From 6be04450722861801178fe0a39af2ce21164762e Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 13 Dec 2012 18:01:06 +0100
Subject: [PATCH 01/36] Increment version to 3.2.1.BUILD-SNAPSHOT

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 947fd645ba..89015ba3ec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=3.2.0.RELEASE
+version=3.2.1.BUILD-SNAPSHOT

From ccb1153440e87c57f229f559f7754e7096a70b11 Mon Sep 17 00:00:00 2001
From: Craig Walls <cwalls@vmware.com>
Date: Thu, 13 Dec 2012 21:07:08 -0600
Subject: [PATCH 02/36] Fix JavaDoc in MockRestServiceServer

---
 .../springframework/test/web/client/MockRestServiceServer.java   | 1 +
 1 file changed, 1 insertion(+)

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 344599208a..4d708ddd18 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
@@ -50,6 +50,7 @@ import org.springframework.web.client.support.RestGatewaySupport;
  * &#47;&#47; Use the hotel instance...
  *
  * mockServer.verify();
+ * </pre>
  *
  * <p>To create an instance of this class, use {@link #createServer(RestTemplate)}
  * and provide the {@code RestTemplate} to set up for the mock testing.

From 155aecf5573c5298360741f811c7d49651b243d8 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Thu, 13 Dec 2012 22:23:37 +0100
Subject: [PATCH 03/36] Fix typo in 3.2 migration guide

- @WebApplicationContext --> @WebAppConfiguration

Backport-Commit: 62e9d6b105feffcd3b9d8b25e8661f993d703c26
---
 src/reference/docbook/migration-3.2.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/reference/docbook/migration-3.2.xml b/src/reference/docbook/migration-3.2.xml
index 898a1f3ed7..c96b43d8ba 100644
--- a/src/reference/docbook/migration-3.2.xml
+++ b/src/reference/docbook/migration-3.2.xml
@@ -124,10 +124,10 @@
     <para>You will no longer be able to use the
     <classname>MockMvcBuilders</classname> <code>annotationConfigSetup</code>
     and <code>xmlConfigSetup</code> options. Instead you'll need to switch
-    to using the <interfacename>@WebApplicationContext</interfacename> support
+    to using the <interfacename>@WebAppConfiguration</interfacename> support
     of <filename>spring-test</filename> for loading Spring configuration,
     then inject a <interfacename>WebApplicationContext</interfacename> into
-    the test and use it to create a <classname>MockMvc</classname>.
+    the test and use it to create a <classname>MockMvc</classname>. See
     <xref linkend="spring-mvc-test-framework" /> for details.</para>
   </section>
 

From c954d10be44ed1d6fc8d5171c2e6a39ed27c00ce Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 19 Dec 2012 12:09:18 +0100
Subject: [PATCH 04/36] Allow for SpEL expressions in initial-delay attribute

Issue: SPR-10102
---
 .../org/springframework/scheduling/config/spring-task-3.2.xsd   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.2.xsd b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.2.xsd
index ff035ece27..34b479d12c 100644
--- a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.2.xsd
+++ b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.2.xsd
@@ -229,7 +229,7 @@
  				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="initial-delay" type="xsd:int" use="optional">
+		<xsd:attribute name="initial-delay" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 	Number of milliseconds to delay before the first execution of a 'fixed-rate' or

From b73a7a84104576d2ea471aead19d5adcd7049faf Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 19 Dec 2012 13:55:22 +0100
Subject: [PATCH 05/36] Added MappingJackson2MessageConverter for JMS

Issue: SPR-10099
---
 build.gradle                                  |   3 +-
 .../MappingJackson2MessageConverter.java      | 370 ++++++++++++++++++
 .../MappingJackson2MessageConverterTests.java | 178 +++++++++
 .../MappingJackson2HttpMessageConverter.java  |   3 +-
 .../MappingJacksonHttpMessageConverter.java   |   5 +-
 5 files changed, 554 insertions(+), 5 deletions(-)
 create mode 100644 spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
 create mode 100644 spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java

diff --git a/build.gradle b/build.gradle
index fd4a12d057..746a290e88 100644
--- a/build.gradle
+++ b/build.gradle
@@ -335,10 +335,11 @@ project("spring-jms") {
 		compile(project(":spring-tx"))
 		optional(project(":spring-oxm"))
 		compile("aopalliance:aopalliance:1.0")
-		optional("org.codehaus.jackson:jackson-mapper-asl:1.4.2")
 		provided("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
 		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")
 	}
 }
 
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
new file mode 100644
index 0000000000..880ae9c75c
--- /dev/null
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MappingJackson2MessageConverter.java
@@ -0,0 +1,370 @@
+/*
+ * 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.jms.support.converter;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.Map;
+import javax.jms.BytesMessage;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+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.
+ *
+ * @author Mark Pollack
+ * @author Dave Syer
+ * @author Juergen Hoeller
+ * @since 3.1.4
+ */
+public class MappingJackson2MessageConverter implements MessageConverter {
+
+	/**
+	 * The default encoding used for writing to text messages: UTF-8.
+	 */
+	public static final String DEFAULT_ENCODING = "UTF-8";
+
+
+	private ObjectMapper objectMapper = new ObjectMapper();
+
+	private MessageType targetType = MessageType.BYTES;
+
+	private String encoding = DEFAULT_ENCODING;
+
+	private String encodingPropertyName;
+
+	private String typeIdPropertyName;
+
+	private Map<String, Class<?>> idClassMappings = new HashMap<String, Class<?>>();
+
+	private Map<Class<?>, String> classIdMappings = new HashMap<Class<?>, String>();
+
+
+	/**
+	 * Specify the {@link org.codehaus.jackson.map.ObjectMapper} to use instead of using the default.
+	 */
+	public void setObjectMapper(ObjectMapper objectMapper) {
+		Assert.notNull(objectMapper, "ObjectMapper must not be null");
+		this.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
+	 */
+	public void setTargetType(MessageType targetType) {
+		Assert.notNull(targetType, "MessageType must not be null");
+		this.targetType = targetType;
+	}
+
+	/**
+	 * Specify the encoding to use when converting to and from text-based
+	 * message body content. The default encoding will be "UTF-8".
+	 * <p>When reading from a a text-based message, an encoding may have been
+	 * suggested through a special JMS property which will then be preferred
+	 * over the encoding set on this MessageConverter instance.
+	 * @see #setEncodingPropertyName
+	 */
+	public void setEncoding(String encoding) {
+		this.encoding = encoding;
+	}
+
+	/**
+	 * Specify the name of the JMS message property that carries the encoding from
+	 * bytes to String and back is BytesMessage is used during the conversion process.
+	 * <p>Default is none. Setting this property is optional; if not set, UTF-8 will
+	 * be used for decoding any incoming bytes message.
+	 * @see #setEncoding
+	 */
+	public void setEncodingPropertyName(String encodingPropertyName) {
+		this.encodingPropertyName = encodingPropertyName;
+	}
+
+	/**
+	 * Specify the name of the JMS message property that carries the type id for the
+	 * contained object: either a mapped id value or a raw Java class name.
+	 * <p>Default is none. <b>NOTE: This property needs to be set in order to allow
+	 * for converting from an incoming message to a Java object.</b>
+	 * @see #setTypeIdMappings
+	 */
+	public void setTypeIdPropertyName(String typeIdPropertyName) {
+		this.typeIdPropertyName = typeIdPropertyName;
+	}
+
+	/**
+	 * Specify mappings from type ids to Java classes, if desired.
+	 * This allows for synthetic ids in the type id message property,
+	 * instead of transferring Java class names.
+	 * <p>Default is no custom mappings, i.e. transferring raw Java class names.
+	 * @param typeIdMappings a Map with type id values as keys and Java classes as values
+	 */
+	public void setTypeIdMappings(Map<String, Class<?>> typeIdMappings) {
+		this.idClassMappings = new HashMap<String, Class<?>>();
+		for (Map.Entry<String, Class<?>> entry : typeIdMappings.entrySet()) {
+			String id = entry.getKey();
+			Class<?> clazz = entry.getValue();
+			this.idClassMappings.put(id, clazz);
+			this.classIdMappings.put(clazz, id);
+		}
+	}
+
+
+	public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
+		Message message;
+		try {
+			switch (this.targetType) {
+				case TEXT:
+					message = mapToTextMessage(object, session, this.objectMapper);
+					break;
+				case BYTES:
+					message = mapToBytesMessage(object, session, this.objectMapper);
+					break;
+				default:
+					message = mapToMessage(object, session, this.objectMapper, this.targetType);
+			}
+		}
+		catch (IOException ex) {
+			throw new MessageConversionException("Could not map JSON object [" + object + "]", ex);
+		}
+		setTypeIdOnMessage(object, message);
+		return message;
+	}
+
+	public Object fromMessage(Message message) throws JMSException, MessageConversionException {
+		try {
+			JavaType targetJavaType = getJavaTypeForMessage(message);
+			return convertToObject(message, targetJavaType);
+		}
+		catch (IOException ex) {
+			throw new MessageConversionException("Failed to convert JSON message content", ex);
+		}
+	}
+
+
+	/**
+	 * Map the given object to a {@link javax.jms.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)
+	 */
+	protected TextMessage mapToTextMessage(Object object, Session session, ObjectMapper objectMapper)
+			throws JMSException, IOException {
+
+		StringWriter writer = new StringWriter();
+		objectMapper.writeValue(writer, object);
+		return session.createTextMessage(writer.toString());
+	}
+
+	/**
+	 * Map the given object to a {@link javax.jms.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)
+	 */
+	protected BytesMessage mapToBytesMessage(Object object, Session session, ObjectMapper objectMapper)
+			throws JMSException, IOException {
+
+		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		OutputStreamWriter writer = new OutputStreamWriter(bos, this.encoding);
+		objectMapper.writeValue(writer, object);
+
+		BytesMessage message = session.createBytesMessage();
+		message.writeBytes(bos.toByteArray());
+		if (this.encodingPropertyName != null) {
+			message.setStringProperty(this.encodingPropertyName, this.encoding);
+		}
+		return message;
+	}
+
+	/**
+	 * 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}.
+	 * <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
+	 */
+	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.");
+	}
+
+	/**
+	 * Set a type id for the given payload object on the given JMS Message.
+	 * <p>The default implementation consults the configured type id mapping and
+	 * sets the resulting value (either a mapped id or the raw Java class name)
+	 * 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
+	 * @see #getJavaTypeForMessage(javax.jms.Message)
+	 * @see #setTypeIdPropertyName(String)
+	 * @see #setTypeIdMappings(java.util.Map)
+	 */
+	protected void setTypeIdOnMessage(Object object, Message message) throws JMSException {
+		if (this.typeIdPropertyName != null) {
+			String typeId = this.classIdMappings.get(object.getClass());
+			if (typeId == null) {
+				typeId = object.getClass().getName();
+			}
+			message.setStringProperty(this.typeIdPropertyName, typeId);
+		}
+	}
+
+
+	/**
+	 * Convenience method to dispatch to converters for individual message types.
+	 */
+	private Object convertToObject(Message message, JavaType targetJavaType) throws JMSException, IOException {
+		if (message instanceof TextMessage) {
+			return convertFromTextMessage((TextMessage) message, targetJavaType);
+		}
+		else if (message instanceof BytesMessage) {
+			return convertFromBytesMessage((BytesMessage) message, targetJavaType);
+		}
+		else {
+			return convertFromMessage(message, targetJavaType);
+		}
+	}
+
+	/**
+	 * Convert a TextMessage to a Java Object with the specified type.
+	 * @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
+	 */
+	protected Object convertFromTextMessage(TextMessage message, JavaType targetJavaType)
+			throws JMSException, IOException {
+
+		String body = message.getText();
+		return this.objectMapper.readValue(body, targetJavaType);
+	}
+
+	/**
+	 * Convert a BytesMessage to a Java Object with the specified type.
+	 * @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
+	 */
+	protected Object convertFromBytesMessage(BytesMessage message, JavaType targetJavaType)
+			throws JMSException, IOException {
+
+		String encoding = this.encoding;
+		if (this.encodingPropertyName != null && message.propertyExists(this.encodingPropertyName)) {
+			encoding = message.getStringProperty(this.encodingPropertyName);
+		}
+		byte[] bytes = new byte[(int) message.getBodyLength()];
+		message.readBytes(bytes);
+		try {
+			String body = new String(bytes, encoding);
+			return this.objectMapper.readValue(body, targetJavaType);
+		}
+		catch (UnsupportedEncodingException ex) {
+			throw new MessageConversionException("Cannot convert bytes to String", ex);
+		}
+	}
+
+	/**
+	 * 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}.
+	 * <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
+	 */
+	protected Object convertFromMessage(Message message, JavaType targetJavaType)
+			throws JMSException, IOException {
+
+		throw new IllegalArgumentException("Unsupported message type [" + message.getClass() +
+				"]. MappingJacksonMessageConverter by default only supports TextMessages and BytesMessages.");
+	}
+
+	/**
+	 * Determine a Jackson JavaType for the given JMS Message,
+	 * typically parsing a type id message property.
+	 * <p>The default implementation parses the configured type id property name
+	 * 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
+	 * @see #setTypeIdOnMessage(Object, javax.jms.Message)
+	 * @see #setTypeIdPropertyName(String)
+	 * @see #setTypeIdMappings(java.util.Map)
+	 */
+	protected JavaType getJavaTypeForMessage(Message message) throws JMSException {
+		String typeId = message.getStringProperty(this.typeIdPropertyName);
+		if (typeId == null) {
+			throw new MessageConversionException("Could not find type id property [" + this.typeIdPropertyName + "]");
+		}
+		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()));
+		}
+		catch (Throwable ex) {
+			throw new MessageConversionException("Failed to resolve type id [" + typeId + "]", ex);
+		}
+	}
+
+}
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
new file mode 100644
index 0000000000..48bc55913d
--- /dev/null
+++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
@@ -0,0 +1,178 @@
+/*
+ * 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.jms.support.converter;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import javax.jms.BytesMessage;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import org.easymock.Capture;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
+/**
+ * @author Arjen Poutsma
+ * @author Dave Syer
+ */
+public class MappingJackson2MessageConverterTests {
+
+	private MappingJackson2MessageConverter converter;
+
+	private Session sessionMock;
+
+	@Before
+	public void setUp() throws Exception {
+		sessionMock = createMock(Session.class);
+		converter = new MappingJackson2MessageConverter();
+		converter.setEncodingPropertyName("__encoding__");
+		converter.setTypeIdPropertyName("__typeid__");
+	}
+
+	@Test
+	public void toBytesMessage() throws Exception {
+		BytesMessage bytesMessageMock = createMock(BytesMessage.class);
+		Date toBeMarshalled = new Date();
+
+		expect(sessionMock.createBytesMessage()).andReturn(bytesMessageMock);
+		bytesMessageMock.setStringProperty("__encoding__", "UTF-8");
+		bytesMessageMock.setStringProperty("__typeid__", Date.class.getName());
+		bytesMessageMock.writeBytes(isA(byte[].class));
+
+		replay(sessionMock, bytesMessageMock);
+
+		converter.toMessage(toBeMarshalled, sessionMock);
+
+		verify(sessionMock, bytesMessageMock);
+	}
+
+	@Test
+	public void fromBytesMessage() throws Exception {
+		BytesMessage bytesMessageMock = createMock(BytesMessage.class);
+		Map<String, String> unmarshalled = Collections.singletonMap("foo",
+				"bar");
+
+		final byte[] bytes = "{\"foo\":\"bar\"}".getBytes();
+		Capture<byte[]> captured = new Capture<byte[]>() {
+			@Override
+			public void setValue(byte[] value) {
+				super.setValue(value);
+				System.arraycopy(bytes, 0, value, 0, bytes.length);
+			}
+		};
+
+		expect(
+				bytesMessageMock.getStringProperty("__typeid__"))
+				.andReturn(Object.class.getName());
+		expect(
+				bytesMessageMock.propertyExists("__encoding__"))
+				.andReturn(false);
+		expect(bytesMessageMock.getBodyLength()).andReturn(
+				new Long(bytes.length));
+		expect(bytesMessageMock.readBytes(EasyMock.capture(captured)))
+				.andReturn(bytes.length);
+
+		replay(sessionMock, bytesMessageMock);
+
+		Object result = converter.fromMessage(bytesMessageMock);
+		assertEquals("Invalid result", result, unmarshalled);
+
+		verify(sessionMock, bytesMessageMock);
+	}
+
+	@Test
+	public void toTextMessageWithObject() throws Exception {
+		converter.setTargetType(MessageType.TEXT);
+		TextMessage textMessageMock = createMock(TextMessage.class);
+		Date toBeMarshalled = new Date();
+
+		textMessageMock.setStringProperty("__typeid__", Date.class.getName());
+		expect(sessionMock.createTextMessage(isA(String.class))).andReturn( textMessageMock);
+
+		replay(sessionMock, textMessageMock);
+
+		converter.toMessage(toBeMarshalled, sessionMock);
+
+		verify(sessionMock, textMessageMock);
+	}
+
+	@Test
+	public void toTextMessageWithMap() throws Exception {
+		converter.setTargetType(MessageType.TEXT);
+		TextMessage textMessageMock = createMock(TextMessage.class);
+		Map<String, String> toBeMarshalled = new HashMap<String, String>();
+		toBeMarshalled.put("foo", "bar");
+
+		textMessageMock.setStringProperty("__typeid__", HashMap.class.getName());
+		expect(sessionMock.createTextMessage(isA(String.class))).andReturn(
+				textMessageMock);
+
+		replay(sessionMock, textMessageMock);
+
+		converter.toMessage(toBeMarshalled, sessionMock);
+
+		verify(sessionMock, textMessageMock);
+	}
+
+	@Test
+	public void fromTextMessageAsObject() throws Exception {
+		TextMessage textMessageMock = createMock(TextMessage.class);
+		Map<String, String> unmarshalled = Collections.singletonMap("foo",
+				"bar");
+
+		String text = "{\"foo\":\"bar\"}";
+		expect(
+				textMessageMock.getStringProperty("__typeid__"))
+				.andReturn(Object.class.getName());
+		expect(textMessageMock.getText()).andReturn(text);
+
+		replay(sessionMock, textMessageMock);
+
+		Object result = converter.fromMessage(textMessageMock);
+		assertEquals("Invalid result", result, unmarshalled);
+
+		verify(sessionMock, textMessageMock);
+	}
+
+	@Test
+	public void fromTextMessageAsMap() throws Exception {
+		TextMessage textMessageMock = createMock(TextMessage.class);
+		Map<String, String> unmarshalled = Collections.singletonMap("foo",
+				"bar");
+
+		String text = "{\"foo\":\"bar\"}";
+		expect(
+				textMessageMock.getStringProperty("__typeid__"))
+				.andReturn(HashMap.class.getName());
+		expect(textMessageMock.getText()).andReturn(text);
+
+		replay(sessionMock, textMessageMock);
+
+		Object result = converter.fromMessage(textMessageMock);
+		assertEquals("Invalid result", result, unmarshalled);
+
+		verify(sessionMock, textMessageMock);
+	}
+
+}
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 f2fe753839..c36c8c1958 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
@@ -49,11 +49,12 @@ import org.springframework.util.Assert;
  *
  * @author Arjen Poutsma
  * @author Keith Donald
+ * @author Rossen Stoyanchev
  * @since 3.1.2
  * @see org.springframework.web.servlet.view.json.MappingJackson2JsonView
  */
 public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConverter<Object>
-	implements GenericHttpMessageConverter<Object> {
+		implements GenericHttpMessageConverter<Object> {
 
 	public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
 
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 81fae185c6..3b8566e337 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
@@ -21,7 +21,6 @@ import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 import java.util.List;
 
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import org.codehaus.jackson.JsonEncoding;
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.JsonProcessingException;
@@ -53,7 +52,7 @@ import org.springframework.util.Assert;
  * @see org.springframework.web.servlet.view.json.MappingJacksonJsonView
  */
 public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConverter<Object>
-	implements GenericHttpMessageConverter<Object> {
+		implements GenericHttpMessageConverter<Object> {
 
 	public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
 
@@ -112,7 +111,7 @@ public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConve
 	}
 
 	/**
-	 * Whether to use the {@link DefaultPrettyPrinter} when writing JSON.
+	 * 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>
 	 * ObjectMapper mapper = new ObjectMapper();

From d3da2edf18f4025bc68cce5b23de8fbd7c2f6474 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Wed, 19 Dec 2012 21:42:37 +0100
Subject: [PATCH 06/36] JmsTemplate uses configured receiveTimeout if shorter
 than remaining transaction timeout

Issue: SPR-10109
---
 .../main/java/org/springframework/jms/core/JmsTemplate.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 4c82d1ac78..189a88a89c 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-2009 the original author or authors.
+ * 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.
@@ -736,7 +736,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 			JmsResourceHolder resourceHolder =
 					(JmsResourceHolder) TransactionSynchronizationManager.getResource(getConnectionFactory());
 			if (resourceHolder != null && resourceHolder.hasTimeout()) {
-				timeout = resourceHolder.getTimeToLiveInMillis();
+				timeout = Math.min(timeout, resourceHolder.getTimeToLiveInMillis());
 			}
 			Message message = doReceive(consumer, timeout);
 			if (session.getTransacted()) {

From 047db8cdf8c7ee0b937c19a6ba09528d209af786 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Thu, 20 Dec 2012 17:33:26 +0100
Subject: [PATCH 07/36] Fixed AbstractAutoProxyCreator to accept null bean
 names again

Issue: SPR-10108
---
 .../autoproxy/AbstractAutoProxyCreator.java   | 31 +++++++------
 .../aop/config/AopNamespaceHandlerTests.java  | 45 ++++++++++++++-----
 2 files changed, 50 insertions(+), 26 deletions(-)

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 3216c3e101..4e4f638008 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
@@ -268,7 +268,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	public Object postProcessBeforeInstantiation(Class<?> beanClass, String beanName) throws BeansException {
 		Object cacheKey = getCacheKey(beanClass, beanName);
 
-		if (!this.targetSourcedBeans.containsKey(beanName)) {
+		if (beanName == null || !this.targetSourcedBeans.containsKey(beanName)) {
 			if (this.advisedBeans.containsKey(cacheKey)) {
 				return null;
 			}
@@ -281,13 +281,15 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 		// Create proxy here if we have a custom TargetSource.
 		// Suppresses unnecessary default instantiation of the target bean:
 		// The TargetSource will handle target instances in a custom fashion.
-		TargetSource targetSource = getCustomTargetSource(beanClass, beanName);
-		if (targetSource != null) {
-			this.targetSourcedBeans.put(beanName, Boolean.TRUE);
-			Object[] specificInterceptors = getAdvicesAndAdvisorsForBean(beanClass, beanName, targetSource);
-			Object proxy = createProxy(beanClass, beanName, specificInterceptors, targetSource);
-			this.proxyTypes.put(cacheKey, proxy.getClass());
-			return proxy;
+		if (beanName != null) {
+			TargetSource targetSource = getCustomTargetSource(beanClass, beanName);
+			if (targetSource != null) {
+				this.targetSourcedBeans.put(beanName, Boolean.TRUE);
+				Object[] specificInterceptors = getAdvicesAndAdvisorsForBean(beanClass, beanName, targetSource);
+				Object proxy = createProxy(beanClass, beanName, specificInterceptors, targetSource);
+				this.proxyTypes.put(cacheKey, proxy.getClass());
+				return proxy;
+			}
 		}
 
 		return null;
@@ -341,7 +343,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	 * @return a proxy wrapping the bean, or the raw bean instance as-is
 	 */
 	protected Object wrapIfNecessary(Object bean, String beanName, Object cacheKey) {
-		if (this.targetSourcedBeans.containsKey(beanName)) {
+		if (beanName != null && this.targetSourcedBeans.containsKey(beanName)) {
 			return bean;
 		}
 		if (Boolean.FALSE.equals(this.advisedBeans.get(cacheKey))) {
@@ -368,17 +370,18 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	/**
 	 * Return whether the given bean class represents an infrastructure class
 	 * that should never be proxied.
-	 * <p>Default implementation considers Advisors, Advices and
-	 * AbstractAutoProxyCreators as infrastructure classes.
+	 * <p>The default implementation considers Advices, Advisors and
+	 * AopInfrastructureBeans as infrastructure classes.
 	 * @param beanClass the class of the bean
 	 * @return whether the bean represents an infrastructure class
+	 * @see org.aopalliance.aop.Advice
 	 * @see org.springframework.aop.Advisor
-	 * @see org.aopalliance.intercept.MethodInterceptor
+	 * @see org.springframework.aop.framework.AopInfrastructureBean
 	 * @see #shouldSkip
 	 */
 	protected boolean isInfrastructureClass(Class<?> beanClass) {
-		boolean retVal = Advisor.class.isAssignableFrom(beanClass) ||
-				Advice.class.isAssignableFrom(beanClass) ||
+		boolean retVal = Advice.class.isAssignableFrom(beanClass) ||
+				Advisor.class.isAssignableFrom(beanClass) ||
 				AopInfrastructureBean.class.isAssignableFrom(beanClass);
 		if (retVal && logger.isTraceEnabled()) {
 			logger.trace("Did not attempt to auto-proxy infrastructure class [" + beanClass.getName() + "]");
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
index 21dd905a33..14620bafaa 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
@@ -16,19 +16,20 @@
 
 package org.springframework.aop.config;
 
-import static org.junit.Assert.*;
-
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.junit.Before;
 import org.junit.Test;
+import test.advice.CountingBeforeAdvice;
+
 import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.ITestBean;
+import org.springframework.beans.TestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import test.advice.CountingBeforeAdvice;
+import static org.junit.Assert.*;
 
 /**
  * Unit tests for aop namespace.
@@ -44,9 +45,14 @@ public class AopNamespaceHandlerTests {
 	@Before
 	public void setUp() {
 		this.context =
-			new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-context.xml", getClass());
+				new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-context.xml", getClass());
 	}
 
+	protected ITestBean getTestBean() {
+		return (ITestBean) this.context.getBean("testBean");
+	}
+
+
 	@Test
 	public void testIsProxy() throws Exception {
 		ITestBean bean = getTestBean();
@@ -83,28 +89,43 @@ public class AopNamespaceHandlerTests {
 
 	@Test
 	public void testAspectApplied() throws Exception {
-		ITestBean testBean = getTestBean();
+		ITestBean bean = getTestBean();
 
 		CountingAspectJAdvice advice = (CountingAspectJAdvice) this.context.getBean("countingAdvice");
 
 		assertEquals("Incorrect before count", 0, advice.getBeforeCount());
 		assertEquals("Incorrect after count", 0, advice.getAfterCount());
 
-		testBean.setName("Sally");
+		bean.setName("Sally");
 
 		assertEquals("Incorrect before count", 1, advice.getBeforeCount());
 		assertEquals("Incorrect after count", 1, advice.getAfterCount());
 
-		testBean.getName();
+		bean.getName();
 
 		assertEquals("Incorrect before count", 1, advice.getBeforeCount());
 		assertEquals("Incorrect after count", 1, advice.getAfterCount());
 	}
 
-	protected ITestBean getTestBean() {
-		return (ITestBean) this.context.getBean("testBean");
-	}
+	@Test
+	public void testAspectAppliedForInitializeBean() {
+		ITestBean bean = (ITestBean) this.context.getAutowireCapableBeanFactory().initializeBean(new TestBean(), null);
 
+		CountingAspectJAdvice advice = (CountingAspectJAdvice) this.context.getBean("countingAdvice");
+
+		assertEquals("Incorrect before count", 0, advice.getBeforeCount());
+		assertEquals("Incorrect after count", 0, advice.getAfterCount());
+
+		bean.setName("Sally");
+
+		assertEquals("Incorrect before count", 1, advice.getBeforeCount());
+		assertEquals("Incorrect after count", 1, advice.getAfterCount());
+
+		bean.getName();
+
+		assertEquals("Incorrect before count", 1, advice.getBeforeCount());
+		assertEquals("Incorrect after count", 1, advice.getAfterCount());
+	}
 }
 
 
@@ -152,5 +173,5 @@ class CountingAspectJAdvice {
 	public int getAroundCount() {
 		return this.aroundCount;
 	}
-}
 
+}

From c242abada1ba450b18629dda8bb5d17d0b67a0be Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Thu, 20 Dec 2012 17:35:02 +0100
Subject: [PATCH 08/36] Fixed QualifierAnnotationAutowireCandidateResolver's
 detection of custom qualifier annotations

Issue: SPR-10107
---
 ...ifierAnnotationAutowireCandidateResolver.java |  3 ++-
 .../QualifierAnnotationAutowireContextTests.java | 16 ++++++++++++++--
 .../org/springframework/util/StringUtils.java    | 15 +++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)

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 5bbed07d91..657ee22666 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
@@ -36,6 +36,7 @@ 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;
 
 /**
  * {@link AutowireCandidateResolver} implementation that matches bean definition qualifiers
@@ -192,7 +193,7 @@ public class QualifierAnnotationAutowireCandidateResolver implements AutowireCan
 						foundMeta = true;
 						// Only accept fallback match if @Qualifier annotation has a value...
 						// Otherwise it is just a marker for a custom qualifier annotation.
-						if ((fallbackToMeta && AnnotationUtils.getValue(metaAnn) == null) ||
+						if ((fallbackToMeta && StringUtils.isEmpty(AnnotationUtils.getValue(metaAnn))) ||
 								!checkQualifier(bdHolder, metaAnn, typeConverter)) {
 							return false;
 						}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireContextTests.java b/spring-context/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireContextTests.java
index b3fc360aa3..e5c14903e2 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireContextTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireContextTests.java
@@ -167,7 +167,7 @@ public class QualifierAnnotationAutowireContextTests {
 		RootBeanDefinition person = new RootBeanDefinition(QualifiedPerson.class, cavs, null);
 		ConstructorArgumentValues cavs2 = new ConstructorArgumentValues();
 		cavs2.addGenericArgumentValue(MARK);
-		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
+		RootBeanDefinition person2 = new RootBeanDefinition(DefaultValueQualifiedPerson.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person);
 		context.registerBeanDefinition(MARK, person2);
 		context.registerBeanDefinition("autowired",
@@ -745,13 +745,25 @@ public class QualifierAnnotationAutowireContextTests {
 	}
 
 
+	@TestQualifierWithDefaultValue
+	private static class DefaultValueQualifiedPerson extends Person {
+
+		public DefaultValueQualifiedPerson() {
+			super(null);
+		}
+
+		public DefaultValueQualifiedPerson(String name) {
+			super(name);
+		}
+	}
+
+
 	@Retention(RetentionPolicy.RUNTIME)
 	@Qualifier
 	public static @interface TestQualifier {
 	}
 
 
-	@Target(ElementType.FIELD)
 	@Retention(RetentionPolicy.RUNTIME)
 	@Qualifier
 	public static @interface TestQualifierWithDefaultValue {
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 c44c0c4ca7..52874fb729 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -69,6 +69,21 @@ public abstract class StringUtils {
 	// General convenience methods for working with Strings
 	//---------------------------------------------------------------------
 
+	/**
+	 * Check whether the given String is empty.
+	 * <p>This method accepts any Object as an argument, comparing it to
+	 * <code>null</code> and the empty String. As a consequence, this method
+	 * will never return <code>true</code> for a non-null non-String object.
+	 * <p>The Object signature is useful for general attribute handling code
+	 * that commonly deals with Strings but generally has to iterate over
+	 * Objects since attributes may e.g. be primitive value objects as well.
+	 * @param str the candidate String
+	 * @since 3.2.1
+	 */
+	public static boolean isEmpty(Object str) {
+		return (str == null || "".equals(str));
+	}
+
 	/**
 	 * Check that the given CharSequence is neither <code>null</code> nor of length 0.
 	 * Note: Will return <code>true</code> for a CharSequence that purely consists of whitespace.

From a30ee0164a6b7307bcb416857699ea8e48463727 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Thu, 20 Dec 2012 17:35:31 +0100
Subject: [PATCH 09/36] Initial preparations for 3.2.1

---
 src/dist/changelog.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/dist/changelog.txt b/src/dist/changelog.txt
index bff2af14da..b9726400ae 100644
--- a/src/dist/changelog.txt
+++ b/src/dist/changelog.txt
@@ -3,6 +3,16 @@ SPRING FRAMEWORK CHANGELOG
 http://www.springsource.org
 
 
+Changes in version 3.2.1 (2013-01-24)
+--------------------------------------
+
+* fixed QualifierAnnotationAutowireCandidateResolver's detection of custom qualifier annotations (SPR-10107)
+* fixed AbstractAutoProxyCreator to accept null bean names again (SPR-10108)
+* spring-task-3.2.xsd allows for SpEL expressions in initial-delay attribute (SPR-10102)
+* JmsTemplate uses configured receiveTimeout if shorter than remaining transaction timeout (SPR-10109)
+* added MappingJackson2MessageConverter for JMS (SPR-10099)
+
+
 Changes in version 3.2 GA (2012-12-13)
 --------------------------------------
 

From 1abb7f66a73b47933e75888a770041c42ba1933c Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Sat, 22 Dec 2012 10:24:33 -0800
Subject: [PATCH 10/36] Fix GenericConversionService search algorithm

Previously the algorithm used by GenericConversionService to find
converters incorrectly searched for interfaces working up from the
base class. This caused particular problems with custom List
converters as as the Collection interface would be considered before
the List interface giving CollectionToObjectConverter precedence
over the custom converter.

The updated algorithm restores the class search order to behave in the
same way as Spring 3.1.

Issue: SPR-10116
Backport-Issue: SPR-10117
Backport-Commit: aa914497dc312568cc541e53302038729364ce68
---
 .../support/GenericConversionService.java     | 86 ++++++++-----------
 .../support/DefaultConversionTests.java       | 34 ++++++--
 .../GenericConversionServiceTests.java        | 15 ++--
 3 files changed, 71 insertions(+), 64 deletions(-)

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 3e69ee4421..f2267fcf3c 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
@@ -431,14 +431,6 @@ public class GenericConversionService implements ConfigurableConversionService {
 	 */
 	private static class Converters {
 
-		private static final Set<Class<?>> IGNORED_CLASSES;
-		static {
-			Set<Class<?>> ignored = new HashSet<Class<?>>();
-			ignored.add(Object.class);
-			ignored.add(Object[].class);
-			IGNORED_CLASSES = Collections.unmodifiableSet(ignored);
-		}
-
 		private final Set<GenericConverter> globalConverters =
 				new LinkedHashSet<GenericConverter>();
 
@@ -483,12 +475,13 @@ public class GenericConversionService implements ConfigurableConversionService {
 		 */
 		public GenericConverter find(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			// Search the full type hierarchy
-			List<TypeDescriptor> sourceCandidates = getTypeHierarchy(sourceType);
-			List<TypeDescriptor> targetCandidates = getTypeHierarchy(targetType);
-			for (TypeDescriptor sourceCandidate : sourceCandidates) {
-				for (TypeDescriptor targetCandidate : targetCandidates) {
+			List<Class<?>> sourceCandidates = getClassHierarchy(sourceType.getType());
+			List<Class<?>> targetCandidates = getClassHierarchy(targetType.getType());
+			for (Class<?> sourceCandidate : sourceCandidates) {
+				for (Class<?> targetCandidate : targetCandidates) {
+					ConvertiblePair convertiblePair = new ConvertiblePair(sourceCandidate, targetCandidate);
 					GenericConverter converter = getRegisteredConverter(
-							sourceType, targetType, sourceCandidate, targetCandidate);
+							sourceType, targetType, convertiblePair);
 					if(converter != null) {
 						return converter;
 					}
@@ -497,12 +490,11 @@ public class GenericConversionService implements ConfigurableConversionService {
 			return null;
 		}
 
-		private GenericConverter getRegisteredConverter(TypeDescriptor sourceType, TypeDescriptor targetType,
-				TypeDescriptor sourceCandidate, TypeDescriptor targetCandidate) {
+		private GenericConverter getRegisteredConverter(TypeDescriptor sourceType,
+				TypeDescriptor targetType, ConvertiblePair convertiblePair) {
 
 			// Check specifically registered converters
-			ConvertersForPair convertersForPair = converters.get(new ConvertiblePair(
-				sourceCandidate.getType(), targetCandidate.getType()));
+			ConvertersForPair convertersForPair = converters.get(convertiblePair);
 			GenericConverter converter = convertersForPair == null ? null
 				: convertersForPair.getConverter(sourceType, targetType);
 			if (converter != null) {
@@ -512,7 +504,7 @@ public class GenericConversionService implements ConfigurableConversionService {
 			// Check ConditionalGenericConverter that match all types
 			for (GenericConverter globalConverter : this.globalConverters) {
 				if (((ConditionalConverter)globalConverter).matches(
-						sourceCandidate, targetCandidate)) {
+						sourceType, targetType)) {
 					return globalConverter;
 				}
 			}
@@ -526,44 +518,38 @@ public class GenericConversionService implements ConfigurableConversionService {
 		 * @return an ordered list of all classes that the given type extends or
 		 *         implements.
 		 */
-		private List<TypeDescriptor> getTypeHierarchy(TypeDescriptor type) {
-			if(type.isPrimitive()) {
-				type = TypeDescriptor.valueOf(type.getObjectType());
-			}
-			Set<TypeDescriptor> typeHierarchy = new LinkedHashSet<TypeDescriptor>();
-			collectTypeHierarchy(typeHierarchy, type);
-			if(type.isArray()) {
-				typeHierarchy.add(TypeDescriptor.valueOf(Object[].class));
-			}
-			typeHierarchy.add(TypeDescriptor.valueOf(Object.class));
-			return new ArrayList<TypeDescriptor>(typeHierarchy);
-		}
-
-		private void collectTypeHierarchy(Set<TypeDescriptor> typeHierarchy,
-				TypeDescriptor type) {
-			if(type != null && !IGNORED_CLASSES.contains(type.getType())) {
-				if(typeHierarchy.add(type)) {
-					Class<?> superclass = type.getType().getSuperclass();
-					if (type.isArray()) {
-						superclass = ClassUtils.resolvePrimitiveIfNecessary(superclass);
-					}
-					collectTypeHierarchy(typeHierarchy, createRelated(type, superclass));
-
-					for (Class<?> implementsInterface : type.getType().getInterfaces()) {
-						collectTypeHierarchy(typeHierarchy, createRelated(type, implementsInterface));
-					}
+		private List<Class<?>> getClassHierarchy(Class<?> type) {
+			List<Class<?>> hierarchy = new ArrayList<Class<?>>(20);
+			Set<Class<?>> visited = new HashSet<Class<?>>(20);
+			addToClassHierarchy(0, ClassUtils.resolvePrimitiveIfNecessary(type), false, hierarchy, visited);
+			boolean array = type.isArray();
+			int i = 0;
+			while (i < hierarchy.size()) {
+				Class<?> candidate = hierarchy.get(i);
+				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);
 				}
+				for (Class<?> implementedInterface : candidate.getInterfaces()) {
+					addToClassHierarchy(hierarchy.size(), implementedInterface, array, hierarchy, visited);
+				}
+				i++;
 			}
+			addToClassHierarchy(hierarchy.size(), Object.class, array, hierarchy, visited);
+			addToClassHierarchy(hierarchy.size(), Object.class, false, hierarchy, visited);
+			return hierarchy;
 		}
 
-		private TypeDescriptor createRelated(TypeDescriptor type, Class<?> relatedType) {
-			if (relatedType == null && type.isArray()) {
-				relatedType = Array.newInstance(relatedType, 0).getClass();
+		private void addToClassHierarchy(int index, Class<?> type, boolean asArray,
+				List<Class<?>> hierarchy, Set<Class<?>> visited) {
+			if(asArray) {
+				type = Array.newInstance(type, 0).getClass();
 			}
-			if(!type.getType().equals(relatedType)) {
-				return type.upcast(relatedType);
+			if(visited.add(type)) {
+				hierarchy.add(index, type);
 			}
-			return null;
 		}
 
 		@Override
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 e5d7e27d3a..e1fdb3dee0 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
@@ -16,11 +16,7 @@
 
 package org.springframework.core.convert.support;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.Assert.*;
 
 import java.awt.Color;
 import java.math.BigDecimal;
@@ -506,6 +502,21 @@ public class DefaultConversionTests {
 		assertEquals(source, result);
 	}
 
+	@Test
+	public void convertCollectionToObjectWithCustomConverter() throws Exception {
+		List<String> source = new ArrayList<String>();
+		source.add("A");
+		source.add("B");
+		conversionService.addConverter(new Converter<List, ListWrapper>() {
+			@Override
+			public ListWrapper convert(List source) {
+				return new ListWrapper(source);
+			}
+		});
+		ListWrapper result = conversionService.convert(source, ListWrapper.class);
+		assertSame(source, result.getList());
+	}
+
 	@Test
 	public void convertObjectToCollection() {
 		List<String> result = (List<String>) conversionService.convert(3L, List.class);
@@ -777,4 +788,17 @@ public class DefaultConversionTests {
 		}
 	}
 
+	private static class ListWrapper {
+
+		private List<?> list;
+
+		public ListWrapper(List<?> list) {
+			this.list = list;
+		}
+
+		public List<?> getList() {
+			return list;
+		}
+	}
+
 }
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 fc2af6d87d..b5ede248ed 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
@@ -27,7 +27,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +47,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.util.StopWatch;
 import org.springframework.util.StringUtils;
 
+import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.*;
 
 /**
@@ -696,14 +696,11 @@ public class GenericConversionServiceTests {
 		MyConditionalGenericConverter converter = new MyConditionalGenericConverter();
 		conversionService.addConverter(converter);
 		assertEquals((Integer) 3, conversionService.convert(3, Integer.class));
+		assertThat(converter.getSourceTypes().size(), greaterThan(2));
 		Iterator<TypeDescriptor> iterator = converter.getSourceTypes().iterator();
-		assertEquals(Integer.class, iterator.next().getType());
-		assertEquals(Number.class, iterator.next().getType());
-		TypeDescriptor last = null;
-		while (iterator.hasNext()) {
-			last = iterator.next();
+		while(iterator.hasNext()) {
+			assertEquals(Integer.class, iterator.next().getType());
 		}
-		assertEquals(Object.class, last.getType());
 	}
 
 	@Test
@@ -784,7 +781,7 @@ public class GenericConversionServiceTests {
 	private static class MyConditionalGenericConverter implements GenericConverter,
 			ConditionalConverter {
 
-		private Set<TypeDescriptor> sourceTypes = new LinkedHashSet<TypeDescriptor>();
+		private List<TypeDescriptor> sourceTypes = new ArrayList<TypeDescriptor>();
 
 		public Set<ConvertiblePair> getConvertibleTypes() {
 			return null;
@@ -800,7 +797,7 @@ public class GenericConversionServiceTests {
 			return null;
 		}
 
-		public Set<TypeDescriptor> getSourceTypes() {
+		public List<TypeDescriptor> getSourceTypes() {
 			return sourceTypes;
 		}
 	}

From 3724b90a8fb83f44995d9a527b10016d86781a74 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 26 Dec 2012 09:31:00 +0100
Subject: [PATCH 11/36] Add spring-oxm-1.5.xsd

Issue: SPR-10121
---
 .../oxm/config/spring-oxm-1.5.xsd             | 146 ++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd

diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd
new file mode 100644
index 0000000000..a81a43a5fd
--- /dev/null
+++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<xsd:schema xmlns="http://www.springframework.org/schema/oxm" 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/oxm" elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
+
+    <xsd:import namespace="http://www.springframework.org/schema/beans"/>
+    <xsd:import namespace="http://www.springframework.org/schema/tool"/>
+
+    <xsd:annotation>
+        <xsd:documentation>
+            Defines the elements used in Spring's Object/XML Mapping integration.
+        </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:element name="jaxb1-marshaller">
+        <xsd:complexType>
+            <xsd:annotation>
+                <xsd:documentation source="java:org.springframework.oxm.jaxb.Jaxb1Marshaller">
+                    Defines a JAXB1 Marshaller.
+                </xsd:documentation>
+                <xsd:appinfo>
+                    <tool:annotation>
+                        <tool:exports type="org.springframework.oxm.jaxb.Jaxb1Marshaller"/>
+                    </tool:annotation>
+                </xsd:appinfo>
+            </xsd:annotation>
+            <xsd:complexContent>
+                <xsd:extension base="beans:identifiedType">
+                    <xsd:attribute name="contextPath" type="xsd:string" use="required">
+                        <xsd:annotation>
+                            <xsd:documentation>The JAXB Context path</xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="validating" type="xsd:boolean" default="false">
+                        <xsd:annotation>
+                            <xsd:documentation>Whether incoming XML should be validated.</xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="jaxb2-marshaller">
+        <xsd:complexType>
+            <xsd:annotation>
+                <xsd:documentation source="java:org.springframework.oxm.jaxb.Jaxb2Marshaller">
+                    Defines a JAXB2 Marshaller.
+                </xsd:documentation>
+                <xsd:appinfo>
+                    <tool:annotation>
+                        <tool:exports type="org.springframework.oxm.jaxb.Jaxb2Marshaller"/>
+                    </tool:annotation>
+                </xsd:appinfo>
+            </xsd:annotation>
+            <xsd:complexContent>
+                <xsd:extension base="beans:identifiedType">
+                    <xsd:sequence>
+                        <xsd:element name="class-to-be-bound" minOccurs="0" maxOccurs="unbounded">
+                            <xsd:complexType>
+                                <xsd:attribute name="name" type="classType" use="required"/>
+                            </xsd:complexType>
+                        </xsd:element>
+                    </xsd:sequence>
+                    <xsd:attribute name="contextPath" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation>The JAXB Context path</xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="jibx-marshaller">
+        <xsd:complexType>
+            <xsd:annotation>
+                <xsd:documentation source="java:org.springframework.oxm.jibx.JibxMarshaller">
+                    Defines a JiBX Marshaller.
+                </xsd:documentation>
+                <xsd:appinfo>
+                    <tool:annotation>
+                        <tool:exports type="org.springframework.oxm.jibx.JibxMarshaller"/>
+                    </tool:annotation>
+                </xsd:appinfo>
+            </xsd:annotation>
+            <xsd:complexContent>
+                <xsd:extension base="beans:identifiedType">
+                    <xsd:attribute name="target-class" type="classType" use="required"/>
+                    <xsd:attribute name="bindingName" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation>The binding name used by this marshaller.</xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="xmlbeans-marshaller">
+        <xsd:complexType>
+            <xsd:annotation>
+                <xsd:documentation source="java:org.springframework.oxm.xmlbeans.XmlBeansMarshaller">
+                    Defines a XMLBeans Marshaller.
+                </xsd:documentation>
+                <xsd:appinfo>
+                    <tool:annotation>
+                        <tool:exports type="org.springframework.oxm.xmlbeans.XmlBeansMarshaller"/>
+                    </tool:annotation>
+                </xsd:appinfo>
+            </xsd:annotation>
+            <xsd:complexContent>
+                <xsd:extension base="beans:identifiedType">
+                    <xsd:attribute name="options" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation source="java:org.apache.xmlbeans.XmlOptions">
+                                The bean name of the XmlOptions that is to be used for this marshaller. Typically a
+                                XmlOptionsFactoryBean definition.
+                            </xsd:documentation>
+                            <xsd:appinfo>
+                                <tool:annotation kind="ref">
+                                    <tool:expected-type type="org.apache.xmlbeans.XmlOptions"/>
+                                </tool:annotation>
+                            </xsd:appinfo>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:simpleType name="classType">
+        <xsd:annotation>
+            <xsd:documentation source="java:java.lang.Class">A class supported by a marshaller.</xsd:documentation>
+            <xsd:appinfo>
+                <tool:annotation kind="direct">
+                    <tool:expected-type type="java.lang.Class"/>
+                </tool:annotation>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:union memberTypes="xsd:string"/>
+    </xsd:simpleType>
+
+</xsd:schema>

From 0758e7246578c766bbd76e56aa39ecd1144c13e1 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 28 Dec 2012 10:26:29 +0100
Subject: [PATCH 12/36] Update contributor guidelines regarding 3.2.x branch

---
 CONTRIBUTING.md | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f06867ea7d..71739dc400 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -47,17 +47,13 @@ future pull requests as well, simply so the Spring Framework team knows
 immediately that this process is complete.
 
 
-## Create your branch from `master`
+## Create your branch from `3.2.x`
 
-At any given time, Spring Framework's `master` branch represents the version
-currently under development. For example, if 3.1.1 was the latest Spring
-Framework release, `master` represents 3.2.0 development, and the `3.1.x`
-branch represents 3.1.2 development.
-
-Create your topic branch to be submitted as a pull request from `master`. The
-Spring team will consider your pull request for backporting to maintenance
-versions (e.g. 3.1.2) on a case-by-case basis; you don't need to worry about
-submitting anything for backporting.
+If your pull request addresses a bug or improvement, please create your branch
+Spring Framework's `3.2.x` branch. `master` is reserved for work on new features
+for the next major version of the framework. Rest assured that if your pull
+request is accepted and merged into `3.2.x`, these changes will also eventually
+be merged into `master`.
 
 
 ## Use short branch names

From 426b099965dc7e6701c2d0368a248e7239b3066a Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 26 Dec 2012 20:41:05 +0100
Subject: [PATCH 13/36] Support snapshot versions qualified by branch name

---
 build.gradle | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build.gradle b/build.gradle
index 746a290e88..a0882a2fe0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,6 +16,14 @@ configure(allprojects) {
 	ext.slf4jVersion    = "1.6.1"
 	ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
 
+	if (rootProject.hasProperty("VERSION_QUALIFIER")) {
+		def qualifier = rootProject.getProperty("VERSION_QUALIFIER")
+		if (qualifier.startsWith("SPR-")) { // topic branch, e.g. SPR-1234
+			// replace 3.2.0.BUILD-SNAPSHOT for 3.2.0.SPR-1234-SNAPSHOT
+			version = version.replace('BUILD', qualifier)
+		}
+	}
+
 	apply plugin: "propdeps"
 	apply plugin: "java"
 	apply plugin: "propdeps-eclipse"

From 44a474a014788e7850cee3a5318ac3916e55e756 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Mon, 17 Dec 2012 10:16:03 +0100
Subject: [PATCH 14/36] Various updates to support IDEA

Remove the 'final' modifier from SingletonBeanFactoryLocatorTests
to work around the "cannot extend final class" error issued when
running all tests. The error was due to confusion with IDEA between
the two variants of SingletonBeanFactoryLocatorTests across
spring-context and spring-beans.

Rename one of the GroovyMessenger classes to GroovyMessenger2.
Previously there were multiple Groovy classes named
'GroovyMessenger', causing a compilation error in certain IDE
arrangements.

Update import-into-idea.md documentation

Add various IDEA artifacts to .gitignore
 - ignore derby.log wherever it is written
 - ignore IDEA's test-output directory
 - ignore IDEA's Atlassian connector config file
---
 .gitignore                                    |  6 +++--
 import-into-idea.md                           | 24 +++++++++----------
 .../SingletonBeanFactoryLocatorTests.java     |  4 ++--
 .../scripting/groovy/Messenger.groovy         |  3 +--
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5d40a5584c..c79bac7342 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ integration-repo
 ivy-cache
 jxl.log
 jmx.log
-spring-jdbc/derby.log
+derby.log
 spring-test/test-output/
 .gradle
 build
@@ -19,8 +19,10 @@ build
 argfile*
 pom.xml
 
-# IDEA metadata and output dirs
+# IDEA artifacts and output dirs
 *.iml
 *.ipr
 *.iws
 out
+test-output
+atlassian-ide-plugin.xml
diff --git a/import-into-idea.md b/import-into-idea.md
index 15a4e9e62d..4bbac88504 100644
--- a/import-into-idea.md
+++ b/import-into-idea.md
@@ -1,10 +1,10 @@
-The following has been tested against Intellij IDEA 11.0.1
+The following has been tested against Intellij IDEA 12.0
 
 ## Steps
 
 _Within your locally cloned spring-framework working directory:_
 
-1. Generate IDEA metadata with `./gradlew cleanIdea idea`
+1. Generate IDEA metadata with `./gradlew :spring-oxm:compileTestJava cleanIdea idea`
 2. Import into IDEA as usual
 3. Set the Project JDK as appropriate
 4. Add git support
@@ -12,21 +12,21 @@ _Within your locally cloned spring-framework working directory:_
 
 ## Known issues
 
-1. MockServletContext and friends will fail to compile in spring-web. To fix this, uncheck the 'export' setting for all servlet-api and tomcat-servlet-api jars. The problem is that spring-web needs Servlet 2.5, but it's picking up Servlet 3.0 from projects that it depends on.
-2. spring-context will fail to build because there's a duplicate instance of GroovyMessenger in spring-context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy. The solution to this is not known.  It's not a problem on Eclipse, because Eclipse doesn't automatically compile .groovy files like IDEA (apparently) does.
-
-There are no other known problems at this time.  Please add to this list, and if you're ambitious, consider playing with the Gradle IDEA generation DSL to fix these problems automatically, e.g.:
-
-* http://gradle.org/docs/current/dsl/org.gradle.plugins.ide.idea.model.IdeaProject.html
-* http://gradle.org/docs/current/dsl/org.gradle.plugins.ide.idea.model.IdeaModule.html
-* http://gradle.org/docs/current/groovydoc/org/gradle/plugins/ide/idea/model/IdeaModule.html
+1. `spring-aspects` does not compile out of the box due to references to aspect types unknown to IDEA.
+See http://youtrack.jetbrains.com/issue/IDEA-64446 for details. In the meantime, you may want to
+exclude `spring-aspects` from the overall project to avoid compilation errors.
+2. While all JUnit tests pass from the command line with Gradle, many will fail when run from IDEA.
+Resolving this is a work in progress. If attempting to run all JUnit tests from within IDEA, you will
+likely need to set the following VM options to avoid out of memory errors:
+    -XX:MaxPermSize=2048m -Xmx2048m -XX:MaxHeapSize=2048m
 
 ## Tips
 
-In any case, please do not check in your own generated .iml, .ipr, or .iws files. You'll notice these files are already intentionally in .gitignore. The same policy goes for eclipse metadata.
+In any case, please do not check in your own generated .iml, .ipr, or .iws files.
+You'll notice these files are already intentionally in .gitignore. The same policy goes for eclipse metadata.
 
 ## FAQ
 
 Q. What about IDEA's own [Gradle support](http://confluence.jetbrains.net/display/IDEADEV/Gradle+integration)?
 
-A. Unknown. Please report back if you try it and it goes well for you.
+A. Keep an eye on http://youtrack.jetbrains.com/issue/IDEA-53476
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
index ff63ff84d5..2a9bff1c30 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
@@ -30,7 +30,7 @@ import org.springframework.util.ClassUtils;
  * @author Colin Sampaleanu
  * @author Chris Beams
  */
-public final class SingletonBeanFactoryLocatorTests {
+public class SingletonBeanFactoryLocatorTests {
 	private static final Class<?> CLASS = SingletonBeanFactoryLocatorTests.class;
 	private static final String REF1_XML = CLASS.getSimpleName() + "-ref1.xml";
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy b/spring-context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy
index 93030df159..002aca83d0 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/Messenger.groovy
@@ -1,8 +1,7 @@
 package org.springframework.scripting.groovy;
 
-import org.springframework.scripting.ConfigurableMessenger
 import org.springframework.stereotype.Component;
 
 @Component
-class GroovyMessenger extends ConcreteMessenger {
+class GroovyMessenger2 extends ConcreteMessenger {
 }

From 1762157ad1a89ff8778387a2c72a8e36ff341a40 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Tue, 18 Dec 2012 13:45:00 -0800
Subject: [PATCH 15/36] Remove trailing whitespace in source files

  find . -type f -name "*.java" -or -name "*.aj" | \
    xargs perl -p -i -e "s/[ \t]*$//g" {} \;

Issue: SPR-10127
---
 gradle/jdiff/Null.java                        |   4 +-
 .../java/org/springframework/aop/Advisor.java |   6 +-
 .../aop/DynamicIntroductionAdvice.java        |   4 +-
 .../aop/IntroductionAdvisor.java              |   4 +-
 .../springframework/aop/IntroductionInfo.java |   2 +-
 .../aop/MethodBeforeAdvice.java               |   8 +-
 .../springframework/aop/PointcutAdvisor.java  |   6 +-
 .../springframework/aop/TrueClassFilter.java  |   6 +-
 .../aop/TrueMethodMatcher.java                |   8 +-
 .../org/springframework/aop/TruePointcut.java |   6 +-
 .../aop/aspectj/AbstractAspectJAdvice.java    |  32 ++--
 .../aop/aspectj/AspectJAfterAdvice.java       |   2 +-
 .../aspectj/AspectJExpressionPointcut.java    |   4 +-
 .../AspectJExpressionPointcutAdvisor.java     |   2 +-
 .../aop/aspectj/AspectJProxyUtils.java        |   2 +-
 .../aspectj/AspectJWeaverMessageHandler.java  |  22 +--
 .../aop/aspectj/DeclareParentsAdvisor.java    |   4 +-
 .../MethodInvocationProceedingJoinPoint.java  |   2 +-
 .../aop/aspectj/RuntimeTestWalker.java        |   8 +-
 .../SingletonAspectInstanceFactory.java       |   2 +-
 .../aop/aspectj/TypePatternClassFilter.java   |   6 +-
 .../AbstractAspectJAdvisorFactory.java        |  16 +-
 .../aspectj/annotation/AspectMetadata.java    |   4 +-
 .../BeanFactoryAspectInstanceFactory.java     |   4 +-
 ...ntiationModelAwarePointcutAdvisorImpl.java |  26 +--
 .../ReflectiveAspectJAdvisorFactory.java      |   2 +-
 .../aop/aspectj/annotation/package-info.java  |   2 +-
 .../AspectJAwareAdvisorAutoProxyCreator.java  |   8 +-
 .../AspectJPrecedenceComparator.java          |   6 +-
 .../aop/aspectj/package-info.java             |   2 +-
 ...erceptorDrivenBeanDefinitionDecorator.java |   2 +-
 .../aop/config/AdviceEntry.java               |   2 +-
 .../aop/config/AdvisorEntry.java              |   2 +-
 .../aop/config/AopConfigUtils.java            |   4 +-
 .../config/ConfigBeanDefinitionParser.java    |   8 +-
 .../aop/config/PointcutEntry.java             |   2 +-
 .../ScopedProxyBeanDefinitionDecorator.java   |   2 +-
 .../aop/framework/Advised.java                |   2 +-
 .../aop/framework/AopProxyFactory.java        |   2 +-
 .../aop/framework/ProxyFactoryBean.java       |  16 +-
 .../adapter/ThrowsAdviceInterceptor.java      |   6 +-
 .../adapter/UnknownAdviceTypeException.java   |   6 +-
 .../aop/framework/adapter/package-info.java   |   2 +-
 .../DefaultAdvisorAutoProxyCreator.java       |   2 +-
 .../autoproxy/TargetSourceCreator.java        |   8 +-
 .../aop/framework/autoproxy/package-info.java |   4 +-
 .../target/QuickTargetSourceCreator.java      |   4 +-
 .../aop/framework/package-info.java           |   6 +-
 .../AbstractMonitoringInterceptor.java        |   2 +-
 .../ConcurrencyThrottleInterceptor.java       |   6 +-
 .../interceptor/ExposeBeanNameAdvisors.java   |   2 +-
 .../JamonPerformanceMonitorInterceptor.java   |   2 +-
 .../org/springframework/aop/package-info.java |   6 +-
 .../aop/scope/DefaultScopedObject.java        |   2 +-
 .../aop/scope/ScopedObject.java               |   2 +-
 .../aop/scope/ScopedProxyFactoryBean.java     |   4 +-
 .../aop/scope/ScopedProxyUtils.java           |   4 +-
 .../support/DefaultIntroductionAdvisor.java   |   2 +-
 .../aop/support/DefaultPointcutAdvisor.java   |   4 +-
 ...erTargetObjectIntroductionInterceptor.java |   8 +-
 .../DelegatingIntroductionInterceptor.java    |  12 +-
 .../aop/support/DynamicMethodMatcher.java     |   6 +-
 .../support/DynamicMethodMatcherPointcut.java |   6 +-
 .../aop/support/JdkRegexpMethodPointcut.java  |   6 +-
 .../aop/support/RootClassFilter.java          |  12 +-
 .../aop/support/StaticMethodMatcher.java      |   8 +-
 .../target/AbstractPoolingTargetSource.java   |   4 +-
 .../aop/target/CommonsPoolTargetSource.java   |   2 +-
 .../aop/target/PoolingConfig.java             |   6 +-
 .../aop/target/SingletonTargetSource.java     |   4 +-
 .../aop/target/ThreadLocalTargetSource.java   |   8 +-
 .../target/ThreadLocalTargetSourceStats.java  |   8 +-
 .../aop/target/dynamic/Refreshable.java       |   6 +-
 ...eParameterNameDiscoverAnnotationTests.java |   2 +-
 ...ctJAdviceParameterNameDiscovererTests.java |   2 +-
 .../AspectJExpressionPointcutTests.java       |  60 +++----
 .../BeanNamePointcutMatchingTests.java        |   8 +-
 ...hodInvocationProceedingJoinPointTests.java |  22 +--
 ...ctJAdviceParameterNameDiscovererTests.java |  14 +-
 .../TigerAspectJExpressionPointcutTests.java  |  68 ++++----
 .../TrickyAspectJPointcutExpressionTests.java |  20 +--
 .../aspectj/TypePatternClassFilterTests.java  |   4 +-
 .../AbstractAspectJAdvisorFactoryTests.java   | 152 ++++++++--------
 .../annotation/ArgumentBindingTests.java      |   4 +-
 .../AspectJPointcutAdvisorTests.java          |  26 +--
 .../annotation/AspectMetadataTests.java       |  12 +-
 .../ReflectiveAspectJAdvisorFactoryTests.java |   2 +-
 .../AspectJPrecedenceComparatorTests.java     |   4 +-
 .../config/AopNamespaceHandlerEventTests.java |   6 +-
 ...AopNamespaceHandlerPointcutErrorTests.java |   2 +-
 .../aop/config/TopLevelAopTagTests.java       |   4 +-
 .../aop/framework/AopProxyUtilsTests.java     |  16 +-
 .../framework/IntroductionBenchmarkTests.java |  10 +-
 .../aop/framework/MethodInvocationTests.java  |  10 +-
 .../aop/framework/PrototypeTargetTests.java   |   2 +-
 .../aop/framework/ProxyFactoryTests.java      |  24 +--
 .../interceptor/DebugInterceptorTests.java    |   4 +-
 .../ExposeBeanNameAdvisorsTests.java          |  22 +--
 .../ExposeInvocationInterceptorTests.java     |  14 +-
 .../aop/scope/ScopedProxyAutowireTests.java   |   4 +-
 .../aop/support/AopUtilsTests.java            |   4 +-
 .../aop/support/ClassFiltersTests.java        |  14 +-
 .../aop/support/ComposablePointcutTests.java  |  26 +--
 .../aop/support/ControlFlowPointcutTests.java |  26 +--
 ...elegatingIntroductionInterceptorTests.java |   8 +-
 .../aop/support/MethodMatchersTests.java      |  18 +-
 .../support/NameMatchMethodPointcutTests.java |  24 +--
 .../aop/support/PointcutsTests.java           |  60 +++----
 ...MethodPointcutAdvisorIntegrationTests.java |  30 ++--
 .../CommonsPoolTargetSourceProxyTests.java    |   2 +-
 .../target/HotSwappableTargetSourceTests.java |  50 +++---
 .../aop/target/LazyInitTargetSourceTests.java |   4 +-
 .../PrototypeBasedTargetSourceTests.java      |   4 +-
 .../target/PrototypeTargetSourceTests.java    |  16 +-
 .../target/ThreadLocalTargetSourceTests.java  |  34 ++--
 .../test/java/test/aop/DefaultLockable.java   |   8 +-
 .../src/test/java/test/aop/Lockable.java      |  14 +-
 .../src/test/java/test/aop/MethodCounter.java |   2 +-
 .../test/java/test/aop/NopInterceptor.java    |  12 +-
 .../test/java/test/aop/PerTargetAspect.java   |   2 +-
 .../test/aop/SerializableNopInterceptor.java  |  16 +-
 .../test/java/test/beans/INestedTestBean.java |   6 +-
 .../src/test/java/test/beans/IOther.java      |   6 +-
 .../test/java/test/beans/NestedTestBean.java  |   6 +-
 .../src/test/java/test/beans/Person.java      |  16 +-
 .../java/test/beans/SerializablePerson.java   |  16 +-
 .../test/java/test/beans/SideEffectBean.java  |  14 +-
 .../test/java/test/beans/subpkg/DeepBean.java |   4 +-
 .../test/util/SerializationTestUtils.java     |   8 +-
 .../java/test/util/TestResourceUtils.java     |  12 +-
 .../src/test/java/test/util/TimeStamped.java  |   8 +-
 .../aspectj/AbstractBeanConfigurerAspect.aj   |   8 +-
 .../AbstractDependencyInjectionAspect.aj      |  34 ++--
 ...nterfaceDrivenDependencyInjectionAspect.aj |  50 +++---
 .../aspectj/AnnotationBeanConfigurerAspect.aj |   8 +-
 .../factory/aspectj/ConfigurableObject.java   |   2 +-
 ...nterfaceDrivenDependencyInjectionAspect.aj |  32 ++--
 .../cache/aspectj/AbstractCacheAspect.aj      |   2 +-
 .../AbstractMethodMockingControl.aj           |  20 +--
 ...otationDrivenStaticEntityMockingControl.aj |  12 +-
 .../aspectj/JpaExceptionTranslatorAspect.aj   |   8 +-
 .../aspectj/AbstractAsyncExecutionAspect.aj   |   2 +-
 .../aspectj/AnnotationTransactionAspect.aj    |  10 +-
 .../AutoProxyWithCodeStyleAspectsTests.java   |   4 +-
 .../beans/INestedTestBean.java                |   6 +-
 .../org/springframework/beans/IOther.java     |   6 +-
 .../springframework/beans/NestedTestBean.java |   6 +-
 .../cache/config/CacheableService.java        |   2 +-
 .../cache/config/DefaultCacheableService.java |   2 +-
 ...nDrivenStaticEntityMockingControlTest.java |  14 +-
 .../mock/staticmock/Delegate.java             |   6 +-
 .../mock/staticmock/Person_Roo_Entity.aj      | 160 ++++++++---------
 .../CallCountingTransactionManager.java       |   2 +-
 .../ClassWithPrivateAnnotatedMember.java      |   8 +-
 .../ClassWithProtectedAnnotatedMember.java    |   8 +-
 .../transaction/aspectj/ITransactional.java   |   2 +-
 ...ethodAnnotationOnClassWithNoInterface.java |   6 +-
 .../aspectj/TransactionAspectTests.java       |  62 +++----
 ...lAnnotationOnlyOnClassWithNoInterface.java |   4 +-
 .../beans/BeanWrapperImpl.java                |  20 +--
 .../GenericTypeAwarePropertyDescriptor.java   |   2 +-
 .../beans/MethodInvocationException.java      |   2 +-
 .../beans/PropertyAccessException.java        |   2 +-
 .../beans/PropertyEditorRegistrar.java        |   2 +-
 .../springframework/beans/PropertyValues.java |   8 +-
 .../beans/factory/BeanFactoryUtils.java       |   2 +-
 .../factory/BeanIsNotAFactoryException.java   |   6 +-
 .../beans/factory/DisposableBean.java         |   6 +-
 .../factory/HierarchicalBeanFactory.java      |   2 +-
 .../beans/factory/InitializingBean.java       |  10 +-
 .../beans/factory/ListableBeanFactory.java    |   2 +-
 .../NoSuchBeanDefinitionException.java        |   2 +-
 .../factory/access/BootstrapException.java    |   6 +-
 .../access/SingletonBeanFactoryLocator.java   |  52 +++---
 .../beans/factory/access/package-info.java    |   2 +-
 .../AutowiredAnnotationBeanPostProcessor.java |  18 +-
 .../factory/annotation/Configurable.java      |   4 +-
 .../beans/factory/annotation/Required.java    |   2 +-
 .../factory/config/AbstractFactoryBean.java   |   2 +-
 .../config/BeanFactoryPostProcessor.java      |   6 +-
 .../factory/config/CommonsLogFactoryBean.java |   6 +-
 .../config/CustomEditorConfigurer.java        |  12 +-
 .../config/FieldRetrievingFactoryBean.java    |   6 +-
 .../config/MethodInvokingFactoryBean.java     |   6 +-
 .../config/PropertyPathFactoryBean.java       |   6 +-
 .../config/RuntimeBeanNameReference.java      |   4 +-
 .../factory/config/RuntimeBeanReference.java  |   4 +-
 .../beans/factory/package-info.java           |   2 +-
 .../parsing/FailFastProblemReporter.java      |   2 +-
 .../beans/factory/parsing/PropertyEntry.java  |   2 +-
 .../beans/factory/parsing/QualifierEntry.java |   2 +-
 .../AbstractAutowireCapableBeanFactory.java   |  16 +-
 .../support/BeanDefinitionDefaults.java       |   2 +-
 ...CglibSubclassingInstantiationStrategy.java |  12 +-
 .../factory/support/ConstructorResolver.java  |   6 +-
 .../support/FactoryBeanRegistrySupport.java   |   4 +-
 .../beans/factory/support/LookupOverride.java |   2 +-
 .../beans/factory/support/MethodOverride.java |   2 +-
 .../factory/support/MethodOverrides.java      |   2 +-
 .../beans/factory/support/MethodReplacer.java |   2 +-
 .../PropertiesBeanDefinitionReader.java       |   2 +-
 .../factory/support/ReplaceOverride.java      |   6 +-
 .../support/SecurityContextProvider.java      |   6 +-
 .../SimpleSecurityContextProvider.java        |   8 +-
 .../beans/factory/support/package-info.java   |   2 +-
 .../xml/AbstractBeanDefinitionParser.java     |   2 +-
 .../AbstractSimpleBeanDefinitionParser.java   |   8 +-
 .../beans/factory/xml/BeansDtdResolver.java   |   2 +-
 .../DefaultBeanDefinitionDocumentReader.java  |   2 +-
 .../beans/factory/xml/NamespaceHandler.java   |   4 +-
 .../SimpleConstructorNamespaceHandler.java    |  24 +--
 .../springframework/beans/package-info.java   |   4 +-
 .../propertyeditors/CharacterEditor.java      |   2 +-
 .../beans/propertyeditors/LocaleEditor.java   |   6 +-
 .../propertyeditors/ResourceBundleEditor.java |  18 +-
 .../StringArrayPropertyEditor.java            |   6 +-
 .../beans/propertyeditors/package-info.java   |   2 +-
 .../beans/support/PropertyComparator.java     |   2 +-
 .../beans/support/SortDefinition.java         |   6 +-
 .../ComponentBeanDefinitionParserTest.java    |   6 +-
 .../beans/AbstractPropertyValuesTests.java    |   8 +-
 .../springframework/beans/BeanUtilsTests.java |   2 +-
 .../beans/BeanWrapperAutoGrowingTests.java    |  30 ++--
 .../beans/ConcurrentBeanWrapperTests.java     |   8 +-
 .../beans/MutablePropertyValuesTests.java     |   2 +-
 .../beans/factory/BeanFactoryUtilsTests.java  |  10 +-
 .../factory/ConcurrentBeanFactoryTests.java   |   2 +-
 .../DefaultListableBeanFactoryTests.java      |  18 +-
 .../beans/factory/FactoryBeanLookupTests.java |  10 +-
 .../beans/factory/FactoryBeanTests.java       |  14 +-
 .../SingletonBeanFactoryLocatorTests.java     |  14 +-
 ...wiredAnnotationBeanPostProcessorTests.java |   2 +-
 .../CustomAutowireConfigurerTests.java        |   2 +-
 .../config/CustomEditorConfigurerTests.java   |   2 +-
 .../FieldRetrievingFactoryBeanTests.java      |   4 +-
 .../MethodInvokingFactoryBeanTests.java       |   2 +-
 ...ObjectFactoryCreatingFactoryBeanTests.java |  10 +-
 .../config/PropertiesFactoryBeanTests.java    |   4 +-
 .../config/PropertyPathFactoryBeanTests.java  |   4 +-
 .../ServiceLocatorFactoryBeanTests.java       |  24 +--
 .../factory/config/SimpleScopeTests.java      |   6 +-
 .../beans/factory/config/TestTypes.java       |   2 +-
 .../parsing/CustomProblemReporterTests.java   |   2 +-
 .../PassThroughSourceExtractorTests.java      |   2 +-
 ...ierAnnotationAutowireBeanFactoryTests.java |  20 +--
 .../security/CallbacksSecurityTests.java      |  16 +-
 .../security/support/ConstructorBean.java     |   6 +-
 .../security/support/CustomCallbackBean.java  |   8 +-
 .../security/support/CustomFactoryBean.java   |   6 +-
 .../support/security/support/DestroyBean.java |   6 +-
 .../support/security/support/FactoryBean.java |  10 +-
 .../support/security/support/InitBean.java    |   6 +-
 .../security/support/PropertyBean.java        |   8 +-
 .../wiring/BeanConfigurerSupportTests.java    |   4 +-
 .../factory/xml/BeanNameGenerationTests.java  |   2 +-
 .../xml/ConstructorDependenciesBean.java      |  12 +-
 .../beans/factory/xml/DependenciesBean.java   |  12 +-
 .../beans/factory/xml/DummyReferencer.java    |   6 +-
 .../factory/xml/DuplicateBeanIdTests.java     |   4 +-
 .../beans/factory/xml/FactoryMethods.java     |  24 +--
 .../beans/factory/xml/InstanceFactory.java    |  16 +-
 .../beans/factory/xml/TestBeanCreator.java    |  12 +-
 .../factory/xml/XmlBeanCollectionTests.java   |   8 +-
 .../xml/XmlBeanDefinitionReaderTests.java     |   2 +-
 .../DefaultNamespaceHandlerResolverTests.java |   2 +-
 .../ByteArrayPropertyEditorTests.java         |   2 +-
 .../propertyeditors/CustomEditorTests.java    |   6 +-
 .../PropertiesEditorTests.java                |  14 +-
 .../beans/support/PagedListHolderTests.java   |   6 +-
 .../support/PropertyComparatorTests.java      |   4 +-
 .../test/java/test/beans/BooleanTestBean.java |   6 +-
 .../src/test/java/test/beans/DummyBean.java   |   8 +-
 .../test/java/test/beans/INestedTestBean.java |   6 +-
 .../src/test/java/test/beans/IOther.java      |   6 +-
 .../test/java/test/beans/NestedTestBean.java  |   6 +-
 .../test/java/test/beans/NumberTestBean.java  |   6 +-
 .../test/beans/PackageLevelVisibleBean.java   |   2 +-
 .../java/test/util/TestResourceUtils.java     |  12 +-
 .../org/springframework/mail/MailSender.java  |   8 +-
 .../mail/SimpleMailMessage.java               |   4 +-
 .../freemarker/FreeMarkerTemplateUtils.java   |   6 +-
 .../beans/INestedTestBean.java                |   6 +-
 .../org/springframework/beans/IOther.java     |   6 +-
 .../springframework/beans/NestedTestBean.java |   6 +-
 .../cache/annotation/CacheEvict.java          |   4 +-
 .../cache/annotation/Cacheable.java           |   2 +-
 .../cache/interceptor/CacheAspectSupport.java |   4 +-
 .../context/ApplicationContext.java           |   2 +-
 .../context/ApplicationContextAware.java      |   4 +-
 .../context/HierarchicalMessageSource.java    |  10 +-
 .../context/MessageSourceResolvable.java      |   2 +-
 .../context/NoSuchMessageException.java       |   6 +-
 .../org/springframework/context/Phased.java   |   2 +-
 .../context/ResourceLoaderAware.java          |   2 +-
 .../access/ContextBeanFactoryReference.java   |   8 +-
 .../context/access/DefaultLocatorFactory.java |   6 +-
 .../context/access/package-info.java          |   2 +-
 .../AnnotationBeanNameGenerator.java          |   2 +-
 .../context/annotation/Bean.java              |   2 +-
 .../ClassPathBeanDefinitionScanner.java       |   2 +-
 .../CommonAnnotationBeanPostProcessor.java    |   2 +-
 .../annotation/ConfigurationClass.java        |   4 +-
 ...onfigurationClassBeanDefinitionReader.java |   2 +-
 .../ConfigurationClassPostProcessor.java      |   2 +-
 .../context/annotation/Scope.java             |   2 +-
 .../context/annotation/ScopeMetadata.java     |   2 +-
 .../annotation/ScopeMetadataResolver.java     |   4 +-
 .../PropertyOverrideBeanDefinitionParser.java |   2 +-
 .../StandardBeanExpressionResolver.java       |   2 +-
 .../springframework/context/package-info.java |   2 +-
 .../ApplicationContextAwareProcessor.java     |   4 +-
 .../support/ApplicationObjectSupport.java     |   4 +-
 .../support/ConversionServiceFactoryBean.java |   2 +-
 .../support/MessageSourceAccessor.java        |   6 +-
 .../AbstractRemoteSlsbInvokerInterceptor.java |   2 +-
 .../access/LocalSlsbInvokerInterceptor.java   |   2 +-
 ...LocalStatelessSessionProxyFactoryBean.java |   4 +-
 ...emoteStatelessSessionProxyFactoryBean.java |   4 +-
 .../ejb/access/package-info.java              |   4 +-
 .../support/AbstractJmsMessageDrivenBean.java |   4 +-
 .../support/AbstractMessageDrivenBean.java    |   2 +-
 .../support/AbstractStatefulSessionBean.java  |   2 +-
 .../ejb/support/package-info.java             |   6 +-
 .../format/AnnotationFormatterFactory.java    |   4 +-
 .../org/springframework/format/Formatter.java |   2 +-
 .../format/FormatterRegistrar.java            |   4 +-
 .../org/springframework/format/Parser.java    |   2 +-
 .../org/springframework/format/Printer.java   |   2 +-
 .../format/annotation/NumberFormat.java       |   6 +-
 ...umberFormatAnnotationFormatterFactory.java |   2 +-
 ...ormattingConversionServiceFactoryBean.java |  14 +-
 ...esourceOverridingShadowingClassLoader.java |  10 +-
 .../GlassFishClassLoaderAdapter.java          |  10 +-
 .../classloading/jboss/JBossMCAdapter.java    |   2 +-
 .../jboss/JBossMCTranslatorAdapter.java       |   4 +-
 .../oc4j/OC4JClassLoaderAdapter.java          |   8 +-
 .../oc4j/OC4JClassPreprocessorAdapter.java    |   8 +-
 .../classloading/oc4j/OC4JLoadTimeWeaver.java |   2 +-
 .../weblogic/WebLogicClassLoaderAdapter.java  |   8 +-
 .../weblogic/WebLogicLoadTimeWeaver.java      |   6 +-
 .../WebSphereClassLoaderAdapter.java          |   4 +-
 .../WebSphereClassPreDefinePlugin.java        |  10 +-
 .../jmx/export/MBeanExporter.java             |   8 +-
 .../jmx/export/annotation/ManagedMetric.java  |   2 +-
 .../AbstractReflectiveMBeanInfoAssembler.java |  10 +-
 .../MethodExclusionMBeanInfoAssembler.java    |   2 +-
 .../export/metadata/JmxAttributeSource.java   |   8 +-
 .../jmx/export/naming/KeyNamingStrategy.java  |   4 +-
 .../ModelMBeanNotificationPublisher.java      |   2 +-
 .../springframework/jndi/JndiTemplate.java    |   6 +-
 .../jndi/JndiTemplateEditor.java              |   6 +-
 .../springframework/jndi/package-info.java    |   2 +-
 .../remoting/rmi/JndiRmiProxyFactoryBean.java |   2 +-
 .../support/RemoteInvocationUtils.java        |   2 +-
 .../AnnotationDrivenBeanDefinitionParser.java |   2 +-
 .../ScheduledTasksBeanDefinitionParser.java   |   2 +-
 .../config/SchedulerBeanDefinitionParser.java |   2 +-
 .../config/TaskNamespaceHandler.java          |   4 +-
 .../support/CronSequenceGenerator.java        |   2 +-
 .../scheduling/support/CronTrigger.java       |   2 +-
 .../scheduling/support/PeriodicTrigger.java   |   6 +-
 .../scheduling/support/TaskUtils.java         |   2 +-
 .../config/LangNamespaceHandler.java          |   4 +-
 .../config/ScriptBeanDefinitionParser.java    |   2 +-
 .../config/ScriptingDefaultsParser.java       |   2 +-
 .../scripting/groovy/GroovyScriptFactory.java |   2 +-
 .../support/ResourceScriptSource.java         |   2 +-
 .../support/ScriptFactoryPostProcessor.java   |   2 +-
 .../stereotype/package-info.java              |   2 +-
 .../ui/context/HierarchicalThemeSource.java   |   6 +-
 .../ui/context/package-info.java              |   4 +-
 .../validation/BeanPropertyBindingResult.java |   2 +-
 .../springframework/validation/Errors.java    |   8 +-
 .../validation/ObjectError.java               |   2 +-
 .../validation/ValidationUtils.java           |   8 +-
 .../springframework/validation/Validator.java |  14 +-
 .../java/example/scannable/MessageBean.java   |   4 +-
 .../scannable/ServiceInvocationCounter.java   |   2 +-
 .../aop/aspectj/AfterAdviceBindingTests.java  |  22 +--
 .../AfterReturningAdviceBindingTests.java     |  40 ++---
 .../AfterThrowingAdviceBindingTests.java      |  28 +--
 .../aop/aspectj/AroundAdviceBindingTests.java |  24 +--
 .../AspectAndAdvicePrecedenceTests.java       |  16 +-
 .../BeanNamePointcutAtAspectTests.java        |   2 +-
 .../aop/aspectj/BeanNamePointcutTests.java    |   8 +-
 .../aop/aspectj/BeforeAdviceBindingTests.java |  24 +--
 .../DeclarationOrderIndependenceTests.java    |  44 ++---
 .../DeclareParentsDelegateRefTests.java       |   6 +-
 .../aop/aspectj/DeclareParentsTests.java      |   8 +-
 ...licitJPArgumentMatchingAtAspectJTests.java |   6 +-
 .../ImplicitJPArgumentMatchingTests.java      |   6 +-
 .../aop/aspectj/OverloadedAdviceTests.java    |   2 +-
 .../aop/aspectj/ProceedTests.java             |  26 +--
 .../aspectj/PropertyDependentAspectTests.java |   4 +-
 .../SharedPointcutWithArgsMismatchTests.java  |   4 +-
 .../SubtypeSensitiveMatchingTests.java        |  16 +-
 .../aspectj/TargetPointcutSelectionTests.java |  14 +-
 ...tSelectionOnlyPointcutsAtAspectJTests.java |  32 ++--
 ...sAndTargetSelectionOnlyPointcutsTests.java |  16 +-
 .../aop/aspectj/_TestTypes.java               |  18 +-
 .../autoproxy/AnnotationBindingTests.java     |   2 +-
 .../autoproxy/AnnotationPointcutTests.java    |   2 +-
 .../AspectImplementingInterfaceTests.java     |   4 +-
 ...xyCreatorAndLazyInitTargetSourceTests.java |   2 +-
 .../AspectJAutoProxyCreatorTests.java         |   4 +-
 .../AtAspectJAnnotationBindingTests.java      |   4 +-
 .../aop/aspectj/autoproxy/_TestTypes.java     |   2 +-
 .../autoproxy/benchmark/BenchmarkTests.java   |  80 ++++-----
 .../autoproxy/spr3064/SPR3064Tests.java       |  12 +-
 ...fterReturningGenericTypeMatchingTests.java |   4 +-
 .../GenericBridgeMethodMatchingTests.java     |   4 +-
 .../GenericParameterMatchingTests.java        |  20 +--
 .../AopNamespaceHandlerAdviceTypeTests.java   |   2 +-
 .../AopNamespaceHandlerArgNamesTests.java     |   2 +-
 .../AopNamespaceHandlerReturningTests.java    |   2 +-
 .../aop/config/AopNamespaceHandlerTests.java  |  10 +-
 .../AopNamespaceHandlerThrowingTests.java     |   2 +-
 .../MethodLocatingFactoryBeanTests.java       |  20 +--
 .../aop/framework/AbstractAopProxyTests.java  |  62 +++----
 .../aop/framework/CglibProxyTests.java        |  10 +-
 .../aop/framework/JdkDynamicProxyTests.java   |  14 +-
 .../aop/framework/ProxyFactoryBeanTests.java  |  18 +-
 .../aop/framework/_TestTypes.java             |   4 +-
 .../AdvisorAutoProxyCreatorTests.java         |  14 +-
 .../BeanNameAutoProxyCreatorTests.java        |  10 +-
 .../aop/scope/ScopedProxyTests.java           |   4 +-
 .../target/CommonsPoolTargetSourceTests.java  |   6 +-
 .../beans/INestedTestBean.java                |   6 +-
 .../org/springframework/beans/IOther.java     |   6 +-
 .../springframework/beans/NestedTestBean.java |   6 +-
 .../org/springframework/beans/Person.java     |   6 +-
 .../beans/SerializablePerson.java             |   6 +-
 .../beans/factory/DummyFactory.java           |   4 +-
 .../springframework/beans/factory/HasMap.java |  14 +-
 .../beans/factory/MustBeInitialized.java      |  12 +-
 .../SingletonBeanFactoryLocatorTests.java     |  12 +-
 .../beans/factory/access/TestBean.java        |   8 +-
 .../InjectAnnotationAutowireContextTests.java |  76 ++++----
 ...alifierAnnotationAutowireContextTests.java |  84 ++++-----
 .../beans/factory/xml/DependenciesBean.java   |  14 +-
 .../LookupMethodWrappedByCglibProxyTests.java |   4 +-
 .../factory/xml/QualifierAnnotationTests.java |   2 +-
 .../support/CustomNamespaceHandlerTests.java  |   8 +-
 .../cache/config/CacheableService.java        |   6 +-
 .../cache/config/DefaultCacheableService.java |   2 +-
 .../springframework/context/ACATester.java    |   8 +-
 .../AbstractApplicationContextTests.java      |   6 +-
 .../context/LifecycleContextBean.java         |  18 +-
 .../ContextBeanFactoryReferenceTests.java     |  10 +-
 .../ContextJndiBeanFactoryLocatorTests.java   |  14 +-
 ...ntextSingletonBeanFactoryLocatorTests.java |   8 +-
 .../access/DefaultLocatorFactoryTests.java    |   6 +-
 .../AbstractCircularImportDetectionTests.java |   4 +-
 ...notationConfigApplicationContextTests.java |   2 +-
 .../AsmCircularImportDetectionTests.java      |   4 +-
 ...PathFactoryBeanDefinitionScannerTests.java |   4 +-
 .../annotation/ComponentScanParserTests.java  |   4 +-
 ...nParserWithUserDefinedStrategiesTests.java |   2 +-
 .../context/annotation/SimpleConfigTests.java |   2 +-
 .../context/annotation/SimpleScanTests.java   |   6 +-
 .../AutowiredConfigurationTests.java          |   4 +-
 ...anAnnotationAttributePropagationTests.java |   2 +-
 .../BeanMethodQualificationTests.java         |   6 +-
 ...figurationClassAspectIntegrationTests.java |   2 +-
 .../configuration/ImportResourceTests.java    |  32 ++--
 .../annotation/configuration/ImportTests.java |   4 +-
 ...tedConfigurationClassEnhancementTests.java |  12 +-
 .../configuration/ScopingTests.java           |  22 +--
 .../annotation/spr8761/Spr8761Tests.java      |   2 +-
 .../context/conversionservice/Bar.java        |   6 +-
 .../ConversionServiceContextConfigTests.java  |   2 +-
 .../EventPublicationInterceptorTests.java     |   4 +-
 .../context/event/LifecycleEventTests.java    |   2 +-
 .../context/support/Assembler.java            |  14 +-
 .../context/support/AutowiredService.java     |   6 +-
 .../BeanFactoryPostProcessorTests.java        |  16 +-
 .../ClassPathXmlApplicationContextTests.java  |   2 +-
 .../ConversionServiceFactoryBeanTests.java    |   8 +-
 .../DefaultLifecycleProcessorTests.java       |   4 +-
 .../context/support/LifecycleTestBean.java    |   2 +-
 .../context/support/Logic.java                |  16 +-
 ...rtyResourceConfigurerIntegrationTests.java |   8 +-
 ...ertySourcesPlaceholderConfigurerTests.java |   2 +-
 .../context/support/Spr7283Tests.java         |   2 +-
 .../context/support/Spr7816Tests.java         |  18 +-
 ...ticApplicationContextMulticasterTests.java |   6 +-
 .../StaticApplicationContextTests.java        |   6 +-
 .../context/support/TestIF.java               |   6 +-
 .../LocalSlsbInvokerInterceptorTests.java     |   2 +-
 ...StatelessSessionProxyFactoryBeanTests.java |  38 ++--
 ...StatelessSessionProxyFactoryBeanTests.java |  58 +++----
 .../format/number/CurrencyFormatterTests.java |   2 +-
 ...tingConversionServiceFactoryBeanTests.java |   4 +-
 .../FormattingConversionServiceTests.java     |   6 +-
 ...ceOverridingShadowingClassLoaderTests.java |  26 +--
 .../org/springframework/jmx/IJmxTestBean.java |   2 +-
 .../springframework/jmx/export/DateRange.java |   2 +-
 .../jmx/export/ExceptionOnInitBean.java       |   2 +-
 .../export/annotation/AnnotationTestBean.java |  10 +-
 .../AbstractMetadataAssemblerTests.java       |  10 +-
 .../assembler/IAdditionalTestMethods.java     |   2 +-
 .../jmx/export/assembler/ICustomJmxBean.java  |   2 +-
 ...aceBasedMBeanInfoAssemblerCustomTests.java |   2 +-
 ...ethodExclusionMBeanInfoAssemblerTests.java |   2 +-
 .../export/naming/KeyNamingStrategyTests.java |   2 +-
 .../jndi/JndiTemplateEditorTests.java         |   6 +-
 .../mock/env/MockEnvironment.java             |   2 +-
 .../mock/jndi/SimpleNamingContextBuilder.java |   2 +-
 .../remoting/rmi/RmiSupportTests.java         |   4 +-
 .../ThreadPoolTaskSchedulerTests.java         |   4 +-
 .../springframework/scripting/ScriptBean.java |   2 +-
 .../config/ScriptingDefaultsTests.java        |   2 +-
 .../groovy/GroovyAspectIntegrationTests.java  |   2 +-
 .../groovy/GroovyScriptFactoryTests.java      |   2 +-
 .../scripting/groovy/LogUserAdvice.java       |   8 +-
 .../ScriptFactoryPostProcessorTests.java      |   2 +-
 .../util/SerializationTestUtils.java          |   8 +-
 .../validation/ValidationUtilsTests.java      |   2 +-
 .../advice/CountingAfterReturningAdvice.java  |   6 +-
 .../test/advice/CountingBeforeAdvice.java     |   6 +-
 .../test/java/test/advice/MethodCounter.java  |   2 +-
 .../java/test/advice/MyThrowsHandler.java     |   4 +-
 .../advice/TimestampIntroductionAdvisor.java  |   8 +-
 .../java/test/aspect/PerTargetAspect.java     |   2 +-
 .../src/test/java/test/beans/Employee.java    |  12 +-
 .../test/java/test/beans/FactoryMethods.java  |   2 +-
 .../src/test/java/test/beans/ITestBean.java   |   4 +-
 .../test/java/test/beans/NestedTestBean.java  |   2 +-
 .../test/java/test/beans/SideEffectBean.java  |  16 +-
 .../src/test/java/test/beans/TestBean.java    |   2 +-
 .../java/test/interceptor/NopInterceptor.java |  12 +-
 .../SerializableNopInterceptor.java           |  16 +-
 .../TimestampIntroductionInterceptor.java     |   8 +-
 .../test/java/test/mixin/DefaultLockable.java |   8 +-
 .../src/test/java/test/mixin/LockMixin.java   |  14 +-
 .../java/test/mixin/LockMixinAdvisor.java     |   8 +-
 .../src/test/java/test/mixin/Lockable.java    |  14 +-
 .../test/java/test/mixin/LockedException.java |   6 +-
 .../src/test/java/test/util/TimeStamped.java  |   8 +-
 .../core/ConstantException.java               |   2 +-
 .../org/springframework/core/Constants.java   |   2 +-
 .../org/springframework/core/ControlFlow.java |   6 +-
 .../org/springframework/core/ErrorCoded.java  |  10 +-
 .../core/ParameterNameDiscoverer.java         |   4 +-
 .../PrioritizedParameterNameDiscoverer.java   |   2 +-
 .../enums/AbstractGenericLabeledEnum.java     |   2 +-
 .../core/enums/LetterCodedLabeledEnum.java    |   2 +-
 .../core/enums/ShortCodedLabeledEnum.java     |   2 +-
 .../core/enums/StaticLabeledEnum.java         |  10 +-
 .../core/env/EnvironmentCapable.java          |   2 +-
 .../core/io/InputStreamSource.java            |   8 +-
 .../PathMatchingResourcePatternResolver.java  |   6 +-
 .../core/serializer/DefaultDeserializer.java  |   4 +-
 .../core/serializer/DefaultSerializer.java    |   2 +-
 .../core/serializer/Deserializer.java         |   2 +-
 .../core/serializer/Serializer.java           |   2 +-
 .../core/serializer/package-info.java         |   2 +-
 .../core/style/StylerUtils.java               |   4 +-
 .../core/style/ToStringCreator.java           |   2 +-
 .../core/task/SyncTaskExecutor.java           |   2 +-
 .../core/task/TaskExecutor.java               |   2 +-
 .../core/type/StandardMethodMetadata.java     |   4 +-
 .../core/type/classreading/package-info.java  |   4 +-
 ...AbstractTypeHierarchyTraversingFilter.java |   4 +-
 .../type/filter/AnnotationTypeFilter.java     |   2 +-
 .../type/filter/AssignableTypeFilter.java     |   6 +-
 .../util/CachingMapDecorator.java             |   2 +-
 .../util/ConcurrencyThrottleSupport.java      |   4 +-
 .../org/springframework/util/DigestUtils.java |   2 +-
 .../util/PropertiesPersister.java             |   6 +-
 .../util/SystemPropertyUtils.java             |   2 +-
 .../org/springframework/util/TypeUtils.java   |   2 +-
 .../util/comparator/ComparableComparator.java |   2 +-
 .../util/comparator/CompoundComparator.java   |   2 +-
 .../springframework/util/xml/DomUtils.java    |   2 +-
 .../util/xml/XMLEventStreamWriter.java        |   4 +-
 .../beans/INestedTestBean.java                |   6 +-
 .../org/springframework/beans/IOther.java     |   6 +-
 .../springframework/beans/NestedTestBean.java |   6 +-
 .../core/AbstractControlFlowTests.java        |  10 +-
 .../core/BridgeMethodResolverTests.java       |   2 +-
 .../springframework/core/ConstantsTests.java  |   2 +-
 .../core/DefaultControlFlowTests.java         |   2 +-
 .../core/Jdk14ControlFlowTests.java           |   2 +-
 ...ableTableParameterNameDiscovererTests.java |   2 +-
 .../core/NestedExceptionTests.java            |  12 +-
 ...ioritizedParameterNameDiscovererTests.java |  18 +-
 .../core/annotation/AnnotationUtilsTests.java |   2 +-
 .../core/env/PropertySourceTests.java         |   2 +-
 ...hMatchingResourcePatternResolverTests.java |   4 +-
 .../ResourceArrayPropertyEditorTests.java     |   2 +-
 .../core/type/AnnotationMetadataTests.java    |   2 +-
 .../core/type/AssignableTypeFilterTests.java  |   6 +-
 .../type/CachingMetadataReaderLeakTest.java   |  10 +-
 .../util/CompositeIteratorTests.java          |   2 +-
 .../util/FileSystemUtilsTests.java            |  26 +--
 .../util/Log4jConfigurerTests.java            |   6 +-
 .../util/MockLog4jAppender.java               |  20 +--
 .../util/PropertyPlaceholderHelperTests.java  |   2 +-
 .../util/SerializationTestUtils.java          |  26 +--
 .../util/SerializationUtilsTests.java         |   2 +-
 .../springframework/util/StopWatchTests.java  |  36 ++--
 .../util/xml/XMLEventStreamWriterTests.java   |   2 +-
 .../expression/AccessException.java           |   2 +-
 .../expression/BeanResolver.java              |   1 -
 .../expression/ConstructorExecutor.java       |   4 +-
 .../expression/EvaluationException.java       |  10 +-
 .../expression/Expression.java                |  22 +--
 .../expression/ExpressionException.java       |  10 +-
 .../ExpressionInvocationTargetException.java  |   2 +-
 .../expression/MethodFilter.java              |  20 +--
 .../springframework/expression/Operation.java |   2 +-
 .../expression/OperatorOverloader.java        |   2 +-
 .../expression/ParseException.java            |   8 +-
 .../expression/ParserContext.java             |   8 +-
 .../expression/PropertyAccessor.java          |   2 +-
 .../expression/TypeComparator.java            |   2 +-
 .../expression/TypedValue.java                |   6 +-
 .../common/CompositeStringExpression.java     |  10 +-
 .../expression/common/LiteralExpression.java  |   2 +-
 .../common/TemplateParserContext.java         |   2 +-
 .../expression/spel/ExpressionState.java      |  30 ++--
 .../spel/InternalParseException.java          |   6 +-
 .../spel/SpelEvaluationException.java         |   6 +-
 .../expression/spel/SpelMessage.java          |  24 +--
 .../expression/spel/SpelParseException.java   |   4 +-
 .../expression/spel/ast/AstUtils.java         |   4 +-
 .../expression/spel/ast/BeanReference.java    |   6 +-
 .../spel/ast/CompoundExpression.java          |   2 +-
 .../spel/ast/ConstructorReference.java        |   4 +-
 .../expression/spel/ast/FormatHelper.java     |   6 +-
 .../spel/ast/FunctionReference.java           |   2 +-
 .../expression/spel/ast/InlineList.java       |   2 +-
 .../expression/spel/ast/IntLiteral.java       |   2 +-
 .../expression/spel/ast/Literal.java          |   8 +-
 .../expression/spel/ast/LongLiteral.java      |   2 +-
 .../expression/spel/ast/OpLT.java             |   2 +-
 .../expression/spel/ast/OpMultiply.java       |   2 +-
 .../expression/spel/ast/Operator.java         |   4 +-
 .../expression/spel/ast/OperatorBetween.java  |   2 +-
 .../expression/spel/ast/OperatorPower.java    |   4 +-
 .../expression/spel/ast/Projection.java       |   6 +-
 .../spel/ast/PropertyOrFieldReference.java    |  16 +-
 .../expression/spel/ast/RealLiteral.java      |   2 +-
 .../expression/spel/ast/Selection.java        |   6 +-
 .../expression/spel/ast/TypeCode.java         |   2 +-
 .../spel/ast/VariableReference.java           |   4 +-
 .../spel/standard/SpelExpression.java         |  36 ++--
 .../spel/standard/SpelExpressionParser.java   |   2 +-
 .../expression/spel/standard/Token.java       |  14 +-
 .../expression/spel/standard/TokenKind.java   |   4 +-
 .../expression/spel/standard/Tokenizer.java   |  50 +++---
 .../spel/support/BooleanTypedValue.java       |   2 +-
 .../spel/support/ReflectionHelper.java        |  32 ++--
 .../ReflectiveConstructorResolver.java        |   2 +-
 .../support/StandardEvaluationContext.java    |  24 +--
 .../spel/support/StandardTypeComparator.java  |   4 +-
 .../spel/support/StandardTypeConverter.java   |   4 +-
 .../spel/support/StandardTypeLocator.java     |   6 +-
 .../spel/ArrayConstructorTests.java           |   2 +-
 .../spel/ConstructorInvocationTests.java      |  50 +++---
 .../spel/DefaultComparatorUnitTests.java      |  10 +-
 .../spel/ExpressionLanguageScenarioTests.java |  26 +--
 .../expression/spel/ExpressionStateTests.java |  72 ++++----
 ...essionTestsUsingCoreConversionService.java |  14 +-
 .../expression/spel/IndexingTests.java        |  48 ++---
 .../expression/spel/ListTests.java            |   2 +-
 .../spel/LiteralExpressionTests.java          |   2 +-
 .../expression/spel/LiteralTests.java         |   4 +-
 .../expression/spel/MapAccessTests.java       |   4 +-
 .../spel/OperatorOverloaderTests.java         |  10 +-
 .../expression/spel/OperatorTests.java        |  70 ++++----
 .../expression/spel/ParsingTests.java         |  18 +-
 .../expression/spel/PerformanceTests.java     |   8 +-
 .../spel/ScenariosForSpringSecurity.java      |  30 ++--
 .../expression/spel/SetValueTests.java        |  34 ++--
 .../spel/SpelDocumentationTests.java          | 164 +++++++++---------
 .../expression/spel/SpelUtilities.java        |   2 +-
 .../spel/StandardTypeLocatorTests.java        |   8 +-
 .../spel/TemplateExpressionParsingTests.java  |  36 ++--
 .../spel/VariableAndFunctionTests.java        |   4 +-
 .../spel/ast/FormatHelperTests.java           |   4 +-
 .../spel/support/ReflectionHelperTests.java   |  86 ++++-----
 .../spel/support/StandardComponentsTests.java |   8 +-
 .../spel/testresources/ArrayContainer.java    |   4 +-
 .../spel/testresources/Company.java           |   4 +-
 .../expression/spel/testresources/Fruit.java  |  10 +-
 .../spel/testresources/Inventor.java          |  18 +-
 .../expression/spel/testresources/Person.java |   6 +-
 .../spel/testresources/PlaceOfBirth.java      |  12 +-
 .../spel/testresources/TestAddress.java       |   2 +-
 .../spel/testresources/TestPerson.java        |   2 +-
 .../TomcatInstrumentableClassLoader.java      |   4 +-
 .../jdbc/BadSqlGrammarException.java          |   2 +-
 .../jdbc/UncategorizedSQLException.java       |   2 +-
 .../config/SortedResourcesFactoryBean.java    |   2 +-
 .../core/BatchPreparedStatementSetter.java    |   4 +-
 .../jdbc/core/CallableStatementCreator.java   |  10 +-
 .../core/CallableStatementCreatorFactory.java |   2 +-
 .../jdbc/core/JdbcOperations.java             |   6 +-
 .../jdbc/core/JdbcTemplate.java               |   4 +-
 .../jdbc/core/ParameterMapper.java            |   4 +-
 .../ParameterizedPreparedStatementSetter.java |   2 +-
 .../jdbc/core/PreparedStatementCreator.java   |   8 +-
 .../jdbc/core/PreparedStatementSetter.java    |   2 +-
 .../jdbc/core/ResultSetExtractor.java         |   2 +-
 .../jdbc/core/RowCountCallbackHandler.java    |  20 +--
 .../springframework/jdbc/core/RowMapper.java  |   5 +-
 .../jdbc/core/SqlProvider.java                |   6 +-
 .../metadata/CallMetaDataProviderFactory.java |   2 +-
 .../metadata/GenericCallMetaDataProvider.java |   2 +-
 .../GenericTableMetaDataProvider.java         |   4 +-
 .../metadata/HsqlTableMetaDataProvider.java   |   2 +-
 .../metadata/OracleCallMetaDataProvider.java  |   2 +-
 .../metadata/OracleTableMetaDataProvider.java |   8 +-
 .../core/metadata/TableMetaDataProvider.java  |   2 +-
 .../NamedParameterJdbcDaoSupport.java         |   4 +-
 .../core/namedparam/NamedParameterUtils.java  |   4 +-
 .../jdbc/core/namedparam/package-info.java    |   4 +-
 .../jdbc/core/simple/AbstractJdbcInsert.java  |   2 +-
 .../jdbc/core/simple/SimpleJdbcCall.java      |   2 +-
 .../core/simple/SimpleJdbcDaoSupport.java     |   6 +-
 .../simple/SimpleJdbcInsertOperations.java    |   6 +-
 .../core/simple/SimpleJdbcOperations.java     |   2 +-
 .../jdbc/core/simple/SimpleJdbcTemplate.java  |   6 +-
 .../jdbc/core/simple/package-info.java        |  10 +-
 .../jdbc/core/support/SqlLobValue.java        |   2 +-
 .../jdbc/datasource/DataSourceUtils.java      |   2 +-
 .../jdbc/datasource/SmartDataSource.java      |   4 +-
 .../DerbyEmbeddedDatabaseConfigurer.java      |   2 +-
 .../embedded/EmbeddedDatabaseBuilder.java     |   2 +-
 .../embedded/EmbeddedDatabaseConfigurer.java  |   4 +-
 .../embedded/EmbeddedDatabaseType.java        |   4 +-
 .../SimpleDriverDataSourceFactory.java        |  10 +-
 .../datasource/init/DatabasePopulator.java    |   2 +-
 .../lookup/BeanFactoryDataSourceLookup.java   |   4 +-
 .../lookup/JndiDataSourceLookup.java          |   2 +-
 .../lookup/MapDataSourceLookup.java           |   4 +-
 .../jdbc/object/BatchSqlUpdate.java           |   2 +-
 .../jdbc/object/GenericSqlQuery.java          |   8 +-
 .../jdbc/object/GenericStoredProcedure.java   |   6 +-
 .../jdbc/object/RdbmsOperation.java           |  12 +-
 .../jdbc/object/SqlFunction.java              |   4 +-
 .../jdbc/object/SqlOperation.java             |   2 +-
 .../jdbc/object/SqlUpdate.java                |   2 +-
 .../jdbc/object/StoredProcedure.java          |   6 +-
 .../jdbc/object/UpdatableSqlQuery.java        |   8 +-
 .../jdbc/object/package-info.java             |   4 +-
 .../springframework/jdbc/package-info.java    |   2 +-
 .../support/DatabaseMetaDataCallback.java     |  12 +-
 .../jdbc/support/JdbcUtils.java               |   4 +-
 .../jdbc/support/KeyHolder.java               |  12 +-
 .../jdbc/support/SQLErrorCodes.java           |   2 +-
 .../jdbc/support/SQLErrorCodesFactory.java    |   6 +-
 .../SqlServerMaxValueIncrementer.java         |   2 +-
 .../SybaseAnywhereMaxValueIncrementer.java    |   2 +-
 .../SybaseMaxValueIncrementer.java            |   2 +-
 .../support/incrementer/package-info.java     |   2 +-
 .../jdbc/support/lob/package-info.java        |   2 +-
 .../nativejdbc/JBossNativeJdbcExtractor.java  |   2 +-
 .../jdbc/support/nativejdbc/package-info.java |   2 +-
 .../jdbc/support/package-info.java            |   2 +-
 .../rowset/ResultSetWrappingSqlRowSet.java    |  74 ++++----
 .../ResultSetWrappingSqlRowSetMetaData.java   |   4 +-
 .../jdbc/support/xml/XmlResultProvider.java   |   2 +-
 .../beans/INestedTestBean.java                |   6 +-
 .../org/springframework/beans/IOther.java     |   6 +-
 .../springframework/beans/NestedTestBean.java |   6 +-
 .../jdbc/AbstractJdbcTests.java               |   8 +-
 .../InitializeDatabaseIntegrationTests.java   |   8 +-
 .../jdbc/core/JdbcTemplateQueryTests.java     |   2 +-
 .../jdbc/core/JdbcTemplateTests.java          |  36 ++--
 .../namedparam/NamedParameterUtilsTests.java  |   2 +-
 .../core/simple/SimpleJdbcInsertTests.java    |   2 +-
 .../simple/TableMetaDataContextTests.java     |   4 +-
 .../core/support/JdbcDaoSupportTests.java     |   6 +-
 .../jdbc/core/support/LobSupportTests.java    |  50 +++---
 .../jdbc/core/support/SqlLobValueTests.java   | 110 ++++++------
 .../DataSourceTransactionManagerTests.java    |  10 +-
 .../EmbeddedDatabaseFactoryTests.java         |  10 +-
 .../BeanFactoryDataSourceLookupTests.java     |   2 +-
 .../datasource/lookup/StubDataSource.java     |   4 +-
 .../jdbc/object/CustomerMapper.java           |   2 +-
 .../jdbc/object/GenericSqlQueryTests.java     |   2 +-
 .../jdbc/object/RdbmsOperationTests.java      |   4 +-
 .../jdbc/object/SqlQueryTests.java            |   2 +-
 .../jdbc/object/SqlUpdateTests.java           |   2 +-
 .../jdbc/object/StoredProcedureTests.java     |  28 +--
 .../support/CustomErrorCodeException.java     |   6 +-
 .../DataFieldMaxValueIncrementerTests.java    |   6 +-
 .../jdbc/support/DefaultLobHandlerTests.java  |   6 +-
 .../jdbc/support/KeyHolderTests.java          |   8 +-
 ...LErrorCodeSQLExceptionTranslatorTests.java |  16 +-
 .../SQLStateExceptionTranslatorTests.java     |  26 +--
 .../AbstractListenerContainerParser.java      |   8 +-
 .../config/JcaListenerContainerParser.java    |   4 +-
 .../config/JmsListenerContainerParser.java    |  10 +-
 .../jms/config/JmsNamespaceHandler.java       |   6 +-
 .../jms/core/JmsOperations.java               |   2 +-
 .../jms/core/MessageCreator.java              |   4 +-
 .../jms/core/ProducerCallback.java            |   2 +-
 .../jms/core/SessionCallback.java             |   4 +-
 .../jms/core/support/JmsGatewaySupport.java   |  16 +-
 .../DefaultMessageListenerContainer.java      |   4 +-
 .../jms/remoting/package-info.java            |   2 +-
 .../destination/DestinationResolver.java      |   2 +-
 .../beans/INestedTestBean.java                |   6 +-
 .../org/springframework/beans/IOther.java     |   6 +-
 .../springframework/beans/NestedTestBean.java |   6 +-
 .../jms/StubConnectionFactory.java            |   8 +-
 .../jms/config/JmsNamespaceHandlerTests.java  |  26 +--
 .../core/support/JmsGatewaySupportTests.java  |   4 +-
 ...AbstractMessageListenerContainerTests.java |   2 +-
 .../MessageListenerAdapter102Tests.java       |   2 +-
 .../CallCountingTransactionManager.java       |   2 +-
 .../mock/web/MockHttpServletResponse.java     |   6 +-
 .../mock/web/MockHttpSession.java             |   8 +-
 .../orm/hibernate3/HibernateOperations.java   |   2 +-
 .../hibernate3/HibernateQueryException.java   |   6 +-
 .../hibernate3/HibernateSystemException.java  |   6 +-
 .../hibernate3/support/ClobStringType.java    |   6 +-
 .../orm/ibatis/package-info.java              |   2 +-
 .../orm/jdo/JdoSystemException.java           |   8 +-
 .../orm/jdo/JdoUsageException.java            |   6 +-
 .../orm/jpa/EntityManagerFactoryInfo.java     |   4 +-
 .../orm/jpa/EntityManagerFactoryUtils.java    |   4 +-
 .../springframework/orm/jpa/JpaDialect.java   |   2 +-
 .../orm/jpa/JpaSystemException.java           |   2 +-
 .../ClassFileTransformerAdapter.java          |   4 +-
 .../orm/jpa/vendor/Database.java              |   2 +-
 .../vendor/EclipseLinkJpaVendorAdapter.java   |   2 +-
 .../orm/jpa/vendor/TopLinkJpaDialect.java     |   2 +-
 .../beans/INestedTestBean.java                |   6 +-
 .../org/springframework/beans/IOther.java     |   6 +-
 .../springframework/beans/NestedTestBean.java |   6 +-
 .../mock/jndi/SimpleNamingContextBuilder.java |   2 +-
 .../HibernateTransactionManagerTests.java     |   2 +-
 .../support/HibernateDaoSupportTests.java     |   6 +-
 .../support/ScopedBeanInterceptorTests.java   |   2 +-
 .../orm/jdo/JdoInterceptorTests.java          |   6 +-
 .../orm/jdo/support/JdoDaoSupportTests.java   |   6 +-
 .../OpenPersistenceManagerInViewTests.java    |   2 +-
 ...rEntityManagerFactoryIntegrationTests.java |  34 ++--
 ...AbstractEntityManagerFactoryBeanTests.java |   2 +-
 ...nManagedEntityManagerIntegrationTests.java |  46 ++---
 ...rManagedEntityManagerIntegrationTests.java |  42 ++---
 .../orm/jpa/DefaultJpaDialectTests.java       |  10 +-
 .../EntityManagerFactoryBeanSupportTests.java |  12 +-
 .../jpa/EntityManagerFactoryUtilsTests.java   |   8 +-
 .../orm/jpa/JpaInterceptorTests.java          |  12 +-
 .../LocalEntityManagerFactoryBeanTests.java   |  26 +--
 .../orm/jpa/domain/DriversLicense.java        |   8 +-
 .../orm/jpa/domain/Person.java                |   2 +-
 ...eEntityManagerFactoryIntegrationTests.java |   2 +-
 ...oryWithAspectJWeavingIntegrationTests.java |   4 +-
 .../PersistenceXmlParsingTests.java           |   4 +-
 .../orm/jpa/support/JpaDaoSupportTests.java   |   8 +-
 ...kEntityManagerFactoryIntegrationTests.java |   2 +-
 .../test/jpa/AbstractJpaTests.java            |  36 ++--
 .../OrmXmlOverridingShadowingClassLoader.java |   2 +-
 .../oxm/castor/CastorMarshaller.java          |   2 +-
 .../CastorMarshallerBeanDefinitionParser.java |   2 +-
 .../oxm/jaxb/Jaxb2Marshaller.java             |   2 +-
 .../oxm/xmlbeans/XmlBeansMarshaller.java      |   2 +-
 .../oxm/config/OxmNamespaceHandlerTests.java  |   2 +-
 .../oxm/jaxb/Jaxb2MarshallerTests.java        |   6 +-
 .../springframework/oxm/jaxb/Primitives.java  |   2 +-
 .../oxm/jaxb/StandardClasses.java             |   2 +-
 .../oxm/xstream/XStreamMarshallerTests.java   |   4 +-
 .../web/struts/ContextLoaderPlugIn.java       |   2 +-
 .../struts/DelegatingRequestProcessor.java    |   2 +-
 .../DelegatingTilesRequestProcessor.java      |   2 +-
 .../web/struts/SpringBindingActionForm.java   |   2 +-
 .../view/tiles/TestComponentController.java   |   6 +-
 .../result/ContentResultMatchersTests.java    |  18 +-
 .../FlashAttributeResultMatchersTests.java    |   2 +-
 .../mock/env/MockEnvironment.java             |   2 +-
 .../mock/env/package-info.java                |   2 +-
 .../mock/jndi/SimpleNamingContextBuilder.java |   2 +-
 .../mock/jndi/package-info.java               |   2 +-
 .../mock/web/MockExpressionEvaluator.java     |   4 +-
 .../mock/web/MockHttpServletRequest.java      |   2 +-
 .../mock/web/MockHttpServletResponse.java     |  10 +-
 .../mock/web/MockHttpSession.java             |  10 +-
 .../mock/web/package-info.java                |   2 +-
 .../mock/web/portlet/MockPortletConfig.java   |   6 +-
 .../mock/web/portlet/MockPortletContext.java  |   8 +-
 .../mock/web/portlet/MockPortletRequest.java  |   8 +-
 .../mock/web/portlet/MockPortletSession.java  |   2 +-
 .../mock/web/portlet/package-info.java        |   2 +-
 .../springframework/test/AssertThrows.java    |   2 +-
 .../test/annotation/DirtiesContext.java       |   2 +-
 .../test/annotation/ExpectedException.java    |   4 +-
 .../test/annotation/IfProfileValue.java       |   6 +-
 .../test/annotation/NotTransactional.java     |   2 +-
 .../ProfileValueSourceConfiguration.java      |   4 +-
 .../test/annotation/ProfileValueUtils.java    |  12 +-
 .../test/annotation/Repeat.java               |   2 +-
 .../test/annotation/Rollback.java             |   2 +-
 .../test/annotation/Timed.java                |   2 +-
 .../test/context/ActiveProfiles.java          |   8 +-
 .../test/context/ContextConfiguration.java    |  34 ++--
 .../test/context/ContextLoader.java           |   2 +-
 .../test/context/ContextLoaderUtils.java      |  14 +-
 .../context/MergedContextConfiguration.java   |   8 +-
 .../test/context/SmartContextLoader.java      |   2 +-
 .../test/context/TestContext.java             |   2 +-
 .../test/context/TestContextManager.java      |   2 +-
 .../test/context/TestExecutionListener.java   |  12 +-
 .../test/context/TestExecutionListeners.java  |   8 +-
 .../AbstractJUnit38SpringContextTests.java    |  14 +-
 .../AbstractJUnit4SpringContextTests.java     |   2 +-
 ...TransactionalJUnit4SpringContextTests.java |   2 +-
 .../junit4/SpringJUnit4ClassRunner.java       |   2 +-
 .../RunAfterTestClassCallbacks.java           |   4 +-
 .../RunBeforeTestClassCallbacks.java          |   4 +-
 .../RunBeforeTestMethodCallbacks.java         |   4 +-
 .../statements/SpringFailOnTimeout.java       |   4 +-
 .../junit4/statements/SpringRepeat.java       |   4 +-
 .../test/context/package-info.java            |   2 +-
 .../support/AbstractContextLoader.java        |   2 +-
 .../AbstractDelegatingSmartContextLoader.java |  20 +--
 .../AbstractTestExecutionListener.java        |   2 +-
 .../AnnotationConfigContextLoader.java        |   6 +-
 .../support/DelegatingSmartContextLoader.java |   2 +-
 .../DirtiesContextTestExecutionListener.java  |   2 +-
 .../AbstractTestNGSpringContextTests.java     |  16 +-
 .../context/transaction/AfterTransaction.java |   2 +-
 .../transaction/BeforeTransaction.java        |   2 +-
 .../web/AbstractGenericWebContextLoader.java  |   2 +-
 .../web/AnnotationConfigWebContextLoader.java |   6 +-
 .../web/ServletTestExecutionListener.java     |   4 +-
 .../test/context/web/WebAppConfiguration.java |   6 +-
 .../web/WebDelegatingSmartContextLoader.java  |   2 +-
 .../web/WebMergedContextConfiguration.java    |   2 +-
 .../test/jdbc/JdbcTestUtils.java              |   2 +-
 .../test/jpa/AbstractJpaTests.java            |  32 ++--
 .../OrmXmlOverridingShadowingClassLoader.java |   2 +-
 .../test/util/ReflectionTestUtils.java        |  40 ++---
 .../test/web/AbstractModelAndViewTests.java   |   6 +-
 .../test/web/ModelAndViewAssert.java          |  16 +-
 .../org/springframework/beans/Employee.java   |  12 +-
 .../beans/INestedTestBean.java                |   6 +-
 .../org/springframework/beans/IOther.java     |   6 +-
 .../springframework/beans/NestedTestBean.java |   6 +-
 .../org/springframework/beans/TestBean.java   |   2 +-
 ...stractSpr3350SingleSpringContextTests.java |   4 +-
 ...DependencyInjectionSpringContextTests.java |   2 +-
 .../test/Spr3264SingleSpringContextTests.java |   2 +-
 ...alueAnnotationAwareTransactionalTests.java |   2 +-
 .../annotation/ProfileValueUtilsTests.java    |   2 +-
 .../ClassLevelDirtiesContextTests.java        |   4 +-
 .../test/context/ContextLoaderUtilsTests.java |   2 +-
 .../MergedContextConfigurationTests.java      |   4 +-
 .../SpringRunnerContextCacheTests.java        |   6 +-
 .../context/TestContextCacheKeyTests.java     |   4 +-
 .../test/context/TestContextManagerTests.java |   6 +-
 .../context/TestExecutionListenersTests.java  |   2 +-
 ...dingPropertiesAndInheritedLoaderTests.java |   2 +-
 ...ithPropertiesExtendingPropertiesTests.java |   2 +-
 ...ransactionalJUnit38SpringContextTests.java |   2 +-
 .../FailingBeforeAndAfterMethodsTests.java    |   2 +-
 ...ProfileValueJUnit38SpringContextTests.java |   2 +-
 .../RepeatedJUnit38SpringContextTests.java    |   2 +-
 ...athSpringJUnit4ClassRunnerAppCtxTests.java |   2 +-
 ...bstractTransactionalSpringRunnerTests.java |   2 +-
 ...ssLevelTransactionalSpringRunnerTests.java |   2 +-
 ...TransactionalJUnit4SpringContextTests.java |   2 +-
 ...ltContextLoaderClassSpringRunnerTests.java |   2 +-
 .../EnabledAndIgnoredSpringRunnerTests.java   |   2 +-
 .../ExpectedExceptionSpringRunnerTests.java   |   2 +-
 .../FailingBeforeAndAfterMethodsTests.java    |   2 +-
 ...edProfileValueSourceSpringRunnerTests.java |   2 +-
 ...odLevelTransactionalSpringRunnerTests.java |   2 +-
 ...cesSpringJUnit4ClassRunnerAppCtxTests.java |   2 +-
 .../junit4/RepeatedSpringRunnerTests.java     |   2 +-
 .../SpringJUnit47ClassRunnerRuleTests.java    |   2 +-
 .../SpringJUnit4ClassRunnerAppCtxTests.java   |   6 +-
 .../junit4/SpringJUnit4SuiteTests.java        |   6 +-
 .../junit4/TimedSpringRunnerTests.java        |   2 +-
 .../TimedTransactionalSpringRunnerTests.java  |   2 +-
 .../context/junit4/TrackingRunListener.java   |   2 +-
 ...figSpringJUnit4ClassRunnerAppCtxTests.java |   6 +-
 ...ingDefaultConfigClassesInheritedTests.java |   4 +-
 ...ngExplicitConfigClassesInheritedTests.java |   4 +-
 .../DefaultConfigClassesBaseTests.java        |   4 +-
 .../DefaultConfigClassesInheritedTests.java   |   4 +-
 ...ingDefaultConfigClassesInheritedTests.java |   2 +-
 ...ngExplicitConfigClassesInheritedTests.java |   2 +-
 ...ltLoaderDefaultConfigClassesBaseTests.java |   2 +-
 ...derDefaultConfigClassesInheritedTests.java |   2 +-
 ...tLoaderExplicitConfigClassesBaseTests.java |   2 +-
 ...erExplicitConfigClassesInheritedTests.java |   2 +-
 .../ExplicitConfigClassesBaseTests.java       |   4 +-
 .../ExplicitConfigClassesInheritedTests.java  |   4 +-
 .../annotation/PojoAndStringConfig.java       |   4 +-
 .../orm/HibernateSessionFlushingTests.java    |   2 +-
 .../junit4/orm/domain/DriversLicense.java     |   2 +-
 .../context/junit4/orm/domain/Person.java     |   2 +-
 .../orm/repository/PersonRepository.java      |   2 +-
 .../hibernate/HibernatePersonRepository.java  |   2 +-
 .../junit4/orm/service/PersonService.java     |   2 +-
 .../service/impl/StandardPersonService.java   |   2 +-
 .../junit4/spr4868/Jsr250LifecycleTests.java  |   8 +-
 .../spr6128/AutowiredQualifierTests.java      |   2 +-
 ...ransactionalAnnotatedConfigClassTests.java |   2 +-
 .../spr9051/AtBeanLiteModeScopeTests.java     |   2 +-
 .../context/junit4/spr9051/LifecycleBean.java |   2 +-
 ...edConfigClassWithAtConfigurationTests.java |   4 +-
 ...figClassesWithoutAtConfigurationTests.java |  12 +-
 .../AnnotatedFooConfigInnerClassTestCase.java |   2 +-
 .../AnnotationConfigContextLoaderTests.java   |   2 +-
 ...ontextConfigurationInnerClassTestCase.java |   2 +-
 .../DelegatingSmartContextLoaderTests.java    |   2 +-
 .../FinalConfigInnerClassTestCase.java        |   2 +-
 ...pleStaticConfigurationClassesTestCase.java |   2 +-
 .../NonStaticConfigInnerClassesTestCase.java  |   2 +-
 ...ainVanillaFooConfigInnerClassTestCase.java |   2 +-
 .../PrivateConfigInnerClassTestCase.java      |   2 +-
 ...TransactionalTestNGSpringContextTests.java |   4 +-
 ...TransactionalTestNGSpringContextTests.java |   2 +-
 ...TransactionalTestNGSpringContextTests.java |   2 +-
 .../FailingBeforeAndAfterMethodsTests.java    |   2 +-
 ...TransactionalTestNGSpringContextTests.java |   2 +-
 .../web/WebContextLoaderTestSuite.java        |   2 +-
 .../test/jdbc/JdbcTestUtilsTests.java         |   2 +-
 .../test/util/ReflectionTestUtilsTests.java   |   2 +-
 .../test/util/subpackage/LegacyEntity.java    |   2 +-
 .../test/util/subpackage/Person.java          |   2 +-
 .../dao/DataRetrievalFailureException.java    |   2 +-
 ...ectUpdateSemanticsDataAccessException.java |   2 +-
 ...validDataAccessResourceUsageException.java |   4 +-
 .../org/springframework/dao/package-info.java |   4 +-
 ...ChainedPersistenceExceptionTranslator.java |   2 +-
 .../dao/support/DataAccessUtils.java          |   4 +-
 .../PersistenceExceptionTranslator.java       |   2 +-
 .../cci/CannotGetCciConnectionException.java  |   6 +-
 .../cci/InvalidResultSetAccessException.java  |   8 +-
 .../connection/ConnectionFactoryUtils.java    |   2 +-
 .../jca/cci/connection/ConnectionHolder.java  |   6 +-
 .../jca/cci/core/ConnectionCallback.java      |   4 +-
 .../jca/cci/core/InteractionCallback.java     |   4 +-
 .../jca/cci/core/RecordCreator.java           |   6 +-
 .../jca/cci/core/RecordExtractor.java         |   6 +-
 .../jca/cci/core/support/CommAreaRecord.java  |   6 +-
 .../cci/object/MappingCommAreaOperation.java  |   6 +-
 .../cci/object/MappingRecordOperation.java    |   6 +-
 .../transaction/TransactionDefinition.java    |   4 +-
 .../TransactionUsageException.java            |   2 +-
 .../transaction/annotation/Isolation.java     |   6 +-
 .../transaction/annotation/Propagation.java   |   8 +-
 ...MatchAlwaysTransactionAttributeSource.java |   2 +-
 .../MethodMapTransactionAttributeSource.java  |   2 +-
 .../interceptor/NoRollbackRuleAttribute.java  |   6 +-
 .../interceptor/RollbackRuleAttribute.java    |   2 +-
 .../RuleBasedTransactionAttribute.java        |   2 +-
 .../interceptor/TransactionAttribute.java     |   2 +-
 .../TransactionAttributeSourceAdvisor.java    |   2 +-
 .../transaction/interceptor/package-info.java |   4 +-
 .../AbstractPlatformTransactionManager.java   |   2 +-
 .../support/SimpleTransactionStatus.java      |   2 +-
 .../support/TransactionSynchronization.java   |   2 +-
 .../TransactionSynchronizationManager.java    |   2 +-
 .../beans/INestedTestBean.java                |   6 +-
 .../org/springframework/beans/IOther.java     |   6 +-
 .../springframework/beans/NestedTestBean.java |   6 +-
 ...edPersistenceExceptionTranslatorTests.java |  16 +-
 .../jca/cci/CciLocalTransactionTests.java     |  10 +-
 .../jca/cci/CciTemplateTests.java             |   6 +-
 .../jca/cci/EisOperationTests.java            |   8 +-
 .../mock/jndi/SimpleNamingContextBuilder.java |   2 +-
 .../CallCountingTransactionManager.java       |   2 +-
 .../JtaTransactionManagerTests.java           |   2 +-
 .../transaction/TestTransactionManager.java   |   6 +-
 .../transaction/TxNamespaceHandlerTests.java  |   4 +-
 ...tationTransactionAttributeSourceTests.java |  30 ++--
 ...ationTransactionNamespaceHandlerTests.java |   6 +-
 .../AbstractTransactionAspectTests.java       |  46 ++---
 .../BeanFactoryTransactionTests.java          |  24 +--
 .../interceptor/ImplementsNoInterfaces.java   |  14 +-
 .../interceptor/MyRuntimeException.java       |   2 +-
 .../PlatformTransactionManagerFacade.java     |   8 +-
 .../interceptor/RollbackRuleTests.java        |   6 +-
 .../TransactionAttributeEditorTests.java      |   6 +-
 ...ransactionAttributeSourceAdvisorTests.java |  12 +-
 ...TransactionAttributeSourceEditorTests.java |  10 +-
 .../TransactionInterceptorTests.java          |  16 +-
 ...aTransactionManagerSerializationTests.java |   6 +-
 .../client/InterceptingClientHttpRequest.java |   2 +-
 .../caucho/HessianClientInterceptor.java      |   2 +-
 .../remoting/caucho/package-info.java         |   4 +-
 .../remoting/httpinvoker/package-info.java    |   2 +-
 .../jaxrpc/ServletEndpointSupport.java        |   2 +-
 .../bind/MethodArgumentNotValidException.java |   4 +-
 .../web/bind/ServletRequestDataBinder.java    |   2 +-
 .../web/bind/WebDataBinder.java               |  12 +-
 .../web/bind/annotation/RequestPart.java      |  28 +--
 .../support/HandlerMethodInvoker.java         |   2 +-
 .../support/DefaultDataBinderFactory.java     |  14 +-
 .../bind/support/WebDataBinderFactory.java    |  12 +-
 .../web/context/WebApplicationContext.java    |   4 +-
 .../AbstractRequestAttributesScope.java       |   2 +-
 .../web/context/request/FacesWebRequest.java  |   2 +-
 .../context/request/RequestContextHolder.java |   2 +-
 .../context/request/ServletWebRequest.java    |   2 +-
 .../web/context/request/WebRequest.java       |   4 +-
 .../support/ServletContextPropertySource.java |   2 +-
 .../web/filter/CompositeFilter.java           |  12 +-
 .../web/jsf/el/package-info.java              |   2 +-
 .../springframework/web/jsf/package-info.java |   2 +-
 .../web/method/HandlerMethodSelector.java     |   8 +-
 ...ractCookieValueMethodArgumentResolver.java |  18 +-
 ...ExpressionValueMethodArgumentResolver.java |  16 +-
 .../InitBinderDataBinderFactory.java          |   8 +-
 .../web/method/annotation/ModelFactory.java   |  62 +++----
 .../RequestHeaderMethodArgumentResolver.java  |  16 +-
 .../HandlerMethodArgumentResolver.java        |  26 +--
 .../HandlerMethodReturnValueHandler.java      |  22 +--
 .../multipart/support/MultipartFilter.java    |   2 +-
 .../RequestPartServletServerHttpRequest.java  |   8 +-
 .../support/StringMultipartFileEditor.java    |   2 +-
 .../springframework/web/util/TagUtils.java    |   6 +-
 .../springframework/web/util/UriUtils.java    |   8 +-
 .../beans/INestedTestBean.java                |   6 +-
 .../org/springframework/beans/IOther.java     |   6 +-
 .../springframework/beans/NestedTestBean.java |   6 +-
 .../org/springframework/beans/Person.java     |   6 +-
 .../beans/SerializablePerson.java             |   6 +-
 .../converter/HttpMessageConverterTests.java  |   2 +-
 .../StringHttpMessageConverterTests.java      |   2 +-
 ...b2RootElementHttpMessageConverterTest.java |   4 +-
 .../xml/SourceHttpMessageConverterTests.java  |   2 +-
 .../mock/web/test/MockHttpSession.java        |  10 +-
 .../RequestAndSessionScopedBeanTests.java     |   2 +-
 .../web/filter/RequestContextFilterTests.java |   8 +-
 ...ookieValueMethodArgumentResolverTests.java |   8 +-
 ...orsMethodHandlerArgumentResolverTests.java |   8 +-
 .../ExceptionHandlerMethodResolverTests.java  |  10 +-
 ...ssionValueMethodArgumentResolverTests.java |  12 +-
 .../InitBinderDataBinderFactoryTests.java     |  34 ++--
 .../annotation/MapMethodProcessorTests.java   |  16 +-
 .../method/annotation/ModelFactoryTests.java  |  38 ++--
 .../annotation/ModelMethodProcessorTests.java |  20 +--
 ...tHeaderMapMethodArgumentResolverTests.java |   8 +-
 ...uestHeaderMethodArgumentResolverTests.java |   4 +-
 ...stParamMapMethodArgumentResolverTests.java |   8 +-
 ...questParamMethodArgumentResolverTests.java |  10 +-
 .../WebArgumentResolverAdapterTests.java      |   6 +-
 ...rMethodArgumentResolverCompositeTests.java |  14 +-
 ...ethodReturnValueHandlerCompositeTests.java |  22 +--
 .../support/ModelAndViewContainerTests.java   |  18 +-
 .../method/support/StubArgumentResolver.java  |   4 +-
 .../support/StubReturnValueHandler.java       |   8 +-
 ...uestPartServletServerHttpRequestTests.java |  10 +-
 .../web/util/Log4jWebConfigurerTests.java     |   6 +-
 .../web/util/MockLog4jAppender.java           |   6 +-
 .../web/util/TagUtilsTests.java               |   6 +-
 .../web/util/UriComponentsTests.java          |   4 +-
 .../web/util/UriTemplateTests.java            |   4 +-
 .../web/util/UriUtilsTests.java               |   2 +-
 .../web/portlet/FrameworkPortlet.java         |   4 +-
 .../web/portlet/GenericPortletBean.java       |   8 +-
 .../web/portlet/HandlerAdapter.java           |   4 +-
 .../web/portlet/HandlerMapping.java           |   2 +-
 .../ModelAndViewDefiningException.java        |   6 +-
 .../PortletApplicationContextUtils.java       |   2 +-
 .../PortletApplicationObjectSupport.java      |   6 +-
 .../portlet/context/PortletConfigAware.java   |   6 +-
 .../portlet/context/PortletContextAware.java  |   6 +-
 .../context/PortletContextAwareProcessor.java |   2 +-
 .../portlet/context/PortletWebRequest.java    |   2 +-
 .../StaticPortletApplicationContext.java      |   2 +-
 .../handler/ParameterMappingInterceptor.java  |   2 +-
 .../handler/PortletContentGenerator.java      |   4 +-
 .../handler/SimplePortletHandlerAdapter.java  |   2 +-
 .../DefaultMultipartActionRequest.java        |   2 +-
 .../multipart/PortletMultipartResolver.java   |   6 +-
 .../web/portlet/mvc/AbstractController.java   |   2 +-
 .../portlet/mvc/AbstractFormController.java   |   6 +-
 .../mvc/AbstractWizardFormController.java     |   6 +-
 .../portlet/mvc/BaseCommandController.java    |  24 +--
 .../web/portlet/mvc/Controller.java           |   6 +-
 .../mvc/ParameterizableViewController.java    |   2 +-
 .../web/portlet/util/PortletUtils.java        |   6 +-
 .../beans/INestedTestBean.java                |   6 +-
 .../org/springframework/beans/IOther.java     |   6 +-
 .../springframework/beans/NestedTestBean.java |   6 +-
 .../beans/factory/MustBeInitialized.java      |   6 +-
 .../springframework/context/ACATester.java    |   8 +-
 .../AbstractApplicationContextTests.java      |   6 +-
 .../context/LifecycleContextBean.java         |  12 +-
 .../mock/web/MockHttpServletResponse.java     |  10 +-
 .../mock/web/MockHttpSession.java             |  10 +-
 .../mock/web/portlet/MockPortletConfig.java   |   6 +-
 .../mock/web/portlet/MockPortletContext.java  |   8 +-
 .../ComplexPortletApplicationContext.java     |  34 ++--
 .../web/portlet/GenericPortletBeanTests.java  |  16 +-
 .../SimplePortletApplicationContext.java      |   4 +-
 ...etRequestParameterPropertyValuesTests.java |   6 +-
 .../bind/PortletRequestUtilsTests.java        |   2 +-
 ...AbstractXmlWebApplicationContextTests.java |   6 +-
 .../context/PortletConfigAwareBean.java       |   4 +-
 .../context/PortletContextAwareBean.java      |   6 +-
 .../PortletContextAwareProcessorTests.java    |  32 ++--
 .../XmlPortletApplicationContextTests.java    |  10 +-
 .../handler/ParameterHandlerMappingTests.java |  30 ++--
 .../ParameterMappingInterceptorTests.java     |  10 +-
 .../PortletModeHandlerMappingTests.java       |  26 +--
 ...rtletModeParameterHandlerMappingTests.java |  28 +--
 .../SimpleMappingExceptionResolverTests.java  |  42 ++---
 ...UserRoleAuthorizationInterceptorTests.java |   2 +-
 .../portlet/mvc/CommandControllerTests.java   |  54 +++---
 .../ParameterizableViewControllerTests.java   |   4 +-
 .../PortletModeNameViewControllerTests.java   |   8 +-
 .../web/servlet/HandlerAdapter.java           |   6 +-
 .../web/servlet/HttpServletBean.java          |   4 +-
 .../ModelAndViewDefiningException.java        |   6 +-
 .../web/servlet/ResourceServlet.java          |   2 +-
 .../web/servlet/SmartView.java                |   4 +-
 .../web/servlet/ThemeResolver.java            |   6 +-
 .../web/servlet/ViewResolver.java             |   4 +-
 ...ultServletHandlerBeanDefinitionParser.java |  24 +--
 .../servlet/config/MvcNamespaceHandler.java   |   2 +-
 .../web/servlet/config/MvcNamespaceUtils.java |  16 +-
 .../ViewControllerBeanDefinitionParser.java   |  10 +-
 .../DefaultServletHandlerConfigurer.java      |  10 +-
 .../config/annotation/EnableWebMvc.java       |  16 +-
 .../ResourceHandlerRegistration.java          |  16 +-
 .../annotation/ResourceHandlerRegistry.java   |  12 +-
 .../ViewControllerRegistration.java           |  12 +-
 .../annotation/ViewControllerRegistry.java    |  16 +-
 .../ConversionServiceExposingInterceptor.java |   2 +-
 .../HandlerExceptionResolverComposite.java    |   4 +-
 .../handler/SimpleServletHandlerAdapter.java  |   2 +-
 .../handler/SimpleUrlHandlerMapping.java      |   2 +-
 .../i18n/AcceptHeaderLocaleResolver.java      |   2 +-
 .../servlet/i18n/SessionLocaleResolver.java   |   2 +-
 .../web/servlet/mvc/AbstractController.java   |   4 +-
 .../servlet/mvc/AbstractFormController.java   |   2 +-
 .../servlet/mvc/BaseCommandController.java    |   4 +-
 .../mvc/ParameterizableViewController.java    |   2 +-
 .../mvc/ServletForwardingController.java      |   2 +-
 .../mvc/UrlFilenameViewController.java        |   2 +-
 .../AbstractNameValueExpression.java          |   6 +-
 .../condition/AbstractRequestCondition.java   |  10 +-
 .../condition/HeadersRequestCondition.java    |  40 ++---
 .../mvc/condition/MediaTypeExpression.java    |   6 +-
 .../mvc/condition/NameValueExpression.java    |   4 +-
 .../mvc/condition/ParamsRequestCondition.java |  28 +--
 .../mvc/condition/RequestCondition.java       |   2 +-
 .../method/AbstractHandlerMethodAdapter.java  |   8 +-
 .../mvc/method/RequestMappingInfo.java        |  34 ++--
 ...dViewResolverMethodReturnValueHandler.java |   6 +-
 .../RequestMappingHandlerMapping.java         |   2 +-
 ...vletCookieValueMethodArgumentResolver.java |   2 +-
 .../ServletModelAttributeMethodProcessor.java |   4 +-
 .../ServletRequestMethodArgumentResolver.java |   6 +-
 ...ServletResponseMethodArgumentResolver.java |   2 +-
 .../ServletWebArgumentResolverAdapter.java    |   8 +-
 .../mvc/multiaction/MethodNameResolver.java   |   2 +-
 .../ParameterMethodNameResolver.java          |  14 +-
 .../PropertiesMethodNameResolver.java         |   2 +-
 .../servlet/mvc/multiaction/package-info.java |   8 +-
 .../web/servlet/mvc/package-info.java         |   6 +-
 .../mvc/support/RedirectAttributes.java       |  32 ++--
 .../support/RedirectAttributesModelMap.java   |  12 +-
 .../web/servlet/package-info.java             |   2 +-
 .../web/servlet/support/RequestContext.java   |   2 +-
 .../servlet/support/RequestContextUtils.java  |   4 +-
 .../support/RequestDataValueProcessor.java    |  12 +-
 .../web/servlet/support/package-info.java     |   2 +-
 .../web/servlet/tags/EvalTag.java             |   4 +-
 .../web/servlet/tags/HtmlEscapeTag.java       |   6 +-
 .../web/servlet/tags/MessageTag.java          |   8 +-
 .../web/servlet/tags/Param.java               |  14 +-
 .../web/servlet/tags/ParamTag.java            |  18 +-
 .../servlet/tags/RequestContextAwareTag.java  |   4 +-
 .../web/servlet/tags/UrlTag.java              |  34 ++--
 .../tags/form/AbstractCheckedElementTag.java  |   2 +-
 .../tags/form/AbstractHtmlElementBodyTag.java |   2 +-
 .../tags/form/AbstractHtmlElementTag.java     |  24 +--
 .../form/AbstractHtmlInputElementTag.java     |   2 +-
 .../form/AbstractMultiCheckedElementTag.java  |   6 +-
 .../web/servlet/tags/form/ButtonTag.java      |  10 +-
 .../web/servlet/tags/form/HiddenInputTag.java |   2 +-
 .../web/servlet/tags/form/InputTag.java       |   6 +-
 .../web/servlet/tags/form/LabelTag.java       |   2 +-
 .../web/servlet/tags/form/OptionTag.java      |  16 +-
 .../web/servlet/tags/form/OptionWriter.java   |  10 +-
 .../web/servlet/tags/form/OptionsTag.java     |  12 +-
 .../web/servlet/tags/form/RadioButtonTag.java |   2 +-
 .../web/servlet/tags/form/SelectTag.java      |   2 +-
 .../tags/form/SelectedValueComparator.java    |   6 +-
 .../servlet/theme/CookieThemeResolver.java    |   6 +-
 .../servlet/theme/SessionThemeResolver.java   |   6 +-
 .../web/servlet/theme/package-info.java       |   8 +-
 .../view/AbstractCachingViewResolver.java     |   4 +-
 .../web/servlet/view/RedirectView.java        |  42 ++---
 .../view/ResourceBundleViewResolver.java      |   4 +-
 .../servlet/view/UrlBasedViewResolver.java    |   6 +-
 .../view/document/AbstractJExcelView.java     |  20 +--
 .../view/document/AbstractPdfView.java        |   2 +-
 .../JasperReportsViewResolver.java            |   2 +-
 .../web/servlet/view/package-info.java        |   2 +-
 .../servlet/view/velocity/VelocityConfig.java |   8 +-
 .../servlet/view/xslt/AbstractXsltView.java   |   4 +-
 .../beans/INestedTestBean.java                |   6 +-
 .../org/springframework/beans/IOther.java     |   6 +-
 .../springframework/beans/NestedTestBean.java |   6 +-
 .../org/springframework/beans/Person.java     |   6 +-
 .../beans/SerializablePerson.java             |   6 +-
 .../beans/factory/MustBeInitialized.java      |   6 +-
 .../beans/factory/access/TestBean.java        |   8 +-
 .../springframework/context/ACATester.java    |   8 +-
 .../context/LifecycleContextBean.java         |  12 +-
 .../XmlWebApplicationContextTests.java        |   8 +-
 .../WebApplicationObjectSupportTests.java     |   6 +-
 .../web/servlet/FlashMapTests.java            |  16 +-
 .../servlet/SimpleWebApplicationContext.java  |   6 +-
 ...tationDrivenBeanDefinitionParserTests.java |   4 +-
 .../ResourceHandlerRegistryTests.java         |   2 +-
 .../ViewControllerRegistryTests.java          |   2 +-
 .../BeanNameUrlHandlerMappingTests.java       |   6 +-
 .../web/servlet/i18n/LocaleResolverTests.java |   6 +-
 .../servlet/mvc/CommandControllerTests.java   |  12 +-
 .../ParameterizableViewControllerTests.java   |   4 +-
 .../mvc/WebContentInterceptorTests.java       |   2 +-
 .../ServletAnnotationControllerTests.java     |  14 +-
 .../ServletAnnotationMappingUtilsTests.java   |  10 +-
 .../servlet/mvc/annotation/Spr7766Tests.java  |   2 +-
 .../servlet/mvc/annotation/Spr7839Tests.java  |  24 +--
 .../HeadersRequestConditionTests.java         |   2 +-
 .../mvc/method/RequestMappingInfoTests.java   | 144 +++++++--------
 ...ResolverMethodReturnValueHandlerTests.java |  16 +-
 ...thVariableMethodArgumentResolverTests.java |  20 +--
 ...equestPartMethodArgumentResolverTests.java |  36 ++--
 ...vetModelAttributeMethodProcessorTests.java |  40 ++---
 ...ookieValueMethodArgumentResolverTests.java |   4 +-
 ...letRequestMethodArgumentResolverTests.java |   8 +-
 ...etResponseMethodArgumentResolverTests.java |   2 +-
 ...ntsBuilderMethodArgumentResolverTests.java |  14 +-
 .../ViewMethodReturnValueHandlerTests.java    |  10 +-
 ...ViewNameMethodReturnValueHandlerTests.java |  12 +-
 .../RedirectAttributesModelMapTests.java      |  36 ++--
 .../servlet/support/RequestContextTests.java  |   6 +-
 .../RequestDataValueProcessorWrapper.java     |   2 +-
 .../ServletUriComponentsBuilderTests.java     |  18 +-
 .../web/servlet/tags/EvalTagTests.java        |   8 +-
 ...ssageTagOutsideDispatcherServletTests.java |   6 +-
 .../web/servlet/tags/MessageTagTests.java     |  12 +-
 .../web/servlet/tags/ParamTagTests.java       |   8 +-
 .../web/servlet/tags/ParamTests.java          |   8 +-
 .../web/servlet/tags/ThemeTagTests.java       |   6 +-
 .../web/servlet/tags/UrlTagTests.java         |   8 +-
 .../form/AbstractHtmlElementTagTests.java     |   2 +-
 .../web/servlet/tags/form/ButtonTagTests.java |  12 +-
 .../servlet/tags/form/CheckboxTagTests.java   |  10 +-
 .../servlet/tags/form/CheckboxesTagTests.java |  28 +--
 .../web/servlet/tags/form/ErrorsTagTests.java |   4 +-
 .../web/servlet/tags/form/FormTagTests.java   |  64 +++----
 .../tags/form/HiddenInputTagTests.java        |  10 +-
 .../web/servlet/tags/form/InputTagTests.java  |   6 +-
 .../web/servlet/tags/form/LabelTagTests.java  |   6 +-
 .../servlet/tags/form/OptionTagEnumTests.java |   4 +-
 .../web/servlet/tags/form/OptionTagTests.java |   8 +-
 .../servlet/tags/form/OptionsTagTests.java    |  24 +--
 .../tags/form/RadioButtonTagTests.java        |   8 +-
 .../tags/form/RadioButtonsTagTests.java       |  18 +-
 .../web/servlet/tags/form/SelectTagTests.java |   6 +-
 .../web/servlet/tags/form/TestTypes.java      |   4 +-
 .../servlet/tags/form/TextareaTagTests.java   |   6 +-
 .../web/servlet/theme/ThemeResolverTests.java |   6 +-
 .../web/servlet/view/BaseViewTests.java       |  68 ++++----
 .../view/InternalResourceViewTests.java       |   2 +-
 .../web/servlet/view/RedirectViewTests.java   |  20 +--
 .../view/RedirectViewUriTemplateTests.java    |  12 +-
 ...esourceBundleViewResolverNoCacheTests.java |   8 +-
 .../view/ResourceBundleViewResolverTests.java |   4 +-
 .../web/servlet/view/ViewResolverTests.java   |  10 +-
 .../servlet/view/document/ExcelViewTests.java |  12 +-
 ...rableJasperReportsViewWithStreamTests.java |   1 -
 ...rableJasperReportsViewWithWriterTests.java |   2 +-
 .../view/velocity/VelocityViewTests.java      |   8 +-
 .../servlet/view/xslt/TestXsltViewTests.java  |   4 +-
 ...NamespaceHandlerScopeIntegrationTests.java |   6 +-
 ...visorAutoProxyCreatorIntegrationTests.java |  28 +--
 .../ltw/ComponentScanningWithLTWTests.java    |   4 +-
 ...efinitionScannerScopeIntegrationTests.java |   6 +-
 .../expression/spel/support/Spr7538Tests.java |  18 +-
 .../CallCountingTransactionManager.java       |   2 +-
 .../advice/CountingAfterReturningAdvice.java  |   6 +-
 .../test/advice/CountingBeforeAdvice.java     |   6 +-
 src/test/java/test/advice/MethodCounter.java  |   2 +-
 src/test/java/test/beans/INestedTestBean.java |   8 +-
 src/test/java/test/beans/IOther.java          |   8 +-
 src/test/java/test/beans/ITestBean.java       |   2 +-
 src/test/java/test/beans/NestedTestBean.java  |   6 +-
 .../java/test/interceptor/NopInterceptor.java |  12 +-
 .../SerializableNopInterceptor.java           |  16 +-
 .../test/util/SerializationTestUtils.java     |   6 +-
 1400 files changed, 5920 insertions(+), 5923 deletions(-)

diff --git a/gradle/jdiff/Null.java b/gradle/jdiff/Null.java
index 019b71895d..2d8649e544 100644
--- a/gradle/jdiff/Null.java
+++ b/gradle/jdiff/Null.java
@@ -1,6 +1,6 @@
-/** 
+/**
  * This class is used only as a "null" argument for Javadoc when comparing
- * two API files. Javadoc has to have a package, .java or .class file as an 
+ * two API files. Javadoc has to have a package, .java or .class file as an
  * argument, even though JDiff doesn't use it.
  */
 public class Null {
diff --git a/spring-aop/src/main/java/org/springframework/aop/Advisor.java b/spring-aop/src/main/java/org/springframework/aop/Advisor.java
index 21c9c8301b..ff4e1745d8 100644
--- a/spring-aop/src/main/java/org/springframework/aop/Advisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/Advisor.java
@@ -18,14 +18,14 @@ package org.springframework.aop;
 
 import org.aopalliance.aop.Advice;
 
-/** 
+/**
  * Base interface holding AOP <b>advice</b> (action to take at a joinpoint)
- * and a filter determining the applicability of the advice (such as 
+ * and a filter determining the applicability of the advice (such as
  * a pointcut). <i>This interface is not for use by Spring users, but to
  * allow for commonality in support for different types of advice.</i>
  *
  * <p>Spring AOP is based around <b>around advice</b> delivered via method
- * <b>interception</b>, compliant with the AOP Alliance interception API. 
+ * <b>interception</b>, compliant with the AOP Alliance interception API.
  * The Advisor interface allows support for different types of advice,
  * such as <b>before</b> and <b>after</b> advice, which need not be
  * implemented using interception.
diff --git a/spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java b/spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java
index 4fcd874cb0..37f9cb7500 100644
--- a/spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java
@@ -18,7 +18,7 @@ package org.springframework.aop;
 
 import org.aopalliance.aop.Advice;
 
-/** 
+/**
  * Subinterface of AOP Alliance Advice that allows additional interfaces
  * to be implemented by an Advice, and available via a proxy using that
  * interceptor. This is a fundamental AOP concept called <b>introduction</b>.
@@ -37,7 +37,7 @@ import org.aopalliance.aop.Advice;
  * @see IntroductionAdvisor
  */
 public interface DynamicIntroductionAdvice extends Advice {
-	
+
 	/**
 	 * Does this introduction advice implement the given interface?
 	 * @param intf the interface to check
diff --git a/spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java
index 9e71253ef0..aa49595d51 100644
--- a/spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java
@@ -30,7 +30,7 @@ package org.springframework.aop;
  * @see IntroductionInterceptor
  */
 public interface IntroductionAdvisor extends Advisor, IntroductionInfo {
-	
+
 	/**
 	 * Return the filter determining which target classes this introduction
 	 * should apply to.
@@ -39,7 +39,7 @@ public interface IntroductionAdvisor extends Advisor, IntroductionInfo {
 	 * @return the class filter
 	 */
 	ClassFilter getClassFilter();
-	
+
 	/**
 	 * Can the advised interfaces be implemented by the introduction advice?
 	 * Invoked before adding an IntroductionAdvisor.
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 c10e63c81d..36ac7ea99b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java
+++ b/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java
@@ -29,7 +29,7 @@ package org.springframework.aop;
  * @since 1.1.1
  */
 public interface IntroductionInfo {
-	
+
 	/**
 	 * Return the additional interfaces introduced by this Advisor or Advice.
 	 * @return the introduced interfaces
diff --git a/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java b/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java
index 9383af683c..63ee9c9dff 100644
--- a/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -28,7 +28,7 @@ import java.lang.reflect.Method;
  * @author Rod Johnson
  */
 public interface MethodBeforeAdvice extends BeforeAdvice {
-	
+
 	/**
 	 * Callback before a given method is invoked.
 	 * @param method method being invoked
diff --git a/spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java
index 02818d12e7..6fb4d88497 100644
--- a/spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
index 0b8c228a4a..4cf96a3fca 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
@@ -24,9 +24,9 @@ import java.io.Serializable;
  * @author Rod Johnson
  */
 class TrueClassFilter implements ClassFilter, Serializable {
-	
+
 	public static final TrueClassFilter INSTANCE = new TrueClassFilter();
-	
+
 	/**
 	 * Enforce Singleton pattern.
 	 */
@@ -36,7 +36,7 @@ class TrueClassFilter implements ClassFilter, Serializable {
 	public boolean matches(Class clazz) {
 		return true;
 	}
-	
+
 	/**
 	 * Required to support serialization. Replaces with canonical
 	 * instance on deserialization, protecting Singleton pattern.
diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
index 7be4d470a2..53e50f3c83 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
@@ -25,9 +25,9 @@ import java.lang.reflect.Method;
  * @author Rod Johnson
  */
 class TrueMethodMatcher implements MethodMatcher, Serializable {
-	
+
 	public static final TrueMethodMatcher INSTANCE = new TrueMethodMatcher();
-	
+
 	/**
 	 * Enforce Singleton pattern.
 	 */
@@ -46,7 +46,7 @@ class TrueMethodMatcher implements MethodMatcher, Serializable {
 		// Should never be invoked as isRuntime returns false.
 		throw new UnsupportedOperationException();
 	}
-	
+
 	/**
 	 * Required to support serialization. Replaces with canonical
 	 * instance on deserialization, protecting Singleton pattern.
@@ -55,7 +55,7 @@ class TrueMethodMatcher implements MethodMatcher, Serializable {
 	private Object readResolve() {
 		return INSTANCE;
 	}
-	
+
 	@Override
 	public String toString() {
 		return "MethodMatcher.TRUE";
diff --git a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
index 0c6efcb70e..87365aa1ef 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
@@ -24,9 +24,9 @@ import java.io.Serializable;
  * @author Rod Johnson
  */
 class TruePointcut implements Pointcut, Serializable {
-	
+
 	public static final TruePointcut INSTANCE = new TruePointcut();
-	
+
 	/**
 	 * Enforce Singleton pattern.
 	 */
@@ -40,7 +40,7 @@ class TruePointcut implements Pointcut, Serializable {
 	public MethodMatcher getMethodMatcher() {
 		return MethodMatcher.TRUE;
 	}
-	
+
 	/**
 	 * Required to support serialization. Replaces with canonical
 	 * instance on deserialization, protecting Singleton pattern.
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 9cc93f3d28..734f4befb6 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
@@ -211,7 +211,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 	public void setAspectName(String name) {
 		this.aspectName = name;
 	}
-	
+
 	public String getAspectName() {
 		return this.aspectName;
 	}
@@ -268,7 +268,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		throw new UnsupportedOperationException("Only afterReturning advice can be used to bind a return value");
 	}
 
-	/** 
+	/**
 	 * We need to hold the returning name at this level for argument binding calculations,
 	 * this method allows the afterReturning advice subclass to set the name.
 	 */
@@ -302,7 +302,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		throw new UnsupportedOperationException("Only afterThrowing advice can be used to bind a thrown exception");
 	}
 
-	/** 
+	/**
 	 * We need to hold the throwing name at this level for argument binding calculations,
 	 * this method allows the afterThrowing advice subclass to set the name.
 	 */
@@ -365,11 +365,11 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		Class[] parameterTypes = this.aspectJAdviceMethod.getParameterTypes();
 		if (maybeBindJoinPoint(parameterTypes[0]) || maybeBindProceedingJoinPoint(parameterTypes[0])) {
 			numUnboundArgs--;
-		} 
+		}
 		else if (maybeBindJoinPointStaticPart(parameterTypes[0])) {
 			numUnboundArgs--;
 		}
-			
+
 		if (numUnboundArgs > 0) {
 			// need to bind arguments by name as returned from the pointcut match
 			bindArgumentsByName(numUnboundArgs);
@@ -398,7 +398,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		}
 		else {
 			return false;
-		}		
+		}
 	}
 
 	protected boolean supportsProceedingJoinPoint() {
@@ -409,7 +409,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		if (candidateParameterType.equals(JoinPoint.StaticPart.class)) {
 			this.joinPointStaticPartArgumentIndex = 0;
 			return true;
-		} 
+		}
 		else {
 			return false;
 		}
@@ -422,7 +422,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		if (this.argumentNames != null) {
 			// We have been able to determine the arg names.
 			bindExplicitArguments(numArgumentsExpectingToBind);
-		} 
+		}
 		else {
 			throw new IllegalStateException("Advice method [" + this.aspectJAdviceMethod.getName() + "] " +
 					"requires " + numArgumentsExpectingToBind + " arguments to be bound by name, but " +
@@ -471,9 +471,9 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		// specified, and find the discovered argument types.
 		if (this.returningName != null) {
 			if (!this.argumentBindings.containsKey(this.returningName)) {
-				throw new IllegalStateException("Returning argument name '" 
+				throw new IllegalStateException("Returning argument name '"
 						+ this.returningName + "' was not bound in advice arguments");
-			} 
+			}
 			else {
 				Integer index = this.argumentBindings.get(this.returningName);
 				this.discoveredReturningType = this.aspectJAdviceMethod.getParameterTypes()[index];
@@ -482,9 +482,9 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		}
 		if (this.throwingName != null) {
 			if (!this.argumentBindings.containsKey(this.throwingName)) {
-				throw new IllegalStateException("Throwing argument name '" 
+				throw new IllegalStateException("Throwing argument name '"
 						+ this.throwingName + "' was not bound in advice arguments");
-			} 
+			}
 			else {
 				Integer index = this.argumentBindings.get(this.throwingName);
 				this.discoveredThrowingType = this.aspectJAdviceMethod.getParameterTypes()[index];
@@ -525,7 +525,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 			pointcutParameterTypes[index] = methodParameterTypes[i];
 			index++;
 		}
-		
+
 		this.pointcut.setParameterNames(pointcutParameterNames);
 		this.pointcut.setParameterTypes(pointcutParameterTypes);
 	}
@@ -549,7 +549,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		if (this.joinPointArgumentIndex != -1) {
 			adviceInvocationArgs[this.joinPointArgumentIndex] = jp;
 			numBound++;
-		} 
+		}
 		else if (this.joinPointStaticPartArgumentIndex != -1) {
 			adviceInvocationArgs[this.joinPointStaticPartArgumentIndex] = jp.getStaticPart();
 			numBound++;
@@ -582,8 +582,8 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 
 		if (numBound != this.adviceInvocationArgumentCount) {
 			throw new IllegalStateException("Required to bind " + this.adviceInvocationArgumentCount
-					+ " arguments, but only bound " + numBound + " (JoinPointMatch " + 
-					(jpMatch == null ? "was NOT" : "WAS") + 
+					+ " arguments, but only bound " + numBound + " (JoinPointMatch " +
+					(jpMatch == null ? "was NOT" : "WAS") +
 					" bound in invocation)");
 		}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java
index 148f71ce5d..7f869ed80d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java
@@ -36,7 +36,7 @@ public class AspectJAfterAdvice extends AbstractAspectJAdvice implements MethodI
 
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
-	
+
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();
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 348b8449c3..f3334ea569 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
@@ -259,7 +259,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 						ex);
 				return false;
 			}
-		} 
+		}
 		catch (BCException ex) {
 			logger.debug("PointcutExpression matching rejected target class", ex);
 			return false;
@@ -554,7 +554,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 			String advisedBeanName = getCurrentProxiedBeanName();
 			if (advisedBeanName == null) {  // no proxy creation in progress
 				// abstain; can't return YES, since that will make pointcut with negation fail
-				return FuzzyBoolean.MAYBE; 
+				return FuzzyBoolean.MAYBE;
 			}
 			if (BeanFactoryUtils.isGeneratedBeanName(advisedBeanName)) {
 				return FuzzyBoolean.NO;
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 001b161fe4..d17bbce30b 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
@@ -21,7 +21,7 @@ import org.springframework.aop.support.AbstractGenericPointcutAdvisor;
 
 /**
  * Spring AOP Advisor that can be used for any AspectJ pointcut expression.
- * 
+ *
  * @author Rob Harrop
  * @since 2.0
  */
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
index 5c92ae6b4d..8b39665a05 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
@@ -30,7 +30,7 @@ import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
  * @since 2.0
  */
 public abstract class AspectJProxyUtils {
-	
+
 	/**
 	 * Add special advisors if necessary to work with a proxy chain that contains AspectJ advisors.
 	 * This will expose the current Spring AOP invocation (necessary for some AspectJ pointcut matching)
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 8932259dc3..5732ae1451 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
@@ -27,7 +27,7 @@ import org.aspectj.bridge.IMessageHandler;
  * Implementation of AspectJ's {@link IMessageHandler} interface that
  * routes AspectJ weaving messages through the same logging system as the
  * regular Spring messages.
- * 
+ *
  * <p>Pass the option...
  *
  * <p><code class="code">-XmessageHandlerClass:org.springframework.aop.aspectj.AspectJWeaverMessageHandler</code>
@@ -44,9 +44,9 @@ import org.aspectj.bridge.IMessageHandler;
 public class AspectJWeaverMessageHandler implements IMessageHandler {
 
 	private static final String AJ_ID = "[AspectJ] ";
-	
+
 	private static final Log LOGGER = LogFactory.getLog("AspectJ Weaver");
-	
+
 
 	public boolean handleMessage(IMessage message) throws AbortException {
 		Kind messageKind = message.getKind();
@@ -56,39 +56,39 @@ public class AspectJWeaverMessageHandler implements IMessageHandler {
 				LOGGER.debug(makeMessageFor(message));
 				return true;
 			}
-		} 
-		
+		}
+
 		if (LOGGER.isInfoEnabled()) {
 			if ((messageKind == IMessage.INFO) || (messageKind == IMessage.WEAVEINFO)) {
 				LOGGER.info(makeMessageFor(message));
 				return true;
 			}
-		} 
-		
+		}
+
 		if (LOGGER.isWarnEnabled()) {
 			if (messageKind == IMessage.WARNING) {
 				LOGGER.warn(makeMessageFor(message));
 				return true;
 			}
 		}
-		
+
 		if (LOGGER.isErrorEnabled()) {
 			if (messageKind == IMessage.ERROR) {
 				LOGGER.error(makeMessageFor(message));
 				return true;
 			}
 		}
-		
+
 		if (LOGGER.isFatalEnabled()) {
 			if (messageKind == IMessage.ABORT) {
 				LOGGER.fatal(makeMessageFor(message));
 				return true;
 			}
 		}
-		
+
 		return false;
 	}
-	
+
 	private String makeMessageFor(IMessage aMessage) {
 		return AJ_ID + aMessage.getMessage();
 	}
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 a60227a5df..3838c7bda6 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
@@ -48,7 +48,7 @@ public class DeclareParentsAdvisor implements IntroductionAdvisor {
 	 * @param defaultImpl the default implementation class
 	 */
 	public DeclareParentsAdvisor(Class interfaceType, String typePattern, Class defaultImpl) {
-		this(interfaceType, typePattern, defaultImpl, 
+		this(interfaceType, typePattern, defaultImpl,
 			 new DelegatePerTargetObjectIntroductionInterceptor(defaultImpl, interfaceType));
 	}
 
@@ -59,7 +59,7 @@ public class DeclareParentsAdvisor implements IntroductionAdvisor {
 	 * @param delegateRef the delegate implementation object
 	 */
 	public DeclareParentsAdvisor(Class interfaceType, String typePattern, Object delegateRef) {
-		this(interfaceType, typePattern, delegateRef.getClass(), 
+		this(interfaceType, typePattern, delegateRef.getClass(),
 			 new DelegatingIntroductionInterceptor(delegateRef));
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
index 6668a8b015..b718359ff9 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
@@ -50,7 +50,7 @@ import org.springframework.util.Assert;
  * @since 2.0
  */
 public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint, JoinPoint.StaticPart {
-	
+
 	private final ProxyMethodInvocation methodInvocation;
 
 	private Object[] defensiveCopyOfArgs;
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 1af86cc417..208c65cb82 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
@@ -39,7 +39,7 @@ import org.springframework.util.ReflectionUtils;
 
 /**
  * This class encapsulates some AspectJ internal knowledge that should be
- * pushed back into the AspectJ project in a future release. 
+ * pushed back into the AspectJ project in a future release.
  *
  * <p>It relies on implementation specific knowledge in AspectJ to break
  * encapsulation and do something AspectJ was not designed to do: query
@@ -137,7 +137,7 @@ class RuntimeTestWalker {
 
 		public void visit(MatchingContextBasedTest matchingContextTest) {
 		}
-		
+
 		protected int getVarType(ReflectionVar v) {
 			try {
 				Field varTypeField = ReflectionVar.class.getDeclaredField("varType");
@@ -169,7 +169,7 @@ class RuntimeTestWalker {
 			this.matches = defaultMatches;
 			this.matchVarType = matchVarType;
 		}
-		
+
 		public boolean instanceOfMatches(Test test) {
 			test.accept(this);
 			return matches;
@@ -236,7 +236,7 @@ class RuntimeTestWalker {
 			aTest.accept(this);
 			return this.testsSubtypeSensitiveVars;
 		}
-		
+
 		@Override
 		public void visit(Instanceof i) {
 			ReflectionVar v = (ReflectionVar) i.getVar();
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
index 53e8600224..c50b359452 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
  * @see SimpleAspectInstanceFactory
  */
 public class SingletonAspectInstanceFactory implements AspectInstanceFactory {
-	
+
 	private final Object aspectInstance;
 
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
index 984c46f4f9..e6fa6f0dd7 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
@@ -47,11 +47,11 @@ public class TypePatternClassFilter implements ClassFilter {
 	}
 
 	/**
-	 * Create a fully configured {@link TypePatternClassFilter} using the  
+	 * Create a fully configured {@link TypePatternClassFilter} using the
 	 * given type pattern.
 	 * @param typePattern the type pattern that AspectJ weaver should parse
 	 * @throws IllegalArgumentException if the supplied <code>typePattern</code> is <code>null</code>
-	 * or is recognized as invalid 
+	 * or is recognized as invalid
 	 */
 	public TypePatternClassFilter(String typePattern) {
 		setTypePattern(typePattern);
@@ -73,7 +73,7 @@ public class TypePatternClassFilter implements ClassFilter {
 	 * <p>These conventions are established by AspectJ, not Spring AOP.
 	 * @param typePattern the type pattern that AspectJ weaver should parse
 	 * @throws IllegalArgumentException if the supplied <code>typePattern</code> is <code>null</code>
-	 * or is recognized as invalid 
+	 * or is recognized as invalid
 	 */
 	public void setTypePattern(String typePattern) {
 		Assert.notNull(typePattern);
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
index cb09937a39..92721d5c77 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
@@ -58,7 +58,7 @@ import org.springframework.util.StringUtils;
  * @since 2.0
  */
 public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFactory {
-	
+
 	protected static final ParameterNameDiscoverer ASPECTJ_ANNOTATION_PARAMETER_NAME_DISCOVERER =
 			new AspectJAnnotationParameterNameDiscoverer();
 
@@ -121,7 +121,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 
 	/**
 	 * We need to detect this as "code-style" AspectJ aspects should not be
-	 * interpreted by Spring AOP. 
+	 * interpreted by Spring AOP.
 	 */
 	private boolean compiledByAjc(Class<?> clazz) {
 		// The AJTypeSystem goes to great lengths to provide a uniform appearance between code-style and
@@ -154,11 +154,11 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 		if (ajType.getPerClause().getKind() == PerClauseKind.PERCFLOWBELOW) {
 			throw new AopConfigException(aspectClass.getName() + " uses percflowbelow instantiation model: " +
 					"This is not supported in Spring AOP.");
-		}	
+		}
 	}
 
 	/**
-	 * The pointcut and advice annotations both have an "argNames" member which contains a 
+	 * The pointcut and advice annotations both have an "argNames" member which contains a
 	 * comma-separated list of the argument names. We use this (if non-empty) to build the
 	 * formal parameters for the pointcut.
 	 */
@@ -169,13 +169,13 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 		if (pointcutParameterNames != null) {
 			pointcutParameterTypes = extractPointcutParameterTypes(pointcutParameterNames,annotatedMethod);
 		}
-		
+
 		AspectJExpressionPointcut ajexp =
 				new AspectJExpressionPointcut(declarationScope,pointcutParameterNames,pointcutParameterTypes);
 		ajexp.setLocation(annotatedMethod.toString());
 		return ajexp;
 	}
-	
+
 	/**
 	 * Create the pointcut parameters needed by aspectj based on the given argument names
 	 * and the argument types that are available from the adviceMethod. Needs to take into
@@ -326,10 +326,10 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 				return names;
 			}
 			else {
-				return null; 				
+				return null;
 			}
 		}
-		
+
 		public String[] getParameterNames(Constructor ctor) {
 			throw new UnsupportedOperationException("Spring AOP cannot handle constructor advice");
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
index cde9f43ef3..9125cbee2a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
@@ -55,8 +55,8 @@ public class AspectMetadata {
 	private final Pointcut perClausePointcut;
 
 	/**
-	 * The name of this aspect as defined to Spring (the bean name) - 
-	 * allows us to determine if two pieces of advice come from the 
+	 * The name of this aspect as defined to Spring (the bean name) -
+	 * allows us to determine if two pieces of advice come from the
 	 * same aspect and hence their relative precedence.
 	 */
 	private String aspectName;
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 a640e36458..fecd7b2e2a 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
@@ -27,7 +27,7 @@ import org.springframework.util.ClassUtils;
  * backed by a Spring {@link org.springframework.beans.factory.BeanFactory}.
  *
  * <p>Note that this may instantiate multiple times if using a prototype,
- * which probably won't give the semantics you expect. 
+ * which probably won't give the semantics you expect.
  * Use a {@link LazySingletonAspectInstanceFactoryDecorator}
  * to wrap this to ensure only one new aspect comes back.
  *
@@ -56,7 +56,7 @@ public class BeanFactoryAspectInstanceFactory implements MetadataAwareAspectInst
 	public BeanFactoryAspectInstanceFactory(BeanFactory beanFactory, String name) {
 		this(beanFactory, name, beanFactory.getType(name));
 	}
-	
+
 	/**
 	 * Create a BeanFactoryAspectInstanceFactory, providing a type that AspectJ should
 	 * introspect to create AJType metadata. Use if the BeanFactory may consider the type
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
index 433a33bb6b..071468141c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
@@ -41,23 +41,23 @@ class InstantiationModelAwarePointcutAdvisorImpl
 		implements InstantiationModelAwarePointcutAdvisor, AspectJPrecedenceInformation {
 
 	private final AspectJExpressionPointcut declaredPointcut;
-	
+
 	private Pointcut pointcut;
-	
+
 	private final MetadataAwareAspectInstanceFactory aspectInstanceFactory;
-	
+
 	private final Method method;
-	
+
 	private final boolean lazy;
-	
+
 	private final AspectJAdvisorFactory atAspectJAdvisorFactory;
-	
+
 	private Advice instantiatedAdvice;
 
 	private int declarationOrder;
-	
+
 	private String aspectName;
-	
+
 	private Boolean isBeforeAdvice;
 
 	private Boolean isAfterAdvice;
@@ -72,12 +72,12 @@ class InstantiationModelAwarePointcutAdvisorImpl
 		this.aspectInstanceFactory = aif;
 		this.declarationOrder = declarationOrderInAspect;
 		this.aspectName = aspectName;
-		
+
 		if (aif.getAspectMetadata().isLazilyInstantiated()) {
 			// Static part of the pointcut is a lazy type.
 			Pointcut preInstantiationPointcut =
 					Pointcuts.union(aif.getAspectMetadata().getPerClausePointcut(), this.declaredPointcut);
-			
+
 			// Make it dynamic: must mutate from pre-instantiation to post-instantiation state.
 			// If it's not a dynamic pointcut, it may be optimized out
 			// by the Spring AOP infrastructure after the first evaluation.
@@ -109,7 +109,7 @@ class InstantiationModelAwarePointcutAdvisorImpl
 	public boolean isPerInstance() {
 		return (getAspectMetadata().getAjType().getPerClause().getKind() != PerClauseKind.SINGLETON);
 	}
-	
+
 	/**
 	 * Return the AspectJ AspectMetadata for this advisor.
 	 */
@@ -126,7 +126,7 @@ class InstantiationModelAwarePointcutAdvisorImpl
 		}
 		return this.instantiatedAdvice;
 	}
-	
+
 	public boolean isLazy() {
 		return this.lazy;
 	}
@@ -140,7 +140,7 @@ class InstantiationModelAwarePointcutAdvisorImpl
 		return this.atAspectJAdvisorFactory.getAdvice(
 				this.method, pcut, this.aspectInstanceFactory, this.declarationOrder, this.aspectName);
 	}
-	
+
 	public MetadataAwareAspectInstanceFactory getAspectInstanceFactory() {
 		return this.aspectInstanceFactory;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
index c2e356678a..35ade227ce 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
@@ -203,7 +203,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 			return null;
 		}
 
-		// If we get here, we know we have an AspectJ method. 
+		// If we get here, we know we have an AspectJ method.
 		// Check that it's an AspectJ-annotated class
 		if (!isAspect(candidateAspectClass)) {
 			throw new AopConfigException("Advice must be declared inside an aspect type: " +
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/package-info.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/package-info.java
index b0f747284b..36b3f59f3d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Classes enabling AspectJ 5 @Annotated classes to be used in Spring AOP.
- * 
+ *
  * <p>Normally to be used through an AspectJAutoProxyCreator rather than directly.
  *
  */
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
index 0cb786cc25..1a64c9610a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
@@ -72,8 +72,8 @@ public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProx
 		for (Advisor element : advisors) {
 			partiallyComparableAdvisors.add(
 					new PartiallyComparableAdvisorHolder(element, DEFAULT_PRECEDENCE_COMPARATOR));
-		}		
-		
+		}
+
 		// sort it
 		List<PartiallyComparableAdvisorHolder> sorted =
 				(List<PartiallyComparableAdvisorHolder>) PartialOrder.sort(partiallyComparableAdvisors);
@@ -81,13 +81,13 @@ public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProx
 			// TODO: work harder to give a better error message here.
 			throw new IllegalArgumentException("Advice precedence circularity error");
 		}
-		
+
 		// extract results again
 		List<Advisor> result = new LinkedList<Advisor>();
 		for (PartiallyComparableAdvisorHolder pcAdvisor : sorted) {
 			result.add(pcAdvisor.getAdvisor());
 		}
-		
+
 		return result;
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
index c293f0be72..8d21b47b5e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
@@ -106,14 +106,14 @@ class AspectJPrecedenceComparator implements Comparator {
 		boolean oneOrOtherIsAfterAdvice =
 				(AspectJAopUtils.isAfterAdvice(advisor1) || AspectJAopUtils.isAfterAdvice(advisor2));
 		int adviceDeclarationOrderDelta = getAspectDeclarationOrder(advisor1) - getAspectDeclarationOrder(advisor2);
-		
+
 		if (oneOrOtherIsAfterAdvice) {
 			// the advice declared last has higher precedence
 			if (adviceDeclarationOrderDelta < 0) {
 				// advice1 was declared before advice2
 				// so advice1 has lower precedence
 				return LOWER_PRECEDENCE;
-			} 
+			}
 			else if (adviceDeclarationOrderDelta == 0) {
 				return SAME_PRECEDENCE;
 			}
@@ -153,7 +153,7 @@ class AspectJPrecedenceComparator implements Comparator {
 	}
 
 	private int getAspectDeclarationOrder(Advisor anAdvisor) {
-		AspectJPrecedenceInformation precedenceInfo = 
+		AspectJPrecedenceInformation precedenceInfo =
 			AspectJAopUtils.getAspectJPrecedenceInformationFor(anAdvisor);
 		if (precedenceInfo != null) {
 			return precedenceInfo.getDeclarationOrder();
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java
index 8355bc3082..6dc2fdb0c0 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java
@@ -5,7 +5,7 @@
  * annotation-style methods, and an AspectJExpressionPointcut: a Spring AOP Pointcut
  * implementation that allows use of the AspectJ pointcut expression language with the Spring AOP
  * runtime framework.
- * 
+ *
  * <p>Note that use of this package does <i>not</i> require the use of the <code>ajc</code> compiler
  * or AspectJ load-time weaver. It is intended to enable the use of a valuable subset of AspectJ
  * functionality, with consistent semantics, with the proxy-based Spring AOP framework.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
index 43de1f6446..173148c5ca 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
@@ -60,7 +60,7 @@ public abstract class AbstractInterceptorDrivenBeanDefinitionDecorator implement
 
 	public final BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definitionHolder, ParserContext parserContext) {
 		BeanDefinitionRegistry registry = parserContext.getRegistry();
-		
+
 		// get the root bean name - will be the name of the generated proxy factory bean
 		String existingBeanName = definitionHolder.getBeanName();
 		BeanDefinition targetDefinition = definitionHolder.getBeanDefinition();
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java
index 4fa6a8a552..180ea636a3 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java
@@ -20,7 +20,7 @@ import org.springframework.beans.factory.parsing.ParseState;
 
 /**
  * {@link ParseState} entry representing an advice element.
- * 
+ *
  * @author Mark Fisher
  * @since 2.0
  */
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java
index fa635ae7a9..dc3b4f9ea8 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java
@@ -20,7 +20,7 @@ import org.springframework.beans.factory.parsing.ParseState;
 
 /**
  * {@link ParseState} entry representing an advisor.
- * 
+ *
  * @author Mark Fisher
  * @since 2.0
  */
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java b/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java
index dd568a51bd..d3f28a464f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java
@@ -31,8 +31,8 @@ import org.springframework.util.Assert;
 /**
  * Utility class for handling registration of AOP auto-proxy creators.
  *
- * <p>Only a single auto-proxy creator can be registered yet multiple concrete 
- * implementations are available. Therefore this class wraps a simple escalation 
+ * <p>Only a single auto-proxy creator can be registered yet multiple concrete
+ * implementations are available. Therefore this class wraps a simple escalation
  * protocol, allowing classes to request a particular auto-proxy creator and know
  * that class, <code>or a subclass thereof</code>, will eventually be resident
  * in the application context.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
index de8beff487..8613647b15 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
@@ -93,7 +93,7 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 	private static final int ASPECT_INSTANCE_FACTORY_INDEX = 2;
 
 	private ParseState parseState = new ParseState();
-	
+
 
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		CompositeComponentDefinition compositeDef =
@@ -281,10 +281,10 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(DeclareParentsAdvisor.class);
 		builder.addConstructorArgValue(declareParentsElement.getAttribute(IMPLEMENT_INTERFACE));
 		builder.addConstructorArgValue(declareParentsElement.getAttribute(TYPE_PATTERN));
-		
+
 		String defaultImpl = declareParentsElement.getAttribute(DEFAULT_IMPL);
 		String delegateRef = declareParentsElement.getAttribute(DELEGATE_REF);
-		
+
 		if (StringUtils.hasText(defaultImpl) && !StringUtils.hasText(delegateRef)) {
 			builder.addConstructorArgValue(defaultImpl);
 		}
@@ -435,7 +435,7 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 		String expression = pointcutElement.getAttribute(EXPRESSION);
 
 		AbstractBeanDefinition pointcutDefinition = null;
-		
+
 		try {
 			this.parseState.push(new PointcutEntry(id));
 			pointcutDefinition = createPointcutDefinition(expression);
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java
index c308d5b833..e1cf5f65f3 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java
@@ -20,7 +20,7 @@ import org.springframework.beans.factory.parsing.ParseState;
 
 /**
  * {@link ParseState} entry representing a pointcut.
- * 
+ *
  * @author Mark Fisher
  * @since 2.0
  */
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
index ac118d7096..bbba335bb6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
@@ -47,7 +47,7 @@ class ScopedProxyBeanDefinitionDecorator implements BeanDefinitionDecorator {
 				proxyTargetClass = Boolean.valueOf(ele.getAttribute(PROXY_TARGET_CLASS));
 			}
 		}
-		
+
 		// Register the original bean definition as it will be referenced by the scoped proxy
 		// and is relevant for tooling (validation, navigation).
 		BeanDefinitionHolder holder =
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 397c97b769..c166ddc04d 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
@@ -124,7 +124,7 @@ public interface Advised extends TargetClassAware {
 	 */
 	void addAdvisor(Advisor advisor) throws AopConfigException;
 
-	/** 
+	/**
 	 * Add an Advisor at the specified position in the chain.
 	 * @param advisor the advisor to add at the specified position in the chain
 	 * @param pos position in chain (0 is head). Must be valid.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java
index d97934f16c..595eb35c65 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java
@@ -35,7 +35,7 @@ package org.springframework.aop.framework;
  *
  * <p>Proxies may or may not allow advice changes to be made.
  * If they do not permit advice changes (for example, because
- * the configuration was frozen) a proxy should throw an 
+ * the configuration was frozen) a proxy should throw an
  * {@link AopConfigException} on an attempted advice change.
  *
  * @author Rod Johnson
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 9b4461fcb4..a9b039f35f 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
@@ -100,7 +100,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 	protected final Log logger = LogFactory.getLog(getClass());
 
 	private String[] interceptorNames;
-	
+
 	private String targetName;
 
 	private boolean autodetectInterfaces = true;
@@ -543,10 +543,10 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 		Advisor advisor = namedBeanToAdvisor(next);
 		if (logger.isTraceEnabled()) {
 			logger.trace("Adding advisor with name '" + name + "'");
-		}			
+		}
 		addAdvisor(advisor);
 	}
-	
+
 	/**
 	 * Return a TargetSource to use when creating a proxy. If the target was not
 	 * specified at the end of the interceptorNames list, the TargetSource will be
@@ -627,24 +627,24 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 		private final String beanName;
 
 		private final String message;
-		
+
 		public PrototypePlaceholderAdvisor(String beanName) {
 			this.beanName = beanName;
 			this.message = "Placeholder for prototype Advisor/Advice with bean name '" + beanName + "'";
 		}
-		
+
 		public String getBeanName() {
 			return beanName;
 		}
-		
+
 		public Advice getAdvice() {
 			throw new UnsupportedOperationException("Cannot invoke methods: " + this.message);
 		}
-		
+
 		public boolean isPerInstance() {
 			throw new UnsupportedOperationException("Cannot invoke methods: " + this.message);
 		}
-		
+
 		@Override
 		public String toString() {
 			return this.message;
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
index 8773e933c0..81023c1251 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
@@ -87,13 +87,13 @@ public class ThrowsAdviceInterceptor implements MethodInterceptor, AfterAdvice {
 				}
 			}
 		}
-		
+
 		if (this.exceptionHandlerMap.isEmpty()) {
 			throw new IllegalArgumentException(
 					"At least one handler method must be found in class [" + throwsAdvice.getClass() + "]");
 		}
 	}
-	
+
 	public int getHandlerMethodCount() {
 		return this.exceptionHandlerMap.size();
 	}
@@ -131,7 +131,7 @@ public class ThrowsAdviceInterceptor implements MethodInterceptor, AfterAdvice {
 			throw ex;
 		}
 	}
-	
+
 	private void invokeHandlerMethod(MethodInvocation mi, Throwable ex, Method method) throws Throwable {
 		Object[] handlerArgs;
 		if (method.getParameterTypes().length == 1) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java
index 5d216e9b6b..a479fbc868 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/package-info.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/package-info.java
index 765d127397..0b3d0a28bf 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/package-info.java
@@ -7,7 +7,7 @@
  * its capabilities, don't need to concern themselves with this package.
  * <br>
  * 	You may wish to use these adapters to wrap Spring-specific advices, such as MethodBeforeAdvice,
- * 	in MethodInterceptor, to allow their use in another AOP framework supporting the AOP Alliance interfaces. 
+ * 	in MethodInterceptor, to allow their use in another AOP framework supporting the AOP Alliance interfaces.
  * </br>
  * <br>
  * 	These adapters do not depend on any other Spring framework classes to allow such usage.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
index 334b9a5cfe..cfc4e09cf9 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
@@ -94,6 +94,6 @@ public class DefaultAdvisorAutoProxyCreator extends AbstractAdvisorAutoProxyCrea
 	@Override
 	protected boolean isEligibleAdvisorBean(String beanName) {
 		return (!isUsePrefix() || beanName.startsWith(getAdvisorBeanNamePrefix()));
-	}              
+	}
 
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java
index 6219a5015c..735a65b852 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -30,7 +30,7 @@ import org.springframework.aop.TargetSource;
  * @author Juergen Hoeller
  */
 public interface TargetSourceCreator {
-	
+
 	/**
 	 * Create a special TargetSource for the given bean, if any.
 	 * @param beanClass the class of the bean to create a TargetSource for
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/package-info.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/package-info.java
index 691464cd7d..8646ea4958 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/package-info.java
@@ -3,10 +3,10 @@
  *
  * Bean post-processors for use in ApplicationContexts to simplify AOP usage
  * by automatically creating AOP proxies without the need to use a ProxyFactoryBean.
- * 
+ *
  * <p>The various post-processors in this package need only be added to an ApplicationContext
  * (typically in an XML bean definition document) to automatically proxy selected beans.
- * 
+ *
  * <p><b>NB</b>: Automatic auto-proxying is not supported for BeanFactory implementations,
  * as post-processors beans are only automatically detected in application contexts.
  * Post-processors can be explicitly registered on a ConfigurableBeanFactory instead.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java
index 094188be1c..9667931793 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java
@@ -23,7 +23,7 @@ import org.springframework.aop.target.ThreadLocalTargetSource;
 
 /**
  * Convenient TargetSourceCreator using bean name prefixes to create one of three
- * well-known TargetSource types: 
+ * well-known TargetSource types:
  * <li>: CommonsPoolTargetSource
  * <li>% ThreadLocalTargetSource
  * <li>! PrototypeTargetSource
@@ -59,5 +59,5 @@ public class QuickTargetSourceCreator extends AbstractBeanFactoryBasedTargetSour
 			return null;
 		}
 	}
-	
+
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/package-info.java b/spring-aop/src/main/java/org/springframework/aop/framework/package-info.java
index 4958a010cb..3581a82efe 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/package-info.java
@@ -3,13 +3,13 @@
  *
  * Package containing Spring's basic AOP infrastructure, compliant with the
  * <a href="http://aopalliance.sourceforge.net">AOP Alliance</a> interfaces.
- * 
+ *
  * <p>Spring AOP supports proxying interfaces or classes, introductions, and offers
  * static and dynamic pointcuts.
- * 
+ *
  * <p>Any Spring AOP proxy can be cast to the ProxyConfig AOP configuration interface
  * in this package to add or remove interceptors.
- * 
+ *
  * <p>The ProxyFactoryBean is a convenient way to create AOP proxies in a BeanFactory
  * or ApplicationContext. However, proxies can be created programmatically using the
  * ProxyFactory class.
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
index 0c257c1c50..8eb36f0964 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
@@ -28,7 +28,7 @@ import org.aopalliance.intercept.MethodInvocation;
  * <p>Subclasses should call the <code>createInvocationTraceName(MethodInvocation)</code>
  * method to create a name for the given trace that includes information about the
  * method invocation under trace along with the prefix and suffix added as appropriate.
- * 
+ *
  * @author Rob Harrop
  * @author Juergen Hoeller
  * @since 1.2.7
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
index bf14ab6430..b8f5e89833 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
index 81b3110742..5fbb6ad8e8 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
@@ -125,7 +125,7 @@ public abstract class ExposeBeanNameAdvisors {
 	 */
 	private static class ExposeBeanNameIntroduction extends DelegatingIntroductionInterceptor implements NamedBean {
 
-		private final String beanName; 
+		private final String beanName;
 
 		public ExposeBeanNameIntroduction(String beanName) {
 			this.beanName = beanName;
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
index 0ea4dd527f..29b9f4620a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
@@ -27,7 +27,7 @@ import org.apache.commons.logging.Log;
  * and output the stats.
  *
  * <p>This code is inspired by Thierry Templier's blog.
- * 
+ *
  * @author Dmitriy Kopylenko
  * @author Juergen Hoeller
  * @author Rob Harrop
diff --git a/spring-aop/src/main/java/org/springframework/aop/package-info.java b/spring-aop/src/main/java/org/springframework/aop/package-info.java
index 5076bc0678..b5691ccfa6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/package-info.java
@@ -2,9 +2,9 @@
 /**
  *
  * Core Spring AOP interfaces, built on AOP Alliance AOP interoperability interfaces.
- * 
+ *
  * <br>Any AOP Alliance MethodInterceptor is usable in Spring.
- * 
+ *
  * <br>Spring AOP also offers:
  * <ul>
  * 	<li>Introduction support
@@ -15,7 +15,7 @@
  * 	<li>Extensibility allowing arbitrary custom advice types to
  * 		be plugged in without modifying the core framework.
  * </ul>
- * 
+ *
  * <br>
  * Spring AOP can be used programmatically or (preferably)
  * integrated with the Spring IoC container.
diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java b/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
index 77c3a107ab..05a041aeec 100644
--- a/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
+++ b/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
@@ -23,7 +23,7 @@ import org.springframework.util.Assert;
 
 /**
  * Default implementation of the {@link ScopedObject} interface.
- * 
+ *
  * <p>Simply delegates the calls to the underlying
  * {@link ConfigurableBeanFactory bean factory}
  * ({@link ConfigurableBeanFactory#getBean(String)}/
diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java
index 1a50082641..9e46d230cd 100644
--- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java
+++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java
@@ -49,5 +49,5 @@ public interface ScopedObject extends RawTargetAccess {
 	 * the exact same target object in the target scope).
 	 */
 	void removeFromScope();
-	
+
 }
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 b13a9eb509..a1cf5db4a8 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
@@ -32,14 +32,14 @@ import org.springframework.util.ClassUtils;
 
 /**
  * Convenient proxy factory bean for scoped objects.
- * 
+ *
  * <p>Proxies created using this factory bean are thread-safe singletons
  * and may be injected into shared objects, with transparent scoping behavior.
  *
  * <p>Proxies returned by this class implement the {@link ScopedObject} interface.
  * This presently allows for removing the corresponding object from the scope,
  * seamlessly creating a new instance in the scope on next access.
- * 
+ *
  * <p>Please note that the proxies created by this factory are
  * <i>class-based</i> proxies by default. This can be customized
  * through switching the "proxyTargetClass" property to "false".
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 62f13bb5c8..e59267d30f 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
@@ -47,7 +47,7 @@ public abstract class ScopedProxyUtils {
 	 */
 	public static BeanDefinitionHolder createScopedProxy(BeanDefinitionHolder definition,
 			BeanDefinitionRegistry registry, boolean proxyTargetClass) {
-		
+
 		String originalBeanName = definition.getBeanName();
 		BeanDefinition targetDefinition = definition.getBeanDefinition();
 
@@ -87,7 +87,7 @@ public abstract class ScopedProxyUtils {
 		// (potentially an inner bean).
 		return new BeanDefinitionHolder(proxyDefinition, originalBeanName, definition.getAliases());
 	}
-	
+
 	/**
 	 * Generates the bean name that is used within the scoped proxy to reference the target bean.
 	 * @param originalBeanName the original name of bean
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 194ae88656..8d5eac8966 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
@@ -42,7 +42,7 @@ import org.springframework.util.ClassUtils;
 public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFilter, Ordered, Serializable {
 
 	private final Advice advice;
-	
+
 	private final Set<Class> interfaces = new HashSet<Class>();
 
 	private int order = Integer.MAX_VALUE;
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
index cb4402683d..2e97d6de12 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
@@ -46,7 +46,7 @@ public class DefaultPointcutAdvisor extends AbstractGenericPointcutAdvisor imple
 	 */
 	public DefaultPointcutAdvisor() {
 	}
-	
+
 	/**
 	 * Create a DefaultPointcutAdvisor that matches all methods.
 	 * <p><code>Pointcut.TRUE</code> will be used as Pointcut.
@@ -55,7 +55,7 @@ public class DefaultPointcutAdvisor extends AbstractGenericPointcutAdvisor imple
 	public DefaultPointcutAdvisor(Advice advice) {
 		this(Pointcut.TRUE, advice);
 	}
-	
+
 	/**
 	 * Create a DefaultPointcutAdvisor, specifying Pointcut and Advice.
 	 * @param pointcut the Pointcut targeting the Advice
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
index 5278ee233f..8cac8329e3 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
@@ -53,7 +53,7 @@ import org.springframework.aop.ProxyMethodInvocation;
 public class DelegatePerTargetObjectIntroductionInterceptor extends IntroductionInfoSupport
 		implements IntroductionInterceptor {
 
-	/** 
+	/**
 	 * Hold weak references to keys as we don't want to interfere with garbage collection..
 	 */
 	private final Map<Object, Object> delegateMap = new WeakHashMap<Object, Object>();
@@ -85,12 +85,12 @@ public class DelegatePerTargetObjectIntroductionInterceptor extends Introduction
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		if (isMethodOnIntroducedInterface(mi)) {
 			Object delegate = getIntroductionDelegateFor(mi.getThis());
-			
+
 			// Using the following method rather than direct reflection,
 			// we get correct handling of InvocationTargetException
 			// if the introduced method throws an exception.
 			Object retVal = AopUtils.invokeJoinpointUsingReflection(delegate, mi.getMethod(), mi.getArguments());
-			
+
 			// Massage return value if possible: if the delegate returned itself,
 			// we really want to return the proxy.
 			if (retVal == delegate && mi instanceof ProxyMethodInvocation) {
@@ -126,7 +126,7 @@ public class DelegatePerTargetObjectIntroductionInterceptor extends Introduction
 			}
 		}
 	}
-	
+
 	private Object createNewDelegate() {
 		try {
 			return this.defaultImplType.newInstance();
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
index fc9631bd61..340e66639d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
@@ -39,7 +39,7 @@ import org.springframework.util.Assert;
  * <p>The <code>suppressInterface</code> method can be used to suppress interfaces
  * implemented by the delegate but which should not be introduced to the owning
  * AOP proxy.
- * 
+ *
  * <p>An instance of this class is serializable if the delegate is.
  *
  * @author Rod Johnson
@@ -50,7 +50,7 @@ import org.springframework.util.Assert;
  */
 public class DelegatingIntroductionInterceptor extends IntroductionInfoSupport
 		implements IntroductionInterceptor {
-		
+
 	/**
 	 * Object that actually implements the interfaces.
 	 * May be "this" if a subclass implements the introduced interfaces.
@@ -66,7 +66,7 @@ public class DelegatingIntroductionInterceptor extends IntroductionInfoSupport
 	public DelegatingIntroductionInterceptor(Object delegate) {
 		init(delegate);
 	}
-	
+
 	/**
 	 * Construct a new DelegatingIntroductionInterceptor.
 	 * The delegate will be the subclass, which must implement
@@ -91,8 +91,8 @@ public class DelegatingIntroductionInterceptor extends IntroductionInfoSupport
 		suppressInterface(IntroductionInterceptor.class);
 		suppressInterface(DynamicIntroductionAdvice.class);
 	}
-		
-	
+
+
 	/**
 	 * Subclasses may need to override this if they want to  perform custom
 	 * behaviour in around advice. However, subclasses should invoke this
@@ -104,7 +104,7 @@ public class DelegatingIntroductionInterceptor extends IntroductionInfoSupport
 			// get correct handling of InvocationTargetException
 			// if the introduced method throws an exception.
 			Object retVal = AopUtils.invokeJoinpointUsingReflection(this.delegate, mi.getMethod(), mi.getArguments());
-			
+
 			// Massage return value if possible: if the delegate returned itself,
 			// we really want to return the proxy.
 			if (retVal == this.delegate && mi instanceof ProxyMethodInvocation) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java
index d011aa641b..6a6a70c985 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java
index 5adc4fa539..e70530b098 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
index d2a4fe1395..61595ff86a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
@@ -38,13 +38,13 @@ import java.util.regex.PatternSyntaxException;
  * @since 1.1
  */
 public class JdkRegexpMethodPointcut extends AbstractRegexpMethodPointcut {
-	
-	/** 
+
+	/**
 	 * Compiled form of the patterns.
 	 */
 	private Pattern[] compiledPatterns = new Pattern[0];
 
-	/** 
+	/**
 	 * Compiled form of the exclusion patterns.
 	 */
 	private Pattern[] compiledExclusionPatterns = new Pattern[0];
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
index 193de1d969..83866afb50 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -25,11 +25,11 @@ import org.springframework.aop.ClassFilter;
  * @author Rod Johnson
  */
 public class RootClassFilter implements ClassFilter, Serializable {
-	
+
 	private Class clazz;
-	
+
 	// TODO inheritance
-	
+
 	public RootClassFilter(Class clazz) {
 		this.clazz = clazz;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java
index 8023ff8837..27209a18ac 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -22,7 +22,7 @@ import org.springframework.aop.MethodMatcher;
 
 /**
  * Convenient abstract superclass for static method matchers, which don't care
- * about arguments at runtime. 
+ * about arguments at runtime.
  */
 public abstract class StaticMethodMatcher implements MethodMatcher {
 
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 8111f2e4c4..3c73521e74 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
@@ -90,7 +90,7 @@ public abstract class AbstractPoolingTargetSource extends AbstractPrototypeBased
 	 * @throws Exception to avoid placing constraints on pooling APIs
 	 */
 	protected abstract void createPool() throws Exception;
-	
+
 	/**
 	 * Acquire an object from the pool.
 	 * @return an object from the pool
@@ -98,7 +98,7 @@ public abstract class AbstractPoolingTargetSource extends AbstractPrototypeBased
 	 * APIs, so we're forgiving with our exception signature
 	 */
 	public abstract Object getTarget() throws Exception;
-	
+
 	/**
 	 * Return the given object to the pool.
 	 * @param target object that must have been acquired from the pool
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 887e253a08..ba3e32d1f4 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
@@ -41,7 +41,7 @@ import org.springframework.core.Constants;
  * properties are explictly not mirrored because the implementation of
  * <code>PoolableObjectFactory</code> used by this class does not implement
  * meaningful validation. All exposed Commons Pool properties use the corresponding
- * Commons Pool defaults: for example, 
+ * Commons Pool defaults: for example,
  *
  * @author Rod Johnson
  * @author Rob Harrop
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java b/spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java
index 4327a2747a..ddaad78704 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
index 08ae6534a6..844073a5ab 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
@@ -58,11 +58,11 @@ public class SingletonTargetSource implements TargetSource, Serializable {
 	public Class<?> getTargetClass() {
 		return this.target.getClass();
 	}
-	
+
 	public Object getTarget() {
 		return this.target;
 	}
-	
+
 	public void releaseTarget(Object target) {
 		// nothing to do
 	}
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 6048f7b484..b57ecae235 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
@@ -49,7 +49,7 @@ import org.springframework.core.NamedThreadLocal;
  */
 public class ThreadLocalTargetSource extends AbstractPrototypeBasedTargetSource
 		implements ThreadLocalTargetSourceStats, DisposableBean {
-	
+
 	/**
 	 * ThreadLocal holding the target associated with the current
 	 * thread. Unlike most ThreadLocals, which are static, this variable
@@ -62,9 +62,9 @@ public class ThreadLocalTargetSource extends AbstractPrototypeBasedTargetSource
 	 * Set of managed targets, enabling us to keep track of the targets we've created.
 	 */
 	private final Set<Object> targetSet = new HashSet<Object>();
-	
+
 	private int invocationCount;
-	
+
 	private int hitCount;
 
 
@@ -93,7 +93,7 @@ public class ThreadLocalTargetSource extends AbstractPrototypeBasedTargetSource
 		}
 		return target;
 	}
-	
+
 	/**
 	 * Dispose of targets if necessary; clear ThreadLocal.
 	 * @see #destroyPrototypeInstance
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java
index 7e3a2fa5cf..688b891330 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -23,7 +23,7 @@ package org.springframework.aop.target;
  * @author Juergen Hoeller
  */
 public interface ThreadLocalTargetSourceStats {
-	
+
 	/**
 	 * Return the number of client invocations.
 	 */
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java
index 7d55a0d59a..82d16e7fd4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2006 the original author 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java
index 3bc43af657..0d523ba87e 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java
@@ -36,7 +36,7 @@ public final class AspectJAdviceParameterNameDiscoverAnnotationTests
 
 	@Retention(RetentionPolicy.RUNTIME)
 	@interface MyAnnotation {}
-	
+
 	public void pjpAndAnAnnotation(ProceedingJoinPoint pjp, MyAnnotation ann) {}
 
 	@Test
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java
index f135239fe0..73ec428395 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java
@@ -247,7 +247,7 @@ public class AspectJAdviceParameterNameDiscovererTests {
 	public void testReferenceBindingWithAlternateTokenizations() {
 		assertParameterNames(getMethod("onePrimitive"),"call(bar *) && somepc(foo)",new String[] {"foo"});
 		assertParameterNames(getMethod("onePrimitive"),"somepc ( foo )",new String[] {"foo"});
-		assertParameterNames(getMethod("onePrimitive"),"somepc( foo)",new String[] {"foo"});  
+		assertParameterNames(getMethod("onePrimitive"),"somepc( foo)",new String[] {"foo"});
 	}
 
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
index b1678c9d7c..954377c0e2 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -44,7 +44,7 @@ import test.beans.subpkg.DeepBean;
  * @author Chris Beams
  */
 public final class AspectJExpressionPointcutTests {
-	
+
 	public static final String MATCH_ALL_METHODS = "execution(* *(..))";
 
 	private Method getAge;
@@ -54,8 +54,8 @@ public final class AspectJExpressionPointcutTests {
 	private Method setSomeNumber;
 
 	private Method isPostProcessed;
-	
-	
+
+
 	@Before
 	public void setUp() throws NoSuchMethodException {
 		getAge = TestBean.class.getMethod("getAge", (Class<?>[])null);
@@ -63,7 +63,7 @@ public final class AspectJExpressionPointcutTests {
 		setSomeNumber = TestBean.class.getMethod("setSomeNumber", new Class[]{Number.class});
 		isPostProcessed = TestBean.class.getMethod("isPostProcessed", (Class[]) null);
 	}
-	
+
 	@Test
 	public void testMatchExplicit() {
 		String expression = "execution(int test.beans.TestBean.getAge())";
@@ -100,60 +100,60 @@ public final class AspectJExpressionPointcutTests {
 		assertTrue("Expression should match setAge(int) method", methodMatcher.matches(setAge, TestBean.class));
 	}
 
-	
+
 	@Test
 	public void testThis() throws SecurityException, NoSuchMethodException{
 		testThisOrTarget("this");
 	}
-	
+
 	@Test
 	public void testTarget() throws SecurityException, NoSuchMethodException {
 		testThisOrTarget("target");
 	}
-	
+
 	public static class OtherIOther implements IOther {
 
 		public void absquatulate() {
 			// Empty
 		}
-		
+
 	}
-	
+
 	/**
 	 * This and target are equivalent. Really instanceof pointcuts.
 	 * @throws Exception
 	 * @param which this or target
-	 * @throws NoSuchMethodException 
-	 * @throws SecurityException 
+	 * @throws NoSuchMethodException
+	 * @throws SecurityException
 	 */
 	private void testThisOrTarget(String which) throws SecurityException, NoSuchMethodException {
 		String matchesTestBean = which + "(test.beans.TestBean)";
 		String matchesIOther = which + "(test.beans.IOther)";
 		AspectJExpressionPointcut testBeanPc = new AspectJExpressionPointcut();
 		testBeanPc.setExpression(matchesTestBean);
-		
+
 		AspectJExpressionPointcut iOtherPc = new AspectJExpressionPointcut();
 		iOtherPc.setExpression(matchesIOther);
-		
+
 		assertTrue(testBeanPc.matches(TestBean.class));
 		assertTrue(testBeanPc.matches(getAge, TestBean.class));
 		assertTrue(iOtherPc.matches(OtherIOther.class.getMethod("absquatulate", (Class<?>[])null),
 				OtherIOther.class));
-	
+
 		assertFalse(testBeanPc.matches(OtherIOther.class.getMethod("absquatulate", (Class<?>[])null),
 				OtherIOther.class));
 	}
-	
+
 	@Test
 	public void testWithinRootPackage() throws SecurityException, NoSuchMethodException {
 		testWithinPackage(false);
 	}
-	
+
 	@Test
 	public void testWithinRootAndSubpackages() throws SecurityException, NoSuchMethodException {
 		testWithinPackage(true);
 	}
-	
+
 	private void testWithinPackage(boolean matchSubpackages) throws SecurityException, NoSuchMethodException {
 		String withinBeansPackage = "within(test.beans.";
 		// Subpackages are matched by **
@@ -163,7 +163,7 @@ public final class AspectJExpressionPointcutTests {
 		withinBeansPackage = withinBeansPackage + "*)";
 		AspectJExpressionPointcut withinBeansPc = new AspectJExpressionPointcut();
 		withinBeansPc.setExpression(withinBeansPackage);
-		
+
 		assertTrue(withinBeansPc.matches(TestBean.class));
 		assertTrue(withinBeansPc.matches(getAge, TestBean.class));
 		assertEquals(matchSubpackages, withinBeansPc.matches(DeepBean.class));
@@ -173,7 +173,7 @@ public final class AspectJExpressionPointcutTests {
 		assertFalse(withinBeansPc.matches(OtherIOther.class.getMethod("absquatulate", (Class<?>[])null),
 				OtherIOther.class));
 	}
-	
+
 	@Test
 	public void testFriendlyErrorOnNoLocationClassMatching() {
 		AspectJExpressionPointcut pc = new AspectJExpressionPointcut();
@@ -185,7 +185,7 @@ public final class AspectJExpressionPointcutTests {
 			assertTrue(ex.getMessage().indexOf("expression") != -1);
 		}
 	}
-	
+
 	@Test
 	public void testFriendlyErrorOnNoLocation2ArgMatching() {
 		AspectJExpressionPointcut pc = new AspectJExpressionPointcut();
@@ -197,7 +197,7 @@ public final class AspectJExpressionPointcutTests {
 			assertTrue(ex.getMessage().indexOf("expression") != -1);
 		}
 	}
-	
+
 	@Test
 	public void testFriendlyErrorOnNoLocation3ArgMatching() {
 		AspectJExpressionPointcut pc = new AspectJExpressionPointcut();
@@ -210,7 +210,7 @@ public final class AspectJExpressionPointcutTests {
 		}
 	}
 
-	
+
 	@Test
 	public void testMatchWithArgs() throws Exception {
 		String expression = "execution(void test.beans.TestBean.setSomeNumber(Number)) && args(Double)";
@@ -329,19 +329,19 @@ public final class AspectJExpressionPointcutTests {
 	@Test
 	public void testAndSubstitution() {
 		Pointcut pc = getPointcut("execution(* *(..)) and args(String)");
-		PointcutExpression expr = 
+		PointcutExpression expr =
 			((AspectJExpressionPointcut) pc).getPointcutExpression();
 		assertEquals("execution(* *(..)) && args(String)",expr.getPointcutExpression());
 	}
-	
+
 	@Test
 	public void testMultipleAndSubstitutions() {
 		Pointcut pc = getPointcut("execution(* *(..)) and args(String) and this(Object)");
-		PointcutExpression expr = 
+		PointcutExpression expr =
 			((AspectJExpressionPointcut) pc).getPointcutExpression();
-		assertEquals("execution(* *(..)) && args(String) && this(Object)",expr.getPointcutExpression());		
+		assertEquals("execution(* *(..)) && args(String) && this(Object)",expr.getPointcutExpression());
 	}
-	
+
 	private Pointcut getPointcut(String expression) {
 		AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
 		pointcut.setExpression(expression);
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
index ce148b7faa..37140304cb 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
@@ -34,8 +34,8 @@ public final class BeanNamePointcutMatchingTests {
 	public void testMatchingPointcuts() {
 		assertMatch("someName", "bean(someName)");
 
-		// Spring bean names are less restrictive compared to AspectJ names (methods, types etc.) 
-		// MVC Controller-kind 
+		// Spring bean names are less restrictive compared to AspectJ names (methods, types etc.)
+		// MVC Controller-kind
 		assertMatch("someName/someOtherName", "bean(someName/someOtherName)");
 		assertMatch("someName/foo/someOtherName", "bean(someName/*/someOtherName)");
 		assertMatch("someName/foo/bar/someOtherName", "bean(someName/*/someOtherName)");
@@ -58,9 +58,9 @@ public final class BeanNamePointcutMatchingTests {
 		// Or, and, not expressions
 		assertMatch("someName", "bean(someName) || bean(someOtherName)");
 		assertMatch("someOtherName", "bean(someName) || bean(someOtherName)");
-		
+
 		assertMatch("someName", "!bean(someOtherName)");
-		
+
 		assertMatch("someName", "bean(someName) || !bean(someOtherName)");
 		assertMatch("someName", "bean(someName) && !bean(someOtherName)");
 	}
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
index 6de4f5c640..e72e475abe 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
@@ -72,31 +72,31 @@ public final class MethodInvocationProceedingJoinPointTests {
 		final Object raw = new TestBean();
 		// Will be set by advice during a method call
 		final int newAge = 23;
-		
+
 		ProxyFactory pf = new ProxyFactory(raw);
 		pf.setExposeProxy(true);
 		pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
 		pf.addAdvice(new MethodBeforeAdvice() {
 			private int depth;
-			
+
 			public void before(Method method, Object[] args, Object target) throws Throwable {
 				JoinPoint jp = AbstractAspectJAdvice.currentJoinPoint();
 				assertTrue("Method named in toString", jp.toString().contains(method.getName()));
 				// Ensure that these don't cause problems
 				jp.toShortString();
 				jp.toLongString();
-				
+
 				assertSame(target, AbstractAspectJAdvice.currentJoinPoint().getTarget());
 				assertFalse(AopUtils.isAopProxy(AbstractAspectJAdvice.currentJoinPoint().getTarget()));
-				
+
 				ITestBean thisProxy = (ITestBean) AbstractAspectJAdvice.currentJoinPoint().getThis();
 				assertTrue(AopUtils.isAopProxy(AbstractAspectJAdvice.currentJoinPoint().getThis()));
-				
+
 				assertNotSame(target, thisProxy);
-				
+
 				// Check getting again doesn't cause a problem
 				assertSame(thisProxy, AbstractAspectJAdvice.currentJoinPoint().getThis());
-				
+
 				// Try reentrant call--will go through this advice.
 				// Be sure to increment depth to avoid infinite recursion
 				if (depth++ == 0) {
@@ -109,10 +109,10 @@ public final class MethodInvocationProceedingJoinPointTests {
 
 				assertSame(AopContext.currentProxy(), thisProxy);
 				assertSame(target, raw);
-				
+
 				assertSame(method.getName(), AbstractAspectJAdvice.currentJoinPoint().getSignature().getName());
 				assertEquals(method.getModifiers(), AbstractAspectJAdvice.currentJoinPoint().getSignature().getModifiers());
-				
+
 				MethodSignature msig = (MethodSignature) AbstractAspectJAdvice.currentJoinPoint().getSignature();
 				assertSame("Return same MethodSignature repeatedly", msig, AbstractAspectJAdvice.currentJoinPoint().getSignature());
 				assertSame("Return same JoinPoint repeatedly", AbstractAspectJAdvice.currentJoinPoint(), AbstractAspectJAdvice.currentJoinPoint());
@@ -146,7 +146,7 @@ public final class MethodInvocationProceedingJoinPointTests {
 				catch (UnsupportedOperationException ex) {
 					// Expected
 				}
-				
+
 				try {
 					sloc.getFileName();
 					fail("Can't get file name");
@@ -191,7 +191,7 @@ public final class MethodInvocationProceedingJoinPointTests {
 				// it serves our purpose here
 				JoinPoint.StaticPart aspectJVersionJp = Factory.makeEncSJP(method);
 				JoinPoint jp = AbstractAspectJAdvice.currentJoinPoint();
-				
+
 				assertEquals(aspectJVersionJp.getSignature().toLongString(), jp.getSignature().toLongString());
 				assertEquals(aspectJVersionJp.getSignature().toShortString(), jp.getSignature().toShortString());
 				assertEquals(aspectJVersionJp.getSignature().toString(), jp.getSignature().toString());
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java
index 824f51433b..d9769685c5 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java
@@ -38,37 +38,37 @@ public final class TigerAspectJAdviceParameterNameDiscovererTests
 	public void testAtTarget() {
 		assertParameterNames(getMethod("oneAnnotation"),"@target(a)",new String[]{"a"});
 	}
-	
+
 	@Test
 	public void testAtArgs() {
 		assertParameterNames(getMethod("oneAnnotation"),"@args(a)",new String[]{"a"});
 	}
-	
+
 	@Test
 	public void testAtWithin() {
 		assertParameterNames(getMethod("oneAnnotation"),"@within(a)",new String[]{"a"});
 	}
-	
+
 	@Test
 	public void testAtWithincode() {
 		assertParameterNames(getMethod("oneAnnotation"),"@withincode(a)",new String[]{"a"});
 	}
-	
+
 	@Test
 	public void testAtAnnotation() {
 		assertParameterNames(getMethod("oneAnnotation"),"@annotation(a)",new String[]{"a"});
 	}
-	
+
 	@Test
 	public void testAmbiguousAnnotationTwoVars() {
 		assertException(getMethod("twoAnnotations"),"@annotation(a) && @this(x)",AmbiguousBindingException.class,
 				"Found 2 potential annotation variable(s), and 2 potential argument slots");
 	}
-	
+
 	@Test
 	public void testAmbiguousAnnotationOneVar() {
 		assertException(getMethod("oneAnnotation"),"@annotation(a) && @this(x)",IllegalArgumentException.class,
-		"Found 2 candidate annotation binding variables but only one potential argument binding slot");		
+		"Found 2 candidate annotation binding variables but only one potential argument binding slot");
 	}
 
 	@Test
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
index 9877171a60..e6ca2ce3cf 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
@@ -32,7 +32,7 @@ import test.annotation.transaction.Tx;
 import test.beans.TestBean;
 
 
-/** 
+/**
  * Java5-specific {@link AspectJExpressionPointcutTests}.
  *
  * @author Rod Johnson
@@ -54,10 +54,10 @@ public final class TigerAspectJExpressionPointcutTests {
 			methodsOnHasGeneric.put(m.getName(), m);
 		}
 	}
-	
+
 
 	public static class HasGeneric {
-		
+
 		public void setFriends(List<TestBean> friends) {
 		}
 		public void setEnemies(List<TestBean> enemies) {
@@ -73,20 +73,20 @@ public final class TigerAspectJExpressionPointcutTests {
 		String expression = "execution(* set*(java.util.List<test.beans.TestBean>) )";
 		AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut();
 		ajexp.setExpression(expression);
-		
+
 		// TODO this will currently map, would be nice for optimization
 		//assertTrue(ajexp.matches(HasGeneric.class));
 		//assertFalse(ajexp.matches(TestBean.class));
-		
+
 		Method takesGenericList = methodsOnHasGeneric.get("setFriends");
 		assertTrue(ajexp.matches(takesGenericList, HasGeneric.class));
 		assertTrue(ajexp.matches(methodsOnHasGeneric.get("setEnemies"), HasGeneric.class));
 		assertFalse(ajexp.matches(methodsOnHasGeneric.get("setPartners"), HasGeneric.class));
 		assertFalse(ajexp.matches(methodsOnHasGeneric.get("setPhoneNumbers"), HasGeneric.class));
-		
+
 		assertFalse(ajexp.matches(getAge, TestBean.class));
 	}
-	
+
 	@Test
 	public void testMatchVarargs() throws SecurityException, NoSuchMethodException {
 		class MyTemplate {
@@ -94,20 +94,20 @@ public final class TigerAspectJExpressionPointcutTests {
 		        return 0;
 		    }
 		}
-	
+
 		String expression = "execution(int *.*(String, Object...))";
 		AspectJExpressionPointcut jdbcVarArgs = new AspectJExpressionPointcut();
 		jdbcVarArgs.setExpression(expression);
-		
+
 		// TODO: the expression above no longer matches Object[]
 		// assertFalse(jdbcVarArgs.matches(
 		//        JdbcTemplate.class.getMethod("queryForInt", String.class, Object[].class),
 		//        JdbcTemplate.class));
-		
+
 		assertTrue(jdbcVarArgs.matches(
 				MyTemplate.class.getMethod("queryForInt", String.class, Object[].class),
 				MyTemplate.class));
-		
+
 		Method takesGenericList = methodsOnHasGeneric.get("setFriends");
 		assertFalse(jdbcVarArgs.matches(takesGenericList, HasGeneric.class));
 		assertFalse(jdbcVarArgs.matches(methodsOnHasGeneric.get("setEnemies"), HasGeneric.class));
@@ -115,44 +115,44 @@ public final class TigerAspectJExpressionPointcutTests {
 		assertFalse(jdbcVarArgs.matches(methodsOnHasGeneric.get("setPhoneNumbers"), HasGeneric.class));
 		assertFalse(jdbcVarArgs.matches(getAge, TestBean.class));
 	}
-	
+
 	@Test
 	public void testMatchAnnotationOnClassWithAtWithin() throws SecurityException, NoSuchMethodException {
 		String expression = "@within(test.annotation.transaction.Tx)";
 		testMatchAnnotationOnClass(expression);
 	}
-	
+
 	@Test
 	public void testMatchAnnotationOnClassWithoutBinding() throws SecurityException, NoSuchMethodException {
 		String expression = "within(@test.annotation.transaction.Tx *)";
 		testMatchAnnotationOnClass(expression);
 	}
-	
+
 	@Test
 	public void testMatchAnnotationOnClassWithSubpackageWildcard() throws SecurityException, NoSuchMethodException {
 		String expression = "within(@(test.annotation..*) *)";
 		AspectJExpressionPointcut springAnnotatedPc = testMatchAnnotationOnClass(expression);
-		assertFalse(springAnnotatedPc.matches(TestBean.class.getMethod("setName", String.class), 
+		assertFalse(springAnnotatedPc.matches(TestBean.class.getMethod("setName", String.class),
 				TestBean.class));
-		assertTrue(springAnnotatedPc.matches(SpringAnnotated.class.getMethod("foo", (Class[]) null), 
+		assertTrue(springAnnotatedPc.matches(SpringAnnotated.class.getMethod("foo", (Class[]) null),
 				SpringAnnotated.class));
-		
+
 		expression = "within(@(test.annotation.transaction..*) *)";
 		AspectJExpressionPointcut springTxAnnotatedPc = testMatchAnnotationOnClass(expression);
-		assertFalse(springTxAnnotatedPc.matches(SpringAnnotated.class.getMethod("foo", (Class[]) null), 
+		assertFalse(springTxAnnotatedPc.matches(SpringAnnotated.class.getMethod("foo", (Class[]) null),
 				SpringAnnotated.class));
 	}
-	
+
 	@Test
 	public void testMatchAnnotationOnClassWithExactPackageWildcard() throws SecurityException, NoSuchMethodException {
 		String expression = "within(@(test.annotation.transaction.*) *)";
 		testMatchAnnotationOnClass(expression);
 	}
-	
+
 	private AspectJExpressionPointcut testMatchAnnotationOnClass(String expression) throws SecurityException, NoSuchMethodException {
 		AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut();
 		ajexp.setExpression(expression);
-		
+
 		assertFalse(ajexp.matches(getAge, TestBean.class));
 		assertTrue(ajexp.matches(HasTransactionalAnnotation.class.getMethod("foo", (Class[]) null), HasTransactionalAnnotation.class));
 		assertTrue(ajexp.matches(HasTransactionalAnnotation.class.getMethod("bar", String.class), HasTransactionalAnnotation.class));
@@ -160,13 +160,13 @@ public final class TigerAspectJExpressionPointcutTests {
 		assertFalse(ajexp.matches(BeanA.class.getMethod("setName", String.class), BeanA.class));
 		return ajexp;
 	}
-	
+
 	@Test
 	public void testAnnotationOnMethodWithFQN() throws SecurityException, NoSuchMethodException {
 		String expression = "@annotation(test.annotation.transaction.Tx)";
 		AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut();
 		ajexp.setExpression(expression);
-		
+
 		assertFalse(ajexp.matches(getAge, TestBean.class));
 		assertFalse(ajexp.matches(HasTransactionalAnnotation.class.getMethod("foo", (Class[]) null), HasTransactionalAnnotation.class));
 		assertFalse(ajexp.matches(HasTransactionalAnnotation.class.getMethod("bar", String.class), HasTransactionalAnnotation.class));
@@ -174,13 +174,13 @@ public final class TigerAspectJExpressionPointcutTests {
 		assertTrue(ajexp.matches(BeanA.class.getMethod("getAge", (Class[]) null), BeanA.class));
 		assertFalse(ajexp.matches(BeanA.class.getMethod("setName", String.class), BeanA.class));
 	}
-	
+
 	@Test
 	public void testAnnotationOnMethodWithWildcard() throws SecurityException, NoSuchMethodException {
 		String expression = "execution(@(test.annotation..*) * *(..))";
 		AspectJExpressionPointcut anySpringMethodAnnotation = new AspectJExpressionPointcut();
 		anySpringMethodAnnotation.setExpression(expression);
-		
+
 		assertFalse(anySpringMethodAnnotation.matches(getAge, TestBean.class));
 		assertFalse(anySpringMethodAnnotation.matches(HasTransactionalAnnotation.class.getMethod("foo", (Class[]) null), HasTransactionalAnnotation.class));
 		assertFalse(anySpringMethodAnnotation.matches(HasTransactionalAnnotation.class.getMethod("bar", String.class), HasTransactionalAnnotation.class));
@@ -194,43 +194,43 @@ public final class TigerAspectJExpressionPointcutTests {
 		String expression = "@args(*, test.annotation.EmptySpringAnnotation))";
 		AspectJExpressionPointcut takesSpringAnnotatedArgument2 = new AspectJExpressionPointcut();
 		takesSpringAnnotatedArgument2.setExpression(expression);
-		
+
 		assertFalse(takesSpringAnnotatedArgument2.matches(getAge, TestBean.class));
 		assertFalse(takesSpringAnnotatedArgument2.matches(HasTransactionalAnnotation.class.getMethod("foo", (Class[]) null), HasTransactionalAnnotation.class));
 		assertFalse(takesSpringAnnotatedArgument2.matches(HasTransactionalAnnotation.class.getMethod("bar", String.class), HasTransactionalAnnotation.class));
 		assertFalse(takesSpringAnnotatedArgument2.matches(BeanA.class.getMethod("setName", String.class), BeanA.class));
 		assertFalse(takesSpringAnnotatedArgument2.matches(BeanA.class.getMethod("getAge", (Class[]) null), BeanA.class));
 		assertFalse(takesSpringAnnotatedArgument2.matches(BeanA.class.getMethod("setName", String.class), BeanA.class));
-		
+
 		assertTrue(takesSpringAnnotatedArgument2.matches(
 				ProcessesSpringAnnotatedParameters.class.getMethod("takesAnnotatedParameters", TestBean.class, SpringAnnotated.class),
 				ProcessesSpringAnnotatedParameters.class));
-		
+
 		// True because it maybeMatches with potential argument subtypes
 		assertTrue(takesSpringAnnotatedArgument2.matches(
 				ProcessesSpringAnnotatedParameters.class.getMethod("takesNoAnnotatedParameters", TestBean.class, BeanA.class),
 				ProcessesSpringAnnotatedParameters.class));
-		
+
 		assertFalse(takesSpringAnnotatedArgument2.matches(
 				ProcessesSpringAnnotatedParameters.class.getMethod("takesNoAnnotatedParameters", TestBean.class, BeanA.class),
 				ProcessesSpringAnnotatedParameters.class,
 				new Object[] { new TestBean(), new BeanA()})
 		);
 	}
-	
+
 	@Test
 	public void testAnnotationOnMethodArgumentsWithWildcards() throws SecurityException, NoSuchMethodException {
 		String expression = "execution(* *(*, @(test..*) *))";
 		AspectJExpressionPointcut takesSpringAnnotatedArgument2 = new AspectJExpressionPointcut();
 		takesSpringAnnotatedArgument2.setExpression(expression);
-		
+
 		assertFalse(takesSpringAnnotatedArgument2.matches(getAge, TestBean.class));
 		assertFalse(takesSpringAnnotatedArgument2.matches(HasTransactionalAnnotation.class.getMethod("foo", (Class[]) null), HasTransactionalAnnotation.class));
 		assertFalse(takesSpringAnnotatedArgument2.matches(HasTransactionalAnnotation.class.getMethod("bar", String.class), HasTransactionalAnnotation.class));
 		assertFalse(takesSpringAnnotatedArgument2.matches(BeanA.class.getMethod("setName", String.class), BeanA.class));
 		assertFalse(takesSpringAnnotatedArgument2.matches(BeanA.class.getMethod("getAge", (Class[]) null), BeanA.class));
 		assertFalse(takesSpringAnnotatedArgument2.matches(BeanA.class.getMethod("setName", String.class), BeanA.class));
-		
+
 		assertTrue(takesSpringAnnotatedArgument2.matches(
 				ProcessesSpringAnnotatedParameters.class.getMethod("takesAnnotatedParameters", TestBean.class, SpringAnnotated.class),
 				ProcessesSpringAnnotatedParameters.class));
@@ -267,7 +267,7 @@ public final class TigerAspectJExpressionPointcutTests {
 		}
 	}
 
-	
+
 	static class BeanA {
 		private String name;
 
@@ -283,7 +283,7 @@ public final class TigerAspectJExpressionPointcutTests {
 		}
 	}
 
-	
+
 	@Tx
 	static class BeanB {
 		private String name;
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
index 227c1553c3..2d8acfe992 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
@@ -67,7 +67,7 @@ public class TrickyAspectJPointcutExpressionTests {
 
 		// Test with default class loader first...
 		testAdvice(new DefaultPointcutAdvisor(pointcut, logAdvice), logAdvice, new TestServiceImpl(), "TestServiceImpl");
-		
+
 		// Then try again with a different class loader on the target...
 		SimpleThrowawayClassLoader loader = new SimpleThrowawayClassLoader(new TestServiceImpl().getClass().getClassLoader());
 		// Make sure the interface is loaded from the  parent class loader
@@ -102,7 +102,7 @@ public class TrickyAspectJPointcutExpressionTests {
 		}
 		assertEquals(1, logAdvice.getCountThrows());
 	}
-	
+
 	public static class SimpleThrowawayClassLoader extends OverridingClassLoader {
 
 		/**
@@ -114,7 +114,7 @@ public class TrickyAspectJPointcutExpressionTests {
 		}
 
 	}
-	
+
 	public static class TestException extends RuntimeException {
 
 		public TestException(String string) {
@@ -129,11 +129,11 @@ public class TrickyAspectJPointcutExpressionTests {
 	@Inherited
 	public static @interface Log {
 	}
-	
+
 	public static interface TestService {
 	    public String sayHello();
 	}
-	
+
 	@Log
 	public static class TestServiceImpl implements TestService{
 	    public String sayHello() {
@@ -142,11 +142,11 @@ public class TrickyAspectJPointcutExpressionTests {
 	}
 
 	public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice {
-		
+
 		private int countBefore = 0;
-		
+
 		private int countThrows = 0;
-		
+
 		public void before(Method method, Object[] objects, Object o) throws Throwable {
 			countBefore++;
 	    }
@@ -163,12 +163,12 @@ public class TrickyAspectJPointcutExpressionTests {
 		public int getCountThrows() {
 			return countThrows;
 		}
-		
+
 		public void reset() {
 			countThrows = 0;
 			countBefore = 0;
 		}
 
 	}
-	
+
 }
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
index c3708d6b86..7b6811aee8 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
@@ -63,7 +63,7 @@ public final class TypePatternClassFilterTests {
 		assertFalse("Must be excluded: not subclass", tpcf.matches(IOther.class));
 		assertFalse("Must be excluded: not subclass", tpcf.matches(DefaultListableBeanFactory.class));
 	}
-	
+
 	@Test
 	public void testAndOrNotReplacement() {
 		TypePatternClassFilter tpcf = new TypePatternClassFilter("java.lang.Object or java.lang.String");
@@ -75,7 +75,7 @@ public final class TypePatternClassFilterTests {
 		assertFalse("matches Double",tpcf.matches(Double.class));
 		tpcf = new TypePatternClassFilter("java.lang.Number+ and not java.lang.Float");
 		assertFalse("matches Float",tpcf.matches(Float.class));
-		assertTrue("matches Double",tpcf.matches(Double.class));	
+		assertTrue("matches Double",tpcf.matches(Double.class));
 	}
 
 	@Test(expected=IllegalArgumentException.class)
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
index 1c366a7042..89716a8789 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
@@ -76,7 +76,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 	 * @return the fixture
 	 */
 	protected abstract AspectJAdvisorFactory getFixture();
-	
+
 
 	@Test
 	public void testRejectsPerCflowAspect() {
@@ -88,7 +88,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 			assertTrue(ex.getMessage().indexOf("PERCFLOW") != -1);
 		}
 	}
-	
+
 	@Test
 	public void testRejectsPerCflowBelowAspect() {
 		try {
@@ -105,11 +105,11 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
-		TestBean itb = (TestBean) createProxy(target, 
+		TestBean itb = (TestBean) createProxy(target,
 				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new PerTargetAspect(), "someBean")),
 				TestBean.class);
 		assertEquals("Around advice must NOT apply", realAge, itb.getAge());
-		
+
 		Advised advised = (Advised) itb;
 		SyntheticInstantiationAdvisor sia = (SyntheticInstantiationAdvisor) advised.getAdvisors()[1];
 		assertTrue(sia.getPointcut().getMethodMatcher().matches(TestBean.class.getMethod("getSpouse"), null));
@@ -121,10 +121,10 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		// Check that the perclause pointcut is valid
 		assertTrue(maaif.getAspectMetadata().getPerClausePointcut().getMethodMatcher().matches(TestBean.class.getMethod("getSpouse"), null));
 		assertNotSame(imapa.getDeclaredPointcut(), imapa.getPointcut());
-		
+
 		// Hit the method in the per clause to instantiate the aspect
 		itb.getSpouse();
-		
+
 		assertTrue(maaif.isMaterialized());
 
 		assertEquals("Around advice must apply", 0, itb.getAge());
@@ -190,11 +190,11 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
-		TestBean itb = (TestBean) createProxy(target, 
+		TestBean itb = (TestBean) createProxy(target,
 				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new PerThisAspect(), "someBean")),
 				TestBean.class);
 		assertEquals("Around advice must NOT apply", realAge, itb.getAge());
-		
+
 		Advised advised = (Advised) itb;
 		// Will be ExposeInvocationInterceptor, synthetic instantiation advisor, 2 method advisors
 		assertEquals(4, advised.getAdvisors().length);
@@ -208,30 +208,30 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		// Check that the perclause pointcut is valid
 		assertTrue(maaif.getAspectMetadata().getPerClausePointcut().getMethodMatcher().matches(TestBean.class.getMethod("getSpouse"), null));
 		assertNotSame(imapa.getDeclaredPointcut(), imapa.getPointcut());
-		
+
 		// Hit the method in the per clause to instantiate the aspect
 		itb.getSpouse();
-		
+
 		assertTrue(maaif.isMaterialized());
 
 		assertTrue(imapa.getDeclaredPointcut().getMethodMatcher().matches(TestBean.class.getMethod("getAge"), null));
-	
+
 		assertEquals("Around advice must apply", 0, itb.getAge());
 		assertEquals("Around advice must apply", 1, itb.getAge());
 	}
-	
+
 	@Test
 	public void testPerTypeWithinAspect() throws SecurityException, NoSuchMethodException {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
 		PerTypeWithinAspectInstanceFactory aif = new PerTypeWithinAspectInstanceFactory();
-		TestBean itb = (TestBean) createProxy(target, 
-				getFixture().getAdvisors(aif), 
+		TestBean itb = (TestBean) createProxy(target,
+				getFixture().getAdvisors(aif),
 				TestBean.class);
 		assertEquals("No method calls", 0, aif.getInstantiationCount());
 		assertEquals("Around advice must now apply", 0, itb.getAge());
-		
+
 		Advised advised = (Advised) itb;
 		// Will be ExposeInvocationInterceptor, synthetic instantiation advisor, 2 method advisors
 		assertEquals(4, advised.getAdvisors().length);
@@ -245,19 +245,19 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		// Check that the perclause pointcut is valid
 		assertTrue(maaif.getAspectMetadata().getPerClausePointcut().getMethodMatcher().matches(TestBean.class.getMethod("getSpouse"), null));
 		assertNotSame(imapa.getDeclaredPointcut(), imapa.getPointcut());
-		
+
 		// Hit the method in the per clause to instantiate the aspect
 		itb.getSpouse();
-		
+
 		assertTrue(maaif.isMaterialized());
 
 		assertTrue(imapa.getDeclaredPointcut().getMethodMatcher().matches(TestBean.class.getMethod("getAge"), null));
-	
+
 		assertEquals("Around advice must still apply", 1, itb.getAge());
 		assertEquals("Around advice must still apply", 2, itb.getAge());
-		
-		TestBean itb2 = (TestBean) createProxy(target, 
-				getFixture().getAdvisors(aif), 
+
+		TestBean itb2 = (TestBean) createProxy(target,
+				getFixture().getAdvisors(aif),
 				TestBean.class);
 		assertEquals(1, aif.getInstantiationCount());
 		assertEquals("Around advice be independent for second instance", 0, itb2.getAge());
@@ -282,20 +282,20 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 	@Test
 	public void testNamedPointcutFromAspectLibraryWithBinding() {
 		TestBean target = new TestBean();
-		ITestBean itb = (ITestBean) createProxy(target, 
-				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new NamedPointcutAspectFromLibraryWithBinding(),"someBean")), 
+		ITestBean itb = (ITestBean) createProxy(target,
+				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new NamedPointcutAspectFromLibraryWithBinding(),"someBean")),
 				ITestBean.class);
 		itb.setAge(10);
 		assertEquals("Around advice must apply", 20, itb.getAge());
 		assertEquals(20,target.getAge());
 	}
-	
+
 	private void testNamedPointcuts(Object aspectInstance) {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
-		ITestBean itb = (ITestBean) createProxy(target, 
-				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(aspectInstance,"someBean")), 
+		ITestBean itb = (ITestBean) createProxy(target,
+				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(aspectInstance,"someBean")),
 				ITestBean.class);
 		assertEquals("Around advice must apply", -1, itb.getAge());
 		assertEquals(realAge, target.getAge());
@@ -304,8 +304,8 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 	@Test
 	public void testBindingWithSingleArg() {
 		TestBean target = new TestBean();
-		ITestBean itb = (ITestBean) createProxy(target, 
-				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new BindingAspectWithSingleArg(),"someBean")), 
+		ITestBean itb = (ITestBean) createProxy(target,
+				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new BindingAspectWithSingleArg(),"someBean")),
 				ITestBean.class);
 		itb.setAge(10);
 		assertEquals("Around advice must apply", 20, itb.getAge());
@@ -315,10 +315,10 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 	@Test
 	public void testBindingWithMultipleArgsDifferentlyOrdered() {
 		ManyValuedArgs target = new ManyValuedArgs();
-		ManyValuedArgs mva = (ManyValuedArgs) createProxy(target, 
-				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new ManyValuedArgs(),"someBean")), 
+		ManyValuedArgs mva = (ManyValuedArgs) createProxy(target,
+				getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new ManyValuedArgs(),"someBean")),
 				ManyValuedArgs.class);
-		
+
 		String a = "a";
 		int b = 12;
 		int c = 25;
@@ -327,7 +327,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		String expectedResult = a + b+ c + d + e;
 		assertEquals(expectedResult, mva.mungeArgs(a, b, c, d, e));
 	}
-	
+
 	/**
 	 * In this case the introduction will be made.
 	 */
@@ -344,7 +344,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		assertFalse(lockable.locked());
 		lockable.lock();
 		assertTrue(lockable.locked());
-		
+
 		NotLockable notLockable2Target = new NotLockable();
 		NotLockable notLockable2 = (NotLockable) createProxy(notLockable2Target,
 				getFixture().getAdvisors(
@@ -363,17 +363,17 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		}
 		assertTrue(lockable2.locked());
 	}
-	
+
 	@Test
 	public void testIntroductionAdvisorExcludedFromTargetImplementingInterface() {
 		assertTrue(AopUtils.findAdvisorsThatCanApply(
 						getFixture().getAdvisors(
 									new SingletonMetadataAwareAspectInstanceFactory(
-											new MakeLockable(),"someBean")), 
+											new MakeLockable(),"someBean")),
 						CannotBeUnlocked.class).isEmpty());
 		assertEquals(2, AopUtils.findAdvisorsThatCanApply(getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(),"someBean")), NotLockable.class).size());
 	}
-	
+
 	@Test
 	public void testIntroductionOnTargetImplementingInterface() {
 		CannotBeUnlocked target = new CannotBeUnlocked();
@@ -398,7 +398,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 			// Ok
 		}
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	@Test
 	public void testIntroductionOnTargetExcludedByTypePattern() {
@@ -415,7 +415,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 	@Test
 	public void testIntroductionBasedOnAnnotationMatch_Spr5307() {
 		AnnotatedTarget target = new AnnotatedTargetImpl();
-		
+
 		List<Advisor> advisors = getFixture().getAdvisors(
 				new SingletonMetadataAwareAspectInstanceFactory(new MakeAnnotatedTypeModifiable(),"someBean"));
 		Object proxy = createProxy(target,
@@ -430,19 +430,19 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 	// TODO: Why does this test fail? It hasn't been run before, so it maybe never actually passed...
 	public void XtestIntroductionWithArgumentBinding() {
 		TestBean target = new TestBean();
-		
+
 		List<Advisor> advisors = getFixture().getAdvisors(
 				new SingletonMetadataAwareAspectInstanceFactory(new MakeITestBeanModifiable(),"someBean"));
 		advisors.addAll(getFixture().getAdvisors(
 				new SingletonMetadataAwareAspectInstanceFactory(new MakeLockable(),"someBean")));
-		
+
 		Modifiable modifiable = (Modifiable) createProxy(target,
 				advisors,
 				ITestBean.class);
 		assertTrue(modifiable instanceof Modifiable);
 		Lockable lockable = (Lockable) modifiable;
 		assertFalse(lockable.locked());
-		
+
 		ITestBean itb = (ITestBean) modifiable;
 		assertFalse(modifiable.isModified());
 		int oldAge = itb.getAge();
@@ -454,7 +454,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		assertFalse("Setting same value does not modify", modifiable.isModified());
 		itb.setName("And now for something completely different");
 		assertTrue(modifiable.isModified());
-		
+
 		lockable.lock();
 		assertTrue(lockable.locked());
 		try {
@@ -474,8 +474,8 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		UnsupportedOperationException expectedException = new UnsupportedOperationException();
 		List<Advisor> advisors = getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new ExceptionAspect(expectedException),"someBean"));
 		assertEquals("One advice method was found", 1, advisors.size());
-		ITestBean itb = (ITestBean) createProxy(target, 
-				advisors, 
+		ITestBean itb = (ITestBean) createProxy(target,
+				advisors,
 				ITestBean.class);
 		try {
 			itb.getAge();
@@ -485,7 +485,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 			assertSame(expectedException, ex);
 		}
 	}
-	
+
 	// TODO document this behaviour.
 	// Is it different AspectJ behaviour, at least for checked exceptions?
 	@Test
@@ -494,8 +494,8 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		RemoteException expectedException = new RemoteException();
 		List<Advisor> advisors = getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(new ExceptionAspect(expectedException),"someBean"));
 		assertEquals("One advice method was found", 1, advisors.size());
-		ITestBean itb = (ITestBean) createProxy(target, 
-				advisors, 
+		ITestBean itb = (ITestBean) createProxy(target,
+				advisors,
 				ITestBean.class);
 		try {
 			itb.getAge();
@@ -505,7 +505,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 			assertSame(expectedException, ex.getCause());
 		}
 	}
-	
+
 	protected Object createProxy(Object target, List<Advisor> advisors, Class<?>... interfaces) {
 		ProxyFactory pf = new ProxyFactory(target);
 		if (interfaces.length > 1 || interfaces[0].isInterface()) {
@@ -533,8 +533,8 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		TwoAdviceAspect twoAdviceAspect = new TwoAdviceAspect();
 		List<Advisor> advisors = getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(twoAdviceAspect,"someBean"));
 		assertEquals("Two advice methods found", 2, advisors.size());
-		ITestBean itb = (ITestBean) createProxy(target, 
-				advisors, 
+		ITestBean itb = (ITestBean) createProxy(target,
+				advisors,
 				ITestBean.class);
 		itb.setName("");
 		assertEquals(0, itb.getAge());
@@ -549,8 +549,8 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 
 		ExceptionHandling afterReturningAspect = new ExceptionHandling();
 		List<Advisor> advisors = getFixture().getAdvisors(new SingletonMetadataAwareAspectInstanceFactory(afterReturningAspect,"someBean"));
-		Echo echo = (Echo) createProxy(target, 
-				advisors, 
+		Echo echo = (Echo) createProxy(target,
+				advisors,
 				Echo.class);
 		assertEquals(0, afterReturningAspect.successCount);
 		assertEquals("", echo.echo(""));
@@ -886,45 +886,45 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
  */
 @Aspect
 abstract class AbstractMakeModifiable {
-	
+
 	public interface MutableModifable extends Modifiable {
 		void markDirty();
 	}
-	
+
 	public static class ModifiableImpl implements MutableModifable {
 		private boolean modified;
-		
+
 		public void acceptChanges() {
 			modified = false;
 		}
-		
+
 		public boolean isModified() {
 			return modified;
 		}
-		
+
 		public void markDirty() {
 			this.modified = true;
 		}
 	}
-	
-	@Before(value="execution(void set*(*)) && this(modifiable) && args(newValue)", 
+
+	@Before(value="execution(void set*(*)) && this(modifiable) && args(newValue)",
 			argNames="modifiable,newValue")
-	public void recordModificationIfSetterArgumentDiffersFromOldValue(JoinPoint jp, 
+	public void recordModificationIfSetterArgumentDiffersFromOldValue(JoinPoint jp,
 		MutableModifable mixin, Object newValue) {
-		
+
 		/*
 		 * We use the mixin to check and, if necessary, change,
-		 * modification status. We need the JoinPoint to get the 
-		 * setter method. We use newValue for comparison. 
+		 * modification status. We need the JoinPoint to get the
+		 * setter method. We use newValue for comparison.
 		 * We try to invoke the getter if possible.
 		 */
-		
+
 		if (mixin.isModified()) {
 			// Already changed, don't need to change again
 			//System.out.println("changed");
 			return;
 		}
-		
+
 		// Find the current raw value, by invoking the corresponding setter
 		Method correspondingGetter =  getGetterFromSetter(((MethodSignature) jp.getSignature()).getMethod());
 		boolean modified = true;
@@ -946,12 +946,12 @@ abstract class AbstractMakeModifiable {
 			mixin.markDirty();
 		}
 	}
-	
+
 	private Method getGetterFromSetter(Method setter) {
 		String getterName = setter.getName().replaceFirst("set", "get");
 		try {
 			return setter.getDeclaringClass().getMethod(getterName, (Class[]) null);
-		} 
+		}
 		catch (NoSuchMethodException ex) {
 			// must be write only
 			return null;
@@ -968,7 +968,7 @@ abstract class AbstractMakeModifiable {
  */
 @Aspect
 class MakeITestBeanModifiable extends AbstractMakeModifiable {
-	
+
 	@DeclareParents(value = "test.beans.ITestBean+",
 			defaultImpl=ModifiableImpl.class)
 	public static MutableModifable mixin;
@@ -982,7 +982,7 @@ class MakeITestBeanModifiable extends AbstractMakeModifiable {
  */
 @Aspect
 class MakeAnnotatedTypeModifiable extends AbstractMakeModifiable {
-	
+
 	@DeclareParents(value = "(@org.springframework.aop.aspectj.annotation.Measured *)",
 //	@DeclareParents(value = "(@Measured *)", // this would be a nice alternative...
 			defaultImpl=DefaultLockable.class)
@@ -996,11 +996,11 @@ class MakeAnnotatedTypeModifiable extends AbstractMakeModifiable {
  */
 @Aspect
 class MakeLockable {
-	
+
 	@DeclareParents(value = "org.springframework..*",
 			defaultImpl=DefaultLockable.class)
 	public static Lockable mixin;
-	
+
 	@Before(value="execution(void set*(*)) && this(mixin)", argNames="mixin")
 	public void checkNotLocked(
 		Lockable mixin)  // Bind to arg
@@ -1043,9 +1043,9 @@ class CannotBeUnlocked implements Lockable, Comparable<Object> {
 interface Modifiable {
 
 	boolean isModified();
-	
+
 	void acceptChanges();
-	
+
 }
 
 /**
@@ -1057,14 +1057,14 @@ interface AnnotatedTarget {
 
 @Measured
 class AnnotatedTargetImpl implements AnnotatedTarget {
-	
+
 }
 
 @Retention(RetentionPolicy.RUNTIME)
 @interface Measured {}
 
 class NotLockable {
-	
+
 	private int intValue;
 
 	public int getIntValue() {
@@ -1097,5 +1097,5 @@ class PerThisAspect {
 	public void countSetter() {
 		++count;
 	}
-	
+
 }
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
index 5f108cb56d..ebb9f03c43 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
@@ -44,7 +44,7 @@ public final class ArgumentBindingTests {
 		TestBean tb = new TestBean();
 		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(tb);
 		proxyFactory.addAspect(NamedPointcutWithArgs.class);
-		
+
 		ITestBean proxiedTestBean = (ITestBean) proxyFactory.getProxy();
 		proxiedTestBean.setName("Supercalifragalisticexpialidocious"); // should throw
 	}
@@ -54,7 +54,7 @@ public final class ArgumentBindingTests {
 		TransactionalBean tb = new TransactionalBean();
 		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(tb);
 		proxyFactory.addAspect(PointcutWithAnnotationArgument.class);
-		
+
 		ITransactionalBean proxiedTestBean = (ITransactionalBean) proxyFactory.getProxy();
 		proxiedTestBean.doInTransaction(); // should throw
 	}
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
index ead9f1f62c..1627f57d69 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
@@ -29,56 +29,56 @@ import test.beans.TestBean;
 
 
 /**
- * @author Rod Johnson 
+ * @author Rod Johnson
  * @author Chris Beams
  */
 public final class AspectJPointcutAdvisorTests {
-	
+
 	private AspectJAdvisorFactory af = new ReflectiveAspectJAdvisorFactory();
 
 	@Test
 	public void testSingleton() throws SecurityException, NoSuchMethodException {
 		AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut();
 		ajexp.setExpression(AspectJExpressionPointcutTests.MATCH_ALL_METHODS);
-		
-		InstantiationModelAwarePointcutAdvisorImpl ajpa = new InstantiationModelAwarePointcutAdvisorImpl(af, ajexp, 
-				new SingletonMetadataAwareAspectInstanceFactory(new AbstractAspectJAdvisorFactoryTests.ExceptionAspect(null),"someBean"), 
+
+		InstantiationModelAwarePointcutAdvisorImpl ajpa = new InstantiationModelAwarePointcutAdvisorImpl(af, ajexp,
+				new SingletonMetadataAwareAspectInstanceFactory(new AbstractAspectJAdvisorFactoryTests.ExceptionAspect(null),"someBean"),
 				TestBean.class.getMethod("getAge", (Class[]) null),1,"someBean");
 		assertSame(Pointcut.TRUE, ajpa.getAspectMetadata().getPerClausePointcut());
 		assertFalse(ajpa.isPerInstance());
 	}
-	
+
 	@Test
 	public void testPerTarget() throws SecurityException, NoSuchMethodException {
 		AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut();
 		ajexp.setExpression(AspectJExpressionPointcutTests.MATCH_ALL_METHODS);
-		
-		InstantiationModelAwarePointcutAdvisorImpl ajpa = new InstantiationModelAwarePointcutAdvisorImpl(af, ajexp, 
+
+		InstantiationModelAwarePointcutAdvisorImpl ajpa = new InstantiationModelAwarePointcutAdvisorImpl(af, ajexp,
 				new SingletonMetadataAwareAspectInstanceFactory(new PerTargetAspect(),"someBean"), null, 1, "someBean");
 		assertNotSame(Pointcut.TRUE, ajpa.getAspectMetadata().getPerClausePointcut());
 		assertTrue(ajpa.getAspectMetadata().getPerClausePointcut() instanceof AspectJExpressionPointcut);
 		assertTrue(ajpa.isPerInstance());
-		
+
 		assertTrue(ajpa.getAspectMetadata().getPerClausePointcut().getClassFilter().matches(TestBean.class));
 		assertFalse(ajpa.getAspectMetadata().getPerClausePointcut().getMethodMatcher().matches(
 				TestBean.class.getMethod("getAge", (Class[]) null),
 				TestBean.class));
-		
+
 		assertTrue(ajpa.getAspectMetadata().getPerClausePointcut().getMethodMatcher().matches(
 				TestBean.class.getMethod("getSpouse", (Class[]) null),
 				TestBean.class));
 	}
-	
+
 	@Test(expected=AopConfigException.class)
 	public void testPerCflowTarget() {
 		testIllegalInstantiationModel(AbstractAspectJAdvisorFactoryTests.PerCflowAspect.class);
 	}
-	
+
 	@Test(expected=AopConfigException.class)
 	public void testPerCflowBelowTarget() {
 		testIllegalInstantiationModel(AbstractAspectJAdvisorFactoryTests.PerCflowBelowAspect.class);
 	}
-	
+
 	private void testIllegalInstantiationModel(Class<?> c) throws AopConfigException {
 		new AspectMetadata(c,"someBean");
 	}
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
index f1c32fe992..472b495a50 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -37,7 +37,7 @@ public final class AspectMetadataTests {
 	public void testNotAnAspect() {
 		new AspectMetadata(String.class,"someBean");
 	}
-	
+
 	@Test
 	public void testSingletonAspect() {
 		AspectMetadata am = new AspectMetadata(ExceptionAspect.class,"someBean");
@@ -45,7 +45,7 @@ public final class AspectMetadataTests {
 		assertSame(Pointcut.TRUE, am.getPerClausePointcut());
 		assertEquals(PerClauseKind.SINGLETON, am.getAjType().getPerClause().getKind());
 	}
-	
+
 	@Test
 	public void testPerTargetAspect() {
 		AspectMetadata am = new AspectMetadata(PerTargetAspect.class,"someBean");
@@ -53,7 +53,7 @@ public final class AspectMetadataTests {
 		assertNotSame(Pointcut.TRUE, am.getPerClausePointcut());
 		assertEquals(PerClauseKind.PERTARGET, am.getAjType().getPerClause().getKind());
 	}
-	
+
 	@Test
 	public void testPerThisAspect() {
 		AspectMetadata am = new AspectMetadata(PerThisAspect.class,"someBean");
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java
index 9cb01199f0..085e8c5d9f 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java
@@ -17,7 +17,7 @@
 package org.springframework.aop.aspectj.annotation;
 
 /**
- * Tests for ReflectiveAtAspectJAdvisorFactory. 
+ * Tests for ReflectiveAtAspectJAdvisorFactory.
  * Tests are inherited: we only set the test fixture here.
  *
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
index 0869a1fa02..8af3a40d8a 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
@@ -42,9 +42,9 @@ import org.springframework.aop.support.DefaultPointcutAdvisor;
 public final class AspectJPrecedenceComparatorTests {
 
 	/*
-	 * Specification for the comparator (as defined in the 
+	 * Specification for the comparator (as defined in the
 	 * AspectJPrecedenceComparator class)
-	 * 
+	 *
 	 * <p>
 	 * Orders AspectJ advice/advisors by invocation order.
 	 * </p>
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
index de36eb98b6..de575c8842 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
@@ -43,18 +43,18 @@ import test.parsing.CollectingReaderEventListener;
 public final class AopNamespaceHandlerEventTests {
 
 	private static final Class<?> CLASS = AopNamespaceHandlerEventTests.class;
-	
+
 	private static final Resource CONTEXT =  qualifiedResource(CLASS, "context.xml");
 	private static final Resource POINTCUT_EVENTS_CONTEXT =  qualifiedResource(CLASS, "pointcutEvents.xml");
 	private static final Resource POINTCUT_REF_CONTEXT = qualifiedResource(CLASS, "pointcutRefEvents.xml");
 	private static final Resource DIRECT_POINTCUT_EVENTS_CONTEXT = qualifiedResource(CLASS, "directPointcutEvents.xml");
-	
+
 	private CollectingReaderEventListener eventListener = new CollectingReaderEventListener();
 
 	private XmlBeanDefinitionReader reader;
 
 	private DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
-	
+
 
 
 	@Before
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
index 860e3dd0ba..fcb34b4012 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
@@ -29,7 +29,7 @@ import org.springframework.beans.factory.xml.XmlBeanFactory;
  * @author Chris Beams
  */
 public final class AopNamespaceHandlerPointcutErrorTests {
-	
+
 	@Test
 	public void testDuplicatePointcutConfig() {
 		try {
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
index 353df218fa..40209c7d7b 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
@@ -26,12 +26,12 @@ import org.springframework.core.io.Resource;
 
 /**
  * Tests that the &lt;aop:config/&gt; element can be used as a top level element.
- * 
+ *
  * @author Rob Harrop
  * @author Chris Beams
  */
 public final class TopLevelAopTagTests {
-	
+
 	private static final Resource CONTEXT = qualifiedResource(TopLevelAopTagTests.class, "context.xml");
 
 	@Test
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
index dda6cf20b1..fc5268c840 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
@@ -35,7 +35,7 @@ import test.beans.TestBean;
  * @author Chris Beams
  */
 public final class AopProxyUtilsTests {
-	
+
 	@Test
 	public void testCompleteProxiedInterfacesWorksWithNull() {
 		AdvisedSupport as = new AdvisedSupport();
@@ -45,7 +45,7 @@ public final class AopProxyUtilsTests {
 		assertTrue(ifaces.contains(Advised.class));
 		assertTrue(ifaces.contains(SpringProxy.class));
 	}
-	
+
 	@Test
 	public void testCompleteProxiedInterfacesWorksWithNullOpaque() {
 		AdvisedSupport as = new AdvisedSupport();
@@ -53,7 +53,7 @@ public final class AopProxyUtilsTests {
 		Class<?>[] completedInterfaces = AopProxyUtils.completeProxiedInterfaces(as);
 		assertEquals(1, completedInterfaces.length);
 	}
-	
+
 	@Test
 	public void testCompleteProxiedInterfacesAdvisedNotIncluded() {
 		AdvisedSupport as = new AdvisedSupport();
@@ -61,14 +61,14 @@ public final class AopProxyUtilsTests {
 		as.addInterface(Comparable.class);
 		Class<?>[] completedInterfaces = AopProxyUtils.completeProxiedInterfaces(as);
 		assertEquals(4, completedInterfaces.length);
-		
+
 		// Can't assume ordering for others, so use a list
 		List<?> l = Arrays.asList(completedInterfaces);
 		assertTrue(l.contains(Advised.class));
 		assertTrue(l.contains(ITestBean.class));
 		assertTrue(l.contains(Comparable.class));
 	}
-	
+
 	@Test
 	public void testCompleteProxiedInterfacesAdvisedIncluded() {
 		AdvisedSupport as = new AdvisedSupport();
@@ -77,14 +77,14 @@ public final class AopProxyUtilsTests {
 		as.addInterface(Advised.class);
 		Class<?>[] completedInterfaces = AopProxyUtils.completeProxiedInterfaces(as);
 		assertEquals(4, completedInterfaces.length);
-		
+
 		// Can't assume ordering for others, so use a list
 		List<?> l = Arrays.asList(completedInterfaces);
 		assertTrue(l.contains(Advised.class));
 		assertTrue(l.contains(ITestBean.class));
 		assertTrue(l.contains(Comparable.class));
 	}
-	
+
 	@Test
 	public void testCompleteProxiedInterfacesAdvisedNotIncludedOpaque() {
 		AdvisedSupport as = new AdvisedSupport();
@@ -93,7 +93,7 @@ public final class AopProxyUtilsTests {
 		as.addInterface(Comparable.class);
 		Class<?>[] completedInterfaces = AopProxyUtils.completeProxiedInterfaces(as);
 		assertEquals(3, completedInterfaces.length);
-		
+
 		// Can't assume ordering for others, so use a list
 		List<?> l = Arrays.asList(completedInterfaces);
 		assertFalse(l.contains(Advised.class));
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
index a8623ba81c..9de8964805 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -25,9 +25,9 @@ import test.beans.TestBean;
 
 /**
  * Benchmarks for introductions.
- * 
+ *
  * NOTE: No assertions!
- * 
+ *
  * @author Rod Johnson
  * @author Chris Beams
  * @since 2.0
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
index 4fdbbc0126..9b10226119 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -34,7 +34,7 @@ import test.beans.TestBean;
  * @since 14.03.2003
  */
 public final class MethodInvocationTests {
-	
+
 	@Test
 	public void testValidInvocation() throws Throwable {
 		Method m = Object.class.getMethod("hashCode", (Class[]) null);
@@ -52,7 +52,7 @@ public final class MethodInvocationTests {
 		Object rv = invocation.proceed();
 		assertTrue("correct response", rv == returnValue);
 	}
-	
+
 	/**
 	 * toString on target can cause failure.
 	 */
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
index fd4eae3a7f..814b902540 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
@@ -31,7 +31,7 @@ import org.springframework.core.io.Resource;
  * @since 03.09.2004
  */
 public final class PrototypeTargetTests {
-	
+
 	private static final Resource CONTEXT = qualifiedResource(PrototypeTargetTests.class, "context.xml");
 
 	@Test
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
index f7d325e4c5..f8999fe674 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
@@ -64,7 +64,7 @@ public final class ProxyFactoryTests {
 		assertEquals(1, pf.indexOf(advisor));
 		assertEquals(-1, advised.indexOf(new DefaultPointcutAdvisor(null)));
 	}
-	
+
 	@Test
 	public void testRemoveAdvisorByReference() {
 		TestBean target = new TestBean();
@@ -84,7 +84,7 @@ public final class ProxyFactoryTests {
 		assertEquals(2, nop.getCount());
 		assertFalse(pf.removeAdvisor(new DefaultPointcutAdvisor(null)));
 	}
-	
+
 	@Test
 	public void testRemoveAdvisorByIndex() {
 		TestBean target = new TestBean();
@@ -113,7 +113,7 @@ public final class ProxyFactoryTests {
 		assertEquals(1, cba.getCalls());
 		assertEquals(2, nop.getCount());
 		assertEquals(3, nop2.getCount());
-		
+
 		// Check out of bounds
 		try {
 			pf.removeAdvisor(-1);
@@ -121,14 +121,14 @@ public final class ProxyFactoryTests {
 		catch (AopConfigException ex) {
 			// Ok
 		}
-		
+
 		try {
 			pf.removeAdvisor(2);
 		}
 		catch (AopConfigException ex) {
 			// Ok
 		}
-		
+
 		assertEquals(5, proxied.getAge());
 		assertEquals(4, nop2.getCount());
 	}
@@ -191,17 +191,17 @@ public final class ProxyFactoryTests {
 		assertEquals("Found correct number of interfaces", 3, factory.getProxiedInterfaces().length);
 		ITestBean tb = (ITestBean) factory.getProxy();
 		assertThat("Picked up secondary interface", tb, instanceOf(IOther.class));
-				
+
 		raw.setAge(25);
 		assertTrue(tb.getAge() == raw.getAge());
 
 		long t = 555555L;
 		TimestampIntroductionInterceptor ti = new TimestampIntroductionInterceptor(t);
-		
+
 		Class<?>[] oldProxiedInterfaces = factory.getProxiedInterfaces();
-		
+
 		factory.addAdvisor(0, new DefaultIntroductionAdvisor(ti, TimeStamped.class));
-		
+
 		Class<?>[] newProxiedInterfaces = factory.getProxiedInterfaces();
 		assertEquals("Advisor proxies one more interface after introduction", oldProxiedInterfaces.length + 1, newProxiedInterfaces.length);
 
@@ -210,7 +210,7 @@ public final class ProxyFactoryTests {
 		// Shouldn't fail;
 		 ((IOther) ts).absquatulate();
 	}
-	
+
 	@Test
 	public void testInterceptorInclusionMethods() {
 		class MyInterceptor implements MethodInterceptor {
@@ -218,7 +218,7 @@ public final class ProxyFactoryTests {
 				throw new UnsupportedOperationException();
 			}
 		}
-		
+
 		NopInterceptor di = new NopInterceptor();
 		NopInterceptor diUnused = new NopInterceptor();
 		ProxyFactory factory = new ProxyFactory(new TestBean());
@@ -228,7 +228,7 @@ public final class ProxyFactoryTests {
 		assertTrue(!factory.adviceIncluded(diUnused));
 		assertTrue(factory.countAdvicesOfType(NopInterceptor.class) == 1);
 		assertTrue(factory.countAdvicesOfType(MyInterceptor.class) == 0);
-	
+
 		factory.addAdvice(0, diUnused);
 		assertTrue(factory.adviceIncluded(diUnused));
 		assertTrue(factory.countAdvicesOfType(NopInterceptor.class) == 2);
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
index 6ac026fcbf..cd7f8b8bda 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
@@ -34,7 +34,7 @@ public final class DebugInterceptorTests {
 	@Test
 	public void testSunnyDayPathLogsCorrectly() throws Throwable {
 		Log log = createMock(Log.class);
-		
+
 		MethodInvocation methodInvocation = createMock(MethodInvocation.class);
 
 		expect(log.isTraceEnabled()).andReturn(true);
@@ -56,7 +56,7 @@ public final class DebugInterceptorTests {
 	@Test
 	public void testExceptionPathStillLogsCorrectly() throws Throwable {
 		Log log = createMock(Log.class);
-		
+
 		MethodInvocation methodInvocation = createMock(MethodInvocation.class);
 
 		expect(log.isTraceEnabled()).andReturn(true);
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
index cc105bebcd..c5f6cf8fe4 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -30,20 +30,20 @@ import test.beans.TestBean;
  * @author Chris Beams
  */
 public final class ExposeBeanNameAdvisorsTests {
-	
+
 	private class RequiresBeanNameBoundTestBean extends TestBean {
 		private final String beanName;
-	
+
 		public RequiresBeanNameBoundTestBean(String beanName) {
 			this.beanName = beanName;
 		}
-		
+
 		public int getAge() {
 			assertEquals(beanName, ExposeBeanNameAdvisors.getBeanName());
 			return super.getAge();
 		}
 	}
-	
+
 	@Test
 	public void testNoIntroduction() {
 		String beanName = "foo";
@@ -52,12 +52,12 @@ public final class ExposeBeanNameAdvisorsTests {
 		pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
 		pf.addAdvisor(ExposeBeanNameAdvisors.createAdvisorWithoutIntroduction(beanName));
 		ITestBean proxy = (ITestBean) pf.getProxy();
-		
+
 		assertFalse("No introduction", proxy instanceof NamedBean);
 		// Requires binding
 		proxy.getAge();
 	}
-	
+
 	@Test
 	public void testWithIntroduction() {
 		String beanName = "foo";
@@ -66,11 +66,11 @@ public final class ExposeBeanNameAdvisorsTests {
 		pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
 		pf.addAdvisor(ExposeBeanNameAdvisors.createAdvisorIntroducingNamedBean(beanName));
 		ITestBean proxy = (ITestBean) pf.getProxy();
-		
+
 		assertTrue("Introduction was made", proxy instanceof NamedBean);
 		// Requires binding
 		proxy.getAge();
-		
+
 		NamedBean nb = (NamedBean) proxy;
 		assertEquals("Name returned correctly", beanName, nb.getBeanName());
 	}
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
index bfa9ea4d05..72e2cf3693 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -29,12 +29,12 @@ import test.beans.TestBean;
 
 /**
  * Non-XML tests are in AbstractAopProxyTests
- * 
+ *
  * @author Rod Johnson
  * @author Chris Beams
  */
 public final class ExposeInvocationInterceptorTests {
-	
+
 	private static final Resource CONTEXT =
 		qualifiedResource(ExposeInvocationInterceptorTests.class, "context.xml");
 
@@ -64,7 +64,7 @@ abstract class ExposedInvocationTestBean extends TestBean {
 		assertions(invocation);
 		super.absquatulate();
 	}
-	
+
 	protected abstract void assertions(MethodInvocation invocation);
 }
 
@@ -72,7 +72,7 @@ abstract class ExposedInvocationTestBean extends TestBean {
 class InvocationCheckExposedInvocationTestBean extends ExposedInvocationTestBean {
 	protected void assertions(MethodInvocation invocation) {
 		assertTrue(invocation.getThis() == this);
-		assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(), 
+		assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(),
 				ITestBean.class.isAssignableFrom(invocation.getMethod().getDeclaringClass()));
 	}
 }
diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
index 3706293c2c..83bb13216e 100644
--- a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
@@ -28,9 +28,9 @@ import org.springframework.core.io.Resource;
  * @author Chris Beams
  */
 public final class ScopedProxyAutowireTests {
-	
+
 	private static final Class<?> CLASS = ScopedProxyAutowireTests.class;
-	
+
 	private static final Resource SCOPED_AUTOWIRE_TRUE_CONTEXT = qualifiedResource(CLASS, "scopedAutowireTrue.xml");
 	private static final Resource SCOPED_AUTOWIRE_FALSE_CONTEXT = qualifiedResource(CLASS, "scopedAutowireFalse.xml");
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
index c423579aa0..6b86cd7232 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
@@ -44,7 +44,7 @@ public final class AopUtilsTests {
 				return false;
 			}
 		}
-	
+
 		Pointcut no = new TestPointcut();
 		assertFalse(AopUtils.canApply(no, Object.class));
 	}
@@ -64,7 +64,7 @@ public final class AopUtilsTests {
 		}
 
 		Pointcut pc = new TestPointcut();
-	
+
 		// will return true if we're not proxying interfaces
 		assertTrue(AopUtils.canApply(pc, Object.class));
 	}
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
index 3c9f37ef13..8df910eecb 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -30,11 +30,11 @@ import test.beans.TestBean;
  * @author Chris Beams
  */
 public final class ClassFiltersTests {
-	
+
 	private ClassFilter exceptionFilter = new RootClassFilter(Exception.class);
-	
+
 	private ClassFilter itbFilter = new RootClassFilter(ITestBean.class);
-	
+
 	private ClassFilter hasRootCauseFilter = new RootClassFilter(NestedRuntimeException.class);
 
 	@Test
@@ -47,7 +47,7 @@ public final class ClassFiltersTests {
 		assertTrue(union.matches(RuntimeException.class));
 		assertTrue(union.matches(TestBean.class));
 	}
-	
+
 	@Test
 	public void testIntersection() {
 		assertTrue(exceptionFilter.matches(RuntimeException.class));
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
index 85b40b9112..41c3e2dd54 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -33,31 +33,31 @@ import test.beans.TestBean;
  * @author Chris Beams
  */
 public final class ComposablePointcutTests {
-	
+
 	public static MethodMatcher GETTER_METHOD_MATCHER = new StaticMethodMatcher() {
 		public boolean matches(Method m, Class<?> targetClass) {
 			return m.getName().startsWith("get");
 		}
 	};
-	
+
 	public static MethodMatcher GET_AGE_METHOD_MATCHER = new StaticMethodMatcher() {
 		public boolean matches(Method m, Class<?> targetClass) {
 			return m.getName().equals("getAge");
 		}
 	};
-	
+
 	public static MethodMatcher ABSQUATULATE_METHOD_MATCHER = new StaticMethodMatcher() {
 		public boolean matches(Method m, Class<?> targetClass) {
 			return m.getName().equals("absquatulate");
 		}
 	};
-	
+
 	public static MethodMatcher SETTER_METHOD_MATCHER = new StaticMethodMatcher() {
 		public boolean matches(Method m, Class<?> targetClass) {
 			return m.getName().startsWith("set");
 		}
 	};
-	
+
 	@Test
 	public void testMatchAll() throws NoSuchMethodException {
 		Pointcut pc = new ComposablePointcut();
@@ -68,9 +68,9 @@ public final class ComposablePointcutTests {
 	@Test
 	public void testFilterByClass() throws NoSuchMethodException {
 		ComposablePointcut pc = new ComposablePointcut();
-	
+
 		assertTrue(pc.getClassFilter().matches(Object.class));
-		
+
 		ClassFilter cf = new RootClassFilter(Exception.class);
 		pc.intersection(cf);
 		assertFalse(pc.getClassFilter().matches(Object.class));
@@ -92,15 +92,15 @@ public final class ComposablePointcutTests {
 		assertFalse(Pointcuts.matches(pc, PointcutsTests.TEST_BEAN_ABSQUATULATE, TestBean.class, null));
 		assertTrue(Pointcuts.matches(pc, PointcutsTests.TEST_BEAN_GET_AGE, TestBean.class, null));
 		assertFalse(Pointcuts.matches(pc, PointcutsTests.TEST_BEAN_GET_NAME, TestBean.class, null));
-		
+
 		pc.union(GETTER_METHOD_MATCHER);
 		// Should now match all getter methods
 		assertFalse(Pointcuts.matches(pc, PointcutsTests.TEST_BEAN_ABSQUATULATE, TestBean.class, null));
 		assertTrue(Pointcuts.matches(pc, PointcutsTests.TEST_BEAN_GET_AGE, TestBean.class, null));
 		assertTrue(Pointcuts.matches(pc, PointcutsTests.TEST_BEAN_GET_NAME, TestBean.class, null));
-		
+
 		pc.union(ABSQUATULATE_METHOD_MATCHER);
-		// Should now match absquatulate() as well 
+		// Should now match absquatulate() as well
 		assertTrue(Pointcuts.matches(pc, PointcutsTests.TEST_BEAN_ABSQUATULATE, TestBean.class, null));
 		assertTrue(Pointcuts.matches(pc, PointcutsTests.TEST_BEAN_GET_AGE, TestBean.class, null));
 		assertTrue(Pointcuts.matches(pc, PointcutsTests.TEST_BEAN_GET_NAME, TestBean.class, null));
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
index ed17db6618..e6c08c08f2 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -31,7 +31,7 @@ import test.beans.TestBean;
  * @author Chris Beams
  */
 public final class ControlFlowPointcutTests {
-	
+
 	@Test
 	public void testMatches() {
 		TestBean target = new TestBean();
@@ -41,21 +41,21 @@ public final class ControlFlowPointcutTests {
 		ProxyFactory pf = new ProxyFactory(target);
 		ITestBean proxied = (ITestBean) pf.getProxy();
 		pf.addAdvisor(new DefaultPointcutAdvisor(cflow, nop));
-		
+
 		// Not advised, not under One
 		assertEquals(target.getAge(), proxied.getAge());
 		assertEquals(0, nop.getCount());
-		
+
 		// Will be advised
 		assertEquals(target.getAge(), new One().getAge(proxied));
 		assertEquals(1, nop.getCount());
-		
+
 		// Won't be advised
 		assertEquals(target.getAge(), new One().nomatch(proxied));
 		assertEquals(1, nop.getCount());
 		assertEquals(3, cflow.getEvaluations());
 	}
-	
+
 	/**
 	 * Check that we can use a cflow pointcut only in conjunction with
 	 * a static pointcut: e.g. all setter methods that are invoked under
@@ -73,19 +73,19 @@ public final class ControlFlowPointcutTests {
 		ProxyFactory pf = new ProxyFactory(target);
 		ITestBean proxied = (ITestBean) pf.getProxy();
 		pf.addAdvisor(new DefaultPointcutAdvisor(settersUnderOne, nop));
-	
+
 		// Not advised, not under One
 		target.setAge(16);
 		assertEquals(0, nop.getCount());
-	
+
 		// Not advised; under One but not a setter
 		assertEquals(16, new One().getAge(proxied));
 		assertEquals(0, nop.getCount());
-	
+
 		// Won't be advised
 		new One().set(proxied);
 		assertEquals(1, nop.getCount());
-		
+
 		// We saved most evaluations
 		assertEquals(1, cflow.getEvaluations());
 	}
@@ -99,7 +99,7 @@ public final class ControlFlowPointcutTests {
 		assertEquals(new ControlFlowPointcut(One.class, "getAge").hashCode(), new ControlFlowPointcut(One.class, "getAge").hashCode());
 		assertFalse(new ControlFlowPointcut(One.class, "getAge").hashCode() == new ControlFlowPointcut(One.class).hashCode());
 	}
-	
+
 	public class One {
 		int getAge(ITestBean proxied) {
 			return proxied.getAge();
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
index cd51a4895c..f74bb4c61e 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -79,7 +79,7 @@ public final class DelegatingIntroductionInterceptorTests {
 		long timestamp = 111L;
 		expect(ts.getTimeStamp()).andReturn(timestamp);
 		replay(ts);
-		
+
 		factory.addAdvisor(0, new DefaultIntroductionAdvisor(new DelegatingIntroductionInterceptor(ts), SubTimeStamped.class));
 
 		SubTimeStamped tsp = (SubTimeStamped) factory.getProxy();
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 4df8bcde48..a55b083a3f 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
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -37,9 +37,9 @@ public final class MethodMatchersTests {
 	private final Method EXCEPTION_GETMESSAGE;
 
 	private final Method ITESTBEAN_SETAGE;
-	
+
 	private final Method ITESTBEAN_GETAGE;
-	
+
 	private final Method IOTHER_ABSQUATULATE;
 
 	public MethodMatchersTests() throws Exception {
@@ -55,7 +55,7 @@ public final class MethodMatchersTests {
 		assertTrue(defaultMm.matches(EXCEPTION_GETMESSAGE, Exception.class));
 		assertTrue(defaultMm.matches(ITESTBEAN_SETAGE, TestBean.class));
 	}
-	
+
 	@Test
 	public void testMethodMatcherTrueSerializable() throws Exception {
 		assertSame(SerializationTestUtils.serializeAndDeserialize(MethodMatcher.TRUE), MethodMatcher.TRUE);
@@ -72,7 +72,7 @@ public final class MethodMatchersTests {
 		assertFalse(defaultMm.matches(ITESTBEAN_SETAGE, TestBean.class));
 	}
 
-	
+
 	@Test
 	public void testDynamicAndStaticMethodMatcherIntersection() throws Exception {
 		MethodMatcher mm1 = MethodMatcher.TRUE;
@@ -87,13 +87,13 @@ public final class MethodMatchersTests {
 		assertTrue("2Matched setAge method", intersection.matches(ITESTBEAN_SETAGE, TestBean.class));
 		assertFalse("3 - not Matched setAge method", intersection.matches(ITESTBEAN_SETAGE, TestBean.class, new Object[] { new Integer(5) }));
 	}
-	
+
 	@Test
 	public void testStaticMethodMatcherUnion() throws Exception {
 		MethodMatcher getterMatcher = new StartsWithMatcher("get");
 		MethodMatcher setterMatcher = new StartsWithMatcher("set");
 		MethodMatcher union = MethodMatchers.union(getterMatcher, setterMatcher);
-		
+
 		assertFalse("Union is a static matcher", union.isRuntime());
 		assertTrue("Matched setAge method", union.matches(ITESTBEAN_SETAGE, TestBean.class));
 		assertTrue("Matched getAge method", union.matches(ITESTBEAN_GETAGE, TestBean.class));
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
index 996d72f02f..a36856ddd3 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -34,11 +34,11 @@ import test.util.SerializationTestUtils;
  * @author Chris Beams
  */
 public final class NameMatchMethodPointcutTests {
-	
+
 	protected NameMatchMethodPointcut pc;
-	
+
 	protected Person proxied;
-	
+
 	protected SerializableNopInterceptor nop;
 
 	/**
@@ -52,7 +52,7 @@ public final class NameMatchMethodPointcutTests {
 		pf.addAdvisor(new DefaultPointcutAdvisor(pc, nop));
 		proxied = (Person) pf.getProxy();
 	}
-	
+
 	@Test
 	public void testMatchingOnly() {
 		// Can't do exact matching through isMatch
@@ -63,7 +63,7 @@ public final class NameMatchMethodPointcutTests {
 		assertFalse(pc.isMatch("setName", "set"));
 		assertTrue(pc.isMatch("testing", "*ing"));
 	}
-		
+
 	@Test
 	public void testEmpty() throws Throwable {
 		assertEquals(0, nop.getCount());
@@ -72,8 +72,8 @@ public final class NameMatchMethodPointcutTests {
 		proxied.echo(null);
 		assertEquals(0, nop.getCount());
 	}
-	
-	
+
+
 	@Test
 	public void testMatchOneMethod() throws Throwable {
 		pc.addMethodName("echo");
@@ -84,7 +84,7 @@ public final class NameMatchMethodPointcutTests {
 		assertEquals(0, nop.getCount());
 		proxied.echo(null);
 		assertEquals(1, nop.getCount());
-		
+
 		proxied.setName("");
 		assertEquals(2, nop.getCount());
 		proxied.setAge(25);
@@ -102,7 +102,7 @@ public final class NameMatchMethodPointcutTests {
 		proxied.echo(null);
 		assertEquals(2, nop.getCount());
 	}
-	
+
 	@Test
 	public void testSerializable() throws Throwable {
 		testSets();
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
index eb008c7f30..e796719866 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -31,12 +31,12 @@ import test.beans.TestBean;
  * @author Chris Beams
  */
 public final class PointcutsTests {
-	
+
 	public static Method TEST_BEAN_SET_AGE;
 	public static Method TEST_BEAN_GET_AGE;
 	public static Method TEST_BEAN_GET_NAME;
 	public static Method TEST_BEAN_ABSQUATULATE;
-	
+
 	static {
 		try {
 			TEST_BEAN_SET_AGE = TestBean.class.getMethod("setAge", new Class[] { int.class });
@@ -48,7 +48,7 @@ public final class PointcutsTests {
 			throw new RuntimeException("Shouldn't happen: error in test suite");
 		}
 	}
-	
+
 	/**
 	 * Matches only TestBean class, not subclasses
 	 */
@@ -65,13 +65,13 @@ public final class PointcutsTests {
 			return true;
 		}
 	};
-		
+
 	public static Pointcut allClassSetterPointcut = Pointcuts.SETTERS;
-	
+
 	// Subclass used for matching
 	public static class MyTestBean extends TestBean {
 	}
-	
+
 	public static Pointcut myTestBeanSetterPointcut = new StaticMethodMatcherPointcut() {
 		public ClassFilter getClassFilter() {
 			return new RootClassFilter(MyTestBean.class);
@@ -81,7 +81,7 @@ public final class PointcutsTests {
 			return m.getName().startsWith("set");
 		}
 	};
-	
+
 	// Will match MyTestBeanSubclass
 	public static Pointcut myTestBeanGetterPointcut = new StaticMethodMatcherPointcut() {
 		public ClassFilter getClassFilter() {
@@ -92,11 +92,11 @@ public final class PointcutsTests {
 			return m.getName().startsWith("get");
 		}
 	};
-	
+
 	// Still more specific class
 	public static class MyTestBeanSubclass extends MyTestBean {
 	}
-	
+
 	public static Pointcut myTestBeanSubclassGetterPointcut = new StaticMethodMatcherPointcut() {
 		public ClassFilter getClassFilter() {
 			return new RootClassFilter(MyTestBeanSubclass.class);
@@ -106,14 +106,14 @@ public final class PointcutsTests {
 			return m.getName().startsWith("get");
 		}
 	};
-	
+
 	public static Pointcut allClassGetterPointcut = Pointcuts.GETTERS;
-	
+
 	public static Pointcut allClassGetAgePointcut = new NameMatchMethodPointcut().addMethodName("getAge");
-	
+
 	public static Pointcut allClassGetNamePointcut = new NameMatchMethodPointcut().addMethodName("getName");
-	
-	
+
+
 	@Test
 	public void testTrue() {
 		assertTrue(Pointcuts.matches(Pointcut.TRUE, TEST_BEAN_SET_AGE, TestBean.class, new Object[] { new Integer(6)}));
@@ -133,7 +133,7 @@ public final class PointcutsTests {
 		assertTrue(Pointcuts.matches(allClassGetterPointcut, TEST_BEAN_GET_AGE, TestBean.class, null));
 		assertFalse(Pointcuts.matches(allClassGetterPointcut, TEST_BEAN_ABSQUATULATE, TestBean.class, null));
 	}
-	
+
 	/**
 	 * Should match all setters and getters on any class
 	 */
@@ -144,7 +144,7 @@ public final class PointcutsTests {
 		assertTrue(Pointcuts.matches(union, TEST_BEAN_GET_AGE, TestBean.class, null));
 		assertFalse(Pointcuts.matches(union, TEST_BEAN_ABSQUATULATE, TestBean.class, null));
 	}
-	
+
 	@Test
 	public void testUnionOfSpecificGetters() {
 		Pointcut union = Pointcuts.union(allClassGetAgePointcut, allClassGetNamePointcut);
@@ -153,7 +153,7 @@ public final class PointcutsTests {
 		assertFalse(Pointcuts.matches(allClassGetAgePointcut, TEST_BEAN_GET_NAME, TestBean.class, null));
 		assertTrue(Pointcuts.matches(union, TEST_BEAN_GET_NAME, TestBean.class, null));
 		assertFalse(Pointcuts.matches(union, TEST_BEAN_ABSQUATULATE, TestBean.class, null));
-		
+
 		// Union with all setters
 		union = Pointcuts.union(union, allClassSetterPointcut);
 		assertTrue(Pointcuts.matches(union, TEST_BEAN_SET_AGE, TestBean.class, new Object[] { new Integer(6)}));
@@ -161,10 +161,10 @@ public final class PointcutsTests {
 		assertFalse(Pointcuts.matches(allClassGetAgePointcut, TEST_BEAN_GET_NAME, TestBean.class, null));
 		assertTrue(Pointcuts.matches(union, TEST_BEAN_GET_NAME, TestBean.class, null));
 		assertFalse(Pointcuts.matches(union, TEST_BEAN_ABSQUATULATE, TestBean.class, null));
-		
+
 		assertTrue(Pointcuts.matches(union, TEST_BEAN_SET_AGE, TestBean.class, new Object[] { new Integer(6)}));
 	}
-	
+
 	/**
 	 * Tests vertical composition. First pointcut matches all setters.
 	 * Second one matches all getters in the MyTestBean class. TestBean getters shouldn't pass.
@@ -174,7 +174,7 @@ public final class PointcutsTests {
 		assertFalse(Pointcuts.matches(myTestBeanSetterPointcut, TEST_BEAN_SET_AGE, TestBean.class, new Object[] { new Integer(6)}));
 		assertTrue(Pointcuts.matches(myTestBeanSetterPointcut, TEST_BEAN_SET_AGE, MyTestBean.class, new Object[] { new Integer(6)}));
 		assertFalse(Pointcuts.matches(myTestBeanSetterPointcut, TEST_BEAN_GET_AGE, TestBean.class, null));
-		
+
 		Pointcut union = Pointcuts.union(myTestBeanSetterPointcut, allClassGetterPointcut);
 		assertTrue(Pointcuts.matches(union, TEST_BEAN_GET_AGE, TestBean.class, null));
 		assertTrue(Pointcuts.matches(union, TEST_BEAN_GET_AGE, MyTestBean.class, null));
@@ -182,7 +182,7 @@ public final class PointcutsTests {
 		assertTrue(Pointcuts.matches(union, TEST_BEAN_SET_AGE, MyTestBean.class, new Object[] { new Integer(6)}));
 		assertFalse(Pointcuts.matches(union, TEST_BEAN_SET_AGE, TestBean.class, new Object[] { new Integer(6)}));
 	}
-	
+
 	/**
 	 * Intersection should be MyTestBean getAge() only:
 	 * it's the union of allClassGetAge and subclass getters
@@ -195,7 +195,7 @@ public final class PointcutsTests {
 		assertFalse(Pointcuts.matches(myTestBeanGetterPointcut, TEST_BEAN_GET_AGE, TestBean.class, null));
 		assertTrue(Pointcuts.matches(myTestBeanGetterPointcut, TEST_BEAN_GET_NAME, MyTestBean.class, null));
 		assertTrue(Pointcuts.matches(myTestBeanGetterPointcut, TEST_BEAN_GET_AGE, MyTestBean.class, null));
-		
+
 		Pointcut intersection = Pointcuts.intersection(allClassGetAgePointcut, myTestBeanGetterPointcut);
 		assertFalse(Pointcuts.matches(intersection, TEST_BEAN_GET_NAME, TestBean.class, null));
 		assertFalse(Pointcuts.matches(intersection, TEST_BEAN_GET_AGE, TestBean.class, null));
@@ -204,7 +204,7 @@ public final class PointcutsTests {
 		// Matches subclass of MyTestBean
 		assertFalse(Pointcuts.matches(intersection, TEST_BEAN_GET_NAME, MyTestBeanSubclass.class, null));
 		assertTrue(Pointcuts.matches(intersection, TEST_BEAN_GET_AGE, MyTestBeanSubclass.class, null));
-		
+
 		// Now intersection with MyTestBeanSubclass getters should eliminate MyTestBean target
 		intersection = Pointcuts.intersection(intersection, myTestBeanSubclassGetterPointcut);
 		assertFalse(Pointcuts.matches(intersection, TEST_BEAN_GET_NAME, TestBean.class, null));
@@ -214,7 +214,7 @@ public final class PointcutsTests {
 		// Still matches subclass of MyTestBean
 		assertFalse(Pointcuts.matches(intersection, TEST_BEAN_GET_NAME, MyTestBeanSubclass.class, null));
 		assertTrue(Pointcuts.matches(intersection, TEST_BEAN_GET_AGE, MyTestBeanSubclass.class, null));
-		
+
 		// Now union with all TestBean methods
 		Pointcut union = Pointcuts.union(intersection, allTestBeanMethodsPointcut);
 		assertTrue(Pointcuts.matches(union, TEST_BEAN_GET_NAME, TestBean.class, null));
@@ -224,12 +224,12 @@ public final class PointcutsTests {
 		// Still matches subclass of MyTestBean
 		assertFalse(Pointcuts.matches(union, TEST_BEAN_GET_NAME, MyTestBeanSubclass.class, null));
 		assertTrue(Pointcuts.matches(union, TEST_BEAN_GET_AGE, MyTestBeanSubclass.class, null));
-		
+
 		assertTrue(Pointcuts.matches(union, TEST_BEAN_ABSQUATULATE, TestBean.class, null));
 		assertFalse(Pointcuts.matches(union, TEST_BEAN_ABSQUATULATE, MyTestBean.class, null));
 	}
-	
-	
+
+
 	/**
 	 * The intersection of these two pointcuts leaves nothing.
 	 */
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
index 8218e4d5db..bab75b7a3d 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -37,18 +37,18 @@ import test.util.SerializationTestUtils;
  * @author Chris Beams
  */
 public final class RegexpMethodPointcutAdvisorIntegrationTests {
-	
+
 	private static final Resource CONTEXT =
 		qualifiedResource(RegexpMethodPointcutAdvisorIntegrationTests.class, "context.xml");
 
 	@Test
 	public void testSinglePattern() throws Throwable {
-		BeanFactory bf = new XmlBeanFactory(CONTEXT); 
+		BeanFactory bf = new XmlBeanFactory(CONTEXT);
 		ITestBean advised = (ITestBean) bf.getBean("settersAdvised");
 		// Interceptor behind regexp advisor
 		NopInterceptor nop = (NopInterceptor) bf.getBean("nopInterceptor");
 		assertEquals(0, nop.getCount());
-		
+
 		int newAge = 12;
 		// Not advised
 		advised.exceptional(null);
@@ -58,21 +58,21 @@ public final class RegexpMethodPointcutAdvisorIntegrationTests {
 		// Only setter fired
 		assertEquals(1, nop.getCount());
 	}
-	
+
 	@Test
 	public void testMultiplePatterns() throws Throwable {
-		BeanFactory bf = new XmlBeanFactory(CONTEXT); 
+		BeanFactory bf = new XmlBeanFactory(CONTEXT);
 		// This is a CGLIB proxy, so we can proxy it to the target class
 		TestBean advised = (TestBean) bf.getBean("settersAndAbsquatulateAdvised");
 		// Interceptor behind regexp advisor
 		NopInterceptor nop = (NopInterceptor) bf.getBean("nopInterceptor");
 		assertEquals(0, nop.getCount());
-	
+
 		int newAge = 12;
 		// Not advised
 		advised.exceptional(null);
 		assertEquals(0, nop.getCount());
-		
+
 		// This is proxied
 		advised.absquatulate();
 		assertEquals(1, nop.getCount());
@@ -81,21 +81,21 @@ public final class RegexpMethodPointcutAdvisorIntegrationTests {
 		// Only setter fired
 		assertEquals(2, nop.getCount());
 	}
-	
+
 	@Test
 	public void testSerialization() throws Throwable {
-		BeanFactory bf = new XmlBeanFactory(CONTEXT); 
+		BeanFactory bf = new XmlBeanFactory(CONTEXT);
 		// This is a CGLIB proxy, so we can proxy it to the target class
 		Person p = (Person) bf.getBean("serializableSettersAdvised");
 		// Interceptor behind regexp advisor
 		NopInterceptor nop = (NopInterceptor) bf.getBean("nopInterceptor");
 		assertEquals(0, nop.getCount());
-	
+
 		int newAge = 12;
 		// Not advised
 		assertEquals(0, p.getAge());
 		assertEquals(0, nop.getCount());
-		
+
 		// This is proxied
 		p.setAge(newAge);
 		assertEquals(1, nop.getCount());
@@ -103,7 +103,7 @@ public final class RegexpMethodPointcutAdvisorIntegrationTests {
 		assertEquals(newAge, p.getAge());
 		// Only setter fired
 		assertEquals(2, nop.getCount());
-		
+
 		// Serialize and continue...
 		p = (Person) SerializationTestUtils.serializeAndDeserialize(p);
 		assertEquals(newAge, p.getAge());
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java
index 69907b0f2f..269d585e9d 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java
@@ -33,7 +33,7 @@ import test.beans.ITestBean;
  * @since 2.0
  */
 public final class CommonsPoolTargetSourceProxyTests {
-	
+
 	private static final Resource CONTEXT =
 		qualifiedResource(CommonsPoolTargetSourceProxyTests.class, "context.xml");
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
index 284c3ae561..be9b929475 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -40,19 +40,19 @@ import test.util.SerializationTestUtils;
  * @author Chris Beams
  */
 public final class HotSwappableTargetSourceTests {
-	
+
 	private static final Resource CONTEXT = qualifiedResource(HotSwappableTargetSourceTests.class, "context.xml");
 
 	/** Initial count value set in bean factory XML */
 	private static final int INITIAL_COUNT = 10;
 
 	private XmlBeanFactory beanFactory;
-	
+
 	@Before
 	public void setUp() throws Exception {
 		this.beanFactory = new XmlBeanFactory(CONTEXT);
 	}
-	
+
 	/**
 	 * We must simulate container shutdown, which should clear threads.
 	 */
@@ -72,42 +72,42 @@ public final class HotSwappableTargetSourceTests {
 		assertEquals(INITIAL_COUNT, proxied.getCount() );
 		proxied.doWork();
 		assertEquals(INITIAL_COUNT + 1, proxied.getCount() );
-		
+
 		proxied = (SideEffectBean) beanFactory.getBean("swappable");
 		proxied.doWork();
 		assertEquals(INITIAL_COUNT + 2, proxied.getCount() );
 	}
-	
+
 	@Test
 	public void testValidSwaps() {
 		SideEffectBean target1 = (SideEffectBean) beanFactory.getBean("target1");
 		SideEffectBean target2 = (SideEffectBean) beanFactory.getBean("target2");
-		
+
 		SideEffectBean proxied = (SideEffectBean) beanFactory.getBean("swappable");
 		assertEquals(target1.getCount(), proxied.getCount() );
 		proxied.doWork();
 		assertEquals(INITIAL_COUNT + 1, proxied.getCount() );
-	
+
 		HotSwappableTargetSource swapper = (HotSwappableTargetSource) beanFactory.getBean("swapper");
 		Object old = swapper.swap(target2);
 		assertEquals("Correct old target was returned", target1, old);
-		
+
 		// TODO should be able to make this assertion: need to fix target handling
 		// in AdvisedSupport
 		//assertEquals(target2, ((Advised) proxied).getTarget());
-		
+
 		assertEquals(20, proxied.getCount());
 		proxied.doWork();
 		assertEquals(21, target2.getCount());
-		
+
 		// Swap it back
 		swapper.swap(target1);
 		assertEquals(target1.getCount(), proxied.getCount());
 	}
-	
-	
+
+
 	/**
-	 * 
+	 *
 	 * @param invalid
 	 * @return the message
 	 */
@@ -122,46 +122,46 @@ public final class HotSwappableTargetSourceTests {
 			// Ok
 			aopex = ex;
 		}
-		
+
 		// It shouldn't be corrupted, it should still work
 		testBasicFunctionality();
 		return aopex;
 	}
-	
+
 	@Test
 	public void testRejectsSwapToNull() {
 		IllegalArgumentException ex = testRejectsSwapToInvalidValue(null);
 		assertTrue(ex.getMessage().indexOf("null") != -1);
 	}
-	
+
 	// TODO test reject swap to wrong interface or class?
 	// how to decide what's valid?
-	
-	
+
+
 	@Test
 	public void testSerialization() throws Exception {
 		SerializablePerson sp1 = new SerializablePerson();
 		sp1.setName("Tony");
 		SerializablePerson sp2 = new SerializablePerson();
 		sp1.setName("Gordon");
-		
+
 		HotSwappableTargetSource hts = new HotSwappableTargetSource(sp1);
 		ProxyFactory pf = new ProxyFactory();
 		pf.addInterface(Person.class);
 		pf.setTargetSource(hts);
 		pf.addAdvisor(new DefaultPointcutAdvisor(new SerializableNopInterceptor()));
 		Person p = (Person) pf.getProxy();
-		
+
 		assertEquals(sp1.getName(), p.getName());
 		hts.swap(sp2);
 		assertEquals(sp2.getName(), p.getName());
-		
+
 		p = (Person) SerializationTestUtils.serializeAndDeserialize(p);
 		// We need to get a reference to the client-side targetsource
 		hts = (HotSwappableTargetSource) ((Advised) p).getTargetSource();
 		assertEquals(sp2.getName(), p.getName());
 		hts.swap(sp1);
 		assertEquals(sp1.getName(), p.getName());
-		
+
 	}
 }
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
index b26fbb1e91..52919dc063 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
@@ -34,9 +34,9 @@ import test.beans.ITestBean;
  * @since 07.01.2005
  */
 public final class LazyInitTargetSourceTests {
-	
+
 	private static final Class<?> CLASS = LazyInitTargetSourceTests.class;
-	
+
 	private static final Resource SINGLETON_CONTEXT = qualifiedResource(CLASS, "singleton.xml");
 	private static final Resource CUSTOM_TARGET_CONTEXT = qualifiedResource(CLASS, "customTarget.xml");
 	private static final Resource FACTORY_BEAN_CONTEXT = qualifiedResource(CLASS, "factoryBean.xml");
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
index 43ba8a211a..daecd1b5e8 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
@@ -59,9 +59,9 @@ public final class PrototypeBasedTargetSourceTests {
 		assertNotNull(sts.getTarget());
 	}
 
-	
+
 	private static class TestTargetSource extends AbstractPrototypeBasedTargetSource {
-		
+
 		/**
 		 * Nonserializable test field to check that subclass
 		 * state can't prevent serialization from working
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
index c5f0fa9d38..3317694eff 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -33,14 +33,14 @@ import test.beans.SideEffectBean;
  * @author Chris Beams
  */
 public final class PrototypeTargetSourceTests {
-	
+
 	private static final Resource CONTEXT = qualifiedResource(PrototypeTargetSourceTests.class, "context.xml");
-	
+
 	/** Initial count value set in bean factory XML */
 	private static final int INITIAL_COUNT = 10;
-	
+
 	private BeanFactory beanFactory;
-	
+
 	@Before
 	public void setUp() throws Exception {
 		this.beanFactory = new XmlBeanFactory(CONTEXT);
@@ -57,7 +57,7 @@ public final class PrototypeTargetSourceTests {
 		assertEquals(INITIAL_COUNT, singleton.getCount() );
 		singleton.doWork();
 		assertEquals(INITIAL_COUNT + 1, singleton.getCount() );
-		
+
 		SideEffectBean prototype = (SideEffectBean) beanFactory.getBean("prototype");
 		assertEquals(INITIAL_COUNT, prototype.getCount() );
 		prototype.doWork();
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
index bd79620b70..2519e89f82 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -33,26 +33,26 @@ import test.beans.SideEffectBean;
  * @author Chris Beams
  */
 public class ThreadLocalTargetSourceTests {
-	
+
 	private static final Resource CONTEXT = qualifiedResource(ThreadLocalTargetSourceTests.class, "context.xml");
 
 	/** Initial count value set in bean factory XML */
 	private static final int INITIAL_COUNT = 10;
 
 	private XmlBeanFactory beanFactory;
-	
+
 	@Before
 	public void setUp() throws Exception {
 		this.beanFactory = new XmlBeanFactory(CONTEXT);
 	}
-	
+
 	/**
 	 * We must simulate container shutdown, which should clear threads.
 	 */
 	protected void tearDown() {
 		this.beanFactory.destroySingletons();
 	}
-	
+
 	/**
 	 * Check we can use two different ThreadLocalTargetSources
 	 * managing objects of different types without them interfering
@@ -64,7 +64,7 @@ public class ThreadLocalTargetSourceTests {
 		assertEquals(INITIAL_COUNT, apartment.getCount() );
 		apartment.doWork();
 		assertEquals(INITIAL_COUNT + 1, apartment.getCount() );
-	
+
 		ITestBean test = (ITestBean) beanFactory.getBean("threadLocal2");
 		assertEquals("Rod", test.getName());
 		assertEquals("Kerry", test.getSpouse().getName());
@@ -76,11 +76,11 @@ public class ThreadLocalTargetSourceTests {
 		assertEquals(INITIAL_COUNT, apartment.getCount() );
 		apartment.doWork();
 		assertEquals(INITIAL_COUNT + 1, apartment.getCount() );
-		
+
 		apartment = (SideEffectBean) beanFactory.getBean("apartment");
 		assertEquals(INITIAL_COUNT + 1, apartment.getCount() );
 	}
-	
+
 	/**
 	 * Relies on introduction.
 	 */
@@ -101,7 +101,7 @@ public class ThreadLocalTargetSourceTests {
 		// Only one thread so only one object can have been bound
 		assertEquals(1, stats.getObjectCount());
 	}
-	
+
 	@Test
 	public void testNewThreadHasOwnInstance() throws InterruptedException {
 		SideEffectBean apartment = (SideEffectBean) beanFactory.getBean("apartment");
@@ -110,7 +110,7 @@ public class ThreadLocalTargetSourceTests {
 		apartment.doWork();
 		apartment.doWork();
 		assertEquals(INITIAL_COUNT + 3, apartment.getCount() );
-	
+
 		class Runner implements Runnable {
 			public SideEffectBean mine;
 			public void run() {
@@ -124,16 +124,16 @@ public class ThreadLocalTargetSourceTests {
 		Thread t = new Thread(r);
 		t.start();
 		t.join();
-		
+
 		assertNotNull(r);
-		
+
 		// Check it didn't affect the other thread's copy
 		assertEquals(INITIAL_COUNT + 3, apartment.getCount() );
-		
-		// When we use other thread's copy in this thread 
+
+		// When we use other thread's copy in this thread
 		// it should behave like ours
 		assertEquals(INITIAL_COUNT + 3, r.mine.getCount() );
-		
+
 		// Bound to two threads
 		assertEquals(2, ((ThreadLocalTargetSourceStats) apartment).getObjectCount());
 	}
diff --git a/spring-aop/src/test/java/test/aop/DefaultLockable.java b/spring-aop/src/test/java/test/aop/DefaultLockable.java
index 42d6c73cb0..82c59d8bc5 100644
--- a/spring-aop/src/test/java/test/aop/DefaultLockable.java
+++ b/spring-aop/src/test/java/test/aop/DefaultLockable.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -18,7 +18,7 @@ package test.aop;
 
 /**
  * Simple implementation of Lockable interface for use in mixins.
- * 
+ *
  * @author Rod Johnson
  */
 public class DefaultLockable implements Lockable {
diff --git a/spring-aop/src/test/java/test/aop/Lockable.java b/spring-aop/src/test/java/test/aop/Lockable.java
index 9427274567..135a991424 100644
--- a/spring-aop/src/test/java/test/aop/Lockable.java
+++ b/spring-aop/src/test/java/test/aop/Lockable.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -19,15 +19,15 @@ package test.aop;
 
 /**
  * Simple interface to use for mixins
- * 
+ *
  * @author Rod Johnson
  *
  */
 public interface Lockable {
-	
+
 	void lock();
-	
+
 	void unlock();
-	
+
 	boolean locked();
 }
\ No newline at end of file
diff --git a/spring-aop/src/test/java/test/aop/MethodCounter.java b/spring-aop/src/test/java/test/aop/MethodCounter.java
index 9c5ed06e9a..745b7289cb 100644
--- a/spring-aop/src/test/java/test/aop/MethodCounter.java
+++ b/spring-aop/src/test/java/test/aop/MethodCounter.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 
 /**
  * Abstract superclass for counting advices etc.
- * 
+ *
  * @author Rod Johnson
  * @author Chris Beams
  */
diff --git a/spring-aop/src/test/java/test/aop/NopInterceptor.java b/spring-aop/src/test/java/test/aop/NopInterceptor.java
index 81bdd9e703..1dc341d427 100644
--- a/spring-aop/src/test/java/test/aop/NopInterceptor.java
+++ b/spring-aop/src/test/java/test/aop/NopInterceptor.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -25,7 +25,7 @@ import org.aopalliance.intercept.MethodInvocation;
  * @author Rod Johnson
  */
 public class NopInterceptor implements MethodInterceptor {
-	
+
 	private int count;
 
 	/**
@@ -35,11 +35,11 @@ public class NopInterceptor implements MethodInterceptor {
 		increment();
 		return invocation.proceed();
 	}
-	
+
 	public int getCount() {
 		return this.count;
 	}
-	
+
 	protected void increment() {
 		++count;
 	}
diff --git a/spring-aop/src/test/java/test/aop/PerTargetAspect.java b/spring-aop/src/test/java/test/aop/PerTargetAspect.java
index 2d373f17e7..cee2420138 100644
--- a/spring-aop/src/test/java/test/aop/PerTargetAspect.java
+++ b/spring-aop/src/test/java/test/aop/PerTargetAspect.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package test.aop;
 
diff --git a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
index ca425b81f6..3b306743b2 100644
--- a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
+++ b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -23,26 +23,26 @@ import java.io.Serializable;
 /**
  * Subclass of NopInterceptor that is serializable and
  * can be used to test proxy serialization.
- * 
+ *
  * @author Rod Johnson
  * @author Chris Beams
  */
 @SuppressWarnings("serial")
 public class SerializableNopInterceptor extends NopInterceptor implements Serializable {
-	
+
 	/**
 	 * We must override this field and the related methods as
 	 * otherwise count won't be serialized from the non-serializable
 	 * NopInterceptor superclass.
 	 */
 	private int count;
-	
+
 	public int getCount() {
 		return this.count;
 	}
-	
+
 	protected void increment() {
 		++count;
 	}
-	
+
 }
\ No newline at end of file
diff --git a/spring-aop/src/test/java/test/beans/INestedTestBean.java b/spring-aop/src/test/java/test/beans/INestedTestBean.java
index 228109c284..87bfc26773 100644
--- a/spring-aop/src/test/java/test/beans/INestedTestBean.java
+++ b/spring-aop/src/test/java/test/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-aop/src/test/java/test/beans/IOther.java b/spring-aop/src/test/java/test/beans/IOther.java
index 734235aa06..e5b576de3b 100644
--- a/spring-aop/src/test/java/test/beans/IOther.java
+++ b/spring-aop/src/test/java/test/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-aop/src/test/java/test/beans/NestedTestBean.java b/spring-aop/src/test/java/test/beans/NestedTestBean.java
index d3fde438b6..a630f8662a 100644
--- a/spring-aop/src/test/java/test/beans/NestedTestBean.java
+++ b/spring-aop/src/test/java/test/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-aop/src/test/java/test/beans/Person.java b/spring-aop/src/test/java/test/beans/Person.java
index d163756b4e..d1a441945e 100644
--- a/spring-aop/src/test/java/test/beans/Person.java
+++ b/spring-aop/src/test/java/test/beans/Person.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -17,19 +17,19 @@
 package test.beans;
 
 /**
- * 
+ *
  * @author Rod Johnson
  */
 public interface Person {
-	
+
 	String getName();
 	void setName(String name);
 	int getAge();
 	void setAge(int i);
-	
-	/** 
+
+	/**
 	 * Test for non-property method matching.
-	 * If the parameter is a Throwable, it will be thrown rather than 
+	 * If the parameter is a Throwable, it will be thrown rather than
 	 * returned.
 	 */
 	Object echo(Object o) throws Throwable;
diff --git a/spring-aop/src/test/java/test/beans/SerializablePerson.java b/spring-aop/src/test/java/test/beans/SerializablePerson.java
index e0a1839c0c..adb2966907 100644
--- a/spring-aop/src/test/java/test/beans/SerializablePerson.java
+++ b/spring-aop/src/test/java/test/beans/SerializablePerson.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -34,26 +34,26 @@ public class SerializablePerson implements Person, Serializable {
 	public int getAge() {
 		return age;
 	}
-	
+
 	public void setAge(int age) {
 		this.age = age;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public Object echo(Object o) throws Throwable {
 		if (o instanceof Throwable) {
 			throw (Throwable) o;
 		}
 		return o;
 	}
-	
+
 	public boolean equals(Object other) {
 		if (!(other instanceof SerializablePerson)) {
 			return false;
diff --git a/spring-aop/src/test/java/test/beans/SideEffectBean.java b/spring-aop/src/test/java/test/beans/SideEffectBean.java
index ea8279e2c2..82871af752 100644
--- a/spring-aop/src/test/java/test/beans/SideEffectBean.java
+++ b/spring-aop/src/test/java/test/beans/SideEffectBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -22,17 +22,17 @@ package test.beans;
  * @author Rod Johnson
  */
 public class SideEffectBean {
-	
+
 	private int count;
-	
+
 	public void setCount(int count) {
 		this.count = count;
 	}
-	
+
 	public int getCount() {
 		return this.count;
 	}
-	
+
 	public void doWork() {
 		++count;
 	}
diff --git a/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java b/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java
index 7920111e2e..211e101023 100644
--- a/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java
+++ b/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java
@@ -20,9 +20,9 @@ import org.springframework.aop.aspectj.AspectJExpressionPointcutTests;
 
 /**
  * Used for testing pointcut matching.
- * 
+ *
  * @see AspectJExpressionPointcutTests#testWithinRootAndSubpackages()
- * 
+ *
  * @author Chris Beams
  */
 public class DeepBean {
diff --git a/spring-aop/src/test/java/test/util/SerializationTestUtils.java b/spring-aop/src/test/java/test/util/SerializationTestUtils.java
index 74130ff343..132bd33d4e 100644
--- a/spring-aop/src/test/java/test/util/SerializationTestUtils.java
+++ b/spring-aop/src/test/java/test/util/SerializationTestUtils.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2009 the original author 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.
@@ -63,7 +63,7 @@ public final class SerializationTestUtils {
 		oos.flush();
 		baos.flush();
 		byte[] bytes = baos.toByteArray();
-		
+
 		ByteArrayInputStream is = new ByteArrayInputStream(bytes);
 		ObjectInputStream ois = new ObjectInputStream(is);
 		Object o2 = ois.readObject();
diff --git a/spring-aop/src/test/java/test/util/TestResourceUtils.java b/spring-aop/src/test/java/test/util/TestResourceUtils.java
index bae2b829ac..9d764e6b83 100644
--- a/spring-aop/src/test/java/test/util/TestResourceUtils.java
+++ b/spring-aop/src/test/java/test/util/TestResourceUtils.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -30,12 +30,12 @@ public class TestResourceUtils {
 	/**
 	 * Loads 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
 	 */
diff --git a/spring-aop/src/test/java/test/util/TimeStamped.java b/spring-aop/src/test/java/test/util/TimeStamped.java
index 052b56ff73..484d5dda44 100644
--- a/spring-aop/src/test/java/test/util/TimeStamped.java
+++ b/spring-aop/src/test/java/test/util/TimeStamped.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -23,7 +23,7 @@ package test.util;
  * @author Rod Johnson
  */
 public interface TimeStamped {
-	
+
 	/**
 	 * Return the timestamp for this object.
 	 * @return long the timestamp for this object,
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj
index 97fe1cb3ea..2061f62321 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 package org.springframework.beans.factory.aspectj;
 
 import org.aspectj.lang.annotation.SuppressAjWarnings;
@@ -23,12 +23,12 @@ import org.springframework.beans.factory.wiring.BeanConfigurerSupport;
  * Abstract superaspect for AspectJ aspects that can perform Dependency
  * Injection on objects, however they may be created. Define the beanCreation()
  * pointcut in subaspects.
- * 
+ *
  * <p>Subaspects may also need a metadata resolution strategy, in the
  * <code>BeanWiringInfoResolver</code> interface. The default implementation
  * looks for a bean with the same name as the FQN. This is the default name
  * of a bean in a Spring container if the id value is not supplied explicitly.
- * 
+ *
  * @author Rob Harrop
  * @author Rod Johnson
  * @author Adrian Colyer
@@ -62,7 +62,7 @@ public abstract aspect AbstractBeanConfigurerAspect extends BeanConfigurerSuppor
 
 	/**
 	 * The initialization of a new object.
-	 * 
+	 *
 	 * <p>WARNING: Although this pointcut is non-abstract for backwards
 	 * compatibility reasons, it is meant to be overridden to select
 	 * initialization of any configurable bean.
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 9008182f02..42a27944d4 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
@@ -21,7 +21,7 @@ import org.aspectj.lang.annotation.SuppressAjWarnings;
 /**
  * Abstract base aspect that can perform Dependency
  * Injection on objects, however they may be created.
- * 
+ *
  * @author Ramnivas Laddad
  * @since 2.5.2
  */
@@ -29,26 +29,26 @@ public abstract aspect AbstractDependencyInjectionAspect {
 	/**
 	 * Select construction join points for objects to inject dependencies
 	 */
-	public abstract pointcut beanConstruction(Object bean); 
+	public abstract pointcut beanConstruction(Object bean);
 
 	/**
 	 * Select deserialization join points for objects to inject dependencies
 	 */
 	public abstract pointcut beanDeserialization(Object bean);
-	
+
 	/**
 	 * Select join points in a configurable bean
 	 */
 	public abstract pointcut inConfigurableBean();
-	
+
 	/**
 	 * 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 pointcut preConstructionConfiguration() : if(false);
-	
+
 	/**
-	 * Select the most-specific initialization join point 
+	 * Select the most-specific initialization join point
 	 * (most concrete class) for the initialization of an instance.
 	 */
 	public pointcut mostSpecificSubTypeConstruction() :
@@ -58,25 +58,25 @@ public abstract aspect AbstractDependencyInjectionAspect {
 	 * Select least specific super type that is marked for DI (so that injection occurs only once with pre-construction inejection
 	 */
 	public abstract pointcut leastSpecificSuperTypeConstruction();
-		
+
 	/**
 	 * Configure the bean
 	 */
 	public abstract void configureBean(Object bean);
 
-	
-	private pointcut preConstructionCondition() : 
+
+	private pointcut preConstructionCondition() :
 		leastSpecificSuperTypeConstruction() && preConstructionConfiguration();
-	
+
 	private pointcut postConstructionCondition() :
 		mostSpecificSubTypeConstruction() && !preConstructionConfiguration();
-	
+
 	/**
 	 * Pre-construction configuration.
 	 */
 	@SuppressAjWarnings("adviceDidNotMatch")
-	before(Object bean) : 
-		beanConstruction(bean) && preConstructionCondition() && inConfigurableBean()  { 
+	before(Object bean) :
+		beanConstruction(bean) && preConstructionCondition() && inConfigurableBean()  {
 		configureBean(bean);
 	}
 
@@ -84,18 +84,18 @@ public abstract aspect AbstractDependencyInjectionAspect {
 	 * Post-construction configuration.
 	 */
 	@SuppressAjWarnings("adviceDidNotMatch")
-	after(Object bean) returning : 
+	after(Object bean) returning :
 		beanConstruction(bean) && postConstructionCondition() && inConfigurableBean() {
 		configureBean(bean);
 	}
-	
+
 	/**
 	 * Post-deserialization configuration.
 	 */
 	@SuppressAjWarnings("adviceDidNotMatch")
-	after(Object bean) returning : 
+	after(Object bean) returning :
 		beanDeserialization(bean) && inConfigurableBean() {
 		configureBean(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 4ecd2923de..fee434c3e3 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
@@ -26,7 +26,7 @@ import java.io.Serializable;
  * 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> 
+ * <p>
  * There are two cases that needs to be handled:
  * <ol>
  *   <li>Normal object creation via the '<code>new</code>' operator: this is
@@ -37,24 +37,24 @@ import java.io.Serializable;
  *       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 
+ *       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, 
+ *           <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 
+ * 		 <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</code>. However, this shouldn't be a big burden, since
- *           use cases that need classes to implement readResolve() (custom enums, 
+ *           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</code> should not
  *           pose any undue burden.</li>
  *       </ul>
- *       The minor collaboration needed by user classes (i.e., that the 
- *       implementation of <code>readResolve()</code>, if any, must be 
- *       <code>public</code>) can be lifted as well if we were to use an 
+ *       The minor collaboration needed by user classes (i.e., that the
+ *       implementation of <code>readResolve()</code>, if any, must be
+ *       <code>public</code>) can be lifted as well if we were to use an
  *       experimental feature in AspectJ - the <code>hasmethod()</code> PCD.</li>
  * </ol>
 
@@ -63,7 +63,7 @@ import java.io.Serializable;
  * 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>
- * 
+ *
  * @author Ramnivas Laddad
  * @since 2.5.2
  */
@@ -71,8 +71,8 @@ public abstract aspect AbstractInterfaceDrivenDependencyInjectionAspect extends
 	/**
 	 * Select initialization join point as object construction
 	 */
-	public pointcut beanConstruction(Object bean) : 
-		initialization(ConfigurableObject+.new(..)) && this(bean); 
+	public pointcut beanConstruction(Object bean) :
+		initialization(ConfigurableObject+.new(..)) && this(bean);
 
 	/**
 	 * Select deserialization join point made available through ITDs for ConfigurableDeserializationSupport
@@ -80,38 +80,38 @@ public abstract aspect AbstractInterfaceDrivenDependencyInjectionAspect extends
 	public pointcut beanDeserialization(Object 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() 
+	 * Declare any class implementing Serializable and ConfigurableObject as also implementing
+	 * ConfigurableDeserializationSupport. This allows us to introduce the 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) 
+	 *		            && !hasmethod(Object readResolve() throws ObjectStreamException)
 	 *		            implements ConfigurableDeserializationSupport;
 	 * </pre>
 	 */
-	declare parents: 
+	declare parents:
 		ConfigurableObject+ && Serializable+	implements ConfigurableDeserializationSupport;
-	
+
 	/**
 	 * A marker interface to which the <code>readResolve()</code> is introduced.
 	 */
 	static interface ConfigurableDeserializationSupport extends Serializable {
 	}
-	
+
 	/**
 	 * Introduce the <code>readResolve()</code> 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</code> 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 f960287720..20b151ed31 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
@@ -43,7 +43,7 @@ import org.springframework.beans.factory.wiring.BeanConfigurerSupport;
  * @see org.springframework.beans.factory.annotation.Configurable
  * @see org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver
  */
-public aspect AnnotationBeanConfigurerAspect 
+public aspect AnnotationBeanConfigurerAspect
 		extends AbstractInterfaceDrivenDependencyInjectionAspect
 		implements BeanFactoryAware, InitializingBean, DisposableBean {
 
@@ -51,7 +51,7 @@ public aspect AnnotationBeanConfigurerAspect
 
 	public pointcut inConfigurableBean() : @this(Configurable);
 
-	public pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*); 
+	public pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);
 
 	declare parents: @Configurable * implements ConfigurableObject;
 
@@ -80,10 +80,10 @@ public aspect AnnotationBeanConfigurerAspect
 	private pointcut preConstructionConfigurationSupport(Configurable c) : @this(c) && if(c.preConstruction());
 
 	/*
-	 * This declaration shouldn't be needed, 
+	 * 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+ 
+	declare parents: @Configurable Serializable+
 		implements ConfigurableDeserializationSupport;
 
 }
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java
index 13597f9a97..9aca558660 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java
@@ -17,7 +17,7 @@ package org.springframework.beans.factory.aspectj;
 
 /**
  * Marker interface for domain object that need DI through aspects.
- * 
+ *
  * @author Ramnivas Laddad
  * @since 2.5
  */
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
index 82795313e7..61a8b90d74 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
@@ -17,24 +17,24 @@ package org.springframework.beans.factory.aspectj;
 
 /**
  * Generic-based dependency injection aspect.
- * <p> 
- * This aspect allows users to implement efficient, type-safe dependency injection without 
+ * <p>
+ * This aspect allows users to implement efficient, type-safe dependency injection without
  * the use of the &#64;Configurable annotation.
- * 
- * The subaspect of this aspect doesn't need to include any AOP constructs. 
+ *
+ * The subaspect of this aspect doesn't need to include any AOP constructs.
  * For example, here is a subaspect that configures the <code>PricingStrategyClient</code> objects.
  * <pre>
- * aspect PricingStrategyDependencyInjectionAspect 
+ * aspect PricingStrategyDependencyInjectionAspect
  *        extends GenericInterfaceDrivenDependencyInjectionAspect<PricingStrategyClient> {
  *     private PricingStrategy pricingStrategy;
- *     
- *     public void configure(PricingStrategyClient bean) { 
- *         bean.setPricingStrategy(pricingStrategy); 
+ *
+ *     public void configure(PricingStrategyClient bean) {
+ *         bean.setPricingStrategy(pricingStrategy);
+ *     }
+ *
+ *     public void setPricingStrategy(PricingStrategy pricingStrategy) {
+ *         this.pricingStrategy = pricingStrategy;
  *     }
- *     
- *     public void setPricingStrategy(PricingStrategy pricingStrategy) { 
- *         this.pricingStrategy = pricingStrategy; 
- *     } 
  * }
  * </pre>
  * @author Ramnivas Laddad
@@ -42,13 +42,13 @@ package org.springframework.beans.factory.aspectj;
  */
 public abstract aspect GenericInterfaceDrivenDependencyInjectionAspect<I> extends AbstractInterfaceDrivenDependencyInjectionAspect {
     declare parents: I implements ConfigurableObject;
-           
+
 	public pointcut inConfigurableBean() : within(I+);
-	
+
 	public final void configureBean(Object bean) {
 		configure((I)bean);
 	}
-	
-	// Unfortunately, erasure used with generics won't allow to use the same named method 
+
+	// Unfortunately, erasure used with generics won't allow to use the same named method
 	protected abstract void configure(I bean);
 }
diff --git a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj
index ccd9472516..ca4d14a66b 100644
--- a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj
@@ -62,7 +62,7 @@ public abstract aspect AbstractCacheAspect extends CacheAspectSupport {
 			}
 		};
 
-		return execute(aspectJInvoker, thisJoinPoint.getTarget(), method, thisJoinPoint.getArgs());	
+		return execute(aspectJInvoker, thisJoinPoint.getTarget(), method, thisJoinPoint.getArgs());
 	}
 
 	/**
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 6ca2bd728c..165252eecf 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
@@ -23,9 +23,9 @@ import java.util.List;
 /**
  * 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 
+ * indicate call stacks when mocking should be triggered, and the
  * methodToMock() pointcut to pick out a method invocations to mock.
- * 
+ *
  * @author Rod Johnson
  * @author Ramnivas Laddad
  */
@@ -42,7 +42,7 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 	// Represents a list of expected calls to static entity methods
 	// Public to allow inserted code to access: is this normal??
 	public class Expectations {
-		
+
 		// Represents an expected call to a static entity method
 		private class Call {
 			private final String signature;
@@ -50,21 +50,21 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 
 			private Object responseObject; // return value or throwable
 			private CallResponse responseType = CallResponse.nothing;
-			
+
 			public Call(String name, Object[] args) {
 				this.signature = name;
 				this.args = args;
 			}
-			
+
 			public boolean hasResponseSpecified() {
 				return responseType != CallResponse.nothing;
 			}
-			
+
 			public void setReturnVal(Object retVal) {
 				this.responseObject = retVal;
 				responseType = CallResponse.return_;
 			}
-			
+
 			public void setThrow(Throwable throwable) {
 				this.responseObject = throwable;
 				responseType = CallResponse.throw_;
@@ -89,7 +89,7 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 				}
 			}
 		}
-		
+
 		private List<Call> calls = new LinkedList<Call>();
 
 		// Calls already verified
@@ -101,7 +101,7 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 						+ " calls, received " + verified);
 			}
 		}
-		
+
 		/**
 		 * Validate the call and provide the expected return value
 		 * @param lastSig
@@ -175,7 +175,7 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 			return expectations.respond(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());
 		}
 	}
-	
+
 	public void expectReturnInternal(Object retVal) {
 		if (!recording) {
 			throw new IllegalStateException("Not recording: Cannot set return value");
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 1c35a47e97..f6c9b7b0a9 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
@@ -20,14 +20,14 @@ package org.springframework.mock.staticmock;
  * Annotation-based aspect to use in test build to enable mocking static methods
  * on JPA-annotated <code>@Entity</code> classes, as used by Roo for finders.
  *
- * <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 in the call stack of any method in a class (typically a test class)
+ * that is annotated with the @MockStaticEntityMethods annotation.
  *
  * <p>Also provides static methods to simplify the programming model for
  * entering playback mode and setting expected return values.
  *
  * <p>Usage:
- * <ol> 
+ * <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
@@ -37,20 +37,20 @@ package org.springframework.mock.staticmock;
  * <li>Call the code you wish to test that uses the static methods. Verification will
  * occur automatically.
  * </ol>
- * 
+ *
  * @author Rod Johnson
  * @author Ramnivas Laddad
  * @see MockStaticEntityMethods
  */
 public aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl {
-	
+
 	/**
 	 * Stop recording mock calls and enter playback state
 	 */
 	public static void playback() {
 		AnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();
 	}
-	
+
 	public static void expectReturn(Object retVal) {
 		AnnotationDrivenStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);
 	}
diff --git a/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj b/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj
index 6ff44249d0..134cfcdf26 100644
--- a/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj
@@ -10,13 +10,13 @@ import org.springframework.orm.jpa.EntityManagerFactoryUtils;
 
 public aspect JpaExceptionTranslatorAspect {
     pointcut entityManagerCall(): call(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) || call(* EntityTransaction.*(..)) || call(* Query.*(..));
-    
-    after() throwing(RuntimeException re): entityManagerCall() {     
+
+    after() throwing(RuntimeException re): entityManagerCall() {
     	DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(re);
     	if (dex != null) {
     		throw dex;
     	} else {
     		throw re;
-    	}        
-    }	
+    	}
+    }
 }
\ No newline at end of file
diff --git a/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj
index c8abf4a729..a64def7ed1 100644
--- a/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj
@@ -28,7 +28,7 @@ import org.springframework.core.task.AsyncTaskExecutor;
 /**
  * Abstract aspect that routes selected methods asynchronously.
  *
- * <p>This aspect needs to be injected with an implementation of 
+ * <p>This aspect needs to be injected with an implementation of
  * {@link Executor} to activate it for a specific thread pool.
  * Otherwise it will simply delegate all calls synchronously.
  *
diff --git a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj
index f4b3109034..36ac0eb2cb 100644
--- a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj
@@ -21,17 +21,17 @@ import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Concrete AspectJ transaction aspect using Spring's @Transactional annotation.
- * 
+ *
  * <p>When using this aspect, you <i>must</i> annotate the implementation class
  * (and/or methods within that class), <i>not</i> the interface (if any) that
- * the class implements. AspectJ follows Java's rule that annotations on 
+ * the class implements. AspectJ follows Java's rule that annotations on
  * interfaces are <i>not</i> inherited.
  *
  * <p>An @Transactional annotation on a class specifies the default transaction
  * semantics for the execution of any <b>public</b> operation in the class.
  *
  * <p>An @Transactional annotation on a method within the class overrides the
- * default transaction semantics given by the class annotation (if present). 
+ * default transaction semantics given by the class annotation (if present).
  * Any method may be annotated (regardless of visibility).
  * Annotating non-public methods directly is the only way
  * to get transaction demarcation for the execution of such operations.
@@ -57,7 +57,7 @@ public aspect AnnotationTransactionAspect extends AbstractTransactionAspect {
 		execution(public * ((@Transactional *)+).*(..)) && within(@Transactional *);
 
 	/**
-	 * Matches the execution of any method with the 
+	 * Matches the execution of any method with the
 	 * Transactional annotation.
 	 */
 	private pointcut executionOfTransactionalMethod() :
@@ -66,7 +66,7 @@ public aspect AnnotationTransactionAspect extends AbstractTransactionAspect {
 	/**
 	 * Definition of pointcut from super aspect - matched join points
 	 * will have Spring transaction management applied.
-	 */	
+	 */
 	protected pointcut transactionalMethodExecution(Object txObject) :
 		(executionOfAnyPublicMethodInAtTransactionalType()
 		 || executionOfTransactionalMethod() )
diff --git a/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java
index 2dd6faa417..d5667cd155 100644
--- a/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java
+++ b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
 public class AutoProxyWithCodeStyleAspectsTests extends TestCase {
 
 	public void testNoAutoproxyingOfAjcCompiledAspects() {
-		new ClassPathXmlApplicationContext("org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml");		
+		new ClassPathXmlApplicationContext("org/springframework/aop/aspectj/autoproxy/ajcAutoproxyTests.xml");
 	}
-	
+
 }
diff --git a/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java
index 7d87547b5f..c5c4ed5e67 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/beans/IOther.java b/spring-aspects/src/test/java/org/springframework/beans/IOther.java
index 797486ec44..6a8f74187c 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java
index a06e15d150..0eb8df5c8a 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java b/spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java
index cdcb73b2cb..09e2fc4c4b 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java
@@ -18,7 +18,7 @@ package org.springframework.cache.config;
 
 /**
  * Basic service interface.
- * 
+ *
  * @author Costin Leau
  */
 public interface CacheableService<T> {
diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
index e8938a804e..33cc40d0a4 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
@@ -25,7 +25,7 @@ import org.springframework.cache.annotation.Caching;
 
 /**
  * Simple cacheable service
- * 
+ *
  * @author Costin Leau
  */
 public class DefaultCacheableService implements CacheableService<Long> {
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
index e33e3aa3f3..3bd1741699 100644
--- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java
+++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java
@@ -45,7 +45,7 @@ public class AnnotationDrivenStaticEntityMockingControlTest {
 		playback();
 		Assert.assertEquals(expectedCount, Person.countPeople());
 	}
-	
+
 	@Test(expected=PersistenceException.class)
 	public void testNoArgThrows() {
 		Person.countPeople();
@@ -64,7 +64,7 @@ public class AnnotationDrivenStaticEntityMockingControlTest {
 		Assert.assertEquals(found, Person.findPerson(id));
 	}
 
-	
+
 	@Test
 	public void testLongSeriesOfCalls() {
 		long id1 = 13;
@@ -80,7 +80,7 @@ public class AnnotationDrivenStaticEntityMockingControlTest {
 		Person.countPeople();
 		expectReturn(0);
 		playback();
-		
+
 		Assert.assertEquals(found1, Person.findPerson(id1));
 		Assert.assertEquals(found2, Person.findPerson(id2));
 		Assert.assertEquals(found1, Person.findPerson(id1));
@@ -122,22 +122,22 @@ public class AnnotationDrivenStaticEntityMockingControlTest {
 	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/Delegate.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
index c99dfe0c2e..946e33aa01 100644
--- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
+++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
@@ -52,7 +52,7 @@ public class Delegate {
 		AnnotationDrivenStaticEntityMockingControl.playback();
 		Assert.assertEquals(found, Person.findPerson(id + 1));
 	}
-	
+
 	@Test
 	public void failTooFewCalls() {
 		long id = 13;
@@ -69,7 +69,7 @@ public class Delegate {
 	public void doesntEverReplay() {
 		Person.countPeople();
 	}
-	
+
 	@Test
 	public void doesntEverSetReturn() {
 		Person.countPeople();
@@ -81,7 +81,7 @@ public class Delegate {
 		AnnotationDrivenStaticEntityMockingControl.playback();
 		Person.countPeople();
 	}
-	
+
 	@Test(expected=RemoteException.class)
 	public void testVerificationFailsEvenWhenTestFailsInExpectedManner() throws RemoteException {
 		Person.countPeople();
diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
index 4d30f14376..7e50ab4a7f 100644
--- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
+++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
@@ -17,84 +17,84 @@
 package org.springframework.mock.staticmock;
 
 privileged aspect Person_Roo_Entity {
-    
-    @javax.persistence.PersistenceContext    
-    transient javax.persistence.EntityManager Person.entityManager;    
-    
-    @javax.persistence.Id    
-    @javax.persistence.GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)    
-    @javax.persistence.Column(name = "id")    
-    private java.lang.Long Person.id;    
-    
-    @javax.persistence.Version    
-    @javax.persistence.Column(name = "version")    
-    private java.lang.Integer Person.version;    
-    
-    public java.lang.Long Person.getId() {    
-        return this.id;        
-    }    
-    
-    public void Person.setId(java.lang.Long id) {    
-        this.id = id;        
-    }    
-    
-    public java.lang.Integer Person.getVersion() {    
-        return this.version;        
-    }    
-    
-    public void Person.setVersion(java.lang.Integer version) {    
-        this.version = version;        
-    }    
-    
-    @org.springframework.transaction.annotation.Transactional    
-    public void Person.persist() {    
-        if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");        
-        this.entityManager.persist(this);        
-    }    
-    
-    @org.springframework.transaction.annotation.Transactional    
-    public void Person.remove() {    
-        if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");        
-        this.entityManager.remove(this);        
-    }    
-    
-    @org.springframework.transaction.annotation.Transactional    
-    public void Person.flush() {    
-        if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");        
-        this.entityManager.flush();        
-    }    
-    
-    @org.springframework.transaction.annotation.Transactional    
-    public void Person.merge() {    
-        if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");        
-        Person merged = this.entityManager.merge(this);        
-        this.entityManager.flush();        
-        this.id = merged.getId();        
-    }    
-    
-    public static long Person.countPeople() {    
-        javax.persistence.EntityManager em = new Person().entityManager;        
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");        
-        return (Long) em.createQuery("select count(o) from Person o").getSingleResult();        
-    }    
-    
-    public static java.util.List<Person> Person.findAllPeople() {    
-        javax.persistence.EntityManager em = new Person().entityManager;        
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");        
-        return em.createQuery("select o from Person o").getResultList();        
-    }    
-    
-    public static Person Person.findPerson(java.lang.Long id) {    
-        if (id == null) throw new IllegalArgumentException("An identifier is required to retrieve an instance of Person");        
-        javax.persistence.EntityManager em = new Person().entityManager;        
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");        
-        return em.find(Person.class, id);        
-    }    
-    
-    public static java.util.List<Person> Person.findPersonEntries(int firstResult, int maxResults) {    
-        javax.persistence.EntityManager em = new Person().entityManager;        
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");        
-        return em.createQuery("select o from Person o").setFirstResult(firstResult).setMaxResults(maxResults).getResultList();        
-    }    
-    
+
+    @javax.persistence.PersistenceContext
+    transient javax.persistence.EntityManager Person.entityManager;
+
+    @javax.persistence.Id
+    @javax.persistence.GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
+    @javax.persistence.Column(name = "id")
+    private java.lang.Long Person.id;
+
+    @javax.persistence.Version
+    @javax.persistence.Column(name = "version")
+    private java.lang.Integer Person.version;
+
+    public java.lang.Long Person.getId() {
+        return this.id;
+    }
+
+    public void Person.setId(java.lang.Long id) {
+        this.id = id;
+    }
+
+    public java.lang.Integer Person.getVersion() {
+        return this.version;
+    }
+
+    public void Person.setVersion(java.lang.Integer version) {
+        this.version = version;
+    }
+
+    @org.springframework.transaction.annotation.Transactional
+    public void Person.persist() {
+        if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        this.entityManager.persist(this);
+    }
+
+    @org.springframework.transaction.annotation.Transactional
+    public void Person.remove() {
+        if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        this.entityManager.remove(this);
+    }
+
+    @org.springframework.transaction.annotation.Transactional
+    public void Person.flush() {
+        if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        this.entityManager.flush();
+    }
+
+    @org.springframework.transaction.annotation.Transactional
+    public void Person.merge() {
+        if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        Person merged = this.entityManager.merge(this);
+        this.entityManager.flush();
+        this.id = merged.getId();
+    }
+
+    public static long Person.countPeople() {
+        javax.persistence.EntityManager em = new Person().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return (Long) em.createQuery("select count(o) from Person o").getSingleResult();
+    }
+
+    public static java.util.List<Person> Person.findAllPeople() {
+        javax.persistence.EntityManager em = new Person().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em.createQuery("select o from Person o").getResultList();
+    }
+
+    public static Person Person.findPerson(java.lang.Long id) {
+        if (id == null) throw new IllegalArgumentException("An identifier is required to retrieve an instance of Person");
+        javax.persistence.EntityManager em = new Person().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em.find(Person.class, id);
+    }
+
+    public static java.util.List<Person> Person.findPersonEntries(int firstResult, int maxResults) {
+        javax.persistence.EntityManager em = new Person().entityManager;
+        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+        return em.createQuery("select o from Person o").setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+    }
+
 }
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index d5c2531fbd..563d610714 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -50,7 +50,7 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM
 		++rollbacks;
 		--inflight;
 	}
-	
+
 	public void clear() {
 		begun = commits = rollbacks = inflight = 0;
 	}
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java
index 6351d55d0d..f718e09385 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2006 the original author 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.
@@ -28,7 +28,7 @@ public class ClassWithPrivateAnnotatedMember {
 	public void doSomething() {
 		doInTransaction();
 	}
-	
+
 	@Transactional
 	private void doInTransaction() {}
 }
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java
index f681c81e84..18763dcc74 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2006 the original author 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.
@@ -28,7 +28,7 @@ public class ClassWithProtectedAnnotatedMember {
 	public void doSomething() {
 		doInTransaction();
 	}
-	
+
 	@Transactional
 	protected void doInTransaction() {}
 }
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java
index 19a115ea21..7e8ef63d16 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java
@@ -4,7 +4,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
 public interface ITransactional {
-	
+
 	Object echo(Throwable t) throws Throwable;
 
 }
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java
index 22cc31ebc6..437a1a4f07 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java
@@ -3,7 +3,7 @@ package org.springframework.transaction.aspectj;
 import org.springframework.transaction.annotation.Transactional;
 
 public class MethodAnnotationOnClassWithNoInterface {
-	
+
 	@Transactional(rollbackFor=InterruptedException.class)
 	public Object echo(Throwable t) throws Throwable {
 		if (t != null) {
@@ -11,9 +11,9 @@ public class MethodAnnotationOnClassWithNoInterface {
 		}
 		return t;
 	}
-	
+
 	public void noTransactionAttribute() {
-		
+
 	}
 
 }
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java
index 9449b2bcf7..407a5e2e99 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java
@@ -31,17 +31,17 @@ import org.springframework.transaction.interceptor.TransactionAttribute;
  * @author Ramnivas Laddad
  */
 public class TransactionAspectTests extends AbstractDependencyInjectionSpringContextTests {
-	
+
 	private TransactionAspectSupport transactionAspect;
-	
+
 	private CallCountingTransactionManager txManager;
-	
+
 	private TransactionalAnnotationOnlyOnClassWithNoInterface annotationOnlyOnClassWithNoInterface;
-	
+
 	private ClassWithProtectedAnnotatedMember beanWithAnnotatedProtectedMethod;
 
 	private ClassWithPrivateAnnotatedMember beanWithAnnotatedPrivateMethod;
-	
+
 	private MethodAnnotationOnClassWithNoInterface methodAnnotationOnly = new MethodAnnotationOnClassWithNoInterface();
 
 
@@ -49,7 +49,7 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 			TransactionalAnnotationOnlyOnClassWithNoInterface annotationOnlyOnClassWithNoInterface) {
 		this.annotationOnlyOnClassWithNoInterface = annotationOnlyOnClassWithNoInterface;
 	}
-	
+
 	public void setClassWithAnnotatedProtectedMethod(ClassWithProtectedAnnotatedMember aBean) {
 		this.beanWithAnnotatedProtectedMethod = aBean;
 	}
@@ -84,14 +84,14 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 		txManager.clear();
 		assertEquals(0, txManager.begun);
 		beanWithAnnotatedProtectedMethod.doInTransaction();
-		assertEquals(1, txManager.commits);		
+		assertEquals(1, txManager.commits);
 	}
 
 	public void testCommitOnAnnotatedPrivateMethod() throws Throwable {
 		txManager.clear();
 		assertEquals(0, txManager.begun);
 		beanWithAnnotatedPrivateMethod.doSomething();
-		assertEquals(1, txManager.commits);		
+		assertEquals(1, txManager.commits);
 	}
 
 	public void testNoCommitOnNonAnnotatedNonPublicMethodInTransactionalType() throws Throwable {
@@ -100,28 +100,28 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 		annotationOnlyOnClassWithNoInterface.nonTransactionalMethod();
 		assertEquals(0,txManager.begun);
 	}
-	
+
 	public void testCommitOnAnnotatedMethod() throws Throwable {
 		txManager.clear();
 		assertEquals(0, txManager.begun);
 		methodAnnotationOnly.echo(null);
 		assertEquals(1, txManager.commits);
 	}
-	
-	
+
+
 	public static class NotTransactional {
 		public void noop() {
 		}
 	}
-	
+
 	public void testNotTransactional() throws Throwable {
 		txManager.clear();
 		assertEquals(0, txManager.begun);
 		new NotTransactional().noop();
 		assertEquals(0, txManager.begun);
 	}
-	
-	
+
+
 	public void testDefaultCommitOnAnnotatedClass() throws Throwable {
 		testRollback(new TransactionOperationCallback() {
 			public Object performTransactionalOperation() throws Throwable {
@@ -129,7 +129,7 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 			}
 		}, false);
 	}
-	
+
 	public void testDefaultRollbackOnAnnotatedClass() throws Throwable {
 		testRollback(new TransactionOperationCallback() {
 			public Object performTransactionalOperation() throws Throwable {
@@ -137,11 +137,11 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 			}
 		}, true);
 	}
-	
-	
+
+
 	public static class SubclassOfClassWithTransactionalAnnotation extends TransactionalAnnotationOnlyOnClassWithNoInterface {
 	}
-	
+
 	public void testDefaultCommitOnSubclassOfAnnotatedClass() throws Throwable {
 		testRollback(new TransactionOperationCallback() {
 			public Object performTransactionalOperation() throws Throwable {
@@ -149,10 +149,10 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 			}
 		}, false);
 	}
-	
+
 	public static class SubclassOfClassWithTransactionalMethodAnnotation extends MethodAnnotationOnClassWithNoInterface {
 	}
-	
+
 	public void testDefaultCommitOnSubclassOfClassWithTransactionalMethodAnnotated() throws Throwable {
 		testRollback(new TransactionOperationCallback() {
 			public Object performTransactionalOperation() throws Throwable {
@@ -160,7 +160,7 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 			}
 		}, false);
 	}
-	
+
 	public static class ImplementsAnnotatedInterface implements ITransactional {
 		public Object echo(Throwable t) throws Throwable {
 			if (t != null) {
@@ -169,14 +169,14 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 			return t;
 		}
 	}
-	
+
 	public void testDefaultCommitOnImplementationOfAnnotatedInterface() throws Throwable {
 //		testRollback(new TransactionOperationCallback() {
 //			public Object performTransactionalOperation() throws Throwable {
 //				return new ImplementsAnnotatedInterface().echo(new Exception());
 //			}
 //		}, false);
-		
+
 		final Exception ex = new Exception();
 		testNotTransactional(new TransactionOperationCallback() {
 			public Object performTransactionalOperation() throws Throwable {
@@ -184,7 +184,7 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 			}
 		}, ex);
 	}
-	
+
 	/**
 	 * Note: resolution does not occur. Thus we can't make a class transactional if
 	 * it implements a transactionally annotated interface. This behaviour could only
@@ -198,15 +198,15 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 		TransactionAttribute ta = atas.getTransactionAttribute(m, ImplementsAnnotatedInterface.class);
 		assertNull(ta);
 	}
-	
-	
+
+
 	public void testDefaultRollbackOnImplementationOfAnnotatedInterface() throws Throwable {
 //		testRollback(new TransactionOperationCallback() {
 //			public Object performTransactionalOperation() throws Throwable {
 //				return new ImplementsAnnotatedInterface().echo(new RuntimeException());
 //			}
 //		}, true);
-		
+
 		final Exception rollbackProvokingException = new RuntimeException();
 		testNotTransactional(new TransactionOperationCallback() {
 			public Object performTransactionalOperation() throws Throwable {
@@ -215,7 +215,7 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 		}, rollbackProvokingException);
 	}
 
-	
+
 	protected void testRollback(TransactionOperationCallback toc, boolean rollback) throws Throwable {
 		txManager.clear();
 		assertEquals(0, txManager.begun);
@@ -228,13 +228,13 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 				return;
 			}
 		}
-		
+
 		if (rollback) {
 			assertEquals(1, txManager.rollbacks);
 		}
 		assertEquals(1, txManager.begun);
 	}
-	
+
 	protected void testNotTransactional(TransactionOperationCallback toc, Throwable expected) throws Throwable {
 		txManager.clear();
 		assertEquals(0, txManager.begun);
@@ -251,7 +251,7 @@ public class TransactionAspectTests extends AbstractDependencyInjectionSpringCon
 			assertEquals(0, txManager.begun);
 		}
 	}
-	
+
 
 	private interface TransactionOperationCallback {
 
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java
index 691506baa0..93bd225f7c 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java
@@ -4,14 +4,14 @@ import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
 public class TransactionalAnnotationOnlyOnClassWithNoInterface {
-	
+
 	public Object echo(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 		return t;
 	}
-	
+
 	void nonTransactionalMethod() {
 		// no-op
 	}
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 efe6fccbcc..b4c13315e7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
@@ -559,7 +559,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 				propertyValue = setDefaultValue(tokens);
 			}
 			else {
-				throw new NullValueInNestedPathException(getRootClass(), this.nestedPath + canonicalName);				
+				throw new NullValueInNestedPathException(getRootClass(), this.nestedPath + canonicalName);
 			}
 		}
 
@@ -723,7 +723,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 					readMethod.setAccessible(true);
 				}
 			}
-			
+
 			Object value;
 			if (System.getSecurityManager() != null) {
 				try {
@@ -740,8 +740,8 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 			else {
                 value = readMethod.invoke(object, (Object[]) null);
 			}
-			
-			if (tokens.keys != null) {				
+
+			if (tokens.keys != null) {
 				if (value == null) {
 					if (this.autoGrowNestedPaths) {
 						value = setDefaultValue(tokens.actualName);
@@ -749,9 +749,9 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 					else {
 						throw new NullValueInNestedPathException(getRootClass(), this.nestedPath + propertyName,
 								"Cannot access indexed value of property referenced in indexed " +
-								"property path '" + propertyName + "': returned null");							
+								"property path '" + propertyName + "': returned null");
 					}
-				}			
+				}
 				String indexedPropertyName = tokens.actualName;
 				// apply indexes and map keys
 				for (int i = 0; i < tokens.keys.length; i++) {
@@ -759,7 +759,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 					if (value == null) {
 						throw new NullValueInNestedPathException(getRootClass(), this.nestedPath + propertyName,
 								"Cannot access indexed value of property referenced in indexed " +
-								"property path '" + propertyName + "': returned null");						
+								"property path '" + propertyName + "': returned null");
 					}
 					else if (value.getClass().isArray()) {
 						int index = Integer.parseInt(key);
@@ -767,9 +767,9 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 						value = Array.get(value, index);
 					}
 					else if (value instanceof List) {
-						int index = Integer.parseInt(key);						
+						int index = Integer.parseInt(key);
 						List list = (List) value;
-						growCollectionIfNecessary(list, index, indexedPropertyName, pd, i + 1);						
+						growCollectionIfNecessary(list, index, indexedPropertyName, pd, i + 1);
 						value = list.get(index);
 					}
 					else if (value instanceof Set) {
@@ -804,7 +804,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 								"Property referenced in indexed property path '" + propertyName +
 								"' is neither an array nor a List nor a Set nor a Map; returned value was [" + value + "]");
 					}
-					indexedPropertyName += PROPERTY_KEY_PREFIX + key + PROPERTY_KEY_SUFFIX;					
+					indexedPropertyName += PROPERTY_KEY_PREFIX + key + PROPERTY_KEY_SUFFIX;
 				}
 			}
 			return value;
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 a2d5ee7af3..e9675f52e4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
@@ -95,7 +95,7 @@ class GenericTypeAwarePropertyDescriptor extends PropertyDescriptor {
 	public Class<?> getBeanClass() {
 		return this.beanClass;
 	}
-	
+
 	@Override
 	public Method getReadMethod() {
 		return this.readMethod;
diff --git a/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java b/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
index 6a9c0eac84..49d1398d7b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
@@ -30,7 +30,7 @@ public class MethodInvocationException extends PropertyAccessException {
 	 * Error code that a method invocation error will be registered with.
 	 */
 	public static final String ERROR_CODE = "methodInvocation";
-	
+
 
 	/**
 	 * Create a new MethodInvocationException.
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
index 830ea5f40d..cb17396c8c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
@@ -30,7 +30,7 @@ import org.springframework.core.ErrorCoded;
 public abstract class PropertyAccessException extends BeansException implements ErrorCoded {
 
 	private transient PropertyChangeEvent propertyChangeEvent;
-	
+
 
 	/**
 	 * Create a new PropertyAccessException.
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java
index 9e141fde3a..56dddc4de5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java
@@ -31,7 +31,7 @@ package org.springframework.beans;
  * @see java.beans.PropertyEditor
  */
 public interface PropertyEditorRegistrar {
-	
+
 	/**
 	 * Register custom {@link java.beans.PropertyEditor PropertyEditors} with
 	 * the given <code>PropertyEditorRegistry</code>.
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java b/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java
index e2180a077e..ad9dbba66e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java
@@ -26,12 +26,12 @@ package org.springframework.beans;
  * @see PropertyValue
  */
 public interface PropertyValues {
-   
-	/** 
+
+	/**
 	 * Return an array of the PropertyValue objects held in this object.
 	 */
-	PropertyValue[] getPropertyValues();	
-	
+	PropertyValue[] getPropertyValues();
+
 	/**
 	 * Return the property value with the given name, if any.
 	 * @param propertyName the name to search for
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 0e58200ad9..a2888182ba 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
@@ -115,7 +115,7 @@ public abstract class BeanFactoryUtils {
 	public static int countBeansIncludingAncestors(ListableBeanFactory lbf) {
 		return beanNamesIncludingAncestors(lbf).length;
 	}
-	
+
 	/**
 	 * Return all bean names in the factory, including ancestor factories.
 	 * @param lbf the bean factory
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java
index 7146ec7806..a741715a3b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java
index 12fdeb853b..536c2e695c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java
index 20eb7845b3..f471915b0a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java
@@ -30,7 +30,7 @@ package org.springframework.beans.factory;
  * @see org.springframework.beans.factory.config.ConfigurableBeanFactory#setParentBeanFactory
  */
 public interface HierarchicalBeanFactory extends BeanFactory {
-	
+
 	/**
 	 * Return the parent bean factory, or <code>null</code> if there is none.
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java
index a21912d31c..420aefb2c0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -20,7 +20,7 @@ package org.springframework.beans.factory;
  * Interface to be implemented by beans that need to react once all their
  * properties have been set by a BeanFactory: for example, to perform custom
  * initialization, or merely to check that all mandatory properties have been set.
- * 
+ *
  * <p>An alternative to implementing InitializingBean is specifying a custom
  * init-method, for example in an XML bean definition.
  * For a list of all bean lifecycle methods, see the BeanFactory javadocs.
@@ -33,7 +33,7 @@ package org.springframework.beans.factory;
  * @see org.springframework.context.ApplicationContextAware
  */
 public interface InitializingBean {
-	
+
 	/**
 	 * Invoked by a BeanFactory after it has set all bean properties supplied
 	 * (and satisfied BeanFactoryAware and ApplicationContextAware).
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
index e7c08c2dc5..64e86dc2c4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
@@ -84,7 +84,7 @@ public interface ListableBeanFactory extends BeanFactory {
 	 * or an empty array if none defined
 	 */
 	String[] getBeanDefinitionNames();
-	
+
 	/**
 	 * Return the names of beans matching the given type (including subclasses),
 	 * judging from either bean definitions or the value of <code>getObjectType</code>
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 7462089556..0157d08650 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
@@ -73,7 +73,7 @@ public class NoSuchBeanDefinitionException extends BeansException {
 		super("No unique bean of type [" + type.getName() + "] is defined: " + message);
 		this.beanType = type;
 	}
-	
+
 	/**
 	 * Create a new {@code NoSuchBeanDefinitionException}.
 	 * @param type required type of the missing bean
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java
index b502384d70..9a607de3ef 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
index 8425921237..61eea7a094 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
@@ -40,7 +40,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * which accesses shared Spring {@link BeanFactory} instances.</p>
  *
  * <p>Please see the warning in BeanFactoryLocator's javadoc about appropriate usage
- * of singleton style BeanFactoryLocator implementations. It is the opinion of the 
+ * of singleton style BeanFactoryLocator implementations. It is the opinion of the
  * Spring team that the use of this class and similar classes is unnecessary except
  * (sometimes) for a small amount of glue code. Excessive usage will lead to code
  * that is more tightly coupled, and harder to modify or test.</p>
@@ -50,11 +50,11 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * searched for is 'classpath*:beanRefFactory.xml', with the Spring-standard
  * 'classpath*:' prefix ensuring that if the classpath contains multiple copies
  * of this file (perhaps one in each component jar) they will be combined. To
- * override the default resource name, instead of using the no-arg 
+ * override the default resource name, instead of using the no-arg
  * {@link #getInstance()} method, use the {@link #getInstance(String selector)}
  * variant, which will treat the 'selector' argument as the resource name to
  * search for.</p>
- * 
+ *
  * <p>The purpose of this 'outer' BeanFactory is to create and hold a copy of one
  * or more 'inner' BeanFactory or ApplicationContext instances, and allow those
  * to be obtained either directly or via an alias. As such, this class provides
@@ -80,10 +80,10 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * or created as three hierarchical ApplicationContexts, by one piece of code
  * somewhere at application startup (perhaps a Servlet filter), from which all other
  * code in the application would flow, obtained as beans from the context(s). However
- * when third party code enters into the picture, things can get problematic. If the 
+ * when third party code enters into the picture, things can get problematic. If the
  * third party code needs to create user classes, which should normally be obtained
  * from a Spring BeanFactory/ApplicationContext, but can handle only newInstance()
- * style object creation, then some extra work is required to actually access and 
+ * style object creation, then some extra work is required to actually access and
  * use object from a BeanFactory/ApplicationContext. One solutions is to make the
  * class created by the third party code be just a stub or proxy, which gets the
  * real object from a BeanFactory/ApplicationContext, and delegates to it. However,
@@ -101,7 +101,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  *
  * <p>Another use of SingletonBeanFactoryLocator, is to demand-load/use one or more
  * BeanFactories/ApplicationContexts. Because the definition can contain one of more
- * BeanFactories/ApplicationContexts, which can be independent or in a hierarchy, if 
+ * BeanFactories/ApplicationContexts, which can be independent or in a hierarchy, if
  * they are set to lazy-initialize, they will only be created when actually requested
  * for use.
  *
@@ -111,9 +111,9 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  *
  * <pre class="code">&lt;?xml version="1.0" encoding="UTF-8"?>
  * &lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
- * 
+ *
  * &lt;beans>
- * 
+ *
  *   &lt;bean id="com.mycompany.myapp"
  *         class="org.springframework.context.support.ClassPathXmlApplicationContext">
  *     &lt;constructor-arg>
@@ -124,7 +124,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  *       &lt;/list>
  *     &lt;/constructor-arg>
  *   &lt;/bean>
- * 
+ *
  * &lt;/beans>
  * </pre>
  *
@@ -133,7 +133,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * <pre class="code">
  * BeanFactoryLocator bfl = SingletonBeanFactoryLocator.getInstance();
  * BeanFactoryReference bf = bfl.useBeanFactory("com.mycompany.myapp");
- * // now use some bean from factory 
+ * // now use some bean from factory
  * MyClass zed = bf.getFactory().getBean("mybean");
  * </pre>
  *
@@ -141,16 +141,16 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  *
  * <pre class="code">&lt;?xml version="1.0" encoding="UTF-8"?>
  * &lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
- * 
+ *
  * &lt;beans>
- * 
+ *
  *   &lt;bean id="com.mycompany.myapp.util" lazy-init="true"
  *         class="org.springframework.context.support.ClassPathXmlApplicationContext">
  *     &lt;constructor-arg>
  *       &lt;value>com/mycompany/myapp/util/applicationContext.xml&lt;/value>
  *     &lt;/constructor-arg>
  *   &lt;/bean>
- * 
+ *
  *   &lt;!-- child of above -->
  *   &lt;bean id="com.mycompany.myapp.dataaccess" lazy-init="true"
  *         class="org.springframework.context.support.ClassPathXmlApplicationContext">
@@ -161,7 +161,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  *       &lt;ref bean="com.mycompany.myapp.util"/>
  *     &lt;/constructor-arg>
  *   &lt;/bean>
- * 
+ *
  *   &lt;!-- child of above -->
  *   &lt;bean id="com.mycompany.myapp.services" lazy-init="true"
  *         class="org.springframework.context.support.ClassPathXmlApplicationContext">
@@ -172,7 +172,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  *       &lt;ref bean="com.mycompany.myapp.dataaccess"/>
  *     &lt;/constructor-arg>
  *   &lt;/bean>
- * 
+ *
  *   &lt;!-- define an alias -->
  *   &lt;bean id="com.mycompany.myapp.mypackage"
  *         class="java.lang.String">
@@ -180,7 +180,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  *       &lt;value>com.mycompany.myapp.services&lt;/value>
  *     &lt;/constructor-arg>
  *   &lt;/bean>
- * 
+ *
  * &lt;/beans>
  * </pre>
  *
@@ -200,7 +200,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  *
  * <pre class="code">&lt;?xml version="1.0" encoding="UTF-8"?>
  * &lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
- * 
+ *
  * &lt;beans>
  *   &lt;bean id="com.mycompany.myapp.util" lazy-init="true"
  *        class="org.springframework.context.support.ClassPathXmlApplicationContext">
@@ -210,12 +210,12 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  *   &lt;/bean>
  * &lt;/beans>
  * </pre>
- * 
+ *
  * <code>beanRefFactory.xml</code> file inside jar for data-access module:<br>
  *
  * <pre class="code">&lt;?xml version="1.0" encoding="UTF-8"?>
  * &lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
- * 
+ *
  * &lt;beans>
  *   &lt;!-- child of util -->
  *   &lt;bean id="com.mycompany.myapp.dataaccess" lazy-init="true"
@@ -229,12 +229,12 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  *   &lt;/bean>
  * &lt;/beans>
  * </pre>
- * 
+ *
  * <code>beanRefFactory.xml</code> file inside jar for services module:
  *
  * <pre class="code">&lt;?xml version="1.0" encoding="UTF-8"?>
  * &lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
- * 
+ *
  * &lt;beans>
  *   &lt;!-- child of data-access -->
  *   &lt;bean id="com.mycompany.myapp.services" lazy-init="true"
@@ -248,20 +248,20 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  *   &lt;/bean>
  * &lt;/beans>
  * </pre>
- * 
+ *
  * <code>beanRefFactory.xml</code> file inside jar for mypackage module. This doesn't
  * create any of its own contexts, but allows the other ones to be referred to be
  * a name known to this module:
  *
  * <pre class="code">&lt;?xml version="1.0" encoding="UTF-8"?>
  * &lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
- * 
+ *
  * &lt;beans>
  *   &lt;!-- define an alias for "com.mycompany.myapp.services" -->
  *   &lt;alias name="com.mycompany.myapp.services" alias="com.mycompany.myapp.mypackage"/&gt;
  * &lt;/beans>
  * </pre>
- *   
+ *
  * @author Colin Sampaleanu
  * @author Juergen Hoeller
  * @see org.springframework.context.access.ContextSingletonBeanFactoryLocator
@@ -362,7 +362,7 @@ public class SingletonBeanFactoryLocator implements BeanFactoryLocator {
 					logger.trace("Factory group with resource name [" + this.resourceLocation +
 							"] requested. Creating new instance.");
 				}
-				
+
 				// Create the BeanFactory but don't initialize it.
 				BeanFactory groupContext = createDefinition(this.resourceLocation, factoryKey);
 
@@ -446,7 +446,7 @@ public class SingletonBeanFactoryLocator implements BeanFactoryLocator {
 
 		return factory;
 	}
-	
+
 	/**
 	 * Instantiate singletons and do any other normal initialization of the factory.
 	 * Subclasses that override {@link #createDefinition createDefinition()} should
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/package-info.java
index 85e6b11a02..7c4a159d5f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Helper infrastructure to locate and access bean factories.
- * 
+ *
  * <p><b>Note: This package is only relevant for special sharing of bean
  * factories, for example behind EJB facades. It is <i>not</i> used in a
  * typical web application or standalone application.</b>
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 4d0b8b5bbf..5b1d61b543 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
@@ -70,10 +70,10 @@ import org.springframework.util.ReflectionUtils;
  * if available, as a direct alternative to Spring's own <code>@Autowired</code>.
  *
  * <p>Only one constructor (at max) of any given bean class may carry this
- * annotation with the 'required' parameter set to <code>true</code>, 
- * indicating <i>the</i> constructor to autowire when used as a Spring bean. 
- * If multiple <i>non-required</i> constructors carry the annotation, they 
- * will be considered as candidates for autowiring. The constructor with 
+ * annotation with the 'required' parameter set to <code>true</code>,
+ * indicating <i>the</i> constructor to autowire when used as a Spring bean.
+ * If multiple <i>non-required</i> constructors carry the annotation, they
+ * will be considered as candidates for autowiring. The constructor with
  * the greatest number of dependencies that can be satisfied by matching
  * beans in the Spring container will be chosen. If none of the candidates
  * can be satisfied, then a default constructor (if present) will be used.
@@ -109,9 +109,9 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 
 	private final Set<Class<? extends Annotation>> autowiredAnnotationTypes =
 			new LinkedHashSet<Class<? extends Annotation>>();
-	
+
 	private String requiredParameterName = "required";
-	
+
 	private boolean requiredParameterValue = true;
 
 	private int order = Ordered.LOWEST_PRECEDENCE - 2;
@@ -185,9 +185,9 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 	}
 
 	/**
-	 * Set the boolean value that marks a dependency as required 
-	 * <p>For example if using 'required=true' (the default), 
-	 * this value should be <code>true</code>; but if using 
+	 * Set the boolean value that marks a dependency as required
+	 * <p>For example if using 'required=true' (the default),
+	 * this value should be <code>true</code>; but if using
 	 * 'optional=false', this value should be <code>false</code>.
 	 * @see #setRequiredParameterName(String)
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java
index 040a80981c..84102e70e9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
 
 /**
  * Marks a class as being eligible for Spring-driven configuration.
- * 
+ *
  * <p>Typically used with the AspectJ <code>AnnotationBeanConfigurerAspect</code>.
  *
  * @author Rod Johnson
@@ -54,7 +54,7 @@ public @interface Configurable {
 	 * Is dependency checking to be performed for configured objects?
 	 */
 	boolean dependencyCheck() default false;
-	
+
 	/**
 	 * Are dependencies to be injected prior to the construction of an object?
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java
index 91aff60e6f..46ef046864 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
 /**
  * Marks a method (typically a JavaBean setter method) as being 'required': that is,
  * the setter method must be configured to be dependency-injected with a value.
- * 
+ *
  * <p>Please do consult the javadoc for the {@link RequiredAnnotationBeanPostProcessor}
  * class (which, by default, checks for the presence of this 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 67d5245278..320db67077 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
@@ -45,7 +45,7 @@ import org.springframework.util.ReflectionUtils;
  * this class will create the object that it creates exactly once
  * on initialization and subsequently return said singleton instance
  * on all calls to the {@link #getObject()} method.
- * 
+ *
  * <p>Else, this class will create a new instance every time the
  * {@link #getObject()} method is invoked. Subclasses are responsible
  * for implementing the abstract {@link #createInstance()} template
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java
index 1619505c1f..47db66447e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
index 70b2e00508..ebaa3a44bb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
index 641f6c7f26..2118bdae98 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
@@ -35,7 +35,7 @@ import org.springframework.util.ClassUtils;
 /**
  * {@link BeanFactoryPostProcessor} implementation that allows for convenient
  * registration of custom {@link PropertyEditor property editors}.
- * 
+ *
  * <p>
  * In case you want to register {@link PropertyEditor} instances, the
  * recommended usage as of Spring 2.0 is to use custom
@@ -43,7 +43,7 @@ import org.springframework.util.ClassUtils;
  * desired editor instances on a given
  * {@link org.springframework.beans.PropertyEditorRegistry registry}. Each
  * PropertyEditorRegistrar can register any number of custom editors.
- * 
+ *
  * <pre class="code">
  * &lt;bean id="customEditorConfigurer" class="org.springframework.beans.factory.config.CustomEditorConfigurer"&gt;
  *   &lt;property name="propertyEditorRegistrars"&gt;
@@ -54,12 +54,12 @@ import org.springframework.util.ClassUtils;
  *   &lt;/property&gt;
  * &lt;/bean&gt;
  * </pre>
- * 
+ *
  * <p>
  * It's perfectly fine to register {@link PropertyEditor} <em>classes</em> via
  * the {@code customEditors} property. Spring will create fresh instances of
  * them for each editing attempt then:
- * 
+ *
  * <pre class="code">
  * &lt;bean id="customEditorConfigurer" class="org.springframework.beans.factory.config.CustomEditorConfigurer"&gt;
  *   &lt;property name="customEditors"&gt;
@@ -70,7 +70,7 @@ import org.springframework.util.ClassUtils;
  *   &lt;/property&gt;
  * &lt;/bean&gt;
  * </pre>
- * 
+ *
  * <p>
  * Note, that you shouldn't register {@link PropertyEditor} bean instances via
  * the {@code customEditors} property as {@link PropertyEditor}s are stateful
@@ -78,7 +78,7 @@ import org.springframework.util.ClassUtils;
  * attempt. In case you need control over the instantiation process of
  * {@link PropertyEditor}s, use a {@link PropertyEditorRegistrar} to register
  * them.
- * 
+ *
  * <p>
  * Also supports "java.lang.String[]"-style array class names and primitive
  * class names (e.g. "boolean"). Delegates to {@link ClassUtils} for actual
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
index 7b3c5ea5df..e84f61c4d5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
@@ -30,7 +30,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * {@link FactoryBean} which retrieves a static or non-static field value.
- * 
+ *
  * <p>Typically used for retrieving public static final constants. Usage example:
  *
  * <pre class="code">// standard definition for exposing a static field, specifying the "staticField" property
@@ -42,10 +42,10 @@ import org.springframework.util.StringUtils;
  * &lt;bean id="java.sql.Connection.TRANSACTION_SERIALIZABLE"
  *       class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean"/&gt;</pre>
  * </pre>
- * 
+ *
  * <p>If you are using Spring 2.0, you can also use the following style of configuration for
  * public static fields.
- * 
+ *
  * <pre class="code">&lt;util:constant static-field="java.sql.Connection.TRANSACTION_SERIALIZABLE"/&gt;</pre>
  *
  * @author Juergen Hoeller
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
index 51440d47da..758092b812 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
@@ -30,7 +30,7 @@ import org.springframework.util.ClassUtils;
 
 /**
  * {@link FactoryBean} which returns a value which is the result of a static or instance
- * method invocation. For most use cases it is better to just use the container's 
+ * method invocation. For most use cases it is better to just use the container's
  * built-in factory method support for the same purpose, since that is smarter at
  * converting arguments. This factory bean is still useful though when you need to
  * call a method which doesn't return any value (for example, a static class method
@@ -55,7 +55,7 @@ import org.springframework.util.ClassUtils;
  *
  * <p>This class depends on {@link #afterPropertiesSet()} being called once
  * all properties have been set, as per the InitializingBean contract.
- * 
+ *
  * <p>An example (in an XML based bean factory definition) of a bean definition
  * which uses this class to call a static factory method:
  *
@@ -82,7 +82,7 @@ import org.springframework.util.ClassUtils;
  *     &lt;/list>
  *   &lt;/property>
  * &lt;/bean></pre>
- * 
+ *
  * @author Colin Sampaleanu
  * @author Juergen Hoeller
  * @since 21.11.2003
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
index 518ce93ff3..c15c47090e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
@@ -31,7 +31,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * {@link FactoryBean} that evaluates a property path on a given target object.
- * 
+ *
  * <p>The target object can be specified directly or via a bean name.
  *
  * <p>Usage examples:
@@ -64,12 +64,12 @@ import org.springframework.util.StringUtils;
  *
  * &lt;!-- will result in 10, which is the value of property 'age' of bean 'tb' --&gt;
  * &lt;bean id="tb.age" class="org.springframework.beans.factory.config.PropertyPathFactoryBean"/&gt;</pre>
- * 
+ *
  * <p>If you are using Spring 2.0 and XML Schema support in your configuration file(s),
  * you can also use the following style of configuration for property path access.
  * (See also the appendix entitled 'XML Schema-based configuration' in the Spring
  * reference manual for more examples.)
- * 
+ *
  * <pre class="code"> &lt;!-- will result in 10, which is the value of property 'age' of bean 'tb' --&gt;
  * &lt;util:property-path id="name" path="testBean.age"/&gt;</pre>
  *
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
index 3df4a47c27..92e3fd1899 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
@@ -18,7 +18,7 @@ package org.springframework.beans.factory.config;
 
 import org.springframework.util.Assert;
 
-/** 
+/**
  * Immutable placeholder class used for a property value object when it's a
  * reference to another bean name in the factory, to be resolved at runtime.
  *
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
  * @see org.springframework.beans.factory.BeanFactory#getBean
  */
 public class RuntimeBeanNameReference implements BeanReference {
-	
+
 	private final String beanName;
 
 	private Object source;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
index 822d98c43c..9bef3a1e81 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
@@ -18,7 +18,7 @@ package org.springframework.beans.factory.config;
 
 import org.springframework.util.Assert;
 
-/** 
+/**
  * Immutable placeholder class used for a property value object when it's
  * a reference to another bean in the factory, to be resolved at runtime.
  *
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
  * @see org.springframework.beans.factory.BeanFactory#getBean
  */
 public class RuntimeBeanReference implements BeanReference {
-	
+
 	private final String beanName;
 
 	private final boolean toParent;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
index bae3c67c50..d4454c46ee 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/package-info.java
@@ -6,7 +6,7 @@
  * Provides an alternative to the Singleton and Prototype design
  * patterns, including a consistent approach to configuration management.
  * Builds on the org.springframework.beans package.
- * 
+ *
  * <p>This package and related packages are discussed in Chapter 11 of
  * <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
  * by Rod Johnson (Wrox, 2002).
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
index 9b3311f512..97ce2d3dde 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
@@ -22,7 +22,7 @@ import org.apache.commons.logging.LogFactory;
 /**
  * Simple {@link ProblemReporter} implementation that exhibits fail-fast
  * behavior when errors are encountered.
- * 
+ *
  * <p>The first error encountered results in a {@link BeanDefinitionParsingException}
  * being thrown.
  *
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java
index c1737e456c..18875d3af3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java
@@ -33,7 +33,7 @@ public class PropertyEntry implements ParseState.Entry {
 	 * Creates a new instance of the {@link PropertyEntry} class.
 	 * @param name the name of the JavaBean property represented by this instance
 	 * @throws IllegalArgumentException if the supplied <code>name</code> is <code>null</code>
-	 * or consists wholly of whitespace 
+	 * or consists wholly of whitespace
 	 */
 	public PropertyEntry(String name) {
 		if (!StringUtils.hasText(name)) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java
index 2c80092fb1..4da479b234 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java
@@ -20,7 +20,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * {@link ParseState} entry representing an autowire candidate qualifier.
- * 
+ *
  * @author Mark Fisher
  * @since 2.5
  */
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 1cf82fc690..7d06a13b08 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
@@ -346,10 +346,10 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		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 +358,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 			else {
 				bean = getInstantiationStrategy().instantiate(bd, null, parent);
 			}
-				
+
 			populateBean(beanClass.getName(), bd, new BeanWrapperImpl(bean));
 			return bean;
 		}
@@ -1346,7 +1346,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 
 		MutablePropertyValues mpvs = null;
 		List<PropertyValue> original;
-		
+
 		if (System.getSecurityManager()!= null) {
 			if (bw instanceof BeanWrapperImpl) {
 				((BeanWrapperImpl) bw).setSecurityContext(getAccessControlContext());
@@ -1473,7 +1473,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		else {
 			invokeAwareMethods(beanName, bean);
 		}
-		
+
 		Object wrappedBean = bean;
 		if (mbd == null || !mbd.isSynthetic()) {
 			wrappedBean = applyBeanPostProcessorsBeforeInitialization(wrappedBean, beanName);
@@ -1540,7 +1540,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 				catch (PrivilegedActionException pae) {
 					throw pae.getException();
 				}
-			}				
+			}
 			else {
 				((InitializingBean) bean).afterPropertiesSet();
 			}
@@ -1585,7 +1585,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		if (logger.isDebugEnabled()) {
 			logger.debug("Invoking init method  '" + initMethodName + "' on bean with name '" + beanName + "'");
 		}
-		
+
 		if (System.getSecurityManager() != null) {
 			AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
 				public Object run() throws Exception {
@@ -1610,7 +1610,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 			try {
 				ReflectionUtils.makeAccessible(initMethod);
 				initMethod.invoke(bean);
-			} 
+			}
 			catch (InvocationTargetException ex) {
 				throw ex.getTargetException();
 			}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java
index 382cc32069..00d5c0bbc0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java
@@ -20,7 +20,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * A simple holder for <code>BeanDefinition</code> property defaults.
- * 
+ *
  * @author Mark Fisher
  * @since 2.5
  */
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 2d3ce41f37..ce25df0711 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
@@ -53,7 +53,7 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 	 * be overridden to provide method lookup.
 	 */
 	private static final int LOOKUP_OVERRIDE = 1;
-	
+
 	/**
 	 * Index in the CGLIB callback array for a method that should
 	 * be overridden using generic Methodreplacer functionality.
@@ -114,8 +114,8 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 					new ReplaceOverrideMethodInterceptor()
 			});
 
-			return (ctor == null) ? 
-					enhancer.create() : 
+			return (ctor == null) ?
+					enhancer.create() :
 					enhancer.create(ctor.getParameterTypes(), args);
 		}
 
@@ -123,7 +123,7 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 		/**
 		 * Class providing hashCode and equals methods required by CGLIB to
 		 * ensure that CGLIB doesn't generate a distinct class per bean.
-		 * Identity is based on class and bean definition. 
+		 * Identity is based on class and bean definition.
 		 */
 		private class CglibIdentitySupport {
 
@@ -157,7 +157,7 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 				// Cast is safe, as CallbackFilter filters are used selectively.
 				LookupOverride lo = (LookupOverride) beanDefinition.getMethodOverrides().getOverride(method);
 				return owner.getBean(lo.getBeanName());
-			}			
+			}
 		}
 
 
@@ -180,7 +180,7 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 		 * CGLIB object to filter method interception behavior.
 		 */
 		private class CallbackFilterImpl extends CglibIdentitySupport implements CallbackFilter {
-			
+
 			public int accept(Method method) {
 				MethodOverride methodOverride = beanDefinition.getMethodOverrides().getOverride(method);
 				if (logger.isTraceEnabled()) {
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 3a769c85d2..a14e5b2b4d 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
@@ -280,7 +280,7 @@ class ConstructorResolver {
 				beanInstance = this.beanFactory.getInstantiationStrategy().instantiate(
 						mbd, beanName, this.beanFactory, constructorToUse, argsToUse);
 			}
-			
+
 			bw.setWrappedInstance(beanInstance);
 			return bw;
 		}
@@ -412,7 +412,7 @@ class ConstructorResolver {
 				rawCandidates = (mbd.isNonPublicAccessAllowed() ?
 						ReflectionUtils.getAllDeclaredMethods(factoryClazz) : factoryClazz.getMethods());
 			}
-			
+
 			List<Method> candidateSet = new ArrayList<Method>();
 			for (Method candidate : rawCandidates) {
 				if (Modifier.isStatic(candidate.getModifiers()) == isStatic &&
@@ -570,7 +570,7 @@ class ConstructorResolver {
 				beanInstance = beanFactory.getInstantiationStrategy().instantiate(
 						mbd, beanName, beanFactory, factoryBean, factoryMethodToUse, argsToUse);
 			}
-			
+
 			if (beanInstance == null) {
 				return 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 9517497ac9..37faa4357d 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
@@ -149,7 +149,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
 			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)) {
@@ -206,7 +206,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
 		super.removeSingleton(beanName);
 		this.factoryBeanObjectCache.remove(beanName);
 	}
-	
+
 	/**
 	 * Returns the security context for this bean factory. If a security manager
 	 * is set, interaction with the user code will be executed using the privileged
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 2a34093cf6..9c1e9292e2 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
@@ -31,7 +31,7 @@ import org.springframework.util.ObjectUtils;
  * @since 1.1
  */
 public class LookupOverride extends MethodOverride {
-	
+
 	private final String 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 a2b85bb2fe..af32ccb075 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
@@ -34,7 +34,7 @@ import org.springframework.util.ObjectUtils;
  * @since 1.1
  */
 public abstract class MethodOverride implements BeanMetadataElement {
-	
+
 	private final String methodName;
 
 	private boolean overloaded = true;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
index c8ba6e4b07..72dd7fd4ca 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
@@ -82,7 +82,7 @@ public class MethodOverrides {
 	public boolean isEmpty() {
 		return this.overrides.isEmpty();
 	}
-	
+
 	/**
 	 * Return the override for the given method, if any.
 	 * @param method method to check for overrides for
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java
index 7e04f826d6..0fa1b59046 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java
@@ -30,7 +30,7 @@ import java.lang.reflect.Method;
  * @since 1.1
  */
 public interface MethodReplacer {
-	
+
 	/**
 	 * Reimplement the given method.
 	 * @param obj the instance we're reimplementing the method for
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
index 71b673c8d8..1dde9b3e2d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
@@ -66,7 +66,7 @@ import org.springframework.util.StringUtils;
  * ceo.$0(ref)=secretary          // inject 'secretary' bean as 0th constructor arg
  * ceo.$1=1000000                 // inject value '1000000' at 1st constructor arg
  * </pre>
- * 
+ *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Rob Harrop
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 3faa967b2b..261ccc0416 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
@@ -76,12 +76,12 @@ public class ReplaceOverride extends MethodOverride {
 			// It can't match.
 			return false;
 		}
-		
+
 		if (!isOverloaded()) {
 			// No overloaded: don't worry about arg type matching.
 			return true;
 		}
-		
+
 		// If we get to here, we need to insist on precise argument matching.
 		if (this.typeIdentifiers.size() != method.getParameterTypes().length) {
 			return false;
@@ -93,7 +93,7 @@ public class ReplaceOverride extends MethodOverride {
 				return false;
 			}
 		}
-		return true;			
+		return true;
 	}
 
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java
index 0403b8900f..6efe58e1e1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2009 the original author 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
index 78b62938da..dbc12b05fc 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2009 the original author 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.
@@ -21,7 +21,7 @@ import java.security.AccessController;
 
 /**
  * Simple {@link SecurityContextProvider} implementation.
- * 
+ *
  * @author Costin Leau
  * @since 3.0
  */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java
index 71a483e483..2523fc71fd 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java
@@ -3,7 +3,7 @@
  *
  * Classes supporting the <code>org.springframework.beans.factory</code> package.
  * Contains abstract base classes for <code>BeanFactory</code> implementations.
- * 
+ *
  *
  */
 package org.springframework.beans.factory.support;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
index d624b2331e..5a7315f81c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
@@ -125,7 +125,7 @@ public abstract class AbstractBeanDefinitionParser implements BeanDefinitionPars
 	 * parameter is <code>false</code>, because one typically does not want inner beans
 	 * to be registered as top level beans.
 	 * @param definition the bean definition to be registered
-	 * @param registry the registry that the bean is to be registered with 
+	 * @param registry the registry that the bean is to be registered with
 	 * @see BeanDefinitionReaderUtils#registerBeanDefinition(BeanDefinitionHolder, BeanDefinitionRegistry)
 	 */
 	protected void registerBeanDefinition(BeanDefinitionHolder definition, BeanDefinitionRegistry registry) {
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 20c96bba68..b933e488cf 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
@@ -40,11 +40,11 @@ import org.springframework.util.StringUtils;
  * class immediately clear. Consider the following class definition:
  *
  * <pre class="code">public class SimpleCache implements Cache {
- * 
+ *
  *     public void setName(String name) {...}
  *     public void setTimeout(int timeout) {...}
  *     public void setEvictionPolicy(EvictionPolicy policy) {...}
- * 
+ *
  *     // remaining class definition elided for clarity...
  * }</pre>
  *
@@ -62,7 +62,7 @@ import org.springframework.util.StringUtils;
  *     protected Class getBeanClass(Element element) {
  *         return SimpleCache.class;
  *     }
- * }</pre> 
+ * }</pre>
  *
  * <p>Please note that the <code>AbstractSimpleBeanDefinitionParser</code>
  * is limited to populating the created bean definition with property values.
@@ -121,7 +121,7 @@ public abstract class AbstractSimpleBeanDefinitionParser extends AbstractSingleB
 	 * property.
 	 * @param element the XML element being parsed
 	 * @param builder used to define the <code>BeanDefinition</code>
-	 * @see #extractPropertyName(String) 
+	 * @see #extractPropertyName(String)
 	 */
 	@Override
 	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
index fcf9af9001..a833a3c514 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
@@ -42,7 +42,7 @@ import org.springframework.core.io.Resource;
  * @see ResourceEntityResolver
  */
 public class BeansDtdResolver implements EntityResolver {
-	
+
 	private static final String DTD_EXTENSION = ".dtd";
 
 	private static final String[] DTD_NAMES = {"spring-beans-2.0", "spring-beans"};
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 4bcc94a22a..913c7db1a6 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
@@ -223,7 +223,7 @@ public class DefaultBeanDefinitionDocumentReader implements BeanDefinitionDocume
 
 		Set<Resource> actualResources = new LinkedHashSet<Resource>(4);
 
-		// Discover whether the location is an absolute or relative URI 
+		// Discover whether the location is an absolute or relative URI
 		boolean absoluteLocation = false;
 		try {
 			absoluteLocation = ResourcePatternUtils.isUrl(location) || ResourceUtils.toURI(location).isAbsolute();
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java
index a6553b1ce4..a3bf241ae7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java
@@ -50,7 +50,7 @@ public interface NamespaceHandler {
 	/**
 	 * Invoked by the {@link DefaultBeanDefinitionDocumentReader} after
 	 * construction but before any custom elements are parsed.
-	 * @see NamespaceHandlerSupport#registerBeanDefinitionParser(String, BeanDefinitionParser) 
+	 * @see NamespaceHandlerSupport#registerBeanDefinitionParser(String, BeanDefinitionParser)
 	 */
 	void init();
 
@@ -66,7 +66,7 @@ public interface NamespaceHandler {
 	 * <strong>not</strong> be used in a nested scenario.
 	 * @param element the element that is to be parsed into one or more <code>BeanDefinitions</code>
 	 * @param parserContext the object encapsulating the current state of the parsing process
-	 * @return the primary <code>BeanDefinition</code> (can be <code>null</code> as explained above) 
+	 * @return the primary <code>BeanDefinition</code> (can be <code>null</code> as explained above)
 	 */
 	BeanDefinition parse(Element element, ParserContext parserContext);
 
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 a3656ec8bb..69d2fc4164 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,12 +1,12 @@
 /*
  * Copyright 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.
@@ -33,24 +33,24 @@ import org.w3c.dom.Node;
  * attributes directly through to bean properties. An important point to note is
  * that this <code>NamespaceHandler</code> 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</code> 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;
  * </pre>
- * 
+ *
  * Here the '<code>c:name</code>' corresponds directly to the '<code>name</code>
  * ' argument declared on the constructor of class '<code>TestBean</code>'. The
  * '<code>c:work-ref</code>' attributes corresponds to the '<code>work</code>'
  * argument and, rather than being the concrete value, it contains the name of
  * the bean that will be considered as a parameter.
- * 
+ *
  * <b>Note</b>: This implementation supports only named parameters - there is no
  * 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
  */
@@ -90,7 +90,7 @@ public class SimpleConstructorNamespaceHandler implements NamespaceHandler {
 			if (argName.startsWith(DELIMITER_PREFIX)) {
 				String arg = argName.substring(1).trim();
 
-				// fast default check 
+				// fast default check
 				if (!StringUtils.hasText(arg)) {
 					cvs.addGenericArgumentValue(valueHolder);
 				}
@@ -107,13 +107,13 @@ public class SimpleConstructorNamespaceHandler implements NamespaceHandler {
 						parserContext.getReaderContext().error(
 								"Constructor argument '" + argName + "' specifies a negative index", attr);
 					}
-					
+
 					if (cvs.hasIndexedArgumentValue(index)){
 						parserContext.getReaderContext().error(
 								"Constructor argument '" + argName + "' with index "+ index+" already defined using <constructor-arg>." +
 								" Only one approach may be used per argument.", attr);
 					}
-					
+
 					cvs.addIndexedArgumentValue(index, valueHolder);
 				}
 			}
@@ -139,7 +139,7 @@ public class SimpleConstructorNamespaceHandler implements NamespaceHandler {
 
 		return true;
 	}
-	
+
 	private boolean checkName(String name, Collection<ValueHolder> values) {
 		for (ValueHolder holder : values) {
 			if (name.equals(holder.getName())) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/package-info.java b/spring-beans/src/main/java/org/springframework/beans/package-info.java
index 1af0af8956..11d8730cd9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/package-info.java
@@ -3,10 +3,10 @@
  *
  * This package contains interfaces and classes for manipulating Java beans.
  * It is used by most other Spring packages.
- * 
+ *
  * <p>A BeanWrapper object may be used to set and get bean properties,
  * singly or in bulk.
- * 
+ *
  * <p>The classes in this package are discussed in Chapter 11 of
  * <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
  * by Rod Johnson (Wrox, 2002).
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
index bf20a7544c..5cdcb1d500 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
@@ -28,7 +28,7 @@ import org.springframework.util.StringUtils;
  * {@link java.beans.PropertyEditor property editor} for <code>char</code>!
  * {@link org.springframework.beans.BeanWrapperImpl} will register this
  * editor by default.
- * 
+ *
  * <p>Also supports conversion from a Unicode character sequence; e.g.
  * <code>u0041</code> ('A').
  *
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java
index 49df579168..9e0944662c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java
@@ -1,12 +1,12 @@
 /*
  * 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.
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 4f0f404d82..19f8bf5393 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
@@ -26,13 +26,13 @@ import java.util.ResourceBundle;
 /**
  * {@link java.beans.PropertyEditor} implementation for
  * {@link java.util.ResourceBundle ResourceBundles}.
- * 
+ *
  * <p>Only supports conversion <i>from</i> a String, but not
  * <i>to</i> a String.
- * 
- * Find below some examples of using this class in a 
+ *
+ * Find below some examples of using this class in a
  * (properly configured) Spring container using XML-based metadata:
- * 
+ *
  * <pre class="code"> &lt;bean id="errorDialog" class="..."&gt;
  *    &lt;!--
  *        the 'messages' property is of type java.util.ResourceBundle.
@@ -40,18 +40,18 @@ import java.util.ResourceBundle;
  *    --&gt;
  *    &lt;property name="messages" value="DialogMessages"/&gt;
  * &lt;/bean&gt;</pre>
- * 
+ *
  * <pre class="code"> &lt;bean id="errorDialog" class="..."&gt;
  *    &lt;!--
  *        the 'DialogMessages.properties' file exists in the 'com/messages' package
  *    --&gt;
  *    &lt;property name="messages" value="com/messages/DialogMessages"/&gt;
  * &lt;/bean&gt;</pre>
- * 
+ *
  * <p>A 'properly configured' Spring {@link org.springframework.context.ApplicationContext container}
  * might contain a {@link org.springframework.beans.factory.config.CustomEditorConfigurer}
  * definition such that the conversion can be effected transparently:
- * 
+ *
  * <pre class="code"> &lt;bean class="org.springframework.beans.factory.config.CustomEditorConfigurer"&gt;
  *    &lt;property name="customEditors"&gt;
  *        &lt;map&gt;
@@ -61,10 +61,10 @@ import java.util.ResourceBundle;
  *        &lt;/map&gt;
  *    &lt;/property&gt;
  * &lt;/bean&gt;</pre>
- * 
+ *
  * <p>Please note that this {@link java.beans.PropertyEditor} is
  * <b>not</b> registered by default with any of the Spring infrastructure.
- * 
+ *
  * <p>Thanks to David Leal Valmana for the suggestion and initial prototype.
  *
  * @author Rick Evans
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java
index c715f61e4c..5bcecaf973 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java
@@ -46,7 +46,7 @@ public class StringArrayPropertyEditor extends PropertyEditorSupport {
 	private final String charsToDelete;
 
 	private final boolean emptyArrayAsNull;
-	
+
 	private final boolean trimValues;
 
 
@@ -83,7 +83,7 @@ public class StringArrayPropertyEditor extends PropertyEditorSupport {
 	 * @param separator the separator to use for splitting a {@link String}
 	 * @param emptyArrayAsNull <code>true</code> if an empty String array
 	 * is to be transformed into <code>null</code>
-	 * @param trimValues <code>true</code> if the values in the parsed arrays 
+	 * @param trimValues <code>true</code> if the values in the parsed arrays
 	 * are to be be trimmed of whitespace (default is true).
 	 */
 	public StringArrayPropertyEditor(String separator, boolean emptyArrayAsNull, boolean trimValues) {
@@ -111,7 +111,7 @@ public class StringArrayPropertyEditor extends PropertyEditorSupport {
 	 * e.g. "\r\n\f" will delete all new lines and line feeds in a String.
 	 * @param emptyArrayAsNull <code>true</code> if an empty String array
 	 * is to be transformed into <code>null</code>
-	 * @param trimValues <code>true</code> if the values in the parsed arrays 
+	 * @param trimValues <code>true</code> if the values in the parsed arrays
 	 * are to be be trimmed of whitespace (default is true).
 	 */
 	public StringArrayPropertyEditor(String separator, String charsToDelete, boolean emptyArrayAsNull, boolean trimValues) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/package-info.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/package-info.java
index 40aa76e11e..376e3c6d3f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/package-info.java
@@ -3,7 +3,7 @@
  *
  * Properties editors used to convert from String values to object
  * types such as java.util.Properties.
- * 
+ *
  * <p>Some of these editors are registered automatically by BeanWrapperImpl.
  * "CustomXxxEditor" classes are intended for manual registration in
  * specific binding processes, as they are localized or the like.
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java b/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java
index d9f9a95bbb..950f22cb06 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java
@@ -81,7 +81,7 @@ public class PropertyComparator implements Comparator {
 		}
 
 		int result;
-		
+
 		// Put an object with null property at the end of the sort result.
 		try {
 			if (v1 != null) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java
index 869701bc59..9ad02dade0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
index aec54454ec..d85622e12b 100644
--- a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
+++ b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
index f85c45233d..4132763825 100644
--- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -25,7 +25,7 @@ import java.util.Map;
  * @author Rod Johnson
  * @author Chris Beams
  */
-public abstract class AbstractPropertyValuesTests { 
+public abstract class AbstractPropertyValuesTests {
 
 	/**
 	 * Must contain: forname=Tony surname=Blair age=50
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 a8abdd95f2..25331d6606 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
@@ -36,7 +36,7 @@ import test.beans.TestBean;
 
 /**
  * Unit tests for {@link BeanUtils}.
- * 
+ *
  * @author Juergen Hoeller
  * @author Rob Harrop
  * @author Chris Beams
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
index 469b22cdaf..c9966af03b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
@@ -71,12 +71,12 @@ public class BeanWrapperAutoGrowingTests {
 	@Test
 	public void getPropertyValueAutoGrowArrayBySeveralElements() {
 		assertNotNull(wrapper.getPropertyValue("array[4]"));
-		assertEquals(5, bean.getArray().length);		
-		assertTrue(bean.getArray()[0] instanceof Bean);		
-		assertTrue(bean.getArray()[1] instanceof Bean);		
-		assertTrue(bean.getArray()[2] instanceof Bean);		
-		assertTrue(bean.getArray()[3] instanceof Bean);		
-		assertTrue(bean.getArray()[4] instanceof Bean);		
+		assertEquals(5, bean.getArray().length);
+		assertTrue(bean.getArray()[0] instanceof Bean);
+		assertTrue(bean.getArray()[1] instanceof Bean);
+		assertTrue(bean.getArray()[2] instanceof Bean);
+		assertTrue(bean.getArray()[3] instanceof Bean);
+		assertTrue(bean.getArray()[4] instanceof Bean);
 		assertNotNull(wrapper.getPropertyValue("array[0]"));
 		assertNotNull(wrapper.getPropertyValue("array[1]"));
 		assertNotNull(wrapper.getPropertyValue("array[2]"));
@@ -94,7 +94,7 @@ public class BeanWrapperAutoGrowingTests {
 	public void getPropertyValueAutoGrowList() {
 		assertNotNull(wrapper.getPropertyValue("list[0]"));
 		assertEquals(1, bean.getList().size());
-		assertTrue(bean.getList().get(0) instanceof Bean);		
+		assertTrue(bean.getList().get(0) instanceof Bean);
 	}
 
 	@Test
@@ -107,11 +107,11 @@ public class BeanWrapperAutoGrowingTests {
 	public void getPropertyValueAutoGrowListBySeveralElements() {
 		assertNotNull(wrapper.getPropertyValue("list[4]"));
 		assertEquals(5, bean.getList().size());
-		assertTrue(bean.getList().get(0) instanceof Bean);		
-		assertTrue(bean.getList().get(1) instanceof Bean);		
-		assertTrue(bean.getList().get(2) instanceof Bean);		
-		assertTrue(bean.getList().get(3) instanceof Bean);		
-		assertTrue(bean.getList().get(4) instanceof Bean);		
+		assertTrue(bean.getList().get(0) instanceof Bean);
+		assertTrue(bean.getList().get(1) instanceof Bean);
+		assertTrue(bean.getList().get(2) instanceof Bean);
+		assertTrue(bean.getList().get(3) instanceof Bean);
+		assertTrue(bean.getList().get(4) instanceof Bean);
 		assertNotNull(wrapper.getPropertyValue("list[0]"));
 		assertNotNull(wrapper.getPropertyValue("list[1]"));
 		assertNotNull(wrapper.getPropertyValue("list[2]"));
@@ -167,9 +167,9 @@ public class BeanWrapperAutoGrowingTests {
 		private Bean[] array;
 
 		private Bean[][] multiArray;
-		
+
 		private List<Bean> list;
-		
+
 		private List<List<Bean>> multiList;
 
 		private List listNotParameterized;
@@ -215,7 +215,7 @@ public class BeanWrapperAutoGrowingTests {
 		public void setList(List<Bean> list) {
 			this.list = list;
 		}
-		
+
 		public List<List<Bean>> getMultiList() {
 			return multiList;
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
index 4866cc101b..2a0cf025b0 100644
--- a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -50,7 +50,7 @@ public final class ConcurrentBeanWrapperTests {
 			performSet();
 		}
 	}
-	
+
 	@Test
 	public void testConcurrent() {
 		for (int i = 0; i < 10; i++) {
diff --git a/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java b/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java
index 8eeb96e36c..2b114defc7 100644
--- a/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java
@@ -36,7 +36,7 @@ public final class MutablePropertyValuesTests extends AbstractPropertyValuesTest
 		pvs.addPropertyValue(new PropertyValue("surname", "Blair"));
 		pvs.addPropertyValue(new PropertyValue("age", "50"));
 		doTestTony(pvs);
-		
+
 		MutablePropertyValues deepCopy = new MutablePropertyValues(pvs);
 		doTestTony(deepCopy);
 		deepCopy.setPropertyValueAt(new PropertyValue("name", "Gordon"), 0);
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 4094dd3974..636fbda545 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
@@ -45,12 +45,12 @@ import static test.util.TestResourceUtils.qualifiedResource;
  * @since 04.07.2003
  */
 public final class BeanFactoryUtilsTests {
-	
+
 	private static final Class<?> CLASS = BeanFactoryUtilsTests.class;
-	private static final Resource ROOT_CONTEXT = qualifiedResource(CLASS, "root.xml"); 
-	private static final Resource MIDDLE_CONTEXT = qualifiedResource(CLASS, "middle.xml"); 
-	private static final Resource LEAF_CONTEXT = qualifiedResource(CLASS, "leaf.xml"); 
-	private static final Resource DEPENDENT_BEANS_CONTEXT = qualifiedResource(CLASS, "dependentBeans.xml"); 
+	private static final Resource ROOT_CONTEXT = qualifiedResource(CLASS, "root.xml");
+	private static final Resource MIDDLE_CONTEXT = qualifiedResource(CLASS, "middle.xml");
+	private static final Resource LEAF_CONTEXT = qualifiedResource(CLASS, "leaf.xml");
+	private static final Resource DEPENDENT_BEANS_CONTEXT = qualifiedResource(CLASS, "dependentBeans.xml");
 
 	private ConfigurableListableBeanFactory listableBeanFactory;
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
index 563b56fca8..3ba946c962 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
@@ -48,7 +48,7 @@ public final class ConcurrentBeanFactoryTests {
 
 	private static final Log logger = LogFactory.getLog(ConcurrentBeanFactoryTests.class);
 	private static final Resource CONTEXT = qualifiedResource(ConcurrentBeanFactoryTests.class, "context.xml");
-	
+
 	private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy/MM/dd");
 	private static final Date DATE_1, DATE_2;
 
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 1acfc0a504..5c821a4f80 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
@@ -2539,38 +2539,38 @@ public class DefaultListableBeanFactoryTests {
 			return this.userName;
 		}
 	}
-	
+
 	/**
 	 * Bean that changes state on a business invocation, so that
 	 * we can check whether it's been invoked
 	 * @author Rod Johnson
 	 */
 	private static class SideEffectBean {
-		
+
 		private int count;
-		
+
 		public void setCount(int count) {
 			this.count = count;
 		}
-		
+
 		public int getCount() {
 			return this.count;
 		}
-		
+
 		public void doWork() {
 			++count;
 		}
 
 	}
-	
+
 	private static class KnowsIfInstantiated {
-		
+
 		private static boolean instantiated;
-		
+
 		public static void clearInstantiationRecord() {
 			instantiated = false;
 		}
-		
+
 		public static boolean wasInstantiated() {
 			return instantiated;
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
index 127b162110..5b4c200f58 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
@@ -40,31 +40,31 @@ public class FactoryBeanLookupTests {
 		beanFactory = new XmlBeanFactory(
 				new ClassPathResource("FactoryBeanLookupTests-context.xml", this.getClass()));
 	}
-	
+
 	@Test
 	public void factoryBeanLookupByNameDereferencing() {
 		Object fooFactory = beanFactory.getBean("&fooFactory");
 		assertThat(fooFactory, instanceOf(FooFactoryBean.class));
 	}
-	
+
 	@Test
 	public void factoryBeanLookupByType() {
 		FooFactoryBean fooFactory = beanFactory.getBean(FooFactoryBean.class);
 		assertNotNull(fooFactory);
 	}
-	
+
 	@Test
 	public void factoryBeanLookupByTypeAndNameDereference() {
 		FooFactoryBean fooFactory = beanFactory.getBean("&fooFactory", FooFactoryBean.class);
 		assertNotNull(fooFactory);
 	}
-	
+
 	@Test
 	public void factoryBeanObjectLookupByName() {
 		Object fooFactory = beanFactory.getBean("fooFactory");
 		assertThat(fooFactory, instanceOf(Foo.class));
 	}
-	
+
 	@Test
 	public void factoryBeanObjectLookupByNameAndType() {
 		Foo foo = beanFactory.getBean("fooFactory", Foo.class);
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 9d1123fe1c..c1e5f9acfe 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
@@ -33,9 +33,9 @@ import org.springframework.util.Assert;
 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 RETURNS_NULL_CONTEXT = qualifiedResource(CLASS, "returnsNull.xml");
+	private static final Resource WITH_AUTOWIRING_CONTEXT = qualifiedResource(CLASS, "withAutowiring.xml");
+
 	@Test
 	public void testFactoryBeanReturnsNull() throws Exception {
 		XmlBeanFactory factory = new XmlBeanFactory(RETURNS_NULL_CONTEXT);
@@ -46,10 +46,10 @@ public final class FactoryBeanTests {
 	@Test
 	public void testFactoryBeansWithAutowiring() throws Exception {
 		XmlBeanFactory factory = new XmlBeanFactory(WITH_AUTOWIRING_CONTEXT);
-		
+
 		BeanFactoryPostProcessor ppc = (BeanFactoryPostProcessor) factory.getBean("propertyPlaceholderConfigurer");
 		ppc.postProcessBeanFactory(factory);
-		
+
 		Alpha alpha = (Alpha) factory.getBean("alpha");
 		Beta beta = (Beta) factory.getBean("beta");
 		Gamma gamma = (Gamma) factory.getBean("gamma");
@@ -63,10 +63,10 @@ public final class FactoryBeanTests {
 	@Test
 	public void testFactoryBeansWithIntermediateFactoryBeanAutowiringFailure() throws Exception {
 		XmlBeanFactory factory = new XmlBeanFactory(WITH_AUTOWIRING_CONTEXT);
-		
+
 		BeanFactoryPostProcessor ppc = (BeanFactoryPostProcessor) factory.getBean("propertyPlaceholderConfigurer");
 		ppc.postProcessBeanFactory(factory);
-		
+
 		Beta beta = (Beta) factory.getBean("beta");
 		Alpha alpha = (Alpha) factory.getBean("alpha");
 		Gamma gamma = (Gamma) factory.getBean("gamma");
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
index 2a9bff1c30..460559b068 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
@@ -26,7 +26,7 @@ import org.springframework.util.ClassUtils;
 
 /**
  * Unit tests for {@link SingletonBeanFactoryLocator}.
- * 
+ *
  * @author Colin Sampaleanu
  * @author Chris Beams
  */
@@ -38,7 +38,7 @@ public class SingletonBeanFactoryLocatorTests {
 	public void testBasicFunctionality() {
 		SingletonBeanFactoryLocator facLoc = new SingletonBeanFactoryLocator(
 				"classpath*:" + ClassUtils.addResourcePathToPackagePath(CLASS, REF1_XML));
-		
+
 		basicFunctionalityTest(facLoc);
 	}
 
@@ -81,7 +81,7 @@ public class SingletonBeanFactoryLocatorTests {
 		BeanFactoryLocator facLoc = SingletonBeanFactoryLocator.getInstance(
 				ClassUtils.addResourcePathToPackagePath(CLASS, REF1_XML));
 		getInstanceTest1(facLoc);
-		
+
 		facLoc = SingletonBeanFactoryLocator.getInstance(
 				"classpath*:/" + ClassUtils.addResourcePathToPackagePath(CLASS, REF1_XML));
 		getInstanceTest2(facLoc);
@@ -90,7 +90,7 @@ public class SingletonBeanFactoryLocatorTests {
 		facLoc = SingletonBeanFactoryLocator.getInstance(
 				"classpath:" + ClassUtils.addResourcePathToPackagePath(CLASS, REF1_XML));
 		getInstanceTest3(facLoc);
-		
+
 	}
 
 	/**
@@ -109,12 +109,12 @@ public class SingletonBeanFactoryLocatorTests {
 		fac = bfr3.getFactory();
 		tb = (TestBean) fac.getBean("beans1.bean1");
 		assertTrue(tb.getName().equals("was beans1.bean1"));
-		
+
 		BeanFactoryReference bfr4 = facLoc.useBeanFactory("a.qualified.name.which.is.an.alias");
 		fac = bfr4.getFactory();
 		tb = (TestBean) fac.getBean("beans1.bean1");
 		assertTrue(tb.getName().equals("was beans1.bean1"));
-		
+
 		bfr.release();
 		bfr3.release();
 		bfr2.release();
@@ -152,7 +152,7 @@ public class SingletonBeanFactoryLocatorTests {
 		bfr4.release();
 		bfr3.release();
 	}
-	
+
 	/**
 	 * Worker method so subclass can use it too
 	 */
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 0e798b9e41..37fc30a4ee 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
@@ -45,7 +45,7 @@ import static org.junit.Assert.*;
 
 /**
  * Unit tests for {@link AutowiredAnnotationBeanPostProcessor}.
- * 
+ *
  * @author Juergen Hoeller
  * @author Mark Fisher
  * @author Sam Brannen
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
index 6beb38ada1..4f96efc8d3 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
@@ -30,7 +30,7 @@ import org.springframework.core.io.Resource;
 
 /**
  * Unit tests for {@link CustomAutowireConfigurer}.
- * 
+ *
  * @author Mark Fisher
  * @author Juergen Hoeller
  * @author Chris Beams
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
index c7870b3236..265fea19a6 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
@@ -39,7 +39,7 @@ import org.springframework.beans.propertyeditors.CustomDateEditor;
 
 /**
  * Unit tests for {@link CustomEditorConfigurer}.
- * 
+ *
  * @author Juergen Hoeller
  * @author Chris Beams
  * @since 31.07.2004
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
index 29aa612110..0c328ce481 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
@@ -30,13 +30,13 @@ import test.beans.TestBean;
 
 /**
  * Unit tests for {@link FieldRetrievingFactoryBean}.
- * 
+ *
  * @author Juergen Hoeller
  * @author Chris Beams
  * @since 31.07.2004
  */
 public final class FieldRetrievingFactoryBeanTests {
-	
+
 	private static final Resource CONTEXT =
 		qualifiedResource(FieldRetrievingFactoryBeanTests.class, "context.xml");
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
index bd11117a4a..616b025ad3 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
@@ -29,7 +29,7 @@ import org.springframework.util.MethodInvoker;
 
 /**
  * Unit tests for {@link MethodInvokingFactoryBean}.
- * 
+ *
  * @author Colin Sampaleanu
  * @author Juergen Hoeller
  * @author Chris Beams
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
index 41c9ce811f..b67861cc28 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -42,7 +42,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
 
 	private static final Resource CONTEXT =
 		qualifiedResource(ObjectFactoryCreatingFactoryBeanTests.class, "context.xml");
-	
+
 	private XmlBeanFactory beanFactory;
 
 	@Before
@@ -116,7 +116,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
 		ObjectFactory<?> objectFactory = (ObjectFactory<?>) factory.getObject();
 		Object actualSingleton = objectFactory.getObject();
 		assertSame(expectedSingleton, actualSingleton);
-		
+
 		verify(beanFactory);
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
index ca972f349a..18fd8bd421 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
@@ -26,13 +26,13 @@ import org.springframework.core.io.Resource;
 
 /**
  * Unit tests for {@link PropertiesFactoryBean}.
- * 
+ *
  * @author Juergen Hoeller
  * @author Chris Beams
  * @since 01.11.2003
  */
 public final class PropertiesFactoryBeanTests {
-	
+
 	private static final Class<?> CLASS = PropertiesFactoryBeanTests.class;
 	private static final Resource TEST_PROPS = qualifiedResource(CLASS, "test.properties");
 	private static final Resource TEST_PROPS_XML = qualifiedResource(CLASS, "test.properties.xml");
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
index fd3891bf99..5a564500eb 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
@@ -28,13 +28,13 @@ import test.beans.TestBean;
 
 /**
  * Unit tests for {@link PropertyPathFactoryBean}.
- * 
+ *
  * @author Juergen Hoeller
  * @author Chris Beams
  * @since 04.10.2004
  */
 public class PropertyPathFactoryBeanTests {
-	
+
 	private static final Resource CONTEXT = qualifiedResource(PropertyPathFactoryBeanTests.class, "context.xml");
 
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
index afb273a5b5..115f618a00 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
@@ -32,7 +32,7 @@ import org.springframework.core.NestedRuntimeException;
 
 /**
  * Unit tests for {@link ServiceLocatorFactoryBean}.
- * 
+ *
  * @author Colin Sampaleanu
  * @author Rick Evans
  * @author Chris Beams
@@ -40,7 +40,7 @@ import org.springframework.core.NestedRuntimeException;
 public final class ServiceLocatorFactoryBeanTests {
 
 	private DefaultListableBeanFactory bf;
-	
+
 	@Before
 	public void setUp() {
 		bf = new DefaultListableBeanFactory();
@@ -53,7 +53,7 @@ public final class ServiceLocatorFactoryBeanTests {
 				genericBeanDefinition(ServiceLocatorFactoryBean.class)
 				.addPropertyValue("serviceLocatorInterface", TestServiceLocator.class)
 				.getBeanDefinition());
-		
+
 		TestServiceLocator factory = (TestServiceLocator) bf.getBean("factory");
 		TestService testService = factory.getTestService();
 		assertNotNull(testService);
@@ -75,13 +75,13 @@ public final class ServiceLocatorFactoryBeanTests {
 				genericBeanDefinition(ServiceLocatorFactoryBean.class)
 				.addPropertyValue("serviceLocatorInterface", TestService2Locator.class)
 				.getBeanDefinition());
-		
+
 		try {
 			TestServiceLocator factory = (TestServiceLocator) bf.getBean("factory");
 			factory.getTestService();
 			fail("Must fail on more than one matching type");
 		} catch (NoSuchBeanDefinitionException ex) { /* expected */ }
-		
+
 		try {
 			TestServiceLocator2 factory = (TestServiceLocator2) bf.getBean("factory2");
 			factory.getTestService(null);
@@ -114,7 +114,7 @@ public final class ServiceLocatorFactoryBeanTests {
 				.addPropertyValue("serviceLocatorInterface", TestService2Locator.class)
 				.addPropertyValue("serviceLocatorExceptionClass", CustomServiceLocatorException3.class)
 				.getBeanDefinition());
-		
+
 		try {
 			TestServiceLocator factory = (TestServiceLocator) bf.getBean("factory");
 			factory.getTestService();
@@ -123,7 +123,7 @@ public final class ServiceLocatorFactoryBeanTests {
 		catch (CustomServiceLocatorException1 expected) {
 			assertTrue(expected.getCause() instanceof NoSuchBeanDefinitionException);
 		}
-		
+
 		try {
 			TestServiceLocator2 factory2 = (TestServiceLocator2) bf.getBean("factory2");
 			factory2.getTestService(null);
@@ -132,7 +132,7 @@ public final class ServiceLocatorFactoryBeanTests {
 		catch (CustomServiceLocatorException2 expected) {
 			assertTrue(expected.getCause() instanceof NoSuchBeanDefinitionException);
 		}
-		
+
 		try {
 			TestService2Locator factory3 = (TestService2Locator) bf.getBean("factory3");
 			factory3.getTestService();
@@ -150,7 +150,7 @@ public final class ServiceLocatorFactoryBeanTests {
 
 		// test string-arg getter with null id
 		TestServiceLocator2 factory = (TestServiceLocator2) bf.getBean("factory");
-		
+
 		@SuppressWarnings("unused")
 		TestService testBean = factory.getTestService(null);
 		// now test with explicit id
@@ -166,12 +166,12 @@ public final class ServiceLocatorFactoryBeanTests {
 	public void testCombinedLocatorInterface() {
 		bf.registerBeanDefinition("testService", genericBeanDefinition(TestService.class).getBeanDefinition());
 		bf.registerAlias("testService", "1");
-		
+
 		bf.registerBeanDefinition("factory",
 				genericBeanDefinition(ServiceLocatorFactoryBean.class)
 				.addPropertyValue("serviceLocatorInterface", TestServiceLocator3.class)
 				.getBeanDefinition());
-		
+
 //		StaticApplicationContext ctx = new StaticApplicationContext();
 //		ctx.registerPrototype("testService", TestService.class, new MutablePropertyValues());
 //		ctx.registerAlias("testService", "1");
@@ -204,7 +204,7 @@ public final class ServiceLocatorFactoryBeanTests {
 				.addPropertyValue("serviceLocatorInterface", TestServiceLocator3.class)
 				.addPropertyValue("serviceMappings", "=testService1\n1=testService1\n2=testService2")
 				.getBeanDefinition());
-		
+
 //		StaticApplicationContext ctx = new StaticApplicationContext();
 //		ctx.registerPrototype("testService1", TestService.class, new MutablePropertyValues());
 //		ctx.registerPrototype("testService2", ExtendedTestService.class, new MutablePropertyValues());
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
index 6833092119..14b272ee0f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
@@ -39,11 +39,11 @@ import test.beans.TestBean;
  * @author Chris Beams
  */
 public final class SimpleScopeTests {
-	
+
 	private static final Resource CONTEXT = qualifiedResource(SimpleScopeTests.class, "context.xml");
 
 	private DefaultListableBeanFactory beanFactory;
-	
+
 	@Before
 	public void setUp() {
 		beanFactory = new DefaultListableBeanFactory();
@@ -71,7 +71,7 @@ public final class SimpleScopeTests {
 		XmlBeanDefinitionReader xbdr = new XmlBeanDefinitionReader(beanFactory);
 		xbdr.loadBeanDefinitions(CONTEXT);
 	}
-	
+
 	@Test
 	public void testCanGetScopedObject() {
 		TestBean tb1 = (TestBean) beanFactory.getBean("usesScope");
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java
index 2aec11ef71..5460f8bd01 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java
@@ -20,7 +20,7 @@ import org.springframework.beans.factory.ObjectFactory;
 
 /**
  * Shared test types for this package.
- * 
+ *
  * @author Chris Beams
  */
 final class TestTypes {}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
index 774fb0b5a8..d5e4441f20 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
@@ -36,7 +36,7 @@ import test.beans.TestBean;
  * @since 2.0
  */
 public final class CustomProblemReporterTests {
-	
+
 	private static final Resource CONTEXT = qualifiedResource(CustomProblemReporterTests.class, "context.xml");
 
 	private CollatingProblemReporter problemReporter;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java
index c8d5e9c1ec..56b9b1fbc6 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 
 /**
  * Unit tests for {@link PassThroughSourceExtractor}.
- * 
+ *
  * @author Rick Evans
  * @author Chris Beams
  */
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java
index b995560e5f..72a90473e2 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java
@@ -53,9 +53,9 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
 		RootBeanDefinition rbd = new RootBeanDefinition(Person.class, cavs, null);
 		lbf.registerBeanDefinition(JUERGEN, rbd);
 		assertTrue(lbf.isAutowireCandidate(JUERGEN, null));
-		assertTrue(lbf.isAutowireCandidate(JUERGEN, 
+		assertTrue(lbf.isAutowireCandidate(JUERGEN,
 				new DependencyDescriptor(Person.class.getDeclaredField("name"), false)));
-		assertTrue(lbf.isAutowireCandidate(JUERGEN, 
+		assertTrue(lbf.isAutowireCandidate(JUERGEN,
 				new DependencyDescriptor(Person.class.getDeclaredField("name"), true)));
 	}
 
@@ -68,16 +68,16 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
 		rbd.setAutowireCandidate(false);
 		lbf.registerBeanDefinition(JUERGEN, rbd);
 		assertFalse(lbf.isAutowireCandidate(JUERGEN, null));
-		assertFalse(lbf.isAutowireCandidate(JUERGEN, 
+		assertFalse(lbf.isAutowireCandidate(JUERGEN,
 				new DependencyDescriptor(Person.class.getDeclaredField("name"), false)));
-		assertFalse(lbf.isAutowireCandidate(JUERGEN, 
+		assertFalse(lbf.isAutowireCandidate(JUERGEN,
 				new DependencyDescriptor(Person.class.getDeclaredField("name"), true)));
 	}
 
 	@Ignore
 	@Test
 	public void testAutowireCandidateWithFieldDescriptor() throws Exception {
-		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();	
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs1 = new ConstructorArgumentValues();
 		cavs1.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person1 = new RootBeanDefinition(Person.class, cavs1, null);
@@ -101,7 +101,7 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
 
 	@Test
 	public void testAutowireCandidateExplicitlyFalseWithFieldDescriptor() throws Exception {
-		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();	
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs = new ConstructorArgumentValues();
 		cavs.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
@@ -119,7 +119,7 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
 
 	@Test
 	public void testAutowireCandidateWithShortClassName() throws Exception {
-		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();	
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs = new ConstructorArgumentValues();
 		cavs.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
@@ -137,7 +137,7 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
 	@Ignore
 	@Test
 	public void testAutowireCandidateWithConstructorDescriptor() throws Exception {
-		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();	
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs1 = new ConstructorArgumentValues();
 		cavs1.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person1 = new RootBeanDefinition(Person.class, cavs1, null);
@@ -159,7 +159,7 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
 	@Ignore
 	@Test
 	public void testAutowireCandidateWithMethodDescriptor() throws Exception {
-		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();	
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs1 = new ConstructorArgumentValues();
 		cavs1.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person1 = new RootBeanDefinition(Person.class, cavs1, null);
@@ -189,7 +189,7 @@ public class QualifierAnnotationAutowireBeanFactoryTests {
 
 	@Test
 	public void testAutowireCandidateWithMultipleCandidatesDescriptor() throws Exception {
-		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();	
+		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		ConstructorArgumentValues cavs1 = new ConstructorArgumentValues();
 		cavs1.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person1 = new RootBeanDefinition(Person.class, cavs1, null);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
index 497352028a..ea14f4c875 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -63,11 +63,11 @@ import org.springframework.core.io.Resource;
 /**
  * Security test case. Checks whether the container uses its privileges for its
  * internal work but does not leak them when touching/calling user code.
- * 
+ *
  *t The first half of the test case checks that permissions are downgraded when
  * calling user code while the second half that the caller code permission get
  * through and Spring doesn't override the permission stack.
- * 
+ *
  * @author Costin Leau
  */
 public class CallbacksSecurityTests {
@@ -97,7 +97,7 @@ public class CallbacksSecurityTests {
 		public void setProperty(Object value) {
 			checkCurrentContext();
 		}
-		
+
 		public Object getProperty() {
 			checkCurrentContext();
 			return null;
@@ -111,7 +111,7 @@ public class CallbacksSecurityTests {
 			checkCurrentContext();
 			return null;
 		}
-		
+
 		private void checkCurrentContext() {
 			assertEquals(expectedName, getCurrentSubjectName());
 		}
@@ -352,7 +352,7 @@ public class CallbacksSecurityTests {
 			assertTrue(ex.getCause() instanceof SecurityException);
 		}
 	}
-	
+
 	@Test
 	public void testCustomInitBean() throws Exception {
 		try {
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java
index 95cf5df4da..1d07565be6 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-2009 the original author 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
index 80c09aff2b..0091998af7 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-2009 the original author 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.
@@ -23,7 +23,7 @@ public class CustomCallbackBean {
 	public void init() {
 		System.getProperties();
 	}
-	
+
 	public void destroy() {
 		System.setProperty("security.destroy", "true");
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
index 93a8c344ba..12f80e38b7 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-2009 the original author 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
index d24ff22474..b429cd8e4b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-2009 the original author 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
index 43efd6fd8b..f648206980 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-2009 the original author 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.
@@ -19,12 +19,12 @@ package org.springframework.beans.factory.support.security.support;
  * @author Costin Leau
  */
 public class FactoryBean {
-	
+
 	public static Object makeStaticInstance() {
 		System.getProperties();
 		return new Object();
 	}
-	
+
 	protected static Object protectedStaticInstance() {
 		return "protectedStaticInstance";
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
index acd4343d21..62f379ee8b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-2009 the original author 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
index ced0d45b93..cf51e1cdd0 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-2009 the original author 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.
@@ -25,6 +25,6 @@ public class PropertyBean {
 	}
 
 	public void setProperty(Object property) {
-		
+
 	}
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
index 6deeeb47c9..2a72cde701 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
@@ -102,7 +102,7 @@ public class BeanConfigurerSupportTests extends TestCase {
 		configurer.setBeanWiringInfoResolver(resolver);
 		configurer.configureBean(beanInstance);
 		assertEquals("Bean is evidently not being configured (for some reason)", "David Gavurin", beanInstance.getSpouse().getName());
-		
+
 		mock.verify();
 	}
 
@@ -126,7 +126,7 @@ public class BeanConfigurerSupportTests extends TestCase {
 		configurer.setBeanWiringInfoResolver(resolver);
 		configurer.configureBean(beanInstance);
 		assertEquals("Bean is evidently not being configured (for some reason)", "David Gavurin", beanInstance.getSpouse().getName());
-		
+
 		mock.verify();
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
index ba05c51675..32e6134823 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
@@ -58,5 +58,5 @@ public class BeanNameGenerationTests extends TestCase {
 
 		assertFalse(child1.getBeanName().equals(child2.getBeanName()));
 	}
-	
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
index 72f32f07ef..d16ff925c5 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -28,11 +28,11 @@ import test.beans.TestBean;
  * @since 09.11.2003
  */
 public class ConstructorDependenciesBean implements Serializable {
-	
+
 	private int age;
-	
+
 	private String name;
-	
+
 	private TestBean spouse1;
 
 	private TestBean spouse2;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
index 2a2b5dcdab..7387cdf600 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -28,11 +28,11 @@ import test.beans.TestBean;
  * @since 04.09.2003
  */
 public class DependenciesBean implements BeanFactoryAware {
-	
+
 	private int age;
-	
+
 	private String name;
-	
+
 	private TestBean spouse;
 
 	private BeanFactory beanFactory;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
index d42ab430eb..fbc40ca302 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
index 1c9e484182..bd2d837038 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
@@ -31,11 +31,11 @@ import test.beans.TestBean;
  * With Spring 3.1, bean id attributes (and all other id attributes across the
  * core schemas) are no longer typed as xsd:id, but as xsd:string.  This allows
  * for using the same bean id within nested <beans> elements.
- * 
+ *
  * Duplicate ids *within the same level of nesting* will still be treated as an
  * error through the ProblemReporter, as this could never be an intended/valid
  * situation.
- * 
+ *
  * @author Chris Beams
  * @since 3.1
  * @see org.springframework.beans.factory.xml.XmlBeanFactoryTests#testWithDuplicateName
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 38666e188c..8ee4c39d63 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
@@ -29,7 +29,7 @@ import test.beans.TestBean;
  * @author Juergen Hoeller
  */
 public class FactoryMethods {
-	
+
 	public static FactoryMethods nullInstance() {
 		return null;
 	}
@@ -39,21 +39,21 @@ public class FactoryMethods {
 		tb.setName("defaultInstance");
 		return new FactoryMethods(tb, "default", 0);
 	}
-	
+
 	/**
 	 * Note that overloaded methods are supported.
 	 */
 	public static FactoryMethods newInstance(TestBean tb) {
 		return new FactoryMethods(tb, "default", 0);
 	}
-	
+
 	protected static FactoryMethods newInstance(TestBean tb, int num, String name) {
 		if (name == null) {
 			throw new IllegalStateException("Should never be called with null value");
 		}
 		return new FactoryMethods(tb, name, num);
 	}
-	
+
 	static FactoryMethods newInstance(TestBean tb, int num, Integer something) {
 		if (something != null) {
 			throw new IllegalStateException("Should never be called with non-null value");
@@ -81,35 +81,35 @@ public class FactoryMethods {
 		this.name = name;
 		this.num = num;
 	}
-	
+
 	public void setStringValue(String stringValue) {
 		this.stringValue = stringValue;
 	}
-	
+
 	public String getStringValue() {
 		return this.stringValue;
 	}
-	
+
 	public TestBean getTestBean() {
 		return this.tb;
 	}
-	
+
 	protected TestBean protectedGetTestBean() {
 		return this.tb;
 	}
-	
+
 	private TestBean privateGetTestBean() {
 		return this.tb;
 	}
-	
+
 	public int getNum() {
 		return num;
 	}
-	
+
 	public String getName() {
 		return name;
 	}
-	
+
 	/**
 	 * Set via Setter Injection once instance is created.
 	 */
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java
index f67a718949..6e3f1df422 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -37,26 +37,26 @@ public class InstanceFactory {
 	public void setFactoryBeanProperty(String s) {
 		this.factoryBeanProperty = s;
 	}
-	
+
 	public String getFactoryBeanProperty() {
 		return this.factoryBeanProperty;
 	}
-	
+
 	public FactoryMethods defaultInstance() {
 		TestBean tb = new TestBean();
 		tb.setName(this.factoryBeanProperty);
 		return FactoryMethods.newInstance(tb);
 	}
-	
+
 	/**
 	 * Note that overloaded methods are supported.
 	 */
 	public FactoryMethods newInstance(TestBean tb) {
 		return FactoryMethods.newInstance(tb);
 	}
-	
+
 	public FactoryMethods newInstance(TestBean tb, int num, String name) {
 		return FactoryMethods.newInstance(tb, num, name);
 	}
-	
+
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
index ffd13f4630..07d8371b6f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -21,18 +21,18 @@ import test.beans.TestBean;
 /**
  * Test class for Spring's ability to create
  * objects using static factory methods, rather
- * than constructors. 
+ * than constructors.
  * @author Rod Johnson
  */
 public class TestBeanCreator {
-	
+
 	public static TestBean createTestBean(String name, int age) {
 		TestBean tb = new TestBean();
 		tb.setName(name);
 		tb.setAge(age);
 		return tb;
 	}
-	
+
 	public static TestBean createTestBean() {
 		TestBean tb = new TestBean();
 		tb.setName("Tristan");
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
index 460c18a9f6..eacf97579e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
@@ -454,7 +454,7 @@ public class XmlBeanCollectionTests {
  * @since 05.06.2003
  */
 class HasMap {
-	
+
 	private Map map;
 
 	private IdentityHashMap identityMap;
@@ -464,11 +464,11 @@ class HasMap {
 	private CopyOnWriteArraySet concurrentSet;
 
 	private Properties props;
-	
+
 	private Object[] objectArray;
-	
+
 	private Class[] classArray;
-	
+
 	private Integer[] intArray;
 
 	public Map getMap() {
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 8af531ca8f..49473c6dc5 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
@@ -106,7 +106,7 @@ public class XmlBeanDefinitionReaderTests extends TestCase {
 		catch (BeanDefinitionStoreException expected) {
 		}
 	}
-	                                                                           
+
 	public void testWithInputSourceAndExplicitValidationMode() {
 		SimpleBeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();;
 		InputSource resource = new InputSource(getClass().getResourceAsStream("test.xml"));
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java
index e491b3ef88..eb936a57ef 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.xml.UtilNamespaceHandler;
 
 /**
  * Unit and integration tests for the {@link DefaultNamespaceHandlerResolver} class.
- * 
+ *
  * @author Rob Harrop
  * @author Rick Evans
  */
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java
index 7c8ab4a56f..4bf47d014a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java
@@ -46,7 +46,7 @@ public final class ByteArrayPropertyEditorTests extends TestCase {
 	public void testGetAsTextReturnsEmptyStringIfValueIsNull() throws Exception {
 		PropertyEditor byteEditor = new ByteArrayPropertyEditor();
 		assertEquals("", byteEditor.getAsText());
-		
+
 		byteEditor.setAsText(null);
 		assertEquals("", byteEditor.getAsText());
 	}
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 ea5a69fb46..c5a230a2c8 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
@@ -59,7 +59,7 @@ import test.beans.TestBean;
  * @author Rob Harrop
  * @author Arjen Poutsma
  * @author Chris Beams
- * 
+ *
  * @since 10.06.2003
  */
 public class CustomEditorTests {
@@ -511,7 +511,7 @@ public class CustomEditorTests {
 
 		bw.setPropertyValue("myChar", "\\u0022");
 		assertEquals('"', cb.getMyChar());
-		
+
 		CharacterEditor editor = new CharacterEditor(false);
 		editor.setAsText("M");
 		assertEquals("M", editor.getAsText());
@@ -672,7 +672,7 @@ public class CustomEditorTests {
 
 		patternEditor = new PatternEditor();
 		assertEquals("", patternEditor.getAsText());
-		
+
 		patternEditor = new PatternEditor();
 		patternEditor.setAsText(null);
 		assertEquals("", patternEditor.getAsText());
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java
index 3e8266ea2d..e2baf25530 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java
@@ -40,7 +40,7 @@ public class PropertiesEditorTests extends TestCase {
 		assertTrue("contains one entry", p.entrySet().size() == 1);
 		assertTrue("foo=bar", p.get("foo").equals("bar"));
 	}
-	
+
 	public void testTwoProperties() {
 		String s = "foo=bar with whitespace\n" +
 			"me=mi";
@@ -51,7 +51,7 @@ public class PropertiesEditorTests extends TestCase {
 		assertTrue("foo=bar with whitespace", p.get("foo").equals("bar with whitespace"));
 		assertTrue("me=mi", p.get("me").equals("mi"));
 	}
-	
+
 	public void testHandlesEqualsInValue() {
 		String s = "foo=bar\n" +
 			"me=mi\n" +
@@ -64,7 +64,7 @@ public class PropertiesEditorTests extends TestCase {
 		assertTrue("me=mi", p.get("me").equals("mi"));
 		assertTrue("x='y=z'", p.get("x").equals("y=z"));
 	}
-	
+
 	public void testHandlesEmptyProperty() {
 		String s = "foo=bar\nme=mi\nx=";
 		PropertiesEditor pe= new PropertiesEditor();
@@ -75,7 +75,7 @@ public class PropertiesEditorTests extends TestCase {
 		assertTrue("me=mi", p.get("me").equals("mi"));
 		assertTrue("x='y=z'", p.get("x").equals(""));
 	}
-	
+
 	public void testHandlesEmptyPropertyWithoutEquals() {
 		String s = "foo\nme=mi\nx=x";
 		PropertiesEditor pe= new PropertiesEditor();
@@ -85,7 +85,7 @@ public class PropertiesEditorTests extends TestCase {
 		assertTrue("foo is empty", p.get("foo").equals(""));
 		assertTrue("me=mi", p.get("me").equals("mi"));
 	}
-	
+
 	/**
 	 * Comments begin with #
 	 */
@@ -124,14 +124,14 @@ public class PropertiesEditorTests extends TestCase {
 		assertTrue("foo is bar", p.get("foo").equals("bar"));
 		assertTrue("me=mi", p.get("me").equals("mi"));
 	}
-	
+
 	public void testNull() {
 		PropertiesEditor pe= new PropertiesEditor();
 		pe.setAsText(null);
 		Properties p = (Properties) pe.getValue();
 		assertEquals(0, p.size());
 	}
-	
+
 	public void testEmptyString() {
 		PropertiesEditor pe = new PropertiesEditor();
 		pe.setAsText("");
diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
index 0d1712048f..4e478abb6d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
index 6d74ebe739..34bfbac3b9 100644
--- a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
@@ -23,9 +23,9 @@ import org.springframework.util.comparator.CompoundComparator;
 
 /**
  * Unit tests for {@link PropertyComparator}
- * 
+ *
  * @see org.springframework.util.comparator.ComparatorTests
- * 
+ *
  * @author Keith Donald
  * @author Chris Beams
  */
diff --git a/spring-beans/src/test/java/test/beans/BooleanTestBean.java b/spring-beans/src/test/java/test/beans/BooleanTestBean.java
index 37a022b661..c6f32d1f91 100644
--- a/spring-beans/src/test/java/test/beans/BooleanTestBean.java
+++ b/spring-beans/src/test/java/test/beans/BooleanTestBean.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
diff --git a/spring-beans/src/test/java/test/beans/DummyBean.java b/spring-beans/src/test/java/test/beans/DummyBean.java
index 54ae5e65d6..6c83aed209 100644
--- a/spring-beans/src/test/java/test/beans/DummyBean.java
+++ b/spring-beans/src/test/java/test/beans/DummyBean.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 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.
@@ -24,7 +24,7 @@ public class DummyBean {
 	private String name;
 	private int age;
 	private TestBean spouse;
-	
+
 	public DummyBean(Object value) {
 		this.value = value;
 	}
diff --git a/spring-beans/src/test/java/test/beans/INestedTestBean.java b/spring-beans/src/test/java/test/beans/INestedTestBean.java
index 228109c284..87bfc26773 100644
--- a/spring-beans/src/test/java/test/beans/INestedTestBean.java
+++ b/spring-beans/src/test/java/test/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-beans/src/test/java/test/beans/IOther.java b/spring-beans/src/test/java/test/beans/IOther.java
index 734235aa06..e5b576de3b 100644
--- a/spring-beans/src/test/java/test/beans/IOther.java
+++ b/spring-beans/src/test/java/test/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-beans/src/test/java/test/beans/NestedTestBean.java b/spring-beans/src/test/java/test/beans/NestedTestBean.java
index d3fde438b6..a630f8662a 100644
--- a/spring-beans/src/test/java/test/beans/NestedTestBean.java
+++ b/spring-beans/src/test/java/test/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-beans/src/test/java/test/beans/NumberTestBean.java b/spring-beans/src/test/java/test/beans/NumberTestBean.java
index 2a4db759b6..e739da4738 100644
--- a/spring-beans/src/test/java/test/beans/NumberTestBean.java
+++ b/spring-beans/src/test/java/test/beans/NumberTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java b/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java
index 167211091f..a77af92d12 100644
--- a/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java
+++ b/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java
@@ -25,5 +25,5 @@ package test.beans;
 class PackageLevelVisibleBean {
 
 	public static final String CONSTANT = "Wuby";
-	
+
 }
diff --git a/spring-beans/src/test/java/test/util/TestResourceUtils.java b/spring-beans/src/test/java/test/util/TestResourceUtils.java
index 410788d2c1..cad4aeae22 100644
--- a/spring-beans/src/test/java/test/util/TestResourceUtils.java
+++ b/spring-beans/src/test/java/test/util/TestResourceUtils.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
@@ -30,12 +30,12 @@ public class TestResourceUtils {
         /**
          * Loads 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
          */
diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailSender.java b/spring-context-support/src/main/java/org/springframework/mail/MailSender.java
index 390b950871..fb44ac572e 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/MailSender.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/MailSender.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -30,7 +30,7 @@ package org.springframework.mail;
  * @see org.springframework.mail.javamail.JavaMailSender
  */
 public interface MailSender {
-	
+
 	/**
 	 * Send the given simple mail message.
 	 * @param simpleMessage the message to send
diff --git a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
index e5e5fe73b8..518d846c1e 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
@@ -67,7 +67,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 	/**
 	 * Copy constructor for creating a new <code>SimpleMailMessage</code> from the state
 	 * of an existing <code>SimpleMailMessage</code> instance.
-	 * @throws IllegalArgumentException if the supplied message is <code>null</code> 
+	 * @throws IllegalArgumentException if the supplied message is <code>null</code>
 	 */
 	public SimpleMailMessage(SimpleMailMessage original) {
 		Assert.notNull(original, "The 'original' message argument cannot be null");
@@ -168,7 +168,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 	/**
 	 * Copy the contents of this message to the given target message.
 	 * @param target the <code>MailMessage</code> to copy to
-	 * @throws IllegalArgumentException if the supplied <code>target</code> is <code>null</code> 
+	 * @throws IllegalArgumentException if the supplied <code>target</code> is <code>null</code>
 	 */
 	public void copyTo(MailMessage target) {
 		Assert.notNull(target, "The 'target' message argument cannot be null");
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 f4ba067752..acc1e30b21 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,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java
index 7d87547b5f..c5c4ed5e67 100644
--- a/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context-support/src/test/java/org/springframework/beans/IOther.java b/spring-context-support/src/test/java/org/springframework/beans/IOther.java
index 797486ec44..6a8f74187c 100644
--- a/spring-context-support/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-context-support/src/test/java/org/springframework/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
index a06e15d150..0eb8df5c8a 100644
--- a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/CacheEvict.java b/spring-context/src/main/java/org/springframework/cache/annotation/CacheEvict.java
index 3e6e49d760..6017ca6df2 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/CacheEvict.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/CacheEvict.java
@@ -38,7 +38,7 @@ public @interface CacheEvict {
 
 	/**
 	 * Qualifier value for the specified cached operation.
-	 * <p>May be used to determine the target cache (or caches), matching the qualifier 
+	 * <p>May be used to determine the target cache (or caches), matching the qualifier
 	 * value (or the bean name(s)) of (a) specific bean definition.
 	 */
 	String[] value();
@@ -50,7 +50,7 @@ public @interface CacheEvict {
 	String key() default "";
 
 	/**
-	 * Spring Expression Language (SpEL) attribute used for conditioning the method caching. 
+	 * Spring Expression Language (SpEL) attribute used for conditioning the method caching.
 	 * <p>Default is "", meaning the method is always cached.
 	 */
 	String condition() default "";
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java b/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
index 447ce62b4f..7116955e82 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
@@ -52,7 +52,7 @@ public @interface Cacheable {
 	String key() default "";
 
 	/**
-	 * Spring Expression Language (SpEL) attribute used for conditioning the method caching. 
+	 * Spring Expression Language (SpEL) attribute used for conditioning the method caching.
 	 * <p>Default is "", meaning the method is always cached.
 	 */
 	String condition() default "";
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 1a600193b9..cda9352b52 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
@@ -223,7 +223,7 @@ public abstract class CacheAspectSupport implements InitializingBean {
 
 		return invoker.invoke();
 	}
-	
+
 	private void inspectBeforeCacheEvicts(Collection<CacheOperationContext> evictions) {
 		inspectCacheEvicts(evictions, true);
 	}
@@ -326,7 +326,7 @@ public abstract class CacheAspectSupport implements InitializingBean {
 					}
 				}
 			}
-			
+
 			// return a status only if at least on cacheable matched
 			if (atLeastOnePassed) {
 				return new CacheStatus(cUpdates, updateRequire, retVal);
diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationContext.java b/spring-context/src/main/java/org/springframework/context/ApplicationContext.java
index 85336bc43a..2ded439068 100644
--- a/spring-context/src/main/java/org/springframework/context/ApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/ApplicationContext.java
@@ -22,7 +22,7 @@ import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.core.env.EnvironmentCapable;
 import org.springframework.core.io.support.ResourcePatternResolver;
 
-/** 
+/**
  * Central interface to provide configuration for an application.
  * This is read-only while the application is running, but may be
  * reloaded if the implementation supports this.
diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java b/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java
index 07a7f7f3ec..8c74f2974a 100644
--- a/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java
+++ b/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java
@@ -57,8 +57,8 @@ import org.springframework.beans.factory.Aware;
  * @see org.springframework.beans.factory.BeanFactoryAware
  */
 public interface ApplicationContextAware extends Aware {
-	
-	/** 
+
+	/**
 	 * Set the ApplicationContext that this object runs in.
 	 * Normally this call will be used to initialize the object.
 	 * <p>Invoked after population of normal bean properties but before an init callback such
diff --git a/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java b/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java
index 45ef4243c7..dc15274a85 100644
--- a/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -24,8 +24,8 @@ package org.springframework.context;
  * @author Juergen Hoeller
  */
 public interface HierarchicalMessageSource extends MessageSource {
-	
-	/** 
+
+	/**
 	 * Set the parent that will be used to try to resolve messages
 	 * that this object can't resolve.
 	 * @param parent the parent MessageSource that will be used to
diff --git a/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java b/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java
index b6441e59d7..6590f111d5 100644
--- a/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java
+++ b/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java
@@ -19,7 +19,7 @@ package org.springframework.context;
 /**
  * Interface for objects that are suitable for message resolution in a
  * {@link MessageSource}.
- * 
+ *
  * <p>Spring's own validation error classes implement this interface.
  *
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java b/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java
index b2ab999a3f..38bb09b935 100644
--- a/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java
+++ b/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/Phased.java b/spring-context/src/main/java/org/springframework/context/Phased.java
index 3d262233b9..b4b84d86d9 100644
--- a/spring-context/src/main/java/org/springframework/context/Phased.java
+++ b/spring-context/src/main/java/org/springframework/context/Phased.java
@@ -19,7 +19,7 @@ package org.springframework.context;
 /**
  * Interface for objects that may participate in a phased
  * process such as lifecycle management.
- * 
+ *
  * @author Mark Fisher
  * @since 3.0
  * @see SmartLifecycle
diff --git a/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java b/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java
index 3491cd047b..6b413e6204 100644
--- a/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java
+++ b/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java
@@ -46,7 +46,7 @@ import org.springframework.core.io.ResourceLoader;
  * <p>As alternative to a ResourcePatternResolver dependency, consider exposing
  * bean properties of type Resource array, populated via pattern Strings with
  * automatic type conversion by the bean factory.
- * 
+ *
  * @author Juergen Hoeller
  * @author Chris Beams
  * @since 10.03.2004
diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java b/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
index fe56c165ae..43d674367d 100644
--- a/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
+++ b/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -59,7 +59,7 @@ public class ContextBeanFactoryReference implements BeanFactoryReference {
 	public void release() {
 		if (this.applicationContext != null) {
 			ApplicationContext savedCtx;
-			
+
 			// We don't actually guarantee thread-safety, but it's not a lot of extra work.
 			synchronized (this) {
 				savedCtx = this.applicationContext;
diff --git a/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java b/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java
index 66e88b6bfc..9b55072489 100644
--- a/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java
+++ b/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/access/package-info.java b/spring-context/src/main/java/org/springframework/context/access/package-info.java
index eeceb70a9f..bcf7238ac6 100644
--- a/spring-context/src/main/java/org/springframework/context/access/package-info.java
+++ b/spring-context/src/main/java/org/springframework/context/access/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Helper infrastructure to locate and access shared application contexts.
- * 
+ *
  * <p><b>Note: This package is only relevant for special sharing of application
  * contexts, for example behind EJB facades. It is <i>not</i> used in a typical
  * web application or standalone application.</b>
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 60a05635aa..1a185248ba 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
@@ -37,7 +37,7 @@ import org.springframework.util.StringUtils;
  * {@link org.springframework.stereotype.Component @Component} as a
  * meta-annotation. For example, Spring's stereotype annotations (such as
  * {@link org.springframework.stereotype.Repository @Repository}) are
- * themselves annotated with 
+ * themselves annotated with
  * {@link org.springframework.stereotype.Component @Component}.
  *
  * <p>Also supports Java EE 6's {@link javax.annotation.ManagedBean} and
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 900584037d..4f40ea26ae 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
@@ -118,7 +118,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
  * the invocation via a CGLIB proxy. This is analogous to inter-{@code @Transactional}
  * method calls where in proxy mode, Spring does not intercept the invocation &mdash;
  * Spring does so only in AspectJ mode.
- * 
+ *
  * <p>For example:
  *
  * <pre class="code">
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 a06bd3d770..bc2ed4e63c 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
@@ -256,7 +256,7 @@ public class ClassPathBeanDefinitionScanner extends ClassPathScanningCandidateCo
 					beanDefinitions.add(definitionHolder);
 					registerBeanDefinition(definitionHolder, this.registry);
 				}
-			}						
+			}
 		}
 		return beanDefinitions;
 	}
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 295ebb500f..4de429f2c4 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
@@ -127,7 +127,7 @@ import org.springframework.util.StringUtils;
  * to specify a custom CommonAnnotationBeanPostProcessor bean definition!
  * <p><b>NOTE:</b> Annotation injection will be performed <i>before</i> XML injection; thus
  * the latter configuration will override the former for properties wired through
- * both approaches. 
+ * both approaches.
  *
  * @author Juergen Hoeller
  * @since 2.5
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 5268e633aa..a25fdcf4ce 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
@@ -178,7 +178,7 @@ final class ConfigurationClass {
 			int newCount = currentCount != null ? currentCount + 1 : 1;
 			methodNameCounts.put(fqMethodName, newCount);
 		}
-		
+
 		for (String methodName : methodNameCounts.keySet()) {
 			int count = methodNameCounts.get(methodName);
 			if (count > 1) {
@@ -186,7 +186,7 @@ final class ConfigurationClass {
 				problemReporter.error(new BeanMethodOverloadingProblem(shortMethodName, count));
 			}
 		}
-		
+
 		// A configuration class may not be final (CGLIB limitation)
 		if (getMetadata().isAnnotated(Configuration.class.getName())) {
 			if (getMetadata().isFinal()) {
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 e7fa93a246..e41aca1728 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
@@ -333,7 +333,7 @@ class ConfigurationClassBeanDefinitionReader {
 		}
 	}
 
-	
+
 	/**
 	 * Configuration classes must be annotated with {@link Configuration @Configuration} or
 	 * declare at least one {@link Bean @Bean} method.
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 f2fa6273e6..7afbc02733 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
@@ -79,7 +79,7 @@ import static org.springframework.context.annotation.AnnotationConfigUtils.*;
  * that any {@link Bean} methods declared in Configuration classes have their
  * respective bean definitions registered before any other BeanFactoryPostProcessor
  * executes.
- * 
+ *
  * @author Chris Beams
  * @author Juergen Hoeller
  * @since 3.0
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Scope.java b/spring-context/src/main/java/org/springframework/context/annotation/Scope.java
index b62c3ca6ec..bcb433f5ca 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Scope.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Scope.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
  * When used as a type-level annotation in conjunction with the {@link Component}
  * annotation, indicates the name of a scope to use for instances of the annotated
  * type.
- * 
+ *
  * <p>When used as a method-level annotation in conjunction with the
  * {@link Bean} annotation, indicates the name of a scope to use for
  * the instance returned from the method.
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java
index 07b41d1000..2f67592b0f 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
 public class ScopeMetadata {
 
 	private String scopeName = BeanDefinition.SCOPE_SINGLETON;
-	
+
 	private ScopedProxyMode scopedProxyMode = ScopedProxyMode.NO;
 
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java
index e9cbcb25f7..54bafe39a5 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java
@@ -20,7 +20,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
 
 /**
  * Strategy interface for resolving the scope of bean definitions.
- * 
+ *
  * @author Mark Fisher
  * @since 2.5
  * @see org.springframework.context.annotation.Scope
@@ -40,5 +40,5 @@ public interface ScopeMetadataResolver {
 	 * @return the relevant scope metadata; never <code>null</code>
 	 */
 	ScopeMetadata resolveScopeMetadata(BeanDefinition definition);
-	
+
 }
diff --git a/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java
index d48ad706b8..256ee62064 100644
--- a/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java
@@ -34,7 +34,7 @@ class PropertyOverrideBeanDefinitionParser extends AbstractPropertyLoadingBeanDe
 	protected Class getBeanClass(Element element) {
 		return PropertyOverrideConfigurer.class;
 	}
-	
+
 	@Override
 	protected void doParse(Element element, BeanDefinitionBuilder builder) {
 
diff --git a/spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java b/spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java
index 8537e05087..fff09d2da4 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java
@@ -38,7 +38,7 @@ import org.springframework.util.StringUtils;
  * Standard implementation of the
  * {@link org.springframework.beans.factory.config.BeanExpressionResolver}
  * interface, parsing and evaluating Spring EL using Spring's expression module.
- * 
+ *
  * @author Juergen Hoeller
  * @since 3.0
  * @see org.springframework.expression.ExpressionParser
diff --git a/spring-context/src/main/java/org/springframework/context/package-info.java b/spring-context/src/main/java/org/springframework/context/package-info.java
index c7ae35d00e..3a09bc5a58 100644
--- a/spring-context/src/main/java/org/springframework/context/package-info.java
+++ b/spring-context/src/main/java/org/springframework/context/package-info.java
@@ -5,7 +5,7 @@
  * message sources and for the Observer design pattern, and the
  * ability for application objects to obtain resources using a
  * consistent API.
- * 
+ *
  * <p>There is no necessity for Spring applications to depend
  * on ApplicationContext or even BeanFactory functionality
  * explicitly. One of the strengths of the Spring architecture
diff --git a/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
index 83b7aec725..a2ce34e6ad 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
@@ -91,10 +91,10 @@ class ApplicationContextAwareProcessor implements BeanPostProcessor {
 		else {
 			invokeAwareInterfaces(bean);
 		}
-		
+
 		return bean;
 	}
-	
+
 	private void invokeAwareInterfaces(Object bean) {
 		if (bean instanceof Aware) {
 			if (bean instanceof EnvironmentAware) {
diff --git a/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
index 0a0acb70f7..675cb8f200 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
@@ -45,10 +45,10 @@ import org.springframework.context.ApplicationContextException;
  * @see org.springframework.web.context.support.WebApplicationObjectSupport
  */
 public abstract class ApplicationObjectSupport implements ApplicationContextAware {
-	
+
 	/** Logger that is available to subclasses */
 	protected final Log logger = LogFactory.getLog(getClass());
-	
+
 	/** ApplicationContext this object runs in */
 	private ApplicationContext applicationContext;
 
diff --git a/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java b/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
index a4fb136b2b..32bb029c0a 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
@@ -81,7 +81,7 @@ public class ConversionServiceFactoryBean implements FactoryBean<ConversionServi
 
 
 	// implementing FactoryBean
-	
+
 	public ConversionService getObject() {
 		return this.conversionService;
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java b/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java
index 2d97735091..34cb5e51db 100644
--- a/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java
+++ b/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
index fd088c88ff..7f2ba5ff57 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
@@ -42,7 +42,7 @@ import org.springframework.remoting.rmi.RmiClientInterceptorUtils;
  * @author Juergen Hoeller
  */
 public abstract class AbstractRemoteSlsbInvokerInterceptor extends AbstractSlsbInvokerInterceptor {
-	
+
 	private Class homeInterface;
 
 	private boolean refreshHomeOnConnectFailure = false;
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
index 8ce1aa9928..6364f8592f 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
@@ -42,7 +42,7 @@ import org.aopalliance.intercept.MethodInvocation;
  * bound at the target location yet. The best solution is to set the lookupHomeOnStartup
  * property to false, in which case the home will be fetched on first access to the EJB.
  * (This flag is only true by default for backwards compatibility reasons).
- * 
+ *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @see AbstractSlsbInvokerInterceptor#setLookupHomeOnStartup
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
index 2eeef7627a..3058f699aa 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
@@ -29,7 +29,7 @@ import org.springframework.util.ClassUtils;
  *
  * <p>See {@link org.springframework.jndi.JndiObjectLocator} for info on
  * how to specify the JNDI location of the target EJB.
- * 
+ *
  * <p>If you want control over interceptor chaining, use an AOP ProxyFactoryBean
  * with LocalSlsbInvokerInterceptor rather than rely on this class.
  *
@@ -41,7 +41,7 @@ import org.springframework.util.ClassUtils;
  * bound at the target location yet. The best solution is to set the "lookupHomeOnStartup"
  * property to "false", in which case the home will be fetched on first access to the EJB.
  * (This flag is only true by default for backwards compatibility reasons).
- *  
+ *
  * @author Rod Johnson
  * @author Colin Sampaleanu
  * @since 09.05.2003
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
index 84e9eb6b3e..6bcb775319 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
@@ -29,7 +29,7 @@ import org.springframework.util.ClassUtils;
  *
  * <p>See {@link org.springframework.jndi.JndiObjectLocator} for info on
  * how to specify the JNDI location of the target EJB.
- * 
+ *
  * <p>If you want control over interceptor chaining, use an AOP ProxyFactoryBean
  * with SimpleRemoteSlsbInvokerInterceptor rather than rely on this class.
  *
@@ -41,7 +41,7 @@ import org.springframework.util.ClassUtils;
  * bound at the target location yet. The best solution is to set the lookupHomeOnStartup
  * property to false, in which case the home will be fetched on first access to the EJB.
  * (This flag is only true by default for backwards compatibility reasons).
- * 
+ *
  * <p>This proxy factory is typically used with an RMI business interface, which serves
  * as super-interface of the EJB component interface. Alternatively, this factory
  * can also proxy a remote SLSB with a matching non-RMI business interface, i.e. an
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/package-info.java b/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
index 608bd665ae..9615bb8146 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/package-info.java
@@ -12,11 +12,11 @@
  * or may not be EJBs). This gives us the choice of introducing EJB
  * into an application (or removing EJB from an application) without
  * affecting code using business objects.
- * 
+ *
  * <p>The motivation for the classes in this package are discussed in Chapter 11 of
  * <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
  * by Rod Johnson (Wrox, 2002).
- * 
+ *
  * <p>However, the implementation and naming of classes in this package has changed.
  * It now uses FactoryBeans and AOP, rather than the custom bean definitions described in
  * <i>Expert One-on-One J2EE</i>.
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
index 4d2b613d39..cb9db418a5 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
@@ -18,7 +18,7 @@ package org.springframework.ejb.support;
 
 import javax.jms.MessageListener;
 
-/** 
+/**
  * Convenient base class for JMS-based EJB 2.x MDBs. Requires subclasses
  * to implement the JMS <code>javax.jms.MessageListener</code> interface.
  *
@@ -31,4 +31,4 @@ public abstract class AbstractJmsMessageDrivenBean extends AbstractMessageDriven
 	// Empty: The purpose of this class is to ensure
 	// that subclasses implement <code>javax.jms.MessageListener</code>.
 
-} 
+}
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
index 3b5167adc3..8d661b480c 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
@@ -22,7 +22,7 @@ import javax.ejb.MessageDrivenContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-/** 
+/**
  * Convenient base class for EJB 2.x MDBs.
  * Doesn't require JMS, as EJB 2.1 MDBs are no longer JMS-specific;
  * see the {@link AbstractJmsMessageDrivenBean} subclass.
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
index a5a009d57f..b36b8fcb4c 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
@@ -29,7 +29,7 @@ import org.springframework.beans.FatalBeanException;
  * method in their custom <code>ejbCreate()</code> and <code>ejbActivate()</code>
  * methods, and should invoke the <code>unloadBeanFactory()</code> method in
  * their <code>ejbPassivate</code> method.</b>
- * 
+ *
  * <p><b>Note: The default BeanFactoryLocator used by this class's superclass
  * (ContextJndiBeanFactoryLocator) is <b>not</b> serializable. Therefore,
  * when using the default BeanFactoryLocator, or another variant which is
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/package-info.java b/spring-context/src/main/java/org/springframework/ejb/support/package-info.java
index 02433e4439..185a3a5002 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/package-info.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/package-info.java
@@ -6,17 +6,17 @@
  * This promotes good EJB practice, with EJB services used for transaction
  * management, thread management, and (possibly) remoting, while
  * business logic is implemented in easily testable POJOs.</p>
- * 
+ *
  * <p>In this model, the EJB is a facade, with as many POJO helpers
  * behind the BeanFactory as required.</p>
- * 
+ *
  * <p>Note that the default behavior is to look for an EJB environment variable
  * with name <code>ejb/BeanFactoryPath</code> that specifies the
  * location <i>on the classpath</i> of an XML bean factory definition
  * file (such as <code>/com/mycom/mypackage/mybeans.xml</code>).
  * If this JNDI key is missing, your EJB subclass won't successfully
  * initialize in the container.</p>
- * 
+ *
  * <p><b>Check out the <code>org.springframework.ejb.interceptor</code>
  * package for equivalent support for the EJB 3 component model</b>,
  * providing annotation-based autowiring using an EJB 3 interceptor.</p>
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 2a267d1e5a..454649b2a4 100644
--- a/spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java
@@ -25,7 +25,7 @@ import java.util.Set;
  * that formats <code>Date</code> values set on fields annotated with <code>@DateTimeFormat</code>.
  *
  * @author Keith Donald
- * @since 3.0 
+ * @since 3.0
  * @param <A> the annotation type that should trigger formatting
  */
 public interface AnnotationFormatterFactory<A extends Annotation> {
@@ -52,5 +52,5 @@ public interface AnnotationFormatterFactory<A extends Annotation> {
 	 * @return the parser
 	 */
 	Parser<?> getParser(A annotation, Class<?> fieldType);
-	
+
 }
diff --git a/spring-context/src/main/java/org/springframework/format/Formatter.java b/spring-context/src/main/java/org/springframework/format/Formatter.java
index 67723c89dd..83d26b13a7 100644
--- a/spring-context/src/main/java/org/springframework/format/Formatter.java
+++ b/spring-context/src/main/java/org/springframework/format/Formatter.java
@@ -21,7 +21,7 @@ package org.springframework.format;
  * A Formatter is both a Printer <i>and</i> a Parser for an object type.
  *
  * @author Keith Donald
- * @since 3.0 
+ * @since 3.0
  * @param <T> the type of object this Formatter formats
  */
 public interface Formatter<T> extends Printer<T>, Parser<T> {
diff --git a/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java
index 16b2208b1a..b754a738d1 100644
--- a/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java
@@ -20,14 +20,14 @@ import org.springframework.core.convert.converter.Converter;
 /**
  * Registers {@link Converter Converters} and {@link Formatter Formatters} with
  * a FormattingConversionService through the {@link FormatterRegistry} SPI.
- * 
+ *
  * @author Keith Donald
  * @since 3.1
  */
 public interface FormatterRegistrar {
 
 	/**
-	 * Register Formatters and Converters with a FormattingConversionService 
+	 * Register Formatters and Converters with a FormattingConversionService
 	 * through a FormatterRegistry SPI.
 	 * @param registry the FormatterRegistry instance to use.
 	 */
diff --git a/spring-context/src/main/java/org/springframework/format/Parser.java b/spring-context/src/main/java/org/springframework/format/Parser.java
index 63e71ba77e..276a509305 100644
--- a/spring-context/src/main/java/org/springframework/format/Parser.java
+++ b/spring-context/src/main/java/org/springframework/format/Parser.java
@@ -23,7 +23,7 @@ import java.util.Locale;
  * Parses text strings to produce instances of T.
  *
  * @author Keith Donald
- * @since 3.0 
+ * @since 3.0
  * @param <T> the type of object this Parser produces
  */
 public interface Parser<T> {
diff --git a/spring-context/src/main/java/org/springframework/format/Printer.java b/spring-context/src/main/java/org/springframework/format/Printer.java
index 00b8c6ec70..c852839858 100644
--- a/spring-context/src/main/java/org/springframework/format/Printer.java
+++ b/spring-context/src/main/java/org/springframework/format/Printer.java
@@ -22,7 +22,7 @@ import java.util.Locale;
  * Prints objects of type T for display.
  *
  * @author Keith Donald
- * @since 3.0 
+ * @since 3.0
  * @param <T> the type of object this Printer prints
  */
 public interface Printer<T> {
diff --git a/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java b/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java
index 21881a2bbb..60761a254e 100644
--- a/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java
+++ b/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java
@@ -26,13 +26,13 @@ import java.lang.annotation.Target;
  * Supports formatting by style or custom pattern string.
  * Can be applied to any JDK <code>java.lang.Number</code> type.
  * <p>
- * For style-based formatting, set the {@link #style()} attribute to be the desired {@link Style}.  
+ * For style-based formatting, set the {@link #style()} attribute to be the desired {@link Style}.
  * For custom formatting, set the {@link #pattern()} attribute to be the number pattern, such as <code>#,###.##</code>.
  * <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 the style attribute.
  * When no annotation attributes are specified, the default format applied is style-based with a style of {@link Style#NUMBER}.
- * 
+ *
  * @author Keith Donald
  * @since 3.0
  * @see java.text.NumberFormat
@@ -67,7 +67,7 @@ public @interface NumberFormat {
 		 * The general-purpose number format for the current locale.
 		 */
 		NUMBER,
-		
+
 		/**
 		 * The currency format for the current locale.
 		 */
diff --git a/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java
index 7ae4021945..00c14d8a7d 100644
--- a/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java
@@ -76,7 +76,7 @@ public class NumberFormatAnnotationFormatterFactory
 	public Printer<Number> getPrinter(NumberFormat annotation, Class<?> fieldType) {
 		return configureFormatterFrom(annotation);
 	}
-	
+
 	public Parser<Number> getParser(NumberFormat annotation, Class<?> fieldType) {
 		return configureFormatterFrom(annotation);
 	}
diff --git a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
index e577c0619c..410c63cf91 100644
--- a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
@@ -96,15 +96,15 @@ public class FormattingConversionServiceFactoryBean
 	}
 
 	/**
-	 * <p>Configure the set of FormatterRegistrars to invoke to register 
-	 * Converters and Formatters in addition to those added declaratively 
+	 * <p>Configure the set of FormatterRegistrars to invoke to register
+	 * Converters and Formatters in addition to those added declaratively
 	 * via {@link #setConverters(Set)} and {@link #setFormatters(Set)}.
-	 * <p>FormatterRegistrars are useful when registering multiple related 
-	 * converters and formatters for a formatting category, such as Date 
-	 * formatting. All types related needed to support the formatting 
+	 * <p>FormatterRegistrars are useful when registering multiple related
+	 * converters and formatters for a formatting category, such as Date
+	 * formatting. All types related needed to support the formatting
 	 * category can be registered from one place.
-	 * <p>FormatterRegistrars can also be used to register Formatters 
-	 * indexed under a specific field type different from its own &lt;T&gt;, 
+	 * <p>FormatterRegistrars can also be used to register Formatters
+	 * indexed under a specific field type different from its own &lt;T&gt;,
 	 * or when registering a Formatter from a Printer/Parser pair.
 	 * @see FormatterRegistry#addFormatterForFieldType(Class, Formatter)
 	 * @see FormatterRegistry#addFormatterForFieldType(Class, Printer, Parser)
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java b/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
index 8f8447aef6..7cf9200abc 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
@@ -34,7 +34,7 @@ import org.springframework.util.Assert;
  * @since 2.0
  */
 public class ResourceOverridingShadowingClassLoader extends ShadowingClassLoader {
-	
+
 	private static final Enumeration<URL> EMPTY_URL_ENUMERATION = new Enumeration<URL>() {
 		public boolean hasMoreElements() {
 			return false;
@@ -43,7 +43,7 @@ public class ResourceOverridingShadowingClassLoader extends ShadowingClassLoader
 			throw new UnsupportedOperationException("Should not be called. I am empty.");
 		}
 	};
-	
+
 
 	/**
 	 * Key is asked for value: value is actual value
@@ -59,7 +59,7 @@ public class ResourceOverridingShadowingClassLoader extends ShadowingClassLoader
 	public ResourceOverridingShadowingClassLoader(ClassLoader enclosingClassLoader) {
 		super(enclosingClassLoader);
 	}
-	
+
 
 	/**
 	 * Return the resource (if any) at the new path
@@ -70,7 +70,7 @@ public class ResourceOverridingShadowingClassLoader extends ShadowingClassLoader
 	public void override(String oldPath, String newPath) {
 		this.overrides.put(oldPath, newPath);
 	}
-	
+
 	/**
 	 * Ensure that a resource with the given path is not found.
 	 * @param oldPath the path of the resource to hide even if
@@ -111,7 +111,7 @@ public class ResourceOverridingShadowingClassLoader extends ShadowingClassLoader
 			return super.getResourceAsStream(requestedPath);
 		}
 	}
-	
+
 	@Override
 	public Enumeration<URL> getResources(String requestedPath) throws IOException {
 		if (this.overrides.containsKey(requestedPath)) {
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java
index 8d114b2bec..d5568e3b8d 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2009 the original author 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.
@@ -24,9 +24,9 @@ import java.lang.reflect.Method;
  * Reflective wrapper around the GlassFish class loader. Used to
  * encapsulate the classloader-specific methods (discovered and
  * called through reflection) from the load-time weaver.
- * 
+ *
  * <p>Supports GlassFish V1, V2 and V3 (currently in beta).
- * 
+ *
  * @author Costin Leau
  * @since 3.0
  */
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java
index 5216b5cd50..0777391ad5 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java
@@ -26,7 +26,7 @@ import org.springframework.util.ReflectionUtils;
 /**
  * Reflective wrapper around a JBoss 5 and 6 class loader methods (discovered and called
  * through reflection) for load time weaving.
- * 
+ *
  * @author Costin Leau
  * @since 3.1
  */
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
index 794864e5f6..4dffbe6f5d 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
@@ -23,10 +23,10 @@ import java.security.ProtectionDomain;
 /**
  * Adapter that implements JBoss Translator interface, delegating to a
  * standard JDK {@link ClassFileTransformer} underneath.
- * 
+ *
  * <p>To avoid compile time checks again the vendor API, a dynamic proxy is
  * being used.
- * 
+ *
  * @author Costin Leau
  * @since 3.1
  */
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
index c138338518..d3821e795e 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-2009 the original author 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.
@@ -26,7 +26,7 @@ import org.springframework.util.Assert;
  * Reflective wrapper around a OC4J class loader. Used to
  * encapsulate the classloader-specific methods (discovered and
  * called through reflection) from the load-time weaver.
- * 
+ *
  * @author Costin Leau
  */
 class OC4JClassLoaderAdapter {
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
index 540aed883e..75f1ea6865 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-2009 the original author 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.
@@ -27,7 +27,7 @@ import java.security.ProtectionDomain;
  *
  * <p>To avoid compile time checks again the vendor API, a dynamic proxy is
  * being used.
- * 
+ *
  * @author Costin Leau
  */
 class OC4JClassPreprocessorAdapter implements InvocationHandler {
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
index 8e0a251115..f96e8d73b0 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
@@ -45,7 +45,7 @@ public class OC4JLoadTimeWeaver implements LoadTimeWeaver {
 	/**
 	 * Creates a new instance of thie {@link OC4JLoadTimeWeaver} class
 	 * using the default {@link ClassLoader class loader}.
-	 * @see org.springframework.util.ClassUtils#getDefaultClassLoader() 
+	 * @see org.springframework.util.ClassUtils#getDefaultClassLoader()
 	 */
 	public OC4JLoadTimeWeaver() {
 		this(ClassUtils.getDefaultClassLoader());
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
index fc198635a4..eb6f98b7dc 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2007 the original author 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.
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
  * Reflective wrapper around a WebLogic 10 class loader. Used to
  * encapsulate the classloader-specific methods (discovered and
  * called through reflection) from the load-time weaver.
- * 
+ *
  * @author Costin Leau
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
index ef1baa9912..e60ceb81e9 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2007 the original author 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
index 798393676b..26a7b4ec47 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
@@ -28,11 +28,11 @@ import java.util.List;
 import org.springframework.util.Assert;
 
 /**
- * 
+ *
  * Reflective wrapper around a WebSphere 7 class loader. Used to
  * encapsulate the classloader-specific methods (discovered and
  * called through reflection) from the load-time weaver.
- * 
+ *
  * @author Costin Leau
  * @since 3.1
  */
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
index 748ba182a4..32227c0b47 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2011 the original author 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.
@@ -25,10 +25,10 @@ import org.springframework.util.FileCopyUtils;
 /**
  * Adapter that implements WebSphere 7.0 ClassPreProcessPlugin interface,
  * delegating to a standard JDK {@link ClassFileTransformer} underneath.
- * 
+ *
  * <p>To avoid compile time checks again the vendor API, a dynamic proxy is
  * being used.
- * 
+ *
  * @author Costin Leau
  * @since 3.1
  */
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 6b02d5b92d..ac847a193a 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
@@ -603,7 +603,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 					"Unable to register MBean [" + mapValue + "] with key '" + beanKey + "'", ex);
 		}
 	}
-	
+
 	/**
 	 * Replaces any bean names used as keys in the <code>NotificationListener</code>
 	 * mappings with their corresponding <code>ObjectName</code> values.
@@ -782,8 +782,8 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	 * interface for the supplied managed resource.
 	 * @param managedResource the resource that is to be exported as an MBean
 	 * @param beanKey the key associated with the managed bean
-	 * @see #createModelMBean() 
-	 * @see #getMBeanInfo(Object, String) 
+	 * @see #createModelMBean()
+	 * @see #getMBeanInfo(Object, String)
 	 */
 	protected ModelMBean createAndConfigureMBean(Object managedResource, String beanKey)
 			throws MBeanExportException {
@@ -1072,7 +1072,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	private class NotificationPublisherAwareLazyTargetSource extends LazyInitTargetSource {
 
 		private ModelMBean modelMBean;
-		
+
 		private ObjectName objectName;
 
 		public void setModelMBean(ModelMBean modelMBean) {
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java
index b2a1d26338..f6868aeb9f 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java
@@ -28,7 +28,7 @@ import org.springframework.jmx.support.MetricType;
  * JDK 1.5+ method-level annotation that indicates to expose a given bean
  * property as JMX attribute, with added Descriptor properties to indicate that
  * it is a metric. Only valid when used on a JavaBean getter.
- * 
+ *
  * @author Jennifer Hickey
  * @since 3.0
  * @see org.springframework.jmx.export.metadata.ManagedMetric
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 a701a5d0f6..c346c10d54 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
@@ -108,12 +108,12 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	 * Constant identifier for the log field in a JMX {@link Descriptor}.
 	 */
 	protected static final String FIELD_LOG = "log";
-	
+
 	/**
 	 * Constant identifier for the logfile field in a JMX {@link Descriptor}.
 	 */
 	protected static final String FIELD_LOG_FILE = "logFile";
-	
+
 	/**
 	 * Constant identifier for the currency time limit field in a JMX {@link Descriptor}.
 	 */
@@ -143,12 +143,12 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	 * Constant identifier for the persistName field in a JMX {@link Descriptor}.
 	 */
 	protected static final String FIELD_PERSIST_NAME = "persistName";
-	
+
 	/**
 	 * Constant identifier for the displayName field in a JMX {@link Descriptor}.
 	 */
 	protected static final String FIELD_DISPLAY_NAME = "displayName";
-	
+
 	/**
 	 * Constant identifier for the units field in a JMX {@link Descriptor}.
 	 */
@@ -158,7 +158,7 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	 * Constant identifier for the metricType field in a JMX {@link Descriptor}.
 	 */
 	protected static final String FIELD_METRIC_TYPE = "metricType";
-	
+
 	/**
 	 * Constant identifier for the custom metricCategory field in a JMX {@link Descriptor}.
 	 */
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 ba77fd95b9..5672cda258 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
@@ -30,7 +30,7 @@ import org.springframework.util.StringUtils;
 /**
  * <code>AbstractReflectiveMBeanInfoAssembler</code> subclass that allows
  * method names to be explicitly excluded as MBean operations and attributes.
- * 
+ *
  * <p>Any method not explicitly excluded from the management interface will be exposed to
  * JMX. JavaBean getters and setters will automatically be exposed as JMX attributes.
  *
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java
index 6feb65bca8..2a18efa50d 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java
@@ -49,7 +49,7 @@ public interface JmxAttributeSource {
 	 * @throws InvalidMetadataException in case of invalid attributes
 	 */
 	ManagedAttribute getManagedAttribute(Method method) throws InvalidMetadataException;
-	
+
 	/**
 	 * Implementations should return an instance of <code>ManagedMetric</code>
 	 * if the supplied <code>Method</code> has the corresponding metadata.
@@ -89,7 +89,7 @@ public interface JmxAttributeSource {
 	 * @throws InvalidMetadataException in the case of invalid metadata
 	 */
 	ManagedNotification[] getManagedNotifications(Class<?> clazz) throws InvalidMetadataException;
-	
-	
-	
+
+
+
 }
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
index cd70b6b67e..27e58109a1 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
@@ -35,7 +35,7 @@ import org.springframework.util.CollectionUtils;
  * <code>ObjectNamingStrategy</code> implementation that builds
  * <code>ObjectName</code> instances from the key used in the
  * "beans" map passed to <code>MBeanExporter</code>.
- * 
+ *
  * <p>Can also check object name mappings, given as <code>Properties</code>
  * or as <code>mappingLocations</code> of properties files. The key used
  * to look up is the key used in <code>MBeanExporter</code>'s "beans" map.
@@ -123,7 +123,7 @@ public class KeyNamingStrategy implements ObjectNamingStrategy, InitializingBean
 			}
 		}
 	}
-	
+
 
 	/**
 	 * Attempts to retrieve the <code>ObjectName</code> via the given key, trying to
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
index b4c50d237e..29d87d7ab3 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
@@ -64,7 +64,7 @@ public class ModelMBeanNotificationPublisher implements NotificationPublisher {
 	 * @param modelMBean the target {@link ModelMBean}; must not be <code>null</code>
 	 * @param objectName the {@link ObjectName} of the source {@link ModelMBean}
 	 * @param managedResource the managed resource exposed by the supplied {@link ModelMBean}
-	 * @throws IllegalArgumentException if any of the parameters is <code>null</code> 
+	 * @throws IllegalArgumentException if any of the parameters is <code>null</code>
 	 */
 	public ModelMBeanNotificationPublisher(
 			ModelMBeanNotificationBroadcaster modelMBean, ObjectName objectName, Object managedResource) {
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java b/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
index ad9fbf09a3..c3e1f65a9c 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
@@ -39,7 +39,7 @@ import org.springframework.util.CollectionUtils;
  * @see #execute
  */
 public class JndiTemplate {
-	
+
 	protected final Log logger = LogFactory.getLog(getClass());
 
 	private Properties environment;
@@ -200,7 +200,7 @@ public class JndiTemplate {
 			}
 		});
 	}
-	
+
 	/**
 	 * Rebind the given object to the current JNDI context, using the given name.
 	 * Overwrites any existing binding.
@@ -236,5 +236,5 @@ public class JndiTemplate {
 			}
 		});
 	}
-	
+
 }
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java b/spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java
index 1110a40bc9..dd4f4e2d27 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/main/java/org/springframework/jndi/package-info.java b/spring-context/src/main/java/org/springframework/jndi/package-info.java
index f215120d6a..eb6ebde08a 100644
--- a/spring-context/src/main/java/org/springframework/jndi/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jndi/package-info.java
@@ -4,7 +4,7 @@
  * The classes in this package make JNDI easier to use,
  * facilitating the accessing of configuration stored in JNDI,
  * and provide useful superclasses for JNDI access classes.
- * 
+ *
  * <p>The classes in this package are discussed in Chapter 11 of
  * <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
  * by Rod Johnson (Wrox, 2002).
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
index 0e718d72b3..fb8ced6226 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
@@ -25,7 +25,7 @@ import org.springframework.util.ClassUtils;
 
 /**
  * {@link FactoryBean} for RMI proxies from JNDI.
- * 
+ *
  * <p>Typically used for RMI-IIOP (CORBA), but can also be used for EJB home objects
  * (for example, a Stateful Session Bean home). In contrast to a plain JNDI lookup,
  * this accessor also performs narrowing through {@link javax.rmi.PortableRemoteObject}.
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
index 7eb5c58c39..67a0d3ade5 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
@@ -23,7 +23,7 @@ import org.springframework.core.JdkVersion;
 
 /**
  * General utilities for handling remote invocations.
- * 
+ *
  * <p>Mainly intended for use within the remoting framework.
  *
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java
index db440ed6ed..009a163c28 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java
@@ -32,7 +32,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * Parser for the 'annotation-driven' element of the 'task' namespace.
- * 
+ *
  * @author Mark Fisher
  * @author Juergen Hoeller
  * @author Ramnivas Laddad
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java
index 828528afab..a892eb414b 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParser.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NodeList;
 
 /**
  * Parser for the 'scheduled-tasks' element of the scheduling namespace.
- * 
+ *
  * @author Mark Fisher
  * @author Chris Beams
  * @since 3.0
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java
index dba85fca50..be34e5ad19 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java
@@ -24,7 +24,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * Parser for the 'scheduler' element of the 'task' namespace.
- * 
+ *
  * @author Mark Fisher
  * @since 3.0
  */
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java b/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
index b4c356da64..ee08a4c977 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
@@ -19,8 +19,8 @@ package org.springframework.scheduling.config;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * <code>NamespaceHandler</code> for the 'task' namespace. 
- * 
+ * <code>NamespaceHandler</code> for the 'task' namespace.
+ *
  * @author Mark Fisher
  * @since 3.0
  */
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 b1753f9275..3f5459e61e 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
@@ -104,7 +104,7 @@ public class CronSequenceGenerator {
 		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
-		
+
 		...
 		*/
 
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 f23b327cf8..09df2374da 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
@@ -86,7 +86,7 @@ public class CronTrigger implements Trigger {
 	public int hashCode() {
 		return this.sequenceGenerator.hashCode();
 	}
-	
+
 	@Override
 	public String toString() {
 		return sequenceGenerator.toString();
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java b/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
index fe45ac2121..91a5b42e55 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
@@ -39,7 +39,7 @@ import org.springframework.util.Assert;
  * within components that rely on the Trigger abstraction. For example, it may
  * be convenient to allow periodic triggers, cron-based triggers, and even
  * custom Trigger implementations to be used interchangeably.
- * 
+ *
  * @author Mark Fisher
  * @since 3.0
  */
@@ -76,7 +76,7 @@ public class PeriodicTrigger implements Trigger {
 	/**
 	 * Specify the delay for the initial execution. It will be evaluated in
 	 * terms of this trigger's {@link TimeUnit}. If no time unit was explicitly
-	 * provided upon instantiation, the default is milliseconds. 
+	 * provided upon instantiation, the default is milliseconds.
 	 */
 	public void setInitialDelay(long initialDelay) {
 		this.initialDelay = this.timeUnit.toMillis(initialDelay);
@@ -122,7 +122,7 @@ public class PeriodicTrigger implements Trigger {
 	public int hashCode() {
 		return (this.fixedRate ? 17 : 29) +
 				(int) (37 * this.period) +
-				(int) (41 * this.initialDelay); 
+				(int) (41 * this.initialDelay);
 	}
 
 }
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java b/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java
index 2d0dcdbed6..4800543853 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java
@@ -31,7 +31,7 @@ import org.springframework.util.ReflectionUtils;
  * implementations. It is only public so that it may be accessed from
  * implementations within other packages. It is <i>not</i> intended for general
  * use and may change in the future.
- * 
+ *
  * @author Mark Fisher
  * @since 3.0
  */
diff --git a/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java b/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
index 6c826fc141..b222d23f16 100644
--- a/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
@@ -23,7 +23,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  * objects backed by dynamic languages such as Groovy, JRuby and
  * BeanShell. The following is an example (from the reference
  * documentation) that details the wiring of a Groovy backed bean:
- * 
+ *
  * <pre class="code">
  * &lt;lang:groovy id="messenger"
  *     refresh-check-delay="5000"
@@ -31,7 +31,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  * &lt;lang:property name="message" value="I Can Do The Frug"/&gt;
  * &lt;/lang:groovy&gt;
  * </pre>
- * 
+ *
  * @author Rob Harrop
  * @author Juergen Hoeller
  * @author Mark Fisher
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 487cd066bf..f5bfb4a734 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
@@ -114,7 +114,7 @@ class ScriptBeanDefinitionParser extends AbstractBeanDefinitionParser {
 		bd.setBeanClassName(this.scriptFactoryClassName);
 		bd.setSource(parserContext.extractSource(element));
 		bd.setAttribute(ScriptFactoryPostProcessor.LANGUAGE_ATTRIBUTE, element.getLocalName());
-		
+
 		// Determine bean scope.
 		String scope = element.getAttribute(SCOPE_ATTRIBUTE);
 		if (StringUtils.hasLength(scope)) {
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 8f91d49083..ee87c28678 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
@@ -36,7 +36,7 @@ public class ScriptingDefaultsParser implements BeanDefinitionParser {
 
 
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
-		BeanDefinition bd = 
+		BeanDefinition bd =
 				LangNamespaceUtils.registerScriptFactoryPostProcessorIfNecessary(parserContext.getRegistry());
 		String refreshCheckDelay = element.getAttribute(REFRESH_CHECK_DELAY_ATTRIBUTE);
 		if (StringUtils.hasText(refreshCheckDelay)) {
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 e94152011b..b55d507baf 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
@@ -53,7 +53,7 @@ import org.springframework.util.ClassUtils;
 public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, BeanClassLoaderAware {
 
 	private final String scriptSourceLocator;
-	
+
 	private final GroovyObjectCustomizer groovyObjectCustomizer;
 
 	private GroovyClassLoader groovyClassLoader;
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 13ab4dc907..c3cce13a7f 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
@@ -115,7 +115,7 @@ public class ResourceScriptSource implements ScriptSource {
 	/**
 	 * 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) {
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 90626e5543..1902621315 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
@@ -193,7 +193,7 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces
 	}
 
 	/**
-	 * Flag to signal that refreshable proxies should be created to proxy the target class not its interfaces. 
+	 * Flag to signal that refreshable proxies should be created to proxy the target class not its interfaces.
 	 * @param defaultProxyTargetClass the flag value to set
 	 */
 	public void setDefaultProxyTargetClass(boolean defaultProxyTargetClass) {
diff --git a/spring-context/src/main/java/org/springframework/stereotype/package-info.java b/spring-context/src/main/java/org/springframework/stereotype/package-info.java
index ca9644652a..420bb19097 100644
--- a/spring-context/src/main/java/org/springframework/stereotype/package-info.java
+++ b/spring-context/src/main/java/org/springframework/stereotype/package-info.java
@@ -3,7 +3,7 @@
  *
  * Annotations denoting the roles of types or methods in the overall architecture
  * (at a conceptual, rather than implementation, level).
- * 
+ *
  * <p>Intended for use by tools and aspects (making an ideal target for pointcuts).
  *
  */
diff --git a/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java
index a67fc7f09a..13c92582db 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/main/java/org/springframework/ui/context/package-info.java b/spring-context/src/main/java/org/springframework/ui/context/package-info.java
index 0fae9ff813..a00d7c3fa0 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/package-info.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/package-info.java
@@ -3,7 +3,7 @@
  *
  * Contains classes defining the application context subinterface
  * for UI applications. The theme feature is added here.
- * 
+ *
  * <ul>
  *   <li>If no <code>UiApplicationContextUtils.THEME_SOURCE_BEAN_NAME</code>
  * bean is available in the context or parent context, a default <code>ResourceBundleThemeSource</code>
@@ -24,7 +24,7 @@
  *   <li>If messages in the resource bundles are in fact paths to resources(css, images, ...), make sure these resources
  *   are directly available for the user and not, for example, under the WEB-INF directory.</li>
  *  </ul>
- * 
+ *
  * <br>Web packages add the resolution and the setting of the user current theme.
  *
  */
diff --git a/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java b/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
index a2a82a1226..53311e519f 100644
--- a/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
+++ b/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
  * Default implementation of the {@link Errors} and {@link BindingResult}
  * interfaces, for the registration and evaluation of binding errors on
  * JavaBean objects.
- * 
+ *
  * <p>Performs standard JavaBean property access, also supporting nested
  * properties. Normally, application code will work with the
  * <code>Errors</code> interface or the <code>BindingResult</code> interface.
diff --git a/spring-context/src/main/java/org/springframework/validation/Errors.java b/spring-context/src/main/java/org/springframework/validation/Errors.java
index edd61ee7c5..2a4f4ce268 100644
--- a/spring-context/src/main/java/org/springframework/validation/Errors.java
+++ b/spring-context/src/main/java/org/springframework/validation/Errors.java
@@ -199,14 +199,14 @@ public interface Errors {
 	/**
 	 * Are there any global errors?
 	 * @return <code>true</code> if there are any global errors
-	 * @see #hasFieldErrors() 
+	 * @see #hasFieldErrors()
 	 */
 	boolean hasGlobalErrors();
 
 	/**
 	 * Return the number of global errors.
 	 * @return the number of global errors
-	 * @see #getFieldErrorCount() 
+	 * @see #getFieldErrorCount()
 	 */
 	int getGlobalErrorCount();
 
@@ -225,14 +225,14 @@ public interface Errors {
 	/**
 	 * Are there any field errors?
 	 * @return <code>true</code> if there are any errors associated with a field
-	 * @see #hasGlobalErrors() 
+	 * @see #hasGlobalErrors()
 	 */
 	boolean hasFieldErrors();
 
 	/**
 	 * Return the number of errors associated with a field.
 	 * @return the number of errors associated with a field
-	 * @see #getGlobalErrorCount() 
+	 * @see #getGlobalErrorCount()
 	 */
 	int getFieldErrorCount();
 
diff --git a/spring-context/src/main/java/org/springframework/validation/ObjectError.java b/spring-context/src/main/java/org/springframework/validation/ObjectError.java
index b0398754db..fb774d8496 100644
--- a/spring-context/src/main/java/org/springframework/validation/ObjectError.java
+++ b/spring-context/src/main/java/org/springframework/validation/ObjectError.java
@@ -22,7 +22,7 @@ import org.springframework.util.Assert;
 /**
  * Encapsulates an object error, that is, a global reason for rejecting
  * an object.
- * 
+ *
  * <p>See the {@link DefaultMessageCodesResolver} javadoc for details on
  * how a message code list is built for an <code>ObjectError</code>.
  *
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 e7867a7633..914318e254 100644
--- a/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java
+++ b/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java
@@ -26,7 +26,7 @@ import org.springframework.util.StringUtils;
 /**
  * Utility class offering convenient methods for invoking a {@link Validator}
  * and for rejecting empty fields.
- * 
+ *
  * <p>Checks for an empty field in <code>Validator</code> implementations can become
  * one-liners when using {@link #rejectIfEmpty} or {@link #rejectIfEmptyOrWhitespace}.
  *
@@ -96,7 +96,7 @@ public abstract class ValidationUtils {
 	/**
 	 * Reject the given field with the given error code if the value is empty.
 	 * <p>An 'empty' value in this context means either <code>null</code> or
-	 * the empty string "". 
+	 * the empty string "".
 	 * <p>The object whose field is being validated does not need to be passed
 	 * in because the {@link Errors} instance can resolve field values by itself
 	 * (it will usually hold an internal reference to the target object).
@@ -112,7 +112,7 @@ public abstract class ValidationUtils {
 	 * Reject the given field with the given error code and default message
 	 * if the value is empty.
 	 * <p>An 'empty' value in this context means either <code>null</code> or
-	 * the empty string "". 
+	 * the empty string "".
 	 * <p>The object whose field is being validated does not need to be passed
 	 * in because the {@link Errors} instance can resolve field values by itself
 	 * (it will usually hold an internal reference to the target object).
@@ -147,7 +147,7 @@ public abstract class ValidationUtils {
 	 * Reject the given field with the given error code, error arguments
 	 * and default message if the value is empty.
 	 * <p>An 'empty' value in this context means either <code>null</code> or
-	 * the empty string "". 
+	 * the empty string "".
 	 * <p>The object whose field is being validated does not need to be passed
 	 * in because the {@link Errors} instance can resolve field values by itself
 	 * (it will usually hold an internal reference to the target object).
diff --git a/spring-context/src/main/java/org/springframework/validation/Validator.java b/spring-context/src/main/java/org/springframework/validation/Validator.java
index c67c5ea8e9..671cd90bf6 100644
--- a/spring-context/src/main/java/org/springframework/validation/Validator.java
+++ b/spring-context/src/main/java/org/springframework/validation/Validator.java
@@ -34,13 +34,13 @@ package org.springframework.validation;
  * at least <code>'MINIMUM_PASSWORD_LENGTH'</code> characters in length.
  *
  * <pre class="code"> public class UserLoginValidator implements Validator {
- * 
+ *
  *    private static final int MINIMUM_PASSWORD_LENGTH = 6;
- * 
+ *
  *    public boolean supports(Class clazz) {
  *       return UserLogin.class.isAssignableFrom(clazz);
  *    }
- * 
+ *
  *    public void validate(Object target, Errors errors) {
  *       ValidationUtils.rejectIfEmptyOrWhitespace(errors, "userName", "field.required");
  *       ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "field.required");
@@ -56,7 +56,7 @@ package org.springframework.validation;
  *
  * <p>See also the Spring reference manual for a fuller discussion of
  * the <code>Validator</code> interface and it's role in an enterprise
- * application. 
+ * application.
  *
  * @author Rod Johnson
  * @see Errors
@@ -75,7 +75,7 @@ public interface Validator {
 	 * being asked if it can {@link #validate(Object, Errors) validate}
 	 * @return <code>true</code> if this {@link Validator} can indeed
 	 * {@link #validate(Object, Errors) validate} instances of the
-	 * supplied <code>clazz</code> 
+	 * supplied <code>clazz</code>
 	 */
 	boolean supports(Class<?> clazz);
 
@@ -85,8 +85,8 @@ public interface Validator {
 	 * typically has (or would) return <code>true</code>.
 	 * <p>The supplied {@link Errors errors} instance can be used to report
 	 * any resulting validation errors.
-	 * @param target the object that is to be validated (can be <code>null</code>) 
-	 * @param errors contextual state about the validation process (never <code>null</code>) 
+	 * @param target the object that is to be validated (can be <code>null</code>)
+	 * @param errors contextual state about the validation process (never <code>null</code>)
 	 * @see ValidationUtils
 	 */
 	void validate(Object target, Errors errors);
diff --git a/spring-context/src/test/java/example/scannable/MessageBean.java b/spring-context/src/test/java/example/scannable/MessageBean.java
index a1035f114f..9a3311ac19 100644
--- a/spring-context/src/test/java/example/scannable/MessageBean.java
+++ b/spring-context/src/test/java/example/scannable/MessageBean.java
@@ -23,7 +23,7 @@ package example.scannable;
 public class MessageBean {
 
 	private String message;
-	
+
 	public MessageBean() {
 		this.message = "DEFAULT MESSAGE";
 	}
@@ -31,7 +31,7 @@ public class MessageBean {
 	public MessageBean(String message) {
 		this.message = message;
 	}
-	
+
 	public String getMessage() {
 		return this.message;
 	}
diff --git a/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java b/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java
index 257a2d8bc5..fbaf713374 100644
--- a/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java
+++ b/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java
@@ -43,7 +43,7 @@ public class ServiceInvocationCounter {
 		this.threadLocalCount.set(this.useCount);
 		System.out.println("");
 	}
-	
+
 	public int getCount() {
 		return this.useCount;
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
index 36a60c2c68..2bf712344e 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
@@ -38,9 +38,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public final class AfterAdviceBindingTests {
 
 	private AdviceBindingCollaborator mockCollaborator;
-	
+
 	private ITestBean testBeanProxy;
-	
+
 	private TestBean testBeanTarget;
 
 	@Before
@@ -48,13 +48,13 @@ public final class AfterAdviceBindingTests {
 		ClassPathXmlApplicationContext ctx =
 			new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
 		AdviceBindingTestAspect afterAdviceAspect = (AdviceBindingTestAspect) ctx.getBean("testAspect");
-		
+
 		testBeanProxy = (ITestBean) ctx.getBean("testBean");
 		assertTrue(AopUtils.isAopProxy(testBeanProxy));
-		
+
 		// we need the real target too, not just the proxy...
 		testBeanTarget = (TestBean) ((Advised) testBeanProxy).getTargetSource().getTarget();
-		
+
 		mockCollaborator = createNiceMock(AdviceBindingCollaborator.class);
 		afterAdviceAspect.setCollaborator(mockCollaborator);
 	}
@@ -66,7 +66,7 @@ public final class AfterAdviceBindingTests {
 		testBeanProxy.setAge(5);
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testOneObjectArgBindingProxyWithThis() {
 		mockCollaborator.oneObjectArg(this.testBeanProxy);
@@ -74,7 +74,7 @@ public final class AfterAdviceBindingTests {
 		testBeanProxy.getAge();
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testOneObjectArgBindingTarget() {
 		mockCollaborator.oneObjectArg(this.testBeanTarget);
@@ -82,7 +82,7 @@ public final class AfterAdviceBindingTests {
 		testBeanProxy.getDoctor();
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testOneIntAndOneObjectArgs() {
 		mockCollaborator.oneIntAndOneObject(5,this.testBeanProxy);
@@ -90,7 +90,7 @@ public final class AfterAdviceBindingTests {
 		testBeanProxy.setAge(5);
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testNeedsJoinPoint() {
 		mockCollaborator.needsJoinPoint("getAge");
@@ -98,7 +98,7 @@ public final class AfterAdviceBindingTests {
 		testBeanProxy.getAge();
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testNeedsJoinPointStaticPart() {
 		mockCollaborator.needsJoinPointStaticPart("getAge");
@@ -106,5 +106,5 @@ public final class AfterAdviceBindingTests {
 		testBeanProxy.getAge();
 		verify(mockCollaborator);
 	}
-	
+
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
index a89b37711b..690e0355a7 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
@@ -45,7 +45,7 @@ public final class AfterReturningAdviceBindingTests {
 	private TestBean testBeanTarget;
 
 	private AfterReturningAdviceBindingCollaborator mockCollaborator;
-	
+
 
 	public void setAfterReturningAdviceAspect(AfterReturningAdviceBindingTestAspect anAspect) {
 		this.afterAdviceAspect = anAspect;
@@ -55,15 +55,15 @@ public final class AfterReturningAdviceBindingTests {
 	public void setUp() throws Exception {
 		ClassPathXmlApplicationContext ctx =
 			new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
-		
+
 		afterAdviceAspect = (AfterReturningAdviceBindingTestAspect) ctx.getBean("testAspect");
-		
+
 		mockCollaborator = createNiceMock(AfterReturningAdviceBindingCollaborator.class);
 		afterAdviceAspect.setCollaborator(mockCollaborator);
-		
+
 		testBeanProxy = (ITestBean) ctx.getBean("testBean");
 		assertTrue(AopUtils.isAopProxy(testBeanProxy));
-		
+
 		// we need the real target too, not just the proxy...
 		this.testBeanTarget = (TestBean) ((Advised)testBeanProxy).getTargetSource().getTarget();
 	}
@@ -76,7 +76,7 @@ public final class AfterReturningAdviceBindingTests {
 		testBeanProxy.setAge(5);
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testOneObjectArg() {
 		mockCollaborator.oneObjectArg(this.testBeanProxy);
@@ -84,7 +84,7 @@ public final class AfterReturningAdviceBindingTests {
 		testBeanProxy.getAge();
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testOneIntAndOneObjectArgs() {
 		mockCollaborator.oneIntAndOneObject(5,this.testBeanProxy);
@@ -92,7 +92,7 @@ public final class AfterReturningAdviceBindingTests {
 		testBeanProxy.setAge(5);
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testNeedsJoinPoint() {
 		mockCollaborator.needsJoinPoint("getAge");
@@ -100,7 +100,7 @@ public final class AfterReturningAdviceBindingTests {
 		testBeanProxy.getAge();
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testNeedsJoinPointStaticPart() {
 		mockCollaborator.needsJoinPointStaticPart("getAge");
@@ -117,7 +117,7 @@ public final class AfterReturningAdviceBindingTests {
 		testBeanProxy.getName();
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testReturningObject() {
 		mockCollaborator.oneObjectArg(this.testBeanTarget);
@@ -125,7 +125,7 @@ public final class AfterReturningAdviceBindingTests {
 		testBeanProxy.returnsThis();
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testReturningBean() {
 		mockCollaborator.oneTestBeanArg(this.testBeanTarget);
@@ -133,7 +133,7 @@ public final class AfterReturningAdviceBindingTests {
 		testBeanProxy.returnsThis();
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testReturningBeanArray() {
 		this.testBeanTarget.setSpouse(new TestBean());
@@ -149,13 +149,13 @@ public final class AfterReturningAdviceBindingTests {
 		// we need a strict mock for this...
 		mockCollaborator = createMock(AfterReturningAdviceBindingCollaborator.class);
 		afterAdviceAspect.setCollaborator(mockCollaborator);
-		
+
 		replay(mockCollaborator);
 		testBeanProxy.setSpouse(this.testBeanProxy);
 		testBeanProxy.getSpouse();
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testReturningByType() {
 		mockCollaborator.objectMatchNoArgs();
@@ -163,7 +163,7 @@ public final class AfterReturningAdviceBindingTests {
 		testBeanProxy.returnsThis();
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testReturningPrimitive() {
 		mockCollaborator.oneInt(20);
@@ -181,15 +181,15 @@ final class AfterReturningAdviceBindingTestAspect extends AdviceBindingTestAspec
 	private AfterReturningAdviceBindingCollaborator getCollaborator() {
 		return (AfterReturningAdviceBindingCollaborator) this.collaborator;
 	}
-	
+
 	public void oneString(String name) {
 		getCollaborator().oneString(name);
 	}
-	
+
 	public void oneTestBeanArg(TestBean bean) {
 		getCollaborator().oneTestBeanArg(bean);
 	}
-	
+
 	public void testBeanArrayArg(ITestBean[] beans) {
 		getCollaborator().testBeanArrayArg(beans);
 	}
@@ -197,11 +197,11 @@ final class AfterReturningAdviceBindingTestAspect extends AdviceBindingTestAspec
 	public void objectMatchNoArgs() {
 		getCollaborator().objectMatchNoArgs();
 	}
-	
+
 	public void stringMatchNoArgs() {
 		getCollaborator().stringMatchNoArgs();
 	}
-	
+
 	public void oneInt(int result) {
 		getCollaborator().oneInt(result);
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
index 5798fa688d..0424250ca5 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
@@ -43,14 +43,14 @@ public final class AfterThrowingAdviceBindingTests {
 	public void setUp() {
 		ClassPathXmlApplicationContext ctx =
 			new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
-		
+
 		testBean = (ITestBean) ctx.getBean("testBean");
 		afterThrowingAdviceAspect = (AfterThrowingAdviceBindingTestAspect) ctx.getBean("testAspect");
-		
+
 		mockCollaborator = createNiceMock(AfterThrowingAdviceBindingCollaborator.class);
 		afterThrowingAdviceAspect.setCollaborator(mockCollaborator);
 	}
-	
+
 	@After
 	public void tearDown() {
 		verify(mockCollaborator);
@@ -62,7 +62,7 @@ public final class AfterThrowingAdviceBindingTests {
 		replay(mockCollaborator);
 		this.testBean.exceptional(new Throwable());
 	}
-	
+
 	@Test(expected=Throwable.class)
 	public void testAfterThrowingWithBinding() throws Throwable {
 		Throwable t = new Throwable();
@@ -70,14 +70,14 @@ public final class AfterThrowingAdviceBindingTests {
 		replay(mockCollaborator);
 		this.testBean.exceptional(t);
 	}
-	
+
 	@Test(expected=Throwable.class)
 	public void testAfterThrowingWithNamedTypeRestriction() throws Throwable {
 		Throwable t = new Throwable();
 		// need a strict mock for this test...
 		mockCollaborator = createMock(AfterThrowingAdviceBindingCollaborator.class);
 		afterThrowingAdviceAspect.setCollaborator(mockCollaborator);
-		
+
 		mockCollaborator.noArgs();
 		mockCollaborator.oneThrowable(t);
 		mockCollaborator.noArgsOnThrowableMatch();
@@ -113,7 +113,7 @@ public final class AfterThrowingAdviceBindingTests {
 
 final class AfterThrowingAdviceBindingTestAspect {
 
-	// collaborator interface that makes it easy to test this aspect is 
+	// collaborator interface that makes it easy to test this aspect is
 	// working as expected through mocking.
 	public interface AfterThrowingAdviceBindingCollaborator {
 		void noArgs();
@@ -122,29 +122,29 @@ final class AfterThrowingAdviceBindingTestAspect {
 		void noArgsOnThrowableMatch();
 		void noArgsOnRuntimeExceptionMatch();
 	}
-	
+
 	protected AfterThrowingAdviceBindingCollaborator collaborator = null;
-	
+
 	public void setCollaborator(AfterThrowingAdviceBindingCollaborator aCollaborator) {
 		this.collaborator = aCollaborator;
 	}
-	
+
 	public void noArgs() {
 		this.collaborator.noArgs();
 	}
-	
+
 	public void oneThrowable(Throwable t) {
 		this.collaborator.oneThrowable(t);
 	}
-	
+
 	public void oneRuntimeException(RuntimeException ex) {
 		this.collaborator.oneRuntimeException(ex);
 	}
-	
+
 	public void noArgsOnThrowableMatch() {
 		this.collaborator.noArgsOnThrowableMatch();
 	}
-	
+
 	public void noArgsOnRuntimeExceptionMatch() {
 		this.collaborator.noArgsOnRuntimeExceptionMatch();
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
index 04d0a666b0..05b171f6bb 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
@@ -39,27 +39,27 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public class AroundAdviceBindingTests {
 
 	private AroundAdviceBindingCollaborator mockCollaborator;
-	
+
 	private ITestBean testBeanProxy;
-	
+
 	private TestBean testBeanTarget;
-	
+
 	protected ApplicationContext ctx;
 
 	@Before
 	public void onSetUp() throws Exception {
 		ctx = new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
-		
+
 		AroundAdviceBindingTestAspect  aroundAdviceAspect = ((AroundAdviceBindingTestAspect) ctx.getBean("testAspect"));
-		
+
 		ITestBean injectedTestBean = (ITestBean) ctx.getBean("testBean");
 		assertTrue(AopUtils.isAopProxy(injectedTestBean));
-		
+
 		this.testBeanProxy = injectedTestBean;
 		// we need the real target too, not just the proxy...
-		
+
 		this.testBeanTarget = (TestBean) ((Advised) testBeanProxy).getTargetSource().getTarget();
-		
+
 		mockCollaborator = createNiceMock(AroundAdviceBindingCollaborator.class);
 		aroundAdviceAspect.setCollaborator(mockCollaborator);
 	}
@@ -71,7 +71,7 @@ public class AroundAdviceBindingTests {
 		testBeanProxy.setAge(5);
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testOneObjectArgBoundToTarget() {
 		mockCollaborator.oneObjectArg(this.testBeanTarget);
@@ -79,7 +79,7 @@ public class AroundAdviceBindingTests {
 		testBeanProxy.getAge();
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testOneIntAndOneObjectArgs() {
 		mockCollaborator.oneIntAndOneObject(5, this.testBeanProxy);
@@ -87,7 +87,7 @@ public class AroundAdviceBindingTests {
 		testBeanProxy.setAge(5);
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testJustJoinPoint() {
 		mockCollaborator.justJoinPoint("getAge");
@@ -95,7 +95,7 @@ public class AroundAdviceBindingTests {
 		testBeanProxy.getAge();
 		verify(mockCollaborator);
 	}
-	
+
 }
 
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
index 1cff726a58..0355c8f7c3 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
@@ -36,15 +36,15 @@ import org.springframework.core.Ordered;
 public final class AspectAndAdvicePrecedenceTests {
 
 	private PrecedenceTestAspect highPrecedenceAspect;
-	
+
 	private PrecedenceTestAspect lowPrecedenceAspect;
-	
+
 	private SimpleSpringBeforeAdvice highPrecedenceSpringAdvice;
-	
+
 	private SimpleSpringBeforeAdvice lowPrecedenceSpringAdvice;
-	
+
 	private ITestBean testBean;
-	
+
 
 	@Before
 	public void setUp() {
@@ -176,7 +176,7 @@ class PrecedenceTestAspect implements BeanNameAware, Ordered {
 		this.collaborator.aroundAdviceOne(this.name);
 		try {
 			ret = ((Integer)pjp.proceed()).intValue();
-		} 
+		}
 		catch(Throwable t) { throw new RuntimeException(t); }
 		this.collaborator.aroundAdviceOne(this.name);
 		return ret;
@@ -187,7 +187,7 @@ class PrecedenceTestAspect implements BeanNameAware, Ordered {
 		this.collaborator.aroundAdviceTwo(this.name);
 		try {
 			ret = ((Integer)pjp.proceed()).intValue();
-		} 
+		}
 		catch(Throwable t) {throw new RuntimeException(t);}
 		this.collaborator.aroundAdviceTwo(this.name);
 		return ret;
@@ -219,7 +219,7 @@ class SimpleSpringBeforeAdvice implements MethodBeforeAdvice, BeanNameAware {
 
 	private PrecedenceTestAspect.Collaborator collaborator;
 	private String name;
-	
+
 	/* (non-Javadoc)
 	 * @see org.springframework.aop.MethodBeforeAdvice#before(java.lang.reflect.Method, java.lang.Object[], java.lang.Object)
 	 */
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 c2f76603b1..4b1d267b61 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
@@ -100,5 +100,5 @@ class CounterAspect {
 	public void increment1ForAnonymousPointcut() {
 		count++;
 	}
-	
+
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
index 8d43600ab9..2e998b24df 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
@@ -48,7 +48,7 @@ public final class BeanNamePointcutTests {
 	private ITestBean interceptThis;
 	private ITestBean dontInterceptThis;
 	private TestInterceptor testInterceptor;
-	
+
 	private ClassPathXmlApplicationContext ctx;
 
 
@@ -64,7 +64,7 @@ public final class BeanNamePointcutTests {
 		interceptThis = (ITestBean) ctx.getBean("interceptThis");
 		dontInterceptThis = (ITestBean) ctx.getBean("dontInterceptThis");
 		testInterceptor = (TestInterceptor) ctx.getBean("testInterceptor");
-		
+
 		counterAspect.reset();
 	}
 
@@ -90,7 +90,7 @@ public final class BeanNamePointcutTests {
 	public void testNonMatchingNestedBeanName() {
 		assertFalse("Non-matching bean must *not* be advised (proxied)", this.testBeanContainingNestedBean.getDoctor() instanceof Advised);
 	}
-	
+
 	@Test
 	public void testMatchingFactoryBeanObject() {
 		assertTrue("Matching bean must be advised (proxied)", this.testFactoryBean1 instanceof Advised);
@@ -125,7 +125,7 @@ public final class BeanNamePointcutTests {
 	public static class TestInterceptor implements MethodBeforeAdvice {
 
 		private int interceptionCount;
-		
+
 		public void before(Method method, Object[] args, Object target) throws Throwable {
 			interceptionCount++;
 		}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
index adabfcc5ea..a1f2fe9736 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
@@ -38,28 +38,28 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public final class BeforeAdviceBindingTests {
 
 	private AdviceBindingCollaborator mockCollaborator;
-	
+
 	private ITestBean testBeanProxy;
-	
+
 	private TestBean testBeanTarget;
 
 	protected String getConfigPath() {
 		return "before-advice-tests.xml";
 	}
-	
+
 	@Before
 	public void setUp() throws Exception {
 		ClassPathXmlApplicationContext ctx =
 			new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
-		
+
 		testBeanProxy = (ITestBean) ctx.getBean("testBean");
 		assertTrue(AopUtils.isAopProxy(testBeanProxy));
-		
+
 		// we need the real target too, not just the proxy...
 		testBeanTarget = (TestBean) ((Advised) testBeanProxy).getTargetSource().getTarget();
-		
+
 		AdviceBindingTestAspect beforeAdviceAspect = (AdviceBindingTestAspect) ctx.getBean("testAspect");
-		
+
 		mockCollaborator = createNiceMock(AdviceBindingCollaborator.class);
 		beforeAdviceAspect.setCollaborator(mockCollaborator);
 	}
@@ -72,7 +72,7 @@ public final class BeforeAdviceBindingTests {
 		testBeanProxy.setAge(5);
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testOneObjectArgBoundToProxyUsingThis() {
 		mockCollaborator.oneObjectArg(this.testBeanProxy);
@@ -80,7 +80,7 @@ public final class BeforeAdviceBindingTests {
 		testBeanProxy.getAge();
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testOneIntAndOneObjectArgs() {
 		mockCollaborator.oneIntAndOneObject(5,this.testBeanTarget);
@@ -88,7 +88,7 @@ public final class BeforeAdviceBindingTests {
 		testBeanProxy.setAge(5);
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testNeedsJoinPoint() {
 		mockCollaborator.needsJoinPoint("getAge");
@@ -96,7 +96,7 @@ public final class BeforeAdviceBindingTests {
 		testBeanProxy.getAge();
 		verify(mockCollaborator);
 	}
-	
+
 	@Test
 	public void testNeedsJoinPointStaticPart() {
 		mockCollaborator.needsJoinPointStaticPart("getAge");
@@ -105,7 +105,7 @@ public final class BeforeAdviceBindingTests {
 		verify(mockCollaborator);
 	}
 
-	
+
 }
 
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
index b37f8fba37..cfeb2ca217 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
@@ -35,7 +35,7 @@ public final class DeclarationOrderIndependenceTests {
 	private TopsyTurvyAspect aspect;
 
 	private TopsyTurvyTarget target;
-	
+
 
 	@Before
 	public void setUp() {
@@ -49,12 +49,12 @@ public final class DeclarationOrderIndependenceTests {
 	public void testTargetIsSerializable() {
 		assertTrue("target bean is serializable",this.target instanceof Serializable);
 	}
-	
+
 	@Test
 	public void testTargetIsBeanNameAware() {
 		assertTrue("target bean is bean name aware",this.target instanceof BeanNameAware);
 	}
-	
+
 	@Test
 	public void testBeforeAdviceFiringOk() {
 		AspectCollaborator collab = new AspectCollaborator();
@@ -62,7 +62,7 @@ public final class DeclarationOrderIndependenceTests {
 		this.target.doSomething();
 		assertTrue("before advice fired",collab.beforeFired);
 	}
-	
+
 	@Test
 	public void testAroundAdviceFiringOk() {
 		AspectCollaborator collab = new AspectCollaborator();
@@ -70,30 +70,30 @@ public final class DeclarationOrderIndependenceTests {
 		this.target.getX();
 		assertTrue("around advice fired",collab.aroundFired);
 	}
-	
+
 	@Test
 	public void testAfterReturningFiringOk() {
 		AspectCollaborator collab = new AspectCollaborator();
 		this.aspect.setCollaborator(collab);
 		this.target.getX();
-		assertTrue("after returning advice fired",collab.afterReturningFired);		
+		assertTrue("after returning advice fired",collab.afterReturningFired);
 	}
-	
-	
+
+
 	/** public visibility is required */
 	public static class BeanNameAwareMixin implements BeanNameAware {
-	
+
 		private String beanName;
-		
+
 		/* (non-Javadoc)
 		 * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String)
 		 */
 		public void setBeanName(String name) {
 			this.beanName = name;
 		}
-	
+
 	}
-	
+
 	/** public visibility is required */
 	@SuppressWarnings("serial")
 	public static class SerializableMixin implements Serializable {
@@ -103,15 +103,15 @@ public final class DeclarationOrderIndependenceTests {
 
 
 class TopsyTurvyAspect {
-	
+
 	interface Collaborator {
 		void beforeAdviceFired();
 		void afterReturningAdviceFired();
 		void aroundAdviceFired();
 	}
-	
+
 	private Collaborator collaborator;
-	
+
 	public void setCollaborator(Collaborator collaborator) {
 		this.collaborator = collaborator;
 	}
@@ -119,11 +119,11 @@ class TopsyTurvyAspect {
 	public void before() {
 		this.collaborator.beforeAdviceFired();
 	}
-	
+
 	public void afterReturning() {
 		this.collaborator.afterReturningAdviceFired();
 	}
-	
+
 	public Object around(ProceedingJoinPoint pjp) throws Throwable {
 		Object ret = pjp.proceed();
 		this.collaborator.aroundAdviceFired();
@@ -144,21 +144,21 @@ interface TopsyTurvyTarget {
 class TopsyTurvyTargetImpl implements TopsyTurvyTarget {
 
 	private int x = 5;
-	
+
 	/* (non-Javadoc)
 	 * @see org.springframework.aop.aspectj.TopsyTurvyTarget#doSomething()
 	 */
 	public void doSomething() {
 		this.x = 10;
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see org.springframework.aop.aspectj.TopsyTurvyTarget#getX()
 	 */
 	public int getX() {
 		return x;
 	}
-	
+
 }
 
 
@@ -167,7 +167,7 @@ class AspectCollaborator implements TopsyTurvyAspect.Collaborator {
 	public boolean afterReturningFired = false;
 	public boolean aroundFired = false;
 	public boolean beforeFired = false;
-	
+
 	/* (non-Javadoc)
 	 * @see org.springframework.aop.aspectj.TopsyTurvyAspect.Collaborator#afterReturningAdviceFired()
 	 */
@@ -188,5 +188,5 @@ class AspectCollaborator implements TopsyTurvyAspect.Collaborator {
 	public void beforeAdviceFired() {
 		this.beforeFired = true;
 	}
-	
+
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java
index 599fa63ee9..cde853bf6a 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java
@@ -31,7 +31,7 @@ public class DeclareParentsDelegateRefTests {
 	protected NoMethodsBean noMethodsBean;
 
 	protected Counter counter;
-	
+
 
 	@Before
 	public void setUp() {
@@ -46,7 +46,7 @@ public class DeclareParentsDelegateRefTests {
 	public void testIntroductionWasMade() {
 		assertTrue("Introduction must have been made", noMethodsBean instanceof ICounter);
 	}
-	
+
 	@Test
 	public void testIntroductionDelegation() {
 		((ICounter)noMethodsBean).increment();
@@ -62,4 +62,4 @@ interface NoMethodsBean {
 
 class NoMethodsBeanImpl implements NoMethodsBean {
 }
-	
+
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
index d4b9926cd4..c3e652a3a3 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
@@ -36,7 +36,7 @@ import test.mixin.Lockable;
 public final class DeclareParentsTests {
 
 	private ITestBean testBeanProxy;
-	
+
 	private TestBean testBeanTarget;
 
 	private ApplicationContext ctx;
@@ -44,14 +44,14 @@ public final class DeclareParentsTests {
 	@Before
 	public void setUp() throws Exception {
 		ctx = new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
-		
+
 		testBeanProxy = (ITestBean) ctx.getBean("testBean");
 		assertTrue(AopUtils.isAopProxy(testBeanProxy));
-		
+
 		// we need the real target too, not just the proxy...
 		testBeanTarget = (TestBean) ((Advised) testBeanProxy).getTargetSource().getTarget();
 	}
-		
+
 	@Test
 	public void testIntroductionWasMade() {
 		assertTrue("Introduction must have been made", testBeanProxy instanceof Lockable);
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
index ca987a04a4..4740e65677 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
@@ -25,18 +25,18 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 /**
  * Tests to check if the first implicit join point argument is correctly processed.
  * See SPR-3723 for more details.
- *   
+ *
  * @author Ramnivas Laddad
  * @author Chris Beams
  */
 public final class ImplicitJPArgumentMatchingAtAspectJTests {
-	
+
 	@Test
 	public void testAspect() {
 		// nothing to really test; it is enough if we don't get error while creating app context
 		new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
 	}
-	
+
 	@Aspect
 	static class CounterAtAspectJAspect {
 		@Around(value="execution(* org.springframework.beans.TestBean.*(..)) and this(bean) and args(argument)",
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
index 8cd94420ee..fc02024d76 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
@@ -22,18 +22,18 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 /**
  * Tests to check if the first implicit join point argument is correctly processed.
  * See SPR-3723 for more details.
- *   
+ *
  * @author Ramnivas Laddad
  * @author Chris Beams
  */
 public final class ImplicitJPArgumentMatchingTests {
-	
+
 	@Test
 	public void testAspect() {
 		// nothing to really test; it is enough if we don't get error while creating app context
 		new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
 	}
-	
+
 	static class CounterAspect {
 		public void increment(ProceedingJoinPoint pjp, Object bean, Object argument) throws Throwable {
 			pjp.proceed();
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java
index 9eac5f45d4..c5512be61d 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java
@@ -64,7 +64,7 @@ class OverloadedAdviceTestAspect {
 	public void myBeforeAdvice(String name) {
 		// no-op
 	}
-	
+
 	public void myBeforeAdvice(int age) {
 		// no-op
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
index 14a52c18d1..70464c5312 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
@@ -82,7 +82,7 @@ public final class ProceedTests {
 
 
 interface SimpleBean {
-	
+
 	void setName(String name);
 	String getName();
 	void setAge(int age);
@@ -100,7 +100,7 @@ class SimpleBeanImpl implements SimpleBean {
 	private float aFloat;
 	private String name;
 	private String sex;
-	
+
 	public int getAge() {
 		return age;
 	}
@@ -136,30 +136,30 @@ class SimpleBeanImpl implements SimpleBean {
 
 
 class ProceedTestingAspect implements Ordered {
-	
+
 	private String lastBeforeStringValue;
 	private String lastAroundStringValue;
 	private float lastBeforeFloatValue;
 	private int order;
-	
+
 	public void setOrder(int order) { this.order = order; }
 	public int getOrder() { return this.order; }
-	
+
 	public Object capitalize(ProceedingJoinPoint pjp, String value) throws Throwable {
 		return pjp.proceed(new Object[] {value.toUpperCase()});
 	}
-	
+
 	public Object doubleOrQuits(ProceedingJoinPoint pjp) throws Throwable {
 		int value = ((Integer) pjp.getArgs()[0]).intValue();
 		pjp.getArgs()[0] = new Integer(value * 2);
 		return pjp.proceed();
 	}
-	
+
 	public Object addOne(ProceedingJoinPoint pjp, Float value) throws Throwable {
 		float fv = value.floatValue();
 		return pjp.proceed(new Object[] {new Float(fv + 1.0F)});
 	}
-	
+
 	public void captureStringArgument(JoinPoint tjp, String arg) {
 		if (!tjp.getArgs()[0].equals(arg)) {
 			throw new IllegalStateException(
@@ -169,7 +169,7 @@ class ProceedTestingAspect implements Ordered {
 		}
 		this.lastBeforeStringValue = arg;
 	}
-	
+
 	public Object captureStringArgumentInAround(ProceedingJoinPoint pjp, String arg) throws Throwable {
 		if (!pjp.getArgs()[0].equals(arg)) {
 			throw new IllegalStateException(
@@ -179,7 +179,7 @@ class ProceedTestingAspect implements Ordered {
 		this.lastAroundStringValue = arg;
 		return pjp.proceed();
 	}
-	
+
 	public void captureFloatArgument(JoinPoint tjp, float arg) {
 		float tjpArg = ((Float) tjp.getArgs()[0]).floatValue();
 		if (Math.abs(tjpArg - arg) > 0.000001) {
@@ -190,15 +190,15 @@ class ProceedTestingAspect implements Ordered {
 		}
 		this.lastBeforeFloatValue = arg;
 	}
-	
+
 	public String getLastBeforeStringValue() {
 		return this.lastBeforeStringValue;
 	}
-	
+
 	public String getLastAroundStringValue() {
 		return this.lastAroundStringValue;
 	}
-	
+
 	public float getLastBeforeFloatValue() {
 		return this.lastBeforeFloatValue;
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java
index 39cc9b3486..bc6a0a1b41 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java
@@ -90,7 +90,7 @@ class JoinPointMonitorAspect {
 	 * is sufficient to reproduce the bug.
 	 */
 	private ICounter counter;
-	
+
 	int beforeExecutions;
 	int aroundExecutions;
 
@@ -121,7 +121,7 @@ class JoinPointMonitorAtAspectJAspect {
 	 * is sufficient to reproduce the bug.
 	 */
 	private ICounter counter;
-	
+
 	int beforeExecutions;
 	int aroundExecutions;
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java
index 5370068562..93fd2a2b59 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java
@@ -22,7 +22,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
  * See SPR-1682.
- * 
+ *
  * @author Adrian Colyer
  * @author Chris Beams
  */
@@ -30,7 +30,7 @@ public final class SharedPointcutWithArgsMismatchTests {
 
 	private ToBeAdvised toBeAdvised;
 
-	
+
 	@Before
 	public void setUp() {
 		ClassPathXmlApplicationContext ctx =
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
index d587ab8ccf..bcd1234398 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
@@ -36,7 +36,7 @@ public final class SubtypeSensitiveMatchingTests {
 	private SerializableFoo serializableBean;
 
 	private Bar bar;
-	
+
 
 	@Before
 	public void setUp() {
@@ -52,13 +52,13 @@ public final class SubtypeSensitiveMatchingTests {
 		assertTrue("bean with serializable type should be proxied",
 				this.serializableBean instanceof Advised);
 	}
-	
+
 	@Test
 	public void testBeansThatDoNotMatchBasedSolelyOnRuntimeTypeAreNotProxied() {
 		assertFalse("bean with non-serializable type should not be proxied",
-				this.nonSerializableBean instanceof Advised);		
+				this.nonSerializableBean instanceof Advised);
 	}
-	
+
 	@Test
 	public void testBeansThatDoNotMatchBasedOnOtherTestAreProxied() {
 		assertTrue("bean with args check should be proxied",
@@ -73,14 +73,14 @@ interface NonSerializableFoo { void foo(); }
 interface SerializableFoo extends Serializable { void foo(); }
 
 class SubtypeMatchingTestClassA implements NonSerializableFoo {
-	
+
 	public void foo() {}
-	
+
 }
 
 @SuppressWarnings("serial")
 class SubtypeMatchingTestClassB implements SerializableFoo {
-	
+
 	public void foo() {}
 
 }
@@ -90,5 +90,5 @@ interface Bar { void bar(Object o); }
 class SubtypeMatchingTestClassC implements Bar {
 
 	public void bar(Object o) {}
-	
+
 }
\ No newline at end of file
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 c20e47a55a..f440f0490b 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
@@ -38,7 +38,7 @@ public final class TargetPointcutSelectionTests {
 	public TestAspect testAspectForTestImpl1;
 	public TestAspect testAspectForAbstractTestImpl;
 	public TestInterceptor testInterceptor;
-	
+
 
 	@Before
 	public void setUp() {
@@ -49,12 +49,12 @@ public final class TargetPointcutSelectionTests {
 		testAspectForTestImpl1 = (TestAspect) ctx.getBean("testAspectForTestImpl1");
 		testAspectForAbstractTestImpl = (TestAspect) ctx.getBean("testAspectForAbstractTestImpl");
 		testInterceptor = (TestInterceptor) ctx.getBean("testInterceptor");
-		
+
 		testAspectForTestImpl1.count = 0;
 		testAspectForAbstractTestImpl.count = 0;
 		testInterceptor.count = 0;
 	}
-	
+
 	@Test
 	public void testTargetSelectionForMatchedType() {
 		testImpl1.interfaceMethod();
@@ -76,7 +76,7 @@ public final class TargetPointcutSelectionTests {
 
 		public void interfaceMethod();
 	}
-	
+
 
 	// Reproducing bug requires that the class specified in target() pointcut doesn't
 	// include the advised method's implementation (instead a base class should include it)
@@ -85,7 +85,7 @@ public final class TargetPointcutSelectionTests {
 		public void interfaceMethod() {
 		}
 	}
-	
+
 
 	public static class TestImpl1 extends AbstractTestImpl {
 	}
@@ -98,12 +98,12 @@ public final class TargetPointcutSelectionTests {
 	public static class TestAspect {
 
 		public int count;
-		
+
 		public void increment() {
 			count++;
 		}
 	}
-	
+
 
 	public static class TestInterceptor extends TestAspect implements MethodInterceptor {
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
index 8008dbccfd..6633bb808e 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
@@ -34,9 +34,9 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests {
 	public TestInterface testBean;
 	public TestInterface testAnnotatedClassBean;
 	public TestInterface testAnnotatedMethodBean;
-	
+
 	protected Counter counter;
-	
+
 	@org.junit.Before
 	public void setUp() {
 		ClassPathXmlApplicationContext ctx =
@@ -89,8 +89,8 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests {
 		testBean.doIt();
 		assertEquals(1, counter.thisAsInterfaceAndTargetAsInterfaceCounter);
 	}
-	
-	
+
+
 	@Test
 	public void testAtTargetClassAnnotationMatch() {
 		testAnnotatedClassBean.doIt();
@@ -102,7 +102,7 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests {
 		testAnnotatedMethodBean.doIt();
 		assertEquals(1, counter.atAnnotationMethodAnnotationCounter);
 	}
-	
+
 	public static interface TestInterface {
 		public void doIt();
 	}
@@ -111,12 +111,12 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests {
 		public void doIt() {
 		}
 	}
-	
+
 	@Retention(RetentionPolicy.RUNTIME)
 	public static @interface TestAnnotation {
-		
+
 	}
-	
+
 	@TestAnnotation
 	public static class AnnotatedClassTestImpl implements TestInterface {
 		public void doIt() {
@@ -128,7 +128,7 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests {
 		public void doIt() {
 		}
 	}
-	
+
 	@Aspect
 	public static class Counter {
 		int thisAsClassCounter;
@@ -140,7 +140,7 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests {
 		int thisAsInterfaceAndTargetAsClassCounter;
 		int atTargetClassAnnotationCounter;
 		int atAnnotationMethodAnnotationCounter;
-		
+
 		public void reset() {
 			thisAsClassCounter = 0;
 			thisAsInterfaceCounter = 0;
@@ -152,7 +152,7 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests {
 			atTargetClassAnnotationCounter = 0;
 			atAnnotationMethodAnnotationCounter = 0;
 		}
-		
+
 		@Before("this(org.springframework.aop.aspectj.ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.TestImpl)")
 		public void incrementThisAsClassCounter() {
 			thisAsClassCounter++;
@@ -162,7 +162,7 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests {
 		public void incrementThisAsInterfaceCounter() {
 			thisAsInterfaceCounter++;
 		}
-	
+
 		@Before("target(org.springframework.aop.aspectj.ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.TestImpl)")
 		public void incrementTargetAsClassCounter() {
 			targetAsClassCounter++;
@@ -184,22 +184,22 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests {
 		public void incrementThisAsInterfaceAndTargetAsInterfaceCounter() {
 			thisAsInterfaceAndTargetAsInterfaceCounter++;
 		}
-		
+
 		@Before("this(org.springframework.aop.aspectj.ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.TestInterface) " +
 				"&& target(org.springframework.aop.aspectj.ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.TestImpl)")
 		public void incrementThisAsInterfaceAndTargetAsClassCounter() {
 			thisAsInterfaceAndTargetAsClassCounter++;
 		}
-		
+
 		@Before("@target(org.springframework.aop.aspectj.ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.TestAnnotation)")
 		public void incrementAtTargetClassAnnotationCounter() {
 			atTargetClassAnnotationCounter++;
 		}
-		
+
 		@Before("@annotation(org.springframework.aop.aspectj.ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.TestAnnotation)")
 		public void incrementAtAnnotationMethodAnnotationCounter() {
 			atAnnotationMethodAnnotationCounter++;
 		}
-		
+
 	}
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
index 398046ddb2..bcd93c0523 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
@@ -27,9 +27,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  * @author Chris Beams
  */
 public final class ThisAndTargetSelectionOnlyPointcutsTests {
-	
+
 	private TestInterface testBean;
-	
+
 	private Counter thisAsClassCounter;
 	private Counter thisAsInterfaceCounter;
 	private Counter targetAsClassCounter;
@@ -37,28 +37,28 @@ public final class ThisAndTargetSelectionOnlyPointcutsTests {
 	private Counter thisAsClassAndTargetAsClassCounter;
 	private Counter thisAsInterfaceAndTargetAsInterfaceCounter;
 	private Counter thisAsInterfaceAndTargetAsClassCounter;
-	
+
 	@Before
 	public void setUp() {
 		ClassPathXmlApplicationContext ctx =
 			new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
 
 		testBean = (TestInterface) ctx.getBean("testBean");
-		
+
 		thisAsClassCounter = (Counter) ctx.getBean("thisAsClassCounter");
 		thisAsInterfaceCounter = (Counter) ctx.getBean("thisAsInterfaceCounter");
 		targetAsClassCounter = (Counter) ctx.getBean("targetAsClassCounter");
 		targetAsInterfaceCounter = (Counter) ctx.getBean("targetAsInterfaceCounter");
-		
+
 		thisAsClassAndTargetAsClassCounter = (Counter) ctx.getBean("thisAsClassAndTargetAsClassCounter");
 		thisAsInterfaceAndTargetAsInterfaceCounter = (Counter) ctx.getBean("thisAsInterfaceAndTargetAsInterfaceCounter");
 		thisAsInterfaceAndTargetAsClassCounter = (Counter) ctx.getBean("thisAsInterfaceAndTargetAsClassCounter");
-		
+
 		thisAsClassCounter.reset();
 		thisAsInterfaceCounter.reset();
 		targetAsClassCounter.reset();
 		targetAsInterfaceCounter.reset();
-		
+
 		thisAsClassAndTargetAsClassCounter.reset();
 		thisAsInterfaceAndTargetAsInterfaceCounter.reset();
 		thisAsInterfaceAndTargetAsClassCounter.reset();
@@ -105,7 +105,7 @@ public final class ThisAndTargetSelectionOnlyPointcutsTests {
 		testBean.doIt();
 		assertEquals(1, thisAsInterfaceAndTargetAsInterfaceCounter.getCount());
 	}
-	
+
 }
 
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
index 3ad14e51d5..935cf4bd58 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
@@ -26,7 +26,7 @@ import org.aspectj.lang.JoinPoint;
  * intention of reducing the surface area of java files within this
  * package.  This allows developers to think about tests first, and deal
  * with these second class testing artifacts on an as-needed basis.
- * 
+ *
  * Types here should be defined as package-private top level classes in
  * order to avoid needing to fully qualify, e.g.: _TestTypes$Foo.
  *
@@ -49,24 +49,24 @@ class AdviceBindingTestAspect {
 	public void setCollaborator(AdviceBindingCollaborator aCollaborator) {
 		this.collaborator = aCollaborator;
 	}
-	
+
 	// "advice" methods
 	public void oneIntArg(int age) {
 		this.collaborator.oneIntArg(age);
 	}
-	
+
 	public void oneObjectArg(Object bean) {
 		this.collaborator.oneObjectArg(bean);
 	}
-	
+
 	public void oneIntAndOneObject(int x, Object o) {
 		this.collaborator.oneIntAndOneObject(x,o);
 	}
-	
+
 	public void needsJoinPoint(JoinPoint tjp) {
 		this.collaborator.needsJoinPoint(tjp.getSignature().getName());
 	}
-	
+
 	public void needsJoinPointStaticPart(JoinPoint.StaticPart tjpsp) {
 		this.collaborator.needsJoinPointStaticPart(tjpsp.getSignature().getName());
 	}
@@ -108,7 +108,7 @@ interface ICounter {
 
 /**
  * A simple counter for use in simple tests (for example, how many times an advice was executed)
- * 
+ *
  * @author Ramnivas Laddad
  */
 final class Counter implements ICounter {
@@ -121,7 +121,7 @@ final class Counter implements ICounter {
 	public void increment() {
 		count++;
 	}
-	
+
 	public void decrement() {
 		count--;
 	}
@@ -133,7 +133,7 @@ final class Counter implements ICounter {
 	public void setCount(int counter) {
 		this.count = counter;
 	}
-	
+
 	public void reset() {
 		this.count = 0;
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java
index af3310eaa3..0829446808 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java
@@ -34,7 +34,7 @@ public final class AnnotationBindingTests {
 	public void setUp() {
 		ClassPathXmlApplicationContext ctx =
 			new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-context.xml", getClass());
-		
+
 		testBean = (AnnotatedTestBean) ctx.getBean("testBean");
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java
index b2bf8acec7..925038414e 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java
@@ -36,7 +36,7 @@ public final class AnnotationPointcutTests {
 	public void setUp() {
 		ClassPathXmlApplicationContext ctx =
 			new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-context.xml", getClass());
-		
+
 		testBean = (AnnotatedTestBean) ctx.getBean("testBean");
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
index 9507d48891..e88d5ada0b 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
@@ -36,10 +36,10 @@ public final class AspectImplementingInterfaceTests {
 	public void testProxyCreation() {
 		ClassPathXmlApplicationContext ctx =
 			new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-context.xml", getClass());
-		
+
 		ITestBean testBean = (ITestBean) ctx.getBean("testBean");
 		AnInterface interfaceExtendingAspect = (AnInterface) ctx.getBean("interfaceExtendingAspect");
-		
+
 		assertTrue(testBean instanceof Advised);
 		assertFalse(interfaceExtendingAspect instanceof Advised);
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java
index 9524e6dce3..227903bab0 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java
@@ -34,7 +34,7 @@ public final class AspectJAutoProxyCreatorAndLazyInitTargetSourceTests {
 	public void testAdrian() {
 		ClassPathXmlApplicationContext ctx =
 			new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-context.xml", getClass());
-		
+
 		ITestBean adrian = (ITestBean) ctx.getBean("adrian");
 		assertEquals(0, LazyTestBean.instantiations);
 		assertNotNull(adrian);
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
index 96b55873b7..9bb9c8d83a 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -180,7 +180,7 @@ public final class AspectJAutoProxyCreatorTests {
 	public void testAspectsAndAdvisorAreAppliedEvenIfComingFromParentFactory() {
 		ClassPathXmlApplicationContext ac = newContext("aspectsPlusAdvisor.xml");
 		GenericApplicationContext childAc = new GenericApplicationContext(ac);
-		// Create a child factory with a bean that should be woven                                              
+		// Create a child factory with a bean that should be woven
 		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
 		bd.getPropertyValues().addPropertyValue(new PropertyValue("name", "Adrian"))
 				.addPropertyValue(new PropertyValue("age", new Integer(34)));
@@ -297,7 +297,7 @@ public final class AspectJAutoProxyCreatorTests {
 		adrian1.getAge();
 		AdviceUsingThisJoinPoint aspectInstance = (AdviceUsingThisJoinPoint) bf.getBean("aspect");
 		//(AdviceUsingThisJoinPoint) Aspects.aspectOf(AdviceUsingThisJoinPoint.class);
-		//assertEquals("method-execution(int TestBean.getAge())",aspectInstance.getLastMethodEntered());		
+		//assertEquals("method-execution(int TestBean.getAge())",aspectInstance.getLastMethodEntered());
 		assertTrue(aspectInstance.getLastMethodEntered().indexOf("TestBean.getAge())") != 0);
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
index 29867330f8..1868a63a3d 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
@@ -76,8 +76,8 @@ class AtAspectJAnnotationBindingTestAspect {
 		Object result = pjp.proceed();
 		return (result instanceof String ? annValue + " " + result : result);
 	}
-	
-} 
+
+}
 
 
 class ResourceArrayFactoryBean implements FactoryBean<Object> {
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java
index 78eede824c..66897ba62d 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java
@@ -30,7 +30,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
  * intention of reducing the surface area of java files within this
  * package.  This allows developers to think about tests first, and deal
  * with these second class testing artifacts on an as-needed basis.
- * 
+ *
  * Types here should be defined as package-private top level classes in
  * order to avoid needing to fully qualify, e.g.: _TestTypes$Foo.
  *
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
index 5051cac166..918dd87535 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
@@ -38,14 +38,14 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.util.StopWatch;
 
 /**
- * Integration tests for AspectJ auto proxying. Includes mixing with Spring AOP 
+ * Integration tests for AspectJ auto proxying. Includes mixing with Spring AOP
  * Advisors to demonstrate that existing autoproxying contract is honoured.
  *
  * @author Rod Johnson
  * @author Chris Beams
  */
 public final class BenchmarkTests {
-	
+
 	private static final Class<?> CLASS = BenchmarkTests.class;
 
 	private static final String ASPECTJ_CONTEXT = CLASS.getSimpleName() + "-aspectj.xml";
@@ -56,27 +56,27 @@ public final class BenchmarkTests {
 	public void testRepeatedAroundAdviceInvocationsWithAspectJ() {
 		testRepeatedAroundAdviceInvocations(ASPECTJ_CONTEXT, getCount(), "AspectJ");
 	}
-	
+
 	@Test
 	public void testRepeatedAroundAdviceInvocationsWithSpringAop() {
 		testRepeatedAroundAdviceInvocations(SPRING_AOP_CONTEXT, getCount(), "Spring AOP");
 	}
-	
+
 	@Test
 	public void testRepeatedBeforeAdviceInvocationsWithAspectJ() {
 		testBeforeAdviceWithoutJoinPoint(ASPECTJ_CONTEXT, getCount(), "AspectJ");
 	}
-	
+
 	@Test
 	public void testRepeatedBeforeAdviceInvocationsWithSpringAop() {
 		testBeforeAdviceWithoutJoinPoint(SPRING_AOP_CONTEXT, getCount(), "Spring AOP");
 	}
-	
+
 	@Test
 	public void testRepeatedAfterReturningAdviceInvocationsWithAspectJ() {
 		testAfterReturningAdviceWithoutJoinPoint(ASPECTJ_CONTEXT, getCount(), "AspectJ");
 	}
-	
+
 	@Test
 	public void testRepeatedAfterReturningAdviceInvocationsWithSpringAop() {
 		testAfterReturningAdviceWithoutJoinPoint(SPRING_AOP_CONTEXT, getCount(), "Spring AOP");
@@ -86,12 +86,12 @@ public final class BenchmarkTests {
 	public void testRepeatedMixWithAspectJ() {
 		testMix(ASPECTJ_CONTEXT, getCount(), "AspectJ");
 	}
-	
+
 	@Test
 	public void testRepeatedMixWithSpringAop() {
 		testMix(SPRING_AOP_CONTEXT, getCount(), "Spring AOP");
 	}
-	
+
 	/**
 	 * Change the return number to a higher number to make this test useful.
 	 */
@@ -105,85 +105,85 @@ public final class BenchmarkTests {
 		StopWatch sw = new StopWatch();
 		sw.start(howmany + " repeated around advice invocations with " + technology);
 		ITestBean adrian = (ITestBean) bf.getBean("adrian");
-		
+
 		assertTrue(AopUtils.isAopProxy(adrian));
 		assertEquals(68, adrian.getAge());
-		
+
 		for (int i = 0; i < howmany; i++) {
 			adrian.getAge();
 		}
-		
+
 		sw.stop();
 		System.out.println(sw.prettyPrint());
 		return sw.getLastTaskTimeMillis();
 	}
-	
+
 	private long testBeforeAdviceWithoutJoinPoint(String file, int howmany, String technology) {
 		ClassPathXmlApplicationContext bf = new ClassPathXmlApplicationContext(file, CLASS);
 
 		StopWatch sw = new StopWatch();
 		sw.start(howmany + " repeated before advice invocations with " + technology);
 		ITestBean adrian = (ITestBean) bf.getBean("adrian");
-		
+
 		assertTrue(AopUtils.isAopProxy(adrian));
 		Advised a = (Advised) adrian;
 		assertTrue(a.getAdvisors().length >= 3);
 		assertEquals("adrian", adrian.getName());
-		
+
 		for (int i = 0; i < howmany; i++) {
 			adrian.getName();
 		}
-		
+
 		sw.stop();
 		System.out.println(sw.prettyPrint());
 		return sw.getLastTaskTimeMillis();
 	}
-	
+
 	private long testAfterReturningAdviceWithoutJoinPoint(String file, int howmany, String technology) {
 		ClassPathXmlApplicationContext bf = new ClassPathXmlApplicationContext(file, CLASS);
 
 		StopWatch sw = new StopWatch();
 		sw.start(howmany + " repeated after returning advice invocations with " + technology);
 		ITestBean adrian = (ITestBean) bf.getBean("adrian");
-		
+
 		assertTrue(AopUtils.isAopProxy(adrian));
 		Advised a = (Advised) adrian;
 		assertTrue(a.getAdvisors().length >= 3);
 		// Hits joinpoint
 		adrian.setAge(25);
-		
+
 		for (int i = 0; i < howmany; i++) {
 			adrian.setAge(i);
 		}
-		
+
 		sw.stop();
 		System.out.println(sw.prettyPrint());
 		return sw.getLastTaskTimeMillis();
 	}
-	
+
 	private long testMix(String file, int howmany, String technology) {
 		ClassPathXmlApplicationContext bf = new ClassPathXmlApplicationContext(file, CLASS);
 
 		StopWatch sw = new StopWatch();
 		sw.start(howmany + " repeated mixed invocations with " + technology);
 		ITestBean adrian = (ITestBean) bf.getBean("adrian");
-		
+
 		assertTrue(AopUtils.isAopProxy(adrian));
 		Advised a = (Advised) adrian;
 		assertTrue(a.getAdvisors().length >= 3);
-		
+
 		for (int i = 0; i < howmany; i++) {
 			// Hit all 3 joinpoints
 			adrian.getAge();
 			adrian.getName();
 			adrian.setAge(i);
-			
+
 			// Invoke three non-advised methods
 			adrian.getDoctor();
 			adrian.getLawyer();
 			adrian.getSpouse();
 		}
-		
+
 		sw.stop();
 		System.out.println(sw.prettyPrint());
 		return sw.getLastTaskTimeMillis();
@@ -193,19 +193,19 @@ public final class BenchmarkTests {
 
 
 class MultiplyReturnValueInterceptor implements MethodInterceptor {
-	
+
 	private int multiple = 2;
-	
+
 	public int invocations;
-	
+
 	public void setMultiple(int multiple) {
 		this.multiple = multiple;
 	}
-	
+
 	public int getMultiple() {
 		return this.multiple;
 	}
-	
+
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		++invocations;
 		int result = (Integer) mi.proceed();
@@ -216,13 +216,13 @@ class MultiplyReturnValueInterceptor implements MethodInterceptor {
 
 
 class TraceAfterReturningAdvice implements AfterReturningAdvice {
-	
+
 	public int afterTakesInt;
-	
+
 	public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable {
 		++afterTakesInt;
 	}
-	
+
 	public static Advisor advisor() {
 		return new DefaultPointcutAdvisor(
 			new StaticMethodMatcherPointcut() {
@@ -239,16 +239,16 @@ class TraceAfterReturningAdvice implements AfterReturningAdvice {
 
 @Aspect
 class TraceAspect {
-	
+
 	public int beforeStringReturn;
-	
+
 	public int afterTakesInt;
-	
+
 	@Before("execution(String *.*(..))")
 	public void traceWithoutJoinPoint() {
 		++beforeStringReturn;
 	}
-	
+
 	@AfterReturning("execution(void *.*(int))")
 	public void traceWithoutJoinPoint2() {
 		++afterTakesInt;
@@ -258,13 +258,13 @@ class TraceAspect {
 
 
 class TraceBeforeAdvice implements MethodBeforeAdvice {
-	
+
 	public int beforeStringReturn;
-	
+
 	public void before(Method method, Object[] args, Object target) throws Throwable {
 		++beforeStringReturn;
 	}
-	
+
 	public static Advisor advisor() {
 		return new DefaultPointcutAdvisor(
 			new StaticMethodMatcherPointcut() {
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java
index e2e6b5270f..17e5943b3a 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java
@@ -34,14 +34,14 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 public final class SPR3064Tests {
 
 	private Service service;
-	
+
 	@Test
 	public void testServiceIsAdvised() {
 		ClassPathXmlApplicationContext ctx =
 			new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
-		
+
 		service = (Service) ctx.getBean("service");
-		
+
 		try {
 			this.service.serveMe();
 			fail("service operation has not been advised by transaction interceptor");
@@ -50,7 +50,7 @@ public final class SPR3064Tests {
 			assertEquals("advice invoked",ex.getMessage());
 		}
 	}
-	
+
 }
 
 
@@ -62,7 +62,7 @@ public final class SPR3064Tests {
 
 @Aspect
 class TransactionInterceptor {
-	
+
 	@Around(value="execution(* *..Service.*(..)) && @annotation(transaction)")
 	public Object around(ProceedingJoinPoint pjp, Transaction transaction) throws Throwable {
 		throw new RuntimeException("advice invoked");
@@ -73,7 +73,7 @@ class TransactionInterceptor {
 
 
 interface Service {
-	
+
 	void serveMe();
 
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java
index 8e2d35d9d2..336523137a 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java
@@ -51,10 +51,10 @@ public final class AfterReturningGenericTypeMatchingTests {
 	public void setUp() {
 		ClassPathXmlApplicationContext ctx =
 			new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-context.xml", getClass());
-		
+
 		counterAspect = (CounterAspect) ctx.getBean("counterAspect");
 		counterAspect.reset();
-		
+
 		testBean = (GenericReturnTypeVariationClass) ctx.getBean("testBean");
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java
index ce7790ab76..b8c85fbef3 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java
@@ -50,10 +50,10 @@ public class GenericBridgeMethodMatchingTests {
 	public void setUp() {
 		ClassPathXmlApplicationContext ctx =
 			new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-context.xml", getClass());
-		
+
 		counterAspect = (GenericCounterAspect) ctx.getBean("counterAspect");
 		counterAspect.count = 0;
-		
+
 		testBean = (DerivedInterface<String>) ctx.getBean("testBean");
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java
index 011095b95d..6260e98b06 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java
@@ -45,14 +45,14 @@ public final class GenericParameterMatchingTests {
 	public void setUp() {
 		ClassPathXmlApplicationContext ctx =
 			new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-context.xml", getClass());
-		
+
 		counterAspect = (CounterAspect) ctx.getBean("counterAspect");
 		counterAspect.reset();
-		
+
 		testBean = (GenericInterface<String>) ctx.getBean("testBean");
 	}
 
-	
+
 	@Test
 	public void testGenericInterfaceGenericArgExecution() {
 		testBean.save("");
@@ -64,7 +64,7 @@ public final class GenericParameterMatchingTests {
 		testBean.saveAll(null);
 		assertEquals(1, counterAspect.genericInterfaceGenericCollectionArgExecutionCount);
 	}
-	
+
 	@Test
 	public void testGenericInterfaceSubtypeGenericCollectionArgExecution() {
 		testBean.saveAll(null);
@@ -96,21 +96,21 @@ public final class GenericParameterMatchingTests {
 		int genericInterfaceGenericArgExecutionCount;
 		int genericInterfaceGenericCollectionArgExecutionCount;
 		int genericInterfaceSubtypeGenericCollectionArgExecutionCount;
-		
+
 		public void reset() {
 			genericInterfaceGenericArgExecutionCount = 0;
 			genericInterfaceGenericCollectionArgExecutionCount = 0;
 			genericInterfaceSubtypeGenericCollectionArgExecutionCount = 0;
 		}
-		
+
 		@Pointcut("execution(* org.springframework.aop.aspectj.generic.GenericParameterMatchingTests.GenericInterface.save(..))")
-		public void genericInterfaceGenericArgExecution() {} 
-		
+		public void genericInterfaceGenericArgExecution() {}
+
 		@Pointcut("execution(* org.springframework.aop.aspectj.generic.GenericParameterMatchingTests.GenericInterface.saveAll(..))")
-		public void GenericInterfaceGenericCollectionArgExecution() {} 
+		public void GenericInterfaceGenericCollectionArgExecution() {}
 
 		@Pointcut("execution(* org.springframework.aop.aspectj.generic.GenericParameterMatchingTests.GenericInterface+.saveAll(..))")
-		public void genericInterfaceSubtypeGenericCollectionArgExecution() {} 
+		public void genericInterfaceSubtypeGenericCollectionArgExecution() {}
 
 		@Before("genericInterfaceGenericArgExecution()")
 		public void incrementGenericInterfaceGenericArgExecution() {
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java
index 01ffc09ec7..f2c174522b 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java
@@ -33,7 +33,7 @@ public final class AopNamespaceHandlerAdviceTypeTests {
 	public void testParsingOfAdviceTypes() {
 		new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-ok.xml", getClass());
 	}
-	
+
 	@Test
 	public void testParsingOfAdviceTypesWithError() {
 		try {
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java
index 030d2539e2..453040fe3d 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java
@@ -32,7 +32,7 @@ public final class AopNamespaceHandlerArgNamesTests {
 	public void testArgNamesOK() {
 		new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-ok.xml", getClass());
 	}
-	
+
 	@Test
 	public void testArgNamesError() {
 		try {
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java
index 3e1d3f0a47..f7f4d3e812 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java
@@ -33,7 +33,7 @@ public final class AopNamespaceHandlerReturningTests {
 	public void testReturningOnReturningAdvice() {
 		new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-ok.xml", getClass());
 	}
-	
+
 	@Test
 	public void testParseReturningOnOtherAdviceType() {
 		try {
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
index 14620bafaa..09d3dacd84 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
 
 /**
  * Unit tests for aop namespace.
- * 
+ *
  * @author Rob Harrop
  * @author Chris Beams
  */
@@ -41,7 +41,7 @@ public class AopNamespaceHandlerTests {
 
 	private ApplicationContext context;
 
-	
+
 	@Before
 	public void setUp() {
 		this.context =
@@ -149,7 +149,7 @@ class CountingAspectJAdvice {
 		this.aroundCount++;
 		pjp.proceed();
 	}
-	
+
 	public void myAfterReturningAdvice(int age) {
 		this.afterCount++;
 	}
@@ -157,11 +157,11 @@ class CountingAspectJAdvice {
 	public void myAfterThrowingAdvice(RuntimeException ex) {
 		this.afterCount++;
 	}
-	
+
 	public void mySetAgeAdvice(int newAge, ITestBean bean) {
 		// no-op
 	}
-	
+
 	public int getBeforeCount() {
 		return this.beforeCount;
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java
index 7533dc4196..dcb1d9c383 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java
@@ -33,7 +33,7 @@ public final class AopNamespaceHandlerThrowingTests {
 	public void testThrowingOnThrowingAdvice() {
 		new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-ok.xml", getClass());
 	}
-	
+
 	@Test
 	public void testParseThrowingOnOtherAdviceType() {
 		try {
diff --git a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
index 2a469823c9..26c0f0cd3f 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
@@ -35,15 +35,15 @@ public final class MethodLocatingFactoryBeanTests {
 	private static final String BEAN_NAME = "string";
 	private MethodLocatingFactoryBean factory;
 	private BeanFactory beanFactory;
-	
+
 	@Before
 	public void setUp() {
 		factory = new MethodLocatingFactoryBean();
-		
+
 		// methods must set up expectations and call replay() manually for this mock
 		beanFactory = createMock(BeanFactory.class);
 	}
-	
+
 	@After
 	public void tearDown() {
 		verify(beanFactory);
@@ -64,7 +64,7 @@ public final class MethodLocatingFactoryBeanTests {
 	@Test(expected=IllegalArgumentException.class)
 	public void testWithNullTargetBeanName() {
 		replay(beanFactory);
-		
+
 		factory.setMethodName("toString()");
 		factory.setBeanFactory(beanFactory);
 	}
@@ -72,7 +72,7 @@ public final class MethodLocatingFactoryBeanTests {
 	@Test(expected=IllegalArgumentException.class)
 	public void testWithEmptyTargetBeanName() {
 		replay(beanFactory);
-		
+
 		factory.setTargetBeanName("");
 		factory.setMethodName("toString()");
 		factory.setBeanFactory(beanFactory);
@@ -81,7 +81,7 @@ public final class MethodLocatingFactoryBeanTests {
 	@Test(expected=IllegalArgumentException.class)
 	public void testWithNullTargetMethodName() {
 		replay(beanFactory);
-		
+
 		factory.setTargetBeanName(BEAN_NAME);
 		factory.setBeanFactory(beanFactory);
 	}
@@ -89,7 +89,7 @@ public final class MethodLocatingFactoryBeanTests {
 	@Test(expected=IllegalArgumentException.class)
 	public void testWithEmptyTargetMethodName() {
 		replay(beanFactory);
-		
+
 		factory.setTargetBeanName(BEAN_NAME);
 		factory.setMethodName("");
 		factory.setBeanFactory(beanFactory);
@@ -99,7 +99,7 @@ public final class MethodLocatingFactoryBeanTests {
 	public void testWhenTargetBeanClassCannotBeResolved() {
 		expect(beanFactory.getType(BEAN_NAME)).andReturn(null);
 		replay(beanFactory);
-		
+
 		factory.setTargetBeanName(BEAN_NAME);
 		factory.setMethodName("toString()");
 		factory.setBeanFactory(beanFactory);
@@ -109,7 +109,7 @@ public final class MethodLocatingFactoryBeanTests {
 	public void testSunnyDayPath() throws Exception {
 		expect((Class) beanFactory.getType(BEAN_NAME)).andReturn(String.class);
 		replay(beanFactory);
-		
+
 		factory.setTargetBeanName(BEAN_NAME);
 		factory.setMethodName("toString()");
 		factory.setBeanFactory(beanFactory);
@@ -124,7 +124,7 @@ public final class MethodLocatingFactoryBeanTests {
 	public void testWhereMethodCannotBeResolved() {
 		expect((Class) beanFactory.getType(BEAN_NAME)).andReturn(String.class);
 		replay(beanFactory);
-		
+
 		factory.setTargetBeanName(BEAN_NAME);
 		factory.setMethodName("loadOfOld()");
 		factory.setBeanFactory(beanFactory);
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
index 622805857d..ea2b39088c 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
@@ -797,7 +797,7 @@ public abstract class AbstractAopProxyTests {
 	}
 
 	/**
-	 * Note that an introduction can't throw an unexpected checked exception, 
+	 * Note that an introduction can't throw an unexpected checked exception,
 	 * as it's constained by the interface.
 	 */
 	@Test
@@ -1268,8 +1268,8 @@ public abstract class AbstractAopProxyTests {
 				return target;
 			}
 
-			public void releaseTarget(Object target) throws Exception {				
-			}			
+			public void releaseTarget(Object target) throws Exception {
+			}
 		});
 
 		// Just test anything: it will fail if context wasn't found
@@ -1422,7 +1422,7 @@ public abstract class AbstractAopProxyTests {
 		}
 		assertEquals(6, cca.getCalls());
 	}
-	
+
 	@Test
 	public void testBeforeAdviceThrowsException() {
 		final RuntimeException rex = new RuntimeException();
@@ -1909,31 +1909,31 @@ public abstract class AbstractAopProxyTests {
 		}
 	}
 
-	
+
 	@SuppressWarnings("serial")
 	public static class CountingMultiAdvice extends MethodCounter implements MethodBeforeAdvice,
 			AfterReturningAdvice, ThrowsAdvice {
-	
+
 		public void before(Method m, Object[] args, Object target) throws Throwable {
 			count(m);
 		}
-	
+
 		public void afterReturning(Object o, Method m, Object[] args, Object target)
 				throws Throwable {
 			count(m);
 		}
-	
+
 		public void afterThrowing(IOException ex) throws Throwable {
 			count(IOException.class.getName());
 		}
-	
+
 		public void afterThrowing(UncheckedException ex) throws Throwable {
 			count(UncheckedException.class.getName());
 		}
-	
+
 	}
-	
-	
+
+
 	@SuppressWarnings("serial")
 	public static class CountingThrowsAdvice extends MethodCounter implements ThrowsAdvice {
 
@@ -1946,36 +1946,36 @@ public abstract class AbstractAopProxyTests {
 		}
 
 	}
-	
+
 
 	@SuppressWarnings("serial")
 	static class UncheckedException extends RuntimeException {
-		
+
 	}
-	
+
 
 	@SuppressWarnings("serial")
 	static class SpecializedUncheckedException extends UncheckedException {
 
 		public SpecializedUncheckedException(String string, SQLException exception) {
 		}
-		
+
 	}
-	
-	
+
+
 	static class MockTargetSource implements TargetSource {
-		
+
 		private Object target;
-		
+
 		public int gets;
-		
+
 		public int releases;
-		
+
 		public void reset() {
 			this.target = null;
 			gets = releases = 0;
 		}
-		
+
 		public void setTarget(Object target) {
 			this.target = target;
 		}
@@ -2003,7 +2003,7 @@ public abstract class AbstractAopProxyTests {
 				throw new RuntimeException("Released wrong target");
 			++releases;
 		}
-		
+
 		/**
 		 * Check that gets and releases match
 		 *
@@ -2021,8 +2021,8 @@ public abstract class AbstractAopProxyTests {
 		}
 
 	}
-	
-	
+
+
 	static abstract class ExposedInvocationTestBean extends TestBean {
 
 		public String getName() {
@@ -2036,18 +2036,18 @@ public abstract class AbstractAopProxyTests {
 			assertions(invocation);
 			super.absquatulate();
 		}
-		
+
 		protected abstract void assertions(MethodInvocation invocation);
 	}
-	
-	
+
+
 	static class InvocationCheckExposedInvocationTestBean extends ExposedInvocationTestBean {
 		protected void assertions(MethodInvocation invocation) {
 			TestCase.assertTrue(invocation.getThis() == this);
-			TestCase.assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(), 
+			TestCase.assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(),
 					ITestBean.class.isAssignableFrom(invocation.getMethod().getDeclaringClass()));
 		}
 	}
-	
+
 }
 
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 8a2106c58f..a1abd8e2fe 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
@@ -227,7 +227,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 
 		return (ITestBean) pf.getProxy();
 	}
-	
+
 	@Test
 	public void testMultipleProxiesForIntroductionAdvisor() {
 		TestBean target = new TestBean();
@@ -243,7 +243,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 	private ITestBean getIntroductionAdvisorProxy(TestBean target) {
 		ProxyFactory pf = new ProxyFactory(new Class[]{ITestBean.class});
 		pf.setProxyTargetClass(true);
-		
+
 		pf.addAdvisor(new LockMixinAdvisor());
 		pf.setTarget(target);
 		pf.setFrozen(true);
@@ -462,15 +462,15 @@ class CglibTestBean {
 class NoArgCtorTestBean {
 
 	private boolean called = false;
-	
+
 	public NoArgCtorTestBean(String x, int y) {
 		called = true;
 	}
-	
+
 	public boolean wasCalled() {
 		return called;
 	}
-	
+
 	public void reset() {
 		called = false;
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
index 2e394ed68f..422517273f 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
@@ -48,16 +48,16 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 		assertTrue("Should be a JDK proxy: " + proxy.getClass(), AopUtils.isJdkDynamicProxy(proxy));
 		return proxy;
 	}
-	
+
 	protected AopProxy createAopProxy(AdvisedSupport as) {
 		return new JdkDynamicAopProxy(as);
 	}
-	
+
 	public void testNullConfig() {
 		try {
 			new JdkDynamicAopProxy(null);
 			fail("Shouldn't allow null interceptors");
-		} 
+		}
 		catch (IllegalArgumentException ex) {
 			// Ok
 		}
@@ -91,16 +91,16 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 		assertTrue("correct return value", tb.getAge() == age);
 		verify(mi);
 	}
-	
+
 	public void testTargetCanGetInvocationWithPrivateClass() throws Throwable {
 		final ExposedInvocationTestBean expectedTarget = new ExposedInvocationTestBean() {
 			protected void assertions(MethodInvocation invocation) {
 				assertTrue(invocation.getThis() == this);
-				assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(), 
+				assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(),
 					invocation.getMethod().getDeclaringClass() == ITestBean.class);
 			}
 		};
-	
+
 		AdvisedSupport pc = new AdvisedSupport(new Class[] { ITestBean.class, IOther.class });
 		pc.addAdvice(ExposeInvocationInterceptor.INSTANCE);
 		TrapTargetInterceptor tii = new TrapTargetInterceptor() {
@@ -118,7 +118,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 		tb.getName();
 		// Not safe to trap invocation
 		//assertTrue(tii.invocation == target.invocation);
-	
+
 		//assertTrue(target.invocation.getProxy() == tb);
 
 		//	((IOther) tb).absquatulate();
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
index 45d575bb4a..ff3e33442e 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
@@ -71,10 +71,10 @@ import test.beans.SideEffectBean;
  * @author Chris Beams
  */
 public final class ProxyFactoryBeanTests {
-	
+
 	private static final Class<?> CLASS = ProxyFactoryBeanTests.class;
 	private static final String CLASSNAME = CLASS.getSimpleName();
-	
+
 	private static final String CONTEXT = CLASSNAME + "-context.xml";
 	private static final String SERIALIZATION_CONTEXT = CLASSNAME + "-serialization.xml";
 	private static final String AUTOWIRING_CONTEXT = CLASSNAME + "-autowiring.xml";
@@ -86,7 +86,7 @@ public final class ProxyFactoryBeanTests {
 	private static final String PROTOTYPE_CONTEXT = CLASSNAME + "-prototype.xml";
 	private static final String THROWS_ADVICE_CONTEXT = CLASSNAME + "-throws-advice.xml";
 	private static final String INNER_BEAN_TARGET_CONTEXT = CLASSNAME + "-inner-bean-target.xml";
-	
+
 	private BeanFactory factory;
 
 	@Before
@@ -243,7 +243,7 @@ public final class ProxyFactoryBeanTests {
 	 * be a prototype
 	 */
 	private Object testPrototypeInstancesAreIndependent(String beanName) {
-		// Initial count value set in bean factory XML 
+		// Initial count value set in bean factory XML
 		int INITIAL_COUNT = 10;
 
 		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(PROTOTYPE_CONTEXT, CLASS));
@@ -301,7 +301,7 @@ public final class ProxyFactoryBeanTests {
 		assertTrue("Has correct object type", ITestBean.class.isAssignableFrom(factory.getType("test1")));
 
 		ITestBean tb = (ITestBean) factory.getBean("test1");
-		// no exception 
+		// no exception
 		tb.hashCode();
 
 		final Exception ex = new UnsupportedOperationException("invoke");
@@ -313,12 +313,12 @@ public final class ProxyFactoryBeanTests {
 		});
 		assertEquals("Have correct advisor count", 2, config.getAdvisors().length);
 
-		tb = (ITestBean) factory.getBean("test1"); 
+		tb = (ITestBean) factory.getBean("test1");
 		try {
 			// Will fail now
 			tb.toString();
 			fail("Evil interceptor added programmatically should fail all method calls");
-		} 
+		}
 		catch (Exception thrown) {
 			assertTrue(thrown == ex);
 		}
@@ -570,7 +570,7 @@ public final class ProxyFactoryBeanTests {
 
 		// Remove offending interceptor...
 		assertTrue(((Advised) p).removeAdvice(nop));
-		assertTrue("Serializable again because offending interceptor was removed", SerializationTestUtils.isSerializable(p));	
+		assertTrue("Serializable again because offending interceptor was removed", SerializationTestUtils.isSerializable(p));
 	}
 
 	@Test
@@ -728,7 +728,7 @@ public final class ProxyFactoryBeanTests {
 
 
 	/**
-	 * Use as a global interceptor. Checks that 
+	 * Use as a global interceptor. Checks that
 	 * global interceptors can add aspect interfaces.
 	 * NB: Add only via global interceptors in XML file.
 	 */
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java
index ea9f35a788..216510950e 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java
@@ -8,7 +8,7 @@ package org.springframework.aop.framework;
  * intention of reducing the surface area of java files within this
  * package.  This allows developers to think about tests first, and deal
  * with these second class testing artifacts on an as-needed basis.
- * 
+ *
  * Types here should be defined as package-private top level classes in
  * order to avoid needing to fully qualify, e.g.: _TestTypes$Foo.
  *
@@ -26,7 +26,7 @@ interface IEcho {
 
 class Echo implements IEcho {
 	private int a;
-	
+
 	public int echoException(int i, Throwable t) throws Throwable {
 		if (t != null)
 			throw t;
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
index 675c2c79af..478a68aafd 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
@@ -40,7 +40,7 @@ import test.mixin.Lockable;
 
 /**
  * Tests for auto proxy creation by advisor recognition.
- * 
+ *
  * @see org.springframework.aop.framework.autoproxy.AdvisorAutoProxyCreatorIntegrationTests;
  *
  * @author Rod Johnson
@@ -51,7 +51,7 @@ public final class AdvisorAutoProxyCreatorTests {
 
 	private static final Class<?> CLASS = AdvisorAutoProxyCreatorTests.class;
 	private static final String CLASSNAME = CLASS.getSimpleName();
-	
+
 	private static final String DEFAULT_CONTEXT = CLASSNAME + "-context.xml";
 	private static final String COMMON_INTERCEPTORS_CONTEXT = CLASSNAME + "-common-interceptors.xml";
 	private static final String CUSTOM_TARGETSOURCE_CONTEXT = CLASSNAME + "-custom-targetsource.xml";
@@ -85,7 +85,7 @@ public final class AdvisorAutoProxyCreatorTests {
 
 		ITestBean test2 = (ITestBean) bf.getBean("test2");
 		Lockable lockable2 = (Lockable) test2;
-		
+
 		// Locking should be independent; nop is shared
 		assertFalse(lockable1.locked());
 		assertFalse(lockable2.locked());
@@ -151,7 +151,7 @@ public final class AdvisorAutoProxyCreatorTests {
 		assertEquals("Rod", test.getName());
 		// Check that references survived pooling
 		assertEquals("Kerry", test.getSpouse().getName());
-	
+
 		// Now test the pooled one
 		test = (ITestBean) bf.getBean(":test");
 		assertTrue(AopUtils.isAopProxy(test));
@@ -160,7 +160,7 @@ public final class AdvisorAutoProxyCreatorTests {
 		assertEquals("Rod", test.getName());
 		// Check that references survived pooling
 		assertEquals("Kerry", test.getSpouse().getName());
-		
+
 		// Now test the ThreadLocal one
 		test = (ITestBean) bf.getBean("%test");
 		assertTrue(AopUtils.isAopProxy(test));
@@ -169,7 +169,7 @@ public final class AdvisorAutoProxyCreatorTests {
 		assertEquals("Rod", test.getName());
 		// Check that references survived pooling
 		assertEquals("Kerry", test.getSpouse().getName());
-		
+
 		// Now test the Prototype TargetSource
 		test = (ITestBean) bf.getBean("!test");
 		assertTrue(AopUtils.isAopProxy(test));
@@ -186,7 +186,7 @@ public final class AdvisorAutoProxyCreatorTests {
 		assertEquals("Kerry", test2.getSpouse().getName());
 		bf.close();
 	}
-	
+
 	@Test
 	public void testWithOptimizedProxy() throws Exception {
 		BeanFactory beanFactory = new ClassPathXmlApplicationContext(OPTIMIZED_CONTEXT, CLASS);
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
index 93a4b20b32..0b8f9a15cd 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
@@ -85,7 +85,7 @@ public class BeanNameAutoProxyCreatorTests {
 		assertEquals(age, tb.getAge());
 		assertTrue("Introduction was made", tb instanceof TimeStamped);
 		assertEquals(0, ((TimeStamped) tb).getTimeStamp());
-		assertEquals(3, nop.getCount());		
+		assertEquals(3, nop.getCount());
 		assertEquals("introductionUsingJdk", tb.getName());
 
 		ITestBean tb2 = (ITestBean) beanFactory.getBean("second-introductionUsingJdk");
@@ -124,10 +124,10 @@ public class BeanNameAutoProxyCreatorTests {
 		assertEquals(age, tb.getAge());
 		assertTrue("Introduction was made", tb instanceof TimeStamped);
 		assertEquals(0, ((TimeStamped) tb).getTimeStamp());
-		assertEquals(3, nop.getCount());		
-	
+		assertEquals(3, nop.getCount());
+
 		ITestBean tb2 = (ITestBean) beanFactory.getBean("second-introductionUsingJdk");
-			
+
 		// Check two per-instance mixins were distinct
 		Lockable lockable1 = (Lockable) tb;
 		Lockable lockable2 = (Lockable) tb2;
@@ -194,7 +194,7 @@ public class BeanNameAutoProxyCreatorTests {
 		tb.setAge(age);
 		assertEquals(age, tb.getAge());
 		assertEquals(2, nop.getCount());
-		assertEquals(2, cba.getCalls());		
+		assertEquals(2, cba.getCalls());
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
index 8c3cfa094b..6448a2d82b 100644
--- a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
@@ -39,10 +39,10 @@ import org.springframework.util.SerializationTestUtils;
  * @author Chris Beams
  */
 public class ScopedProxyTests {
-	
+
 	private static final Class<?> CLASS = ScopedProxyTests.class;
 	private static final String CLASSNAME = CLASS.getSimpleName();
-	
+
 	private static final ClassPathResource LIST_CONTEXT = new ClassPathResource(CLASSNAME + "-list.xml", CLASS);
 	private static final ClassPathResource MAP_CONTEXT = new ClassPathResource(CLASSNAME + "-map.xml", CLASS);
 	private static final ClassPathResource OVERRIDE_CONTEXT = new ClassPathResource(CLASSNAME + "-override.xml", CLASS);
diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
index 1cada3e6d8..cf6e0789b6 100644
--- a/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java
index 7d87547b5f..c5c4ed5e67 100644
--- a/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/IOther.java b/spring-context/src/test/java/org/springframework/beans/IOther.java
index 797486ec44..6a8f74187c 100644
--- a/spring-context/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-context/src/test/java/org/springframework/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
index a06e15d150..0eb8df5c8a 100644
--- a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/Person.java b/spring-context/src/test/java/org/springframework/beans/Person.java
index 3ebce5e2ea..a78998ad5d 100644
--- a/spring-context/src/test/java/org/springframework/beans/Person.java
+++ b/spring-context/src/test/java/org/springframework/beans/Person.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
index 36351352aa..34d05120aa 100644
--- a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
+++ b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
index 020e683d7d..c5ee4d060b 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
@@ -33,7 +33,7 @@ import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
  */
 public class DummyFactory
 		implements FactoryBean, BeanNameAware, BeanFactoryAware, InitializingBean, DisposableBean {
-	
+
 	public static final String SINGLETON_NAME = "Factory singleton";
 
 	private static boolean prototypeCreated;
@@ -125,7 +125,7 @@ public class DummyFactory
 		}
 		this.initialized = true;
 	}
-	
+
 	/**
 	 * Was this initialized by invocation of the
 	 * afterPropertiesSet() method from the InitializingBean interface?
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java b/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java
index 3bac49498b..361746b32a 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -27,17 +27,17 @@ import java.util.Set;
  * @since 05.06.2003
  */
 public class HasMap {
-	
+
 	private Map map;
 
 	private Set set;
 
 	private Properties props;
-	
+
 	private Object[] objectArray;
-	
+
 	private Class[] classArray;
-	
+
 	private Integer[] intArray;
 
 	private HasMap() {
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
index 1dedf6624c..1dcc1aaf72 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -23,15 +23,15 @@ package org.springframework.beans.factory;
  */
 public class MustBeInitialized implements InitializingBean {
 
-	private boolean inited; 
-	
+	private boolean inited;
+
 	/**
 	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
 	 */
 	public void afterPropertiesSet() throws Exception {
 		this.inited = true;
 	}
-	
+
 	/**
 	 * Dummy business method that will fail unless the factory
 	 * managed the bean's lifecycle correctly
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
index 9bdca2165c..0e8a09a5a7 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
@@ -32,7 +32,7 @@ public class SingletonBeanFactoryLocatorTests {
 	public void testBasicFunctionality() {
 		SingletonBeanFactoryLocator facLoc = new SingletonBeanFactoryLocator(
 				"classpath*:" + ClassUtils.addResourcePathToPackagePath(getClass(), "ref1.xml"));
-		
+
 		basicFunctionalityTest(facLoc);
 	}
 
@@ -75,7 +75,7 @@ public class SingletonBeanFactoryLocatorTests {
 		BeanFactoryLocator facLoc = SingletonBeanFactoryLocator.getInstance(
 				ClassUtils.addResourcePathToPackagePath(getClass(), "ref1.xml"));
 		getInstanceTest1(facLoc);
-		
+
 		facLoc = SingletonBeanFactoryLocator.getInstance(
 				"classpath*:/" + ClassUtils.addResourcePathToPackagePath(getClass(), "ref1.xml"));
 		getInstanceTest2(facLoc);
@@ -84,7 +84,7 @@ public class SingletonBeanFactoryLocatorTests {
 		facLoc = SingletonBeanFactoryLocator.getInstance(
 				"classpath:" + ClassUtils.addResourcePathToPackagePath(getClass(), "ref1.xml"));
 		getInstanceTest3(facLoc);
-		
+
 	}
 
 	/**
@@ -103,12 +103,12 @@ public class SingletonBeanFactoryLocatorTests {
 		fac = bfr3.getFactory();
 		tb = (TestBean) fac.getBean("beans1.bean1");
 		assertTrue(tb.getName().equals("was beans1.bean1"));
-		
+
 		BeanFactoryReference bfr4 = facLoc.useBeanFactory("a.qualified.name.which.is.an.alias");
 		fac = bfr4.getFactory();
 		tb = (TestBean) fac.getBean("beans1.bean1");
 		assertTrue(tb.getName().equals("was beans1.bean1"));
-		
+
 		bfr.release();
 		bfr3.release();
 		bfr2.release();
@@ -146,7 +146,7 @@ public class SingletonBeanFactoryLocatorTests {
 		bfr4.release();
 		bfr3.release();
 	}
-	
+
 	/**
 	 * Worker method so subclass can use it too
 	 */
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java b/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
index eaf1d5ec0b..3a77af2f71 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * Scrap bean for use in tests.
- * 
+ *
  * @author Colin Sampaleanu
  */
 public class TestBean {
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 92921dbfb1..4a32d4582c 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
@@ -43,7 +43,7 @@ import org.springframework.context.support.GenericApplicationContext;
  * @since 3.0
  */
 public class InjectAnnotationAutowireContextTests {
-	
+
 	private static final String JUERGEN = "juergen";
 
 	private static final String MARK = "mark";
@@ -56,7 +56,7 @@ public class InjectAnnotationAutowireContextTests {
 		cavs.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
 		context.registerBeanDefinition(JUERGEN, person);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -76,7 +76,7 @@ public class InjectAnnotationAutowireContextTests {
 		cavs.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
 		context.registerBeanDefinition(JUERGEN, person);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedMethodParameterTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -96,7 +96,7 @@ public class InjectAnnotationAutowireContextTests {
 		cavs.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
 		context.registerBeanDefinition(JUERGEN, person);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -132,11 +132,11 @@ public class InjectAnnotationAutowireContextTests {
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
 		person.addQualifier(new AutowireCandidateQualifier(TestQualifier.class));
 		context.registerBeanDefinition(JUERGEN, person);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedMethodParameterTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedMethodParameterTestBean bean = 
+		QualifiedMethodParameterTestBean bean =
 				(QualifiedMethodParameterTestBean) context.getBean("autowired");
 		assertEquals(JUERGEN, bean.getPerson().getName());
 	}
@@ -186,11 +186,11 @@ public class InjectAnnotationAutowireContextTests {
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
 		person.addQualifier(new AutowireCandidateQualifier(TestQualifier.class));
 		context.registerBeanDefinition(JUERGEN, person);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedConstructorArgumentTestBean bean = 
+		QualifiedConstructorArgumentTestBean bean =
 				(QualifiedConstructorArgumentTestBean) context.getBean("autowired");
 		assertEquals(JUERGEN, bean.getPerson().getName());
 	}
@@ -206,7 +206,7 @@ public class InjectAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -230,7 +230,7 @@ public class InjectAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedMethodParameterTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -254,7 +254,7 @@ public class InjectAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -279,7 +279,7 @@ public class InjectAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
@@ -299,11 +299,11 @@ public class InjectAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedMethodParameterTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedMethodParameterTestBean bean = 
+		QualifiedMethodParameterTestBean bean =
 				(QualifiedMethodParameterTestBean) context.getBean("autowired");
 		assertEquals(JUERGEN, bean.getPerson().getName());
 	}
@@ -320,11 +320,11 @@ public class InjectAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedConstructorArgumentTestBean bean = 
+		QualifiedConstructorArgumentTestBean bean =
 				(QualifiedConstructorArgumentTestBean) context.getBean("autowired");
 		assertEquals(JUERGEN, bean.getPerson().getName());
 	}
@@ -342,11 +342,11 @@ public class InjectAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithDefaultValueTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedFieldWithDefaultValueTestBean bean = 
+		QualifiedFieldWithDefaultValueTestBean bean =
 				(QualifiedFieldWithDefaultValueTestBean) context.getBean("autowired");
 		assertEquals(JUERGEN, bean.getPerson().getName());
 	}
@@ -364,7 +364,7 @@ public class InjectAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithDefaultValueTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -390,11 +390,11 @@ public class InjectAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithDefaultValueTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedFieldWithDefaultValueTestBean bean = 
+		QualifiedFieldWithDefaultValueTestBean bean =
 				(QualifiedFieldWithDefaultValueTestBean) context.getBean("autowired");
 		assertEquals(JUERGEN, bean.getPerson().getName());
 	}
@@ -416,11 +416,11 @@ public class InjectAnnotationAutowireContextTests {
 		person2.addQualifier(qualifier2);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithMultipleAttributesTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedFieldWithMultipleAttributesTestBean bean = 
+		QualifiedFieldWithMultipleAttributesTestBean bean =
 				(QualifiedFieldWithMultipleAttributesTestBean) context.getBean("autowired");
 		assertEquals(MARK, bean.getPerson().getName());
 	}
@@ -443,7 +443,7 @@ public class InjectAnnotationAutowireContextTests {
 		person2.addQualifier(qualifier2);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithMultipleAttributesTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -474,11 +474,11 @@ public class InjectAnnotationAutowireContextTests {
 		person2.addQualifier(qualifier2);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithMultipleAttributesTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedFieldWithMultipleAttributesTestBean bean = 
+		QualifiedFieldWithMultipleAttributesTestBean bean =
 				(QualifiedFieldWithMultipleAttributesTestBean) context.getBean("autowired");
 		assertEquals(MARK, bean.getPerson().getName());
 	}
@@ -501,7 +501,7 @@ public class InjectAnnotationAutowireContextTests {
 		person2.addQualifier(qualifier2);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithMultipleAttributesTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -527,7 +527,7 @@ public class InjectAnnotationAutowireContextTests {
 		person2.addQualifier(new AutowireCandidateQualifier(Qualifier.class, "juergen"));
 		context.registerBeanDefinition("juergen1", person1);
 		context.registerBeanDefinition("juergen2", person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentWithBaseQualifierNonDefaultValueTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -546,7 +546,7 @@ public class InjectAnnotationAutowireContextTests {
 		@Inject
 		@TestQualifier
 		private Person person;
-		
+
 		public Person getPerson() {
 			return this.person;
 		}
@@ -556,7 +556,7 @@ public class InjectAnnotationAutowireContextTests {
 	private static class QualifiedMethodParameterTestBean {
 
 		private Person person;
-		
+
 		@Inject
 		public void setPerson(@TestQualifier Person person) {
 			this.person = person;
@@ -566,17 +566,17 @@ public class InjectAnnotationAutowireContextTests {
 			return this.person;
 		}
 	}
-	
-	
+
+
 	private static class QualifiedConstructorArgumentTestBean {
 
 		private Person person;
-		
+
 		@Inject
 		public QualifiedConstructorArgumentTestBean(@TestQualifier Person person) {
 			this.person = person;
 		}
-		
+
 		public Person getPerson() {
 			return this.person;
 		}
@@ -589,7 +589,7 @@ public class InjectAnnotationAutowireContextTests {
 		@Inject
 		@TestQualifierWithDefaultValue
 		private Person person;
-		
+
 		public Person getPerson() {
 			return this.person;
 		}
@@ -601,7 +601,7 @@ public class InjectAnnotationAutowireContextTests {
 		@Inject
 		@TestQualifierWithMultipleAttributes(number=123)
 		private Person person;
-		
+
 		public Person getPerson() {
 			return this.person;
 		}
@@ -612,7 +612,7 @@ public class InjectAnnotationAutowireContextTests {
 
 		@Inject
 		private Person person;
-		
+
 		public Person getPerson() {
 			return this.person;
 		}
@@ -628,7 +628,7 @@ public class InjectAnnotationAutowireContextTests {
 				@Named("juergen") Person person) {
 			this.person = person;
 		}
-		
+
 		public Person getPerson() {
 			return this.person;
 		}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireContextTests.java b/spring-context/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireContextTests.java
index e5c14903e2..b86f148037 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireContextTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireContextTests.java
@@ -38,13 +38,13 @@ import static org.junit.Assert.*;
 
 /**
  * Integration tests for handling {@link Qualifier} annotations.
- * 
+ *
  * @author Mark Fisher
  * @author Juergen Hoeller
  * @author Chris Beams
  */
 public class QualifierAnnotationAutowireContextTests {
-	
+
 	private static final String JUERGEN = "juergen";
 
 	private static final String MARK = "mark";
@@ -57,7 +57,7 @@ public class QualifierAnnotationAutowireContextTests {
 		cavs.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
 		context.registerBeanDefinition(JUERGEN, person);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -77,7 +77,7 @@ public class QualifierAnnotationAutowireContextTests {
 		cavs.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
 		context.registerBeanDefinition(JUERGEN, person);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedMethodParameterTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -97,7 +97,7 @@ public class QualifierAnnotationAutowireContextTests {
 		cavs.addGenericArgumentValue(JUERGEN);
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
 		context.registerBeanDefinition(JUERGEN, person);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -133,11 +133,11 @@ public class QualifierAnnotationAutowireContextTests {
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
 		person.addQualifier(new AutowireCandidateQualifier(TestQualifier.class));
 		context.registerBeanDefinition(JUERGEN, person);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedMethodParameterTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedMethodParameterTestBean bean = 
+		QualifiedMethodParameterTestBean bean =
 				(QualifiedMethodParameterTestBean) context.getBean("autowired");
 		assertEquals(JUERGEN, bean.getPerson().getName());
 	}
@@ -187,11 +187,11 @@ public class QualifierAnnotationAutowireContextTests {
 		RootBeanDefinition person = new RootBeanDefinition(Person.class, cavs, null);
 		person.addQualifier(new AutowireCandidateQualifier(TestQualifier.class));
 		context.registerBeanDefinition(JUERGEN, person);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedConstructorArgumentTestBean bean = 
+		QualifiedConstructorArgumentTestBean bean =
 				(QualifiedConstructorArgumentTestBean) context.getBean("autowired");
 		assertEquals(JUERGEN, bean.getPerson().getName());
 	}
@@ -207,7 +207,7 @@ public class QualifierAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -231,7 +231,7 @@ public class QualifierAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedMethodParameterTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -255,7 +255,7 @@ public class QualifierAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -320,11 +320,11 @@ public class QualifierAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedMethodParameterTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedMethodParameterTestBean bean = 
+		QualifiedMethodParameterTestBean bean =
 				(QualifiedMethodParameterTestBean) context.getBean("autowired");
 		assertEquals(JUERGEN, bean.getPerson().getName());
 	}
@@ -341,11 +341,11 @@ public class QualifierAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedConstructorArgumentTestBean bean = 
+		QualifiedConstructorArgumentTestBean bean =
 				(QualifiedConstructorArgumentTestBean) context.getBean("autowired");
 		assertEquals(JUERGEN, bean.getPerson().getName());
 	}
@@ -363,11 +363,11 @@ public class QualifierAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithDefaultValueTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedFieldWithDefaultValueTestBean bean = 
+		QualifiedFieldWithDefaultValueTestBean bean =
 				(QualifiedFieldWithDefaultValueTestBean) context.getBean("autowired");
 		assertEquals(JUERGEN, bean.getPerson().getName());
 	}
@@ -385,7 +385,7 @@ public class QualifierAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithDefaultValueTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -411,11 +411,11 @@ public class QualifierAnnotationAutowireContextTests {
 		RootBeanDefinition person2 = new RootBeanDefinition(Person.class, cavs2, null);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithDefaultValueTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedFieldWithDefaultValueTestBean bean = 
+		QualifiedFieldWithDefaultValueTestBean bean =
 				(QualifiedFieldWithDefaultValueTestBean) context.getBean("autowired");
 		assertEquals(JUERGEN, bean.getPerson().getName());
 	}
@@ -437,11 +437,11 @@ public class QualifierAnnotationAutowireContextTests {
 		person2.addQualifier(qualifier2);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithMultipleAttributesTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedFieldWithMultipleAttributesTestBean bean = 
+		QualifiedFieldWithMultipleAttributesTestBean bean =
 				(QualifiedFieldWithMultipleAttributesTestBean) context.getBean("autowired");
 		assertEquals(MARK, bean.getPerson().getName());
 	}
@@ -464,7 +464,7 @@ public class QualifierAnnotationAutowireContextTests {
 		person2.addQualifier(qualifier2);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithMultipleAttributesTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -495,11 +495,11 @@ public class QualifierAnnotationAutowireContextTests {
 		person2.addQualifier(qualifier2);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithMultipleAttributesTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedFieldWithMultipleAttributesTestBean bean = 
+		QualifiedFieldWithMultipleAttributesTestBean bean =
 				(QualifiedFieldWithMultipleAttributesTestBean) context.getBean("autowired");
 		assertEquals(MARK, bean.getPerson().getName());
 	}
@@ -522,7 +522,7 @@ public class QualifierAnnotationAutowireContextTests {
 		person2.addQualifier(qualifier2);
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithMultipleAttributesTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -547,11 +547,11 @@ public class QualifierAnnotationAutowireContextTests {
 		person2.addQualifier(new AutowireCandidateQualifier(Qualifier.class));
 		context.registerBeanDefinition(JUERGEN, person1);
 		context.registerBeanDefinition(MARK, person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedFieldWithBaseQualifierDefaultValueTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedFieldWithBaseQualifierDefaultValueTestBean bean = 
+		QualifiedFieldWithBaseQualifierDefaultValueTestBean bean =
 				(QualifiedFieldWithBaseQualifierDefaultValueTestBean) context.getBean("autowired");
 		assertEquals(MARK, bean.getPerson().getName());
 	}
@@ -569,11 +569,11 @@ public class QualifierAnnotationAutowireContextTests {
 		person2.addQualifier(new AutowireCandidateQualifier(Qualifier.class, "not really juergen"));
 		context.registerBeanDefinition("juergen1", person1);
 		context.registerBeanDefinition("juergen2", person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentWithBaseQualifierNonDefaultValueTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		context.refresh();
-		QualifiedConstructorArgumentWithBaseQualifierNonDefaultValueTestBean bean = 
+		QualifiedConstructorArgumentWithBaseQualifierNonDefaultValueTestBean bean =
 				(QualifiedConstructorArgumentWithBaseQualifierNonDefaultValueTestBean) context.getBean("autowired");
 		assertEquals("the real juergen", bean.getPerson().getName());
 	}
@@ -591,7 +591,7 @@ public class QualifierAnnotationAutowireContextTests {
 		person2.addQualifier(new AutowireCandidateQualifier(Qualifier.class, "juergen"));
 		context.registerBeanDefinition("juergen1", person1);
 		context.registerBeanDefinition("juergen2", person2);
-		context.registerBeanDefinition("autowired", 
+		context.registerBeanDefinition("autowired",
 				new RootBeanDefinition(QualifiedConstructorArgumentWithBaseQualifierNonDefaultValueTestBean.class));
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		try {
@@ -610,7 +610,7 @@ public class QualifierAnnotationAutowireContextTests {
 		@Autowired
 		@TestQualifier
 		private Person person;
-		
+
 		public Person getPerson() {
 			return this.person;
 		}
@@ -638,7 +638,7 @@ public class QualifierAnnotationAutowireContextTests {
 	private static class QualifiedMethodParameterTestBean {
 
 		private Person person;
-		
+
 		@Autowired
 		public void setPerson(@TestQualifier Person person) {
 			this.person = person;
@@ -648,17 +648,17 @@ public class QualifierAnnotationAutowireContextTests {
 			return this.person;
 		}
 	}
-	
-	
+
+
 	private static class QualifiedConstructorArgumentTestBean {
 
 		private Person person;
-		
+
 		@Autowired
 		public QualifiedConstructorArgumentTestBean(@TestQualifier Person person) {
 			this.person = person;
 		}
-		
+
 		public Person getPerson() {
 			return this.person;
 		}
@@ -671,7 +671,7 @@ public class QualifierAnnotationAutowireContextTests {
 		@Autowired
 		@TestQualifierWithDefaultValue
 		private Person person;
-		
+
 		public Person getPerson() {
 			return this.person;
 		}
@@ -683,7 +683,7 @@ public class QualifierAnnotationAutowireContextTests {
 		@Autowired
 		@TestQualifierWithMultipleAttributes(number=123)
 		private Person person;
-		
+
 		public Person getPerson() {
 			return this.person;
 		}
@@ -695,7 +695,7 @@ public class QualifierAnnotationAutowireContextTests {
 		@Autowired
 		@Qualifier
 		private Person person;
-		
+
 		public Person getPerson() {
 			return this.person;
 		}
@@ -711,7 +711,7 @@ public class QualifierAnnotationAutowireContextTests {
 				@Qualifier("juergen") Person person) {
 			this.person = person;
 		}
-		
+
 		public Person getPerson() {
 			return this.person;
 		}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
index ff45fc5700..f17b3dfc89 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -22,7 +22,7 @@ import org.springframework.beans.factory.BeanFactoryAware;
 
 /**
  * Simple bean used to test dependency checking.
- * 
+ *
  * Note: would be defined within {@link XmlBeanFactoryTestTypes}, but must be a public type
  * in order to satisfy test dependencies.
  *
@@ -31,11 +31,11 @@ import org.springframework.beans.factory.BeanFactoryAware;
  * @since 04.09.2003
  */
 public final class DependenciesBean implements BeanFactoryAware {
-	
+
 	private int age;
-	
+
 	private String name;
-	
+
 	private TestBean spouse;
 
 	private BeanFactory beanFactory;
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java
index ceb416775f..96adebee0f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java
@@ -33,10 +33,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  * @author Chris Beams
  */
 public final class LookupMethodWrappedByCglibProxyTests {
-	
+
 	private static final Class<?> CLASS = LookupMethodWrappedByCglibProxyTests.class;
 	private static final String CLASSNAME = CLASS.getSimpleName();
-	
+
 	private static final String CONTEXT = CLASSNAME + "-context.xml";
 
 	private ApplicationContext applicationContext;
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java
index 587b492fd2..09bd64d34d 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java
@@ -120,7 +120,7 @@ public final class QualifierAnnotationTests {
 		context.refresh();
 		QualifiedByAliasTestBean testBean = (QualifiedByAliasTestBean) context.getBean("testBean");
 		Person person = testBean.getStooge();
-		assertEquals("LarryBean", person.getName());		
+		assertEquals("LarryBean", person.getName());
 	}
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
index f4ee8ec405..d236686275 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
@@ -63,18 +63,18 @@ import org.springframework.core.io.Resource;
 
 /**
  * Unit tests for custom XML namespace handler implementations.
- * 
+ *
  * @author Rob Harrop
  * @author Rick Evans
  * @author Chris Beams
  * @author Juergen Hoeller
  */
 public class CustomNamespaceHandlerTests {
-	
+
 	private static final Class<?> CLASS = CustomNamespaceHandlerTests.class;
 	private static final String CLASSNAME = CLASS.getSimpleName();
 	private static final String FQ_PATH = "org/springframework/beans/factory/xml/support";
-	
+
 	private static final String NS_PROPS = format("%s/%s.properties", FQ_PATH, CLASSNAME);
 	private static final String NS_XML = format("%s/%s-context.xml", FQ_PATH, CLASSNAME);
 	private static final String TEST_XSD = format("%s/%s.xsd", FQ_PATH, CLASSNAME);
@@ -211,7 +211,7 @@ public class CustomNamespaceHandlerTests {
 
 /**
  * Custom namespace handler implementation.
- * 
+ *
  * @author Rob Harrop
  */
 final class TestNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/spring-context/src/test/java/org/springframework/cache/config/CacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/CacheableService.java
index 870bdde66b..09e2fc4c4b 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/CacheableService.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/CacheableService.java
@@ -18,7 +18,7 @@ package org.springframework.cache.config;
 
 /**
  * Basic service interface.
- * 
+ *
  * @author Costin Leau
  */
 public interface CacheableService<T> {
@@ -59,11 +59,11 @@ public interface CacheableService<T> {
 
 	// multi annotations
 	T multiCache(Object arg1);
-	
+
 	T multiEvict(Object arg1);
 
 	T multiCacheAndEvict(Object arg1);
-	
+
 	T multiConditionalCacheAndEvict(Object arg1);
 
 	T multiUpdate(Object arg1);
diff --git a/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
index fc754b6c3d..fc46127cd4 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
@@ -25,7 +25,7 @@ import org.springframework.cache.annotation.Caching;
 
 /**
  * Simple cacheable service
- * 
+ *
  * @author Costin Leau
  */
 public class DefaultCacheableService implements CacheableService<Long> {
diff --git a/spring-context/src/test/java/org/springframework/context/ACATester.java b/spring-context/src/test/java/org/springframework/context/ACATester.java
index 1bda64a785..3faf3ba364 100644
--- a/spring-context/src/test/java/org/springframework/context/ACATester.java
+++ b/spring-context/src/test/java/org/springframework/context/ACATester.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -19,7 +19,7 @@ package org.springframework.context;
 import java.util.Locale;
 
 public class ACATester implements ApplicationContextAware {
-	
+
 	private ApplicationContext ac;
 
 	public void setApplicationContext(ApplicationContext ctx) throws ApplicationContextException {
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 d014d770e1..619bfba6fb 100644
--- a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
index c3aba92b5f..720a7cd9b4 100644
--- a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -22,12 +22,12 @@ import org.springframework.beans.factory.LifecycleBean;
 
 /**
  * Simple bean to test ApplicationContext lifecycle methods for beans
- * 
+ *
  * @author Colin Sampaleanu
  * @since 03.07.2004
  */
 public class LifecycleContextBean extends LifecycleBean implements ApplicationContextAware {
-	
+
 	protected ApplicationContext owningContext;
 
 	public void setBeanFactory(BeanFactory beanFactory) {
@@ -35,18 +35,18 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo
 		if (this.owningContext != null)
 			throw new RuntimeException("Factory called setBeanFactory after setApplicationContext");
 	}
-	
+
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
 		if (this.owningContext == null)
 			throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean");
 	}
-	
+
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		if (this.owningFactory == null)
 			throw new RuntimeException("Factory called setApplicationContext before setBeanFactory");
-			
+
 		this.owningContext = applicationContext;
 	}
-	
+
 }
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java
index ca79f530b3..c93760bf67 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -24,12 +24,12 @@ import org.springframework.context.ConfigurableApplicationContext;
 
 /**
  * Unit test for {@link ContextBeanFactoryReference}
- * 
+ *
  * @author Colin Sampaleanu
  * @author Chris Beams
  */
 public class ContextBeanFactoryReferenceTests {
-	
+
 	@Test
 	public void testAllOperations() {
 		ConfigurableApplicationContext ctx = createMock(ConfigurableApplicationContext.class);
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
index 2f6728e96d..eb3bc80d39 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -35,15 +35,15 @@ import org.springframework.mock.jndi.SimpleNamingContextBuilder;
 public final class ContextJndiBeanFactoryLocatorTests extends TestCase {
 
 	private static final String BEAN_FACTORY_PATH_ENVIRONMENT_KEY = "java:comp/env/ejb/BeanFactoryPath";
-	
+
 	private static final Class<?> CLASS = ContextJndiBeanFactoryLocatorTests.class;
 	private static final String CLASSNAME = CLASS.getSimpleName();
-	
+
 	private static final String FQ_PATH = "/org/springframework/context/access/";
-	
+
 	private static final String COLLECTIONS_CONTEXT = FQ_PATH + CLASSNAME + "-collections.xml";
 	private static final String PARENT_CONTEXT = FQ_PATH + CLASSNAME + "-parent.xml";
-	
+
 
 	public void testBeanFactoryPathRequiredFromJndiEnvironment() throws Exception {
 		// Set up initial context but don't bind anything
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
index 6d2b96e92b..96750057f5 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
@@ -34,10 +34,10 @@ import org.springframework.util.ClassUtils;
  * @author Chris Beams
  */
 public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactoryLocatorTests {
-	
+
 	private static final Class<?> CLASS = ContextSingletonBeanFactoryLocatorTests.class;
 	private static final String CONTEXT = CLASS.getSimpleName() + "-context.xml";
-	
+
 
 	@Test
 	public void testBaseBeanFactoryDefs() {
@@ -51,7 +51,7 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor
 	public void testBasicFunctionality() {
 		ContextSingletonBeanFactoryLocator facLoc = new ContextSingletonBeanFactoryLocator(
 				"classpath*:" + ClassUtils.addResourcePathToPackagePath(CLASS, CONTEXT));
-		
+
 		basicFunctionalityTest(facLoc);
 
 		BeanFactoryReference bfr = facLoc.useBeanFactory("a.qualified.name.of.some.sort");
@@ -77,7 +77,7 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor
 		BeanFactoryLocator facLoc = ContextSingletonBeanFactoryLocator.getInstance(
 				ClassUtils.addResourcePathToPackagePath(CLASS, CONTEXT));
 		getInstanceTest1(facLoc);
-		
+
 		facLoc = ContextSingletonBeanFactoryLocator.getInstance(
 				"classpath*:" + ClassUtils.addResourcePathToPackagePath(CLASS, CONTEXT));
 		getInstanceTest2(facLoc);
diff --git a/spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java b/spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java
index 6b5eafee15..eee36e9d9b 100644
--- a/spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
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 57d42c88c8..50ed95df10 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
@@ -29,7 +29,7 @@ import test.beans.TestBean;
 /**
  * TCK-style unit tests for handling circular use of the {@link Import} annotation. Explore
  * subclass hierarchy for specific concrete implementations.
- * 
+ *
  * @author Chris Beams
  */
 public abstract class AbstractCircularImportDetectionTests {
@@ -37,7 +37,7 @@ public abstract class AbstractCircularImportDetectionTests {
 	protected abstract ConfigurationClassParser newParser();
 
 	protected abstract String loadAsConfigurationSource(Class<?> clazz) throws Exception;
-	
+
 	@Test
 	public void simpleCircularImportIsDetected() throws Exception {
 		boolean threw = false;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
index fe528621aa..a829ee49f9 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
@@ -43,7 +43,7 @@ public class AnnotationConfigApplicationContextTests {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(Config.class);
 		context.getBean((Class<?>)null);
 	}
-	
+
 	@Test
 	public void scanAndRefresh() {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
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 36a9b1eed8..01e25e8030 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
@@ -24,11 +24,11 @@ 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.
- * 
+ *
  * <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
  */
 public class AsmCircularImportDetectionTests extends AbstractCircularImportDetectionTests {
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
index 36d950e110..1f81d31669 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
@@ -57,7 +57,7 @@ public class ClassPathFactoryBeanDefinitionScannerTests extends TestCase {
 		TestBean tb2 = (TestBean)context.getBean("publicInstance"); //2
 		assertEquals("publicInstance", tb2.getName());
 		assertSame(tb2, tb);
-		
+
 		tb = (TestBean)context.getBean("protectedInstance"); //3
 		assertEquals("protectedInstance", tb.getName());
 		assertSame(tb, context.getBean("protectedInstance"));
@@ -72,7 +72,7 @@ public class ClassPathFactoryBeanDefinitionScannerTests extends TestCase {
 		tb2 = context.getBean("privateInstance", TestBean.class); //4
 		assertEquals(2, tb2.getAge());
 		assertNotSame(tb2, tb);
-		
+
 		Object bean = context.getBean("requestScopedInstance"); //5
 		assertTrue(AopUtils.isCglibProxy(bean));
 		assertTrue(bean instanceof ScopedObject);
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java
index 4181cc2233..75bef42a0f 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java
@@ -124,7 +124,7 @@ public class ComponentScanParserTests {
 
 	@Target({ElementType.TYPE, ElementType.FIELD})
 	@Retention(RetentionPolicy.RUNTIME)
-	public static @interface CustomAnnotation {	
+	public static @interface CustomAnnotation {
 	}
 
 
@@ -141,7 +141,7 @@ public class ComponentScanParserTests {
 
 
 	@CustomAnnotation
-	public static class CustomAnnotationDependencyBean {	
+	public static class CustomAnnotationDependencyBean {
 	}
 
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java
index 1925dd4afc..c7237a2f6b 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java
@@ -68,5 +68,5 @@ public class ComponentScanParserWithUserDefinedStrategiesTests {
 			// expected
 		}
 	}
-	
+
 }
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
index fc186b8e43..c07ded4154 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
@@ -31,7 +31,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  * @author Juergen Hoeller
  */
 public class SimpleConfigTests {
-	
+
 	@Test
 	public void testFooService() throws Exception {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(getConfigLocations(), getClass());
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java
index d0bb3a8c59..d3a14c0ab3 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java
@@ -38,10 +38,10 @@ public class SimpleScanTests {
 	@Test
 	public void testFooService() throws Exception {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(getConfigLocations(), getClass());
-		
+
 		FooService fooService = (FooService) ctx.getBean("fooServiceImpl");
 		ServiceInvocationCounter serviceInvocationCounter = (ServiceInvocationCounter) ctx.getBean("serviceInvocationCounter");
-		
+
 		assertEquals(0, serviceInvocationCounter.getCount());
 
 		assertTrue(fooService.isInitCalled());
@@ -50,7 +50,7 @@ public class SimpleScanTests {
 		String value = fooService.foo(1);
 		assertEquals("bar", value);
 		assertEquals(2, serviceInvocationCounter.getCount());
-		
+
 		fooService.foo(1);
 		assertEquals(3, serviceInvocationCounter.getCount());
 	}
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 da56d717da..71f2f9e3d5 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
@@ -37,13 +37,13 @@ import org.springframework.core.io.ClassPathResource;
 /**
  * System tests covering use of {@link Autowired} and {@link Value} within
  * {@link Configuration} classes.
- * 
+ *
  * @author Chris Beams
  * @author Juergen Hoeller
  */
 public class AutowiredConfigurationTests {
 
-	@Test 
+	@Test
 	public void testAutowiredConfigurationDependencies() {
 		ClassPathXmlApplicationContext factory = new ClassPathXmlApplicationContext(
 		        AutowiredConfigurationTests.class.getSimpleName() + ".xml", AutowiredConfigurationTests.class);
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java
index 1eddf67a4f..da770cb924 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.DependsOn;
  * Unit tests proving that the various attributes available via the {@link Bean}
  * annotation are correctly reflected in the {@link BeanDefinition} created when
  * processing the {@link Configuration} class.
- * 
+ *
  * <p>Also includes tests proving that using {@link Lazy} and {@link Primary}
  * annotations in conjunction with Bean propagate their respective metadata
  * correctly into the resulting BeanDefinition
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 872cc9281a..5e6fc1b125 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
@@ -36,9 +36,9 @@ import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 /**
- * Tests proving that @Qualifier annotations work when used 
+ * Tests proving that @Qualifier annotations work when used
  * with @Configuration classes on @Bean methods.
- * 
+ *
  * @author Chris Beams
  * @author Juergen Hoeller
  */
@@ -69,7 +69,7 @@ public class BeanMethodQualificationTests {
 		public TestBean testBean1() {
 			return new TestBean("interesting");
 		}
-		
+
 		@Bean @Qualifier("boring")
 		public TestBean testBean2() {
 			return new TestBean("boring");
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
index 2b3924bb4f..c983ea4e3a 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
@@ -38,7 +38,7 @@ import test.beans.TestBean;
  * {@link Bean} methods may return aspects, or Configuration classes may themselves be annotated with Aspect.
  * In the latter case, advice methods are declared inline within the Configuration class.  This makes for a
  * particularly convenient syntax requiring no extra artifact for the aspect.
- * 
+ *
  * <p>Currently it is assumed that the user is bootstrapping Configuration class processing via XML (using
  * annotation-config or component-scan), and thus will also use {@code <aop:aspectj-autoproxy/>} to enable
  * processing of the Aspect annotation.
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 745cd792fb..9dc9e980d4 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
@@ -78,81 +78,81 @@ public class ImportResourceTests {
             return new TestBean("java.declared");
         }
     }
-    
+
     @Ignore // TODO: SPR-6310
     @Test
     public void testImportXmlByConvention() {
     	ApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlByConventionConfig.class);
     	assertTrue("context does not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean"));
     }
-    
+
     @Configuration
     //@ImportXml
     static class ImportXmlByConventionConfig {
     }
-    
+
     @Test
     public void testImportXmlIsInheritedFromSuperclassDeclarations() {
         AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(FirstLevelSubConfig.class);
         assertTrue(ctx.containsBean("xmlDeclaredBean"));
     }
-    
+
     @Test
     public void testImportXmlIsMergedFromSuperclassDeclarations() {
         AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SecondLevelSubConfig.class);
         assertTrue("failed to pick up second-level-declared XML bean", ctx.containsBean("secondLevelXmlDeclaredBean"));
         assertTrue("failed to pick up parent-declared XML bean", ctx.containsBean("xmlDeclaredBean"));
     }
-    
+
     @Configuration
     @ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml")
     static class BaseConfig {
     }
-    
+
     @Configuration
     static class FirstLevelSubConfig extends BaseConfig {
     }
-    
+
     @Configuration
     @ImportResource("classpath:org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml")
     static class SecondLevelSubConfig extends BaseConfig {
     }
-    
+
     @Test
     public void testImportXmlWithNamespaceConfig() {
     	AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlWithAopNamespaceConfig.class);
     	Object bean = ctx.getBean("proxiedXmlBean");
     	assertTrue(AopUtils.isAopProxy(bean));
     }
-    
+
     @Configuration
     @ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml")
     static class ImportXmlWithAopNamespaceConfig {
     }
-    
+
     @Aspect
     static class AnAspect {
     	@Before("execution(* test.beans.TestBean.*(..))")
     	public void advice() { }
     }
-    
+
     @Test
     public void testImportXmlWithAutowiredConfig() {
         AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlAutowiredConfig.class);
         String name = ctx.getBean("xmlBeanName", String.class);
         assertThat(name, equalTo("xml.declared"));
     }
-    
+
     @Configuration
     @ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml")
     static class ImportXmlAutowiredConfig {
         @Autowired TestBean xmlDeclaredBean;
-        
+
         public @Bean String xmlBeanName() {
             return xmlDeclaredBean.getName();
         }
     }
-    
+
     @Test
     public void testImportNonXmlResource() {
         AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportNonXmlResourceConfig.class);
@@ -164,7 +164,7 @@ public class ImportResourceTests {
     		reader=PropertiesBeanDefinitionReader.class)
     static class ImportNonXmlResourceConfig {
     }
-    
+
     @Ignore // TODO: SPR-6327
     @Test
     public void testImportDifferentResourceTypes() {
@@ -172,7 +172,7 @@ public class ImportResourceTests {
         assertTrue(ctx.containsBean("propertiesDeclaredBean"));
         assertTrue(ctx.containsBean("xmlDeclaredBean"));
     }
-    
+
     @Configuration
     @ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml",
     		reader=XmlBeanDefinitionReader.class)
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
index 1866ea8040..c27d84c131 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Import;
 
 /**
  * System tests for {@link Import} annotation support.
- * 
+ *
  * @author Chris Beams
  */
 public class ImportTests {
@@ -125,7 +125,7 @@ public class ImportTests {
 	@Configuration
 	@Import(DataSourceConfig.class)
 	static class AppConfig {
-		
+
 		@Bean
 		public ITestBean transferService() {
 			return new TestBean(accountRepository());
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 208516f99b..2d4783496a 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
@@ -39,7 +39,7 @@ import test.beans.TestBean;
  */
 public class ImportedConfigurationClassEnhancementTests {
 
-	
+
 	@Test
 	public void autowiredConfigClassIsEnhancedWhenImported() {
 		autowiredConfigClassIsEnhanced(ConfigThatDoesImport.class);
@@ -49,25 +49,25 @@ public class ImportedConfigurationClassEnhancementTests {
 	public void autowiredConfigClassIsEnhancedWhenRegisteredViaConstructor() {
 		autowiredConfigClassIsEnhanced(ConfigThatDoesNotImport.class, ConfigToBeAutowired.class);
 	}
-	
+
 	private void autowiredConfigClassIsEnhanced(Class<?>... configClasses) {
 		ApplicationContext ctx = new AnnotationConfigApplicationContext(configClasses);
 		Config config = ctx.getBean(Config.class);
 		assertTrue("autowired config class has not been enhanced",
 				ClassUtils.isCglibProxy(config.autowiredConfig));
 	}
-	
-	
+
+
 	@Test
 	public void autowiredConfigClassBeanMethodsRespectScopingWhenImported() {
 		autowiredConfigClassBeanMethodsRespectScoping(ConfigThatDoesImport.class);
 	}
-	
+
 	@Test
 	public void autowiredConfigClassBeanMethodsRespectScopingWhenRegisteredViaConstructor() {
 		autowiredConfigClassBeanMethodsRespectScoping(ConfigThatDoesNotImport.class, ConfigToBeAutowired.class);
 	}
-	
+
 	private void autowiredConfigClassBeanMethodsRespectScoping(Class<?>... configClasses) {
 		ApplicationContext ctx = new AnnotationConfigApplicationContext(configClasses);
 		Config config = ctx.getBean(Config.class);
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
index c0d1415636..b0d617e9cf 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
@@ -196,7 +196,7 @@ public class ScopingTests {
 		// 6 @Beans + 1 Configuration + 2 scoped proxy + 1 importRegistry
 		assertEquals(10, ctx.getBeanDefinitionCount());
 	}
-	
+
 //	/**
 //	 * SJC-254 caught a regression in handling scoped proxies starting in 1.0 m4.
 //	 * The ScopedProxyFactoryBean object was having its scope set to that of its delegate
@@ -207,10 +207,10 @@ public class ScopingTests {
 //		JavaConfigWebApplicationContext ctx = new JavaConfigWebApplicationContext();
 //		ctx.setConfigLocations(new String[] { ScopeTestConfiguration.class.getName() });
 //		ctx.refresh();
-//		
+//
 //		// should be fine
 //		ctx.getBean(Bar.class);
-//		
+//
 //		boolean threw = false;
 //		try {
 //			ctx.getBean(Foo.class);
@@ -221,7 +221,7 @@ public class ScopingTests {
 //		}
 //		assertTrue(threw);
 //	}
-	
+
 	@Configuration
 	static class ScopeTestConfiguration {
 
@@ -236,30 +236,30 @@ public class ScopingTests {
 			return new Bar(foo());
 		}
 	}
-	
+
 	static class Foo {
 		public Foo() {
 			//System.out.println("created foo: " + this.getClass().getName());
 		}
-		
+
 		public void doSomething() {
 			//System.out.println("interesting: " + this);
 		}
 	}
-	
+
 	static class Bar {
-	
+
 		private final Foo foo;
-	
+
 		public Bar(Foo foo) {
 			this.foo = foo;
 			//System.out.println("created bar: " + this);
 		}
-	
+
 		public Foo getFoo() {
 			return foo;
 		}
-		
+
 	}
 
 	private void genericTestScope(String beanName) throws Exception {
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java
index c37c22106c..be87313477 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java
@@ -53,5 +53,5 @@ class WithNestedAnnotation {
 	@Retention(RetentionPolicy.RUNTIME)
 	@Component
 	public static @interface MyComponent {
-	} 
+	}
 }
diff --git a/spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java b/spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java
index b89f6274ad..8094915700 100644
--- a/spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java
+++ b/spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java
@@ -20,13 +20,13 @@ package org.springframework.context.conversionservice;
  * @author Keith Donald
  */
 public class Bar {
-	
+
 	private String value;
-	
+
 	public Bar(String value) {
 		this.value = value;
 	}
-	
+
 	public String getValue() {
 		return value;
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java b/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java
index 60dd150dcb..c319cde520 100644
--- a/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java
+++ b/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java
@@ -25,7 +25,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  * @author Keith Donald
  */
 public class ConversionServiceContextConfigTests {
-	
+
 	@Test
 	public void testConfigOk() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/springframework/context/conversionservice/conversionService.xml");
diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
index eeeee80b1e..2d8d8f4bd0 100644
--- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
@@ -39,7 +39,7 @@ import org.springframework.context.support.StaticApplicationContext;
  * @author Rick Evans
  */
 public class EventPublicationInterceptorTests {
-	
+
 	private ApplicationEventPublisher publisher;
 
 
@@ -48,7 +48,7 @@ public class EventPublicationInterceptorTests {
 		publisher = createMock(ApplicationEventPublisher.class);
 		replay(publisher);
 	}
-	
+
 	@After
 	public void tearDown() {
 		verify(publisher);
diff --git a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
index 5fa2f37ccf..d5cc8f790f 100644
--- a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
@@ -55,7 +55,7 @@ public class LifecycleEventTests extends TestCase {
 		assertFalse(lifecycleBean.isRunning());
 		context.start();
 		assertTrue(lifecycleBean.isRunning());
-		assertEquals(0, listener.getStoppedCount());		
+		assertEquals(0, listener.getStoppedCount());
 		context.stop();
 		assertFalse(lifecycleBean.isRunning());
 		assertEquals(1, listener.getStoppedCount());
diff --git a/spring-context/src/test/java/org/springframework/context/support/Assembler.java b/spring-context/src/test/java/org/springframework/context/support/Assembler.java
index f317191219..60df14aeb8 100644
--- a/spring-context/src/test/java/org/springframework/context/support/Assembler.java
+++ b/spring-context/src/test/java/org/springframework/context/support/Assembler.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -22,24 +22,24 @@ package org.springframework.context.support;
 public class Assembler implements TestIF {
 
 	private Service service;
-	private Logic l;	
+	private Logic l;
 	private String name;
 
 	public void setService(Service service) {
 		this.service = service;
 	}
-	
+
 	public void setLogic(Logic l) {
 		this.l = l;
 	}
-	
+
 	public void setBeanName(String name) {
 		this.name = name;
 	}
 
 	public void test() {
 	}
-	
+
 	public void output() {
 		System.out.println("Bean " + name);
 		l.output();
diff --git a/spring-context/src/test/java/org/springframework/context/support/AutowiredService.java b/spring-context/src/test/java/org/springframework/context/support/AutowiredService.java
index 285e8348bd..3ab4a12d95 100644
--- a/spring-context/src/test/java/org/springframework/context/support/AutowiredService.java
+++ b/spring-context/src/test/java/org/springframework/context/support/AutowiredService.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
index c50e7941dd..2e36dde141 100644
--- a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -35,7 +35,7 @@ import org.springframework.context.support.StaticApplicationContext;
  * any registered {@link BeanFactoryPostProcessor} implementations.  Specifically
  * {@link StaticApplicationContext} is used for the tests, but what's represented
  * here is any {@link AbstractApplicationContext} implementation.
- * 
+ *
  * @author Colin Sampaleanu
  * @author Juergen Hoeller
  * @author Chris Beams
@@ -54,7 +54,7 @@ public class BeanFactoryPostProcessorTests {
 		ac.refresh();
 		assertTrue(bfpp.wasCalled);
 	}
-	
+
 	@Test
 	public void testDefinedBeanFactoryPostProcessor() {
 		StaticApplicationContext ac = new StaticApplicationContext();
@@ -93,7 +93,7 @@ public class BeanFactoryPostProcessorTests {
 		assertFalse(bfpp.wasCalled);
 	}
 
-	
+
 	public static class TestBeanFactoryPostProcessor implements BeanFactoryPostProcessor {
 
 		public String initValue;
@@ -103,10 +103,10 @@ public class BeanFactoryPostProcessorTests {
 		}
 
 		public boolean wasCalled = false;
-		
+
 		public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
 			wasCalled = true;
 		}
 	}
-	
+
 }
diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
index 1fdec145cc..f55a47870c 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
@@ -71,7 +71,7 @@ public final class ClassPathXmlApplicationContextTests {
 	private static final String TEST_PROPERTIES = "test.properties";
 	private static final String FQ_TEST_PROPERTIES = "classpath:org/springframework/beans/factory/xml/" + TEST_PROPERTIES;
 
-	
+
 	@Test
 	public void testSingleConfigLocation() {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(FQ_SIMPLE_CONTEXT);
diff --git a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
index 7f88ebfd57..5a779f0d3a 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
@@ -48,7 +48,7 @@ public class ConversionServiceFactoryBeanTests {
 		ConversionService service = factory.getObject();
 		assertTrue(service.canConvert(String.class, Integer.class));
 	}
-	
+
 	@Test
 	public void createDefaultConversionServiceWithSupplements() {
 		ConversionServiceFactoryBean factory = new ConversionServiceFactoryBean();
@@ -81,7 +81,7 @@ public class ConversionServiceFactoryBeanTests {
 		assertTrue(service.canConvert(String.class, Integer.class));
 		assertTrue(service.canConvert(String.class, Foo.class));
 		assertTrue(service.canConvert(String.class, Bar.class));
-		assertTrue(service.canConvert(String.class, Baz.class));		
+		assertTrue(service.canConvert(String.class, Baz.class));
 	}
 
 	@Test(expected=IllegalArgumentException.class)
@@ -119,10 +119,10 @@ public class ConversionServiceFactoryBeanTests {
 
 	public static class Foo {
 	}
-	
+
 	public static class Bar {
 	}
-	
+
 	public static class Baz {
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
index 18bd081d2d..61615a2b59 100644
--- a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
@@ -295,7 +295,7 @@ public class DefaultLifecycleProcessorTests {
 	@Test
 	public void singleLifecycleShutdown() throws Exception {
 		CopyOnWriteArrayList<Lifecycle> stoppedBeans = new CopyOnWriteArrayList<Lifecycle>();
-		Lifecycle bean = new TestLifecycleBean(null, stoppedBeans); 
+		Lifecycle bean = new TestLifecycleBean(null, stoppedBeans);
 		StaticApplicationContext context = new StaticApplicationContext();
 		context.getBeanFactory().registerSingleton("bean", bean);
 		context.refresh();
@@ -636,7 +636,7 @@ public class DefaultLifecycleProcessorTests {
 		}
 
 		public void setAutoStartup(boolean autoStartup) {
-			this.autoStartup = autoStartup; 
+			this.autoStartup = autoStartup;
 		}
 
 		public void stop(final Runnable callback) {
diff --git a/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java b/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java
index 8c22088837..44dcf38bd6 100644
--- a/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java
+++ b/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java
@@ -54,7 +54,7 @@ public class LifecycleTestBean implements Lifecycle {
 
 	public void stop() {
 		this.stopOrder = ++stopCounter;
-		this.running = false;		
+		this.running = false;
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/context/support/Logic.java b/spring-context/src/test/java/org/springframework/context/support/Logic.java
index ee1974670c..325ebc10a4 100644
--- a/spring-context/src/test/java/org/springframework/context/support/Logic.java
+++ b/spring-context/src/test/java/org/springframework/context/support/Logic.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -22,24 +22,24 @@ import org.springframework.beans.factory.BeanNameAware;
 
 
 public class Logic implements BeanNameAware {
-	
+
 	private Log log = LogFactory.getLog(Logic.class);
 	private String name;
 	private Assembler a;
-	
+
 	public void setAssembler(Assembler a) {
 		this.a = a;
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String)
 	 */
 	public void setBeanName(String name) {
 		this.name = name;
 	}
-	
+
 	public void output() {
-		System.out.println("Bean " + name);		
+		System.out.println("Bean " + name);
 	}
 
 }
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 0884859f23..e3f9ada36f 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
@@ -38,12 +38,12 @@ import org.springframework.util.StringUtils;
  * interaction with an {@link ApplicationContext}.  For example, a {@link PropertyPlaceholderConfigurer}
  * that contains ${..} tokens in its 'location' property requires being tested through an ApplicationContext
  * as opposed to using only a BeanFactory during testing.
- * 
+ *
  * @author Chris Beams
  * @see org.springframework.beans.factory.config.PropertyResourceConfigurerTests
  */
 public class PropertyResourceConfigurerIntegrationTests {
-	
+
 	@Test
 	public void testPropertyPlaceholderConfigurerWithSystemPropertyInLocation() {
 		StaticApplicationContext ac = new StaticApplicationContext();
@@ -85,14 +85,14 @@ public class PropertyResourceConfigurerIntegrationTests {
 		catch (BeanInitializationException ex) {
 			// expected
 			assertTrue(ex.getCause() instanceof FileNotFoundException);
-			// slight hack for Linux/Unix systems			
+			// slight hack for Linux/Unix systems
 			String userDir = StringUtils.cleanPath(System.getProperty("user.dir"));
 			if (userDir.startsWith("/")) {
 				userDir = userDir.substring(1);
 			}
 			/* the above hack doesn't work since the exception message is created without
 			   the leading / stripped so the test fails.  Changed 17/11/04. DD */
-			//assertTrue(ex.getMessage().indexOf(userDir + "/test/" + userDir) != -1);		
+			//assertTrue(ex.getMessage().indexOf(userDir + "/test/" + userDir) != -1);
 			assertTrue(ex.getMessage().contains(userDir + "/test/" + userDir) ||
 					ex.getMessage().contains(userDir + "/test//" + userDir));
 		}
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 8226dae186..bfb2adc69a 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
@@ -40,7 +40,7 @@ import test.beans.TestBean;
 
 /**
  * Unit tests for {@link PropertySourcesPlaceholderConfigurer}.
- * 
+ *
  * @author Chris Beams
  * @since 3.1
  */
diff --git a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
index 40255c0e68..910200918a 100644
--- a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
@@ -44,5 +44,5 @@ public class Spr7283Tests {
     public static class B {
     	public B() {}
     }
-        
+
 }
diff --git a/spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java b/spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java
index 998049819c..9c7e9a2319 100644
--- a/spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java
@@ -37,13 +37,13 @@ public class Spr7816Tests {
 		assertEquals(Entrance.class, adapter.getSupportedTypes().get("Entrance"));
 		assertEquals(Dwelling.class, adapter.getSupportedTypes().get("Dwelling"));
 	}
-	
+
 	public static class FilterAdapter {
-		
+
 		private String extensionPrefix;
-		
+
 		private Map<String, Class<? extends DomainEntity>> supportedTypes;
-		
+
 		public FilterAdapter(final String extensionPrefix, final Map<String, Class<? extends DomainEntity>> supportedTypes) {
 			this.extensionPrefix = extensionPrefix;
 			this.supportedTypes = supportedTypes;
@@ -58,17 +58,17 @@ public class Spr7816Tests {
 		}
 
 	}
-	
+
 	public static class Building extends DomainEntity {
 	}
-	
+
 	public static class Entrance extends DomainEntity {
 	}
-	
+
 	public static class Dwelling extends DomainEntity {
 	}
-	
+
 	public abstract static class DomainEntity {
-		
+
 	}
 }
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
index 9bfe88b2cc..089072fb3c 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
index d98528b230..431325062e 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/TestIF.java b/spring-context/src/test/java/org/springframework/context/support/TestIF.java
index d458965dc3..7ee7a9c006 100644
--- a/spring-context/src/test/java/org/springframework/context/support/TestIF.java
+++ b/spring-context/src/test/java/org/springframework/context/support/TestIF.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
index 3743579d00..11a20f3cd6 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
@@ -186,7 +186,7 @@ public class LocalSlsbInvokerInterceptorTests {
 	}
 
 
-	/** 
+	/**
 	 * Needed so that we can mock the create() method.
 	 */
 	private interface SlsbHome extends EJBLocalHome {
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
index 0b8d488a52..c2c9e07aaa 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
@@ -41,16 +41,16 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 	public void testInvokesMethod() throws Exception {
 		final int value = 11;
 		final String jndiName = "foo";
-		
+
 		MyEjb myEjb = createMock(MyEjb.class);
 		expect(myEjb.getValue()).andReturn(value);
 		myEjb.remove();
 		replay(myEjb);
-		
+
 		final MyHome home = createMock(MyHome.class);
 		expect(home.create()).andReturn(myEjb);
 		replay(home);
-		
+
 		JndiTemplate jt = new JndiTemplate() {
 			public Object lookup(String name) throws NamingException {
 				// parameterize
@@ -58,13 +58,13 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 				return home;
 			}
 		};
-		
+
 		LocalStatelessSessionProxyFactoryBean fb = new LocalStatelessSessionProxyFactoryBean();
 		fb.setJndiName(jndiName);
 		fb.setResourceRef(true);
 		fb.setBusinessInterface(MyBusinessMethods.class);
 		fb.setJndiTemplate(jt);
-		
+
 		// Need lifecycle methods
 		fb.afterPropertiesSet();
 
@@ -72,9 +72,9 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		assertTrue(Proxy.isProxyClass(mbm.getClass()));
 		assertTrue(mbm.getValue() == value);
 		verify(myEjb);
-		verify(home);	
+		verify(home);
 	}
-	
+
 	@Test
 	public void testInvokesMethodOnEjb3StyleBean() throws Exception {
 		final int value = 11;
@@ -110,12 +110,12 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 	@Test
 	public void testCreateException() throws Exception {
 		final String jndiName = "foo";
-	
+
 		final CreateException cex = new CreateException();
 		final MyHome home = createMock(MyHome.class);
 		expect(home.create()).andThrow(cex);
 		replay(home);
-	
+
 		JndiTemplate jt = new JndiTemplate() {
 			public Object lookup(String name) throws NamingException {
 				// parameterize
@@ -123,20 +123,20 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 				return home;
 			}
 		};
-	
+
 		LocalStatelessSessionProxyFactoryBean fb = new LocalStatelessSessionProxyFactoryBean();
 		fb.setJndiName(jndiName);
 		fb.setResourceRef(false);	// no java:comp/env prefix
 		fb.setBusinessInterface(MyBusinessMethods.class);
 		assertEquals(fb.getBusinessInterface(), MyBusinessMethods.class);
 		fb.setJndiTemplate(jt);
-	
+
 		// Need lifecycle methods
 		fb.afterPropertiesSet();
 
 		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
 		assertTrue(Proxy.isProxyClass(mbm.getClass()));
-		
+
 		try {
 			mbm.getValue();
 			fail("Should have failed to create EJB");
@@ -144,10 +144,10 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		catch (EjbAccessException ex) {
 			assertSame(cex, ex.getCause());
 		}
-		
-		verify(home);	
+
+		verify(home);
 	}
-	
+
 	@Test
 	public void testNoBusinessInterfaceSpecified() throws Exception {
 		// Will do JNDI lookup to get home but won't call create
@@ -162,7 +162,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 				// parameterize
 				assertTrue(name.equals("java:comp/env/" + jndiName));
 				return home;
-			} 
+			}
 		};
 
 		LocalStatelessSessionProxyFactoryBean fb = new LocalStatelessSessionProxyFactoryBean();
@@ -184,10 +184,10 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		}
 
 		// Expect no methods on home
-		verify(home);	
+		verify(home);
 	}
-	
-	
+
+
 	public static interface MyHome extends EJBLocalHome {
 
 		MyBusinessMethods create() throws CreateException;
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
index a3d570c3f1..396d347b17 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
@@ -53,16 +53,16 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 	public void testInvokesMethod() throws Exception {
 		final int value = 11;
 		final String jndiName = "foo";
-		
+
 		MyEjb myEjb = createMock(MyEjb.class);
 		expect(myEjb.getValue()).andReturn(value);
 		myEjb.remove();
 		replay(myEjb);
-		
+
 		final MyHome home = createMock(MyHome.class);
 		expect(home.create()).andReturn(myEjb);
 		replay(home);
-		
+
 		JndiTemplate jt = new JndiTemplate() {
 			public Object lookup(String name) {
 				// parameterize
@@ -70,7 +70,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 				return home;
 			}
 		};
-		
+
 		SimpleRemoteStatelessSessionProxyFactoryBean fb = new SimpleRemoteStatelessSessionProxyFactoryBean();
 		fb.setJndiName(jndiName);
 		fb.setResourceRef(true);
@@ -83,10 +83,10 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
 		assertTrue(Proxy.isProxyClass(mbm.getClass()));
 		assertEquals("Returns expected value", value, mbm.getValue());
-		verify(myEjb);	
-		verify(home);	
+		verify(myEjb);
+		verify(home);
 	}
-	
+
 	@Test
 	public void testInvokesMethodOnEjb3StyleBean() throws Exception {
 		final int value = 11;
@@ -123,18 +123,18 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 	public void testRemoteException() throws Exception {
 		final RemoteException rex = new RemoteException();
 		final String jndiName = "foo";
-	
+
 		MyEjb myEjb = createMock(MyEjb.class);
 		expect(myEjb.getValue()).andThrow(rex);
 		// TODO might want to control this behaviour...
 		// Do we really want to call remove after a remote exception?
 		myEjb.remove();
 		replay(myEjb);
-	
+
 		final MyHome home = createMock(MyHome.class);
 		expect(home.create()).andReturn(myEjb);
 		replay(home);
-	
+
 		JndiTemplate jt = new JndiTemplate() {
 			public Object lookup(String name) {
 				// parameterize
@@ -142,13 +142,13 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 				return home;
 			}
 		};
-	
+
 		SimpleRemoteStatelessSessionProxyFactoryBean fb = new SimpleRemoteStatelessSessionProxyFactoryBean();
 		fb.setJndiName(jndiName);
 		fb.setResourceRef(true);
 		fb.setBusinessInterface(MyBusinessMethods.class);
 		fb.setJndiTemplate(jt);
-	
+
 		// Need lifecycle methods
 		fb.afterPropertiesSet();
 
@@ -161,19 +161,19 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		catch (RemoteException ex) {
 			assertSame("Threw expected RemoteException", rex, ex);
 		}
-		verify(myEjb);	
-		verify(home);	
+		verify(myEjb);
+		verify(home);
 	}
-	
+
 	@Test
 	public void testCreateException() throws Exception {
 		final String jndiName = "foo";
-	
+
 		final CreateException cex = new CreateException();
 		final MyHome home = createMock(MyHome.class);
 		expect(home.create()).andThrow(cex);
 		replay(home);
-	
+
 		JndiTemplate jt = new JndiTemplate() {
 			public Object lookup(String name) {
 				// parameterize
@@ -181,20 +181,20 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 				return home;
 			}
 		};
-	
+
 		SimpleRemoteStatelessSessionProxyFactoryBean fb = new SimpleRemoteStatelessSessionProxyFactoryBean();
 		fb.setJndiName(jndiName);
 		// rely on default setting of resourceRef=false, no auto addition of java:/comp/env prefix
 		fb.setBusinessInterface(MyBusinessMethods.class);
 		assertEquals(fb.getBusinessInterface(), MyBusinessMethods.class);
 		fb.setJndiTemplate(jt);
-	
+
 		// Need lifecycle methods
 		fb.afterPropertiesSet();
 
 		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
 		assertTrue(Proxy.isProxyClass(mbm.getClass()));
-		
+
 		try {
 			mbm.getValue();
 			fail("Should have failed to create EJB");
@@ -202,10 +202,10 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		catch (RemoteException ex) {
 			// expected
 		}
-		
-		verify(home);	
+
+		verify(home);
 	}
-	
+
 	@Test
 	public void testCreateExceptionWithLocalBusinessInterface() throws Exception {
 		final String jndiName = "foo";
@@ -269,7 +269,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		// rely on default setting of resourceRef=false, no auto addition of java:/comp/env prefix
 		// Don't set business interface
 		fb.setJndiTemplate(jt);
-		
+
 		// Check it's a singleton
 		assertTrue(fb.isSingleton());
 
@@ -281,12 +281,12 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 			// TODO more appropriate exception?
 			assertTrue(ex.getMessage().indexOf("businessInterface") != 1);
 		}
-	
+
 		// Expect no methods on home
-		verify(home);	
+		verify(home);
 	}
-	
-	
+
+
 	protected static interface MyHome extends EJBHome {
 
 		MyBusinessMethods create() throws CreateException, RemoteException;
@@ -306,7 +306,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 
 
 	protected static interface MyEjb extends EJBObject, MyBusinessMethods {
-		
+
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java b/spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java
index d10259b11b..4cb1bfdd58 100644
--- a/spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java
+++ b/spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java
@@ -32,7 +32,7 @@ import org.springframework.format.number.CurrencyFormatter;
 public class CurrencyFormatterTests {
 
 	private CurrencyFormatter formatter = new CurrencyFormatter();
-	
+
 	@Test
 	public void formatValue() {
 		assertEquals("$23.00", formatter.print(new BigDecimal("23"), Locale.US));
diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
index abd5e87e3c..a5c07dbe80 100644
--- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
@@ -195,7 +195,7 @@ public class FormattingConversionServiceFactoryBeanTests {
 		public void registerFormatters(FormatterRegistry registry) {
 			registry.addFormatter(new TestBeanFormatter());
 		}
-		
+
 	}
-	
+
 }
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 e6e0d82a5e..c620be5b74 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
@@ -219,7 +219,7 @@ public class FormattingConversionServiceTests {
 			assertEquals(new LocalDate(2009, 10, 2), new LocalDate(dates.get(2)));
 		}
 	}
-	
+
 	@Test
 	public void testPrintNull() throws ParseException {
 		formattingService.addFormatterForFieldType(Number.class, new NumberFormatter());
@@ -324,7 +324,7 @@ public class FormattingConversionServiceTests {
 
 		@org.springframework.format.annotation.DateTimeFormat(style="S-")
 		public Date date;
-		
+
 		@org.springframework.format.annotation.DateTimeFormat(pattern="M-d-yy")
 		public List<Date> dates;
 
@@ -371,7 +371,7 @@ public class FormattingConversionServiceTests {
 		public Integer parse(String text, Locale locale) throws ParseException {
 			return null;
 		}
-		
+
 	}
 
 
diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java
index a5a7fc2d41..506a883136 100644
--- a/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java
+++ b/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2006 the original author 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.
@@ -29,47 +29,47 @@ import org.junit.Test;
  * @since 2.0
  */
 public class ResourceOverridingShadowingClassLoaderTests {
-	
+
 	private static final String EXISTING_RESOURCE = "org/springframework/instrument/classloading/testResource.xml";
-	
+
 	private ClassLoader thisClassLoader = getClass().getClassLoader();
-	
+
 	private ResourceOverridingShadowingClassLoader overridingLoader = new ResourceOverridingShadowingClassLoader(thisClassLoader);
-	
-	
+
+
 	@Test
 	public void testFindsExistingResourceWithGetResourceAndNoOverrides() {
 		assertNotNull(thisClassLoader.getResource(EXISTING_RESOURCE));
 		assertNotNull(overridingLoader.getResource(EXISTING_RESOURCE));
 	}
-	
+
 	@Test
 	public void testDoesNotFindExistingResourceWithGetResourceAndNullOverride() {
 		assertNotNull(thisClassLoader.getResource(EXISTING_RESOURCE));
 		overridingLoader.override(EXISTING_RESOURCE, null);
 		assertNull(overridingLoader.getResource(EXISTING_RESOURCE));
 	}
-	
+
 	@Test
 	public void testFindsExistingResourceWithGetResourceAsStreamAndNoOverrides() {
 		assertNotNull(thisClassLoader.getResourceAsStream(EXISTING_RESOURCE));
 		assertNotNull(overridingLoader.getResourceAsStream(EXISTING_RESOURCE));
 	}
-	
+
 	@Test
 	public void testDoesNotFindExistingResourceWithGetResourceAsStreamAndNullOverride() {
 		assertNotNull(thisClassLoader.getResourceAsStream(EXISTING_RESOURCE));
 		overridingLoader.override(EXISTING_RESOURCE, null);
 		assertNull(overridingLoader.getResourceAsStream(EXISTING_RESOURCE));
 	}
-	
+
 	@Test
 	public void testFindsExistingResourceWithGetResourcesAndNoOverrides() throws IOException {
 		assertNotNull(thisClassLoader.getResources(EXISTING_RESOURCE));
 		assertNotNull(overridingLoader.getResources(EXISTING_RESOURCE));
 		assertEquals(1, countElements(overridingLoader.getResources(EXISTING_RESOURCE)));
 	}
-	
+
 	@Test
 	public void testDoesNotFindExistingResourceWithGetResourcesAndNullOverride() throws IOException {
 		assertNotNull(thisClassLoader.getResources(EXISTING_RESOURCE));
diff --git a/spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java b/spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java
index 74d579fb8a..0a6ba49035 100644
--- a/spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java
@@ -36,5 +36,5 @@ public interface IJmxTestBean {
 
 	// used to test invalid methods that exist in the proxy interface
 	public void dontExposeMe();
-	
+
 }
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/DateRange.java b/spring-context/src/test/java/org/springframework/jmx/export/DateRange.java
index a9e7f84df6..5603c43abd 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/DateRange.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/DateRange.java
@@ -24,7 +24,7 @@ import java.util.Date;
 public class DateRange {
 
 	private Date startDate;
-	
+
 	private Date endDate;
 
 	public Date getStartDate() {
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java b/spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java
index d11bee12ac..c61cd388aa 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java
@@ -22,7 +22,7 @@ package org.springframework.jmx.export;
 public class ExceptionOnInitBean {
 
 	private boolean exceptOnInit = false;
-	
+
 	private String name;
 
 	public String getName() {
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java
index 1971dddc57..97a3581954 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java
@@ -66,7 +66,7 @@ public class AnnotationTestBean implements IJmxTestBean {
 	public String getName() {
 		return name;
 	}
-	
+
 	@ManagedAttribute(description = "The Nick Name Attribute")
 	public void setNickName(String nickName) {
 		this.nickName = nickName;
@@ -98,18 +98,18 @@ public class AnnotationTestBean implements IJmxTestBean {
 	public void dontExposeMe() {
 		throw new RuntimeException();
 	}
-	
-	@ManagedMetric(description="The QueueSize metric", currencyTimeLimit = 20, persistPolicy="OnUpdate", persistPeriod=300, 
+
+	@ManagedMetric(description="The QueueSize metric", currencyTimeLimit = 20, persistPolicy="OnUpdate", persistPeriod=300,
 			category="utilization", metricType = MetricType.COUNTER, displayName="Queue Size", unit="messages")
 	public long getQueueSize() {
 		return 100l;
 	}
-	
+
 	@ManagedMetric
 	public int getCacheEntries() {
 		return 3;
 	}
 
-	
+
 
 }
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
index 3c15e835ee..bfbd928382 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
@@ -41,9 +41,9 @@ import test.interceptor.NopInterceptor;
  * @author Chris Beams
  */
 public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemblerTests {
-	
+
 	protected static final String QUEUE_SIZE_METRIC = "QueueSize";
-	
+
 	protected static final String CACHE_ENTRIES_METRIC = "CacheEntries";
 
 	public void testDescription() throws Exception {
@@ -170,7 +170,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble
 
 		assertTrue("Not included in autodetection", assembler.includeBean(proxy.getClass(), "some bean name"));
 	}
-	
+
 	public void testMetricDescription() throws Exception {
 		ModelMBeanInfo inf = getMBeanInfoFromAssembler();
 		ModelMBeanAttributeInfo metric = inf.getAttribute(QUEUE_SIZE_METRIC);
@@ -180,7 +180,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble
 		assertEquals("The description for the getter operation of the queue size metric is incorrect",
 				"The QueueSize metric", operation.getDescription());
 	}
-	
+
 	public void testMetricDescriptor() throws Exception {
 		ModelMBeanInfo info = getMBeanInfoFromAssembler();
 		Descriptor desc = info.getAttribute(QUEUE_SIZE_METRIC).getDescriptor();
@@ -192,7 +192,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble
 		assertEquals("Metric Type should be COUNTER", "COUNTER",desc.getFieldValue("metricType"));
 		assertEquals("Metric Category should be utilization", "utilization",desc.getFieldValue("metricCategory"));
 	}
-	
+
 	public void testMetricDescriptorDefaults() throws Exception {
 		ModelMBeanInfo info = getMBeanInfoFromAssembler();
 		Descriptor desc = info.getAttribute(CACHE_ENTRIES_METRIC).getDescriptor();
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/IAdditionalTestMethods.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/IAdditionalTestMethods.java
index 4c7e41c747..d6b59fc5ff 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/IAdditionalTestMethods.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/IAdditionalTestMethods.java
@@ -9,5 +9,5 @@ public interface IAdditionalTestMethods {
 	String getNickName();
 
 	void setNickName(String nickName);
-	
+
 }
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java
index f3676ba5b8..1d74177d3b 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java
@@ -20,7 +20,7 @@ package org.springframework.jmx.export.assembler;
  * @author Rob Harrop
  */
 public interface ICustomJmxBean extends ICustomBase {
-	
+
 	String getName();
 
 	void setName(String name);
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
index 713263171b..bb9dc93912 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
@@ -57,5 +57,5 @@ public class InterfaceBasedMBeanInfoAssemblerCustomTests extends AbstractJmxAsse
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml";
 	}
-	
+
 }
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
index 64c6bb7f39..3363f4f585 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
@@ -67,7 +67,7 @@ public class MethodExclusionMBeanInfoAssemblerTests extends AbstractJmxAssembler
 	 * http://opensource.atlassian.com/projects/spring/browse/SPR-2754
 	 */
 	public void testIsNotIgnoredDoesntIgnoreUnspecifiedBeanMethods() throws Exception {
-		final String beanKey = "myTestBean";	
+		final String beanKey = "myTestBean";
 		MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler();
 		Properties ignored = new Properties();
 		ignored.setProperty(beanKey, "dontExposeMe,setSuperman");
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java
index 0342d3b2cb..c98f88489f 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java
@@ -38,5 +38,5 @@ public class KeyNamingStrategyTests extends AbstractNamingStrategyTests {
 	protected String getCorrectObjectName() {
 		return OBJECT_NAME;
 	}
-	
+
 }
diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java
index 9a9a6dfb38..cf2c73b506 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-context/src/test/java/org/springframework/mock/env/MockEnvironment.java b/spring-context/src/test/java/org/springframework/mock/env/MockEnvironment.java
index 9759c99c55..a53fd65f89 100644
--- a/spring-context/src/test/java/org/springframework/mock/env/MockEnvironment.java
+++ b/spring-context/src/test/java/org/springframework/mock/env/MockEnvironment.java
@@ -23,7 +23,7 @@ import org.springframework.core.env.ConfigurableEnvironment;
  * Simple {@link ConfigurableEnvironment} implementation exposing
  * {@link #setProperty(String, String)} and {@link #withProperty(String, String)}
  * methods for testing purposes.
- * 
+ *
  * @author Chris Beams
  * @author Sam Brannen
  * @since 3.2
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index 8b816b45d0..f6c3f0a376 100644
--- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -52,7 +52,7 @@ import org.springframework.util.ClassUtils;
  * DataSource ds = new DriverManagerDataSource(...);
  * builder.bind("java:comp/env/jdbc/myds", ds);
  * builder.activate();</pre>
- * 
+ *
  * Note that it's impossible to activate multiple builders within the same JVM,
  * due to JNDI restrictions. Thus to configure a fresh builder repeatedly, use
  * the following code to get a reference to either an already activated builder
diff --git a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
index 2f2b1e8155..aebf7d8e41 100644
--- a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
+++ b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
@@ -273,7 +273,7 @@ public class RmiSupportTests extends TestCase {
 
 	private void doTestRmiProxyFactoryBeanWithBusinessInterfaceAndExceptionAndRefresh(
 			Class rmiExceptionClass, Class springExceptionClass) throws Exception {
-		
+
 		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
 		factory.setServiceInterface(IBusinessBean.class);
 		factory.setServiceUrl("rmi://localhost:1090/test");
@@ -309,7 +309,7 @@ public class RmiSupportTests extends TestCase {
 		try {
 			client.afterPropertiesSet();
 			fail("url isn't set, expected IllegalArgumentException");
-		} 
+		}
 		catch(IllegalArgumentException e){
 			// expected
 		}
diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java
index dbf22d24a9..7d3b05f631 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java
@@ -229,7 +229,7 @@ public class ThreadPoolTaskSchedulerTests {
 		private final int expectedRunCount;
 
 		private final AtomicInteger actualRunCount = new AtomicInteger();
-	
+
 		private final CountDownLatch latch;
 
 		private Thread lastThread;
@@ -254,7 +254,7 @@ public class ThreadPoolTaskSchedulerTests {
 		private final int expectedRunCount;
 
 		private final AtomicInteger actualRunCount = new AtomicInteger();
-	
+
 		TestCallable(int expectedRunCount) {
 			this.expectedRunCount = expectedRunCount;
 		}
diff --git a/spring-context/src/test/java/org/springframework/scripting/ScriptBean.java b/spring-context/src/test/java/org/springframework/scripting/ScriptBean.java
index ca2f6e476c..95e40c1098 100644
--- a/spring-context/src/test/java/org/springframework/scripting/ScriptBean.java
+++ b/spring-context/src/test/java/org/springframework/scripting/ScriptBean.java
@@ -18,7 +18,7 @@ package org.springframework.scripting;
 
 /**
  * Simple interface used in testing the scripted beans support.
- * 
+ *
  * @author Rick Evans
  */
 public interface ScriptBean {
diff --git a/spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java b/spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
index 2aa1275290..fc19107ced 100644
--- a/spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
@@ -42,7 +42,7 @@ public class ScriptingDefaultsTests extends TestCase {
 	public void testDefaultRefreshCheckDelay() throws Exception {
 		ApplicationContext context = new ClassPathXmlApplicationContext(CONFIG);
 		Advised advised = (Advised) context.getBean("testBean");
-		AbstractRefreshableTargetSource targetSource = 
+		AbstractRefreshableTargetSource targetSource =
 				((AbstractRefreshableTargetSource) advised.getTargetSource());
 		Field field = AbstractRefreshableTargetSource.class.getDeclaredField("refreshCheckDelay");
 		field.setAccessible(true);
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 62f2d3223c..b0373d46a4 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
@@ -23,7 +23,7 @@ public class GroovyAspectIntegrationTests {
 
 	@Test
 	public void testJavaBean() {
-		
+
 		context = new GenericXmlApplicationContext(getClass(), getClass().getSimpleName()+"-java-context.xml");
 
 		TestService bean = context.getBean("javaBean", TestService.class);
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 0450ac8012..d43f90950b 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
@@ -384,7 +384,7 @@ public class GroovyScriptFactoryTests {
 		assertEquals("Hello World!", messenger.getMessage());
 
 		assertTrue(ctx.getBeansOfType(ConcreteMessenger.class).values().contains(messenger));
-		
+
 		// Check that AnnotationUtils works with concrete proxied script classes
 		assertNotNull(AnnotationUtils.findAnnotation(messenger.getClass(), Component.class));
 	}
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java b/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java
index 53ade22775..f3be4d65c4 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java
@@ -6,11 +6,11 @@ import org.springframework.aop.MethodBeforeAdvice;
 import org.springframework.aop.ThrowsAdvice;
 
 public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice {
-	
+
 	private int countBefore = 0;
-	
+
 	private int countThrows = 0;
-	
+
 	public void before(Method method, Object[] objects, Object o) throws Throwable {
 		countBefore++;
         System.out.println("Method:"+method.getName());
@@ -32,7 +32,7 @@ public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice {
 	public int getCountThrows() {
 		return countThrows;
 	}
-	
+
 	public void reset() {
 		countThrows = 0;
 		countBefore = 0;
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
index 8aebff6f7b..db4323a318 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
@@ -216,7 +216,7 @@ public class ScriptFactoryPostProcessorTests extends TestCase {
 		ctx.registerBeanDefinition(BEAN_WITH_DEPENDENCY_NAME, scriptedBeanBuilder.getBeanDefinition());
 		ctx.registerBeanDefinition("scriptProcessor", createScriptFactoryPostProcessor(true));
 		ctx.refresh();
-		
+
 		Messenger messenger1 = (Messenger) ctx.getBean(BEAN_WITH_DEPENDENCY_NAME);
 		Messenger messenger2 = (Messenger) ctx.getBean(BEAN_WITH_DEPENDENCY_NAME);
 		assertNotSame(messenger1, messenger2);
diff --git a/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java
index f42512ccb0..9ae4f54ec2 100644
--- a/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java
+++ b/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java
@@ -31,13 +31,13 @@ import java.io.OutputStream;
  * @author Rod Johnson
  */
 public class SerializationTestUtils {
-	
+
 	public static void testSerialization(Object o) throws IOException {
 		OutputStream baos = new ByteArrayOutputStream();
 		ObjectOutputStream oos = new ObjectOutputStream(baos);
 		oos.writeObject(o);
 	}
-	
+
 	public static boolean isSerializable(Object o) throws IOException {
 		try {
 			testSerialization(o);
@@ -47,7 +47,7 @@ public class SerializationTestUtils {
 			return false;
 		}
 	}
-	
+
 	public static Object serializeAndDeserialize(Object o) throws IOException, ClassNotFoundException {
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		ObjectOutputStream oos = new ObjectOutputStream(baos);
@@ -55,7 +55,7 @@ public class SerializationTestUtils {
 		oos.flush();
 		baos.flush();
 		byte[] bytes = baos.toByteArray();
-		
+
 		ByteArrayInputStream is = new ByteArrayInputStream(bytes);
 		ObjectInputStream ois = new ObjectInputStream(is);
 		Object o2 = ois.readObject();
diff --git a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
index 329e886577..11235906e3 100644
--- a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
@@ -23,7 +23,7 @@ import org.springframework.beans.TestBean;
 
 /**
  * Unit tests for {@link ValidationUtils}.
- * 
+ *
  * @author Juergen Hoeller
  * @author Rick Evans
  * @author Chris Beams
diff --git a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
index 12010bee5c..2e9aaa5a15 100644
--- a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
+++ b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
index cade9a1832..3dc49faf24 100644
--- a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
+++ b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
diff --git a/spring-context/src/test/java/test/advice/MethodCounter.java b/spring-context/src/test/java/test/advice/MethodCounter.java
index c7f660a511..8c29886a3d 100644
--- a/spring-context/src/test/java/test/advice/MethodCounter.java
+++ b/spring-context/src/test/java/test/advice/MethodCounter.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 
 /**
  * Abstract superclass for counting advices etc.
- * 
+ *
  * @author Rod Johnson
  * @author Chris Beams
  */
diff --git a/spring-context/src/test/java/test/advice/MyThrowsHandler.java b/spring-context/src/test/java/test/advice/MyThrowsHandler.java
index 1856821a58..abe79f9dc3 100644
--- a/spring-context/src/test/java/test/advice/MyThrowsHandler.java
+++ b/spring-context/src/test/java/test/advice/MyThrowsHandler.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package test.advice;
 
@@ -19,7 +19,7 @@ public class MyThrowsHandler extends MethodCounter implements ThrowsAdvice {
 	public void afterThrowing(RemoteException ex) throws Throwable {
 		count("remoteException");
 	}
-	
+
 	/** Not valid, wrong number of arguments */
 	public void afterThrowing(Method m, Exception ex) throws Throwable {
 		throw new UnsupportedOperationException("Shouldn't be called");
diff --git a/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java b/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
index c0e70dd28e..fc0794c17f 100644
--- a/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
+++ b/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -22,7 +22,7 @@ import org.springframework.aop.support.DefaultIntroductionAdvisor;
 import test.interceptor.TimestampIntroductionInterceptor;
 
 /**
- * 
+ *
  * @author Rod Johnson
  */
 public class TimestampIntroductionAdvisor extends DefaultIntroductionAdvisor {
diff --git a/spring-context/src/test/java/test/aspect/PerTargetAspect.java b/spring-context/src/test/java/test/aspect/PerTargetAspect.java
index 79977f0cb1..47fb82e40b 100644
--- a/spring-context/src/test/java/test/aspect/PerTargetAspect.java
+++ b/spring-context/src/test/java/test/aspect/PerTargetAspect.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package test.aspect;
 
diff --git a/spring-context/src/test/java/test/beans/Employee.java b/spring-context/src/test/java/test/beans/Employee.java
index db4d5fb595..d93ca6ed60 100644
--- a/spring-context/src/test/java/test/beans/Employee.java
+++ b/spring-context/src/test/java/test/beans/Employee.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
@@ -20,7 +20,7 @@ package test.beans;
 import org.springframework.beans.TestBean;
 
 public class Employee extends TestBean {
-	
+
 	private String co;
 
 	/**
@@ -29,11 +29,11 @@ public class Employee extends TestBean {
 	public Employee() {
 		super();
 	}
-	
+
 	public String getCompany() {
 		return co;
 	}
-	
+
 	public void setCompany(String co) {
 		this.co = co;
 	}
diff --git a/spring-context/src/test/java/test/beans/FactoryMethods.java b/spring-context/src/test/java/test/beans/FactoryMethods.java
index d3040c39b6..ee25e7042b 100644
--- a/spring-context/src/test/java/test/beans/FactoryMethods.java
+++ b/spring-context/src/test/java/test/beans/FactoryMethods.java
@@ -25,7 +25,7 @@ package test.beans;
  * @author Chris Beams
  */
 public final class FactoryMethods {
-	
+
 	public static FactoryMethods nullInstance() {
 		return null;
 	}
diff --git a/spring-context/src/test/java/test/beans/ITestBean.java b/spring-context/src/test/java/test/beans/ITestBean.java
index 76b0ce68f8..81c0e45e3b 100644
--- a/spring-context/src/test/java/test/beans/ITestBean.java
+++ b/spring-context/src/test/java/test/beans/ITestBean.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 /**
  * Interface used for test beans. Two methods are the same as on Person, but if this extends
  * person it breaks quite a few tests
- * 
+ *
  * @author Rod Johnson
  */
 public interface ITestBean {
@@ -53,7 +53,7 @@ public interface ITestBean {
 
 	/**
 	 * Increment the age by one.
-	 * 
+	 *
 	 * @return the previous age
 	 */
 	int haveBirthday();
diff --git a/spring-context/src/test/java/test/beans/NestedTestBean.java b/spring-context/src/test/java/test/beans/NestedTestBean.java
index e87c2c46cc..2a37c6b8c1 100644
--- a/spring-context/src/test/java/test/beans/NestedTestBean.java
+++ b/spring-context/src/test/java/test/beans/NestedTestBean.java
@@ -17,7 +17,7 @@ package test.beans;
 
 /**
  * Simple nested test bean used for testing bean factories, AOP framework etc.
- * 
+ *
  * @author Trevor D. Cook
  * @since 30.09.2003
  */
diff --git a/spring-context/src/test/java/test/beans/SideEffectBean.java b/spring-context/src/test/java/test/beans/SideEffectBean.java
index 33619a48b1..990989bb19 100644
--- a/spring-context/src/test/java/test/beans/SideEffectBean.java
+++ b/spring-context/src/test/java/test/beans/SideEffectBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -19,21 +19,21 @@ package test.beans;
 /**
  * Bean that changes state on a business invocation, so that
  * we can check whether it's been invoked
- * 
+ *
  * @author Rod Johnson
  */
 public class SideEffectBean {
-	
+
 	private int count;
-	
+
 	public void setCount(int count) {
 		this.count = count;
 	}
-	
+
 	public int getCount() {
 		return this.count;
 	}
-	
+
 	public void doWork() {
 		++count;
 	}
diff --git a/spring-context/src/test/java/test/beans/TestBean.java b/spring-context/src/test/java/test/beans/TestBean.java
index 0911566a3f..c528573e4d 100644
--- a/spring-context/src/test/java/test/beans/TestBean.java
+++ b/spring-context/src/test/java/test/beans/TestBean.java
@@ -37,7 +37,7 @@ import java.util.Set;
 
 /**
  * Simple test bean used for testing bean factories, AOP framework etc.
- * 
+ *
  * @author Rod Johnson
  * @since 15 April 2001
  */
diff --git a/spring-context/src/test/java/test/interceptor/NopInterceptor.java b/spring-context/src/test/java/test/interceptor/NopInterceptor.java
index 223a5f1a75..79158e74ea 100644
--- a/spring-context/src/test/java/test/interceptor/NopInterceptor.java
+++ b/spring-context/src/test/java/test/interceptor/NopInterceptor.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
@@ -26,7 +26,7 @@ import org.aopalliance.intercept.MethodInvocation;
  * @author Rod Johnson
  */
 public class NopInterceptor implements MethodInterceptor {
-	
+
 	private int count;
 
 	/**
@@ -36,11 +36,11 @@ public class NopInterceptor implements MethodInterceptor {
 		increment();
 		return invocation.proceed();
 	}
-	
+
 	public int getCount() {
 		return this.count;
 	}
-	
+
 	protected void increment() {
 		++count;
 	}
diff --git a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
index 3af0cbc296..b706cc4795 100644
--- a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
+++ b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -22,24 +22,24 @@ import java.io.Serializable;
 /**
  * Subclass of NopInterceptor that is serializable and
  * can be used to test proxy serialization.
- * 
+ *
  * @author Rod Johnson
  */
 public class SerializableNopInterceptor extends NopInterceptor implements Serializable {
-	
+
 	/**
 	 * We must override this field and the related methods as
 	 * otherwise count won't be serialized from the non-serializable
 	 * NopInterceptor superclass.
 	 */
 	private int count;
-	
+
 	public int getCount() {
 		return this.count;
 	}
-	
+
 	protected void increment() {
 		++count;
 	}
-	
+
 }
\ No newline at end of file
diff --git a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
index 960be703f6..4039d22839 100644
--- a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
+++ b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -31,7 +31,7 @@ public class TimestampIntroductionInterceptor extends DelegatingIntroductionInte
 	public TimestampIntroductionInterceptor(long ts) {
 		this.ts = ts;
 	}
-	
+
 	public void setTime(long ts) {
 		this.ts = ts;
 	}
diff --git a/spring-context/src/test/java/test/mixin/DefaultLockable.java b/spring-context/src/test/java/test/mixin/DefaultLockable.java
index a85fb94678..2510395bf6 100644
--- a/spring-context/src/test/java/test/mixin/DefaultLockable.java
+++ b/spring-context/src/test/java/test/mixin/DefaultLockable.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -19,7 +19,7 @@
 
 /**
  * Simple implementation of Lockable interface for use in mixins.
- * 
+ *
  * @author Rod Johnson
  */
 public class DefaultLockable implements Lockable {
diff --git a/spring-context/src/test/java/test/mixin/LockMixin.java b/spring-context/src/test/java/test/mixin/LockMixin.java
index d4d9292ee4..bdfafc45e5 100644
--- a/spring-context/src/test/java/test/mixin/LockMixin.java
+++ b/spring-context/src/test/java/test/mixin/LockMixin.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -24,19 +24,19 @@ import org.springframework.aop.support.DelegatingIntroductionInterceptor;
  * Mixin to provide stateful locking functionality.
  * Test/demonstration of AOP mixin support rather than a
  * useful interceptor in its own right.
- * 
+ *
  * @author Rod Johnson
  * @since 10.07.2003
  */
 public class LockMixin extends DelegatingIntroductionInterceptor implements Lockable {
-	
+
 	/** This field demonstrates additional state in the mixin */
 	private boolean locked;
-	
+
 	public void lock() {
 		this.locked = true;
 	}
-	
+
 	public void unlock() {
 		this.locked = false;
 	}
diff --git a/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java b/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java
index ba28e9dd4d..f82eef3294 100644
--- a/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java
+++ b/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -24,7 +24,7 @@ import org.springframework.aop.support.DefaultIntroductionAdvisor;
  * @author Rod Johnson
  */
 public class LockMixinAdvisor extends DefaultIntroductionAdvisor {
-	
+
 	public LockMixinAdvisor() {
 		super(new LockMixin(), Lockable.class);
 	}
diff --git a/spring-context/src/test/java/test/mixin/Lockable.java b/spring-context/src/test/java/test/mixin/Lockable.java
index 6db63281d7..dd006ad449 100644
--- a/spring-context/src/test/java/test/mixin/Lockable.java
+++ b/spring-context/src/test/java/test/mixin/Lockable.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -19,15 +19,15 @@ package test.mixin;
 
 /**
  * Simple interface to use for mixins
- * 
+ *
  * @author Rod Johnson
  *
  */
 public interface Lockable {
-	
+
 	void lock();
-	
+
 	void unlock();
-	
+
 	boolean locked();
 }
\ No newline at end of file
diff --git a/spring-context/src/test/java/test/mixin/LockedException.java b/spring-context/src/test/java/test/mixin/LockedException.java
index f00ac9507b..68d428fece 100644
--- a/spring-context/src/test/java/test/mixin/LockedException.java
+++ b/spring-context/src/test/java/test/mixin/LockedException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-context/src/test/java/test/util/TimeStamped.java b/spring-context/src/test/java/test/util/TimeStamped.java
index 958d8b21f9..2de8e381e2 100644
--- a/spring-context/src/test/java/test/util/TimeStamped.java
+++ b/spring-context/src/test/java/test/util/TimeStamped.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -23,7 +23,7 @@ package test.util;
  * @author Rod Johnson
  */
 public interface TimeStamped {
-	
+
 	/**
 	 * Return the timestamp for this object.
 	 * @return long the timestamp for this object,
diff --git a/spring-core/src/main/java/org/springframework/core/ConstantException.java b/spring-core/src/main/java/org/springframework/core/ConstantException.java
index 938667454b..454a8abb5a 100644
--- a/spring-core/src/main/java/org/springframework/core/ConstantException.java
+++ b/spring-core/src/main/java/org/springframework/core/ConstantException.java
@@ -25,7 +25,7 @@ package org.springframework.core;
  * @see org.springframework.core.Constants
  */
 public class ConstantException extends IllegalArgumentException {
-	
+
 	/**
 	 * Thrown when an invalid constant name is requested.
 	 * @param className name of the class containing the constant definitions
diff --git a/spring-core/src/main/java/org/springframework/core/Constants.java b/spring-core/src/main/java/org/springframework/core/Constants.java
index 9fb1e2cc5f..792c1a2056 100644
--- a/spring-core/src/main/java/org/springframework/core/Constants.java
+++ b/spring-core/src/main/java/org/springframework/core/Constants.java
@@ -207,7 +207,7 @@ public class Constants {
 	 * in accordance with the standard Java convention for constant
 	 * values (i.e. all uppercase). The supplied <code>namePrefix</code>
 	 * will be uppercased (in a locale-insensitive fashion) prior to
-	 * the main logic of this method kicking in. 
+	 * the main logic of this method kicking in.
 	 * @param namePrefix prefix of the constant names to search (may be <code>null</code>)
 	 * @return the set of values
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/ControlFlow.java b/spring-core/src/main/java/org/springframework/core/ControlFlow.java
index 4875f1c191..908501d12a 100644
--- a/spring-core/src/main/java/org/springframework/core/ControlFlow.java
+++ b/spring-core/src/main/java/org/springframework/core/ControlFlow.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/ErrorCoded.java b/spring-core/src/main/java/org/springframework/core/ErrorCoded.java
index 6b75babe92..722dcdb98a 100644
--- a/spring-core/src/main/java/org/springframework/core/ErrorCoded.java
+++ b/spring-core/src/main/java/org/springframework/core/ErrorCoded.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -27,9 +27,9 @@ package org.springframework.core;
  * @see org.springframework.context.MessageSource
  */
 public interface ErrorCoded {
-	
+
 	/**
-	 * Return the error code associated with this failure. 
+	 * Return the error code associated with this failure.
 	 * The GUI can render this any way it pleases, allowing for localization etc.
 	 * @return a String error code associated with this failure,
 	 * or <code>null</code> if not error-coded
diff --git a/spring-core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java
index 59f03a5939..67152fc974 100644
--- a/spring-core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java
+++ b/spring-core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java
@@ -32,7 +32,7 @@ import java.lang.reflect.Method;
  * @since 2.0
  */
 public interface ParameterNameDiscoverer {
-	
+
 	/**
 	 * Return parameter names for this method,
 	 * or <code>null</code> if they cannot be determined.
@@ -41,7 +41,7 @@ public interface ParameterNameDiscoverer {
 	 * or <code>null</code> if they cannot
 	 */
 	String[] getParameterNames(Method method);
-	
+
 	/**
 	 * Return parameter names for this constructor,
 	 * or <code>null</code> if they cannot be determined.
diff --git a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
index e2cb227b83..f15a892208 100644
--- a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
+++ b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
@@ -35,7 +35,7 @@ import java.util.List;
  * @since 2.0
  */
 public class PrioritizedParameterNameDiscoverer implements ParameterNameDiscoverer {
-	
+
 	private final List<ParameterNameDiscoverer> parameterNameDiscoverers =
 			new LinkedList<ParameterNameDiscoverer>();
 
diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
index 41611b285a..e73babe3ae 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
@@ -48,6 +48,6 @@ public abstract class AbstractGenericLabeledEnum extends AbstractLabeledEnum {
 		else {
 			return getCode().toString();
 		}
-	}	
+	}
 
 }
diff --git a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
index b8bd13a49a..31abeab0c8 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
@@ -50,7 +50,7 @@ public class LetterCodedLabeledEnum extends AbstractGenericLabeledEnum {
 		this.code = new Character(code);
 	}
 
-	
+
 	public Comparable getCode() {
 		return code;
 	}
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 b3a129d99f..f0aab91544 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
@@ -46,7 +46,7 @@ public class ShortCodedLabeledEnum extends AbstractGenericLabeledEnum {
 		this.code = new Short((short) code);
 	}
 
-	
+
 	public Comparable getCode() {
 		return code;
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
index 0c167cf49b..3dad2edda5 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
@@ -18,9 +18,9 @@ package org.springframework.core.enums;
 
 /**
  * Base class for static type-safe labeled enum instances.
- * 
+ *
  * Usage example:
- * 
+ *
  * <pre>
  * public class FlowSessionStatus extends StaticLabeledEnum {
  *
@@ -30,15 +30,15 @@ package org.springframework.core.enums;
  *     public static FlowSessionStatus PAUSED = new FlowSessionStatus(2, &quot;Paused&quot;);
  *     public static FlowSessionStatus SUSPENDED = new FlowSessionStatus(3, &quot;Suspended&quot;);
  *     public static FlowSessionStatus ENDED = new FlowSessionStatus(4, &quot;Ended&quot;);
- *     
+ *
  *     // private constructor!
  *     private FlowSessionStatus(int code, String label) {
  *         super(code, label);
  *     }
- *     
+ *
  *     // custom behavior
  * }</pre>
- * 
+ *
  * @author Keith Donald
  * @since 1.2.6
  * @deprecated as of Spring 3.0, in favor of Java 5 enums.
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 6e96cb26d0..3c53c71275 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
@@ -18,7 +18,7 @@ package org.springframework.core.env;
 
 
 /**
- * Interface indicating a component contains and makes available an {@link Environment} object. 
+ * Interface indicating a component contains and makes available an {@link Environment} object.
  *
  * <p>All Spring application contexts are EnvironmentCapable, and the interface is used primarily
  * for performing {@code instanceof} checks in framework methods that accept BeanFactory
diff --git a/spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java b/spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java
index 7e1f58a0c7..3b1ca88ea2 100644
--- a/spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -29,7 +29,7 @@ import java.io.InputStream;
  * file-based <code>Resource</code> implementation can be used as a concrete
  * instance, allowing one to read the underlying content stream multiple times.
  * This makes this interface useful as an abstract content source for mail
- * attachments, for example. 
+ * attachments, for example.
  *
  * @author Juergen Hoeller
  * @since 20.01.2004
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 f9a3645a3e..61a56cdaff 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
@@ -66,7 +66,7 @@ import org.springframework.util.StringUtils;
  * Examples are real URLs such as "<code>file:C:/context.xml</code>", pseudo-URLs
  * such as "<code>classpath:/context.xml</code>", and simple unprefixed paths
  * such as "<code>/WEB-INF/context.xml</code>". The latter will resolve in a
- * fashion specific to the underlying <code>ResourceLoader</code> (e.g. 
+ * fashion specific to the underlying <code>ResourceLoader</code> (e.g.
  * <code>ServletContextResource</code> for a <code>WebApplicationContext</code>).
  *
  * <p><b>Ant-style Patterns:</b>
@@ -147,7 +147,7 @@ import org.springframework.util.StringUtils;
  *     com/mycompany/package1/service-context.xml
  * </pre>may be in only one location, but when a path such as<pre>
  *     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");</code>. If this base package
  * node exists in multiple classloader locations, the actual end resource may
  * not be underneath. Therefore, preferably, use "<code>classpath*:<code>" with the same
@@ -695,7 +695,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 			else if ("toString".equals(methodName)) {
 				return toString();
 			}
-			
+
 			throw new IllegalStateException("Unexpected method invocation: " + method);
 		}
 
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java b/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java
index a50fbea446..a247769a7a 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java
@@ -24,12 +24,12 @@ import org.springframework.core.NestedIOException;
 
 /**
  * Deserializer that reads an input stream using Java Serialization.
- * 
+ *
  * @author Gary Russell
  * @author Mark Fisher
  * @since 3.0.5
  */
-public class DefaultDeserializer implements Deserializer<Object> { 
+public class DefaultDeserializer implements Deserializer<Object> {
 
 	/**
 	 * Reads the input stream and deserializes into an object.
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java b/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java
index 792be40ad3..8e03728e8c 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
 
 /**
  * Serializer that writes an object to an output stream using Java Serialization.
- * 
+ *
  * @author Gary Russell
  * @author Mark Fisher
  * @since 3.0.5
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java b/spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java
index 02958ac5b3..0219a70e42 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java
@@ -21,7 +21,7 @@ import java.io.InputStream;
 
 /**
  * A strategy interface for converting from data in an InputStream to an Object.
- * 
+ *
  * @author Gary Russell
  * @author Mark Fisher
  * @since 3.0.5
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/Serializer.java b/spring-core/src/main/java/org/springframework/core/serializer/Serializer.java
index 88ec0d4f40..b1e0bb95e0 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/Serializer.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/Serializer.java
@@ -21,7 +21,7 @@ import java.io.OutputStream;
 
 /**
  * A strategy interface for streaming an object to an OutputStream.
- * 
+ *
  * @author Gary Russell
  * @author Mark Fisher
  * @since 3.0.5
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/package-info.java b/spring-core/src/main/java/org/springframework/core/serializer/package-info.java
index f94296f9ca..36a79f4151 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/package-info.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/package-info.java
@@ -1,7 +1,7 @@
 
 /**
  *
- * Root package for Spring's serializer interfaces and implementations. 
+ * Root package for Spring's serializer interfaces and implementations.
  * Provides an abstraction over various serialization techniques.
  * Includes exceptions for serialization and deserialization failures.
  *
diff --git a/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java b/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java
index 1457589bf1..a49fa80461 100644
--- a/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java
@@ -17,7 +17,7 @@
 package org.springframework.core.style;
 
 /**
- * Simple utility class to allow for convenient access to value 
+ * Simple utility class to allow for convenient access to value
  * styling logic, mainly to support descriptive logging messages.
  *
  * <p>For more sophisticated needs, use the {@link ValueStyler} abstraction
@@ -30,7 +30,7 @@ package org.springframework.core.style;
  * @see DefaultValueStyler
  */
 public abstract class StylerUtils {
-	
+
 	/**
 	 * Default ValueStyler instance used by the <code>style</code> method.
 	 * Also available for the {@link ToStringCreator} class in this package.
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 fcf1d27584..51441951d5 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
@@ -22,7 +22,7 @@ import org.springframework.util.Assert;
  * Utility class that builds pretty-printing <code>toString()</code> methods
  * with pluggable styling conventions. By default, ToStringCreator adheres
  * to Spring's <code>toString()</code> styling conventions.
- * 
+ *
  * @author Keith Donald
  * @author Juergen Hoeller
  * @since 1.2.2
diff --git a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
index 4830730c75..d79cb3e533 100644
--- a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
@@ -41,7 +41,7 @@ public class SyncTaskExecutor implements TaskExecutor, Serializable {
 	/**
 	 * Executes the given <code>task</code> synchronously, through direct
 	 * invocation of it's {@link Runnable#run() run()} method.
-	 * @throws IllegalArgumentException if the given <code>task</code> is <code>null</code> 
+	 * @throws IllegalArgumentException if the given <code>task</code> is <code>null</code>
 	 */
 	public void execute(Runnable task) {
 		Assert.notNull(task, "Runnable must not be null");
diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
index a13738578a..71956bf224 100644
--- a/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
@@ -21,7 +21,7 @@ import java.util.concurrent.Executor;
 /**
  * Simple task executor interface that abstracts the execution
  * of a {@link Runnable}.
- * 
+ *
  * <p>Implementations can use all sorts of different execution strategies,
  * such as: synchronous, asynchronous, using a thread pool, and more.
  *
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 aca42b9d94..a9e89dff14 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
@@ -67,11 +67,11 @@ public class StandardMethodMetadata implements MethodMetadata {
 		return this.introspectedMethod;
 	}
 
-	
+
 	public String getMethodName() {
 		return this.introspectedMethod.getName();
 	}
-	
+
 	public String getDeclaringClassName() {
 		return this.introspectedMethod.getDeclaringClass().getName();
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/package-info.java b/spring-core/src/main/java/org/springframework/core/type/classreading/package-info.java
index 5a8afa0838..62b269f486 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/package-info.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/package-info.java
@@ -1,8 +1,8 @@
 
 /**
- * 
+ *
  * Support classes for reading annotation and class-level metadata.
- * 
+ *
  */
 package org.springframework.core.type.classreading;
 
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 bebdb7dd88..1a218fb70d 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
@@ -24,12 +24,12 @@ import org.springframework.core.type.classreading.MetadataReader;
 
 /**
  * Type filter that is aware of traversing over hierarchy.
- * 
+ *
  * <p>This filter is useful when matching needs to be made based on potentially the
  * whole class/interface hierarchy. The algorithm employed uses a succeed-fast
  * strategy: if at any time a match is declared, no further processing is
  * carried out.
- * 
+ *
  * @author Ramnivas Laddad
  * @author Mark Fisher
  * @since 2.5
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 e0a1aba156..73c494b458 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
@@ -78,7 +78,7 @@ public class AnnotationTypeFilter extends AbstractTypeHierarchyTraversingFilter
 	@Override
 	protected boolean matchSelf(MetadataReader metadataReader) {
 		AnnotationMetadata metadata = metadataReader.getAnnotationMetadata();
-		return metadata.hasAnnotation(this.annotationType.getName()) || 
+		return metadata.hasAnnotation(this.annotationType.getName()) ||
 				(this.considerMetaAnnotations && metadata.hasMetaAnnotation(this.annotationType.getName()));
 	}
 
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 8fb8ecd3f7..7d0f457452 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,12 +1,12 @@
 /*
  * Copyright 2002-2007 the original author 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.
diff --git a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
index 832b4a1f55..b8a615150b 100644
--- a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
+++ b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
@@ -37,7 +37,7 @@ import java.util.WeakHashMap;
  * <p>This class is an abstract template. Caching Map implementations
  * should subclass and override the <code>create(key)</code> method which
  * encapsulates expensive creation of a new object.
- * 
+ *
  * @author Keith Donald
  * @author Juergen Hoeller
  * @since 1.2.2
diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java b/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
index 172359c351..a845c061c8 100644
--- a/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
+++ b/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
@@ -54,7 +54,7 @@ public abstract class ConcurrencyThrottleSupport implements Serializable {
 	 * Switch concurrency 'off': that is, don't allow any concurrent invocations.
 	 */
 	public static final int NO_CONCURRENCY = 0;
-	
+
 
 	/** Transient to optimize serialization */
 	protected transient Log logger = LogFactory.getLog(getClass());
@@ -99,7 +99,7 @@ public abstract class ConcurrencyThrottleSupport implements Serializable {
 	/**
 	 * To be invoked before the main execution logic of concrete subclasses.
 	 * <p>This implementation applies the concurrency throttle.
-	 * @see #afterAccess() 
+	 * @see #afterAccess()
 	 */
 	protected void beforeAccess() {
 		if (this.concurrencyLimit == NO_CONCURRENCY) {
diff --git a/spring-core/src/main/java/org/springframework/util/DigestUtils.java b/spring-core/src/main/java/org/springframework/util/DigestUtils.java
index 200c73b7e6..0328c0fdd6 100644
--- a/spring-core/src/main/java/org/springframework/util/DigestUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/DigestUtils.java
@@ -67,7 +67,7 @@ public abstract class DigestUtils {
 	}
 
 	/**
-	 * Creates a new {@link MessageDigest} with the given algorithm. Necessary 
+	 * Creates a new {@link MessageDigest} with the given algorithm. Necessary
 	 * because {@code MessageDigest} is not thread-safe.
 	 */
 	private static MessageDigest getDigest(String algorithm) {
diff --git a/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java b/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java
index 9fb5c755a4..a8edf97060 100644
--- a/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java
+++ b/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java
@@ -1,12 +1,12 @@
 /*
  * 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.
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 6e8eaff2f1..7506863875 100644
--- a/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java
@@ -22,7 +22,7 @@ import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver;
  * Helper class for resolving placeholders in texts. Usually applied to file paths.
  *
  * <p>A text may contain <code>${...}</code> placeholders, to be resolved as system properties: e.g.
- * <code>${user.dir}</code>.  Default values can be supplied using the ":" separator between key 
+ * <code>${user.dir}</code>.  Default values can be supplied using the ":" separator between key
  * and value.
  *
  * @author Juergen Hoeller
diff --git a/spring-core/src/main/java/org/springframework/util/TypeUtils.java b/spring-core/src/main/java/org/springframework/util/TypeUtils.java
index 6c98fb26f6..0f0125cf41 100644
--- a/spring-core/src/main/java/org/springframework/util/TypeUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/TypeUtils.java
@@ -212,7 +212,7 @@ public abstract class TypeUtils {
 
 		return true;
 	}
-	
+
 	public static boolean isAssignableBound(Type lhsType, Type rhsType) {
 		if (rhsType == null) {
 			return true;
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/ComparableComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/ComparableComparator.java
index 269fddb4b9..40e4e7af93 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/ComparableComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/ComparableComparator.java
@@ -22,7 +22,7 @@ import java.util.Comparator;
  * Comparator that adapts Comparables to the Comparator interface.
  * Mainly for internal use in other Comparators, when supposed
  * to work on Comparables.
- * 
+ *
  * @author Keith Donald
  * @since 1.2.2
  * @see Comparable
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java
index 4e1a6189af..ba56bd54d1 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
  *
  * <p>This facilitates in-memory sorting similar to multi-column sorting in SQL.
  * The order of any single Comparator in the list can also be reversed.
- * 
+ *
  * @author Keith Donald
  * @author Juergen Hoeller
  * @since 1.2.2
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 62e1328fcf..d34943281b 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
@@ -119,7 +119,7 @@ public abstract class DomUtils {
 	}
 
 	/**
-	 * Retrieve all child elements of the given DOM element	
+	 * Retrieve 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</code> instances
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 c2f8b8509d..37dff4fb81 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
@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
  *
  * @author Arjen Poutsma
  * @since 3.0.5
- * @see StaxUtils#createEventStreamWriter(javax.xml.stream.XMLEventWriter, javax.xml.stream.XMLEventFactory) 
+ * @see StaxUtils#createEventStreamWriter(javax.xml.stream.XMLEventWriter, javax.xml.stream.XMLEventFactory)
  */
 class XMLEventStreamWriter implements XMLStreamWriter {
 
@@ -51,7 +51,7 @@ class XMLEventStreamWriter implements XMLStreamWriter {
 	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;
 	}
diff --git a/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java
index 7d87547b5f..c5c4ed5e67 100644
--- a/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-core/src/test/java/org/springframework/beans/IOther.java b/spring-core/src/test/java/org/springframework/beans/IOther.java
index 797486ec44..6a8f74187c 100644
--- a/spring-core/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-core/src/test/java/org/springframework/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
index a06e15d150..0eb8df5c8a 100644
--- a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java
index 2136a269d9..4df72c3091 100644
--- a/spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java
+++ b/spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2006 the original author 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.
@@ -33,7 +33,7 @@ public abstract class AbstractControlFlowTests extends TestCase {
 		new Two().testing();
 		new Three().test();
 	}
-	
+
 	/*
 	public void testUnderPackage() {
 		ControlFlow cflow = new ControlFlow();
@@ -43,7 +43,7 @@ public abstract class AbstractControlFlowTests extends TestCase {
 	}
 	*/
 
-	
+
 	public class One {
 
 		public void test() {
diff --git a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
index 95f93a430d..98c4a54314 100644
--- a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
@@ -882,7 +882,7 @@ public class BridgeMethodResolverTests {
 	}
 
 
-	public class GenericHibernateRepository<T, ID extends Serializable> 
+	public class GenericHibernateRepository<T, ID extends Serializable>
 					implements ConvenientGenericRepository<T, ID> {
 
 		/**
diff --git a/spring-core/src/test/java/org/springframework/core/ConstantsTests.java b/spring-core/src/test/java/org/springframework/core/ConstantsTests.java
index 68fe5cd747..2dc85aae31 100644
--- a/spring-core/src/test/java/org/springframework/core/ConstantsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ConstantsTests.java
@@ -33,7 +33,7 @@ public class ConstantsTests extends TestCase {
 		Constants c = new Constants(A.class);
 		assertEquals(A.class.getName(), c.getClassName());
 		assertEquals(9, c.getSize());
-		
+
 		assertEquals(c.asNumber("DOG").intValue(), A.DOG);
 		assertEquals(c.asNumber("dog").intValue(), A.DOG);
 		assertEquals(c.asNumber("cat").intValue(), A.CAT);
diff --git a/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java
index d527f769ea..ea011aa984 100644
--- a/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java
+++ b/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java
@@ -22,7 +22,7 @@ package org.springframework.core;
  * @author Rod Johnson
  */
 public class DefaultControlFlowTests extends AbstractControlFlowTests {
-	
+
 	/**
 	 * Necessary only because Eclipse won't run test suite unless
 	 * it declares some methods as well as inherited methods.
diff --git a/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java
index 040a6fcf20..281141361e 100644
--- a/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java
+++ b/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java
@@ -22,7 +22,7 @@ package org.springframework.core;
  * @author Rod Johnson
  */
 public class Jdk14ControlFlowTests extends AbstractControlFlowTests {
-	
+
 	/**
 	 * Necessary only because Eclipse won't run test suite unless it declares
 	 * some methods as well as inherited methods
diff --git a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
index 5951028343..4239e38e29 100644
--- a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
+++ b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
@@ -189,7 +189,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 		m = clazz.getMethod("getDate", null);
 		names = discoverer.getParameterNames(m);
 		assertEquals(0, names.length);
-		
+
 		//System.in.read();
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java b/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
index 7d86d86071..4873105ce2 100644
--- a/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
+++ b/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -70,7 +70,7 @@ public class NestedExceptionTests extends TestCase {
 		NestedCheckedException nex = new NestedCheckedException(mesg) {};
 		assertNull(nex.getCause());
 		assertEquals(nex.getMessage(), mesg);
-		
+
 		// Check printStackTrace
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		PrintWriter pw = new PrintWriter(baos);
@@ -79,7 +79,7 @@ public class NestedExceptionTests extends TestCase {
 		String stackTrace = new String(baos.toByteArray());
 		assertFalse(stackTrace.indexOf(mesg) == -1);
 	}
-	
+
 	public void testNestedCheckedExceptionWithRootCause() {
 		String myMessage = "mesg for this exception";
 		String rootCauseMesg = "this is the obscure message of the root cause";
@@ -89,7 +89,7 @@ public class NestedExceptionTests extends TestCase {
 		Assert.assertEquals(nex.getCause(), rootCause);
 		assertTrue(nex.getMessage().indexOf(myMessage) != -1);
 		assertTrue(nex.getMessage().indexOf(rootCauseMesg) != -1);
-		
+
 		// check PrintStackTrace
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		PrintWriter pw = new PrintWriter(baos);
diff --git a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
index c51d8c1dbf..b5480482e4 100644
--- a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
+++ b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
@@ -25,11 +25,11 @@ import junit.framework.TestCase;
 import org.springframework.beans.TestBean;
 
 public class PrioritizedParameterNameDiscovererTests extends TestCase {
-	
+
 	private static final String[] FOO_BAR = new String[] { "foo", "bar" };
-	
+
 	private static final String[] SOMETHING_ELSE = new String[] { "something", "else" };
-	
+
 	ParameterNameDiscoverer returnsFooBar = new ParameterNameDiscoverer() {
 		public String[] getParameterNames(Method m) {
 			return FOO_BAR;
@@ -38,7 +38,7 @@ public class PrioritizedParameterNameDiscovererTests extends TestCase {
 			return FOO_BAR;
 		}
 	};
-	
+
 	ParameterNameDiscoverer returnsSomethingElse = new ParameterNameDiscoverer() {
 		public String[] getParameterNames(Method m) {
 			return SOMETHING_ELSE;
@@ -47,20 +47,20 @@ public class PrioritizedParameterNameDiscovererTests extends TestCase {
 			return SOMETHING_ELSE;
 		}
 	};
-	
+
 	private final Method anyMethod;
 	private final Class anyClass = Object.class;
-	
+
 	public PrioritizedParameterNameDiscovererTests() throws SecurityException, NoSuchMethodException {
 		anyMethod = TestBean.class.getMethod("getAge", (Class[]) null);
 	}
-	
+
 	public void testNoParametersDiscoverers() {
 		ParameterNameDiscoverer pnd = new PrioritizedParameterNameDiscoverer();
 		assertNull(pnd.getParameterNames(anyMethod));
 		assertNull(pnd.getParameterNames((Constructor) null));
 	}
-	
+
 	public void testOrderedParameterDiscoverers1() {
 		PrioritizedParameterNameDiscoverer pnd = new PrioritizedParameterNameDiscoverer();
 		pnd.addDiscoverer(returnsFooBar);
@@ -70,7 +70,7 @@ public class PrioritizedParameterNameDiscovererTests extends TestCase {
 		assertTrue(Arrays.equals(FOO_BAR, pnd.getParameterNames(anyMethod)));
 		assertTrue(Arrays.equals(FOO_BAR, pnd.getParameterNames((Constructor) null)));
 	}
-	
+
 	public void testOrderedParameterDiscoverers2() {
 		PrioritizedParameterNameDiscoverer pnd = new PrioritizedParameterNameDiscoverer();
 		pnd.addDiscoverer(returnsSomethingElse);
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 7ae7007863..b02c6c3aaa 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
@@ -363,5 +363,5 @@ public class AnnotationUtilsTests {
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @interface Transactional {
-	
+
 }
diff --git a/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
index 3717edb38e..f430a29935 100644
--- a/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 
 /**
  * Unit tests for {@link AbstractPropertySource} implementations.
- * 
+ *
  * @author Chris Beams
  * @since 3.1
  */
diff --git a/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
index 0db7b301ff..694335eeb4 100644
--- a/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
@@ -137,14 +137,14 @@ public class PathMatchingResourcePatternResolverTests {
 //		List expectedNames = new LinkedList(Arrays.asList(fileNames));
 //		Collections.sort(sortedActualNames);
 //		Collections.sort(expectedNames);
-//		
+//
 //		System.out.println("-----------");
 //		System.out.println("Expected: " + StringUtils.collectionToCommaDelimitedString(expectedNames));
 //		System.out.println("Actual: " + StringUtils.collectionToCommaDelimitedString(sortedActualNames));
 //		for (int i = 0; i < resources.length; i++) {
 //			System.out.println(resources[i]);
 //		}
-			
+
 		assertEquals("Correct number of files found", fileNames.length, resources.length);
 		for (int i = 0; i < resources.length; i++) {
 			Resource resource = resources[i];
diff --git a/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java b/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
index c12bd5b8e7..235d2f5486 100644
--- a/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
@@ -40,7 +40,7 @@ public class ResourceArrayPropertyEditorTests {
 
 	@Test
 	public void testPatternResource() throws Exception {
-		// N.B. this will sometimes fail if you use classpath: instead of classpath*:.  
+		// N.B. this will sometimes fail if you use classpath: instead of classpath*:.
 		// The result depends on the classpath - if test-classes are segregated from classes
 		// and they come first on the classpath (like in Maven) then it breaks, if classes
 		// comes first (like in Spring Build) then it is OK.
diff --git a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
index 6f051a16e7..ca52e93e38 100644
--- a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
+++ b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
@@ -214,7 +214,7 @@ public class AnnotationMetadataTests {
 			})
 	@SuppressWarnings({"serial", "unused"})
 	private static class AnnotatedComponent implements Serializable {
-		
+
 		@TestAutowired
 		public void doWork(@TestQualifier("myColor") java.awt.Color color) {
 		}
diff --git a/spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java b/spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java
index ef547f5fb8..1e99fa0299 100644
--- a/spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java
+++ b/spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java
@@ -39,7 +39,7 @@ public class AssignableTypeFilterTests extends TestCase {
 		assertFalse(notMatchingFilter.match(metadataReader, metadataReaderFactory));
 		assertTrue(matchingFilter.match(metadataReader, metadataReaderFactory));
 	}
-	
+
 	public void testInterfaceMatch() throws Exception {
 		MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
 		String classUnderTest = "org.springframework.core.type.AssignableTypeFilterTests$TestInterfaceImpl";
@@ -49,7 +49,7 @@ public class AssignableTypeFilterTests extends TestCase {
 		assertTrue(filter.match(metadataReader, metadataReaderFactory));
 		ClassloadingAssertions.assertClassNotLoaded(classUnderTest);
 	}
-	
+
 	public void testSuperClassMatch() throws Exception {
 		MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
 		String classUnderTest = "org.springframework.core.type.AssignableTypeFilterTests$SomeDaoLikeImpl";
@@ -59,7 +59,7 @@ public class AssignableTypeFilterTests extends TestCase {
 		assertTrue(filter.match(metadataReader, metadataReaderFactory));
 		ClassloadingAssertions.assertClassNotLoaded(classUnderTest);
 	}
-	
+
 	public void testInterfaceThroughSuperClassMatch() throws Exception {
 		MetadataReaderFactory metadataReaderFactory = new SimpleMetadataReaderFactory();
 		String classUnderTest = "org.springframework.core.type.AssignableTypeFilterTests$SomeDaoLikeImpl";
diff --git a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
index e6128c35bf..c3cc1a806f 100644
--- a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
+++ b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-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.
@@ -32,8 +32,8 @@ import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
 /**
  * Unit test checking the behaviour of {@link CachingMetadataReaderFactory under load.
  * If the cache is not controller, this test should fail with an out of memory exception around entry
- * 5k. 
- * 
+ * 5k.
+ *
  * @author Costin Leau
  */
 public class CachingMetadataReaderLeakTest {
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 451005558e..d27cb93109 100644
--- a/spring-core/src/test/java/org/springframework/util/CompositeIteratorTests.java
+++ b/spring-core/src/test/java/org/springframework/util/CompositeIteratorTests.java
@@ -9,7 +9,7 @@ import junit.framework.TestCase;
 
 /**
  * Test case for {@link CompositeIterator}.
- * 
+ *
  * @author Erwin Vervaet
  */
 public class CompositeIteratorTests extends TestCase {
diff --git a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
index f15b52ffc4..5eaa203ef5 100644
--- a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
@@ -24,51 +24,51 @@ import junit.framework.TestCase;
  * @author Rob Harrop
  */
 public class FileSystemUtilsTests extends TestCase {
-	
+
 	public void testDeleteRecursively() throws Exception {
 		File root = new File("./tmp/root");
 		File child = new File(root, "child");
 		File grandchild = new File(child, "grandchild");
-		
+
 		grandchild.mkdirs();
-		
+
 		File bar = new File(child, "bar.txt");
 		bar.createNewFile();
-		
+
 		assertTrue(root.exists());
 		assertTrue(child.exists());
 		assertTrue(grandchild.exists());
 		assertTrue(bar.exists());
-		
+
 		FileSystemUtils.deleteRecursively(root);
-		
+
 		assertFalse(root.exists());
 		assertFalse(child.exists());
 		assertFalse(grandchild.exists());
 		assertFalse(bar.exists());
 	}
-	
+
 	public void testCopyRecursively() throws Exception {
 		File src = new File("./tmp/src");
 		File child = new File(src, "child");
 		File grandchild = new File(child, "grandchild");
-		
+
 		grandchild.mkdirs();
-		
+
 		File bar = new File(child, "bar.txt");
 		bar.createNewFile();
-		
+
 		assertTrue(src.exists());
 		assertTrue(child.exists());
 		assertTrue(grandchild.exists());
 		assertTrue(bar.exists());
-		
+
 		File dest = new File("./dest");
 		FileSystemUtils.copyRecursively(src, dest);
-		
+
 		assertTrue(dest.exists());
 		assertTrue(new File(dest, child.getName()).exists());
-		
+
 		FileSystemUtils.deleteRecursively(src);
 		assertTrue(!src.exists());
 	}
diff --git a/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java b/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java
index 1b75fd96e9..b71c516c8c 100644
--- a/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java
+++ b/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java
index 18bc8b2d5b..13e662d381 100644
--- a/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java
+++ b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -26,11 +26,11 @@ import org.apache.log4j.spi.LoggingEvent;
  * @author Alef Arendsen
  */
 public class MockLog4jAppender extends AppenderSkeleton {
-	
+
 	public static final List loggingStrings = new ArrayList();
-	
+
 	public static boolean closeCalled = false;
-	
+
 	/* (non-Javadoc)
 	 * @see org.apache.log4j.AppenderSkeleton#append(org.apache.log4j.spi.LoggingEvent)
 	 */
@@ -38,7 +38,7 @@ public class MockLog4jAppender extends AppenderSkeleton {
 		//System.out.println("Adding " + evt.getMessage());
 		loggingStrings.add(evt.getMessage());
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see org.apache.log4j.Appender#close()
 	 */
@@ -49,11 +49,11 @@ public class MockLog4jAppender extends AppenderSkeleton {
 	/* (non-Javadoc)
 	 * @see org.apache.log4j.Appender#requiresLayout()
 	 */
-	public boolean requiresLayout() {		
+	public boolean requiresLayout() {
 		return false;
 	}
-	
-	
+
+
 
 
 }
diff --git a/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java b/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java
index 58f8f14af3..d353cb9e0a 100644
--- a/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java
+++ b/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java
@@ -98,7 +98,7 @@ public class PropertyPlaceholderHelperTests {
 		String text = "foo=${foo},bar=${bar}";
 		Properties props = new Properties();
 		props.setProperty("foo", "bar");
-		
+
 		assertEquals("foo=bar,bar=${bar}", this.helper.replacePlaceholders(text, props));
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-core/src/test/java/org/springframework/util/SerializationTestUtils.java
index bdffe7578d..39a7582e83 100644
--- a/spring-core/src/test/java/org/springframework/util/SerializationTestUtils.java
+++ b/spring-core/src/test/java/org/springframework/util/SerializationTestUtils.java
@@ -27,13 +27,13 @@ import org.springframework.beans.TestBean;
  * @author Rod Johnson
  */
 public class SerializationTestUtils extends TestCase {
-	
+
 	public static void testSerialization(Object o) throws IOException {
 		OutputStream baos = new ByteArrayOutputStream();
 		ObjectOutputStream oos = new ObjectOutputStream(baos);
 		oos.writeObject(o);
 	}
-	
+
 	public static boolean isSerializable(Object o) throws IOException {
 		try {
 			testSerialization(o);
@@ -43,7 +43,7 @@ public class SerializationTestUtils extends TestCase {
 			return false;
 		}
 	}
-	
+
 	public static Object serializeAndDeserialize(Object o) throws IOException, ClassNotFoundException {
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		ObjectOutputStream oos = new ObjectOutputStream(baos);
@@ -51,24 +51,24 @@ public class SerializationTestUtils extends TestCase {
 		oos.flush();
 		baos.flush();
 		byte[] bytes = baos.toByteArray();
-		
+
 		ByteArrayInputStream is = new ByteArrayInputStream(bytes);
 		ObjectInputStream ois = new ObjectInputStream(is);
 		Object o2 = ois.readObject();
-		
+
 		return o2;
 	}
-	
+
 	public SerializationTestUtils(String s) {
 		super(s);
 	}
-	
+
 	public void testWithNonSerializableObject() throws IOException {
 		TestBean o = new TestBean();
 		assertFalse(o instanceof Serializable);
-		
+
 		assertFalse(isSerializable(o));
-		
+
 		try {
 			testSerialization(o);
 			fail();
@@ -77,17 +77,17 @@ public class SerializationTestUtils extends TestCase {
 			// Ok
 		}
 	}
-	
+
 	public void testWithSerializableObject() throws Exception {
 		int x = 5;
 		int y = 10;
 		Point p = new Point(x, y);
 		assertTrue(p instanceof Serializable);
-	
+
 		testSerialization(p);
-		
+
 		assertTrue(isSerializable(p));
-		
+
 		Point p2 = (Point) serializeAndDeserialize(p);
 		assertNotSame(p, p2);
 		assertEquals(x, (int) p2.getX());
diff --git a/spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java b/spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java
index 46a1287f5c..630568b818 100644
--- a/spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java
@@ -28,7 +28,7 @@ import org.springframework.util.SerializationUtils;
 
 /**
  * Test for static utility to help with serialization.
- * 
+ *
  * @author Dave Syer
  * @since 3.0.5
  */
diff --git a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
index a066318ebf..83029423f2 100644
--- a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
@@ -1,13 +1,13 @@
- 
+
 /*
  * 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.
@@ -33,17 +33,17 @@ public class StopWatchTests extends TestCase {
 		long int2 = 45L;
 		String name1 = "Task 1";
 		String name2 = "Task 2";
-		
+
 		long fudgeFactor = 5L;
 		assertFalse(sw.isRunning());
 		sw.start(name1);
 		Thread.sleep(int1);
 		assertTrue(sw.isRunning());
 		sw.stop();
-		
+
 		// TODO are timings off in JUnit? Why do these assertions sometimes fail
 		// under both Ant and Eclipse?
-		
+
 		//assertTrue("Unexpected timing " + sw.getTotalTime(), sw.getTotalTime() >= int1);
 		//assertTrue("Unexpected timing " + sw.getTotalTime(), sw.getTotalTime() <= int1 + fudgeFactor);
 		sw.start(name2);
@@ -51,19 +51,19 @@ public class StopWatchTests extends TestCase {
 		sw.stop();
 		//assertTrue("Unexpected timing " + sw.getTotalTime(), sw.getTotalTime() >= int1 + int2);
 		//assertTrue("Unexpected timing " + sw.getTotalTime(), sw.getTotalTime() <= int1 + int2 + fudgeFactor);
-		
+
 		assertTrue(sw.getTaskCount() == 2);
 		String pp = sw.prettyPrint();
 		assertTrue(pp.indexOf(name1) != -1);
 		assertTrue(pp.indexOf(name2) != -1);
-		
+
 		StopWatch.TaskInfo[] tasks = sw.getTaskInfo();
 		assertTrue(tasks.length == 2);
 		assertTrue(tasks[0].getTaskName().equals(name1));
 		assertTrue(tasks[1].getTaskName().equals(name2));
 		sw.toString();
 	}
-	
+
 	public void testValidUsageNotKeepingTaskList() throws Exception {
 		StopWatch sw = new StopWatch();
 		sw.setKeepTaskList(false);
@@ -71,17 +71,17 @@ public class StopWatchTests extends TestCase {
 		long int2 = 45L;
 		String name1 = "Task 1";
 		String name2 = "Task 2";
-	
+
 		long fudgeFactor = 5L;
 		assertFalse(sw.isRunning());
 		sw.start(name1);
 		Thread.sleep(int1);
 		assertTrue(sw.isRunning());
 		sw.stop();
-	
+
 		// TODO are timings off in JUnit? Why do these assertions sometimes fail
 		// under both Ant and Eclipse?
-	
+
 		//assertTrue("Unexpected timing " + sw.getTotalTime(), sw.getTotalTime() >= int1);
 		//assertTrue("Unexpected timing " + sw.getTotalTime(), sw.getTotalTime() <= int1 + fudgeFactor);
 		sw.start(name2);
@@ -89,12 +89,12 @@ public class StopWatchTests extends TestCase {
 		sw.stop();
 		//assertTrue("Unexpected timing " + sw.getTotalTime(), sw.getTotalTime() >= int1 + int2);
 		//assertTrue("Unexpected timing " + sw.getTotalTime(), sw.getTotalTime() <= int1 + int2 + fudgeFactor);
-	
+
 		assertTrue(sw.getTaskCount() == 2);
 		String pp = sw.prettyPrint();
 		assertTrue(pp.indexOf("kept") != -1);
 		sw.toString();
-	
+
 		try {
 			sw.getTaskInfo();
 			fail();
@@ -103,7 +103,7 @@ public class StopWatchTests extends TestCase {
 			// Ok
 		}
 	}
-	
+
 	public void testFailureToStartBeforeGettingTimings() {
 		StopWatch sw = new StopWatch();
 		try {
@@ -114,7 +114,7 @@ public class StopWatchTests extends TestCase {
 			// Ok
 		}
 	}
-	
+
 	public void testFailureToStartBeforeStop() {
 		StopWatch sw = new StopWatch();
 		try {
@@ -125,7 +125,7 @@ public class StopWatchTests extends TestCase {
 			// Ok
 		}
 	}
-	
+
 	public void testRejectsStartTwice() {
 		StopWatch sw = new StopWatch();
 		try {
diff --git a/spring-core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTests.java b/spring-core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTests.java
index 1cf4bf3c0a..00fb47bddb 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/XMLEventStreamWriterTests.java
@@ -42,7 +42,7 @@ public class XMLEventStreamWriterTests {
 		XMLEventWriter eventWriter = outputFactory.createXMLEventWriter(stringWriter);
 		streamWriter = new XMLEventStreamWriter(eventWriter, XMLEventFactory.newInstance());
 	}
-	
+
 	@Test
 	public void write() throws Exception {
 		streamWriter.writeStartDocument();
diff --git a/spring-expression/src/main/java/org/springframework/expression/AccessException.java b/spring-expression/src/main/java/org/springframework/expression/AccessException.java
index d0b41aab6d..09efbbe45d 100644
--- a/spring-expression/src/main/java/org/springframework/expression/AccessException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/AccessException.java
@@ -18,7 +18,7 @@ package org.springframework.expression;
 
 /**
  * An AccessException is thrown by an accessor if it has an unexpected problem.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
diff --git a/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java b/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
index c3857d8e98..2b5e33d594 100644
--- a/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
+++ b/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
@@ -35,4 +35,3 @@ public interface BeanResolver {
 	Object resolve(EvaluationContext context, String beanName) throws AccessException;
 
 }
-	
\ No newline at end of file
diff --git a/spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java b/spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java
index 34bda66d9e..260f93e4d8 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java
@@ -23,10 +23,10 @@ package org.springframework.expression;
  * back to the resolvers. For example, the particular constructor to run on a class may be discovered by the reflection
  * constructor resolver - it will then build a ConstructorExecutor that executes that constructor and the
  * ConstructorExecutor can be reused without needing to go back to the resolver to discover the constructor again.
- * 
+ *
  * 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
  */
diff --git a/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java b/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java
index 995c65d0d3..e082baec66 100644
--- a/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java
@@ -18,7 +18,7 @@ package org.springframework.expression;
 
 /**
  * Represent an exception that occurs during expression evaluation.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
@@ -28,7 +28,7 @@ public class EvaluationException extends ExpressionException {
 	 * Creates a new expression evaluation exception.
 	 * @param position the position in the expression where the problem occurred
 	 * @param message description of the problem that occurred
-	 */ 
+	 */
 	public EvaluationException(int position, String message) {
 		super(position, message);
 	}
@@ -37,7 +37,7 @@ public class EvaluationException extends ExpressionException {
 	 * Creates a new expression evaluation exception.
 	 * @param expressionString the expression that could not be evaluated
 	 * @param message description of the problem that occurred
-	 */ 
+	 */
 	public EvaluationException(String expressionString, String message) {
 		super(expressionString, message);
 	}
@@ -47,7 +47,7 @@ public class EvaluationException extends ExpressionException {
 	 * @param position the position in the expression where the problem occurred
 	 * @param message description of the problem that occurred
 	 * @param cause the underlying cause of this exception
-	 */ 
+	 */
 	public EvaluationException(int position, String message, Throwable cause) {
 		super(position, message, cause);
 	}
@@ -55,7 +55,7 @@ public class EvaluationException extends ExpressionException {
 	/**
 	 * Creates a new expression evaluation exception.
 	 * @param message description of the problem that occurred
-	 */ 
+	 */
 	public EvaluationException(String message) {
 		super(message);
 	}
diff --git a/spring-expression/src/main/java/org/springframework/expression/Expression.java b/spring-expression/src/main/java/org/springframework/expression/Expression.java
index e0cddfa68a..a353ab005d 100644
--- a/spring-expression/src/main/java/org/springframework/expression/Expression.java
+++ b/spring-expression/src/main/java/org/springframework/expression/Expression.java
@@ -37,14 +37,14 @@ public interface Expression {
 	 */
 	Object getValue() throws EvaluationException;
 
-	/** 
+	/**
 	 * Evaluate this expression against the specified root object
 	 * @param rootObject the root object against which properties/etc will be resolved
 	 * @return the evaluation result
 	 * @throws EvaluationException if there is a problem during evaluation
 	 */
 	Object getValue(Object rootObject) throws EvaluationException;
-	
+
 	/**
 	 * Evaluate the expression in the default context. If the result of the evaluation does not match (and
 	 * cannot be converted to) the expected result type then an exception will be returned.
@@ -53,10 +53,10 @@ public interface Expression {
 	 * @throws EvaluationException if there is a problem during evaluation
 	 */
 	<T> T getValue(Class<T> desiredResultType) throws EvaluationException;
-	
+
 	/**
-	 * Evaluate the expression in the default context against the specified root object. If the 
-	 * result of the evaluation does not match (and cannot be converted to) the expected result type 
+	 * Evaluate the expression in the default context against the specified root object. If the
+	 * result of the evaluation does not match (and cannot be converted to) the expected result type
 	 * then an exception will be returned.
 	 * @param rootObject the root object against which properties/etc will be resolved
 	 * @param desiredResultType the class the caller would like the result to be
@@ -82,7 +82,7 @@ public interface Expression {
 	 * @throws EvaluationException if there is a problem during evaluation
 	 */
 	Object getValue(EvaluationContext context, Object rootObject) throws EvaluationException;
-	
+
 	/**
 	 * Evaluate the expression in a specified context which can resolve references to properties, methods, types, etc -
 	 * the type of the evaluation result is expected to be of a particular class and an exception will be thrown if it
@@ -132,7 +132,7 @@ public interface Expression {
 	 * @throws EvaluationException if there is a problem determining the type
 	 */
 	Class getValueType(EvaluationContext context) throws EvaluationException;
-	
+
 	/**
 	 * Returns the most general type that can be passed to the {@link #setValue(EvaluationContext, Object)}
 	 * method for the given context. The supplied root object overrides any specified in the context.
@@ -150,7 +150,7 @@ public interface Expression {
 	 * @throws EvaluationException if there is a problem determining the type
 	 */
 	TypeDescriptor getValueTypeDescriptor() throws EvaluationException;
-	
+
 	/**
 	 * Returns the most general type that can be passed to the {@link #setValue(EvaluationContext, Object)}
 	 * method using the default context.
@@ -207,13 +207,13 @@ public interface Expression {
 
 	/**
 	 * Set this expression in the provided context to the value provided.
-	 * 
+	 *
 	 * @param context the context in which to set the value of the expression
 	 * @param value the new value
 	 * @throws EvaluationException if there is a problem during evaluation
 	 */
 	void setValue(EvaluationContext context, Object value) throws EvaluationException;
-	
+
 	/**
 	 * Set this expression in the provided context to the value provided.
 	 * @param rootObject the root object against which to evaluate the expression
@@ -231,7 +231,7 @@ public interface Expression {
 	 * @throws EvaluationException if there is a problem during evaluation
 	 */
 	void setValue(EvaluationContext context, Object rootObject, Object value) throws EvaluationException;
-	
+
 	/**
 	 * Returns the original string used to create this expression, unmodified.
 	 * @return the original expression string
diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
index b02852ddc0..c04d03ae28 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
@@ -38,7 +38,7 @@ public class ExpressionException extends RuntimeException {
 		this.position = -1;
 		this.expressionString = expressionString;
 	}
-	
+
 	/**
 	 * Creates a new expression exception.
 	 * @param expressionString the expression string
@@ -66,7 +66,7 @@ public class ExpressionException extends RuntimeException {
 	 * @param position the position in the expression string where the problem occurred
 	 * @param message a descriptive message
 	 * @param cause the underlying cause of this exception
-	 */ 
+	 */
 	public ExpressionException(int position, String message, Throwable cause) {
 		super(message,cause);
 		this.position = position;
@@ -75,7 +75,7 @@ public class ExpressionException extends RuntimeException {
 	/**
 	 * Creates a new expression exception.
 	 * @param message a descriptive message
-	 */ 
+	 */
 	public ExpressionException(String message) {
 		super(message);
 	}
@@ -99,11 +99,11 @@ public class ExpressionException extends RuntimeException {
 		output.append(getMessage());
 		return output.toString();
 	}
-	
+
 	public final String getExpressionString() {
 		return this.expressionString;
 	}
-	
+
 	public final int getPosition() {
 		return position;
 	}
diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java
index 6668fff415..00caf12c4f 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java
@@ -20,7 +20,7 @@ package org.springframework.expression;
  * It differs from a SpelEvaluationException because this indicates the occurrence of a checked exception
  * that the invoked method was defined to throw.  SpelEvaluationExceptions are for handling (and wrapping)
  * unexpected exceptions.
- * 
+ *
  * @author Andy Clement
  * @since 3.0.3
  */
diff --git a/spring-expression/src/main/java/org/springframework/expression/MethodFilter.java b/spring-expression/src/main/java/org/springframework/expression/MethodFilter.java
index b2567425d4..bcc824e5a0 100644
--- a/spring-expression/src/main/java/org/springframework/expression/MethodFilter.java
+++ b/spring-expression/src/main/java/org/springframework/expression/MethodFilter.java
@@ -21,26 +21,26 @@ import java.util.List;
 /**
  * MethodFilter instances allow SpEL users to fine tune the behaviour of the method resolution
  * process.  Method resolution (which translates from a method name in an expression to a real
- * method to invoke) will normally retrieve candidate methods for invocation via a simple call 
- * to 'Class.getMethods()' and will choose the first one that is suitable for the 
- * input parameters.  By registering a MethodFilter the user can receive a callback 
+ * method to invoke) will normally retrieve candidate methods for invocation via a simple call
+ * to 'Class.getMethods()' and will choose the first one that is suitable for the
+ * input parameters.  By registering a MethodFilter the user can receive a callback
  * and change the methods that will be considered suitable.
- * 
+ *
  * @author Andy Clement
  * @since 3.0.1
  */
 public interface MethodFilter {
 
 	/**
-	 * Called by the method resolver to allow the SpEL user to organize the list of candidate 
-	 * methods that may be invoked.  The filter can remove methods that should not be 
-	 * considered candidates and it may sort the results.  The resolver will then search 
-	 * through the methods as returned from the filter when looking for a suitable 
+	 * Called by the method resolver to allow the SpEL user to organize the list of candidate
+	 * methods that may be invoked.  The filter can remove methods that should not be
+	 * considered candidates and it may sort the results.  The resolver will then search
+	 * through the methods as returned from the filter when looking for a suitable
 	 * candidate to invoke.
-	 * 
+	 *
 	 * @param methods the full list of methods the resolver was going to choose from
 	 * @return a possible subset of input methods that may be sorted by order of relevance
 	 */
 	List<Method> filter(List<Method> methods);
-	
+
 }
\ No newline at end of file
diff --git a/spring-expression/src/main/java/org/springframework/expression/Operation.java b/spring-expression/src/main/java/org/springframework/expression/Operation.java
index 55055a5b4f..27239c862e 100644
--- a/spring-expression/src/main/java/org/springframework/expression/Operation.java
+++ b/spring-expression/src/main/java/org/springframework/expression/Operation.java
@@ -18,7 +18,7 @@ package org.springframework.expression;
 
 /**
  * Supported operations that an {@link OperatorOverloader} can implement for any pair of operands.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
diff --git a/spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java b/spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java
index 0dd7bd2e6c..ff4a2f7eaf 100644
--- a/spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java
+++ b/spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java
@@ -19,7 +19,7 @@ package org.springframework.expression;
 /**
  * By default the mathematical operators {@link Operation} support simple types like numbers. By providing an
  * implementation of OperatorOverloader, a user of the expression language can support these operations on other types.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
diff --git a/spring-expression/src/main/java/org/springframework/expression/ParseException.java b/spring-expression/src/main/java/org/springframework/expression/ParseException.java
index cb0ff8ae88..722eb4d88e 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ParseException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ParseException.java
@@ -29,7 +29,7 @@ public class ParseException extends ExpressionException {
 	 * @param expressionString the expression string that could not be parsed
 	 * @param position the position in the expression string where the problem occurred
 	 * @param message description of the problem that occurred
-	 */ 
+	 */
 	public ParseException(String expressionString, int position, String message) {
 		super(expressionString, position, message);
 	}
@@ -39,16 +39,16 @@ public class ParseException extends ExpressionException {
 	 * @param position the position in the expression string where the problem occurred
 	 * @param message description of the problem that occurred
 	 * @param cause the underlying cause of this exception
-	 */ 
+	 */
 	public ParseException(int position, String message, Throwable cause) {
 		super(position, message, cause);
 	}
-	
+
 	/**
 	 * Creates a new expression parsing exception.
 	 * @param position the position in the expression string where the problem occurred
 	 * @param message description of the problem that occurred
-	 */ 
+	 */
 	public ParseException(int position, String message) {
 		super(position, message);
 	}
diff --git a/spring-expression/src/main/java/org/springframework/expression/ParserContext.java b/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
index 2a32bb3dde..a462c35312 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
@@ -28,13 +28,13 @@ public interface ParserContext {
 	/**
 	 * Whether or not the expression being parsed is a template. A template expression consists of literal text that can
 	 * be mixed with evaluatable blocks. Some examples:
-	 * 
+	 *
 	 * <pre>
 	 * 	   Some literal text
 	 *     Hello #{name.firstName}!
 	 *     #{3 + 4}
 	 * </pre>
-	 * 
+	 *
 	 * @return true if the expression is a template, false otherwise
 	 */
 	boolean isTemplate();
@@ -54,7 +54,7 @@ public interface ParserContext {
 	 * @return the suffix that identifies the end of an expression
 	 */
 	String getExpressionSuffix();
-	
+
 	/**
 	 * The default ParserContext implementation that enables template expression parsing mode.
 	 * The expression prefix is #{ and the expression suffix is }.
@@ -73,7 +73,7 @@ public interface ParserContext {
 		public boolean isTemplate() {
 			return true;
 		}
-		
+
 	};
 
 }
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 c5f474e3ca..041752988e 100644
--- a/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java
@@ -25,7 +25,7 @@ package org.springframework.expression;
  * 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.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
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 117ac772ab..6b0f61e8ce 100644
--- a/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java
@@ -19,7 +19,7 @@ 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}.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
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 ec063ff54c..c9db4a8f04 100644
--- a/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
+++ b/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
@@ -56,12 +56,12 @@ public class TypedValue {
 		this.value = value;
 		this.typeDescriptor = typeDescriptor;
 	}
-	
+
 
 	public Object getValue() {
 		return this.value;
 	}
-	
+
 	public TypeDescriptor getTypeDescriptor() {
 		if (this.typeDescriptor == null) {
 			this.typeDescriptor = TypeDescriptor.forObject(this.value);
@@ -76,5 +76,5 @@ public class TypedValue {
 		str.append("TypedValue: '").append(this.value).append("' of [").append(getTypeDescriptor() + "]");
 		return str.toString();
 	}
-	
+
 }
diff --git a/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java b/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
index 04fc1a561e..1a3ff0b672 100644
--- a/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
+++ b/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
@@ -31,7 +31,7 @@ import org.springframework.expression.Expression;
  * which will be represented as a CompositeStringExpression of two parts. The first part being a
  * LiteralExpression representing 'Hello ' and the second part being a real expression that will
  * call <code>getName()</code> when invoked.
- * 
+ *
  * @author Andy Clement
  * @author Juergen Hoeller
  * @since 3.0
@@ -60,7 +60,7 @@ public class CompositeStringExpression implements Expression {
 			String value = expression.getValue(String.class);
 			if (value != null) {
 				sb.append(value);
-			}	
+			}
 		}
 		return sb.toString();
 	}
@@ -71,7 +71,7 @@ public class CompositeStringExpression implements Expression {
 			String value = expression.getValue(rootObject, String.class);
 			if (value != null) {
 				sb.append(value);
-			}	
+			}
 		}
 		return sb.toString();
 	}
@@ -93,7 +93,7 @@ public class CompositeStringExpression implements Expression {
 			String value = expression.getValue(context, rootObject, String.class);
 			if (value != null) {
 				sb.append(value);
-			}				
+			}
 		}
 		return sb.toString();
 	}
@@ -131,7 +131,7 @@ public class CompositeStringExpression implements Expression {
 	public boolean isWritable(EvaluationContext context) {
 		return false;
 	}
-	
+
 	public Expression[] getExpressions() {
 		return expressions;
 	}
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 43d61bedfb..c9b3c6041b 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
@@ -52,7 +52,7 @@ public class LiteralExpression implements Expression {
 	public String getValue(EvaluationContext context) {
 		return this.literalValue;
 	}
-	
+
 	public String getValue(Object rootObject) {
 		return this.literalValue;
 	}
diff --git a/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java b/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java
index c1ed129dec..5df9c134fe 100644
--- a/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java
+++ b/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java
@@ -38,7 +38,7 @@ public class TemplateParserContext implements ParserContext {
 	public TemplateParserContext() {
 		this("#{", "}");
 	}
-	
+
 	/**
 	 * Create a new TemplateParserContext for the given prefix and suffix.
 	 * @param expressionPrefix the expression prefix to use
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 47ee693d82..85c1727c5c 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
@@ -36,22 +36,22 @@ import org.springframework.expression.TypedValue;
  * 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.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
 public class ExpressionState {
 
 	private final EvaluationContext relatedContext;
-	
-	private Stack<VariableScope> variableScopes; 
+
+	private Stack<VariableScope> variableScopes;
 
 	private Stack<TypedValue> contextObjects;
-	
+
 	private final TypedValue rootObject;
-	
+
 	private SpelParserConfiguration configuration;
 
 
@@ -59,30 +59,30 @@ public class ExpressionState {
 		this.relatedContext = context;
 		this.rootObject = context.getRootObject();
 	}
-	
+
 	public ExpressionState(EvaluationContext context, SpelParserConfiguration configuration) {
 		this.relatedContext = context;
 		this.configuration = configuration;
 		this.rootObject = context.getRootObject();
 	}
-	
+
 	public ExpressionState(EvaluationContext context, TypedValue rootObject) {
 		this.relatedContext = context;
 		this.rootObject = rootObject;
 	}
-	
+
 	public ExpressionState(EvaluationContext context, TypedValue rootObject, SpelParserConfiguration configuration) {
 		this.relatedContext = context;
 		this.configuration = configuration;
 		this.rootObject = rootObject;
 	}
-	
+
 
 	private void ensureVariableScopesInitialized() {
 		if (this.variableScopes == null) {
 			this.variableScopes = new Stack<VariableScope>();
 			// top level empty variable scope
-			this.variableScopes.add(new VariableScope()); 
+			this.variableScopes.add(new VariableScope());
 		}
 	}
 
@@ -93,7 +93,7 @@ public class ExpressionState {
 		if (this.contextObjects==null || this.contextObjects.isEmpty()) {
 			return this.rootObject;
 		}
-		
+
 		return this.contextObjects.peek();
 	}
 
@@ -140,7 +140,7 @@ public class ExpressionState {
 	public Object convertValue(Object value, TypeDescriptor targetTypeDescriptor) throws EvaluationException {
 		return this.relatedContext.getTypeConverter().convertValue(value, TypeDescriptor.forObject(value), targetTypeDescriptor);
 	}
-	
+
 	public TypeConverter getTypeConverter() {
 		return this.relatedContext.getTypeConverter();
 	}
@@ -153,7 +153,7 @@ public class ExpressionState {
 	/*
 	 * A new scope is entered when a function is invoked
 	 */
-	
+
 	public void enterScope(Map<String, Object> argMap) {
 		ensureVariableScopesInitialized();
 		this.variableScopes.push(new VariableScope(argMap));
@@ -226,7 +226,7 @@ public class ExpressionState {
 				this.vars.putAll(arguments);
 			}
 		}
-		
+
 		public VariableScope(String name, Object value) {
 			this.vars.put(name,value);
 		}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
index fd3dcb5549..7af1d21c8c 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
@@ -21,7 +21,7 @@ import org.springframework.expression.spel.SpelParseException;
 /**
  * Wraps a real parse exception. This exception flows to the top parse method and then
  * the wrapped exception is thrown as the real problem.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
@@ -30,9 +30,9 @@ public class InternalParseException extends RuntimeException {
 	public InternalParseException(SpelParseException cause) {
 		super(cause);
 	}
-	
+
 	public SpelParseException getCause() {
 		return (SpelParseException) super.getCause();
 	}
-	
+
 }
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java
index e736d3bf74..e5bb78e995 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java
@@ -21,7 +21,7 @@ import org.springframework.expression.EvaluationException;
  * Root exception for Spring EL related exceptions. Rather than holding a hard coded string indicating the problem, it
  * records a message key and the inserts for the message. See {@link SpelMessage} for the list of all possible messages
  * that can occur.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
@@ -37,7 +37,7 @@ public class SpelEvaluationException extends EvaluationException {
 	}
 
 	public SpelEvaluationException(int position, SpelMessage message, Object... inserts) {
-		super(position, message.formatMessage(position, inserts)); 
+		super(position, message.formatMessage(position, inserts));
 		this.message = message;
 		this.inserts = inserts;
 	}
@@ -75,7 +75,7 @@ public class SpelEvaluationException extends EvaluationException {
 
 	/**
 	 * Set the position in the related expression which gave rise to this exception.
-	 * 
+	 *
 	 * @param position the position in the expression that gave rise to the exception
 	 */
 	public void setPosition(int position) {
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 5ee88152eb..a7f457e147 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
@@ -24,13 +24,13 @@ import java.text.MessageFormat;
  * 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
- * 
+ *
  * <pre>
  * 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.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
@@ -39,7 +39,7 @@ 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"), // 
+	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"), //
@@ -47,7 +47,7 @@ public enum SpelMessage {
 	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"), //
-	CANNOT_INDEX_INTO_NULL_VALUE(Kind.ERROR, 1012, "Cannot index into a null value"),	
+	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}''"), //
@@ -60,22 +60,22 @@ public enum SpelMessage {
 	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"), // 
+	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}''"), // 
+	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}"), 
+	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"), // 
+	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_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}''"),
@@ -93,7 +93,7 @@ public enum SpelMessage {
 	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}''"), // 
+	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}''"), //
@@ -125,7 +125,7 @@ public enum SpelMessage {
 	/**
 	 * 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
 	 * @param inserts the inserts to put into the formatted message
 	 * @return a formatted message
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
index 3b8c14ff13..86499273f8 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
@@ -22,7 +22,7 @@ import org.springframework.expression.ParseException;
  * Root exception for Spring EL related exceptions. Rather than holding a hard coded string indicating the problem, it
  * records a message key and the inserts for the message. See {@link SpelMessage} for the list of all possible messages
  * that can occur.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
@@ -41,7 +41,7 @@ public class SpelParseException extends ParseException {
 		super(expressionString, position, message.formatMessage(position,inserts));
 		this.position = position;
 		this.message = message;
-		this.inserts = inserts; 
+		this.inserts = inserts;
 	}
 
 	public SpelParseException(int position, SpelMessage message, Object... inserts) {
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java
index f3c4197377..900270b62e 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java
@@ -29,7 +29,7 @@ import org.springframework.expression.spel.ExpressionState;
  * @since 3.0.2
  */
 public class AstUtils {
-	
+
 	/**
 	 * Determines the set of property resolvers that should be used to try and access a property on the specified target
 	 * type. The resolvers are considered to be in an ordered list, however in the returned list any that are exact
@@ -37,7 +37,7 @@ public class AstUtils {
 	 * 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
 	 * @return a list of resolvers that should be tried in order to access the property
 	 */
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
index e7c7eb850b..09e4a0a114 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
@@ -26,13 +26,13 @@ import org.springframework.expression.spel.SpelMessage;
 
 /**
  * Represents a bean reference to a type, for example "@foo" or "@'foo.bar'"
- * 
+ *
  * @author Andy Clement
  */
 public class BeanReference extends SpelNodeImpl {
 
 	private String beanname;
-	
+
 	public BeanReference(int pos,String beanname) {
 		super(pos);
 		this.beanname = beanname;
@@ -64,5 +64,5 @@ public class BeanReference extends SpelNodeImpl {
 		}
 		return sb.toString();
 	}
-	
+
 }
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/CompoundExpression.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/CompoundExpression.java
index 7dfec0ca33..7ec464075d 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/CompoundExpression.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/CompoundExpression.java
@@ -23,7 +23,7 @@ import org.springframework.expression.spel.SpelEvaluationException;
 
 /**
  * Represents a DOT separated expression sequence, such as 'property1.property2.methodOne()'
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
index ceb1d401e9..6558498b85 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
@@ -44,7 +44,7 @@ import org.springframework.expression.spel.SpelNode;
  * new String('hello world')<br>
  * new int[]{1,2,3,4}<br>
  * new int[3] new int[3]{1,2,3}
- * 
+ *
  * @author Andy Clement
  * @author Juergen Hoeller
  * @since 3.0
@@ -137,7 +137,7 @@ public class ConstructorReference extends SpelNodeImpl {
 						throw new SpelEvaluationException(getStartPosition(), rootCause,
 								SpelMessage.CONSTRUCTOR_INVOCATION_PROBLEM, typename, FormatHelper
 										.formatMethodForMessage("", argumentTypes));
-					}					
+					}
 				}
 
 				// at this point we know it wasn't a user problem so worth a retry if a better candidate can be found
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java
index 3983c207a2..3f6a1f45ed 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java
@@ -22,7 +22,7 @@ import org.springframework.core.convert.TypeDescriptor;
 
 /**
  * Utility methods (formatters, etc) used during parsing and evaluation.
- * 
+ *
  * @author Andy Clement
  */
 public class FormatHelper {
@@ -46,7 +46,7 @@ public class FormatHelper {
 				sb.append(formatClassNameForMessage(typeDescriptor.getType()));
 			}
 			else {
-				sb.append(formatClassNameForMessage(null));				
+				sb.append(formatClassNameForMessage(null));
 			}
 		}
 		sb.append(")");
@@ -60,7 +60,7 @@ public class FormatHelper {
 	 * @return a formatted string suitable for message inclusion
 	 */
 	public static String formatClassNameForMessage(Class<?> clazz) {
-		if (clazz == null) { 
+		if (clazz == null) {
 			return "null";
 		}
 		StringBuilder fmtd = new StringBuilder();
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
index edac92f095..1bc897efcc 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
@@ -74,7 +74,7 @@ public class FunctionReference extends SpelNodeImpl {
 
 	/**
 	 * Execute a function represented as a java.lang.reflect.Method.
-	 * 
+	 *
 	 * @param state the expression evaluation state
 	 * @param the java method to invoke
 	 * @return the return value of the invoked Java method
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
index ad7bf42a84..e0b2b8d4de 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
@@ -26,7 +26,7 @@ import org.springframework.expression.spel.SpelNode;
 
 /**
  * Represent a list in an expression, e.g. '{1,2,3}'
- * 
+ *
  * @author Andy Clement
  * @since 3.0.4
  */
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java
index 15dc80d2db..466e03e9d6 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java
@@ -28,7 +28,7 @@ public class IntLiteral extends Literal {
 	private final TypedValue value;
 
 	IntLiteral(String payload, int pos, int value) {
-		super(payload, pos); 
+		super(payload, pos);
 		this.value = new TypedValue(value);
 	}
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Literal.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Literal.java
index 7a8cbdf47c..19ddf7caac 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Literal.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Literal.java
@@ -21,13 +21,13 @@ import org.springframework.expression.spel.*;
 
 /**
  * Common superclass for nodes representing literals (boolean, string, number, etc).
- * 
+ *
  * @author Andy Clement
  */
 public abstract class Literal extends SpelNodeImpl {
 
 	protected String literalValue;
-	
+
 	public Literal(String payload, int pos) {
 		super(pos);
 		this.literalValue = payload;
@@ -53,7 +53,7 @@ public abstract class Literal extends SpelNodeImpl {
 	/**
 	 * Process the string form of a number, using the specified base if supplied and return an appropriate literal to
 	 * hold it. Any suffix to indicate a long will be taken into account (either 'l' or 'L' is supported).
-	 * 
+	 *
 	 * @param numberToken the token holding the number as its payload (eg. 1234 or 0xCAFE)
 	 * @param radix the base of number
 	 * @return a subtype of Literal that can represent it
@@ -84,7 +84,7 @@ public abstract class Literal extends SpelNodeImpl {
 				return new FloatLiteral(numberToken, pos, value);
 			} else {
 				double value = Double.parseDouble(numberToken);
-				return new RealLiteral(numberToken, pos, value);				
+				return new RealLiteral(numberToken, pos, value);
 			}
 		} catch (NumberFormatException nfe) {
 			throw new InternalParseException(new SpelParseException(pos>>16, nfe, SpelMessage.NOT_A_REAL, numberToken));
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java
index 6ac11d8372..c6b1b303af 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java
@@ -29,7 +29,7 @@ public class LongLiteral extends Literal {
 	private final TypedValue value;
 
 	LongLiteral(String payload, int pos, long value) {
-		super(payload, pos); 
+		super(payload, pos);
 		this.value = new TypedValue(value);
 	}
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java
index 6fab393a19..0f0e12d045 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpLT.java
@@ -31,7 +31,7 @@ public class OpLT extends Operator {
 	public OpLT(int pos, SpelNodeImpl... operands) {
 		super("<", pos, operands);
 	}
-	
+
 	@Override
 	public BooleanTypedValue getValueInternal(ExpressionState state) throws EvaluationException {
 		Object left = getLeftOperand().getValueInternal(state).getValue();
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
index 507acac3ad..42b0259416 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java
@@ -24,7 +24,7 @@ import org.springframework.expression.spel.ExpressionState;
 /**
  * Implements the {@code multiply} operator.
  *
- * <p>Conversions and promotions are handled as defined in 
+ * <p>Conversions and promotions are handled as defined in
  * <a href="http://java.sun.com/docs/books/jls/third_edition/html/conversions.html">Section 5.6.2
  * of the Java Language Specification</a>:
  *
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
index 79c190f464..b629ff54b7 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
@@ -27,12 +27,12 @@ package org.springframework.expression.spel.ast;
 public abstract class Operator extends SpelNodeImpl {
 
 	String operatorName;
-	
+
 	public Operator(String payload,int pos,SpelNodeImpl... operands) {
 		super(pos, operands);
 		this.operatorName = payload;
 	}
-	
+
 	public SpelNodeImpl getLeftOperand() {
 		return children[0];
 	}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java
index 2095e64680..d89e5bd6b8 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java
@@ -29,7 +29,7 @@ import org.springframework.expression.spel.support.BooleanTypedValue;
  * Represents the between operator. The left operand to between must be a single value and the right operand must be a
  * list - this operator returns true if the left operand is between (using the registered comparator) the two elements
  * in the list. The definition of between being inclusive follows the SQL BETWEEN definition.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorPower.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorPower.java
index 41c5cee037..0c41e6a8dc 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorPower.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorPower.java
@@ -23,7 +23,7 @@ import org.springframework.expression.spel.ExpressionState;
 
 /**
  * The power operator.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
@@ -37,7 +37,7 @@ public class OperatorPower extends Operator {
 	public TypedValue getValueInternal(ExpressionState state) throws EvaluationException {
 		SpelNodeImpl leftOp = getLeftOperand();
 		SpelNodeImpl rightOp = getRightOperand();
-	
+
 		Object operandOne = leftOp.getValueInternal(state).getValue();
 		Object operandTwo = rightOp.getValueInternal(state).getValue();
 		if (operandOne instanceof Number && operandTwo instanceof Number) {
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
index 2d572e5d83..ffc5819367 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
@@ -32,7 +32,7 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 
 /**
- * Represents projection, where a given operation is performed on all elements in some input sequence, returning 
+ * Represents projection, where a given operation is performed on all elements in some input sequence, returning
  * a new sequence of the same size. For example:
  * "{1,2,3,4,5,6,7,8,9,10}.!{#isEven(#this)}" returns "[n, y, n, y, n, y, n, y, n, y]"
  *
@@ -43,7 +43,7 @@ import org.springframework.util.ObjectUtils;
 public class Projection extends SpelNodeImpl {
 
 	private final boolean nullSafe;
-	
+
 	public Projection(boolean nullSafe, int pos, SpelNodeImpl expression) {
 		super(pos, expression);
 		this.nullSafe = nullSafe;
@@ -61,7 +61,7 @@ public class Projection extends SpelNodeImpl {
 		Object operand = op.getValue();
 		boolean operandIsArray = ObjectUtils.isArray(operand);
 		// TypeDescriptor operandTypeDescriptor = op.getTypeDescriptor();
-		
+
 		// When the input is a map, we push a special context object on the stack
 		// before calling the specified operation. This special context object
 		// has two fields 'key' and 'value' that refer to the map entries key
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 c7f85333a0..99e79ff504 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
@@ -34,10 +34,10 @@ import org.springframework.expression.spel.support.ReflectivePropertyAccessor;
 
 /**
  * Represents a simple property or field reference.
- * 
+ *
  * @author Andy Clement
  * @author Juergen Hoeller
- * @author Clark Duplichien 
+ * @author Clark Duplichien
  * @since 3.0
  */
 public class PropertyOrFieldReference extends SpelNodeImpl {
@@ -119,7 +119,7 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
 			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 { 
+					try {
 						if (isWritableProperty(this.name,contextObject,eContext)) {
 							List<?> newList = ArrayList.class.newInstance();
 							writeProperty(contextObject, eContext, this.name, newList);
@@ -136,7 +136,7 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
 					}
 				}
 				else {
-					try { 
+					try {
 						if (isWritableProperty(this.name,contextObject,eContext)) {
 							Map<?,?> newMap = HashMap.class.newInstance();
 							writeProperty(contextObject, eContext, name, newMap);
@@ -155,7 +155,7 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
 			}
 			else {
 				// 'simple' object
-				try { 
+				try {
 					if (isWritableProperty(this.name,contextObject,eContext)) {
 						Object newObject  = result.getTypeDescriptor().getType().newInstance();
 						writeProperty(contextObject, eContext, name, newObject);
@@ -169,7 +169,7 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
 				catch (IllegalAccessException ex) {
 					throw new SpelEvaluationException(getStartPosition(), ex,
 							SpelMessage.UNABLE_TO_DYNAMICALLY_CREATE_OBJECT, result.getTypeDescriptor().getType());
-				}				
+				}
 			}
 		}
 		return result;
@@ -249,7 +249,7 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
 	}
 
 	private void writeProperty(TypedValue contextObject, EvaluationContext eContext, String name, Object newValue) throws SpelEvaluationException {
-		
+
 		if (contextObject.getValue() == null && nullSafe) {
 			return;
 		}
@@ -339,7 +339,7 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
 							specificAccessors.add( resolver);
 							break;
 						}
-						else if (clazz.isAssignableFrom(targetType)) { 
+						else if (clazz.isAssignableFrom(targetType)) {
 							generalAccessors.add(resolver);
 						}
 					}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java
index c3a1566a1c..194db8115d 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java
@@ -27,7 +27,7 @@ public class RealLiteral extends Literal {
 	private final TypedValue value;
 
 	public RealLiteral(String payload, int pos, double value) {
-		super(payload, pos); 
+		super(payload, pos);
 		this.value = new TypedValue(value);
 	}
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
index 7c599c6605..e532aa9ebc 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Selection.java
@@ -54,7 +54,7 @@ public class Selection extends SpelNodeImpl {
 	private final boolean nullSafe;
 
 	public Selection(boolean nullSafe, int variant,int pos,SpelNodeImpl expression) {
-		super(pos,expression); 
+		super(pos,expression);
 		this.nullSafe = nullSafe;
 		this.variant = variant;
 	}
@@ -153,7 +153,7 @@ public class Selection extends SpelNodeImpl {
 			}
 		} else {
 			if (operand==null) {
-				if (nullSafe) { 
+				if (nullSafe) {
 					return ValueRef.NullValueRef.instance;
 				} else {
 					throw new SpelEvaluationException(getStartPosition(), SpelMessage.INVALID_TYPE_FOR_SELECTION,
@@ -162,7 +162,7 @@ public class Selection extends SpelNodeImpl {
 			} else {
 				throw new SpelEvaluationException(getStartPosition(), SpelMessage.INVALID_TYPE_FOR_SELECTION,
 						operand.getClass().getName());
-			}				
+			}
 		}
 	}
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java
index aeb7ca1cc6..c91ccad467 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java
@@ -18,7 +18,7 @@ package org.springframework.expression.spel.ast;
 /**
  * Captures primitive types and their corresponding class objects, plus one special entry that represents all reference
  * (non-primitive) types.
- * 
+ *
  * @author Andy Clement
  */
 public enum TypeCode {
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java
index 99aec584f0..785d317cac 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java
@@ -23,7 +23,7 @@ import org.springframework.expression.spel.SpelEvaluationException;
 
 /**
  * Represents a variable reference, eg. #someVar. Note this is different to a *local* variable like $someVar
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
@@ -102,7 +102,7 @@ public class VariableReference extends SpelNodeImpl {
 	}
 
 	@Override
-	public String toStringAST() { 
+	public String toStringAST() {
 		return "#" + this.name;
 	}
 
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
index eac133e671..ac52f98a55 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
@@ -34,12 +34,12 @@ import org.springframework.util.Assert;
  * to be evaluated in a specified context. An expression can be evaluated
  * standalone or in a specified context. During expression evaluation the context
  * may be asked to resolve references to types, beans, properties, and methods.
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
 public class SpelExpression implements Expression {
-	
+
 	private final String expression;
 
 	private final SpelNodeImpl ast;
@@ -61,7 +61,7 @@ public class SpelExpression implements Expression {
 
 
 	// implementing Expression
-	
+
 	public Object getValue() throws EvaluationException {
 		ExpressionState expressionState = new ExpressionState(getEvaluationContext(), configuration);
 		return ast.getValue(expressionState);
@@ -88,7 +88,7 @@ public class SpelExpression implements Expression {
 		Assert.notNull(context, "The EvaluationContext is required");
 		return ast.getValue(new ExpressionState(context, configuration));
 	}
-	
+
 	public Object getValue(EvaluationContext context, Object rootObject) throws EvaluationException {
 		Assert.notNull(context, "The EvaluationContext is required");
 		return ast.getValue(new ExpressionState(context, toTypedValue(rootObject), configuration));
@@ -98,7 +98,7 @@ public class SpelExpression implements Expression {
 		TypedValue typedResultValue = ast.getTypedValue(new ExpressionState(context, configuration));
 		return ExpressionUtils.convertTypedValue(context, typedResultValue, expectedResultType);
 	}
-	
+
 	public <T> T getValue(EvaluationContext context, Object rootObject, Class<T> expectedResultType) throws EvaluationException {
 		TypedValue typedResultValue = ast.getTypedValue(new ExpressionState(context, toTypedValue(rootObject), configuration));
 		return ExpressionUtils.convertTypedValue(context, typedResultValue, expectedResultType);
@@ -128,56 +128,56 @@ public class SpelExpression implements Expression {
 	public TypeDescriptor getValueTypeDescriptor() throws EvaluationException {
 		return getValueTypeDescriptor(getEvaluationContext());
 	}
-	
+
 	public TypeDescriptor getValueTypeDescriptor(Object rootObject) throws EvaluationException {
 		ExpressionState eState = new ExpressionState(getEvaluationContext(), toTypedValue(rootObject), configuration);
 		return ast.getValueInternal(eState).getTypeDescriptor();
 	}
-	
+
 	public TypeDescriptor getValueTypeDescriptor(EvaluationContext context) throws EvaluationException {
 		Assert.notNull(context, "The EvaluationContext is required");
 		ExpressionState eState = new ExpressionState(context, configuration);
 		return ast.getValueInternal(eState).getTypeDescriptor();
 	}
-	
+
 	public TypeDescriptor getValueTypeDescriptor(EvaluationContext context, Object rootObject) throws EvaluationException {
 		Assert.notNull(context, "The EvaluationContext is required");
 		ExpressionState eState = new ExpressionState(context, toTypedValue(rootObject), configuration);
 		return ast.getValueInternal(eState).getTypeDescriptor();
 	}
-	
+
 	public String getExpressionString() {
 		return expression;
 	}
 
 	public boolean isWritable(EvaluationContext context) throws EvaluationException {
-		Assert.notNull(context, "The EvaluationContext is required");		
+		Assert.notNull(context, "The EvaluationContext is required");
 		return ast.isWritable(new ExpressionState(context, configuration));
 	}
 
 	public boolean isWritable(Object rootObject) throws EvaluationException {
 		return ast.isWritable(new ExpressionState(getEvaluationContext(), toTypedValue(rootObject), configuration));
 	}
-	
+
 	public boolean isWritable(EvaluationContext context, Object rootObject) throws EvaluationException {
-		Assert.notNull(context, "The EvaluationContext is required");		
+		Assert.notNull(context, "The EvaluationContext is required");
 		return ast.isWritable(new ExpressionState(context, toTypedValue(rootObject), configuration));
 	}
 
 	public void setValue(EvaluationContext context, Object value) throws EvaluationException {
-		Assert.notNull(context, "The EvaluationContext is required");		
+		Assert.notNull(context, "The EvaluationContext is required");
 		ast.setValue(new ExpressionState(context, configuration), value);
 	}
 
 	public void setValue(Object rootObject, Object value) throws EvaluationException {
 		ast.setValue(new ExpressionState(getEvaluationContext(), toTypedValue(rootObject), configuration), value);
 	}
-	
+
 	public void setValue(EvaluationContext context, Object rootObject, Object value) throws EvaluationException {
-		Assert.notNull(context, "The EvaluationContext is required");		
+		Assert.notNull(context, "The EvaluationContext is required");
 		ast.setValue(new ExpressionState(context, toTypedValue(rootObject), configuration), value);
 	}
-	
+
 	// impl only
 
 	/**
@@ -196,7 +196,7 @@ public class SpelExpression implements Expression {
 	public String toStringAST() {
 		return ast.toStringAST();
 	}
-	
+
 	/**
      * Return the default evaluation context that will be used if none is supplied on an evaluation call
      * @return the default evaluation context
@@ -207,7 +207,7 @@ public class SpelExpression implements Expression {
 		}
 		return defaultContext;
 	}
-	
+
 	/**
      * Set the evaluation context that will be used if none is specified on an evaluation call.
      * @param context an evaluation context
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java
index 7c6c6f987e..7762d75c85 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java
@@ -24,7 +24,7 @@ import org.springframework.util.Assert;
 
 /**
  * SpEL parser. Instances are reusable and thread-safe.
- * 
+ *
  * @author Andy Clement
  * @author Juergen Hoeller
  * @since 3.0
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java
index 5d3d248fa0..0bc2f0d91a 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java
@@ -18,17 +18,17 @@ package org.springframework.expression.spel.standard;
 
 /**
  * Holder for a kind of token, the associated data and its position in the input data stream (start/end).
- * 
+ *
  * @author Andy Clement
  * @since 3.0
  */
 class Token {
-	
+
 	TokenKind kind;
 	String data;
 	int startpos; // index of first character
 	int endpos;   // index of char after the last character
-	
+
 	/**
 	 * Constructor for use when there is no particular data for the token (eg. TRUE or '+')
 	 * @param startpos the exact start
@@ -39,17 +39,17 @@ class Token {
 		this.startpos = startpos;
 		this.endpos = endpos;
 	}
-	
+
 	Token(TokenKind tokenKind, char[] tokenData, int pos, int endpos) {
 		this(tokenKind,pos,endpos);
 		this.data = new String(tokenData);
 	}
-	
-	
+
+
 	public TokenKind getKind() {
 		return kind;
 	}
-	
+
 	public String toString() {
 		StringBuilder s = new StringBuilder();
 		s.append("[").append(kind.toString());
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/TokenKind.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/TokenKind.java
index 6484a98fa2..ffa6ffa88c 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/TokenKind.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/TokenKind.java
@@ -22,9 +22,9 @@ package org.springframework.expression.spel.standard;
  */
 enum TokenKind {
 	// ordered by priority - operands first
-	LITERAL_INT, LITERAL_LONG, LITERAL_HEXINT, LITERAL_HEXLONG, LITERAL_STRING, LITERAL_REAL, LITERAL_REAL_FLOAT, 
+	LITERAL_INT, LITERAL_LONG, LITERAL_HEXINT, LITERAL_HEXLONG, LITERAL_STRING, LITERAL_REAL, LITERAL_REAL_FLOAT,
 	LPAREN("("), RPAREN(")"), COMMA(","), IDENTIFIER,
-	COLON(":"),HASH("#"),RSQUARE("]"), LSQUARE("["), 
+	COLON(":"),HASH("#"),RSQUARE("]"), LSQUARE("["),
 	LCURLY("{"),RCURLY("}"),
 	DOT("."), PLUS("+"), STAR("*"),  MINUS("-"), SELECT_FIRST("^["), SELECT_LAST("$["), QMARK("?"), PROJECT("!["),
 	DIV("/"), GE(">="), GT(">"), LE("<="), LT("<"), EQ("=="), NE("!="),
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java
index 44e122266b..396c8f17ff 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java
@@ -27,12 +27,12 @@ import org.springframework.util.Assert;
 
 /**
  * Lex some input data into a stream of tokens that can then be parsed.
- *  
+ *
  * @author Andy Clement
  * @since 3.0
  */
 class Tokenizer {
-	
+
 	String expressionString;
 	char[] toProcess;
 	int pos;
@@ -117,7 +117,7 @@ class Tokenizer {
 					if (isTwoCharToken(TokenKind.SELECT_FIRST)) {
 						pushPairToken(TokenKind.SELECT_FIRST);
 					} else {
-						pushCharToken(TokenKind.POWER);					
+						pushCharToken(TokenKind.POWER);
 					}
 					break;
 				case '!':
@@ -145,7 +145,7 @@ class Tokenizer {
 					if (isTwoCharToken(TokenKind.SYMBOLIC_OR)) {
 						pushPairToken(TokenKind.SYMBOLIC_OR);
 					}
-					break;					
+					break;
 				case '?':
 					if (isTwoCharToken(TokenKind.SELECT)) {
 						pushPairToken(TokenKind.SELECT);
@@ -154,7 +154,7 @@ class Tokenizer {
 					} else if (isTwoCharToken(TokenKind.SAFE_NAVI)) {
 						pushPairToken(TokenKind.SAFE_NAVI);
 					} else {
-						pushCharToken(TokenKind.QMARK);					
+						pushCharToken(TokenKind.QMARK);
 					}
 					break;
 				case '$':
@@ -216,7 +216,7 @@ class Tokenizer {
 		}
 	}
 
-	public List<Token> getTokens() { 
+	public List<Token> getTokens() {
 		return tokens;
 	}
 
@@ -266,26 +266,26 @@ class Tokenizer {
 		tokens.add(new Token(TokenKind.LITERAL_STRING, subarray(start,pos), start, pos));
 	}
 
-//	REAL_LITERAL :	
+//	REAL_LITERAL :
 //	  ('.' (DECIMAL_DIGIT)+ (EXPONENT_PART)? (REAL_TYPE_SUFFIX)?) |
 //		((DECIMAL_DIGIT)+ '.' (DECIMAL_DIGIT)+ (EXPONENT_PART)? (REAL_TYPE_SUFFIX)?) |
 //		((DECIMAL_DIGIT)+ (EXPONENT_PART) (REAL_TYPE_SUFFIX)?) |
 //		((DECIMAL_DIGIT)+ (REAL_TYPE_SUFFIX));
 //	fragment INTEGER_TYPE_SUFFIX : ( 'L' | 'l' );
-//	fragment HEX_DIGIT : '0'|'1'|'2'|'3'|'4'|'5'|'6'|'7'|'8'|'9'|'A'|'B'|'C'|'D'|'E'|'F'|'a'|'b'|'c'|'d'|'e'|'f';		
-//		
-//	fragment EXPONENT_PART : 'e'  (SIGN)*  (DECIMAL_DIGIT)+ | 'E'  (SIGN)*  (DECIMAL_DIGIT)+ ;	
+//	fragment HEX_DIGIT : '0'|'1'|'2'|'3'|'4'|'5'|'6'|'7'|'8'|'9'|'A'|'B'|'C'|'D'|'E'|'F'|'a'|'b'|'c'|'d'|'e'|'f';
+//
+//	fragment EXPONENT_PART : 'e'  (SIGN)*  (DECIMAL_DIGIT)+ | 'E'  (SIGN)*  (DECIMAL_DIGIT)+ ;
 //	fragment SIGN :	'+' | '-' ;
 //	fragment REAL_TYPE_SUFFIX : 'F' | 'f' | 'D' | 'd';
 //	INTEGER_LITERAL
-//	: (DECIMAL_DIGIT)+ (INTEGER_TYPE_SUFFIX)?;		
+//	: (DECIMAL_DIGIT)+ (INTEGER_TYPE_SUFFIX)?;
 
 	private void lexNumericLiteral(boolean firstCharIsZero) {
 		boolean isReal = false;
 		int start = pos;
 		char ch = toProcess[pos+1];
 		boolean isHex = ch=='x' || ch=='X';
-		
+
 		// deal with hexadecimal
 		if (firstCharIsZero && isHex) {
 			pos=pos+1;
@@ -293,16 +293,16 @@ class Tokenizer {
 				pos++;
 			} while (isHexadecimalDigit(toProcess[pos]));
 			if (isChar('L','l')) {
-				pushHexIntToken(subarray(start+2,pos),true, start, pos);				
+				pushHexIntToken(subarray(start+2,pos),true, start, pos);
 				pos++;
 			} else {
-				pushHexIntToken(subarray(start+2,pos),false, start, pos);				
+				pushHexIntToken(subarray(start+2,pos),false, start, pos);
 			}
 			return;
 		}
 
 		// real numbers must have leading digits
-		
+
 		// Consume first part of number
 		do {
 			pos++;
@@ -311,7 +311,7 @@ class Tokenizer {
 		// a '.' indicates this number is a real
 		ch = toProcess[pos];
 		if (ch=='.') {
-			isReal = true; 
+			isReal = true;
 			int dotpos = pos;
 			// carry on consuming digits
 			do {
@@ -328,9 +328,9 @@ class Tokenizer {
 		}
 
 		int endOfNumber = pos;
-		
+
 		// Now there may or may not be an exponent
-		
+
 		// is it a long ?
 		if (isChar('L','l')) {
 			if (isReal) { // 3.4L - not allowed
@@ -345,7 +345,7 @@ class Tokenizer {
 			if (isSign(possibleSign)) {
 				pos++;
 			}
-			
+
 			// exponent digits
 			do {
 				pos++;
@@ -354,7 +354,7 @@ class Tokenizer {
 			if (isFloatSuffix(toProcess[pos])) {
 				isFloat = true;
 				endOfNumber = ++pos;
-			} else if (isDoubleSuffix(toProcess[pos])) {				
+			} else if (isDoubleSuffix(toProcess[pos])) {
 				endOfNumber = ++pos;
 			}
 			pushRealToken(subarray(start,pos), isFloat, start, pos);
@@ -367,7 +367,7 @@ class Tokenizer {
 				endOfNumber = ++pos;
 			} else if (isDoubleSuffix(ch)) {
 				isReal = true;
-				endOfNumber = ++pos;				
+				endOfNumber = ++pos;
 			}
 			if (isReal) {
 				pushRealToken(subarray(start,endOfNumber), isFloat, start, endOfNumber);
@@ -386,7 +386,7 @@ class Tokenizer {
 			pos++;
 		} while (isIdentifier(toProcess[pos]));
 		char[] subarray = subarray(start,pos);
-		
+
 		// Check if this is the alternative (textual) representation of an operator (see alternativeOperatorNames)
 		if ((pos-start)==2 || (pos-start)==3) {
 			String asString = new String(subarray).toUpperCase();
@@ -409,7 +409,7 @@ class Tokenizer {
 
 	private void pushHexIntToken(char[] data,boolean isLong, int start, int end) {
 		if (data.length==0) {
-			if (isLong) {				
+			if (isLong) {
 				throw new InternalParseException(new SpelParseException(expressionString,start,SpelMessage.NOT_A_LONG,expressionString.substring(start,end+1)));
 			} else {
 				throw new InternalParseException(new SpelParseException(expressionString,start,SpelMessage.NOT_AN_INTEGER,expressionString.substring(start,end)));
@@ -426,7 +426,7 @@ class Tokenizer {
 		if (isFloat) {
 			tokens.add(new Token(TokenKind.LITERAL_REAL_FLOAT, data, start, end));
 		} else {
-			tokens.add(new Token(TokenKind.LITERAL_REAL, data, start, end));			
+			tokens.add(new Token(TokenKind.LITERAL_REAL, data, start, end));
 		}
 	}
 
@@ -512,7 +512,7 @@ class Tokenizer {
 		return (flags[ch] & IS_HEXDIGIT)!=0;
 	}
 
-	private static final byte flags[] = new byte[256];	
+	private static final byte flags[] = new byte[256];
 	private static final byte IS_DIGIT=0x01;
 	private static final byte IS_HEXDIGIT=0x02;
 	private static final byte IS_ALPHA=0x04;
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java
index b397f1ac04..8de2154720 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java
@@ -32,7 +32,7 @@ public class BooleanTypedValue extends TypedValue {
 	private BooleanTypedValue(boolean b) {
 		super(b);
 	}
-	
+
 
 	public static BooleanTypedValue forValue(boolean b) {
 		if (b) {
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 40dcbc2ca7..a6beaafe6c 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
@@ -72,7 +72,7 @@ public class ReflectionHelper {
 					if (suppliedArg.isAssignableTo(expectedArg)) {
 						if (match != ArgsMatchKind.REQUIRES_CONVERSION) {
 							match = ArgsMatchKind.CLOSE;
-						} 
+						}
 					}
 					else if (typeConverter.canConvert(suppliedArg, expectedArg)) {
 						if (argsRequiringConversion == null) {
@@ -103,7 +103,7 @@ public class ReflectionHelper {
 			}
 		}
 	}
-	
+
 	/**
 	 * Based on {@link MethodInvoker#getTypeDifferenceWeight(Class[], Object[])} but operates on TypeDescriptors.
 	 */
@@ -153,17 +153,17 @@ public class ReflectionHelper {
 	 * 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
-	 * @param typeConverter a registered type converter 
+	 * @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
 	 */
 	static ArgumentsMatchInfo compareArgumentsVarargs(
 			List<TypeDescriptor> expectedArgTypes, List<TypeDescriptor> suppliedArgTypes, TypeConverter typeConverter) {
- 
+
 		Assert.isTrue(expectedArgTypes != null && expectedArgTypes.size() > 0,
 				"Expected arguments must at least include one array (the vargargs parameter)");
 		Assert.isTrue(expectedArgTypes.get(expectedArgTypes.size() - 1).isArray(),
 				"Final expected argument should be array type (the varargs parameter)");
-		
+
 		ArgsMatchKind match = ArgsMatchKind.EXACT;
 		List<Integer> argsRequiringConversion = null;
 
@@ -221,7 +221,7 @@ public class ReflectionHelper {
 				if (suppliedArg == null) {
 					if (varargsParameterType.isPrimitive()) {
 						match = null;
-					}					
+					}
 				} else {
 					if (varargsParameterType != suppliedArg.getType()) {
 						if (ClassUtils.isAssignable(varargsParameterType, suppliedArg.getType())) {
@@ -284,18 +284,18 @@ public class ReflectionHelper {
 			for (int i = 0; i < varargsPosition; i++) {
 				TypeDescriptor targetType = new TypeDescriptor(MethodParameter.forMethodOrConstructor(methodOrCtor, i));
 				Object argument = arguments[i];
-				arguments[i] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType);				
+				arguments[i] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType);
 			}
 			MethodParameter methodParam = MethodParameter.forMethodOrConstructor(methodOrCtor, varargsPosition);
 			if (varargsPosition == arguments.length - 1) {
-				TypeDescriptor targetType = new TypeDescriptor(methodParam);				
+				TypeDescriptor targetType = new TypeDescriptor(methodParam);
 				Object argument = arguments[varargsPosition];
-				arguments[varargsPosition] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType);					
+				arguments[varargsPosition] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType);
 			} else {
 				TypeDescriptor targetType = TypeDescriptor.nested(methodParam, 1);
 				for (int i = varargsPosition; i < arguments.length; i++) {
 					Object argument = arguments[i];
-					arguments[i] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType);					
+					arguments[i] = converter.convertValue(argument, TypeDescriptor.forObject(argument), targetType);
 				}
 			}
 		}
@@ -371,7 +371,7 @@ public class ReflectionHelper {
 			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++) {
@@ -446,9 +446,9 @@ public class ReflectionHelper {
 
 	public static enum ArgsMatchKind {
 		// An exact match is where the parameter types exactly match what the method/constructor being invoked is expecting
-		EXACT, 
+		EXACT,
 		// A close match is where the parameter types either exactly match or are assignment compatible with the method/constructor being invoked
-		CLOSE, 
+		CLOSE,
 		// A conversion match is where the type converter must be used to transform some of the parameter types
 		REQUIRES_CONVERSION
 	}
@@ -474,11 +474,11 @@ public class ReflectionHelper {
 		ArgumentsMatchInfo(ArgsMatchKind kind) {
 			this.kind = kind;
 		}
-		
+
 		public boolean isExactMatch() {
 			return (this.kind == ArgsMatchKind.EXACT);
 		}
-		
+
 		public boolean isCloseMatch() {
 			return (this.kind == ArgsMatchKind.CLOSE);
 		}
@@ -486,7 +486,7 @@ public class ReflectionHelper {
 		public boolean isMatchRequiringConversion() {
 			return (this.kind == ArgsMatchKind.REQUIRES_CONVERSION);
 		}
-		
+
 		public String toString() {
 			StringBuilder sb = new StringBuilder();
 			sb.append("ArgumentMatch: ").append(this.kind);
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 a2768fc099..fb7d4b3136 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
@@ -33,7 +33,7 @@ import org.springframework.expression.TypeConverter;
 
 /**
  * A constructor resolver that uses reflection to locate the constructor that should be invoked
- * 
+ *
  * @author Andy Clement
  * @author Juergen Hoeller
  * @since 3.0
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 88118cea32..c4a4425bed 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
@@ -47,13 +47,13 @@ import org.springframework.util.Assert;
  * @since 3.0
  */
 public class StandardEvaluationContext implements EvaluationContext {
-	
+
 	private TypedValue rootObject;
 
 	private List<ConstructorResolver> constructorResolvers;
 
 	private List<MethodResolver> methodResolvers;
-	
+
 	private ReflectiveMethodResolver reflectiveMethodResolver;
 
 	private List<PropertyAccessor> propertyAccessors;
@@ -67,14 +67,14 @@ public class StandardEvaluationContext implements EvaluationContext {
 	private OperatorOverloader operatorOverloader = new StandardOperatorOverloader();
 
 	private final Map<String, Object> variables = new HashMap<String, Object>();
-	
+
 	private BeanResolver beanResolver;
 
 
 	public StandardEvaluationContext() {
 		setRootObject(null);
 	}
-	
+
 	public StandardEvaluationContext(Object rootObject) {
 		this();
 		setRootObject(rootObject);
@@ -102,12 +102,12 @@ public class StandardEvaluationContext implements EvaluationContext {
 		ensureConstructorResolversInitialized();
 		return this.constructorResolvers.remove(resolver);
 	}
-	
+
 	public List<ConstructorResolver> getConstructorResolvers() {
 		ensureConstructorResolversInitialized();
 		return this.constructorResolvers;
 	}
-	
+
 	public void setConstructorResolvers(List<ConstructorResolver> constructorResolvers) {
 		this.constructorResolvers = constructorResolvers;
 	}
@@ -117,7 +117,7 @@ public class StandardEvaluationContext implements EvaluationContext {
 		ensureMethodResolversInitialized();
 		this.methodResolvers.add(this.methodResolvers.size() - 1, resolver);
 	}
-	
+
 	public boolean removeMethodResolver(MethodResolver methodResolver) {
 		ensureMethodResolversInitialized();
 		return this.methodResolvers.remove(methodResolver);
@@ -131,21 +131,21 @@ public class StandardEvaluationContext implements EvaluationContext {
 	public void setBeanResolver(BeanResolver beanResolver) {
 		this.beanResolver = beanResolver;
 	}
-	
+
 	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);
 	}
-	
+
 	public boolean removePropertyAccessor(PropertyAccessor accessor) {
 		return this.propertyAccessors.remove(accessor);
 	}
@@ -154,7 +154,7 @@ public class StandardEvaluationContext implements EvaluationContext {
 		ensurePropertyAccessorsInitialized();
 		return this.propertyAccessors;
 	}
-	
+
 	public void setPropertyAccessors(List<PropertyAccessor> propertyAccessors) {
 		this.propertyAccessors = propertyAccessors;
 	}
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 4cb99f4d5f..1b5a6ddddc 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
@@ -22,7 +22,7 @@ import org.springframework.expression.spel.SpelMessage;
 
 /**
  * A simple basic TypeComparator implementation. It supports comparison of numbers and types implementing Comparable.
- * 
+ *
  * @author Andy Clement
  * @author Juergen Hoeller
  * @since 3.0
@@ -68,7 +68,7 @@ public class StandardTypeComparator implements TypeComparator {
 		} catch (ClassCastException cce) {
 			throw new SpelEvaluationException(cce, SpelMessage.NOT_COMPARABLE, left.getClass(), right.getClass());
 		}
-		
+
 		throw new SpelEvaluationException(SpelMessage.NOT_COMPARABLE, left.getClass(), right.getClass());
 	}
 
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 49c0b3c2bd..1cc1d6f394 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
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
 /**
  * Default implementation of the {@link TypeConverter} interface,
  * delegating to a core Spring {@link ConversionService}.
- * 
+ *
  * @author Juergen Hoeller
  * @author Andy Clement
  * @since 3.0
@@ -38,7 +38,7 @@ import org.springframework.util.Assert;
 public class StandardTypeConverter implements TypeConverter {
 
 	private static ConversionService defaultConversionService;
-	
+
 	private final ConversionService conversionService;
 
 
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 18d9df11f2..e46c53462f 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
@@ -29,7 +29,7 @@ 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.
- * 
+ *
  * @author Andy Clement
  * @author Juergen Hoeller
  * @since 3.0
@@ -95,9 +95,9 @@ public class StandardTypeLocator implements TypeLocator {
 	public List<String> getImportPrefixes() {
 		return Collections.unmodifiableList(this.knownPackagePrefixes);
 	}
-	
+
 	public void removeImport(String prefix) {
-		this.knownPackagePrefixes.remove(prefix);		
+		this.knownPackagePrefixes.remove(prefix);
 	}
 
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java
index d48266f451..6a0a2f9c2a 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java
@@ -22,7 +22,7 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
 
 /**
  * Test construction of arrays.
- * 
+ *
  * @author Andy Clement
  */
 public class ArrayConstructorTests extends ExpressionTestCase {
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
index 3d3be623a5..eab2a6f0c2 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
@@ -34,7 +34,7 @@ import org.springframework.expression.spel.testresources.PlaceOfBirth;
 
 /**
  * Tests invocation of constructors.
- * 
+ *
  * @author Andy Clement
  */
 public class ConstructorInvocationTests extends ExpressionTestCase {
@@ -43,22 +43,22 @@ public class ConstructorInvocationTests extends ExpressionTestCase {
 	public void testTypeConstructors() {
 		evaluate("new String('hello world')", "hello world", String.class);
 	}
-	
+
 	@Test
 	public void testNonExistentType() {
 		evaluateAndCheckError("new FooBar()",SpelMessage.CONSTRUCTOR_INVOCATION_PROBLEM);
 	}
-	
+
 	static class TestException extends Exception {
-		
+
 	}
-	
+
 	static class Tester {
 		public static int counter;
 		public int i;
-		
+
 		public Tester() {}
-		
+
 		public Tester(int i) throws Exception {
 			counter++;
 			if (i==1) {
@@ -72,11 +72,11 @@ public class ConstructorInvocationTests extends ExpressionTestCase {
 			}
 			this.i = i;
 		}
-		
+
 		public Tester(PlaceOfBirth pob) {
-			
+
 		}
-		
+
 	}
 	@Test
 	public void testConstructorThrowingException_SPR6760() {
@@ -85,7 +85,7 @@ public class ConstructorInvocationTests extends ExpressionTestCase {
 		// On 2 it will throw a RuntimeException
 		// On 3 it will exit normally
 		// In each case it increments the Tester field 'counter' when invoked
-		
+
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expr = parser.parseExpression("new org.springframework.expression.spel.ConstructorInvocationTests$Tester(#bar).i");
 
@@ -104,11 +104,11 @@ public class ConstructorInvocationTests extends ExpressionTestCase {
 		o = expr.getValue(eContext);
 		Assert.assertEquals(0, 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.
-		
+
 		// First, switch back to throwException(int)
 		eContext.setVariable("bar",3);
 		o = expr.getValue(eContext);
@@ -130,8 +130,8 @@ public class ConstructorInvocationTests extends ExpressionTestCase {
 		}
 		// If counter is 4 then the method got called twice!
 		Assert.assertEquals(3,parser.parseExpression("counter").getValue(eContext));
-		
-		
+
+
 		// 1 will make it throw a RuntimeException - SpEL will let this through
 		eContext.setVariable("bar",1);
 		try {
@@ -147,38 +147,38 @@ public class ConstructorInvocationTests extends ExpressionTestCase {
 		// If counter is 5 then the method got called twice!
 		Assert.assertEquals(4,parser.parseExpression("counter").getValue(eContext));
 	}
-	
+
 	@Test
 	public void testAddingConstructorResolvers() {
 		StandardEvaluationContext ctx = new StandardEvaluationContext();
-		
+
 		// reflective constructor accessor is the only one by default
 		List<ConstructorResolver> constructorResolvers = ctx.getConstructorResolvers();
 		Assert.assertEquals(1,constructorResolvers.size());
-		
+
 		ConstructorResolver dummy = new DummyConstructorResolver();
 		ctx.addConstructorResolver(dummy);
 		Assert.assertEquals(2,ctx.getConstructorResolvers().size());
-		
+
 		List<ConstructorResolver> copy = new ArrayList<ConstructorResolver>();
 		copy.addAll(ctx.getConstructorResolvers());
 		Assert.assertTrue(ctx.removeConstructorResolver(dummy));
 		Assert.assertFalse(ctx.removeConstructorResolver(dummy));
 		Assert.assertEquals(1,ctx.getConstructorResolvers().size());
-		
+
 		ctx.setConstructorResolvers(copy);
 		Assert.assertEquals(2,ctx.getConstructorResolvers().size());
 	}
-	
+
 	static class DummyConstructorResolver implements ConstructorResolver {
 
 		public ConstructorExecutor resolve(EvaluationContext context, String typeName, List<TypeDescriptor> argumentTypes)
 				throws AccessException {
 			throw new UnsupportedOperationException("Auto-generated method stub");
 		}
-		
+
 	}
-	
+
 	@Test
 	public void testVarargsInvocation01() {
 		// Calling 'Fruit(String... strings)'
@@ -201,7 +201,7 @@ public class ConstructorInvocationTests extends ExpressionTestCase {
 		evaluate("new org.springframework.expression.spel.testresources.Fruit(2,'a',3.0d).stringscount()", 4, Integer.class);
 		evaluate("new org.springframework.expression.spel.testresources.Fruit(8,stringArrayOfThreeItems).stringscount()", 11, Integer.class);
 	}
-	
+
 	/*
 	 * These tests are attempting to call constructors where we need to widen or convert the argument in order to
 	 * satisfy a suitable constructor.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
index 37c0dd935d..f28c7c295c 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
@@ -24,7 +24,7 @@ import org.springframework.expression.spel.support.StandardTypeComparator;
 
 /**
  * Unit tests for type comparison
- * 
+ *
  * @author Andy Clement
  */
 public class DefaultComparatorUnitTests {
@@ -52,12 +52,12 @@ public class DefaultComparatorUnitTests {
 		Assert.assertTrue(comparator.compare(1, 2L) < 0);
 		Assert.assertTrue(comparator.compare(1, 1L) == 0);
 		Assert.assertTrue(comparator.compare(2, 1L) > 0);
-		
+
 		Assert.assertTrue(comparator.compare(1L, 2L) < 0);
 		Assert.assertTrue(comparator.compare(1L, 1L) == 0);
 		Assert.assertTrue(comparator.compare(2L, 1L) > 0);
 	}
-	
+
 	@Test
 	public void testNulls() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
@@ -73,7 +73,7 @@ public class DefaultComparatorUnitTests {
 		Assert.assertTrue(comparator.compare("a","b")<0);
 		Assert.assertTrue(comparator.compare("b","a")>0);
 	}
-	
+
 	@Test
 	public void testCanCompare() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
@@ -85,5 +85,5 @@ public class DefaultComparatorUnitTests {
 		Assert.assertTrue(comparator.canCompare("abc",3));
 		Assert.assertFalse(comparator.canCompare(String.class,3));
 	}
-	
+
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
index ed7d79f5dd..b225aa66df 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
@@ -56,7 +56,7 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
  * <li>Adding an advanced (better performing) property resolver
  * <li>Adding your own type converter to support conversion between any types you like
  * </ul>
- * 
+ *
  * @author Andy Clement
  */
 public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
@@ -75,7 +75,7 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 			Object value = expr.getValue();
 			// They are reusable
 			value = expr.getValue();
-				
+
 			Assert.assertEquals("hello world", value);
 			Assert.assertEquals(String.class, value.getClass());
 		} catch (EvaluationException ee) {
@@ -100,7 +100,7 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 		List<Integer> primes = new ArrayList<Integer>();
 		primes.addAll(Arrays.asList(2,3,5,7,11,13,17));
 		ctx.setVariable("primes",primes);
-		
+
 		Expression expr = parser.parseRaw("#favouriteColour");
 		Object value = expr.getValue(ctx);
 		Assert.assertEquals("blue", value);
@@ -112,17 +112,17 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 		// all prime numbers > 10 from the list (using selection ?{...})
 		expr = parser.parseRaw("#primes.?[#this>10]");
 		value = expr.getValue(ctx);
-		Assert.assertEquals("[11, 13, 17]", value.toString());			
+		Assert.assertEquals("[11, 13, 17]", value.toString());
 	}
 
-	
+
 	static class TestClass {
 		public String str;
 		private int property;
 		public int getProperty() { return property; }
 		public void setProperty(int i) { property = i; }
 	}
-	
+
 	/**
 	 * Scenario: using your own root context object
 	 */
@@ -137,11 +137,11 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 		tc.setProperty(42);
 		tc.str = "wibble";
 		ctx.setRootObject(tc);
-		
+
 		// read it, set it, read it again
 		Expression expr = parser.parseRaw("str");
 		Object value = expr.getValue(ctx);
-		Assert.assertEquals("wibble", value);			
+		Assert.assertEquals("wibble", value);
 		expr = parser.parseRaw("str");
 		expr.setValue(ctx, "wobble");
 		expr = parser.parseRaw("str");
@@ -153,7 +153,7 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 		expr = parser.parseRaw("str");
 		value = expr.getValue(ctx);
 		Assert.assertEquals("wabble", value);
-		
+
 		// private property will be accessed through getter()
 		expr = parser.parseRaw("property");
 		value = expr.getValue(ctx);
@@ -166,7 +166,7 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 		value = expr.getValue(ctx);
 		Assert.assertEquals(4,value);
 	}
-	
+
 	public static String repeat(String s) { return s+s; }
 
 	/**
@@ -180,7 +180,7 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 			// Use the standard evaluation context
 			StandardEvaluationContext ctx = new StandardEvaluationContext();
 			ctx.registerFunction("repeat",ExpressionLanguageScenarioTests.class.getDeclaredMethod("repeat",String.class));
-			
+
 			Expression expr = parser.parseRaw("#repeat('hello')");
 			Object value = expr.getValue(ctx);
 			Assert.assertEquals("hellohello", value);
@@ -193,7 +193,7 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 			Assert.fail("Unexpected Exception: " + pe.getMessage());
 		}
 	}
-	
+
 	/**
 	 * Scenario: add a property resolver that will get called in the resolver chain, this one only supports reading.
 	 */
@@ -313,6 +313,6 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 
 		public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException {
 		}
-		
+
 	}
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
index f984c98540..a7a1856777 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
@@ -33,13 +33,13 @@ import org.springframework.expression.spel.testresources.Inventor;
 
 /**
  * Tests for the expression state object - some features are not yet exploited in the language (eg nested scopes)
- * 
+ *
  * @author Andy Clement
  */
 public class ExpressionStateTests extends ExpressionTestCase {
 
 	@Test
-	public void testConstruction() {		
+	public void testConstruction() {
 		EvaluationContext context = TestScenarioCreator.getTestEvaluationContext();
 		ExpressionState state = new ExpressionState(context);
 		Assert.assertEquals(context,state.getEvaluationContext());
@@ -47,14 +47,14 @@ public class ExpressionStateTests extends ExpressionTestCase {
 
 	// Local variables are in variable scopes which come and go during evaluation.  Normal variables are
 	// accessible through the evaluation context
-	
+
 	@Test
 	public void testLocalVariables() {
 		ExpressionState state = getState();
-		
+
 		Object value = state.lookupLocalVariable("foo");
 		Assert.assertNull(value);
-		
+
 		state.setLocalVariable("foo",34);
 		value = state.lookupLocalVariable("foo");
 		Assert.assertEquals(34,value);
@@ -80,13 +80,13 @@ public class ExpressionStateTests extends ExpressionTestCase {
 		Assert.assertEquals("abc",typedValue.getValue());
 		Assert.assertEquals(String.class,typedValue.getTypeDescriptor().getType());
 	}
-	
+
 	@Test
 	public void testNoVariableInteference() {
 		ExpressionState state = getState();
 		TypedValue typedValue = state.lookupVariable("foo");
 		Assert.assertEquals(TypedValue.NULL,typedValue);
-		
+
 		state.setLocalVariable("foo",34);
 		typedValue = state.lookupVariable("foo");
 		Assert.assertEquals(TypedValue.NULL,typedValue);
@@ -94,25 +94,25 @@ public class ExpressionStateTests extends ExpressionTestCase {
 		state.setVariable("goo","hello");
 		Assert.assertNull(state.lookupLocalVariable("goo"));
 	}
-	
+
 	@Test
 	public void testLocalVariableNestedScopes() {
 		ExpressionState state = getState();
 		Assert.assertEquals(null,state.lookupLocalVariable("foo"));
-		
+
 		state.setLocalVariable("foo",12);
 		Assert.assertEquals(12,state.lookupLocalVariable("foo"));
-		
+
 		state.enterScope(null);
 		Assert.assertEquals(12,state.lookupLocalVariable("foo")); // found in upper scope
 
 		state.setLocalVariable("foo","abc");
 		Assert.assertEquals("abc",state.lookupLocalVariable("foo")); // found in nested scope
-		
+
 		state.exitScope();
 		Assert.assertEquals(12,state.lookupLocalVariable("foo")); // found in nested scope
 	}
-	
+
 	@Test
 	public void testRootContextObject() {
 		ExpressionState state = getState();
@@ -122,62 +122,62 @@ public class ExpressionStateTests extends ExpressionTestCase {
 		((StandardEvaluationContext) state.getEvaluationContext()).setRootObject(null);
 		Assert.assertEquals(Inventor.class,state.getRootContextObject().getValue().getClass());
 		// Assert.assertEquals(null, state.getRootContextObject().getValue());
-		
+
 		state = new ExpressionState(new StandardEvaluationContext());
 		Assert.assertEquals(TypedValue.NULL,state.getRootContextObject());
-		
+
 
 		((StandardEvaluationContext)state.getEvaluationContext()).setRootObject(null);
 		Assert.assertEquals(null,state.getRootContextObject().getValue());
 	}
-	
+
 	@Test
 	public void testActiveContextObject() {
 		ExpressionState state = getState();
 		Assert.assertEquals(state.getRootContextObject().getValue(),state.getActiveContextObject().getValue());
-		
+
 		try {
 			state.popActiveContextObject();
 			Assert.fail("stack should be empty...");
 		} catch (EmptyStackException ese) {
 			// success
 		}
-		
+
 		state.pushActiveContextObject(new TypedValue(34));
 		Assert.assertEquals(34,state.getActiveContextObject().getValue());
-		
+
 		state.pushActiveContextObject(new TypedValue("hello"));
 		Assert.assertEquals("hello",state.getActiveContextObject().getValue());
-		
+
 		state.popActiveContextObject();
 		Assert.assertEquals(34,state.getActiveContextObject().getValue());
-		
+
 		state.popActiveContextObject();
 		Assert.assertEquals(state.getRootContextObject().getValue(),state.getActiveContextObject().getValue());
-		
+
 		state = new ExpressionState(new StandardEvaluationContext());
 		Assert.assertEquals(TypedValue.NULL,state.getActiveContextObject());
 	}
-	
+
 	@Test
 	public void testPopulatedNestedScopes() {
 		ExpressionState state = getState();
 		Assert.assertNull(state.lookupLocalVariable("foo"));
-		
+
 		state.enterScope("foo",34);
 		Assert.assertEquals(34,state.lookupLocalVariable("foo"));
-		
+
 		state.enterScope(null);
 		state.setLocalVariable("foo",12);
 		Assert.assertEquals(12,state.lookupLocalVariable("foo"));
 
 		state.exitScope();
 		Assert.assertEquals(34,state.lookupLocalVariable("foo"));
-		
+
 		state.exitScope();
 		Assert.assertNull(state.lookupLocalVariable("goo"));
 	}
-	
+
 	@Test
 	public void testRootObjectConstructor() {
 		EvaluationContext ctx = getContext();
@@ -188,21 +188,21 @@ public class ExpressionStateTests extends ExpressionTestCase {
 		Assert.assertEquals(String.class,stateRoot.getTypeDescriptor().getType());
 		Assert.assertEquals("i am a string",stateRoot.getValue());
 	}
-	
+
 	@Test
 	public void testPopulatedNestedScopesMap() {
 		ExpressionState state = getState();
 		Assert.assertNull(state.lookupLocalVariable("foo"));
 		Assert.assertNull(state.lookupLocalVariable("goo"));
-		
+
 		Map<String,Object> m = new HashMap<String,Object>();
 		m.put("foo",34);
 		m.put("goo","abc");
-		
+
 		state.enterScope(m);
 		Assert.assertEquals(34,state.lookupLocalVariable("foo"));
 		Assert.assertEquals("abc",state.lookupLocalVariable("goo"));
-		
+
 		state.enterScope(null);
 		state.setLocalVariable("foo",12);
 		Assert.assertEquals(12,state.lookupLocalVariable("foo"));
@@ -213,7 +213,7 @@ public class ExpressionStateTests extends ExpressionTestCase {
 		Assert.assertNull(state.lookupLocalVariable("foo"));
 		Assert.assertNull(state.lookupLocalVariable("goo"));
 	}
-	
+
 	@Test
 	public void testOperators() throws Exception {
 		ExpressionState state = getState();
@@ -233,13 +233,13 @@ public class ExpressionStateTests extends ExpressionTestCase {
 			Assert.assertEquals(SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES,sEx.getMessageCode());
 		}
 	}
-	
+
 	@Test
 	public void testComparator() {
 		ExpressionState state = getState();
 		Assert.assertEquals(state.getEvaluationContext().getTypeComparator(),state.getTypeComparator());
 	}
-	
+
 	@Test
 	public void testTypeLocator() throws EvaluationException {
 		ExpressionState state = getState();
@@ -253,7 +253,7 @@ public class ExpressionStateTests extends ExpressionTestCase {
 			Assert.assertEquals(SpelMessage.TYPE_NOT_FOUND,sEx.getMessageCode());
 		}
 	}
-	
+
 	@Test
 	public void testTypeConversion() throws EvaluationException {
 		ExpressionState state = getState();
@@ -269,7 +269,7 @@ public class ExpressionStateTests extends ExpressionTestCase {
 		ExpressionState state = getState();
 		Assert.assertEquals(state.getEvaluationContext().getPropertyAccessors(),state.getPropertyAccessors());
 	}
-	
+
 	/**
 	 * @return a new ExpressionState
 	 */
@@ -278,7 +278,7 @@ public class ExpressionStateTests extends ExpressionTestCase {
 		ExpressionState state = new ExpressionState(context);
 		return state;
 	}
-	
+
 	private EvaluationContext getContext() {
 		return TestScenarioCreator.getTestEvaluationContext();
 	}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
index af7e57e6e1..9f4d22b363 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
@@ -49,7 +49,7 @@ public class ExpressionTestsUsingCoreConversionService extends ExpressionTestCas
 	private static TypeDescriptor typeDescriptorForListOfString = null;
 	private static List<Integer> listOfInteger = new ArrayList<Integer>();
 	private static TypeDescriptor typeDescriptorForListOfInteger = null;
-	
+
 	static {
 		listOfString.add("1");
 		listOfString.add("2");
@@ -58,21 +58,21 @@ public class ExpressionTestsUsingCoreConversionService extends ExpressionTestCas
 		listOfInteger.add(5);
 		listOfInteger.add(6);
 	}
-	
+
 	@Before
 	public void setUp() throws Exception {
 		ExpressionTestsUsingCoreConversionService.typeDescriptorForListOfString = new TypeDescriptor(ExpressionTestsUsingCoreConversionService.class.getDeclaredField("listOfString"));
 		ExpressionTestsUsingCoreConversionService.typeDescriptorForListOfInteger = new TypeDescriptor(ExpressionTestsUsingCoreConversionService.class.getDeclaredField("listOfInteger"));
 	}
-		
-	
+
+
 	/**
 	 * Test the service can convert what we are about to use in the expression evaluation tests.
 	 */
 	@Test
 	public void testConversionsAvailable() throws Exception {
 		TypeConvertorUsingConversionService tcs = new TypeConvertorUsingConversionService();
-		
+
 		// ArrayList containing List<Integer> to List<String>
 		Class<?> clazz = typeDescriptorForListOfString.getElementTypeDescriptor().getType();
 		assertEquals(String.class,clazz);
@@ -82,11 +82,11 @@ public class ExpressionTestsUsingCoreConversionService extends ExpressionTestCas
 		// ArrayList containing List<String> to List<Integer>
 		clazz = typeDescriptorForListOfInteger.getElementTypeDescriptor().getType();
 		assertEquals(Integer.class,clazz);
-		
+
 		l = (List) tcs.convertValue(listOfString, TypeDescriptor.forObject(listOfString), typeDescriptorForListOfString);
 		assertNotNull(l);
 	}
-	
+
 	@Test
 	public void testSetParameterizedList() throws Exception {
 		StandardEvaluationContext context = TestScenarioCreator.getTestEvaluationContext();
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
index 617d69fa66..f94503828b 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
@@ -38,7 +38,7 @@ public class IndexingTests {
 		expression = parser.parseExpression("property['foo']");
 		assertEquals("bar", expression.getValue(this));
 	}
-	
+
 	@FieldAnnotation
 	public Object property;
 
@@ -59,7 +59,7 @@ public class IndexingTests {
 		expression = parser.parseExpression("property['foo']");
 		assertEquals("bar", expression.getValue(context));
 	}
-	
+
 	public static class MapAccessor implements PropertyAccessor {
 
 		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
@@ -83,9 +83,9 @@ public class IndexingTests {
 		public Class<?>[] getSpecificTargetClasses() {
 			return new Class[] { Map.class };
 		}
-		
+
 	}
-	
+
 	@Test
 	public void setGenericPropertyContainingMap() {
 		Map<String, String> property = new HashMap<String, String>();
@@ -97,7 +97,7 @@ public class IndexingTests {
 		assertEquals(property, expression.getValue(this));
 		expression = parser.parseExpression("property['foo']");
 		assertEquals("bar", expression.getValue(this));
-		expression.setValue(this, "baz");		
+		expression.setValue(this, "baz");
 		assertEquals("baz", expression.getValue(this));
 	}
 
@@ -112,7 +112,7 @@ public class IndexingTests {
 		assertEquals(property, expression.getValue(this));
 		expression = parser.parseExpression("parameterizedMap['9']");
 		assertEquals(3, expression.getValue(this));
-		expression.setValue(this, "37");		
+		expression.setValue(this, "37");
 		assertEquals(37, expression.getValue(this));
 	}
 
@@ -126,10 +126,10 @@ public class IndexingTests {
 		assertEquals(property, expression.getValue(this));
 		expression = parser.parseExpression("parameterizedMap['9']");
 		assertEquals(null, expression.getValue(this));
-		expression.setValue(this, "37");		
+		expression.setValue(this, "37");
 		assertEquals(37, expression.getValue(this));
 	}
-	
+
 	@Test
 	public void indexIntoGenericPropertyContainingList() {
 		List<String> property = new ArrayList<String>();
@@ -142,7 +142,7 @@ public class IndexingTests {
 		expression = parser.parseExpression("property[0]");
 		assertEquals("bar", expression.getValue(this));
 	}
-	
+
 	@Test
 	public void setGenericPropertyContainingList() {
 		List<Integer> property = new ArrayList<Integer>();
@@ -170,10 +170,10 @@ public class IndexingTests {
 		try {
 			expression.setValue(this, "4");
 		} catch (EvaluationException e) {
-			assertTrue(e.getMessage().startsWith("EL1053E"));			
+			assertTrue(e.getMessage().startsWith("EL1053E"));
 		}
 	}
-	
+
 	@Test
 	public void indexIntoPropertyContainingList() {
 		List<Integer> property = new ArrayList<Integer>();
@@ -186,7 +186,7 @@ public class IndexingTests {
 		expression = parser.parseExpression("parameterizedList[0]");
 		assertEquals(3, expression.getValue(this));
 	}
-	
+
 	public List<Integer> parameterizedList;
 
 	@Test
@@ -201,9 +201,9 @@ public class IndexingTests {
 		expression = parser.parseExpression("parameterizedListOfList[0][0]");
 		assertEquals(3, expression.getValue(this));
 	}
-	
+
 	public List<List<Integer>> parameterizedListOfList;
-	
+
 	@Test
 	public void setPropertyContainingList() {
 		List<Integer> property = new ArrayList<Integer>();
@@ -218,7 +218,7 @@ public class IndexingTests {
 		expression.setValue(this, "4");
 		assertEquals(4, expression.getValue(this));
 	}
-	
+
 	@Test
 	public void indexIntoGenericPropertyContainingNullList() {
 		SpelParserConfiguration configuration = new SpelParserConfiguration(true, true);
@@ -230,7 +230,7 @@ public class IndexingTests {
 		try {
 			assertEquals("bar", expression.getValue(this));
 		} catch (EvaluationException e) {
-			assertTrue(e.getMessage().startsWith("EL1027E"));			
+			assertTrue(e.getMessage().startsWith("EL1027E"));
 		}
 	}
 
@@ -267,7 +267,7 @@ public class IndexingTests {
 			assertTrue(e.getMessage().startsWith("EL1053E"));
 		}
 	}
-	
+
 	public List property2;
 
 	@Test
@@ -281,7 +281,7 @@ public class IndexingTests {
 		expression = parser.parseExpression("property[0]");
 		assertEquals("bar", expression.getValue(this));
 	}
-	
+
 	@Test
 	public void emptyList() {
 		listOfScalarNotGeneric = new ArrayList();
@@ -315,7 +315,7 @@ public class IndexingTests {
 	@Target({ElementType.FIELD})
 	@Retention(RetentionPolicy.RUNTIME)
 	public @interface FieldAnnotation {
-		
+
 	}
 
 	@Test
@@ -327,7 +327,7 @@ public class IndexingTests {
 		Expression expression = parser.parseExpression("mapNotGeneric");
 		assertEquals("@org.springframework.expression.spel.IndexingTests$FieldAnnotation java.util.HashMap<?, ?>", expression.getValueTypeDescriptor(this).toString());
 	}
-	
+
 	@FieldAnnotation
 	public Map mapNotGeneric;
 
@@ -339,10 +339,10 @@ public class IndexingTests {
 		Expression expression = parser.parseExpression("listOfScalarNotGeneric[0]");
 		assertEquals(new Integer(5), expression.getValue(this, Integer.class));
 	}
-	
+
 	public List listOfScalarNotGeneric;
 
-	
+
 	@Test
 	public void testListsOfMap() {
 		listOfMapsNotGeneric = new ArrayList();
@@ -353,7 +353,7 @@ public class IndexingTests {
 		Expression expression = parser.parseExpression("listOfMapsNotGeneric[0]['fruit']");
 		assertEquals("apple", expression.getValue(this, String.class));
 	}
-	
+
 	public List listOfMapsNotGeneric;
-	
+
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java
index 6fd8925ae0..71055857f8 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java
@@ -26,7 +26,7 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
 
 /**
  * Test usage of inline lists.
- * 
+ *
  * @author Andy Clement
  * @since 3.0.4
  */
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java
index 7aff1e1ba2..16d490bc2c 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java
@@ -46,7 +46,7 @@ public class LiteralExpressionTests {
 		Assert.assertFalse(lEx.isWritable(new Rooty()));
 		Assert.assertFalse(lEx.isWritable(new StandardEvaluationContext(), new Rooty()));
 	}
-	
+
 	static class Rooty {}
 
 	@Test
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/LiteralTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralTests.java
index b3330d7b9d..6eda349325 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/LiteralTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralTests.java
@@ -23,7 +23,7 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
 
 /**
  * Tests the evaluation of basic literals: boolean, integer, hex integer, long, real, null, date
- * 
+ *
  * @author Andy Clement
  */
 public class LiteralTests extends ExpressionTestCase {
@@ -159,7 +159,7 @@ public class LiteralTests extends ExpressionTestCase {
 		evaluate("new Integer(37).byteValue()", (byte) 37, Byte.class); // calling byteValue() on Integer.class
 		evaluateAndAskForReturnType("new Integer(37)", (byte) 37, Byte.class); // relying on registered type converters
 	}
-	
+
 	@Test
 	public void testNotWritable() throws Exception {
 		SpelExpression expr = (SpelExpression)parser.parseExpression("37");
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 adae5e7197..215e703671 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
@@ -33,7 +33,7 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
 
 /**
  * Testing variations on map access.
- * 
+ *
  * @author Andy Clement
  */
 public class MapAccessTests extends ExpressionTestCase {
@@ -170,7 +170,7 @@ public class MapAccessTests extends ExpressionTestCase {
 		public Class<?>[] getSpecificTargetClasses() {
 			return new Class[] { Map.class };
 		}
-		
+
 	}
 
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
index e19da9b9a8..66aa85fb89 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
@@ -27,7 +27,7 @@ import org.springframework.expression.spel.standard.SpelExpression;
 
 /**
  * Test providing operator support
- * 
+ *
  * @author Andy Clement
  */
 public class OperatorOverloaderTests extends ExpressionTestCase {
@@ -48,11 +48,11 @@ public class OperatorOverloaderTests extends ExpressionTestCase {
 				return true;
 			}
 			return false;
-			
+
 		}
-		
+
 	}
-	
+
 	@Test
 	public void testSimpleOperations() throws Exception {
 		// no built in support for this:
@@ -66,7 +66,7 @@ public class OperatorOverloaderTests extends ExpressionTestCase {
 
 		expr = (SpelExpression)parser.parseExpression("'abc'-true");
 		Assert.assertEquals("abc",expr.getValue(eContext));
-		
+
 		expr = (SpelExpression)parser.parseExpression("'abc'+null");
 		Assert.assertEquals("abcnull",expr.getValue(eContext));
 	}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
index 2c62030d6f..56f26cef12 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
@@ -23,7 +23,7 @@ import org.springframework.expression.spel.standard.SpelExpression;
 
 /**
  * Tests the evaluation of expressions using relational operators.
- * 
+ *
  * @author Andy Clement
  */
 public class OperatorTests extends ExpressionTestCase {
@@ -124,7 +124,7 @@ public class OperatorTests extends ExpressionTestCase {
 	public void testGreaterThanOrEqual() {
 		evaluate("3 >= 5", false, Boolean.class);
 		evaluate("5 >= 3", true, Boolean.class);
-		evaluate("6 >= 6", true, Boolean.class);		
+		evaluate("6 >= 6", true, Boolean.class);
 		evaluate("3L >= 5L", false, Boolean.class);
 		evaluate("5L >= 3L", true, Boolean.class);
 		evaluate("5L >= 5L", true, Boolean.class);
@@ -137,14 +137,14 @@ public class OperatorTests extends ExpressionTestCase {
 
 		evaluate("3 GE 5", false, Boolean.class);
 		evaluate("5 gE 3", true, Boolean.class);
-		evaluate("6 Ge 6", true, Boolean.class);		
+		evaluate("6 Ge 6", true, Boolean.class);
 		evaluate("3L ge 5L", false, Boolean.class);
 	}
 
 	@Test
 	public void testGreaterThan() {
 		evaluate("3 > 5", false, Boolean.class);
-		evaluate("5 > 3", true, Boolean.class);		
+		evaluate("5 > 3", true, Boolean.class);
 		evaluate("3L > 5L", false, Boolean.class);
 		evaluate("5L > 3L", true, Boolean.class);
 		evaluate("3.0d > 5.0d", false, Boolean.class);
@@ -172,7 +172,7 @@ public class OperatorTests extends ExpressionTestCase {
 	public void testMathOperatorAdd02() {
 		evaluate("'hello' + ' ' + 'world'", "hello world", String.class);
 	}
-	
+
 	@Test
 	public void testMathOperatorsInChains() {
 		evaluate("1+2+3",6,Integer.class);
@@ -194,7 +194,7 @@ public class OperatorTests extends ExpressionTestCase {
 		evaluate("3 Mod 2", 1, Integer.class);
 		evaluate("3 MOD 2", 1, Integer.class);
 	}
-	
+
 	@Test
 	public void testPlus() throws Exception {
 		evaluate("7 + 2", "9", Integer.class);
@@ -205,26 +205,26 @@ public class OperatorTests extends ExpressionTestCase {
 		evaluate("2 + 'a'", "2a", String.class);
 		evaluate("'ab' + null", "abnull", String.class);
 		evaluate("null + 'ab'", "nullab", String.class);
-		
+
 		// AST:
 		SpelExpression expr = (SpelExpression)parser.parseExpression("+3");
 		Assert.assertEquals("+3",expr.toStringAST());
 		expr = (SpelExpression)parser.parseExpression("2+3");
 		Assert.assertEquals("(2 + 3)",expr.toStringAST());
-		
+
 		// use as a unary operator
 		evaluate("+5d",5d,Double.class);
 		evaluate("+5L",5L,Long.class);
 		evaluate("+5",5,Integer.class);
 		evaluateAndCheckError("+'abc'",SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
-		
+
 		// string concatenation
 		evaluate("'abc'+'def'","abcdef",String.class);
-		
-		// 
+
+		//
 		evaluate("5 + new Integer('37')",42,Integer.class);
 	}
-	
+
 	@Test
 	public void testMinus() throws Exception {
 		evaluate("'c' - 2", "a", String.class);
@@ -235,13 +235,13 @@ public class OperatorTests extends ExpressionTestCase {
 		Assert.assertEquals("-3",expr.toStringAST());
 		expr = (SpelExpression)parser.parseExpression("2-3");
 		Assert.assertEquals("(2 - 3)",expr.toStringAST());
-		
+
 		evaluate("-5d",-5d,Double.class);
 		evaluate("-5L",-5L,Long.class);
 		evaluate("-5",-5,Integer.class);
 		evaluateAndCheckError("-'abc'",SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
 	}
-	
+
 	@Test
 	public void testModulus() {
 		evaluate("3%2",1,Integer.class);
@@ -259,7 +259,7 @@ public class OperatorTests extends ExpressionTestCase {
 		evaluate("4L DIV 2L",2L,Long.class);
 		evaluateAndCheckError("'abc'/'def'",SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
 	}
-	
+
 	@Test
 	public void testMathOperatorDivide_ConvertToDouble() {
 		evaluateAndAskForReturnType("8/4", new Double(2.0), Double.class);
@@ -282,7 +282,7 @@ public class OperatorTests extends ExpressionTestCase {
 		evaluate("3.0d / 5.0d", 0.6d, Double.class);
 		evaluate("6.0d % 3.5d", 2.5d, Double.class);
 	}
-	
+
 	@Test
 	public void testOperatorNames() throws Exception {
 		Operator node = getOperatorNode((SpelExpression)parser.parseExpression("1==3"));
@@ -290,13 +290,13 @@ public class OperatorTests extends ExpressionTestCase {
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("1!=3"));
 		Assert.assertEquals("!=",node.getOperatorName());
-		
+
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3/3"));
 		Assert.assertEquals("/",node.getOperatorName());
-		
+
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3+3"));
 		Assert.assertEquals("+",node.getOperatorName());
-		
+
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3-3"));
 		Assert.assertEquals("-",node.getOperatorName());
 
@@ -305,29 +305,29 @@ public class OperatorTests extends ExpressionTestCase {
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3<=4"));
 		Assert.assertEquals("<=",node.getOperatorName());
-		
+
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3*4"));
 		Assert.assertEquals("*",node.getOperatorName());
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3%4"));
 		Assert.assertEquals("%",node.getOperatorName());
-		
+
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3>=4"));
 		Assert.assertEquals(">=",node.getOperatorName());
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3 between 4"));
 		Assert.assertEquals("between",node.getOperatorName());
-		
+
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3 ^ 4"));
 		Assert.assertEquals("^",node.getOperatorName());
 	}
-	
+
 	@Test
 	public void testOperatorOverloading() {
 		evaluateAndCheckError("'a' * '2'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
 		evaluateAndCheckError("'a' ^ '2'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
 	}
-	
+
 	@Test
 	public void testPower() {
 		evaluate("3^2",9,Integer.class);
@@ -335,16 +335,16 @@ public class OperatorTests extends ExpressionTestCase {
 		evaluate("3L^2L",9L,Long.class);
 		evaluate("(2^32)^2",9223372036854775807L,Long.class);
 	}
-	
+
 	@Test
 	public void testMixedOperands_FloatsAndDoubles() {
 		evaluate("3.0d + 5.0f", 8.0d, Double.class);
 		evaluate("3.0D - 5.0f", -2.0d, Double.class);
 		evaluate("3.0f * 5.0d", 15.0d, Double.class);
 		evaluate("3.0f / 5.0D", 0.6d, Double.class);
-		evaluate("5.0D % 3f", 2.0d, Double.class);		
+		evaluate("5.0D % 3f", 2.0d, Double.class);
 	}
-	
+
 	@Test
 	public void testMixedOperands_DoublesAndInts() {
 		evaluate("3.0d + 5", 8.0d, Double.class);
@@ -352,10 +352,10 @@ public class OperatorTests extends ExpressionTestCase {
 		evaluate("3.0f * 5", 15.0f, Float.class);
 		evaluate("6.0f / 2", 3.0f, Float.class);
 		evaluate("6.0f / 4", 1.5f, Float.class);
-		evaluate("5.0D % 3", 2.0d, Double.class);		
-		evaluate("5.5D % 3", 2.5, Double.class);		
+		evaluate("5.0D % 3", 2.0d, Double.class);
+		evaluate("5.5D % 3", 2.5, Double.class);
 	}
-	
+
 	@Test
 	public void testStrings() {
 		evaluate("'abc' == 'abc'",true,Boolean.class);
@@ -363,7 +363,7 @@ public class OperatorTests extends ExpressionTestCase {
 		evaluate("'abc' != 'abc'",false,Boolean.class);
 		evaluate("'abc' != 'def'",true,Boolean.class);
 	}
-	
+
 	@Test
 	public void testLongs() {
 		evaluate("3L == 4L", false, Boolean.class);
@@ -374,14 +374,14 @@ public class OperatorTests extends ExpressionTestCase {
 		evaluate("3L + 50L", 53L, Long.class);
 		evaluate("3L - 50L", -47L, Long.class);
 	}
-	
+
 	// ---
-	
+
 	private Operator getOperatorNode(SpelExpression e) {
 		SpelNode node = e.getAST();
 		return (Operator)findNode(node,Operator.class);
 	}
-	
+
 	private SpelNode findNode(SpelNode node, Class<Operator> clazz) {
 		if (clazz.isAssignableFrom(node.getClass())) {
 			return node;
@@ -395,5 +395,5 @@ public class OperatorTests extends ExpressionTestCase {
 		}
 		return null;
 	}
-	
+
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
index 5e714ac661..3c0a3024f5 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
@@ -26,7 +26,7 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
 /**
  * Parse some expressions and check we get the AST we expect. Rather than inspecting each node in the AST, we ask it to
  * write itself to a string form and check that is as expected.
- * 
+ *
  * @author Andy Clement
  */
 public class ParsingTests {
@@ -160,7 +160,7 @@ public class ParsingTests {
 	public void testElvis() {
 		parseCheck("3?:1", "3 ?: 1");
 	}
-	
+
 	// public void testRelOperatorsIn01() {
 	// parseCheck("3 in {1,2,3,4,5}", "(3 in {1,2,3,4,5})");
 	// }
@@ -399,14 +399,14 @@ public class ParsingTests {
 		parseCheck("#var1='value1'");
 	}
 
-	
+
 	// ternary operator
-	
+
 	@Test
 	public void testTernaryOperator01() {
 		parseCheck("1>2?3:4","(1 > 2) ? 3 : 4");
 	}
-	
+
 	// public void testTernaryOperator01() {
 	// parseCheck("{1}.#isEven(#this) == 'y'?'it is even':'it is odd'",
 	// "({1}.#isEven(#this) == 'y') ? 'it is even' : 'it is odd'");
@@ -432,16 +432,16 @@ public class ParsingTests {
 	public void testTypeReferences02() {
 		parseCheck("T(String)");
 	}
-	
+
 	@Test
 	public void testInlineList1() {
 		parseCheck("{1,2,3,4}");
 	}
-	
+
 	/**
 	 * Parse the supplied expression and then create a string representation of the resultant AST, it should be the same
 	 * as the original expression.
-	 * 
+	 *
 	 * @param expression the expression to parse *and* the expected value of the string form of the resultant AST
 	 */
 	public void parseCheck(String expression) {
@@ -451,7 +451,7 @@ public class ParsingTests {
 	/**
 	 * Parse the supplied expression and then create a string representation of the resultant AST, it should be the
 	 * expected value.
-	 * 
+	 *
 	 * @param expression the expression to parse
 	 * @param expectedStringFormOfAST the expected string form of the AST
 	 */
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
index 126cb718ce..231a3adff0 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
@@ -28,7 +28,7 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
 
 /**
  * Tests the evaluation of real expressions in a real context.
- * 
+ *
  * @author Andy Clement
  */
 public class PerformanceTests {
@@ -40,7 +40,7 @@ public class PerformanceTests {
 	private static EvaluationContext eContext = TestScenarioCreator.getTestEvaluationContext();
 
 	private static final boolean DEBUG = false;
-	
+
 	@Test
 	public void testPerformanceOfPropertyAccess() throws Exception {
 		long starttime = 0;
@@ -54,7 +54,7 @@ public class PerformanceTests {
 			}
 			expr.getValue(eContext);
 		}
-		
+
 		starttime = System.currentTimeMillis();
 		for (int i = 0; i < ITERATIONS; i++) {
 			Expression expr = parser.parseExpression("placeOfBirth.city");
@@ -92,7 +92,7 @@ public class PerformanceTests {
 	public void testPerformanceOfMethodAccess() throws Exception {
 		long starttime = 0;
 		long endtime = 0;
-		
+
 		// warmup
 		for (int i = 0; i < ITERATIONS; i++) {
 			Expression expr = parser.parseExpression("getPlaceOfBirth().getCity()");
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
index fa05420e45..5bc84c9d38 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
@@ -40,7 +40,7 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
 ///CLOVER:OFF
 /**
  * Spring Security scenarios from https://wiki.springsource.com/display/SECURITY/Spring+Security+Expression-based+Authorization
- * 
+ *
  * @author Andy Clement
  */
 public class ScenariosForSpringSecurity extends ExpressionTestCase {
@@ -55,7 +55,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 			ctx.setRootObject(new Person("Ben"));
 			Boolean value = expr.getValue(ctx,Boolean.class);
 			Assert.assertFalse(value);
-			
+
 			ctx.setRootObject(new Manager("Luke"));
 			value = expr.getValue(ctx,Boolean.class);
 			Assert.assertTrue(value);
@@ -72,7 +72,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 		StandardEvaluationContext ctx = new StandardEvaluationContext();
 
 		ctx.addPropertyAccessor(new SecurityPrincipalAccessor());
-		
+
 		// Multiple options for supporting this expression: "p.name == principal.name"
 		// (1) If the right person is the root context object then "name==principal.name" is good enough
 		Expression expr = parser.parseRaw("name == principal.name");
@@ -80,22 +80,22 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 		ctx.setRootObject(new Person("Andy"));
 		Boolean value = expr.getValue(ctx,Boolean.class);
 		Assert.assertTrue(value);
-		
+
 		ctx.setRootObject(new Person("Christian"));
 		value = expr.getValue(ctx,Boolean.class);
 		Assert.assertFalse(value);
 
 		// (2) Or register an accessor that can understand 'p' and return the right person
 		expr = parser.parseRaw("p.name == principal.name");
-		
+
 		PersonAccessor pAccessor = new PersonAccessor();
 		ctx.addPropertyAccessor(pAccessor);
 		ctx.setRootObject(null);
-		
+
 		pAccessor.setPerson(new Person("Andy"));
 		value = expr.getValue(ctx,Boolean.class);
 		Assert.assertTrue(value);
-		
+
 		pAccessor.setPerson(new Person("Christian"));
 		value = expr.getValue(ctx,Boolean.class);
 		Assert.assertFalse(value);
@@ -105,18 +105,18 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 	public void testScenario03_Arithmetic() throws Exception {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext ctx = new StandardEvaluationContext();
-		
+
 		// Might be better with a as a variable although it would work as a property too...
 		// Variable references using a '#'
 		Expression expr = parser.parseRaw("(hasRole('SUPERVISOR') or (#a <  1.042)) and hasIpAddress('10.10.0.0/16')");
 
 		Boolean value = null;
-		
+
 		ctx.setVariable("a",1.0d); // referenced as #a in the expression
 		ctx.setRootObject(new Supervisor("Ben")); // so non-qualified references 'hasRole()' 'hasIpAddress()' are invoked against it
 		value = expr.getValue(ctx,Boolean.class);
 		Assert.assertTrue(value);
-		
+
 		ctx.setRootObject(new Manager("Luke"));
 		ctx.setVariable("a",1.043d);
 		value = expr.getValue(ctx,Boolean.class);
@@ -128,7 +128,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 	public void testScenario04_ControllingWhichMethodsRun() throws Exception {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext ctx = new StandardEvaluationContext();
-		
+
 		ctx.setRootObject(new Supervisor("Ben")); // so non-qualified references 'hasRole()' 'hasIpAddress()' are invoked against it);
 
 		ctx.addMethodResolver(new MyMethodResolver()); // NEEDS TO OVERRIDE THE REFLECTION ONE - SHOW REORDERING MECHANISM
@@ -138,17 +138,17 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 		Expression expr = parser.parseRaw("(hasRole(3) or (#a <  1.042)) and hasIpAddress('10.10.0.0/16')");
 
 		Boolean value = null;
-		
+
 		ctx.setVariable("a",1.0d); // referenced as #a in the expression
 		value = expr.getValue(ctx,Boolean.class);
 		Assert.assertTrue(value);
-		
+
 //			ctx.setRootObject(new Manager("Luke"));
 //			ctx.setVariable("a",1.043d);
 //			value = (Boolean)expr.getValue(ctx,Boolean.class);
 //			assertFalse(value);
 	}
-	
+
 
 	static class Person {
 
@@ -236,7 +236,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 		public Class<?>[] getSpecificTargetClasses() {
 			return null;
 		}
-		
+
 
 	}
 
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
index 45ddcf2394..8d98cb8bea 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
@@ -31,7 +31,7 @@ import org.springframework.expression.spel.testresources.PlaceOfBirth;
 
 /**
  * Tests set value expressions.
- * 
+ *
  * @author Keith Donald
  * @author Andy Clement
  */
@@ -43,7 +43,7 @@ public class SetValueTests extends ExpressionTestCase {
 	public void testSetProperty() {
 		setValue("wonNobelPrize", true);
 	}
-	
+
 	@Test
 	public void testSetNestedProperty() {
 		setValue("placeOfBirth.city", "Wien");
@@ -89,17 +89,17 @@ public class SetValueTests extends ExpressionTestCase {
 		setValueExpectError("arrayContainer.bytes[1]", "NaB");
 		setValueExpectError("arrayContainer.chars[1]", "NaC");
 	}
-	
+
 	@Test
 	public void testSetArrayElementNestedValue() {
 		setValue("placesLived[0].city", "Wien");
 	}
-	
+
 	@Test
 	public void testSetListElementValue() {
 		setValue("placesLivedList[0]", new PlaceOfBirth("Wien"));
 	}
-	
+
 	@Test
 	public void testSetGenericListElementValueTypeCoersion() {
 		// TODO currently failing since setValue does a getValue and "Wien" string != PlaceOfBirth - check with andy
@@ -110,7 +110,7 @@ public class SetValueTests extends ExpressionTestCase {
 	public void testSetGenericListElementValueTypeCoersionOK() {
 		setValue("booleanList[0]", "true", Boolean.TRUE);
 	}
-	
+
 	@Test
 	public void testSetListElementNestedValue() {
 		setValue("placesLived[0].city", "Wien");
@@ -121,17 +121,17 @@ public class SetValueTests extends ExpressionTestCase {
 		setValueExpectError("placesLived[23]", "Wien");
 		setValueExpectError("placesLivedList[23]", "Wien");
 	}
-	
+
 	@Test
 	public void testSetMapElements() {
 		setValue("testMap['montag']","lundi");
 	}
-	
+
 	@Test
 	public void testIndexingIntoUnsupportedType() {
 		setValueExpectError("'hello'[3]", 'p');
 	}
-	
+
 	@Test
 	public void testSetPropertyTypeCoersion() {
 		setValue("publicBoolean", "true", Boolean.TRUE);
@@ -141,9 +141,9 @@ public class SetValueTests extends ExpressionTestCase {
 	public void testSetPropertyTypeCoersionThroughSetter() {
 		setValue("SomeProperty", "true", Boolean.TRUE);
 	}
-	
+
 	@Test
-	public void testAssign() throws Exception {	
+	public void testAssign() throws Exception {
 		StandardEvaluationContext eContext = TestScenarioCreator.getTestEvaluationContext();
 		Expression e = parse("publicName='Andy'");
 		Assert.assertFalse(e.isWritable(eContext));
@@ -158,32 +158,32 @@ public class SetValueTests extends ExpressionTestCase {
 		StandardEvaluationContext eContext = TestScenarioCreator.getTestEvaluationContext();
 		Expression e = parse("mapOfStringToBoolean[42]");
 		Assert.assertNull(e.getValue(eContext));
-		
+
 		// Key should be coerced to string representation of 42
 		e.setValue(eContext, "true");
-		
+
 		// All keys should be strings
 		Set ks = parse("mapOfStringToBoolean.keySet()").getValue(eContext,Set.class);
 		for (Object o: ks) {
 			Assert.assertEquals(String.class,o.getClass());
 		}
-		
+
 		// All values should be booleans
 		Collection vs = parse("mapOfStringToBoolean.values()").getValue(eContext,Collection.class);
 		for (Object o: vs) {
 			Assert.assertEquals(Boolean.class,o.getClass());
 		}
-		
+
 		// One final test check coercion on the key for a map lookup
 		Object o = e.getValue(eContext);
 		Assert.assertEquals(Boolean.TRUE,o);
 	}
-	
+
 
 	private Expression parse(String expressionString) throws Exception {
 		return parser.parseExpression(expressionString);
 	}
-	
+
 	/**
 	 * Call setValue() but expect it to fail.
 	 */
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
index 1dad243120..ada7b35acf 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
@@ -38,17 +38,17 @@ import org.springframework.expression.spel.testresources.PlaceOfBirth;
 
 /**
  * Test the examples specified in the documentation.
- * 
+ *
  * NOTE: any outgoing changes from this file upon synchronizing with the repo may indicate that
  * you need to update the documentation too !
- * 
+ *
  * @author Andy Clement
  */
 public class SpelDocumentationTests extends ExpressionTestCase {
 
 	static Inventor tesla ;
 	static Inventor pupin ;
-	
+
 	static {
 		GregorianCalendar c = new GregorianCalendar();
 		c.set(1856, 7, 9);
@@ -60,18 +60,18 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 		pupin = new Inventor("Pupin", c.getTime(), "Idvor");
 		pupin.setPlaceOfBirth(new PlaceOfBirth("Idvor"));
-		
+
 	}
 	static class IEEE {
 		private String name;
-		
-		
+
+
 		public Inventor[] Members = new Inventor[1];
 		public List Members2 = new ArrayList();
 		public Map<String,Object> officers = new HashMap<String,Object>();
-		
+
 		public List<Map<String, Object>> reverse = new ArrayList<Map<String, Object>>();
-		
+
 		@SuppressWarnings("unchecked")
 		IEEE() {
 			officers.put("president",pupin);
@@ -80,28 +80,28 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 			officers.put("advisors",linv);
 			Members2.add(tesla);
 			Members2.add(pupin);
-			
+
 			reverse.add(officers);
 		}
-		
+
 		public boolean isMember(String name) {
 			return true;
 		}
-		
+
 		public String getName() { return name; }
 		public void setName(String n) { this.name = n; }
 	}
-	
+
 	@Test
 	public void testMethodInvocation() {
 		evaluate("'Hello World'.concat('!')","Hello World!",String.class);
 	}
-	
+
 	@Test
 	public void testBeanPropertyAccess() {
 		evaluate("new String('Hello World'.bytes)","Hello World",String.class);
 	}
-	
+
 	@Test
 	public void testArrayLengthAccess() {
 		evaluate("'Hello World'.bytes.length",11,Integer.class);
@@ -123,12 +123,12 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 		String name = (String) exp.getValue(context);
 		Assert.assertEquals("Nikola Tesla",name);
-	}	
-	
+	}
+
 	@Test
 	public void testEqualityCheck() throws Exception {
 		ExpressionParser parser = new SpelExpressionParser();
-	
+
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		context.setRootObject(tesla);
 
@@ -136,14 +136,14 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		boolean isEqual = exp.getValue(context, Boolean.class);  // evaluates to true
 		Assert.assertTrue(isEqual);
 	}
-	
+
 	// Section 7.4.1
-	
+
 	@Test
 	public void testXMLBasedConfig() {
 		 evaluate("(T(java.lang.Math).random() * 100.0 )>0",true,Boolean.class);
 	}
-	
+
 	// Section 7.5
 	@Test
 	public void testLiterals() throws Exception {
@@ -151,16 +151,16 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 		String helloWorld = (String) parser.parseExpression("'Hello World'").getValue(); // evals to "Hello World"
 		Assert.assertEquals("Hello World",helloWorld);
-		
-		double avogadrosNumber  = (Double) parser.parseExpression("6.0221415E+23").getValue();  
+
+		double avogadrosNumber  = (Double) parser.parseExpression("6.0221415E+23").getValue();
 		Assert.assertEquals(6.0221415E+23,avogadrosNumber);
-		
+
 		int maxValue = (Integer) parser.parseExpression("0x7FFFFFFF").getValue();  // evals to 2147483647
 		Assert.assertEquals(Integer.MAX_VALUE,maxValue);
-		
+
 		boolean trueValue = (Boolean) parser.parseExpression("true").getValue();
 		Assert.assertTrue(trueValue);
-		
+
 		Object nullValue = parser.parseExpression("null").getValue();
 		Assert.assertNull(nullValue);
 	}
@@ -170,11 +170,11 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		EvaluationContext context = TestScenarioCreator.getTestEvaluationContext();
 		int year = (Integer) parser.parseExpression("Birthdate.Year + 1900").getValue(context); // 1856
 		Assert.assertEquals(1856,year);
-		
+
 		String city = (String) parser.parseExpression("placeOfBirth.City").getValue(context);
 		Assert.assertEquals("SmilJan",city);
 	}
-	
+
 	@Test
 	public void testPropertyNavigation() throws Exception {
 		ExpressionParser parser = new SpelExpressionParser();
@@ -184,7 +184,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 //		teslaContext.setRootObject(tesla);
 
 		// evaluates to "Induction motor"
-		String invention = parser.parseExpression("inventions[3]").getValue(teslaContext, String.class); 
+		String invention = parser.parseExpression("inventions[3]").getValue(teslaContext, String.class);
 		Assert.assertEquals("Induction motor",invention);
 
 		// Members List
@@ -196,14 +196,14 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		// evaluates to "Nikola Tesla"
 		String name = parser.parseExpression("Members[0].Name").getValue(societyContext, String.class);
 		Assert.assertEquals("Nikola Tesla",name);
-		
+
 		// List and Array navigation
 		// evaluates to "Wireless communication"
 		invention = parser.parseExpression("Members[0].Inventions[6]").getValue(societyContext, String.class);
 		Assert.assertEquals("Wireless communication",invention);
 	}
-	
-	
+
+
 	@Test
 	public void testDictionaryAccess() throws Exception {
 		StandardEvaluationContext societyContext = new StandardEvaluationContext();
@@ -217,14 +217,14 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		// setting values
 		Inventor i = parser.parseExpression("officers['advisors'][0]").getValue(societyContext,Inventor.class);
 		Assert.assertEquals("Nikola Tesla",i.getName());
-		
+
 		parser.parseExpression("officers['advisors'][0].PlaceOfBirth.Country").setValue(societyContext, "Croatia");
 
 		Inventor i2 = parser.parseExpression("reverse[0]['advisors'][0]").getValue(societyContext,Inventor.class);
 		Assert.assertEquals("Nikola Tesla",i2.getName());
 
 	}
-	
+
 	// 7.5.3
 
 	@Test
@@ -232,16 +232,16 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		// string literal, evaluates to "bc"
 		String c = parser.parseExpression("'abc'.substring(1, 3)").getValue(String.class);
 		Assert.assertEquals("bc",c);
-		
+
 		StandardEvaluationContext societyContext = new StandardEvaluationContext();
 		societyContext.setRootObject(new IEEE());
 		// evaluates to true
 		boolean isMember = parser.parseExpression("isMember('Mihajlo Pupin')").getValue(societyContext, Boolean.class);
 		Assert.assertTrue(isMember);
 	}
-	
+
 	// 7.5.4.1
-	
+
 	@Test
 	public void testRelationalOperators() throws Exception {
 		boolean result = parser.parseExpression("2 == 2").getValue(Boolean.class);
@@ -249,18 +249,18 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		// evaluates to false
 		result = parser.parseExpression("2 < -5.0").getValue(Boolean.class);
 		Assert.assertFalse(result);
-		
+
 		// evaluates to true
 		result = parser.parseExpression("'black' < 'block'").getValue(Boolean.class);
 		Assert.assertTrue(result);
 	}
-	
+
 	@Test
 	public void testOtherOperators() throws Exception {
 		// evaluates to false
 		boolean falseValue = parser.parseExpression("'xyz' instanceof T(int)").getValue(Boolean.class);
 		Assert.assertFalse(falseValue);
-		
+
 		// evaluates to true
 		boolean trueValue = parser.parseExpression("'5.00' matches '^-?\\d+(\\.\\d{2})?$'").getValue(Boolean.class);
 		Assert.assertTrue(trueValue);
@@ -269,15 +269,15 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		falseValue = parser.parseExpression("'5.0067' matches '^-?\\d+(\\.\\d{2})?$'").getValue(Boolean.class);
 		Assert.assertFalse(falseValue);
 	}
-	
+
 	// 7.5.4.2
-	
+
 	@Test
 	public void testLogicalOperators() throws Exception {
 
 		StandardEvaluationContext societyContext = new StandardEvaluationContext();
 		societyContext.setRootObject(new IEEE());
-		
+
 		// -- AND --
 
 		// evaluates to false
@@ -292,12 +292,12 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		// evaluates to true
 		trueValue = parser.parseExpression("true or false").getValue(Boolean.class);
 		Assert.assertTrue(trueValue);
-		
+
 		// evaluates to true
 		expression =  "isMember('Nikola Tesla') or isMember('Albert Einstien')";
 		trueValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class);
 		Assert.assertTrue(trueValue);
-		
+
 		// -- NOT --
 
 		// evaluates to false
@@ -310,56 +310,56 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		falseValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class);
 		Assert.assertFalse(falseValue);
 	}
-	
+
 	// 7.5.4.3
-	
+
 	@Test
 	public void testNumericalOperators() throws Exception {
 		// Addition
 		int two = parser.parseExpression("1 + 1").getValue(Integer.class); // 2
 		Assert.assertEquals(2,two);
-		
+
 		String testString = parser.parseExpression("'test' + ' ' + 'string'").getValue(String.class); // 'test string'
 		Assert.assertEquals("test string",testString);
-		
+
 		// Subtraction
 		int four =  parser.parseExpression("1 - -3").getValue(Integer.class); // 4
 		Assert.assertEquals(4,four);
-		
+
 		double d = parser.parseExpression("1000.00 - 1e4").getValue(Double.class); // -9000
 		Assert.assertEquals(-9000.0d,d);
-		
+
 		// Multiplication
 		int six =  parser.parseExpression("-2 * -3").getValue(Integer.class); // 6
 		Assert.assertEquals(6,six);
-		
+
 		double twentyFour = parser.parseExpression("2.0 * 3e0 * 4").getValue(Double.class); // 24.0
 		Assert.assertEquals(24.0d,twentyFour);
-		
+
 		// Division
 		int minusTwo =  parser.parseExpression("6 / -3").getValue(Integer.class); // -2
 		Assert.assertEquals(-2,minusTwo);
-		
+
 		double one = parser.parseExpression("8.0 / 4e0 / 2").getValue(Double.class); // 1.0
 		Assert.assertEquals(1.0d,one);
 
 		// Modulus
 		int three =  parser.parseExpression("7 % 4").getValue(Integer.class); // 3
 		Assert.assertEquals(3,three);
-		
+
 		int oneInt = parser.parseExpression("8 / 5 % 2").getValue(Integer.class); // 1
 		Assert.assertEquals(1,oneInt);
-		
+
 		// Operator precedence
 		int minusTwentyOne = parser.parseExpression("1+2-3*8").getValue(Integer.class); // -21
 		Assert.assertEquals(-21,minusTwentyOne);
 	}
 
 	// 7.5.5
-	
+
 	@Test
 	public void testAssignment() throws Exception {
-		Inventor inventor = new Inventor();		
+		Inventor inventor = new Inventor();
 		StandardEvaluationContext inventorContext = new StandardEvaluationContext();
 		inventorContext.setRootObject(inventor);
 
@@ -372,9 +372,9 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		Assert.assertEquals("Alexandar Seovic",parser.parseExpression("foo").getValue(inventorContext,String.class));
 		Assert.assertEquals("Alexandar Seovic",aleks);
 	}
-	
+
 	// 7.5.6
-	
+
 	@Test
 	public void testTypes() throws Exception {
 		Class dateClass = parser.parseExpression("T(java.util.Date)").getValue(Class.class);
@@ -382,22 +382,22 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		boolean trueValue = parser.parseExpression("T(java.math.RoundingMode).CEILING < T(java.math.RoundingMode).FLOOR").getValue(Boolean.class);
 		Assert.assertTrue(trueValue);
 	}
-	
+
 	// 7.5.7
-	
+
 	@Test
 	public void testConstructors() throws Exception {
 		StandardEvaluationContext societyContext = new StandardEvaluationContext();
 		societyContext.setRootObject(new IEEE());
-		Inventor einstein = 
+		Inventor einstein =
 			   parser.parseExpression("new org.springframework.expression.spel.testresources.Inventor('Albert Einstein',new java.util.Date(), 'German')").getValue(Inventor.class);
 		Assert.assertEquals("Albert Einstein", einstein.getName());
 		//create new inventor instance within add method of List
 		parser.parseExpression("Members2.add(new org.springframework.expression.spel.testresources.Inventor('Albert Einstein', 'German'))").getValue(societyContext);
 	}
-	
+
 	// 7.5.8
-	
+
 	@Test
 	public void testVariables() throws Exception {
 		Inventor tesla = new Inventor("Nikola Tesla", "Serbian");
@@ -410,7 +410,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 		Assert.assertEquals("Mike Tesla",tesla.getFoo());
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	@Test
 	public void testSpecialVariables() throws Exception {
@@ -427,45 +427,45 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		List<Integer> primesGreaterThanTen = (List<Integer>) parser.parseExpression("#primes.?[#this>10]").getValue(context);
 		Assert.assertEquals("[11, 13, 17]",primesGreaterThanTen.toString());
 	}
-	
+
 	// 7.5.9
-	
+
 	@Test
 	public void testFunctions() throws Exception {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
 
-		context.registerFunction("reverseString", 
+		context.registerFunction("reverseString",
 		                         StringUtils.class.getDeclaredMethod("reverseString", new Class[] { String.class }));
 
 		String helloWorldReversed = parser.parseExpression("#reverseString('hello world')").getValue(context, String.class);
 		Assert.assertEquals("dlrow olleh",helloWorldReversed);
 	}
-	
+
 	// 7.5.10
-	
+
 	@Test
 	public void testTernary() throws Exception {
 		String falseString = parser.parseExpression("false ? 'trueExp' : 'falseExp'").getValue(String.class);
 		Assert.assertEquals("falseExp",falseString);
-		
+
 		StandardEvaluationContext societyContext = new StandardEvaluationContext();
 		societyContext.setRootObject(new IEEE());
 
-		
+
 		parser.parseExpression("Name").setValue(societyContext, "IEEE");
 		societyContext.setVariable("queryName", "Nikola Tesla");
 
-		String expression = "isMember(#queryName)? #queryName + ' is a member of the ' " + 
+		String expression = "isMember(#queryName)? #queryName + ' is a member of the ' " +
 		             "+ Name + ' Society' : #queryName + ' is not a member of the ' + Name + ' Society'";
 
 		String queryResultString = parser.parseExpression(expression).getValue(societyContext, String.class);
 		Assert.assertEquals("Nikola Tesla is a member of the IEEE Society",queryResultString);
 		// queryResultString = "Nikola Tesla is a member of the IEEE Society"
 	}
-	
+
 	// 7.5.11
-	
+
 	@SuppressWarnings("unchecked")
 	@Test
 	public void testSelection() throws Exception {
@@ -475,16 +475,16 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		Assert.assertEquals(1,list.size());
 		Assert.assertEquals("Nikola Tesla",list.get(0).getName());
 	}
-	
+
 	// 7.5.12
-	
+
 	@Test
 	public void testTemplating() throws Exception {
-		String randomPhrase = 
+		String randomPhrase =
 			   parser.parseExpression("random number is ${T(java.lang.Math).random()}", new TemplatedParserContext()).getValue(String.class);
 		Assert.assertTrue(randomPhrase.startsWith("random number"));
 	}
-	
+
 	static class TemplatedParserContext implements ParserContext {
 
 		  public String getExpressionPrefix() {
@@ -494,12 +494,12 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		  public String getExpressionSuffix() {
 		    return "}";
 		  }
-		  
+
 		  public boolean isTemplate() {
 		    return true;
 		  }
 	}
-	
+
 	static class StringUtils {
 
 		  public static String reverseString(String input) {
@@ -510,6 +510,6 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		    return backwards.toString();
 		  }
 	}
-	
+
 }
 
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java
index 1833cc983a..8c3f134774 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java
@@ -23,7 +23,7 @@ import org.springframework.expression.spel.standard.SpelExpression;
 
 /**
  * Utilities for working with Spring Expressions.
- * 
+ *
  * @author Andy Clement
  */
 public class SpelUtilities {
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
index 16dae3796c..bdc112a4ef 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
@@ -25,7 +25,7 @@ import org.springframework.expression.spel.support.StandardTypeLocator;
 
 /**
  * Unit tests for type comparison
- * 
+ *
  * @author Andy Clement
  */
 public class StandardTypeLocatorTests {
@@ -35,7 +35,7 @@ public class StandardTypeLocatorTests {
 		StandardTypeLocator locator = new StandardTypeLocator();
 		Assert.assertEquals(Integer.class,locator.findType("java.lang.Integer"));
 		Assert.assertEquals(String.class,locator.findType("java.lang.String"));
-		
+
 		List<String> prefixes = locator.getImportPrefixes();
 		Assert.assertEquals(1,prefixes.size());
 		Assert.assertTrue(prefixes.contains("java.lang"));
@@ -44,7 +44,7 @@ public class StandardTypeLocatorTests {
 		Assert.assertEquals(Boolean.class,locator.findType("Boolean"));
 		// currently does not know about java.util by default
 //		assertEquals(java.util.List.class,locator.findType("List"));
-		
+
 		try {
 			locator.findType("URL");
 			Assert.fail("Should have failed");
@@ -54,7 +54,7 @@ public class StandardTypeLocatorTests {
 		}
 		locator.registerImport("java.net");
 		Assert.assertEquals(java.net.URL.class,locator.findType("URL"));
-		
+
 	}
 
 }
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 0ce7fc5837..201944098d 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
@@ -91,7 +91,7 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 		Expression expr = parser.parseExpression("${'hello'} world", DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		Object o = expr.getValue();
 		Assert.assertEquals("hello world", o.toString());
-		
+
 		expr = parser.parseExpression("", DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		o = expr.getValue();
 		Assert.assertEquals("", o.toString());
@@ -135,7 +135,7 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 		Assert.assertEquals(String.class,ex.getValueType(ctx, new Rooty()));
 		Assert.assertEquals(String.class,ex.getValueTypeDescriptor(new Rooty()).getType());
 		Assert.assertEquals(String.class,ex.getValueTypeDescriptor(ctx, new Rooty()).getType());
-		
+
 		try {
 			ex.setValue(ctx, null);
 			Assert.fail();
@@ -155,9 +155,9 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 			// success
 		}
 	}
-	
+
 	static class Rooty {}
-	
+
 	@Test
 	public void testNestedExpressions() throws Exception {
 		SpelExpressionParser parser = new SpelExpressionParser();
@@ -179,22 +179,22 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 		ex = parser.parseExpression("hello ${listOfNumbersUpToTen.$[#this<5]} ${listOfNumbersUpToTen.$[#this>5]} world",DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		s = ex.getValue(TestScenarioCreator.getTestEvaluationContext(),String.class);
 		Assert.assertEquals("hello 4 10 world",s);
-		
+
 		try {
 			ex = parser.parseExpression("hello ${listOfNumbersUpToTen.$[#this<5]} ${listOfNumbersUpToTen.$[#this>5] world",DEFAULT_TEMPLATE_PARSER_CONTEXT);
 			Assert.fail("Should have failed");
 		} catch (ParseException pe) {
 			Assert.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);
 			Assert.fail("Should have failed");
 		} catch (ParseException pe) {
 			Assert.assertEquals("Found closing '}' at position 74 but most recent opening is '[' at position 30",pe.getMessage());
-		}	
+		}
 	}
-	
+
 	@Test
 
 	public void testClashingWithSuffixes() throws Exception {
@@ -211,7 +211,7 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 		s = ex.getValue(TestScenarioCreator.getTestEvaluationContext(),String.class);
 		Assert.assertEquals("hello 7 wo}rld",s);
 	}
-	
+
 	@Test
 	public void testParsingNormalExpressionThroughTemplateParser() throws Exception {
 		Expression expr = parser.parseExpression("1+2+3");
@@ -219,7 +219,7 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 		expr = parser.parseExpression("1+2+3",null);
 		Assert.assertEquals(6,expr.getValue());
 	}
-	
+
 	@Test
 	public void testErrorCases() throws Exception {
 		try {
@@ -240,29 +240,29 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 			Assert.fail("Should have failed");
 		} catch (ParseException pe) {
 			Assert.assertEquals("No expression defined within delimiter '${}' at character 6",pe.getMessage());
-		}		
+		}
 	}
 
 	@Test
 	public void testTemplateParserContext() {
 		TemplateParserContext tpc = new TemplateParserContext("abc","def");
 		Assert.assertEquals("abc", tpc.getExpressionPrefix());
-		Assert.assertEquals("def", tpc.getExpressionSuffix()); 
+		Assert.assertEquals("def", tpc.getExpressionSuffix());
 		Assert.assertTrue(tpc.isTemplate());
 
 		tpc = new TemplateParserContext();
 		Assert.assertEquals("#{", tpc.getExpressionPrefix());
-		Assert.assertEquals("}", tpc.getExpressionSuffix()); 
+		Assert.assertEquals("}", tpc.getExpressionSuffix());
 		Assert.assertTrue(tpc.isTemplate());
-		
+
 		ParserContext pc = ParserContext.TEMPLATE_EXPRESSION;
 		Assert.assertEquals("#{", pc.getExpressionPrefix());
-		Assert.assertEquals("}", pc.getExpressionSuffix()); 
+		Assert.assertEquals("}", pc.getExpressionSuffix());
 		Assert.assertTrue(pc.isTemplate());
 	}
-	
+
 	// ---
-	
+
 	private void checkString(String expectedString, Object value) {
 		if (!(value instanceof String)) {
 			Assert.fail("Result was not a string, it was of type " + value.getClass() + "  (value=" + value + ")");
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
index f34ac8a1b6..d2cd8d9494 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
@@ -25,7 +25,7 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
 
 /**
  * Tests the evaluation of expressions that access variables and functions (lambda/java).
- * 
+ *
  * @author Andy Clement
  */
 public class VariableAndFunctionTests extends ExpressionTestCase {
@@ -35,7 +35,7 @@ public class VariableAndFunctionTests extends ExpressionTestCase {
 		evaluate("#answer", "42", Integer.class, SHOULD_BE_WRITABLE);
 		evaluate("#answer / 2", 21, Integer.class, SHOULD_NOT_BE_WRITABLE);
 	}
-	
+
 	@Test
 	public void testVariableAccess_WellKnownVariables() {
 		evaluate("#this.getName()","Nikola Tesla",String.class);
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java
index b40ec92a98..6aa0bafec5 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java
@@ -28,13 +28,13 @@ import static org.junit.Assert.*;
  * @author Andy Wilkinson
  */
 public class FormatHelperTests {
-	
+
 	@Test
 	public void formatMethodWithSingleArgumentForMessage() {
 		String message = FormatHelper.formatMethodForMessage("foo", Arrays.asList(TypeDescriptor.forObject("a string")));
 		assertEquals("foo(java.lang.String)", message);
 	}
-	
+
 	@Test
 	public void formatMethodWithMultipleArgumentsForMessage() {
 		String message = FormatHelper.formatMethodForMessage("foo", Arrays.asList(TypeDescriptor.forObject("a string"), TypeDescriptor.forObject(Integer.valueOf(5))));
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 2bc87f90fb..781d6963a4 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
@@ -40,7 +40,7 @@ import org.springframework.expression.spel.support.ReflectionHelper.ArgsMatchKin
 
 /**
  * Tests for any helper code.
- * 
+ *
  * @author Andy Clement
  */
 public class ReflectionHelperTests extends ExpressionTestCase {
@@ -53,7 +53,7 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 		Assert.assertEquals("int[][]",FormatHelper.formatClassNameForMessage(new int[1][2].getClass()));
 		Assert.assertEquals("null",FormatHelper.formatClassNameForMessage(null));
 	}
-	
+
 	/*
 	@Test
 	public void testFormatHelperForMethod() {
@@ -62,7 +62,7 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 		Assert.assertEquals("boo()",FormatHelper.formatMethodForMessage("boo"));
 	}
 	*/
-	
+
 	@Test
 	public void testUtilities() throws ParseException {
 		SpelExpression expr = (SpelExpression)parser.parseExpression("3+4+5+6+7-2");
@@ -93,52 +93,52 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 		Assert.assertTrue(s.indexOf("===> Expression '3+4+5+6+7-2' - AST start")!=-1);
 		Assert.assertTrue(s.indexOf(" OpPlus  value:((((3 + 4) + 5) + 6) + 7)  #children:2")!=-1);
 	}
-	
+
 	@Test
 	public void testTypedValue() {
 		TypedValue tValue = new TypedValue("hello");
 		Assert.assertEquals(String.class,tValue.getTypeDescriptor().getType());
 		Assert.assertEquals("TypedValue: 'hello' of [java.lang.String]",tValue.toString());
 	}
-	
+
 	@Test
 	public void testReflectionHelperCompareArguments_ExactMatching() {
 		StandardTypeConverter typeConverter = new StandardTypeConverter();
-		
+
 		// Calling foo(String) with (String) is exact match
 		checkMatch(new Class[]{String.class},new Class[]{String.class},typeConverter,ArgsMatchKind.EXACT);
-		
+
 		// Calling foo(String,Integer) with (String,Integer) is exact match
 		checkMatch(new Class[]{String.class,Integer.class},new Class[]{String.class,Integer.class},typeConverter,ArgsMatchKind.EXACT);
 	}
-	
+
 	@Test
 	public void testReflectionHelperCompareArguments_CloseMatching() {
 		StandardTypeConverter typeConverter = new StandardTypeConverter();
-		
+
 		// Calling foo(List) with (ArrayList) is close match (no conversion required)
 		checkMatch(new Class[]{ArrayList.class},new Class[]{List.class},typeConverter,ArgsMatchKind.CLOSE);
-		
+
 		// Passing (Sub,String) on call to foo(Super,String) is close match
 		checkMatch(new Class[]{Sub.class,String.class},new Class[]{Super.class,String.class},typeConverter,ArgsMatchKind.CLOSE);
-		
+
 		// Passing (String,Sub) on call to foo(String,Super) is close match
 		checkMatch(new Class[]{String.class,Sub.class},new Class[]{String.class,Super.class},typeConverter,ArgsMatchKind.CLOSE);
 	}
-	
+
 	@Test
 	public void testReflectionHelperCompareArguments_RequiresConversionMatching() {
 		StandardTypeConverter typeConverter = new StandardTypeConverter();
-		
+
 		// Calling foo(String,int) with (String,Integer) requires boxing conversion of argument one
 		checkMatch(new Class[]{String.class,Integer.TYPE},new Class[]{String.class,Integer.class},typeConverter,ArgsMatchKind.CLOSE,1);
 
 		// Passing (int,String) on call to foo(Integer,String) requires boxing conversion of argument zero
 		checkMatch(new Class[]{Integer.TYPE,String.class},new Class[]{Integer.class, String.class},typeConverter,ArgsMatchKind.CLOSE,0);
-		
+
 		// Passing (int,Sub) on call to foo(Integer,Super) requires boxing conversion of argument zero
 		checkMatch(new Class[]{Integer.TYPE,Sub.class},new Class[]{Integer.class, Super.class},typeConverter,ArgsMatchKind.CLOSE,0);
-		
+
 		// Passing (int,Sub,boolean) on call to foo(Integer,Super,Boolean) requires boxing conversion of arguments zero and two
 		// TODO checkMatch(new Class[]{Integer.TYPE,Sub.class,Boolean.TYPE},new Class[]{Integer.class, Super.class,Boolean.class},typeConverter,ArgsMatchKind.REQUIRES_CONVERSION,0,2);
 	}
@@ -146,7 +146,7 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 	@Test
 	public void testReflectionHelperCompareArguments_NotAMatch() {
 		StandardTypeConverter typeConverter = new StandardTypeConverter();
-		
+
 		// Passing (Super,String) on call to foo(Sub,String) is not a match
 		checkMatch(new Class[]{Super.class,String.class},new Class[]{Sub.class,String.class},typeConverter,null);
 	}
@@ -156,16 +156,16 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 		StandardTypeConverter tc = new StandardTypeConverter();
 		Class<?> stringArrayClass = new String[0].getClass();
 		Class<?> integerArrayClass = new Integer[0].getClass();
-				
+
 		// Passing (String[]) on call to (String[]) is exact match
 		checkMatch2(new Class[]{stringArrayClass},new Class[]{stringArrayClass},tc,ArgsMatchKind.EXACT);
-		
+
 		// Passing (Integer, String[]) on call to (Integer, String[]) is exact match
 		checkMatch2(new Class[]{Integer.class,stringArrayClass},new Class[]{Integer.class,stringArrayClass},tc,ArgsMatchKind.EXACT);
 
 		// Passing (String, Integer, String[]) on call to (String, String, String[]) is exact match
 		checkMatch2(new Class[]{String.class,Integer.class,stringArrayClass},new Class[]{String.class,Integer.class,stringArrayClass},tc,ArgsMatchKind.EXACT);
-		
+
 		// Passing (Sub, String[]) on call to (Super, String[]) is exact match
 		checkMatch2(new Class[]{Sub.class,stringArrayClass},new Class[]{Super.class,stringArrayClass},tc,ArgsMatchKind.CLOSE);
 
@@ -174,10 +174,10 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 
 		// Passing (Integer, Sub, String[]) on call to (String, Super, String[]) is exact match
 		checkMatch2(new Class[]{Integer.class,Sub.class,String[].class},new Class[]{String.class,Super.class,String[].class},tc,ArgsMatchKind.REQUIRES_CONVERSION,0);
-		
+
 		// Passing (String) on call to (String[]) is exact match
 		checkMatch2(new Class[]{String.class},new Class[]{stringArrayClass},tc,ArgsMatchKind.EXACT);
-		
+
 		// Passing (Integer,String) on call to (Integer,String[]) is exact match
 		checkMatch2(new Class[]{Integer.class,String.class},new Class[]{Integer.class,stringArrayClass},tc,ArgsMatchKind.EXACT);
 
@@ -186,7 +186,7 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 
 		// Passing (Sub) on call to (Super[]) is close match
 		checkMatch2(new Class[]{Sub.class},new Class[]{new Super[0].getClass()},tc,ArgsMatchKind.CLOSE);
-		
+
 		// Passing (Super) on call to (Sub[]) is not a match
 		checkMatch2(new Class[]{Super.class},new Class[]{new Sub[0].getClass()},tc,null);
 
@@ -261,17 +261,17 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 		catch (SpelEvaluationException se) {
 			Assert.assertEquals(SpelMessage.TYPE_CONVERSION_ERROR,se.getMessageCode());
 		}
-		
+
 		// null value
 		args = new Object[]{3,null,3.0f};
 		ReflectionHelper.convertAllArguments(tc, args, twoArg);
 		checkArguments(args,"3",null,"3.0");
 	}
-	
+
 	@Test
 	public void testSetupArguments() {
 		Object[] newArray = ReflectionHelper.setupArgumentsForVarargsInvocation(new Class[]{new String[0].getClass()},"a","b","c");
-		
+
 		Assert.assertEquals(1,newArray.length);
 		Object firstParam = newArray[0];
 		Assert.assertEquals(String.class,firstParam.getClass().getComponentType());
@@ -281,7 +281,7 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 		Assert.assertEquals("b",firstParamArray[1]);
 		Assert.assertEquals("c",firstParamArray[2]);
 	}
-	
+
 	@Test
 	public void testReflectivePropertyResolver() throws Exception {
 		ReflectivePropertyAccessor rpr = new ReflectivePropertyAccessor();
@@ -295,16 +295,16 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 		Assert.assertTrue(rpr.canRead(ctx, t, "field"));
 		Assert.assertEquals(3,rpr.read(ctx, t, "field").getValue());
 		Assert.assertEquals(3,rpr.read(ctx, t, "field").getValue()); // cached accessor used
-		
+
 		Assert.assertTrue(rpr.canWrite(ctx, t, "property"));
 		rpr.write(ctx, t, "property","goodbye");
 		rpr.write(ctx, t, "property","goodbye"); // cached accessor used
-				
+
 		Assert.assertTrue(rpr.canWrite(ctx, t, "field"));
 		rpr.write(ctx, t, "field",12);
 		rpr.write(ctx, t, "field",12);
 
-		// Attempted write as first activity on this field and property to drive testing 
+		// Attempted write as first activity on this field and property to drive testing
 		// of populating type descriptor cache
 		rpr.write(ctx,t,"field2",3);
 		rpr.write(ctx, t, "property2","doodoo");
@@ -330,7 +330,7 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 		Assert.assertEquals("id",rpr.read(ctx,t,"Id").getValue());
 		Assert.assertTrue(rpr.canRead(ctx,t,"Id"));
 	}
-	
+
 	@Test
 	public void testOptimalReflectivePropertyResolver() throws Exception {
 		ReflectivePropertyAccessor rpr = new ReflectivePropertyAccessor();
@@ -340,7 +340,7 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 //		Assert.assertTrue(rpr.canRead(ctx, t, "property"));
 //		Assert.assertEquals("hello",rpr.read(ctx, t, "property").getValue());
 //		Assert.assertEquals("hello",rpr.read(ctx, t, "property").getValue()); // cached accessor used
-		
+
 		PropertyAccessor optA = rpr.createOptimalAccessor(ctx, t, "property");
 		Assert.assertTrue(optA.canRead(ctx, t, "property"));
 		Assert.assertFalse(optA.canRead(ctx, t, "property2"));
@@ -405,7 +405,7 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 
 
 	}
-	
+
 
 	// test classes
 	static class Tester {
@@ -426,7 +426,7 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 		public void setProperty2(String value) { property2 = value; }
 
 		public String getProperty3() { return property3; }
-		
+
 		public boolean isProperty4() { return property4; }
 
 		public String getiD() { return iD; }
@@ -435,17 +435,17 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 
 		public String getID() { return ID; }
 	}
-	
+
 	static class Super {
 	}
-	
+
 	static class Sub extends Super {
 	}
-	
+
 	static class Unconvertable {}
-	
+
 	// ---
-	
+
 	/**
 	 * Used to validate the match returned from a compareArguments call.
 	 */
@@ -459,10 +459,10 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 
 		if (expectedMatchKind==ArgsMatchKind.EXACT) {
 			Assert.assertTrue(matchInfo.isExactMatch());
-			Assert.assertNull(matchInfo.argsRequiringConversion);		
+			Assert.assertNull(matchInfo.argsRequiringConversion);
 		} else if (expectedMatchKind==ArgsMatchKind.CLOSE) {
 			Assert.assertTrue(matchInfo.isCloseMatch());
-			Assert.assertNull(matchInfo.argsRequiringConversion);		
+			Assert.assertNull(matchInfo.argsRequiringConversion);
 		} else if (expectedMatchKind==ArgsMatchKind.REQUIRES_CONVERSION) {
 			Assert.assertTrue("expected to be a match requiring conversion, but was "+matchInfo,matchInfo.isMatchRequiringConversion());
 			if (argsForConversion==null) {
@@ -488,10 +488,10 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 
 		if (expectedMatchKind==ArgsMatchKind.EXACT) {
 			Assert.assertTrue(matchInfo.isExactMatch());
-			Assert.assertNull(matchInfo.argsRequiringConversion);		
+			Assert.assertNull(matchInfo.argsRequiringConversion);
 		} else if (expectedMatchKind==ArgsMatchKind.CLOSE) {
 			Assert.assertTrue(matchInfo.isCloseMatch());
-			Assert.assertNull(matchInfo.argsRequiringConversion);		
+			Assert.assertNull(matchInfo.argsRequiringConversion);
 		} else if (expectedMatchKind==ArgsMatchKind.REQUIRES_CONVERSION) {
 			Assert.assertTrue("expected to be a match requiring conversion, but was "+matchInfo,matchInfo.isMatchRequiringConversion());
 			if (argsForConversion==null) {
@@ -510,7 +510,7 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 			checkArgument(expected[i],args[i]);
 		}
 	}
-	
+
 	private void checkArgument(Object expected, Object actual) {
 		Assert.assertEquals(expected,actual);
 	}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java
index 47c49ba026..ab23d3e157 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java
@@ -43,19 +43,19 @@ public class StandardComponentsTests {
 		context.setTypeLocator(tl);
 		Assert.assertEquals(tl,context.getTypeLocator());
 	}
-	
+
 	@Test
 	public void testStandardOperatorOverloader() throws EvaluationException {
 		OperatorOverloader oo = new StandardOperatorOverloader();
 		Assert.assertFalse(oo.overridesOperation(Operation.ADD, null, null));
-		try {	
+		try {
 			oo.operate(Operation.ADD, 2, 3);
 			Assert.fail("should have failed");
 		} catch (EvaluationException e) {
 			// success
 		}
 	}
-	
+
 	@Test
 	public void testStandardTypeLocator() {
 		StandardTypeLocator tl = new StandardTypeLocator();
@@ -68,7 +68,7 @@ public class StandardComponentsTests {
 		prefixes = tl.getImportPrefixes();
 		Assert.assertEquals(1,prefixes.size());
 	}
-	
+
 	@Test
 	public void testStandardTypeConverter() throws EvaluationException {
 		TypeConverter tc = new StandardTypeConverter();
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java
index fa6d62f444..9047e35b7d 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java
@@ -17,7 +17,7 @@
 
 /**
  * Hold the various kinds of primitive array for access through the test evaluation context.
- * 
+ *
  * @author Andy Clement
  */
 public class ArrayContainer {
@@ -29,7 +29,7 @@ public class ArrayContainer {
 	public short[] shorts = new short[3];
 	public boolean[] booleans = new boolean[3];
 	public float[] floats = new float[3];
-	
+
 	public ArrayContainer() {
 		// setup some values
 		ints[0] = 42;
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Company.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Company.java
index 54a8384ff0..c497c2fad7 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Company.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Company.java
@@ -1,12 +1,12 @@
 /**
- * 
+ *
  */
 package org.springframework.expression.spel.testresources;
 
 ///CLOVER:OFF
 public class Company {
 	String address;
-	
+
 	public Company(String string) {
 		this.address = string;
 	}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java
index c8a2c7f27f..04cf7fa004 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Fruit.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.springframework.expression.spel.testresources;
 
@@ -11,7 +11,7 @@ public class Fruit {
 	public Color color; // accessible as property through getter/setter
 	public String colorName; // accessible as property through getter/setter
 	public int stringscount = -1;
-	
+
 	public Fruit(String name, Color color, String colorName) {
 		this.name = name;
 		this.color = color;
@@ -21,15 +21,15 @@ public class Fruit {
 	public Color getColor() {
 		return color;
 	}
-	
+
 	public Fruit(String... strings) {
 		stringscount = strings.length;
 	}
-	
+
 	public Fruit(int i, String... strings) {
 		stringscount = i + strings.length;
 	}
-	
+
 	public int stringscount() {
 		return stringscount;
 	}
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 051fe95ca3..2869a366bf 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
@@ -37,7 +37,7 @@ public class Inventor {
 	public String[] stringArrayOfThreeItems = new String[]{"1","2","3"};
 	private String foo;
 	public int counter;
-	
+
 	public Inventor(String name, Date birthdate, String nationality) {
 		this.name = name;
 		this._name = name;
@@ -88,7 +88,7 @@ public class Inventor {
 	public String[] getInventions() {
 		return inventions;
 	}
-	
+
 	public void setInventions(String[] inventions) {
 		this.inventions = inventions;
 	}
@@ -96,7 +96,7 @@ public class Inventor {
 	public PlaceOfBirth getPlaceOfBirth() {
 		return placeOfBirth;
 	}
-	
+
 	public int throwException(int valueIn) throws Exception {
 		counter++;
 		if (valueIn==1) {
@@ -110,9 +110,9 @@ public class Inventor {
 		}
 		return valueIn;
 	}
-	
+
 	static class TestException extends Exception {}
-	
+
 	public String throwException(PlaceOfBirth pob) {
 		return pob.getCity();
 	}
@@ -120,7 +120,7 @@ public class Inventor {
 	public String getName() {
 		return name;
 	}
-	
+
 	public boolean getWonNobelPrize() {
 		return wonNobelPrize;
 	}
@@ -152,7 +152,7 @@ public class Inventor {
 	public String sayHelloTo(String person) {
 		return "hello " + person;
 	}
-	
+
 	public String printDouble(Double d) {
 		return d.toString();
 	}
@@ -187,7 +187,7 @@ public class Inventor {
 	public Inventor(String... strings) {
 
 	}
-	
+
 	public boolean getSomeProperty() {
 		return accessedThroughGetSet;
 	}
@@ -195,7 +195,7 @@ public class Inventor {
 	public void setSomeProperty(boolean b) {
 		this.accessedThroughGetSet = b;
 	}
-	
+
 	public Date getBirthdate() { return birthdate;}
 
 	public String getFoo() { return foo; }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java
index 80a432d256..9126de0488 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java
@@ -8,16 +8,16 @@ public class Person {
 	public Person(String name) {
 		this.privateName = name;
 	}
-	
+
 	public Person(String name, Company company) {
 		this.privateName = name;
 		this.company = company;
 	}
-	
+
 	public String getName() {
 		return privateName;
 	}
-	
+
 	public void setName(String n) {
 		this.privateName = n;
 	}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java
index 658855cd7c..ea5c1d970a 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/PlaceOfBirth.java
@@ -3,9 +3,9 @@ package org.springframework.expression.spel.testresources;
 ///CLOVER:OFF
 public class PlaceOfBirth {
 	private String city;
-	
+
 	public String Country;
-	
+
 	/**
 	 * Keith now has a converter that supports String to X, if X has a ctor that takes a String.
 	 * In order for round tripping to work we need toString() for X to return what it was
@@ -25,11 +25,11 @@ public class PlaceOfBirth {
 	public PlaceOfBirth(String string) {
 		this.city=string;
 	}
-	
+
 	public int doubleIt(int i) {
 		return i*2;
 	}
-	
+
 	public boolean equals(Object o) {
 		if (!(o instanceof PlaceOfBirth)) {
 			return false;
@@ -37,9 +37,9 @@ public class PlaceOfBirth {
 		PlaceOfBirth oPOB = (PlaceOfBirth)o;
 		return (city.equals(oPOB.city));
 	}
-	
+
 	public int hashCode() {
 		return city.hashCode();
 	}
-	
+
 }
\ No newline at end of file
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java
index 0f84c9e85e..251703fbc8 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java
@@ -5,7 +5,7 @@ import java.util.List;
 public class TestAddress{
 		private String street;
 		private List<String> crossStreets;
-		
+
 		public String getStreet() {
 			return street;
 		}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java
index dca009da12..f01e15f098 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java
@@ -3,7 +3,7 @@ package org.springframework.expression.spel.testresources;
 public class TestPerson {
 		private String name;
 		private TestAddress address;
-		
+
 		public String getName() {
 			return name;
 		}
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 47d2a4ba29..e75390d3c1 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
@@ -28,8 +28,8 @@ import org.springframework.instrument.classloading.WeavingTransformer;
  * Extension of Tomcat's default class loader which adds instrumentation
  * to loaded classes without the need to use a VM-wide agent.
  *
- * <p>To be registered using a 
- * <code><a href="http://tomcat.apache.org/tomcat-5.5-doc/config/loader.html">Loader</a></code> tag 
+ * <p>To be registered using a
+ * <code><a href="http://tomcat.apache.org/tomcat-5.5-doc/config/loader.html">Loader</a></code> tag
  * in Tomcat's <code><a href="http://tomcat.apache.org/tomcat-5.5-doc/config/context.html">Context</a></code>
  * definition in the <code>server.xml</code> 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
index 4e3389298b..e61aefdee7 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
@@ -32,7 +32,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
  * @see InvalidResultSetAccessException
  */
 public class BadSqlGrammarException extends InvalidDataAccessResourceUsageException {
-	
+
 	private String sql;
 
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java
index eccba39f5d..658ec04b32 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java
@@ -21,7 +21,7 @@ import java.sql.SQLException;
 import org.springframework.dao.UncategorizedDataAccessException;
 
 /**
- * Exception thrown when we can't classify a SQLException into 
+ * Exception thrown when we can't classify a SQLException into
  * one of our generic data access exceptions.
  *
  * @author Rod Johnson
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java
index 9a54179854..3f593940fb 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java
@@ -42,7 +42,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * @since 3.0
  */
 public class SortedResourcesFactoryBean extends AbstractFactoryBean<Resource[]> implements ResourceLoaderAware {
-	
+
 	private final List<String> locations;
 
 	private ResourcePatternResolver resourcePatternResolver;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
index 8a8e523a5b..4b95acde85 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
@@ -38,7 +38,7 @@ import java.sql.SQLException;
  */
 public interface BatchPreparedStatementSetter {
 
-	/** 
+	/**
 	 * Set parameter values on the given PreparedStatement.
 	 * @param ps the PreparedStatement to invoke setter methods on
 	 * @param i index of the statement we're issuing in the batch, starting from 0
@@ -47,7 +47,7 @@ public interface BatchPreparedStatementSetter {
 	 */
 	void setValues(PreparedStatement ps, int i) throws SQLException;
 
-	/** 
+	/**
 	 * Return the size of the batch.
 	 * @return the number of statements in the batch
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java
index 8a42702394..552daf1bd3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -42,9 +42,9 @@ import java.sql.SQLException;
  */
 public interface CallableStatementCreator {
 
-	/** 
+	/**
 	 * Create a callable statement in this connection. Allows implementations to use
-	 * CallableStatements. 
+	 * CallableStatements.
 	 * @param con Connection to use to create statement
 	 * @return a callable statement
 	 * @throws SQLException there is no need to catch SQLExceptions
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
index 93f68dd099..f5f5d0eed5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
@@ -37,7 +37,7 @@ import org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractor;
  * @author Thomas Risberg
  * @author Juergen Hoeller
  */
-public class CallableStatementCreatorFactory { 
+public class CallableStatementCreatorFactory {
 
 	/** The SQL call string, which won't change when the parameters change. */
 	private final String callString;
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 634b2c8b89..e199293cee 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
@@ -407,7 +407,7 @@ public interface JdbcOperations {
 	 * @see PreparedStatementCreatorFactory
 	 */
 	void query(PreparedStatementCreator psc, RowCallbackHandler rch) throws DataAccessException;
-	
+
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a
 	 * PreparedStatementSetter implementation that knows how to bind values
@@ -423,7 +423,7 @@ public interface JdbcOperations {
 	 */
 	void query(String sql, PreparedStatementSetter pss, RowCallbackHandler rch)
 	    throws DataAccessException;
-	
+
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a list of
 	 * arguments to bind to the query, reading the ResultSet on a per-row basis
@@ -947,7 +947,7 @@ public interface JdbcOperations {
 	 * @throws DataAccessException if there is any problem issuing the update
 	 */
 	int update(String sql, PreparedStatementSetter pss) throws DataAccessException;
-	
+
 	/**
 	 * Issue a single SQL update operation (such as an insert, update or delete statement)
 	 * via a prepared statement, binding the given arguments.
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 707ffe1482..cce62c60b2 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
@@ -934,7 +934,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 	/*
 	 * (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) {
@@ -1054,7 +1054,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 					resultSetParameters.add(parameter);
 				}
 				else {
-					updateCountParameters.add(parameter);					
+					updateCountParameters.add(parameter);
 				}
 			}
 			else {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java
index 46a78377c0..515163d784 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java
@@ -20,7 +20,7 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Map;
 
-/** 
+/**
  * Implement this interface when parameters need to be customized based
  * on the connection. We might need to do this to make use of proprietary
  * features, available only with a specific Connection type.
@@ -43,5 +43,5 @@ public interface ParameterMapper {
 	 * @return Map of input parameters, keyed by name (never <code>null</code>)
 	 */
 	Map<String, ?> createMap(Connection con) throws SQLException;
-	
+
 }
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 fd8f827876..9845cec064 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
@@ -46,5 +46,5 @@ public interface ParameterizedPreparedStatementSetter<T> {
 	 * @throws SQLException if a SQLException is encountered (i.e. there is no need to catch SQLException)
 	 */
 	void setValues(PreparedStatement ps, T argument) throws SQLException;
-	
+
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java
index dc92215618..2cb5a1f648 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -42,7 +42,7 @@ import java.sql.SQLException;
  */
 public interface PreparedStatementCreator {
 
-	/** 
+	/**
 	 * Create a statement in this connection. Allows implementations to use
 	 * PreparedStatements. The JdbcTemplate will close the created statement.
 	 * @param con Connection to use to create statement
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java
index fb12a1b48d..d8a3ad4a55 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java
@@ -42,7 +42,7 @@ import java.sql.SQLException;
  */
 public interface PreparedStatementSetter {
 
-	/** 
+	/**
 	 * Set parameter values on the given PreparedStatement.
 	 * @param ps the PreparedStatement to invoke setter methods on
 	 * @throws SQLException if a SQLException is encountered
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java
index 76ddcd1b23..1544655ea4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java
@@ -21,7 +21,7 @@ import java.sql.SQLException;
 
 import org.springframework.dao.DataAccessException;
 
-/** 
+/**
  * Callback interface used by {@link JdbcTemplate}'s query methods.
  * Implementations of this interface perform the actual work of extracting
  * results from a {@link java.sql.ResultSet}, but don't need to worry
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
index 88efe072ec..73df113b54 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2006 the original author 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.
@@ -34,7 +34,7 @@ import java.sql.SQLException;
  * <p>A usage example with JdbcTemplate:
  *
  * <pre class="code">JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);  // reusable object
- * 
+ *
  * RowCountCallbackHandler countCallback = new RowCountCallbackHandler();  // not reusable
  * jdbcTemplate.query("select * from user", countCallback);
  * int rowCount = countCallback.getRowCount();</pre>
@@ -55,7 +55,7 @@ public class RowCountCallbackHandler implements RowCallbackHandler {
 	 * as returned by ResultSetMetaData object.
 	 */
 	private int[] columnTypes;
-	
+
 	/**
 	 * Indexed from 0. Column name as returned by ResultSetMetaData object.
 	 */
@@ -84,7 +84,7 @@ public class RowCountCallbackHandler implements RowCallbackHandler {
 		processRow(rs, this.rowCount++);
 	}
 
-	/** 
+	/**
 	 * Subclasses may override this to perform custom extraction
 	 * or processing. This class's implementation does nothing.
 	 * @param rs ResultSet to extract data from. This method is
@@ -104,8 +104,8 @@ public class RowCountCallbackHandler implements RowCallbackHandler {
 	public final int[] getColumnTypes() {
 		return columnTypes;
 	}
-	
-	/** 
+
+	/**
 	 * Return the names of the columns.
 	 * Valid after processRow is invoked the first time.
 	 * @return the names of the columns.
@@ -115,7 +115,7 @@ public class RowCountCallbackHandler implements RowCallbackHandler {
 		return columnNames;
 	}
 
-	/** 
+	/**
 	 * Return the row count of this ResultSet
 	 * Only valid after processing is complete
 	 * @return the number of rows in this ResultSet
@@ -124,7 +124,7 @@ public class RowCountCallbackHandler implements RowCallbackHandler {
 		return rowCount;
 	}
 
-	/** 
+	/**
 	 * Return the number of columns in this result set.
 	 * Valid once we've seen the first row,
 	 * so subclasses can use it during processing
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java
index 680e904ed2..56bba1bb55 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java
@@ -47,7 +47,7 @@ import java.sql.SQLException;
  */
 public interface RowMapper<T> {
 
-	/** 
+	/**
 	 * Implementations must implement this method to map each row of data
 	 * in the ResultSet. This method should not call <code>next()</code> on
 	 * the ResultSet; it is only supposed to map values of the current row.
@@ -57,7 +57,6 @@ public interface RowMapper<T> {
 	 * @throws SQLException if a SQLException is encountered getting
 	 * column values (that is, there's no need to catch SQLException)
 	 */
-	T mapRow(ResultSet rs, int rowNum) throws SQLException; 
+	T mapRow(ResultSet rs, int rowNum) throws SQLException;
 
 }
- 
\ No newline at end of file
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java
index 5dc642be86..755990221b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java
@@ -1,12 +1,12 @@
 /*
  * 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.
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 38d47301c3..4693b02067 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
@@ -64,7 +64,7 @@ public class CallMetaDataProviderFactory {
 	 * Create a CallMetaDataProvider based on the database metedata
 	 * @param dataSource used to retrieve metedata
 	 * @param context the class that holds configuration and metedata
-	 * @return instance of the CallMetaDataProvider implementation to be used 
+	 * @return instance of the CallMetaDataProvider implementation to be used
 	 */
 	static public CallMetaDataProvider createMetaDataProvider(DataSource dataSource, final CallMetaDataContext context) {
 		try {
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 db7cd667fa..17578e80bb 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
@@ -197,7 +197,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 	}
 
 	public SqlParameter createDefaultInParameter(String parameterName, CallParameterMetaData meta) {
-		return new SqlParameter(parameterName, meta.getSqlType());		
+		return new SqlParameter(parameterName, meta.getSqlType());
 	}
 
 	public String getUserName() {
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 1a4e28772f..4869064edc 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
@@ -389,8 +389,8 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 				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 
-					// (this is for better Oracle support where there have been issues 
+					// 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) {
 						dataType = Types.NUMERIC;
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 b35ac67f6a..7ae4ecd912 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
@@ -20,7 +20,7 @@ import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
 
 /**
- * The HSQL specific implementation of the {@link TableMetaDataProvider}. Suports a feature for 
+ * The HSQL specific implementation of the {@link TableMetaDataProvider}. Suports a feature for
  * retreiving generated keys without the JDBC 3.0 getGeneratedKeys support.
  *
  * @author Thomas Risberg
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java
index 6b31dcea99..340f0fe2ea 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java
@@ -45,7 +45,7 @@ public class OracleCallMetaDataProvider extends GenericCallMetaDataProvider {
 	public boolean isReturnResultSetSupported() {
 		return false;
 	}
-	
+
 	@Override
 	public boolean isRefCursorSupported() {
 		return true;
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 326428a4c8..3465522e11 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
@@ -34,7 +34,7 @@ import org.springframework.util.ReflectionUtils;
  *
  * <p>Thanks to Mike Youngstrom and Bruce Campbell for submitting the original suggestion for the Oracle
  * current schema lookup implementation.
- * 
+ *
  * @author Thomas Risberg
  * @author Juergen Hoeller
  * @since 3.0
@@ -42,7 +42,7 @@ import org.springframework.util.ReflectionUtils;
 public class OracleTableMetaDataProvider extends GenericTableMetaDataProvider {
 
 	private final boolean includeSynonyms;
-	
+
 	private String defaultSchema;
 
 
@@ -124,10 +124,10 @@ public class OracleTableMetaDataProvider extends GenericTableMetaDataProvider {
 			throw new InvalidDataAccessApiUsageException("Couldn't reset Oracle Connection", ex);
 		}
 	}
-	
+
 	/*
 	 * Oracle implementation for detecting current schema
-	 * 
+	 *
 	 * @param databaseMetaData
 	 */
 	private void lookupDefaultSchema(DatabaseMetaData databaseMetaData) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
index d34c6fc11c..25eaa98b56 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
@@ -98,7 +98,7 @@ public interface TableMetaDataProvider {
 	 * Are we using the meta data for the table columns?
 	 */
  	boolean isTableColumnMetaDataUsed();
-	
+
 	/**
 	 * Does this database support the JDBC 3.0 feature of retreiving generated keys
 	 * {@link java.sql.DatabaseMetaData#supportsGetGeneratedKeys()}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
index 621cf6d9f3..9c049300e0 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
@@ -20,14 +20,14 @@ import org.springframework.jdbc.core.support.JdbcDaoSupport;
 
 /**
  * Extension of JdbcDaoSupport that exposes a NamedParameterJdbcTemplate as well.
- * 
+ *
  * @author Thomas Risberg
  * @author Juergen Hoeller
  * @since 2.0
  * @see NamedParameterJdbcTemplate
  */
 public class NamedParameterJdbcDaoSupport extends JdbcDaoSupport {
-	
+
 	private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
 
 
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 ccc668502c..552e3a526c 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
@@ -227,7 +227,7 @@ public abstract class NamedParameterUtils {
 		}
 		return position;
 	}
-	
+
 	/**
 	 * Parse the SQL statement and locate any placeholders or named parameters.
 	 * Named parameters are substituted for a JDBC placeholder and any select list
@@ -482,7 +482,7 @@ public abstract class NamedParameterUtils {
 		public int getStartIndex() {
 			return startIndex;
 		}
-		
+
 		public int getEndIndex() {
 			return endIndex;
 		}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java
index 78f4d6d2d4..55414697b5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java
@@ -2,12 +2,12 @@
 /**
  *
  * JdbcTemplate variant with named parameter support.
- * 
+ *
  * <p>NamedParameterJdbcTemplate is a wrapper around JdbcTemplate that adds
  * support for named parameter parsing. It does not implement the JdbcOperations
  * interface or extend JdbcTemplate, but implements the dedicated
  * NamedParameterJdbcOperations interface.
- * 
+ *
  * <P>If you need the full power of Spring JDBC for less common operations, use
  * the <code>getJdbcOperations()</code> method of NamedParameterJdbcTemplate and
  * work with the returned classic template, or use a JdbcTemplate instance directly.
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 018892ba3a..55d12b94c6 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
@@ -622,7 +622,7 @@ public abstract class AbstractJdbcInsert {
 			}
 		}
 	}
-	
+
 	/**
 	 * Match the provided in parameter values with regitered parameters and parameters defined via metedata
 	 * processing.
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 0311dc4cf3..a83b2e7954 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
@@ -38,7 +38,7 @@ import org.springframework.jdbc.core.namedparam.SqlParameterSource;
  * <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"
  * can only be used for databases that are known to provide accurate meta data.
- * These currently include Derby, MySQL, Microsoft SQL Server, Oracle, DB2, 
+ * 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
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java
index d0ad45ce97..16a842da18 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java
@@ -22,18 +22,18 @@ import org.springframework.jdbc.core.support.JdbcDaoSupport;
  * Extension of {@link org.springframework.jdbc.core.support.JdbcDaoSupport}
  * that exposes a {@link #getSimpleJdbcTemplate() SimpleJdbcTemplate} as well.
  * Only usable on Java 5 and above.
- * 
+ *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @since 2.0
  * @see SimpleJdbcTemplate
  * @deprecated since Spring 3.1 in favor of {@link org.springframework.jdbc.core.support.JdbcDaoSupport} and
- * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcDaoSupport}. The JdbcTemplate and 
+ * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcDaoSupport}. The JdbcTemplate and
  * NamedParameterJdbcTemplate now provide all the functionality of the SimpleJdbcTemplate.
  */
 @Deprecated
 public class SimpleJdbcDaoSupport extends JdbcDaoSupport {
-	
+
 	private SimpleJdbcTemplate simpleJdbcTemplate;
 
 
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 a4351abadc..0033f3847a 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
@@ -31,7 +31,7 @@ import org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractor;
  * @since 2.5
  */
 public interface SimpleJdbcInsertOperations {
-	
+
 	/**
 	 * Specify the table name to be used for the insert.
 	 * @param tableName the name of the stored table
@@ -85,8 +85,8 @@ public interface SimpleJdbcInsertOperations {
 	/**
 	 * Use a the provided NativeJdbcExtractor during the column meta data
 	 * lookups via JDBC.
-	 * Note: this is only necessary to include when running with a connection pool 
-	 * that wraps the meta data connection and when using a database like Oracle 
+	 * Note: this is only necessary to include when running with a connection pool
+	 * that wraps the meta data connection and when using a database like Oracle
 	 * where it is necessary to access the native connection to include synonyms.
 	 * @return the instance of this SimpleJdbcInsert
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java
index 2b68f35cb0..45e4644816 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java
@@ -38,7 +38,7 @@ import org.springframework.jdbc.core.namedparam.SqlParameterSource;
  * @see SimpleJdbcTemplate
  * @see org.springframework.jdbc.core.JdbcOperations
  * @deprecated since Spring 3.1 in favor of {@link org.springframework.jdbc.core.JdbcOperations} and
- * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations}. The JdbcTemplate and 
+ * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations}. The JdbcTemplate and
  * NamedParameterJdbcTemplate now provide all the functionality of the SimpleJdbcTemplate.
  */
 @Deprecated
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java
index 2ca0132530..ff1c747995 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java
@@ -41,7 +41,7 @@ import org.springframework.util.ObjectUtils;
  * any methods specifying SQL types, methods using less commonly used callbacks
  * such as RowCallbackHandler, updates with PreparedStatementSetters rather than
  * argument arrays, and stored procedures as well as batch operations.
- * 
+ *
  * @author Rod Johnson
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -51,12 +51,12 @@ import org.springframework.util.ObjectUtils;
  * @see SimpleJdbcDaoSupport
  * @see org.springframework.jdbc.core.JdbcTemplate
  * @deprecated since Spring 3.1 in favor of {@link org.springframework.jdbc.core.JdbcTemplate} and
- * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}. The JdbcTemplate and 
+ * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}. The JdbcTemplate and
  * NamedParameterJdbcTemplate now provide all the functionality of the SimpleJdbcTemplate.
  */
 @Deprecated
 public class SimpleJdbcTemplate implements SimpleJdbcOperations {
-	
+
 	/** The NamedParameterJdbcTemplate that we are wrapping */
 	private final NamedParameterJdbcOperations namedParameterJdbcOperations;
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java
index 44294d6e8b..90f8f1c873 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java
@@ -2,14 +2,14 @@
 /**
  *
  * Simplification layer over JdbcTemplate for Java 5 and above.
- * 
+ *
  * <p><code>SimpleJdbcInsert</code> and <code>SimpleJdbcCall</code> are classes that takes advantage
- * of database metadata provided by the JDBC driver to simplify the application code. Much of the 
+ * of database metadata provided by the JDBC driver to simplify the application code. Much of the
  * parameter specification becomes unnecessary since it can be looked up in the metadata.
- * 
- * Note: The <code>SimpleJdbcOperations</code> and <code>SimpleJdbcTemplate</code>, which provides a wrapper 
+ *
+ * Note: The <code>SimpleJdbcOperations</code> and <code>SimpleJdbcTemplate</code>, which provides a wrapper
  * around JdbcTemplate to take advantage of Java 5 features like generics, varargs and autoboxing, is now deprecated
- * since Spring 3.1. All functionality is now available in the <code>JdbcOperations</code> and 
+ * since Spring 3.1. All functionality is now available in the <code>JdbcOperations</code> and
  * <code>NamedParametersOperations</code> respectively.
  *
  */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java
index 4921a84b6d..517e8a052f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java
@@ -53,7 +53,7 @@ import org.springframework.jdbc.support.lob.LobHandler;
  *     },
  *     new int[] {Types.VARCHAR, Types.BLOB, Types.CLOB});
  * </pre>
- *   
+ *
  * @author Thomas Risberg
  * @author Juergen Hoeller
  * @since 1.1
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
index 12637d9547..6179a5103c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
@@ -29,7 +29,7 @@ import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.support.TransactionSynchronizationAdapter;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
- 
+
 /**
  * Helper class that provides static methods for obtaining JDBC Connections from
  * a {@link javax.sql.DataSource}. Includes special support for Spring-managed
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java
index 3c0e1377b1..9885f48efe 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java
@@ -36,8 +36,8 @@ import javax.sql.DataSource;
  * @see org.springframework.jdbc.core.JdbcTemplate
  */
 public interface SmartDataSource extends DataSource {
-		
-	/** 
+
+	/**
 	 * Should we close this Connection, obtained from this DataSource?
 	 * <p>Code that uses Connections from a SmartDataSource should always
 	 * perform a check via this method before invoking <code>close()</code>.
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 cf6737e1a5..5969069371 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
@@ -37,7 +37,7 @@ import org.apache.derby.jdbc.EmbeddedDriver;
 final class DerbyEmbeddedDatabaseConfigurer implements EmbeddedDatabaseConfigurer {
 
 	private static final Log logger = LogFactory.getLog(DerbyEmbeddedDatabaseConfigurer.class);
-	
+
 	private static final String URL_TEMPLATE = "jdbc:derby:memory:%s;%s";
 
 	// Error code that indicates successful shutdown
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 6c1ea235dc..6555e2c557 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
@@ -105,7 +105,7 @@ public class EmbeddedDatabaseBuilder {
 		addScript("data.sql");
 		return this;
 	}
-	
+
 	/**
 	 * Build the embedded database.
 	 * @return the embedded database
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
index 210439042c..7e1ea19597 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
@@ -26,7 +26,7 @@ import javax.sql.DataSource;
  * @since 3.0
  */
 public interface EmbeddedDatabaseConfigurer {
-	
+
 	/**
 	 * Configure the properties required to create and connect to the embedded database instance.
 	 * @param properties connection properties to configure
@@ -40,5 +40,5 @@ public interface EmbeddedDatabaseConfigurer {
 	 * @param databaseName the name of the database being shutdown
 	 */
 	void shutdown(DataSource dataSource, String databaseName);
-	
+
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
index d70884c32f..d8ad816c58 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
@@ -26,10 +26,10 @@ package org.springframework.jdbc.datasource.embedded;
 public enum EmbeddedDatabaseType {
 
 	/** The Hypersonic Embedded Java SQL Database (http://hsqldb.org) */
-	HSQL, 
+	HSQL,
 
 	/** The H2 Embedded Java SQL Database Engine (http://h2database.com) */
-	H2, 
+	H2,
 
 	/** The Apache Derby Embedded SQL Database (http://db.apache.org/derby) */
 	DERBY
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
index 4fdb38e8cd..6debd6f014 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
@@ -32,21 +32,21 @@ import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 final class SimpleDriverDataSourceFactory implements DataSourceFactory {
 
 	private final SimpleDriverDataSource dataSource = new SimpleDriverDataSource();
-	
+
 	public ConnectionProperties getConnectionProperties() {
 		return new ConnectionProperties() {
 			public void setDriverClass(Class<? extends Driver> driverClass) {
 				dataSource.setDriverClass(driverClass);
 			}
-			
+
 			public void setUrl(String url) {
 				dataSource.setUrl(url);
 			}
-			
+
 			public void setUsername(String username) {
 				dataSource.setUsername(username);
 			}
-			
+
 			public void setPassword(String password) {
 				dataSource.setPassword(password);
 			}
@@ -56,5 +56,5 @@ final class SimpleDriverDataSourceFactory implements DataSourceFactory {
 	public DataSource getDataSource() {
 		return this.dataSource;
 	}
-	
+
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
index 7f4102cb64..a88cd6698b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
@@ -27,7 +27,7 @@ import java.sql.SQLException;
  * @see ResourceDatabasePopulator
  */
 public interface DatabasePopulator {
-	
+
 	/**
 	 * Populate the database using the JDBC connection provided.
 	 * @param connection the JDBC connection to use to populate the db; already configured and ready to use
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
index 49919dc26e..144bf69aad 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
 
 /**
  * {@link DataSourceLookup} implementation based on a Spring {@link BeanFactory}.
- * 
+ *
  * <p>Will lookup Spring managed beans identified by bean name,
  * expecting them to be of type <code>javax.sql.DataSource</code>.
  *
@@ -53,7 +53,7 @@ public class BeanFactoryDataSourceLookup implements DataSourceLookup, BeanFactor
 	 * by a Spring IoC container, as the supplied {@link BeanFactory} will be
 	 * replaced by the {@link BeanFactory} that creates it (c.f. the
 	 * {@link BeanFactoryAware} contract). So only use this constructor if you
-	 * are using this class outside the context of a Spring IoC container. 
+	 * are using this class outside the context of a Spring IoC container.
 	 * @param beanFactory the bean factory to be used to lookup {@link DataSource DataSources}
 	 */
 	public BeanFactoryDataSourceLookup(BeanFactory beanFactory) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java
index 3d9de9d0b3..3e4ebc76ed 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java
@@ -26,7 +26,7 @@ import org.springframework.jndi.JndiLocatorSupport;
  *
  * <p>For specific JNDI configuration, it is recommended to configure
  * the "jndiEnvironment"/"jndiTemplate" properties.
- * 
+ *
  * @author Costin Leau
  * @author Juergen Hoeller
  * @since 2.0
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
index d09dacf8fe..c8e2d06dc4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
@@ -68,7 +68,7 @@ public class MapDataSourceLookup implements DataSourceLookup {
 	 * Set the {@link Map} of {@link DataSource DataSources}; the keys
 	 * are {@link String Strings}, the values are actual {@link DataSource} instances.
 	 * <p>If the supplied {@link Map} is <code>null</code>, then this method
-	 * call effectively has no effect. 
+	 * call effectively has no effect.
 	 * @param dataSources said {@link Map} of {@link DataSource DataSources}
 	 */
 	public void setDataSources(Map<String, DataSource> dataSources) {
@@ -80,7 +80,7 @@ public class MapDataSourceLookup implements DataSourceLookup {
 	/**
 	 * Get the {@link Map} of {@link DataSource DataSources} maintained by this object.
 	 * <p>The returned {@link Map} is {@link Collections#unmodifiableMap(java.util.Map) unmodifiable}.
-	 * @return said {@link Map} of {@link DataSource DataSources} (never <code>null</code>) 
+	 * @return said {@link Map} of {@link DataSource DataSources} (never <code>null</code>)
 	 */
 	public Map<String, DataSource> getDataSources() {
 		return Collections.unmodifiableMap(this.dataSources);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
index 61e0d09fe1..3a757389d9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
@@ -180,7 +180,7 @@ public class BatchSqlUpdate extends SqlUpdate {
 		if (this.parameterQueue.isEmpty()) {
 			return new int[0];
 		}
-		
+
 		int[] rowsAffected = getJdbcTemplate().batchUpdate(
 				getSql(),
 				new BatchPreparedStatementSetter() {
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 b2d09d28d2..c1527f45c3 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,12 +1,12 @@
 /*
  * Copyright 2002-2009 the original author 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.
@@ -32,7 +32,7 @@ public class GenericSqlQuery extends SqlQuery {
 			throws IllegalAccessException, InstantiationException {
 		this.rowMapperClass = rowMapperClass;
 		if (!RowMapper.class.isAssignableFrom(rowMapperClass))
-			throw new IllegalStateException("The specified class '" + 
+			throw new IllegalStateException("The specified class '" +
 					rowMapperClass.getName() + " is not a sub class of " +
 					"'org.springframework.jdbc.core.RowMapper'");
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java
index 1944c6a31e..13511bd2d4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2009 the original author 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.
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 9884cd935d..93a89ad13d 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
@@ -69,7 +69,7 @@ public abstract class RdbmsOperation implements InitializingBean {
 	private boolean updatableResults = false;
 
 	private boolean returnGeneratedKeys = false;
-	
+
 	private String[] generatedKeysColumnNames = null;
 
 	private String sql;
@@ -82,8 +82,8 @@ public abstract class RdbmsOperation implements InitializingBean {
 	 * but subclasses may also implement their own custom validation.
 	 */
 	private boolean compiled;
-	
-	
+
+
 	/**
 	 * An alternative to the more commonly used setDataSource() when you want to
 	 * use the same JdbcTemplate in multiple RdbmsOperations. This is appropriate if the
@@ -281,7 +281,7 @@ public abstract class RdbmsOperation implements InitializingBean {
 	}
 
 	/**
-	 * Add one or more declared parameters. Used for configuring this operation 
+	 * Add one or more declared parameters. Used for configuring this operation
 	 * when used in a bean factory.  Each parameter will specify SQL type and (optionally)
 	 * the parameter's name.
 	 * @param parameters Array containing the declared {@link SqlParameter} objects
@@ -334,8 +334,8 @@ public abstract class RdbmsOperation implements InitializingBean {
 			}
 			catch (IllegalArgumentException ex) {
 				throw new InvalidDataAccessApiUsageException(ex.getMessage());
-			}	
-		
+			}
+
 			compileInternal();
 			this.compiled = true;
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java
index 30965dbca1..69e825a0cd 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java
@@ -24,8 +24,8 @@ import org.springframework.dao.TypeMismatchDataAccessException;
 import org.springframework.jdbc.core.SingleColumnRowMapper;
 
 /**
- * SQL "function" wrapper for a query that returns a single row of results. 
- * The default behavior is to return an int, but that can be overridden by 
+ * SQL "function" wrapper for a query that returns a single row of results.
+ * The default behavior is to return an int, but that can be overridden by
  * using the constructor with an extra return type parameter.
  *
  * <p>Intended to use to call SQL functions that return a single result using a
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java
index df90e9de84..ecbe54490a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java
@@ -86,7 +86,7 @@ public abstract class SqlOperation extends RdbmsOperation {
 		}
 	}
 
-	
+
 	/**
 	 * Return a PreparedStatementSetter to perform an operation
 	 * with the given parameters.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java
index 27a108b043..90007b646b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java
@@ -171,7 +171,7 @@ public class SqlUpdate extends SqlOperation {
 	}
 
 	/**
-	 * Method to execute the update given arguments and 
+	 * Method to execute the update given arguments and
 	 * retrieve the generated keys using a KeyHolder.
 	 * @param params array of parameter objects
 	 * @param generatedKeyHolder KeyHolder that will hold the generated keys
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 c284edf3b3..96e3e1490b 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
@@ -59,7 +59,7 @@ public abstract class StoredProcedure extends SqlCall {
 		setDataSource(ds);
 		setSql(name);
 	}
-	
+
 	/**
 	 * Create a new object wrapper for a stored procedure.
 	 * @param jdbcTemplate JdbcTemplate which wraps DataSource
@@ -147,9 +147,9 @@ public abstract class StoredProcedure extends SqlCall {
 	/**
 	 * Execute the stored procedure. Subclasses should define a strongly typed
 	 * execute method (with a meaningful name) that invokes this method, passing in
-	 * a ParameterMapper that will populate the input map.  This allows mapping database 
+	 * a ParameterMapper that will populate the input map.  This allows mapping database
 	 * specific features since the ParameterMapper has access to the Connection object.
-	 * The execute method is also responsible for extracting typed values from the output map. 
+	 * The execute method is also responsible for extracting typed values from the output map.
 	 * Subclass execute methods will often take domain objects as arguments and return values.
 	 * Alternatively, they can return void.
 	 * @param inParamMapper map of input parameters, keyed by name as in parameter
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
index 8a4c1d7728..c7733b7130 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
@@ -26,7 +26,7 @@ import org.springframework.jdbc.core.RowMapper;
 
 /**
  * Reusable RDBMS query in which concrete subclasses must implement
- * the abstract updateRow(ResultSet, int, context) method to update each 
+ * the abstract updateRow(ResultSet, int, context) method to update each
  * row of the JDBC ResultSet and optionally map contents into an object.
  *
  * <p>Subclasses can be constructed providing SQL, parameter types
@@ -65,15 +65,15 @@ public abstract class UpdatableSqlQuery<T> extends SqlQuery<T> {
 	}
 
 	/**
-	 * Subclasses must implement this method to update each row of the 
+	 * Subclasses must implement this method to update each row of the
 	 * ResultSet and optionally create object of the result type.
 	 * @param rs ResultSet we're working through
 	 * @param rowNum row number (from 0) we're up to
 	 * @param context passed to the execute() method.
 	 * It can be <code>null</code> if no contextual information is need.  If you
-	 * need to pass in data for each row, you can pass in a HashMap with 
+	 * need to pass in data for each row, you can pass in a HashMap with
 	 * the primary key of the row being the key for the HashMap.  That way
-	 * it is easy to locate the updates for each row 
+	 * it is easy to locate the updates for each row
 	 * @return an object of the result type
 	 * @throws SQLException if there's an error updateing data.
 	 * Subclasses can simply not catch SQLExceptions, relying on the
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
index a3805eeb75..f8ec12f7d9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
@@ -5,13 +5,13 @@
  * and stored procedures as threadsafe, reusable objects. This approach
  * is modelled by JDO, although of course objects returned by queries
  * are "disconnected" from the database.
- * 
+ *
  * <p>This higher level of JDBC abstraction depends on the lower-level
  * abstraction in the <code>org.springframework.jdbc.core</code> package.
  * Exceptions thrown are as in the <code>org.springframework.dao</code> package,
  * meaning that code using this package does not need to implement JDBC or
  * RDBMS-specific error handling.
- * 
+ *
  * <p>This package and related packages are discussed in Chapter 9 of
  * <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
  * by Rod Johnson (Wrox, 2002).
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java
index 1d14b31fd9..a58744a9fa 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java
@@ -14,7 +14,7 @@
  * to target different RDBMSes without introducing proprietary
  * dependencies into application code.
  * </ul>
- * 
+ *
  * <p>This package and related packages are discussed in Chapter 9 of
  * <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
  * by Rod Johnson (Wrox, 2002).
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java
index ebaf984a2d..fa0d270d77 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -19,7 +19,7 @@ package org.springframework.jdbc.support;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
 
-/** 
+/**
  * A callback interface used by the JdbcUtils class. Implementations of this
  * interface perform the actual work of extracting database meta data, but
  * don't need to worry about exception handling. SQLExceptions will be caught
@@ -29,8 +29,8 @@ import java.sql.SQLException;
  * @see JdbcUtils#extractDatabaseMetaData
  */
 public interface DatabaseMetaDataCallback {
-	
-	/** 
+
+	/**
 	 * Implementations must implement this method to process the meta data
 	 * passed in. Exactly what the implementation chooses to do is up to it.
 	 * @param dbmd the DatabaseMetaData to process
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
index f07ba9ae19..c3ad8aefac 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
@@ -387,8 +387,8 @@ public abstract class JdbcUtils {
 			name = "DB2";
 		}
 		else if ("Sybase SQL Server".equals(source) ||
-				"Adaptive Server Enterprise".equals(source) || 
-				"ASE".equals(source) || 
+				"Adaptive Server Enterprise".equals(source) ||
+				"ASE".equals(source) ||
 				"sql server".equalsIgnoreCase(source) ) {
 			name = "Sybase";
 		}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java
index 481623c432..5be6970438 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java
@@ -21,7 +21,7 @@ import java.util.Map;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 
-/** 
+/**
  * Interface for retrieving keys, typically used for auto-generated keys
  * as potentially returned by JDBC insert statements.
  *
@@ -41,8 +41,8 @@ import org.springframework.dao.InvalidDataAccessApiUsageException;
  * @see org.springframework.jdbc.object.SqlUpdate
  */
 public interface KeyHolder {
-	
-	/** 
+
+	/**
 	 * Retrieve the first item from the first map, assuming that there is just
 	 * one item and just one map, and that the item is a number.
 	 * This is the typical case: a single, numeric generated key.
@@ -54,9 +54,9 @@ public interface KeyHolder {
 	 * @return the generated key
 	 * @throws InvalidDataAccessApiUsageException if multiple keys are encountered.
 	 */
-	Number getKey() throws InvalidDataAccessApiUsageException; 
+	Number getKey() throws InvalidDataAccessApiUsageException;
 
-	/** 
+	/**
 	 * Retrieve the first map of keys. If there are multiple entries in the list
 	 * (meaning that multiple rows had keys returned), then an
 	 * InvalidDataAccessApiUsageException is thrown.
@@ -65,7 +65,7 @@ public interface KeyHolder {
 	 */
 	Map<String, Object> getKeys() throws InvalidDataAccessApiUsageException;
 
-	/** 
+	/**
 	 * Return a reference to the List that contains the keys.
 	 * Can be used for extracting keys for multiple rows (an unusual case),
 	 * and also for adding new maps of keys.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java
index c82bbad5bf..298343bf36 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java
@@ -174,7 +174,7 @@ public class SQLErrorCodes {
 	public void setCannotSerializeTransactionCodes(String[] cannotSerializeTransactionCodes) {
 		this.cannotSerializeTransactionCodes = StringUtils.sortStringArray(cannotSerializeTransactionCodes);
 	}
-	
+
 	public String[] getCannotSerializeTransactionCodes() {
 		return this.cannotSerializeTransactionCodes;
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java
index a127e82937..445ecf5b1a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java
@@ -130,10 +130,10 @@ public class SQLErrorCodesFactory {
 			logger.warn("Error loading SQL error codes from config file", ex);
 			errorCodes = Collections.emptyMap();
 		}
-		
+
 		this.errorCodesMap = errorCodes;
 	}
-	
+
 	/**
 	 * Load the given resource from the class path.
 	 * <p><b>Not to be overridden by application developers, who should obtain
@@ -159,7 +159,7 @@ public class SQLErrorCodesFactory {
 	 */
 	public SQLErrorCodes getErrorCodes(String dbName) {
 		Assert.notNull(dbName, "Database product name must not be null");
-		
+
 		SQLErrorCodes sec = this.errorCodesMap.get(dbName);
 		if (sec == null) {
 			for (SQLErrorCodes candidate : this.errorCodesMap.values()) {
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 99d41cc0cd..fea25531ca 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
@@ -26,7 +26,7 @@ import java.sql.SQLException;
  * <pre class="code"> create table tab (id int not null primary key, text varchar(100))
  * create table tab_sequence (id bigint identity)
  * insert into tab_sequence default values</pre>
- * 
+ *
  * If "cacheSize" is set, the intermediate values are served without querying the
  * database. If the server or your application is stopped or crashes or a transaction
  * is rolled back, the unused values will never be served. The maximum hole size in
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 679ff4a1ce..8b3a04a999 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
@@ -19,7 +19,7 @@ package org.springframework.jdbc.support.incrementer;
 import javax.sql.DataSource;
 
 /**
- * {@link org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer} that increments 
+ * {@link org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer} that increments
  * the maximum value of a given Sybase SQL Anywhere table
  * with the equivalent of an auto-increment column. Note: If you use this class, your table key
  * column should <i>NOT</i> be defined as an IDENTITY column, as the sequence table does the job.
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 d8a30adfa5..5ccc969a8f 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
@@ -28,7 +28,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 /**
- * {@link org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer} that increments 
+ * {@link org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer} that increments
  * the maximum value of a given Sybase SQL Server table
  * with the equivalent of an auto-increment column. Note: If you use this class, your table key
  * column should <i>NOT</i> be defined as an IDENTITY column, as the sequence table does the job.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/package-info.java
index 6ccd325432..c6251e9b5b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/package-info.java
@@ -3,7 +3,7 @@
  *
  * Provides a support framework for incrementing database table values
  * via sequences, with implementations for various databases.
- * 
+ *
  * <p>Can be used independently, for example in custom JDBC access code.
  *
  */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/package-info.java
index 08d63d6ec5..2991509bf7 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/package-info.java
@@ -3,7 +3,7 @@
  *
  * Provides a stategy interface for Large OBject handling,
  * with implementations for various databases.
- * 
+ *
  * <p>Can be used independently from jdbc.core and jdbc.object,
  * for example in custom JDBC access code.
  *
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java
index d5f24aaee1..739b3fb1c4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java
@@ -155,5 +155,5 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 		}
 		return rs;
 	}
-	
+
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/package-info.java
index e8fe8591b4..1397cab074 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/package-info.java
@@ -3,7 +3,7 @@
  *
  * Provides a mechanism for extracting native implementations of JDBC
  * interfaces from wrapper objects that got returned from connection pools.
- * 
+ *
  * <p>Can be used independently, for example in custom JDBC access code.
  *
  */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/package-info.java
index 8413234328..13f9784fb5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/package-info.java
@@ -4,7 +4,7 @@
  * Support classes for the JDBC framework, used by the classes in the
  * jdbc.core and jdbc.object packages. Provides a translator from
  * SQLExceptions Spring's generic DataAccessExceptions.
- * 
+ *
  * <p>Can be used independently, for example in custom JDBC access code,
  * or in JDBC-based O/R mapping layers.
  *
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 23327ee7a2..1256563e9d 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
@@ -71,7 +71,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	private final ResultSet resultSet;
 
 	private final SqlRowSetMetaData rowSetMetaData;
-	
+
 	private final Map<String, Integer> columnLabelMap;
 
 
@@ -109,7 +109,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 		catch (SQLException se) {
 			throw new InvalidResultSetAccessException(se);
 		}
-		
+
 	}
 
 
@@ -128,7 +128,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	public final SqlRowSetMetaData getMetaData() {
 		return this.rowSetMetaData;
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#findColumn(String)
 	 */
@@ -161,7 +161,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getBigDecimal(String)
 	 */
@@ -187,7 +187,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	public boolean getBoolean(String columnLabel) throws InvalidResultSetAccessException {
 		return getBoolean(findColumn(columnLabel));
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getByte(int)
 	 */
@@ -199,14 +199,14 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getByte(String)
 	 */
 	public byte getByte(String columnLabel) throws InvalidResultSetAccessException {
 		return getByte(findColumn(columnLabel));
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getDate(int, java.util.Calendar)
 	 */
@@ -218,7 +218,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getDate(int)
 	 */
@@ -236,14 +236,14 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	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)
 	 */
@@ -255,14 +255,14 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getDouble(String)
 	 */
 	public double getDouble(String columnLabel) throws InvalidResultSetAccessException {
 		return getDouble(findColumn(columnLabel));
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getFloat(int)
 	 */
@@ -299,7 +299,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	public int getInt(String columnLabel) throws InvalidResultSetAccessException {
 		return getInt(findColumn(columnLabel));
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getLong(int)
 	 */
@@ -311,14 +311,14 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getLong(String)
 	 */
 	public long getLong(String columnLabel) throws InvalidResultSetAccessException {
 		return getLong(findColumn(columnLabel));
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getObject(int, java.util.Map)
 	 */
@@ -330,7 +330,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getObject(int)
 	 */
@@ -342,21 +342,21 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getObject(String, java.util.Map)
 	 */
 	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)
 	 */
@@ -368,14 +368,14 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getShort(String)
 	 */
 	public short getShort(String columnLabel) throws InvalidResultSetAccessException {
 		return getShort(findColumn(columnLabel));
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getString(int)
 	 */
@@ -387,14 +387,14 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getString(String)
 	 */
 	public String getString(String columnLabel) throws InvalidResultSetAccessException {
 		return getString(findColumn(columnLabel));
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getTime(int, java.util.Calendar)
 	 */
@@ -406,7 +406,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getTime(int)
 	 */
@@ -425,14 +425,14 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	public Time getTime(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
 		return getTime(findColumn(columnLabel), cal);
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getTime(String)
 	 */
 	public Time getTime(String columnLabel) throws InvalidResultSetAccessException {
 		return getTime(findColumn(columnLabel));
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getTimestamp(int, java.util.Calendar)
 	 */
@@ -444,7 +444,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#getTimestamp(int)
 	 */
@@ -473,7 +473,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 
 
 	// RowSet navigation methods
-	
+
 	/**
 	 * @see java.sql.ResultSet#absolute(int)
 	 */
@@ -497,7 +497,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#beforeFirst()
 	 */
@@ -509,7 +509,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#first()
 	 */
@@ -557,7 +557,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#isFirst()
 	 */
@@ -569,7 +569,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#isLast()
 	 */
@@ -581,7 +581,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#last()
 	 */
@@ -593,7 +593,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#next()
 	 */
@@ -605,7 +605,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#previous()
 	 */
@@ -617,7 +617,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#relative(int)
 	 */
@@ -629,7 +629,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	/**
 	 * @see java.sql.ResultSet#wasNull()
 	 */
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 483ef36cc5..985a199af3 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
@@ -63,7 +63,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 	public String getColumnClassName(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.getColumnClassName(column);
@@ -199,5 +199,5 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
-	
+
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java
index 5b8db54ffe..9142ecd0b8 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java
@@ -32,7 +32,7 @@ public interface XmlResultProvider {
 	 * Implementations must implement this method to provide the XML content
 	 * for the <code>Result</code>. Implementations will vary depending on
 	 * the <code>Result</code> implementation used.
-	 * @param result the <code>Result</code> object being used to provide the XML input 
+	 * @param result the <code>Result</code> object being used to provide the XML input
 	 */
 	void provideXml(Result result);
 
diff --git a/spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java
index 7d87547b5f..c5c4ed5e67 100644
--- a/spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/beans/IOther.java b/spring-jdbc/src/test/java/org/springframework/beans/IOther.java
index 797486ec44..6a8f74187c 100644
--- a/spring-jdbc/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-jdbc/src/test/java/org/springframework/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java
index a06e15d150..0eb8df5c8a 100644
--- a/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java
index c8fecfdf96..ded9cd0bf7 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java
@@ -5,13 +5,13 @@
  */
 /*
  * 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.
@@ -37,7 +37,7 @@ public abstract class AbstractJdbcTests extends TestCase {
 	protected DataSource mockDataSource;
 	protected MockControl ctrlConnection;
 	protected Connection mockConnection;
-	
+
 	/**
 	 * Set to true if the user wants verification, indicated
 	 * by a call to replay(). We need to make this optional,
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
index af62a7c6bf..4d722fb2c8 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
@@ -110,16 +110,16 @@ public class InitializeDatabaseIntegrationTests {
 		JdbcTemplate t = new JdbcTemplate(dataSource);
 		assertEquals(1, t.queryForInt("select count(*) from T_TEST"));
 	}
-	
+
 	public static class CacheData implements InitializingBean {
 
 		private JdbcTemplate jdbcTemplate;
 		private List<Map<String,Object>> cache;
-		
+
 		public void setDataSource(DataSource dataSource) {
 			this.jdbcTemplate = new JdbcTemplate(dataSource);
 		}
-		
+
 		public List<Map<String,Object>> getCachedData() {
 			return cache;
 		}
@@ -127,7 +127,7 @@ public class InitializeDatabaseIntegrationTests {
 		public void afterPropertiesSet() throws Exception {
 			cache = jdbcTemplate.queryForList("SELECT * FROM T_TEST");
 		}
-		
+
 	}
 
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
index 9851a23923..de75c0d0f2 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
@@ -273,7 +273,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests {
 
 	public void testQueryForObjectThrowsIncorrectResultSizeForMoreThanOneRow() throws Exception {
 		String sql = "select pass from t_account where first_name='Alef'";
-		
+
 		mockResultSetMetaData.getColumnCount();
 		ctrlResultSetMetaData.setReturnValue(1);
 
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
index bfe4c14824..636a234859 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
@@ -51,7 +51,7 @@ import org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractor;
 import org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractorAdapter;
 import org.springframework.util.LinkedCaseInsensitiveMap;
 
-/** 
+/**
  * Mock object based tests for JdbcTemplate.
  *
  * @author Rod Johnson
@@ -737,12 +737,12 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		try {
 			template.batchUpdate(sql);
 			fail("Shouldn't have executed batch statement with a select");
-		} 
+		}
 		catch (DataAccessException ex) {
 			// pass
 			assertTrue("Check exception type", ex.getClass() == InvalidDataAccessApiUsageException.class);
 		}
-		
+
 		ctrlStatement.verify();
 		ctrlDatabaseMetaData.verify();
 	}
@@ -1189,7 +1189,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData);
 	}
-	
+
 	public void testBatchUpdateWithCollectionOfObjects() throws Exception {
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
 		final List<Integer> ids = new ArrayList<Integer>();
@@ -1275,12 +1275,12 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 			RowCountCallbackHandler rcch = new RowCountCallbackHandler();
 			template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch);
 			fail("Shouldn't have executed query without a connection");
-		} 
+		}
 		catch (CannotGetJdbcConnectionException ex) {
 			// pass
 			assertTrue("Check root cause", ex.getCause() == sex);
 		}
-		
+
 		ctrlDataSource.verify();
 	}
 
@@ -1348,7 +1348,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		//mockConnection.close();
 		//ctrlConnection.setVoidCallable(1);
 		ctrlConnection.replay();
-		
+
 		// Change behaviour in setUp() because we only expect one call to getConnection():
 		// none is necessary to get metadata for exception translator
 		ctrlDataSource = MockControl.createControl(DataSource.class);
@@ -1366,26 +1366,26 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 			RowCountCallbackHandler rcch = new RowCountCallbackHandler();
 			template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch);
 			fail("Shouldn't have executed query without a connection");
-		} 
+		}
 		catch (CannotGetJdbcConnectionException ex) {
 			// pass
 			assertTrue("Check root cause", ex.getCause() == sex);
 		}
-	
+
 		ctrlDataSource.verify();
 		ctrlConnection.verify();
 	}
-	
+
 	public void testCouldntGetConnectionInOperationWithExceptionTranslatorInitializedViaBeanProperty()
 			throws Exception {
 		doTestCouldntGetConnectionInOperationWithExceptionTranslatorInitialized(true);
 	}
-	
+
 	public void testCouldntGetConnectionInOperationWithExceptionTranslatorInitializedInAfterPropertiesSet()
 			throws Exception {
 		doTestCouldntGetConnectionInOperationWithExceptionTranslatorInitialized(false);
 	}
-	
+
 	/**
 	 * If beanProperty is true, initialize via exception translator bean property;
 	 * if false, use afterPropertiesSet().
@@ -1402,7 +1402,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		//mockConnection.close();
 		//ctrlConnection.setVoidCallable(1);
 		ctrlConnection.replay();
-	
+
 		// Change behaviour in setUp() because we only expect one call to getConnection():
 		// none is necessary to get metadata for exception translator
 		ctrlDataSource = MockControl.createControl(DataSource.class);
@@ -1434,7 +1434,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 				"SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3",
 				rcch);
 			fail("Shouldn't have executed query without a connection");
-		} 
+		}
 		catch (CannotGetJdbcConnectionException ex) {
 			// pass
 			assertTrue("Check root cause", ex.getCause() == sex);
@@ -1778,7 +1778,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		mockConnection.createStatement();
 		ctrlConnection.setReturnValue(mockStatement);
-		
+
 		// Change behaviour in setUp() because we only expect one call to getConnection():
 		// none is necessary to get metadata for exception translator
 		ctrlConnection = MockControl.createControl(Connection.class);
@@ -1817,11 +1817,11 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 			assertTrue(
 				"Wanted same exception back, not " + ex,
 				sex == ex.getCause());
-		} 
+		}
 
 		ctrlResultSet.verify();
 		ctrlStatement.verify();
-		
+
 		// We didn't call superclass replay() so we need to check these ourselves
 		ctrlDataSource.verify();
 		ctrlConnection.verify();
@@ -2139,7 +2139,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		template.setResultsMapCaseInsensitive(true);
 		assertTrue("now it should have been set to case insensitive", template.isResultsMapCaseInsensitive());
-		
+
 		List params = new ArrayList();
 		params.add(new SqlOutParameter("a", 12));
 
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 48875c60f0..2360b80840 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
@@ -227,7 +227,7 @@ public class NamedParameterUtilsTests {
 		assertEquals(0, parsedSql.getParameterNames().size());
 		String finalSql = NamedParameterUtils.substituteNamedParameters(parsedSql, null);
 		assertEquals(expectedSql, finalSql);
-		
+
 		String expectedSql2 = "select foo from bar where baz = 'b:{p1}z'";
 		String sql2 = "select foo from bar where baz = 'b:{p1}z'";
 
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
index 7d7b47918e..b6ffa6f70f 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
@@ -82,7 +82,7 @@ public class SimpleJdbcInsertTests extends TestCase {
 		ctrlResultSet.setReturnValue(false);
 		mockResultSet.close();
 		ctrlResultSet.setVoidCallable();
-		
+
 		mockDatabaseMetaData.getDatabaseProductName();
 		ctrlDatabaseMetaData.setReturnValue("MyDB");
 		mockDatabaseMetaData.supportsGetGeneratedKeys();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java
index a02a105c74..d42a5810dd 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java
@@ -144,12 +144,12 @@ public class TableMetaDataContextTests extends TestCase {
 		ctrlMetaDataResultSet.replay();
 		ctrlColumnsResultSet.replay();
 		replay();
-		
+
 		MapSqlParameterSource map = new MapSqlParameterSource();
 		map.addValue("id", 1);
 		map.addValue("name", "Sven");
 		map.addValue("customersince", new Date());
-		map.addValue("version", 0);		
+		map.addValue("version", 0);
 		map.registerSqlType("customersince", Types.DATE);
 		map.registerSqlType("version", Types.NUMERIC);
 
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
index d9cb7118cc..69d03b371d 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
index 08f3a84f18..b63387c48c 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -34,62 +34,62 @@ import org.springframework.jdbc.support.lob.LobHandler;
  * @author Alef Arendsen
  */
 public class LobSupportTests extends TestCase {
-	
+
 	public void testCreatingPreparedStatementCallback() throws SQLException {
 		// - return value should match
 		// - lob creator should be closed
 		// - set return value should be called
 		// - execute update should be called
-		
+
 		MockControl lobHandlerControl = MockControl.createControl(LobHandler.class);
-		LobHandler handler = (LobHandler)lobHandlerControl.getMock();		
-		
+		LobHandler handler = (LobHandler)lobHandlerControl.getMock();
+
 		MockControl lobCreatorControl = MockControl.createControl(LobCreator.class);
 		LobCreator creator = (LobCreator)lobCreatorControl.getMock();
-		
+
 		MockControl psControl = MockControl.createControl(PreparedStatement.class);
 		PreparedStatement ps = (PreparedStatement)psControl.getMock();
-		
+
 		handler.getLobCreator();
 		lobHandlerControl.setReturnValue(creator);
 		ps.executeUpdate();
 		psControl.setReturnValue(3);
 		creator.close();
-		
+
 		lobHandlerControl.replay();
 		lobCreatorControl.replay();
 		psControl.replay();
-		
+
 		class SetValuesCalled {
 			boolean b = false;
 		}
-		
+
 		final SetValuesCalled svc = new SetValuesCalled();
-		
-		AbstractLobCreatingPreparedStatementCallback psc = 
+
+		AbstractLobCreatingPreparedStatementCallback psc =
 			new AbstractLobCreatingPreparedStatementCallback(handler) {
-			
+
 			protected void setValues(PreparedStatement ps, LobCreator lobCreator)
 					throws SQLException, DataAccessException {
 				svc.b = true;
 			}
 		};
-		
+
 		assertEquals(new Integer(3), psc.doInPreparedStatement(ps));
-		
+
 		lobHandlerControl.verify();
 		lobCreatorControl.verify();
 		psControl.verify();
 		assertTrue(svc.b);
 	}
-	
+
 	public void testAbstractLobStreamingResultSetExtractorNoRows() throws SQLException {
 		MockControl rsetControl = MockControl.createControl(ResultSet.class);
 		ResultSet rset = (ResultSet)rsetControl.getMock();
 		rset.next();
 		rsetControl.setReturnValue(false);
 		rsetControl.replay();
-		
+
 		AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false);
 		try {
 			lobRse.extractData(rset);
@@ -98,7 +98,7 @@ public class LobSupportTests extends TestCase {
 			// expected
 		}
 	}
-	
+
 	public void testAbstractLobStreamingResultSetExtractorOneRow() throws SQLException {
 		MockControl rsetControl = MockControl.createControl(ResultSet.class);
 		ResultSet rset = (ResultSet)rsetControl.getMock();
@@ -109,7 +109,7 @@ public class LobSupportTests extends TestCase {
 		rset.next();
 		rsetControl.setReturnValue(false);
 		rsetControl.replay();
-		
+
 		AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false);
 		lobRse.extractData(rset);
 		rsetControl.verify();
@@ -125,7 +125,7 @@ public class LobSupportTests extends TestCase {
 		rset.next();
 		rsetControl.setReturnValue(true);
 		rsetControl.replay();
-		
+
 		AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false);
 		try {
 			lobRse.extractData(rset);
@@ -135,14 +135,14 @@ public class LobSupportTests extends TestCase {
 		}
 		rsetControl.verify();
 	}
-	
+
 	public void testAbstractLobStreamingResultSetExtractorCorrectException() throws SQLException {
 		MockControl rsetControl = MockControl.createControl(ResultSet.class);
 		ResultSet rset = (ResultSet)rsetControl.getMock();
 		rset.next();
 		rsetControl.setReturnValue(true);
 		rsetControl.replay();
-		
+
 		AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(true);
 		try {
 			lobRse.extractData(rset);
@@ -152,7 +152,7 @@ public class LobSupportTests extends TestCase {
 		}
 		rsetControl.verify();
 	}
-	
+
 	private AbstractLobStreamingResultSetExtractor getResultSetExtractor(final boolean ex) {
 		AbstractLobStreamingResultSetExtractor lobRse = new AbstractLobStreamingResultSetExtractor() {
 			protected void streamData(ResultSet rs) throws SQLException, IOException {
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
index 29a4a51fbc..f2345bbc73 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -33,7 +33,7 @@ import org.springframework.jdbc.support.lob.LobHandler;
 /**
  * Test cases for the sql lob value:
  *
- * BLOB: 
+ * BLOB:
  *   1. Types.BLOB: setBlobAsBytes (byte[])
  *   2. String: setBlobAsBytes (byte[])
  *   3. else: IllegalArgumentException
@@ -43,44 +43,44 @@ import org.springframework.jdbc.support.lob.LobHandler;
  *   5. InputStream: setClobAsAsciiStream (InputStream)
  *   6. Reader: setClobAsCharacterStream (Reader)
  *   7. else: IllegalArgumentException
- * 
+ *
  * @author Alef Arendsen
  */
 public class SqlLobValueTests extends TestCase {
-	
+
 	private MockControl psControl;
 	private PreparedStatement ps;
-	
+
 	private MockControl lobHandlerControl;
 	private LobHandler handler;
-	
+
 	private MockControl lobCreatorControl;
 	private LobCreator creator;
-	
+
 	public void setUp() {
 		//	create preparedstatement
 		psControl = MockControl.createControl(PreparedStatement.class);
 		ps = (PreparedStatement) psControl.getMock();
-		
+
 		// create handler controler
 		lobHandlerControl = MockControl.createControl(LobHandler.class);
 		handler = (LobHandler) lobHandlerControl.getMock();
-		
+
 		// create creator control
 		lobCreatorControl = MockControl.createControl(LobCreator.class);
 		creator = (LobCreator) lobCreatorControl.getMock();
-		
+
 		// set initial state
 		handler.getLobCreator();
 		lobHandlerControl.setReturnValue(creator);
 	}
-	
+
 	private void replay() {
 		psControl.replay();
 		lobHandlerControl.replay();
 		lobCreatorControl.replay();
 	}
-	
+
 	public void test1() throws SQLException {
 		byte[] testBytes = "Bla".getBytes();
 		creator.setBlobAsBytes(ps, 1, testBytes);
@@ -88,40 +88,40 @@ public class SqlLobValueTests extends TestCase {
 		SqlLobValue lob = new SqlLobValue(testBytes, handler);
 		lob.setTypeValue(ps, 1, Types.BLOB, "test");
 		lobHandlerControl.verify();
-		lobCreatorControl.verify();		
+		lobCreatorControl.verify();
 	}
-	
+
 	public void test2() throws SQLException {
 		String testString = "Bla";
-		
+
 		creator.setBlobAsBytes(ps, 1, testString.getBytes());
 		// set a matcher to match the byte array!
-		lobCreatorControl.setMatcher(new ArgumentsMatcher() {			
+		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
 			public boolean matches(Object[] arg0, Object[] arg1) {
 				byte[] one = (byte[]) arg0[2];
 				byte[] two = (byte[]) arg1[2];
 				return Arrays.equals(one, two);
 			}
-			public String toString(Object[] arg0) {				
+			public String toString(Object[] arg0) {
 				return "bla";
 			}
 		});
-		
+
 		replay();
 
 		SqlLobValue lob = new SqlLobValue(testString, handler);
 		lob.setTypeValue(ps, 1, Types.BLOB, "test");
 		lobHandlerControl.verify();
-		lobCreatorControl.verify();		
-		
+		lobCreatorControl.verify();
+
 	}
-	
-	public void test3() 
+
+	public void test3()
 	throws SQLException {
-		
+
 		Date testContent = new Date();
-		
-		SqlLobValue lob = 
+
+		SqlLobValue lob =
 			new SqlLobValue(new InputStreamReader(new ByteArrayInputStream("Bla".getBytes())), 12);
 		try {
 			lob.setTypeValue(ps, 1, Types.BLOB, "test");
@@ -131,19 +131,19 @@ public class SqlLobValueTests extends TestCase {
 			// expected
 		}
 	}
-	
+
 	public void test4() throws SQLException {
 		String testContent = "Bla";
 		creator.setClobAsString(ps, 1, testContent);
-		
+
 		replay();
-		
+
 		SqlLobValue lob = new SqlLobValue(testContent, handler);
 		lob.setTypeValue(ps, 1, Types.CLOB, "test");
 		lobHandlerControl.verify();
-		lobCreatorControl.verify();		
+		lobCreatorControl.verify();
 	}
-	
+
 	public void test5() throws SQLException {
 		byte[] testContent = "Bla".getBytes();
 		ByteArrayInputStream bais = new ByteArrayInputStream(testContent);
@@ -157,15 +157,15 @@ public class SqlLobValueTests extends TestCase {
 				return null;
 			}
 		});
-		
+
 		replay();
-		
+
 		SqlLobValue lob = new SqlLobValue(new ByteArrayInputStream(testContent), 3, handler);
 		lob.setTypeValue(ps, 1, Types.CLOB, "test");
 		lobHandlerControl.verify();
-		lobCreatorControl.verify();		
+		lobCreatorControl.verify();
 	}
-	
+
 	public void test6()throws SQLException {
 		byte[] testContent = "Bla".getBytes();
 		ByteArrayInputStream bais = new ByteArrayInputStream(testContent);
@@ -180,19 +180,19 @@ public class SqlLobValueTests extends TestCase {
 				return null;
 			}
 		});
-		
+
 		replay();
-		
+
 		SqlLobValue lob = new SqlLobValue(reader, 3, handler);
 		lob.setTypeValue(ps, 1, Types.CLOB, "test");
 		lobHandlerControl.verify();
 		lobCreatorControl.verify();
-		
+
 	}
-	
+
 	public void test7() throws SQLException {
 		Date testContent = new Date();
-		
+
 		SqlLobValue lob = new SqlLobValue("bla".getBytes());
 		try {
 			lob.setTypeValue(ps, 1, Types.CLOB, "test");
@@ -202,13 +202,13 @@ public class SqlLobValueTests extends TestCase {
 			// expected
 		}
 	}
-	
+
 	public void testOtherConstructors() throws SQLException {
 		// a bit BS, but we need to test them, as long as they don't throw exceptions
-		
+
 		SqlLobValue lob = new SqlLobValue("bla");
 		lob.setTypeValue(ps, 1, Types.CLOB, "test");
-		
+
 		try {
 			lob = new SqlLobValue("bla".getBytes());
 			lob.setTypeValue(ps, 1, Types.CLOB, "test");
@@ -220,24 +220,24 @@ public class SqlLobValueTests extends TestCase {
 
 		lob = new SqlLobValue(new ByteArrayInputStream("bla".getBytes()), 3);
 		lob.setTypeValue(ps, 1, Types.CLOB, "test");
-		
+
 		lob = new SqlLobValue(new InputStreamReader(
 				new ByteArrayInputStream("bla".getBytes())), 3);
 		lob.setTypeValue(ps, 1, Types.CLOB, "test");
-		
-		// same for BLOB		
+
+		// same for BLOB
 		lob = new SqlLobValue("bla");
 		lob.setTypeValue(ps, 1, Types.BLOB, "test");
-		
+
 		lob = new SqlLobValue("bla".getBytes());
 		lob.setTypeValue(ps, 1, Types.BLOB, "test");
-		
+
 		lob = new SqlLobValue(new ByteArrayInputStream("bla".getBytes()), 3);
 		lob.setTypeValue(ps, 1, Types.BLOB, "test");
-		
+
 		lob = new SqlLobValue(new InputStreamReader(
 				new ByteArrayInputStream("bla".getBytes())), 3);
-		
+
 		try {
 			lob.setTypeValue(ps, 1, Types.BLOB, "test");
 			fail("IllegalArgumentException should have been thrown");
@@ -246,19 +246,19 @@ public class SqlLobValueTests extends TestCase {
 			// expected
 		}
 	}
-	
+
 	public void testCorrectCleanup()  throws SQLException {
 		creator.setClobAsString(ps, 1, "Bla");
 		creator.close();
-		
+
 		replay();
 		SqlLobValue lob = new SqlLobValue("Bla", handler);
 		lob.setTypeValue(ps, 1, Types.CLOB, "test");
 		lob.cleanup();
-		
+
 		lobCreatorControl.verify();
 	}
-	
+
 	public void testOtherSqlType() throws SQLException {
 		replay();
 		SqlLobValue lob = new SqlLobValue("Bla", handler);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
index 89ecf0bc66..cf3cf2cb45 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
@@ -48,11 +48,11 @@ import org.springframework.transaction.support.TransactionTemplate;
  * @since 04.07.2003
  */
 public class DataSourceTransactionManagerTests extends TestCase {
-	
+
 	public void testTransactionCommitWithAutoCommitTrue() throws Exception {
 		doTestTransactionCommitRestoringAutoCommit(true, false, false);
 	}
-	
+
 	public void testTransactionCommitWithAutoCommitFalse() throws Exception {
 		doTestTransactionCommitRestoringAutoCommit(false, false, false);
 	}
@@ -159,11 +159,11 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		conControl.verify();
 		dsControl.verify();
 	}
-	
+
 	public void testTransactionRollbackWithAutoCommitTrue() throws Exception  {
 		doTestTransactionRollbackRestoringAutoCommit(true, false, false);
 	}
-	
+
 	public void testTransactionRollbackWithAutoCommitFalse() throws Exception  {
 		doTestTransactionRollbackRestoringAutoCommit(false, false, false);
 	}
@@ -1509,7 +1509,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		// Must restore
 		con.setAutoCommit(false);
 		conControl.setVoidCallable(1);
-				
+
 		con.rollback();
 		conControl.setThrowable(new SQLException("Cannot rollback"), 1);
 		con.setAutoCommit(true);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java
index f3e85fb790..3a9f6b94ec 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java
@@ -8,9 +8,9 @@ import org.junit.Test;
 import org.springframework.jdbc.datasource.init.DatabasePopulator;
 
 public class EmbeddedDatabaseFactoryTests {
-	
+
 	private EmbeddedDatabaseFactory factory = new EmbeddedDatabaseFactory();
-	
+
 	@Test
 	public void testGetDataSource() {
 		StubDatabasePopulator populator = new StubDatabasePopulator();
@@ -19,14 +19,14 @@ public class EmbeddedDatabaseFactoryTests {
 		assertTrue(populator.populateCalled);
 		db.shutdown();
 	}
-	
+
 	private static class StubDatabasePopulator implements DatabasePopulator {
 
 		private boolean populateCalled;
-		
+
 		public void populate(Connection connection) {
 			this.populateCalled = true;
 		}
-		
+
 	}
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java
index e6e8e10c07..20f66ddf3d 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java
@@ -38,7 +38,7 @@ public class BeanFactoryDataSourceLookupTests {
 	@Test
 	public void testLookupSunnyDay() {
 		BeanFactory beanFactory = createMock(BeanFactory.class);
-		
+
 		StubDataSource expectedDataSource = new StubDataSource();
 		expect(beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class)).andReturn(expectedDataSource);
 
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java
index 2290483066..a8521e70ba 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java
@@ -23,9 +23,9 @@ import org.springframework.jdbc.datasource.AbstractDataSource;
 
 /**
  * Stub, do-nothing DataSource implementation.
- * 
+ *
  * <p>All methods throw {@link UnsupportedOperationException}.
- * 
+ *
  * @author Rick Evans
  */
 class StubDataSource extends AbstractDataSource {
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java
index 50455e803a..a497dca34e 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java
@@ -9,7 +9,7 @@ import java.sql.SQLException;
 public class CustomerMapper implements RowMapper<Customer> {
 
 	private static final String[] COLUMN_NAMES = new String[] {"id", "forename"};
-	
+
 	public Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 		Customer cust = new Customer();
 		cust.setId(rs.getInt(COLUMN_NAMES[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 785a0458f7..4bf0f2eed4 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
@@ -60,7 +60,7 @@ public class GenericSqlQueryTests extends AbstractJdbcTests {
 
 	private BeanFactory bf;
 
-	
+
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
index e94bcc3729..8feb57fc97 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
@@ -84,7 +84,7 @@ public class RdbmsOperationTests extends TestCase {
 		operation.setTypes(new int[] { Types.INTEGER });
 		try {
 			operation.validateParameters((Object[]) null);
-			fail("Shouldn't validate without enough parameters"); 
+			fail("Shouldn't validate without enough parameters");
 		}
 		catch (InvalidDataAccessApiUsageException idaauex) {
 			// OK
@@ -123,7 +123,7 @@ public class RdbmsOperationTests extends TestCase {
 		operation.setSql("select * from mytable");
 		try {
 			operation.validateParameters(new Object[] {new Integer(1), new Integer(2)});
-			fail("Shouldn't validate with too many parameters"); 
+			fail("Shouldn't validate with too many parameters");
 		}
 		catch (InvalidDataAccessApiUsageException idaauex) {
 			// OK
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
index 877164d0d8..1f548759ea 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
@@ -969,7 +969,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 		Assert.assertEquals("Second customer id was assigned correctly", ((Customer)cust.get(1)).getId(), 2);
 		Assert.assertEquals("Second customer forename was assigned correctly", ((Customer)cust.get(1)).getForename(), "juergen");
 	}
-	
+
 	public void testNamedParameterQueryReusingParameter() throws SQLException {
 		mockResultSet.next();
 		ctrlResultSet.setReturnValue(true);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
index 447a8aa9c2..867f1891ac 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
@@ -272,7 +272,7 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 		ctrlResultSet.setReturnValue(false);
 		mockResultSet.close();
 		ctrlResultSet.setVoidCallable();
-		
+
 		mockPreparedStatement.setString(1, "rod");
 		ctrlPreparedStatement.setVoidCallable();
 		mockPreparedStatement.executeUpdate();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
index ddce92f5a3..13ceba3fed 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
@@ -213,13 +213,13 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 	}
 
-		
+
 	/**
 	 * Confirm no connection was used to get metadata.
 	 * Does not use superclass replay mechanism.
 	 * @throws Exception
 	 */
-	public void testStoredProcedureConfiguredViaJdbcTemplateWithCustomExceptionTranslator() throws Exception {					
+	public void testStoredProcedureConfiguredViaJdbcTemplateWithCustomExceptionTranslator() throws Exception {
 		mockCallable.setObject(1, new Integer(11), Types.INTEGER);
 		ctrlCallable.setVoidCallable(1);
 		mockCallable.registerOutParameter(2, Types.INTEGER);
@@ -246,7 +246,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		mockConnection.close();
 		ctrlConnection.setVoidCallable(1);
 		ctrlConnection.replay();
-		
+
 		MockControl dsControl = MockControl.createControl(DataSource.class);
 		DataSource localDs = (DataSource) dsControl.getMock();
 		localDs.getConnection();
@@ -267,15 +267,15 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		// DataSource here if we need to to create an ExceptionTranslator
 		t.setExceptionTranslator(new SQLStateSQLExceptionTranslator());
 		StoredProcedureConfiguredViaJdbcTemplate sp = new StoredProcedureConfiguredViaJdbcTemplate(t);
-		
+
 		assertEquals(sp.execute(11), 5);
 		assertEquals(1, t.calls);
-		
+
 		dsControl.verify();
 		ctrlCallable.verify();
 		ctrlConnection.verify();
 	}
-	
+
 	/**
 	 * Confirm our JdbcTemplate is used
 	 * @throws Exception
@@ -301,11 +301,11 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		mockConnection.prepareCall("{call " + StoredProcedureConfiguredViaJdbcTemplate.SQL + "(?, ?)}");
 		ctrlConnection.setReturnValue(mockCallable);
 
-		replay();	
+		replay();
 		JdbcTemplate t = new JdbcTemplate();
 		t.setDataSource(mockDataSource);
 		StoredProcedureConfiguredViaJdbcTemplate sp = new StoredProcedureConfiguredViaJdbcTemplate(t);
-	
+
 		assertEquals(sp.execute(1106), 4);
 	}
 
@@ -429,7 +429,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		ctrlResultSet.verify();
 		assertEquals(2, sproc.getCount());
 	}
-	
+
 	public void testStoredProcedureWithResultSetMapped() throws Exception {
 		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
 		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
@@ -473,11 +473,11 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		Map res = sproc.execute();
 
 		ctrlResultSet.verify();
-		
+
 		List rs = (List) res.get("rs");
 		assertEquals(2, rs.size());
 		assertEquals("Foo", rs.get(0));
-		assertEquals("Bar", rs.get(1));		
+		assertEquals("Bar", rs.get(1));
 
 	}
 
@@ -958,12 +958,12 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 			out = execute(new TestParameterMapper());
 			return out;
 		}
-		
+
 		private static class TestParameterMapper implements ParameterMapper {
-			
+
 			private TestParameterMapper() {
 			}
-			
+
 			public Map createMap(Connection conn) throws SQLException {
 				Map inParms = new HashMap();
 				String testValue = conn.toString();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java
index 7a26db3471..a637cf1ba9 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java
index 7c63fd5c5c..bb022964a3 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java
index 933d8089a5..f4db4d3e66 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
index 058ce7c304..565e7d1cce 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -34,7 +34,7 @@ import junit.framework.TestCase;
  */
 public class KeyHolderTests extends TestCase {
 	private KeyHolder kh;
-	
+
 	public void setUp() {
 		kh = new GeneratedKeyHolder();
 	}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
index b33aa870ac..8293d5c98d 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -35,7 +35,7 @@ import org.springframework.jdbc.InvalidResultSetAccessException;
  * @author Rod Johnson
  */
 public class SQLErrorCodeSQLExceptionTranslatorTests extends TestCase {
-	
+
 	private static SQLErrorCodes ERROR_CODES = new SQLErrorCodes();
 	static {
 		ERROR_CODES.setBadSqlGrammarCodes(new String[] { "1", "2" });
@@ -116,19 +116,19 @@ public class SQLErrorCodeSQLExceptionTranslatorTests extends TestCase {
 			}
 		};
 		sext.setSqlErrorCodes(ERROR_CODES);
-		
+
 		// Shouldn't custom translate this
 		assertEquals(customDex, sext.translate(TASK, SQL, badSqlEx));
 		DataIntegrityViolationException diex = (DataIntegrityViolationException) sext.translate(TASK, SQL, intVioEx);
 		assertEquals(intVioEx, diex.getCause());
 	}
-	
+
 	public void testCustomExceptionTranslation() {
 		final String TASK = "TASK";
 		final String SQL = "SQL SELECT *";
 		final SQLErrorCodes customErrorCodes = new SQLErrorCodes();
 		final CustomSQLErrorCodesTranslation customTranslation = new CustomSQLErrorCodesTranslation();
-		
+
 		customErrorCodes.setBadSqlGrammarCodes(new String[] {"1", "2"});
 		customErrorCodes.setDataIntegrityViolationCodes(new String[] {"3", "4"});
 		customTranslation.setErrorCodes(new String[] {"1"});
@@ -137,7 +137,7 @@ public class SQLErrorCodeSQLExceptionTranslatorTests extends TestCase {
 
 		SQLErrorCodeSQLExceptionTranslator sext = new SQLErrorCodeSQLExceptionTranslator();
 		sext.setSqlErrorCodes(customErrorCodes);
-		
+
 		// Should custom translate this
 		SQLException badSqlEx = new SQLException("", "", 1);
 		assertEquals(CustomErrorCodeException.class, sext.translate(TASK, SQL, badSqlEx).getClass());
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java
index 35a66acbf3..681ef8ff16 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -24,12 +24,12 @@ import org.springframework.jdbc.BadSqlGrammarException;
 import org.springframework.jdbc.UncategorizedSQLException;
 
 /**
- * 
+ *
  * @author Rod Johnson
  * @since 13-Jan-03
  */
 public class SQLStateExceptionTranslatorTests extends TestCase {
-	
+
 	private SQLStateSQLExceptionTranslator trans = new SQLStateSQLExceptionTranslator();
 
 	// ALSO CHECK CHAIN of SQLExceptions!?
@@ -39,7 +39,7 @@ public class SQLStateExceptionTranslatorTests extends TestCase {
 		String sql = "SELECT FOO FROM BAR";
 		SQLException sex = new SQLException("Message", "42001", 1);
 		try {
-			throw this.trans.translate("task", sql, sex); 
+			throw this.trans.translate("task", sql, sex);
 		}
 		catch (BadSqlGrammarException ex) {
 			// OK
@@ -47,7 +47,7 @@ public class SQLStateExceptionTranslatorTests extends TestCase {
 			assertTrue("Exception matches", sex.equals(ex.getSQLException()));
 		}
 	}
-	
+
 	public void testInvalidSqlStateCode() {
 		String sql = "SELECT FOO FROM BAR";
 		SQLException sex = new SQLException("Message", "NO SUCH CODE", 1);
@@ -60,26 +60,26 @@ public class SQLStateExceptionTranslatorTests extends TestCase {
 			assertTrue("Exception matches", sex.equals(ex.getSQLException()));
 		}
 	}
-	
+
 	/**
 	 * PostgreSQL can return null
 	 * SAP DB can apparently return empty SQL code
-	 * Bug 729170 
+	 * Bug 729170
 	 */
 	public void testMalformedSqlStateCodes() {
 		String sql = "SELECT FOO FROM BAR";
 		SQLException sex = new SQLException("Message", null, 1);
 		testMalformedSqlStateCode(sex);
-		
+
 		sex = new SQLException("Message", "", 1);
 		testMalformedSqlStateCode(sex);
-				
+
 		// One char's not allowed
 		sex = new SQLException("Message", "I", 1);
 		testMalformedSqlStateCode(sex);
 	}
-	
-	
+
+
 	private void testMalformedSqlStateCode(SQLException sex) {
 		String sql = "SELECT FOO FROM BAR";
 		try {
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
index 7b470f949d..ebd0259508 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
@@ -103,7 +103,7 @@ abstract class AbstractListenerContainerParser implements BeanDefinitionParser {
 				}
 			}
 		}
-		
+
 		parserContext.popAndRegisterContainingComponent();
 		return null;
 	}
@@ -111,7 +111,7 @@ abstract class AbstractListenerContainerParser implements BeanDefinitionParser {
 	private void parseListener(Element listenerEle, Element containerEle, ParserContext parserContext) {
 		RootBeanDefinition listenerDef = new RootBeanDefinition();
 		listenerDef.setSource(parserContext.extractSource(listenerEle));
-		
+
 		String ref = listenerEle.getAttribute(REF_ATTRIBUTE);
 		if (!StringUtils.hasText(ref)) {
 			parserContext.getReaderContext().error(
@@ -164,11 +164,11 @@ abstract class AbstractListenerContainerParser implements BeanDefinitionParser {
 		containerDef.getPropertyValues().add("messageListener", listenerDef);
 
 		String containerBeanName = listenerEle.getAttribute(ID_ATTRIBUTE);
-		// If no bean id is given auto generate one using the ReaderContext's BeanNameGenerator 
+		// If no bean id is given auto generate one using the ReaderContext's BeanNameGenerator
 		if (!StringUtils.hasText(containerBeanName)) {
 			containerBeanName = parserContext.getReaderContext().generateBeanName(containerDef);
 		}
-		
+
 		// Register the listener and fire event
 		parserContext.registerBeanComponent(new BeanComponentDefinition(containerDef, containerBeanName));
 	}
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 1faf7d715e..20df434ebf 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
@@ -41,7 +41,7 @@ class JcaListenerContainerParser extends AbstractListenerContainerParser {
 		RootBeanDefinition containerDef = new RootBeanDefinition();
 		containerDef.setSource(parserContext.extractSource(containerEle));
 		containerDef.setBeanClassName("org.springframework.jms.listener.endpoint.JmsMessageEndpointManager");
-		
+
 		if (containerEle.hasAttribute(RESOURCE_ADAPTER_ATTRIBUTE)) {
 			String resourceAdapterBeanName = containerEle.getAttribute(RESOURCE_ADAPTER_ATTRIBUTE);
 			if (!StringUtils.hasText(resourceAdapterBeanName)) {
@@ -73,7 +73,7 @@ class JcaListenerContainerParser extends AbstractListenerContainerParser {
 		RootBeanDefinition configDef = new RootBeanDefinition();
 		configDef.setSource(parserContext.extractSource(configDef));
 		configDef.setBeanClassName("org.springframework.jms.listener.endpoint.JmsActivationSpecConfig");
-		
+
 		parseListenerConfiguration(listenerEle, parserContext, configDef);
 		parseContainerConfiguration(containerEle, parserContext, configDef);
 
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 e66a857155..a65db63d9d 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
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -28,7 +28,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * Parser for the JMS <code>&lt;listener-container&gt;</code> element.
- * 
+ *
  * @author Mark Fisher
  * @author Juergen Hoeller
  * @since 2.5
@@ -53,7 +53,7 @@ class JmsListenerContainerParser extends AbstractListenerContainerParser {
 	protected BeanDefinition parseContainer(Element listenerEle, Element containerEle, ParserContext parserContext) {
 		RootBeanDefinition containerDef = new RootBeanDefinition();
 		containerDef.setSource(parserContext.extractSource(containerEle));
-		
+
 		parseListenerConfiguration(listenerEle, parserContext, containerDef);
 		parseContainerConfiguration(containerEle, parserContext, containerDef);
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java b/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java
index 2818273877..09949d5521 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2007 the original author 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
index 6ea64fcb32..7d0871abb8 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
@@ -24,7 +24,7 @@ import org.springframework.jms.JmsException;
 
 /**
  * Specifies a basic set of JMS operations.
- * 
+ *
  * <p>Implemented by {@link JmsTemplate}. Not often used but a useful option
  * to enhance testability, as it can easily be mocked or stubbed.
  *
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java b/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
index fec95b353b..dfaeaceb9d 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
@@ -22,7 +22,7 @@ import javax.jms.Session;
 
 /**
  * Creates a JMS message given a {@link Session}.
- * 
+ *
  * <p>The <code>Session</code> typically is provided by an instance
  * of the {@link JmsTemplate} class.
  *
@@ -40,7 +40,7 @@ public interface MessageCreator {
 	/**
 	 * Create a {@link Message} to be sent.
 	 * @param session the JMS {@link Session} to be used to create the
-	 * <code>Message</code> (never <code>null</code>) 
+	 * <code>Message</code> (never <code>null</code>)
 	 * @return the <code>Message</code> to be sent
 	 * @throws javax.jms.JMSException if thrown by JMS API methods
 	 */
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
index 037b8df486..78b82b61e9 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
@@ -46,7 +46,7 @@ public interface ProducerCallback<T> {
 	 * when specified in the JmsTemplate call.
 	 * @param session the JMS <code>Session</code> object to use
 	 * @param producer the JMS <code>MessageProducer</code> object to use
-	 * @return a result object from working with the <code>Session</code>, if any (can be <code>null</code>) 
+	 * @return a result object from working with the <code>Session</code>, if any (can be <code>null</code>)
 	 * @throws javax.jms.JMSException if thrown by JMS API methods
 	 */
 	T doInJms(Session session, MessageProducer producer) throws JMSException;
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
index cf6fe1545c..0702989f7b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
@@ -22,7 +22,7 @@ import javax.jms.Session;
 /**
  * Callback for executing any number of operations on a provided
  * {@link Session}.
- * 
+ *
  * <p>To be used with the {@link JmsTemplate#execute(SessionCallback)}
  * method, often implemented as an anonymous inner class.
  *
@@ -36,7 +36,7 @@ public interface SessionCallback<T> {
 	 * Execute any number of operations against the supplied JMS
 	 * {@link Session}, possibly returning a result.
 	 * @param session the JMS <code>Session</code>
-	 * @return a result object from working with the <code>Session</code>, if any (so can be <code>null</code>) 
+	 * @return a result object from working with the <code>Session</code>, if any (so can be <code>null</code>)
 	 * @throws javax.jms.JMSException if thrown by JMS API methods
 	 */
 	T doInJms(Session session) throws JMSException;
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
index c3abca4ace..bc426fc77a 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
@@ -27,7 +27,7 @@ import org.springframework.jms.core.JmsTemplate;
 
 /**
  * Convenient super class for application classes that need JMS access.
- * 
+ *
  * <p>Requires a ConnectionFactory or a JmsTemplate instance to be set.
  * It will create its own JmsTemplate if a ConnectionFactory is passed in.
  * A custom JmsTemplate instance can be created for a given ConnectionFactory
@@ -44,7 +44,7 @@ public abstract class JmsGatewaySupport implements InitializingBean {
 
 	/** Logger available to subclasses */
 	protected final Log logger = LogFactory.getLog(getClass());
-	
+
 	private JmsTemplate jmsTemplate;
 
 
@@ -58,7 +58,7 @@ public abstract class JmsGatewaySupport implements InitializingBean {
 	public final void setConnectionFactory(ConnectionFactory connectionFactory) {
 		this.jmsTemplate = createJmsTemplate(connectionFactory);
 	}
-	
+
 	/**
 	 * Create a JmsTemplate for the given ConnectionFactory.
 	 * Only invoked if populating the gateway with a ConnectionFactory reference.
@@ -72,14 +72,14 @@ public abstract class JmsGatewaySupport implements InitializingBean {
 	protected JmsTemplate createJmsTemplate(ConnectionFactory connectionFactory) {
 		return new JmsTemplate(connectionFactory);
 	}
-	
+
 	/**
 	 * Return the JMS ConnectionFactory used by the gateway.
 	 */
 	public final ConnectionFactory getConnectionFactory() {
 		return (this.jmsTemplate != null ? this.jmsTemplate.getConnectionFactory() : null);
 	}
-	
+
 	/**
 	 * Set the JmsTemplate for the gateway.
 	 * @param jmsTemplate
@@ -88,14 +88,14 @@ public abstract class JmsGatewaySupport implements InitializingBean {
 	public final void setJmsTemplate(JmsTemplate jmsTemplate) {
 		this.jmsTemplate = jmsTemplate;
 	}
-	
+
 	/**
 	 * Return the JmsTemplate for the gateway.
 	 */
 	public final JmsTemplate getJmsTemplate() {
 		return this.jmsTemplate;
 	}
-	
+
 	public final void afterPropertiesSet() throws IllegalArgumentException, BeanInitializationException {
 		if (this.jmsTemplate == null) {
 			throw new IllegalArgumentException("'connectionFactory' or 'jmsTemplate' is required");
@@ -107,7 +107,7 @@ public abstract class JmsGatewaySupport implements InitializingBean {
 			throw new BeanInitializationException("Initialization of JMS gateway failed: " + ex.getMessage(), ex);
 		}
 	}
-	
+
 	/**
 	 * Subclasses can override this for custom initialization behavior.
 	 * Gets called after population of this instance's bean properties.
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 5a6f3cbc3c..b34168a18e 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
@@ -87,7 +87,7 @@ import org.springframework.util.ClassUtils;
  * shrinking back to the standard number of consumers once the load decreases.
  * Consider adapting the {@link #setIdleTaskExecutionLimit "idleTaskExecutionLimit"}
  * setting to control the lifespan of each new task, to avoid frequent scaling up
- * and down, in particular if the {@code ConnectionFactory} does not pool JMS 
+ * and down, in particular if the {@code ConnectionFactory} does not pool JMS
  * {@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
@@ -421,7 +421,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
 	}
 
 	/**
-	 * Return the limit for the number of idle consumers. 
+	 * Return the limit for the number of idle consumers.
 	 */
 	public final int getIdleConsumerLimit() {
 		synchronized (this.lifecycleMonitor) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java b/spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java
index cfb780cd8b..4c35097381 100644
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java
+++ b/spring-jms/src/main/java/org/springframework/jms/remoting/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * Remoting classes for transparent Java-to-Java remoting via a JMS provider.
- * 
+ *
  * <p>Allows the target service to be load-balanced across a number of queue
  * receivers, and provides a level of indirection between the client and the
  * service: They only need to agree on a queue name and a service interface.
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
index 7f5d5d6ca4..e01c5129c3 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
@@ -22,7 +22,7 @@ import javax.jms.Session;
 
 /**
  * Strategy interface for resolving JMS destinations.
- * 
+ *
  * <p>Used by {@link org.springframework.jms.core.JmsTemplate} for resolving
  * destination names from simple {@link String Strings} to actual
  * {@link Destination} implementation instances.
diff --git a/spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java
index 7d87547b5f..c5c4ed5e67 100644
--- a/spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-jms/src/test/java/org/springframework/beans/IOther.java b/spring-jms/src/test/java/org/springframework/beans/IOther.java
index 797486ec44..6a8f74187c 100644
--- a/spring-jms/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-jms/src/test/java/org/springframework/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java
index a06e15d150..0eb8df5c8a 100644
--- a/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
index dced87b716..3d7b35490c 100644
--- a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
+++ b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2007 the original author 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.
@@ -22,7 +22,7 @@ import javax.jms.JMSException;
 
 /**
  * A stub implementation of the JMS ConnectionFactory for testing.
- * 
+ *
  * @author Mark Fisher
  */
 public class StubConnectionFactory implements ConnectionFactory {
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
index acd9e4f474..4f51d133a0 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -184,9 +184,9 @@ public class JmsNamespaceHandlerTests extends TestCase {
 		assertTrue("Parser should have registered a component named 'listener1'", context.containsComponentDefinition("listener1"));
 		assertTrue("Parser should have registered a component named 'listener2'", context.containsComponentDefinition("listener2"));
 		assertTrue("Parser should have registered a component named 'listener3'", context.containsComponentDefinition("listener3"));
-		assertTrue("Parser should have registered a component named '" + DefaultMessageListenerContainer.class.getName() + "#0'", 
+		assertTrue("Parser should have registered a component named '" + DefaultMessageListenerContainer.class.getName() + "#0'",
 			context.containsComponentDefinition(DefaultMessageListenerContainer.class.getName() + "#0"));
-		assertTrue("Parser should have registered a component named '" + JmsMessageEndpointManager.class.getName() + "#0'", 
+		assertTrue("Parser should have registered a component named '" + JmsMessageEndpointManager.class.getName() + "#0'",
 			context.containsComponentDefinition(JmsMessageEndpointManager.class.getName() + "#0"));
 	}
 
@@ -215,14 +215,14 @@ public class JmsNamespaceHandlerTests extends TestCase {
 			this.message = message;
 		}
 	}
-	
+
 
 	/**
 	 * Internal extension that registers a {@link ReaderEventListener} to store
 	 * registered {@link ComponentDefinition}s.
 	 */
 	private static class ToolingTestApplicationContext extends ClassPathXmlApplicationContext {
-		
+
 		private Set<ComponentDefinition> registeredComponents;
 
 		public ToolingTestApplicationContext(String path, Class clazz) {
@@ -234,7 +234,7 @@ public class JmsNamespaceHandlerTests extends TestCase {
 			beanDefinitionReader.setEventListener(new StoringReaderEventListener(this.registeredComponents));
 			beanDefinitionReader.setSourceExtractor(new PassThroughSourceExtractor());
 		}
-		
+
 		public boolean containsComponentDefinition(String name) {
 			for (ComponentDefinition cd : this.registeredComponents) {
 				if (cd instanceof CompositeComponentDefinition) {
@@ -253,21 +253,21 @@ public class JmsNamespaceHandlerTests extends TestCase {
 			}
 			return false;
 		}
-		
+
 		public Iterator<ComponentDefinition> getRegisteredComponents() {
 			return this.registeredComponents.iterator();
 		}
 	}
-	
+
 
 	private static class StoringReaderEventListener extends EmptyReaderEventListener {
-		
+
 		protected final Set<ComponentDefinition> registeredComponents;
-		
+
 		public StoringReaderEventListener(Set<ComponentDefinition> registeredComponents) {
 			this.registeredComponents = registeredComponents;
 		}
-		
+
 		public void componentRegistered(ComponentDefinition componentDefinition) {
 			this.registeredComponents.add(componentDefinition);
 		}
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
index 1007b4c1d7..dbc3663fa0 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
@@ -47,7 +47,7 @@ public class JmsGatewaySupportTests extends TestCase {
 		assertEquals("Correct JmsTemplate", mockConnectionFactory, gateway.getJmsTemplate().getConnectionFactory());
 		assertEquals("initGatway called", test.size(), 1);
 		connectionFactoryControl.verify();
-		
+
 	}
 	public void testJmsGatewaySupportWithJmsTemplate() throws Exception {
 		JmsTemplate template = new JmsTemplate();
@@ -60,7 +60,7 @@ public class JmsGatewaySupportTests extends TestCase {
 		gateway.setJmsTemplate(template);
 		gateway.afterPropertiesSet();
 		assertEquals("Correct JmsTemplate", template, gateway.getJmsTemplate());
-		assertEquals("initGateway called", test.size(), 1);		
+		assertEquals("initGateway called", test.size(), 1);
 	}
 
 }
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java
index 78c2126646..0e51fae693 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java
@@ -28,7 +28,7 @@ public abstract class AbstractMessageListenerContainerTests {
 
 	protected abstract AbstractMessageListenerContainer getContainer();
 
-	
+
 	@Test(expected=IllegalArgumentException.class)
 	public void testSettingMessageListenerToANullType() throws Exception {
 		getContainer().setMessageListener(null);
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java
index 89bdeab937..56c56a8e65 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java
@@ -379,7 +379,7 @@ public final class MessageListenerAdapter102Tests {
 		QueueSender queueSender = (QueueSender) mockQueueSender.getMock();
 		queueSender.send(responseTextMessage);
 		mockQueueSender.setThrowable(new JMSException("Dow!"));
-		// ensure that regardless of a JMSException the producer is closed... 
+		// ensure that regardless of a JMSException the producer is closed...
 		queueSender.close();
 		mockQueueSender.setVoidCallable();
 		mockQueueSender.replay();
diff --git a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index d5c2531fbd..563d610714 100644
--- a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -50,7 +50,7 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM
 		++rollbacks;
 		--inflight;
 	}
-	
+
 	public void clear() {
 		begun = commits = rollbacks = inflight = 0;
 	}
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
index 550e927a47..88f3dbab08 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -51,7 +51,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	private static final String CHARSET_PREFIX = "charset=";
 
 	private static final String CONTENT_TYPE_HEADER = "Content-Type";
-	
+
 	private static final String CONTENT_LENGTH_HEADER = "Content-Length";
 
 	private static final String LOCATION_HEADER = "Location";
@@ -141,7 +141,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		this.charset = true;
 		updateContentTypeHeader();
 	}
-	
+
 	private void updateContentTypeHeader() {
 		if (this.contentType != null) {
 			StringBuilder sb = new StringBuilder(this.contentType);
@@ -457,7 +457,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 		doAddHeaderValue(name, value, false);
 	}
-	
+
 	private boolean setSpecialHeader(String name, Object value) {
 		if (CONTENT_TYPE_HEADER.equalsIgnoreCase(name)) {
 			setContentType((String) value);
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java
index 3caa9213ee..c5096572d0 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java
@@ -80,7 +80,7 @@ public class MockHttpSession implements HttpSession {
 
 	/**
 	 * Create a new MockHttpSession.
-	 * 
+	 *
 	 * @param servletContext the ServletContext that the session runs in
 	 */
 	public MockHttpSession(ServletContext servletContext) {
@@ -89,7 +89,7 @@ public class MockHttpSession implements HttpSession {
 
 	/**
 	 * Create a new MockHttpSession.
-	 * 
+	 *
 	 * @param servletContext the ServletContext that the session runs in
 	 * @param id a unique identifier for this session
 	 */
@@ -222,7 +222,7 @@ public class MockHttpSession implements HttpSession {
 	/**
 	 * Serialize the attributes of this session into an object that can be
 	 * turned into a byte array with standard Java serialization.
-	 * 
+	 *
 	 * @return a representation of this session's serialized state
 	 */
 	public Serializable serializeState() {
@@ -249,7 +249,7 @@ public class MockHttpSession implements HttpSession {
 	/**
 	 * Deserialize the attributes of this session from a state object created by
 	 * {@link #serializeState()}.
-	 * 
+	 *
 	 * @param state a representation of this session's serialized state
 	 */
 	@SuppressWarnings("unchecked")
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 25353ae56a..2bf551c381 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
@@ -239,7 +239,7 @@ public interface HibernateOperations {
 
 	/**
 	 * Return all persistent instances of the given entity class.
-	 * Note: Use queries or criteria for retrieving a specific subset. 
+	 * Note: Use queries or criteria for retrieving a specific subset.
 	 * @param entityClass a persistent class
 	 * @return a {@link List} containing 0 or more persistent instances
 	 * @throws org.springframework.dao.DataAccessException if there is a Hibernate error
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java
index 743600991b..a1e72bcc3c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
index 83fdb0f3d5..f8f0408b40 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
index 12435ba890..af8640ba8e 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java
index c16fc59bab..b76167a271 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/package-info.java
@@ -4,7 +4,7 @@
  * Package providing integration of
  * <a href="http://ibatis.apache.org">iBATIS Database Layer</a>
  * with Spring concepts.
- * 
+ *
  * <p>Contains resource helper classes and template classes for
  * data access with the iBATIS SqlMapClient API.
  *
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
index 088b80a0b3..6d193d463f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -34,5 +34,5 @@ public class JdoSystemException extends UncategorizedDataAccessException {
 	public JdoSystemException(JDOException ex) {
 		super(ex.getMessage(), ex);
 	}
-	
+
 }
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java
index b4c4441910..c7114178f6 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
index a9d3fc2670..140d1fef0b 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
@@ -33,7 +33,7 @@ import javax.sql.DataSource;
  * @since 2.0
  */
 public interface EntityManagerFactoryInfo {
-	
+
 	/**
 	 * Return the raw underlying EntityManagerFactory.
 	 * @return the unadorned EntityManagerFactory (never <code>null</code>)
@@ -59,7 +59,7 @@ public interface EntityManagerFactoryInfo {
 	PersistenceUnitInfo getPersistenceUnitInfo();
 
 	/**
-	 * Return the name of the persistence unit used to create this 
+	 * Return the name of the persistence unit used to create this
 	 * EntityManagerFactory, or <code>null</code> if it is an unnamed default.
 	 * <p>If <code>getPersistenceUnitInfo()</code> returns non-null, the result of
 	 * <code>getPersistenceUnitName()</code> must be equal to the value returned by
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
index 8ed9ed0718..11b743aecf 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
@@ -317,11 +317,11 @@ public abstract class EntityManagerFactoryUtils {
 		if (ex instanceof PersistenceException) {
 			return new JpaSystemException((PersistenceException) ex);
 		}
-		
+
 		// If we get here, we have an exception that resulted from user code,
 		// rather than the persistence provider, so we return null to indicate
 		// that translation should not occur.
-		return null;				
+		return null;
 	}
 
 	/**
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
index b3802f0559..0d0562dbd6 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
@@ -32,7 +32,7 @@ import org.springframework.transaction.TransactionException;
  * does not offer, such as access to the underlying JDBC Connection. This
  * strategy is mainly intended for standalone usage of a JPA provider; most
  * of its functionality is not relevant when running with JTA transactions.
- * 
+ *
  * <p>Also allows for the provision of value-added methods for portable yet
  * more capable EntityManager and EntityManagerFactory subinterfaces offered
  * by Spring.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
index 710ab144c8..362374a6b5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
@@ -34,5 +34,5 @@ public class JpaSystemException extends UncategorizedDataAccessException {
 	public JpaSystemException(PersistenceException ex) {
 		super(ex.getMessage(), ex);
 	}
-	
+
 }
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
index 7402618f12..2b1fb8687f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
  * @see javax.persistence.spi.PersistenceUnitInfo#addTransformer(javax.persistence.spi.ClassTransformer)
  */
 class ClassFileTransformerAdapter implements ClassFileTransformer {
-	
+
 	private static final Log logger = LogFactory.getLog(ClassFileTransformerAdapter.class);
 
 	private final ClassTransformer classTransformer;
@@ -51,7 +51,7 @@ class ClassFileTransformerAdapter implements ClassFileTransformer {
 	public byte[] transform(
 			ClassLoader loader, String className, Class<?> classBeingRedefined,
 			ProtectionDomain protectionDomain, byte[] classfileBuffer) {
-		
+
 		try {
 			byte[] transformed = this.classTransformer.transform(
 					loader, className, classBeingRedefined, protectionDomain, classfileBuffer);
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java
index 053acca358..7b7c4643d9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java
@@ -49,7 +49,7 @@ public enum Database {
 
 	ORACLE,
 
-	POSTGRESQL, 
+	POSTGRESQL,
 
 	SQL_SERVER,
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
index fcc3afd86e..e985802007 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
@@ -41,7 +41,7 @@ import org.springframework.orm.jpa.JpaDialect;
  * Thanks to Mike Keith for the original EclipseLink support prototype!
  *
  * <p>NOTE: No need to filter out classes from the JPA providers package for
- * EclipseLink (see SPR-6040) 
+ * EclipseLink (see SPR-6040)
  *
  * @author Juergen Hoeller
  * @author Thomas Risberg
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java
index 89b9141b93..bbaef3c3d0 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java
@@ -54,7 +54,7 @@ import org.springframework.transaction.TransactionException;
  */
 @Deprecated
 public class TopLinkJpaDialect extends DefaultJpaDialect {
-	
+
 	private boolean lazyDatabaseTransaction = false;
 
 
diff --git a/spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java
index 7d87547b5f..c5c4ed5e67 100644
--- a/spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-orm/src/test/java/org/springframework/beans/IOther.java b/spring-orm/src/test/java/org/springframework/beans/IOther.java
index 797486ec44..6a8f74187c 100644
--- a/spring-orm/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-orm/src/test/java/org/springframework/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java
index a06e15d150..0eb8df5c8a 100644
--- a/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index 8b816b45d0..f6c3f0a376 100644
--- a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -52,7 +52,7 @@ import org.springframework.util.ClassUtils;
  * DataSource ds = new DriverManagerDataSource(...);
  * builder.bind("java:comp/env/jdbc/myds", ds);
  * builder.activate();</pre>
- * 
+ *
  * Note that it's impossible to activate multiple builders within the same JVM,
  * due to JNDI restrictions. Thus to configure a fresh builder repeatedly, use
  * the following code to get a reference to either an already activated builder
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
index 81a4bf6ea4..4e7e29d6d7 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
@@ -1024,7 +1024,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		beanFactory.getBean("entityInterceptor", Interceptor.class);
 		beanFactoryControl.setReturnValue(entityInterceptor2, 1);
 		beanFactoryControl.replay();
-		
+
 		HibernateTransactionManager tm = new HibernateTransactionManager(sf);
 		tm.setEntityInterceptorBeanName("entityInterceptor");
 		tm.setBeanFactory(beanFactory);
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java
index b6d0e0e1df..b0d96c7d32 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java
index 4d74833ab9..c884a39fa4 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java
@@ -32,7 +32,7 @@ public class ScopedBeanInterceptorTests extends TestCase {
 
 		ScopedObject scoped = new ScopedObject() {
 			public Object getTargetObject() {
-				return realObject; 
+				return realObject;
 			}
 			public void removeFromScope() {
 				// do nothing
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java
index 46093da105..a07a672b09 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java
index 89b3987b11..99a55063d4 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java
index cbfd34748a..133e08311e 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java
@@ -43,7 +43,7 @@ import org.springframework.web.context.support.StaticWebApplicationContext;
  * @since 15.06.2004
  */
 public class OpenPersistenceManagerInViewTests extends TestCase {
-    
+
 	public void testOpenPersistenceManagerInViewInterceptor() throws Exception {
 		MockControl pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
 		PersistenceManagerFactory pmf = (PersistenceManagerFactory) pmfControl.getMock();
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java
index e53c4a1fad..32b43d0cb6 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java
@@ -47,7 +47,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests
 	@NotTransactional
 	public void testEntityManagerFactoryImplementsEntityManagerFactoryInfo() {
 		assertTrue(Proxy.isProxyClass(entityManagerFactory.getClass()));
-		assertTrue("Must have introduced config interface", 
+		assertTrue("Must have introduced config interface",
 				entityManagerFactory instanceof EntityManagerFactoryInfo);
 		EntityManagerFactoryInfo emfi = (EntityManagerFactoryInfo) entityManagerFactory;
 		//assertEquals("Person", emfi.getPersistenceUnitName());
@@ -79,7 +79,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests
 		assertTrue(Proxy.isProxyClass(sharedEntityManager.getClass()));
 		Query q = sharedEntityManager.createQuery("select p from Person as p");
 		List<Person> people = q.getResultList();
-		
+
 		assertTrue("Should be open to start with", sharedEntityManager.isOpen());
 		sharedEntityManager.close();
 		assertTrue("Close should have been silently ignored", sharedEntityManager.isOpen());
@@ -96,8 +96,8 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests
 	public void testGetReferenceWhenNoRow() {
 		// Fails here with TopLink
 		Person notThere = sharedEntityManager.getReference(Person.class, 666);
-		
-		// We may get here (as with Hibernate). 
+
+		// We may get here (as with Hibernate).
 		// Either behaviour is valid: throw exception on first access
 		// or on getReference itself.
 		notThere.getFirstName();
@@ -112,15 +112,15 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests
 			sharedEntityManager.persist(tony);
 			setComplete();
 			endTransaction();
-			
+
 			startNewTransaction();
 			sharedEntityManager.clear();
 			Person newTony = entityManagerFactory.createEntityManager().getReference(Person.class, tony.getId());
 			assertNotSame(newTony, tony);
 			endTransaction();
-				
+
 			assertNotNull(newTony.getDriversLicense());
-			
+
 			newTony.getDriversLicense().getSerialNumber();
 		}
 		finally {
@@ -128,17 +128,17 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests
 			//setComplete();
 		}
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	public void testMultipleResults() {
 		// Add with JDBC
 		String firstName = "Tony";
 		insertPerson(firstName);
-		
+
 		assertTrue(Proxy.isProxyClass(sharedEntityManager.getClass()));
 		Query q = sharedEntityManager.createQuery("select p from Person as p");
 		List<Person> people = q.getResultList();
-		
+
 		assertEquals(1, people.size());
 		assertEquals(firstName, people.get(0).getFirstName());
 	}
@@ -147,32 +147,32 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests
 		String INSERT_PERSON = "INSERT INTO PERSON (ID, FIRST_NAME, LAST_NAME) VALUES (?, ?, ?)";
 		simpleJdbcTemplate.update(INSERT_PERSON, 1, firstName, "Blair");
 	}
-	
+
 	public void testEntityManagerProxyRejectsProgrammaticTxManagement() {
 		try {
 			sharedEntityManager.getTransaction();
 			fail("Should not be able to create transactions on container managed EntityManager");
 		}
-		catch (IllegalStateException ex) {			
+		catch (IllegalStateException ex) {
 		}
 	}
-	
+
 	public void testSharedEntityManagerProxyRejectsProgrammaticTxJoining() {
 		try {
 			sharedEntityManager.joinTransaction();
 			fail("Should not be able to join transactions with container managed EntityManager");
 		}
-		catch (IllegalStateException ex) {		
+		catch (IllegalStateException ex) {
 		}
 	}
-	
+
 //	public void testAspectJInjectionOfConfigurableEntity() {
 //		Person p = new Person();
 //		System.err.println(p);
 //		assertNotNull("Was injected", p.getTestBean());
 //		assertEquals("Ramnivas", p.getTestBean().getName());
 //	}
-	
+
 	public void testInstantiateAndSaveWithSharedEmProxy() {
 		testInstantiateAndSave(sharedEntityManager);
 	}
@@ -183,7 +183,7 @@ public abstract class AbstractContainerEntityManagerFactoryIntegrationTests
 		p.setFirstName("Tony");
 		p.setLastName("Blair");
 		em.persist(p);
-		
+
 		em.flush();
 		assertEquals("1 row must have been inserted", 1, countRowsInTable("person"));
 	}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
index f4e6512267..52e7ac53d1 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
@@ -68,7 +68,7 @@ public abstract class AbstractEntityManagerFactoryBeanTests extends TestCase {
 	protected static class DummyEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean {
 
 		private final EntityManagerFactory emf;
-		
+
 		public DummyEntityManagerFactoryBean(EntityManagerFactory emf) {
 			this.emf = emf;
 		}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
index d2cf740ab3..fb5b06616e 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
@@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @since 2.0
  */
 public class ApplicationManagedEntityManagerIntegrationTests extends AbstractEntityManagerFactoryIntegrationTests {
-	
+
 	@NotTransactional
 	public void testEntityManagerIsProxy() {
 		assertTrue("EntityManagerFactory is proxied", Proxy.isProxyClass(entityManagerFactory.getClass()));
@@ -49,25 +49,25 @@ public class ApplicationManagedEntityManagerIntegrationTests extends AbstractEnt
 		assertTrue(Proxy.isProxyClass(em.getClass()));
 		Query q = em.createQuery("select p from Person as p");
 		List<Person> people = q.getResultList();
-		
+
 		assertTrue("Should be open to start with", em.isOpen());
 		em.close();
 		assertFalse("Close should work on application managed EM", em.isOpen());
 	}
-	
+
 	public void testEntityManagerProxyAcceptsProgrammaticTxJoining() {
 		EntityManager em = entityManagerFactory.createEntityManager();
 		em.joinTransaction();
 	}
-	
+
 	public void testInstantiateAndSave() {
 		EntityManager em = entityManagerFactory.createEntityManager();
 		em.joinTransaction();
 		doInstantiateAndSave(em);
 	}
-	
+
 	public void testCannotFlushWithoutGettingTransaction() {
-		EntityManager em = entityManagerFactory.createEntityManager();		
+		EntityManager em = entityManagerFactory.createEntityManager();
 		try {
 			doInstantiateAndSave(em);
 			fail("Should have thrown TransactionRequiredException");
@@ -75,7 +75,7 @@ public class ApplicationManagedEntityManagerIntegrationTests extends AbstractEnt
 		catch (TransactionRequiredException ex) {
 			// expected
 		}
-		
+
 		// TODO following lines are a workaround for Hibernate bug
 		// If Hibernate throws an exception due to flush(),
 		// it actually HAS flushed, meaning that the database
@@ -83,15 +83,15 @@ public class ApplicationManagedEntityManagerIntegrationTests extends AbstractEnt
 		deleteAllPeopleUsingEntityManager(sharedEntityManager);
 		setComplete();
 	}
-	
+
 	public void doInstantiateAndSave(EntityManager em) {
 		testStateClean();
 		Person p = new Person();
-		
+
 		p.setFirstName("Tony");
 		p.setLastName("Blair");
 		em.persist(p);
-		
+
 		em.flush();
 		assertEquals("1 row must have been inserted", 1, countRowsInTable("person"));
 	}
@@ -99,31 +99,31 @@ public class ApplicationManagedEntityManagerIntegrationTests extends AbstractEnt
 	public void testStateClean() {
 		assertEquals("Should be no people from previous transactions", 0, countRowsInTable("person"));
 	}
-	
+
 	public void testReuseInNewTransaction() {
 		EntityManager em = entityManagerFactory.createEntityManager();
 		em.joinTransaction();
-		
+
 		doInstantiateAndSave(em);
 		endTransaction();
-		
+
 		assertFalse(em.getTransaction().isActive());
-		
+
 		startNewTransaction();
 		// Call any method: should cause automatic tx invocation
 		assertFalse(em.contains(new Person()));
-		
+
 		assertFalse(em.getTransaction().isActive());
 		em.joinTransaction();
-		
+
 		assertTrue(em.getTransaction().isActive());
-		
+
 		doInstantiateAndSave(em);
 		setComplete();
 		endTransaction();	// Should rollback
 		assertEquals("Tx must have committed back",
 				1, countRowsInTable("person"));
-		
+
 		// Now clean up the database
 		startNewTransaction();
 		em.joinTransaction();
@@ -132,7 +132,7 @@ public class ApplicationManagedEntityManagerIntegrationTests extends AbstractEnt
 				0, countRowsInTable("person"));
 		setComplete();
 	}
-	
+
 	public static void deleteAllPeopleUsingEntityManager(EntityManager em) {
 		em.createQuery("delete from Person p").executeUpdate();
 	}
@@ -145,19 +145,19 @@ public class ApplicationManagedEntityManagerIntegrationTests extends AbstractEnt
 		assertEquals("Tx must have been rolled back",
 				0, countRowsInTable("person"));
 	}
-	
+
 	public void testCommitOccurs() {
 		EntityManager em = entityManagerFactory.createEntityManager();
 		em.joinTransaction();
 		doInstantiateAndSave(em);
-		
+
 		setComplete();
 		endTransaction();	// Should rollback
 		assertEquals("Tx must have committed back",
 				1, countRowsInTable("person"));
-		
+
 		// Now clean up the database
 		deleteFromTables(new String[] { "person" });
 	}
-	
+
 }
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
index 22f22831e4..eeb89a614d 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
@@ -33,17 +33,17 @@ import org.springframework.test.annotation.NotTransactional;
 
 /**
  * Integration tests using in-memory database for container-managed JPA
- * 
+ *
  * @author Rod Johnson
  * @since 2.0
  */
 public class ContainerManagedEntityManagerIntegrationTests extends AbstractEntityManagerFactoryIntegrationTests {
-	
+
 	@NotTransactional
-	public void testExceptionTranslationWithDialectFoundOnIntroducedEntityManagerInfo() throws Exception {		
+	public void testExceptionTranslationWithDialectFoundOnIntroducedEntityManagerInfo() throws Exception {
 		doTestExceptionTranslationWithDialectFound(((EntityManagerFactoryInfo) entityManagerFactory).getJpaDialect());
 	}
-	
+
 	@NotTransactional
 	public void testExceptionTranslationWithDialectFoundOnEntityManagerFactoryBean() throws Exception {
 		AbstractEntityManagerFactoryBean aefb =
@@ -51,7 +51,7 @@ public class ContainerManagedEntityManagerIntegrationTests extends AbstractEntit
 		assertNotNull("Dialect must have been set", aefb.getJpaDialect());
 		doTestExceptionTranslationWithDialectFound(aefb);
 	}
-		
+
 	protected void doTestExceptionTranslationWithDialectFound(PersistenceExceptionTranslator pet) throws Exception {
 		RuntimeException in1 = new RuntimeException("in1");
 		PersistenceException in2 = new PersistenceException();
@@ -60,14 +60,14 @@ public class ContainerManagedEntityManagerIntegrationTests extends AbstractEntit
 		assertNotNull(dex);
 		assertSame(in2, dex.getCause());
 	}
-	
+
 	public void testEntityManagerProxyIsProxy() {
 		EntityManager em = createContainerManagedEntityManager();
 		assertTrue(Proxy.isProxyClass(em.getClass()));
 		Query q = em.createQuery("select p from Person as p");
 		List<Person> people = q.getResultList();
 		assertTrue(people.isEmpty());
-		
+
 		assertTrue("Should be open to start with", em.isOpen());
 		try {
 			em.close();
@@ -78,7 +78,7 @@ public class ContainerManagedEntityManagerIntegrationTests extends AbstractEntit
 		}
 		assertTrue(em.isOpen());
 	}
-	
+
 	// This would be legal, at least if not actually _starting_ a tx
 	@ExpectedException(IllegalStateException.class)
 	public void testEntityManagerProxyRejectsProgrammaticTxManagement() {
@@ -92,53 +92,53 @@ public class ContainerManagedEntityManagerIntegrationTests extends AbstractEntit
 	public void testContainerEntityManagerProxyAllowsJoinTransactionInTransaction() {
 		createContainerManagedEntityManager().joinTransaction();
 	}
-	
+
 	@NotTransactional
 	@ExpectedException(TransactionRequiredException.class)
 	public void testContainerEntityManagerProxyRejectsJoinTransactionWithoutTransaction() {
 		createContainerManagedEntityManager().joinTransaction();
 	}
-	
+
 	public void testInstantiateAndSave() {
 		EntityManager em = createContainerManagedEntityManager();
 		doInstantiateAndSave(em);
 	}
-	
+
 	public void doInstantiateAndSave(EntityManager em) {
 		assertEquals("Should be no people from previous transactions",
 				0, countRowsInTable("person"));
 		Person p = new Person();
-		
+
 		p.setFirstName("Tony");
 		p.setLastName("Blair");
 		em.persist(p);
-		
+
 		em.flush();
 		assertEquals("1 row must have been inserted", 1, countRowsInTable("person"));
 	}
-	
+
 	public void testReuseInNewTransaction() {
 		EntityManager em = createContainerManagedEntityManager();
 		doInstantiateAndSave(em);
 		endTransaction();
-		
+
 		//assertFalse(em.getTransaction().isActive());
-		
+
 		startNewTransaction();
 		// Call any method: should cause automatic tx invocation
 		assertFalse(em.contains(new Person()));
 		//assertTrue(em.getTransaction().isActive());
-		
+
 		doInstantiateAndSave(em);
 		setComplete();
 		endTransaction();	// Should rollback
 		assertEquals("Tx must have committed back",
 				1, countRowsInTable("person"));
-		
+
 		// Now clean up the database
 		deleteFromTables(new String[] { "person" });
 	}
-	
+
 	public void testRollbackOccurs() {
 		EntityManager em = createContainerManagedEntityManager();
 		doInstantiateAndSave(em);
@@ -146,7 +146,7 @@ public class ContainerManagedEntityManagerIntegrationTests extends AbstractEntit
 		assertEquals("Tx must have been rolled back",
 				0, countRowsInTable("person"));
 	}
-	
+
 	public void testCommitOccurs() {
 		EntityManager em = createContainerManagedEntityManager();
 		doInstantiateAndSave(em);
@@ -154,7 +154,7 @@ public class ContainerManagedEntityManagerIntegrationTests extends AbstractEntit
 		endTransaction();	// Should rollback
 		assertEquals("Tx must have committed back",
 				1, countRowsInTable("person"));
-		
+
 		// Now clean up the database
 		deleteFromTables(new String[] { "person" });
 	}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
index 5135a401fd..8bea214403 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2006 the original author 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.
@@ -28,9 +28,9 @@ import org.springframework.transaction.TransactionException;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 
 /**
- * 
+ *
  * @author Costin Leau
- * 
+ *
  */
 public class DefaultJpaDialectTests extends TestCase {
 	JpaDialect dialect;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java
index 9ad43e6e7f..e88c59dc31 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java
@@ -20,7 +20,7 @@ package org.springframework.orm.jpa;
  * @author Rod Johnson
  */
 public class EntityManagerFactoryBeanSupportTests extends AbstractEntityManagerFactoryBeanTests {
-	
+
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
@@ -28,17 +28,17 @@ public class EntityManagerFactoryBeanSupportTests extends AbstractEntityManagerF
 		emfMc.setVoidCallable();
 		emfMc.replay();
 	}
-		
+
 	public void testHookIsCalled() throws Exception {
 		DummyEntityManagerFactoryBean demf = new DummyEntityManagerFactoryBean(mockEmf);
-		
+
 		demf.afterPropertiesSet();
-		
+
 		checkInvariants(demf);
-		
+
 		// Should trigger close method expected by EntityManagerFactory mock
 		demf.destroy();
-		
+
 		emfMc.verify();
 	}
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
index e3b323ab35..9197860414 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
@@ -82,7 +82,7 @@ public class EntityManagerFactoryUtilsTests extends TestCase {
 			// no tx active
 			assertSame(manager, EntityManagerFactoryUtils.doGetTransactionalEntityManager(factory, null));
 			assertSame(manager, ((EntityManagerHolder)TransactionSynchronizationManager.unbindResource(factory)).getEntityManager());
-			
+
 			mockControl.verify();
 		}
 		finally {
@@ -91,21 +91,21 @@ public class EntityManagerFactoryUtilsTests extends TestCase {
 
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 	}
-	
+
 	public void testTranslatesIllegalStateException() {
 		IllegalStateException ise = new IllegalStateException();
 		DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(ise);
 		assertSame(ise, dex.getCause());
 		assertTrue(dex instanceof InvalidDataAccessApiUsageException);
 	}
-	
+
 	public void testTranslatesIllegalArgumentException() {
 		IllegalArgumentException iae = new IllegalArgumentException();
 		DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(iae);
 		assertSame(iae, dex.getCause());
 		assertTrue(dex instanceof InvalidDataAccessApiUsageException);
 	}
-	
+
 	/**
 	 * We do not convert unknown exceptions. They may result from user code.
 	 */
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java
index b70e89752f..a94be01f20 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java
@@ -108,7 +108,7 @@ public class JpaInterceptorTests extends TestCase {
 	public void testInterceptorWithThreadBound() {
 		factoryControl.replay();
 		managerControl.replay();
-		
+
 		TransactionSynchronizationManager.bindResource(factory, new EntityManagerHolder(entityManager));
 		JpaInterceptor interceptor = new JpaInterceptor();
 		interceptor.setEntityManagerFactory(factory);
@@ -179,12 +179,12 @@ public class JpaInterceptorTests extends TestCase {
 	public void testInterceptorWithFlushFailure() throws Throwable {
 		factoryControl.expectAndReturn(factory.createEntityManager(), entityManager);
 		entityManager.flush();
-		
+
 		PersistenceException exception = new PersistenceException();
 		managerControl.setThrowable(exception, 1);
 		managerControl.expectAndReturn(entityManager.isOpen(), true);
 		entityManager.close();
-		
+
 		factoryControl.replay();
 		managerControl.replay();
 
@@ -203,16 +203,16 @@ public class JpaInterceptorTests extends TestCase {
 		factoryControl.verify();
 		managerControl.verify();
 	}
-	
+
 	public void testInterceptorWithFlushFailureWithoutConversion() throws Throwable {
 		factoryControl.expectAndReturn(factory.createEntityManager(), entityManager);
 		entityManager.flush();
-		
+
 		PersistenceException exception = new PersistenceException();
 		managerControl.setThrowable(exception, 1);
 		managerControl.expectAndReturn(entityManager.isOpen(), true);
 		entityManager.close();
-		
+
 		factoryControl.replay();
 		managerControl.replay();
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
index b2d3557e9b..ad68b90a6f 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
@@ -27,7 +27,7 @@ import javax.persistence.spi.PersistenceUnitInfo;
  * @author Rod Johnson
  */
 public class LocalEntityManagerFactoryBeanTests extends AbstractEntityManagerFactoryBeanTests {
-	
+
 	// Static fields set by inner class DummyPersistenceProvider
 
 	private static String actualName;
@@ -42,48 +42,48 @@ public class LocalEntityManagerFactoryBeanTests extends AbstractEntityManagerFac
 		emfMc.setVoidCallable();
 		emfMc.replay();
 	}
-	
+
 	public void testValidUsageWithDefaultProperties() throws Exception {
 		testValidUsage(null);
 	}
-	
+
 	public void testValidUsageWithExplicitProperties() throws Exception {
 		testValidUsage(new Properties());
 	}
-	
+
 	protected void testValidUsage(Properties props) throws Exception {
 		// This will be set by DummyPersistenceProvider
 		actualName = null;
 		actualProps = null;
-		
+
 		LocalEntityManagerFactoryBean lemfb = new LocalEntityManagerFactoryBean();
 		String entityManagerName = "call me Bob";
-		
+
 		lemfb.setPersistenceUnitName(entityManagerName);
 		lemfb.setPersistenceProviderClass(DummyPersistenceProvider.class);
 		if (props != null) {
 			lemfb.setJpaProperties(props);
 		}
 		lemfb.afterPropertiesSet();
-		
+
 		assertSame(entityManagerName, actualName);
 		if (props != null) {
 			assertEquals(props, actualProps);
 		}
 		checkInvariants(lemfb);
-		
+
 		lemfb.destroy();
-		
+
 		emfMc.verify();
 	}
-	
-	
+
+
 	protected static class DummyPersistenceProvider implements PersistenceProvider {
-		
+
 		public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo pui, Map map) {
 			throw new UnsupportedOperationException();
 		}
-		
+
 		public EntityManagerFactory createEntityManagerFactory(String emfName, Map properties) {
 			actualName = emfName;
 			actualProps = properties;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java
index c0b9003654..da0ad4e138 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java
@@ -23,16 +23,16 @@ import javax.persistence.Table;
 @Entity
 @Table(name="DRIVERS_LICENSE")
 public class DriversLicense {
-	
+
 	@Id
 	private int id;
-	
+
 	private String serial_number;
-	
+
 
 	protected DriversLicense() {
 	}
-	
+
 	public DriversLicense(String serialNumber) {
 		this.serial_number = serialNumber;
 	}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
index 69c51ca869..5e5e7f917f 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
@@ -39,7 +39,7 @@ import org.springframework.beans.factory.annotation.Configurable;
 @Configurable
 public class Person {
 
-	@Id 
+	@Id
 	@GeneratedValue(strategy=GenerationType.AUTO)
 	private Integer id;
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
index 40e7af0431..e7a439080a 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
@@ -29,7 +29,7 @@ import org.springframework.test.annotation.IfProfileValue;
 
 /**
  * Hibernate-specific JPA tests.
- * 
+ *
  * @author Juergen Hoeller
  * @author Rod Johnson
  */
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java
index 44dc72070a..3b1f71ba3c 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java
@@ -19,7 +19,7 @@ package org.springframework.orm.jpa.openjpa;
 import org.junit.Ignore;
 
 /**
- * Test that AspectJ weaving (in particular the currently shipped aspects) work with JPA (see SPR-3873 for more details). 
+ * Test that AspectJ weaving (in particular the currently shipped aspects) work with JPA (see SPR-3873 for more details).
  *
  * @author Ramnivas Laddad
  */
@@ -34,7 +34,7 @@ public class OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests exten
 
 	protected String[] getConfigLocations() {
 		return new String[] {
-				"/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml", 
+				"/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml",
 				"/org/springframework/orm/jpa/memdb.xml",
 				"/org/springframework/orm/jpa/inject.xml"};
 	}
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 559a9c98a5..a09e090765 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
@@ -40,7 +40,7 @@ import static org.junit.Assert.*;
 
 /**
  * Unit and integration tests for the JPA XML resource parsing support.
- * 
+ *
  * @author Costin Leau
  * @author Juergen Hoeller
  */
@@ -275,7 +275,7 @@ public class PersistenceXmlParsingTests {
 		url = reader.determinePersistenceUnitRootUrl(new ClassPathResource("/org/springframework/orm/jpa/META-INF/persistence.xml"));
 		assertTrue("the containing folder should have been returned", url.toString().endsWith("/org/springframework/orm/jpa"));
 	}
-	
+
 	@Test
 	public void testPersistenceUnitRootUrlWithJar() throws Exception {
 		PersistenceUnitReader reader = new PersistenceUnitReader(
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java
index e5513a0cf5..ec65890b88 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2006 the original author 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.
@@ -28,7 +28,7 @@ import org.springframework.orm.jpa.JpaTemplate;
 
 /**
  * @author Costin Leau
- * 
+ *
  */
 public class JpaDaoSupportTests extends TestCase {
 
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 ef97dec7a9..d69241996e 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
@@ -21,7 +21,7 @@ import org.springframework.orm.jpa.EntityManagerFactoryInfo;
 
 /**
  * TopLink-specific JPA tests.
- * 
+ *
  * @author Costin Leau
  * @author Rod Johnson
  * @author Juergen Hoeller
diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
index 99ffd1dcfd..9a52d6b5ba 100644
--- a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -59,8 +59,8 @@ import org.springframework.util.StringUtils;
  * JpaTransactionManager through the superclass.
  *
  * <p>When using Xerces, make sure a post 2.0.2 version is available on the classpath
- * to avoid a critical 
- * <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16014"/>bug</a> 
+ * to avoid a critical
+ * <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16014"/>bug</a>
  * that leads to StackOverflow. Maven users are likely to encounter this problem since
  * 2.0.2 is used by default.
  *
@@ -83,7 +83,7 @@ import org.springframework.util.StringUtils;
 public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactionalTests {
 
 	private static final String DEFAULT_ORM_XML_LOCATION = "META-INF/orm.xml";
-	
+
 	/**
 	 * Map from String defining unique combination of config locations, to ApplicationContext.
 	 * Values are intentionally not strongly typed, to avoid potential class cast exceptions
@@ -139,15 +139,15 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 
 	@Override
 	public void setDirty() {
-		super.setDirty();		
+		super.setDirty();
 		contextCache.remove(cacheKeys());
 		classLoaderCache.remove(cacheKeys());
-		
+
 		// If we are a shadow loader, we need to invoke
-		// the shadow parent to set it dirty, as 
+		// the shadow parent to set it dirty, as
 		// it is the shadow parent that maintains the cache state,
 		// not the child
-		if (this.shadowParent != null) {			
+		if (this.shadowParent != null) {
 			try {
 				Method m = shadowParent.getClass().getMethod("setDirty", (Class[]) null);
 				m.invoke(shadowParent, (Object[]) null);
@@ -158,11 +158,11 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 		}
 	}
 
-	
+
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
 	public void runBare() throws Throwable {
-		
+
 		// getName will return the name of the method being run.
 		if (isDisabledInThisEnvironment(getName())) {
 			// Let superclass log that we didn't run the test.
@@ -178,13 +178,13 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 					+ "Total disabled tests=" + getDisabledTestCount());
 			return;
 		}
-		
+
 		if (!shouldUseShadowLoader()) {
 			super.runBare();
 			return;
 		}
-		
-		String combinationOfContextLocationsForThisTestClass = cacheKeys(); 			
+
+		String combinationOfContextLocationsForThisTestClass = cacheKeys();
 		ClassLoader classLoaderForThisTestClass = getClass().getClassLoader();
 		// save the TCCL
 		ClassLoader initialClassLoader = Thread.currentThread().getContextClassLoader();
@@ -254,7 +254,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 				}
 				// create the shadowed test
 				Class shadowedTestClass = shadowingClassLoader.loadClass(getClass().getName());
-				
+
 				// So long as JUnit is excluded from shadowing we
 				// can minimize reflective invocation here
 				TestCase shadowedTestCase = (TestCase) BeanUtils.instantiateClass(shadowedTestClass);
@@ -294,12 +294,12 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 	 * class to be loaded eagerly when this test case loads, creating verify errors at runtime.
 	 */
 	protected ClassLoader createShadowingClassLoader(ClassLoader classLoader) {
-		OrmXmlOverridingShadowingClassLoader orxl = new OrmXmlOverridingShadowingClassLoader(classLoader, 
-				getActualOrmXmlLocation());		
+		OrmXmlOverridingShadowingClassLoader orxl = new OrmXmlOverridingShadowingClassLoader(classLoader,
+				getActualOrmXmlLocation());
 		customizeResourceOverridingShadowingClassLoader(orxl);
 		return orxl;
 	}
-	
+
 	/**
 	 * Customize the shadowing class loader.
 	 * @param shadowingClassLoader this parameter is actually of type
@@ -310,7 +310,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 	protected void customizeResourceOverridingShadowingClassLoader(ClassLoader shadowingClassLoader) {
 		// empty
 	}
-	
+
 	/**
 	 * Subclasses can override this to return the real location path for
 	 * orm.xml or null if they do not wish to find any orm.xml
@@ -366,7 +366,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 		public ClassLoader getInstrumentableClassLoader() {
 			return this.shadowingClassLoader;
 		}
-		
+
 		public ClassLoader getThrowawayClassLoader() {
 			// Be sure to copy the same resource overrides and same class file transformers:
 			// We want the throwaway class loader to behave like the instrumentable class loader.
diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java b/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
index a6baeaffcd..0f2180ebeb 100644
--- a/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
+++ b/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
@@ -31,7 +31,7 @@ import org.springframework.instrument.classloading.ResourceOverridingShadowingCl
  * @since 2.0
  */
 class OrmXmlOverridingShadowingClassLoader extends ResourceOverridingShadowingClassLoader {
-	
+
 	/**
 	 * Default location of the <code>orm.xml</code> file in the class path:
 	 * "META-INF/orm.xml"
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 dfea7ac536..55e66f8d5e 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
@@ -181,7 +181,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
 	public void setTargetPackage(String targetPackage) {
 		this.targetPackages = new String[] {targetPackage};
 	}
-	
+
 	/**
 	 * Set the names of packages with the Castor descriptor classes.
 	 */
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
index 60fdf715d3..9d28892f9d 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
@@ -33,5 +33,5 @@ public class CastorMarshallerBeanDefinitionParser extends AbstractSimpleBeanDefi
 	@Override
 	protected String getBeanClassName(Element element) {
 		return CASTOR_MARSHALLER_CLASS_NAME;
-	}	
+	}
 }
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 a53bddf3f0..65ec8cceed 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
@@ -132,7 +132,7 @@ public class Jaxb2Marshaller
 	private String contextPath;
 
 	private Class<?>[] classesToBeBound;
-	
+
 	private String[] packagesToScan;
 
 	private Map<String, ?> jaxbContextProperties;
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 eb5a6e6c1d..ae322b9036 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
@@ -328,7 +328,7 @@ public class XmlBeansMarshaller extends AbstractMarshaller {
 		private InputStream getInputStream() {
 			return this.in.get();
 		}
-		
+
 		@Override
 		public int read() throws IOException {
 			InputStream in = getInputStream();
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java
index f9dd3eeb24..90e8bdf738 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java
@@ -30,7 +30,7 @@ import static org.junit.Assert.*;
 
 /**
  * Tests the {@link OxmNamespaceHandler} class.
- * 
+ *
  * @author Arjen Poustma
  * @author Jakub Narloch
  */
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 a9a749dc0f..1471b5fd41 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
@@ -163,7 +163,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests {
 		marshaller.afterPropertiesSet();
 		testSupports();
 	}
-	
+
 	@Test
 	public void supportsPackagesToScan() throws Exception {
 		marshaller = new Jaxb2Marshaller();
@@ -261,7 +261,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests {
 		assertFalse("Jaxb2Marshaller supports DummyType class", marshaller.supports(DummyType.class));
 		assertFalse("Jaxb2Marshaller supports DummyType type", marshaller.supports((Type)DummyType.class));
 	}
-	
+
 
 	@Test
 	public void marshalAttachments() throws Exception {
@@ -307,5 +307,5 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests {
 	private JAXBElement<DummyType> createDummyType() {
 		return null;
 	}
-	
+
 }
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
index 1a5c658093..92e98b4d06 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
@@ -52,7 +52,7 @@ public class Primitives {
 	public JAXBElement<Double> primitiveDouble() {
 		return new JAXBElement<Double>(NAME, Double.class, 42D);
 	}
-	
+
 	public JAXBElement<byte[]> primitiveByteArray() {
 		return new JAXBElement<byte[]>(NAME, byte[].class, new byte[]{42});
 	}
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
index bd98d9df1a..89e41d3c65 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
@@ -103,7 +103,7 @@ public class StandardClasses {
 		Duration duration = factory.newDuration(42000);
 		return new JAXBElement<Duration>(NAME, Duration.class, duration);
 	}
-	
+
 	public JAXBElement<Image> standardClassImage() throws IOException {
 		Image image = ImageIO.read(getClass().getResourceAsStream("spring-ws.png"));
 		return new JAXBElement<Image>(NAME, Image.class, image);
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
index 49821ece29..cf42f1bd78 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
@@ -216,7 +216,7 @@ public class XStreamMarshallerTests {
 		String expected = "<flight flightNumber=\"42\" />";
 		assertXMLEqual("Marshaller does not use attributes", expected, writer.toString());
 	}
-	
+
 	@Test
 	public void useAttributesForClassStringListMap() throws Exception {
 		marshaller
@@ -278,7 +278,7 @@ public class XStreamMarshallerTests {
 		Flights flights = new Flights();
 		flights.getFlights().add(flight);
 		flights.getStrings().add("42");
-		
+
 		Map<String, Class> aliases = new HashMap<String, Class>();
 		aliases.put("flight", Flight.class);
 		aliases.put("flights", Flights.class);
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
index ba316fd3bc..3f1cf06118 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
@@ -305,7 +305,7 @@ public class ContextLoaderPlugIn implements PlugIn {
 			logger.debug("Published WebApplicationContext of Struts ActionServlet '" + getServletName() +
 					"', module '" + getModulePrefix() + "' as ServletContext attribute with name [" + attrName + "]");
 		}
-		
+
 		return wac;
 	}
 
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
index 9f8d647b8c..4883625cfc 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
@@ -108,7 +108,7 @@ import org.springframework.web.context.WebApplicationContext;
 public class DelegatingRequestProcessor extends RequestProcessor {
 
 	private WebApplicationContext webApplicationContext;
-	
+
 
 	@Override
 	public void init(ActionServlet actionServlet, ModuleConfig moduleConfig) throws ServletException {
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
index 9749ad53b0..ee80f63720 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
@@ -60,7 +60,7 @@ import org.springframework.web.context.WebApplicationContext;
 public class DelegatingTilesRequestProcessor extends TilesRequestProcessor {
 
 	private WebApplicationContext webApplicationContext;
-	
+
 
 	@Override
 	public void init(ActionServlet actionServlet, ModuleConfig moduleConfig) throws ServletException {
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java b/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
index c16f719c62..77dcb6d579 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
@@ -62,7 +62,7 @@ import org.springframework.validation.ObjectError;
  * &lt;form-beans&gt;
  *   &lt;form-bean name="actionForm" type="org.springframework.web.struts.SpringBindingActionForm"/&gt;
  * &lt;/form-beans&gt;</pre>
- * 
+ *
  * Example code in a custom Struts <code>Action</code>:
  *
  * <pre>
diff --git a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java
index d65b6c7a4d..941dd59517 100644
--- a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java
+++ b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
index 7cec4989f8..9a1bac3fdc 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
@@ -36,49 +36,49 @@ public class ContentResultMatchersTests {
 	public void typeNoMatch() throws Exception {
 		new ContentResultMatchers().contentType("text/plain").match(getStubMvcResult());
 	}
-	
+
 	@Test
 	public void encoding() throws Exception {
 		new ContentResultMatchers().encoding("UTF-8").match(getStubMvcResult());
 	}
-	
+
 	@Test(expected=AssertionError.class)
 	public void encodingNoMatch() throws Exception {
 		new ContentResultMatchers().encoding("ISO-8859-1").match(getStubMvcResult());
 	}
-	
+
 	@Test
 	public void string() throws Exception {
 		new ContentResultMatchers().string(new String(CONTENT.getBytes("UTF-8"))).match(getStubMvcResult());
 	}
-	
+
 	@Test(expected=AssertionError.class)
 	public void stringNoMatch() throws Exception {
 		new ContentResultMatchers().encoding("bogus").match(getStubMvcResult());
 	}
-	
+
 	@Test
 	public void stringMatcher() throws Exception {
 		String content = new String(CONTENT.getBytes("UTF-8"));
 		new ContentResultMatchers().string(Matchers.equalTo(content)).match(getStubMvcResult());
 	}
-	
+
 	@Test(expected=AssertionError.class)
 	public void stringMatcherNoMatch() throws Exception {
 		new ContentResultMatchers().string(Matchers.equalTo("bogus")).match(getStubMvcResult());
 	}
-	
+
 	@Test
 	public void bytes() throws Exception {
 		new ContentResultMatchers().bytes(CONTENT.getBytes("UTF-8")).match(getStubMvcResult());
 	}
-	
+
 	@Test(expected=AssertionError.class)
 	public void bytesNoMatch() throws Exception {
 		new ContentResultMatchers().bytes("bogus".getBytes()).match(getStubMvcResult());
 	}
 
-	
+
 	private static final String CONTENT = "{\"foo\":\"bar\"}";
 
 	private StubMvcResult getStubMvcResult() throws Exception {
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java
index 0b6e0be447..c27a743a19 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java
@@ -35,7 +35,7 @@ public class FlashAttributeResultMatchersTests {
 	public void attributeExists_doesntExist() throws Exception {
 		new FlashAttributeResultMatchers().attributeExists("bad").match(getStubMvcResult());
 	}
-	
+
 	@Test
 	public void attribute() throws Exception {
 		new FlashAttributeResultMatchers().attribute("good", "good").match(getStubMvcResult());
diff --git a/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java b/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java
index a689255832..8042e6d1f6 100644
--- a/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java
+++ b/spring-test/src/main/java/org/springframework/mock/env/MockEnvironment.java
@@ -23,7 +23,7 @@ import org.springframework.core.env.ConfigurableEnvironment;
  * Simple {@link ConfigurableEnvironment} implementation exposing
  * {@link #setProperty(String, String)} and {@link #withProperty(String, String)}
  * methods for testing purposes.
- * 
+ *
  * @author Chris Beams
  * @author Sam Brannen
  * @since 3.2
diff --git a/spring-test/src/main/java/org/springframework/mock/env/package-info.java b/spring-test/src/main/java/org/springframework/mock/env/package-info.java
index 6be96f5baf..1772b5c90e 100644
--- a/spring-test/src/main/java/org/springframework/mock/env/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/env/package-info.java
@@ -3,7 +3,7 @@
  * {@link org.springframework.core.env.Environment Environment} and
  * {@link org.springframework.core.env.PropertySource PropertySource}
  * abstractions introduced in Spring 3.1.
- * 
+ *
  * <p>These <em>mocks</em> are useful for developing <em>out-of-container</em>
  * unit tests for code that depends on environment-specific properties.
  */
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 8b816b45d0..f6c3f0a376 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
@@ -52,7 +52,7 @@ import org.springframework.util.ClassUtils;
  * DataSource ds = new DriverManagerDataSource(...);
  * builder.bind("java:comp/env/jdbc/myds", ds);
  * builder.activate();</pre>
- * 
+ *
  * Note that it's impossible to activate multiple builders within the same JVM,
  * due to JNDI restrictions. Thus to configure a fresh builder repeatedly, use
  * the following code to get a reference to either an already activated builder
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java b/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
index 4ee7055afd..992e2369c3 100644
--- a/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/jndi/package-info.java
@@ -2,7 +2,7 @@
 /**
  *
  * The simplest implementation of the JNDI SPI that could possibly work.
- * 
+ *
  * <p>Useful for setting up a simple JNDI environment for test suites
  * or stand-alone applications. If, for example, JDBC DataSources get bound to the
  * same JNDI names as within a Java EE container, both application code and
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java b/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
index 6748f5e7e0..4894fe4eb9 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
@@ -36,7 +36,7 @@ import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
  * <p>
  * Note that the Jakarta JSTL implementation (jstl.jar, standard.jar) has to be
  * available on the class path to use this expression evaluator.
- * 
+ *
  * @author Juergen Hoeller
  * @since 1.1.5
  * @see org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager
@@ -49,7 +49,7 @@ public class MockExpressionEvaluator extends ExpressionEvaluator {
 
 	/**
 	 * Create a new MockExpressionEvaluator for the given PageContext.
-	 * 
+	 *
 	 * @param pageContext the JSP PageContext to run in
 	 */
 	public MockExpressionEvaluator(PageContext pageContext) {
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 973db4189f..b1ca960b70 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
@@ -747,7 +747,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 			return -1;
 		}
 	}
-	
+
 	public void setMethod(String method) {
 		this.method = method;
 	}
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 3e2701c576..88f3dbab08 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
@@ -51,7 +51,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	private static final String CHARSET_PREFIX = "charset=";
 
 	private static final String CONTENT_TYPE_HEADER = "Content-Type";
-	
+
 	private static final String CONTENT_LENGTH_HEADER = "Content-Length";
 
 	private static final String LOCATION_HEADER = "Location";
@@ -65,7 +65,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	private boolean writerAccessAllowed = true;
 
 	private String characterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
-	
+
 	private boolean charset = false;
 
 	private final ByteArrayOutputStream content = new ByteArrayOutputStream();
@@ -141,7 +141,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		this.charset = true;
 		updateContentTypeHeader();
 	}
-	
+
 	private void updateContentTypeHeader() {
 		if (this.contentType != null) {
 			StringBuilder sb = new StringBuilder(this.contentType);
@@ -151,7 +151,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 			doAddHeaderValue(CONTENT_TYPE_HEADER, sb.toString(), true);
 		}
 	}
-	
+
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
@@ -457,7 +457,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 		doAddHeaderValue(name, value, false);
 	}
-	
+
 	private boolean setSpecialHeader(String name, Object value) {
 		if (CONTENT_TYPE_HEADER.equalsIgnoreCase(name)) {
 			setContentType((String) value);
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java
index bc08077830..1855230d2c 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java
@@ -71,7 +71,7 @@ public class MockHttpSession implements HttpSession {
 
 	/**
 	 * Create a new MockHttpSession with a default {@link MockServletContext}.
-	 * 
+	 *
 	 * @see MockServletContext
 	 */
 	public MockHttpSession() {
@@ -80,7 +80,7 @@ public class MockHttpSession implements HttpSession {
 
 	/**
 	 * Create a new MockHttpSession.
-	 * 
+	 *
 	 * @param servletContext the ServletContext that the session runs in
 	 */
 	public MockHttpSession(ServletContext servletContext) {
@@ -89,7 +89,7 @@ public class MockHttpSession implements HttpSession {
 
 	/**
 	 * Create a new MockHttpSession.
-	 * 
+	 *
 	 * @param servletContext the ServletContext that the session runs in
 	 * @param id a unique identifier for this session
 	 */
@@ -222,7 +222,7 @@ public class MockHttpSession implements HttpSession {
 	/**
 	 * Serialize the attributes of this session into an object that can be
 	 * turned into a byte array with standard Java serialization.
-	 * 
+	 *
 	 * @return a representation of this session's serialized state
 	 */
 	public Serializable serializeState() {
@@ -249,7 +249,7 @@ public class MockHttpSession implements HttpSession {
 	/**
 	 * Deserialize the attributes of this session from a state object created by
 	 * {@link #serializeState()}.
-	 * 
+	 *
 	 * @param state a representation of this session's serialized state
 	 */
 	@SuppressWarnings("unchecked")
diff --git a/spring-test/src/main/java/org/springframework/mock/web/package-info.java b/spring-test/src/main/java/org/springframework/mock/web/package-info.java
index b97ebd68a8..be8cb8601c 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/package-info.java
@@ -4,7 +4,7 @@
  * A comprehensive set of Servlet API 2.5 mock objects,
  * targeted at usage with Spring's web MVC framework.
  * Useful for testing web contexts and controllers.
- * 
+ *
  * <p>More convenient to use than dynamic mock objects
  * (<a href="http://www.easymock.org">EasyMock</a>) or
  * existing Servlet API mock objects
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java
index d69e75d0c1..985c1e20dc 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java
@@ -95,15 +95,15 @@ public class MockPortletConfig implements PortletConfig {
 		this.portletName = portletName;
 	}
 
-	
+
 	public String getPortletName() {
 		return this.portletName;
 	}
-	
+
 	public PortletContext getPortletContext() {
 		return this.portletContext;
 	}
-	
+
 	public void setResourceBundle(Locale locale, ResourceBundle resourceBundle) {
 		Assert.notNull(locale, "Locale must not be null");
 		this.resourceBundles.put(locale, resourceBundle);
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java
index 45db454d8b..89dbaf0d74 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java
@@ -57,7 +57,7 @@ public class MockPortletContext implements PortletContext {
 	private final Log logger = LogFactory.getLog(getClass());
 
 	private final String resourceBasePath;
-	
+
 	private final ResourceLoader resourceLoader;
 
 	private final Map<String, Object> attributes = new LinkedHashMap<String, Object>();
@@ -70,7 +70,7 @@ public class MockPortletContext implements PortletContext {
 
 
 	/**
-	 * Create a new MockPortletContext with no base path and a 
+	 * Create a new MockPortletContext with no base path and a
 	 * DefaultResourceLoader (i.e. the classpath root as WAR root).
 	 * @see org.springframework.core.io.DefaultResourceLoader
 	 */
@@ -125,7 +125,7 @@ public class MockPortletContext implements PortletContext {
 		return this.resourceBasePath + path;
 	}
 
-	
+
 	public String getServerInfo() {
 		return "MockPortal/1.0";
 	}
@@ -160,7 +160,7 @@ public class MockPortletContext implements PortletContext {
 	public int getMinorVersion() {
 		return 0;
 	}
-	
+
 	public String getMimeType(String filePath) {
 		return MimeTypeResolver.getMimeType(filePath);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
index e302a86e77..7281894d51 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
@@ -42,7 +42,7 @@ import org.springframework.util.CollectionUtils;
 
 /**
  * Mock implementation of the {@link javax.portlet.PortletRequest} interface.
- * 
+ *
  * @author John A. Lewis
  * @author Juergen Hoeller
  * @since 2.0
@@ -103,7 +103,7 @@ public class MockPortletRequest implements PortletRequest {
 	/**
 	 * Create a new MockPortletRequest with a default {@link MockPortalContext}
 	 * and a default {@link MockPortletContext}.
-	 * 
+	 *
 	 * @see MockPortalContext
 	 * @see MockPortletContext
 	 */
@@ -113,7 +113,7 @@ public class MockPortletRequest implements PortletRequest {
 
 	/**
 	 * Create a new MockPortletRequest with a default {@link MockPortalContext}.
-	 * 
+	 *
 	 * @param portletContext the PortletContext that the request runs in
 	 * @see MockPortalContext
 	 */
@@ -123,7 +123,7 @@ public class MockPortletRequest implements PortletRequest {
 
 	/**
 	 * Create a new MockPortletRequest.
-	 * 
+	 *
 	 * @param portalContext the PortalContext that the request runs in
 	 * @param portletContext the PortletContext that the request runs in
 	 */
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java
index d2c84be7ea..477493f4f0 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java
@@ -76,7 +76,7 @@ public class MockPortletSession implements PortletSession {
 		this.portletContext = (portletContext != null ? portletContext : new MockPortletContext());
 	}
 
-	
+
 	public Object getAttribute(String name) {
 		return this.portletAttributes.get(name);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java
index db777eec28..3c28fee42b 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/package-info.java
@@ -4,7 +4,7 @@
  * A comprehensive set of Portlet API 2.0 mock objects,
  * targeted at usage with Spring's web MVC framework.
  * Useful for testing web contexts and controllers.
- * 
+ *
  * <p>More convenient to use than dynamic mock objects
  * (<a href="http://www.easymock.org">EasyMock</a>) or
  * existing Portlet API mock objects.
diff --git a/spring-test/src/main/java/org/springframework/test/AssertThrows.java b/spring-test/src/main/java/org/springframework/test/AssertThrows.java
index 0224a26e6e..35a275f2f9 100644
--- a/spring-test/src/main/java/org/springframework/test/AssertThrows.java
+++ b/spring-test/src/main/java/org/springframework/test/AssertThrows.java
@@ -166,7 +166,7 @@ public abstract class AssertThrows {
 	 * {@link #test() test logic} and the
 	 * {@link #checkExceptionExpectations(Exception) checking} of the
 	 * resulting (expected) {@link java.lang.Exception}.
-	 * @see #test() 
+	 * @see #test()
 	 * @see #doFail()
 	 * @see #checkExceptionExpectations(Exception)
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java b/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
index e129e49428..c9e9921ba6 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
@@ -49,7 +49,7 @@ import java.lang.annotation.Target;
  * AFTER_EACH_TEST_METHOD}, the context will be marked dirty after each test
  * method in the class.
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @author Rod Johnson
  * @since 2.0
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java b/spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java
index b5f8584dfe..91962ee827 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java
@@ -25,12 +25,12 @@ import java.lang.annotation.Target;
 /**
  * Test annotation to indicate that a test method is required to throw the
  * specified exception.
- * 
+ *
  * @author Rod Johnson
  * @author Sam Brannen
  * @since 2.0
  * @deprecated as of Spring 3.1 in favor of using built-in support for declaring
- * expected exceptions in the underlying testing framework (e.g., JUnit, TestNG, etc.) 
+ * expected exceptions in the underlying testing framework (e.g., JUnit, TestNG, etc.)
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java b/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java
index 47d6f57628..8eb649d291 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java
@@ -41,7 +41,7 @@ import java.lang.annotation.Target;
  * {@link ProfileValueSource} implementation, you can configure a test method to
  * run only on Java VMs from Sun Microsystems as follows:
  * </p>
- * 
+ *
  * <pre class="code">
  * &#064;IfProfileValue(name = &quot;java.vendor&quot;, value = &quot;Sun Microsystems Inc.&quot;)
  * public void testSomething() {
@@ -54,14 +54,14 @@ import java.lang.annotation.Target;
  * (assuming a {@link ProfileValueSource} has been appropriately configured for
  * the &quot;test-groups&quot; name):
  * </p>
- * 
+ *
  * <pre class="code">
  * &#064;IfProfileValue(name = &quot;test-groups&quot;, values = { &quot;unit-tests&quot;, &quot;integration-tests&quot; })
  * public void testWhichRunsForUnitOrIntegrationTestGroups() {
  * 	// ...
  * }
  * </pre>
- * 
+ *
  * @author Rod Johnson
  * @author Sam Brannen
  * @since 2.0
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java b/spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java
index ade7b71fb7..76983acf72 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
 
 /**
  * Test annotation to indicate that a method is <i>not transactional</i>.
- * 
+ *
  * @author Rod Johnson
  * @author Sam Brannen
  * @since 2.0
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java
index 5c195c85e8..e21ace4ce7 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java
@@ -30,7 +30,7 @@ import java.lang.annotation.Target;
  * <em>profile values</em> configured via the {@link IfProfileValue
  * &#064;IfProfileValue} annotation.
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see ProfileValueSource
@@ -48,7 +48,7 @@ public @interface ProfileValueSourceConfiguration {
 	 * The type of {@link ProfileValueSource} to use when retrieving
 	 * <em>profile values</em>.
 	 * </p>
-	 * 
+	 *
 	 * @see SystemProfileValueSource
 	 */
 	Class<? extends ProfileValueSource> value() default SystemProfileValueSource.class;
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java
index f43ea26f8c..fc912a798c 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java
@@ -27,7 +27,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * General utility methods for working with <em>profile values</em>.
- * 
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  * @since 2.5
@@ -51,7 +51,7 @@ public abstract class ProfileValueUtils {
 	 * &#064;ProfileValueSourceConfiguration} is not present on the specified
 	 * class or if a custom {@link ProfileValueSource} is not declared, the
 	 * default {@link SystemProfileValueSource} will be returned instead.
-	 * 
+	 *
 	 * @param testClass The test class for which the ProfileValueSource should
 	 * be retrieved
 	 * @return the configured (or default) ProfileValueSource for the specified
@@ -108,7 +108,7 @@ public abstract class ProfileValueUtils {
 	 * <p>
 	 * Defaults to <code>true</code> if no {@link IfProfileValue
 	 * &#064;IfProfileValue} annotation is declared.
-	 * 
+	 *
 	 * @param testClass the test class
 	 * @return <code>true</code> if the test is <em>enabled</em> in the current
 	 * environment
@@ -127,7 +127,7 @@ public abstract class ProfileValueUtils {
 	 * <p>
 	 * Defaults to <code>true</code> if no {@link IfProfileValue
 	 * &#064;IfProfileValue} annotation is declared.
-	 * 
+	 *
 	 * @param testMethod the test method
 	 * @param testClass the test class
 	 * @return <code>true</code> if the test is <em>enabled</em> in the current
@@ -146,7 +146,7 @@ public abstract class ProfileValueUtils {
 	 * <p>
 	 * Defaults to <code>true</code> if no {@link IfProfileValue
 	 * &#064;IfProfileValue} annotation is declared.
-	 * 
+	 *
 	 * @param profileValueSource the ProfileValueSource to use to determine if
 	 * the test is enabled
 	 * @param testMethod the test method
@@ -172,7 +172,7 @@ public abstract class ProfileValueUtils {
 	 * Determine if the <code>value</code> (or one of the <code>values</code>)
 	 * in the supplied {@link IfProfileValue &#064;IfProfileValue} annotation is
 	 * <em>enabled</em> in the current environment.
-	 * 
+	 *
 	 * @param profileValueSource the ProfileValueSource to use to determine if
 	 * the test is enabled
 	 * @param ifProfileValue the annotation to introspect; may be
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java b/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
index f0c7591ac8..7ab7906813 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
  * Note that the scope of execution to be repeated includes execution of the
  * test method itself as well as any <em>set up</em> or <em>tear down</em> of
  * the test fixture.
- * 
+ *
  * @author Rod Johnson
  * @author Sam Brannen
  * @since 2.0
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java b/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java
index 052b419f95..56c29482a0 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
  * test method should be <em>rolled back</em> after the test method has
  * completed. If <code>true</code>, the transaction will be rolled back;
  * otherwise, the transaction will be committed.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/Timed.java b/spring-test/src/main/java/org/springframework/test/annotation/Timed.java
index 94f7d0df14..96729e409e 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/Timed.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/Timed.java
@@ -36,7 +36,7 @@ import java.lang.annotation.Target;
  * {@link Repeat repetitions} of the test, and any <em>set up</em> or
  * <em>tear down</em> of the test fixture.
  * </p>
- * 
+ *
  * @author Rod Johnson
  * @author Sam Brannen
  * @since 2.0
diff --git a/spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java b/spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java
index b0bff1db9a..628e665745 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java
@@ -45,7 +45,7 @@ public @interface ActiveProfiles {
 
 	/**
 	 * Alias for {@link #profiles}.
-	 * 
+	 *
 	 * <p>This attribute may <strong>not</strong> be used in conjunction
 	 * with {@link #profiles}, but it may be used <em>instead</em> of
 	 * {@link #profiles}.
@@ -54,7 +54,7 @@ public @interface ActiveProfiles {
 
 	/**
 	 * The bean definition profiles to activate.
-	 * 
+	 *
 	 * <p>This attribute may <strong>not</strong> be used in conjunction
 	 * with {@link #value}, but it may be used <em>instead</em> of
 	 * {@link #value}.
@@ -88,7 +88,7 @@ public @interface ActiveProfiles {
 	 * public class BaseTest {
 	 *     // ...
 	 * }
-	 * 
+	 *
 	 * &#064;ActiveProfiles(&quot;extended&quot;)
 	 * &#064;ContextConfiguration
 	 * public class ExtendedTest extends BaseTest {
@@ -96,7 +96,7 @@ public @interface ActiveProfiles {
 	 * }
 	 * </pre>
 	 *
-	 * <p>Note: {@code @ActiveProfiles} can be used when loading an 
+	 * <p>Note: {@code @ActiveProfiles} can be used when loading an
 	 * {@code ApplicationContext} from path-based resource locations or
 	 * annotated classes.
 	 *
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
index 4710ee7af9..7dfd2db721 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
@@ -81,7 +81,7 @@ public @interface ContextConfiguration {
 
 	/**
 	 * Alias for {@link #locations}.
-	 * 
+	 *
 	 * <p>This attribute may <strong>not</strong> be used in conjunction
 	 * with {@link #locations} or {@link #classes}, but it may be used
 	 * instead of {@link #locations}.
@@ -93,7 +93,7 @@ public @interface ContextConfiguration {
 	/**
 	 * The resource locations to use for loading an
 	 * {@link org.springframework.context.ApplicationContext ApplicationContext}.
-	 * 
+	 *
 	 * <p>Check out the Javadoc for
 	 * {@link org.springframework.test.context.support.AbstractContextLoader#modifyLocations
 	 * AbstractContextLoader.modifyLocations()} for details on how a location
@@ -102,7 +102,7 @@ public @interface ContextConfiguration {
 	 * {@link org.springframework.test.context.support.AbstractContextLoader#generateDefaultLocations
 	 * AbstractContextLoader.generateDefaultLocations()} for details on the default
 	 * locations that are going to be used if none are specified.
-	 * 
+	 *
 	 * <p>Note that the above-mentioned default rules only apply for a standard
 	 * {@link org.springframework.test.context.support.AbstractContextLoader
 	 * AbstractContextLoader} subclass such as
@@ -111,7 +111,7 @@ public @interface ContextConfiguration {
 	 * used at runtime if <code>locations</code> are configured. See the
 	 * documentation for {@link #loader} for further details regarding default
 	 * loaders.
-	 * 
+	 *
 	 * <p>This attribute may <strong>not</strong> be used in conjunction with
 	 * {@link #value} or {@link #classes}, but it may be used instead of
 	 * {@link #value}.
@@ -123,14 +123,14 @@ public @interface ContextConfiguration {
 	/**
 	 * The <em>annotated classes</em> to use for loading an
 	 * {@link org.springframework.context.ApplicationContext ApplicationContext}.
-	 * 
+	 *
 	 * <p>Check out the Javadoc for
 	 * {@link org.springframework.test.context.support.AnnotationConfigContextLoader#detectDefaultConfigurationClasses
 	 * AnnotationConfigContextLoader.detectDefaultConfigurationClasses()} for details
 	 * on how default configuration classes will be detected if no
 	 * <em>annotated classes</em> are specified. See the documentation for
 	 * {@link #loader} for further details regarding default loaders.
-	 * 
+	 *
 	 * <p>This attribute may <strong>not</strong> be used in conjunction with
 	 * {@link #locations} or {@link #value}.
 	 *
@@ -144,7 +144,7 @@ public @interface ContextConfiguration {
 	/**
 	 * The application context <em>initializer classes</em> to use for initializing
 	 * a {@link ConfigurableApplicationContext}.
-	 * 
+	 *
 	 * <p>The concrete {@code ConfigurableApplicationContext} type supported by each
 	 * declared initializer must be compatible with the type of {@code ApplicationContext}
 	 * created by the {@link SmartContextLoader} in use.
@@ -173,12 +173,12 @@ public @interface ContextConfiguration {
 	 * resource locations or annotated classes defined by test superclasses.
 	 * Thus, subclasses have the option of <em>extending</em> the list of resource
 	 * locations or annotated classes.
-	 * 
+	 *
 	 * <p>If <code>inheritLocations</code> is set to <code>false</code>, the
 	 * resource locations or annotated classes for the annotated class
-	 * will <em>shadow</em> and effectively replace any resource locations 
+	 * will <em>shadow</em> and effectively replace any resource locations
 	 * or annotated classes defined by superclasses.
-	 * 
+	 *
 	 * <p>In the following example that uses path-based resource locations, the
 	 * {@link org.springframework.context.ApplicationContext ApplicationContext}
 	 * for {@code ExtendedTest} will be loaded from
@@ -191,18 +191,18 @@ public @interface ContextConfiguration {
 	 * public class BaseTest {
 	 *     // ...
 	 * }
-	 * 
+	 *
 	 * &#064;ContextConfiguration(&quot;extended-context.xml&quot;)
 	 * public class ExtendedTest extends BaseTest {
 	 *     // ...
 	 * }
 	 * </pre>
-	 * 
+	 *
 	 * <p>Similarly, in the following example that uses annotated
 	 * classes, the
 	 * {@link org.springframework.context.ApplicationContext ApplicationContext}
 	 * for {@code ExtendedTest} will be loaded from the
-	 * {@code BaseConfig} <strong>and</strong> {@code ExtendedConfig} 
+	 * {@code BaseConfig} <strong>and</strong> {@code ExtendedConfig}
 	 * configuration classes, in that order. Beans defined in
 	 * {@code ExtendedConfig} may therefore override those defined in
 	 * {@code BaseConfig}.
@@ -211,7 +211,7 @@ public @interface ContextConfiguration {
 	 * public class BaseTest {
 	 *     // ...
 	 * }
-	 * 
+	 *
 	 * &#064;ContextConfiguration(classes=ExtendedConfig.class)
 	 * public class ExtendedTest extends BaseTest {
 	 *     // ...
@@ -249,7 +249,7 @@ public @interface ContextConfiguration {
 	 * public class BaseTest {
 	 *     // ...
 	 * }
-	 * 
+	 *
 	 * &#064;ContextConfiguration(initializers = ExtendedInitializer.class)
 	 * public class ExtendedTest extends BaseTest {
 	 *     // ...
@@ -263,12 +263,12 @@ public @interface ContextConfiguration {
 	 * The type of {@link SmartContextLoader} (or {@link ContextLoader}) to use
 	 * for loading an {@link org.springframework.context.ApplicationContext
 	 * ApplicationContext}.
-	 * 
+	 *
 	 * <p>If not specified, the loader will be inherited from the first superclass
 	 * that is annotated with {@code @ContextConfiguration} and specifies an
 	 * explicit loader. If no class in the hierarchy specifies an explicit
 	 * loader, a default loader will be used instead.
-	 * 
+	 *
 	 * <p>The default concrete implementation chosen at runtime will be
 	 * {@link org.springframework.test.context.support.DelegatingSmartContextLoader
 	 * DelegatingSmartContextLoader}. For further details on the default behavior
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java
index f28364a9b4..2db039ad32 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java
@@ -21,7 +21,7 @@ import org.springframework.context.ApplicationContext;
 /**
  * Strategy interface for loading an {@link ApplicationContext application context}
  * for an integration test managed by the Spring TestContext Framework.
- * 
+ *
  * <p><b>Note</b>: as of Spring 3.1, implement {@link SmartContextLoader} instead
  * of this interface in order to provide support for annotated classes, active
  * bean definition profiles, and application context initializers.
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 01f368c011..a4e911cbd6 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
@@ -42,7 +42,7 @@ import org.springframework.util.StringUtils;
  * Utility methods for working with {@link ContextLoader ContextLoaders} and
  * {@link SmartContextLoader SmartContextLoaders} and resolving resource locations,
  * annotated classes, and active bean definition profiles.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  * @see ContextLoader
@@ -112,15 +112,15 @@ abstract class ContextLoaderUtils {
 	/**
 	 * Resolve the {@link ContextLoader} {@linkplain Class class} to use for the
 	 * supplied list of {@link ContextConfigurationAttributes}.
-	 * 
+	 *
 	 * <p>Beginning with the first level in the context configuration attributes
-	 * hierarchy: 
+	 * hierarchy:
 	 *
 	 * <ol>
 	 * <li>If the {@link ContextConfigurationAttributes#getContextLoaderClass()
 	 * contextLoaderClass} property of {@link ContextConfigurationAttributes} is
 	 * configured with an explicit class, that class will be returned.</li>
-	 * <li>If an explicit {@code ContextLoader} class is not specified at the 
+	 * <li>If an explicit {@code ContextLoader} class is not specified at the
 	 * current level in the hierarchy, traverse to the next level in the hierarchy
 	 * and return to step #1.</li>
 	 * <li>If no explicit {@code ContextLoader} class is found after traversing
@@ -137,9 +137,9 @@ abstract class ContextLoaderUtils {
 	 * {@code ContextLoader} class to use; must not be {@code null} or empty
 	 * @return the {@code ContextLoader} class to use for the supplied test class
 	 * @throws IllegalArgumentException if {@code @ContextConfiguration} is not
-	 * <em>present</em> on the supplied test class 
+	 * <em>present</em> on the supplied test class
 	 * @throws IllegalStateException if the default {@code ContextLoader} class
-	 * could not be loaded 
+	 * could not be loaded
 	 */
 	@SuppressWarnings("unchecked")
 	static Class<? extends ContextLoader> resolveContextLoaderClass(Class<?> testClass,
@@ -407,7 +407,7 @@ abstract class ContextLoaderUtils {
 	/**
 	 * Load the {@link org.springframework.test.context.web.WebAppConfiguration @WebAppConfiguration}
 	 * class, using reflection in order to avoid package cycles.
-	 * 
+	 *
 	 * @return the {@code @WebAppConfiguration} class or <code>null</code> if it
 	 * cannot be loaded
 	 * @since 3.2
diff --git a/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
index 6fc402e92f..3933067286 100644
--- a/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
@@ -41,15 +41,15 @@ import org.springframework.util.StringUtils;
  * {@link ContextConfiguration#inheritLocations inheritLocations} and
  * {@link ActiveProfiles#inheritProfiles inheritProfiles} flags in
  * {@code @ContextConfiguration} and {@code @ActiveProfiles}, respectively.
- * 
+ *
  * <p>A {@link SmartContextLoader} uses {@code MergedContextConfiguration}
  * to load an {@link org.springframework.context.ApplicationContext ApplicationContext}.
- * 
+ *
  * <p>{@code MergedContextConfiguration} is also used by the {@link TestContext}
  * as the context cache key for caching an
  * {@link org.springframework.context.ApplicationContext ApplicationContext}
  * that was loaded using properties of this {@code MergedContextConfiguration}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  * @see ContextConfiguration
@@ -118,7 +118,7 @@ public class MergedContextConfiguration implements Serializable {
 	 * <code>classes</code>, or <code>activeProfiles</code> an empty array will
 	 * be stored instead. Furthermore, active profiles will be sorted, and duplicate
 	 * profiles will be removed.
-	 * 
+	 *
 	 * @param testClass the test class for which the configuration was merged
 	 * @param locations the merged resource locations
 	 * @param classes the merged annotated classes
diff --git a/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
index ba5f22bd66..54a44174fe 100644
--- a/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
@@ -32,7 +32,7 @@ import org.springframework.context.ApplicationContext;
  * <p>See the Javadoc for
  * {@link org.springframework.test.context.ContextConfiguration @ContextConfiguration}
  * for a definition of <em>annotated class</em>.
- * 
+ *
  * <p>Clients of a {@code SmartContextLoader} should call
  * {@link #processContextConfiguration(ContextConfigurationAttributes)
  * processContextConfiguration()} prior to calling
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 6d3a90c663..02ac2bfe56 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
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
 /**
  * <code>TestContext</code> encapsulates the context in which a test is executed,
  * agnostic of the actual testing framework in use.
- * 
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  * @since 2.5
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 088d8867a3..409b8dc39d 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
@@ -64,7 +64,7 @@ import org.springframework.util.ObjectUtils;
  * <em>after class methods</em> of a particular testing framework (e.g., JUnit
  * 4's {@link org.junit.AfterClass &#064;AfterClass})</li>
  * </ul>
- * 
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
index 2b67223d93..a76134c23f 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
@@ -41,7 +41,7 @@ package org.springframework.test.context;
  * {@link org.springframework.test.context.transaction.TransactionalTestExecutionListener
  * TransactionalTestExecutionListener}</li>
  * </ul>
- * 
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  * @since 2.5
@@ -58,7 +58,7 @@ public interface TestExecutionListener {
 	 * If a given testing framework (e.g., JUnit 3.8) does not support
 	 * <em>before class</em> lifecycle callbacks, this method will not be called
 	 * for that framework.
-	 * 
+	 *
 	 * @param testContext the test context for the test; never <code>null</code>
 	 * @throws Exception allows any exception to propagate
 	 */
@@ -70,7 +70,7 @@ public interface TestExecutionListener {
 	 * <p>
 	 * This method should be called immediately after instantiation of the test
 	 * instance but prior to any framework-specific lifecycle callbacks.
-	 * 
+	 *
 	 * @param testContext the test context for the test; never <code>null</code>
 	 * @throws Exception allows any exception to propagate
 	 */
@@ -84,7 +84,7 @@ public interface TestExecutionListener {
 	 * <p>
 	 * This method should be called immediately prior to framework-specific
 	 * <em>before</em> lifecycle callbacks.
-	 * 
+	 *
 	 * @param testContext the test context in which the test method will be
 	 * executed; never <code>null</code>
 	 * @throws Exception allows any exception to propagate
@@ -99,7 +99,7 @@ public interface TestExecutionListener {
 	 * <p>
 	 * This method should be called immediately after framework-specific
 	 * <em>after</em> lifecycle callbacks.
-	 * 
+	 *
 	 * @param testContext the test context in which the test method was
 	 * executed; never <code>null</code>
 	 * @throws Exception allows any exception to propagate
@@ -116,7 +116,7 @@ public interface TestExecutionListener {
 	 * If a given testing framework (e.g., JUnit 3.8) does not support
 	 * <em>after class</em> lifecycle callbacks, this method will not be called
 	 * for that framework.
-	 * 
+	 *
 	 * @param testContext the test context for the test; never <code>null</code>
 	 * @throws Exception allows any exception to propagate
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
index a7517418ff..86d1d8dc43 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
@@ -29,7 +29,7 @@ import java.lang.annotation.Target;
  * be registered with a {@link TestContextManager}. Typically,
  * <code>&#064;TestExecutionListeners</code> will be used in conjunction with
  * {@link ContextConfiguration &#064;ContextConfiguration}.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see TestExecutionListener
@@ -47,7 +47,7 @@ public @interface TestExecutionListeners {
 	 * The {@link TestExecutionListener TestExecutionListeners} to register with
 	 * a {@link TestContextManager}.
 	 * </p>
-	 * 
+	 *
 	 * @see org.springframework.test.context.support.DependencyInjectionTestExecutionListener
 	 * @see org.springframework.test.context.support.DirtiesContextTestExecutionListener
 	 * @see org.springframework.test.context.transaction.TransactionalTestExecutionListener
@@ -78,14 +78,14 @@ public @interface TestExecutionListeners {
 	 * <code>DirtiesContextTestExecutionListener</code>, <strong>and</strong>
 	 * <code>TransactionalTestExecutionListener</code>, in that order.
 	 * </p>
-	 * 
+	 *
 	 * <pre class="code">
 	 * &#064;TestExecutionListeners({ DependencyInjectionTestExecutionListener.class,
      *    DirtiesContextTestExecutionListener.class })
 	 * public abstract class AbstractBaseTest {
 	 * 	// ...
 	 * }
-	 * 
+	 *
 	 * &#064;TestExecutionListeners(TransactionalTestExecutionListener.class)
 	 * public class TransactionalTest extends AbstractBaseTest {
 	 * 	// ...
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
index f476635416..958904e2d0 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
@@ -99,7 +99,7 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe
  * {@link org.springframework.test.context.TestExecutionListener#afterTestClass(org.springframework.test.context.TestContext)
  * afterTestClass()}</li>
  * </ul>
- * 
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  * @since 2.5
@@ -164,7 +164,7 @@ public abstract class AbstractJUnit38SpringContextTests extends TestCase impleme
 	 * supplied <code>name</code>; initializes the internal
 	 * {@link TestContextManager} for the current test; and retrieves the
 	 * configured (or default) {@link ProfileValueSource}.
-	 * 
+	 *
 	 * @param name the name of the current test to execute
 	 */
 	public AbstractJUnit38SpringContextTests(String name) {
@@ -200,7 +200,7 @@ public abstract class AbstractJUnit38SpringContextTests extends TestCase impleme
 	 * <li>Provides support for {@link ExpectedException
 	 * &#064;ExpectedException}.</li>
 	 * </ul>
-	 * 
+	 *
 	 * @see ProfileValueUtils#isTestEnabledInThisEnvironment
 	 */
 	@Override
@@ -242,7 +242,7 @@ public abstract class AbstractJUnit38SpringContextTests extends TestCase impleme
 	/**
 	 * Runs a <em>timed</em> test via the supplied {@link TestExecutionCallback}
 	 * , providing support for the {@link Timed &#064;Timed} annotation.
-	 * 
+	 *
 	 * @param tec the test execution callback to run
 	 * @param testMethod the actual test method: used to retrieve the
 	 * <code>timeout</code>
@@ -273,7 +273,7 @@ public abstract class AbstractJUnit38SpringContextTests extends TestCase impleme
 	 * Runs a test via the supplied {@link TestExecutionCallback}, providing
 	 * support for the {@link ExpectedException &#064;ExpectedException} and
 	 * {@link Repeat &#064;Repeat} annotations.
-	 * 
+	 *
 	 * @param tec the test execution callback to run
 	 * @param testMethod the actual test method: used to retrieve the
 	 * {@link ExpectedException &#064;ExpectedException} and {@link Repeat
@@ -320,7 +320,7 @@ public abstract class AbstractJUnit38SpringContextTests extends TestCase impleme
 	 * Calls {@link TestContextManager#beforeTestMethod(Object,Method)} and
 	 * {@link TestContextManager#afterTestMethod(Object,Method,Throwable)} at
 	 * the appropriate test execution points.
-	 * 
+	 *
 	 * @param testMethod the test method to run
 	 * @throws Throwable if any exception is thrown
 	 * @see #runBare()
@@ -374,7 +374,7 @@ public abstract class AbstractJUnit38SpringContextTests extends TestCase impleme
 	 * Records the supplied test method as <em>disabled</em> in the current
 	 * environment by incrementing the total number of disabled tests and
 	 * logging a debug message.
-	 * 
+	 *
 	 * @param testMethod the test method that is disabled.
 	 * @see #getDisabledTestCount()
 	 */
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 19806cd163..555892901e 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
@@ -51,7 +51,7 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe
  * {@link SpringJUnit4ClassRunner}, {@link ContextConfiguration
  * &#064;ContextConfiguration}, {@link TestExecutionListeners
  * &#064;TestExecutionListeners}, etc.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see ContextConfiguration
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java
index a0cef63289..79546a256f 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java
@@ -56,7 +56,7 @@ import org.springframework.transaction.annotation.Transactional;
  * &#064;ContextConfiguration}, {@link TestExecutionListeners
  * &#064;TestExecutionListeners}, {@link Transactional &#064;Transactional},
  * etc.
- * 
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java b/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
index 2d184156ee..9351f2f908 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
@@ -79,7 +79,7 @@ import org.springframework.util.ReflectionUtils;
  * <b>NOTE:</b> As of Spring 3.0, <code>SpringJUnit4ClassRunner</code> requires
  * JUnit 4.5+.
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java
index b0ca874ca3..61d721ebf9 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java
@@ -29,7 +29,7 @@ import org.springframework.test.context.TestContextManager;
  * be plugged into the JUnit execution chain by calling
  * {@link TestContextManager#afterTestClass() afterTestClass()} on the supplied
  * {@link TestContextManager}.
- * 
+ *
  * @see #evaluate()
  * @see RunBeforeTestMethodCallbacks
  * @author Sam Brannen
@@ -45,7 +45,7 @@ public class RunAfterTestClassCallbacks extends Statement {
 
 	/**
 	 * Constructs a new <code>RunAfterTestClassCallbacks</code> statement.
-	 * 
+	 *
 	 * @param next the next <code>Statement</code> in the execution chain
 	 * @param testContextManager the TestContextManager upon which to call
 	 * <code>afterTestClass()</code>
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java
index 6e06239a12..af2f1c23a0 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java
@@ -25,7 +25,7 @@ import org.springframework.test.context.TestContextManager;
  * be plugged into the JUnit execution chain by calling
  * {@link TestContextManager#beforeTestClass() beforeTestClass()} on the
  * supplied {@link TestContextManager}.
- * 
+ *
  * @see #evaluate()
  * @see RunAfterTestMethodCallbacks
  * @author Sam Brannen
@@ -40,7 +40,7 @@ public class RunBeforeTestClassCallbacks extends Statement {
 
 	/**
 	 * Constructs a new <code>RunBeforeTestClassCallbacks</code> statement.
-	 * 
+	 *
 	 * @param next the next <code>Statement</code> in the execution chain
 	 * @param testContextManager the TestContextManager upon which to call
 	 * <code>beforeTestClass()</code>
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java
index 8833c390b1..1c5e59be6f 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java
@@ -27,7 +27,7 @@ import org.springframework.test.context.TestContextManager;
  * be plugged into the JUnit execution chain by calling
  * {@link TestContextManager#beforeTestMethod(Object, Method)
  * beforeTestMethod()} on the supplied {@link TestContextManager}.
- * 
+ *
  * @see #evaluate()
  * @see RunAfterTestMethodCallbacks
  * @author Sam Brannen
@@ -46,7 +46,7 @@ public class RunBeforeTestMethodCallbacks extends Statement {
 
 	/**
 	 * Constructs a new <code>RunBeforeTestMethodCallbacks</code> statement.
-	 * 
+	 *
 	 * @param next the next <code>Statement</code> in the execution chain
 	 * @param testInstance the current test instance (never <code>null</code>)
 	 * @param testMethod the test method which is about to be executed on the
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
index 62aee02728..a9a10b8b80 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
@@ -26,7 +26,7 @@ import org.springframework.test.annotation.Timed;
  * which adds support for Spring's {@link Timed @Timed} annotation by throwing
  * an exception if the next statement in the execution chain takes more than the
  * specified number of milliseconds.
- * 
+ *
  * @see #evaluate()
  * @author Sam Brannen
  * @since 3.0
@@ -40,7 +40,7 @@ public class SpringFailOnTimeout extends Statement {
 
 	/**
 	 * Constructs a new <code>SpringFailOnTimeout</code> statement.
-	 * 
+	 *
 	 * @param next the next <code>Statement</code> in the execution chain
 	 * @param timeout the configured <code>timeout</code> for the current test
 	 * @see Timed#millis()
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java
index f2c79a9f3b..541b4ab6d6 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java
@@ -28,7 +28,7 @@ import org.springframework.util.ClassUtils;
  * <code>SpringRepeat</code> is a custom JUnit 4.5+ {@link Statement} which adds
  * support for Spring's {@link Repeat &#064;Repeat} annotation by repeating the
  * test for the specified number of times.
- * 
+ *
  * @see #evaluate()
  * @author Sam Brannen
  * @since 3.0
@@ -46,7 +46,7 @@ public class SpringRepeat extends Statement {
 
 	/**
 	 * Constructs a new <code>SpringRepeat</code> statement.
-	 * 
+	 *
 	 * @param next the next <code>Statement</code> in the execution chain
 	 * @param testMethod the current test method
 	 * @param repeat the configured repeat count for the current test method
diff --git a/spring-test/src/main/java/org/springframework/test/context/package-info.java b/spring-test/src/main/java/org/springframework/test/context/package-info.java
index f549babc39..b02e0b447b 100644
--- a/spring-test/src/main/java/org/springframework/test/context/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/package-info.java
@@ -4,7 +4,7 @@
  * agnostic of the actual testing framework in use. The same techniques and
  * annotation-based configuration used in, for example, a JUnit 4.5+ environment
  * can also be applied to tests written with TestNG, etc.
- * 
+ *
  * <p>In addition to providing generic and extensible testing infrastructure,
  * the Spring TestContext Framework provides out-of-the-box support for
  * Spring-specific integration testing functionality such as context management
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 6f114738ff..d4b6dc49bb 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
@@ -93,7 +93,7 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
 	}
 
 	/**
-	 * Prepare the {@link ConfigurableApplicationContext} created by this 
+	 * Prepare the {@link ConfigurableApplicationContext} created by this
 	 * {@code SmartContextLoader} <i>before</i> bean definitions are read.
 	 *
 	 * <p>The default implementation:
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 d8116c000d..01b4102e53 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
@@ -42,7 +42,7 @@ import org.springframework.util.ObjectUtils;
  * that is annotated with {@link ContextConfiguration @ContextConfiguration}, and
  * the candidate that supports the merged, processed configuration will be used to
  * actually {@link #loadContext load} the context.
- * 
+ *
  * <p>Placing an empty {@code @ContextConfiguration} annotation on a test class signals
  * that default resource locations (i.e., XML configuration files) or default
  * {@link org.springframework.context.annotation.Configuration configuration classes}
@@ -52,13 +52,13 @@ import org.springframework.util.ObjectUtils;
  * {@code AbstractDelegatingSmartContextLoader} will be used as the default loader,
  * thus providing automatic support for either XML configuration files or annotated
  * classes, but not both simultaneously.
- * 
+ *
  * <p>As of Spring 3.2, a test class may optionally declare neither XML configuration
  * 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.
- * 
+ *
  * @author Sam Brannen
  * @since 3.2
  * @see SmartContextLoader
@@ -111,15 +111,15 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte
 	/**
 	 * 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 
+	 * {@code ContextConfigurationAttributes} are not empty, the appropriate
 	 * candidate loader will be allowed to process the configuration <em>as is</em>,
 	 * without any checks for detection of defaults.</li>
 	 * <li>Otherwise, the XML-based loader will be allowed to process
@@ -131,7 +131,7 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte
 	 * 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</code>, or if the supplied configuration attributes include both
@@ -216,12 +216,12 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte
 	/**
 	 * 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,7 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte
 	 * 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</code>
 	 * @throws IllegalStateException if neither candidate loader is capable of loading an
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java
index e57d1a1daf..beaa77ca1a 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java
@@ -23,7 +23,7 @@ import org.springframework.test.context.TestExecutionListener;
  * Abstract implementation of the {@link TestExecutionListener} interface which
  * provides empty method stubs. Subclasses can extend this class and override
  * only those methods suitable for the task at hand.
- * 
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
index 749f08cca5..c8ba660fbf 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
@@ -28,11 +28,11 @@ import org.springframework.util.ObjectUtils;
 /**
  * Concrete implementation of {@link AbstractGenericContextLoader} that loads
  * bean definitions from annotated classes.
- * 
+ *
  * <p>See the Javadoc for
  * {@link org.springframework.test.context.ContextConfiguration @ContextConfiguration}
  * for a definition of <em>annotated class</em>.
- * 
+ *
  * <p>Note: <code>AnnotationConfigContextLoader</code> supports <em>annotated classes</em>
  * rather than the String-based resource locations defined by the legacy
  * {@link org.springframework.test.context.ContextLoader ContextLoader} API. Thus,
@@ -68,7 +68,7 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
 	 * {@link ContextConfigurationAttributes#setClasses(Class[]) set} in the
 	 * supplied configuration attributes. Otherwise, properties in the supplied
 	 * configuration attributes will not be modified.
-	 * 
+	 *
 	 * @param configAttributes the context configuration attributes to process
 	 * @see org.springframework.test.context.SmartContextLoader#processContextConfiguration(ContextConfigurationAttributes)
 	 * @see #isGenerateDefaultLocations()
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java
index 4d2d7c324a..32442fe3ec 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java
@@ -22,7 +22,7 @@ import org.springframework.test.context.SmartContextLoader;
  * {@code DelegatingSmartContextLoader} is a concrete implementation of
  * {@link AbstractDelegatingSmartContextLoader} that delegates to a
  * {@link GenericXmlContextLoader} and an {@link AnnotationConfigContextLoader}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  * @see SmartContextLoader
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 b59b88a937..b5665228ef 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
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
  * <code>ApplicationContext</code> associated with a test as <em>dirty</em> for
  * both test classes and test methods configured with the {@link DirtiesContext
  * &#064;DirtiesContext} annotation.
- * 
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  * @since 2.5
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 7f002792f1..ee397d1655 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
@@ -58,7 +58,7 @@ import org.testng.annotations.BeforeMethod;
  * <li>Must have constructors which either implicitly or explicitly delegate to
  * {@code super();}.</li>
  * </ul>
- * 
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  * @since 2.5
@@ -96,7 +96,7 @@ public abstract class AbstractTestNGSpringContextTests implements IHookable, App
 	/**
 	 * Set the {@link ApplicationContext} to be used by this test instance,
 	 * provided via {@link ApplicationContextAware} semantics.
-	 * 
+	 *
 	 * @param applicationContext the applicationContext to set
 	 */
 	public final void setApplicationContext(ApplicationContext applicationContext) {
@@ -107,7 +107,7 @@ public abstract class AbstractTestNGSpringContextTests implements IHookable, App
 	 * Delegates to the configured {@link TestContextManager} to call
 	 * {@link TestContextManager#beforeTestClass() 'before test class'}
 	 * callbacks.
-	 * 
+	 *
 	 * @throws Exception if a registered TestExecutionListener throws an
 	 * exception
 	 */
@@ -121,7 +121,7 @@ public abstract class AbstractTestNGSpringContextTests implements IHookable, App
 	 * {@link TestContextManager#prepareTestInstance(Object) prepare} this test
 	 * instance prior to execution of any individual tests, for example for
 	 * injecting dependencies, etc.
-	 * 
+	 *
 	 * @throws Exception if a registered TestExecutionListener throws an
 	 * exception
 	 */
@@ -134,7 +134,7 @@ public abstract class AbstractTestNGSpringContextTests implements IHookable, App
 	 * Delegates to the configured {@link TestContextManager} to
 	 * {@link TestContextManager#beforeTestMethod(Object,Method) pre-process}
 	 * the test method before the actual test is executed.
-	 * 
+	 *
 	 * @param testMethod the test method which is about to be executed.
 	 * @throws Exception allows all exceptions to propagate.
 	 */
@@ -147,7 +147,7 @@ public abstract class AbstractTestNGSpringContextTests implements IHookable, App
 	 * Delegates to the {@link IHookCallBack#runTestMethod(ITestResult) test
 	 * method} in the supplied <code>callback</code> to execute the actual test
 	 * and then tracks the exception thrown during test execution, if any.
-	 * 
+	 *
 	 * @see org.testng.IHookable#run(org.testng.IHookCallBack,
 	 * org.testng.ITestResult)
 	 */
@@ -165,7 +165,7 @@ public abstract class AbstractTestNGSpringContextTests implements IHookable, App
 	 * Delegates to the configured {@link TestContextManager} to
 	 * {@link TestContextManager#afterTestMethod(Object, Method, Throwable)
 	 * post-process} the test method after the actual test has executed.
-	 * 
+	 *
 	 * @param testMethod the test method which has just been executed on the
 	 * test instance
 	 * @throws Exception allows all exceptions to propagate
@@ -183,7 +183,7 @@ public abstract class AbstractTestNGSpringContextTests implements IHookable, App
 	/**
 	 * Delegates to the configured {@link TestContextManager} to call
 	 * {@link TestContextManager#afterTestClass() 'after test class'} callbacks.
-	 * 
+	 *
 	 * @throws Exception if a registered TestExecutionListener throws an
 	 * exception
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
index 7900cf30bf..6ecbc5d534 100644
--- a/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
+++ b/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
@@ -33,7 +33,7 @@ import java.lang.annotation.Target;
  * The <code>&#064;AfterTransaction</code> methods of superclasses will be
  * executed after those of the current class.
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see org.springframework.transaction.annotation.Transactional
diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java
index 48736b79fd..ac7e1e62ba 100644
--- a/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java
+++ b/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java
@@ -33,7 +33,7 @@ import java.lang.annotation.Target;
  * The <code>&#064;BeforeTransaction</code> methods of superclasses will be
  * executed before those of the current class.
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see org.springframework.transaction.annotation.Transactional
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
index d43e5f755d..06b9d54b1f 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
@@ -136,7 +136,7 @@ public abstract class AbstractGenericWebContextLoader extends AbstractContextLoa
 	 * the {@code MockServletContext} under the
 	 * {@link WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE} key.</li>
 	 * <li>Finally, the {@code MockServletContext} is set in the
-	 * {@code WebApplicationContext}.</li> 
+	 * {@code WebApplicationContext}.</li>
 	 *
 	 * @param context the web application context for which to configure the web
 	 * resources
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java
index 05cc92cd93..4c89b59c70 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java
@@ -28,11 +28,11 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
 /**
  * Concrete implementation of {@link AbstractGenericWebContextLoader} that loads
  * bean definitions from annotated classes.
- * 
+ *
  * <p>See the Javadoc for
  * {@link org.springframework.test.context.ContextConfiguration @ContextConfiguration}
  * for a definition of <em>annotated class</em>.
- * 
+ *
  * <p>Note: <code>AnnotationConfigWebContextLoader</code> supports <em>annotated classes</em>
  * rather than the String-based resource locations defined by the legacy
  * {@link org.springframework.test.context.ContextLoader ContextLoader} API. Thus,
@@ -69,7 +69,7 @@ public class AnnotationConfigWebContextLoader extends AbstractGenericWebContextL
 	 * {@linkplain ContextConfigurationAttributes#setClasses(Class[]) set} in the
 	 * supplied configuration attributes. Otherwise, properties in the supplied
 	 * configuration attributes will not be modified.
-	 * 
+	 *
 	 * @param configAttributes the context configuration attributes to process
 	 * @see org.springframework.test.context.SmartContextLoader#processContextConfiguration(ContextConfigurationAttributes)
 	 * @see #isGenerateDefaultLocations()
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 5a21ea0d32..2d865d8afd 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
@@ -38,7 +38,7 @@ import org.springframework.web.context.request.ServletWebRequest;
  * {@code TestExecutionListener} which provides mock Servlet API support to
  * {@link WebApplicationContext WebApplicationContexts} loaded by the <em>Spring
  * TestContext Framework</em>.
- * 
+ *
  * <p>Specifically, {@code ServletTestExecutionListener} sets up thread-local
  * state via Spring Web's {@link RequestContextHolder} during {@linkplain
  * #prepareTestInstance(TestContext) test instance preparation} and {@linkplain
@@ -61,7 +61,7 @@ public class ServletTestExecutionListener extends AbstractTestExecutionListener
 
 	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}.
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/WebAppConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/web/WebAppConfiguration.java
index 785d314e5e..7f24c2663f 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/WebAppConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/WebAppConfiguration.java
@@ -24,11 +24,11 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * {@code @WebAppConfiguration} is a class-level annotation that is used to 
+ * {@code @WebAppConfiguration} is a class-level annotation that is used to
  * declare that the {@code ApplicationContext} loaded for an integration test
  * should be a {@link org.springframework.web.context.WebApplicationContext
  * WebApplicationContext}.
- * 
+ *
  * <p>The mere presence of {@code @WebAppConfiguration} on a test class ensures
  * that a {@code WebApplicationContext} will be loaded for the test using a default
  * for the path to the root of the web application. To override the default,
@@ -36,7 +36,7 @@ import java.lang.annotation.Target;
  *
  * <p>Note that {@code @WebAppConfiguration} must be used in conjunction with
  * {@link org.springframework.test.context.ContextConfiguration @ContextConfiguration},
- * either within a single test class or within a test class hierarchy. 
+ * either within a single test class or within a test class hierarchy.
  *
  * @author Sam Brannen
  * @since 3.2
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/WebDelegatingSmartContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/web/WebDelegatingSmartContextLoader.java
index 6e0be682e8..fa561c00a7 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/WebDelegatingSmartContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/WebDelegatingSmartContextLoader.java
@@ -23,7 +23,7 @@ import org.springframework.test.context.support.AbstractDelegatingSmartContextLo
  * {@code WebDelegatingSmartContextLoader} is a concrete implementation of
  * {@link AbstractDelegatingSmartContextLoader} that delegates to a
  * {@link GenericXmlWebContextLoader} and an {@link AnnotationConfigWebContextLoader}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.2
  * @see SmartContextLoader
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java
index ce3ed59e29..4be20de0f3 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java
@@ -117,7 +117,7 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
 	 * instance by comparing both object's {@linkplain #getLocations() locations},
 	 * {@linkplain #getClasses() annotated classes},
 	 * {@linkplain #getContextInitializerClasses() context initializer classes},
-	 * {@linkplain #getActiveProfiles() active profiles}, 
+	 * {@linkplain #getActiveProfiles() active profiles},
 	 * {@linkplain #getResourceBasePath() resource base path}, and the fully
 	 * qualified names of their {@link #getContextLoader() ContextLoaders}.
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java b/spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
index 8c2370f7a7..a59043a948 100644
--- a/spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
@@ -233,7 +233,7 @@ public class JdbcTestUtils {
 	}
 
 	/**
-	 * Read a script from the provided {@code LineNumberReader}, using 
+	 * Read a script from the provided {@code LineNumberReader}, using
 	 * "{@code --}" as the comment prefix, and build a {@code String} containing
 	 * the lines.
 	 * @param lineNumberReader the {@code LineNumberReader} containing the script
diff --git a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
index fd18656aa9..5e1b003830 100644
--- a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -59,8 +59,8 @@ import org.springframework.util.StringUtils;
  * JpaTransactionManager through the superclass.
  *
  * <p>When using Xerces, make sure a post 2.0.2 version is available on the classpath
- * to avoid a critical 
- * <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16014"/>bug</a> 
+ * to avoid a critical
+ * <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16014"/>bug</a>
  * that leads to StackOverflow. Maven users are likely to encounter this problem since
  * 2.0.2 is used by default.
  *
@@ -84,7 +84,7 @@ import org.springframework.util.StringUtils;
 public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactionalTests {
 
 	private static final String DEFAULT_ORM_XML_LOCATION = "META-INF/orm.xml";
-	
+
 	/**
 	 * Map from String defining unique combination of config locations, to ApplicationContext.
 	 * Values are intentionally not strongly typed, to avoid potential class cast exceptions
@@ -140,15 +140,15 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 
 	@Override
 	public void setDirty() {
-		super.setDirty();		
+		super.setDirty();
 		contextCache.remove(cacheKeys());
 		classLoaderCache.remove(cacheKeys());
-		
+
 		// If we are a shadow loader, we need to invoke
-		// the shadow parent to set it dirty, as 
+		// the shadow parent to set it dirty, as
 		// it is the shadow parent that maintains the cache state,
 		// not the child
-		if (this.shadowParent != null) {			
+		if (this.shadowParent != null) {
 			try {
 				Method m = shadowParent.getClass().getMethod("setDirty", (Class[]) null);
 				m.invoke(shadowParent, (Object[]) null);
@@ -159,11 +159,11 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 		}
 	}
 
-	
+
 	@Override
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public void runBare() throws Throwable {
-		
+
 		// getName will return the name of the method being run.
 		if (isDisabledInThisEnvironment(getName())) {
 			// Let superclass log that we didn't run the test.
@@ -185,7 +185,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 			return;
 		}
 
-		String combinationOfContextLocationsForThisTestClass = cacheKeys(); 			
+		String combinationOfContextLocationsForThisTestClass = cacheKeys();
 		ClassLoader classLoaderForThisTestClass = getClass().getClassLoader();
 		// save the TCCL
 		ClassLoader initialClassLoader = Thread.currentThread().getContextClassLoader();
@@ -255,7 +255,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 				}
 				// create the shadowed test
 				Class shadowedTestClass = shadowingClassLoader.loadClass(getClass().getName());
-				
+
 				// So long as JUnit is excluded from shadowing we
 				// can minimize reflective invocation here
 				TestCase shadowedTestCase = (TestCase) BeanUtils.instantiateClass(shadowedTestClass);
@@ -295,12 +295,12 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 	 * class to be loaded eagerly when this test case loads, creating verify errors at runtime.
 	 */
 	protected ClassLoader createShadowingClassLoader(ClassLoader classLoader) {
-		OrmXmlOverridingShadowingClassLoader orxl = new OrmXmlOverridingShadowingClassLoader(classLoader, 
-				getActualOrmXmlLocation());		
+		OrmXmlOverridingShadowingClassLoader orxl = new OrmXmlOverridingShadowingClassLoader(classLoader,
+				getActualOrmXmlLocation());
 		customizeResourceOverridingShadowingClassLoader(orxl);
 		return orxl;
 	}
-	
+
 	/**
 	 * Customize the shadowing class loader.
 	 * @param shadowingClassLoader this parameter is actually of type
@@ -311,7 +311,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 	protected void customizeResourceOverridingShadowingClassLoader(ClassLoader shadowingClassLoader) {
 		// empty
 	}
-	
+
 	/**
 	 * Subclasses can override this to return the real location path for
 	 * orm.xml or null if they do not wish to find any orm.xml
@@ -367,7 +367,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 		public ClassLoader getInstrumentableClassLoader() {
 			return this.shadowingClassLoader;
 		}
-		
+
 		public ClassLoader getThrowawayClassLoader() {
 			// Be sure to copy the same resource overrides and same class file transformers:
 			// We want the throwaway class loader to behave like the instrumentable class loader.
diff --git a/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java b/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
index a6baeaffcd..0f2180ebeb 100644
--- a/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
@@ -31,7 +31,7 @@ import org.springframework.instrument.classloading.ResourceOverridingShadowingCl
  * @since 2.0
  */
 class OrmXmlOverridingShadowingClassLoader extends ResourceOverridingShadowingClassLoader {
-	
+
 	/**
 	 * Default location of the <code>orm.xml</code> file in the class path:
 	 * "META-INF/orm.xml"
diff --git a/spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java b/spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java
index 865c9e3a5c..6b54d54797 100644
--- a/spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/util/ReflectionTestUtils.java
@@ -30,12 +30,12 @@ import org.springframework.util.StringUtils;
 /**
  * {@code ReflectionTestUtils} is a collection of reflection-based utility
  * methods for use in unit and integration testing scenarios.
- * 
+ *
  * <p>There are often times when it would be beneficial to be able to set a
  * non-{@code public} field, invoke a non-{@code public} setter method, or
  * invoke a non-{@code public} <em>configuration</em> or <em>lifecycle</em>
  * callback method when testing code involving, for example:
- * 
+ *
  * <ul>
  * <li>ORM frameworks such as JPA and Hibernate which condone the usage of
  * {@code private} or {@code protected} field access as opposed to
@@ -49,7 +49,7 @@ import org.springframework.util.StringUtils;
  * and {@link javax.annotation.PreDestroy @PreDestroy} for lifecycle callback
  * methods.</li>
  * </ul>
- * 
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  * @since 2.5
@@ -67,12 +67,12 @@ public class ReflectionTestUtils {
 	/**
 	 * Set the {@link Field field} with the given {@code name} on the provided
 	 * {@link Object target object} to the supplied {@code value}.
-	 * 
+	 *
 	 * <p>This method traverses the class hierarchy in search of the desired field.
 	 * In addition, an attempt will be made to make non-{@code public} fields
 	 * <em>accessible</em>, thus allowing one to set {@code protected},
 	 * {@code private}, and <em>package-private</em> fields.
-	 * 
+	 *
 	 * @param target the target object on which to set the field
 	 * @param name the name of the field to set
 	 * @param value the value to set
@@ -87,12 +87,12 @@ public class ReflectionTestUtils {
 	/**
 	 * Set the {@link Field field} with the given {@code name} on the provided
 	 * {@link Object target object} to the supplied {@code value}.
-	 * 
+	 *
 	 * <p>This method traverses the class hierarchy in search of the desired
 	 * field. In addition, an attempt will be made to make non-{@code public}
 	 * fields <em>accessible</em>, thus allowing one to set {@code protected},
 	 * {@code private}, and <em>package-private</em> fields.
-	 * 
+	 *
 	 * @param target the target object on which to set the field
 	 * @param name the name of the field to set
 	 * @param value the value to set
@@ -123,12 +123,12 @@ public class ReflectionTestUtils {
 
 	/**
 	 * Get the field with the given {@code name} from the provided target object.
-	 * 
+	 *
 	 * <p>This method traverses the class hierarchy in search of the desired
 	 * field. In addition, an attempt will be made to make non-{@code public}
 	 * fields <em>accessible</em>, thus allowing one to get {@code protected},
 	 * {@code private}, and <em>package-private</em> fields.
-	 * 
+	 *
 	 * @param target the target object on which to set the field
 	 * @param name the name of the field to get
 	 * @return the field's current value
@@ -151,17 +151,17 @@ public class ReflectionTestUtils {
 	/**
 	 * Invoke the setter method with the given {@code name} on the supplied
 	 * target object with the supplied {@code value}.
-	 * 
+	 *
 	 * <p>This method traverses the class hierarchy in search of the desired
 	 * method. In addition, an attempt will be made to make non-{@code public}
 	 * methods <em>accessible</em>, thus allowing one to invoke {@code protected},
 	 * {@code private}, and <em>package-private</em> setter methods.
-	 * 
+	 *
 	 * <p>In addition, this method supports JavaBean-style <em>property</em>
 	 * names. For example, if you wish to set the {@code name} property on the
 	 * target object, you may pass either &quot;name&quot; or
 	 * &quot;setName&quot; as the method name.
-	 * 
+	 *
 	 * @param target the target object on which to invoke the specified setter
 	 * method
 	 * @param name the name of the setter method to invoke or the corresponding
@@ -178,17 +178,17 @@ public class ReflectionTestUtils {
 	/**
 	 * Invoke the setter method with the given {@code name} on the supplied
 	 * target object with the supplied {@code value}.
-	 * 
+	 *
 	 * <p>This method traverses the class hierarchy in search of the desired
 	 * method. In addition, an attempt will be made to make non-{@code public}
 	 * methods <em>accessible</em>, thus allowing one to invoke {@code protected},
 	 * {@code private}, and <em>package-private</em> setter methods.
-	 * 
+	 *
 	 * <p>In addition, this method supports JavaBean-style <em>property</em>
 	 * names. For example, if you wish to set the {@code name} property on the
 	 * target object, you may pass either &quot;name&quot; or
 	 * &quot;setName&quot; as the method name.
-	 * 
+	 *
 	 * @param target the target object on which to invoke the specified setter
 	 * method
 	 * @param name the name of the setter method to invoke or the corresponding
@@ -226,17 +226,17 @@ public class ReflectionTestUtils {
 	/**
 	 * Invoke the getter method with the given {@code name} on the supplied
 	 * target object with the supplied {@code value}.
-	 * 
+	 *
 	 * <p>This method traverses the class hierarchy in search of the desired
 	 * method. In addition, an attempt will be made to make non-{@code public}
 	 * methods <em>accessible</em>, thus allowing one to invoke {@code protected},
 	 * {@code private}, and <em>package-private</em> getter methods.
-	 * 
+	 *
 	 * <p>In addition, this method supports JavaBean-style <em>property</em>
 	 * names. For example, if you wish to get the {@code name} property on the
 	 * target object, you may pass either &quot;name&quot; or
 	 * &quot;getName&quot; as the method name.
-	 * 
+	 *
 	 * @param target the target object on which to invoke the specified getter
 	 * method
 	 * @param name the name of the getter method to invoke or the corresponding
@@ -271,12 +271,12 @@ public class ReflectionTestUtils {
 	/**
 	 * Invoke the method with the given {@code name} on the supplied target
 	 * object with the supplied arguments.
-	 * 
+	 *
 	 * <p>This method traverses the class hierarchy in search of the desired
 	 * method. In addition, an attempt will be made to make non-{@code public}
 	 * methods <em>accessible</em>, thus allowing one to invoke {@code protected},
 	 * {@code private}, and <em>package-private</em> methods.
-	 * 
+	 *
 	 * @param target the target object on which to invoke the specified method
 	 * @param name the name of the method to invoke
 	 * @param args the arguments to provide to the method
diff --git a/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java b/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java
index e3392456b4..c647bd41dc 100644
--- a/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java
+++ b/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java
@@ -28,11 +28,11 @@ import org.springframework.web.servlet.ModelAndView;
 /**
  * Convenient JUnit 3.8 base class for tests dealing with Spring Web MVC
  * {@link org.springframework.web.servlet.ModelAndView ModelAndView} objects.
- * 
+ *
  * <p>All <code>assert*()</code> methods throw {@link AssertionFailedError}s.
- * 
+ *
  * <p>Consider the use of {@link ModelAndViewAssert} with JUnit 4 and TestNG.
- * 
+ *
  * @author Alef Arendsen
  * @author Bram Smeets
  * @author Sam Brannen
diff --git a/spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java b/spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java
index 2d6bf7da09..a15c67d323 100644
--- a/spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java
+++ b/spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java
@@ -35,7 +35,7 @@ import org.springframework.web.servlet.ModelAndView;
  * <p>
  * Intended for use with JUnit 4 and TestNG. All <code>assert*()</code> methods
  * throw {@link AssertionError}s.
- * 
+ *
  * @author Sam Brannen
  * @author Alef Arendsen
  * @author Bram Smeets
@@ -48,7 +48,7 @@ public abstract class ModelAndViewAssert {
 	 * Checks whether the model value under the given <code>modelName</code>
 	 * exists and checks it type, based on the <code>expectedType</code>. If the
 	 * model entry exists and the type matches, the model value is returned.
-	 * 
+	 *
 	 * @param mav ModelAndView to test against (never <code>null</code>)
 	 * @param modelName name of the object to add to the model (never
 	 * <code>null</code>)
@@ -68,7 +68,7 @@ public abstract class ModelAndViewAssert {
 
 	/**
 	 * Compare each individual entry in a list, without first sorting the lists.
-	 * 
+	 *
 	 * @param mav ModelAndView to test against (never <code>null</code>)
 	 * @param modelName name of the object to add to the model (never
 	 * <code>null</code>)
@@ -87,7 +87,7 @@ public abstract class ModelAndViewAssert {
 
 	/**
 	 * Assert whether or not a model attribute is available.
-	 * 
+	 *
 	 * @param mav ModelAndView to test against (never <code>null</code>)
 	 * @param modelName name of the object to add to the model (never
 	 * <code>null</code>)
@@ -102,7 +102,7 @@ public abstract class ModelAndViewAssert {
 	/**
 	 * Compare a given <code>expectedValue</code> to the value from the model
 	 * bound under the given <code>modelName</code>.
-	 * 
+	 *
 	 * @param mav ModelAndView to test against (never <code>null</code>)
 	 * @param modelName name of the object to add to the model (never
 	 * <code>null</code>)
@@ -118,7 +118,7 @@ public abstract class ModelAndViewAssert {
 	/**
 	 * Inspect the <code>expectedModel</code> to see if all elements in the
 	 * model appear and are equal.
-	 * 
+	 *
 	 * @param mav ModelAndView to test against (never <code>null</code>)
 	 * @param expectedModel the expected model
 	 */
@@ -151,7 +151,7 @@ public abstract class ModelAndViewAssert {
 	/**
 	 * Compare each individual entry in a list after having sorted both lists
 	 * (optionally using a comparator).
-	 * 
+	 *
 	 * @param mav ModelAndView to test against (never <code>null</code>)
 	 * @param modelName name of the object to add to the model (never
 	 * <code>null</code>)
@@ -187,7 +187,7 @@ public abstract class ModelAndViewAssert {
 	/**
 	 * Check to see if the view name in the ModelAndView matches the given
 	 * <code>expectedName</code>.
-	 * 
+	 *
 	 * @param mav ModelAndView to test against (never <code>null</code>)
 	 * @param expectedName the name of the model value
 	 */
diff --git a/spring-test/src/test/java/org/springframework/beans/Employee.java b/spring-test/src/test/java/org/springframework/beans/Employee.java
index 923c004108..3a47dfd690 100644
--- a/spring-test/src/test/java/org/springframework/beans/Employee.java
+++ b/spring-test/src/test/java/org/springframework/beans/Employee.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
@@ -18,7 +18,7 @@
 package org.springframework.beans;
 
 public class Employee extends TestBean {
-	
+
 	private String co;
 
 	/**
@@ -27,11 +27,11 @@ public class Employee extends TestBean {
 	public Employee() {
 		super();
 	}
-	
+
 	public String getCompany() {
 		return co;
 	}
-	
+
 	public void setCompany(String co) {
 		this.co = co;
 	}
diff --git a/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java
index 7d87547b5f..c5c4ed5e67 100644
--- a/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-test/src/test/java/org/springframework/beans/IOther.java b/spring-test/src/test/java/org/springframework/beans/IOther.java
index 797486ec44..6a8f74187c 100644
--- a/spring-test/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-test/src/test/java/org/springframework/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
index a06e15d150..0eb8df5c8a 100644
--- a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-test/src/test/java/org/springframework/beans/TestBean.java b/spring-test/src/test/java/org/springframework/beans/TestBean.java
index a56bab7e33..d84f85d096 100644
--- a/spring-test/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-test/src/test/java/org/springframework/beans/TestBean.java
@@ -35,7 +35,7 @@ import org.springframework.util.ObjectUtils;
 
 /**
  * Simple test bean used for testing bean factories, the AOP framework etc.
- * 
+ *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @since 15 April 2001
diff --git a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
index c60037cf74..eb8f362d56 100644
--- a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
@@ -24,7 +24,7 @@ import org.springframework.context.ApplicationContext;
  * Abstract JUnit 3.8 based unit test which verifies new functionality requested
  * in <a href="http://opensource.atlassian.com/projects/spring/browse/SPR-3550"
  * target="_blank">SPR-3350</a>.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
@@ -51,7 +51,7 @@ public abstract class AbstractSpr3350SingleSpringContextTests extends AbstractDe
 	 * configured
 	 * {@link #createBeanDefinitionReader(org.springframework.context.support.GenericApplicationContext)
 	 * BeanDefinitionReader}.
-	 * 
+	 *
 	 * @see org.springframework.test.AbstractSingleSpringContextTests#getConfigPath()
 	 */
 	protected abstract String getConfigPath();
diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
index 9636d46a97..ab6e42dc68 100644
--- a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
@@ -20,7 +20,7 @@ package org.springframework.test;
  * JUnit 3.8 based unit test which verifies new functionality requested in <a
  * href="http://opensource.atlassian.com/projects/spring/browse/SPR-3264"
  * target="_blank">SPR-3264</a>.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see Spr3264SingleSpringContextTests
diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
index 6496cdb07e..496bbc1b01 100644
--- a/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
@@ -20,7 +20,7 @@ package org.springframework.test;
  * JUnit 3.8 based unit test which verifies new functionality requested in <a
  * href="http://opensource.atlassian.com/projects/spring/browse/SPR-3264"
  * target="_blank">SPR-3264</a>.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see Spr3264DependencyInjectionSpringContextTests
diff --git a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
index e1d77ab5d5..580b873b10 100644
--- a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
+++ b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
@@ -23,7 +23,7 @@ import junit.framework.TestResult;
  * Verifies proper handling of {@link IfProfileValue @IfProfileValue} and
  * {@link ProfileValueSourceConfiguration @ProfileValueSourceConfiguration} in
  * conjunction with {@link AbstractAnnotationAwareTransactionalTests}.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
index 092bc751ac..7ec007c016 100644
--- a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 /**
  * Unit tests for {@link ProfileValueUtils}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java b/spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java
index 59d5da748b..613dc3acce 100644
--- a/spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java
@@ -41,7 +41,7 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe
  * application context caching} in conjunction with the
  * {@link SpringJUnit4ClassRunner} and the {@link DirtiesContext
  * &#064;DirtiesContext} annotation at the class level.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
@@ -54,7 +54,7 @@ public class ClassLevelDirtiesContextTests {
 
 	/**
 	 * Asserts the statistics of the supplied context cache.
-	 * 
+	 *
 	 * @param usageScenario the scenario in which the statistics are used
 	 * @param expectedSize the expected number of contexts in the cache
 	 * @param expectedHitCount the expected hit count
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 5b386cfc94..aace2b29a4 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
@@ -37,7 +37,7 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
 
 /**
  * Unit tests for {@link ContextLoaderUtils}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java
index 790d5f9ca9..9bd67303ba 100644
--- a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java
@@ -31,10 +31,10 @@ import org.springframework.test.context.support.GenericXmlContextLoader;
 
 /**
  * Unit tests for {@link MergedContextConfiguration}.
- * 
+ *
  * <p>These tests primarily exist to ensure that {@code MergedContextConfiguration}
  * can safely be used as the cache key for {@link ContextCache}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java b/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java
index 2e1b2ef09e..8ae941c107 100644
--- a/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java
@@ -40,7 +40,7 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe
  * application context caching} in conjunction with the
  * {@link SpringJUnit4ClassRunner} and the {@link DirtiesContext
  * &#064;DirtiesContext} annotation at the method level.
- * 
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  * @since 2.5
@@ -59,7 +59,7 @@ public class SpringRunnerContextCacheTests {
 
 	/**
 	 * Asserts the statistics of the context cache in {@link TestContextManager}.
-	 * 
+	 *
 	 * @param usageScenario the scenario in which the statistics are used
 	 * @param expectedSize the expected number of contexts in the cache
 	 * @param expectedHitCount the expected hit count
@@ -73,7 +73,7 @@ public class SpringRunnerContextCacheTests {
 
 	/**
 	 * Asserts the statistics of the supplied context cache.
-	 * 
+	 *
 	 * @param contextCache the cache to assert against
 	 * @param usageScenario the scenario in which the statistics are used
 	 * @param expectedSize the expected number of contexts in the cache
diff --git a/spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java b/spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java
index c8a21e32b6..a504642a92 100644
--- a/spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java
@@ -26,9 +26,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 /**
- * Unit tests for verifying proper behavior of the {@link ContextCache} in 
+ * Unit tests for verifying proper behavior of the {@link ContextCache} in
  * conjunction with cache keys used in {@link TestContext}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  * @see SpringRunnerContextCacheTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java b/spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java
index 5b76b650bb..69c5ba2d43 100644
--- a/spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java
@@ -38,7 +38,7 @@ import org.springframework.test.context.support.AbstractTestExecutionListener;
  * JUnit 4 based unit test for {@link TestContextManager}, which verifies proper
  * <em>execution order</em> of registered {@link TestExecutionListener
  * TestExecutionListeners}.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
@@ -64,7 +64,7 @@ public class TestContextManagerTests {
 	 * Asserts the <em>execution order</em> of 'before' and 'after' test method
 	 * calls on {@link TestExecutionListener listeners} registered for the
 	 * configured {@link TestContextManager}.
-	 * 
+	 *
 	 * @see #beforeTestMethodCalls
 	 * @see #afterTestMethodCalls
 	 */
@@ -121,7 +121,7 @@ public class TestContextManagerTests {
 	/**
 	 * Verifies the expected {@link TestExecutionListener}
 	 * <em>execution order</em> within a test method.
-	 * 
+	 *
 	 * @see #verifyListenerExecutionOrderAfterClass()
 	 */
 	@Test
diff --git a/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java b/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
index 19919c1ac2..5596e6ea8b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
@@ -33,7 +33,7 @@ import org.springframework.test.context.support.AbstractTestExecutionListener;
  * href="http://opensource.atlassian.com/projects/spring/browse/SPR-3896"
  * target="_blank">SPR-3896</a></li>
  * </ul>
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
index a9b9e3f16f..a6376dfdf9 100644
--- a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
@@ -31,7 +31,7 @@ import org.springframework.test.context.junit4.PropertiesBasedSpringJUnit4ClassR
  * be used at all levels within a test class hierarchy when the
  * <code>loader</code> is <i>inherited</i> (i.e., not explicitly declared) via
  * {@link ContextConfiguration &#064;ContextConfiguration}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  * @see PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
index 3038750d41..8c635bdd6a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
@@ -32,7 +32,7 @@ import org.springframework.test.context.support.GenericPropertiesContextLoader;
  * be used at all levels within a test class hierarchy when the
  * <code>loader</code> is explicitly declared via {@link ContextConfiguration
  * &#064;ContextConfiguration}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  * @see PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
index 9235841e49..b1a0a4e551 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
@@ -41,7 +41,7 @@ import org.springframework.test.jdbc.SimpleJdbcTestUtils;
 /**
  * Combined integration test for {@link AbstractJUnit38SpringContextTests} and
  * {@link AbstractTransactionalJUnit38SpringContextTests}.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
index 3049204efb..192702ab29 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
@@ -47,7 +47,7 @@ import org.springframework.test.context.transaction.BeforeTransaction;
  * href="http://opensource.atlassian.com/projects/spring/browse/SPR-3960"
  * target="_blank">SPR-3960</a>.
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
index 1b8e6e6a00..39cf8624ad 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
@@ -32,7 +32,7 @@ import org.springframework.test.context.TestExecutionListeners;
  * Verifies proper handling of {@link IfProfileValue &#064;IfProfileValue} and
  * {@link ProfileValueSourceConfiguration &#064;ProfileValueSourceConfiguration}
  * in conjunction with {@link AbstractJUnit38SpringContextTests}.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java
index 8a6f32c512..e33f290ac5 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java
@@ -24,7 +24,7 @@ import org.springframework.test.context.TestExecutionListeners;
 /**
  * Unit test for {@link AbstractJUnit38SpringContextTests} which focuses on
  * proper support of the {@link Repeat @Repeat} annotation.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java
index 6318814e72..419997161e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java
@@ -23,7 +23,7 @@ import org.springframework.test.context.ContextConfiguration;
  * Extension of {@link SpringJUnit4ClassRunnerAppCtxTests}, which verifies that
  * we can specify an explicit, <em>absolute path</em> location for our
  * application context.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see SpringJUnit4ClassRunnerAppCtxTests
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 4b36e3ed37..ebe40daa0a 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
@@ -26,7 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
  * Abstract base class for verifying support of Spring's {@link Transactional
  * &#64;Transactional} and {@link NotTransactional &#64;NotTransactional}
  * annotations.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see ClassLevelTransactionalSpringRunnerTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
index a4c5c81ab4..9069dc59bd 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
@@ -55,7 +55,7 @@ import org.springframework.transaction.annotation.Transactional;
  * This class specifically tests usage of <code>&#064;Transactional</code>
  * defined at the <strong>class level</strong>.
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see MethodLevelTransactionalSpringRunnerTests
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 8348e5aad7..01ec43a2fd 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
@@ -45,7 +45,7 @@ import org.springframework.test.jdbc.SimpleJdbcTestUtils;
 /**
  * Combined integration test for {@link AbstractJUnit4SpringContextTests} and
  * {@link AbstractTransactionalJUnit4SpringContextTests}.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java
index 59f59ff21d..ad7de4f270 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java
@@ -31,7 +31,7 @@ import org.springframework.test.context.support.GenericPropertiesContextLoader;
  * Integration tests which verify that a subclass of {@link SpringJUnit4ClassRunner}
  * can specify a custom <em>default ContextLoader class name</em> that overrides
  * the standard default class name.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java
index b9c6c811a3..80366aed5a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java
@@ -39,7 +39,7 @@ import org.springframework.test.context.TestExecutionListeners;
  * Note that {@link TestExecutionListeners &#064;TestExecutionListeners} is
  * explicitly configured with an empty list, thus disabling all default
  * listeners.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see HardCodedProfileValueSourceSpringRunnerTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java
index cedbc19121..d94035194c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java
@@ -35,7 +35,7 @@ import org.springframework.test.context.TestExecutionListeners;
  * <li>JUnit's {@link Test#expected() &#064;Test(expected=...)}</li>
  * <li>Spring's {@link ExpectedException &#064;ExpectedException}</li>
  * </ul>
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
index 4bdf5837e3..0f4fb93641 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
@@ -55,7 +55,7 @@ import org.springframework.test.context.transaction.BeforeTransaction;
  * and {@link TestExecutionListener#afterTestClass(TestContext)
  * afterTestClass()} lifecycle callback methods.
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
index 62118b48df..8e422e1c0c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
@@ -29,7 +29,7 @@ import org.springframework.test.annotation.ProfileValueSourceConfiguration;
  * <em>explicit, custom defined {@link ProfileValueSource}</em>) annotations in
  * conjunction with the {@link SpringJUnit4ClassRunner}.
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see EnabledAndIgnoredSpringRunnerTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
index b553904583..f2664d8ec0 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
@@ -55,7 +55,7 @@ import org.springframework.transaction.annotation.Transactional;
  * {@link ClassLevelTransactionalSpringRunnerTests}, this class omits usage of
  * <code>&#064;NotTransactional</code>.
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see ClassLevelTransactionalSpringRunnerTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
index 3790fc2188..306eb98310 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
@@ -30,7 +30,7 @@ import org.springframework.util.ResourceUtils;
  * to verify support for the new <code>value</code> attribute alias for
  * <code>&#064;ContextConfiguration</code>'s <code>locations</code> attribute.
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see SpringJUnit4ClassRunnerAppCtxTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
index 5b02643ea6..49d5ad5e7a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
@@ -40,7 +40,7 @@ import org.springframework.test.context.TestExecutionListeners;
  * <li>Spring's {@link Repeat &#064;Repeat}</li>
  * <li>Spring's {@link Timed &#064;Timed}</li>
  * </ul>
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java
index 215e410469..61059c3639 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java
@@ -28,7 +28,7 @@ import org.springframework.test.context.TestExecutionListeners;
  * Verifies support for JUnit 4.7 {@link Rule Rules} in conjunction with the
  * {@link SpringJUnit4ClassRunner}. The body of this test class is taken from
  * the JUnit 4.7 release notes.
- * 
+ *
  * @author JUnit 4.7 Team
  * @author Sam Brannen
  * @since 3.0
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
index af1389b879..0b2993059f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
@@ -69,11 +69,11 @@ import org.springframework.test.context.support.GenericXmlContextLoader;
  * dependencies will be injected via {@link Autowired @Autowired},
  * {@link Inject @Inject}, and {@link Resource @Resource} from beans defined in
  * the {@link ApplicationContext} loaded from the default classpath resource:
- * 
+ *
  * <code>&quot;/org/springframework/test/context/junit/SpringJUnit4ClassRunnerAppCtxTests-context.xml&quot;</code>
  * .
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  * @see AbsolutePathSpringJUnit4ClassRunnerAppCtxTests
@@ -88,7 +88,7 @@ public class SpringJUnit4ClassRunnerAppCtxTests implements ApplicationContextAwa
 	/**
 	 * Default resource path for the application context configuration for
 	 * {@link SpringJUnit4ClassRunnerAppCtxTests}:
-	 * 
+	 *
 	 * <code>&quot;/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml&quot;</code>
 	 */
 	public static final String DEFAULT_CONTEXT_RESOURCE_PATH = "/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml";
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
index f9096ab5f0..d8446ea579 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
@@ -43,15 +43,15 @@ import org.springframework.test.context.junit4.profile.xml.DevProfileXmlConfigTe
 /**
  * JUnit test suite for tests involving {@link SpringJUnit4ClassRunner} and the
  * <em>Spring TestContext Framework</em>.
- * 
+ *
  * <p>This test suite serves a dual purpose of verifying that tests run with
  * {@link SpringJUnit4ClassRunner} can be used in conjunction with JUnit's
  * {@link Suite} runner.
- * 
+ *
  * <p>Note that tests included in this suite will be executed at least twice if
  * run from an automated build process, test runner, etc. that is configured to
  * run tests based on a &quot;*Tests.class&quot; pattern match.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java
index 4d7eb155da..a3679ba75e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java
@@ -33,7 +33,7 @@ import org.springframework.test.context.TestExecutionListeners;
  * <li>JUnit's {@link Test#timeout() @Test(timeout=...)}</li>
  * <li>Spring's {@link Timed @Timed}</li>
  * </ul>
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java
index 1dd4494dd6..ad6090ab61 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java
@@ -31,7 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
  * {@link Transactional &#64;Transactional} and {@link NotTransactional
  * &#64;NotTransactional} annotations in conjunction with {@link Timed
  * &#64;Timed} and JUnit 4's {@link Test#timeout() timeout} attribute.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java b/spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java
index 6a8edd857c..2b38752082 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java
@@ -25,7 +25,7 @@ import org.junit.runner.notification.RunListener;
 /**
  * Simple {@link RunListener} which tracks how many times certain JUnit callback
  * methods were called: only intended for the integration test suite.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
index e83eaddd33..e8a92ab0ef 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
@@ -22,14 +22,14 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunnerAppCtxTest
 /**
  * Integration tests that verify support for configuration classes in
  * the Spring TestContext Framework.
- * 
+ *
  * <p>Furthermore, by extending {@link SpringJUnit4ClassRunnerAppCtxTests},
  * this class also verifies support for several basic features of the
  * Spring TestContext Framework. See JavaDoc in
  * <code>SpringJUnit4ClassRunnerAppCtxTests</code> for details.
- * 
+ *
  * <p>Configuration will be loaded from {@link PojoAndStringConfig}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java
index 61a033f3cb..70e1a8dd5c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java
@@ -28,10 +28,10 @@ import org.springframework.test.context.ContextConfiguration;
 /**
  * Integration tests that verify support for configuration classes in
  * the Spring TestContext Framework.
- * 
+ *
  * <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTests.ContextConfiguration}
  * and {@link BeanOverridingDefaultConfigClassesInheritedTests.ContextConfiguration}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java
index 537e46ead0..223c5a6f59 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java
@@ -25,10 +25,10 @@ import org.springframework.test.context.ContextConfiguration;
 /**
  * Integration tests that verify support for configuration classes in
  * the Spring TestContext Framework.
- * 
+ *
  * <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTests.ContextConfiguration}
  * and {@link BeanOverridingDefaultConfigClassesInheritedTests.ContextConfiguration}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java
index e6a1d67b31..8773890968 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java
@@ -32,9 +32,9 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 /**
  * Integration tests that verify support for configuration classes in
  * the Spring TestContext Framework.
- * 
+ *
  * <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTests.ContextConfiguration}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  * @see DefaultLoaderDefaultConfigClassesBaseTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java
index 281c8f3f26..aed661d838 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java
@@ -29,10 +29,10 @@ import org.springframework.test.context.ContextConfiguration;
 /**
  * Integration tests that verify support for configuration classes in
  * the Spring TestContext Framework.
- * 
+ *
  * <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTests.ContextConfiguration}
  * and {@link DefaultConfigClassesInheritedTests.ContextConfiguration}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java
index c61562127f..db1c4bca19 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java
@@ -30,7 +30,7 @@ import org.springframework.test.context.support.DelegatingSmartContextLoader;
  * Integration tests that verify support for configuration classes in
  * the Spring TestContext Framework in conjunction with the
  * {@link DelegatingSmartContextLoader}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java
index cdf4207a01..cfc0a5fd53 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java
@@ -27,7 +27,7 @@ import org.springframework.test.context.support.DelegatingSmartContextLoader;
  * Integration tests that verify support for configuration classes in
  * the Spring TestContext Framework in conjunction with the
  * {@link DelegatingSmartContextLoader}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java
index 68a1d37603..f2b001e10d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java
@@ -33,7 +33,7 @@ import org.springframework.test.context.support.DelegatingSmartContextLoader;
  * Integration tests that verify support for configuration classes in
  * the Spring TestContext Framework in conjunction with the
  * {@link DelegatingSmartContextLoader}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  * @see DefaultConfigClassesBaseTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java
index a5706a1517..6ba03e1bc4 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java
@@ -31,7 +31,7 @@ import org.springframework.test.context.support.DelegatingSmartContextLoader;
  * Integration tests that verify support for configuration classes in
  * the Spring TestContext Framework in conjunction with the
  * {@link DelegatingSmartContextLoader}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java
index 46b7259581..b2e4fedb24 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java
@@ -31,7 +31,7 @@ import org.springframework.test.context.support.DelegatingSmartContextLoader;
  * Integration tests that verify support for configuration classes in
  * the Spring TestContext Framework in conjunction with the
  * {@link DelegatingSmartContextLoader}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java
index 69a2c846b5..f769cb1a13 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java
@@ -31,7 +31,7 @@ import org.springframework.test.context.support.DelegatingSmartContextLoader;
  * Integration tests that verify support for configuration classes in
  * the Spring TestContext Framework in conjunction with the
  * {@link DelegatingSmartContextLoader}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java
index cd351bdfc0..da02bb8228 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java
@@ -30,9 +30,9 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 /**
  * Integration tests that verify support for configuration classes in
  * the Spring TestContext Framework.
- * 
+ *
  * <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTests.ContextConfiguration}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java
index 642d2d67e7..6a384d8c6a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java
@@ -30,10 +30,10 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 /**
  * Integration tests that verify support for configuration classes in
  * the Spring TestContext Framework.
- * 
+ *
  * <p>Configuration will be loaded from {@link DefaultConfigClassesInheritedTests.ContextConfiguration}
  * and {@link DefaultConfigClassesBaseTests.ContextConfiguration}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
index e04c1c0737..6a169ebf2b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
@@ -23,12 +23,12 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * ApplicationContext configuration class for various integration tests.
- * 
+ *
  * <p>The beans defined in this configuration class map directly to the
  * beans defined in <code>SpringJUnit4ClassRunnerAppCtxTests-context.xml</code>.
  * Consequently, the application contexts loaded from these two sources
  * should be identical with regard to bean definitions.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java
index 3c32c47b82..69aecb723b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/HibernateSessionFlushingTests.java
@@ -37,7 +37,7 @@ import org.springframework.test.context.junit4.orm.service.PersonService;
 /**
  * Transactional integration tests regarding <i>manual</i> session flushing with
  * Hibernate.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java
index cdb2b0f884..464ff84af0 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java
@@ -18,7 +18,7 @@ package org.springframework.test.context.junit4.orm.domain;
 
 /**
  * DriversLicense POJO.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java
index e264f66e8e..882578a189 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java
@@ -18,7 +18,7 @@ package org.springframework.test.context.junit4.orm.domain;
 
 /**
  * Person POJO.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java
index a0b7730d31..56bd298739 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java
@@ -20,7 +20,7 @@ import org.springframework.test.context.junit4.orm.domain.Person;
 
 /**
  * Person Repository API.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
index 702dfcae7e..994b886b30 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
@@ -24,7 +24,7 @@ import org.springframework.test.context.junit4.orm.repository.PersonRepository;
 
 /**
  * Hibernate implementation of the {@link PersonRepository} API.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java
index 73aa29a5c3..e8a7c2f5a5 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java
@@ -20,7 +20,7 @@ import org.springframework.test.context.junit4.orm.domain.Person;
 
 /**
  * Person Service API.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java
index dbd7fe6c22..039faa6894 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java
@@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Standard implementation of the {@link PersonService} API.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr4868/Jsr250LifecycleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr4868/Jsr250LifecycleTests.java
index 45af06fb21..44b7d1bd24 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr4868/Jsr250LifecycleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr4868/Jsr250LifecycleTests.java
@@ -38,12 +38,12 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution
 /**
  * Integration tests that investigate the applicability of JSR-250 lifecycle
  * annotations in test classes.
- * 
+ *
  * <p>This class does not really contain actual <em>tests</em> per se. Rather it
  * can be used to empirically verify the expected log output (see below). In
- * order to see the log output, one would naturally need to ensure that the 
+ * order to see the log output, one would naturally need to ensure that the
  * logger category for this class is enabled at {@code INFO} level.
- * 
+ *
  * <h4>Expected Log Output</h4>
  * <pre>
  * INFO : org.springframework.test.context.junit4.spr4868.LifecycleBean - initializing
@@ -57,7 +57,7 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution
  * INFO : org.springframework.test.context.junit4.spr4868.ExampleTest - tearDown()
  * INFO : org.springframework.test.context.junit4.spr4868.LifecycleBean - destroying
  * </pre>
- * 
+ *
  * @author Sam Brannen
  * @since 3.2
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
index f0012c412c..47d7dab773 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
@@ -30,7 +30,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * Integration tests to verify claims made in <a
  * href="http://jira.springframework.org/browse/SPR-6128"
  * target="_blank">SPR-6128</a>.
- * 
+ *
  * @author Sam Brannen
  * @author Chris Beams
  * @since 3.0
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/AbstractTransactionalAnnotatedConfigClassTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/AbstractTransactionalAnnotatedConfigClassTests.java
index cb00d7af81..d8b7fcacf3 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/AbstractTransactionalAnnotatedConfigClassTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/AbstractTransactionalAnnotatedConfigClassTests.java
@@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
  * This set of tests (i.e., all concrete subclasses) investigates the claims made in
  * <a href="https://jira.springsource.org/browse/SPR-9051" target="_blank">SPR-9051</a>
  * with regard to transactional tests.
- * 
+ *
  * @author Sam Brannen
  * @since 3.2
  * @see org.springframework.test.context.testng.AnnotationConfigTransactionalTestNGSpringContextTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/AtBeanLiteModeScopeTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/AtBeanLiteModeScopeTests.java
index 9a1fe08c37..035bc9f23d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/AtBeanLiteModeScopeTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/AtBeanLiteModeScopeTests.java
@@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 /**
  * Integration tests that verify proper scoping of beans created in
  * <em>{@code @Bean} Lite Mode</em>.
- * 
+ *
  * @author Sam Brannen
  * @since 3.2
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/LifecycleBean.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/LifecycleBean.java
index 0d08f3d93a..07c0550c2d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/LifecycleBean.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/LifecycleBean.java
@@ -20,7 +20,7 @@ import javax.annotation.PostConstruct;
 
 /**
  * Simple POJO that contains lifecycle callbacks.
- * 
+ *
  * @author Sam Brannen
  * @since 3.2
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassWithAtConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassWithAtConfigurationTests.java
index 3b5a579d8a..373166d9b4 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassWithAtConfigurationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassWithAtConfigurationTests.java
@@ -32,7 +32,7 @@ import org.springframework.transaction.PlatformTransactionManager;
 /**
  * Concrete implementation of {@link AbstractTransactionalAnnotatedConfigClassTests}
  * that uses a true {@link Configuration @Configuration class}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.2
  * @see TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests
@@ -43,7 +43,7 @@ public class TransactionalAnnotatedConfigClassWithAtConfigurationTests extends
 
 	/**
 	 * This is <b>intentionally</b> annotated with {@code @Configuration}.
-	 * 
+	 *
 	 * <p>Consequently, this class contains standard singleton bean methods
 	 * instead of <i>annotated factory bean methods</i>.
 	 */
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests.java
index 63c6ef5849..3f6a054ecb 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests.java
@@ -38,7 +38,7 @@ import org.springframework.transaction.PlatformTransactionManager;
  * that does <b>not</b> use a true {@link Configuration @Configuration class} but
  * rather a <em>lite mode</em> configuration class (see the Javadoc for {@link Bean @Bean}
  * for details).
- * 
+ *
  * @author Sam Brannen
  * @since 3.2
  * @see Bean
@@ -50,7 +50,7 @@ public class TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests exte
 
 	/**
 	 * This is intentionally <b>not</b> annotated with {@code @Configuration}.
-	 * 
+	 *
 	 * <p>Consequently, this class contains <i>annotated factory bean methods</i>
 	 * instead of standard singleton bean methods.
 	 */
@@ -74,10 +74,10 @@ public class TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests exte
 		/**
 		 * Since this method does not reside in a true {@code @Configuration class},
 		 * it acts as a factory method when invoked directly (e.g., from
-		 * {@link #transactionManager()}) and as a singleton bean when retrieved 
+		 * {@link #transactionManager()}) and as a singleton bean when retrieved
 		 * through the application context (e.g., when injected into the test
 		 * instance). The result is that this method will be called twice:
-		 * 
+		 *
 		 * <ol>
 		 * <li>once <em>indirectly</em> by the {@link TransactionalTestExecutionListener}
 		 * when it retrieves the {@link PlatformTransactionManager} from the
@@ -110,8 +110,8 @@ public class TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests exte
 	}
 
 	/**
-	 * Overrides {@code afterTransaction()} in order to assert a different result. 
-	 * 
+	 * Overrides {@code afterTransaction()} in order to assert a different result.
+	 *
 	 * <p>See in-line comments for details.
 	 *
 	 * @see AbstractTransactionalAnnotatedConfigClassTests#afterTransaction()
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java
index d44ce27d96..85da86b3f5 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java
@@ -21,7 +21,7 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * Not an actual <em>test case</em>.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  * @see AnnotationConfigContextLoaderTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java
index 8cc5276286..d56c24f5e5 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 
 /**
  * Unit tests for {@link AnnotationConfigContextLoader}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java
index 5d24320003..adaff61eb0 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java
@@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * Not an actual <em>test case</em>.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  * @see AnnotationConfigContextLoaderTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/DelegatingSmartContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/DelegatingSmartContextLoaderTests.java
index 21a32e3714..20355683bc 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/DelegatingSmartContextLoaderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/DelegatingSmartContextLoaderTests.java
@@ -33,7 +33,7 @@ import org.springframework.util.ObjectUtils;
 
 /**
  * Unit tests for {@link DelegatingSmartContextLoader}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java
index 89a1653b09..7cde8c0190 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java
@@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * Not an actual <em>test case</em>.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  * @see AnnotationConfigContextLoaderTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java
index a07dc16cfa..e9e69e1a19 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java
@@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * Not an actual <em>test case</em>.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  * @see AnnotationConfigContextLoaderTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java
index a711853241..a8ae4fcc8b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java
@@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * Not an actual <em>test case</em>.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  * @see AnnotationConfigContextLoaderTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java
index 98858425fa..a569313555 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java
@@ -18,7 +18,7 @@ package org.springframework.test.context.support;
 
 /**
  * Not an actual <em>test case</em>.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  * @see AnnotationConfigContextLoaderTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/PrivateConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/PrivateConfigInnerClassTestCase.java
index d6e387be05..5432f578a1 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/PrivateConfigInnerClassTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/PrivateConfigInnerClassTestCase.java
@@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration;
 
 /**
  * Not an actual <em>test case</em>.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  * @see AnnotationConfigContextLoaderTests
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java
index dfabc22d7d..4cfb6b8abc 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java
@@ -45,10 +45,10 @@ import org.testng.annotations.Test;
  * Integration tests that verify support for
  * {@link import org.springframework.context.annotation.Configuration @Configuration}
  * classes with TestNG-based tests.
- * 
+ *
  * <p>Configuration will be loaded from
  * {@link AnnotationConfigTransactionalTestNGSpringContextTests.ContextConfiguration}.
- * 
+ *
  * @author Sam Brannen
  * @since 3.1
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
index 5f6840f495..27a08c054c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
@@ -43,7 +43,7 @@ import org.testng.annotations.Test;
 /**
  * Combined integration test for {@link AbstractTestNGSpringContextTests} and
  * {@link AbstractTransactionalTestNGSpringContextTests}.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java
index ab61dc2bc5..82fb19287b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java
@@ -43,7 +43,7 @@ import org.testng.annotations.Test;
  * individual tests. DirtiesContextTransactionalTestNGSpringContextTests
  * therefore verifies the expected behavior and correct semantics.
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
index ab76d69d47..66318987d0 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
@@ -57,7 +57,7 @@ import org.testng.TestNG;
  * and {@link TestExecutionListener#afterTestClass(TestContext)
  * afterTestClass()} lifecycle callback methods.
  * </p>
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
index f7bc81107e..cdc23e35bf 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
@@ -26,7 +26,7 @@ import org.testng.annotations.Test;
  * {@link AbstractTransactionalTestNGSpringContextTests}; used to verify claim
  * raised in <a href="http://jira.springframework.org/browse/SPR-6124"
  * target="_blank">SPR-6124</a>.
- * 
+ *
  * @author Sam Brannen
  * @since 3.0
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/web/WebContextLoaderTestSuite.java b/spring-test/src/test/java/org/springframework/test/context/web/WebContextLoaderTestSuite.java
index 06a83a2923..8ccd8b4f90 100644
--- a/spring-test/src/test/java/org/springframework/test/context/web/WebContextLoaderTestSuite.java
+++ b/spring-test/src/test/java/org/springframework/test/context/web/WebContextLoaderTestSuite.java
@@ -26,7 +26,7 @@ import org.springframework.web.context.WebApplicationContext;
  * Convenience test suite for integration tests that verify support for
  * {@link WebApplicationContext} {@linkplain ContextLoader context loaders}
  * in the TestContext framework.
- * 
+ *
  * @author Sam Brannen
  * @since 3.2
  */
diff --git a/spring-test/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java b/spring-test/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java
index 9651d2bcde..d5fd1b68e4 100644
--- a/spring-test/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java
@@ -28,7 +28,7 @@ import org.springframework.core.io.support.EncodedResource;
 
 /**
  * Unit tests for {@link JdbcTestUtils}.
- * 
+ *
  * @author Thomas Risberg
  * @author Sam Brannen
  * @since 2.5.4
diff --git a/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java b/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
index 0634161c3b..5b64657360 100644
--- a/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
@@ -29,7 +29,7 @@ import org.springframework.test.util.subpackage.Person;
 
 /**
  * Unit tests for {@link ReflectionTestUtils}.
- * 
+ *
  * @author Sam Brannen
  * @author Juergen Hoeller
  */
diff --git a/spring-test/src/test/java/org/springframework/test/util/subpackage/LegacyEntity.java b/spring-test/src/test/java/org/springframework/test/util/subpackage/LegacyEntity.java
index a31f450d15..19507c9380 100644
--- a/spring-test/src/test/java/org/springframework/test/util/subpackage/LegacyEntity.java
+++ b/spring-test/src/test/java/org/springframework/test/util/subpackage/LegacyEntity.java
@@ -21,7 +21,7 @@ import org.springframework.core.style.ToStringCreator;
 /**
  * A <em>legacy entity</em> whose {@link #toString()} method has side effects;
  * intended for use in unit tests.
- * 
+ *
  * @author Sam Brannen
  * @since 3.2
  */
diff --git a/spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java b/spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java
index 4eb84791f5..eac5e7b76f 100644
--- a/spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java
+++ b/spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java
@@ -21,7 +21,7 @@ import org.springframework.core.style.ToStringCreator;
 /**
  * Concrete subclass of {@link PersistentEntity} representing a <em>person</em>
  * entity; intended for use in unit tests.
- * 
+ *
  * @author Sam Brannen
  * @since 2.5
  */
diff --git a/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java b/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java
index 68467df26a..c9d7a93f60 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java
@@ -42,5 +42,5 @@ public class DataRetrievalFailureException extends NonTransientDataAccessExcepti
 	public DataRetrievalFailureException(String msg, Throwable cause) {
 		super(msg, cause);
 	}
-	
+
 }
diff --git a/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java
index d4a2d1957b..57ddae5379 100644
--- a/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java
@@ -42,7 +42,7 @@ public class IncorrectUpdateSemanticsDataAccessException extends InvalidDataAcce
 	public IncorrectUpdateSemanticsDataAccessException(String msg, Throwable cause) {
 		super(msg, cause);
 	}
-	
+
 	/**
 	 * Return whether data was updated.
 	 * If this method returns false, there's nothing to roll back.
diff --git a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java
index 0537b27dbe..735acdc348 100644
--- a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java
@@ -24,7 +24,7 @@ package org.springframework.dao;
  * @author Rod Johnson
  */
 public class InvalidDataAccessResourceUsageException extends NonTransientDataAccessException {
-	
+
 	/**
 	 * Constructor for InvalidDataAccessResourceUsageException.
 	 * @param msg the detail message
@@ -32,7 +32,7 @@ public class InvalidDataAccessResourceUsageException extends NonTransientDataAcc
 	public InvalidDataAccessResourceUsageException(String msg) {
 		super(msg);
 	}
-	
+
 	/**
 	 * Constructor for InvalidDataAccessResourceUsageException.
 	 * @param msg the detail message
diff --git a/spring-tx/src/main/java/org/springframework/dao/package-info.java b/spring-tx/src/main/java/org/springframework/dao/package-info.java
index 725797c63a..dd36227a35 100644
--- a/spring-tx/src/main/java/org/springframework/dao/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/dao/package-info.java
@@ -7,10 +7,10 @@
  * subclasses), calling code can detect and handle common problems such
  * as deadlocks without being tied to a particular data access strategy,
  * such as JDBC.
- * 
+ *
  * <p>All these exceptions are unchecked, meaning that calling code can
  * leave them uncaught and treat all data access exceptions as fatal.
- * 
+ *
  * <p>The classes in this package are discussed in Chapter 9 of
  * <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
  * by Rod Johnson (Wrox, 2002).
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java b/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
index 5c0e6e7831..b5946c404e 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
  * @since 2.0
  */
 public class ChainedPersistenceExceptionTranslator implements PersistenceExceptionTranslator {
-	
+
 	/** List of PersistenceExceptionTranslators */
 	private final List<PersistenceExceptionTranslator> delegates = new ArrayList<PersistenceExceptionTranslator>(4);
 
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 6e7e07608a..5dbf87b39c 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
@@ -196,8 +196,8 @@ public abstract class DataAccessUtils {
 
 		return objectResult(results, Number.class).longValue();
 	}
-	
-	
+
+
 	/**
 	 * Return a translated exception if this is appropriate,
 	 * otherwise return the input exception.
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java
index e17732f11b..21300ae57e 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java
@@ -31,7 +31,7 @@ import org.springframework.dao.DataAccessException;
  * @since 2.0
  */
 public interface PersistenceExceptionTranslator {
-	
+
 	/**
 	 * Translate the given runtime exception thrown by a persistence framework to a
 	 * corresponding exception from Spring's generic DataAccessException hierarchy,
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
index e2f5761a63..f35273b627 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
index 6492bc7217..b7959a6079 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -32,7 +32,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
  * @see javax.resource.cci.ResultSet
  */
 public class InvalidResultSetAccessException extends InvalidDataAccessResourceUsageException {
-	
+
 	/**
 	 * Constructor for InvalidResultSetAccessException.
 	 * @param msg message
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
index 3fd28fc9cf..47d5743711 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
@@ -28,7 +28,7 @@ import org.springframework.jca.cci.CannotGetCciConnectionException;
 import org.springframework.transaction.support.ResourceHolderSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
- 
+
 /**
  * Helper class that provides static methods for obtaining CCI Connections
  * from a {@link javax.resource.cci.ConnectionFactory}. Includes special
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java
index 8641078639..693345dc62 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
index f7dd0edae5..54a8a1f499 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
@@ -28,7 +28,7 @@ import org.springframework.dao.DataAccessException;
  * Generic callback interface for code that operates on a CCI Connection.
  * Allows to execute any number of operations on a single Connection,
  * using any type and number of Interaction.
- * 
+ *
  * <p>This is particularly useful for delegating to existing data access code
  * that expects a Connection to work on and throws ResourceException. For newly
  * written code, it is strongly recommended to use CciTemplate's more specific
@@ -47,7 +47,7 @@ public interface ConnectionCallback<T> {
 	 * Gets called by <code>CciTemplate.execute</code> with an active CCI Connection.
 	 * Does not need to care about activating or closing the Connection, or handling
 	 * transactions.
-	 * 
+	 *
 	 * <p>If called without a thread-bound CCI transaction (initiated by
 	 * CciLocalTransactionManager), the code will simply get executed on the CCI
 	 * Connection with its transactional semantics. If CciTemplate is configured
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
index 9de2bfce86..5ed18fb361 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
@@ -29,7 +29,7 @@ import org.springframework.dao.DataAccessException;
  * Allows to execute any number of operations on a single Interaction, for
  * example a single execute call or repeated execute calls with varying
  * parameters.
- * 
+ *
  * <p>This is particularly useful for delegating to existing data access code
  * that expects an Interaction to work on and throws ResourceException. For newly
  * written code, it is strongly recommended to use CciTemplate's more specific
@@ -48,7 +48,7 @@ public interface InteractionCallback<T> {
 	 * Gets called by <code>CciTemplate.execute</code> with an active CCI Interaction.
 	 * Does not need to care about activating or closing the Interaction, or
 	 * handling transactions.
-	 * 
+	 *
 	 * <p>If called without a thread-bound CCI transaction (initiated by
 	 * CciLocalTransactionManager), the code will simply get executed on the CCI
 	 * Interaction with its transactional semantics. If CciTemplate is configured
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
index 4458dfb9bf..956403b511 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
index 6cdb875326..539a7b9eaf 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
@@ -23,7 +23,7 @@ import javax.resource.cci.Record;
 
 import org.springframework.dao.DataAccessException;
 
-/** 
+/**
  * Callback interface for extracting a result object from a CCI Record instance.
  *
  * <p>Used for output object creation in CciTemplate. Alternatively, output
@@ -44,8 +44,8 @@ import org.springframework.dao.DataAccessException;
  * @see javax.resource.cci.ResultSet
  */
 public interface RecordExtractor<T> {
-	
-	/** 
+
+	/**
 	 * Process the data in the given Record, creating a corresponding result object.
 	 * @param record the Record to extract data from
 	 * (possibly a CCI ResultSet)
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
index 52d9d7ef6d..223f5daf5f 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java
index bbbd94bd6f..638ae9d23a 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
index 8c9915b796..3735e34d16 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
index 0382efa2f2..5645c336a6 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
@@ -186,7 +186,7 @@ public interface TransactionDefinition {
 
 	/**
 	 * Use the default timeout of the underlying transaction system,
-	 * or none if timeouts are not supported. 
+	 * or none if timeouts are not supported.
 	 */
 	int TIMEOUT_DEFAULT = -1;
 
@@ -237,7 +237,7 @@ public interface TransactionDefinition {
 	 * it will <i>not necessarily</i> cause failure of write access attempts.
 	 * A transaction manager which cannot interpret the read-only hint will
 	 * <i>not</i> throw an exception when asked for a read-only transaction.
-	 * @return <code>true</code> if the transaction is to be optimized as read-only 
+	 * @return <code>true</code> if the transaction is to be optimized as read-only
 	 * @see org.springframework.transaction.support.TransactionSynchronization#beforeCommit(boolean)
 	 * @see org.springframework.transaction.support.TransactionSynchronizationManager#isCurrentTransactionReadOnly()
 	 */
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java
index 28c4f859ba..ef28675b74 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java
@@ -17,7 +17,7 @@
 package org.springframework.transaction;
 
 /**
- * Superclass for exceptions caused by inappropriate usage of 
+ * Superclass for exceptions caused by inappropriate usage of
  * a Spring transaction API.
  *
  * @author Rod Johnson
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java
index 03e569991f..597afcc58c 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java
@@ -28,7 +28,7 @@ import org.springframework.transaction.TransactionDefinition;
  * @since 1.2
  */
 public enum Isolation {
-	
+
 	/**
 	 * Use the default isolation level of the underlying datastore.
 	 * All other levels correspond to the JDBC isolation levels.
@@ -82,7 +82,7 @@ public enum Isolation {
 
 
 	Isolation(int value) { this.value = value; }
-	
+
 	public int value() { return this.value; }
-	
+
 }
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
index 5e0a796450..37e9e5c7ec 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
@@ -16,7 +16,7 @@
 
 package org.springframework.transaction.annotation;
 
-import org.springframework.transaction.TransactionDefinition; 
+import org.springframework.transaction.TransactionDefinition;
 
 /**
  * Enumeration that represents transaction propagation behaviors for use
@@ -28,7 +28,7 @@ import org.springframework.transaction.TransactionDefinition;
  * @since 1.2
  */
 public enum Propagation {
-	
+
 	/**
 	 * Support a current transaction, create a new one if none exists.
 	 * Analogous to EJB transaction attribute of the same name.
@@ -99,7 +99,7 @@ public enum Propagation {
 
 
 	Propagation(int value) { this.value = value; }
-	
+
 	public int value() { return this.value; }
-	
+
 }
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
index 42767a7ea4..c807119f76 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
@@ -34,7 +34,7 @@ import org.springframework.util.ObjectUtils;
  * @see org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator
  */
 public class MatchAlwaysTransactionAttributeSource implements TransactionAttributeSource, Serializable {
-  
+
 	private TransactionAttribute transactionAttribute = new DefaultTransactionAttribute();
 
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
index 0181a5efa5..be037ba6f9 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
@@ -35,7 +35,7 @@ import org.springframework.util.PatternMatchUtils;
 /**
  * Simple {@link TransactionAttributeSource} implementation that
  * allows attributes to be stored per method in a {@link Map}.
- * 
+ *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @since 24.04.2003
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
index da4f0006dd..17dc29a531 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2007 the original author 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.
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 c1d7e41359..4c60fbf2f8 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
@@ -133,7 +133,7 @@ public class RollbackRuleAttribute implements Serializable{
 		RollbackRuleAttribute rhs = (RollbackRuleAttribute) other;
 		return this.exceptionName.equals(rhs.exceptionName);
 	}
-	
+
 	@Override
 	public int hashCode() {
 		return this.exceptionName.hashCode();
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
index d67368843f..d1f7b1665e 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
@@ -152,7 +152,7 @@ public class RuleBasedTransactionAttribute extends DefaultTransactionAttribute i
 			logger.trace("No relevant rollback rule found: applying default rules");
 			return super.rollbackOn(ex);
 		}
-			
+
 		return !(winner instanceof NoRollbackRuleAttribute);
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java
index e208008cb6..3e02fef6d5 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java
@@ -44,5 +44,5 @@ public interface TransactionAttribute extends TransactionDefinition {
 	 * @return whether to perform a rollback or not
 	 */
 	boolean rollbackOn(Throwable ex);
-	
+
 }
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
index 941c2b7336..1aaee3b393 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
@@ -36,7 +36,7 @@ import org.springframework.aop.support.AbstractPointcutAdvisor;
  * @see TransactionProxyFactoryBean
  */
 public class TransactionAttributeSourceAdvisor extends AbstractPointcutAdvisor {
-	
+
 	private TransactionInterceptor transactionInterceptor;
 
 	private final TransactionAttributeSourcePointcut pointcut = new TransactionAttributeSourcePointcut() {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/package-info.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/package-info.java
index 18f5282cd1..1a88634aa5 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/package-info.java
@@ -4,10 +4,10 @@
  * AOP-based solution for declarative transaction demarcation.
  * Builds on the AOP infrastructure in org.springframework.aop.framework.
  * Any POJO can be transactionally advised with Spring.
- * 
+ *
  * <p>The TransactionFactoryProxyBean can be used to create transactional
  * AOP proxies transparently to code that uses them.
- * 
+ *
  * <p>The TransactionInterceptor is the AOP Alliance MethodInterceptor that
  * delivers transactional advice, based on the Spring transaction abstraction.
  * This allows declarative transaction management in any environment,
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 dbb9f85fb4..07e3344f0f 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
@@ -64,7 +64,7 @@ import org.springframework.transaction.UnexpectedRollbackException;
  * transaction for closing at transaction completion time, allowing e.g. for reuse
  * of the same Hibernate Session within the transaction. The same mechanism can
  * also be leveraged for custom synchronization needs in an application.
- * 
+ *
  * <p>The state of this class is serializable, to allow for serializing the
  * transaction strategy along with proxies that carry a transaction interceptor.
  * It is up to subclasses if they wish to make their state to be serializable too.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
index 0018fc1f47..6ad3318a1d 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
@@ -19,7 +19,7 @@ package org.springframework.transaction.support;
 /**
  * A simple {@link org.springframework.transaction.TransactionStatus}
  * implementation.
- * 
+ *
  * <p>Derives from {@link AbstractTransactionStatus} and adds an explicit
  * {@link #isNewTransaction() "newTransaction"} flag.
  *
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 a152f94698..ccf5109c58 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
@@ -44,7 +44,7 @@ public interface TransactionSynchronization {
 
 	/** Completion status in case of heuristic mixed completion or system errors */
 	int STATUS_UNKNOWN = 2;
-	
+
 
 	/**
 	 * Suspend this synchronization.
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 93aafbdabd..0c7aedfd22 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
@@ -118,7 +118,7 @@ public abstract class TransactionSynchronizationManager {
 	 * Check if there is a resource for the given key bound to the current thread.
 	 * @param key the key to check (usually the resource factory)
 	 * @return if there is a value bound to the current thread
-	 * @see ResourceTransactionManager#getResourceFactory() 
+	 * @see ResourceTransactionManager#getResourceFactory()
 	 */
 	public static boolean hasResource(Object key) {
 		Object actualKey = TransactionSynchronizationUtils.unwrapResourceIfNecessary(key);
diff --git a/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java
index 7d87547b5f..c5c4ed5e67 100644
--- a/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-tx/src/test/java/org/springframework/beans/IOther.java b/spring-tx/src/test/java/org/springframework/beans/IOther.java
index 797486ec44..6a8f74187c 100644
--- a/spring-tx/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-tx/src/test/java/org/springframework/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
index a06e15d150..0eb8df5c8a 100644
--- a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java b/spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java
index 010da75e8f..5cd19f8f02 100644
--- a/spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java
+++ b/spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java
@@ -27,39 +27,39 @@ import org.springframework.dao.support.DataAccessUtilsTests.MapPersistenceExcept
  * @since 2.0
  */
 public class ChainedPersistenceExceptionTranslatorTests extends TestCase {
-	
+
 	public void testEmpty() {
 		ChainedPersistenceExceptionTranslator pet = new ChainedPersistenceExceptionTranslator();
 		//MapPersistenceExceptionTranslator mpet = new MapPersistenceExceptionTranslator();
 		RuntimeException in = new RuntimeException("in");
 		assertSame(in, DataAccessUtils.translateIfNecessary(in, pet));
 	}
-	
+
 	public void testExceptionTranslationWithTranslation() {
 		MapPersistenceExceptionTranslator mpet1 = new MapPersistenceExceptionTranslator();
 		RuntimeException in1 = new RuntimeException("in");
 		InvalidDataAccessApiUsageException out1 = new InvalidDataAccessApiUsageException("out");
 		InvalidDataAccessApiUsageException out2 = new InvalidDataAccessApiUsageException("out");
 		mpet1.addTranslation(in1, out1);
-		
+
 		ChainedPersistenceExceptionTranslator chainedPet1 = new ChainedPersistenceExceptionTranslator();
 		assertSame("Should not translate yet", in1, DataAccessUtils.translateIfNecessary(in1, chainedPet1));
 		chainedPet1.addDelegate(mpet1);
 		assertSame("Should now translate", out1, DataAccessUtils.translateIfNecessary(in1, chainedPet1));
-		
+
 		// Now add a new translator and verify it wins
 		MapPersistenceExceptionTranslator mpet2 = new MapPersistenceExceptionTranslator();
 		mpet2.addTranslation(in1, out2);
 		chainedPet1.addDelegate(mpet2);
-		assertSame("Should still translate the same due to ordering", 
+		assertSame("Should still translate the same due to ordering",
 				out1, DataAccessUtils.translateIfNecessary(in1, chainedPet1));
-		
+
 		ChainedPersistenceExceptionTranslator chainedPet2 = new ChainedPersistenceExceptionTranslator();
 		chainedPet2.addDelegate(mpet2);
 		chainedPet2.addDelegate(mpet1);
-		assertSame("Should translate differently due to ordering", 
+		assertSame("Should translate differently due to ordering",
 				out2, DataAccessUtils.translateIfNecessary(in1, chainedPet2));
-		
+
 		RuntimeException in2 = new RuntimeException("in2");
 		OptimisticLockingFailureException out3 = new OptimisticLockingFailureException("out2");
 		assertNull(chainedPet2.translateExceptionIfPossible(in2));
diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
index dc38fb5e8e..16f1012a75 100644
--- a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
+++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -104,7 +104,7 @@ public class CciLocalTransactionTests {
 		LocalTransaction localTransaction = createMock(LocalTransaction.class);
 		final Record record = createMock(Record.class);
 		final InteractionSpec interactionSpec = createMock(InteractionSpec.class);
-		
+
 		expect(connectionFactory.getConnection()).andReturn(connection);
 
 		expect(connection.getLocalTransaction()).andReturn(localTransaction);
@@ -122,7 +122,7 @@ public class CciLocalTransactionTests {
 		localTransaction.rollback();
 
 		connection.close();
-		
+
 		replay(connectionFactory, connection, localTransaction, interaction, record);
 
 		org.springframework.jca.cci.connection.CciLocalTransactionManager tm = new org.springframework.jca.cci.connection.CciLocalTransactionManager();
diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
index d724b77190..c8f43b9625 100644
--- a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
+++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
index 0fa0b63d4b..bd8f7fb5d0 100644
--- a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
+++ b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -80,7 +80,7 @@ public class EisOperationTests {
 		InteractionSpec interactionSpec = createMock(InteractionSpec.class);
 
 		SimpleRecordOperation operation = new SimpleRecordOperation(connectionFactory, interactionSpec);
-		
+
 		expect(connectionFactory.getConnection()).andReturn(connection);
 
 		expect(connection.createInteraction()).andReturn(interaction);
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index 8b816b45d0..f6c3f0a376 100644
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -52,7 +52,7 @@ import org.springframework.util.ClassUtils;
  * DataSource ds = new DriverManagerDataSource(...);
  * builder.bind("java:comp/env/jdbc/myds", ds);
  * builder.activate();</pre>
- * 
+ *
  * Note that it's impossible to activate multiple builders within the same JVM,
  * due to JNDI restrictions. Thus to configure a fresh builder repeatedly, use
  * the following code to get a reference to either an already activated builder
diff --git a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index d5c2531fbd..563d610714 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -50,7 +50,7 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM
 		++rollbacks;
 		--inflight;
 	}
-	
+
 	public void clear() {
 		begun = commits = rollbacks = inflight = 0;
 	}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
index 4b6d23d369..480b869d3a 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
@@ -43,7 +43,7 @@ import org.springframework.transaction.support.TransactionTemplate;
  * @since 12.05.2003
  */
 public class JtaTransactionManagerTests extends TestCase {
-	
+
 	public void testJtaTransactionManagerWithCommit() throws Exception {
 		MockControl utControl = MockControl.createControl(UserTransaction.class);
 		UserTransaction ut = (UserTransaction) utControl.getMock();
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
index f64862b938..1cd39725b0 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
index b83f83ebd4..cfae77ca56 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
@@ -76,13 +76,13 @@ public class TxNamespaceHandlerTests extends TestCase {
 			assertEquals("Should have 1 rolled back transaction", 1, ptm.rollbacks);
 		}
 	}
-	
+
 	public void testRollbackRules() {
 		TransactionInterceptor txInterceptor = (TransactionInterceptor) context.getBean("txRollbackAdvice");
 		TransactionAttributeSource txAttrSource = txInterceptor.getTransactionAttributeSource();
 		TransactionAttribute txAttr = txAttrSource.getTransactionAttribute(getAgeMethod,ITestBean.class);
 		assertTrue("should be configured to rollback on Exception",txAttr.rollbackOn(new Exception()));
-		
+
 		txAttr = txAttrSource.getTransactionAttribute(setAgeMethod, ITestBean.class);
 		assertFalse("should not rollback on RuntimeException",txAttr.rollbackOn(new RuntimeException()));
 	}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
index 9bd446fc87..6d61e66360 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
@@ -43,7 +43,7 @@ import org.springframework.util.SerializationTestUtils;
  * @author Juergen Hoeller
  */
 public class AnnotationTransactionAttributeSourceTests {
-	
+
 	@Test
 	public void testSerializable() throws Exception {
 		TestBean1 tb = new TestBean1();
@@ -71,10 +71,10 @@ public class AnnotationTransactionAttributeSourceTests {
 	@Test
 	public void testNullOrEmpty() throws Exception {
 		Method method = Empty.class.getMethod("getAge", (Class[]) null);
-		
+
 		AnnotationTransactionAttributeSource atas = new AnnotationTransactionAttributeSource();
 		assertNull(atas.getTransactionAttribute(method, null));
-		
+
 		// Try again in case of caching
 		assertNull(atas.getTransactionAttribute(method, null));
 	}
@@ -86,10 +86,10 @@ public class AnnotationTransactionAttributeSourceTests {
 	@Test
 	public void testTransactionAttributeDeclaredOnClassMethod() throws Exception {
 		Method classMethod = ITestBean.class.getMethod("getAge", (Class[]) null);
-		
+
 		AnnotationTransactionAttributeSource atas = new AnnotationTransactionAttributeSource();
 		TransactionAttribute actual = atas.getTransactionAttribute(classMethod, TestBean1.class);
-		
+
 		RuleBasedTransactionAttribute rbta = new RuleBasedTransactionAttribute();
 		rbta.getRollbackRules().add(new RollbackRuleAttribute(Exception.class));
 		assertEquals(rbta.getRollbackRules(), ((RuleBasedTransactionAttribute) actual).getRollbackRules());
@@ -124,7 +124,7 @@ public class AnnotationTransactionAttributeSourceTests {
 
 		AnnotationTransactionAttributeSource atas = new AnnotationTransactionAttributeSource();
 		TransactionAttribute actual = atas.getTransactionAttribute(interfaceMethod, TestBean2.class);
-		
+
 		RuleBasedTransactionAttribute rbta = new RuleBasedTransactionAttribute();
 			assertEquals(rbta.getRollbackRules(), ((RuleBasedTransactionAttribute) actual).getRollbackRules());
 	}
@@ -152,11 +152,11 @@ public class AnnotationTransactionAttributeSourceTests {
 		TransactionAttribute actual2 = atas.getTransactionAttribute(interfaceMethod2, TestBean3.class);
 		assertEquals(TransactionAttribute.PROPAGATION_REQUIRED, actual2.getPropagationBehavior());
 	}
-	
+
 	@Test
 	public void testRollbackRulesAreApplied() throws Exception {
 		Method method = TestBean3.class.getMethod("getAge", (Class[]) null);
-		
+
 		AnnotationTransactionAttributeSource atas = new AnnotationTransactionAttributeSource();
 		TransactionAttribute actual = atas.getTransactionAttribute(method, TestBean3.class);
 
@@ -167,13 +167,13 @@ public class AnnotationTransactionAttributeSourceTests {
 		assertEquals(rbta.getRollbackRules(), ((RuleBasedTransactionAttribute) actual).getRollbackRules());
 		assertTrue(actual.rollbackOn(new Exception()));
 		assertFalse(actual.rollbackOn(new IOException()));
-		
+
 		actual = atas.getTransactionAttribute(method, method.getDeclaringClass());
 
 		rbta = new RuleBasedTransactionAttribute();
 		rbta.getRollbackRules().add(new RollbackRuleAttribute("java.lang.Exception"));
 		rbta.getRollbackRules().add(new NoRollbackRuleAttribute(IOException.class));
-		
+
 		assertEquals(rbta.getRollbackRules(), ((RuleBasedTransactionAttribute) actual).getRollbackRules());
 		assertTrue(actual.rollbackOn(new Exception()));
 		assertFalse(actual.rollbackOn(new IOException()));
@@ -189,7 +189,7 @@ public class AnnotationTransactionAttributeSourceTests {
 
 		AnnotationTransactionAttributeSource atas = new AnnotationTransactionAttributeSource();
 		TransactionAttribute actual = atas.getTransactionAttribute(method, TestBean4.class);
-		
+
 		RuleBasedTransactionAttribute rbta = new RuleBasedTransactionAttribute();
 		rbta.getRollbackRules().add(new RollbackRuleAttribute(Exception.class));
 		rbta.getRollbackRules().add(new NoRollbackRuleAttribute(IOException.class));
@@ -265,7 +265,7 @@ public class AnnotationTransactionAttributeSourceTests {
 
 		void setAge(int age);
 
-		String getName(); 
+		String getName();
 
 		void setName(String name);
 	}
@@ -278,7 +278,7 @@ public class AnnotationTransactionAttributeSourceTests {
 
 		void setAge(int age);
 
-		String getName(); 
+		String getName();
 
 		void setName(String name);
 	}
@@ -291,12 +291,12 @@ public class AnnotationTransactionAttributeSourceTests {
 
 		void setAge(int age);
 
-		String getName(); 
+		String getName();
 
 		void setName(String name);
 	}
 
-	
+
 	public static class Empty implements ITestBean {
 
 		private String name;
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 2b81366319..36c076ce52 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
@@ -82,14 +82,14 @@ public class AnnotationTransactionNamespaceHandlerTests extends TestCase {
 
 		}
 	}
-	
+
 	public void testNonPublicMethodsNotAdvised() {
 		TransactionalTestBean testBean = getTestBean();
 		CallCountingTransactionManager ptm = (CallCountingTransactionManager) context.getBean("transactionManager");
 
 		assertEquals("Should not have any started transactions", 0, ptm.begun);
 		testBean.annotationsOnProtectedAreIgnored();
-		assertEquals("Should not have any started transactions", 0, ptm.begun);		
+		assertEquals("Should not have any started transactions", 0, ptm.begun);
 	}
 
 	public void testMBeanExportAlsoWorks() throws Exception {
@@ -125,7 +125,7 @@ public class AnnotationTransactionNamespaceHandlerTests extends TestCase {
 		public String doSomething() {
 			return "done";
 		}
-		
+
 		@Transactional
 		protected void annotationsOnProtectedAreIgnored() {
 		}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
index 790c0ee53c..5d787bec1e 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
@@ -47,11 +47,11 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport.Tran
  * @since 16.03.2003
  */
 public abstract class AbstractTransactionAspectTests extends TestCase {
-	
+
 	protected Method exceptionalMethod;
-	
+
 	protected Method getNameMethod;
-	
+
 	protected Method setNameMethod;
 
 
@@ -246,7 +246,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 		ptm.commit(status);
 		ptmControl.setVoidCallable(1);
 		ptmControl.replay();
-		
+
 		final String spouseName = "innerName";
 
 		TestBean outer = new TestBean() {
@@ -264,7 +264,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 				return spouseName;
 			}
 		};
-		
+
 		ITestBean outerProxy = (ITestBean) advised(outer, ptm, tas);
 		ITestBean innerProxy = (ITestBean) advised(inner, ptm, tas);
 		outer.setSpouse(innerProxy);
@@ -272,13 +272,13 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 		checkTransactionStatus(false);
 
 		// Will invoke inner.getName, which is non-transactional
-		outerProxy.exceptional(null);		
-		
+		outerProxy.exceptional(null);
+
 		checkTransactionStatus(false);
 
 		ptmControl.verify();
 	}
-	
+
 	public void testEnclosingTransactionWithNestedTransactionOnAdvisedInside() throws Throwable {
 		final TransactionAttribute outerTxatt = new DefaultTransactionAttribute();
 		final TransactionAttribute innerTxatt = new DefaultTransactionAttribute(TransactionDefinition.PROPAGATION_NESTED);
@@ -291,23 +291,23 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 
 		TransactionStatus outerStatus = transactionStatusForNewTransaction();
 		TransactionStatus innerStatus = transactionStatusForNewTransaction();
-		
+
 		MockControl ptmControl = MockControl.createControl(PlatformTransactionManager.class);
 		PlatformTransactionManager ptm = (PlatformTransactionManager) ptmControl.getMock();
 		// Expect a transaction
 		ptm.getTransaction(outerTxatt);
 		ptmControl.setReturnValue(outerStatus, 1);
-		
+
 		ptm.getTransaction(innerTxatt);
 		ptmControl.setReturnValue(innerStatus, 1);
-		
+
 		ptm.commit(innerStatus);
 		ptmControl.setVoidCallable(1);
-		
+
 		ptm.commit(outerStatus);
 		ptmControl.setVoidCallable(1);
 		ptmControl.replay();
-		
+
 		final String spouseName = "innerName";
 
 		TestBean outer = new TestBean() {
@@ -328,7 +328,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 				return spouseName;
 			}
 		};
-		
+
 		ITestBean outerProxy = (ITestBean) advised(outer, ptm, tas);
 		ITestBean innerProxy = (ITestBean) advised(inner, ptm, tas);
 		outer.setSpouse(innerProxy);
@@ -336,13 +336,13 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 		checkTransactionStatus(false);
 
 		// Will invoke inner.getName, which is non-transactional
-		outerProxy.exceptional(null);		
-		
+		outerProxy.exceptional(null);
+
 		checkTransactionStatus(false);
 
 		ptmControl.verify();
 	}
-	
+
 	public void testRollbackOnCheckedException() throws Throwable {
 		doTestRollbackOnException(new Exception(), true, false);
 	}
@@ -419,7 +419,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 		}
 		ptmControl.replay();
 
-		TestBean tb = new TestBean();		
+		TestBean tb = new TestBean();
 		ITestBean itb = (ITestBean) advised(tb, ptm, tas);
 
 		try {
@@ -437,7 +437,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 
 		ptmControl.verify();
 	}
-	
+
 	/**
 	 * Test that TransactionStatus.setRollbackOnly works.
 	 */
@@ -466,7 +466,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 				return name;
 			}
 		};
-		
+
 		ITestBean itb = (ITestBean) advised(tb, ptm, tas);
 
 		// verification!?
@@ -474,7 +474,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 
 		ptmControl.verify();
 	}
-	
+
 	/**
 	 * @return a TransactionStatus object configured for a new transaction
 	 */
@@ -507,7 +507,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 				throw new UnsupportedOperationException(
 						"Shouldn't have invoked target method when couldn't create transaction for transactional method");
 			}
-		};		
+		};
 		ITestBean itb = (ITestBean) advised(tb, ptm, tas);
 
 		try {
@@ -545,7 +545,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 		ptmControl.setThrowable(ex);
 		ptmControl.replay();
 
-		TestBean tb = new TestBean();		
+		TestBean tb = new TestBean();
 		ITestBean itb = (ITestBean) advised(tb, ptm, tas);
 
 		String name = "new name";
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 09388b1d81..27d72c2dc4 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,12 +1,12 @@
 /*
  * 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.
@@ -66,13 +66,13 @@ public class BeanFactoryTransactionTests extends TestCase {
 		assertTrue("testBean is a dynamic proxy", Proxy.isProxyClass(testBean.getClass()));
 		doTestGetsAreNotTransactional(testBean);
 	}
-	
+
 	public void testGetsAreNotTransactionalWithProxyFactory2Cglib() throws NoSuchMethodException {
 		ITestBean testBean = (ITestBean) factory.getBean("proxyFactory2Cglib");
 		assertTrue("testBean is CGLIB advised", AopUtils.isCglibProxy(testBean));
 		doTestGetsAreNotTransactional(testBean);
 	}
-	
+
 	public void testProxyFactory2Lazy() throws NoSuchMethodException {
 		ITestBean testBean = (ITestBean) factory.getBean("proxyFactory2Lazy");
 		assertFalse(factory.containsSingleton("target"));
@@ -84,14 +84,14 @@ public class BeanFactoryTransactionTests extends TestCase {
 		ImplementsNoInterfaces ini = (ImplementsNoInterfaces) factory.getBean("cglibNoInterfaces");
 		assertTrue("testBean is CGLIB advised", AopUtils.isCglibProxy(ini));
 		String newName = "Gordon";
-		
+
 		// Install facade
 		CallCountingTransactionManager ptm = new CallCountingTransactionManager();
 		PlatformTransactionManagerFacade.delegate = ptm;
-		
+
 		ini.setName(newName);
 		assertEquals(newName, ini.getName());
-		assertEquals(2, ptm.commits);		
+		assertEquals(2, ptm.commits);
 	}
 
 	public void testGetsAreNotTransactionalWithProxyFactory3() throws NoSuchMethodException {
@@ -171,7 +171,7 @@ public class BeanFactoryTransactionTests extends TestCase {
 			// Ok
 		}
 	}
-	
+
 	/**
 	 * Test that we can set the target to a dynamic TargetSource.
 	 */
@@ -179,13 +179,13 @@ public class BeanFactoryTransactionTests extends TestCase {
 		// Install facade
 		CallCountingTransactionManager txMan = new CallCountingTransactionManager();
 		PlatformTransactionManagerFacade.delegate = txMan;
-		
+
 		TestBean tb = (TestBean) factory.getBean("hotSwapped");
 		assertEquals(666, tb.getAge());
 		int newAge = 557;
 		tb.setAge(newAge);
 		assertEquals(newAge, tb.getAge());
-		
+
 		TestBean target2 = new TestBean();
 		target2.setAge(65);
 		HotSwappableTargetSource ts = (HotSwappableTargetSource) factory.getBean("swapper");
@@ -193,7 +193,7 @@ public class BeanFactoryTransactionTests extends TestCase {
 		assertEquals(target2.getAge(), tb.getAge());
 		tb.setAge(newAge);
 		assertEquals(newAge, target2.getAge());
-		
+
 		assertEquals(0, txMan.inflight);
 		assertEquals(2, txMan.commits);
 		assertEquals(0, txMan.rollbacks);
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java
index 90f0361eed..75e100602f 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -25,17 +25,17 @@ import org.springframework.beans.TestBean;
  * @author Rod Johnson
  */
 public class ImplementsNoInterfaces {
-	
+
 	private TestBean testBean;
-	
+
 	public void setDependency(TestBean testBean) {
 		this.testBean = testBean;
 	}
-	
+
 	public String getName() {
 		return testBean.getName();
 	}
-	
+
 	public void setName(String name) {
 		testBean.setName(name);
 	}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java
index bdb09009aa..1e804de132 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java
@@ -20,7 +20,7 @@ import org.springframework.core.NestedRuntimeException;
 
 /**
  * An example {@link RuntimeException} for use in testing rollback rules.
- * 
+ *
  * @author Chris Beams
  */
 @SuppressWarnings("serial")
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java
index 7836064227..7aa4a1e275 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -31,7 +31,7 @@ import org.springframework.transaction.TransactionStatus;
  * @since 26.04.2003
  */
 public class PlatformTransactionManagerFacade implements PlatformTransactionManager {
-	
+
 	/**
 	 * This member can be changed to change behavior class-wide.
 	 */
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java
index c9125fc6cd..d1884954fd 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java
@@ -39,17 +39,17 @@ public class RollbackRuleTests extends TestCase {
 		RollbackRuleAttribute rr = new RollbackRuleAttribute(java.lang.Exception.class.getName());
 		assertTrue(rr.getDepth(new Exception()) == 0);
 	}
-	
+
 	public void testFoundImmediatelyWithClass() {
 		RollbackRuleAttribute rr = new RollbackRuleAttribute(Exception.class);
 		assertTrue(rr.getDepth(new Exception()) == 0);
 	}
-	
+
 	public void testNotFound() {
 		RollbackRuleAttribute rr = new RollbackRuleAttribute(java.io.IOException.class.getName());
 		assertTrue(rr.getDepth(new MyRuntimeException("")) == -1);
 	}
-	
+
 	public void testAncestry() {
 		RollbackRuleAttribute rr = new RollbackRuleAttribute(java.lang.Exception.class.getName());
 		// Exception -> Runtime -> NestedRuntime -> MyRuntimeException
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java
index 19abfc6523..f32779ef36 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java
index 8911d31bb1..81364f12b4 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -23,15 +23,15 @@ import org.springframework.util.SerializationTestUtils;
 import junit.framework.TestCase;
 
 /**
- * 
+ *
  * @author Rod Johnson
  */
 public class TransactionAttributeSourceAdvisorTests extends TestCase {
-	
+
 	public TransactionAttributeSourceAdvisorTests(String s) {
 		super(s);
 	}
-	
+
 	public void testSerializability() throws Exception {
 		TransactionInterceptor ti = new TransactionInterceptor();
 		ti.setTransactionAttributes(new Properties());
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
index 1c74ff2e09..3ed4ebcb35 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
 import org.springframework.transaction.TransactionDefinition;
 
 /**
- * Format is 
+ * Format is
  * <code>FQN.Method=tx attribute representation</code>
  *
  * @author Rod Johnson
@@ -50,7 +50,7 @@ public class TransactionAttributeSourceEditorTests extends TestCase {
 			// Ok
 		}
 	}
-	
+
 	public void testMatchesSpecific() throws Exception {
 		TransactionAttributeSourceEditor pe = new TransactionAttributeSourceEditor();
 		// TODO need FQN?
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
index fbe4b9f6ce..5447995f5f 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -45,14 +45,14 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
 	}
 
 	/**
-	 * Template method to create an advised object given the 
+	 * Template method to create an advised object given the
 	 * target object and transaction setup.
 	 * Creates a TransactionInterceptor and applies it.
 	 */
 	protected Object advised(Object target, PlatformTransactionManager ptm, TransactionAttributeSource tas) {
 		TransactionInterceptor ti = new TransactionInterceptor();
 		ti.setTransactionManager(ptm);
-		assertEquals(ptm, ti.getTransactionManager());		
+		assertEquals(ptm, ti.getTransactionManager());
 		ti.setTransactionAttributeSource(tas);
 		assertEquals(tas, ti.getTransactionAttributeSource());
 
@@ -60,9 +60,9 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
 		pf.addAdvice(0, ti);
 		return pf.getProxy();
 	}
-	
+
 /**
-	 * A TransactionInterceptor should be serializable if its 
+	 * A TransactionInterceptor should be serializable if its
 	 * PlatformTransactionManager is.
 	 */
 	public void testSerializableWithAttributeProperties() throws Exception {
@@ -121,6 +121,6 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
 		public void rollback(TransactionStatus status) throws TransactionException {
 			throw new UnsupportedOperationException();
 		}
-		
+
 	}
 }
diff --git a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
index cce8a85764..7f699d8e90 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2009 the original author 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.
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 37008ee8cf..de141afc41 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
@@ -63,7 +63,7 @@ class InterceptingClientHttpRequest extends AbstractBufferingClientHttpRequest {
 	@Override
 	protected final ClientHttpResponse executeInternal(HttpHeaders headers, byte[] bufferedOutput) throws IOException {
 		RequestExecution requestExecution = new RequestExecution();
-		
+
 		return requestExecution.execute(this, bufferedOutput);
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
index 712f4bbce0..d07fe12733 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
@@ -223,7 +223,7 @@ public class HessianClientInterceptor extends UrlBasedRemoteAccessor implements
 		}
 		catch (InvocationTargetException ex) {
 			Throwable targetEx = ex.getTargetException();
-			// Hessian 4.0 check: another layer of InvocationTargetException. 
+			// Hessian 4.0 check: another layer of InvocationTargetException.
 			if (targetEx instanceof InvocationTargetException) {
 				targetEx = ((InvocationTargetException) targetEx).getTargetException();
 			}
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java b/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
index 498f58a674..68e2b0ee5b 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/package-info.java
@@ -4,11 +4,11 @@
  * This package provides remoting classes for Caucho's Hessian and Burlap
  * protocols: a proxy factory for accessing Hessian/Burlap services,
  * and an exporter for making beans available to Hessian/Burlap clients.
- * 
+ *
  * <p>Hessian is a slim, binary RPC protocol over HTTP.
  * For information on Hessian, see the
  * <a href="http://www.caucho.com/hessian">Hessian website</a>
- * 
+ *
  * <p>Burlap is a slim, XML-based RPC protocol over HTTP.
  * For information on Burlap, see the
  * <a href="http://www.caucho.com/burlap">Burlap website</a>
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java
index a18e047d91..7430dc45fe 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/package-info.java
@@ -4,7 +4,7 @@
  * Remoting classes for transparent Java-to-Java remoting via HTTP invokers.
  * Uses Java serialization just like RMI, but provides the same ease of setup
  * as Caucho's HTTP-based Hessian and Burlap protocols.
- * 
+ *
  * <p><b>HTTP invoker is the recommended protocol for Java-to-Java remoting.</b>
  * It is more powerful and more extensible than Hessian and Burlap, at the
  * expense of being tied to Java. Neverthelesss, it is as easy to set up as
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
index d2fcaf921f..ab206aad4b 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
@@ -62,7 +62,7 @@ import org.springframework.web.util.WebUtils;
 public abstract class ServletEndpointSupport implements ServiceLifecycle {
 
 	protected final Log logger = LogFactory.getLog(getClass());
-	
+
 	private ServletEndpointContext servletEndpointContext;
 
 	private WebApplicationContext webApplicationContext;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
index 3c7534327c..ed19bc9cd2 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
@@ -29,7 +29,7 @@ import org.springframework.validation.ObjectError;
 public class MethodArgumentNotValidException extends Exception {
 
 	private final MethodParameter parameter;
-	
+
 	private final BindingResult bindingResult;
 
 
@@ -69,5 +69,5 @@ public class MethodArgumentNotValidException extends Exception {
 		}
 		return sb.toString();
 	}
-	
+
 }
diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
index 838cc633b2..6ff75e8b09 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
@@ -115,7 +115,7 @@ public class ServletRequestDataBinder extends WebDataBinder {
 	/**
 	 * Extension point that subclasses can use to add extra bind values for a
 	 * request. Invoked before {@link #doBind(MutablePropertyValues)}.
-	 * The default implementation is empty. 
+	 * The default implementation is empty.
 	 * @param mpvs the property values that will be used for data binding
 	 * @param request the current request
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java
index 15d799210e..6c365e1783 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java
@@ -35,7 +35,7 @@ import org.springframework.web.multipart.MultipartFile;
  * HTML checkboxes and select options: detecting that a field was part of
  * the form, but did not generate a request parameter because it was empty.
  * A field marker allows to detect that state and reset the corresponding
- * bean property accordingly. Default values, for parameters that are otherwise 
+ * bean property accordingly. Default values, for parameters that are otherwise
  * not present, can specify a value for the field other then empty.
  *
  * @author Juergen Hoeller
@@ -65,7 +65,7 @@ public class WebDataBinder extends DataBinder {
 	/**
 	 * Default prefix that field default parameters start with, followed by the field
 	 * name: e.g. "!subscribeToNewsletter" for a field "subscribeToNewsletter".
-	 * <p>Default parameters differ from field markers in that they provide a default 
+	 * <p>Default parameters differ from field markers in that they provide a default
 	 * value instead of an empty value.
 	 * @see #setFieldDefaultPrefix
 	 */
@@ -134,15 +134,15 @@ public class WebDataBinder extends DataBinder {
 
 	/**
 	 * Specify a prefix that can be used for parameters that indicate default
-	 * value fields, having "prefix + field" as name. The value of the default 
+	 * value fields, having "prefix + field" as name. The value of the default
 	 * field is used when the field is not provided.
 	 * <p>Default is "!", for "!FIELD" parameters (e.g. "!subscribeToNewsletter").
 	 * Set this to null if you want to turn off the field defaults completely.
 	 * <p>HTML checkboxes only send a value when they're checked, so it is not
 	 * possible to detect that a formerly checked box has just been unchecked,
-	 * at least not with standard HTML means.  A default field is especially 
+	 * at least not with standard HTML means.  A default field is especially
 	 * useful when a checkbox represents a non-boolean value.
-	 * <p>The presence of a default parameter preempts the behavior of a field 
+	 * <p>The presence of a default parameter preempts the behavior of a field
 	 * marker for the given field.
 	 * @see #DEFAULT_FIELD_DEFAULT_PREFIX
 	 * @see org.springframework.web.servlet.mvc.BaseCommandController#onBind
@@ -208,7 +208,7 @@ public class WebDataBinder extends DataBinder {
 					String field = pv.getName().substring(fieldDefaultPrefix.length());
 					if (getPropertyAccessor().isWritableProperty(field) && !mpvs.contains(field)) {
 						mpvs.add(field, pv.getValue());
-					} 
+					}
 					mpvs.removePropertyValue(pv);
 				}
 			}
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
index 968e970aee..47a5fe8a62 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
@@ -29,29 +29,29 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartResolver;
 
 /**
- * Annotation that can be used to associate the part of a "multipart/form-data" request 
+ * Annotation that can be used to associate the part of a "multipart/form-data" request
  * with a method argument. Supported method argument types include {@link MultipartFile}
- * in conjunction with Spring's {@link MultipartResolver} abstraction, 
+ * in conjunction with Spring's {@link MultipartResolver} abstraction,
  * {@code javax.servlet.http.Part} in conjunction with Servlet 3.0 multipart requests,
- * or otherwise for any other method argument, the content of the part is passed through an 
- * {@link HttpMessageConverter} taking into consideration the 'Content-Type' header 
- * of the request part. This is analogous to what @{@link RequestBody} does to resolve 
+ * or otherwise for any other method argument, the content of the part is passed through an
+ * {@link HttpMessageConverter} taking into consideration the 'Content-Type' header
+ * of the request part. This is analogous to what @{@link RequestBody} does to resolve
  * an argument based on the content of a non-multipart regular request.
- * 
- * <p>Note that @{@link RequestParam} annotation can also be used to associate the 
+ *
+ * <p>Note that @{@link RequestParam} annotation can also be used to associate the
  * part of a "multipart/form-data" request with a method argument supporting the same
  * method argument types. The main difference is that when the method argument is not a
- * String, @{@link RequestParam} relies on type conversion via a registered 
+ * String, @{@link RequestParam} relies on type conversion via a registered
  * {@link Converter} or {@link PropertyEditor} while @{@link RequestPart} relies
  * on {@link HttpMessageConverter}s taking into consideration the 'Content-Type' header
- * of the request part. @{@link RequestParam} is likely to be used with name-value form 
+ * of the request part. @{@link RequestParam} is likely to be used with name-value form
  * fields while @{@link RequestPart} is likely to be used with parts containing more
- * complex content (e.g. JSON, XML). 
- * 
+ * complex content (e.g. JSON, XML).
+ *
  * @author Rossen Stoyanchev
  * @author Arjen Poutsma
  * @since 3.1
- * 
+ *
  * @see RequestParam
  * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter
  */
@@ -64,7 +64,7 @@ public @interface RequestPart {
 	 * The name of the part in the "multipart/form-data" request to bind to.
 	 */
 	String value() default "";
-	
+
 	/**
 	 * Whether the part is required.
 	 * <p>Default is <code>true</code>, leading to an exception thrown in case
@@ -72,5 +72,5 @@ public @interface RequestPart {
 	 * if you prefer a <code>null</value> in case of the part missing.
 	 */
 	boolean required() default true;
-	
+
 }
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java
index 28b93fc403..f9ea11e44b 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java
@@ -664,7 +664,7 @@ public class HandlerMethodInvoker {
 		}
 		throw new IllegalArgumentException(
 				"HttpEntity parameter (" + methodParam.getParameterName() + ") is not parameterized");
-		
+
 	}
 
 	private Object resolveCookieValue(String cookieName, boolean required, String defaultValue,
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
index a0ddc9713f..92b78c1721 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
@@ -20,9 +20,9 @@ import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.context.request.NativeWebRequest;
 
 /**
- * Create a {@link WebRequestDataBinder} instance and initialize it with a 
+ * Create a {@link WebRequestDataBinder} instance and initialize it with a
  * {@link WebBindingInitializer}.
- * 
+ *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
@@ -39,8 +39,8 @@ public class DefaultDataBinderFactory implements WebDataBinderFactory {
 	}
 
 	/**
-	 * Create a new {@link WebDataBinder} for the given target object and 
-	 * initialize it through a {@link WebBindingInitializer}. 
+	 * Create a new {@link WebDataBinder} for the given target object and
+	 * initialize it through a {@link WebBindingInitializer}.
 	 * @throws Exception in case of invalid state or arguments
 	 */
 	public final WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName)
@@ -57,7 +57,7 @@ public class DefaultDataBinderFactory implements WebDataBinderFactory {
 	 * Extension point to create the WebDataBinder instance.
 	 * By default this is {@code WebRequestDataBinder}.
 	 * @param target the binding target or {@code null} for type conversion only
-	 * @param objectName the binding target object name 
+	 * @param objectName the binding target object name
 	 * @param webRequest the current request
 	 * @throws Exception in case of invalid state or arguments
 	 */
@@ -67,8 +67,8 @@ public class DefaultDataBinderFactory implements WebDataBinderFactory {
 	}
 
 	/**
-	 * Extension point to further initialize the created data binder instance 
-	 * (e.g. with {@code @InitBinder} methods) after "global" initializaton 
+	 * Extension point to further initialize the created data binder instance
+	 * (e.g. with {@code @InitBinder} methods) after "global" initializaton
 	 * via {@link WebBindingInitializer}.
 	 * @param dataBinder the data binder instance to customize
 	 * @param webRequest the current request
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java
index ba72a92a3a..d10d7c81dd 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java
@@ -20,21 +20,21 @@ import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.context.request.NativeWebRequest;
 
 /**
- * A factory for creating a {@link WebDataBinder} instance for a named target object. 
- * 
+ * A factory for creating a {@link WebDataBinder} instance for a named target object.
+ *
  * @author Arjen Poutsma
  * @since 3.1
  */
 public interface WebDataBinderFactory {
 
 	/**
-	 * Create a {@link WebDataBinder} for the given object. 
+	 * Create a {@link WebDataBinder} for the given object.
 	 * @param webRequest the current request
 	 * @param target the object to create a data binder for, or {@code null} if creating a binder for a simple type
-	 * @param objectName the name of the target object 
+	 * @param objectName the name of the target object
 	 * @return the created {@link WebDataBinder} instance, never null
-	 * @throws Exception raised if the creation and initialization of the data binder fails 
+	 * @throws Exception raised if the creation and initialization of the data binder fails
 	 */
 	WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception;
-	
+
 }
\ No newline at end of file
diff --git a/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
index 48ae350aea..167c4db876 100644
--- a/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
@@ -20,7 +20,7 @@ import javax.servlet.ServletContext;
 
 import org.springframework.context.ApplicationContext;
 
-/** 
+/**
  * Interface to provide configuration for a web application. This is read-only while
  * the application is running, but may be reloaded if the implementation supports this.
  *
@@ -107,5 +107,5 @@ public interface WebApplicationContext extends ApplicationContext {
 	 * <p>Also available for a Portlet application, in addition to the PortletContext.
 	 */
 	ServletContext getServletContext();
-	
+
 }
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java
index 04b95bac08..e65e7a7505 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.config.Scope;
  *
  * <p>Subclasses may wish to override the {@link #get} and {@link #remove}
  * methods to add synchronization around the call back into this super class.
- * 
+ *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Rob Harrop
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
index edd13a778a..839c13b5a6 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
@@ -93,7 +93,7 @@ public class FacesWebRequest extends FacesRequestAttributes implements NativeWeb
 	public Iterator<String> getParameterNames() {
 		return getExternalContext().getRequestParameterNames();
 	}
-	
+
 	public String[] getParameterValues(String paramName) {
 		return getExternalContext().getRequestParameterValuesMap().get(paramName);
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
index eaa52bc8ed..2377145bc0 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
@@ -44,7 +44,7 @@ import org.springframework.util.ClassUtils;
  * @see org.springframework.web.portlet.DispatcherPortlet
  */
 public abstract class RequestContextHolder  {
-	
+
 	private static final boolean jsfPresent =
 			ClassUtils.isPresent("javax.faces.context.FacesContext", RequestContextHolder.class.getClassLoader());
 
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 d9a75991d3..ca6318f344 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
@@ -46,7 +46,7 @@ public class ServletWebRequest extends ServletRequestAttributes implements Nativ
 	private static final String HEADER_LAST_MODIFIED = "Last-Modified";
 
 	private static final String METHOD_GET = "GET";
-	
+
 
 	private HttpServletResponse response;
 
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 9db1794781..620708266e 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
@@ -77,7 +77,7 @@ public interface WebRequest extends RequestAttributes {
 	 * @since 3.0
 	 */
 	Iterator<String> getParameterNames();
-	
+
 	/**
 	 * Return a immutable Map of the request parameters, with parameter names as map keys
 	 * and parameter values as map values. The map values will be of type String array.
@@ -174,7 +174,7 @@ public interface WebRequest extends RequestAttributes {
 	 * {@link #checkNotModified(long)}, but not both.
 	 * @param eTag the entity tag that the application determined
 	 * for the underlying resource. This parameter will be padded
-	 * with quotes (") if necessary.   
+	 * 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
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 38251f1ad1..4dc22c2449 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
@@ -24,7 +24,7 @@ import org.springframework.util.CollectionUtils;
 
 /**
  * {@link PropertySource} that reads init parameters from a {@link ServletContext} object.
- * 
+ *
  * @author Chris Beams
  * @since 3.1
  * @see ServletConfigPropertySource
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 76b6b886b5..b85cb1e23e 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
@@ -33,11 +33,11 @@ import javax.servlet.ServletResponse;
  * 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.
- * 
+ *
  * @since 3.1
- * 
+ *
  * @author Dave Syer
- * 
+ *
  */
 public class CompositeFilter implements Filter {
 
@@ -49,7 +49,7 @@ public class CompositeFilter implements Filter {
 
 	/**
 	 * 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() {
@@ -61,7 +61,7 @@ public class CompositeFilter implements Filter {
 
 	/**
 	 * 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 {
@@ -74,7 +74,7 @@ public class CompositeFilter implements Filter {
 	 * 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}.
-	 * 
+	 *
 	 * @see Filter#doFilter(ServletRequest, ServletResponse, FilterChain)
 	 */
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/package-info.java b/spring-web/src/main/java/org/springframework/web/jsf/el/package-info.java
index aa34df937f..ada7476aa5 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/el/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/el/package-info.java
@@ -3,7 +3,7 @@
  *
  * Support classes for integrating a JSF 1.2 web tier with a Spring middle tier
  * which is hosted in a Spring root WebApplicationContext.
- * 
+ *
  * <p>Supports JSF 1.2's ELResolver mechanism, providing closer integration
  * than JSF 1.1's VariableResolver mechanism allowed for.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/package-info.java b/spring-web/src/main/java/org/springframework/web/jsf/package-info.java
index b49913a301..b5d645df28 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/package-info.java
@@ -3,7 +3,7 @@
  *
  * Support classes for integrating a JSF web tier with a Spring middle tier
  * which is hosted in a Spring root WebApplicationContext.
- * 
+ *
  * <p>Supports easy access to beans in the Spring root WebApplicationContext
  * from JSF EL expressions, for example in property values of JSF-managed beans.
  *
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 a8029705b7..c0ea3fc345 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
@@ -28,18 +28,18 @@ import org.springframework.util.ReflectionUtils;
 import org.springframework.util.ReflectionUtils.MethodFilter;
 
 /**
- * Defines the algorithm for searching handler methods exhaustively including interfaces and parent 
+ * Defines the algorithm for searching handler methods exhaustively including interfaces and parent
  * classes while also dealing with parameterized methods as well as interface and class-based proxies.
- * 
+ *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
 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.
-	 * 
+	 *
 	 * @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/AbstractCookieValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java
index df485e1b0a..4f25d7633b 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java
@@ -23,16 +23,16 @@ import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.CookieValue;
 
 /**
- * A base abstract class to resolve method arguments annotated with 
+ * A base abstract class to resolve method arguments annotated with
  * {@code @CookieValue}. Subclasses extract the cookie value from the request.
- * 
- * <p>An {@code @CookieValue} is a named value that is resolved from a cookie. 
- * It has a required flag and a default value to fall back on when the cookie 
- * does not exist. 
- * 
- * <p>A {@link WebDataBinder} may be invoked to apply type conversion to the 
+ *
+ * <p>An {@code @CookieValue} is a named value that is resolved from a cookie.
+ * It has a required flag and a default value to fall back on when the cookie
+ * does not exist.
+ *
+ * <p>A {@link WebDataBinder} may be invoked to apply type conversion to the
  * resolved cookie value.
- * 
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  * @since 3.1
@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.CookieValue;
 public abstract class AbstractCookieValueMethodArgumentResolver extends AbstractNamedValueMethodArgumentResolver {
 
 	/**
-	 * @param beanFactory a bean factory to use for resolving  ${...} 
+	 * @param beanFactory a bean factory to use for resolving  ${...}
 	 * placeholder and #{...} SpEL expressions in default values;
 	 * or {@code null} if default values are not expected to contain expressions
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
index 7877e7923c..083e6fe5e5 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
@@ -26,21 +26,21 @@ import org.springframework.web.context.request.NativeWebRequest;
 
 /**
  * Resolves method arguments annotated with {@code @Value}.
- * 
+ *
  * <p>An {@code @Value} does not have a name but gets resolved from the default
- * value string, which may contain ${...} placeholder or Spring Expression 
- * Language #{...} expressions. 
- * 
- * <p>A {@link WebDataBinder} may be invoked to apply type conversion to 
+ * value string, which may contain ${...} placeholder or Spring Expression
+ * Language #{...} expressions.
+ *
+ * <p>A {@link WebDataBinder} may be invoked to apply type conversion to
  * resolved argument value.
- * 
+ *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
 public class ExpressionValueMethodArgumentResolver extends AbstractNamedValueMethodArgumentResolver {
 
 	/**
-	 * @param beanFactory a bean factory to use for resolving  ${...} 
+	 * @param beanFactory a bean factory to use for resolving  ${...}
 	 * placeholder and #{...} SpEL expressions in default values;
 	 * or {@code null} if default values are not expected to contain expressions
 	 */
@@ -75,5 +75,5 @@ public class ExpressionValueMethodArgumentResolver extends AbstractNamedValueMet
 		private ExpressionValueNamedValueInfo(Value annotation) {
 			super("@Value", false, annotation.value());
 		}
-	}	
+	}
 }
\ No newline at end of file
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java
index 991ab9ff86..c7520687e1 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java
@@ -38,7 +38,7 @@ import org.springframework.web.method.support.InvocableHandlerMethod;
 public class InitBinderDataBinderFactory extends DefaultDataBinderFactory {
 
 	private final List<InvocableHandlerMethod> binderMethods;
-	
+
 	/**
 	 * Create a new instance.
 	 * @param binderMethods {@code @InitBinder} methods, or {@code null}
@@ -68,8 +68,8 @@ public class InitBinderDataBinderFactory extends DefaultDataBinderFactory {
 	}
 
 	/**
-	 * Return {@code true} if the given {@code @InitBinder} method should be 
-	 * invoked to initialize the given WebDataBinder. 
+	 * Return {@code true} if the given {@code @InitBinder} method should be
+	 * invoked to initialize the given WebDataBinder.
 	 * <p>The default implementation checks if target object name is included
 	 * in the attribute names specified in the {@code @InitBinder} annotation.
 	 */
@@ -78,5 +78,5 @@ public class InitBinderDataBinderFactory extends DefaultDataBinderFactory {
 		Collection<String> names = Arrays.asList(annot.value());
 		return (names.size() == 0 || names.contains(binder.getObjectName()));
 	}
-	
+
 }
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java
index 3d5abfa580..5cac3e8eb6 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java
@@ -41,24 +41,24 @@ import org.springframework.web.method.support.InvocableHandlerMethod;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
 /**
- * Provides methods to initialize the {@link Model} before controller method 
- * invocation and to update it afterwards. On initialization, the model is 
- * populated with attributes from the session or by invoking 
- * {@code @ModelAttribute} methods. On update, model attributes are 
- * synchronized with the session -- either adding or removing them. 
+ * Provides methods to initialize the {@link Model} before controller method
+ * invocation and to update it afterwards. On initialization, the model is
+ * populated with attributes from the session or by invoking
+ * {@code @ModelAttribute} methods. On update, model attributes are
+ * synchronized with the session -- either adding or removing them.
  * Also {@link BindingResult} attributes where missing.
- * 
+ *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
 public final class ModelFactory {
 
 	private final List<InvocableHandlerMethod> attributeMethods;
-	
+
 	private final WebDataBinderFactory binderFactory;
-	
+
 	private final SessionAttributesHandler sessionAttributesHandler;
-	
+
 	/**
 	 * Create a new instance with the given {@code @ModelAttribute} methods.
 	 * @param attributeMethods for model initialization
@@ -76,15 +76,15 @@ public final class ModelFactory {
 	/**
 	 * Populate the model in the following order:
 	 * <ol>
-	 * 	<li>Retrieve "known" session attributes -- i.e. attributes listed via 
-	 * 	{@link SessionAttributes @SessionAttributes} and previously stored in 
+	 * 	<li>Retrieve "known" session attributes -- i.e. attributes listed via
+	 * 	{@link SessionAttributes @SessionAttributes} and previously stored in
 	 * 	the in the model at least once
 	 * 	<li>Invoke {@link ModelAttribute @ModelAttribute} methods
 	 * 	<li>Find method arguments eligible as session attributes and retrieve
-	 * 	them if they're not	already	present in the model 
+	 * 	them if they're not	already	present in the model
 	 * </ol>
 	 * @param request the current request
-	 * @param mavContainer contains the model to be initialized 
+	 * @param mavContainer contains the model to be initialized
 	 * @param handlerMethod the method for which the model is initialized
 	 * @throws Exception may arise from {@code @ModelAttribute} methods
 	 */
@@ -108,18 +108,18 @@ public final class ModelFactory {
 	}
 
 	/**
-	 * Invoke model attribute methods to populate the model. Attributes are 
+	 * Invoke model attribute methods to populate the model. Attributes are
 	 * added only if not already present in the model.
 	 */
 	private void invokeModelAttributeMethods(NativeWebRequest request, ModelAndViewContainer mavContainer)
 			throws Exception {
-		
+
 		for (InvocableHandlerMethod attrMethod : this.attributeMethods) {
 			String modelName = attrMethod.getMethodAnnotation(ModelAttribute.class).value();
 			if (mavContainer.containsAttribute(modelName)) {
 				continue;
 			}
-			
+
 			Object returnValue = attrMethod.invokeForRequest(request, mavContainer);
 
 			if (!attrMethod.isVoid()){
@@ -130,9 +130,9 @@ public final class ModelFactory {
 			}
 		}
 	}
-	
+
 	/**
-	 * Return all {@code @ModelAttribute} arguments declared as session 
+	 * Return all {@code @ModelAttribute} arguments declared as session
 	 * attributes via {@code @SessionAttributes}.
 	 */
 	private List<String> findSessionAttributeArguments(HandlerMethod handlerMethod) {
@@ -147,12 +147,12 @@ public final class ModelFactory {
 		}
 		return result;
 	}
-	
+
 	/**
-	 * Derive the model attribute name for the given return value using 
+	 * Derive the model attribute name for the given return value using
 	 * one of the following:
 	 * <ol>
-	 * 	<li>The method {@code ModelAttribute} annotation value 
+	 * 	<li>The method {@code ModelAttribute} annotation value
 	 * 	<li>The declared return type if it is other than {@code Object}
 	 * 	<li>The actual return value type
 	 * </ol>
@@ -176,7 +176,7 @@ public final class ModelFactory {
 	 * Derives the model attribute name for a method parameter based on:
 	 * <ol>
 	 * 	<li>The parameter {@code @ModelAttribute} annotation value
-	 * 	<li>The parameter type 
+	 * 	<li>The parameter type
 	 * </ol>
 	 * @return the derived name; never {@code null} or an empty string
 	 */
@@ -185,7 +185,7 @@ public final class ModelFactory {
 		String attrName = (annot != null) ? annot.value() : null;
 		return StringUtils.hasText(attrName) ? attrName :  Conventions.getVariableNameForParameter(parameter);
 	}
-	
+
 	/**
 	 * Synchronize model attributes with the session. Add {@link BindingResult}
 	 * attributes where necessary.
@@ -194,17 +194,17 @@ public final class ModelFactory {
 	 * @throws Exception if creating BindingResult attributes fails
 	 */
 	public void updateModel(NativeWebRequest request, ModelAndViewContainer mavContainer) throws Exception {
-		
+
 		if (mavContainer.getSessionStatus().isComplete()){
 			this.sessionAttributesHandler.cleanupAttributes(request);
 		}
 		else {
 			this.sessionAttributesHandler.storeAttributes(request, mavContainer.getModel());
 		}
-		
+
 		if (!mavContainer.isRequestHandled()) {
 			updateBindingResult(request, mavContainer.getModel());
-		} 
+		}
 	}
 
 	/**
@@ -217,7 +217,7 @@ public final class ModelFactory {
 
 			if (isBindingCandidate(name, value)) {
 				String bindingResultKey = BindingResult.MODEL_KEY_PREFIX + name;
-			
+
 				if (!model.containsAttribute(bindingResultKey)) {
 					WebDataBinder dataBinder = binderFactory.createBinder(request, value, name);
 					model.put(bindingResultKey, dataBinder.getBindingResult());
@@ -233,14 +233,14 @@ public final class ModelFactory {
 		if (attributeName.startsWith(BindingResult.MODEL_KEY_PREFIX)) {
 			return false;
 		}
-		
+
 		Class<?> attrType = (value != null) ? value.getClass() : null;
 		if (this.sessionAttributesHandler.isHandlerSessionAttribute(attributeName, attrType)) {
 			return true;
 		}
-		
-		return (value != null && !value.getClass().isArray() && !(value instanceof Collection) && 
+
+		return (value != null && !value.getClass().isArray() && !(value instanceof Collection) &&
 				!(value instanceof Map) && !BeanUtils.isSimpleValueType(value.getClass()));
 	}
-	
+
 }
\ No newline at end of file
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java
index 1c5c3cf04f..57a622118e 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java
@@ -27,16 +27,16 @@ import org.springframework.web.context.request.NativeWebRequest;
 
 /**
  * Resolves method arguments annotated with {@code @RequestHeader} except for
- * {@link Map} arguments. See {@link RequestHeaderMapMethodArgumentResolver} for 
+ * {@link Map} arguments. See {@link RequestHeaderMapMethodArgumentResolver} for
  * details on {@link Map} arguments annotated with {@code @RequestHeader}.
- * 
- * <p>An {@code @RequestHeader} is a named value resolved from a request header.
- * It has a required flag and a default value to fall back on when the request 
- * header does not exist. 
  *
- * <p>A {@link WebDataBinder} is invoked to apply type conversion to resolved 
+ * <p>An {@code @RequestHeader} is a named value resolved from a request header.
+ * It has a required flag and a default value to fall back on when the request
+ * header does not exist.
+ *
+ * <p>A {@link WebDataBinder} is invoked to apply type conversion to resolved
  * request header values that don't yet match the method parameter type.
- * 
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  * @since 3.1
@@ -44,7 +44,7 @@ import org.springframework.web.context.request.NativeWebRequest;
 public class RequestHeaderMethodArgumentResolver extends AbstractNamedValueMethodArgumentResolver {
 
 	/**
-	 * @param beanFactory a bean factory to use for resolving  ${...} 
+	 * @param beanFactory a bean factory to use for resolving  ${...}
 	 * placeholder and #{...} SpEL expressions in default values;
 	 * or {@code null} if default values are not expected to have expressions
 	 */
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 9dafb6d867..79a49c1cad 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
@@ -22,7 +22,7 @@ import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
 
 /**
- * Strategy interface for resolving method parameters into argument values in 
+ * Strategy interface for resolving method parameters into argument values in
  * the context of a given request.
  *
  * @author Arjen Poutsma
@@ -31,25 +31,25 @@ import org.springframework.web.context.request.NativeWebRequest;
 public interface HandlerMethodArgumentResolver {
 
 	/**
-	 * Whether the given {@linkplain MethodParameter method parameter} is 
+	 * 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; 
+	 * @return {@code true} if this resolver supports the supplied parameter;
 	 * {@code false} otherwise
 	 */
 	boolean supportsParameter(MethodParameter parameter);
 
 	/**
-	 * Resolves a method parameter into an argument value from a given request. 
-	 * A {@link ModelAndViewContainer} provides access to the model for the 
+	 * Resolves a method parameter into an argument value from a given request.
+	 * A {@link ModelAndViewContainer} provides access to the model for the
 	 * request. A {@link WebDataBinderFactory} provides a way to create
-	 * a {@link WebDataBinder} instance when needed for data binding and 
+	 * 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)} 
+	 *
+	 * @param parameter the method parameter to resolve. This parameter must
+	 * have previously been passed to
+	 * {@link #supportsParameter(org.springframework.core.MethodParameter)}
 	 * and it must have returned {@code true}
 	 * @param mavContainer the ModelAndViewContainer for the current request
 	 * @param webRequest the current request
@@ -57,9 +57,9 @@ 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, 
+	Object resolveArgument(MethodParameter parameter,
 						   ModelAndViewContainer mavContainer,
-						   NativeWebRequest webRequest, 
+						   NativeWebRequest webRequest,
 						   WebDataBinderFactory binderFactory) throws Exception;
 
 }
\ No newline at end of file
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 8def3ac532..4b77ba622e 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
@@ -20,8 +20,8 @@ import org.springframework.core.MethodParameter;
 import org.springframework.web.context.request.NativeWebRequest;
 
 /**
- * Strategy interface to handle the value returned from the invocation of a 
- * handler method . 
+ * Strategy interface to handle the value returned from the invocation of a
+ * handler method .
  *
  * @author Arjen Poutsma
  * @since 3.1
@@ -29,25 +29,25 @@ import org.springframework.web.context.request.NativeWebRequest;
 public interface HandlerMethodReturnValueHandler {
 
 	/**
-	 * Whether the given {@linkplain MethodParameter method return type} is 
+	 * 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; 
+	 * @return {@code true} if this handler supports the supplied return type;
 	 * {@code false} otherwise
 	 */
 	boolean supportsReturnType(MethodParameter returnType);
 
 	/**
-	 * Handle the given return value by adding attributes to the model and 
-	 * setting a view or setting the 
+	 * Handle the given return value by adding attributes to the model and
+	 * setting a view or setting the
 	 * {@link ModelAndViewContainer#setRequestHandled} flag to {@code true}
-	 * to indicate the response has been handled directly.  
-	 * 
+	 * 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 
-	 * {@link #supportsReturnType(org.springframework.core.MethodParameter)} 
+	 * @param returnType the type of the return value. This type must have
+	 * previously been passed to
+	 * {@link #supportsReturnType(org.springframework.core.MethodParameter)}
 	 * and it must have returned {@code true}
 	 * @param mavContainer the ModelAndViewContainer for the current request
 	 * @param webRequest the current request
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 c7bff8e6e4..b22ba7af1c 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
@@ -114,7 +114,7 @@ public class MultipartFilter extends OncePerRequestFilter {
 				logger.debug("Request [" + processedRequest.getRequestURI() + "] is not a multipart request");
 			}
 		}
-		
+
 		try {
 			filterChain.doFilter(processedRequest, response);
 		}
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
index 4cffa524bb..2d8c260ef6 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
@@ -51,15 +51,15 @@ public class RequestPartServletServerHttpRequest extends ServletServerHttpReques
 
 
 	/**
-	 * Create a new instance. 
+	 * Create a new instance.
 	 * @param request the current request
 	 * @param partName the name of the part to adapt to the {@link ServerHttpRequest} contract
 	 * @throws MissingServletRequestPartException if the request part cannot be found
 	 * @throws IllegalArgumentException if MultipartHttpServletRequest cannot be initialized
 	 */
-	public RequestPartServletServerHttpRequest(HttpServletRequest request, String partName) 
+	public RequestPartServletServerHttpRequest(HttpServletRequest request, String partName)
 			throws MissingServletRequestPartException {
-		
+
 		super(request);
 
 		this.multipartRequest = asMultipartRequest(request);
@@ -78,7 +78,7 @@ public class RequestPartServletServerHttpRequest extends ServletServerHttpReques
 			}
 		}
 	}
-	
+
 	private static MultipartHttpServletRequest asMultipartRequest(HttpServletRequest request) {
 		if (request instanceof MultipartHttpServletRequest) {
 			return (MultipartHttpServletRequest) request;
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java
index 9c551c315f..7d8e8dff17 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java
@@ -24,7 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
 /**
  * Custom {@link java.beans.PropertyEditor} for converting
  * {@link MultipartFile MultipartFiles} to Strings.
- * 
+ *
  * <p>Allows one to specify the charset to use.
  *
  * @author Juergen Hoeller
diff --git a/spring-web/src/main/java/org/springframework/web/util/TagUtils.java b/spring-web/src/main/java/org/springframework/web/util/TagUtils.java
index 8c000e83f0..298262392b 100644
--- a/spring-web/src/main/java/org/springframework/web/util/TagUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/TagUtils.java
@@ -63,7 +63,7 @@ public abstract class TagUtils {
 	 * 'page' or 'application', the method will return {@link PageContext#PAGE_SCOPE}.
 	 * @param scope the <code>String</code> to inspect
 	 * @return the scope found, or {@link PageContext#PAGE_SCOPE} if no scope matched
-	 * @throws IllegalArgumentException if the supplied <code>scope</code> is <code>null</code> 
+	 * @throws IllegalArgumentException if the supplied <code>scope</code> is <code>null</code>
 	 */
 	public static int getScope(String scope) {
 		Assert.notNull(scope, "Scope to search for cannot be null");
@@ -90,7 +90,7 @@ public abstract class TagUtils {
 	 * of the supplied type
 	 * @throws IllegalArgumentException if either of the supplied arguments is <code>null</code>;
 	 * or if the supplied <code>ancestorTagClass</code> is not type-assignable to
-	 * the {@link Tag} class 
+	 * the {@link Tag} class
 	 */
 	public static boolean hasAncestorOfType(Tag tag, Class ancestorTagClass) {
 		Assert.notNull(tag, "Tag cannot be null");
@@ -122,7 +122,7 @@ public abstract class TagUtils {
 	 * @throws IllegalArgumentException if any of the supplied arguments is <code>null</code>,
 	 * or in the case of the {@link String}-typed arguments, is composed wholly
 	 * of whitespace; or if the supplied <code>ancestorTagClass</code> is not
-	 * type-assignable to the {@link Tag} class 
+	 * type-assignable to the {@link Tag} class
 	 * @see #hasAncestorOfType(javax.servlet.jsp.tagext.Tag, Class)
 	 */
 	public static void assertHasAncestorOfType(Tag tag, Class ancestorTagClass, String tagName, String ancestorTagName) {
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 e976a43b54..c86b5a613e 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
@@ -70,8 +70,8 @@ public abstract class UriUtils {
 	/**
 	 * Encodes the given source URI into an encoded String. All various URI components are
 	 * encoded according to their respective valid character sets.
-	 * <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 
+	 * <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>
 	 * UriComponents uriComponents = UriComponentsBuilder.fromUri("/path?name={value}").buildAndExpand("a=b");
@@ -111,8 +111,8 @@ public abstract class UriUtils {
 	 * encoded according to their respective valid character sets.
 	 * <p><strong>Note</strong> that this method does not support fragments ({@code #}),
 	 * as these are not supposed to be sent to the server, but retained by the client.
-	 * <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 
+	 * <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>
 	 * UriComponents uriComponents = UriComponentsBuilder.fromHttpUrl("/path?name={value}").buildAndExpand("a=b");
diff --git a/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java
index 7d87547b5f..c5c4ed5e67 100644
--- a/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-web/src/test/java/org/springframework/beans/IOther.java b/spring-web/src/test/java/org/springframework/beans/IOther.java
index 797486ec44..6a8f74187c 100644
--- a/spring-web/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-web/src/test/java/org/springframework/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
index a06e15d150..0eb8df5c8a 100644
--- a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-web/src/test/java/org/springframework/beans/Person.java b/spring-web/src/test/java/org/springframework/beans/Person.java
index 3ebce5e2ea..a78998ad5d 100644
--- a/spring-web/src/test/java/org/springframework/beans/Person.java
+++ b/spring-web/src/test/java/org/springframework/beans/Person.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
index 36351352aa..34d05120aa 100644
--- a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
+++ b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java
index 0de4c19736..e3c5072f1b 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java
@@ -56,7 +56,7 @@ public class HttpMessageConverterTests {
 		assertFalse(converter.canRead(MyType.class, new MediaType("foo", "*")));
 		assertFalse(converter.canRead(MyType.class, MediaType.ALL));
 	}
-	
+
 	@Test
 	public void canWrite() {
 		AbstractHttpMessageConverter<MyType> converter = new MyHttpMessageConverter<MyType>(MEDIA_TYPE) {
diff --git a/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
index 149a84f659..3f5171390d 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
@@ -87,7 +87,7 @@ public class StringHttpMessageConverterTests {
 	}
 
 	// SPR-8867
-	
+
 	@Test
 	public void writeOverrideRequestedContentType() throws IOException {
 		Charset utf8 = Charset.forName("UTF-8");
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/Jaxb2RootElementHttpMessageConverterTest.java
index d8c60f1827..89cbe30df7 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/Jaxb2RootElementHttpMessageConverterTest.java
@@ -56,7 +56,7 @@ public class Jaxb2RootElementHttpMessageConverterTest {
 		AopProxy proxy = proxyFactory.createAopProxy(advisedSupport);
 		rootElementCglib = (RootElement) proxy.getProxy();
 	}
-	
+
 	@Test
 	public void canRead() throws Exception {
 		assertTrue("Converter does not support reading @XmlRootElement", converter.canRead(RootElement.class, null));
@@ -79,7 +79,7 @@ public class Jaxb2RootElementHttpMessageConverterTest {
 		RootElement result = (RootElement) converter.read((Class) RootElement.class, inputMessage);
 		assertEquals("Invalid result", "Hello World", result.type.s);
 	}
-	
+
 	@Test
 	@SuppressWarnings("unchecked")
 	public void readXmlRootElementSubclass() throws Exception {
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 3dbbb80e5f..a273cfffab 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
@@ -120,7 +120,7 @@ public class SourceHttpMessageConverterTests {
 		assertEquals("Invalid content-length", outputMessage.getBodyAsBytes().length,
 				outputMessage.getHeaders().getContentLength());
 	}
-	
+
 	@Test
 	public void writeSAXSource() throws Exception {
 		String xml = "<root>Hello World</root>";
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java
index 9e9beb0558..ae7d58af43 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java
@@ -71,7 +71,7 @@ public class MockHttpSession implements HttpSession {
 
 	/**
 	 * Create a new MockHttpSession with a default {@link MockServletContext}.
-	 * 
+	 *
 	 * @see MockServletContext
 	 */
 	public MockHttpSession() {
@@ -80,7 +80,7 @@ public class MockHttpSession implements HttpSession {
 
 	/**
 	 * Create a new MockHttpSession.
-	 * 
+	 *
 	 * @param servletContext the ServletContext that the session runs in
 	 */
 	public MockHttpSession(ServletContext servletContext) {
@@ -89,7 +89,7 @@ public class MockHttpSession implements HttpSession {
 
 	/**
 	 * Create a new MockHttpSession.
-	 * 
+	 *
 	 * @param servletContext the ServletContext that the session runs in
 	 * @param id a unique identifier for this session
 	 */
@@ -222,7 +222,7 @@ public class MockHttpSession implements HttpSession {
 	/**
 	 * Serialize the attributes of this session into an object that can be
 	 * turned into a byte array with standard Java serialization.
-	 * 
+	 *
 	 * @return a representation of this session's serialized state
 	 */
 	public Serializable serializeState() {
@@ -249,7 +249,7 @@ public class MockHttpSession implements HttpSession {
 	/**
 	 * Deserialize the attributes of this session from a state object created by
 	 * {@link #serializeState()}.
-	 * 
+	 *
 	 * @param state a representation of this session's serialized state
 	 */
 	@SuppressWarnings("unchecked")
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java
index 6bd5bb75d3..5c18203da6 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java
@@ -72,7 +72,7 @@ public class RequestAndSessionScopedBeanTests {
 			// expected
 		}
 	}
-	
+
 	@Test
 	public void testPutBeanInSession() throws Exception {
 		String targetBeanName = "target";
diff --git a/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java
index 69a71bb3fc..5eed6a55ac 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java
@@ -41,16 +41,16 @@ public class RequestContextFilterTests extends TestCase {
 	public void testHappyPath() throws Exception {
 		testFilterInvocation(null);
 	}
-	
+
 	public void testWithException() throws Exception {
 		testFilterInvocation(new ServletException());
 	}
-		
+
 	public void testFilterInvocation(final ServletException sex) throws Exception {
 		final MockHttpServletRequest req = new MockHttpServletRequest();
 		req.setAttribute("myAttr", "myValue");
 		final MockHttpServletResponse resp = new MockHttpServletResponse();
-		
+
 		// Expect one invocation by the filter being tested
 		class DummyFilterChain implements FilterChain {
 			public int invocations = 0;
@@ -84,7 +84,7 @@ public class RequestContextFilterTests extends TestCase {
 		catch (ServletException ex) {
 			assertNotNull(sex);
 		}
-		
+
 		try {
 			RequestContextHolder.currentRequestAttributes();
 			fail();
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java
index 8b36851a2a..968728154e 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java
@@ -38,7 +38,7 @@ import org.springframework.web.method.annotation.AbstractCookieValueMethodArgume
 
 /**
  * Test fixture with {@link org.springframework.web.method.annotation.AbstractCookieValueMethodArgumentResolver}.
- * 
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  */
@@ -59,7 +59,7 @@ public class CookieValueMethodArgumentResolverTests {
 	@Before
 	public void setUp() throws Exception {
 		resolver = new TestCookieValueMethodArgumentResolver();
-		
+
 		Method method = getClass().getMethod("params", Cookie.class, String.class, String.class);
 		paramNamedCookie = new MethodParameter(method, 0);
 		paramNamedDefaultValueString = new MethodParameter(method, 1);
@@ -79,7 +79,7 @@ public class CookieValueMethodArgumentResolverTests {
 	@Test
 	public void resolveCookieDefaultValue() throws Exception {
 		Object result = resolver.resolveArgument(paramNamedDefaultValueString, null, webRequest, null);
-		
+
 		assertTrue(result instanceof String);
 		assertEquals("Invalid result", "bar", result);
 	}
@@ -101,7 +101,7 @@ public class CookieValueMethodArgumentResolverTests {
 			return null;
 		}
 	}
-	
+
 	public void params(@CookieValue("name") Cookie param1,
 					   @CookieValue(value = "name", defaultValue = "bar") String param2,
 					   String param3) {
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ErrorsMethodHandlerArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ErrorsMethodHandlerArgumentResolverTests.java
index 719d5eda0a..be8ce28ce3 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/ErrorsMethodHandlerArgumentResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ErrorsMethodHandlerArgumentResolverTests.java
@@ -32,7 +32,7 @@ import org.springframework.web.method.support.ModelAndViewContainer;
 
 /**
  * Test fixture with {@link ErrorsMethodArgumentResolver}.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class ErrorsMethodHandlerArgumentResolverTests {
@@ -66,7 +66,7 @@ public class ErrorsMethodHandlerArgumentResolverTests {
 		mavContainer.addAttribute("ignore4", "value4");
 		mavContainer.addAttribute("ignore5", "value5");
 		mavContainer.addAllAttributes(bindingResult.getModel());
-		
+
 		Object actual = resolver.resolveArgument(paramErrors, mavContainer, webRequest, null);
 
 		assertSame(actual, bindingResult);
@@ -77,10 +77,10 @@ public class ErrorsMethodHandlerArgumentResolverTests {
 		ModelAndViewContainer mavContainer = new ModelAndViewContainer();
 		mavContainer.addAllAttributes(bindingResult.getModel());
 		mavContainer.addAttribute("ignore1", "value1");
-		
+
 		resolver.resolveArgument(paramErrors, mavContainer, webRequest, null);
 	}
-	
+
 	@Test(expected=IllegalStateException.class)
 	public void noBindingResult() throws Exception {
 		resolver.resolveArgument(paramErrors, new ModelAndViewContainer(), webRequest, null);
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
index 1a233bba9d..4ac6a73348 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
@@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 
 /**
  * Test fixture for {@link ExceptionHandlerMethodResolver} tests.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class ExceptionHandlerMethodResolverTests {
@@ -83,7 +83,7 @@ public class ExceptionHandlerMethodResolverTests {
 		IOException exception = new IOException();
 		assertEquals("handleIOException", resolver.resolveMethod(exception).getName());
 	}
-	
+
 	@Test(expected = IllegalStateException.class)
 	public void ambiguousExceptionMapping() {
 		new ExceptionHandlerMethodResolver(AmbiguousController.class);
@@ -96,7 +96,7 @@ public class ExceptionHandlerMethodResolverTests {
 
 	@Controller
 	static class ExceptionController {
-		
+
 		public void handle() {}
 
 		@ExceptionHandler(IOException.class)
@@ -139,10 +139,10 @@ public class ExceptionHandlerMethodResolverTests {
 
 	@Controller
 	static class NoExceptionController {
-		
+
 		@ExceptionHandler
 		public void handle() {
 		}
 	}
-	
+
 }
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java
index cd6ac844ba..73c3484273 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java
@@ -37,7 +37,7 @@ import org.springframework.web.method.annotation.ExpressionValueMethodArgumentRe
 
 /**
  * Test fixture with {@link ExpressionValueMethodArgumentResolver}.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class ExpressionValueMethodArgumentResolverTests {
@@ -57,18 +57,18 @@ public class ExpressionValueMethodArgumentResolverTests {
 		GenericWebApplicationContext context = new GenericWebApplicationContext();
 		context.refresh();
 		resolver = new ExpressionValueMethodArgumentResolver(context.getBeanFactory());
-		
+
 		Method method = getClass().getMethod("params", int.class, String.class, String.class);
 		paramSystemProperty = new MethodParameter(method, 0);
 		paramContextPath = new MethodParameter(method, 1);
 		paramNotSupported = new MethodParameter(method, 2);
 
 		webRequest = new ServletWebRequest(new MockHttpServletRequest(), new MockHttpServletResponse());
-		
+
 		// Expose request to the current thread (for SpEL expressions)
 		RequestContextHolder.setRequestAttributes(webRequest);
 	}
-	
+
 	@After
 	public void teardown() {
 		RequestContextHolder.resetRequestAttributes();
@@ -86,7 +86,7 @@ public class ExpressionValueMethodArgumentResolverTests {
 		System.setProperty("systemProperty", "22");
 		Object value = resolver.resolveArgument(paramSystemProperty, null, webRequest, null);
 		System.clearProperty("systemProperty");
-		
+
 		assertEquals("22", value);
 	}
 
@@ -94,7 +94,7 @@ public class ExpressionValueMethodArgumentResolverTests {
 	public void resolveContextPath() throws Exception {
 		webRequest.getNativeRequest(MockHttpServletRequest.class).setContextPath("/contextPath");
 		Object value = resolver.resolveArgument(paramContextPath, null, webRequest, null);
-		
+
 		assertEquals("/contextPath", value);
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/InitBinderDataBinderFactoryTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/InitBinderDataBinderFactoryTests.java
index 6600ef920f..40b600377c 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/InitBinderDataBinderFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/InitBinderDataBinderFactoryTests.java
@@ -53,19 +53,19 @@ public class InitBinderDataBinderFactoryTests {
 	private HandlerMethodArgumentResolverComposite argumentResolvers;
 
 	private NativeWebRequest webRequest;
-	
+
 	@Before
 	public void setUp() throws Exception {
 		bindingInitializer = new ConfigurableWebBindingInitializer();
 		argumentResolvers = new HandlerMethodArgumentResolverComposite();
 		webRequest = new ServletWebRequest(new MockHttpServletRequest());
 	}
-	
+
 	@Test
 	public void createBinder() throws Exception {
 		WebDataBinderFactory factory = createBinderFactory("initBinder", WebDataBinder.class);
 		WebDataBinder dataBinder = factory.createBinder(webRequest, null, null);
-		
+
 		assertNotNull(dataBinder.getDisallowedFields());
 		assertEquals("id", dataBinder.getDisallowedFields()[0]);
 	}
@@ -74,10 +74,10 @@ public class InitBinderDataBinderFactoryTests {
 	public void createBinderWithGlobalInitialization() throws Exception {
 		ConversionService conversionService = new DefaultFormattingConversionService();
 		bindingInitializer.setConversionService(conversionService);
-		
+
 		WebDataBinderFactory factory = createBinderFactory("initBinder", WebDataBinder.class);
 		WebDataBinder dataBinder = factory.createBinder(webRequest, null, null);
-		
+
 		assertSame(conversionService, dataBinder.getConversionService());
 	}
 
@@ -85,7 +85,7 @@ public class InitBinderDataBinderFactoryTests {
 	public void createBinderWithAttrName() throws Exception {
 		WebDataBinderFactory factory = createBinderFactory("initBinderWithAttributeName", WebDataBinder.class);
 		WebDataBinder dataBinder = factory.createBinder(webRequest, null, "foo");
-		
+
 		assertNotNull(dataBinder.getDisallowedFields());
 		assertEquals("id", dataBinder.getDisallowedFields()[0]);
 	}
@@ -94,18 +94,18 @@ public class InitBinderDataBinderFactoryTests {
 	public void createBinderWithAttrNameNoMatch() throws Exception {
 		WebDataBinderFactory factory = createBinderFactory("initBinderWithAttributeName", WebDataBinder.class);
 		WebDataBinder dataBinder = factory.createBinder(webRequest, null, "invalidName");
-		
+
 		assertNull(dataBinder.getDisallowedFields());
 	}
-	
+
 	@Test
 	public void createBinderNullAttrName() throws Exception {
 		WebDataBinderFactory factory = createBinderFactory("initBinderWithAttributeName", WebDataBinder.class);
 		WebDataBinder dataBinder = factory.createBinder(webRequest, null, null);
-		
+
 		assertNull(dataBinder.getDisallowedFields());
 	}
-	
+
 	@Test(expected=IllegalStateException.class)
 	public void returnValueNotExpected() throws Exception {
 		WebDataBinderFactory factory = createBinderFactory("initBinderReturnValue", WebDataBinder.class);
@@ -123,7 +123,7 @@ public class InitBinderDataBinderFactoryTests {
 		assertNotNull(dataBinder.getDisallowedFields());
 		assertEquals("requestParam-22", dataBinder.getDisallowedFields()[0]);
 	}
-	
+
 	private WebDataBinderFactory createBinderFactory(String methodName, Class<?>... parameterTypes)
 			throws Exception {
 
@@ -134,9 +134,9 @@ public class InitBinderDataBinderFactoryTests {
 		handlerMethod.setHandlerMethodArgumentResolvers(argumentResolvers);
 		handlerMethod.setDataBinderFactory(new DefaultDataBinderFactory(null));
 		handlerMethod.setParameterNameDiscoverer(new LocalVariableTableParameterNameDiscoverer());
-		
+
 		return new InitBinderDataBinderFactory(Arrays.asList(handlerMethod), bindingInitializer);
-	}	
+	}
 
 	private static class InitBinderHandler {
 
@@ -145,24 +145,24 @@ public class InitBinderDataBinderFactoryTests {
 		public void initBinder(WebDataBinder dataBinder) {
 			dataBinder.setDisallowedFields("id");
 		}
-		
+
 		@SuppressWarnings("unused")
 		@InitBinder(value="foo")
 		public void initBinderWithAttributeName(WebDataBinder dataBinder) {
 			dataBinder.setDisallowedFields("id");
 		}
-		
+
 		@SuppressWarnings("unused")
 		@InitBinder
 		public String initBinderReturnValue(WebDataBinder dataBinder) {
 			return "invalid";
 		}
-		
+
 		@SuppressWarnings("unused")
 		@InitBinder
 		public void initBinderTypeConversion(WebDataBinder dataBinder, @RequestParam int requestParam) {
 			dataBinder.setDisallowedFields("requestParam-" + requestParam);
 		}
 	}
-	
+
 }
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java
index 3d35b95cbd..1b1e302837 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java
@@ -35,15 +35,15 @@ import org.springframework.web.method.support.ModelAndViewContainer;
 
 /**
  * Test fixture with {@link org.springframework.web.method.annotation.MapMethodProcessor}.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class MapMethodProcessorTests {
 
 	private MapMethodProcessor processor;
-	
+
 	private ModelAndViewContainer mavContainer;
-	
+
 	private MethodParameter paramMap;
 
 	private MethodParameter returnParamMap;
@@ -54,8 +54,8 @@ public class MapMethodProcessorTests {
 	public void setUp() throws Exception {
 		processor = new MapMethodProcessor();
 		mavContainer = new ModelAndViewContainer();
-		
-		Method method = getClass().getDeclaredMethod("map", Map.class); 
+
+		Method method = getClass().getDeclaredMethod("map", Map.class);
 		paramMap = new MethodParameter(method, 0);
 		returnParamMap = new MethodParameter(method, 0);
 
@@ -76,12 +76,12 @@ public class MapMethodProcessorTests {
 	public void resolveArgumentValue() throws Exception {
 		assertSame(mavContainer.getModel(), processor.resolveArgument(paramMap, mavContainer, webRequest, null));
 	}
-	
+
 	@Test
 	public void handleMapReturnValue() throws Exception {
 		mavContainer.addAttribute("attr1", "value1");
 		Map<String, Object> returnValue = new ModelMap("attr2", "value2");
-		
+
 		processor.handleReturnValue(returnValue , returnParamMap, mavContainer, webRequest);
 
 		assertEquals("value1", mavContainer.getModel().get("attr1"));
@@ -92,5 +92,5 @@ public class MapMethodProcessorTests {
 	private Map<String, Object> map(Map<String, Object> map) {
 		return null;
 	}
-	
+
 }
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java
index 1007bb266c..34ca840ce9 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java
@@ -50,13 +50,13 @@ import org.springframework.web.method.support.ModelAndViewContainer;
 
 /**
  * Text fixture for {@link ModelFactory} tests.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class ModelFactoryTests {
-	
+
 	private Object handler = new ModelHandler();
-	
+
 	private InvocableHandlerMethod handleMethod;
 
 	private InvocableHandlerMethod handleSessionAttrMethod;
@@ -77,13 +77,13 @@ public class ModelFactoryTests {
 		sessionAttrsHandler = new SessionAttributesHandler(handlerType, sessionAttributeStore);
 		webRequest = new ServletWebRequest(new MockHttpServletRequest());
 	}
-	
+
 	@Test
 	public void modelAttributeMethod() throws Exception {
 		ModelFactory modelFactory = createModelFactory("modelAttr", Model.class);
 		ModelAndViewContainer mavContainer = new ModelAndViewContainer();
 		modelFactory.initModel(webRequest, mavContainer, handleMethod);
-		
+
 		assertEquals(Boolean.TRUE, mavContainer.getModel().get("modelAttr"));
 	}
 
@@ -114,14 +114,14 @@ public class ModelFactoryTests {
 		assertTrue(mavContainer.containsAttribute("name"));
 		assertNull(mavContainer.getModel().get("name"));
 	}
-	
+
 	@Test
 	public void sessionAttribute() throws Exception {
 		sessionAttributeStore.storeAttribute(webRequest, "sessionAttr", "sessionAttrValue");
 
 		// Resolve successfully handler session attribute once
 		assertTrue(sessionAttrsHandler.isHandlerSessionAttribute("sessionAttr", null));
-		
+
 		ModelFactory modelFactory = createModelFactory("modelAttr", Model.class);
 		ModelAndViewContainer mavContainer = new ModelAndViewContainer();
 		modelFactory.initModel(webRequest, mavContainer, handleMethod);
@@ -137,7 +137,7 @@ public class ModelFactoryTests {
 			modelFactory.initModel(webRequest, new ModelAndViewContainer(), handleSessionAttrMethod);
 			fail("Expected HttpSessionRequiredException");
 		} catch (HttpSessionRequiredException e) { }
-		
+
 		sessionAttributeStore.storeAttribute(webRequest, "sessionAttr", "sessionAttrValue");
 		ModelAndViewContainer mavContainer = new ModelAndViewContainer();
 		modelFactory.initModel(webRequest, mavContainer, handleSessionAttrMethod);
@@ -151,19 +151,19 @@ public class ModelFactoryTests {
 		Object attrValue = new Object();
 		ModelAndViewContainer mavContainer = new ModelAndViewContainer();
 		mavContainer.addAttribute(attrName, attrValue);
-		
+
 		WebDataBinder dataBinder = new WebDataBinder(attrValue, attrName);
 		WebDataBinderFactory binderFactory = createMock(WebDataBinderFactory.class);
 		expect(binderFactory.createBinder(webRequest, attrValue, attrName)).andReturn(dataBinder);
 		replay(binderFactory);
-		
+
 		ModelFactory modelFactory = new ModelFactory(null, binderFactory, sessionAttrsHandler);
 		modelFactory.updateModel(webRequest, mavContainer);
 
 		assertEquals(attrValue, mavContainer.getModel().remove(attrName));
 		assertSame(dataBinder.getBindingResult(), mavContainer.getModel().remove(bindingResultKey(attrName)));
 		assertEquals(0, mavContainer.getModel().size());
-		
+
 		verify(binderFactory);
 	}
 
@@ -171,12 +171,12 @@ public class ModelFactoryTests {
 	public void updateModelSessionStatusComplete() throws Exception {
 		String attrName = "sessionAttr";
 		String attrValue = "sessionAttrValue";
-		
+
 		ModelAndViewContainer mavContainer = new ModelAndViewContainer();
 		mavContainer.addAttribute(attrName, attrValue);
 		mavContainer.getSessionStatus().setComplete();
 		sessionAttributeStore.storeAttribute(webRequest, attrName, attrValue);
-		
+
 		// Resolve successfully handler session attribute once
 		assertTrue(sessionAttrsHandler.isHandlerSessionAttribute(attrName, null));
 
@@ -193,11 +193,11 @@ public class ModelFactoryTests {
 
 		verify(binderFactory);
 	}
-	
+
 	private String bindingResultKey(String key) {
 		return BindingResult.MODEL_KEY_PREFIX + key;
 	}
-	
+
 	private ModelFactory createModelFactory(String methodName, Class<?>... parameterTypes) throws Exception{
 		Method method = ModelHandler.class.getMethod(methodName, parameterTypes);
 
@@ -208,13 +208,13 @@ public class ModelFactoryTests {
 		handlerMethod.setHandlerMethodArgumentResolvers(argResolvers);
 		handlerMethod.setDataBinderFactory(null);
 		handlerMethod.setParameterNameDiscoverer(new LocalVariableTableParameterNameDiscoverer());
-		
+
 		return new ModelFactory(Arrays.asList(handlerMethod), null, sessionAttrsHandler);
 	}
-	
+
 	@SessionAttributes("sessionAttr") @SuppressWarnings("unused")
 	private static class ModelHandler {
-		
+
 		@ModelAttribute
 		public void modelAttr(Model model) {
 			model.addAttribute("modelAttr", Boolean.TRUE);
@@ -234,7 +234,7 @@ public class ModelFactoryTests {
 		public Boolean nullModelAttr() {
 			return null;
 		}
-		
+
 		public void handle() {
 		}
 
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java
index 7c42a0f9cf..b55df92951 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java
@@ -35,15 +35,15 @@ import org.springframework.web.method.support.ModelAndViewContainer;
 
 /**
  * Test fixture with {@link org.springframework.web.method.annotation.ModelMethodProcessor}.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class ModelMethodProcessorTests {
 
 	private ModelMethodProcessor processor;
-	
+
 	private ModelAndViewContainer mavContainer;
-	
+
 	private MethodParameter paramModel;
 
 	private MethodParameter returnParamModel;
@@ -54,11 +54,11 @@ public class ModelMethodProcessorTests {
 	public void setUp() throws Exception {
 		processor = new ModelMethodProcessor();
 		mavContainer = new ModelAndViewContainer();
-		
-		Method method = getClass().getDeclaredMethod("model", Model.class); 
+
+		Method method = getClass().getDeclaredMethod("model", Model.class);
 		paramModel = new MethodParameter(method, 0);
 		returnParamModel = new MethodParameter(method, -1);
-		
+
 		webRequest = new ServletWebRequest(new MockHttpServletRequest());
 	}
 
@@ -76,7 +76,7 @@ public class ModelMethodProcessorTests {
 	public void resolveArgumentValue() throws Exception {
 		assertSame(mavContainer.getModel(), processor.resolveArgument(paramModel, mavContainer, webRequest, null));
 	}
-	
+
 	@Test
 	public void handleModelReturnValue() throws Exception {
 		mavContainer.addAttribute("attr1", "value1");
@@ -84,14 +84,14 @@ public class ModelMethodProcessorTests {
 		returnValue.addAttribute("attr2", "value2");
 
 		processor.handleReturnValue(returnValue , returnParamModel, mavContainer, webRequest);
-		
+
 		assertEquals("value1", mavContainer.getModel().get("attr1"));
 		assertEquals("value2", mavContainer.getModel().get("attr2"));
 	}
-	
+
 	@SuppressWarnings("unused")
 	private Model model(Model model) {
 		return null;
 	}
-	
+
 }
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java
index 25170be90d..15b5d0a5e2 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java
@@ -39,7 +39,7 @@ import org.springframework.web.method.annotation.RequestHeaderMapMethodArgumentR
 
 /**
  * Text fixture with {@link RequestHeaderMapMethodArgumentResolver}.
- * 
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  */
@@ -62,7 +62,7 @@ public class RequestHeaderMapMethodArgumentResolverTests {
 	@Before
 	public void setUp() throws Exception {
 		resolver = new RequestHeaderMapMethodArgumentResolver();
-		
+
 		Method method = getClass().getMethod("params", Map.class, MultiValueMap.class, HttpHeaders.class, Map.class);
 		paramMap = new MethodParameter(method, 0);
 		paramMultiValueMap = new MethodParameter(method, 1);
@@ -108,7 +108,7 @@ public class RequestHeaderMapMethodArgumentResolverTests {
 		expected.add(name, value2);
 
 		Object result = resolver.resolveArgument(paramMultiValueMap, null, webRequest, null);
-		
+
 		assertTrue(result instanceof MultiValueMap);
 		assertEquals("Invalid result", expected, result);
 	}
@@ -127,7 +127,7 @@ public class RequestHeaderMapMethodArgumentResolverTests {
 		expected.add(name, value2);
 
 		Object result = resolver.resolveArgument(paramHttpHeaders, null, webRequest, null);
-		
+
 		assertTrue(result instanceof HttpHeaders);
 		assertEquals("Invalid result", expected, result);
 	}
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java
index 0c3921d720..fa511ad3f0 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java
@@ -41,7 +41,7 @@ import org.springframework.web.method.annotation.RequestHeaderMethodArgumentReso
 
 /**
  * Test fixture with {@link org.springframework.web.method.annotation.RequestHeaderMethodArgumentResolver}.
- * 
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  */
@@ -78,7 +78,7 @@ public class RequestHeaderMethodArgumentResolverTests {
 		// Expose request to the current thread (for SpEL expressions)
 		RequestContextHolder.setRequestAttributes(webRequest);
 	}
-	
+
 	@After
 	public void teardown() {
 		RequestContextHolder.resetRequestAttributes();
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java
index 6334fcd4c9..ee709f04ba 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java
@@ -38,7 +38,7 @@ import org.springframework.web.method.annotation.RequestParamMapMethodArgumentRe
 
 /**
  * Test fixture with {@link RequestParamMapMethodArgumentResolver}.
- * 
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  */
@@ -61,7 +61,7 @@ public class RequestParamMapMethodArgumentResolverTests {
 	@Before
 	public void setUp() throws Exception {
 		resolver = new RequestParamMapMethodArgumentResolver();
-		
+
 		Method method = getClass().getMethod("params", Map.class, MultiValueMap.class, Map.class, Map.class);
 		paramMap = new MethodParameter(method, 0);
 		paramMultiValueMap = new MethodParameter(method, 1);
@@ -88,7 +88,7 @@ public class RequestParamMapMethodArgumentResolverTests {
 		Map<String, String> expected = Collections.singletonMap(name, value);
 
 		Object result = resolver.resolveArgument(paramMap, null, webRequest, null);
-		
+
 		assertTrue(result instanceof Map);
 		assertEquals("Invalid result", expected, result);
 	}
@@ -99,7 +99,7 @@ public class RequestParamMapMethodArgumentResolverTests {
 		String value1 = "bar";
 		String value2 = "baz";
 		request.addParameter(name, new String[]{value1, value2});
-		
+
 		MultiValueMap<String, String> expected = new LinkedMultiValueMap<String, String>(1);
 		expected.add(name, value1);
 		expected.add(name, value2);
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 272b2b5959..f8978d8b17 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
@@ -50,7 +50,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 /**
  * Test fixture with {@link org.springframework.web.method.annotation.RequestParamMethodArgumentResolver}.
- * 
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  */
@@ -81,7 +81,7 @@ public class RequestParamMethodArgumentResolverTests {
 
 		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);
-		
+
 		paramNamedDefaultValueString = new MethodParameter(method, 0);
 		paramNamedStringArray = new MethodParameter(method, 1);
 		paramNamedMap = new MethodParameter(method, 2);
@@ -112,7 +112,7 @@ public class RequestParamMethodArgumentResolverTests {
 		assertTrue("Simple type params supported w/o annotations", resolver.supportsParameter(paramStringNotAnnot));
 		assertTrue("MultipartFile parameter not supported", resolver.supportsParameter(paramMultipartFileNotAnnot));
 		assertTrue("Part parameter not supported", resolver.supportsParameter(paramServlet30Part));
-		
+
 		resolver = new RequestParamMethodArgumentResolver(null, false);
 		assertFalse(resolver.supportsParameter(paramStringNotAnnot));
 		assertFalse(resolver.supportsParameter(paramRequestPartAnnot));
@@ -229,7 +229,7 @@ public class RequestParamMethodArgumentResolverTests {
 	@Test
 	public void resolveDefaultValue() throws Exception {
 		Object result = resolver.resolveArgument(paramNamedDefaultValueString, null, webRequest, null);
-		
+
 		assertTrue(result instanceof String);
 		assertEquals("Invalid result", "bar", result);
 	}
@@ -250,7 +250,7 @@ public class RequestParamMethodArgumentResolverTests {
 	}
 
 	// SPR-8561
-	
+
 	@Test
 	public void resolveSimpleTypeParamToNull() throws Exception {
 		Object result = resolver.resolveArgument(paramStringNotAnnot, null, webRequest, null);
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java
index ed392de909..3cd926d20c 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java
@@ -36,7 +36,7 @@ import org.springframework.web.context.request.ServletWebRequest;
 
 /**
  * Test fixture with {@link WebArgumentResolverAdapterTests}.
- * 
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  */
@@ -56,7 +56,7 @@ public class WebArgumentResolverAdapterTests {
 		adapter = new TestWebArgumentResolverAdapter(adaptee);
 		parameter = new MethodParameter(getClass().getMethod("handle", Integer.TYPE), 0);
 		webRequest = new ServletWebRequest(new MockHttpServletRequest());
-		
+
 		// Expose request to the current thread (for SpEL expressions)
 		RequestContextHolder.setRequestAttributes(webRequest);
 	}
@@ -151,7 +151,7 @@ public class WebArgumentResolverAdapterTests {
 
 	public void handle(int param) {
 	}
-	
+
 	private class TestWebArgumentResolverAdapter extends AbstractWebArgumentResolverAdapter {
 
 		public TestWebArgumentResolverAdapter(WebArgumentResolver adaptee) {
diff --git a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java
index 18a8a16416..4b700225e8 100644
--- a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java
@@ -28,7 +28,7 @@ import org.springframework.core.MethodParameter;
 
 /**
  * Test fixture with {@link HandlerMethodArgumentResolverComposite}.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class HandlerMethodArgumentResolverCompositeTests {
@@ -42,20 +42,20 @@ public class HandlerMethodArgumentResolverCompositeTests {
 	@Before
 	public void setUp() throws Exception {
 		resolvers = new HandlerMethodArgumentResolverComposite();
-		
+
 		Method method = getClass().getDeclaredMethod("handle", Integer.class, String.class);
 		paramInt = new MethodParameter(method, 0);
 		paramStr = new MethodParameter(method, 1);
 	}
-	
+
 	@Test
 	public void supportsParameter() throws Exception {
 		registerResolver(Integer.class, null);
-		
+
 		assertTrue(this.resolvers.supportsParameter(paramInt));
 		assertFalse(this.resolvers.supportsParameter(paramStr));
 	}
-	
+
 	@Test
 	public void resolveArgument() throws Exception {
 		registerResolver(Integer.class, Integer.valueOf(55));
@@ -63,7 +63,7 @@ public class HandlerMethodArgumentResolverCompositeTests {
 
 		assertEquals(Integer.valueOf(55), resolvedValue);
 	}
-	
+
 	@Test
 	public void checkArgumentResolverOrder() throws Exception {
 		registerResolver(Integer.class, Integer.valueOf(1));
@@ -72,7 +72,7 @@ public class HandlerMethodArgumentResolverCompositeTests {
 
 		assertEquals("Didn't use the first registered resolver", Integer.valueOf(1), resolvedValue);
 	}
-	
+
 	@Test(expected=IllegalArgumentException.class)
 	public void noSuitableArgumentResolver() throws Exception {
 		this.resolvers.resolveArgument(paramStr, null, null, null);
diff --git a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java
index 99b53bb78b..9acab34ec6 100644
--- a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java
@@ -27,7 +27,7 @@ import org.springframework.core.MethodParameter;
 
 /**
  * Test fixture with {@link HandlerMethodReturnValueHandlerComposite}.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class HandlerMethodReturnValueHandlerCompositeTests {
@@ -35,7 +35,7 @@ public class HandlerMethodReturnValueHandlerCompositeTests {
 	private HandlerMethodReturnValueHandlerComposite handlers;
 
 	ModelAndViewContainer mavContainer;
-	
+
 	private MethodParameter paramInt;
 
 	private MethodParameter paramStr;
@@ -43,11 +43,11 @@ public class HandlerMethodReturnValueHandlerCompositeTests {
 	@Before
 	public void setUp() throws Exception {
 		handlers = new HandlerMethodReturnValueHandlerComposite();
-		mavContainer = new ModelAndViewContainer(); 
+		mavContainer = new ModelAndViewContainer();
 		paramInt = new MethodParameter(getClass().getDeclaredMethod("handleInteger"), -1);
 		paramStr = new MethodParameter(getClass().getDeclaredMethod("handleString"), -1);
 	}
-	
+
 	@Test
 	public void supportsReturnType() throws Exception {
 		registerHandler(Integer.class);
@@ -55,12 +55,12 @@ public class HandlerMethodReturnValueHandlerCompositeTests {
 		assertTrue(this.handlers.supportsReturnType(paramInt));
 		assertFalse(this.handlers.supportsReturnType(paramStr));
 	}
-	
+
 	@Test
 	public void handleReturnValue() throws Exception {
 		StubReturnValueHandler handler = registerHandler(Integer.class);
 		this.handlers.handleReturnValue(Integer.valueOf(55), paramInt, mavContainer, null);
-		
+
 		assertEquals(Integer.valueOf(55), handler.getReturnValue());
 	}
 
@@ -69,28 +69,28 @@ public class HandlerMethodReturnValueHandlerCompositeTests {
 		StubReturnValueHandler h1 = registerHandler(Integer.class);
 		StubReturnValueHandler h2 = registerHandler(Integer.class);
 		this.handlers.handleReturnValue(Integer.valueOf(55), paramInt, mavContainer, null);
-		
+
 		assertEquals("Didn't use the 1st registered handler", Integer.valueOf(55), h1.getReturnValue());
 		assertNull("Shouldn't have use the 2nd registered handler", h2.getReturnValue());
 	}
-	
+
 	@Test(expected=IllegalArgumentException.class)
 	public void noSuitableReturnValueHandler() throws Exception {
 		registerHandler(Integer.class);
 		this.handlers.handleReturnValue("value", paramStr, null, null);
 	}
-	
+
 	private StubReturnValueHandler registerHandler(Class<?> returnType) {
 		StubReturnValueHandler handler = new StubReturnValueHandler(returnType);
 		handlers.addHandler(handler);
 		return handler;
 	}
-	
+
 	@SuppressWarnings("unused")
 	private Integer handleInteger() {
 		return null;
 	}
-	
+
 	@SuppressWarnings("unused")
 	private String handleString() {
 		return null;
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 7e98d2c4e6..bd0c80565c 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
@@ -36,7 +36,7 @@ public class ModelAndViewContainerTests {
 	public void setup() {
 		this.mavContainer = new ModelAndViewContainer();
 	}
-	
+
 	@Test
 	public void getModel() {
 		this.mavContainer.addAttribute("name", "value");
@@ -48,13 +48,13 @@ public class ModelAndViewContainerTests {
 		ModelMap redirectModel = new ModelMap("name", "redirectValue");
 		this.mavContainer.setRedirectModel(redirectModel);
 		this.mavContainer.addAttribute("name", "value");
-		
+
 		assertEquals("Default model should be used if not in redirect scenario",
 				"value", this.mavContainer.getModel().get("name"));
-	
+
 		this.mavContainer.setRedirectModelScenario(true);
-		
-		assertEquals("Redirect model should be used in redirect scenario", 
+
+		assertEquals("Redirect model should be used in redirect scenario",
 				"redirectValue", this.mavContainer.getModel().get("name"));
 	}
 
@@ -62,13 +62,13 @@ public class ModelAndViewContainerTests {
 	public void getModelIgnoreDefaultModelOnRedirect() {
 		this.mavContainer.addAttribute("name", "value");
 		this.mavContainer.setRedirectModelScenario(true);
-		
-		assertEquals("Default model should be used since no redirect model was provided", 
+
+		assertEquals("Default model should be used since no redirect model was provided",
 				1, this.mavContainer.getModel().size());
 
 		this.mavContainer.setIgnoreDefaultModelOnRedirect(true);
-		
-		assertEquals("Empty model should be returned if no redirect model is available", 
+
+		assertEquals("Empty model should be returned if no redirect model is available",
 				0, this.mavContainer.getModel().size());
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java
index db89c8dea5..45c84b353b 100644
--- a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java
+++ b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java
@@ -26,7 +26,7 @@ import org.springframework.web.context.request.NativeWebRequest;
 /**
  * Supports parameters of a given type and resolves them using a stub value.
  * Also records the resolved parameter value.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class StubArgumentResolver implements HandlerMethodArgumentResolver {
@@ -34,7 +34,7 @@ public class StubArgumentResolver implements HandlerMethodArgumentResolver {
 	private final Class<?> parameterType;
 
 	private final Object stubValue;
-	
+
 	private List<MethodParameter> resolvedParameters = new ArrayList<MethodParameter>();
 
 	public StubArgumentResolver(Class<?> supportedParameterType, Object stubValue) {
diff --git a/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java b/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java
index 61717c659a..7f88809354 100644
--- a/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java
+++ b/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java
@@ -20,16 +20,16 @@ import org.springframework.core.MethodParameter;
 import org.springframework.web.context.request.NativeWebRequest;
 
 /**
- * Supports a fixed return value type. Records the last handled return value. 
- * 
+ * Supports a fixed return value type. Records the last handled return value.
+ *
  * @author Rossen Stoyanchev
  */
 public class StubReturnValueHandler implements HandlerMethodReturnValueHandler {
 
 	private final Class<?> returnType;
-	
+
 	private Object returnValue;
-	
+
 	public StubReturnValueHandler(Class<?> returnType) {
 		this.returnType = returnType;
 	}
diff --git a/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
index 51252eec74..60776274c5 100644
--- a/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
@@ -36,19 +36,19 @@ import static org.junit.Assert.*;
 public class RequestPartServletServerHttpRequestTests {
 
 	private RequestPartServletServerHttpRequest request;
-	
+
 	private MockMultipartHttpServletRequest mockRequest;
 
 	private MockMultipartFile mockFile;
-	
+
 	@Before
 	public void create() throws Exception {
 		mockFile = new MockMultipartFile("part", "", "application/json" ,"Part Content".getBytes("UTF-8"));
 		mockRequest = new MockMultipartHttpServletRequest();
 		mockRequest.addFile(mockFile);
 		request = new RequestPartServletServerHttpRequest(mockRequest, "part");
-	}	
-	
+	}
+
 	@Test
 	public void getMethod() throws Exception {
 		mockRequest.setMethod("POST");
@@ -80,5 +80,5 @@ public class RequestPartServletServerHttpRequestTests {
 		byte[] result = FileCopyUtils.copyToByteArray(request.getBody());
 		assertArrayEquals("Invalid content returned", mockFile.getBytes(), result);
 	}
-	
+
 }
diff --git a/spring-web/src/test/java/org/springframework/web/util/Log4jWebConfigurerTests.java b/spring-web/src/test/java/org/springframework/web/util/Log4jWebConfigurerTests.java
index 2d37f8c6ac..baa11b9e44 100644
--- a/spring-web/src/test/java/org/springframework/web/util/Log4jWebConfigurerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/Log4jWebConfigurerTests.java
@@ -50,7 +50,7 @@ public class Log4jWebConfigurerTests {
 	public void initLoggingWithClasspathResourceAndRefreshInterval() {
 		initLogging(CLASSPATH_RESOURCE, true);
 	}
-	
+
 	@Test
 	public void initLoggingWithRelativeFilePath() {
 		initLogging(RELATIVE_PATH, false);
@@ -119,11 +119,11 @@ public class Log4jWebConfigurerTests {
 	@Test
 	public void testLog4jConfigListener() {
 		Log4jConfigListener listener = new Log4jConfigListener();
-		
+
 		MockServletContext sc = new MockServletContext("", new FileSystemResourceLoader());
 		sc.addInitParameter(Log4jWebConfigurer.CONFIG_LOCATION_PARAM, RELATIVE_PATH);
 		listener.contextInitialized(new ServletContextEvent(sc));
-		
+
 		try {
 			assertLogOutput();
 		} finally {
diff --git a/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java b/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java
index 83963b8c06..bb078da54c 100644
--- a/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java
+++ b/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
index 9484a2c514..e93aa884fa 100644
--- a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2006 the original author 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.
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
index 234a21c090..50b1fc07ee 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
@@ -45,7 +45,7 @@ public class UriComponentsTests {
         UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/hotel list/Z\u00fcrich").build();
         assertEquals(new URI("http://example.com/hotel%20list/Z\u00fcrich"), uriComponents.toUri());
     }
-	
+
 	@Test
 	public void expand() {
 		UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com").path("/{foo} {bar}").build();
@@ -63,7 +63,7 @@ public class UriComponentsTests {
 	public void invalidCharacters() {
 		UriComponentsBuilder.fromPath("/{foo}").build(true);
 	}
-	
+
 	@Test(expected = IllegalArgumentException.class)
 	public void invalidEncodedSequence() {
 		UriComponentsBuilder.fromPath("/fo%2o").build(true);
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
index ba2d7a796d..557ba7ca9f 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
@@ -80,7 +80,7 @@ public class UriTemplateTests {
 		URI result = template.expand(uriVariables);
 		assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result);
 	}
-    
+
     @Test
     public void expandMapEncoded() throws Exception {
         Map<String, String> uriVariables = Collections.singletonMap("hotel", "Z\u00fcrich");
@@ -113,7 +113,7 @@ public class UriTemplateTests {
 		assertFalse("UriTemplate matches", template.matches(""));
 		assertFalse("UriTemplate matches", template.matches(null));
 	}
-	
+
 	@Test
 	public void matchesCustomRegex() throws Exception {
 		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel:\\d+}");
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
index 444b7ec43c..0439504c8c 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
@@ -29,7 +29,7 @@ public class UriUtilsTests {
 
 	private static final String ENC = "UTF-8";
 
-	
+
 
 	@Test
 	public void encodeScheme() throws UnsupportedEncodingException {
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 ce8d4ad18b..29b0c091c5 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
@@ -609,7 +609,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean
 		if (userName != null) {
 			return userName;
 		}
-		
+
 		// Try the Portlet USER_INFO map.
 		Map userInfo = (Map) request.getAttribute(PortletRequest.USER_INFO);
 		if (userInfo != null) {
@@ -620,7 +620,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean
 				}
 			}
 		}
-		
+
 		// Nothing worked...
 		return null;
 	}
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
index 1006cd3405..dcc6f3260a 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
@@ -74,7 +74,7 @@ public abstract class GenericPortletBean extends GenericPortlet
 	/** Logger available to subclasses */
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	/** 
+	/**
 	 * Set of required properties (Strings) that must be supplied as
 	 * config parameters to this portlet.
 	 */
@@ -105,7 +105,7 @@ public abstract class GenericPortletBean extends GenericPortlet
 		if (logger.isInfoEnabled()) {
 			logger.info("Initializing portlet '" + getPortletName() + "'");
 		}
-		
+
 		// Set bean properties from init parameters.
 		try {
 			PropertyValues pvs = new PortletConfigPropertyValues(getPortletConfig(), this.requiredProperties);
@@ -127,7 +127,7 @@ public abstract class GenericPortletBean extends GenericPortlet
 			logger.info("Portlet '" + getPortletName() + "' configured successfully");
 		}
 	}
-	
+
 	/**
 	 * Initialize the BeanWrapper for this GenericPortletBean,
 	 * possibly with custom editors.
@@ -215,7 +215,7 @@ public abstract class GenericPortletBean extends GenericPortlet
 		 */
 		private PortletConfigPropertyValues(PortletConfig config, Set<String> requiredProperties)
 			throws PortletException {
-				
+
 			Set<String> missingProps = (requiredProperties != null && !requiredProperties.isEmpty()) ?
 					new HashSet<String>(requiredProperties) : null;
 
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
index c1e618fa6d..ae952850f1 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
@@ -48,7 +48,7 @@ import javax.portlet.ResourceResponse;
  * @see org.springframework.web.portlet.mvc.SimpleControllerHandlerAdapter
  */
 public interface HandlerAdapter {
-	
+
 	/**
 	 * Given a handler instance, return whether or not this HandlerAdapter can
 	 * support it. Typical HandlerAdapters will base the decision on the handler
@@ -60,7 +60,7 @@ public interface HandlerAdapter {
 	 * @param handler handler object to check
 	 * @return whether or not this object can use the given handler
 	 */
-	boolean supports(Object handler); 
+	boolean supports(Object handler);
 
 	/**
 	 * Use the given handler to handle this action request.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
index 7c79d8482f..cc0913e943 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
@@ -54,7 +54,7 @@ import javax.portlet.PortletRequest;
  * @see org.springframework.web.portlet.handler.PortletModeParameterHandlerMapping
  */
 public interface HandlerMapping {
-	
+
 	/**
 	 * Return a handler and any interceptors for this request. The choice may be made
 	 * on portlet mode, session state, or any factor the implementing class chooses.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
index dcb2a64e4e..ce35bb669f 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
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 fa139ff53d..e9bd670d8f 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
@@ -55,7 +55,7 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
  * @see org.springframework.web.portlet.DispatcherPortlet
  */
 public abstract class PortletApplicationContextUtils {
-	
+
 	/**
 	 * Find the root WebApplicationContext for this portlet application, which is
 	 * typically loaded via ContextLoaderListener or ContextLoaderServlet.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
index 574b4d80d7..2f074204e9 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java
index 2a3fee97f0..7e64034a49 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2011 the original author 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java
index 3fa1a56a6a..5b0b1e40ae 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2011 the original author 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
index 1daacb553e..07e60b45ad 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
@@ -49,7 +49,7 @@ public class PortletContextAwareProcessor implements BeanPostProcessor {
 	public PortletContextAwareProcessor(PortletContext portletContext) {
 		this(portletContext, null);
 	}
-	
+
 	/**
 	 * Create a new PortletContextAwareProcessor for the given config.
 	 */
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
index d407f40fa9..ee0c5ffee1 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
@@ -111,7 +111,7 @@ public class PortletWebRequest extends PortletRequestAttributes implements Nativ
 	public Iterator<String> getParameterNames() {
 		return CollectionUtils.toIterator(getRequest().getParameterNames());
 	}
-	
+
 	public Map<String, String[]> getParameterMap() {
 		return getRequest().getParameterMap();
 	}
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 7452f6b34c..ce44602bb6 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
@@ -51,7 +51,7 @@ public class StaticPortletApplicationContext extends StaticApplicationContext
 		implements ConfigurablePortletApplicationContext {
 
 	private ServletContext servletContext;
-	
+
 	private PortletContext portletContext;
 
 	private PortletConfig portletConfig;
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
index cd5f157011..700ef95078 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
@@ -26,7 +26,7 @@ import javax.portlet.ActionResponse;
  * <p>This can be useful when using {@link ParameterHandlerMapping ParameterHandlerMapping}
  * or {@link PortletModeParameterHandlerMapping PortletModeParameterHandlerMapping}.
  * It will ensure that the parameter that was used to map the <code>ActionRequest</code>
- * to a handler will be forwarded to the <code>RenderRequest</code> so that it will also be 
+ * to a handler will be forwarded to the <code>RenderRequest</code> so that it will also be
  * mapped the same way.
  *
  * <p>When using this Interceptor, you can still change the value of the mapping parameter
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java
index 318c5d1ceb..b23756f87c 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java
@@ -95,7 +95,7 @@ public abstract class PortletContentGenerator extends PortletApplicationObjectSu
 
 	/**
 	 * Check and prepare the given request and response according to the settings
-	 * of this generator. Checks for a required session, and applies the number of 
+	 * of this generator. Checks for a required session, and applies the number of
 	 * cache seconds configured for this generator (if it is a render request/response).
 	 * @param request current portlet request
 	 * @param response current portlet response
@@ -109,7 +109,7 @@ public abstract class PortletContentGenerator extends PortletApplicationObjectSu
 
 	/**
 	 * Check and prepare the given request and response according to the settings
-	 * of this generator. Checks for a required session, and applies the given 
+	 * of this generator. Checks for a required session, and applies the given
 	 * number of cache seconds (if it is a render request/response).
 	 * @param request current portlet request
 	 * @param response current portlet response
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
index b8e85ab745..7d1eacd87f 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
@@ -59,7 +59,7 @@ import org.springframework.web.portlet.util.PortletUtils;
  * @see org.springframework.web.portlet.mvc.PortletWrappingController
  */
 public class SimplePortletHandlerAdapter implements HandlerAdapter, PortletContextAware {
-	
+
 	private PortletContext portletContext;
 
 
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
index ca644eaddc..550e08867d 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
@@ -91,7 +91,7 @@ public class DefaultMultipartActionRequest extends ActionRequestWrapper implemen
 			return Collections.emptyList();
 		}
 	}
-	
+
 
 	public Map<String, MultipartFile> getFileMap() {
 		return getMultipartFiles().toSingleValueMap();
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
index 0370c8b77b..4add8c5cc8 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2007 the original author 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
index fa56a66a31..f8721abb76 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
@@ -204,7 +204,7 @@ public abstract class AbstractController extends PortletContentGenerator impleme
 		if (WindowState.MINIMIZED.equals(request.getWindowState()) && !this.renderWhenMinimized) {
 			return null;
 		}
-	    
+
 		// Delegate to PortletContentGenerator for checking and preparing.
 		checkAndPrepare(request, response);
 
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
index 5b081df6dd..56c0b3a4b3 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
@@ -638,7 +638,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 			binder.bind(request);
 			onBindOnNewForm(request, command, errors);
 		}
-		
+
 		// Return BindException object that resulted from binding.
 		return errors;
 	}
@@ -690,7 +690,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 		if (!isSessionForm()) {
 			return formBackingObject(request);
 		}
-		
+
 		// Session-form mode: retrieve form object from portlet session attribute.
 		PortletSession session = request.getPortletSession(false);
 		if (session == null) {
@@ -821,7 +821,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 		// Fetch errors model as starting point, containing form object under
 		// "commandName", and corresponding Errors instance under internal key.
 		Map model = errors.getModel();
-		
+
 		// Merge reference data into model, if any.
 		Map referenceData = referenceData(request, errors.getTarget(), errors);
 		if (referenceData != null) {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
index ef52eec345..5183bfaa5b 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
@@ -342,7 +342,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 			if (logger.isDebugEnabled()) {
 				logger.debug("Showing wizard page " + page + " for form bean '" + getCommandName() + "'");
 			}
-			
+
 			// Set page session attribute, expose overriding request attribute.
 			Integer pageInteger = new Integer(page);
 			String pageAttrName = getPageSessionAttributeName(request);
@@ -353,7 +353,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 				request.getPortletSession().setAttribute(pageAttrName, pageInteger);
 			}
 			request.setAttribute(pageAttrName, pageInteger);
-			
+
 			// Set page request attribute for evaluation by views.
 			Map controlModel = new HashMap();
 			if (this.pageAttribute != null) {
@@ -647,7 +647,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 			request.getPortletSession().removeAttribute(pageAttrName);
 		}
 		request.setAttribute(pageAttrName, new Integer(currentPage));
-		
+
 		// cancel?
 		if (isCancelRequest(request)) {
 			if (logger.isDebugEnabled()) {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
index 162843b29b..f90ef73029 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
@@ -41,7 +41,7 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
  * <p>This controller is the base for all controllers wishing to populate
  * JavaBeans based on request parameters, validate the content of such
  * JavaBeans using {@link Validator Validators} and use custom editors (in the form of
- * {@link java.beans.PropertyEditor PropertyEditors}) to transform 
+ * {@link java.beans.PropertyEditor PropertyEditors}) to transform
  * objects into strings and vice versa, for example. Three notions are mentioned here:</p>
  *
  * <p><b>Command class:</b><br>
@@ -54,7 +54,7 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
  * Upon receiving a request, any BaseCommandController will attempt to fill the
  * command object using the request parameters. This is done using the typical
  * and well-known JavaBeans property notation. When a request parameter named
- * <code>'firstName'</code> exists, the framework will attempt to call 
+ * <code>'firstName'</code> exists, the framework will attempt to call
  * <code>setFirstName([value])</code> passing the value of the parameter. Nested properties
  * are of course supported. For instance a parameter named <code>'address.city'</code>
  * will result in a <code>getAddress().setCity([value])</code> call on the
@@ -155,14 +155,14 @@ public abstract class BaseCommandController extends AbstractController {
 	 * session is that we have no way of knowing when we are done re-rendering
 	 * the request and so we don't know when we can remove the objects from
 	 * the session. So we will end up polluting the session with old objects
-	 * when we finally leave the render of this controller and move on to 
+	 * when we finally leave the render of this controller and move on to
 	 * somthing else. To minimize the pollution, we will use a static string
 	 * value as the session attribute name. At least this way we are only ever
 	 * leaving one orphaned set behind. The methods that return these names
 	 * can be overridden if you want to use a different method, but be aware
 	 * of the session pollution that may occur.
 	 */
-	private static final String RENDER_COMMAND_SESSION_ATTRIBUTE = 
+	private static final String RENDER_COMMAND_SESSION_ATTRIBUTE =
 			"org.springframework.web.portlet.mvc.RenderCommand";
 
 	private static final String RENDER_ERRORS_SESSION_ATTRIBUTE =
@@ -172,13 +172,13 @@ public abstract class BaseCommandController extends AbstractController {
 
 
 	private String commandName = DEFAULT_COMMAND_NAME;
-	
+
 	private Class commandClass;
-	
+
 	private Validator[] validators;
-	
+
 	private boolean validateOnBinding = true;
-	
+
 	private MessageCodesResolver messageCodesResolver;
 
 	private BindingErrorProcessor bindingErrorProcessor;
@@ -405,7 +405,7 @@ public abstract class BaseCommandController extends AbstractController {
 	protected final boolean checkCommand(Object command) {
 		return (this.commandClass == null || this.commandClass.isInstance(command));
 	}
-	
+
 
 	/**
 	 * Bind the parameters of the given request to the given command object.
@@ -416,7 +416,7 @@ public abstract class BaseCommandController extends AbstractController {
 	 */
 	protected final PortletRequestDataBinder bindAndValidate(PortletRequest request, Object command)
 			throws Exception {
-				
+
 		PortletRequestDataBinder binder = createBinder(request, command);
 		if (!suppressBinding(request)) {
 			binder.bind(request);
@@ -464,7 +464,7 @@ public abstract class BaseCommandController extends AbstractController {
 	 */
 	protected PortletRequestDataBinder createBinder(PortletRequest request, Object command)
 			throws Exception {
-			
+
 		PortletRequestDataBinder binder = new PortletRequestDataBinder(command, getCommandName());
 		prepareBinder(binder);
 		initBinder(request, binder);
@@ -598,7 +598,7 @@ public abstract class BaseCommandController extends AbstractController {
 		return RENDER_COMMAND_SESSION_ATTRIBUTE;
 	}
 
-	/** 
+	/**
 	 * Return the name of the session attribute that holds
 	 * the render phase command object for this form controller.
 	 * @return the name of the render phase command object session attribute
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
index 356898f97b..c8f3096eb8 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
@@ -24,8 +24,8 @@ import javax.portlet.RenderResponse;
 import org.springframework.web.portlet.ModelAndView;
 
 /**
- * Base portlet Controller interface, representing a component that receives 
- * RenderRequest/RenderResponse and ActionRequest/ActionResponse like a 
+ * Base portlet Controller interface, representing a component that receives
+ * RenderRequest/RenderResponse and ActionRequest/ActionResponse like a
  * <code>Portlet</code> but is able to participate in an MVC workflow.
  *
  * <p>Any implementation of the portlet Controller interface should be a
@@ -46,7 +46,7 @@ import org.springframework.web.portlet.ModelAndView;
  * So actually, these method are the main entrypoint for the
  * {@link org.springframework.web.portlet.DispatcherPortlet DispatcherPortlet}
  * which delegates requests to controllers.</p>
- * 
+ *
  * <p>So basically any <i>direct</i> implementation of the Controller interface
  * just handles RenderRequests/ActionRequests and should return a ModelAndView, to be
  * further used by the DispatcherPortlet. Any additional functionality such as
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
index 5fdfd33596..0a39a2fd0c 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
@@ -63,7 +63,7 @@ import org.springframework.web.portlet.ModelAndView;
  * @since 2.0
  */
 public class ParameterizableViewController extends AbstractController {
-	
+
 	private String viewName;
 
 
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
index 2beb0352b8..34ef4b64ca 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
@@ -194,7 +194,7 @@ public abstract class PortletUtils {
 
 	/**
 	 * Get the specified session attribute under the {@link javax.portlet.PortletSession#PORTLET_SCOPE},
-	 * creating and setting a new attribute if no existing found. The given class 
+	 * creating and setting a new attribute if no existing found. The given class
 	 * needs to have a public no-arg constructor.
 	 * Useful for on-demand state objects in a web tier, like shopping carts.
 	 * @param session current portlet session
@@ -211,7 +211,7 @@ public abstract class PortletUtils {
 
 	/**
 	 * Get the specified session attribute in the given scope,
-	 * creating and setting a new attribute if no existing found. The given class 
+	 * creating and setting a new attribute if no existing found. The given class
 	 * needs to have a public no-arg constructor.
 	 * Useful for on-demand state objects in a web tier, like shopping carts.
 	 * @param session current portlet session
@@ -369,7 +369,7 @@ public abstract class PortletUtils {
 	}
 
 	/**
-	 * Return the full name of a specific input type="submit" parameter 
+	 * Return the full name of a specific input type="submit" parameter
 	 * if it was sent in the request, either via a button (directly with name)
 	 * or via an image (name + ".x" or name + ".y").
 	 * @param request current portlet request
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java
index 7d87547b5f..c5c4ed5e67 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java
index 797486ec44..6a8f74187c 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
index a06e15d150..0eb8df5c8a 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
index b85110e1cb..4715fe448f 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java
index f77a7bda50..72c129ca4e 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -24,7 +24,7 @@ import org.springframework.context.ApplicationContextException;
 import org.springframework.context.NoSuchMessageException;
 
 public class ACATester implements ApplicationContextAware {
-	
+
 	private ApplicationContext ac;
 
 	public void setApplicationContext(ApplicationContext ctx) throws ApplicationContextException {
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
index d014d770e1..619bfba6fb 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java
index d8be8ec966..50c9936c44 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java
@@ -7,12 +7,12 @@ import org.springframework.beans.factory.LifecycleBean;
 
 /**
  * Simple bean to test ApplicationContext lifecycle methods for beans
- * 
+ *
  * @author Colin Sampaleanu
  * @since 03.07.2004
  */
 public class LifecycleContextBean extends LifecycleBean implements ApplicationContextAware {
-	
+
 	protected ApplicationContext owningContext;
 
 	public void setBeanFactory(BeanFactory beanFactory) {
@@ -20,18 +20,18 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo
 		if (this.owningContext != null)
 			throw new RuntimeException("Factory called setBeanFactory after setApplicationContext");
 	}
-	
+
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
 		if (this.owningContext == null)
 			throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean");
 	}
-	
+
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		if (this.owningFactory == null)
 			throw new RuntimeException("Factory called setApplicationContext before setBeanFactory");
-			
+
 		this.owningContext = applicationContext;
 	}
-	
+
 }
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
index 3e2701c576..88f3dbab08 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -51,7 +51,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	private static final String CHARSET_PREFIX = "charset=";
 
 	private static final String CONTENT_TYPE_HEADER = "Content-Type";
-	
+
 	private static final String CONTENT_LENGTH_HEADER = "Content-Length";
 
 	private static final String LOCATION_HEADER = "Location";
@@ -65,7 +65,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	private boolean writerAccessAllowed = true;
 
 	private String characterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
-	
+
 	private boolean charset = false;
 
 	private final ByteArrayOutputStream content = new ByteArrayOutputStream();
@@ -141,7 +141,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		this.charset = true;
 		updateContentTypeHeader();
 	}
-	
+
 	private void updateContentTypeHeader() {
 		if (this.contentType != null) {
 			StringBuilder sb = new StringBuilder(this.contentType);
@@ -151,7 +151,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 			doAddHeaderValue(CONTENT_TYPE_HEADER, sb.toString(), true);
 		}
 	}
-	
+
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
@@ -457,7 +457,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 		doAddHeaderValue(name, value, false);
 	}
-	
+
 	private boolean setSpecialHeader(String name, Object value) {
 		if (CONTENT_TYPE_HEADER.equalsIgnoreCase(name)) {
 			setContentType((String) value);
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
index bc08077830..1855230d2c 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
@@ -71,7 +71,7 @@ public class MockHttpSession implements HttpSession {
 
 	/**
 	 * Create a new MockHttpSession with a default {@link MockServletContext}.
-	 * 
+	 *
 	 * @see MockServletContext
 	 */
 	public MockHttpSession() {
@@ -80,7 +80,7 @@ public class MockHttpSession implements HttpSession {
 
 	/**
 	 * Create a new MockHttpSession.
-	 * 
+	 *
 	 * @param servletContext the ServletContext that the session runs in
 	 */
 	public MockHttpSession(ServletContext servletContext) {
@@ -89,7 +89,7 @@ public class MockHttpSession implements HttpSession {
 
 	/**
 	 * Create a new MockHttpSession.
-	 * 
+	 *
 	 * @param servletContext the ServletContext that the session runs in
 	 * @param id a unique identifier for this session
 	 */
@@ -222,7 +222,7 @@ public class MockHttpSession implements HttpSession {
 	/**
 	 * Serialize the attributes of this session into an object that can be
 	 * turned into a byte array with standard Java serialization.
-	 * 
+	 *
 	 * @return a representation of this session's serialized state
 	 */
 	public Serializable serializeState() {
@@ -249,7 +249,7 @@ public class MockHttpSession implements HttpSession {
 	/**
 	 * Deserialize the attributes of this session from a state object created by
 	 * {@link #serializeState()}.
-	 * 
+	 *
 	 * @param state a representation of this session's serialized state
 	 */
 	@SuppressWarnings("unchecked")
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java
index d69e75d0c1..985c1e20dc 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java
@@ -95,15 +95,15 @@ public class MockPortletConfig implements PortletConfig {
 		this.portletName = portletName;
 	}
 
-	
+
 	public String getPortletName() {
 		return this.portletName;
 	}
-	
+
 	public PortletContext getPortletContext() {
 		return this.portletContext;
 	}
-	
+
 	public void setResourceBundle(Locale locale, ResourceBundle resourceBundle) {
 		Assert.notNull(locale, "Locale must not be null");
 		this.resourceBundles.put(locale, resourceBundle);
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java
index 0cf9f24ffe..cd8c997e37 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java
@@ -55,7 +55,7 @@ public class MockPortletContext implements PortletContext {
 	private final Log logger = LogFactory.getLog(getClass());
 
 	private final String resourceBasePath;
-	
+
 	private final ResourceLoader resourceLoader;
 
 	private final Map<String, Object> attributes = new LinkedHashMap<String, Object>();
@@ -68,7 +68,7 @@ public class MockPortletContext implements PortletContext {
 
 
 	/**
-	 * Create a new MockPortletContext with no base path and a 
+	 * Create a new MockPortletContext with no base path and a
 	 * DefaultResourceLoader (i.e. the classpath root as WAR root).
 	 * @see org.springframework.core.io.DefaultResourceLoader
 	 */
@@ -123,7 +123,7 @@ public class MockPortletContext implements PortletContext {
 		return this.resourceBasePath + path;
 	}
 
-	
+
 	public String getServerInfo() {
 		return "MockPortal/1.0";
 	}
@@ -158,7 +158,7 @@ public class MockPortletContext implements PortletContext {
 	public int getMinorVersion() {
 		return 0;
 	}
-	
+
 	public String getMimeType(String filePath) {
 		return null;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
index fbbdcaefaa..cef74bee41 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
@@ -84,7 +84,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 		registerSingleton("standardHandlerAdapter", SimpleControllerHandlerAdapter.class);
 		registerSingleton("portletHandlerAdapter", SimplePortletHandlerAdapter.class);
 		registerSingleton("myHandlerAdapter", MyHandlerAdapter.class);
-		
+
 		registerSingleton("viewController", ViewController.class);
 		registerSingleton("editController", EditController.class);
 		registerSingleton("helpController1", HelpController1.class);
@@ -93,21 +93,21 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 		registerSingleton("testController2", TestController2.class);
 		registerSingleton("requestLocaleCheckingController", RequestLocaleCheckingController.class);
 		registerSingleton("localeContextCheckingController", LocaleContextCheckingController.class);
-		
+
 		registerSingleton("exceptionThrowingHandler1", ExceptionThrowingHandler.class);
 		registerSingleton("exceptionThrowingHandler2", ExceptionThrowingHandler.class);
 		registerSingleton("unknownHandler", Object.class);
-		
+
 		registerSingleton("myPortlet", MyPortlet.class);
 		registerSingleton("portletMultipartResolver", MockMultipartResolver.class);
 		registerSingleton("portletPostProcessor", SimplePortletPostProcessor.class);
 		registerSingleton("testListener", TestApplicationListener.class);
-		
+
 		ConstructorArgumentValues cvs = new ConstructorArgumentValues();
 		cvs.addIndexedArgumentValue(0, new MockPortletContext());
 		cvs.addIndexedArgumentValue(1, "complex");
 		registerBeanDefinition("portletConfig", new RootBeanDefinition(MockPortletConfig.class, cvs, null));
-		
+
 		UserRoleAuthorizationInterceptor userRoleInterceptor = new UserRoleAuthorizationInterceptor();
 		userRoleInterceptor.setAuthorizedRoles(new String[] {"role1", "role2"});
 
@@ -129,7 +129,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 		pvs.add("portletModeMap", portletModeMap);
 		pvs.add("interceptors", interceptors);
 		registerSingleton("handlerMapping3", PortletModeHandlerMapping.class, pvs);
-		
+
 		pvs = new MutablePropertyValues();
 		Map parameterMap = new ManagedMap();
 		parameterMap.put("test1", new RuntimeBeanReference("testController1"));
@@ -144,7 +144,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 		pvs.add("parameterName", "myParam");
 		pvs.add("order", "2");
 		registerSingleton("handlerMapping2", ParameterHandlerMapping.class, pvs);
-		
+
 		pvs = new MutablePropertyValues();
 		Map innerMap = new ManagedMap();
 		innerMap.put("help1", new RuntimeBeanReference("helpController1"));
@@ -178,7 +178,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 		addMessage("test", Locale.ENGLISH, "test message");
 		addMessage("test", Locale.CANADA, "Canadian & test message");
 		addMessage("test.args", Locale.ENGLISH, "test {0} and {1}");
-		
+
 		super.refresh();
 	}
 
@@ -214,7 +214,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 			return new ModelAndView("someViewName", "result", "view was here");
 		}
 	}
-	
+
 
 	public static class EditController implements Controller {
 
@@ -226,7 +226,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 			return new ModelAndView(request.getParameter("param"));
 		}
 	}
-	
+
 
 	public static class HelpController1 implements Controller {
 
@@ -250,7 +250,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 			return new ModelAndView("help2-view");
 		}
 	}
-	
+
 	public static class RequestLocaleCheckingController implements Controller {
 
 		public void handleActionRequest(ActionRequest request, ActionResponse response) throws PortletException {
@@ -258,8 +258,8 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 				throw new PortletException("Incorrect Locale in ActionRequest");
 			}
 		}
-		
-		public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) 
+
+		public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response)
 			throws PortletException, IOException {
 			if (!Locale.CANADA.equals(request.getLocale())) {
 				throw new PortletException("Incorrect Locale in RenderRequest");
@@ -277,8 +277,8 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 				throw new PortletException("Incorrect Locale in LocaleContextHolder");
 			}
 		}
-		
-		public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) 
+
+		public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response)
 			throws PortletException, IOException {
 			if (!Locale.CANADA.equals(LocaleContextHolder.getLocale())) {
 				throw new PortletException("Incorrect Locale in LocaleContextHolder");
@@ -304,7 +304,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 		public void render(RenderRequest request, RenderResponse response) throws PortletException, IOException {
 			response.getWriter().write("myPortlet was here");
 		}
-		
+
 		public PortletConfig getPortletConfig() {
 			return this.portletConfig;
 		}
@@ -319,7 +319,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 		public void doSomething(PortletRequest request) throws Exception;
 	}
-	
+
 
 	public static class ExceptionThrowingHandler implements MyHandler {
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java
index dd6f8006c0..e0256a341d 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java
@@ -40,7 +40,7 @@ public class GenericPortletBeanTests extends TestCase {
 		assertNotNull(portletBean.getTestParam());
 		assertEquals(testValue, portletBean.getTestParam());
 	}
-	
+
 	public void testInitParameterNotSet() throws Exception {
 		PortletContext portletContext = new MockPortletContext();
 		MockPortletConfig portletConfig = new MockPortletConfig(portletContext);
@@ -112,7 +112,7 @@ public class GenericPortletBeanTests extends TestCase {
 			// expected
 		}
 	}
-	
+
 	public void testRequiredInitParameterNotSetOtherParameterNotSet() throws Exception {
 		PortletContext portletContext = new MockPortletContext();
 		MockPortletConfig portletConfig = new MockPortletConfig(portletContext);
@@ -153,22 +153,22 @@ public class GenericPortletBeanTests extends TestCase {
 
 
 	private static class TestPortletBean extends GenericPortletBean {
-		
-		private String testParam; 
+
+		private String testParam;
 		private String anotherParam;
-		
+
 		public void setTestParam(String value) {
 			this.testParam = value;
 		}
-		
+
 		public String getTestParam() {
 			return this.testParam;
 		}
-		
+
 		public void setAnotherParam(String value) {
 			this.anotherParam = value;
 		}
-		
+
 		public String getAnotherParam() {
 			return this.anotherParam;
 		}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java
index 748414ff48..b2bc75c703 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java
@@ -47,7 +47,7 @@ public class SimplePortletApplicationContext extends StaticPortletApplicationCon
 	public void refresh() throws BeansException {
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		registerSingleton("controller1", TestFormController.class, pvs);
-		
+
 		pvs = new MutablePropertyValues();
 		pvs.add("bindOnNewForm", "true");
 		registerSingleton("controller2", TestFormController.class, pvs);
@@ -65,7 +65,7 @@ public class SimplePortletApplicationContext extends StaticPortletApplicationCon
 		registerSingleton("controller4", TestFormController.class, pvs);
 
 		pvs = new MutablePropertyValues();
-		Map parameterMap = new ManagedMap();		
+		Map parameterMap = new ManagedMap();
 		parameterMap.put("form", new RuntimeBeanReference("controller1"));
 		parameterMap.put("form-bind", new RuntimeBeanReference("controller2"));
 		parameterMap.put("form-session-bind", new RuntimeBeanReference("controller3"));
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java
index 54166c7e91..765e4c6552 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java
@@ -30,14 +30,14 @@ public class PortletRequestParameterPropertyValuesTests extends TestCase {
 		PortletRequestParameterPropertyValues pvs = new PortletRequestParameterPropertyValues(request);
 		assertTrue("Should not have any property values", pvs.getPropertyValues().length == 0);
 	}
-	
+
 	public void testWithNoPrefix() {
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("param", "value");
 		PortletRequestParameterPropertyValues pvs = new PortletRequestParameterPropertyValues(request);
 		assertEquals("value", pvs.getPropertyValue("param").getValue());
 	}
-	
+
 	public void testWithPrefix() {
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("test_param", "value");
@@ -60,5 +60,5 @@ public class PortletRequestParameterPropertyValuesTests extends TestCase {
 		assertFalse(pvs.contains("other"));
 		assertTrue(pvs.contains("param"));
 		assertEquals("value", pvs.getPropertyValue("param").getValue());
-	}	
+	}
 }
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java
index e82de4420e..3730a69e12 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java
@@ -103,7 +103,7 @@ public class PortletRequestUtilsTests extends TestCase {
 		assertEquals(PortletRequestUtils.getLongParameter(request, "param1", 6L), 5L);
 		assertEquals(PortletRequestUtils.getRequiredIntParameter(request, "param1"), 5L);
 		assertEquals(PortletRequestUtils.getLongParameter(request, "param2", 6L), 6L);
-		
+
 		try {
 			PortletRequestUtils.getRequiredLongParameter(request, "param2");
 			fail("Should have thrown PortletRequestBindingException");
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 19ed8741eb..4c9447b34b 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
@@ -31,9 +31,9 @@ import org.springframework.web.context.support.XmlWebApplicationContext;
 
 /**
  * Should ideally be eliminated.  Copied when splitting .testsuite up into individual bundles.
- * 
+ *
  * @see org.springframework.web.context.XmlWebApplicationContextTests
- * 
+ *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Chris Beams
@@ -52,7 +52,7 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl
 		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);
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java
index 2b22f26bd7..3492556e9a 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java
@@ -24,11 +24,11 @@ import javax.portlet.PortletConfig;
 public class PortletConfigAwareBean implements PortletConfigAware {
 
 	private PortletConfig portletConfig;
-	
+
 	public void setPortletConfig(PortletConfig portletConfig) {
 		this.portletConfig = portletConfig;
 	}
-	
+
 	public PortletConfig getPortletConfig() {
 		return portletConfig;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java
index 87bbe58758..b89b393ea7 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java
@@ -22,13 +22,13 @@ import javax.portlet.PortletContext;
  * @author Mark Fisher
  */
 public class PortletContextAwareBean implements PortletContextAware {
-	
+
 	private PortletContext portletContext;
-	
+
 	public void setPortletContext(PortletContext portletContext) {
 		this.portletContext = portletContext;
 	}
-	
+
 	public PortletContext getPortletContext() {
 		return portletContext;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java
index d2ad1dd355..28b89a96cf 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java
@@ -38,7 +38,7 @@ public class PortletContextAwareProcessorTests extends TestCase {
 		assertNotNull("PortletContext should have been set", bean.getPortletContext());
 		assertEquals(portletContext, bean.getPortletContext());
 	}
-	
+
 	public void testPortletContextAwareWithPortletConfig() {
 		PortletContext portletContext = new MockPortletContext();
 		PortletConfig portletConfig = new MockPortletConfig(portletContext);
@@ -47,9 +47,9 @@ public class PortletContextAwareProcessorTests extends TestCase {
 		assertNull(bean.getPortletContext());
 		processor.postProcessBeforeInitialization(bean, "testBean");
 		assertNotNull("PortletContext should have been set", bean.getPortletContext());
-		assertEquals(portletContext, bean.getPortletContext());		
+		assertEquals(portletContext, bean.getPortletContext());
 	}
-	
+
 	public void testPortletContextAwareWithPortletContextAndPortletConfig() {
 		PortletContext portletContext = new MockPortletContext();
 		PortletConfig portletConfig = new MockPortletConfig(portletContext);
@@ -58,9 +58,9 @@ public class PortletContextAwareProcessorTests extends TestCase {
 		assertNull(bean.getPortletContext());
 		processor.postProcessBeforeInitialization(bean, "testBean");
 		assertNotNull("PortletContext should have been set", bean.getPortletContext());
-		assertEquals(portletContext, bean.getPortletContext());			
+		assertEquals(portletContext, bean.getPortletContext());
 	}
-	
+
 	public void testPortletContextAwareWithNullPortletContextAndNonNullPortletConfig() {
 		PortletContext portletContext = new MockPortletContext();
 		PortletConfig portletConfig = new MockPortletConfig(portletContext);
@@ -69,9 +69,9 @@ public class PortletContextAwareProcessorTests extends TestCase {
 		assertNull(bean.getPortletContext());
 		processor.postProcessBeforeInitialization(bean, "testBean");
 		assertNotNull("PortletContext should have been set", bean.getPortletContext());
-		assertEquals(portletContext, bean.getPortletContext());				
+		assertEquals(portletContext, bean.getPortletContext());
 	}
-	
+
 	public void testPortletContextAwareWithNonNullPortletContextAndNullPortletConfig() {
 		PortletContext portletContext = new MockPortletContext();
 		PortletContextAwareProcessor processor = new PortletContextAwareProcessor(portletContext, null);
@@ -79,7 +79,7 @@ public class PortletContextAwareProcessorTests extends TestCase {
 		assertNull(bean.getPortletContext());
 		processor.postProcessBeforeInitialization(bean, "testBean");
 		assertNotNull("PortletContext should have been set", bean.getPortletContext());
-		assertEquals(portletContext, bean.getPortletContext());		
+		assertEquals(portletContext, bean.getPortletContext());
 	}
 
 	public void testPortletContextAwareWithNullPortletContext() {
@@ -90,7 +90,7 @@ public class PortletContextAwareProcessorTests extends TestCase {
 		processor.postProcessBeforeInitialization(bean, "testBean");
 		assertNull(bean.getPortletContext());
 	}
-	
+
 	public void testPortletConfigAwareWithPortletContextOnly() {
 		PortletContext portletContext = new MockPortletContext();
 		PortletContextAwareProcessor processor = new PortletContextAwareProcessor(portletContext);
@@ -99,7 +99,7 @@ public class PortletContextAwareProcessorTests extends TestCase {
 		processor.postProcessBeforeInitialization(bean, "testBean");
 		assertNull(bean.getPortletConfig());
 	}
-	
+
 	public void testPortletConfigAwareWithPortletConfig() {
 		PortletContext portletContext = new MockPortletContext();
 		PortletConfig portletConfig = new MockPortletConfig(portletContext);
@@ -108,9 +108,9 @@ public class PortletContextAwareProcessorTests extends TestCase {
 		assertNull(bean.getPortletConfig());
 		processor.postProcessBeforeInitialization(bean, "testBean");
 		assertNotNull("PortletConfig should have been set", bean.getPortletConfig());
-		assertEquals(portletConfig, bean.getPortletConfig());		
+		assertEquals(portletConfig, bean.getPortletConfig());
 	}
-	
+
 	public void testPortletConfigAwareWithPortletContextAndPortletConfig() {
 		PortletContext portletContext = new MockPortletContext();
 		PortletConfig portletConfig = new MockPortletConfig(portletContext);
@@ -119,9 +119,9 @@ public class PortletContextAwareProcessorTests extends TestCase {
 		assertNull(bean.getPortletConfig());
 		processor.postProcessBeforeInitialization(bean, "testBean");
 		assertNotNull("PortletConfig should have been set", bean.getPortletConfig());
-		assertEquals(portletConfig, bean.getPortletConfig());			
+		assertEquals(portletConfig, bean.getPortletConfig());
 	}
-	
+
 	public void testPortletConfigAwareWithNullPortletContextAndNonNullPortletConfig() {
 		PortletContext portletContext = new MockPortletContext();
 		PortletConfig portletConfig = new MockPortletConfig(portletContext);
@@ -130,9 +130,9 @@ public class PortletContextAwareProcessorTests extends TestCase {
 		assertNull(bean.getPortletConfig());
 		processor.postProcessBeforeInitialization(bean, "testBean");
 		assertNotNull("PortletConfig should have been set", bean.getPortletConfig());
-		assertEquals(portletConfig, bean.getPortletConfig());				
+		assertEquals(portletConfig, bean.getPortletConfig());
 	}
-	
+
 	public void testPortletConfigAwareWithNonNullPortletContextAndNullPortletConfig() {
 		PortletContext portletContext = new MockPortletContext();
 		PortletContextAwareProcessor processor = new PortletContextAwareProcessor(portletContext, null);
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
index d968e5fd3f..148943c06d 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
@@ -40,7 +40,7 @@ import org.springframework.mock.web.portlet.MockPortletContext;
 public class XmlPortletApplicationContextTests extends AbstractXmlWebApplicationContextTests {
 
 	private ConfigurablePortletApplicationContext root;
-	
+
 	protected ConfigurableApplicationContext createContext() throws Exception {
 		root = new XmlPortletApplicationContext();
 		PortletContext portletContext = new MockPortletContext();
@@ -72,7 +72,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication
 		pac.refresh();
 		return pac;
 	}
-	
+
 	/**
 	 * Overridden in order to use MockPortletConfig
 	 * @see org.springframework.web.context.XmlWebApplicationContextTests#testWithoutMessageSource()
@@ -96,7 +96,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication
 		String msg = pac.getMessage("someMessage", null, "default", Locale.getDefault());
 		assertTrue("Default message returned", "default".equals(msg));
 	}
-	
+
 	/**
 	 * Overridden in order to access the root ApplicationContext
 	 * @see org.springframework.web.context.XmlWebApplicationContextTests#testContextNesting()
@@ -115,12 +115,12 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication
 		assertTrue("Bean from root context", "Roderick".equals(rod.getName()));
 		assertTrue("Custom BeanPostProcessor applied", rod.getFriends().contains("myFriend"));
 	}
-	
+
 	public void testCount() {
 		assertTrue("should have 16 beans, not "+ this.applicationContext.getBeanDefinitionCount(),
 				this.applicationContext.getBeanDefinitionCount() == 16);
 	}
-	
+
 	public void testPortletContextAwareBean() {
 		PortletContextAwareBean bean = (PortletContextAwareBean)this.applicationContext.getBean("portletContextAwareBean");
 		assertNotNull(bean.getPortletContext());
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java
index fbacd30f1f..8f3c4a539d 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java
@@ -30,9 +30,9 @@ import org.springframework.web.portlet.context.XmlPortletApplicationContext;
 public class ParameterHandlerMappingTests extends TestCase {
 
 	public static final String CONF = "/org/springframework/web/portlet/handler/parameterMapping.xml";
-	
-	private ConfigurablePortletApplicationContext pac; 
-	
+
+	private ConfigurablePortletApplicationContext pac;
+
 	public void setUp() throws Exception {
 		MockPortletContext portletContext = new MockPortletContext();
 		pac = new XmlPortletApplicationContext();
@@ -40,55 +40,55 @@ public class ParameterHandlerMappingTests extends TestCase {
 		pac.setConfigLocations(new String[] {CONF});
 		pac.refresh();
 	}
-	
+
 	public void testParameterMapping() throws Exception {
 		HandlerMapping hm = (HandlerMapping)pac.getBean("handlerMapping");
-		
+
 		MockPortletRequest addRequest = new MockPortletRequest();
 		addRequest.addParameter("action", "add");
 
 		MockPortletRequest removeRequest = new MockPortletRequest();
 		removeRequest.addParameter("action", "remove");
-		
+
 		Object addHandler = hm.getHandler(addRequest).getHandler();
 		Object removeHandler = hm.getHandler(removeRequest).getHandler();
-		
+
 		assertEquals(pac.getBean("addItemHandler"), addHandler);
 		assertEquals(pac.getBean("removeItemHandler"), removeHandler);
 	}
-	
+
 	public void testUnregisteredHandlerWithNoDefault() throws Exception {
 		HandlerMapping hm = (HandlerMapping)pac.getBean("handlerMapping");
-		
+
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("action", "modify");
 
-		assertNull(hm.getHandler(request));		
+		assertNull(hm.getHandler(request));
 	}
 
 	public void testUnregisteredHandlerWithDefault() throws Exception {
 		ParameterHandlerMapping hm = (ParameterHandlerMapping)pac.getBean("handlerMapping");
 		Object defaultHandler = new Object();
 		hm.setDefaultHandler(defaultHandler);
-		
+
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("action", "modify");
 
 		assertNotNull(hm.getHandler(request));
 		assertEquals(defaultHandler, hm.getHandler(request).getHandler());
 	}
-	
+
 	public void testConfiguredParameterName() throws Exception {
 		ParameterHandlerMapping hm = (ParameterHandlerMapping)pac.getBean("handlerMapping");
 		hm.setParameterName("someParam");
-	
+
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("someParam", "add");
-		
+
 		Object handler = hm.getHandler(request).getHandler();
 		assertEquals(pac.getBean("addItemHandler"), handler);
 	}
-	
+
 	public void testDuplicateMappingAttempt() {
 		ParameterHandlerMapping hm = (ParameterHandlerMapping)pac.getBean("handlerMapping");
 		try {
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java
index 644786283c..4c071f7402 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java
@@ -42,7 +42,7 @@ public class ParameterMappingInterceptorTests extends TestCase {
 		assertNotNull(response.getRenderParameter(param));
 		assertEquals(value, response.getRenderParameter(param));
 	}
-	
+
 	public void testNonDefaultParameterNotMapped() throws Exception {
 		ParameterMappingInterceptor interceptor = new ParameterMappingInterceptor();
 		Object handler = new Object();
@@ -57,7 +57,7 @@ public class ParameterMappingInterceptorTests extends TestCase {
 		assertNull(response.getRenderParameter(param));
 		assertNull(response.getRenderParameter(ParameterHandlerMapping.DEFAULT_PARAMETER_NAME));
 	}
-	
+
 	public void testNonDefaultParameterMappedWhenHandlerMappingProvided() throws Exception {
 		String param = "myParam";
 		String value = "someValue";
@@ -88,7 +88,7 @@ public class ParameterMappingInterceptorTests extends TestCase {
 		boolean shouldProceed = interceptor.preHandle(request, response, handler);
 		assertTrue(shouldProceed);
 	}
-	
+
 	public void testNoParameterValueSetWithDefaultParameterName() throws Exception {
 		ParameterMappingInterceptor interceptor = new ParameterMappingInterceptor();
 		Object handler = new Object();
@@ -100,7 +100,7 @@ public class ParameterMappingInterceptorTests extends TestCase {
 		assertTrue(shouldProceed);
 		assertNull(response.getRenderParameter(param));
 	}
-	
+
 	public void testNoParameterValueSetWithNonDefaultParameterName() throws Exception {
 		ParameterMappingInterceptor interceptor = new ParameterMappingInterceptor();
 		Object handler = new Object();
@@ -127,5 +127,5 @@ public class ParameterMappingInterceptorTests extends TestCase {
 		assertTrue(shouldProceed);
 		assertNull(response.getRenderParameter(param));
 	}
-	
+
 }
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java
index f1bda01629..cff6418b88 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java
@@ -32,9 +32,9 @@ import org.springframework.web.portlet.context.XmlPortletApplicationContext;
 public class PortletModeHandlerMappingTests extends TestCase {
 
 	public static final String CONF = "/org/springframework/web/portlet/handler/portletModeMapping.xml";
-	
-	private ConfigurablePortletApplicationContext pac; 
-	
+
+	private ConfigurablePortletApplicationContext pac;
+
 	public void setUp() throws Exception {
 		MockPortletContext portletContext = new MockPortletContext();
 		pac = new XmlPortletApplicationContext();
@@ -42,37 +42,37 @@ public class PortletModeHandlerMappingTests extends TestCase {
 		pac.setConfigLocations(new String[] {CONF});
 		pac.refresh();
 	}
-	
+
 	public void testPortletModeView() throws Exception {
 		HandlerMapping hm = (HandlerMapping)pac.getBean("handlerMapping");
-		
+
 		MockPortletRequest request = new MockPortletRequest();
 		request.setPortletMode(PortletMode.VIEW);
-		
+
 		Object handler = hm.getHandler(request).getHandler();
 		assertEquals(pac.getBean("viewHandler"), handler);
 	}
 
 	public void testPortletModeEdit() throws Exception {
 		HandlerMapping hm = (HandlerMapping)pac.getBean("handlerMapping");
-		
+
 		MockPortletRequest request = new MockPortletRequest();
 		request.setPortletMode(PortletMode.EDIT);
-		
+
 		Object handler = hm.getHandler(request).getHandler();
 		assertEquals(pac.getBean("editHandler"), handler);
 	}
-	
+
 	public void testPortletModeHelp() throws Exception {
 		HandlerMapping hm = (HandlerMapping)pac.getBean("handlerMapping");
-		
+
 		MockPortletRequest request = new MockPortletRequest();
 		request.setPortletMode(PortletMode.HELP);
-		
+
 		Object handler = hm.getHandler(request).getHandler();
 		assertEquals(pac.getBean("helpHandler"), handler);
 	}
-	
+
 	public void testDuplicateMappingAttempt() {
 		PortletModeHandlerMapping hm = (PortletModeHandlerMapping)pac.getBean("handlerMapping");
 		try {
@@ -83,5 +83,5 @@ public class PortletModeHandlerMappingTests extends TestCase {
 			// expected
 		}
 	}
-	
+
 }
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java
index 1bf68e45fa..687e4938e4 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java
@@ -32,9 +32,9 @@ import org.springframework.web.portlet.context.XmlPortletApplicationContext;
 public class PortletModeParameterHandlerMappingTests extends TestCase {
 
 	public static final String CONF = "/org/springframework/web/portlet/handler/portletModeParameterMapping.xml";
-	
-	private ConfigurablePortletApplicationContext pac; 
-	
+
+	private ConfigurablePortletApplicationContext pac;
+
 	public void setUp() throws Exception {
 		MockPortletContext portletContext = new MockPortletContext();
 		pac = new XmlPortletApplicationContext();
@@ -42,10 +42,10 @@ public class PortletModeParameterHandlerMappingTests extends TestCase {
 		pac.setConfigLocations(new String[] {CONF});
 		pac.refresh();
 	}
-	
+
 	public void testPortletModeViewWithParameter() throws Exception {
 		HandlerMapping hm = (HandlerMapping)pac.getBean("handlerMapping");
-		
+
 		MockPortletRequest addRequest = new MockPortletRequest();
 		addRequest.setPortletMode(PortletMode.VIEW);
 		addRequest.setParameter("action", "add");
@@ -53,25 +53,25 @@ public class PortletModeParameterHandlerMappingTests extends TestCase {
 		MockPortletRequest removeRequest = new MockPortletRequest();
 		removeRequest.setPortletMode(PortletMode.VIEW);
 		removeRequest.setParameter("action", "remove");
-		
+
 		Object addHandler = hm.getHandler(addRequest).getHandler();
 		Object removeHandler = hm.getHandler(removeRequest).getHandler();
-		
+
 		assertEquals(pac.getBean("addItemHandler"), addHandler);
 		assertEquals(pac.getBean("removeItemHandler"), removeHandler);
 	}
 
 	public void testPortletModeEditWithParameter() throws Exception {
 		HandlerMapping hm = (HandlerMapping)pac.getBean("handlerMapping");
-		
+
 		MockPortletRequest request = new MockPortletRequest();
 		request.setPortletMode(PortletMode.EDIT);
 		request.setParameter("action", "prefs");
-		
+
 		Object handler = hm.getHandler(request).getHandler();
 		assertEquals(pac.getBean("preferencesHandler"), handler);
 	}
-	
+
 	public void testDuplicateMappingInSamePortletMode() {
 		PortletModeParameterHandlerMapping hm = (PortletModeParameterHandlerMapping)pac.getBean("handlerMapping");
 		try {
@@ -93,18 +93,18 @@ public class PortletModeParameterHandlerMappingTests extends TestCase {
 			// expected
 		}
 	}
-	
+
 	public void testAllowDuplicateMappingInDifferentPortletMode() throws Exception {
 		PortletModeParameterHandlerMapping hm = (PortletModeParameterHandlerMapping)pac.getBean("handlerMapping");
 		hm.setAllowDuplicateParameters(true);
-		
+
 		Object editRemoveHandler = new Object();
 		hm.registerHandler(PortletMode.EDIT, "remove", editRemoveHandler);
-		
+
 		MockPortletRequest request = new MockPortletRequest();
 		request.setPortletMode(PortletMode.EDIT);
 		request.setParameter("action", "remove");
-		
+
 		Object handler = hm.getHandler(request).getHandler();
 		assertEquals(editRemoveHandler, handler);
 	}
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 8cc1ec1fe9..5539c8eb93 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
@@ -33,7 +33,7 @@ import org.springframework.web.portlet.ModelAndView;
  * @author Juergen Hoeller
  */
 public class SimpleMappingExceptionResolverTests extends TestCase {
-	
+
 	private static final String DEFAULT_VIEW = "default-view";
 
 	private SimpleMappingExceptionResolver exceptionResolver;
@@ -51,19 +51,19 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 		handler2 = new Object();
 		genericException = new Exception();
 	}
-	
+
 	public void testSetOrder() {
 		exceptionResolver.setOrder(2);
 		assertEquals(2, exceptionResolver.getOrder());
 	}
-	
+
 	public void testDefaultErrorView() {
 		exceptionResolver.setDefaultErrorView(DEFAULT_VIEW);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
 		assertEquals(DEFAULT_VIEW, mav.getViewName());
 		assertEquals(genericException, mav.getModel().get(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE));
 	}
-	
+
 	public void testDefaultErrorViewDifferentHandler() {
 		exceptionResolver.setDefaultErrorView(DEFAULT_VIEW);
 		exceptionResolver.setMappedHandlers(Collections.singleton(handler1));
@@ -90,14 +90,14 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 		assertEquals(DEFAULT_VIEW, mav.getViewName());
 		assertNull(mav.getModel().get(SimpleMappingExceptionResolver.DEFAULT_EXCEPTION_ATTRIBUTE));
 	}
-	
+
 	public void testNullExceptionMappings() {
 		exceptionResolver.setExceptionMappings(null);
 		exceptionResolver.setDefaultErrorView(DEFAULT_VIEW);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
 		assertEquals(DEFAULT_VIEW, mav.getViewName());
 	}
-	
+
 	public void testDefaultNoRenderWhenMinimized() {
 		exceptionResolver.setDefaultErrorView(DEFAULT_VIEW);
 		request.setWindowState(WindowState.MINIMIZED);
@@ -113,7 +113,7 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 		assertNotNull("ModelAndView should not be null", mav);
 		assertEquals(DEFAULT_VIEW, mav.getViewName());
 	}
-	
+
 	public void testSimpleExceptionMapping() {
 		Properties props = new Properties();
 		props.setProperty("Exception", "error");
@@ -122,7 +122,7 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
 		assertEquals("error", mav.getViewName());
 	}
-	
+
 	public void testExactExceptionMappingWithHandlerSpecified() {
 		Properties props = new Properties();
 		props.setProperty("java.lang.Exception", "error");
@@ -131,7 +131,7 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
 		assertEquals("error", mav.getViewName());
 	}
-	
+
 	public void testExactExceptionMappingWithHandlerClassSpecified() {
 		Properties props = new Properties();
 		props.setProperty("java.lang.Exception", "error");
@@ -176,7 +176,7 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
 		assertNull("Exception not mapped - ModelAndView should be null", mav);
 	}
-	
+
 	public void testTwoMappings() {
 		Properties props = new Properties();
 		props.setProperty("java.lang.Exception", "error");
@@ -186,7 +186,7 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
 		assertEquals("error", mav.getViewName());
 	}
-	
+
 	public void testTwoMappingsOneShortOneLong() {
 		Properties props = new Properties();
 		props.setProperty("Exception", "error");
@@ -196,7 +196,7 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, genericException);
 		assertEquals("error", mav.getViewName());
 	}
-	
+
 	public void testTwoMappingsOneShortOneLongThrowOddException() {
 		Exception oddException = new SomeOddException();
 		Properties props = new Properties();
@@ -207,7 +207,7 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, oddException);
 		assertEquals("error", mav.getViewName());
 	}
-	
+
 	public void testTwoMappingsThrowOddExceptionUseLongExceptionMapping() {
 		Exception oddException = new SomeOddException();
 		Properties props = new Properties();
@@ -218,7 +218,7 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, oddException);
 		assertEquals("another-error", mav.getViewName());
 	}
-	
+
 	public void testThreeMappings() {
 		Exception oddException = new AnotherOddException();
 		Properties props = new Properties();
@@ -230,7 +230,7 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, oddException);
 		assertEquals("another-some-error", mav.getViewName());
 	}
-	
+
 	public void testExceptionWithSubstringMatchingParent() {
 		Exception oddException = new SomeOddExceptionChild();
 		Properties props = new Properties();
@@ -240,9 +240,9 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 		exceptionResolver.setMappedHandlers(Collections.singleton(handler1));
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, oddException);
-		assertEquals("child-error", mav.getViewName());		
+		assertEquals("child-error", mav.getViewName());
 	}
-	
+
 	public void testMostSpecificExceptionInHierarchyWins() {
 		Exception oddException = new NoSubstringMatchesThisException();
 		Properties props = new Properties();
@@ -251,19 +251,19 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 		exceptionResolver.setMappedHandlers(Collections.singleton(handler1));
 		exceptionResolver.setExceptionMappings(props);
 		ModelAndView mav = exceptionResolver.resolveException(request, response, handler1, oddException);
-		assertEquals("parent-error", mav.getViewName());		
+		assertEquals("parent-error", mav.getViewName());
 	}
 
 
 	private static class SomeOddException extends Exception {
 
 	}
-	
+
 
 	private static class SomeOddExceptionChild extends SomeOddException {
 
 	}
-	
+
 
 	private static class NoSubstringMatchesThisException extends SomeOddException {
 
@@ -273,5 +273,5 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 	private static class AnotherOddException extends Exception {
 
 	}
-	
+
 }
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java
index 7185dee986..ef70c03718 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java
@@ -91,7 +91,7 @@ public class UserRoleAuthorizationInterceptorTests extends TestCase {
 			// expected
 		}
 	}
-	
+
 	public void testInterceptorWithNoAuthorizedRoles() throws Exception {
 		UserRoleAuthorizationInterceptor interceptor = new UserRoleAuthorizationInterceptor();
 		MockRenderRequest request = new MockRenderRequest();
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
index 52a566fd39..fdf57bb0af 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
@@ -53,7 +53,7 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
  * @author Mark Fisher
  */
 public class CommandControllerTests extends TestCase {
-	
+
 	private static final String ERRORS_KEY = "errors";
 
 	public void testRenderRequestWithNoParams() throws Exception {
@@ -71,7 +71,7 @@ public class CommandControllerTests extends TestCase {
 
 	public void testRenderRequestWithParams() throws Exception {
 		TestController tc = new TestController();
-		MockRenderRequest request = new MockRenderRequest();		
+		MockRenderRequest request = new MockRenderRequest();
 		MockRenderResponse response = new MockRenderResponse();
 		String name = "test";
 		int age = 30;
@@ -87,10 +87,10 @@ public class CommandControllerTests extends TestCase {
 		assertNotNull(errors);
 		assertEquals("There should be no errors", 0, errors.getErrorCount());
 	}
-	
+
 	public void testRenderRequestWithMismatch() throws Exception {
 		TestController tc = new TestController();
-		MockRenderRequest request = new MockRenderRequest();		
+		MockRenderRequest request = new MockRenderRequest();
 		MockRenderResponse response = new MockRenderResponse();
 		String name = "test";
 		request.addParameter("name", name);
@@ -102,11 +102,11 @@ public class CommandControllerTests extends TestCase {
 		assertNotNull(command);
 		assertEquals("Name should be bound", name, command.getName());
 		BindException errors = (BindException)mav.getModel().get(ERRORS_KEY);
-		assertEquals("There should be 1 error", 1, errors.getErrorCount());		
+		assertEquals("There should be 1 error", 1, errors.getErrorCount());
 		assertNotNull(errors.getFieldError("age"));
 		assertEquals("typeMismatch", errors.getFieldError("age").getCode());
 	}
-	
+
 	public void testRenderWhenMinimizedReturnsNull() throws Exception {
 		TestController tc = new TestController();
 		assertFalse(tc.isRenderWhenMinimized());
@@ -125,13 +125,13 @@ public class CommandControllerTests extends TestCase {
 		request.setContextPath("test");
 		MockRenderResponse response = new MockRenderResponse();
 		ModelAndView mav = tc.handleRenderRequest(request, response);
-		assertNotNull("ModelAndView should not be null", mav);		
+		assertNotNull("ModelAndView should not be null", mav);
 		assertEquals("test-view", mav.getViewName());
 		assertNotNull(mav.getModel().get(tc.getCommandName()));
 		BindException errors = (BindException)mav.getModel().get(ERRORS_KEY);
 		assertEquals("There should be no errors", 0, errors.getErrorCount());
 	}
-	
+
 	public void testRequiresSessionWithoutSession() throws Exception {
 		TestController tc = new TestController();
 		tc.setRequireSession(true);
@@ -151,7 +151,7 @@ public class CommandControllerTests extends TestCase {
 		tc.setRequireSession(true);
 		MockRenderRequest request = new MockRenderRequest();
 		MockRenderResponse response = new MockRenderResponse();
-		
+
 		// create the session
 		request.getPortletSession(true);
 		try {
@@ -161,7 +161,7 @@ public class CommandControllerTests extends TestCase {
 			fail("Should not have thrown PortletSessionRequiredException");
 		}
 	}
-	
+
 	public void testRenderRequestWithoutCacheSetting() throws Exception {
 		TestController tc = new TestController();
 		MockRenderRequest request = new MockRenderRequest();
@@ -176,17 +176,17 @@ public class CommandControllerTests extends TestCase {
 		tc.setCacheSeconds(-99);
 		MockRenderRequest request = new MockRenderRequest();
 		MockRenderResponse response = new MockRenderResponse();
-		tc.handleRenderRequest(request, response);		
+		tc.handleRenderRequest(request, response);
 		String cacheProperty = response.getProperty(RenderResponse.EXPIRATION_CACHE);
 		assertNull("Expiration-cache should be null", cacheProperty);
 	}
-	
+
 	public void testRenderRequestWithZeroCacheSetting() throws Exception {
 		TestController tc = new TestController();
 		tc.setCacheSeconds(0);
 		MockRenderRequest request = new MockRenderRequest();
 		MockRenderResponse response = new MockRenderResponse();
-		tc.handleRenderRequest(request, response);		
+		tc.handleRenderRequest(request, response);
 		String cacheProperty = response.getProperty(RenderResponse.EXPIRATION_CACHE);
 		assertEquals("Expiration-cache should be set to 0 seconds", "0", cacheProperty);
 	}
@@ -196,11 +196,11 @@ public class CommandControllerTests extends TestCase {
 		tc.setCacheSeconds(30);
 		MockRenderRequest request = new MockRenderRequest();
 		MockRenderResponse response = new MockRenderResponse();
-		tc.handleRenderRequest(request, response);		
+		tc.handleRenderRequest(request, response);
 		String cacheProperty = response.getProperty(RenderResponse.EXPIRATION_CACHE);
 		assertEquals("Expiration-cache should be set to 30 seconds", "30", cacheProperty);
 	}
-	
+
 	public void testActionRequest() throws Exception {
 		TestController tc = new TestController();
 		MockActionRequest request = new MockActionRequest();
@@ -209,14 +209,14 @@ public class CommandControllerTests extends TestCase {
 		TestBean command = (TestBean)request.getPortletSession().getAttribute(tc.getRenderCommandSessionAttributeName());
 		assertTrue(command.isJedi());
 	}
-	
+
 	public void testSuppressBinding() throws Exception {
 		TestController tc = new TestController() {
 			protected boolean suppressBinding(PortletRequest request) {
 				return true;
 			}
 		};
-		MockRenderRequest request = new MockRenderRequest();		
+		MockRenderRequest request = new MockRenderRequest();
 		MockRenderResponse response = new MockRenderResponse();
 		String name = "test";
 		int age = 30;
@@ -232,7 +232,7 @@ public class CommandControllerTests extends TestCase {
 		BindException errors = (BindException)mav.getModel().get(ERRORS_KEY);
 		assertEquals("There should be no errors", 0, errors.getErrorCount());
 	}
-	
+
 	public void testWithCustomDateEditor() throws Exception {
 		final DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy");
 		TestController tc = new TestController() {
@@ -240,7 +240,7 @@ public class CommandControllerTests extends TestCase {
 				binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, false));
 			}
 		};
-		MockRenderRequest request = new MockRenderRequest();		
+		MockRenderRequest request = new MockRenderRequest();
 		MockRenderResponse response = new MockRenderResponse();
 		String name = "test";
 		int age = 30;
@@ -265,7 +265,7 @@ public class CommandControllerTests extends TestCase {
 				binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, false));
 			}
 		};
-		MockRenderRequest request = new MockRenderRequest();		
+		MockRenderRequest request = new MockRenderRequest();
 		MockRenderResponse response = new MockRenderResponse();
 		String name = "test";
 		int age = 30;
@@ -278,7 +278,7 @@ public class CommandControllerTests extends TestCase {
 		assertEquals(name, command.getName());
 		assertEquals(age, command.getAge());
 		BindException errors = (BindException)mav.getModel().get(ERRORS_KEY);
-		assertEquals("There should be 1 error", 1, errors.getErrorCount());		
+		assertEquals("There should be 1 error", 1, errors.getErrorCount());
 		assertNotNull(errors.getFieldError("date"));
 		assertEquals("typeMismatch", errors.getFieldError("date").getCode());
 		assertEquals(emptyString, errors.getFieldError("date").getRejectedValue());
@@ -291,7 +291,7 @@ public class CommandControllerTests extends TestCase {
 				binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));
 			}
 		};
-		MockRenderRequest request = new MockRenderRequest();		
+		MockRenderRequest request = new MockRenderRequest();
 		MockRenderResponse response = new MockRenderResponse();
 		String name = "test";
 		int age = 30;
@@ -304,10 +304,10 @@ public class CommandControllerTests extends TestCase {
 		assertEquals(name, command.getName());
 		assertEquals(age, command.getAge());
 		BindException errors = (BindException)mav.getModel().get(ERRORS_KEY);
-		assertEquals("There should be 0 errors", 0, errors.getErrorCount());		
+		assertEquals("There should be 0 errors", 0, errors.getErrorCount());
 		assertNull("date should be null", command.getDate());
 	}
-	
+
 	public void testNestedBindingWithPropertyEditor() throws Exception {
 		TestController tc = new TestController() {
 			protected void initBinder(PortletRequest request, PortletRequestDataBinder binder) {
@@ -318,7 +318,7 @@ public class CommandControllerTests extends TestCase {
 				});
 			}
 		};
-		MockRenderRequest request = new MockRenderRequest();		
+		MockRenderRequest request = new MockRenderRequest();
 		MockRenderResponse response = new MockRenderResponse();
 		String name = "test";
 		String spouseName = "testSpouse";
@@ -338,7 +338,7 @@ public class CommandControllerTests extends TestCase {
 		BindException errors = (BindException)mav.getModel().get(ERRORS_KEY);
 		assertEquals("There should be no errors", 0, errors.getErrorCount());
 	}
-	
+
 	public void testWithValidatorNotSupportingCommandClass() throws Exception {
 		Validator v = new Validator() {
 			public boolean supports(Class c) {
@@ -443,7 +443,7 @@ public class CommandControllerTests extends TestCase {
 		private TestController() {
 			super(TestBean.class, "testBean");
 		}
-		
+
 		protected void handleAction(ActionRequest request, ActionResponse response, Object command, BindException errors) {
 			((TestBean)command).setJedi(true);
 		}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java
index cef2df048c..dc35d85acd 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java
@@ -56,7 +56,7 @@ public class ParameterizableViewControllerTests extends TestCase {
 			// expected
 		}
 	}
-	
+
 	public void testActionRequestNotHandled() throws Exception {
 		ParameterizableViewController controller = new ParameterizableViewController();
 		ActionRequest request = new MockActionRequest();
@@ -69,5 +69,5 @@ public class ParameterizableViewControllerTests extends TestCase {
 			// expected
 		}
 	}
-	
+
 }
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java
index 5fa8569bb6..008ccfaeeb 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java
@@ -33,11 +33,11 @@ import org.springframework.web.portlet.ModelAndView;
 public class PortletModeNameViewControllerTests extends TestCase {
 
 	private PortletModeNameViewController controller;
-	
+
 	public void setUp() {
 		controller = new PortletModeNameViewController();
 	}
-	
+
 	public void testEditPortletMode() throws Exception {
 		MockRenderRequest request = new MockRenderRequest();
 		MockRenderResponse response = new MockRenderResponse();
@@ -53,7 +53,7 @@ public class PortletModeNameViewControllerTests extends TestCase {
 		ModelAndView mav = controller.handleRenderRequest(request, response);
 		assertEquals("help", mav.getViewName());
 	}
-	
+
 	public void testViewPortletMode() throws Exception {
 		MockRenderRequest request = new MockRenderRequest();
 		MockRenderResponse response = new MockRenderResponse();
@@ -61,7 +61,7 @@ public class PortletModeNameViewControllerTests extends TestCase {
 		ModelAndView mav = controller.handleRenderRequest(request, response);
 		assertEquals("view", mav.getViewName());
 	}
-	
+
 	public void testActionRequest() throws Exception {
 		MockActionRequest request = new MockActionRequest();
 		MockActionResponse response = new MockActionResponse();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
index 3be0e0902b..27d392e7cd 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
@@ -46,7 +46,7 @@ import javax.servlet.http.HttpServletResponse;
  * @see org.springframework.web.servlet.handler.SimpleServletHandlerAdapter
  */
 public interface HandlerAdapter {
-	
+
 	/**
 	 * Given a handler instance, return whether or not this HandlerAdapter can
 	 * support it. Typical HandlerAdapters will base the decision on the handler
@@ -58,8 +58,8 @@ public interface HandlerAdapter {
 	 * @param handler handler object to check
 	 * @return whether or not this object can use the given handler
 	 */
-	boolean supports(Object handler); 
-	
+	boolean supports(Object handler);
+
 	/**
 	 * Use the given handler to handle this request.
 	 * The workflow that is required may vary widely.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
index e35e00ccfa..aeee264e48 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
@@ -86,7 +86,7 @@ public abstract class HttpServletBean extends HttpServlet
 	/** Logger available to subclasses */
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	/** 
+	/**
 	 * Set of required properties (Strings) that must be supplied as
 	 * config parameters to this servlet.
 	 */
@@ -230,7 +230,7 @@ public abstract class HttpServletBean extends HttpServlet
 		 */
 		public ServletConfigPropertyValues(ServletConfig config, Set<String> requiredProperties)
 		    throws ServletException {
-			
+
 			Set<String> missingProps = (requiredProperties != null && !requiredProperties.isEmpty()) ?
 					new HashSet<String>(requiredProperties) : null;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
index 36ef10866f..52f3d7c29e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
@@ -1,12 +1,12 @@
 /*
  * 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.
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 3f40bbd08c..dea8fddc99 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
@@ -29,7 +29,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.context.support.ServletContextResource;
 
 /**
- * Simple servlet that can expose an internal resource, including a 
+ * Simple servlet that can expose an internal resource, including a
  * default URL if the specified resource is not found. An alternative,
  * for example, to trying and catching exceptions when using JSP include.
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java
index 3ac6526f66..209c1bc092 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java
@@ -17,8 +17,8 @@
 package org.springframework.web.servlet;
 
 /**
- * Provides additional information about a View such as whether it 
- * performs redirects. 
+ * Provides additional information about a View such as whether it
+ * performs redirects.
  *
  * @author Rossen Stoyanchev
  * @since 3.1
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 c1463fc9e9..c44619e313 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,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java
index 650c6a6e5f..12868f403e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java
@@ -35,12 +35,12 @@ import java.util.Locale;
  */
 public interface ViewResolver {
 
-	/** 
+	/**
 	 * Resolve the given view by name.
 	 * <p>Note: To allow for ViewResolver chaining, a ViewResolver should
 	 * return <code>null</code> if a view with the given name is not defined in it.
 	 * However, this is not required: Some ViewResolvers will always attempt
-	 * to build View objects with the given name, unable to return <code>null</code> 
+	 * to build View objects with the given name, unable to return <code>null</code>
 	 * (rather throwing an exception when View creation failed).
 	 * @param viewName name of the view to resolve
 	 * @param locale Locale in which to resolve the view.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java
index c85df51517..68f0220540 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java
@@ -32,11 +32,11 @@ import org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter;
 import org.springframework.web.servlet.resource.DefaultServletHttpRequestHandler;
 
 /**
- * {@link BeanDefinitionParser} that parses a {@code default-servlet-handler} element to 
- * register a {@link DefaultServletHttpRequestHandler}.  Will also register a 
- * {@link SimpleUrlHandlerMapping} for mapping resource requests, and a 
- * {@link HttpRequestHandlerAdapter}. 
- * 
+ * {@link BeanDefinitionParser} that parses a {@code default-servlet-handler} element to
+ * register a {@link DefaultServletHttpRequestHandler}.  Will also register a
+ * {@link SimpleUrlHandlerMapping} for mapping resource requests, and a
+ * {@link HttpRequestHandlerAdapter}.
+ *
  * @author Jeremy Grelle
  * @author Rossen Stoyanchev
  * @since 3.0.4
@@ -45,8 +45,8 @@ class DefaultServletHandlerBeanDefinitionParser implements BeanDefinitionParser
 
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		Object source = parserContext.extractSource(element);
-		
-		String defaultServletName = element.getAttribute("default-servlet-name");		
+
+		String defaultServletName = element.getAttribute("default-servlet-name");
 		RootBeanDefinition defaultServletHandlerDef = new RootBeanDefinition(DefaultServletHttpRequestHandler.class);
 		defaultServletHandlerDef.setSource(source);
 		defaultServletHandlerDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
@@ -56,20 +56,20 @@ class DefaultServletHandlerBeanDefinitionParser implements BeanDefinitionParser
 		String defaultServletHandlerName = parserContext.getReaderContext().generateBeanName(defaultServletHandlerDef);
 		parserContext.getRegistry().registerBeanDefinition(defaultServletHandlerName, defaultServletHandlerDef);
 		parserContext.registerComponent(new BeanComponentDefinition(defaultServletHandlerDef, defaultServletHandlerName));
-		
+
 		Map<String, String> urlMap = new ManagedMap<String, String>();
 		urlMap.put("/**", defaultServletHandlerName);
-		
+
 		RootBeanDefinition handlerMappingDef = new RootBeanDefinition(SimpleUrlHandlerMapping.class);
 		handlerMappingDef.setSource(source);
 		handlerMappingDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 		handlerMappingDef.getPropertyValues().add("urlMap", urlMap);
-		
+
 		String handlerMappingBeanName = parserContext.getReaderContext().generateBeanName(handlerMappingDef);
 		parserContext.getRegistry().registerBeanDefinition(handlerMappingBeanName, handlerMappingDef);
 		parserContext.registerComponent(new BeanComponentDefinition(handlerMappingDef, handlerMappingBeanName));
-		
-		// Ensure BeanNameUrlHandlerMapping (SPR-8289) and default HandlerAdapters are not "turned off" 
+
+		// Ensure BeanNameUrlHandlerMapping (SPR-8289) and default HandlerAdapters are not "turned off"
 		MvcNamespaceUtils.registerDefaultComponents(parserContext, source);
 
 		return null;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
index ecf70c794b..2b4af21e86 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
@@ -31,7 +31,7 @@ public class MvcNamespaceHandler extends NamespaceHandlerSupport {
 	public void init() {
 		registerBeanDefinitionParser("annotation-driven", new AnnotationDrivenBeanDefinitionParser());
 		registerBeanDefinitionParser("default-servlet-handler", new DefaultServletHandlerBeanDefinitionParser());
-		registerBeanDefinitionParser("interceptors", new InterceptorsBeanDefinitionParser());		
+		registerBeanDefinitionParser("interceptors", new InterceptorsBeanDefinitionParser());
 		registerBeanDefinitionParser("resources", new ResourcesBeanDefinitionParser());
 		registerBeanDefinitionParser("view-controller", new ViewControllerBeanDefinitionParser());
 	}
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 49db0579e4..a0defb43f1 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
@@ -26,19 +26,19 @@ import org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter;
 
 /**
  * Convenience methods for use in MVC namespace BeanDefinitionParsers.
- * 
+ *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
 abstract class MvcNamespaceUtils {
 
-	private static final String BEAN_NAME_URL_HANDLER_MAPPING_BEAN_NAME = 
+	private static final String BEAN_NAME_URL_HANDLER_MAPPING_BEAN_NAME =
 			BeanNameUrlHandlerMapping.class.getName();
 
-	private static final String SIMPLE_CONTROLLER_HANDLER_ADAPTER_BEAN_NAME = 
+	private static final String SIMPLE_CONTROLLER_HANDLER_ADAPTER_BEAN_NAME =
 			SimpleControllerHandlerAdapter.class.getName();
 
-	private static final String HTTP_REQUEST_HANDLER_ADAPTER_BEAN_NAME = 
+	private static final String HTTP_REQUEST_HANDLER_ADAPTER_BEAN_NAME =
 			HttpRequestHandlerAdapter.class.getName();
 
 	public static void registerDefaultComponents(ParserContext parserContext, Object source) {
@@ -48,7 +48,7 @@ abstract class MvcNamespaceUtils {
 	}
 
 	/**
-	 * Registers  an {@link HttpRequestHandlerAdapter} under a well-known 
+	 * Registers  an {@link HttpRequestHandlerAdapter} under a well-known
 	 * name unless already registered.
 	 */
 	private static void registerBeanNameUrlHandlerMapping(ParserContext parserContext, Object source) {
@@ -63,7 +63,7 @@ abstract class MvcNamespaceUtils {
 	}
 
 	/**
-	 * Registers  an {@link HttpRequestHandlerAdapter} under a well-known 
+	 * Registers  an {@link HttpRequestHandlerAdapter} under a well-known
 	 * name unless already registered.
 	 */
 	private static void registerHttpRequestHandlerAdapter(ParserContext parserContext, Object source) {
@@ -75,9 +75,9 @@ abstract class MvcNamespaceUtils {
 			parserContext.registerComponent(new BeanComponentDefinition(handlerAdapterDef, HTTP_REQUEST_HANDLER_ADAPTER_BEAN_NAME));
 		}
 	}
-	
+
 	/**
-	 * Registers a {@link SimpleControllerHandlerAdapter} under a well-known 
+	 * Registers a {@link SimpleControllerHandlerAdapter} under a well-known
 	 * name unless already registered.
 	 */
 	private static void registerSimpleControllerHandlerAdapter(ParserContext parserContext, Object source) {
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 a3e423b7f0..d218be939c 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
@@ -39,7 +39,7 @@ import org.w3c.dom.Element;
  */
 class ViewControllerBeanDefinitionParser implements BeanDefinitionParser {
 
-	private static final String HANDLER_MAPPING_BEAN_NAME = 
+	private static final String HANDLER_MAPPING_BEAN_NAME =
 		"org.springframework.web.servlet.config.viewControllerHandlerMapping";
 
 
@@ -49,14 +49,14 @@ class ViewControllerBeanDefinitionParser implements BeanDefinitionParser {
 		// Register SimpleUrlHandlerMapping for view controllers
 		BeanDefinition handlerMappingDef = registerHandlerMapping(parserContext, source);
 
-		// Ensure BeanNameUrlHandlerMapping (SPR-8289) and default HandlerAdapters are not "turned off" 
+		// Ensure BeanNameUrlHandlerMapping (SPR-8289) and default HandlerAdapters are not "turned off"
 		MvcNamespaceUtils.registerDefaultComponents(parserContext, source);
 
 		// Create view controller bean definition
 		RootBeanDefinition viewControllerDef = new RootBeanDefinition(ParameterizableViewController.class);
 		viewControllerDef.setSource(source);
 		if (element.hasAttribute("view-name")) {
-			viewControllerDef.getPropertyValues().add("viewName", element.getAttribute("view-name"));			
+			viewControllerDef.getPropertyValues().add("viewName", element.getAttribute("view-name"));
 		}
 		Map<String, BeanDefinition> urlMap;
 		if (handlerMappingDef.getPropertyValues().contains("urlMap")) {
@@ -64,13 +64,13 @@ class ViewControllerBeanDefinitionParser implements BeanDefinitionParser {
 		}
 		else {
 			urlMap = new ManagedMap<String, BeanDefinition>();
-			handlerMappingDef.getPropertyValues().add("urlMap", urlMap);			
+			handlerMappingDef.getPropertyValues().add("urlMap", urlMap);
 		}
 		urlMap.put(element.getAttribute("path"), viewControllerDef);
 
 		return null;
 	}
-	
+
 	private BeanDefinition registerHandlerMapping(ParserContext parserContext, Object source) {
 		if (!parserContext.getRegistry().containsBeanDefinition(HANDLER_MAPPING_BEAN_NAME)) {
 			RootBeanDefinition handlerMappingDef = new RootBeanDefinition(SimpleUrlHandlerMapping.class);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java
index 1506df31cc..eaae024b2b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java
@@ -29,9 +29,9 @@ import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 import org.springframework.web.servlet.resource.DefaultServletHttpRequestHandler;
 
 /**
- * Configures a request handler for serving static resources by forwarding the request to the Servlet container's 
+ * Configures a request handler for serving static resources by forwarding the request to the Servlet container's
  * "default" Servlet. This is intended to be used when the Spring MVC {@link DispatcherServlet} is mapped to "/"
- * thus overriding the Servlet container's default handling of static resources. Since this handler is configured 
+ * thus overriding the Servlet container's default handling of static resources. Since this handler is configured
  * at the lowest precedence, effectively it allows all other handler mappings to handle the request, and if none
  * of them do, this handler can forward it to the "default" Servlet.
  *
@@ -57,7 +57,7 @@ public class DefaultServletHandlerConfigurer {
 
 	/**
 	 * Enable forwarding to the "default" Servlet. When this method is used the {@link DefaultServletHttpRequestHandler}
-	 * will try to auto-detect the "default" Servlet name. Alternatively, you can specify the name of the default 
+	 * will try to auto-detect the "default" Servlet name. Alternatively, you can specify the name of the default
 	 * Servlet via {@link #enable(String)}.
 	 * @see DefaultServletHttpRequestHandler
 	 */
@@ -78,14 +78,14 @@ public class DefaultServletHandlerConfigurer {
 
 	/**
 	 * Return a handler mapping instance ordered at {@link Integer#MAX_VALUE} containing the
-	 * {@link DefaultServletHttpRequestHandler} instance mapped to {@code "/**"}; or {@code null} if 
+	 * {@link DefaultServletHttpRequestHandler} instance mapped to {@code "/**"}; or {@code null} if
 	 * default servlet handling was not been enabled.
 	 */
 	protected AbstractHandlerMapping getHandlerMapping() {
 		if (handler == null) {
 			return null;
 		}
-		
+
 		Map<String, HttpRequestHandler> urlMap = new HashMap<String, HttpRequestHandler>();
 		urlMap.put("/**", handler);
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
index 9928410edb..2daa59c476 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Import;
 /**
  * Add this annotation to an {@code @Configuration} class to have the Spring MVC
  * configuration defined in {@link WebMvcConfigurationSupport} imported:
- * 
+ *
  * <pre class="code">
  * &#064;Configuration
  * &#064;EnableWebMvc
@@ -33,9 +33,9 @@ import org.springframework.context.annotation.Import;
  * }
  * </pre>
  * <p>Customize the imported configuration by implementing the
- * {@link WebMvcConfigurer} interface or more likely by extending the 
- * {@link WebMvcConfigurerAdapter} base class and overriding individual methods: 
- * 
+ * {@link WebMvcConfigurer} interface or more likely by extending the
+ * {@link WebMvcConfigurerAdapter} base class and overriding individual methods:
+ *
  * <pre class="code">
  * &#064;Configuration
  * &#064;EnableWebMvc
@@ -56,11 +56,11 @@ import org.springframework.context.annotation.Import;
  * }
  * </pre>
  *
- * <p>If the customization options of {@link WebMvcConfigurer} do not expose 
- * something you need to configure, consider removing the {@code @EnableWebMvc} 
- * annotation and extending directly from {@link WebMvcConfigurationSupport} 
+ * <p>If the customization options of {@link WebMvcConfigurer} do not expose
+ * something you need to configure, consider removing the {@code @EnableWebMvc}
+ * annotation and extending directly from {@link WebMvcConfigurationSupport}
  * overriding selected {@code @Bean} methods:
- * 
+ *
  * <pre class="code">
  * &#064;Configuration
  * &#064;ComponentScan(basePackageClasses = { MyConfiguration.class })
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java
index cbad096879..b406d284ae 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java
@@ -27,25 +27,25 @@ import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
 
 /**
  * Encapsulates information required to create a resource handlers.
- * 
+ *
  * @author Rossen Stoyanchev
  * @author Keith Donald
- * 
+ *
  * @since 3.1
  */
 public class ResourceHandlerRegistration {
 
 	private final ResourceLoader resourceLoader;
-	
+
 	private final String[] pathPatterns;
-	
+
 	private final List<Resource> locations = new ArrayList<Resource>();
-	
+
 	private Integer cachePeriod;
 
 	/**
 	 * Create a {@link ResourceHandlerRegistration} instance.
-	 * @param resourceLoader a resource loader for turning a String location into a {@link Resource} 
+	 * @param resourceLoader a resource loader for turning a String location into a {@link Resource}
 	 * @param pathPatterns one or more resource URL path patterns
 	 */
 	public ResourceHandlerRegistration(ResourceLoader resourceLoader, String... pathPatterns) {
@@ -53,7 +53,7 @@ public class ResourceHandlerRegistration {
 		this.resourceLoader = resourceLoader;
 		this.pathPatterns = pathPatterns;
 	}
-	
+
 	/**
 	 * Add one or more resource locations from which to serve static content. Each location must point to a valid
 	 * directory. Multiple locations may be specified as a comma-separated list, and the locations will be checked
@@ -69,7 +69,7 @@ public class ResourceHandlerRegistration {
 		}
 		return this;
 	}
-	
+
 	/**
 	 * Specify the cache period for the resources served by the resource handler, in seconds. The default is to not
 	 * send any cache headers but to rely on last-modified timestamps only. Set to 0 in order to send cache headers
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
index e95cc82aac..914c9cfaa3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
@@ -32,15 +32,15 @@ import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
 
 /**
- * Stores registrations of resource handlers for serving static resources such as images, css files and others 
- * through Spring MVC including setting cache headers optimized for efficient loading in a web browser. 
+ * Stores registrations of resource handlers for serving static resources such as images, css files and others
+ * through Spring MVC including setting cache headers optimized for efficient loading in a web browser.
  * Resources can be served out of locations under web application root, from the classpath, and others.
  *
- * <p>To create a resource handler, use {@link #addResourceHandler(String...)} providing the URL path patterns 
+ * <p>To create a resource handler, use {@link #addResourceHandler(String...)} providing the URL path patterns
  * for which the handler should be invoked to serve static resources (e.g. {@code "/resources/**"}).
  *
- * <p>Then use additional methods on the returned {@link ResourceHandlerRegistration} to add one or more 
- * locations from which to serve static content from (e.g. {{@code "/"}, 
+ * <p>Then use additional methods on the returned {@link ResourceHandlerRegistration} to add one or more
+ * locations from which to serve static content from (e.g. {{@code "/"},
  * {@code "classpath:/META-INF/public-web-resources/"}}) or to specify a cache period for served resources.
  *
  * @author Rossen Stoyanchev
@@ -57,7 +57,7 @@ public class ResourceHandlerRegistry {
 	private final List<ResourceHandlerRegistration> registrations = new ArrayList<ResourceHandlerRegistration>();
 
 	private int order = Integer.MAX_VALUE -1;
-	
+
 	public ResourceHandlerRegistry(ApplicationContext applicationContext, ServletContext servletContext) {
 		Assert.notNull(applicationContext, "ApplicationContext is required");
 		this.applicationContext = applicationContext;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java
index 48700f905d..155aa38536 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java
@@ -22,7 +22,7 @@ import org.springframework.web.servlet.mvc.ParameterizableViewController;
 
 /**
  * Encapsulates information required to create a view controller.
- * 
+ *
  * @author Rossen Stoyanchev
  * @author Keith Donald
  * @since 3.1
@@ -30,7 +30,7 @@ import org.springframework.web.servlet.mvc.ParameterizableViewController;
 public class ViewControllerRegistration {
 
 	private final String urlPath;
-	
+
 	private String viewName;
 
 	/**
@@ -41,11 +41,11 @@ public class ViewControllerRegistration {
 		Assert.notNull(urlPath, "A URL path is required to create a view controller.");
 		this.urlPath = urlPath;
 	}
-	
+
 	/**
-	 * Sets the view name to use for this view controller. This field is optional. If not specified the 
+	 * Sets the view name to use for this view controller. This field is optional. If not specified the
 	 * view controller will return a {@code null} view name, which will be resolved through the configured
-	 * {@link RequestToViewNameTranslator}. By default that means "/foo/bar" would resolve to "foo/bar". 
+	 * {@link RequestToViewNameTranslator}. By default that means "/foo/bar" would resolve to "foo/bar".
 	 */
 	public void setViewName(String viewName) {
 		this.viewName = viewName;
@@ -66,5 +66,5 @@ public class ViewControllerRegistration {
 		controller.setViewName(viewName);
 		return controller;
 	}
-	
+
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
index 55d3d457d0..9cbbadf4f1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
@@ -26,8 +26,8 @@ import org.springframework.web.servlet.handler.AbstractHandlerMapping;
 import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 
 /**
- * Stores registrations of view controllers. A view controller does nothing more than return a specified 
- * view name. It saves you from having to write a controller when you want to forward the request straight 
+ * Stores registrations of view controllers. A view controller does nothing more than return a specified
+ * view name. It saves you from having to write a controller when you want to forward the request straight
  * through to a view such as a JSP.
  *
  * @author Rossen Stoyanchev
@@ -37,7 +37,7 @@ import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 public class ViewControllerRegistry {
 
 	private final List<ViewControllerRegistration> registrations = new ArrayList<ViewControllerRegistration>();
-	
+
 	private int order = 1;
 
 	public ViewControllerRegistration addViewController(String urlPath) {
@@ -45,10 +45,10 @@ public class ViewControllerRegistry {
 		registrations.add(registration);
 		return registration;
 	}
-	
+
 	/**
-	 * Specify the order to use for ViewControllers mappings relative to other {@link HandlerMapping}s 
-	 * configured in the Spring MVC application context. The default value for view controllers is 1, 
+	 * Specify the order to use for ViewControllers mappings relative to other {@link HandlerMapping}s
+	 * configured in the Spring MVC application context. The default value for view controllers is 1,
 	 * which is 1 higher than the value used for annotated controllers.
 	 */
 	public void setOrder(int order) {
@@ -67,11 +67,11 @@ public class ViewControllerRegistry {
 		for (ViewControllerRegistration registration : registrations) {
 			urlMap.put(registration.getUrlPath(), registration.getViewController());
 		}
-		
+
 		SimpleUrlHandlerMapping handlerMapping = new SimpleUrlHandlerMapping();
 		handlerMapping.setOrder(order);
 		handlerMapping.setUrlMap(urlMap);
 		return handlerMapping;
 	}
-	
+
 }
\ No newline at end of file
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
index f32c255c01..203a25c206 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
  * @since 3.0.1
  */
 public class ConversionServiceExposingInterceptor extends HandlerInterceptorAdapter {
-	
+
 	private final ConversionService conversionService;
 
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
index 47463cad55..f9e1e7c393 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
@@ -47,7 +47,7 @@ public class HandlerExceptionResolverComposite implements HandlerExceptionResolv
 	}
 
 	/**
-	 * Set the list of exception resolvers to delegate to. 
+	 * Set the list of exception resolvers to delegate to.
 	 */
 	public void setExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
 		this.resolvers = exceptionResolvers;
@@ -61,7 +61,7 @@ public class HandlerExceptionResolverComposite implements HandlerExceptionResolv
 	}
 
 	/**
-	 * Resolve the exception by iterating over the list of configured exception resolvers. 
+	 * Resolve the exception by iterating over the list of configured exception resolvers.
 	 * The first one to return a ModelAndView instance wins. Otherwise {@code null} is returned.
 	 */
 	public ModelAndView resolveException(HttpServletRequest request,
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
index 189e674d75..a0ce3299fb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
@@ -59,7 +59,7 @@ public class SimpleServletHandlerAdapter implements HandlerAdapter {
 
 	public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
-		
+
 		((Servlet) handler).service(request, response);
 		return null;
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java
index 383c6d20e5..9d798afc33 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java
@@ -54,7 +54,7 @@ import org.springframework.util.CollectionUtils;
  * @see BeanNameUrlHandlerMapping
  */
 public class SimpleUrlHandlerMapping extends AbstractUrlHandlerMapping {
-	
+
 	private final Map<String, Object> urlMap = new HashMap<String, Object>();
 
 
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 638133a71e..56a7b29f3e 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
@@ -45,5 +45,5 @@ public class AcceptHeaderLocaleResolver implements LocaleResolver {
 		throw new UnsupportedOperationException(
 				"Cannot change HTTP accept header - use a different locale resolution strategy");
 	}
-	
+
 }
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 0212727177..230e1cc7b6 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
@@ -50,7 +50,7 @@ public class SessionLocaleResolver extends AbstractLocaleResolver {
 	 * @see org.springframework.web.servlet.support.RequestContextUtils#getLocale
 	 */
 	public static final String LOCALE_SESSION_ATTRIBUTE_NAME = SessionLocaleResolver.class.getName() + ".LOCALE";
-	
+
 
 	public Locale resolveLocale(HttpServletRequest request) {
 		Locale locale = (Locale) WebUtils.getSessionAttribute(request, LOCALE_SESSION_ATTRIBUTE_NAME);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
index f20d4df337..ab85c87aa9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
@@ -27,7 +27,7 @@ import org.springframework.web.util.WebUtils;
 /**
  * <p>Convenient superclass for controller implementations, using the Template
  * Method design pattern.</p>
- * 
+ *
  * <p>As stated in the {@link org.springframework.web.servlet.mvc.Controller Controller}
  * interface, a lot of functionality is already provided by certain abstract
  * base controllers. The AbstractController is one of the most important
@@ -149,7 +149,7 @@ public abstract class AbstractController extends WebContentGenerator implements
 				}
 			}
 		}
-		
+
 		return handleRequestInternal(request, response);
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
index 4b1518f1c9..44f0ac4769 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
@@ -76,7 +76,7 @@ import org.springframework.web.servlet.ModelAndView;
  *      gets applied to populate the new form object with initial request parameters and the
  *      {@link #onBindOnNewForm(HttpServletRequest, Object, BindException)} callback method is
  *      called. <em>Note:</em> any defined Validators are not applied at this point, to allow
- *      partial binding. However be aware that any Binder customizations applied via 
+ *      partial binding. However be aware that any Binder customizations applied via
  *      initBinder() (such as
  *      {@link org.springframework.validation.DataBinder#setRequiredFields(String[])} will
  *      still apply. As such, if using bindOnNewForm=true and initBinder() customizations are
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
index 9082bbf993..47f3df7c86 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
@@ -37,7 +37,7 @@ import org.springframework.web.context.request.ServletWebRequest;
  * JavaBeans based on request parameters, validate the content of such
  * JavaBeans using {@link org.springframework.validation.Validator Validators}
  * and use custom editors (in the form of
- * {@link java.beans.PropertyEditor PropertyEditors}) to transform 
+ * {@link java.beans.PropertyEditor PropertyEditors}) to transform
  * objects into strings and vice versa, for example. Three notions are mentioned here:</p>
  *
  * <p><b>Command class:</b><br>
@@ -50,7 +50,7 @@ import org.springframework.web.context.request.ServletWebRequest;
  * Upon receiving a request, any BaseCommandController will attempt to fill the
  * command object using the request parameters. This is done using the typical
  * and well-known JavaBeans property notation. When a request parameter named
- * <code>'firstName'</code> exists, the framework will attempt to call 
+ * <code>'firstName'</code> exists, the framework will attempt to call
  * <code>setFirstName([value])</code> passing the value of the parameter. Nested properties
  * are of course supported. For instance a parameter named <code>'address.city'</code>
  * will result in a <code>getAddress().setCity([value])</code> call on the
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
index 68499f2945..657d5fb059 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
@@ -68,7 +68,7 @@ import org.springframework.web.servlet.support.RequestContextUtils;
  * @author Keith Donald
  */
 public class ParameterizableViewController extends AbstractController {
-	
+
 	private String viewName;
 
 
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 3ddaa4fb69..5322957ce5 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
@@ -90,7 +90,7 @@ public class ServletForwardingController extends AbstractController implements B
 	private String servletName;
 
 	private String beanName;
-	
+
 
 	/**
 	 * Set the name of the servlet to forward to,
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java
index 00d4f03035..faff41fb9f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java
@@ -26,7 +26,7 @@ import org.springframework.web.servlet.HandlerMapping;
 /**
  * Simple <code>Controller</code> implementation that transforms the virtual
  * path of a URL into a view name and returns that view.
- * 
+ *
  * <p>Can optionally prepend a {@link #setPrefix prefix} and/or append a
  * {@link #setSuffix suffix} to build the viewname from the URL filename.
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
index b6ebb6d717..dd050ca81c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
@@ -19,8 +19,8 @@ package org.springframework.web.servlet.mvc.condition;
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * Supports "name=value" style expressions as described in: 
- * {@link org.springframework.web.bind.annotation.RequestMapping#params()} and 
+ * Supports "name=value" style expressions as described in:
+ * {@link org.springframework.web.bind.annotation.RequestMapping#params()} and
  * {@link org.springframework.web.bind.annotation.RequestMapping#headers()}.
  *
  * @author Rossen Stoyanchev
@@ -48,7 +48,7 @@ abstract class AbstractNameValueExpression<T> implements NameValueExpression<T>
 			this.value = parseValue(expression.substring(separator + 1));
 		}
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
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 98385ae911..5328d5e799 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
@@ -20,21 +20,21 @@ import java.util.Collection;
 import java.util.Iterator;
 
 /**
- * A base class for {@link RequestCondition} types providing implementations of 
- * {@link #equals(Object)}, {@link #hashCode()}, and {@link #toString()}. 
- * 
+ * A base class for {@link RequestCondition} types providing implementations of
+ * {@link #equals(Object)}, {@link #hashCode()}, and {@link #toString()}.
+ *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
 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) {
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 ab005ad2bf..20b4ee8381 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
@@ -26,13 +26,13 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
- * A logical conjunction (' && ') request condition that matches a request against 
+ * A logical conjunction (' && ') request condition that matches a request against
  * a set of header expressions with syntax defined in {@link RequestMapping#headers()}.
- * 
- * <p>Expressions passed to the constructor with header names 'Accept' or 
+ *
+ * <p>Expressions passed to the constructor with header names 'Accept' or
  * 'Content-Type' are ignored. See {@link ConsumesRequestCondition} and
- * {@link ProducesRequestCondition} for those. 
- * 
+ * {@link ProducesRequestCondition} for those.
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  * @since 3.1
@@ -42,20 +42,20 @@ 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. 
+	 * 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.
 	 */
 	public HeadersRequestCondition(String... headers) {
 		this(parseExpressions(headers));
 	}
-	
+
 	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) {
@@ -76,7 +76,7 @@ public final class HeadersRequestCondition extends AbstractRequestCondition<Head
 	public Set<NameValueExpression<String>> getExpressions() {
 		return new LinkedHashSet<NameValueExpression<String>>(this.expressions);
 	}
-	
+
 	@Override
 	protected Collection<HeaderExpression> getContent() {
 		return this.expressions;
@@ -88,7 +88,7 @@ public final class HeadersRequestCondition extends AbstractRequestCondition<Head
 	}
 
 	/**
-	 * Returns a new instance with the union of the header expressions 
+	 * Returns a new instance with the union of the header expressions
 	 * from "this" and the "other" instance.
 	 */
 	public HeadersRequestCondition combine(HeadersRequestCondition other) {
@@ -96,9 +96,9 @@ public final class HeadersRequestCondition extends AbstractRequestCondition<Head
 		set.addAll(other.expressions);
 		return new HeadersRequestCondition(set);
 	}
-	
+
 	/**
-	 * Returns "this" instance if the request matches all expressions; 
+	 * Returns "this" instance if the request matches all expressions;
 	 * or {@code null} otherwise.
 	 */
 	public HeadersRequestCondition getMatchingCondition(HttpServletRequest request) {
@@ -116,10 +116,10 @@ public final class HeadersRequestCondition extends AbstractRequestCondition<Head
 	 * 	<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 
+	 * </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.
 	 */
 	public int compareTo(HeadersRequestCondition other, HttpServletRequest request) {
@@ -127,7 +127,7 @@ public final class HeadersRequestCondition extends AbstractRequestCondition<Head
 	}
 
 	/**
-	 * Parses and matches a single header expression to a request. 
+	 * Parses and matches a single header expression to a request.
 	 */
 	static class HeaderExpression extends AbstractNameValueExpression<String> {
 
@@ -157,5 +157,5 @@ public final class HeadersRequestCondition extends AbstractRequestCondition<Head
 			result = 31 * result + (isNegated ? 1 : 0);
 			return result;
 		}
-	}	
+	}
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java
index 660f59481a..9df8949dac 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java
@@ -20,13 +20,13 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
- * A contract for media type expressions (e.g. "text/plain", "!text/plain") as 
- * defined in the {@code @RequestMapping} annotation for "consumes" and 
+ * A contract for media type expressions (e.g. "text/plain", "!text/plain") as
+ * defined in the {@code @RequestMapping} annotation for "consumes" and
  * "produces" conditions.
  *
  * @author Rossen Stoyanchev
  * @since 3.1
- * 
+ *
  * @see RequestMapping#consumes()
  * @see RequestMapping#produces()
  */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java
index 670aae0ee9..83a01ea56a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java
@@ -20,12 +20,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 
 /**
- * A contract for {@code "name!=value"} style expression used to specify request 
+ * A contract for {@code "name!=value"} style expression used to specify request
  * parameters and request header conditions in {@code @RequestMapping}.
  *
  * @author Rossen Stoyanchev
  * @since 3.1
- * 
+ *
  * @see RequestMapping#params()
  * @see RequestMapping#headers()
  */
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 c4c199133d..66d6e51009 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
@@ -27,9 +27,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.util.WebUtils;
 
 /**
- * A logical conjunction (' && ') request condition that matches a request against 
- * a set parameter expressions with syntax defined in {@link RequestMapping#params()}. 
- * 
+ * A logical conjunction (' && ') request condition that matches a request against
+ * a set parameter expressions with syntax defined in {@link RequestMapping#params()}.
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  * @since 3.1
@@ -37,16 +37,16 @@ import org.springframework.web.util.WebUtils;
 public final class ParamsRequestCondition extends AbstractRequestCondition<ParamsRequestCondition> {
 
 	private final Set<ParamExpression> expressions;
-	
+
 	/**
-	 * Create a new instance from the given param expressions. 
-	 * @param params expressions with syntax defined in {@link RequestMapping#params()}; 
+	 * Create a new instance from the given param expressions.
+	 * @param params expressions with syntax defined in {@link RequestMapping#params()};
 	 * 	if 0, the condition will match to every request.
 	 */
 	public ParamsRequestCondition(String... params) {
 		this(parseExpressions(params));
 	}
-	
+
 	private ParamsRequestCondition(Collection<ParamExpression> conditions) {
 		this.expressions = Collections.unmodifiableSet(new LinkedHashSet<ParamExpression>(conditions));
 	}
@@ -79,7 +79,7 @@ public final class ParamsRequestCondition extends AbstractRequestCondition<Param
 	}
 
 	/**
-	 * Returns a new instance with the union of the param expressions 
+	 * Returns a new instance with the union of the param expressions
 	 * from "this" and the "other" instance.
 	 */
 	public ParamsRequestCondition combine(ParamsRequestCondition other) {
@@ -89,7 +89,7 @@ public final class ParamsRequestCondition extends AbstractRequestCondition<Param
 	}
 
 	/**
-	 * Returns "this" instance if the request matches all param expressions; 
+	 * Returns "this" instance if the request matches all param expressions;
 	 * or {@code null} otherwise.
 	 */
 	public ParamsRequestCondition getMatchingCondition(HttpServletRequest request) {
@@ -107,10 +107,10 @@ public final class ParamsRequestCondition extends AbstractRequestCondition<Param
 	 * 	<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 
+	 * </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) {
@@ -118,7 +118,7 @@ public final class ParamsRequestCondition extends AbstractRequestCondition<Param
 	}
 
 	/**
-	 * Parses and matches a single param expression to a request. 
+	 * Parses and matches a single param expression to a request.
 	 */
 	static class ParamExpression extends AbstractNameValueExpression<String> {
 
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 fd99e6ffce..d4c69a9360 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
@@ -67,5 +67,5 @@ public interface RequestCondition<T> {
 	 * to ensure they have content relevant to current request only.
 	 */
 	int compareTo(T other, HttpServletRequest request);
-	
+
 }
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 653628ceaa..b6028a667e 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
@@ -26,7 +26,7 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.support.WebContentGenerator;
 
 /**
- * Abstract base class for {@link HandlerAdapter} implementations that support 
+ * Abstract base class for {@link HandlerAdapter} implementations that support
  * handlers of type {@link HandlerMethod}.
  *
  * @author Arjen Poutsma
@@ -53,7 +53,7 @@ public abstract class AbstractHandlerMethodAdapter extends WebContentGenerator i
 	public int getOrder() {
 		return this.order;
 	}
-	
+
 	/**
 	 * {@inheritDoc} <p>This implementation expects the handler to be an {@link HandlerMethod}.
 	 *
@@ -85,9 +85,9 @@ public abstract class AbstractHandlerMethodAdapter extends WebContentGenerator i
 	 *
 	 * @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 
+	 * @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 
+	 * @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
 	 */
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 26ffe93579..765ed74a64 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
@@ -38,7 +38,7 @@ import org.springframework.web.servlet.mvc.condition.RequestMethodsRequestCondit
  * 	<li>{@link ProducesRequestCondition}
  * 	<li>{@code RequestCondition<?>} (optional, custom request condition)
  * </ol>
- * 
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  * @since 3.1
@@ -56,7 +56,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 	private final ConsumesRequestCondition consumesCondition;
 
 	private final ProducesRequestCondition producesCondition;
-	
+
 	private final RequestConditionHolder customConditionHolder;
 
 	private int hash;
@@ -65,9 +65,9 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 	 * Creates a new instance with the given request conditions.
 	 */
 	public RequestMappingInfo(PatternsRequestCondition patterns,
-							  RequestMethodsRequestCondition methods, 
+							  RequestMethodsRequestCondition methods,
 							  ParamsRequestCondition params,
-							  HeadersRequestCondition headers, 
+							  HeadersRequestCondition headers,
 							  ConsumesRequestCondition consumes,
 							  ProducesRequestCondition produces,
 							  RequestCondition<?> custom) {
@@ -89,7 +89,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 	}
 
 	/**
-	 * Returns the URL patterns of this {@link RequestMappingInfo}; 
+	 * Returns the URL patterns of this {@link RequestMappingInfo};
 	 * or instance with 0 patterns, never {@code null}
 	 */
 	public PatternsRequestCondition getPatternsCondition() {
@@ -97,7 +97,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 	}
 
 	/**
-	 * Returns the HTTP request methods of this {@link RequestMappingInfo}; 
+	 * Returns the HTTP request methods of this {@link RequestMappingInfo};
 	 * or instance with 0 request methods, never {@code null}
 	 */
 	public RequestMethodsRequestCondition getMethodsCondition() {
@@ -161,9 +161,9 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 	}
 
 	/**
-	 * Checks if all conditions in this request mapping info match the provided request and returns 
-	 * a potentially new request mapping info with conditions tailored to the current request. 
-	 * <p>For example the returned instance may contain the subset of URL patterns that match to 
+	 * Checks if all conditions in this request mapping info match the provided request and returns
+	 * a potentially new request mapping info with conditions tailored to the current request.
+	 * <p>For example the returned instance may contain the subset of URL patterns that match to
 	 * the current request, sorted with best matching patterns on top.
 	 * @return a new instance in case all conditions match; or {@code null} otherwise
 	 */
@@ -173,27 +173,27 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 		HeadersRequestCondition headers = headersCondition.getMatchingCondition(request);
 		ConsumesRequestCondition consumes = consumesCondition.getMatchingCondition(request);
 		ProducesRequestCondition produces = producesCondition.getMatchingCondition(request);
-		
+
 		if (methods == null || params == null || headers == null || consumes == null || produces == null) {
 			return null;
 		}
-		
+
 		PatternsRequestCondition patterns = patternsCondition.getMatchingCondition(request);
 		if (patterns == null) {
 			return null;
 		}
-		
+
 		RequestConditionHolder custom = customConditionHolder.getMatchingCondition(request);
 		if (custom == null) {
 			return null;
 		}
-		
+
 		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 
+	 * 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
 	 * {@link #getMatchingCondition(HttpServletRequest)} to ensure they have conditions with
 	 * content relevant to current request.
 	 */
@@ -241,7 +241,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 					this.paramsCondition.equals(other.paramsCondition) &&
 					this.headersCondition.equals(other.headersCondition) &&
 					this.consumesCondition.equals(other.consumesCondition) &&
-					this.producesCondition.equals(other.producesCondition) && 
+					this.producesCondition.equals(other.producesCondition) &&
 					this.customConditionHolder.equals(other.customConditionHolder));
 		}
 		return false;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java
index d1ede55c57..a39649551a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java
@@ -52,9 +52,9 @@ import org.springframework.web.servlet.mvc.annotation.ModelAndViewResolver;
  * @since 3.1
  */
 public class ModelAndViewResolverMethodReturnValueHandler implements HandlerMethodReturnValueHandler {
-	
+
 	private final List<ModelAndViewResolver> mavResolvers;
-	
+
 	private final ModelAttributeMethodProcessor modelAttributeProcessor = new ModelAttributeMethodProcessor(true);
 
 	/**
@@ -94,7 +94,7 @@ public class ModelAndViewResolverMethodReturnValueHandler implements HandlerMeth
 		}
 
 		// No suitable ModelAndViewResolver..
-		
+
 		if (this.modelAttributeProcessor.supportsReturnType(returnType)) {
 			this.modelAttributeProcessor.handleReturnValue(returnValue, returnType, mavContainer, request);
 		}
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 cec0544ecf..315cf8f68e 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
@@ -58,7 +58,7 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
 
 	private final List<String> fileExtensions = new ArrayList<String>();
 
-	
+
 	/**
 	 * Whether to use suffix pattern match (".*") when matching patterns to
 	 * requests. If enabled a method mapped to "/users" also matches to "/users.*".
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java
index d2a64b7987..ee09382f23 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java
@@ -29,7 +29,7 @@ import org.springframework.web.util.WebUtils;
 /**
  * An {@link org.springframework.web.method.annotation.AbstractCookieValueMethodArgumentResolver} that resolves cookie
  * values from an {@link HttpServletRequest}.
- * 
+ *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
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 56c45e033b..3b54676ed3 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
@@ -80,7 +80,7 @@ public class ServletModelAttributeMethodProcessor extends ModelAttributeMethodPr
 
 		return super.createAttribute(attributeName, parameter, binderFactory, request);
 	}
-	
+
 	/**
 	 * Obtain a value from the request that may be used to instantiate the
 	 * model attribute through type conversion from String to the target type.
@@ -140,7 +140,7 @@ public class ServletModelAttributeMethodProcessor extends ModelAttributeMethodPr
 		}
 		return null;
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 * <p>Downcast {@link WebDataBinder} to {@link ServletRequestDataBinder} before binding.
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 a6e9f7f933..d0c3a02024 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
@@ -71,12 +71,12 @@ public class ServletRequestMethodArgumentResolver implements HandlerMethodArgume
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
 			throws IOException {
-		
+
 		Class<?> paramType = parameter.getParameterType();
 		if (WebRequest.class.isAssignableFrom(paramType)) {
 			return webRequest;
 		}
-		
+
 		HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
 		if (ServletRequest.class.isAssignableFrom(paramType) || MultipartRequest.class.isAssignableFrom(paramType)) {
 			Object nativeRequest = webRequest.getNativeRequest(paramType);
@@ -107,5 +107,5 @@ public class ServletRequestMethodArgumentResolver implements HandlerMethodArgume
 			throw new UnsupportedOperationException("Unknown parameter type: " + paramType + " in method: " + method);
 		}
 	}
-	
+
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java
index f1eaa6607d..14c216258f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java
@@ -89,5 +89,5 @@ public class ServletResponseMethodArgumentResolver implements HandlerMethodArgum
 			throw new UnsupportedOperationException("Unknown parameter type: " + paramType + " in method: " + method);
 		}
 	}
-	
+
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java
index b19d0f362a..54a4e2265e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java
@@ -27,12 +27,12 @@ import org.springframework.web.method.annotation.AbstractWebArgumentResolverAdap
 /**
  * A Servlet-specific {@link org.springframework.web.method.annotation.AbstractWebArgumentResolverAdapter} that creates a
  * {@link NativeWebRequest} from {@link ServletRequestAttributes}.
- * 
+ *
  * <p><strong>Note:</strong> This class is provided for backwards compatibility.
- * However it is recommended to re-write a {@code WebArgumentResolver} as 
- * {@code HandlerMethodArgumentResolver}. For more details see javadoc of 
+ * However it is recommended to re-write a {@code WebArgumentResolver} as
+ * {@code HandlerMethodArgumentResolver}. For more details see javadoc of
  * {@link org.springframework.web.method.annotation.AbstractWebArgumentResolverAdapter}.
- * 
+ *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java
index d073b32073..53740ed959 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletRequest;
  * @see MultiActionController#setMethodNameResolver
  */
 public interface MethodNameResolver {
-	
+
 	/**
 	 * Return a method name that can handle this request. Such
 	 * mappings are typically, but not necessarily, based on URL.
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 81f6222356..003ab61ef8 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
@@ -30,12 +30,12 @@ import org.springframework.web.util.WebUtils;
 /**
  * Implementation of {@link MethodNameResolver} which supports several strategies
  * for mapping parameter values to the names of methods to invoke.
- * 
+ *
  * <p>The simplest strategy looks for a specific named parameter, whose value is
  * considered the name of the method to invoke. The name of the parameter may be
  * specified as a JavaBean property, if the default <code>action</code> is not
  * acceptable.
- * 
+ *
  * <p>The alternative strategy uses the very existence of a request parameter (
  * i.e. a request parameter with a certain name is found) as an indication that a
  * method with the same name should be dispatched to. In this case, the actual
@@ -47,18 +47,18 @@ import org.springframework.web.util.WebUtils;
  * button should be set to the mapped method name, while the 'value' attribute
  * is normally displayed as the button label by the browser, and will be
  * ignored by the resolver.
- * 
+ *
  * <p>Note that the second strategy also supports the use of submit buttons of
  * type 'image'. That is, an image submit button named 'reset' will normally be
  * submitted by the browser as two request paramters called 'reset.x', and
- * 'reset.y'. When checking for the existence of a paramter from the 
+ * 'reset.y'. When checking for the existence of a paramter from the
  * <code>methodParamNames</code> list, to indicate that a specific method should
  * be called, the code will look for request parameter in the "reset" form
  * (exactly as spcified in the list), and in the "reset.x" form ('.x' appended to
  * the name in the list). In this way it can handle both normal and image submit
  * buttons. The actual method name resolved if there is a match will always be
- * the bare form without the ".x". 
- * 
+ * the bare form without the ".x".
+ *
  * <p><b>Note:</b> If both strategies are configured, i.e. both "paramName"
  * and "methodParamNames" are specified, then both will be checked for any given
  * request. A match for an explicit request parameter in the "methodParamNames"
@@ -66,7 +66,7 @@ import org.springframework.web.util.WebUtils;
  *
  * <p>For use with either strategy, the name of a default handler method to use
  * when there is no match, can be specified as a JavaBean property.
- * 
+ *
  * <p>For both resolution strategies, the method name is of course coming from
  * some sort of view code, (such as a JSP page). While this may be acceptable,
  * it is sometimes desireable to treat this only as a 'logical' method name,
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
index 62759f96e6..96bdac9c30 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
@@ -48,7 +48,7 @@ import org.springframework.util.PathMatcher;
  */
 public class PropertiesMethodNameResolver extends AbstractUrlMethodNameResolver
 		implements InitializingBean {
-	
+
 	private Properties mappings;
 
 	private PathMatcher pathMatcher = new AntPathMatcher();
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 d84339fd05..320384a29f 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
@@ -5,18 +5,18 @@
  * at <i>method</i> rather than <i>class</i> level. This is useful when
  * we want to avoid having many trivial controller classes, as can
  * easily happen when using an MVC framework.
- * 
+ *
  * <p>Typically a controller that handles multiple request types will
  * extend MultiActionController, and implement multiple request handling
  * methods that will be invoked by reflection if they follow this class'
  * 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> 
+ *
+ * <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.
  *
  */
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 d6b21ffa38..3f8948780b 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
@@ -6,7 +6,7 @@
  *     with Spring. Provides both abstract base classes and concrete implementations
  *     for often seen use cases.
  * </p>
- * 
+ *
  * <p>
  *     A <code>Controller</code> - as defined in this package - is analogous to a Struts
  *     <code>Action</code>. Usually <code>Controllers</code> are JavaBeans
@@ -18,7 +18,7 @@
  *     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
@@ -29,7 +29,7 @@
  *     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:
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
index 4e2d8d5acf..daeaa970c5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
@@ -24,17 +24,17 @@ import org.springframework.web.servlet.FlashMap;
 
 /**
  * A specialization of the {@link Model} interface that controllers can use to
- * select attributes for a redirect scenario. Since the intent of adding 
- * redirect attributes is very explicit --  i.e. to be used for a redirect URL, 
- * attribute values may be formatted as Strings and stored that way to make 
- * them eligible to be appended to the query string or expanded as URI 
+ * select attributes for a redirect scenario. Since the intent of adding
+ * redirect attributes is very explicit --  i.e. to be used for a redirect URL,
+ * attribute values may be formatted as Strings and stored that way to make
+ * them eligible to be appended to the query string or expanded as URI
  * variables in {@code org.springframework.web.servlet.view.RedirectView}.
- * 
- * <p>This interface also provides a way to add flash attributes. For a 
- * general overview of flash attributes see {@link FlashMap}. You can use 
- * {@link RedirectAttributes} to store flash attributes and they will be 
- * automatically propagated to the "output" FlashMap of the current request. 
- * 
+ *
+ * <p>This interface also provides a way to add flash attributes. For a
+ * general overview of flash attributes see {@link FlashMap}. You can use
+ * {@link RedirectAttributes} to store flash attributes and they will be
+ * automatically propagated to the "output" FlashMap of the current request.
+ *
  * <p>Example usage in an {@code @Controller}:
  * <pre>
  * &#064;RequestMapping(value = "/accounts", method = RequestMethod.POST)
@@ -47,13 +47,13 @@ import org.springframework.web.servlet.FlashMap;
  *   return "redirect:/accounts/{id}";
  * }
  * </pre>
- * 
+ *
  * <p>A RedirectAttributes model is empty when the method is called and is never
  * used unless the method returns a redirect view name or a RedirectView.
- * 
+ *
  * <p>After the redirect, flash attributes are automatically added to the model
  * of the controller that serves the target URL.
- * 
+ *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
@@ -64,11 +64,11 @@ public interface RedirectAttributes extends Model {
 	RedirectAttributes addAttribute(Object attributeValue);
 
 	RedirectAttributes addAllAttributes(Collection<?> attributeValues);
-	
+
 	RedirectAttributes mergeAttributes(Map<String, ?> attributes);
 
 	/**
-	 * Add the given flash attribute. 
+	 * Add the given flash attribute.
 	 * @param attributeName the attribute name; never {@code null}
 	 * @param attributeValue the attribute value; may be {@code null}
 	 */
@@ -76,7 +76,7 @@ public interface RedirectAttributes extends Model {
 
 	/**
 	 * Add the given flash storage using a
-	 * {@link org.springframework.core.Conventions#getVariableName generated name}. 
+	 * {@link org.springframework.core.Conventions#getVariableName generated name}.
 	 * @param attributeValue the flash attribute value; never {@code null}
 	 */
 	RedirectAttributes addFlashAttribute(Object attributeValue);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java
index 7b28b729b6..27c0e25bbc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java
@@ -24,10 +24,10 @@ import org.springframework.validation.DataBinder;
 
 /**
  * A {@link ModelMap} implementation of {@link RedirectAttributes} that formats
- * values as Strings using a {@link DataBinder}. Also provides a place to store 
- * flash attributes so they can survive a redirect without the need to be 
+ * values as Strings using a {@link DataBinder}. Also provides a place to store
+ * flash attributes so they can survive a redirect without the need to be
  * embedded in the redirect URL.
- * 
+ *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
@@ -45,9 +45,9 @@ public class RedirectAttributesModelMap extends ModelMap implements RedirectAttr
 	public RedirectAttributesModelMap(DataBinder dataBinder) {
 		this.dataBinder = dataBinder;
 	}
-	
+
 	/**
-	 * Default constructor without a DataBinder. 
+	 * Default constructor without a DataBinder.
 	 * Attribute values are converted to String via {@link #toString()}.
 	 */
 	public RedirectAttributesModelMap() {
@@ -153,7 +153,7 @@ public class RedirectAttributesModelMap extends ModelMap implements RedirectAttr
 		this.flashAttributes.addAttribute(attributeName, attributeValue);
 		return this;
 	}
-	
+
 	public RedirectAttributes addFlashAttribute(Object attributeValue) {
 		this.flashAttributes.addAttribute(attributeValue);
 		return this;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
index 3913b20d49..117cbb726e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/package-info.java
@@ -4,7 +4,7 @@
  * Provides servlets that integrate with the application context
  * infrastructure, and the core interfaces and classes for the
  * Spring web MVC framework.
- * 
+ *
  * <p>This package and related packages are discussed in Chapters 12 and 13 of
  * <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543857/">Expert One-On-One J2EE Design and Development</a>
  * by Rod Johnson (Wrox, 2002).
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 8de2078052..9d10b61b26 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
@@ -231,7 +231,7 @@ public class RequestContext {
 			// Ignored
 		}
 	}
-	
+
 	/**
 	 * Determine the fallback locale for this context. <p>The default implementation checks for a JSTL locale attribute
 	 * in request, session or application scope; if not found, returns the <code>HttpServletRequest.getLocale()</code>.
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 8c284e37ed..87be6bcedb 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
@@ -158,9 +158,9 @@ public abstract class RequestContextUtils {
 
 	/**
 	 * Return a read-only {@link Map} with "input" flash attributes saved on a
-	 * previous request. 
+	 * previous request.
 	 * @param request the current request
-	 * @return a read-only Map, or {@code null} 
+	 * @return a read-only Map, or {@code null}
 	 * @see FlashMap
 	 */
 	@SuppressWarnings("unchecked")
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
index 82bd0398f5..a8ca8ca256 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
@@ -22,17 +22,17 @@ import javax.servlet.http.HttpServletRequest;
 
 /**
  * A contract for inspecting and potentially modifying request data values such
- * as URL query parameters or form field values before they are rendered by a 
+ * as URL query parameters or form field values before they are rendered by a
  * view or before a redirect.
- * 
- * <p>Implementations may use this contract for example as part of a solution 
- * to provide data integrity, confidentiality, protection against cross-site 
+ *
+ * <p>Implementations may use this contract for example as part of a solution
+ * to provide data integrity, confidentiality, protection against cross-site
  * request forgery (CSRF), and others or for other tasks such as automatically
  * adding a hidden field to all forms and URLs.
- * 
+ *
  * <p>View technologies that support this contract can obtain an instance to
  * delegate to via {@link RequestContext#getRequestDataValueProcessor()}.
- * 
+ *
  * @author Rossen Stoyanchev
  * @since 3.1
  */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/package-info.java
index 35f4258dd6..bea2cac64c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/package-info.java
@@ -3,7 +3,7 @@
  *
  * Support classes for Spring's web MVC framework.
  * Provides easy evaluation of the request context in views,
- * and miscellaneous HandlerInterceptor implementations.  
+ * and miscellaneous HandlerInterceptor implementations.
  *
  */
 package org.springframework.web.servlet.support;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
index 2d3e74b524..4c45550689 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
@@ -147,7 +147,7 @@ public class EvalTag extends HtmlEscapingAwareTag {
 		}
 		return context;
 	}
-	
+
 	private ConversionService getConversionService(PageContext pageContext) {
 		return (ConversionService) pageContext.getRequest().getAttribute(ConversionService.class.getName());
 	}
@@ -188,7 +188,7 @@ public class EvalTag extends HtmlEscapingAwareTag {
 		public void write(EvaluationContext context, Object target, String name, Object newValue) {
 			throw new UnsupportedOperationException();
 		}
-		
+
 		private Object resolveImplicitVariable(String name) throws AccessException {
 			if (this.variableResolver == null) {
 				return null;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
index b7dfb13d81..9107a16d0b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
index 3ad7054190..ae093bc04c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
@@ -68,9 +68,9 @@ public class MessageTag extends HtmlEscapingAwareTag {
 	private String argumentSeparator = DEFAULT_ARGUMENT_SEPARATOR;
 
 	private String text;
-	
+
 	private String var;
-	
+
 	private String scope = TagUtils.SCOPE_PAGE;
 
 	private boolean javaScriptEscape = false;
@@ -118,7 +118,7 @@ public class MessageTag extends HtmlEscapingAwareTag {
 	public void setText(String text) {
 		this.text = text;
 	}
-	
+
 	/**
 	 * Set PageContext attribute name under which to expose
 	 * a variable that contains the resolved message.
@@ -128,7 +128,7 @@ public class MessageTag extends HtmlEscapingAwareTag {
 	public void setVar(String var) {
 		this.var = var;
 	}
-	
+
 	/**
 	 * Set the scope to export the variable to.
 	 * Default is SCOPE_PAGE ("page").
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java
index 0dfa4b24bf..d37d05a9eb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2008 the original author 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.
@@ -19,10 +19,10 @@ package org.springframework.web.servlet.tags;
 /**
  * Bean used to pass name-value pair parameters from a {@link ParamTag} to a
  * {@link ParamAware} tag.
- * 
- * <p>Attributes are the raw values passed to the spring:param tag and have not 
- * been encoded or escaped. 
- * 
+ *
+ * <p>Attributes are the raw values passed to the spring:param tag and have not
+ * been encoded or escaped.
+ *
  * @author Scott Andrews
  * @since 3.0
  * @see ParamTag
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
index 3d08507401..b502de7fe3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2008 the original author 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.
@@ -22,9 +22,9 @@ import javax.servlet.jsp.tagext.BodyTagSupport;
 /**
  * JSP tag for collecting name-value parameters and passing them to a
  * {@link ParamAware} ancestor in the tag hierarchy.
- * 
+ *
  * <p>This tag must be nested under a param aware tag.
- * 
+ *
  * @author Scott Andrews
  * @since 3.0
  * @see Param
@@ -69,10 +69,10 @@ public class ParamTag extends BodyTagSupport {
 
 	/**
 	 * Sets the name of the parameter
-	 * 
+	 *
 	 * <p>
 	 * Required
-	 * 
+	 *
 	 * @param name the parameter name
 	 */
 	public void setName(String name) {
@@ -81,10 +81,10 @@ public class ParamTag extends BodyTagSupport {
 
 	/**
 	 * Sets the value of the parameter
-	 * 
+	 *
 	 * <p>
 	 * Optional. If not set, the tag's body content is evaluated
-	 * 
+	 *
 	 * @param value the parameter value
 	 */
 	public void setValue(String value) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
index 959d7f9532..21be4a4fd9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
@@ -29,7 +29,7 @@ import org.springframework.web.servlet.support.RequestContext;
 
 /**
  * Superclass for all tags that require a {@link RequestContext}.
- * 
+ *
  * <p>The <code>RequestContext</code> instance provides easy access
  * to current state like the
  * {@link org.springframework.web.context.WebApplicationContext},
@@ -54,7 +54,7 @@ public abstract class RequestContextAwareTag extends TagSupport implements TryCa
 	public static final String REQUEST_CONTEXT_PAGE_ATTRIBUTE =
 			"org.springframework.web.servlet.tags.REQUEST_CONTEXT";
 
-	
+
 	/** Logger available to subclasses */
 	protected final Log logger = LogFactory.getLog(getClass());
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
index 034339c14e..18c58d91a6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
@@ -40,37 +40,37 @@ import org.springframework.web.util.UriUtils;
 /**
  * JSP tag for creating URLs. Modeled after the JSTL c:url tag with backwards
  * compatibility in mind.
- * 
+ *
  * <p>Enhancements to the JSTL functionality include:
  * <ul>
  * <li>URL encoded template URI variables</li>
  * <li>HTML/XML escaping of URLs</li>
  * <li>JavaScript escaping of URLs</li>
  * </ul>
- * 
+ *
  * <p>Template URI variables are indicated in the {@link #setValue(String) 'value'}
  * attribute and marked by braces '{variableName}'. The braces and attribute name are
- * replaced by the URL encoded value of a parameter defined with the spring:param tag 
- * in the body of the url tag. If no parameter is available the literal value is 
- * passed through. Params matched to template variables will not be added to the query 
+ * replaced by the URL encoded value of a parameter defined with the spring:param tag
+ * in the body of the url tag. If no parameter is available the literal value is
+ * passed through. Params matched to template variables will not be added to the query
  * string.
- * 
- * <p>Use of the spring:param tag for URI template variables is strongly recommended 
- * over direct EL substitution as the values are URL encoded.  Failure to properly 
+ *
+ * <p>Use of the spring:param tag for URI template variables is strongly recommended
+ * over direct EL substitution as the values are URL encoded.  Failure to properly
  * encode URL can leave an application vulnerable to XSS and other injection attacks.
- * 
- * <p>URLs can be HTML/XML escaped by setting the {@link #setHtmlEscape(String) 
- * 'htmlEscape'} attribute to 'true'.  Detects an HTML escaping setting, either on 
- * this tag instance, the page level, or the <code>web.xml</code> level. The default 
+ *
+ * <p>URLs can be HTML/XML escaped by setting the {@link #setHtmlEscape(String)
+ * 'htmlEscape'} attribute to 'true'.  Detects an HTML escaping setting, either on
+ * this tag instance, the page level, or the <code>web.xml</code> level. The default
  * is 'false'.  When setting the URL value into a variable, escaping is not recommended.
- * 
+ *
  * <p>Example usage:
  * <pre>&lt;spring:url value="/url/path/{variableName}"&gt;
  *   &lt;spring:param name="variableName" value="more than JSTL c:url" /&gt;
  * &lt;/spring:url&gt;</pre>
  * Results in:
  * <code>/currentApplicationContext/url/path/more%20than%20JSTL%20c%3Aurl</code>
- * 
+ *
  * @author Scott Andrews
  * @since 3.0
  * @see ParamTag
@@ -171,13 +171,13 @@ public class UrlTag extends HtmlEscapingAwareTag implements ParamAware {
 	@Override
 	public int doEndTag() throws JspException {
 		String url = createUrl();
-		
+
 		RequestDataValueProcessor processor = getRequestContext().getRequestDataValueProcessor();
 		ServletRequest request = this.pageContext.getRequest();
 		if ((processor != null) && (request instanceof HttpServletRequest)) {
 			url = processor.processUrl((HttpServletRequest) request, url);
 		}
-		
+
 		if (this.var == null) {
 			// print the url to the writer
 			try {
@@ -229,7 +229,7 @@ public class UrlTag extends HtmlEscapingAwareTag implements ParamAware {
 		// HTML and/or JavaScript escape, if demanded.
 		urlStr = isHtmlEscape() ? HtmlUtils.htmlEscape(urlStr) : urlStr;
 		urlStr = this.javaScriptEscape ? JavaScriptUtils.javaScriptEscape(urlStr) : urlStr;
-		
+
 		return urlStr;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
index ff1420f401..10a31b974d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
@@ -96,7 +96,7 @@ public abstract class AbstractCheckedElementTag extends AbstractHtmlInputElement
 	protected boolean isValidDynamicAttribute(String localName, Object value) {
 		return !"type".equals(localName);
 	}
-	
+
 	/**
 	 * Return the type of the HTML input element to generate:
 	 * "checkbox" or "radio".
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
index bc098505a1..438fab4468 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
@@ -27,7 +27,7 @@ import org.springframework.util.StringUtils;
 /**
  * Convenient super class for many html tags that render content using the databinding
  * features of the {@link AbstractHtmlElementTag AbstractHtmlElementTag}. The only thing sub tags
- * need to do is override {@link #renderDefaultContent(TagWriter)}. 
+ * need to do is override {@link #renderDefaultContent(TagWriter)}.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
index 32b5f20653..b497d01067 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
@@ -29,13 +29,13 @@ import org.springframework.util.StringUtils;
 /**
  * Base class for databinding-aware JSP tags that render HTML element. Provides
  * a set of properties corresponding to the set of HTML attributes that are common
- * across elements.  
- * 
- * <p>Additionally, this base class allows for rendering non-standard attributes 
- * as part of the tag's output.  These attributes are accessible to subclasses if 
- * needed via the {@link AbstractHtmlElementTag#getDynamicAttributes() dynamicAttributes} 
+ * across elements.
+ *
+ * <p>Additionally, this base class allows for rendering non-standard attributes
+ * as part of the tag's output.  These attributes are accessible to subclasses if
+ * needed via the {@link AbstractHtmlElementTag#getDynamicAttributes() dynamicAttributes}
  * map.
- * 
+ *
  * @author Rob Harrop
  * @author Jeremy Grelle
  * @author Rossen Stoyanchev
@@ -109,7 +109,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	private String onkeyup;
 
 	private String onkeydown;
-	
+
 	private Map<String, Object> dynamicAttributes;
 
 
@@ -383,14 +383,14 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	protected String getOnkeydown() {
 		return this.onkeydown;
 	}
-	
+
 	/**
-	 * Get the map of dynamic attributes. 
+	 * Get the map of dynamic attributes.
 	 */
 	protected Map<String, Object> getDynamicAttributes() {
 		return this.dynamicAttributes;
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -404,7 +404,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 		}
 		dynamicAttributes.put(localName, value);
 	}
-	
+
 	/**
 	 * Whether the given name-value pair is a valid dynamic attribute.
 	 */
@@ -445,7 +445,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 		writeOptionalAttribute(tagWriter, ONKEYPRESS_ATTRIBUTE, getOnkeypress());
 		writeOptionalAttribute(tagWriter, ONKEYUP_ATTRIBUTE, getOnkeyup());
 		writeOptionalAttribute(tagWriter, ONKEYDOWN_ATTRIBUTE, getOnkeydown());
-		
+
 		if (!CollectionUtils.isEmpty(this.dynamicAttributes)) {
 			for (String attr : this.dynamicAttributes.keySet()) {
 				tagWriter.writeOptionalAttributeValue(attr, getDisplayString(this.dynamicAttributes.get(attr)));
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
index c5a3d549ae..4d9ca3fb01 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
@@ -162,7 +162,7 @@ public abstract class AbstractHtmlInputElementTag extends AbstractHtmlElementTag
 	/**
 	 * Gets the value of the '<code>readonly</code>' attribute.
 	 * May be a runtime expression.
-	 * @see #isReadonly() 
+	 * @see #isReadonly()
 	 */
 	protected String getReadonly() {
 		return this.readonly;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
index 6cf8af1571..2aec3de705 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
@@ -199,7 +199,7 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem
 		if (itemsObject == null && boundType != null && boundType.isEnum()) {
 			itemsObject = boundType.getEnumConstants();
 		}
-		
+
 		if (itemsObject == null) {
 			throw new IllegalArgumentException("Attribute 'items' is required and must be a Collection, an Array or a Map");
 		}
@@ -241,10 +241,10 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem
 		Object renderValue;
 		if (valueProperty != null) {
 			renderValue = wrapper.getPropertyValue(valueProperty);
-		} 
+		}
 		else if (item instanceof Enum) {
 			renderValue = ((Enum<?>) item).name();
-		} 
+		}
 		else {
 			renderValue = item;
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
index e96b1eecba..22a3971cb9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
@@ -21,7 +21,7 @@ import javax.servlet.jsp.JspException;
 import org.springframework.web.servlet.support.RequestDataValueProcessor;
 
 /**
- * An HTML button tag. This tag is provided for completeness if the application 
+ * An HTML button tag. This tag is provided for completeness if the application
  * relies on a {@link RequestDataValueProcessor}.
  *
  * @author Rossen Stoyanchev
@@ -38,7 +38,7 @@ public class ButtonTag extends AbstractHtmlElementTag {
 	private TagWriter tagWriter;
 
 	private String name;
-	
+
 	private String value;
 
 	private String disabled;
@@ -63,21 +63,21 @@ public class ButtonTag extends AbstractHtmlElementTag {
 	public String getValue() {
 		return this.value;
 	}
-	
+
 	/**
 	 * Set the value of the '<code>value</code>' attribute.
 	 */
 	public void setValue(String value) {
 		this.value = value;
 	}
-	
+
 	/**
 	 * Get the value of the '<code>disabled</code>' attribute.
 	 */
 	public String getDisabled() {
 		return this.disabled;
 	}
-	
+
 	/**
 	 * Set the value of the '<code>disabled</code>' attribute.
 	 * May be a runtime expression.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
index 1afec35d8a..70ccd7d347 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
@@ -48,7 +48,7 @@ public class HiddenInputTag extends AbstractHtmlElementTag {
 	public String getDisabled() {
 		return this.disabled;
 	}
-	
+
 	/**
 	 * Set the value of the '<code>disabled</code>' attribute.
 	 * May be a runtime expression.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
index 258da68648..0306aac636 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
@@ -21,7 +21,7 @@ import javax.servlet.jsp.JspException;
 /**
  * Data-binding-aware JSP tag for rendering an HTML '<code>input</code>'
  * element with a '<code>type</code>' of '<code>text</code>'.
- * 
+ *
  * @author Rob Harrop
  * @author Juergen Hoeller
  * @author Rossen Stoyanchev
@@ -172,7 +172,7 @@ public class InputTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Flags {@code type="checkbox"} and {@code type="radio"} as illegal 
+	 * Flags {@code type="checkbox"} and {@code type="radio"} as illegal
 	 * dynamic attributes.
 	 */
 	@Override
@@ -184,7 +184,7 @@ public class InputTag extends AbstractHtmlInputElementTag {
 		}
 		return true;
 	}
-	
+
 	/**
 	 * Get the value of the '<code>type</code>' attribute. Subclasses
 	 * can override this to change the type of '<code>input</code>' element
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 b2237cad90..2dcf87a747 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
@@ -62,7 +62,7 @@ public class LabelTag extends AbstractHtmlElementTag {
 	/**
 	 * Set the value of the '<code>for</code>' attribute.
 	 * <p>Defaults to the value of {@link #getPath}; may be a runtime expression.
-	 * @throws IllegalArgumentException if the supplied value is <code>null</code> 
+	 * @throws IllegalArgumentException if the supplied value is <code>null</code>
 	 */
 	public void setFor(String forId) {
 		Assert.notNull(forId, "'forId' must not be null");
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
index 0fa3de81d9..57d2d75cef 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
@@ -26,9 +26,9 @@ import org.springframework.web.util.TagUtils;
 
 /**
  * JSP tag for rendering an HTML '<code>option</code>' tag.
- * 
+ *
  * <p><b>Must be used nested inside a {@link SelectTag}.</b>
- * 
+ *
  * <p>Provides full support for databinding by marking an
  * '<code>option</code>' as 'selected' if the {@link #setValue value}
  * matches the value bound to the out {@link SelectTag}.
@@ -67,7 +67,7 @@ public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	 * The name of the '<code>value</code>' attribute.
 	 */
 	private static final String VALUE_ATTRIBUTE = VALUE_VARIABLE_NAME;
-	
+
 	/**
 	 * The name of the '<code>disabled</code>' attribute.
 	 */
@@ -87,7 +87,7 @@ public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	private Object oldValue;
 
 	private Object oldDisplayValue;
-	
+
 	private String disabled;
 
 
@@ -105,7 +105,7 @@ public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	protected Object getValue() {
 		return this.value;
 	}
-	
+
 	/**
 	 * Set the value of the '<code>disabled</code>' attribute.
 	 * <p>May be a runtime expression.
@@ -121,10 +121,10 @@ public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	protected String getDisabled() {
 		return this.disabled;
 	}
-	
+
 	/**
 	 * Is the current HTML tag disabled?
-	 * @return <code>true</code> if this tag is disabled 
+	 * @return <code>true</code> if this tag is disabled
 	 */
 	protected boolean isDisabled() throws JspException {
 		return evaluateBoolean(DISABLED_ATTRIBUTE, getDisabled());
@@ -239,7 +239,7 @@ public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	private void assertUnderSelectTag() {
 		TagUtils.assertHasAncestorOfType(this, SelectTag.class, "option", "select");
 	}
-	
+
 	private SelectTag getSelectTag() {
 		return (SelectTag) findAncestorWithClass(this, SelectTag.class);
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
index 8fb4edbd5c..cc1cb878c1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
@@ -47,7 +47,7 @@ import org.springframework.web.servlet.support.RequestContext;
  * the <code>labelProperty</code>). These properties are then used when
  * rendering each element of the array/{@link Collection} as an '<code>option</code>'.
  * If either property name is omitted, the value of {@link Object#toString()} of
- * the corresponding array/{@link Collection} element is used instead.  However, 
+ * the corresponding array/{@link Collection} element is used instead.  However,
  * if the item is an enum, {@link Enum#name()} is used as the default value.
  * </p>
  * <h3>Using a {@link Map}:</h3>
@@ -228,7 +228,7 @@ class OptionWriter {
 
 		String valueDisplayString = getDisplayString(value);
 		String labelDisplayString = getDisplayString(label);
-		
+
 		valueDisplayString = processOptionValue(valueDisplayString);
 
 		// allows render values to handle some strange browser compat issues.
@@ -254,13 +254,13 @@ class OptionWriter {
 	}
 
 	/**
-	 * Process the option value before it is written. 
-	 * The default implementation simply returns the same value unchanged. 
+	 * Process the option value before it is written.
+	 * The default implementation simply returns the same value unchanged.
 	 */
 	protected String processOptionValue(String resolvedValue) {
 		return resolvedValue;
 	}
-	
+
 	/**
 	 * Determine whether the supplied values matched the selected value.
 	 * Delegates to {@link SelectedValueComparator#isSelected}.
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 bf145a9c9c..7c016a431c 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
@@ -29,16 +29,16 @@ import org.springframework.web.util.TagUtils;
  * Convenient tag that allows one to supply a collection of objects
  * that are to be rendered as '<code>option</code>' tags within a
  * '<code>select</code>' tag.
- * 
+ *
  * <p><i>Must</i> be used within a {@link SelectTag 'select' tag}.
- * 
+ *
  * @author Rob Harrop
  * @author Juergen Hoeller
  * @author Scott Andrews
  * @since 2.0
  */
 public class OptionsTag extends AbstractHtmlElementTag {
-	
+
 	/**
 	 * The {@link java.util.Collection}, {@link java.util.Map} or array of
 	 * objects used to generate the inner '<code>option</code>' tags.
@@ -200,8 +200,8 @@ public class OptionsTag extends AbstractHtmlElementTag {
 	 * Inner class that adapts OptionWriter for multiple options to be rendered.
 	 */
 	private class OptionsWriter extends OptionWriter {
-		
-		private final String selectName; 
+
+		private final String selectName;
 
 		public OptionsWriter(String selectName, Object optionSource, String valueProperty, String labelProperty) {
 			super(optionSource, getBindStatus(), valueProperty, labelProperty, isHtmlEscape());
@@ -223,7 +223,7 @@ public class OptionsTag extends AbstractHtmlElementTag {
 		protected String processOptionValue(String value) {
 			return processFieldValue(this.selectName, value, "option");
 		}
-		
+
 	}
 
 }
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
index e2014ed714..44c650ab10 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
@@ -27,7 +27,7 @@ import javax.servlet.jsp.JspException;
  *
  * <p>A typical usage pattern will involved multiple tag instances bound
  * to the same property but with different values.
- * 
+ *
  * @author Rob Harrop
  * @author Juergen Hoeller
  * @since 2.0
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
index aab847886d..446e6dcba2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
@@ -312,5 +312,5 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 		this.tagWriter = null;
 		this.pageContext.removeAttribute(LIST_VALUE_PAGE_ATTRIBUTE);
 	}
-	
+
 }
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 510c2f16a0..490a0f0a2c 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
@@ -32,14 +32,14 @@ import org.springframework.web.servlet.support.BindStatus;
  * inequality, logical (String-representation-based) equality and {@link PropertyEditor}-based comparison.
  *
  * <p>Full support is provided for comparing arrays, {@link Collection Collections} and {@link Map Maps}.
- * 
+ *
  * <p><h1><a name="equality-contract">Equality Contract</a></h1>
  * For single-valued objects equality is first tested using standard {@link Object#equals Java equality}. As
  * such, user code should endeavour to implement {@link Object#equals} to speed up the comparison process. If
  * {@link Object#equals} returns <code>false</code> then an attempt is made at an
  * {@link #exhaustiveCompare exhaustive comparison} with the aim being to <strong>prove</strong> equality rather
  * than disprove it.
- * 
+ *
  * <p>Special support is given for instances of {@link LabeledEnum} with a <code>String</code>-based
  * comparison of the candidate value against the code of the {@link LabeledEnum}. This can be useful when a
  * {@link LabeledEnum} is used to define a list of '<code>&lt;option&gt;</code>' elements in HTML.
@@ -47,7 +47,7 @@ import org.springframework.web.servlet.support.BindStatus;
  * <p>Next, an attempt is made to compare the <code>String</code> representations of both the candidate and bound
  * values. This may result in <code>true</code> in a number of cases due to the fact both values will be represented
  * as <code>Strings</code> when shown to the user.
- * 
+ *
  * <p>Next, if the candidate value is a <code>String</code>, an attempt is made to compare the bound value to
  * result of applying the corresponding {@link PropertyEditor} to the candidate. This comparison may be
  * executed twice, once against the direct <code>String</code> instances, and then against the <code>String</code>
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 7ff5301bd5..c01fde5f51 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,12 +1,12 @@
 /*
  * 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.
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 5de95d1ab1..b810a51f67 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,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java
index ffe608db91..a29b6a0304 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java
@@ -4,17 +4,17 @@
  * Theme support classes for Spring's web MVC framework.
  * Provides standard ThemeResolver implementations,
  * and a HandlerInterceptor for theme changes.
- * 
+ *
  * <p>
  * <ul>
- *   <li>If you don't provide a bean of one of these classes as <code>themeResolver</code>, 
+ *   <li>If you don't provide a bean of one of these classes as <code>themeResolver</code>,
  * a <code>FixedThemeResolver</code> will be provided with the default theme name 'theme'.</li>
- *   <li>If you use a defined <code>FixedThemeResolver</code>, you will able to use another theme 
+ *   <li>If you use a defined <code>FixedThemeResolver</code>, you will able to use another theme
  * name for default, but the users will stick on this theme.</li>
  *   <li>With a <code>CookieThemeResolver</code> or <code>SessionThemeResolver</code>, you can allow
  * the user to change his current theme.</li>
  *   <li>Generally, you will put in the themes resource bundles the paths of CSS files, images and HTML constructs.</li>
- *   <li>For retrieving themes data, you can either use the spring:theme tag in JSP or access via the 
+ *   <li>For retrieving themes data, you can either use the spring:theme tag in JSP or access via the
  * <code>RequestContext</code> for other view technologies.</li>
  *   <li>The <code>pagedlist</code> demo application uses themes</li>
  * </ul>
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
index 71706e8052..70498baa6a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
@@ -160,7 +160,7 @@ public abstract class AbstractCachingViewResolver extends WebApplicationObjectSu
 	 */
 	public void removeFromCache(String viewName, Locale locale) {
 		if (!isCache()) {
-			logger.warn("View caching is SWITCHED OFF -- removal not necessary");			
+			logger.warn("View caching is SWITCHED OFF -- removal not necessary");
 		}
 		else {
 			Object cacheKey = getCacheKey(viewName, locale);
@@ -173,7 +173,7 @@ public abstract class AbstractCachingViewResolver extends WebApplicationObjectSu
 				if (logger.isDebugEnabled()) {
 					logger.debug("No cached instance for view '" + cacheKey + "' was found");
 				}
-			} 
+			}
 			else {
 				if (logger.isDebugEnabled()) {
 					logger.debug("Cache for view " + cacheKey + " has been cleared");
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 14adcfa3ea..673dc6db44 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
@@ -54,13 +54,13 @@ import org.springframework.web.util.WebUtils;
 
 /**
  * <p>View that redirects to an absolute, context relative, or current request
- * relative URL. The URL may be a URI template in which case the URI template 
- * variables will be replaced with values available in the model. By default 
- * all primitive model attributes (or collections thereof) are exposed as HTTP 
- * query parameters (assuming they've not been used as URI template variables), 
- * but this behavior can be changed by overriding the 
+ * relative URL. The URL may be a URI template in which case the URI template
+ * variables will be replaced with values available in the model. By default
+ * all primitive model attributes (or collections thereof) are exposed as HTTP
+ * query parameters (assuming they've not been used as URI template variables),
+ * but this behavior can be changed by overriding the
  * {@link #isEligibleProperty(String, Object)} method.
- * 
+ *
  * <p>A URL for this view is supposed to be a HTTP redirect URL, i.e.
  * suitable for HttpServletResponse's <code>sendRedirect</code> method, which
  * is what actually does the redirect if the HTTP 1.0 flag is on, or via sending
@@ -262,7 +262,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 
 		String targetUrl = createTargetUrl(model, request);
 		targetUrl = updateTargetUrl(targetUrl, model, request, response);
-		
+
 		FlashMap flashMap = RequestContextUtils.getOutputFlashMap(request);
 		if (!CollectionUtils.isEmpty(flashMap)) {
 			UriComponents uriComponents = UriComponentsBuilder.fromUriString(targetUrl).build();
@@ -277,13 +277,13 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 	}
 
 	/**
-	 * Creates the target URL by checking if the redirect string is a URI template first, 
-	 * expanding it with the given model, and then optionally appending simple type model 
+	 * Creates the target URL by checking if the redirect string is a URI template first,
+	 * expanding it with the given model, and then optionally appending simple type model
 	 * attributes as query String parameters.
 	 */
 	protected final String createTargetUrl(Map<String, Object> model, HttpServletRequest request)
 			throws UnsupportedEncodingException {
-		
+
 		// Prepare target URL.
 		StringBuilder targetUrl = new StringBuilder();
 		if (this.contextRelative && getUrl().startsWith("/")) {
@@ -304,7 +304,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 			Map<String, String> variables = getCurrentRequestUriVariables(request);
 			targetUrl = replaceUriTemplateVariables(targetUrl.toString(), model, variables, enc);
 		}
-		
+
 		if (this.exposeModelAttributes) {
 			appendQueryProperties(targetUrl, model, enc);
 		}
@@ -313,9 +313,9 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 	}
 
 	/**
-	 * Replace URI template variables in the target URL with encoded model 
+	 * Replace URI template variables in the target URL with encoded model
 	 * attributes or URI variables from the current request. Model attributes
-	 * referenced in the URL are removed from the model. 
+	 * referenced in the URL are removed from the model.
 	 * @param targetUrl the redirect URL
 	 * @param model Map that contains model attributes
 	 * @param currentUriVariables current request URI variables to use
@@ -325,7 +325,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 	protected StringBuilder replaceUriTemplateVariables(
 			String targetUrl, Map<String, Object> model, Map<String, String> currentUriVariables, String encodingScheme)
 			throws UnsupportedEncodingException {
-		
+
 		StringBuilder result = new StringBuilder();
 		Matcher m = URI_TEMPLATE_VARIABLE_PATTERN.matcher(targetUrl);
 		int endLastMatch = 0;
@@ -343,11 +343,11 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 
 	@SuppressWarnings("unchecked")
 	private Map<String, String> getCurrentRequestUriVariables(HttpServletRequest request) {
-		Map<String, String> uriVars = 
+		Map<String, String> uriVars =
 			(Map<String, String>) request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
 		return (uriVars != null) ? uriVars : Collections.<String, String> emptyMap();
 	}
-	
+
 	/**
 	 * Append query properties to the redirect URL.
 	 * Stringifies, URL-encodes and formats model attributes as query properties.
@@ -503,9 +503,9 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 	 * it to update the redirect target URL.
 	 * @return the updated URL or the same as URL as the one passed in
 	 */
-	protected String updateTargetUrl(String targetUrl, Map<String, Object> model, 
+	protected String updateTargetUrl(String targetUrl, Map<String, Object> model,
 								  HttpServletRequest request, HttpServletResponse response) {
-		
+
 		RequestContext requestContext = null;
 		if (getWebApplicationContext() != null) {
 			requestContext = createRequestContext(request, response, model);
@@ -523,10 +523,10 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 				targetUrl = processor.processUrl(request, targetUrl);
 			}
 		}
-		
+
 		return targetUrl;
 	}
-	
+
 	/**
 	 * Send a redirect back to the HTTP client
 	 * @param request current HTTP request (allows for reacting to request method)
@@ -540,7 +540,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 			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 93959d2ded..ff5315a4a3 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
@@ -36,10 +36,10 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
 import org.springframework.web.servlet.View;
 
 /**
- * {@link org.springframework.web.servlet.ViewResolver} implementation 
+ * {@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".
  *
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 b9a6b6bf11..e150e4e3a7 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
@@ -341,13 +341,13 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements
 	/**
 	 * 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. 
+	 * 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> 
+	 * 		<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) {
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 2a920bc634..0050f40313 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
@@ -33,7 +33,7 @@ import org.springframework.web.servlet.view.AbstractView;
 
 /**
  * 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>.
@@ -43,19 +43,19 @@ import org.springframework.web.servlet.view.AbstractView;
  * <li>url (optional): The url of an existing Excel document to pick as a
  * starting point. It is done without localization part nor the .xls extension.
  * </ul>
- * 
+ *
  * <p>The file will be searched with locations in the following order:
  * <ul>
  * <li>[url]_[language]_[country].xls
  * <li>[url]_[language].xls
  * <li>[url].xls
  * </ul>
- * 
+ *
  * <p>For working with the workbook in the subclass, see <a
  * href="http://www.andykhan.com/jexcelapi/">Java Excel API site</a>
- * 
+ *
  * <p>As an example, you can try this snippet:
- * 
+ *
  * <pre class="code">
  * protected void buildExcelDocument(
  *      Map&lt;String, Object&gt; model, WritableWorkbook workbook,
@@ -64,15 +64,15 @@ import org.springframework.web.servlet.view.AbstractView;
  * 	 if (workbook.getNumberOfSheets() == 0) {
  * 	     workbook.createSheet(&quot;Spring&quot;, 0);
  *   }
- * 
+ *
  * 	 WritableSheet sheet = workbook.getSheet(&quot;Spring&quot;);
  * 	 Label label = new Label(0, 0, &quot;This is a nice label&quot;);
  * 	 sheet.addCell(label);
  * }</pre>
- * 
+ *
  * The use of this view is close to the AbstractExcelView class,
  * just using the JExcel API instead of the Apache POI API.
- * 
+ *
  * @author Bram Smeets
  * @author Alef Arendsen
  * @author Juergen Hoeller
@@ -120,7 +120,7 @@ public abstract class AbstractJExcelView extends AbstractView {
 	@Override
 	protected final void renderMergedOutputModel(
 			Map<String, Object> model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
+
 		// Set the content type and get the output stream.
 		response.setContentType(getContentType());
 		OutputStream out = response.getOutputStream();
@@ -129,7 +129,7 @@ public abstract class AbstractJExcelView extends AbstractView {
 		if (this.url != null) {
 			Workbook template = getTemplateSource(this.url, request);
 			workbook = Workbook.createWorkbook(out, template);
-		} 
+		}
 		else {
 			logger.debug("Creating Excel Workbook from scratch");
 			workbook = Workbook.createWorkbook(out);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
index 1f4fd24a9b..30416bdc0e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
@@ -28,7 +28,7 @@ import com.lowagie.text.PageSize;
 import com.lowagie.text.pdf.PdfWriter;
 
 import org.springframework.web.servlet.view.AbstractView;
- 
+
 /**
  * Abstract superclass for PDF views, using Bruno Lowagie's
  * <a href="http://www.lowagie.com/iText">iText</a> package.
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 c24fc71cf1..7fc3a86d3e 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
@@ -28,7 +28,7 @@ import org.springframework.web.servlet.view.UrlBasedViewResolver;
  * {@link org.springframework.web.servlet.ViewResolver} implementation that
  * resolves instances of {@link AbstractJasperReportsView} by translating
  * the supplied view name into the URL of the report file.
- * 
+ *
  * @author Rob Harrop
  * @since 1.2.6
  */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/package-info.java
index d71ad9134f..c6250f65df 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/package-info.java
@@ -3,7 +3,7 @@
  *
  * Provides standard View and ViewResolver implementations,
  * including abstract base classes for custom implementations.
- * 
+ *
  * <p>Application developers don't usually need to implement views,
  * as the framework provides standard views for JSPs, Velocity,
  * XSLT, etc. However, the ability to implement custom views easily
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java
index dd767b5a4a..f8b7c47592 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -28,7 +28,7 @@ import org.apache.velocity.app.VelocityEngine;
  * @see VelocityView
  */
 public interface VelocityConfig {
-	
+
 	/**
 	 * Return the VelocityEngine for the current web application context.
 	 * May be unique to one servlet, or shared in the root context.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java
index f1937dea7f..5d23e33959 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java
@@ -51,7 +51,7 @@ import org.springframework.web.util.NestedServletException;
 
 /**
  * Convenient superclass for views rendered using an XSLT stylesheet.
- * 
+ *
  * <p>Subclasses typically must provide the {@link Source} to transform
  * by overriding {@link #createXsltSource}. Subclasses do not need to
  * concern themselves with XSLT other than providing a valid stylesheet location.
@@ -67,7 +67,7 @@ import org.springframework.web.util.NestedServletException;
  * the {@link ErrorListener} implementation instance for custom handling of warnings and errors during TransformerFactory operations
  * <li>{@link #setIndent(boolean) indent} (optional): whether additional whitespace
  * may be added when outputting the result; defaults to <code>true</code>
- * <li>{@link #setCache(boolean) cache} (optional): are templates to be cached; debug setting only; defaults to <code>true</code> 
+ * <li>{@link #setCache(boolean) cache} (optional): are templates to be cached; debug setting only; defaults to <code>true</code>
  * </ul>
  *
  * <p>Note that setting {@link #setCache(boolean) "cache"} to <code>false</code>
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java
index 7d87547b5f..c5c4ed5e67 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/IOther.java b/spring-webmvc/src/test/java/org/springframework/beans/IOther.java
index 797486ec44..6a8f74187c 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
index a06e15d150..0eb8df5c8a 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/Person.java b/spring-webmvc/src/test/java/org/springframework/beans/Person.java
index 3ebce5e2ea..a78998ad5d 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/Person.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/Person.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
index 36351352aa..34d05120aa 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
index b85110e1cb..4715fe448f 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java
index eaf1d5ec0b..3a77af2f71 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * Scrap bean for use in tests.
- * 
+ *
  * @author Colin Sampaleanu
  */
 public class TestBean {
diff --git a/spring-webmvc/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc/src/test/java/org/springframework/context/ACATester.java
index f77a7bda50..72c129ca4e 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/ACATester.java
+++ b/spring-webmvc/src/test/java/org/springframework/context/ACATester.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -24,7 +24,7 @@ import org.springframework.context.ApplicationContextException;
 import org.springframework.context.NoSuchMessageException;
 
 public class ACATester implements ApplicationContextAware {
-	
+
 	private ApplicationContext ac;
 
 	public void setApplicationContext(ApplicationContext ctx) throws ApplicationContextException {
diff --git a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
index d8be8ec966..50c9936c44 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
@@ -7,12 +7,12 @@ import org.springframework.beans.factory.LifecycleBean;
 
 /**
  * Simple bean to test ApplicationContext lifecycle methods for beans
- * 
+ *
  * @author Colin Sampaleanu
  * @since 03.07.2004
  */
 public class LifecycleContextBean extends LifecycleBean implements ApplicationContextAware {
-	
+
 	protected ApplicationContext owningContext;
 
 	public void setBeanFactory(BeanFactory beanFactory) {
@@ -20,18 +20,18 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo
 		if (this.owningContext != null)
 			throw new RuntimeException("Factory called setBeanFactory after setApplicationContext");
 	}
-	
+
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
 		if (this.owningContext == null)
 			throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean");
 	}
-	
+
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		if (this.owningFactory == null)
 			throw new RuntimeException("Factory called setApplicationContext before setBeanFactory");
-			
+
 		this.owningContext = applicationContext;
 	}
-	
+
 }
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 509861a680..cca608e9f1 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
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -95,7 +95,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes
 		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);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/WebApplicationObjectSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/WebApplicationObjectSupportTests.java
index 892a546e9a..391f464d03 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/support/WebApplicationObjectSupportTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/WebApplicationObjectSupportTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java
index 6583b5d5c0..dba9624609 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java
@@ -26,7 +26,7 @@ import org.springframework.util.MultiValueMap;
 
 /**
  * Test fixture for {@link FlashMap} tests.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class FlashMapTests {
@@ -78,7 +78,7 @@ public class FlashMapTests {
 		flashMap.addTargetRequestParam("text", "abc");
 		flashMap.addTargetRequestParam("empty", " ");
 		flashMap.addTargetRequestParam("null", null);
-		
+
 		assertEquals(1, flashMap.getTargetRequestParams().size());
 		assertEquals("abc", flashMap.getTargetRequestParams().getFirst("text"));
 	}
@@ -89,10 +89,10 @@ public class FlashMapTests {
 		params.add("key", "abc");
 		params.add("key", " ");
 		params.add("key", null);
-		
+
 		FlashMap flashMap = new FlashMap();
 		flashMap.addTargetRequestParams(params);
-		
+
 		assertEquals(1, flashMap.getTargetRequestParams().size());
 		assertEquals(1, flashMap.getTargetRequestParams().get("key").size());
 		assertEquals("abc", flashMap.getTargetRequestParams().getFirst("key"));
@@ -103,7 +103,7 @@ public class FlashMapTests {
 		FlashMap flashMap = new FlashMap();
 		flashMap.addTargetRequestParam(" ", "abc");
 		flashMap.addTargetRequestParam(null, "abc");
-		
+
 		assertTrue(flashMap.getTargetRequestParams().isEmpty());
 	}
 
@@ -112,11 +112,11 @@ public class FlashMapTests {
 		MultiValueMap<String, String> params = new LinkedMultiValueMap<String, String>();
 		params.add(" ", "abc");
 		params.add(null, " ");
-		
+
 		FlashMap flashMap = new FlashMap();
 		flashMap.addTargetRequestParams(params);
-		
+
 		assertTrue(flashMap.getTargetRequestParams().isEmpty());
 	}
-	
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
index 36824364d0..70c40be9fd 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
@@ -1,12 +1,12 @@
 /*
  * 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.
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 0e08da83bd..e1c8898604 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
@@ -143,7 +143,7 @@ public class AnnotationDrivenBeanDefinitionParserTests {
 		assertTrue(converters.get(0) instanceof StringHttpMessageConverter);
 		assertTrue(converters.get(1) instanceof ResourceHttpMessageConverter);
 	}
-	
+
 }
 
 class TestWebArgumentResolver implements WebArgumentResolver {
@@ -176,7 +176,7 @@ class TestHandlerMethodReturnValueHandler implements HandlerMethodReturnValueHan
 			MethodParameter returnType, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest) throws Exception {
 	}
-	
+
 }
 
 class TestMessageCodesResolver implements MessageCodesResolver {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
index 54c2e0bc0c..816cdc8222 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistryTests.java
@@ -37,7 +37,7 @@ import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
 public class ResourceHandlerRegistryTests {
 
 	private ResourceHandlerRegistry registry;
-	
+
 	private ResourceHandlerRegistration registration;
 
 	private MockHttpServletResponse response;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java
index b6e3ad2838..888cdfe9b2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java
@@ -63,7 +63,7 @@ public class ViewControllerRegistryTests {
 		assertNotNull(controller);
 		assertEquals("viewName", controller.getViewName());
 	}
-	
+
 	@Test
 	public void order() {
 		registry.addViewController("/path");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
index 18ec7f9068..6e018218fd 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
@@ -35,7 +35,7 @@ import org.springframework.web.servlet.HandlerMapping;
 public class BeanNameUrlHandlerMappingTests extends TestCase {
 
 	public static final String CONF = "/org/springframework/web/servlet/handler/map1.xml";
-	
+
 	private ConfigurableWebApplicationContext wac;
 
 	public void setUp() throws Exception {
@@ -82,7 +82,7 @@ public class BeanNameUrlHandlerMappingTests extends TestCase {
 		req.setContextPath("/myapp");
 		hec = hm.getHandler(req);
 		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
-		
+
 		req = new MockHttpServletRequest("GET", "/myapp/mypath/welcome.html");
 		req.setContextPath("/myapp");
 		req.setServletPath("/mypath/welcome.html");
@@ -109,7 +109,7 @@ public class BeanNameUrlHandlerMappingTests extends TestCase {
 		hec = hm.getHandler(req);
 		assertTrue("Handler is correct bean", hec != null && hec.getHandler() == bean);
 	}
-	
+
 	public void testRequestsWithFullPaths() throws Exception {
 		BeanNameUrlHandlerMapping hm = new BeanNameUrlHandlerMapping();
 		hm.setAlwaysUseFullPath(true);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java
index b109bc81ad..bb6fd2b5da 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/LocaleResolverTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java
index ff5ecdeb49..26b73b097f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -78,7 +78,7 @@ public class CommandControllerTests extends TestCase {
 		assertTrue("command name bound ok", person.getName().equals(name));
 		assertTrue("command age bound ok", person.getAge() == age);
 	}
-	
+
 	public void test2Args1Mismatch() throws Exception {
 		TestController mc = new TestController();
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/ok.html");
@@ -492,11 +492,11 @@ public class CommandControllerTests extends TestCase {
 
 
 	private static class TestController extends AbstractCommandController {
-		
+
 		private TestController() {
 			super(TestBean.class, "person");
 		}
-		
+
 		protected ModelAndView handle(HttpServletRequest request,	HttpServletResponse response,	Object command,	BindException errors) {
 			Map m = new HashMap();
 			assertTrue("Command not null", command != null);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ParameterizableViewControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ParameterizableViewControllerTests.java
index 9a8c94a651..6afd4b9b7b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ParameterizableViewControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ParameterizableViewControllerTests.java
@@ -39,7 +39,7 @@ public class ParameterizableViewControllerTests {
 	private ParameterizableViewController controller;
 
 	private MockHttpServletRequest request;
-	
+
 	@Before
 	public void setup() {
 		this.controller = new ParameterizableViewController();
@@ -54,7 +54,7 @@ public class ParameterizableViewControllerTests {
 		assertEquals(viewName, mav.getViewName());
 		assertTrue(mav.getModel().isEmpty());
 	}
-	
+
 	@Test
 	public void handleRequestWithoutViewName() throws Exception {
 		ModelAndView mav = this.controller.handleRequest(this.request, new MockHttpServletResponse());
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java
index 095276a6e7..73528894df 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java
@@ -76,7 +76,7 @@ public class WebContentInterceptorTests {
 		WebContentInterceptor interceptor = new WebContentInterceptor();
 		interceptor.setCacheSeconds(10);
 		interceptor.setCacheMappings(mappings);
-		
+
 		request.setRequestURI("http://localhost:7070/example/adminhandle.vm");
 		interceptor.preHandle(request, response, null);
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
index 236bd3666f..6ca9722166 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
@@ -285,7 +285,7 @@ public class ServletAnnotationControllerTests {
 			}
 		};
 		servlet.init(new MockServletConfig());
-		
+
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/myApp/myPath.do");
 		request.setContextPath("/myApp");
 		MockHttpServletResponse response = new MockHttpServletResponse();
@@ -1705,7 +1705,7 @@ public class ServletAnnotationControllerTests {
 		assertEquals("handle", response.getContentAsString());
 
 	}
-	
+
 	@Test
 	public void trailingSlash() throws Exception {
 		initServlet(TrailingSlashController.class);
@@ -2824,7 +2824,7 @@ public class ServletAnnotationControllerTests {
 
 	@XmlRootElement
 	public static class A {
-		
+
 	}
 
 	@XmlRootElement
@@ -3144,7 +3144,7 @@ public class ServletAnnotationControllerTests {
 		public void root(Writer writer) throws IOException {
 			writer.write("root");
 		}
-		
+
 		@RequestMapping(value = "/{templatePath}/", method = RequestMethod.GET)
 		public void templatePath(Writer writer) throws IOException {
 			writer.write("templatePath");
@@ -3256,10 +3256,10 @@ public class ServletAnnotationControllerTests {
 			writer.write("handle2");
 		}
 	}
-	
+
 	@Controller
 	static class HeadersConditionController {
-		
+
 		@RequestMapping(value = "/", method = RequestMethod.GET)
 		public String home() {
 			return "home";
@@ -3279,5 +3279,5 @@ public class ServletAnnotationControllerTests {
 		public void handle(RedirectAttributes redirectAttrs) {
 		}
 	}
-	
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtilsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtilsTests.java
index 9da4b087d3..9bff022421 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtilsTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtilsTests.java
@@ -68,7 +68,7 @@ public class ServletAnnotationMappingUtilsTests {
 		boolean result = ServletAnnotationMappingUtils.checkParameters(params, request);
 		assertTrue("Invalid request method result", result);
 	}
-	
+
 	@Test
 	public void checkParametersKeyValueNoMatch() {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/");
@@ -77,7 +77,7 @@ public class ServletAnnotationMappingUtilsTests {
 		boolean result = ServletAnnotationMappingUtils.checkParameters(params, request);
 		assertFalse("Invalid request method result", result);
 	}
-	
+
 	@Test
 	public void checkParametersNegatedValueMatch() {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/");
@@ -86,7 +86,7 @@ public class ServletAnnotationMappingUtilsTests {
 		boolean result = ServletAnnotationMappingUtils.checkParameters(params, request);
 		assertTrue("Invalid request method result", result);
 	}
-	
+
 	@Test
 	public void checkParametersNegatedValueNoMatch() {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/");
@@ -143,8 +143,8 @@ public class ServletAnnotationMappingUtilsTests {
 		assertFalse("Invalid request method result", result);
 	}
 
-	// SPR-8862 
-	
+	// SPR-8862
+
 	@Test
 	public void checkHeadersKeyValueNoMatchWithNegation() {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java
index 8abb0b2a72..b88c10fa9f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java
@@ -44,7 +44,7 @@ public class Spr7766Tests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		adapter.handle(request, response, controller);
 	}
-	
+
 	public class ColorConverter implements Converter<String, Color> {
 		public Color convert(String source) { if (!source.startsWith("#")) source = "#" + source; return Color.decode(source); }
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
index 54fec80ce9..e7aa5e97bc 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
@@ -69,7 +69,7 @@ public class Spr7839Tests {
 		request.addParameter("nested.list", "Nested1,Nested2");
 		adapter.handle(request, response, controller);
 	}
-	
+
 	@Test
 	public void listElement() throws Exception {
 		request.setRequestURI("/nested/listElement");
@@ -124,14 +124,14 @@ public class Spr7839Tests {
 
 	@Test
 	public void map() throws Exception {
-		request.setRequestURI("/nested/map");		
+		request.setRequestURI("/nested/map");
 		request.addParameter("nested.map['apple'].foo", "bar");
 		adapter.handle(request, response, controller);
 	}
 
 	@Test
 	public void mapOfLists() throws Exception {
-		request.setRequestURI("/nested/mapOfLists");		
+		request.setRequestURI("/nested/mapOfLists");
 		request.addParameter("nested.mapOfLists['apples'][0]", "1");
 		adapter.handle(request, response, controller);
 	}
@@ -173,14 +173,14 @@ public class Spr7839Tests {
 		public void handlerMap(JavaBean bean) {
 			assertEquals("bar", bean.nested.map.get("apple").foo);
 		}
-		
+
 		@RequestMapping("/nested/mapOfLists")
 		public void handlerMapOfLists(JavaBean bean) {
 			assertEquals(new Integer(1), bean.nested.mapOfLists.get("apples").get(0));
 		}
 
 	}
-	
+
 	public static class JavaBean {
 
 	    private NestedBean nested;
@@ -193,7 +193,7 @@ public class Spr7839Tests {
 			this.nested = nested;
 		}
 
-	    
+
 	}
 
 	public static class NestedBean {
@@ -209,15 +209,15 @@ public class Spr7839Tests {
 	    private Map<String, NestedBean> map;
 
 	    private Map<String, List<Integer>> mapOfLists;
-	    
+
 	    public NestedBean() {
-	    	
+
 	    }
-	    
+
 	    public NestedBean(String foo) {
 	    	this.foo = foo;
 	    }
-	    
+
 		public String getFoo() {
 			return foo;
 		}
@@ -265,7 +265,7 @@ public class Spr7839Tests {
 		public void setMapOfLists(Map<String, List<Integer>> mapOfLists) {
 			this.mapOfLists = mapOfLists;
 		}
-	   
+
 	}
-	
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java
index 10586067da..0d8642b9c5 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/HeadersRequestConditionTests.java
@@ -134,7 +134,7 @@ public class HeadersRequestConditionTests {
 		assertTrue("Invalid comparison result: " + result, result > 0);
 	}
 
-	
+
 	@Test
 	public void combine() {
 		HeadersRequestCondition condition1 = new HeadersRequestCondition("foo=bar");
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 d9c881dc9e..ea7e21b24f 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
@@ -48,7 +48,7 @@ public class RequestMappingInfoTests {
 	@Test
 	public void createEmpty() {
 		RequestMappingInfo info = new RequestMappingInfo(null, null, null, null, null, null, null);
-		
+
 		assertEquals(0, info.getPatternsCondition().getPatterns().size());
 		assertEquals(0, info.getMethodsCondition().getMethods().size());
 		assertEquals(true, info.getConsumesCondition().isEmpty());
@@ -57,7 +57,7 @@ public class RequestMappingInfoTests {
 		assertNotNull(info.getHeadersCondition());
 		assertNull(info.getCustomCondition());
 	}
-	
+
 	@Test
 	public void matchPatternsCondition() {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo");
@@ -66,14 +66,14 @@ public class RequestMappingInfoTests {
 				new PatternsRequestCondition("/foo*", "/bar"), null, null, null, null, null, null);
 		RequestMappingInfo expected = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo*"), null, null, null, null, null, null);
-		
+
 		assertEquals(expected, info.getMatchingCondition(request));
 
 		info = new RequestMappingInfo(
 				new PatternsRequestCondition("/**", "/foo*", "/foo"), null, null, null, null, null, null);
 		expected = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo", "/foo*", "/**"), null, null, null, null, null, null);
-		
+
 		assertEquals(expected, info.getMatchingCondition(request));
 	}
 
@@ -84,14 +84,14 @@ public class RequestMappingInfoTests {
 
 		RequestMappingInfo info =
 				new RequestMappingInfo(
-						new PatternsRequestCondition("/foo"), null, 
+						new PatternsRequestCondition("/foo"), null,
 						new ParamsRequestCondition("foo=bar"), null, null, null, null);
 		RequestMappingInfo match = info.getMatchingCondition(request);
 
 		assertNotNull(match);
 
 		info = new RequestMappingInfo(
-				new PatternsRequestCondition("/foo"), null, 
+				new PatternsRequestCondition("/foo"), null,
 				new ParamsRequestCondition("foo!=bar"), null, null, null, null);
 		match = info.getMatchingCondition(request);
 
@@ -105,14 +105,14 @@ public class RequestMappingInfoTests {
 
 		RequestMappingInfo info =
 				new RequestMappingInfo(
-						new PatternsRequestCondition("/foo"), null, null, 
+						new PatternsRequestCondition("/foo"), null, null,
 						new HeadersRequestCondition("foo=bar"), null, null, null);
 		RequestMappingInfo match = info.getMatchingCondition(request);
 
 		assertNotNull(match);
 
 		info = new RequestMappingInfo(
-				new PatternsRequestCondition("/foo"), null, null, 
+				new PatternsRequestCondition("/foo"), null, null,
 				new HeadersRequestCondition("foo!=bar"), null, null, null);
 		match = info.getMatchingCondition(request);
 
@@ -124,7 +124,7 @@ public class RequestMappingInfoTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo");
 		request.setContentType("text/plain");
 
-		RequestMappingInfo info = 
+		RequestMappingInfo info =
 			new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"), null, null, null,
 				new ConsumesRequestCondition("text/plain"), null, null);
@@ -145,9 +145,9 @@ public class RequestMappingInfoTests {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo");
 		request.addHeader("Accept", "text/plain");
 
-		RequestMappingInfo info = 
+		RequestMappingInfo info =
 			new RequestMappingInfo(
-					new PatternsRequestCondition("/foo"), null, null, null, null, 
+					new PatternsRequestCondition("/foo"), null, null, null, null,
 					new ProducesRequestCondition("text/plain"), null);
 		RequestMappingInfo match = info.getMatchingCondition(request);
 
@@ -168,38 +168,38 @@ public class RequestMappingInfoTests {
 
 		RequestMappingInfo info =
 				new RequestMappingInfo(
-						new PatternsRequestCondition("/foo"), null, null, null, null, null, 
+						new PatternsRequestCondition("/foo"), null, null, null, null, null,
 						new ParamsRequestCondition("foo=bar"));
 		RequestMappingInfo match = info.getMatchingCondition(request);
 
 		assertNotNull(match);
 
 		info = new RequestMappingInfo(
-				new PatternsRequestCondition("/foo"), null, 
-				new ParamsRequestCondition("foo!=bar"), null, null, null, 
+				new PatternsRequestCondition("/foo"), null,
+				new ParamsRequestCondition("foo!=bar"), null, null, null,
 				new ParamsRequestCondition("foo!=bar"));
 		match = info.getMatchingCondition(request);
 
 		assertNull(match);
-	}	
-	
+	}
+
 	@Test
 	public void compareTwoHttpMethodsOneParam() {
 		RequestMappingInfo none = new RequestMappingInfo(null, null, null, null, null, null, null);
-		RequestMappingInfo oneMethod = 
-			new RequestMappingInfo(null, 
+		RequestMappingInfo oneMethod =
+			new RequestMappingInfo(null,
 					new RequestMethodsRequestCondition(RequestMethod.GET), null, null, null, null, null);
 		RequestMappingInfo oneMethodOneParam =
-				new RequestMappingInfo(null, 
-						new RequestMethodsRequestCondition(RequestMethod.GET), 
+				new RequestMappingInfo(null,
+						new RequestMethodsRequestCondition(RequestMethod.GET),
 						new ParamsRequestCondition("foo"), null, null, null, null);
-		
+
 		Comparator<RequestMappingInfo> comparator = new Comparator<RequestMappingInfo>() {
 			public int compare(RequestMappingInfo info, RequestMappingInfo otherInfo) {
 				return info.compareTo(otherInfo, new MockHttpServletRequest());
 			}
 		};
-		
+
 		List<RequestMappingInfo> list = asList(none, oneMethod, oneMethodOneParam);
 		Collections.shuffle(list);
 		Collections.sort(list, comparator);
@@ -211,22 +211,22 @@ public class RequestMappingInfoTests {
 
 	@Test
 	public void equals() {
-		
+
 		RequestMappingInfo info1 = new RequestMappingInfo(
-				new PatternsRequestCondition("/foo"), 
-				new RequestMethodsRequestCondition(RequestMethod.GET), 
-				new ParamsRequestCondition("foo=bar"), 
+				new PatternsRequestCondition("/foo"),
+				new RequestMethodsRequestCondition(RequestMethod.GET),
+				new ParamsRequestCondition("foo=bar"),
 				new HeadersRequestCondition("foo=bar"),
-				new ConsumesRequestCondition("text/plain"), 
+				new ConsumesRequestCondition("text/plain"),
 				new ProducesRequestCondition("text/plain"),
 				new ParamsRequestCondition("customFoo=customBar"));
 
 		RequestMappingInfo info2 = new RequestMappingInfo(
-				new PatternsRequestCondition("/foo"), 
-				new RequestMethodsRequestCondition(RequestMethod.GET), 
-				new ParamsRequestCondition("foo=bar"), 
+				new PatternsRequestCondition("/foo"),
+				new RequestMethodsRequestCondition(RequestMethod.GET),
+				new ParamsRequestCondition("foo=bar"),
 				new HeadersRequestCondition("foo=bar"),
-				new ConsumesRequestCondition("text/plain"), 
+				new ConsumesRequestCondition("text/plain"),
 				new ProducesRequestCondition("text/plain"),
 				new ParamsRequestCondition("customFoo=customBar"));
 
@@ -234,86 +234,86 @@ public class RequestMappingInfoTests {
 		assertEquals(info1.hashCode(), info2.hashCode());
 
 		info2 = new RequestMappingInfo(
-				new PatternsRequestCondition("/foo", "/NOOOOOO"), 
-				new RequestMethodsRequestCondition(RequestMethod.GET), 
-				new ParamsRequestCondition("foo=bar"), 
+				new PatternsRequestCondition("/foo", "/NOOOOOO"),
+				new RequestMethodsRequestCondition(RequestMethod.GET),
+				new ParamsRequestCondition("foo=bar"),
 				new HeadersRequestCondition("foo=bar"),
-				new ConsumesRequestCondition("text/plain"), 
+				new ConsumesRequestCondition("text/plain"),
 				new ProducesRequestCondition("text/plain"),
 				new ParamsRequestCondition("customFoo=customBar"));
-	
+
 		assertFalse(info1.equals(info2));
 		assertTrue(info1.hashCode() != info2.hashCode());
 
 		info2 = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"),
-				new RequestMethodsRequestCondition(RequestMethod.GET, RequestMethod.POST), 
-				new ParamsRequestCondition("foo=bar"), 
+				new RequestMethodsRequestCondition(RequestMethod.GET, RequestMethod.POST),
+				new ParamsRequestCondition("foo=bar"),
 				new HeadersRequestCondition("foo=bar"),
-				new ConsumesRequestCondition("text/plain"), 
+				new ConsumesRequestCondition("text/plain"),
 				new ProducesRequestCondition("text/plain"),
 				new ParamsRequestCondition("customFoo=customBar"));
-	
+
 		assertFalse(info1.equals(info2));
 		assertTrue(info1.hashCode() != info2.hashCode());
 
 		info2 = new RequestMappingInfo(
-				new PatternsRequestCondition("/foo"), 
-				new RequestMethodsRequestCondition(RequestMethod.GET), 
-				new ParamsRequestCondition("/NOOOOOO"), 
+				new PatternsRequestCondition("/foo"),
+				new RequestMethodsRequestCondition(RequestMethod.GET),
+				new ParamsRequestCondition("/NOOOOOO"),
 				new HeadersRequestCondition("foo=bar"),
-				new ConsumesRequestCondition("text/plain"), 
+				new ConsumesRequestCondition("text/plain"),
 				new ProducesRequestCondition("text/plain"),
 				new ParamsRequestCondition("customFoo=customBar"));
-	
+
 		assertFalse(info1.equals(info2));
 		assertTrue(info1.hashCode() != info2.hashCode());
 
 		info2 = new RequestMappingInfo(
-				new PatternsRequestCondition("/foo"), 
-				new RequestMethodsRequestCondition(RequestMethod.GET), 
-				new ParamsRequestCondition("foo=bar"), 
+				new PatternsRequestCondition("/foo"),
+				new RequestMethodsRequestCondition(RequestMethod.GET),
+				new ParamsRequestCondition("foo=bar"),
 				new HeadersRequestCondition("/NOOOOOO"),
-				new ConsumesRequestCondition("text/plain"), 
+				new ConsumesRequestCondition("text/plain"),
 				new ProducesRequestCondition("text/plain"),
 				new ParamsRequestCondition("customFoo=customBar"));
-	
-		assertFalse(info1.equals(info2));
-		assertTrue(info1.hashCode() != info2.hashCode());
-		
-		info2 = new RequestMappingInfo(
-				new PatternsRequestCondition("/foo"), 
-				new RequestMethodsRequestCondition(RequestMethod.GET), 
-				new ParamsRequestCondition("foo=bar"), 
-				new HeadersRequestCondition("foo=bar"),
-				new ConsumesRequestCondition("text/NOOOOOO"), 
-				new ProducesRequestCondition("text/plain"),
-				new ParamsRequestCondition("customFoo=customBar"));
-	
+
 		assertFalse(info1.equals(info2));
 		assertTrue(info1.hashCode() != info2.hashCode());
 
 		info2 = new RequestMappingInfo(
-				new PatternsRequestCondition("/foo"), 
-				new RequestMethodsRequestCondition(RequestMethod.GET), 
-				new ParamsRequestCondition("foo=bar"), 
+				new PatternsRequestCondition("/foo"),
+				new RequestMethodsRequestCondition(RequestMethod.GET),
+				new ParamsRequestCondition("foo=bar"),
 				new HeadersRequestCondition("foo=bar"),
-				new ConsumesRequestCondition("text/plain"), 
+				new ConsumesRequestCondition("text/NOOOOOO"),
+				new ProducesRequestCondition("text/plain"),
+				new ParamsRequestCondition("customFoo=customBar"));
+
+		assertFalse(info1.equals(info2));
+		assertTrue(info1.hashCode() != info2.hashCode());
+
+		info2 = new RequestMappingInfo(
+				new PatternsRequestCondition("/foo"),
+				new RequestMethodsRequestCondition(RequestMethod.GET),
+				new ParamsRequestCondition("foo=bar"),
+				new HeadersRequestCondition("foo=bar"),
+				new ConsumesRequestCondition("text/plain"),
 				new ProducesRequestCondition("text/NOOOOOO"),
 				new ParamsRequestCondition("customFoo=customBar"));
-	
+
 		assertFalse(info1.equals(info2));
 		assertTrue(info1.hashCode() != info2.hashCode());
 
 		info2 = new RequestMappingInfo(
-				new PatternsRequestCondition("/foo"), 
-				new RequestMethodsRequestCondition(RequestMethod.GET), 
-				new ParamsRequestCondition("foo=bar"), 
+				new PatternsRequestCondition("/foo"),
+				new RequestMethodsRequestCondition(RequestMethod.GET),
+				new ParamsRequestCondition("foo=bar"),
 				new HeadersRequestCondition("foo=bar"),
-				new ConsumesRequestCondition("text/plain"), 
+				new ConsumesRequestCondition("text/plain"),
 				new ProducesRequestCondition("text/plain"),
 				new ParamsRequestCondition("customFoo=NOOOOOO"));
-	
+
 		assertFalse(info1.equals(info2));
 		assertTrue(info1.hashCode() != info2.hashCode());
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java
index 4d4ac56928..1ff5a6303e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java
@@ -41,7 +41,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ModelAndViewResolve
 
 /**
  * Test fixture with {@link ModelAndViewResolverMethodReturnValueHandler}.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class ModelAndViewResolverMethodReturnValueHandlerTests {
@@ -69,7 +69,7 @@ public class ModelAndViewResolverMethodReturnValueHandlerTests {
 		TestBean testBean = new TestBean("name");
 
 		handler.handleReturnValue(testBean, returnType, mavContainer, request);
-		
+
 		assertEquals("viewName", mavContainer.getViewName());
 		assertSame(testBean, mavContainer.getModel().get("modelAttrName"));
 		assertFalse(mavContainer.isRequestHandled());
@@ -86,12 +86,12 @@ public class ModelAndViewResolverMethodReturnValueHandlerTests {
 	public void handleNull() throws Exception {
 		MethodParameter returnType = new MethodParameter(getClass().getDeclaredMethod("testBeanReturnValue"), -1);
 		handler.handleReturnValue(null, returnType, mavContainer, request);
-		
+
 		assertNull(mavContainer.getView());
 		assertNull(mavContainer.getViewName());
 		assertTrue(mavContainer.getModel().isEmpty());
 	}
-	
+
 	@Test(expected=UnsupportedOperationException.class)
 	public void handleSimpleType() throws Exception {
 		MethodParameter returnType = new MethodParameter(getClass().getDeclaredMethod("intReturnValue"), -1);
@@ -102,7 +102,7 @@ public class ModelAndViewResolverMethodReturnValueHandlerTests {
 	public void handleNonSimpleType() throws Exception{
 		MethodParameter returnType = new MethodParameter(getClass().getDeclaredMethod("testBeanReturnValue"), -1);
 		handler.handleReturnValue(new TestBean(), returnType, mavContainer, request);
-		
+
 		assertTrue(mavContainer.containsAttribute("testBean"));
 	}
 
@@ -115,11 +115,11 @@ public class ModelAndViewResolverMethodReturnValueHandlerTests {
 	private TestBean testBeanReturnValue() {
 		return null;
 	}
-	
+
 	private static class TestModelAndViewResolver implements ModelAndViewResolver {
-		
+
 		private Class<?> returnValueType;
-		
+
 		public TestModelAndViewResolver(Class<?> returnValueType) {
 			this.returnValueType = returnValueType;
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java
index 8c9cfaec55..4deb2412e7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java
@@ -41,21 +41,21 @@ import org.springframework.web.servlet.mvc.method.annotation.PathVariableMethodA
 
 /**
  * Test fixture with {@link PathVariableMethodArgumentResolver}.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class PathVariableMethodArgumentResolverTests {
 
 	private PathVariableMethodArgumentResolver resolver;
-	
+
 	private MethodParameter paramNamedString;
 
 	private MethodParameter paramString;
 
 	private ModelAndViewContainer mavContainer;
-	
+
 	private ServletWebRequest webRequest;
-	
+
 	private MockHttpServletRequest request;
 
 	@Before
@@ -70,7 +70,7 @@ public class PathVariableMethodArgumentResolverTests {
 		request = new MockHttpServletRequest();
 		webRequest = new ServletWebRequest(request, new MockHttpServletResponse());
 	}
-	
+
 	@Test
 	public void supportsParameter() {
 		assertTrue("Parameter with @PathVariable annotation", resolver.supportsParameter(paramNamedString));
@@ -85,14 +85,14 @@ public class PathVariableMethodArgumentResolverTests {
 
 		String result = (String) resolver.resolveArgument(paramNamedString, mavContainer, webRequest, null);
 		assertEquals("PathVariable not resolved correctly", "value", result);
-		
+
 		@SuppressWarnings("unchecked")
 		Map<String, Object> pathVars = (Map<String, Object>) request.getAttribute(View.PATH_VARIABLES);
 		assertNotNull(pathVars);
 		assertEquals(1, pathVars.size());
 		assertEquals("value", pathVars.get("name"));
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	@Test
 	public void resolveArgumentWithExistingPathVars() throws Exception {
@@ -106,20 +106,20 @@ public class PathVariableMethodArgumentResolverTests {
 
 		String result = (String) resolver.resolveArgument(paramNamedString, mavContainer, webRequest, null);
 		assertEquals("PathVariable not resolved correctly", "value", result);
-		
+
 		pathVars = (Map<String, Object>) request.getAttribute(View.PATH_VARIABLES);
 		assertNotNull(pathVars);
 		assertEquals(2, pathVars.size());
 		assertEquals("value", pathVars.get("name"));
 		assertEquals("oldValue", pathVars.get("oldName"));
 	}
-	
+
 	@Test(expected = ServletRequestBindingException.class)
 	public void handleMissingValue() throws Exception {
 		resolver.resolveArgument(paramNamedString, mavContainer, webRequest, null);
 		fail("Unresolved path variable should lead to exception.");
 	}
-	
+
 	public void handle(@PathVariable(value = "name") String param1, String param2) {
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
index 7f18922e49..813c7819a9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
@@ -68,7 +68,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestPartMethodAr
 
 /**
  * Test fixture with {@link RequestPartMethodArgumentResolver} and mock {@link HttpMessageConverter}.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class RequestPartMethodArgumentResolverTests {
@@ -76,7 +76,7 @@ public class RequestPartMethodArgumentResolverTests {
 	private RequestPartMethodArgumentResolver resolver;
 
 	private HttpMessageConverter<SimpleBean> messageConverter;
-	
+
 	private MultipartFile multipartFile1;
 	private MultipartFile multipartFile2;
 
@@ -99,10 +99,10 @@ public class RequestPartMethodArgumentResolverTests {
 	@SuppressWarnings("unchecked")
 	@Before
 	public void setUp() throws Exception {
-		
+
 		Method method = getClass().getMethod("handle", SimpleBean.class, SimpleBean.class, SimpleBean.class,
 				MultipartFile.class, List.class, Integer.TYPE, MultipartFile.class, Part.class, MultipartFile.class);
-		
+
 		paramRequestPart = new MethodParameter(method, 0);
 		paramRequestPart.initParameterNameDiscovery(new LocalVariableTableParameterNameDiscoverer());
 		paramNamedRequestPart = new MethodParameter(method, 1);
@@ -122,7 +122,7 @@ public class RequestPartMethodArgumentResolverTests {
 
 		resolver = new RequestPartMethodArgumentResolver(Collections.<HttpMessageConverter<?>>singletonList(messageConverter));
 		reset(messageConverter);
-		
+
 		multipartFile1 = new MockMultipartFile("requestPart", "", "text/plain", (byte[]) null);
 		multipartFile2 = new MockMultipartFile("requestPart", "", "text/plain", (byte[]) null);
 		multipartRequest = new MockMultipartHttpServletRequest();
@@ -139,16 +139,16 @@ public class RequestPartMethodArgumentResolverTests {
 		assertTrue("Part parameter not supported", resolver.supportsParameter(paramServlet30Part));
 		assertFalse("non-RequestPart parameter supported", resolver.supportsParameter(paramInt));
 		assertFalse("@RequestParam args not supported", resolver.supportsParameter(paramRequestParamAnnot));
-	}	
+	}
 
-	@Test 
+	@Test
 	public void resolveMultipartFile() throws Exception {
 		Object actual = resolver.resolveArgument(paramMultipartFile, null, webRequest, null);
 		assertNotNull(actual);
 		assertSame(multipartFile1, actual);
 	}
 
-	@Test 
+	@Test
 	public void resolveMultipartFileList() throws Exception {
 		Object actual = resolver.resolveArgument(paramMultipartFileList, null, webRequest, null);
 		assertNotNull(actual);
@@ -193,7 +193,7 @@ public class RequestPartMethodArgumentResolverTests {
 	public void resolveNamedRequestPart() throws Exception {
 		testResolveArgument(new SimpleBean("foo"), paramNamedRequestPart);
 	}
-	
+
 	@Test
 	public void resolveRequestPartNotValid() throws Exception {
 		try {
@@ -205,12 +205,12 @@ public class RequestPartMethodArgumentResolverTests {
 			assertNotNull(e.getBindingResult().getFieldError("name"));
 		}
 	}
-	
+
 	@Test
 	public void resolveRequestPartValid() throws Exception {
 		testResolveArgument(new SimpleBean("foo"), paramNamedRequestPart);
 	}
-	
+
 	@Test
 	public void resolveRequestPartRequired() throws Exception {
 		try {
@@ -225,7 +225,7 @@ public class RequestPartMethodArgumentResolverTests {
 	public void resolveRequestPartNotRequired() throws Exception {
 		testResolveArgument(new SimpleBean("foo"), paramValidRequestPart);
 	}
-	
+
 	@Test(expected=MultipartException.class)
 	public void isMultipartRequest() throws Exception {
 		MockHttpServletRequest request = new MockHttpServletRequest();
@@ -255,9 +255,9 @@ public class RequestPartMethodArgumentResolverTests {
 
 		assertEquals("Invalid argument value", argValue, actualValue);
 		assertFalse("The requestHandled flag shouldn't change", mavContainer.isRequestHandled());
-		
+
 		verify(messageConverter);
-	}	
+	}
 
 	private static class SimpleBean {
 
@@ -273,7 +273,7 @@ public class RequestPartMethodArgumentResolverTests {
 			return name;
 		}
 	}
-	
+
 	private final class ValidatingBinderFactory implements WebDataBinderFactory {
 		public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception {
 			LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
@@ -284,9 +284,9 @@ public class RequestPartMethodArgumentResolverTests {
 		}
 	}
 
-	public void handle(@RequestPart SimpleBean requestPart, 
-					   @RequestPart(value="requestPart", required=false) SimpleBean namedRequestPart, 
-					   @Valid @RequestPart("requestPart") SimpleBean validRequestPart, 
+	public void handle(@RequestPart SimpleBean requestPart,
+					   @RequestPart(value="requestPart", required=false) SimpleBean namedRequestPart,
+					   @Valid @RequestPart("requestPart") SimpleBean validRequestPart,
 					   @RequestPart("requestPart") MultipartFile multipartFile,
 					   @RequestPart("requestPart") List<MultipartFile> multipartFileList,
 					   int i,
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java
index d0b6e815ec..21ef1b1959 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java
@@ -40,7 +40,7 @@ import org.springframework.web.servlet.HandlerMapping;
 /**
  * Test fixture for {@link ServletModelAttributeMethodProcessor} specific tests.
  * Also see org.springframework.web.method.annotation.support.ModelAttributeMethodProcessorTests
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class SerlvetModelAttributeMethodProcessorTests {
@@ -48,7 +48,7 @@ public class SerlvetModelAttributeMethodProcessorTests {
 	private ServletModelAttributeMethodProcessor processor;
 
 	private MethodParameter testBeanModelAttr;
-	
+
 	private MethodParameter testBeanWithoutStringConstructorModelAttr;
 
 	private ModelAndViewContainer mavContainer;
@@ -63,18 +63,18 @@ public class SerlvetModelAttributeMethodProcessorTests {
 	public void setUp() throws Exception {
 		this.processor = new ServletModelAttributeMethodProcessor(false);
 
-		Method method = getClass().getDeclaredMethod("modelAttribute", 
+		Method method = getClass().getDeclaredMethod("modelAttribute",
 				TestBean.class, TestBeanWithoutStringConstructor.class);
-		
+
 		this.testBeanModelAttr = new MethodParameter(method, 0);
 		this.testBeanWithoutStringConstructorModelAttr = new MethodParameter(method, 1);
-		
+
 		ConfigurableWebBindingInitializer initializer = new ConfigurableWebBindingInitializer();
 		initializer.setConversionService(new DefaultConversionService());
-		
+
 		this.binderFactory = new ServletRequestDataBinderFactory(null, initializer );
 		this.mavContainer = new ModelAndViewContainer();
-		
+
 		this.request = new MockHttpServletRequest();
 		this.webRequest = new ServletWebRequest(request);
 	}
@@ -87,10 +87,10 @@ public class SerlvetModelAttributeMethodProcessorTests {
 
 		// Type conversion from "Patty" to TestBean via TestBean(String) constructor
 
-		TestBean testBean = 
+		TestBean testBean =
 			(TestBean) this.processor.resolveArgument(
 					this.testBeanModelAttr, this.mavContainer, this.webRequest, this.binderFactory);
-		
+
 		assertEquals("Patty", testBean.getName());
 	}
 
@@ -100,10 +100,10 @@ public class SerlvetModelAttributeMethodProcessorTests {
 		uriTemplateVars.put("testBean2", "Patty");
 		request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, uriTemplateVars);
 
-		TestBeanWithoutStringConstructor testBean = 
+		TestBeanWithoutStringConstructor testBean =
 			(TestBeanWithoutStringConstructor) this.processor.resolveArgument(
 					this.testBeanWithoutStringConstructorModelAttr, this.mavContainer, this.webRequest, this.binderFactory);
-		
+
 		assertNotNull(testBean);
 	}
 
@@ -113,10 +113,10 @@ public class SerlvetModelAttributeMethodProcessorTests {
 
 		// Type conversion from "Patty" to TestBean via TestBean(String) constructor
 
-		TestBean testBean = 
+		TestBean testBean =
 			(TestBean) this.processor.resolveArgument(
 					this.testBeanModelAttr, this.mavContainer, this.webRequest, this.binderFactory);
-		
+
 		assertEquals("Patty", testBean.getName());
 	}
 
@@ -124,17 +124,17 @@ public class SerlvetModelAttributeMethodProcessorTests {
 	public void createAttributeRequestParameterCannotConvert() throws Exception {
 		this.request.addParameter("testBean1", "Patty");
 
-		TestBeanWithoutStringConstructor testBean = 
+		TestBeanWithoutStringConstructor testBean =
 			(TestBeanWithoutStringConstructor) this.processor.resolveArgument(
 					this.testBeanWithoutStringConstructorModelAttr, this.mavContainer, this.webRequest, this.binderFactory);
-		
+
 		assertNotNull(testBean);
 	}
 
-	
+
 	@SuppressWarnings("unused")
-	private void modelAttribute(@ModelAttribute("testBean1") TestBean testBean1, 
-								@ModelAttribute("testBean2") TestBeanWithoutStringConstructor testBean2) { 
+	private void modelAttribute(@ModelAttribute("testBean1") TestBean testBean1,
+								@ModelAttribute("testBean2") TestBeanWithoutStringConstructor testBean2) {
 	}
 
 
@@ -143,10 +143,10 @@ public class SerlvetModelAttributeMethodProcessorTests {
 
 		public TestBeanWithoutStringConstructor() {
 		}
-		
+
 		public TestBeanWithoutStringConstructor(int i) {
 		}
-		
+
 	}
 
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java
index 7590c2ceb6..b1118f4c46 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java
@@ -33,7 +33,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ServletCookieValueM
 
 /**
  * Test fixture with {@link ServletCookieValueMethodArgumentResolver}.
- * 
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  */
@@ -52,7 +52,7 @@ public class ServletCookieValueMethodArgumentResolverTests {
 	@Before
 	public void setUp() throws Exception {
 		resolver = new ServletCookieValueMethodArgumentResolver(null);
-		
+
 		Method method = getClass().getMethod("params", Cookie.class, String.class);
 		cookieParameter = new MethodParameter(method, 0);
 		cookieStringParameter = new MethodParameter(method, 1);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
index ba68354ee7..f3c51db5a8 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.*;
 
 /**
  * Test fixture with {@link ServletRequestMethodArgumentResolver}.
- * 
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  */
@@ -52,7 +52,7 @@ public class ServletRequestMethodArgumentResolverTests {
 	private Method method;
 
 	private ModelAndViewContainer mavContainer;
-	
+
 	private ServletWebRequest webRequest;
 
 	private MockHttpServletRequest servletRequest;
@@ -69,10 +69,10 @@ public class ServletRequestMethodArgumentResolverTests {
 	@Test
 	public void servletRequest() throws Exception {
 		MethodParameter servletRequestParameter = new MethodParameter(method, 0);
-		
+
 		boolean isSupported = resolver.supportsParameter(servletRequestParameter);
 		Object result = resolver.resolveArgument(servletRequestParameter, mavContainer, webRequest, null);
-		
+
 		assertTrue("ServletRequest not supported", isSupported);
 		assertSame("Invalid result", servletRequest, result);
 		assertFalse("The requestHandled flag shouldn't change", mavContainer.isRequestHandled());
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java
index e7b7acb168..e29bb77226 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
 
 /**
  * Test fixture with {@link org.springframework.web.servlet.mvc.method.annotation.ServletRequestMethodArgumentResolver}.
- * 
+ *
  * @author Arjen Poutsma
  */
 public class ServletResponseMethodArgumentResolverTests {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java
index 5c8054c319..043467e47a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java
@@ -35,7 +35,7 @@ import org.springframework.web.util.UriComponentsBuilder;
 
 /**
  * Test fixture with {@link UriComponentsBuilderMethodArgumentResolver}.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class UriComponentsBuilderMethodArgumentResolverTests {
@@ -45,7 +45,7 @@ public class UriComponentsBuilderMethodArgumentResolverTests {
 	private MethodParameter builderParam;
 
 	private MethodParameter servletBuilderParam;
-	
+
 	private MethodParameter intParam;
 
 	private ServletWebRequest webRequest;
@@ -62,22 +62,22 @@ public class UriComponentsBuilderMethodArgumentResolverTests {
 		this.servletRequest = new MockHttpServletRequest();
 		this.webRequest = new ServletWebRequest(this.servletRequest);
 	}
-	
+
 	@Test
 	public void supportsParameter() throws Exception {
 		assertTrue(this.resolver.supportsParameter(this.builderParam));
 		assertTrue(this.resolver.supportsParameter(this.servletBuilderParam));
 		assertFalse(this.resolver.supportsParameter(this.intParam));
 	}
-	
+
 	@Test
 	public void resolveArgument() throws Exception {
 		this.servletRequest.setContextPath("/myapp");
 		this.servletRequest.setServletPath("/main");
 		this.servletRequest.setPathInfo("/accounts");
-		
+
 		Object actual = this.resolver.resolveArgument(this.builderParam, new ModelAndViewContainer(), this.webRequest, null);
-		
+
 		assertNotNull(actual);
 		assertEquals(ServletUriComponentsBuilder.class, actual.getClass());
 		assertEquals("http://localhost/myapp/main", ((ServletUriComponentsBuilder) actual).build().toUriString());
@@ -86,5 +86,5 @@ public class UriComponentsBuilderMethodArgumentResolverTests {
 
 	void handle(UriComponentsBuilder builder, ServletUriComponentsBuilder servletBuilder, int value) {
 	}
-	
+
 }
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java
index 1f2b04df29..21c9c76c7a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java
@@ -36,7 +36,7 @@ import org.springframework.web.servlet.view.RedirectView;
 
 /**
  * Test fixture with {@link ViewMethodReturnValueHandler}.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class ViewMethodReturnValueHandlerTests {
@@ -53,7 +53,7 @@ public class ViewMethodReturnValueHandlerTests {
 		this.mavContainer = new ModelAndViewContainer();
 		this.webRequest = new ServletWebRequest(new MockHttpServletRequest());
 	}
-	
+
 	@Test
 	public void supportsReturnType() throws Exception {
 		assertTrue(this.handler.supportsReturnType(createReturnValueParam("view")));
@@ -63,7 +63,7 @@ public class ViewMethodReturnValueHandlerTests {
 	public void returnView() throws Exception {
 		InternalResourceView view = new InternalResourceView("testView");
 		this.handler.handleReturnValue(view, createReturnValueParam("view"), this.mavContainer, this.webRequest);
-		
+
 		assertSame(view, this.mavContainer.getView());
 	}
 
@@ -74,7 +74,7 @@ public class ViewMethodReturnValueHandlerTests {
 		this.mavContainer.setRedirectModel(redirectModel);
 		MethodParameter param = createReturnValueParam("view");
 		this.handler.handleReturnValue(redirectView, param, this.mavContainer, this.webRequest);
-		
+
 		assertSame(redirectView, this.mavContainer.getView());
 		assertSame("Should have switched to the RedirectModel", redirectModel, this.mavContainer.getModel());
 	}
@@ -83,7 +83,7 @@ public class ViewMethodReturnValueHandlerTests {
 		Method method = getClass().getDeclaredMethod(methodName);
 		return new MethodParameter(method, -1);
 	}
-	
+
 	View view() {
 		return null;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandlerTests.java
index 50f41b337b..d5db099445 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandlerTests.java
@@ -34,7 +34,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributesModelMap;
 
 /**
  * Test fixture with {@link ViewNameMethodReturnValueHandler}.
- * 
+ *
  * @author Rossen Stoyanchev
  */
 public class ViewNameMethodReturnValueHandlerTests {
@@ -51,17 +51,17 @@ public class ViewNameMethodReturnValueHandlerTests {
 		this.mavContainer = new ModelAndViewContainer();
 		this.webRequest = new ServletWebRequest(new MockHttpServletRequest());
 	}
-	
+
 	@Test
 	public void supportsReturnType() throws Exception {
 		assertTrue(this.handler.supportsReturnType(createReturnValueParam("viewName")));
 	}
-	
+
 	@Test
 	public void returnViewName() throws Exception {
 		MethodParameter param = createReturnValueParam("viewName");
 		this.handler.handleReturnValue("testView", param, this.mavContainer, this.webRequest);
-		
+
 		assertEquals("testView", this.mavContainer.getViewName());
 	}
 
@@ -80,9 +80,9 @@ public class ViewNameMethodReturnValueHandlerTests {
 		Method method = getClass().getDeclaredMethod(methodName);
 		return new MethodParameter(method, -1);
 	}
-	
+
 	String viewName() {
 		return null;
 	}
-	
+
 }
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
index 6662b3acb9..e229bac169 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
@@ -31,7 +31,7 @@ import org.springframework.format.support.FormattingConversionService;
 import org.springframework.validation.DataBinder;
 
 /**
- * 
+ *
  * Test fixture for {@link RedirectAttributesModelMap} tests.
  *
  * @author Rossen Stoyanchev
@@ -40,7 +40,7 @@ import org.springframework.validation.DataBinder;
 public class RedirectAttributesModelMapTests {
 
 	private RedirectAttributesModelMap redirectAttributes;
-	
+
 	private FormattingConversionService conversionService;
 
 	@Before
@@ -48,10 +48,10 @@ public class RedirectAttributesModelMapTests {
 		this.conversionService = new DefaultFormattingConversionService();
 		DataBinder dataBinder = new DataBinder(null);
 		dataBinder.setConversionService(conversionService);
-		
+
 		this.redirectAttributes = new RedirectAttributesModelMap(dataBinder);
 	}
-	
+
 	@Test
 	public void addAttributePrimitiveType() {
 		this.redirectAttributes.addAttribute("speed", 65);
@@ -62,12 +62,12 @@ public class RedirectAttributesModelMapTests {
 	public void addAttributeCustomType() {
 		String attrName = "person";
 		this.redirectAttributes.addAttribute(attrName, new TestBean("Fred"));
-		
+
 		assertEquals("ConversionService should have invoked toString()", "Fred", this.redirectAttributes.get(attrName));
 
 		this.conversionService.addConverter(new TestBeanConverter());
 		this.redirectAttributes.addAttribute(attrName, new TestBean("Fred"));
-		
+
 		assertEquals("Type converter should have been used", "[Fred]", this.redirectAttributes.get(attrName));
 	}
 
@@ -83,14 +83,14 @@ public class RedirectAttributesModelMapTests {
 	@Test
 	public void addAttributeValue() {
 		this.redirectAttributes.addAttribute(new TestBean("Fred"));
-		
+
 		assertEquals("Fred", this.redirectAttributes.get("testBean"));
 	}
 
 	@Test
 	public void addAllAttributesList() {
 		this.redirectAttributes.addAllAttributes(Arrays.asList(new TestBean("Fred"), new Integer(5)));
-		
+
 		assertEquals("Fred", this.redirectAttributes.get("testBean"));
 		assertEquals("5", this.redirectAttributes.get("integer"));
 	}
@@ -101,7 +101,7 @@ public class RedirectAttributesModelMapTests {
 		map.put("person", new TestBean("Fred"));
 		map.put("age", 33);
 		this.redirectAttributes.addAllAttributes(map);
-		
+
 		assertEquals("Fred", this.redirectAttributes.get("person"));
 		assertEquals("33", this.redirectAttributes.get("age"));
 	}
@@ -111,18 +111,18 @@ public class RedirectAttributesModelMapTests {
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("person", new TestBean("Fred"));
 		map.put("age", 33);
-		
+
 		this.redirectAttributes.addAttribute("person", new TestBean("Ralph"));
 		this.redirectAttributes.mergeAttributes(map);
-		
+
 		assertEquals("Ralph", this.redirectAttributes.get("person"));
 		assertEquals("33", this.redirectAttributes.get("age"));
 	}
-	
+
 	@Test
 	public void put() {
 		this.redirectAttributes.put("testBean", new TestBean("Fred"));
-		
+
 		assertEquals("Fred", this.redirectAttributes.get("testBean"));
 	}
 
@@ -132,16 +132,16 @@ public class RedirectAttributesModelMapTests {
 		map.put("person", new TestBean("Fred"));
 		map.put("age", 33);
 		this.redirectAttributes.putAll(map);
-		
+
 		assertEquals("Fred", this.redirectAttributes.get("person"));
 		assertEquals("33", this.redirectAttributes.get("age"));
 	}
-	
+
 	public static class TestBeanConverter implements Converter<TestBean, String> {
-		
+
 		public String convert(TestBean source) {
 			return "[" + source.getName() + "]";
 		}
-	}	
-	
+	}
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestContextTests.java
index c568339b0c..ecde8326f6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestContextTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestContextTests.java
@@ -67,7 +67,7 @@ public class RequestContextTests {
 		map.put("spam", "bucket");
 		assertEquals("foo/bar?spam=bucket", context.getContextUrl("{foo}?spam={spam}", map));
 	}
-	
+
 	@Test
 	public void testGetContextUrlWithMapEscaping() throws Exception {
 		request.setContextPath("foo/");
@@ -83,12 +83,12 @@ public class RequestContextTests {
 		request.setContextPath("/app");
 		request.setServletPath("/servlet");
 		RequestContext context = new RequestContext(request, response, servletContext, model);
-		
+
 		assertEquals("/app/servlet", context.getPathToServlet());
 
 		request.setAttribute(WebUtils.FORWARD_CONTEXT_PATH_ATTRIBUTE, "/origApp");
 		request.setAttribute(WebUtils.FORWARD_SERVLET_PATH_ATTRIBUTE, "/origServlet");
-		
+
 		assertEquals("/origApp/origServlet", context.getPathToServlet());
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
index d26f18d120..84e940352a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
@@ -25,7 +25,7 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
 public class RequestDataValueProcessorWrapper implements RequestDataValueProcessor {
 
 	private RequestDataValueProcessor processor;
-	
+
 	public void setRequestDataValueProcessor(RequestDataValueProcessor processor) {
 		this.processor = processor;
 	}
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 50304a348b..d87212008c 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
@@ -39,7 +39,7 @@ public class ServletUriComponentsBuilderTests {
 		this.request.setServerPort(80);
 		this.request.setContextPath("/mvc-showcase");
 	}
-	
+
 	@Test
 	public void fromRequest() {
 		request.setRequestURI("/mvc-showcase/data/param");
@@ -61,16 +61,16 @@ public class ServletUriComponentsBuilderTests {
 	public void fromRequestAtypicalHttpPort() {
 		request.setServerPort(8080);
 		String result = ServletUriComponentsBuilder.fromRequest(request).build().toUriString();
-		
+
 		assertEquals("http://localhost:8080", result);
 	}
-	
+
 	@Test
 	public void fromRequestAtypicalHttpsPort() {
 		request.setScheme("https");
 		request.setServerPort(9043);
 		String result = ServletUriComponentsBuilder.fromRequest(request).build().toUriString();
-		
+
 		assertEquals("https://localhost:9043", result);
 	}
 
@@ -88,9 +88,9 @@ public class ServletUriComponentsBuilderTests {
 		request.setRequestURI("/mvc-showcase/data/param");
 		request.setQueryString("foo=123");
 		String result = ServletUriComponentsBuilder.fromContextPath(request).build().toUriString();
-		
+
 		assertEquals("http://localhost/mvc-showcase", result);
-	}	
+	}
 
 	@Test
 	public void fromServletMapping() {
@@ -98,9 +98,9 @@ public class ServletUriComponentsBuilderTests {
 		request.setServletPath("/app");
 		request.setQueryString("foo=123");
 		String result = ServletUriComponentsBuilder.fromServletMapping(request).build().toUriString();
-		
+
 		assertEquals("http://localhost/mvc-showcase/app", result);
-	}	
+	}
 
 	@Test
 	public void fromCurrentRequest() {
@@ -116,5 +116,5 @@ public class ServletUriComponentsBuilderTests {
 			RequestContextHolder.resetRequestAttributes();
 		}
 	}
-	
+
 }
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 6b02ec1627..a8a3167c56 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
@@ -159,16 +159,16 @@ public class EvalTagTests extends AbstractTagTests {
 
 
 	public static class Bean {
-		
+
 		public String method() {
 			return "foo";
 		}
-		
+
 		@NumberFormat(style=Style.PERCENT)
 		public BigDecimal getFormattable() {
 			return new BigDecimal(".25");
 		}
-		
+
 		public String html() {
 			return "<p>";
 		}
@@ -176,7 +176,7 @@ public class EvalTagTests extends AbstractTagTests {
 		public String getBean() {
 			return "not the bean object";
 		}
-		
+
 		public Object getNull() {
 			return null;
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
index 66090324b6..d2205f8fcc 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
index 50f7110a3c..3d33e75a04 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
@@ -300,7 +300,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertTrue("Correct doStartTag return value", tag.doStartTag() == Tag.EVAL_BODY_INCLUDE);
 		assertEquals("Correct message", "test &amp; text", message.toString());
 	}
-	
+
 	public void testMessageTagWithTextAndExpressionArgumentFormat() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -354,12 +354,12 @@ public class MessageTagTests extends AbstractTagTests {
 		MessageTag tag = new MessageTag();
 		tag.setPageContext(pc);
 		tag.setText("text & text");
-		tag.setVar("testvar");		
+		tag.setVar("testvar");
 		tag.setScope("page");
 		tag.doStartTag();
 		assertEquals("text & text", pc.getAttribute("testvar"));
 		tag.release();
-		
+
 		tag = new MessageTag();
 		tag.setPageContext(pc);
 		tag.setCode("test");
@@ -374,7 +374,7 @@ public class MessageTagTests extends AbstractTagTests {
 		MessageTag tag = new MessageTag();
 		tag.setPageContext(pc);
 		tag.setText("text & text");
-		tag.setVar("testvar");		
+		tag.setVar("testvar");
 		tag.doStartTag();
 		assertEquals("text & text", pc.getAttribute("testvar"));
 		tag.release();
@@ -383,11 +383,11 @@ public class MessageTagTests extends AbstractTagTests {
 		tag.setPageContext(pc);
 		tag.setCode("test");
 		tag.setVar("testvar");
-			
+
 		tag.doStartTag();
 		assertEquals("Correct message", "test message", pc.getAttribute("testvar"));
 	}
-	
+
 	public void testNullMessageSource() throws JspException {
 		PageContext pc = createPageContext();
 		ConfigurableWebApplicationContext ctx = (ConfigurableWebApplicationContext)
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
index 66b6aa90d5..943ebcbd12 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2008 the original author 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.
@@ -26,7 +26,7 @@ import org.springframework.mock.web.test.MockHttpServletResponse;
 
 /**
  * Unit tests for ParamTag
- * 
+ *
  * @author Scott Andrews
  */
 public class ParamTagTests extends AbstractTagTests {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java
index 4cd6406a55..49d305cc4e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2008 the original author 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.
@@ -20,7 +20,7 @@ import junit.framework.TestCase;
 
 /**
  * Unit tests for Param
- * 
+ *
  * @author Scott Andrews
  */
 public class ParamTests extends TestCase {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
index e1de2505de..be9f385a84 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
index 1faac4d93a..85839b405f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2008 the original author 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.
@@ -34,7 +34,7 @@ import org.springframework.util.ReflectionUtils;
 
 /**
  * Unit tests for UrlTag
- * 
+ *
  * @author Scott Andrews
  */
 public class UrlTagTests extends AbstractTagTests {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
index 53f3303cab..e101be304b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
@@ -104,7 +104,7 @@ public abstract class AbstractHtmlElementTagTests extends AbstractTagTests {
 		RequestDataValueProcessor mockProcessor = createMock(RequestDataValueProcessor.class);
 		ServletRequest request = getPageContext().getRequest();
 		StaticWebApplicationContext wac = (StaticWebApplicationContext) RequestContextUtils.getWebApplicationContext(request);
-		wac.getBean(RequestDataValueProcessorWrapper.class).setRequestDataValueProcessor(mockProcessor);		
+		wac.getBean(RequestDataValueProcessorWrapper.class).setRequestDataValueProcessor(mockProcessor);
 		return mockProcessor;
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
index 3208aa74f6..431f85d03d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
@@ -37,11 +37,11 @@ public class ButtonTagTests extends AbstractFormTagTests {
 		this.tag.setName("My Name");
 		this.tag.setValue("My Button");
 	}
-	
+
 	public void testButtonTag() throws Exception {
 		assertEquals(Tag.EVAL_BODY_INCLUDE, this.tag.doStartTag());
 		assertEquals(Tag.EVAL_PAGE, this.tag.doEndTag());
-		
+
 		String output = getOutput();
 		assertTagOpened(output);
 		assertTagClosed(output);
@@ -52,10 +52,10 @@ public class ButtonTagTests extends AbstractFormTagTests {
 		assertContainsAttribute(output, "value", "My Button");
 		assertAttributeNotPresent(output, "disabled");
 	}
-	
+
 	public void testDisabled() throws Exception {
 		this.tag.setDisabled("true");
-		
+
 		this.tag.doStartTag();
 		this.tag.doEndTag();
 
@@ -65,7 +65,7 @@ public class ButtonTagTests extends AbstractFormTagTests {
 
 		assertContainsAttribute(output, "disabled", "disabled");
 	}
-	
+
 	@Override
 	protected TestBean createTestBean() {
 		return new TestBean();
@@ -78,7 +78,7 @@ public class ButtonTagTests extends AbstractFormTagTests {
 	protected final void assertTagOpened(String output) {
 		assertTrue("Tag not opened properly", output.startsWith("<button "));
 	}
-	
+
 	@SuppressWarnings("serial")
 	protected ButtonTag createTag(final Writer writer) {
 		return new ButtonTag() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
index c9b9d3ddf0..bcca71760c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
@@ -80,7 +80,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 		assertEquals("checked", checkboxElement.attribute("checked").getValue());
 		assertEquals("true", checkboxElement.attribute("value").getValue());
 	}
-	
+
 	public void testWithIndexedBooleanObjectNotChecked() throws Exception {
 		this.tag.setPath("someMap[key]");
 		int result = this.tag.doStartTag();
@@ -110,7 +110,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 		this.tag.setPath("someBoolean");
 		this.tag.setDynamicAttribute(null, dynamicAttribute1, dynamicAttribute1);
 		this.tag.setDynamicAttribute(null, dynamicAttribute2, dynamicAttribute2);
-		
+
 		int result = this.tag.doStartTag();
 		assertEquals(Tag.SKIP_BODY, result);
 		String output = getOutput();
@@ -612,7 +612,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 		assertEquals("checked", checkboxElement.attribute("checked").getValue());
 		assertEquals("true", checkboxElement.attribute("value").getValue());
 	}
-	
+
 	public void testDynamicTypeAttribute() throws JspException {
 		try {
 			this.tag.setDynamicAttribute(null, "type", "email");
@@ -622,8 +622,8 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 			assertEquals("Attribute type=\"email\" is not allowed", e.getMessage());
 		}
 	}
-	
-	
+
+
 	private Date getDate() {
 		Calendar cal = Calendar.getInstance();
 		cal.set(Calendar.YEAR, 10);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
index 5a65340930..41cf9aa72b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
@@ -105,16 +105,16 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		assertEquals("baz", checkboxElement3.attribute("value").getValue());
 		assertEquals("baz", spanElement3.getStringValue());
 	}
-	
+
 	public void testWithMultiValueArrayAndDynamicAttributes() throws Exception {
 		String dynamicAttribute1 = "attr1";
 		String dynamicAttribute2 = "attr2";
-		
+
 		this.tag.setPath("stringArray");
 		this.tag.setItems(new Object[] {"foo", "bar", "baz"});
 		this.tag.setDynamicAttribute(null, dynamicAttribute1, dynamicAttribute1);
 		this.tag.setDynamicAttribute(null, dynamicAttribute2, dynamicAttribute2);
-		
+
 		int result = this.tag.doStartTag();
 		assertEquals(Tag.SKIP_BODY, result);
 
@@ -257,12 +257,12 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		tag.setItemValue("name");
 		int result = this.tag.doStartTag();
 		assertEquals(Tag.SKIP_BODY, result);
-		
+
 		String output = getOutput();
-		
+
 		// wrap the output so it is valid XML
 		output = "<doc>" + output + "</doc>";
-		
+
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
 		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
@@ -544,15 +544,15 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		this.tag.setItems(allPets);
 		this.tag.setItemValue("name");
 		this.tag.setItemLabel("label");
-		
+
 		int result = this.tag.doStartTag();
 		assertEquals(Tag.SKIP_BODY, result);
-		
+
 		String output = getOutput();
-		
+
 		// wrap the output so it is valid XML
 		output = "<doc>" + output + "</doc>";
-		
+
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
 		Element spanElement1 = (Element) document.getRootElement().elements().get(0);
@@ -687,7 +687,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		assertEquals("disabled", checkboxElement.attribute("disabled").getValue());
 		assertEquals("foo", checkboxElement.attribute("value").getValue());
 	}
-	
+
 	public void testSpanElementCustomizable() throws Exception {
 		this.tag.setPath("stringArray");
 		this.tag.setItems(new Object[] {"foo", "bar", "baz"});
@@ -714,8 +714,8 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 			assertEquals("Attribute type=\"email\" is not allowed", e.getMessage());
 		}
 	}
-	
-	
+
+
 	private Date getDate() {
 		Calendar cal = Calendar.getInstance();
 		cal.set(Calendar.YEAR, 10);
@@ -742,7 +742,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		Set someObjects = new HashSet();
 		someObjects.add(new ItemPet("PET1"));
 		someObjects.add(new ItemPet("PET2"));
-		
+
 		this.bean = new TestBean();
 		this.bean.setDate(getDate());
 		this.bean.setName("Rob Harrop");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
index 83e5868fad..7cb49c8e25 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
@@ -159,11 +159,11 @@ public class ErrorsTagTests extends AbstractFormTagTests {
 		assertBlockTagContains(output, "Default Message");
 		assertBlockTagContains(output, "Too Short");
 	}
-	
+
 	public void testWithErrorsAndDynamicAttributes() throws Exception {
 		String dynamicAttribute1 = "attr1";
 		String dynamicAttribute2 = "attr2";
-		
+
 		this.tag.setDynamicAttribute(null, dynamicAttribute1, dynamicAttribute1);
 		this.tag.setDynamicAttribute(null, dynamicAttribute2, dynamicAttribute2);
 
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 a5e12796f6..81710ed789 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
@@ -39,14 +39,14 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
  * @author Jeremy Grelle
  */
 public class FormTagTests extends AbstractHtmlElementTagTests {
-	
+
 	private static final String REQUEST_URI = "/my/form";
 
 	private static final String QUERY_STRING = "foo=bar";
 
 
 	private FormTag tag;
-	
+
 	private MockHttpServletRequest request;
 
 
@@ -187,25 +187,10 @@ public class FormTagTests extends AbstractHtmlElementTagTests {
 		assertEquals("<form id=\"command\" action=\"/my/form?foo=bar&amp;stuff=&quot;&gt;&lt;script&gt;alert(&#39;XSS!&#39;)&lt;/script&gt;\" method=\"post\">",
 				getOutput());
 	}
-	
+
 	public void testGet() throws Exception {
 		this.tag.setMethod("get");
-		
-		this.tag.doStartTag();
-		this.tag.doEndTag();
-		this.tag.doFinally();
-		
-		String output = getOutput();
-		String formOutput = getFormTag(output);
-		String inputOutput = getInputTag(output);
-		
-		assertContainsAttribute(formOutput, "method", "get");
-		assertEquals("", inputOutput);
-	}
-	
-	public void testPost() throws Exception {
-		this.tag.setMethod("post");
-		
+
 		this.tag.doStartTag();
 		this.tag.doEndTag();
 		this.tag.doFinally();
@@ -213,14 +198,29 @@ public class FormTagTests extends AbstractHtmlElementTagTests {
 		String output = getOutput();
 		String formOutput = getFormTag(output);
 		String inputOutput = getInputTag(output);
-		
+
+		assertContainsAttribute(formOutput, "method", "get");
+		assertEquals("", inputOutput);
+	}
+
+	public void testPost() throws Exception {
+		this.tag.setMethod("post");
+
+		this.tag.doStartTag();
+		this.tag.doEndTag();
+		this.tag.doFinally();
+
+		String output = getOutput();
+		String formOutput = getFormTag(output);
+		String inputOutput = getInputTag(output);
+
 		assertContainsAttribute(formOutput, "method", "post");
 		assertEquals("", inputOutput);
 	}
-	
+
 	public void testPut() throws Exception {
 		this.tag.setMethod("put");
-		
+
 		this.tag.doStartTag();
 		this.tag.doEndTag();
 		this.tag.doFinally();
@@ -234,10 +234,10 @@ public class FormTagTests extends AbstractHtmlElementTagTests {
 		assertContainsAttribute(inputOutput, "value", "put");
 		assertContainsAttribute(inputOutput, "type", "hidden");
 	}
-	
+
 	public void testDelete() throws Exception {
 		this.tag.setMethod("delete");
-		
+
 		this.tag.doStartTag();
 		this.tag.doEndTag();
 		this.tag.doFinally();
@@ -251,11 +251,11 @@ public class FormTagTests extends AbstractHtmlElementTagTests {
 		assertContainsAttribute(inputOutput, "value", "delete");
 		assertContainsAttribute(inputOutput, "type", "hidden");
 	}
-	
+
 	public void testCustomMethodParameter() throws Exception {
 		this.tag.setMethod("put");
 		this.tag.setMethodParam("methodParameter");
-		
+
 		this.tag.doStartTag();
 		this.tag.doEndTag();
 		this.tag.doFinally();
@@ -279,24 +279,24 @@ public class FormTagTests extends AbstractHtmlElementTagTests {
 		this.tag.doFinally();
 		assertNull(getPageContext().getAttribute(FormTag.MODEL_ATTRIBUTE_VARIABLE_NAME, PageContext.REQUEST_SCOPE));
 	}
-	
+
 	public void testRequestDataValueProcessorHooks() throws Exception {
 		String action = "/my/form?foo=bar";
 		RequestDataValueProcessor processor = getMockRequestDataValueProcessor();
 		expect(processor.processAction(this.request, action)).andReturn(action);
 		expect(processor.getExtraHiddenFields(this.request)).andReturn(Collections.singletonMap("key", "value"));
 		replay(processor);
-		
+
 		this.tag.doStartTag();
 		this.tag.doEndTag();
 		this.tag.doFinally();
-		
+
 		String output = getOutput();
-		
+
 		assertEquals("<input type=\"hidden\" name=\"key\" value=\"value\"></input>", getInputTag(output));
 		assertFormTagOpened(output);
 		assertFormTagClosed(output);
-		
+
 		verify(processor);
 	}
 
@@ -320,5 +320,5 @@ public class FormTagTests extends AbstractHtmlElementTagTests {
 	private static void assertFormTagClosed(String output) {
 		assertTrue(output.endsWith("</form>"));
 	}
-	
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
index 915be9e2b4..4058788ffd 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
@@ -73,7 +73,7 @@ public class HiddenInputTagTests extends AbstractFormTagTests {
 		assertContainsAttribute(output, "type", "hidden");
 		assertContainsAttribute(output, "value", "12.34f");
 	}
-	
+
 	public void testDynamicTypeAttribute() throws JspException {
 		try {
 			this.tag.setDynamicAttribute(null, "type", "email");
@@ -86,7 +86,7 @@ public class HiddenInputTagTests extends AbstractFormTagTests {
 
 	public void testDisabledTrue() throws Exception {
 		this.tag.setDisabled("true");
-		
+
 		this.tag.doStartTag();
 		this.tag.doEndTag();
 
@@ -98,10 +98,10 @@ public class HiddenInputTagTests extends AbstractFormTagTests {
 	}
 
 	// SPR-8661
-	
+
 	public void testDisabledFalse() throws Exception {
 		this.tag.setDisabled("false");
-		
+
 		this.tag.doStartTag();
 		this.tag.doEndTag();
 
@@ -111,7 +111,7 @@ public class HiddenInputTagTests extends AbstractFormTagTests {
 
 		assertAttributeNotPresent(output, "disabled");
 	}
-	
+
 	private void assertTagClosed(String output) {
 		assertTrue(output.endsWith("/>"));
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
index 1fb2487e60..82c233b4f9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
@@ -356,7 +356,7 @@ public class InputTagTests extends AbstractFormTagTests {
 		assertContainsAttribute(output, "type", "number");
 		assertValueAttribute(output, "12.34");
 	}
-	
+
 	public void testDynamicTypeRadioAttribute() throws JspException {
 		try {
 			this.tag.setDynamicAttribute(null, "type", "radio");
@@ -366,7 +366,7 @@ public class InputTagTests extends AbstractFormTagTests {
 			assertEquals("Attribute type=\"radio\" is not allowed", e.getMessage());
 		}
 	}
-	
+
 	public void testDynamicTypeCheckboxAttribute() throws JspException {
 		try {
 			this.tag.setDynamicAttribute(null, "type", "checkbox");
@@ -376,7 +376,7 @@ public class InputTagTests extends AbstractFormTagTests {
 			assertEquals("Attribute type=\"checkbox\" is not allowed", e.getMessage());
 		}
 	}
-	
+
 	protected final void assertTagClosed(String output) {
 		assertTrue("Tag not closed properly", output.endsWith("/>"));
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
index ba21f23384..a53ca2e193 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
@@ -71,15 +71,15 @@ public class LabelTagTests extends AbstractFormTagTests {
 		assertTrue(output.startsWith("<label "));
 		assertTrue(output.endsWith("</label>"));
 	}
-	
+
 	public void testSimpleRenderWithDynamicAttributes() throws Exception {
 		String dynamicAttribute1 = "attr1";
 		String dynamicAttribute2 = "attr2";
-		
+
 		this.tag.setPath("name");
 		this.tag.setDynamicAttribute(null, dynamicAttribute1, dynamicAttribute1);
 		this.tag.setDynamicAttribute(null, dynamicAttribute2, dynamicAttribute2);
-		
+
 		int startResult = this.tag.doStartTag();
 		int endResult = this.tag.doEndTag();
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
index 56aef73a1d..e4b956177b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
@@ -29,7 +29,7 @@ import org.springframework.web.servlet.support.BindStatus;
 public class OptionTagEnumTests extends AbstractHtmlElementTagTests {
 
 	private OptionTag tag;
-	
+
 	private SelectTag parentTag;
 
 	protected void onSetUp() {
@@ -40,7 +40,7 @@ public class OptionTagEnumTests extends AbstractHtmlElementTagTests {
 		};
 		this.parentTag = new SelectTag() {
 			public String getName() {
-				// Should not be used other than to delegate to 
+				// Should not be used other than to delegate to
 				// RequestDataValueDataProcessor
 				return "testName";
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
index b4f0134164..062d7ed270 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
@@ -59,7 +59,7 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 		};
 		this.parentTag = new SelectTag() {
 			public String getName() {
-				// Should not be used other than to delegate to 
+				// Should not be used other than to delegate to
 				// RequestDataValueDataProcessor
 				return "testName";
 			}
@@ -106,18 +106,18 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 		assertContainsAttribute(output, "value", "bar");
 		assertBlockTagContains(output, "Bar");
 	}
-	
+
 	public void testRenderWithDynamicAttributes() throws Exception {
 		String dynamicAttribute1 = "attr1";
 		String dynamicAttribute2 = "attr2";
-		
+
 		String selectName = "testBean.name";
 		getPageContext().setAttribute(SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, new BindStatus(getRequestContext(), selectName, false));
 		this.tag.setValue("bar");
 		this.tag.setLabel("Bar");
 		this.tag.setDynamicAttribute(null, dynamicAttribute1, dynamicAttribute1);
 		this.tag.setDynamicAttribute(null, dynamicAttribute2, dynamicAttribute2);
-		
+
 		int result = this.tag.doStartTag();
 		assertEquals(BodyTag.EVAL_BODY_BUFFERED, result);
 		result = this.tag.doEndTag();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
index 968a42a1c8..de33846e77 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
@@ -65,7 +65,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
 				return new TagWriter(getWriter());
 			}
 			public String getName() {
-				// Should not be used other than to delegate to 
+				// Should not be used other than to delegate to
 				// RequestDataValueDataProcessor
 				return "testName";
 			}
@@ -103,11 +103,11 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
 		assertEquals("myClass", element.attribute("class").getValue());
 		assertEquals("CLICK", element.attribute("onclick").getValue());
 	}
-	
+
 	public void testWithCollectionAndDynamicAttributes() throws Exception {
 		String dynamicAttribute1 = "attr1";
 		String dynamicAttribute2 = "attr2";
-		
+
 		getPageContext().setAttribute(
 				SelectTag.LIST_VALUE_PAGE_ATTRIBUTE, new BindStatus(getRequestContext(), "testBean.country", false));
 
@@ -119,7 +119,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
 		this.tag.setOnclick("CLICK");
 		this.tag.setDynamicAttribute(null, dynamicAttribute1, dynamicAttribute1);
 		this.tag.setDynamicAttribute(null, dynamicAttribute2, dynamicAttribute2);
-		
+
 		int result = this.tag.doStartTag();
 		assertEquals(Tag.SKIP_BODY, result);
 		String output = getOutput();
@@ -203,18 +203,18 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
 		this.tag.setItemValue("isoCode");
 		this.tag.setItemLabel("name");
 		this.selectTag.setPath("testBean");
-		
+
 		this.selectTag.doStartTag();
 		int result = this.tag.doStartTag();
 		assertEquals(Tag.SKIP_BODY, result);
 		this.tag.doEndTag();
 		this.selectTag.doEndTag();
-		
+
 		String output = getOutput();
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
 		Element rootElement = document.getRootElement();
-		
+
 		List children = rootElement.elements();
 		assertEquals("Incorrect number of children", 0, children.size());
 	}
@@ -223,7 +223,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
 		BeanWithEnum testBean = new BeanWithEnum();
 		testBean.setTestEnum(TestEnum.VALUE_2);
 		getPageContext().getRequest().setAttribute("testBean", testBean);
-		
+
 		this.selectTag.setPath("testBean.testEnum");
 
 		this.selectTag.doStartTag();
@@ -237,7 +237,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
 		Element rootElement = document.getRootElement();
-		
+
 		assertEquals(2, rootElement.elements().size());
 		Node value1 = rootElement.selectSingleNode("option[@value = 'VALUE_1']");
 		Node value2 = rootElement.selectSingleNode("option[@value = 'VALUE_2']");
@@ -250,7 +250,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
 		BeanWithEnum testBean = new BeanWithEnum();
 		testBean.setTestEnum(TestEnum.VALUE_2);
 		getPageContext().getRequest().setAttribute("testBean", testBean);
-		
+
 		this.selectTag.setPath("testBean.testEnum");
 		this.tag.setItemLabel("enumLabel");
 		this.tag.setItemValue("enumValue");
@@ -266,7 +266,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
 		Element rootElement = document.getRootElement();
-		
+
 		assertEquals(2, rootElement.elements().size());
 		Node value1 = rootElement.selectSingleNode("option[@value = 'Value: VALUE_1']");
 		Node value2 = rootElement.selectSingleNode("option[@value = 'Value: VALUE_2']");
@@ -304,5 +304,5 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
 		RequestContext context = new RequestContext((HttpServletRequest) pageContext.getRequest(), model);
 		pageContext.setAttribute(RequestContextAwareTag.REQUEST_CONTEXT_PAGE_ATTRIBUTE, context);
 	}
-	
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
index a6a3f1c261..ba1a340019 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
@@ -55,12 +55,12 @@ public class RadioButtonTagTests extends AbstractFormTagTests {
 	public void testWithCheckedValue() throws Exception {
 		String dynamicAttribute1 = "attr1";
 		String dynamicAttribute2 = "attr2";
-		
+
 		this.tag.setPath("sex");
 		this.tag.setValue("M");
 		this.tag.setDynamicAttribute(null, dynamicAttribute1, dynamicAttribute1);
 		this.tag.setDynamicAttribute(null, dynamicAttribute2, dynamicAttribute2);
-		
+
 		int result = this.tag.doStartTag();
 		assertEquals(Tag.SKIP_BODY, result);
 
@@ -74,7 +74,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests {
 		assertContainsAttribute(output, dynamicAttribute1, dynamicAttribute1);
 		assertContainsAttribute(output, dynamicAttribute2, dynamicAttribute2);
 	}
-	
+
 	public void testWithCheckedValueAndDynamicAttributes() throws Exception {
 		this.tag.setPath("sex");
 		this.tag.setValue("M");
@@ -237,7 +237,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests {
 			assertEquals("Attribute type=\"email\" is not allowed", e.getMessage());
 		}
 	}
-	
+
 	private void assertTagOpened(String output) {
 		assertTrue(output.indexOf("<input ") > -1);
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
index ef10fe1821..a780aa02d1 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
@@ -99,11 +99,11 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests {
 		assertEquals("baz", radioButtonElement3.attribute("value").getValue());
 		assertEquals("baz", spanElement3.getStringValue());
 	}
-	
+
 	public void testWithMultiValueArrayAndDynamicAttributes() throws Exception {
 		String dynamicAttribute1 = "attr1";
 		String dynamicAttribute2 = "attr2";
-		
+
 		this.tag.setPath("stringArray");
 		this.tag.setItems(new Object[] {"foo", "bar", "baz"});
 		this.tag.setDynamicAttribute(null, dynamicAttribute1, dynamicAttribute1);
@@ -460,12 +460,12 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests {
 		assertEquals("Mufty", radioButtonElement5.attribute("value").getValue());
 		assertEquals("MUFTY", spanElement5.getStringValue());
 	}
-	
+
 	public void testWithoutItemsEnumBindTarget() throws Exception {
 		BeanWithEnum testBean = new BeanWithEnum();
 		testBean.setTestEnum(TestEnum.VALUE_2);
 		getPageContext().getRequest().setAttribute("testBean", testBean);
-		
+
 		this.tag.setPath("testEnum");
 		int result = this.tag.doStartTag();
 		assertEquals(Tag.SKIP_BODY, result);
@@ -474,7 +474,7 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests {
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
 		Element rootElement = document.getRootElement();
-		
+
 		assertEquals(2, rootElement.elements().size());
 		Node value1 = rootElement.selectSingleNode("//input[@value = 'VALUE_1']");
 		Node value2 = rootElement.selectSingleNode("//input[@value = 'VALUE_2']");
@@ -482,12 +482,12 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests {
 		assertEquals("TestEnum: VALUE_2", rootElement.selectSingleNode("//label[@for = '" + value2.valueOf("@id") + "']").getText());
 		assertEquals(value2, rootElement.selectSingleNode("//input[@checked]"));
 	}
-	
+
 	public void testWithoutItemsEnumBindTargetWithExplicitLabelsAndValues() throws Exception {
 		BeanWithEnum testBean = new BeanWithEnum();
 		testBean.setTestEnum(TestEnum.VALUE_2);
 		getPageContext().getRequest().setAttribute("testBean", testBean);
-		
+
 		this.tag.setPath("testEnum");
 		this.tag.setItemLabel("enumLabel");
 		this.tag.setItemValue("enumValue");
@@ -498,7 +498,7 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests {
 		SAXReader reader = new SAXReader();
 		Document document = reader.read(new StringReader(output));
 		Element rootElement = document.getRootElement();
-		
+
 		assertEquals(2, rootElement.elements().size());
 		Node value1 = rootElement.selectSingleNode("//input[@value = 'Value: VALUE_1']");
 		Node value2 = rootElement.selectSingleNode("//input[@value = 'Value: VALUE_2']");
@@ -569,7 +569,7 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests {
 			assertEquals("Attribute type=\"email\" is not allowed", e.getMessage());
 		}
 	}
-	
+
 	private Date getDate() {
 		Calendar cal = Calendar.getInstance();
 		cal.set(Calendar.YEAR, 10);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
index 97b001d364..893f7e6293 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
@@ -83,7 +83,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 		this.tag.setItemLabel("name");
 		this.tag.setDynamicAttribute(null, dynamicAttribute1, dynamicAttribute1);
 		this.tag.setDynamicAttribute(null, dynamicAttribute2, dynamicAttribute2);
-		
+
 		int result = this.tag.doStartTag();
 		assertEquals(Tag.SKIP_BODY, result);
 
@@ -846,7 +846,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 	private TestBean getTestBean() {
 		return (TestBean) getPageContext().getRequest().getAttribute(COMMAND_NAME);
 	}
-	
+
 	public static class TestBeanWrapper {
 		private TestBean bean;
 
@@ -857,7 +857,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 		public void setBean(TestBean bean) {
 			this.bean = bean;
 		}
-		
+
 	}
 
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java
index e15e78ffdc..860fffb567 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java
@@ -2,13 +2,13 @@ package org.springframework.web.servlet.tags.form;
 
 /**
  * Test related data types for <code>org.springframework.web.servlet.tags.form</code> package.
- * 
+ *
  * @author Scott Andrews
  */
 public class TestTypes { }
 
 class BeanWithEnum {
-	
+
 	private TestEnum testEnum;
 
 	public TestEnum getTestEnum() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
index 581acd7bcf..d391092717 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
@@ -52,11 +52,11 @@ public class TextareaTagTests extends AbstractFormTagTests {
 		assertContainsAttribute(output, "readonly", "readonly");
 		assertBlockTagContains(output, "Rob");
 	}
-	
+
 	public void testSimpleBindWithDynamicAttributes() throws Exception {
 		String dynamicAttribute1 = "attr1";
 		String dynamicAttribute2 = "attr2";
-		
+
 		this.tag.setPath("name");
 		this.tag.setReadonly("true");
 		this.tag.setDynamicAttribute(null, dynamicAttribute1, dynamicAttribute1);
@@ -87,7 +87,7 @@ public class TextareaTagTests extends AbstractFormTagTests {
 	public void testSimpleBindWithHtmlEscaping() throws Exception {
 		final String NAME = "Rob \"I Love Mangos\" Harrop";
 		final String HTML_ESCAPED_NAME = "Rob &quot;I Love Mangos&quot; Harrop";
-		
+
 		this.tag.setPath("name");
 		this.rob.setName(NAME);
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/theme/ThemeResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/theme/ThemeResolverTests.java
index a63b929300..a71265c8c1 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/theme/ThemeResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/theme/ThemeResolverTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
index 5fbde8bfbf..873e98e8e0 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
@@ -49,7 +49,7 @@ import org.springframework.web.servlet.View;
 public class BaseViewTests extends TestCase {
 
 	public void testRenderWithoutStaticAttributes() throws Exception {
-		
+
 		WebApplicationContext wac = createMock(WebApplicationContext.class);
 		wac.getServletContext();
 		expectLastCall().andReturn(new MockServletContext());
@@ -58,11 +58,11 @@ public class BaseViewTests extends TestCase {
 		HttpServletRequest request = new MockHttpServletRequest();
 		HttpServletResponse response = new MockHttpServletResponse();
 		TestView tv = new TestView(wac);
-		
+
 		// Check superclass handles duplicate init
-		tv.setApplicationContext(wac);		
 		tv.setApplicationContext(wac);
-		
+		tv.setApplicationContext(wac);
+
 		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("foo", "bar");
 		model.put("something", new Object());
@@ -70,11 +70,11 @@ public class BaseViewTests extends TestCase {
 
 		// check it contains all
 		checkContainsAll(model, tv.model);
-		
+
 		assertTrue(tv.inited);
 		verify(wac);
 	}
-	
+
 	/**
 	 * Test attribute passing, NOT CSV parsing.
 	 */
@@ -87,13 +87,13 @@ public class BaseViewTests extends TestCase {
 		HttpServletRequest request = new MockHttpServletRequest();
 		HttpServletResponse response = new MockHttpServletResponse();
 		TestView tv = new TestView(wac);
-	
+
 		tv.setApplicationContext(wac);
-		Properties p = new Properties();	
+		Properties p = new Properties();
 		p.setProperty("foo", "bar");
 		p.setProperty("something", "else");
-		tv.setAttributes(p);	
-	
+		tv.setAttributes(p);
+
 		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("one", new HashMap<Object, Object>());
 		model.put("two", new Object());
@@ -102,7 +102,7 @@ public class BaseViewTests extends TestCase {
 		// Check it contains all
 		checkContainsAll(model, tv.model);
 		checkContainsAll(p, tv.model);
-	
+
 		assertTrue(tv.inited);
 		verify(wac);
 	}
@@ -118,17 +118,17 @@ public class BaseViewTests extends TestCase {
 
 		TestView tv = new TestView(wac);
 		tv.setApplicationContext(wac);
-		
-		Properties p = new Properties();	
+
+		Properties p = new Properties();
 		p.setProperty("one", "bar");
 		p.setProperty("something", "else");
-		tv.setAttributes(p);	
-		
+		tv.setAttributes(p);
+
 		Map<String, Object> pathVars = new HashMap<String, Object>();
 		pathVars.put("one", new HashMap<Object, Object>());
 		pathVars.put("two", new Object());
 		request.setAttribute(View.PATH_VARIABLES, pathVars);
-		
+
 		tv.render(new HashMap<String, Object>(), request, response);
 
 		// Check it contains all
@@ -140,7 +140,7 @@ public class BaseViewTests extends TestCase {
 		assertTrue(tv.inited);
 		verify(wac);
 	}
-	
+
 	public void testDynamicModelOverridesStaticAttributesIfCollision() throws Exception {
 		WebApplicationContext wac = createMock(WebApplicationContext.class);
 		wac.getServletContext();
@@ -152,10 +152,10 @@ public class BaseViewTests extends TestCase {
 		TestView tv = new TestView(wac);
 
 		tv.setApplicationContext(wac);
-		Properties p = new Properties();	
+		Properties p = new Properties();
 		p.setProperty("one", "bar");
 		p.setProperty("something", "else");
-		tv.setAttributes(p);	
+		tv.setAttributes(p);
 
 		Map<String, Object> model = new HashMap<String, Object>();
 		model.put("one", new HashMap<Object, Object>());
@@ -204,13 +204,13 @@ public class BaseViewTests extends TestCase {
 		assertTrue(tv.inited);
 		verify(wac);
 	}
-	
+
 	public void testIgnoresNullAttributes() {
 		AbstractView v = new ConcreteView();
 		v.setAttributes(null);
 		assertTrue(v.getStaticAttributes().size() == 0);
 	}
-	
+
 	/**
 	 * Test only the CSV parsing implementation.
 	 */
@@ -219,13 +219,13 @@ public class BaseViewTests extends TestCase {
 		v.setAttributesCSV(null);
 		assertTrue(v.getStaticAttributes().size() == 0);
 	}
-	
+
 	public void testAttributeCSVParsingIgnoresEmptyString() {
 		AbstractView v = new ConcreteView();
 		v.setAttributesCSV("");
 		assertTrue(v.getStaticAttributes().size() == 0);
 	}
-	
+
 	/**
 	 * Format is attname0={value1},attname1={value1}
 	 */
@@ -236,7 +236,7 @@ public class BaseViewTests extends TestCase {
 		assertTrue(v.getStaticAttributes().get("foo").equals("bar"));
 		assertTrue(v.getStaticAttributes().get("king").equals("kong"));
 	}
-	
+
 	public void testAttributeCSVParsingValidWithWeirdCharacters() {
 		AbstractView v = new ConcreteView();
 		String fooval = "owfie   fue&3[][[[2 \n\n \r  \t 8\ufffd3";
@@ -247,7 +247,7 @@ public class BaseViewTests extends TestCase {
 		assertTrue(v.getStaticAttributes().get("foo").equals(fooval));
 		assertTrue(v.getStaticAttributes().get("king").equals(kingval));
 	}
-	
+
 	public void testAttributeCSVParsingInvalid() {
 		AbstractView v = new ConcreteView();
 		try {
@@ -257,7 +257,7 @@ public class BaseViewTests extends TestCase {
 		}
 		catch (IllegalArgumentException ex) {
 		}
-		
+
 		try {
 			// No value
 			v.setAttributesCSV("fweoiruiu=");
@@ -265,7 +265,7 @@ public class BaseViewTests extends TestCase {
 		}
 		catch (IllegalArgumentException ex) {
 		}
-		
+
 		try {
 			// No closing ]
 			v.setAttributesCSV("fweoiruiu=[");
@@ -281,13 +281,13 @@ public class BaseViewTests extends TestCase {
 		catch (IllegalArgumentException ex) {
 		}
 	}
-	
+
 	public void testAttributeCSVParsingIgoresTrailingComma() {
 		AbstractView v = new ConcreteView();
 		v.setAttributesCSV("foo=[de],");
 		assertTrue(v.getStaticAttributes().size() == 1);
 	}
-	
+
 	/**
 	 * Check that all keys in expected have same values in actual
 	 * @param expected
@@ -299,10 +299,10 @@ public class BaseViewTests extends TestCase {
 		for (Iterator<String> iter = keys.iterator(); iter.hasNext();) {
 			String key = (String) iter.next();
 			//System.out.println("Checking model key " + key);
-			assertTrue("Value for model key '" + key + "' must match", actual.get(key) == expected.get(key));			
+			assertTrue("Value for model key '" + key + "' must match", actual.get(key) == expected.get(key));
 		}
 	}
-	
+
 	/**
 	 * Trivial concrete subclass we can use when we're interested only
 	 * in CSV parsing, which doesn't require lifecycle management
@@ -322,13 +322,13 @@ public class BaseViewTests extends TestCase {
 	private class TestView extends AbstractView {
 		private WebApplicationContext wac;
 		public boolean inited;
-		
+
 		/** Captured model in render */
 		public Map<String, Object> model;
-		
+
 		public TestView(WebApplicationContext wac) {
 			this.wac = wac;
-			
+
 		}
 		protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
index 622b9fa590..be564fee2d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
@@ -63,7 +63,7 @@ public class InternalResourceViewTests extends TestCase {
 		model.put("I", obj);
 
 		String url = "forward-to";
-		
+
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/myservlet/handler.do");
 		request.setContextPath("/mycontext");
 		request.setServletPath("/myservlet");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java
index ef01366feb..d252550f18 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java
@@ -116,7 +116,7 @@ public class RedirectViewTests {
 		assertEquals(301, response.getStatus());
 		assertEquals("http://url.somewhere.com", response.getHeader("Location"));
 	}
-	
+
 	@Test
 	public void attributeStatusCodeHttp11() throws Exception {
 		RedirectView rv = new RedirectView();
@@ -129,7 +129,7 @@ public class RedirectViewTests {
 		assertEquals(201, response.getStatus());
 		assertEquals("http://url.somewhere.com", response.getHeader("Location"));
 	}
-	
+
 	@Test
 	public void flashMap() throws Exception {
 		RedirectView rv = new RedirectView();
@@ -144,21 +144,21 @@ public class RedirectViewTests {
 		rv.render(model, request, response);
 		assertEquals(303, response.getStatus());
 		assertEquals("http://url.somewhere.com/path?id=1", response.getHeader("Location"));
-		
+
 		assertEquals("/path", flashMap.getTargetRequestPath());
 		assertEquals(model, flashMap.getTargetRequestParams().toSingleValueMap());
 	}
-	
+
 	@Test
 	public void updateTargetUrl() throws Exception {
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.registerSingleton("requestDataValueProcessor", RequestDataValueProcessorWrapper.class);
 		wac.setServletContext(new MockServletContext());
 		wac.refresh();
-		
+
 		RequestDataValueProcessor mockProcessor = createMock(RequestDataValueProcessor.class);
 		wac.getBean(RequestDataValueProcessorWrapper.class).setRequestDataValueProcessor(mockProcessor);
-		
+
 		RedirectView rv = new RedirectView();
 		rv.setApplicationContext(wac);	// Init RedirectView with WebAppCxt
 		rv.setUrl("/path");
@@ -175,7 +175,7 @@ public class RedirectViewTests {
 		EasyMock.verify(mockProcessor);
 	}
 
-	
+
 	@Test
 	public void updateTargetUrlWithContextLoader() throws Exception {
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
@@ -183,7 +183,7 @@ public class RedirectViewTests {
 
 		MockServletContext servletContext = new MockServletContext();
 		ContextLoader contextLoader = new ContextLoader(wac);
-		contextLoader.initWebApplicationContext(servletContext); 
+		contextLoader.initWebApplicationContext(servletContext);
 
 		try {
 			RequestDataValueProcessor mockProcessor = createMock(RequestDataValueProcessor.class);
@@ -251,7 +251,7 @@ public class RedirectViewTests {
 		String expectedUrlForEncoding = "http://url.somewhere.com/test.htm" + "?" + key + "=" + val + "#myAnchor";
 		doTest(model, url, false, expectedUrlForEncoding);
 	}
-	
+
 	@Test
 	public void contextRelativeQueryParam() throws Exception {
 		String url = "/test.html?id=1";
@@ -376,7 +376,7 @@ public class RedirectViewTests {
 
 		FlashMapManager flashMapManager = new SessionFlashMapManager();
 		expect(request.getAttribute(DispatcherServlet.FLASH_MAP_MANAGER_ATTRIBUTE)).andReturn(flashMapManager);
-		
+
 		HttpServletResponse response = createMock("response", HttpServletResponse.class);
 		expect(response.encodeRedirectURL(expectedUrlForEncoding)).andReturn(expectedUrlForEncoding);
 		response.sendRedirect(expectedUrlForEncoding);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java
index 50e00161aa..a95173f91c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java
@@ -36,7 +36,7 @@ public class RedirectViewUriTemplateTests {
 	private MockHttpServletRequest request;
 
 	private MockHttpServletResponse response;
-	
+
 	@Before
 	public void setUp() {
 		this.request = new MockHttpServletRequest();
@@ -56,7 +56,7 @@ public class RedirectViewUriTemplateTests {
 
 		assertEquals(baseUrl + "/bar", this.response.getRedirectedUrl());
 	}
-	
+
 	@Test
 	public void uriTemplateEncode() throws Exception {
 		Map<String, Object> model = new HashMap<String, Object>();
@@ -68,7 +68,7 @@ public class RedirectViewUriTemplateTests {
 
 		assertEquals(baseUrl + "/context path/bar%2Fbar%20baz", this.response.getRedirectedUrl());
 	}
-	
+
 	@Test
 	public void uriTemplateAndArrayQueryParam() throws Exception {
 		Map<String, Object> model = new HashMap<String, Object>();
@@ -98,7 +98,7 @@ public class RedirectViewUriTemplateTests {
 		model.put("key1", "value1");
 		model.put("name", "value2");
 		model.put("key3", "value3");
-		
+
 		Map<String, String> currentRequestUriTemplateVars = new HashMap<String, String>();
 		currentRequestUriTemplateVars.put("var1", "v1");
 		currentRequestUriTemplateVars.put("name", "v2");
@@ -116,7 +116,7 @@ public class RedirectViewUriTemplateTests {
 	public void uriTemplateNullValue() throws Exception {
 		new RedirectView("/{foo}").renderMergedOutputModel(new ModelMap(), this.request, this.response);
 	}
-	
+
 	@Test
 	public void emptyRedirectString() throws Exception {
 		Map<String, Object> model = new HashMap<String, Object>();
@@ -138,5 +138,5 @@ public class RedirectViewUriTemplateTests {
 
 		assertEquals(url, this.response.getRedirectedUrl());
 	}
-	
+
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java
index 4ede466ea8..1695bd0c54 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -20,7 +20,7 @@ package org.springframework.web.servlet.view;
  * @author Rod Johnson
  */
 public class ResourceBundleViewResolverNoCacheTests extends ResourceBundleViewResolverTests {
-	
+
 	protected boolean getCache() {
 		return false;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java
index f315d428d2..117063f7af 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java
@@ -42,7 +42,7 @@ public class ResourceBundleViewResolverTests extends TestCase {
 	private static String PROPS_FILE = "org.springframework.web.servlet.view.testviews";
 
 	private ResourceBundleViewResolver rb;
-	
+
 	private StaticWebApplicationContext wac;
 
 
@@ -147,7 +147,7 @@ public class ResourceBundleViewResolverTests extends TestCase {
 		assertTrue("test has correct name", "test".equals(tv.getBeanName()));
 		assertTrue("test should have been initialized once, not " + tv.initCount + " times", tv.initCount == 1);
 	}
-	
+
 	public void testNoSuchBasename() throws Exception {
 		try {
 			rb.setBasename("weoriwoierqupowiuer");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
index 3a7a601ef9..286f628e22 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
@@ -485,13 +485,13 @@ public class ViewResolverTests {
 		InternalResourceViewResolver vr = new InternalResourceViewResolver();
 		vr.setViewClass(JstlView.class);
 		vr.setApplicationContext(wac);
-	
-		View view = vr.resolveViewName("example1", Locale.getDefault());		
+
+		View view = vr.resolveViewName("example1", Locale.getDefault());
 		View cached = vr.resolveViewName("example1", Locale.getDefault());
 		if (view != cached) {
 			fail("Caching doesn't work");
 		}
-		
+
 		vr.removeFromCache("example1", Locale.getDefault());
 		cached = vr.resolveViewName("example1", Locale.getDefault());
 		if (view == cached) {
@@ -515,11 +515,11 @@ public class ViewResolverTests {
 
 		viewResolver.resolveViewName("view", Locale.getDefault());
 		viewResolver.resolveViewName("view", Locale.getDefault());
-		
+
 		assertEquals(2, count.intValue());
 
 		viewResolver.setCacheUnresolved(true);
-		
+
 		viewResolver.resolveViewName("view", Locale.getDefault());
 		viewResolver.resolveViewName("view", Locale.getDefault());
 		viewResolver.resolveViewName("view", Locale.getDefault());
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 3131c7e5e4..5f44339cbd 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,12 +1,12 @@
 /*
  * 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.
@@ -105,7 +105,7 @@ public class ExcelViewTests extends TestCase {
 					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");
@@ -139,7 +139,7 @@ public class ExcelViewTests extends TestCase {
 					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");
@@ -173,7 +173,7 @@ public class ExcelViewTests extends TestCase {
 					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");
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
index 6e17ff630f..85ce6ff5ff 100644
--- 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
@@ -35,4 +35,3 @@ public class ConfigurableJasperReportsViewWithStreamTests extends AbstractConfig
 		return "application/pdf";
 	}
 }
- 
\ No newline at end of file
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
index 087960e514..e35f3e93a8 100644
--- 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
@@ -28,7 +28,7 @@ public class ConfigurableJasperReportsViewWithWriterTests extends AbstractConfig
 		view.setExporterClass(JRPdfExporter.class);
 		view.setUseWriter(false);
 		view.setContentType("text/html");
-		return view;       
+		return view;
 	}
 
 	protected String getDesiredContentType() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java
index 274d01aac7..916e1f2fb1 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java
@@ -100,17 +100,17 @@ public class VelocityViewTests {
 	public void testMergeTemplateSucceeds() throws Exception {
 		testValidTemplateName(null);
 	}
-	
+
 	@Test
 	public void testMergeTemplateFailureWithIOException() throws Exception {
 		testValidTemplateName(new IOException());
 	}
-	
+
 	@Test
 	public void testMergeTemplateFailureWithParseErrorException() throws Exception {
 		testValidTemplateName(new ParseErrorException(""));
 	}
-		
+
 	@Test
 	public void testMergeTemplateFailureWithUnspecifiedException() throws Exception {
 		testValidTemplateName(new Exception(""));
@@ -241,7 +241,7 @@ public class VelocityViewTests {
 		expectLastCall().andReturn(null);
 		wac.getServletContext();
 		expectLastCall().andReturn(new MockServletContext());
-		
+
 		final Template expectedTemplate = new Template();
 		VelocityConfig vc = new VelocityConfig() {
 			public VelocityEngine getVelocityEngine() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java
index 7ee45ed7b5..2b96a0c3e3 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java
@@ -46,7 +46,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 /**
  * Unit tests for the {@link AbstractXsltView} class.
- * 
+ *
  * @author Darren Davison
  * @author Rick Evans
  * @author Juergen Hoeller
@@ -325,7 +325,7 @@ public class TestXsltViewTests extends TestCase {
 		wordList.add("hello");
 		wordList.add("world");
 		map.put("wordList", wordList);
-		
+
 		view.render(new ModelAndView("home", map).getModel(), request, response);
 		String text = response.getContentAsString();
 		assertTrue(text.trim().startsWith("<html"));
diff --git a/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
index fa5feaeed6..231ae393a2 100644
--- a/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
+++ b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
@@ -38,15 +38,15 @@ import org.springframework.web.context.support.XmlWebApplicationContext;
 /**
  * Integration tests for scoped proxy use in conjunction with aop: namespace.
  * Deemed an integration test because .web mocks and application contexts are required.
- * 
+ *
  * @see org.springframework.aop.config.AopNamespaceHandlerTests;
- * 
+ *
  * @author Rob Harrop
  * @author Juergen Hoeller
  * @author Chris Beams
  */
 public final class AopNamespaceHandlerScopeIntegrationTests {
-	
+
 	private static final String CLASSNAME = AopNamespaceHandlerScopeIntegrationTests.class.getName();
 	private static final String CONTEXT = format("classpath:%s-context.xml", ClassUtils.convertClassNameToResourcePath(CLASSNAME));
 
diff --git a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
index 6d3e309c8e..7b2f7d94a4 100644
--- a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
+++ b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
@@ -44,7 +44,7 @@ import test.interceptor.NopInterceptor;
 /**
  * Integration tests for auto proxy creation by advisor recognition working in
  * conjunction with transaction managment resources.
- * 
+ *
  * @see org.springframework.aop.framework.autoproxy.AdvisorAutoProxyCreatorTests;
  *
  * @author Rod Johnson
@@ -54,7 +54,7 @@ public final class AdvisorAutoProxyCreatorIntegrationTests {
 
 	private static final Class<?> CLASS = AdvisorAutoProxyCreatorIntegrationTests.class;
 	private static final String CLASSNAME = CLASS.getSimpleName();
-	
+
 	private static final String DEFAULT_CONTEXT = CLASSNAME + "-context.xml";
 
 	private static final String ADVISOR_APC_BEAN_NAME = "aapc";
@@ -66,7 +66,7 @@ public final class AdvisorAutoProxyCreatorIntegrationTests {
 	protected BeanFactory getBeanFactory() throws IOException {
 		return new ClassPathXmlApplicationContext(DEFAULT_CONTEXT, CLASS);
 	}
-	
+
 	@Test
 	public void testDefaultExclusionPrefix() throws Exception {
 		DefaultAdvisorAutoProxyCreator aapc = (DefaultAdvisorAutoProxyCreator) getBeanFactory().getBean(ADVISOR_APC_BEAN_NAME);
@@ -100,7 +100,7 @@ public final class AdvisorAutoProxyCreatorIntegrationTests {
 		test.getName();
 		assertEquals(1, counter.getCalls());
 	}
-	
+
 	@Test
 	public void testTransactionAttributeOnMethod() throws Exception {
 		BeanFactory bf = getBeanFactory();
@@ -157,7 +157,7 @@ public final class AdvisorAutoProxyCreatorIntegrationTests {
 		CallCountingTransactionManager txMan = (CallCountingTransactionManager) bf.getBean(TXMANAGER_BEAN_NAME);
 
 		assertEquals(0, txMan.commits);
-		// Should NOT roll back on ServletException 
+		// Should NOT roll back on ServletException
 		try {
 			rb.echoException(new ServletException());
 		}
@@ -190,18 +190,18 @@ public final class AdvisorAutoProxyCreatorIntegrationTests {
 
 @SuppressWarnings("serial")
 class NeverMatchAdvisor extends StaticMethodMatcherPointcutAdvisor {
-	
+
 	public NeverMatchAdvisor() {
 		super(new NopInterceptor());
 	}
-	
+
 	/**
 	 * This method is solely to allow us to create a mixture of dependencies in
 	 * the bean definitions. The dependencies don't have any meaning, and don't
 	 * <b>do</b> anything.
 	 */
 	public void setDependencies(List<?> l) {
-		
+
 	}
 
 	/**
@@ -215,11 +215,11 @@ class NeverMatchAdvisor extends StaticMethodMatcherPointcutAdvisor {
 
 
 class NoSetters {
-	
+
 	public void A() {
-		
+
 	}
-	
+
 	public int getB() {
 		return -1;
 	}
@@ -282,7 +282,7 @@ class OrderedTxCheckAdvisor extends StaticMethodMatcherPointcutAdvisor implement
 
 
 class Rollback {
-	
+
 	/**
 	 * Inherits transaction attribute.
 	 * Illustrates programmatic rollback.
@@ -293,7 +293,7 @@ class Rollback {
 			setRollbackOnly();
 		}
 	}
-	
+
 	/**
 	 * Extracted in a protected method to facilitate testing
 	 */
@@ -342,7 +342,7 @@ class CallCountingTransactionManager extends AbstractPlatformTransactionManager
 		++rollbacks;
 		--inflight;
 	}
-	
+
 	public void clear() {
 		begun = commits = rollbacks = inflight = 0;
 	}
diff --git a/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java
index afbcab7a28..194c455f21 100644
--- a/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java
+++ b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java
@@ -21,7 +21,7 @@ import org.springframework.test.jpa.AbstractJpaTests;
 /**
  * Test to ensure that component scanning work with load-time weaver.
  * See SPR-3873 for more details.
- * 
+ *
  * @author Ramnivas Laddad
  */
 public class ComponentScanningWithLTWTests extends AbstractJpaTests {
@@ -29,7 +29,7 @@ public class ComponentScanningWithLTWTests extends AbstractJpaTests {
 	public ComponentScanningWithLTWTests() {
 		setDependencyCheck(false);
 	}
-	
+
 	@Override
 	protected String getConfigPath() {
 		return "ComponentScanningWithLTWTests.xml";
diff --git a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
index bd03001ec6..dab551d075 100644
--- a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
+++ b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
@@ -49,7 +49,7 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests {
 
 	private ServletRequestAttributes oldRequestAttributes;
 
-	private ServletRequestAttributes newRequestAttributes; 
+	private ServletRequestAttributes newRequestAttributes;
 
 	private ServletRequestAttributes oldRequestAttributesWithSession;
 
@@ -234,7 +234,7 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests {
 		assertTrue(bean instanceof AnotherScopeTestInterface);
 
 		assertEquals(DEFAULT_NAME, bean.getName());
-		bean.setName(MODIFIED_NAME);	
+		bean.setName(MODIFIED_NAME);
 
 		RequestContextHolder.setRequestAttributes(newRequestAttributesWithSession);
 		// this is a proxy so it should be reset to default
@@ -262,7 +262,7 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests {
 		assertTrue(bean instanceof SessionScopedTestBean);
 
 		assertEquals(DEFAULT_NAME, bean.getName());
-		bean.setName(MODIFIED_NAME);	
+		bean.setName(MODIFIED_NAME);
 
 		RequestContextHolder.setRequestAttributes(newRequestAttributesWithSession);
 		// this is a proxy so it should be reset to default
diff --git a/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java b/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java
index 60a3397af7..0ddec74625 100644
--- a/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java
+++ b/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java
@@ -11,39 +11,39 @@ import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.MethodExecutor;
 
 public class Spr7538Tests {
-	
+
 	@Ignore @Test
 	public void repro() throws Exception {
 		AlwaysTrueReleaseStrategy target = new AlwaysTrueReleaseStrategy();
 		BeanFactoryTypeConverter converter = new BeanFactoryTypeConverter();
-		
+
 		StandardEvaluationContext context = new StandardEvaluationContext();
 		context.setTypeConverter(converter);
-		
+
 		List<Foo> arguments = new ArrayList<Foo>();
-		
+
 		// !!!! With the below line commented you'll get NPE. Uncomment and everything is OK!
 		//arguments.add(new Foo());
-		
+
 		List<TypeDescriptor> paramDescriptors = new ArrayList<TypeDescriptor>();
 		Method method = AlwaysTrueReleaseStrategy.class.getMethod("checkCompleteness", List.class);
 		paramDescriptors.add(new TypeDescriptor(new MethodParameter(method, 0)));
 
-		
+
 		List<TypeDescriptor> argumentTypes = new ArrayList<TypeDescriptor>();
 		argumentTypes.add(TypeDescriptor.forObject(arguments));
 		ReflectiveMethodResolver resolver = new ReflectiveMethodResolver();
 		MethodExecutor executor = resolver.resolve(context, target, "checkCompleteness", argumentTypes);
-		
+
 		Object result = executor.execute(context, target, arguments);
 		System.out.println("Result: " + result);
 	}
-	
+
 	public static class AlwaysTrueReleaseStrategy {
 		public boolean checkCompleteness(List<Foo> messages) {
 			return true;
 		}
 	}
-	
+
 	public static class Foo{}
 }
\ No newline at end of file
diff --git a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index 117d16d6a0..d5f25ddd70 100644
--- a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -51,7 +51,7 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM
 		++rollbacks;
 		--inflight;
 	}
-	
+
 	public void clear() {
 		begun = commits = rollbacks = inflight = 0;
 	}
diff --git a/src/test/java/test/advice/CountingAfterReturningAdvice.java b/src/test/java/test/advice/CountingAfterReturningAdvice.java
index 12010bee5c..2e9aaa5a15 100644
--- a/src/test/java/test/advice/CountingAfterReturningAdvice.java
+++ b/src/test/java/test/advice/CountingAfterReturningAdvice.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/src/test/java/test/advice/CountingBeforeAdvice.java b/src/test/java/test/advice/CountingBeforeAdvice.java
index cade9a1832..3dc49faf24 100644
--- a/src/test/java/test/advice/CountingBeforeAdvice.java
+++ b/src/test/java/test/advice/CountingBeforeAdvice.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2008 the original author 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.
diff --git a/src/test/java/test/advice/MethodCounter.java b/src/test/java/test/advice/MethodCounter.java
index c7f660a511..8c29886a3d 100644
--- a/src/test/java/test/advice/MethodCounter.java
+++ b/src/test/java/test/advice/MethodCounter.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 
 /**
  * Abstract superclass for counting advices etc.
- * 
+ *
  * @author Rod Johnson
  * @author Chris Beams
  */
diff --git a/src/test/java/test/beans/INestedTestBean.java b/src/test/java/test/beans/INestedTestBean.java
index 8167cc05ad..1023dbbc13 100644
--- a/src/test/java/test/beans/INestedTestBean.java
+++ b/src/test/java/test/beans/INestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -19,5 +19,5 @@ package test.beans;
 public interface INestedTestBean {
 
 	public String getCompany();
-	
+
 }
diff --git a/src/test/java/test/beans/IOther.java b/src/test/java/test/beans/IOther.java
index e9e0dd23c9..80fe4e8498 100644
--- a/src/test/java/test/beans/IOther.java
+++ b/src/test/java/test/beans/IOther.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
@@ -18,7 +18,7 @@
 package test.beans;
 
 public interface IOther {
-	
+
 	void absquatulate();
 
 }
diff --git a/src/test/java/test/beans/ITestBean.java b/src/test/java/test/beans/ITestBean.java
index 1eabf18180..c452bdc1dd 100644
--- a/src/test/java/test/beans/ITestBean.java
+++ b/src/test/java/test/beans/ITestBean.java
@@ -33,7 +33,7 @@ public interface ITestBean {
 
 	void setAge(int age);
 
-	String getName(); 
+	String getName();
 
 	void setName(String name);
 
diff --git a/src/test/java/test/beans/NestedTestBean.java b/src/test/java/test/beans/NestedTestBean.java
index 3919cf8383..b0f9df9d9b 100644
--- a/src/test/java/test/beans/NestedTestBean.java
+++ b/src/test/java/test/beans/NestedTestBean.java
@@ -1,12 +1,12 @@
 /*
  * 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.
diff --git a/src/test/java/test/interceptor/NopInterceptor.java b/src/test/java/test/interceptor/NopInterceptor.java
index 223a5f1a75..79158e74ea 100644
--- a/src/test/java/test/interceptor/NopInterceptor.java
+++ b/src/test/java/test/interceptor/NopInterceptor.java
@@ -1,13 +1,13 @@
 
 /*
  * 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.
@@ -26,7 +26,7 @@ import org.aopalliance.intercept.MethodInvocation;
  * @author Rod Johnson
  */
 public class NopInterceptor implements MethodInterceptor {
-	
+
 	private int count;
 
 	/**
@@ -36,11 +36,11 @@ public class NopInterceptor implements MethodInterceptor {
 		increment();
 		return invocation.proceed();
 	}
-	
+
 	public int getCount() {
 		return this.count;
 	}
-	
+
 	protected void increment() {
 		++count;
 	}
diff --git a/src/test/java/test/interceptor/SerializableNopInterceptor.java b/src/test/java/test/interceptor/SerializableNopInterceptor.java
index 58b9fce209..c7b2acf82f 100644
--- a/src/test/java/test/interceptor/SerializableNopInterceptor.java
+++ b/src/test/java/test/interceptor/SerializableNopInterceptor.java
@@ -1,12 +1,12 @@
 /*
  * 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.
@@ -22,25 +22,25 @@ import java.io.Serializable;
 /**
  * Subclass of NopInterceptor that is serializable and
  * can be used to test proxy serialization.
- * 
+ *
  * @author Rod Johnson
  */
 @SuppressWarnings("serial")
 public class SerializableNopInterceptor extends NopInterceptor implements Serializable {
-	
+
 	/**
 	 * We must override this field and the related methods as
 	 * otherwise count won't be serialized from the non-serializable
 	 * NopInterceptor superclass.
 	 */
 	private int count;
-	
+
 	public int getCount() {
 		return this.count;
 	}
-	
+
 	protected void increment() {
 		++count;
 	}
-	
+
 }
\ No newline at end of file
diff --git a/src/test/java/test/util/SerializationTestUtils.java b/src/test/java/test/util/SerializationTestUtils.java
index 15ef78a864..132bd33d4e 100644
--- a/src/test/java/test/util/SerializationTestUtils.java
+++ b/src/test/java/test/util/SerializationTestUtils.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2002-2009 the original author 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.

From 2cf45bad860f560d3a5806eb23ffe1669e907673 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Wed, 19 Dec 2012 14:55:41 -0800
Subject: [PATCH 16/36] Replace space indentation with tabs

Issue: SPR-10127
---
 .../framework/ReflectiveMethodInvocation.java |   4 +-
 .../aop/target/ThreadLocalTargetSource.java   |   6 +-
 .../TigerAspectJExpressionPointcutTests.java  |  10 +-
 .../TrickyAspectJPointcutExpressionTests.java |  16 +-
 .../aspectj/TypePatternClassFilterTests.java  |   2 +-
 .../AbstractAspectJAdvisorFactoryTests.java   |   9 +-
 .../aop/framework/MethodInvocationTests.java  |   2 +-
 ...nterfaceDrivenDependencyInjectionAspect.aj |   2 +-
 .../aspectj/JpaExceptionTranslatorAspect.aj   |  20 +-
 .../aspectj/AbstractTransactionAspect.aj      |   2 +-
 .../mock/staticmock/Person_Roo_Entity.aj      | 128 +--
 .../beans/AbstractPropertyAccessor.java       |   2 +-
 .../beans/BeanWrapperImpl.java                |   2 +-
 .../beans/DirectFieldAccessor.java            |   2 +-
 .../beans/PropertyAccessor.java               |   4 +-
 .../config/FieldRetrievingFactoryBean.java    |   2 +-
 .../PreferencesPlaceholderConfigurer.java     |   4 +-
 .../config/PropertyPathFactoryBean.java       |   6 +-
 .../support/BeanDefinitionResource.java       |   2 +-
 .../support/BeanDefinitionValueResolver.java  |   4 +-
 .../support/DefaultListableBeanFactory.java   |   2 +-
 .../propertyeditors/CustomNumberEditor.java   |   4 +-
 .../beans/support/MutableSortDefinition.java  |   3 +-
 .../springframework/beans/BeanUtilsTests.java |  20 +-
 .../java/test/util/TestResourceUtils.java     |  30 +-
 .../mail/javamail/MimeMessageHelper.java      |  30 +-
 .../quartz/LocalDataSourceJobStore.java       |   6 +-
 .../quartz/LocalTaskExecutorThreadPool.java   |   4 +-
 .../quartz/ResourceLoaderClassLoadHelper.java |   4 +-
 .../quartz/CronTriggerBeanTests.java          |   2 +-
 .../support/AbstractApplicationContext.java   |   2 +-
 .../access/LocalSlsbInvokerInterceptor.java   |   2 +-
 .../SimpleRemoteSlsbInvokerInterceptor.java   |   2 +-
 .../rmi/JndiRmiClientInterceptor.java         |   6 +-
 .../remoting/rmi/RmiClientInterceptor.java    |   4 +-
 .../remoting/rmi/RmiInvocationHandler.java    |   2 +-
 .../remoting/rmi/RmiInvocationWrapper.java    |   2 +-
 .../aop/framework/ProxyFactoryBeanTests.java  |   4 +-
 .../AutowiredConfigurationTests.java          |   6 +-
 .../configuration/ImportResourceTests.java    | 222 ++---
 .../ClassPathXmlApplicationContextTests.java  |   3 +-
 .../context/support/NoOpAdvice.java           |   2 +-
 .../context/support/Spr7283Tests.java         |  20 +-
 .../scripting/groovy/LogUserAdvice.java       |  16 +-
 .../org/springframework/core/Constants.java   |  22 +-
 .../convert/converter/GenericConverter.java   |  24 +-
 .../core/io/AbstractResource.java             |   2 +-
 .../core/io/ByteArrayResource.java            |   2 +-
 .../core/io/DescriptiveResource.java          |   2 +-
 .../core/io/FileSystemResource.java           |   2 +-
 .../core/io/InputStreamResource.java          |   2 +-
 .../springframework/core/io/UrlResource.java  |   2 +-
 .../springframework/util/FileCopyUtils.java   |   2 +-
 .../core/ExceptionDepthComparatorTests.java   | 118 +--
 .../core/GenericTypeResolverTests.java        |  48 +-
 .../spel/support/ReflectionHelper.java        |   2 +-
 .../spel/ConstructorInvocationTests.java      |   2 +-
 .../spel/SpelDocumentationTests.java          |  40 +-
 .../jdbc/core/JdbcOperations.java             |  10 +-
 .../DataSourceTransactionManager.java         |   2 +-
 .../jdbc/support/lob/LobCreatorUtils.java     |   4 +-
 .../jdbc/support/lob/OracleLobHandler.java    |   6 +-
 .../nativejdbc/JBossNativeJdbcExtractor.java  |   6 +-
 .../jms/core/JmsOperations.java               |   6 +-
 .../springframework/jms/core/JmsTemplate.java |   2 +-
 .../jms/core/JmsTemplate102Tests.java         |   8 +-
 .../HibernateTransactionManager.java          |   2 +-
 .../HibernateTransactionManager.java          |   2 +-
 .../hibernate3/LocalCacheProviderProxy.java   |   2 +-
 .../LocalDataSourceConnectionProvider.java    |   2 +-
 .../hibernate3/LocalRegionFactoryProxy.java   |   2 +-
 .../LocalTransactionManagerLookup.java        |   2 +-
 .../orm/hibernate3/SessionFactoryUtils.java   |   8 +-
 .../hibernate3/support/AbstractLobType.java   |   8 +-
 .../support/HibernateDaoSupport.java          |   6 +-
 .../support/OpenSessionInViewInterceptor.java |   2 +-
 .../support/AbstractLobTypeHandler.java       |   2 +-
 .../springframework/orm/jdo/JdoTemplate.java  |   4 +-
 .../LocalPersistenceManagerFactoryBean.java   |   2 +-
 .../jdo/PersistenceManagerFactoryUtils.java   |   6 +-
 .../orm/jdo/support/JdoDaoSupport.java        |   2 +-
 .../orm/jpa/JpaTransactionManager.java        |   2 +-
 .../support/OpenSessionInViewTests.java       |   6 +-
 .../OpenPersistenceManagerInViewTests.java    |   2 +-
 .../support/OpenEntityManagerInViewTests.java |   4 +-
 .../oxm/XmlMappingException.java              |  12 +-
 .../oxm/xstream/XStreamMarshaller.java        |  12 +-
 .../oxm/jaxb/BinaryObject.java                |  46 +-
 .../org/springframework/oxm/jibx/Flights.java |  20 +-
 .../xmlbeans/XmlOptionsFactoryBeanTests.java  |  16 +-
 .../springframework/oxm/xstream/Flight.java   |  18 +-
 .../tiles/ComponentControllerSupport.java     |   4 +-
 .../web/servlet/view/tiles/TilesView.java     |   2 +-
 .../web/struts/ContextLoaderPlugIn.java       |   2 +-
 .../test/util/MatcherAssertionErrors.java     |   6 +-
 .../test/web/servlet/RequestBuilder.java      |   2 +-
 .../servlet/result/StatusResultMatchers.java  | 828 +++++++++---------
 .../setup/PatternMappingFilterProxy.java      |   4 +-
 .../MockHttpServletRequestBuilderTests.java   |   6 +-
 .../standalone/ExceptionHandlerTests.java     |   2 +-
 .../samples/standalone/RedirectTests.java     |  28 +-
 .../FlashAttributeAssertionTests.java         |  20 +-
 .../RequestAttributeAssertionTests.java       |  12 +-
 .../SessionAttributeAssertionTests.java       |   6 +-
 .../test/util/AssertionErrors.java            |  30 +-
 .../CciLocalTransactionManager.java           |   2 +-
 .../jta/JtaTransactionManager.java            |  10 +-
 .../jta/WebLogicJtaTransactionManager.java    |   2 +-
 .../AbstractPlatformTransactionManager.java   |   2 +-
 .../support/DefaultTransactionStatus.java     |   2 +-
 .../TransactionSynchronizationManager.java    |   2 +-
 ...TransactionAttributeSourceEditorTests.java |  40 +-
 .../org/springframework/http/HttpHeaders.java |   6 +-
 .../org/springframework/http/MediaType.java   |   2 +-
 .../HttpComponentsClientHttpRequest.java      |   6 +-
 ...ttpComponentsClientHttpRequestFactory.java |  22 +-
 .../SimpleStreamingClientHttpRequest.java     |  50 +-
 .../caucho/BurlapClientInterceptor.java       |   2 +-
 .../caucho/HessianClientInterceptor.java      |   2 +-
 .../HttpInvokerClientInterceptor.java         |   2 +-
 .../web/filter/GenericFilterBean.java         |   8 +-
 .../web/jsf/FacesContextUtils.java            |   2 +-
 .../web/util/UriComponentsBuilder.java        |   6 +-
 .../springframework/web/util/UriTemplate.java |  16 +-
 .../springframework/web/util/WebUtils.java    |  18 +-
 .../AbstractHttpRequestFactoryTestCase.java   |   4 +-
 .../http/client/FreePortScanner.java          | 112 +--
 .../CommonsMultipartResolverTests.java        |   8 +-
 .../web/util/UriComponentsBuilderTests.java   | 104 +--
 .../web/util/UriComponentsTests.java          |  34 +-
 .../web/util/UriTemplateTests.java            |  32 +-
 .../PortletApplicationContextUtils.java       |   2 +-
 .../DefaultAnnotationHandlerMapping.java      |   4 +-
 .../ComplexPortletApplicationContext.java     |  10 +-
 .../Portlet20AnnotationControllerTests.java   |   2 +-
 ...ildcardServletTilesApplicationContext.java | 108 +--
 .../web/servlet/HttpServletBean.java          |   8 +-
 .../web/servlet/ResourceServlet.java          |   8 +-
 .../config/ResourcesBeanDefinitionParser.java |   4 +-
 .../handler/HandlerInterceptorAdapter.java    |   2 +-
 .../mvc/AbstractWizardFormController.java     |  12 +-
 .../servlet/mvc/BaseCommandController.java    |   2 +-
 .../servlet/mvc/WebContentInterceptor.java    |   2 +-
 .../AnnotationMethodHandlerAdapter.java       |   6 +-
 ...stractMessageConverterMethodProcessor.java |  22 +-
 .../servlet/support/RequestContextUtils.java  |   2 +-
 .../web/servlet/tags/form/ButtonTag.java      |  16 +-
 .../http/client/FreePortScanner.java          | 112 +--
 .../servlet/ComplexWebApplicationContext.java |  12 +-
 .../mvc/WizardFormControllerTests.java        |   6 +-
 .../servlet/mvc/annotation/Spr7839Tests.java  |  24 +-
 .../RequestPartIntegrationTests.java          |  10 +-
 .../DispatcherServletInitializerTests.java    |   2 +-
 .../json/MappingJackson2JsonViewTests.java    |   2 +-
 154 files changed, 1481 insertions(+), 1476 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
index 458cc46518..10578d9960 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
@@ -151,12 +151,12 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 		}
 
 		Object interceptorOrInterceptionAdvice =
-		    this.interceptorsAndDynamicMethodMatchers.get(++this.currentInterceptorIndex);
+				this.interceptorsAndDynamicMethodMatchers.get(++this.currentInterceptorIndex);
 		if (interceptorOrInterceptionAdvice instanceof InterceptorAndDynamicMethodMatcher) {
 			// Evaluate dynamic method matcher here: static part will already have
 			// been evaluated and found to match.
 			InterceptorAndDynamicMethodMatcher dm =
-			    (InterceptorAndDynamicMethodMatcher) interceptorOrInterceptionAdvice;
+					(InterceptorAndDynamicMethodMatcher) interceptorOrInterceptionAdvice;
 			if (dm.methodMatcher.matches(this.method, this.targetClass, this.arguments)) {
 				return dm.interceptor.invoke(this);
 			}
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 b57ecae235..dd39eecbcb 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
@@ -78,8 +78,10 @@ public class ThreadLocalTargetSource extends AbstractPrototypeBasedTargetSource
 		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/aspectj/TigerAspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
index e6ca2ce3cf..c3e1f0c120 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
@@ -90,9 +90,9 @@ public final class TigerAspectJExpressionPointcutTests {
 	@Test
 	public void testMatchVarargs() throws SecurityException, NoSuchMethodException {
 		class MyTemplate {
-		    public int queryForInt(String sql, Object... params) {
-		        return 0;
-		    }
+			public int queryForInt(String sql, Object... params) {
+				return 0;
+			}
 		}
 
 		String expression = "execution(int *.*(String, Object...))";
@@ -101,8 +101,8 @@ public final class TigerAspectJExpressionPointcutTests {
 
 		// TODO: the expression above no longer matches Object[]
 		// assertFalse(jdbcVarArgs.matches(
-		//        JdbcTemplate.class.getMethod("queryForInt", String.class, Object[].class),
-		//        JdbcTemplate.class));
+		//	JdbcTemplate.class.getMethod("queryForInt", String.class, Object[].class),
+		//	JdbcTemplate.class));
 
 		assertTrue(jdbcVarArgs.matches(
 				MyTemplate.class.getMethod("queryForInt", String.class, Object[].class),
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
index 2d8acfe992..18e0bd56ad 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
@@ -131,14 +131,14 @@ public class TrickyAspectJPointcutExpressionTests {
 	}
 
 	public static interface TestService {
-	    public String sayHello();
+		public String sayHello();
 	}
 
 	@Log
-	public static class TestServiceImpl implements TestService{
-	    public String sayHello() {
-	        throw new TestException("TestServiceImpl");
-	    }
+	public static class TestServiceImpl implements TestService {
+		public String sayHello() {
+			throw new TestException("TestServiceImpl");
+		}
 	}
 
 	public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice {
@@ -149,12 +149,12 @@ public class TrickyAspectJPointcutExpressionTests {
 
 		public void before(Method method, Object[] objects, Object o) throws Throwable {
 			countBefore++;
-	    }
+		}
 
 		public void afterThrowing(Exception e) throws Throwable {
 			countThrows++;
-	        throw e;
-	    }
+			throw e;
+		}
 
 		public int getCountBefore() {
 			return countBefore;
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
index 7b6811aee8..7ad0b7c768 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
@@ -80,7 +80,7 @@ public final class TypePatternClassFilterTests {
 
 	@Test(expected=IllegalArgumentException.class)
 	public void testSetTypePatternWithNullArgument() throws Exception {
-	    new TypePatternClassFilter(null);
+		new TypePatternClassFilter(null);
 	}
 
 	@Test(expected=IllegalStateException.class)
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
index 89716a8789..0a485087c3 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
@@ -411,6 +411,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 				CannotBeUnlocked.class);
 		assertFalse("Type pattern must have excluded mixin", proxy instanceof Lockable);
 	}
+
 	/* prereq AspectJ 1.6.7
 	@Test
 	public void testIntroductionBasedOnAnnotationMatch_Spr5307() {
@@ -426,8 +427,10 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		Lockable lockable = (Lockable)proxy;
 		lockable.locked();
 	}
-    */
+	*/
+
 	// TODO: Why does this test fail? It hasn't been run before, so it maybe never actually passed...
+
 	public void XtestIntroductionWithArgumentBinding() {
 		TestBean target = new TestBean();
 
@@ -764,8 +767,8 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 		public void setAge(int a) {}
 
 		@Around(value="setAge(age)",argNames="age")
-		// @ArgNames({"age"})  // AMC needs more work here? ignoring pjp arg... ok??
-		//                     // argNames should be suported in Around as it is in Pointcut
+		// @ArgNames({"age"})	// AMC needs more work here? ignoring pjp arg... ok??
+								// argNames should be suported in Around as it is in Pointcut
 		public void changeReturnType(ProceedingJoinPoint pjp, int age) throws Throwable {
 			pjp.proceed(new Object[] {age*2});
 		}
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
index 9b10226119..f5c4a8edca 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
@@ -68,7 +68,7 @@ public final class MethodInvocationTests {
 		Method m = Object.class.getMethod("hashCode", (Class[]) null);
 		Object proxy = new Object();
 		ReflectiveMethodInvocation invocation =
-		    new ReflectiveMethodInvocation(proxy, target, m, null, null, is);
+			new ReflectiveMethodInvocation(proxy, target, m, null, null, is);
 
 		// If it hits target, the test will fail with the UnsupportedOpException
 		// in the inner class above.
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
index 61a8b90d74..bee02ac9be 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
@@ -41,7 +41,7 @@ package org.springframework.beans.factory.aspectj;
  * @since 3.0.0
  */
 public abstract aspect GenericInterfaceDrivenDependencyInjectionAspect<I> extends AbstractInterfaceDrivenDependencyInjectionAspect {
-    declare parents: I implements ConfigurableObject;
+	declare parents: I implements ConfigurableObject;
 
 	public pointcut inConfigurableBean() : within(I+);
 
diff --git a/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj b/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj
index 134cfcdf26..491f666992 100644
--- a/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj
@@ -9,14 +9,14 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.orm.jpa.EntityManagerFactoryUtils;
 
 public aspect JpaExceptionTranslatorAspect {
-    pointcut entityManagerCall(): call(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) || call(* EntityTransaction.*(..)) || call(* Query.*(..));
+	pointcut entityManagerCall(): call(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) || call(* EntityTransaction.*(..)) || call(* Query.*(..));
 
-    after() throwing(RuntimeException re): entityManagerCall() {
-    	DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(re);
-    	if (dex != null) {
-    		throw dex;
-    	} else {
-    		throw re;
-    	}
-    }
-}
\ No newline at end of file
+	after() throwing(RuntimeException re): entityManagerCall() {
+		DataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(re);
+		if (dex != null) {
+			throw dex;
+		} else {
+			throw re;
+		}
+	}
+}
diff --git a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj
index c1b23c1bcb..27a09bb462 100644
--- a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj
@@ -66,7 +66,7 @@ public abstract aspect AbstractTransactionAspect extends TransactionAspectSuppor
 	@SuppressAjWarnings("adviceDidNotMatch")
 	after(Object txObject) throwing(Throwable t) : transactionalMethodExecution(txObject) {
 		try {
-      		completeTransactionAfterThrowing(TransactionAspectSupport.currentTransactionInfo(), t);
+			completeTransactionAfterThrowing(TransactionAspectSupport.currentTransactionInfo(), t);
 		}
 		catch (Throwable t2) {
 			logger.error("Failed to close transaction after throwing in a transactional method", t2);
diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
index 7e50ab4a7f..9e13013bb1 100644
--- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
+++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
@@ -18,83 +18,83 @@ package org.springframework.mock.staticmock;
 
 privileged aspect Person_Roo_Entity {
 
-    @javax.persistence.PersistenceContext
-    transient javax.persistence.EntityManager Person.entityManager;
+	@javax.persistence.PersistenceContext
+	transient javax.persistence.EntityManager Person.entityManager;
 
-    @javax.persistence.Id
-    @javax.persistence.GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
-    @javax.persistence.Column(name = "id")
-    private java.lang.Long Person.id;
+	@javax.persistence.Id
+	@javax.persistence.GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
+	@javax.persistence.Column(name = "id")
+	private java.lang.Long Person.id;
 
-    @javax.persistence.Version
-    @javax.persistence.Column(name = "version")
-    private java.lang.Integer Person.version;
+	@javax.persistence.Version
+	@javax.persistence.Column(name = "version")
+	private java.lang.Integer Person.version;
 
-    public java.lang.Long Person.getId() {
-        return this.id;
-    }
+	public java.lang.Long Person.getId() {
+		return this.id;
+	}
 
-    public void Person.setId(java.lang.Long id) {
-        this.id = id;
-    }
+	public void Person.setId(java.lang.Long id) {
+		this.id = id;
+	}
 
-    public java.lang.Integer Person.getVersion() {
-        return this.version;
-    }
+	public java.lang.Integer Person.getVersion() {
+		return this.version;
+	}
 
-    public void Person.setVersion(java.lang.Integer version) {
-        this.version = version;
-    }
+	public void Person.setVersion(java.lang.Integer version) {
+		this.version = version;
+	}
 
-    @org.springframework.transaction.annotation.Transactional
-    public void Person.persist() {
-        if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        this.entityManager.persist(this);
-    }
+	@org.springframework.transaction.annotation.Transactional
+	public void Person.persist() {
+		if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+		this.entityManager.persist(this);
+	}
 
-    @org.springframework.transaction.annotation.Transactional
-    public void Person.remove() {
-        if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        this.entityManager.remove(this);
-    }
+	@org.springframework.transaction.annotation.Transactional
+	public void Person.remove() {
+		if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+		this.entityManager.remove(this);
+	}
 
-    @org.springframework.transaction.annotation.Transactional
-    public void Person.flush() {
-        if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        this.entityManager.flush();
-    }
+	@org.springframework.transaction.annotation.Transactional
+	public void Person.flush() {
+		if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+		this.entityManager.flush();
+	}
 
-    @org.springframework.transaction.annotation.Transactional
-    public void Person.merge() {
-        if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        Person merged = this.entityManager.merge(this);
-        this.entityManager.flush();
-        this.id = merged.getId();
-    }
+	@org.springframework.transaction.annotation.Transactional
+	public void Person.merge() {
+		if (this.entityManager == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+		Person merged = this.entityManager.merge(this);
+		this.entityManager.flush();
+		this.id = merged.getId();
+	}
 
-    public static long Person.countPeople() {
-        javax.persistence.EntityManager em = new Person().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return (Long) em.createQuery("select count(o) from Person o").getSingleResult();
-    }
+	public static long Person.countPeople() {
+		javax.persistence.EntityManager em = new Person().entityManager;
+		if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+		return (Long) em.createQuery("select count(o) from Person o").getSingleResult();
+	}
 
-    public static java.util.List<Person> Person.findAllPeople() {
-        javax.persistence.EntityManager em = new Person().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em.createQuery("select o from Person o").getResultList();
-    }
+	public static java.util.List<Person> Person.findAllPeople() {
+		javax.persistence.EntityManager em = new Person().entityManager;
+		if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+		return em.createQuery("select o from Person o").getResultList();
+	}
 
-    public static Person Person.findPerson(java.lang.Long id) {
-        if (id == null) throw new IllegalArgumentException("An identifier is required to retrieve an instance of Person");
-        javax.persistence.EntityManager em = new Person().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em.find(Person.class, id);
-    }
+	public static Person Person.findPerson(java.lang.Long id) {
+		if (id == null) throw new IllegalArgumentException("An identifier is required to retrieve an instance of Person");
+		javax.persistence.EntityManager em = new Person().entityManager;
+		if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+		return em.find(Person.class, id);
+	}
 
-    public static java.util.List<Person> Person.findPersonEntries(int firstResult, int maxResults) {
-        javax.persistence.EntityManager em = new Person().entityManager;
-        if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
-        return em.createQuery("select o from Person o").setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
-    }
+	public static java.util.List<Person> Person.findPersonEntries(int firstResult, int maxResults) {
+		javax.persistence.EntityManager em = new Person().entityManager;
+		if (em == null) throw new IllegalStateException("Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC/AJDT aspects library?)");
+		return em.createQuery("select o from Person o").setFirstResult(firstResult).setMaxResults(maxResults).getResultList();
+	}
 
 }
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 c72277d2cf..258313c90f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java
@@ -103,7 +103,7 @@ public abstract class AbstractPropertyAccessor extends TypeConverterSupport impl
 	}
 
 
-    // Redefined with public visibility.
+	// Redefined with public visibility.
 	@Override
 	public Class getPropertyType(String propertyPath) {
 		return null;
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 b4c13315e7..1754c8745d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
@@ -738,7 +738,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 				}
 			}
 			else {
-                value = readMethod.invoke(object, (Object[]) null);
+				value = readMethod.invoke(object, (Object[]) null);
 			}
 
 			if (tokens.keys != null) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java b/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java
index caaa069b06..4aafd43356 100644
--- a/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java
@@ -64,7 +64,7 @@ public class DirectFieldAccessor extends AbstractPropertyAccessor {
 				if (fieldMap.containsKey(field.getName())) {
 					// ignore superclass declarations of fields already found in a subclass
 				}
-                else {
+				else {
 					fieldMap.put(field.getName(), field);
 				}
 			}
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 c8b8edb63f..280f1d90eb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java
@@ -191,7 +191,7 @@ public interface PropertyAccessor {
 	 * @see #setPropertyValues(PropertyValues, boolean, boolean)
 	 */
 	void setPropertyValues(PropertyValues pvs, boolean ignoreUnknown)
-	    throws BeansException;
+			throws BeansException;
 
 	/**
 	 * Perform a batch update with full control over behavior.
@@ -213,6 +213,6 @@ public interface PropertyAccessor {
 	 * successfully updated.
 	 */
 	void setPropertyValues(PropertyValues pvs, boolean ignoreUnknown, boolean ignoreInvalid)
-	    throws BeansException;
+			throws BeansException;
 
 }
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
index e84f61c4d5..b0583f5886 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
@@ -159,7 +159,7 @@ public class FieldRetrievingFactoryBean
 		if (this.targetClass == null && this.targetObject == null) {
 			if (this.targetField != null) {
 				throw new IllegalArgumentException(
-				    "Specify targetClass or targetObject in combination with targetField");
+						"Specify targetClass or targetObject in combination with targetField");
 			}
 
 			// If no other property specified, consider bean name as static field expression.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
index f025a941c1..2e0aabceba 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
@@ -76,9 +76,9 @@ public class PreferencesPlaceholderConfigurer extends PropertyPlaceholderConfigu
 	 */
 	public void afterPropertiesSet() {
 		this.systemPrefs = (this.systemTreePath != null) ?
-		    Preferences.systemRoot().node(this.systemTreePath) : Preferences.systemRoot();
+				Preferences.systemRoot().node(this.systemTreePath) : Preferences.systemRoot();
 		this.userPrefs = (this.userTreePath != null) ?
-		    Preferences.userRoot().node(this.userTreePath) : Preferences.userRoot();
+				Preferences.userRoot().node(this.userTreePath) : Preferences.userRoot();
 	}
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
index c15c47090e..8032c16335 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
@@ -162,15 +162,15 @@ public class PropertyPathFactoryBean implements FactoryBean<Object>, BeanNameAwa
 		if (this.targetBeanWrapper == null && this.targetBeanName == null) {
 			if (this.propertyPath != null) {
 				throw new IllegalArgumentException(
-				    "Specify 'targetObject' or 'targetBeanName' in combination with 'propertyPath'");
+						"Specify 'targetObject' or 'targetBeanName' in combination with 'propertyPath'");
 			}
 
 			// No other properties specified: check bean name.
 			int dotIndex = this.beanName.indexOf('.');
 			if (dotIndex == -1) {
 				throw new IllegalArgumentException(
-				    "Neither 'targetObject' nor 'targetBeanName' specified, and PropertyPathFactoryBean " +
-				    "bean name '" + this.beanName + "' does not follow 'beanName.property' syntax");
+						"Neither 'targetObject' nor 'targetBeanName' specified, and PropertyPathFactoryBean " +
+						"bean name '" + this.beanName + "' does not follow 'beanName.property' syntax");
 			}
 			this.targetBeanName = this.beanName.substring(0, dotIndex);
 			this.propertyPath = this.beanName.substring(dotIndex + 1);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java
index e5fb9c6afb..f14db8c8bc 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java
@@ -80,7 +80,7 @@ class BeanDefinitionResource extends AbstractResource {
 	@Override
 	public boolean equals(Object obj) {
 		return (obj == this ||
-		    (obj instanceof BeanDefinitionResource &&
+			(obj instanceof BeanDefinitionResource &&
 						((BeanDefinitionResource) obj).beanDefinition.equals(this.beanDefinition)));
 	}
 
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 d794b3a4ef..83bc48f20b 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
@@ -339,7 +339,7 @@ class BeanDefinitionValueResolver {
 		Object resolved = Array.newInstance(elementType, ml.size());
 		for (int i = 0; i < ml.size(); i++) {
 			Array.set(resolved, i,
-			    resolveValueIfNecessary(new KeyedArgName(argName, i), ml.get(i)));
+					resolveValueIfNecessary(new KeyedArgName(argName, i), ml.get(i)));
 		}
 		return resolved;
 	}
@@ -351,7 +351,7 @@ class BeanDefinitionValueResolver {
 		List<Object> resolved = new ArrayList<Object>(ml.size());
 		for (int i = 0; i < ml.size(); i++) {
 			resolved.add(
-			    resolveValueIfNecessary(new KeyedArgName(argName, i), ml.get(i)));
+					resolveValueIfNecessary(new KeyedArgName(argName, i), ml.get(i)));
 		}
 		return resolved;
 	}
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 3dfa8e893e..306ffa03f5 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
@@ -744,7 +744,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			TypeConverter converter = (typeConverter != null ? typeConverter : getTypeConverter());
 			return (descriptor.getField() != null ?
 					converter.convertIfNecessary(value, type, descriptor.getField()) :
-			        converter.convertIfNecessary(value, type, descriptor.getMethodParameter()));
+					converter.convertIfNecessary(value, type, descriptor.getMethodParameter()));
 		}
 
 		if (type.isArray()) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java
index b1d960bbfc..eaf799f528 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java
@@ -85,8 +85,8 @@ public class CustomNumberEditor extends PropertyEditorSupport {
 	 * @see java.text.NumberFormat#parse
 	 * @see java.text.NumberFormat#format
 	 */
-	public CustomNumberEditor(Class<? extends Number> numberClass, NumberFormat numberFormat, boolean allowEmpty)
-	    throws IllegalArgumentException {
+	public CustomNumberEditor(Class<? extends Number> numberClass,
+			NumberFormat numberFormat, boolean allowEmpty) throws IllegalArgumentException {
 
 		if (numberClass == null || !Number.class.isAssignableFrom(numberClass)) {
 			throw new IllegalArgumentException("Property class must be a subclass of Number");
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
index e227dd59af..c9a369c639 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
@@ -159,7 +159,8 @@ public class MutableSortDefinition implements SortDefinition, Serializable {
 		}
 		SortDefinition otherSd = (SortDefinition) other;
 		return (getProperty().equals(otherSd.getProperty()) &&
-		    isAscending() == otherSd.isAscending() && isIgnoreCase() == otherSd.isIgnoreCase());
+				isAscending() == otherSd.isAscending() &&
+				isIgnoreCase() == otherSd.isIgnoreCase());
 	}
 
 	@Override
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 25331d6606..fb6831eb8c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
@@ -250,17 +250,17 @@ public final class BeanUtilsTests {
 	}
 
 	@Test
-    public void testSPR6063() {
-        PropertyDescriptor[] descrs = BeanUtils.getPropertyDescriptors(Bean.class);
+	public void testSPR6063() {
+		PropertyDescriptor[] descrs = BeanUtils.getPropertyDescriptors(Bean.class);
 
-        PropertyDescriptor keyDescr = BeanUtils.getPropertyDescriptor(Bean.class, "value");
-        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());
-            }
-        }
-    }
+		PropertyDescriptor keyDescr = BeanUtils.getPropertyDescriptor(Bean.class, "value");
+		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());
+			}
+		}
+	}
 
 	private void assertSignatureEquals(Method desiredMethod, String signature) {
 		assertEquals(desiredMethod, BeanUtils.resolveSignature(signature, MethodSignatureBean.class));
diff --git a/spring-beans/src/test/java/test/util/TestResourceUtils.java b/spring-beans/src/test/java/test/util/TestResourceUtils.java
index cad4aeae22..c137adffe4 100644
--- a/spring-beans/src/test/java/test/util/TestResourceUtils.java
+++ b/spring-beans/src/test/java/test/util/TestResourceUtils.java
@@ -27,20 +27,20 @@ import org.springframework.core.io.ClassPathResource;
  */
 public class TestResourceUtils {
 
-        /**
-         * Loads 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);
-        }
+		/**
+		 * Loads 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);
+		}
 
 }
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
index b4984c693d..bef2498eea 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
@@ -241,7 +241,7 @@ public class MimeMessageHelper {
 	 * @see #MimeMessageHelper(javax.mail.internet.MimeMessage, int, String)
 	 */
 	public MimeMessageHelper(MimeMessage mimeMessage, boolean multipart, String encoding)
-	    throws MessagingException {
+			throws MessagingException {
 
 		this(mimeMessage, (multipart ? MULTIPART_MODE_MIXED_RELATED : MULTIPART_MODE_NO), encoding);
 	}
@@ -283,7 +283,7 @@ public class MimeMessageHelper {
 	 * @see #MULTIPART_MODE_MIXED_RELATED
 	 */
 	public MimeMessageHelper(MimeMessage mimeMessage, int multipartMode, String encoding)
-	    throws MessagingException {
+			throws MessagingException {
 
 		this.mimeMessage = mimeMessage;
 		createMimeMultiparts(mimeMessage, multipartMode);
@@ -380,8 +380,8 @@ public class MimeMessageHelper {
 	private void checkMultipart() throws IllegalStateException {
 		if (!isMultipart()) {
 			throw new IllegalStateException("Not in multipart mode - " +
-			    "create an appropriate MimeMessageHelper via a constructor that takes a 'multipart' flag " +
-			    "if you need to set alternative texts or add inline elements or attachments.");
+				"create an appropriate MimeMessageHelper via a constructor that takes a 'multipart' flag " +
+				"if you need to set alternative texts or add inline elements or attachments.");
 		}
 	}
 
@@ -546,7 +546,7 @@ public class MimeMessageHelper {
 	public void setFrom(String from, String personal) throws MessagingException, UnsupportedEncodingException {
 		Assert.notNull(from, "From address must not be null");
 		setFrom(getEncoding() != null ?
-		    new InternetAddress(from, personal, getEncoding()) : new InternetAddress(from, personal));
+			new InternetAddress(from, personal, getEncoding()) : new InternetAddress(from, personal));
 	}
 
 	public void setReplyTo(InternetAddress replyTo) throws MessagingException {
@@ -608,8 +608,8 @@ public class MimeMessageHelper {
 	public void addTo(String to, String personal) throws MessagingException, UnsupportedEncodingException {
 		Assert.notNull(to, "To address must not be null");
 		addTo(getEncoding() != null ?
-		    new InternetAddress(to, personal, getEncoding()) :
-		    new InternetAddress(to, personal));
+			new InternetAddress(to, personal, getEncoding()) :
+			new InternetAddress(to, personal));
 	}
 
 
@@ -653,8 +653,8 @@ public class MimeMessageHelper {
 	public void addCc(String cc, String personal) throws MessagingException, UnsupportedEncodingException {
 		Assert.notNull(cc, "Cc address must not be null");
 		addCc(getEncoding() != null ?
-		    new InternetAddress(cc, personal, getEncoding()) :
-		    new InternetAddress(cc, personal));
+			new InternetAddress(cc, personal, getEncoding()) :
+			new InternetAddress(cc, personal));
 	}
 
 
@@ -698,8 +698,8 @@ public class MimeMessageHelper {
 	public void addBcc(String bcc, String personal) throws MessagingException, UnsupportedEncodingException {
 		Assert.notNull(bcc, "Bcc address must not be null");
 		addBcc(getEncoding() != null ?
-		    new InternetAddress(bcc, personal, getEncoding()) :
-		    new InternetAddress(bcc, personal));
+			new InternetAddress(bcc, personal, getEncoding()) :
+			new InternetAddress(bcc, personal));
 	}
 
 	private InternetAddress parseAddress(String address) throws MessagingException {
@@ -960,7 +960,7 @@ public class MimeMessageHelper {
 	 * @see #addInline(String, javax.activation.DataSource)
 	 */
 	public void addInline(String contentId, InputStreamSource inputStreamSource, String contentType)
-	    throws MessagingException {
+		throws MessagingException {
 
 		Assert.notNull(inputStreamSource, "InputStreamSource must not be null");
 		if (inputStreamSource instanceof Resource && ((Resource) inputStreamSource).isOpen()) {
@@ -1035,7 +1035,7 @@ public class MimeMessageHelper {
 	 * @see org.springframework.core.io.Resource
 	 */
 	public void addAttachment(String attachmentFilename, InputStreamSource inputStreamSource)
-	    throws MessagingException {
+		throws MessagingException {
 
 		String contentType = getFileTypeMap().getContentType(attachmentFilename);
 		addAttachment(attachmentFilename, inputStreamSource, contentType);
@@ -1059,7 +1059,7 @@ public class MimeMessageHelper {
 	 */
 	public void addAttachment(
 			String attachmentFilename, InputStreamSource inputStreamSource, String contentType)
-	    throws MessagingException {
+		throws MessagingException {
 
 		Assert.notNull(inputStreamSource, "InputStreamSource must not be null");
 		if (inputStreamSource instanceof Resource && ((Resource) inputStreamSource).isOpen()) {
@@ -1079,7 +1079,7 @@ public class MimeMessageHelper {
 	 * @return the Activation Framework DataSource
 	 */
 	protected DataSource createDataSource(
-	    final InputStreamSource inputStreamSource, final String contentType, final String name) {
+		final InputStreamSource inputStreamSource, final String contentType, final String name) {
 
 		return new DataSource() {
 			public InputStream getInputStream() throws IOException {
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 139febeb7d..2b1f04a48b 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
@@ -83,14 +83,14 @@ public class LocalDataSourceJobStore extends JobStoreCMT {
 
 	@Override
 	public void initialize(ClassLoadHelper loadHelper, SchedulerSignaler signaler)
-	    throws SchedulerConfigException {
+			throws SchedulerConfigException {
 
 		// Absolutely needs thread-bound DataSource to initialize.
 		this.dataSource = SchedulerFactoryBean.getConfigTimeDataSource();
 		if (this.dataSource == null) {
 			throw new SchedulerConfigException(
-			    "No local DataSource found for configuration - " +
-			    "'dataSource' property must be set on SchedulerFactoryBean");
+				"No local DataSource found for configuration - " +
+				"'dataSource' property must be set on SchedulerFactoryBean");
 		}
 
 		// Configure transactional connection settings for Quartz.
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 8738e21a51..71bcd7852c 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
@@ -52,8 +52,8 @@ public class LocalTaskExecutorThreadPool implements ThreadPool {
 		this.taskExecutor = SchedulerFactoryBean.getConfigTimeTaskExecutor();
 		if (this.taskExecutor == null) {
 			throw new SchedulerConfigException(
-			    "No local TaskExecutor found for configuration - " +
-			    "'taskExecutor' property must be set on SchedulerFactoryBean");
+				"No local TaskExecutor found for configuration - " +
+				"'taskExecutor' property must be set on SchedulerFactoryBean");
 		}
 	}
 
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 c77a1480a5..a81e39c83f 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
@@ -77,8 +77,8 @@ public class ResourceLoaderClassLoadHelper implements ClassLoadHelper {
 
 	@SuppressWarnings("unchecked")
 	public <T> Class<? extends T> loadClass(String name, Class<T> clazz) throws ClassNotFoundException {
-        return loadClass(name);
-    }
+		return loadClass(name);
+	}
 
 	public URL getResource(String name) {
 		Resource resource = this.resourceLoader.getResource(name);
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java
index fcd1a2f7c5..ca7bb45d65 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java
@@ -32,7 +32,7 @@ public class CronTriggerBeanTests {
 
 	@Test
 	public void testStartTime() throws Exception {
-	    CronTriggerBean bean = createTriggerBean();
+		CronTriggerBean bean = createTriggerBean();
 		Date startTime = new Date(System.currentTimeMillis() + 1234L);
 		bean.setStartTime(startTime);
 		bean.afterPropertiesSet();
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 b1e7726ed6..120ee42154 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
@@ -1257,7 +1257,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 */
 	protected MessageSource getInternalParentMessageSource() {
 		return (getParent() instanceof AbstractApplicationContext) ?
-		    ((AbstractApplicationContext) getParent()).messageSource : getParent();
+			((AbstractApplicationContext) getParent()).messageSource : getParent();
 	}
 
 
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
index 6364f8592f..789130620c 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
@@ -93,7 +93,7 @@ public class LocalSlsbInvokerInterceptor extends AbstractSlsbInvokerInterceptor
 		}
 		catch (IllegalAccessException ex) {
 			throw new EjbAccessException("Could not access method [" + invocation.getMethod().getName() +
-			    "] of local EJB [" + getJndiName() + "]", ex);
+				"] of local EJB [" + getJndiName() + "]", ex);
 		}
 		finally {
 			if (ejb instanceof EJBLocalObject) {
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
index c133a61f65..c459d22a9a 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
@@ -106,7 +106,7 @@ public class SimpleRemoteSlsbInvokerInterceptor extends AbstractRemoteSlsbInvoke
 			if (targetEx instanceof RemoteException) {
 				RemoteException rex = (RemoteException) targetEx;
 				throw RmiClientInterceptorUtils.convertRmiAccessException(
-				    invocation.getMethod(), rex, isConnectFailure(rex), getJndiName());
+					invocation.getMethod(), rex, isConnectFailure(rex), getJndiName());
 			}
 			else if (targetEx instanceof CreateException) {
 				throw RmiClientInterceptorUtils.convertRmiAccessException(
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
index 9c4373f125..eb07d65c20 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
@@ -190,8 +190,8 @@ public class JndiRmiClientInterceptor extends JndiObjectLocator implements Metho
 				else if (getServiceInterface() != null) {
 					boolean isImpl = getServiceInterface().isInstance(remoteObj);
 					logger.debug("Using service interface [" + getServiceInterface().getName() +
-					    "] for JNDI RMI object [" + getJndiName() + "] - " +
-					    (!isImpl ? "not " : "") + "directly implemented");
+						"] for JNDI RMI object [" + getJndiName() + "] - " +
+						(!isImpl ? "not " : "") + "directly implemented");
 				}
 			}
 			if (this.cacheStub) {
@@ -426,7 +426,7 @@ public class JndiRmiClientInterceptor extends JndiObjectLocator implements Metho
 	 * @see org.springframework.remoting.support.RemoteInvocation
 	 */
 	protected Object doInvoke(MethodInvocation methodInvocation, RmiInvocationHandler invocationHandler)
-	    throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+		throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
 
 		if (AopUtils.isToStringMethod(methodInvocation.getMethod())) {
 			return "RMI invoker proxy for service URL [" + getJndiName() + "]";
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
index f3d08416b3..0ef03a4ef2 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
@@ -152,8 +152,8 @@ public class RmiClientInterceptor extends RemoteInvocationBasedAccessor
 				else if (getServiceInterface() != null) {
 					boolean isImpl = getServiceInterface().isInstance(remoteObj);
 					logger.debug("Using service interface [" + getServiceInterface().getName() +
-					    "] for RMI stub [" + getServiceUrl() + "] - " +
-					    (!isImpl ? "not " : "") + "directly implemented");
+						"] for RMI stub [" + getServiceUrl() + "] - " +
+						(!isImpl ? "not " : "") + "directly implemented");
 				}
 			}
 			if (this.cacheStub) {
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
index 0849cd8fe8..e16b8158ca 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
@@ -54,6 +54,6 @@ public interface RmiInvocationHandler extends Remote {
 	 * @throws InvocationTargetException if the method invocation resulted in an exception
 	 */
 	public Object invoke(RemoteInvocation invocation)
-	    throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException;
+			throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException;
 
 }
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
index 299f5cc6fb..5d028402bc 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
@@ -67,7 +67,7 @@ class RmiInvocationWrapper implements RmiInvocationHandler {
 	 * @see RmiBasedExporter#invoke(org.springframework.remoting.support.RemoteInvocation, Object)
 	 */
 	public Object invoke(RemoteInvocation invocation)
-	    throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+		throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
 
 		return this.rmiExporter.invoke(invocation, this.wrappedObject);
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
index ff3e33442e..eb5f420b03 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
@@ -678,8 +678,8 @@ public final class ProxyFactoryBeanTests {
 	public void testFrozenFactoryBean() {
 		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(FROZEN_CONTEXT, CLASS));
 
-	    Advised advised = (Advised)bf.getBean("frozen");
-	    assertTrue("The proxy should be frozen", advised.isFrozen());
+		Advised advised = (Advised)bf.getBean("frozen");
+		assertTrue("The proxy should be frozen", advised.isFrozen());
 	}
 
 	@Test
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 71f2f9e3d5..e061bc7edf 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
@@ -46,7 +46,7 @@ public class AutowiredConfigurationTests {
 	@Test
 	public void testAutowiredConfigurationDependencies() {
 		ClassPathXmlApplicationContext factory = new ClassPathXmlApplicationContext(
-		        AutowiredConfigurationTests.class.getSimpleName() + ".xml", AutowiredConfigurationTests.class);
+				AutowiredConfigurationTests.class.getSimpleName() + ".xml", AutowiredConfigurationTests.class);
 
 		assertThat(factory.getBean("colour", Colour.class), equalTo(Colour.RED));
 		assertThat(factory.getBean("testBean", TestBean.class).getName(), equalTo(Colour.RED.toString()));
@@ -100,7 +100,7 @@ public class AutowiredConfigurationTests {
 	@Test
 	public void testValueInjection() {
 		ClassPathXmlApplicationContext factory = new ClassPathXmlApplicationContext(
-		        "ValueInjectionTests.xml", AutowiredConfigurationTests.class);
+				"ValueInjectionTests.xml", AutowiredConfigurationTests.class);
 
 		System.clearProperty("myProp");
 
@@ -155,7 +155,7 @@ public class AutowiredConfigurationTests {
 	@Test
 	public void testCustomProperties() {
 		ClassPathXmlApplicationContext factory = new ClassPathXmlApplicationContext(
-		        "AutowiredConfigurationTests-custom.xml", AutowiredConfigurationTests.class);
+				"AutowiredConfigurationTests-custom.xml", AutowiredConfigurationTests.class);
 
 		TestBean testBean = factory.getBean("testBean", TestBean.class);
 		assertThat(testBean.getName(), equalTo("localhost"));
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 9dc9e980d4..7bdf1daac5 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
@@ -42,140 +42,140 @@ import org.springframework.context.annotation.ImportResource;
  * @author Juergen Hoeller
  */
 public class ImportResourceTests {
-    @Test
-    public void testImportXml() {
-        AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlConfig.class);
-        assertTrue("did not contain java-declared bean", ctx.containsBean("javaDeclaredBean"));
-        assertTrue("did not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean"));
+	@Test
+	public void testImportXml() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlConfig.class);
+		assertTrue("did not contain java-declared bean", ctx.containsBean("javaDeclaredBean"));
+		assertTrue("did not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean"));
 		TestBean tb = ctx.getBean("javaDeclaredBean", TestBean.class);
 		assertEquals("myName", tb.getName());
-    }
+	}
 
-    @Configuration
-    @ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml")
-    static class ImportXmlConfig {
+	@Configuration
+	@ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml")
+	static class ImportXmlConfig {
 		@Value("${name}")
 		private String name;
-        public @Bean TestBean javaDeclaredBean() {
-            return new TestBean(this.name);
-        }
-    }
+		public @Bean TestBean javaDeclaredBean() {
+			return new TestBean(this.name);
+		}
+	}
 
-    @Ignore // TODO: SPR-6310
-    @Test
-    public void testImportXmlWithRelativePath() {
-        AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlWithRelativePathConfig.class);
-        assertTrue("did not contain java-declared bean", ctx.containsBean("javaDeclaredBean"));
-        assertTrue("did not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean"));
+	@Ignore // TODO: SPR-6310
+	@Test
+	public void testImportXmlWithRelativePath() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlWithRelativePathConfig.class);
+		assertTrue("did not contain java-declared bean", ctx.containsBean("javaDeclaredBean"));
+		assertTrue("did not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean"));
 		TestBean tb = ctx.getBean("javaDeclaredBean", TestBean.class);
 		assertEquals("myName", tb.getName());
-    }
+	}
 
-    @Configuration
-    @ImportResource("ImportXmlConfig-context.xml")
-    static class ImportXmlWithRelativePathConfig {
-        public @Bean TestBean javaDeclaredBean() {
-            return new TestBean("java.declared");
-        }
-    }
+	@Configuration
+	@ImportResource("ImportXmlConfig-context.xml")
+	static class ImportXmlWithRelativePathConfig {
+		public @Bean TestBean javaDeclaredBean() {
+			return new TestBean("java.declared");
+		}
+	}
 
-    @Ignore // TODO: SPR-6310
-    @Test
-    public void testImportXmlByConvention() {
-    	ApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlByConventionConfig.class);
-    	assertTrue("context does not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean"));
-    }
+	@Ignore // TODO: SPR-6310
+	@Test
+	public void testImportXmlByConvention() {
+		ApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlByConventionConfig.class);
+		assertTrue("context does not contain xml-declared bean", ctx.containsBean("xmlDeclaredBean"));
+	}
 
-    @Configuration
-    //@ImportXml
-    static class ImportXmlByConventionConfig {
-    }
+	@Configuration
+	//@ImportXml
+	static class ImportXmlByConventionConfig {
+	}
 
-    @Test
-    public void testImportXmlIsInheritedFromSuperclassDeclarations() {
-        AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(FirstLevelSubConfig.class);
-        assertTrue(ctx.containsBean("xmlDeclaredBean"));
-    }
+	@Test
+	public void testImportXmlIsInheritedFromSuperclassDeclarations() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(FirstLevelSubConfig.class);
+		assertTrue(ctx.containsBean("xmlDeclaredBean"));
+	}
 
-    @Test
-    public void testImportXmlIsMergedFromSuperclassDeclarations() {
-        AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SecondLevelSubConfig.class);
-        assertTrue("failed to pick up second-level-declared XML bean", ctx.containsBean("secondLevelXmlDeclaredBean"));
-        assertTrue("failed to pick up parent-declared XML bean", ctx.containsBean("xmlDeclaredBean"));
-    }
+	@Test
+	public void testImportXmlIsMergedFromSuperclassDeclarations() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SecondLevelSubConfig.class);
+		assertTrue("failed to pick up second-level-declared XML bean", ctx.containsBean("secondLevelXmlDeclaredBean"));
+		assertTrue("failed to pick up parent-declared XML bean", ctx.containsBean("xmlDeclaredBean"));
+	}
 
-    @Configuration
-    @ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml")
-    static class BaseConfig {
-    }
+	@Configuration
+	@ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml")
+	static class BaseConfig {
+	}
 
-    @Configuration
-    static class FirstLevelSubConfig extends BaseConfig {
-    }
+	@Configuration
+	static class FirstLevelSubConfig extends BaseConfig {
+	}
 
-    @Configuration
-    @ImportResource("classpath:org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml")
-    static class SecondLevelSubConfig extends BaseConfig {
-    }
+	@Configuration
+	@ImportResource("classpath:org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml")
+	static class SecondLevelSubConfig extends BaseConfig {
+	}
 
-    @Test
-    public void testImportXmlWithNamespaceConfig() {
-    	AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlWithAopNamespaceConfig.class);
-    	Object bean = ctx.getBean("proxiedXmlBean");
-    	assertTrue(AopUtils.isAopProxy(bean));
-    }
+	@Test
+	public void testImportXmlWithNamespaceConfig() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlWithAopNamespaceConfig.class);
+		Object bean = ctx.getBean("proxiedXmlBean");
+		assertTrue(AopUtils.isAopProxy(bean));
+	}
 
-    @Configuration
-    @ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml")
-    static class ImportXmlWithAopNamespaceConfig {
-    }
+	@Configuration
+	@ImportResource("classpath:org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml")
+	static class ImportXmlWithAopNamespaceConfig {
+	}
 
-    @Aspect
-    static class AnAspect {
-    	@Before("execution(* test.beans.TestBean.*(..))")
-    	public void advice() { }
-    }
+	@Aspect
+	static class AnAspect {
+		@Before("execution(* test.beans.TestBean.*(..))")
+		public void advice() { }
+	}
 
-    @Test
-    public void testImportXmlWithAutowiredConfig() {
-        AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlAutowiredConfig.class);
-        String name = ctx.getBean("xmlBeanName", String.class);
-        assertThat(name, equalTo("xml.declared"));
-    }
+	@Test
+	public void testImportXmlWithAutowiredConfig() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportXmlAutowiredConfig.class);
+		String name = ctx.getBean("xmlBeanName", String.class);
+		assertThat(name, equalTo("xml.declared"));
+	}
 
-    @Configuration
-    @ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml")
-    static class ImportXmlAutowiredConfig {
-        @Autowired TestBean xmlDeclaredBean;
+	@Configuration
+	@ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml")
+	static class ImportXmlAutowiredConfig {
+		@Autowired TestBean xmlDeclaredBean;
 
-        public @Bean String xmlBeanName() {
-            return xmlDeclaredBean.getName();
-        }
-    }
+		public @Bean String xmlBeanName() {
+			return xmlDeclaredBean.getName();
+		}
+	}
 
-    @Test
-    public void testImportNonXmlResource() {
-        AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportNonXmlResourceConfig.class);
-        assertTrue(ctx.containsBean("propertiesDeclaredBean"));
-    }
+	@Test
+	public void testImportNonXmlResource() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(ImportNonXmlResourceConfig.class);
+		assertTrue(ctx.containsBean("propertiesDeclaredBean"));
+	}
 
-    @Configuration
-    @ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties",
-    		reader=PropertiesBeanDefinitionReader.class)
-    static class ImportNonXmlResourceConfig {
-    }
+	@Configuration
+	@ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties",
+			reader=PropertiesBeanDefinitionReader.class)
+	static class ImportNonXmlResourceConfig {
+	}
 
-    @Ignore // TODO: SPR-6327
-    @Test
-    public void testImportDifferentResourceTypes() {
-        AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SubResourceConfig.class);
-        assertTrue(ctx.containsBean("propertiesDeclaredBean"));
-        assertTrue(ctx.containsBean("xmlDeclaredBean"));
-    }
+	@Ignore // TODO: SPR-6327
+	@Test
+	public void testImportDifferentResourceTypes() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(SubResourceConfig.class);
+		assertTrue(ctx.containsBean("propertiesDeclaredBean"));
+		assertTrue(ctx.containsBean("xmlDeclaredBean"));
+	}
 
-    @Configuration
-    @ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml",
-    		reader=XmlBeanDefinitionReader.class)
-    static class SubResourceConfig extends ImportNonXmlResourceConfig {
-    }
-}
\ No newline at end of file
+	@Configuration
+	@ImportResource(value="classpath:org/springframework/context/annotation/configuration/ImportXmlConfig-context.xml",
+			reader=XmlBeanDefinitionReader.class)
+	static class SubResourceConfig extends ImportNonXmlResourceConfig {
+	}
+}
diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
index f55a47870c..68ddae1f8c 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
@@ -319,8 +319,7 @@ public final class ClassPathXmlApplicationContextTests {
 
 	@Test
 	public void testResourceAndInputStream() throws IOException {
-		ClassPathXmlApplicationContext ctx =
-		    new ClassPathXmlApplicationContext(RESOURCE_CONTEXT) {
+		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(RESOURCE_CONTEXT) {
 			public Resource getResource(String location) {
 				if (TEST_PROPERTIES.equals(location)) {
 					return new ClassPathResource(TEST_PROPERTIES, ClassPathXmlApplicationContextTests.class);
diff --git a/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java b/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java
index 87d195dc1c..68f1ce529c 100644
--- a/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java
+++ b/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java
@@ -26,7 +26,7 @@ import org.springframework.aop.ThrowsAdvice;
 public class NoOpAdvice implements ThrowsAdvice {
 
 	public void afterThrowing(Exception ex) throws Throwable {
-	    // no-op
+		// no-op
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
index 910200918a..d734c34f0a 100644
--- a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
@@ -27,22 +27,22 @@ import org.junit.Test;
  */
 public class Spr7283Tests {
 
-    @Test
-    public void testListWithInconsistentElementType() {
-        ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("spr7283.xml", getClass());
+	@Test
+	public void testListWithInconsistentElementType() {
+		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("spr7283.xml", getClass());
 		List list = ctx.getBean("list", List.class);
 		assertEquals(2, list.size());
 		assertTrue(list.get(0) instanceof A);
 		assertTrue(list.get(1) instanceof B);
-    }
+	}
 
 
-    public static class A {
-    	public A() {}
-    }
+	public static class A {
+		public A() {}
+	}
 
-    public static class B {
-    	public B() {}
-    }
+	public static class B {
+		public B() {}
+	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java b/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java
index f3be4d65c4..a7066c828c 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java
@@ -13,17 +13,17 @@ public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice {
 
 	public void before(Method method, Object[] objects, Object o) throws Throwable {
 		countBefore++;
-        System.out.println("Method:"+method.getName());
-    }
+		System.out.println("Method:"+method.getName());
+	}
 
 	public void afterThrowing(Exception e) throws Throwable {
 		countThrows++;
-        System.out.println("***********************************************************************************");
-        System.out.println("Exception caught:");
-        System.out.println("***********************************************************************************");
-        e.printStackTrace();
-        throw e;
-    }
+		System.out.println("***********************************************************************************");
+		System.out.println("Exception caught:");
+		System.out.println("***********************************************************************************");
+		e.printStackTrace();
+		throw e;
+	}
 
 	public int getCountBefore() {
 		return countBefore;
diff --git a/spring-core/src/main/java/org/springframework/core/Constants.java b/spring-core/src/main/java/org/springframework/core/Constants.java
index 792c1a2056..67621e01f0 100644
--- a/spring-core/src/main/java/org/springframework/core/Constants.java
+++ b/spring-core/src/main/java/org/springframework/core/Constants.java
@@ -319,17 +319,17 @@ public class Constants {
 	 * @see #toCodeForProperty
 	 */
 	public String propertyToConstantNamePrefix(String propertyName) {
-	  StringBuilder parsedPrefix = new StringBuilder();
-	  for(int i = 0; i < propertyName.length(); i++) {
-	    char c = propertyName.charAt(i);
-	    if (Character.isUpperCase(c)) {
-	      parsedPrefix.append("_");
-	      parsedPrefix.append(c);
-	    }
-	    else {
-	      parsedPrefix.append(Character.toUpperCase(c));
-	    }
-	  }
+		StringBuilder parsedPrefix = new StringBuilder();
+		for (int i = 0; i < propertyName.length(); i++) {
+			char c = propertyName.charAt(i);
+			if (Character.isUpperCase(c)) {
+				parsedPrefix.append("_");
+				parsedPrefix.append(c);
+			}
+			else {
+				parsedPrefix.append(Character.toUpperCase(c));
+			}
+		}
 		return parsedPrefix.toString();
 	}
 
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 83923a778e..6826155989 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
@@ -94,23 +94,23 @@ public interface GenericConverter {
 			return this.targetType;
 		}
 
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj) {
 				return true;
 			}
-            if (obj == null || obj.getClass() != ConvertiblePair.class) {
+			if (obj == null || obj.getClass() != ConvertiblePair.class) {
 				return false;
 			}
-            ConvertiblePair other = (ConvertiblePair) obj;
-            return this.sourceType.equals(other.sourceType) && this.targetType.equals(other.targetType);
+			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 int hashCode() {
+			return this.sourceType.hashCode() * 31 + this.targetType.hashCode();
+		}
+	}
 
 }
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 3933128d64..637d36d6fa 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
@@ -194,7 +194,7 @@ public abstract class AbstractResource implements Resource {
 	@Override
 	public boolean equals(Object obj) {
 		return (obj == this ||
-		    (obj instanceof Resource && ((Resource) obj).getDescription().equals(getDescription())));
+			(obj instanceof Resource && ((Resource) obj).getDescription().equals(getDescription())));
 	}
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
index 008d93dc9d..0e67b3b1fe 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
@@ -112,7 +112,7 @@ public class ByteArrayResource extends AbstractResource {
 	@Override
 	public boolean equals(Object obj) {
 		return (obj == this ||
-		    (obj instanceof ByteArrayResource && Arrays.equals(((ByteArrayResource) obj).byteArray, this.byteArray)));
+			(obj instanceof ByteArrayResource && Arrays.equals(((ByteArrayResource) obj).byteArray, this.byteArray)));
 	}
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java b/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
index df3aaad2cf..d7ee370df9 100644
--- a/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
@@ -70,7 +70,7 @@ public class DescriptiveResource extends AbstractResource {
 	@Override
 	public boolean equals(Object obj) {
 		return (obj == this ||
-		    (obj instanceof DescriptiveResource && ((DescriptiveResource) obj).description.equals(this.description)));
+			(obj instanceof DescriptiveResource && ((DescriptiveResource) obj).description.equals(this.description)));
 	}
 
 	/**
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 3d0805c345..12daadd208 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
@@ -204,7 +204,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso
 	@Override
 	public boolean equals(Object obj) {
 		return (obj == this ||
-		    (obj instanceof FileSystemResource && this.path.equals(((FileSystemResource) obj).path)));
+			(obj instanceof FileSystemResource && this.path.equals(((FileSystemResource) obj).path)));
 	}
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java b/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
index e9c1c7d4ae..d9558c5182 100644
--- a/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
@@ -111,7 +111,7 @@ public class InputStreamResource extends AbstractResource {
 	@Override
 	public boolean equals(Object obj) {
 		return (obj == this ||
-		    (obj instanceof InputStreamResource && ((InputStreamResource) obj).inputStream.equals(this.inputStream)));
+			(obj instanceof InputStreamResource && ((InputStreamResource) obj).inputStream.equals(this.inputStream)));
 	}
 
 	/**
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 2f9f162d78..ae760378e7 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
@@ -207,7 +207,7 @@ public class UrlResource extends AbstractFileResolvingResource {
 	@Override
 	public boolean equals(Object obj) {
 		return (obj == this ||
-		    (obj instanceof UrlResource && this.cleanedUrl.equals(((UrlResource) obj).cleanedUrl)));
+			(obj instanceof UrlResource && this.cleanedUrl.equals(((UrlResource) obj).cleanedUrl)));
 	}
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java b/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
index 1153c475fa..25f7fa9aba 100644
--- a/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
@@ -61,7 +61,7 @@ public abstract class FileCopyUtils {
 		Assert.notNull(in, "No input File specified");
 		Assert.notNull(out, "No output File specified");
 		return copy(new BufferedInputStream(new FileInputStream(in)),
-		    new BufferedOutputStream(new FileOutputStream(out)));
+			new BufferedOutputStream(new FileOutputStream(out)));
 	}
 
 	/**
diff --git a/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
index 0e18a067db..196f2e6577 100644
--- a/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
@@ -28,78 +28,78 @@ import static org.junit.Assert.*;
  */
 public class ExceptionDepthComparatorTests {
 
-  @Test
-  public void targetBeforeSameDepth() throws Exception {
-    Class<? extends Throwable> foundClass = findClosestMatch(TargetException.class, SameDepthException.class);
-    assertEquals(TargetException.class, foundClass);
-  }
+	@Test
+	public void targetBeforeSameDepth() throws Exception {
+		Class<? extends Throwable> foundClass = findClosestMatch(TargetException.class, SameDepthException.class);
+		assertEquals(TargetException.class, foundClass);
+	}
 
-  @Test
-  public void sameDepthBeforeTarget() throws Exception {
-    Class<? extends Throwable> foundClass = findClosestMatch(SameDepthException.class, TargetException.class);
-    assertEquals(TargetException.class, foundClass);
-  }
+	@Test
+	public void sameDepthBeforeTarget() throws Exception {
+		Class<? extends Throwable> foundClass = findClosestMatch(SameDepthException.class, TargetException.class);
+		assertEquals(TargetException.class, foundClass);
+	}
 
-  @Test
-  public void lowestDepthBeforeTarget() throws Exception {
-    Class<? extends Throwable> foundClass = findClosestMatch(LowestDepthException.class, TargetException.class);
-    assertEquals(TargetException.class, foundClass);
-  }
+	@Test
+	public void lowestDepthBeforeTarget() throws Exception {
+		Class<? extends Throwable> foundClass = findClosestMatch(LowestDepthException.class, TargetException.class);
+		assertEquals(TargetException.class, foundClass);
+	}
 
-  @Test
-  public void targetBeforeLowestDepth() throws Exception {
-    Class<? extends Throwable> foundClass = findClosestMatch(TargetException.class, LowestDepthException.class);
-    assertEquals(TargetException.class, foundClass);
-  }
+	@Test
+	public void targetBeforeLowestDepth() throws Exception {
+		Class<? extends Throwable> foundClass = findClosestMatch(TargetException.class, LowestDepthException.class);
+		assertEquals(TargetException.class, foundClass);
+	}
 
-  @Test
-  public void noDepthBeforeTarget() throws Exception {
-    Class<? extends Throwable> foundClass = findClosestMatch(NoDepthException.class, TargetException.class);
-    assertEquals(TargetException.class, foundClass);
-  }
+	@Test
+	public void noDepthBeforeTarget() throws Exception {
+		Class<? extends Throwable> foundClass = findClosestMatch(NoDepthException.class, TargetException.class);
+		assertEquals(TargetException.class, foundClass);
+	}
 
-  @Test
-  public void noDepthBeforeHighestDepth() throws Exception {
-    Class<? extends Throwable> foundClass = findClosestMatch(NoDepthException.class, HighestDepthException.class);
-    assertEquals(HighestDepthException.class, foundClass);
-  }
+	@Test
+	public void noDepthBeforeHighestDepth() throws Exception {
+		Class<? extends Throwable> foundClass = findClosestMatch(NoDepthException.class, HighestDepthException.class);
+		assertEquals(HighestDepthException.class, foundClass);
+	}
 
-  @Test
-  public void highestDepthBeforeNoDepth() throws Exception {
-    Class<? extends Throwable> foundClass = findClosestMatch(HighestDepthException.class, NoDepthException.class);
-    assertEquals(HighestDepthException.class, foundClass);
-  }
+	@Test
+	public void highestDepthBeforeNoDepth() throws Exception {
+		Class<? extends Throwable> foundClass = findClosestMatch(HighestDepthException.class, NoDepthException.class);
+		assertEquals(HighestDepthException.class, foundClass);
+	}
 
-  @Test
-  public void highestDepthBeforeLowestDepth() throws Exception {
-    Class<? extends Throwable> foundClass = findClosestMatch(HighestDepthException.class, LowestDepthException.class);
-    assertEquals(LowestDepthException.class, foundClass);
-  }
+	@Test
+	public void highestDepthBeforeLowestDepth() throws Exception {
+		Class<? extends Throwable> foundClass = findClosestMatch(HighestDepthException.class, LowestDepthException.class);
+		assertEquals(LowestDepthException.class, foundClass);
+	}
 
-  @Test
-  public void lowestDepthBeforeHighestDepth() throws Exception {
-    Class<? extends Throwable> foundClass = findClosestMatch(LowestDepthException.class, HighestDepthException.class);
-    assertEquals(LowestDepthException.class, foundClass);
-  }
+	@Test
+	public void lowestDepthBeforeHighestDepth() throws Exception {
+		Class<? extends Throwable> foundClass = findClosestMatch(LowestDepthException.class, HighestDepthException.class);
+		assertEquals(LowestDepthException.class, foundClass);
+	}
 
-  private Class<? extends Throwable> findClosestMatch(Class<? extends Throwable>... classes) {
-    return ExceptionDepthComparator.findClosestMatch(Arrays.asList(classes), new TargetException());
-  }
+	private Class<? extends Throwable> findClosestMatch(
+			Class<? extends Throwable>... classes) {
+		return ExceptionDepthComparator.findClosestMatch(Arrays.asList(classes), new TargetException());
+	}
 
+	public class HighestDepthException extends Throwable {
+	}
 
-  public class HighestDepthException extends Throwable {
-  }
+	public class LowestDepthException extends HighestDepthException {
+	}
 
-  public class LowestDepthException extends HighestDepthException {
-  }
+	public class TargetException extends LowestDepthException {
+	}
 
-  public class TargetException extends LowestDepthException {
-  }
+	public class SameDepthException extends LowestDepthException {
+	}
 
-  public class SameDepthException extends LowestDepthException {
-  }
-
-  public class NoDepthException extends TargetException {
-  }
+	public class NoDepthException extends TargetException {
+	}
 
 }
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 cdb201c602..5bdc32d9a2 100644
--- a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
@@ -130,26 +130,26 @@ public class GenericTypeResolverTests {
 		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>()));
+	/**
+	 * @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>()));
 
-            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 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 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));
+	}
 
 
 	public interface MyInterfaceType<T> {
@@ -234,14 +234,14 @@ public class GenericTypeResolverTests {
 			return null;
 		}
 
-        public void readIntegerInputMessage(MyInterfaceType<Integer> message) {
-        }
+		public void readIntegerInputMessage(MyInterfaceType<Integer> message) {
+		}
 
-        public void readIntegerArrayInputMessage(MyInterfaceType<Integer>[] message) {
-        }
+		public void readIntegerArrayInputMessage(MyInterfaceType<Integer>[] message) {
+		}
 
-        public void readGenericArrayInputMessage(T[] message) {
-        }
+		public void readGenericArrayInputMessage(T[] message) {
+		}
 	}
 
 	public static class MySimpleTypeWithMethods extends MyTypeWithMethods<Integer> {
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 a6beaafe6c..33a40425ca 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
@@ -124,7 +124,7 @@ public class ReflectionHelper {
 				Class paramTypeClazz = paramType.getType();
 				if (paramTypeClazz.isPrimitive()) {
 					paramTypeClazz = Object.class;
-			    }
+				}
 				Class superClass = argType.getClass().getSuperclass();
 				while (superClass != null) {
 					if (paramType.equals(superClass)) {
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
index eab2a6f0c2..aa3f27509f 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
@@ -192,7 +192,7 @@ public class ConstructorInvocationTests extends ExpressionTestCase {
 
 	@Test
 	public void testVarargsInvocation02() {
-	    // Calling 'Fruit(int i, String... strings)' - returns int+length_of_strings
+		// Calling 'Fruit(int i, String... strings)' - returns int+length_of_strings
 		evaluate("new org.springframework.expression.spel.testresources.Fruit(5,'a','b','c').stringscount()", 8, Integer.class);
 		evaluate("new org.springframework.expression.spel.testresources.Fruit(2,'a').stringscount()", 3, Integer.class);
 		evaluate("new org.springframework.expression.spel.testresources.Fruit(4).stringscount()", 4, Integer.class);
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
index ada7b35acf..6876afb0e1 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
@@ -435,8 +435,8 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		ExpressionParser parser = new SpelExpressionParser();
 		StandardEvaluationContext context = new StandardEvaluationContext();
 
-		context.registerFunction("reverseString",
-		                         StringUtils.class.getDeclaredMethod("reverseString", new Class[] { String.class }));
+		context.registerFunction("reverseString", StringUtils.class.getDeclaredMethod(
+				"reverseString", new Class[] { String.class }));
 
 		String helloWorldReversed = parser.parseExpression("#reverseString('hello world')").getValue(context, String.class);
 		Assert.assertEquals("dlrow olleh",helloWorldReversed);
@@ -456,8 +456,8 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		parser.parseExpression("Name").setValue(societyContext, "IEEE");
 		societyContext.setVariable("queryName", "Nikola Tesla");
 
-		String expression = "isMember(#queryName)? #queryName + ' is a member of the ' " +
-		             "+ Name + ' Society' : #queryName + ' is not a member of the ' + Name + ' Society'";
+		String expression = "isMember(#queryName)? #queryName + ' is a member of the ' "
+				+ "+ Name + ' Society' : #queryName + ' is not a member of the ' + Name + ' Society'";
 
 		String queryResultString = parser.parseExpression(expression).getValue(societyContext, String.class);
 		Assert.assertEquals("Nikola Tesla is a member of the IEEE Society",queryResultString);
@@ -487,28 +487,28 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 	static class TemplatedParserContext implements ParserContext {
 
-		  public String getExpressionPrefix() {
-		    return "${";
-		  }
+		public String getExpressionPrefix() {
+			return "${";
+		}
 
-		  public String getExpressionSuffix() {
-		    return "}";
-		  }
+		public String getExpressionSuffix() {
+			return "}";
+		}
 
-		  public boolean isTemplate() {
-		    return true;
-		  }
+		public boolean isTemplate() {
+			return true;
+		}
 	}
 
 	static class StringUtils {
 
-		  public static String reverseString(String input) {
-		    StringBuilder backwards = new StringBuilder();
-		    for (int i = 0; i < input.length(); i++) {
-		      backwards.append(input.charAt(input.length() - 1 - i));
-		    }
-		    return backwards.toString();
-		  }
+		public static String reverseString(String input) {
+			StringBuilder backwards = new StringBuilder();
+			for (int i = 0; i < input.length(); i++) {
+				backwards.append(input.charAt(input.length() - 1 - i));
+			}
+			return backwards.toString();
+		}
 	}
 
 }
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 e199293cee..e97d7cccbc 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
@@ -364,7 +364,7 @@ public interface JdbcOperations {
 	 * @see java.sql.Types
 	 */
 	<T> T query(String sql, Object[] args, int[] argTypes, ResultSetExtractor<T> rse)
-	    throws DataAccessException;
+			throws DataAccessException;
 
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a list
@@ -422,7 +422,7 @@ public interface JdbcOperations {
 	 * @throws DataAccessException if the query fails
 	 */
 	void query(String sql, PreparedStatementSetter pss, RowCallbackHandler rch)
-	    throws DataAccessException;
+			throws DataAccessException;
 
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a list of
@@ -437,7 +437,7 @@ public interface JdbcOperations {
 	 * @see java.sql.Types
 	 */
 	void query(String sql, Object[] args, int[] argTypes, RowCallbackHandler rch)
-	    throws DataAccessException;
+			throws DataAccessException;
 
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a list of
@@ -510,7 +510,7 @@ public interface JdbcOperations {
 	 * @see java.sql.Types
 	 */
 	<T> List<T> query(String sql, Object[] args, int[] argTypes, RowMapper<T> rowMapper)
-	    throws DataAccessException;
+			throws DataAccessException;
 
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a list
@@ -614,7 +614,7 @@ public interface JdbcOperations {
 	 * @see java.sql.Types
 	 */
 	<T> T queryForObject(String sql, Object[] args, int[] argTypes, Class<T> requiredType)
-	    throws DataAccessException;
+			throws DataAccessException;
 
 	/**
 	 * Query given SQL to create a prepared statement from SQL and a
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 5bf57f3e36..e2b4fb8951 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
@@ -177,7 +177,7 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan
 		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;
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java
index 77afaba1d1..b6d57ee63f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java
@@ -58,7 +58,7 @@ public abstract class LobCreatorUtils {
 		if (TransactionSynchronizationManager.isSynchronizationActive()) {
 			logger.debug("Registering Spring transaction synchronization for LobCreator");
 			TransactionSynchronizationManager.registerSynchronization(
-			    new SpringLobCreatorSynchronization(lobCreator));
+				new SpringLobCreatorSynchronization(lobCreator));
 		}
 		else {
 			if (jtaTransactionManager != null) {
@@ -77,7 +77,7 @@ public abstract class LobCreatorUtils {
 				}
 			}
 			throw new IllegalStateException("Active Spring transaction synchronization or active " +
-			    "JTA transaction with specified [javax.transaction.TransactionManager] required");
+				"JTA transaction with specified [javax.transaction.TransactionManager] required");
 		}
 	}
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
index e55342b36f..10b02fdc2b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
@@ -414,7 +414,7 @@ public class OracleLobHandler extends AbstractLobHandler {
 		}
 
 		public void setClobAsString(PreparedStatement ps, int paramIndex, final String content)
-		    throws SQLException {
+			throws SQLException {
 
 			if (content != null) {
 				Clob clob = (Clob) createLob(ps, true, new LobCallback() {
@@ -437,7 +437,7 @@ public class OracleLobHandler extends AbstractLobHandler {
 
 		public void setClobAsAsciiStream(
 				PreparedStatement ps, int paramIndex, final InputStream asciiStream, int contentLength)
-		    throws SQLException {
+			throws SQLException {
 
 			if (asciiStream != null) {
 				Clob clob = (Clob) createLob(ps, true, new LobCallback() {
@@ -460,7 +460,7 @@ public class OracleLobHandler extends AbstractLobHandler {
 
 		public void setClobAsCharacterStream(
 				PreparedStatement ps, int paramIndex, final Reader characterStream, int contentLength)
-		    throws SQLException {
+			throws SQLException {
 
 			if (characterStream != null) {
 				Clob clob = (Clob) createLob(ps, true, new LobCallback() {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java
index 739b3fb1c4..b7c9553f2d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java
@@ -94,11 +94,11 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 			this.wrappedStatementClass = getClass().getClassLoader().loadClass(prefix + "WrappedStatement");
 			this.wrappedResultSetClass = getClass().getClassLoader().loadClass(prefix + "WrappedResultSet");
 			this.getUnderlyingConnectionMethod =
-			    this.wrappedConnectionClass.getMethod("getUnderlyingConnection", (Class[]) null);
+				this.wrappedConnectionClass.getMethod("getUnderlyingConnection", (Class[]) null);
 			this.getUnderlyingStatementMethod =
-			    this.wrappedStatementClass.getMethod("getUnderlyingStatement", (Class[]) null);
+				this.wrappedStatementClass.getMethod("getUnderlyingStatement", (Class[]) null);
 			this.getUnderlyingResultSetMethod =
-			    this.wrappedResultSetClass.getMethod("getUnderlyingResultSet", (Class[]) null);
+				this.wrappedResultSetClass.getMethod("getUnderlyingResultSet", (Class[]) null);
 		}
 		catch (Exception ex) {
 			throw new IllegalStateException(
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
index 7d0871abb8..039e69680d 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
@@ -160,7 +160,7 @@ public interface JmsOperations {
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	void convertAndSend(Object message, MessagePostProcessor postProcessor)
-	    throws JmsException;
+		throws JmsException;
 
 	/**
 	 * Send the given object to the specified destination, converting the object
@@ -172,7 +172,7 @@ public interface JmsOperations {
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	void convertAndSend(Destination destination, Object message, MessagePostProcessor postProcessor)
-	    throws JmsException;
+		throws JmsException;
 
 	/**
 	 * Send the given object to the specified destination, converting the object
@@ -185,7 +185,7 @@ public interface JmsOperations {
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	void convertAndSend(String destinationName, Object message, MessagePostProcessor postProcessor)
-	    throws JmsException;
+		throws JmsException;
 
 
 	//-------------------------------------------------------------------------
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 189a88a89c..66c5d8750a 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
@@ -648,7 +648,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 
 	public void convertAndSend(
 			String destinationName, final Object message, final MessagePostProcessor postProcessor)
-	    throws JmsException {
+		throws JmsException {
 
 		send(destinationName, new MessageCreator() {
 			public Message createMessage(Session session) throws JMSException {
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java
index c9890fd55b..b37037c444 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java
@@ -366,7 +366,7 @@ public class JmsTemplate102Tests extends TestCase {
 
 		template.execute(new ProducerCallback() {
 			public Object doInJms(Session session, MessageProducer producer)
-			    throws JMSException {
+				throws JMSException {
 				boolean b = session.getTransacted();
 				int i = producer.getPriority();
 				return null;
@@ -627,7 +627,7 @@ public class JmsTemplate102Tests extends TestCase {
 			else {
 				template.send("testQueue", new MessageCreator() {
 					public Message createMessage(Session session)
-					    throws JMSException {
+						throws JMSException {
 						return session.createTextMessage("just testing");
 					}
 				});
@@ -690,7 +690,7 @@ public class JmsTemplate102Tests extends TestCase {
 		if (explicitTopic) {
 			template.send(mockTopic, new MessageCreator() {
 				public Message createMessage(Session session)
-				    throws JMSException {
+					throws JMSException {
 					return session.createTextMessage("just testing");
 				}
 			});
@@ -698,7 +698,7 @@ public class JmsTemplate102Tests extends TestCase {
 		else {
 			template.send("testTopic", new MessageCreator() {
 				public Message createMessage(Session session)
-				    throws JMSException {
+					throws JMSException {
 					return session.createTextMessage("just testing");
 				}
 			});
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 250334fd63..19d6588b04 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
@@ -660,7 +660,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 		@Override
 		public void flush() {
 			try {
-			    this.sessionHolder.getSession().flush();
+				this.sessionHolder.getSession().flush();
 			}
 			catch (HibernateException ex) {
 				throw convertHibernateAccessException(ex);
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 ae5f3853b3..66d38bde67 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
@@ -888,7 +888,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 
 		public void flush() {
 			try {
-			    this.sessionHolder.getSession().flush();
+				this.sessionHolder.getSession().flush();
 			}
 			catch (HibernateException ex) {
 				throw convertHibernateAccessException(ex);
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java
index e240800e0f..e48abde632 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java
@@ -41,7 +41,7 @@ public class LocalCacheProviderProxy implements CacheProvider {
 		// absolutely needs thread-bound CacheProvider to initialize
 		if (cp == null) {
 			throw new IllegalStateException("No Hibernate CacheProvider found - " +
-			    "'cacheProvider' property must be set on LocalSessionFactoryBean");
+				"'cacheProvider' property must be set on LocalSessionFactoryBean");
 		}
 		this.cacheProvider = cp;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java
index 498c53c6b7..3f97a1d7b9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java
@@ -49,7 +49,7 @@ public class LocalDataSourceConnectionProvider implements ConnectionProvider {
 		// absolutely needs thread-bound DataSource to initialize
 		if (this.dataSource == null) {
 			throw new HibernateException("No local DataSource found for configuration - " +
-			    "'dataSource' property must be set on LocalSessionFactoryBean");
+				"'dataSource' property must be set on LocalSessionFactoryBean");
 		}
 		this.dataSourceToUse = getDataSourceToUse(this.dataSource);
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
index e066594157..0a46bc5e9f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
@@ -56,7 +56,7 @@ public class LocalRegionFactoryProxy implements RegionFactory {
 		// absolutely needs thread-bound RegionFactory to initialize
 		if (rf == null) {
 			throw new IllegalStateException("No Hibernate RegionFactory found - " +
-			    "'cacheRegionFactory' property must be set on LocalSessionFactoryBean");
+				"'cacheRegionFactory' property must be set on LocalSessionFactoryBean");
 		}
 		this.regionFactory = rf;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java
index 0990f8384f..e8d0f2f462 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java
@@ -53,7 +53,7 @@ public class LocalTransactionManagerLookup implements TransactionManagerLookup {
 		// absolutely needs thread-bound TransactionManager to initialize
 		if (tm == null) {
 			throw new IllegalStateException("No JTA TransactionManager found - " +
-			    "'jtaTransactionManager' property must be set on LocalSessionFactoryBean");
+				"'jtaTransactionManager' property must be set on LocalSessionFactoryBean");
 		}
 		this.transactionManager = tm;
 	}
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 0fbddd87f7..73aeefdd1f 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
@@ -354,7 +354,7 @@ public abstract class SessionFactoryUtils {
 		if (!allowCreate && !isSessionTransactional(session, sessionFactory)) {
 			closeSession(session);
 			throw new IllegalStateException("No Hibernate Session bound to thread, " +
-			    "and configuration does not allow creation of non-transactional one here");
+				"and configuration does not allow creation of non-transactional one here");
 		}
 
 		return session;
@@ -371,8 +371,8 @@ public abstract class SessionFactoryUtils {
 	 * @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
@@ -612,7 +612,7 @@ public abstract class SessionFactoryUtils {
 	public static void applyTransactionTimeout(Criteria criteria, SessionFactory sessionFactory) {
 		Assert.notNull(criteria, "No Criteria object specified");
 		SessionHolder sessionHolder =
-		    (SessionHolder) TransactionSynchronizationManager.getResource(sessionFactory);
+			(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/support/AbstractLobType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
index 5ab3c68bbb..814da12370 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
@@ -76,7 +76,7 @@ public abstract class AbstractLobType implements UserType {
 	 */
 	protected AbstractLobType() {
 		this(LocalSessionFactoryBean.getConfigTimeLobHandler(),
-		    LocalSessionFactoryBean.getConfigTimeTransactionManager());
+			LocalSessionFactoryBean.getConfigTimeTransactionManager());
 	}
 
 	/**
@@ -150,7 +150,7 @@ public abstract class AbstractLobType implements UserType {
 
 		if (this.lobHandler == null) {
 			throw new IllegalStateException("No LobHandler found for configuration - " +
-			    "lobHandler property must be set on LocalSessionFactoryBean");
+				"lobHandler property must be set on LocalSessionFactoryBean");
 		}
 
 		try {
@@ -172,7 +172,7 @@ public abstract class AbstractLobType implements UserType {
 
 		if (this.lobHandler == null) {
 			throw new IllegalStateException("No LobHandler found for configuration - " +
-			    "lobHandler property must be set on LocalSessionFactoryBean");
+				"lobHandler property must be set on LocalSessionFactoryBean");
 		}
 
 		LobCreator lobCreator = this.lobHandler.getLobCreator();
@@ -211,7 +211,7 @@ public abstract class AbstractLobType implements UserType {
 	 * @throws HibernateException in case of any other exceptions
 	 */
 	protected abstract void nullSafeSetInternal(
-	    PreparedStatement ps, int index, Object value, LobCreator lobCreator)
+		PreparedStatement ps, int index, Object value, LobCreator lobCreator)
 			throws SQLException, IOException, HibernateException;
 
 }
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 5428baeed5..644103394e 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
@@ -138,7 +138,7 @@ public abstract class HibernateDaoSupport extends DaoSupport {
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession(SessionFactory, boolean)
 	 */
 	protected final Session getSession()
-	    throws DataAccessResourceFailureException, IllegalStateException {
+		throws DataAccessResourceFailureException, IllegalStateException {
 
 		return getSession(this.hibernateTemplate.isAllowCreate());
 	}
@@ -163,10 +163,10 @@ public abstract class HibernateDaoSupport extends DaoSupport {
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession(SessionFactory, boolean)
 	 */
 	protected final Session getSession(boolean allowCreate)
-	    throws DataAccessResourceFailureException, IllegalStateException {
+		throws DataAccessResourceFailureException, IllegalStateException {
 
 		return (!allowCreate ?
-		    SessionFactoryUtils.getSession(getSessionFactory(), false) :
+			SessionFactoryUtils.getSession(getSessionFactory(), false) :
 				SessionFactoryUtils.getSession(
 						getSessionFactory(),
 						this.hibernateTemplate.getEntityInterceptor(),
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 068424acd7..59bdc8e642 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
@@ -156,7 +156,7 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 		}
 
 		if ((isSingleSession() && TransactionSynchronizationManager.hasResource(getSessionFactory())) ||
-		    SessionFactoryUtils.isDeferredCloseActive(getSessionFactory())) {
+			SessionFactoryUtils.isDeferredCloseActive(getSessionFactory())) {
 			// Do not modify the Session: just mark the request accordingly.
 			Integer count = (Integer) request.getAttribute(participateAttributeName, WebRequest.SCOPE_REQUEST);
 			int newCount = (count != null ? count + 1 : 1);
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
index 9519e654dd..aa227bcaad 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
@@ -79,7 +79,7 @@ public abstract class AbstractLobTypeHandler extends BaseTypeHandler {
 	protected AbstractLobTypeHandler(LobHandler lobHandler) {
 		if (lobHandler == null) {
 			throw new IllegalStateException("No LobHandler found for configuration - " +
-			    "lobHandler property must be set on SqlMapClientFactoryBean");
+				"lobHandler property must be set on SqlMapClientFactoryBean");
 		}
 		this.lobHandler = lobHandler;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
index 0f25a17d63..397f58c3f4 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
@@ -201,9 +201,9 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		Assert.notNull(action, "Callback object must not be null");
 
 		PersistenceManager pm = PersistenceManagerFactoryUtils.getPersistenceManager(
-		    getPersistenceManagerFactory(), isAllowCreate());
+			getPersistenceManagerFactory(), isAllowCreate());
 		boolean existingTransaction =
-		    TransactionSynchronizationManager.hasResource(getPersistenceManagerFactory());
+			TransactionSynchronizationManager.hasResource(getPersistenceManagerFactory());
 		try {
 			PersistenceManager pmToExpose = (exposeNativePersistenceManager ? pm : createPersistenceManagerProxy(pm));
 			T result = action.doInJdo(pmToExpose);
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
index 09ce80a2dd..723445fcb9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
@@ -281,7 +281,7 @@ public class LocalPersistenceManagerFactoryBean implements FactoryBean<Persisten
 
 	public Class<? extends PersistenceManagerFactory> getObjectType() {
 		return (this.persistenceManagerFactory != null ?
-		    this.persistenceManagerFactory.getClass() : PersistenceManagerFactory.class);
+			this.persistenceManagerFactory.getClass() : PersistenceManagerFactory.class);
 	}
 
 	public boolean isSingleton() {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
index b6983a4c5c..0ec7f40a25 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
@@ -106,7 +106,7 @@ public abstract class PersistenceManagerFactoryUtils {
 	 * @see JdoTransactionManager
 	 */
 	public static PersistenceManager getPersistenceManager(PersistenceManagerFactory pmf, boolean allowCreate)
-	    throws DataAccessResourceFailureException, IllegalStateException {
+		throws DataAccessResourceFailureException, IllegalStateException {
 
 		try {
 			return doGetPersistenceManager(pmf, allowCreate);
@@ -133,7 +133,7 @@ public abstract class PersistenceManagerFactoryUtils {
 	 * @see JdoTransactionManager
 	 */
 	public static PersistenceManager doGetPersistenceManager(PersistenceManagerFactory pmf, boolean allowCreate)
-	    throws JDOException, IllegalStateException {
+		throws JDOException, IllegalStateException {
 
 		Assert.notNull(pmf, "No PersistenceManagerFactory specified");
 
@@ -204,7 +204,7 @@ public abstract class PersistenceManagerFactoryUtils {
 
 		Assert.notNull(query, "No Query object specified");
 		PersistenceManagerHolder pmHolder =
-		    (PersistenceManagerHolder) TransactionSynchronizationManager.getResource(pmf);
+			(PersistenceManagerHolder) TransactionSynchronizationManager.getResource(pmf);
 		if (pmHolder != null && pmHolder.hasTimeout()) {
 			jdoDialect.applyQueryTimeout(query, pmHolder.getTimeToLiveInSeconds());
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java
index 23feeb358a..5b0ec257b1 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java
@@ -144,7 +144,7 @@ public abstract class JdoDaoSupport extends DaoSupport {
 	 * @see org.springframework.orm.jdo.PersistenceManagerFactoryUtils#getPersistenceManager
 	 */
 	protected final PersistenceManager getPersistenceManager(boolean allowCreate)
-	    throws DataAccessResourceFailureException, IllegalStateException {
+		throws DataAccessResourceFailureException, IllegalStateException {
 
 		return PersistenceManagerFactoryUtils.getPersistenceManager(getPersistenceManagerFactory(), allowCreate);
 	}
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 efd2ef1a64..a01f5ca69d 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
@@ -659,7 +659,7 @@ public class JpaTransactionManager extends AbstractPlatformTransactionManager
 
 		public void flush() {
 			try {
-			    this.entityManagerHolder.getEntityManager().flush();
+				this.entityManagerHolder.getEntityManager().flush();
 			}
 			catch (RuntimeException ex) {
 				throw DataAccessUtils.translateIfNecessary(ex, getJpaDialect());
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
index e7fa3d76ef..2c7c2d4f8a 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
@@ -436,7 +436,7 @@ public class OpenSessionInViewTests {
 
 		final FilterChain filterChain2 = new FilterChain() {
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
-			    throws IOException, ServletException {
+				throws IOException, ServletException {
 				assertTrue(TransactionSynchronizationManager.hasResource(sf2));
 				filter.doFilter(servletRequest, servletResponse, filterChain);
 			}
@@ -665,7 +665,7 @@ public class OpenSessionInViewTests {
 
 		final FilterChain filterChain2 = new FilterChain() {
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
-			    throws IOException, ServletException {
+				throws IOException, ServletException {
 
 				HibernateTransactionManager tm = new HibernateTransactionManager(sf2);
 				TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition());
@@ -767,7 +767,7 @@ public class OpenSessionInViewTests {
 
 		FilterChain filterChain2 = new FilterChain() {
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
-			    throws IOException, ServletException {
+				throws IOException, ServletException {
 				filter.doFilter(servletRequest, servletResponse, filterChain);
 			}
 		};
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java
index 133e08311e..c01d831d8a 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java
@@ -154,7 +154,7 @@ public class OpenPersistenceManagerInViewTests extends TestCase {
 
 		final FilterChain filterChain2 = new FilterChain() {
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
-			    throws IOException, ServletException {
+				throws IOException, ServletException {
 				assertTrue(TransactionSynchronizationManager.hasResource(pmf2));
 				filter.doFilter(servletRequest, servletResponse, filterChain);
 			}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
index c03e6a4b1e..5fe4923a67 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
@@ -265,7 +265,7 @@ public class OpenEntityManagerInViewTests extends TestCase {
 
 		final FilterChain filterChain2 = new FilterChain() {
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
-			    throws IOException, ServletException {
+				throws IOException, ServletException {
 				assertTrue(TransactionSynchronizationManager.hasResource(factory2));
 				filter.doFilter(servletRequest, servletResponse, filterChain);
 			}
@@ -334,7 +334,7 @@ public class OpenEntityManagerInViewTests extends TestCase {
 
 		final FilterChain filterChain2 = new FilterChain() {
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
-			    throws IOException, ServletException {
+				throws IOException, ServletException {
 				assertTrue(TransactionSynchronizationManager.hasResource(factory2));
 				filter.doFilter(servletRequest, servletResponse, filterChain);
 				count2.incrementAndGet();
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
index bdcef11a4c..62f2c6ff46 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
@@ -30,9 +30,9 @@ public abstract class XmlMappingException extends NestedRuntimeException {
 	 * Construct an <code>XmlMappingException</code> with the specified detail message.
 	 * @param msg the detail message
 	 */
-    public XmlMappingException(String msg) {
-        super(msg);
-    }
+	public XmlMappingException(String msg) {
+		super(msg);
+	}
 
 	/**
 	 * Construct an <code>XmlMappingException</code> with the specified detail message
@@ -40,8 +40,8 @@ public abstract class XmlMappingException extends NestedRuntimeException {
 	 * @param msg the detail message
 	 * @param cause the nested exception
 	 */
-    public XmlMappingException(String msg, Throwable cause) {
-        super(msg, cause);
-    }
+	public XmlMappingException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
 
 }
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 6a33cf2c5f..a4bb7486c7 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
@@ -425,12 +425,12 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin
 
 	@Override
 	protected void marshalOutputStream(Object graph, OutputStream outputStream) throws XmlMappingException, IOException {
-        if (this.streamDriver != null) {
-            marshal(graph, this.streamDriver.createWriter(outputStream));
-        }
-        else {
-		    marshalWriter(graph, new OutputStreamWriter(outputStream, this.encoding));
-        }
+		if (this.streamDriver != null) {
+			marshal(graph, this.streamDriver.createWriter(outputStream));
+		}
+		else {
+			marshalWriter(graph, new OutputStreamWriter(outputStream, this.encoding));
+		}
 	}
 
 	@Override
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java
index 7f15d0417f..503b01cc01 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java
@@ -24,34 +24,34 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement(namespace = "http://springframework.org/spring-ws")
 public class BinaryObject {
 
-    @XmlElement(namespace = "http://springframework.org/spring-ws")
-    private byte[] bytes;
+	@XmlElement(namespace = "http://springframework.org/spring-ws")
+	private byte[] bytes;
 
-    @XmlElement(namespace = "http://springframework.org/spring-ws")
-    private DataHandler dataHandler;
+	@XmlElement(namespace = "http://springframework.org/spring-ws")
+	private DataHandler dataHandler;
 
-    @XmlElement(namespace = "http://springframework.org/spring-ws")
-    @XmlAttachmentRef
-    private DataHandler swaDataHandler;
+	@XmlElement(namespace = "http://springframework.org/spring-ws")
+	@XmlAttachmentRef
+	private DataHandler swaDataHandler;
 
-    public BinaryObject() {
-    }
+	public BinaryObject() {
+	}
 
-    public BinaryObject(byte[] bytes, DataHandler dataHandler) {
-        this.bytes = bytes;
-        this.dataHandler = dataHandler;
-        swaDataHandler = dataHandler;
-    }
+	public BinaryObject(byte[] bytes, DataHandler dataHandler) {
+		this.bytes = bytes;
+		this.dataHandler = dataHandler;
+		swaDataHandler = dataHandler;
+	}
 
-    public byte[] getBytes() {
-        return bytes;
-    }
+	public byte[] getBytes() {
+		return bytes;
+	}
 
-    public DataHandler getDataHandler() {
-        return dataHandler;
-    }
+	public DataHandler getDataHandler() {
+		return dataHandler;
+	}
 
-    public DataHandler getSwaDataHandler() {
-        return swaDataHandler;
-    }
+	public DataHandler getSwaDataHandler() {
+		return swaDataHandler;
+	}
 }
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
index 739a3ab9bf..aa445748bd 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
@@ -20,17 +20,17 @@ import java.util.ArrayList;
 
 public class Flights {
 
-    protected ArrayList flightList = new ArrayList();
+	protected ArrayList flightList = new ArrayList();
 
-    public void addFlight(FlightType flight) {
-        flightList.add(flight);
-    }
+	public void addFlight(FlightType flight) {
+		flightList.add(flight);
+	}
 
-    public FlightType getFlight(int index) {
-        return (FlightType) flightList.get(index);
-    }
+	public FlightType getFlight(int index) {
+		return (FlightType) flightList.get(index);
+	}
 
-    public int sizeFlightList() {
-        return flightList.size();
-    }
+	public int sizeFlightList() {
+		return flightList.size();
+	}
 }
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java
index 70bd44b5d1..0c3b71eca5 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java
@@ -27,15 +27,15 @@ import org.junit.Test;
  */
 public class XmlOptionsFactoryBeanTests {
 
-    private XmlOptionsFactoryBean factoryBean = new XmlOptionsFactoryBean();
+	private XmlOptionsFactoryBean factoryBean = new XmlOptionsFactoryBean();
 
-    @Test
+	@Test
 	public void xmlOptionsFactoryBean() throws Exception {
-        factoryBean.setOptions(Collections.singletonMap(XmlOptions.SAVE_PRETTY_PRINT, Boolean.TRUE));
-        XmlOptions xmlOptions = factoryBean.getObject();
-        assertNotNull("No XmlOptions returned", xmlOptions);
-        assertTrue("Option not set", xmlOptions.hasOption(XmlOptions.SAVE_PRETTY_PRINT));
-        assertFalse("Invalid option set", xmlOptions.hasOption(XmlOptions.LOAD_LINE_NUMBERS));
-    }
+		factoryBean.setOptions(Collections.singletonMap(XmlOptions.SAVE_PRETTY_PRINT, Boolean.TRUE));
+		XmlOptions xmlOptions = factoryBean.getObject();
+		assertNotNull("No XmlOptions returned", xmlOptions);
+		assertTrue("Option not set", xmlOptions.hasOption(XmlOptions.SAVE_PRETTY_PRINT));
+		assertFalse("Invalid option set", xmlOptions.hasOption(XmlOptions.LOAD_LINE_NUMBERS));
+	}
 
 }
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java
index 8152f1e2d2..0f6698f8db 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java
@@ -21,14 +21,14 @@ import com.thoughtworks.xstream.annotations.XStreamAlias;
 @XStreamAlias("flight")
 public class Flight {
 
-    @XStreamAlias("number")
-    private long flightNumber;
+	@XStreamAlias("number")
+	private long flightNumber;
 
-    public long getFlightNumber() {
-        return flightNumber;
-    }
+	public long getFlightNumber() {
+		return flightNumber;
+	}
 
-    public void setFlightNumber(long number) {
-        this.flightNumber = number;
-    }
-}
\ No newline at end of file
+	public void setFlightNumber(long number) {
+		this.flightNumber = number;
+	}
+}
diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java
index 45274b8a60..051e9a6394 100644
--- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java
+++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java
@@ -69,7 +69,7 @@ public abstract class ComponentControllerSupport extends ControllerSupport {
 	public final void perform(
 			ComponentContext componentContext, HttpServletRequest request,
 			HttpServletResponse response, ServletContext servletContext)
-	    throws ServletException, IOException {
+		throws ServletException, IOException {
 
 		try {
 			execute(componentContext, request, response, servletContext);
@@ -97,7 +97,7 @@ public abstract class ComponentControllerSupport extends ControllerSupport {
 	public final void execute(
 			ComponentContext componentContext, HttpServletRequest request,
 			HttpServletResponse response, ServletContext servletContext)
-	    throws Exception {
+		throws Exception {
 
 		synchronized (this) {
 			if (this.webApplicationContext == null) {
diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java
index 2ec6870375..61f8d927bf 100644
--- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java
+++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java
@@ -138,7 +138,7 @@ public class TilesView extends InternalResourceView {
 	 * @return the component definition
 	 */
 	protected ComponentDefinition getComponentDefinition(DefinitionsFactory factory, HttpServletRequest request)
-	    throws Exception {
+		throws Exception {
 		return factory.getDefinition(getUrl(), request, getServletContext());
 	}
 
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
index 3f1cf06118..50919592b8 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
@@ -340,7 +340,7 @@ public class ContextLoaderPlugIn implements PlugIn {
 		wac.setNamespace(getNamespace());
 		if (getContextConfigLocation() != null) {
 			wac.setConfigLocations(
-			    StringUtils.tokenizeToStringArray(
+				StringUtils.tokenizeToStringArray(
 							getContextConfigLocation(), ConfigurableWebApplicationContext.CONFIG_LOCATION_DELIMITERS));
 		}
 		wac.addBeanFactoryPostProcessor(
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java b/spring-test-mvc/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java
index 6aa4cbdd7a..809daf3f6c 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/util/MatcherAssertionErrors.java
@@ -37,7 +37,7 @@ public abstract class MatcherAssertionErrors {
 
 
 	private MatcherAssertionErrors() {
-    }
+	}
 
 	/**
 	 * Asserts that the given matcher matches the actual value.
@@ -65,8 +65,8 @@ public abstract class MatcherAssertionErrors {
 			description.appendText("\nExpected: ");
 			description.appendDescriptionOf(matcher);
 			if (describeMismatchMethod != null) {
-                description.appendText("\n     but: ");
-                matcher.describeMismatch(actual, description);
+				description.appendText("\n     but: ");
+				matcher.describeMismatch(actual, description);
 			}
 			else {
 				description.appendText("\n     got: ");
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
index 17d9290c7b..f82e6aae02 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java
@@ -22,6 +22,6 @@ public interface RequestBuilder {
 	 * @param servletContext the {@link ServletContext} to use to create the request
 	 * @return the request
 	 */
-    MockHttpServletRequest buildRequest(ServletContext servletContext);
+	MockHttpServletRequest buildRequest(ServletContext servletContext);
 
 }
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
index bec4b84b1a..93534aae6f 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
@@ -86,461 +86,461 @@ public class StatusResultMatchers {
 		};
 	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.CONTINUE} (100).
-     */
-    public ResultMatcher isContinue() {
-        return matcher(HttpStatus.CONTINUE);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.SWITCHING_PROTOCOLS} (101).
-     */
-    public ResultMatcher isSwitchingProtocols() {
-        return matcher(HttpStatus.SWITCHING_PROTOCOLS);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.PROCESSING} (102).
-     */
-    public ResultMatcher isProcessing() {
-        return matcher(HttpStatus.PROCESSING);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.CHECKPOINT} (103).
-     */
-    public ResultMatcher isCheckpoint() {
-        return matcher(HttpStatus.valueOf(103));
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.OK} (200).
-     */
-    public ResultMatcher isOk() {
-        return matcher(HttpStatus.OK);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.CREATED} (201).
-     */
-    public ResultMatcher isCreated() {
-        return matcher(HttpStatus.CREATED);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.ACCEPTED} (202).
-     */
-    public ResultMatcher isAccepted() {
-        return matcher(HttpStatus.ACCEPTED);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.NON_AUTHORITATIVE_INFORMATION} (203).
-     */
-    public ResultMatcher isNonAuthoritativeInformation() {
-        return matcher(HttpStatus.NON_AUTHORITATIVE_INFORMATION);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.NO_CONTENT} (204).
-     */
-    public ResultMatcher isNoContent() {
-        return matcher(HttpStatus.NO_CONTENT);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.RESET_CONTENT} (205).
-     */
-    public ResultMatcher isResetContent() {
-        return matcher(HttpStatus.RESET_CONTENT);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.PARTIAL_CONTENT} (206).
-     */
-    public ResultMatcher isPartialContent() {
-        return matcher(HttpStatus.PARTIAL_CONTENT);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.MULTI_STATUS} (207).
-     */
-    public ResultMatcher isMultiStatus() {
-        return matcher(HttpStatus.MULTI_STATUS);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.ALREADY_REPORTED} (208).
-     */
-    public ResultMatcher isAlreadyReported() {
-        return matcher(HttpStatus.ALREADY_REPORTED);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.IM_USED} (226).
-     */
-    public ResultMatcher isImUsed() {
-        return matcher(HttpStatus.IM_USED);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.MULTIPLE_CHOICES} (300).
-     */
-    public ResultMatcher isMultipleChoices() {
-        return matcher(HttpStatus.MULTIPLE_CHOICES);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.MOVED_PERMANENTLY} (301).
-     */
-    public ResultMatcher isMovedPermanently() {
-        return matcher(HttpStatus.MOVED_PERMANENTLY);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.FOUND} (302).
-     */
-    public ResultMatcher isFound() {
-        return matcher(HttpStatus.FOUND);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.MOVED_TEMPORARILY} (302).
-     */
-    public ResultMatcher isMovedTemporarily() {
-        return matcher(HttpStatus.MOVED_TEMPORARILY);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.SEE_OTHER} (303).
-     */
-    public ResultMatcher isSeeOther() {
-        return matcher(HttpStatus.SEE_OTHER);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.NOT_MODIFIED} (304).
-     */
-    public ResultMatcher isNotModified() {
-        return matcher(HttpStatus.NOT_MODIFIED);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.USE_PROXY} (305).
-     */
-    public ResultMatcher isUseProxy() {
-        return matcher(HttpStatus.USE_PROXY);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.TEMPORARY_REDIRECT} (307).
-     */
-    public ResultMatcher isTemporaryRedirect() {
-        return matcher(HttpStatus.TEMPORARY_REDIRECT);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.RESUME_INCOMPLETE} (308).
-     */
-    public ResultMatcher isResumeIncomplete() {
-        return matcher(HttpStatus.valueOf(308));
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.BAD_REQUEST} (400).
-     */
-    public ResultMatcher isBadRequest() {
-        return matcher(HttpStatus.BAD_REQUEST);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.UNAUTHORIZED} (401).
-     */
-    public ResultMatcher isUnauthorized() {
-        return matcher(HttpStatus.UNAUTHORIZED);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.PAYMENT_REQUIRED} (402).
-     */
-    public ResultMatcher isPaymentRequired() {
-        return matcher(HttpStatus.PAYMENT_REQUIRED);
-    }
-
-    /**
-     * Assert the response status code is {@code HttpStatus.FORBIDDEN} (403).
-     */
-    public ResultMatcher isForbidden() {
-        return matcher(HttpStatus.FORBIDDEN);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.CONTINUE} (100).
+	 */
+	public ResultMatcher isContinue() {
+		return matcher(HttpStatus.CONTINUE);
+	}
 
 	/**
-     * Assert the response status code is {@code HttpStatus.NOT_FOUND} (404).
-     */
-    public ResultMatcher isNotFound() {
-        return matcher(HttpStatus.NOT_FOUND);
-    }
+	 * Assert the response status code is {@code HttpStatus.SWITCHING_PROTOCOLS} (101).
+	 */
+	public ResultMatcher isSwitchingProtocols() {
+		return matcher(HttpStatus.SWITCHING_PROTOCOLS);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.METHOD_NOT_ALLOWED} (405).
-     */
-    public ResultMatcher isMethodNotAllowed() {
-        return matcher(HttpStatus.METHOD_NOT_ALLOWED);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.PROCESSING} (102).
+	 */
+	public ResultMatcher isProcessing() {
+		return matcher(HttpStatus.PROCESSING);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.NOT_ACCEPTABLE} (406).
-     */
-    public ResultMatcher isNotAcceptable() {
-        return matcher(HttpStatus.NOT_ACCEPTABLE);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.CHECKPOINT} (103).
+	 */
+	public ResultMatcher isCheckpoint() {
+		return matcher(HttpStatus.valueOf(103));
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.PROXY_AUTHENTICATION_REQUIRED} (407).
-     */
-    public ResultMatcher isProxyAuthenticationRequired() {
-        return matcher(HttpStatus.PROXY_AUTHENTICATION_REQUIRED);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.OK} (200).
+	 */
+	public ResultMatcher isOk() {
+		return matcher(HttpStatus.OK);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.REQUEST_TIMEOUT} (408).
-     */
-    public ResultMatcher isRequestTimeout() {
-        return matcher(HttpStatus.REQUEST_TIMEOUT);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.CREATED} (201).
+	 */
+	public ResultMatcher isCreated() {
+		return matcher(HttpStatus.CREATED);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.CONFLICT} (409).
-     */
-    public ResultMatcher isConflict() {
-        return matcher(HttpStatus.CONFLICT);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.ACCEPTED} (202).
+	 */
+	public ResultMatcher isAccepted() {
+		return matcher(HttpStatus.ACCEPTED);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.GONE} (410).
-     */
-    public ResultMatcher isGone() {
-        return matcher(HttpStatus.GONE);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.NON_AUTHORITATIVE_INFORMATION} (203).
+	 */
+	public ResultMatcher isNonAuthoritativeInformation() {
+		return matcher(HttpStatus.NON_AUTHORITATIVE_INFORMATION);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.LENGTH_REQUIRED} (411).
-     */
-    public ResultMatcher isLengthRequired() {
-        return matcher(HttpStatus.LENGTH_REQUIRED);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.NO_CONTENT} (204).
+	 */
+	public ResultMatcher isNoContent() {
+		return matcher(HttpStatus.NO_CONTENT);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.PRECONDITION_FAILED} (412).
-     */
-    public ResultMatcher isPreconditionFailed() {
-        return matcher(HttpStatus.PRECONDITION_FAILED);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.RESET_CONTENT} (205).
+	 */
+	public ResultMatcher isResetContent() {
+		return matcher(HttpStatus.RESET_CONTENT);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.REQUEST_ENTITY_TOO_LARGE} (413).
-     */
-    public ResultMatcher isRequestEntityTooLarge() {
-        return matcher(HttpStatus.REQUEST_ENTITY_TOO_LARGE);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.PARTIAL_CONTENT} (206).
+	 */
+	public ResultMatcher isPartialContent() {
+		return matcher(HttpStatus.PARTIAL_CONTENT);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.REQUEST_URI_TOO_LONG} (414).
-     */
-    public ResultMatcher isRequestUriTooLong() {
-        return matcher(HttpStatus.REQUEST_URI_TOO_LONG);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.MULTI_STATUS} (207).
+	 */
+	public ResultMatcher isMultiStatus() {
+		return matcher(HttpStatus.MULTI_STATUS);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.UNSUPPORTED_MEDIA_TYPE} (415).
-     */
-    public ResultMatcher isUnsupportedMediaType() {
-        return matcher(HttpStatus.UNSUPPORTED_MEDIA_TYPE);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.ALREADY_REPORTED} (208).
+	 */
+	public ResultMatcher isAlreadyReported() {
+		return matcher(HttpStatus.ALREADY_REPORTED);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE} (416).
-     */
-    public ResultMatcher isRequestedRangeNotSatisfiable() {
-        return matcher(HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.IM_USED} (226).
+	 */
+	public ResultMatcher isImUsed() {
+		return matcher(HttpStatus.IM_USED);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.EXPECTATION_FAILED} (417).
-     */
-    public ResultMatcher isExpectationFailed() {
-        return matcher(HttpStatus.EXPECTATION_FAILED);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.MULTIPLE_CHOICES} (300).
+	 */
+	public ResultMatcher isMultipleChoices() {
+		return matcher(HttpStatus.MULTIPLE_CHOICES);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.I_AM_A_TEAPOT} (418).
-     */
-    public ResultMatcher isIAmATeapot() {
-        return matcher(HttpStatus.valueOf(418));
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.MOVED_PERMANENTLY} (301).
+	 */
+	public ResultMatcher isMovedPermanently() {
+		return matcher(HttpStatus.MOVED_PERMANENTLY);
+	}
 
-    /**
-      * Assert the response status code is {@code HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE} (419).
-      * @deprecated matching the deprecation of HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE
-      */
-     public ResultMatcher isInsufficientSpaceOnResource() {
-         return matcher(HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE);
-     }
+	/**
+	 * Assert the response status code is {@code HttpStatus.FOUND} (302).
+	 */
+	public ResultMatcher isFound() {
+		return matcher(HttpStatus.FOUND);
+	}
 
-     /**
-      * Assert the response status code is {@code HttpStatus.METHOD_FAILURE} (420).
-      * @deprecated matching the deprecation of HttpStatus.METHOD_FAILURE
-      */
-     public ResultMatcher isMethodFailure() {
-         return matcher(HttpStatus.METHOD_FAILURE);
-     }
+	/**
+	 * Assert the response status code is {@code HttpStatus.MOVED_TEMPORARILY} (302).
+	 */
+	public ResultMatcher isMovedTemporarily() {
+		return matcher(HttpStatus.MOVED_TEMPORARILY);
+	}
 
-     /**
-      * Assert the response status code is {@code HttpStatus.DESTINATION_LOCKED} (421).
-      * @deprecated matching the deprecation of HttpStatus.DESTINATION_LOCKED
-      */
-     public ResultMatcher isDestinationLocked() {
-         return matcher(HttpStatus.DESTINATION_LOCKED);
-     }
+	/**
+	 * Assert the response status code is {@code HttpStatus.SEE_OTHER} (303).
+	 */
+	public ResultMatcher isSeeOther() {
+		return matcher(HttpStatus.SEE_OTHER);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.UNPROCESSABLE_ENTITY} (422).
-     */
-    public ResultMatcher isUnprocessableEntity() {
-        return matcher(HttpStatus.UNPROCESSABLE_ENTITY);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.NOT_MODIFIED} (304).
+	 */
+	public ResultMatcher isNotModified() {
+		return matcher(HttpStatus.NOT_MODIFIED);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.LOCKED} (423).
-     */
-    public ResultMatcher isLocked() {
-        return matcher(HttpStatus.LOCKED);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.USE_PROXY} (305).
+	 */
+	public ResultMatcher isUseProxy() {
+		return matcher(HttpStatus.USE_PROXY);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.FAILED_DEPENDENCY} (424).
-     */
-    public ResultMatcher isFailedDependency() {
-        return matcher(HttpStatus.FAILED_DEPENDENCY);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.TEMPORARY_REDIRECT} (307).
+	 */
+	public ResultMatcher isTemporaryRedirect() {
+		return matcher(HttpStatus.TEMPORARY_REDIRECT);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.UPGRADE_REQUIRED} (426).
-     */
-    public ResultMatcher isUpgradeRequired() {
-        return matcher(HttpStatus.UPGRADE_REQUIRED);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.RESUME_INCOMPLETE} (308).
+	 */
+	public ResultMatcher isResumeIncomplete() {
+		return matcher(HttpStatus.valueOf(308));
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.PRECONDITION_REQUIRED} (428).
-     */
-    public ResultMatcher isPreconditionRequired() {
-        return matcher(HttpStatus.valueOf(428));
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.BAD_REQUEST} (400).
+	 */
+	public ResultMatcher isBadRequest() {
+		return matcher(HttpStatus.BAD_REQUEST);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.TOO_MANY_REQUESTS} (429).
-     */
-    public ResultMatcher isTooManyRequests() {
-        return matcher(HttpStatus.valueOf(429));
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.UNAUTHORIZED} (401).
+	 */
+	public ResultMatcher isUnauthorized() {
+		return matcher(HttpStatus.UNAUTHORIZED);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.REQUEST_HEADER_FIELDS_TOO_LARGE} (431).
-     */
-    public ResultMatcher isRequestHeaderFieldsTooLarge() {
-        return matcher(HttpStatus.valueOf(431));
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.PAYMENT_REQUIRED} (402).
+	 */
+	public ResultMatcher isPaymentRequired() {
+		return matcher(HttpStatus.PAYMENT_REQUIRED);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.INTERNAL_SERVER_ERROR} (500).
-     */
-    public ResultMatcher isInternalServerError() {
-        return matcher(HttpStatus.INTERNAL_SERVER_ERROR);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.FORBIDDEN} (403).
+	 */
+	public ResultMatcher isForbidden() {
+		return matcher(HttpStatus.FORBIDDEN);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.NOT_IMPLEMENTED} (501).
-     */
-    public ResultMatcher isNotImplemented() {
-        return matcher(HttpStatus.NOT_IMPLEMENTED);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.NOT_FOUND} (404).
+	 */
+	public ResultMatcher isNotFound() {
+		return matcher(HttpStatus.NOT_FOUND);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.BAD_GATEWAY} (502).
-     */
-    public ResultMatcher isBadGateway() {
-        return matcher(HttpStatus.BAD_GATEWAY);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.METHOD_NOT_ALLOWED} (405).
+	 */
+	public ResultMatcher isMethodNotAllowed() {
+		return matcher(HttpStatus.METHOD_NOT_ALLOWED);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.SERVICE_UNAVAILABLE} (503).
-     */
-    public ResultMatcher isServiceUnavailable() {
-        return matcher(HttpStatus.SERVICE_UNAVAILABLE);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.NOT_ACCEPTABLE} (406).
+	 */
+	public ResultMatcher isNotAcceptable() {
+		return matcher(HttpStatus.NOT_ACCEPTABLE);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.GATEWAY_TIMEOUT} (504).
-     */
-    public ResultMatcher isGatewayTimeout() {
-        return matcher(HttpStatus.GATEWAY_TIMEOUT);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.PROXY_AUTHENTICATION_REQUIRED} (407).
+	 */
+	public ResultMatcher isProxyAuthenticationRequired() {
+		return matcher(HttpStatus.PROXY_AUTHENTICATION_REQUIRED);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.HTTP_VERSION_NOT_SUPPORTED} (505).
-     */
-    public ResultMatcher isHttpVersionNotSupported() {
-        return matcher(HttpStatus.HTTP_VERSION_NOT_SUPPORTED);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.REQUEST_TIMEOUT} (408).
+	 */
+	public ResultMatcher isRequestTimeout() {
+		return matcher(HttpStatus.REQUEST_TIMEOUT);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.VARIANT_ALSO_NEGOTIATES} (506).
-     */
-    public ResultMatcher isVariantAlsoNegotiates() {
-        return matcher(HttpStatus.VARIANT_ALSO_NEGOTIATES);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.CONFLICT} (409).
+	 */
+	public ResultMatcher isConflict() {
+		return matcher(HttpStatus.CONFLICT);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.INSUFFICIENT_STORAGE} (507).
-     */
-    public ResultMatcher isInsufficientStorage() {
-        return matcher(HttpStatus.INSUFFICIENT_STORAGE);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.GONE} (410).
+	 */
+	public ResultMatcher isGone() {
+		return matcher(HttpStatus.GONE);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.LOOP_DETECTED} (508).
-     */
-    public ResultMatcher isLoopDetected() {
-        return matcher(HttpStatus.LOOP_DETECTED);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.LENGTH_REQUIRED} (411).
+	 */
+	public ResultMatcher isLengthRequired() {
+		return matcher(HttpStatus.LENGTH_REQUIRED);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.BANDWIDTH_LIMIT_EXCEEDED} (509).
-     */
-    public ResultMatcher isBandwidthLimitExceeded() {
-        return matcher(HttpStatus.valueOf(509));
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.PRECONDITION_FAILED} (412).
+	 */
+	public ResultMatcher isPreconditionFailed() {
+		return matcher(HttpStatus.PRECONDITION_FAILED);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.NOT_EXTENDED} (510).
-     */
-    public ResultMatcher isNotExtended() {
-        return matcher(HttpStatus.NOT_EXTENDED);
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.REQUEST_ENTITY_TOO_LARGE} (413).
+	 */
+	public ResultMatcher isRequestEntityTooLarge() {
+		return matcher(HttpStatus.REQUEST_ENTITY_TOO_LARGE);
+	}
 
-    /**
-     * Assert the response status code is {@code HttpStatus.NETWORK_AUTHENTICATION_REQUIRED} (511).
-     */
-    public ResultMatcher isNetworkAuthenticationRequired() {
-        return matcher(HttpStatus.valueOf(511));
-    }
+	/**
+	 * Assert the response status code is {@code HttpStatus.REQUEST_URI_TOO_LONG} (414).
+	 */
+	public ResultMatcher isRequestUriTooLong() {
+		return matcher(HttpStatus.REQUEST_URI_TOO_LONG);
+	}
 
-    /**
+	/**
+	 * Assert the response status code is {@code HttpStatus.UNSUPPORTED_MEDIA_TYPE} (415).
+	 */
+	public ResultMatcher isUnsupportedMediaType() {
+		return matcher(HttpStatus.UNSUPPORTED_MEDIA_TYPE);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE} (416).
+	 */
+	public ResultMatcher isRequestedRangeNotSatisfiable() {
+		return matcher(HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.EXPECTATION_FAILED} (417).
+	 */
+	public ResultMatcher isExpectationFailed() {
+		return matcher(HttpStatus.EXPECTATION_FAILED);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.I_AM_A_TEAPOT} (418).
+	 */
+	public ResultMatcher isIAmATeapot() {
+		return matcher(HttpStatus.valueOf(418));
+	}
+
+	/**
+	  * Assert the response status code is {@code HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE} (419).
+	  * @deprecated matching the deprecation of HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE
+	  */
+	 public ResultMatcher isInsufficientSpaceOnResource() {
+		 return matcher(HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE);
+	 }
+
+	 /**
+	  * Assert the response status code is {@code HttpStatus.METHOD_FAILURE} (420).
+	  * @deprecated matching the deprecation of HttpStatus.METHOD_FAILURE
+	  */
+	 public ResultMatcher isMethodFailure() {
+		 return matcher(HttpStatus.METHOD_FAILURE);
+	 }
+
+	 /**
+	  * Assert the response status code is {@code HttpStatus.DESTINATION_LOCKED} (421).
+	  * @deprecated matching the deprecation of HttpStatus.DESTINATION_LOCKED
+	  */
+	 public ResultMatcher isDestinationLocked() {
+		 return matcher(HttpStatus.DESTINATION_LOCKED);
+	 }
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.UNPROCESSABLE_ENTITY} (422).
+	 */
+	public ResultMatcher isUnprocessableEntity() {
+		return matcher(HttpStatus.UNPROCESSABLE_ENTITY);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.LOCKED} (423).
+	 */
+	public ResultMatcher isLocked() {
+		return matcher(HttpStatus.LOCKED);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.FAILED_DEPENDENCY} (424).
+	 */
+	public ResultMatcher isFailedDependency() {
+		return matcher(HttpStatus.FAILED_DEPENDENCY);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.UPGRADE_REQUIRED} (426).
+	 */
+	public ResultMatcher isUpgradeRequired() {
+		return matcher(HttpStatus.UPGRADE_REQUIRED);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.PRECONDITION_REQUIRED} (428).
+	 */
+	public ResultMatcher isPreconditionRequired() {
+		return matcher(HttpStatus.valueOf(428));
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.TOO_MANY_REQUESTS} (429).
+	 */
+	public ResultMatcher isTooManyRequests() {
+		return matcher(HttpStatus.valueOf(429));
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.REQUEST_HEADER_FIELDS_TOO_LARGE} (431).
+	 */
+	public ResultMatcher isRequestHeaderFieldsTooLarge() {
+		return matcher(HttpStatus.valueOf(431));
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.INTERNAL_SERVER_ERROR} (500).
+	 */
+	public ResultMatcher isInternalServerError() {
+		return matcher(HttpStatus.INTERNAL_SERVER_ERROR);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.NOT_IMPLEMENTED} (501).
+	 */
+	public ResultMatcher isNotImplemented() {
+		return matcher(HttpStatus.NOT_IMPLEMENTED);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.BAD_GATEWAY} (502).
+	 */
+	public ResultMatcher isBadGateway() {
+		return matcher(HttpStatus.BAD_GATEWAY);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.SERVICE_UNAVAILABLE} (503).
+	 */
+	public ResultMatcher isServiceUnavailable() {
+		return matcher(HttpStatus.SERVICE_UNAVAILABLE);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.GATEWAY_TIMEOUT} (504).
+	 */
+	public ResultMatcher isGatewayTimeout() {
+		return matcher(HttpStatus.GATEWAY_TIMEOUT);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.HTTP_VERSION_NOT_SUPPORTED} (505).
+	 */
+	public ResultMatcher isHttpVersionNotSupported() {
+		return matcher(HttpStatus.HTTP_VERSION_NOT_SUPPORTED);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.VARIANT_ALSO_NEGOTIATES} (506).
+	 */
+	public ResultMatcher isVariantAlsoNegotiates() {
+		return matcher(HttpStatus.VARIANT_ALSO_NEGOTIATES);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.INSUFFICIENT_STORAGE} (507).
+	 */
+	public ResultMatcher isInsufficientStorage() {
+		return matcher(HttpStatus.INSUFFICIENT_STORAGE);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.LOOP_DETECTED} (508).
+	 */
+	public ResultMatcher isLoopDetected() {
+		return matcher(HttpStatus.LOOP_DETECTED);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.BANDWIDTH_LIMIT_EXCEEDED} (509).
+	 */
+	public ResultMatcher isBandwidthLimitExceeded() {
+		return matcher(HttpStatus.valueOf(509));
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.NOT_EXTENDED} (510).
+	 */
+	public ResultMatcher isNotExtended() {
+		return matcher(HttpStatus.NOT_EXTENDED);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.NETWORK_AUTHENTICATION_REQUIRED} (511).
+	 */
+	public ResultMatcher isNetworkAuthenticationRequired() {
+		return matcher(HttpStatus.valueOf(511));
+	}
+
+	/**
 	 * Match the expected response status to that of the HttpServletResponse
 	 */
-    private ResultMatcher matcher(final HttpStatus status) {
+	private ResultMatcher matcher(final HttpStatus status) {
 		return new ResultMatcher() {
 			public void match(MvcResult result) {
 				assertEquals("Status", status.value(), result.getResponse().getStatus());
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
index fbec16420d..b582b3b68c 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
@@ -62,7 +62,7 @@ final class PatternMappingFilterProxy implements Filter {
 		Assert.notNull(delegate, "A delegate Filter is required");
 		this.delegate = delegate;
 		for(String urlPattern : urlPatterns) {
-		    addUrlPattern(urlPattern);
+			addUrlPattern(urlPattern);
 		}
 	}
 
@@ -127,4 +127,4 @@ final class PatternMappingFilterProxy implements Filter {
 		this.delegate.destroy();
 	}
 
-}
\ No newline at end of file
+}
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 da60dfc5b1..926942869a 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,9 +228,9 @@ public class MockHttpServletRequestBuilderTests {
 		assertEquals("bar=baz", request.getParameter("foo"));
 	}
 
-    @Test
-    public void acceptHeader() throws Exception {
-        this.builder.accept(MediaType.TEXT_HTML, MediaType.APPLICATION_XML);
+	@Test
+	public void acceptHeader() throws Exception {
+		this.builder.accept(MediaType.TEXT_HTML, MediaType.APPLICATION_XML);
 
 		MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
 		List<String> accept = Collections.list(request.getHeaders("Accept"));
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java
index 9668622584..902dc2c7e0 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java
@@ -40,7 +40,7 @@ public class ExceptionHandlerTests {
 		standaloneSetup(new PersonController()).build()
 			.perform(get("/person/Clyde"))
 				.andExpect(status().isOk())
-                .andExpect(forwardedUrl("errorView"));
+				.andExpect(forwardedUrl("errorView"));
 	}
 
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
index f3ee74e8ce..73659fc416 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java
@@ -52,32 +52,32 @@ public class RedirectTests {
 	public void save() throws Exception {
 		this.mockMvc.perform(post("/persons").param("name", "Andy"))
 			.andExpect(status().isMovedTemporarily())
-            .andExpect(redirectedUrl("/persons/Joe"))
-            .andExpect(model().size(1))
-            .andExpect(model().attributeExists("name"))
-            .andExpect(flash().attributeCount(1))
-            .andExpect(flash().attribute("message", "success!"));
+			.andExpect(redirectedUrl("/persons/Joe"))
+			.andExpect(model().size(1))
+			.andExpect(model().attributeExists("name"))
+			.andExpect(flash().attributeCount(1))
+			.andExpect(flash().attribute("message", "success!"));
 	}
 
 	@Test
 	public void saveWithErrors() throws Exception {
 		this.mockMvc.perform(post("/persons"))
 			.andExpect(status().isOk())
-            .andExpect(forwardedUrl("persons/add"))
-            .andExpect(model().size(1))
-            .andExpect(model().attributeExists("person"))
-            .andExpect(flash().attributeCount(0));
+			.andExpect(forwardedUrl("persons/add"))
+			.andExpect(model().size(1))
+			.andExpect(model().attributeExists("person"))
+			.andExpect(flash().attributeCount(0));
 	}
 
 	@Test
 	public void getPerson() throws Exception {
 		this.mockMvc.perform(get("/persons/Joe").flashAttr("message", "success!"))
 			.andExpect(status().isOk())
-            .andExpect(forwardedUrl("persons/index"))
-            .andExpect(model().size(2))
-            .andExpect(model().attribute("person", new Person("Joe")))
-            .andExpect(model().attribute("message", "success!"))
-            .andExpect(flash().attributeCount(0));
+			.andExpect(forwardedUrl("persons/index"))
+			.andExpect(model().size(2))
+			.andExpect(model().attribute("person", new Person("Joe")))
+			.andExpect(model().attribute("message", "success!"))
+			.andExpect(flash().attributeCount(0));
 	}
 
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
index ae60ff4ca7..e82e79a5f4 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java
@@ -56,26 +56,26 @@ public class FlashAttributeAssertionTests {
 	@Test
 	public void testExists() throws Exception {
 		this.mockMvc.perform(post("/persons"))
-            .andExpect(flash().attributeExists("one", "two", "three"));
+			.andExpect(flash().attributeExists("one", "two", "three"));
 	}
 
 	@Test
 	public void testEqualTo() throws Exception {
 		this.mockMvc.perform(post("/persons"))
-            .andExpect(flash().attribute("one", "1"))
-            .andExpect(flash().attribute("two", 2.222))
-            .andExpect(flash().attribute("three", new URL("http://example.com")))
-	        .andExpect(flash().attribute("one", equalTo("1")))	// Hamcrest...
-	        .andExpect(flash().attribute("two", equalTo(2.222)))
-	        .andExpect(flash().attribute("three", equalTo(new URL("http://example.com"))));
+			.andExpect(flash().attribute("one", "1"))
+			.andExpect(flash().attribute("two", 2.222))
+			.andExpect(flash().attribute("three", new URL("http://example.com")))
+			.andExpect(flash().attribute("one", equalTo("1")))	// Hamcrest...
+			.andExpect(flash().attribute("two", equalTo(2.222)))
+			.andExpect(flash().attribute("three", equalTo(new URL("http://example.com"))));
 	}
 
 	@Test
 	public void testMatchers() throws Exception {
 		this.mockMvc.perform(post("/persons"))
-	        .andExpect(flash().attribute("one", containsString("1")))
-	        .andExpect(flash().attribute("two", closeTo(2, 0.5)))
-	        .andExpect(flash().attribute("three", notNullValue()));
+			.andExpect(flash().attribute("one", containsString("1")))
+			.andExpect(flash().attribute("two", closeTo(2, 0.5)))
+			.andExpect(flash().attribute("three", notNullValue()));
 	}
 
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
index 4779f52608..1db0c2b110 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/RequestAttributeAssertionTests.java
@@ -48,10 +48,10 @@ public class RequestAttributeAssertionTests {
 	@Test
 	public void testRequestAttributeEqualTo() throws Exception {
 		this.mockMvc.perform(get("/main/1").servletPath("/main"))
-            .andExpect(request().attribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, "/{id}"))
-            .andExpect(request().attribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/1"))
-	        .andExpect(request().attribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, equalTo("/{id}")))
-	        .andExpect(request().attribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, equalTo("/1")));
+			.andExpect(request().attribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, "/{id}"))
+			.andExpect(request().attribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/1"))
+			.andExpect(request().attribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, equalTo("/{id}")))
+			.andExpect(request().attribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, equalTo("/1")));
 	}
 
 	@Test
@@ -60,8 +60,8 @@ public class RequestAttributeAssertionTests {
 		String producibleMediaTypes = HandlerMapping.PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE;
 
 		this.mockMvc.perform(get("/1"))
-	        .andExpect(request().attribute(producibleMediaTypes, hasItem(MediaType.APPLICATION_JSON)))
-	        .andExpect(request().attribute(producibleMediaTypes, not(hasItem(MediaType.APPLICATION_XML))));
+			.andExpect(request().attribute(producibleMediaTypes, hasItem(MediaType.APPLICATION_JSON)))
+			.andExpect(request().attribute(producibleMediaTypes, not(hasItem(MediaType.APPLICATION_XML))));
 	}
 
 
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
index 654feef07c..feeb8d23e5 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/SessionAttributeAssertionTests.java
@@ -54,14 +54,14 @@ public class SessionAttributeAssertionTests {
 	@Test
 	public void testSessionAttributeEqualTo() throws Exception {
 		this.mockMvc.perform(get("/"))
-            .andExpect(request().sessionAttribute("locale", Locale.UK))
-	        .andExpect(request().sessionAttribute("locale", equalTo(Locale.UK)));
+			.andExpect(request().sessionAttribute("locale", Locale.UK))
+			.andExpect(request().sessionAttribute("locale", equalTo(Locale.UK)));
 	}
 
 	@Test
 	public void testSessionAttributeMatcher() throws Exception {
 		this.mockMvc.perform(get("/"))
-	        .andExpect(request().sessionAttribute("locale", notNullValue()));
+			.andExpect(request().sessionAttribute("locale", notNullValue()));
 	}
 
 
diff --git a/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java b/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java
index bd8ff08969..4f2dbab7f8 100644
--- a/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java
+++ b/spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java
@@ -27,17 +27,17 @@ import org.springframework.util.ObjectUtils;
 public abstract class AssertionErrors {
 
 
-    private AssertionErrors() {
-    }
+	private AssertionErrors() {
+	}
 
 	/**
 	 * Fails a test with the given message.
 	 *
 	 * @param message describes the reason for the failure
 	 */
-    public static void fail(String message) {
-        throw new AssertionError(message);
-    }
+	public static void fail(String message) {
+		throw new AssertionError(message);
+	}
 
 	/**
 	 * Fails a test with the given message passing along expected and actual
@@ -56,9 +56,9 @@ public abstract class AssertionErrors {
 	 * @param expected expected value
 	 * @param actual actual value
 	 */
-    public static void fail(String message, Object expected, Object actual) {
-        throw new AssertionError(message + " expected:<" + expected + "> but was:<" + actual + ">");
-    }
+	public static void fail(String message, Object expected, Object actual) {
+		throw new AssertionError(message + " expected:<" + expected + "> but was:<" + actual + ">");
+	}
 
 	/**
 	 * Assert the given condition is {@code true} and raise an
@@ -67,11 +67,11 @@ public abstract class AssertionErrors {
 	 * @param message the message
 	 * @param condition the condition to test for
 	 */
-    public static void assertTrue(String message, boolean condition) {
-        if (!condition) {
-            fail(message);
-        }
-    }
+	public static void assertTrue(String message, boolean condition) {
+		if (!condition) {
+			fail(message);
+		}
+	}
 
 	/**
 	 * Assert two objects are equal raise an {@link AssertionError} if not.
@@ -84,10 +84,10 @@ public abstract class AssertionErrors {
 	 * @param expected the expected value
 	 * @param actual the actual value
 	 */
-    public static void assertEquals(String message, Object expected, Object actual) {
+	public static void assertEquals(String message, Object expected, Object actual) {
 		if (!ObjectUtils.nullSafeEquals(expected, actual)) {
 			fail(message, expected, actual);
 		}
-    }
+	}
 
 }
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 f8e46ea6a5..f5e54bb50f 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
@@ -123,7 +123,7 @@ public class CciLocalTransactionManager extends AbstractPlatformTransactionManag
 	protected Object doGetTransaction() {
 		CciLocalTransactionObject txObject = new CciLocalTransactionObject();
 		ConnectionHolder conHolder =
-		    (ConnectionHolder) TransactionSynchronizationManager.getResource(getConnectionFactory());
+			(ConnectionHolder) TransactionSynchronizationManager.getResource(getConnectionFactory());
 		txObject.setConnectionHolder(conHolder);
 		return txObject;
 	}
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 6929ef5aee..a771826932 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
@@ -717,7 +717,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 		if (transactionSynchronizationRegistryClass == null) {
 			// JTA 1.1 API not present - skip.
 			if (logger.isDebugEnabled()) {
-			    logger.debug("JTA 1.1 [" + TRANSACTION_SYNCHRONIZATION_REGISTRY_CLASS_NAME + "] API not available");
+				logger.debug("JTA 1.1 [" + TRANSACTION_SYNCHRONIZATION_REGISTRY_CLASS_NAME + "] API not available");
 			}
 			return null;
 		}
@@ -823,12 +823,12 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 		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);
@@ -883,7 +883,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 
 		if (!this.allowCustomIsolationLevels && isolationLevel != TransactionDefinition.ISOLATION_DEFAULT) {
 			throw new InvalidIsolationLevelException(
-			    "JtaTransactionManager does not support custom isolation levels by default - " +
+				"JtaTransactionManager does not support custom isolation levels by default - " +
 				"switch 'allowCustomIsolationLevels' to 'true'");
 		}
 	}
@@ -962,7 +962,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 	 * @see javax.transaction.TransactionManager#resume(javax.transaction.Transaction)
 	 */
 	protected void doJtaResume(JtaTransactionObject txObject, Object suspendedTransaction)
-	    throws InvalidTransactionException, SystemException {
+		throws InvalidTransactionException, SystemException {
 
 		if (getTransactionManager() == null) {
 			throw new TransactionSuspensionNotSupportedException(
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 b9f994d27a..731978b693 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
@@ -274,7 +274,7 @@ public class WebLogicJtaTransactionManager extends JtaTransactionManager {
 
 			if (logger.isDebugEnabled()) {
 				logger.debug("Standard JTA resume threw InvalidTransactionException: " + ex.getMessage() +
-				    " - trying WebLogic JTA forceResume");
+					" - trying WebLogic JTA forceResume");
 			}
 			/*
 			weblogic.transaction.TransactionManager wtm =
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 07e3344f0f..e79760ad39 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
@@ -359,7 +359,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 		}
 		else if (definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_REQUIRED ||
 				definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_REQUIRES_NEW ||
-		    definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_NESTED) {
+			definition.getPropagationBehavior() == TransactionDefinition.PROPAGATION_NESTED) {
 			SuspendedResourcesHolder suspendedResources = suspend(null);
 			if (debugEnabled) {
 				logger.debug("Creating new transaction with name [" + definition.getName() + "]: " + definition);
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java
index a69769852a..8b73072267 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java
@@ -176,7 +176,7 @@ public class DefaultTransactionStatus extends AbstractTransactionStatus {
 	protected SavepointManager getSavepointManager() {
 		if (!isTransactionSavepointManager()) {
 			throw new NestedTransactionNotSupportedException(
-			    "Transaction object [" + getTransaction() + "] does not support savepoints");
+				"Transaction object [" + getTransaction() + "] does not support savepoints");
 		}
 		return (SavepointManager) getTransaction();
 	}
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 0c7aedfd22..712b1296d0 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
@@ -284,7 +284,7 @@ public abstract class TransactionSynchronizationManager {
 	 * @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/interceptor/TransactionAttributeSourceEditorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
index 3ed4ebcb35..6c6da1c15e 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
@@ -55,27 +55,27 @@ public class TransactionAttributeSourceEditorTests extends TestCase {
 		TransactionAttributeSourceEditor pe = new TransactionAttributeSourceEditor();
 		// TODO need FQN?
 		pe.setAsText(
-		    "java.lang.Object.hashCode=PROPAGATION_REQUIRED\n" +
-		    "java.lang.Object.equals=PROPAGATION_MANDATORY\n" +
-		    "java.lang.Object.*it=PROPAGATION_SUPPORTS\n" +
-		    "java.lang.Object.notify=PROPAGATION_SUPPORTS\n" +
-		    "java.lang.Object.not*=PROPAGATION_REQUIRED");
+			"java.lang.Object.hashCode=PROPAGATION_REQUIRED\n" +
+			"java.lang.Object.equals=PROPAGATION_MANDATORY\n" +
+			"java.lang.Object.*it=PROPAGATION_SUPPORTS\n" +
+			"java.lang.Object.notify=PROPAGATION_SUPPORTS\n" +
+			"java.lang.Object.not*=PROPAGATION_REQUIRED");
 		TransactionAttributeSource tas = (TransactionAttributeSource) pe.getValue();
 
 		checkTransactionProperties(tas, Object.class.getMethod("hashCode", (Class[]) null),
-		    TransactionDefinition.PROPAGATION_REQUIRED);
+			TransactionDefinition.PROPAGATION_REQUIRED);
 		checkTransactionProperties(tas, Object.class.getMethod("equals", new Class[] { Object.class }),
-		    TransactionDefinition.PROPAGATION_MANDATORY);
+			TransactionDefinition.PROPAGATION_MANDATORY);
 		checkTransactionProperties(tas, Object.class.getMethod("wait", (Class[]) null),
-		    TransactionDefinition.PROPAGATION_SUPPORTS);
+			TransactionDefinition.PROPAGATION_SUPPORTS);
 		checkTransactionProperties(tas, Object.class.getMethod("wait", new Class[] { long.class }),
-		    TransactionDefinition.PROPAGATION_SUPPORTS);
+			TransactionDefinition.PROPAGATION_SUPPORTS);
 		checkTransactionProperties(tas, Object.class.getMethod("wait", new Class[] { long.class, int.class }),
-		    TransactionDefinition.PROPAGATION_SUPPORTS);
+			TransactionDefinition.PROPAGATION_SUPPORTS);
 		checkTransactionProperties(tas, Object.class.getMethod("notify", (Class[]) null),
-		    TransactionDefinition.PROPAGATION_SUPPORTS);
+			TransactionDefinition.PROPAGATION_SUPPORTS);
 		checkTransactionProperties(tas, Object.class.getMethod("notifyAll", (Class[]) null),
-		    TransactionDefinition.PROPAGATION_REQUIRED);
+			TransactionDefinition.PROPAGATION_REQUIRED);
 		checkTransactionProperties(tas, Object.class.getMethod("toString", (Class[]) null), -1);
 	}
 
@@ -85,21 +85,21 @@ public class TransactionAttributeSourceEditorTests extends TestCase {
 		TransactionAttributeSource tas = (TransactionAttributeSource) pe.getValue();
 
 		checkTransactionProperties(tas, Object.class.getMethod("hashCode", (Class[]) null),
-		    TransactionDefinition.PROPAGATION_REQUIRED);
+			TransactionDefinition.PROPAGATION_REQUIRED);
 		checkTransactionProperties(tas, Object.class.getMethod("equals", new Class[] { Object.class }),
-		    TransactionDefinition.PROPAGATION_REQUIRED);
+			TransactionDefinition.PROPAGATION_REQUIRED);
 		checkTransactionProperties(tas, Object.class.getMethod("wait", (Class[]) null),
-		    TransactionDefinition.PROPAGATION_REQUIRED);
+			TransactionDefinition.PROPAGATION_REQUIRED);
 		checkTransactionProperties(tas, Object.class.getMethod("wait", new Class[] { long.class }),
-		    TransactionDefinition.PROPAGATION_REQUIRED);
+			TransactionDefinition.PROPAGATION_REQUIRED);
 		checkTransactionProperties(tas, Object.class.getMethod("wait", new Class[] { long.class, int.class }),
-		    TransactionDefinition.PROPAGATION_REQUIRED);
+			TransactionDefinition.PROPAGATION_REQUIRED);
 		checkTransactionProperties(tas, Object.class.getMethod("notify", (Class[]) null),
-		    TransactionDefinition.PROPAGATION_REQUIRED);
+			TransactionDefinition.PROPAGATION_REQUIRED);
 		checkTransactionProperties(tas, Object.class.getMethod("notifyAll", (Class[]) null),
-		    TransactionDefinition.PROPAGATION_REQUIRED);
+			TransactionDefinition.PROPAGATION_REQUIRED);
 		checkTransactionProperties(tas, Object.class.getMethod("toString", (Class[]) null),
-		    TransactionDefinition.PROPAGATION_REQUIRED);
+			TransactionDefinition.PROPAGATION_REQUIRED);
 	}
 
 	private void checkTransactionProperties(TransactionAttributeSource tas, Method method, int propagationBehavior) {
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 3da6afe333..5d480d5e4b 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+	 * 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.
@@ -96,8 +96,8 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
 
 	private static final String[] DATE_FORMATS = new String[] {
 		"EEE, dd MMM yyyy HH:mm:ss zzz",
-        "EEE, dd-MMM-yy HH:mm:ss zzz",
-        "EEE MMM dd HH:mm:ss yyyy"
+		"EEE, dd-MMM-yy HH:mm:ss zzz",
+		"EEE MMM dd HH:mm:ss yyyy"
 	};
 
 	private static TimeZone GMT = TimeZone.getTimeZone("GMT");
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 e8853a9b16..e50c58f445 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -463,7 +463,7 @@ public class MediaType implements Comparable<MediaType> {
 	 * @return a read-only map, possibly empty, never <code>null</code>
 	 */
 	public Map<String, String> getParameters() {
-	        return parameters;
+			return parameters;
 	}
 
 	/**
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 16a5908e45..ab13bc68c7 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
@@ -50,13 +50,13 @@ final class HttpComponentsClientHttpRequest extends AbstractBufferingClientHttpR
 
 	private final HttpUriRequest httpRequest;
 
-    private final HttpContext httpContext;
+	private final HttpContext httpContext;
 
 
-    public HttpComponentsClientHttpRequest(HttpClient httpClient, HttpUriRequest httpRequest, HttpContext httpContext) {
+	public HttpComponentsClientHttpRequest(HttpClient httpClient, HttpUriRequest httpRequest, HttpContext httpContext) {
 		this.httpClient = httpClient;
 		this.httpRequest = httpRequest;
-        this.httpContext = httpContext;
+		this.httpContext = httpContext;
 	}
 
 
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 8bb41ed743..0131cfa50f 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
@@ -128,7 +128,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
 		getHttpClient().getParams().setIntParameter(CoreConnectionPNames.SO_TIMEOUT, timeout);
 	}
 
-    public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
+	public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
 		HttpUriRequest httpRequest = createHttpUriRequest(httpMethod, uri);
 		postProcessHttpRequest(httpRequest);
 		return new HttpComponentsClientHttpRequest(getHttpClient(), httpRequest, createHttpContext(httpMethod, uri));
@@ -172,16 +172,16 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
 	protected void postProcessHttpRequest(HttpUriRequest request) {
 	}
 
-    /**
-     * Template methods that creates a {@link HttpContext} for the given HTTP method and URI.
-     * <p>The default implementation returns {@code null}.
-     * @param httpMethod the HTTP method
-     * @param uri the URI
-     * @return the http context
-     */
-    protected HttpContext createHttpContext(HttpMethod httpMethod, URI uri) {
-        return null;
-    }
+	/**
+	 * Template methods that creates a {@link HttpContext} for the given HTTP method and URI.
+	 * <p>The default implementation returns {@code null}.
+	 * @param httpMethod the HTTP method
+	 * @param uri the URI
+	 * @return the http context
+	 */
+	protected HttpContext createHttpContext(HttpMethod httpMethod, URI uri) {
+		return null;
+	}
 
 	/**
 	 * Shutdown hook that closes the underlying
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 9ec659945a..a5e831102c 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
@@ -73,38 +73,38 @@ final class SimpleStreamingClientHttpRequest extends AbstractClientHttpRequest {
 			else {
 				this.connection.setChunkedStreamingMode(this.chunkSize);
 			}
-            writeHeaders(headers);
-            this.connection.connect();
+			writeHeaders(headers);
+			this.connection.connect();
 			this.body = this.connection.getOutputStream();
 		}
 		return new NonClosingOutputStream(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);
-            }
-        }
-    }
+	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
+	@Override
 	protected ClientHttpResponse executeInternal(HttpHeaders headers) throws IOException {
-        try {
-            if (this.body != null) {
-                this.body.close();
-            }
-            else {
-                writeHeaders(headers);
-                this.connection.connect();
-            }
-        }
-        catch (IOException ex) {
-            // ignore
-        }
-        return new SimpleClientHttpResponse(this.connection);
-    }
+		try {
+			if (this.body != null) {
+				this.body.close();
+			}
+			else {
+				writeHeaders(headers);
+				this.connection.connect();
+			}
+		}
+		catch (IOException ex) {
+			// ignore
+		}
+		return new SimpleClientHttpResponse(this.connection);
+	}
 
 
 	private static class NonClosingOutputStream extends FilterOutputStream {
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
index 0529f38206..9b819edc8d 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
@@ -183,7 +183,7 @@ public class BurlapClientInterceptor extends UrlBasedRemoteAccessor implements M
 		}
 		else {
 			return new RemoteAccessException(
-			    "Cannot access Burlap remote service at [" + getServiceUrl() + "]", ex);
+				"Cannot access Burlap remote service at [" + getServiceUrl() + "]", ex);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
index d07fe12733..57418a6747 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
@@ -264,7 +264,7 @@ public class HessianClientInterceptor extends UrlBasedRemoteAccessor implements
 		}
 		else {
 			return new RemoteAccessException(
-			    "Cannot access Hessian remote service at [" + getServiceUrl() + "]", ex);
+				"Cannot access Hessian remote service at [" + getServiceUrl() + "]", ex);
 		}
 	}
 
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 df2fba95cc..7f6c8eeb64 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
@@ -210,7 +210,7 @@ public class HttpInvokerClientInterceptor extends RemoteInvocationBasedAccessor
 		}
 		else {
 			throw new RemoteAccessException(
-			    "Could not access HTTP invoker remote service at [" + getServiceUrl() + "]", ex);
+				"Could not access HTTP invoker remote service at [" + getServiceUrl() + "]", ex);
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
index 8bb3a5e009..1ffd4ec611 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
@@ -185,7 +185,7 @@ public abstract class GenericFilterBean implements
 		}
 		catch (BeansException ex) {
 			String msg = "Failed to set bean properties on filter '" +
-			    filterConfig.getFilterName() + "': " + ex.getMessage();
+				filterConfig.getFilterName() + "': " + ex.getMessage();
 			logger.error(msg, ex);
 			throw new NestedServletException(msg, ex);
 		}
@@ -310,9 +310,9 @@ public abstract class GenericFilterBean implements
 			// Fail if we are still missing properties.
 			if (missingProps != null && missingProps.size() > 0) {
 				throw new ServletException(
-				    "Initialization from FilterConfig for filter '" + config.getFilterName() +
-				    "' failed; the following required properties were missing: " +
-				    StringUtils.collectionToDelimitedString(missingProps, ", "));
+					"Initialization from FilterConfig for filter '" + config.getFilterName() +
+					"' failed; the following required properties were missing: " +
+					StringUtils.collectionToDelimitedString(missingProps, ", "));
 			}
 		}
 	}
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 e28efaeb57..e4b929d6fc 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
@@ -76,7 +76,7 @@ public abstract class FacesContextUtils {
 	 * @see org.springframework.web.context.WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE
 	 */
 	public static WebApplicationContext getRequiredWebApplicationContext(FacesContext fc)
-	    throws IllegalStateException {
+		throws IllegalStateException {
 
 		WebApplicationContext wac = getWebApplicationContext(fc);
 		if (wac == null) {
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 a52615d1ef..141cd7b86e 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
@@ -107,7 +107,7 @@ public class UriComponentsBuilder {
 	protected UriComponentsBuilder() {
 	}
 
-    // Factory methods
+	// Factory methods
 
 	/**
 	 * Returns a new, empty builder.
@@ -253,7 +253,7 @@ public class UriComponentsBuilder {
 
 
 
-    // build methods
+	// build methods
 
 	/**
 	 * Builds a {@code UriComponents} instance from the various components contained in this builder.
@@ -306,7 +306,7 @@ public class UriComponentsBuilder {
 		return build(false).expand(uriVariableValues);
 	}
 
-    // URI components methods
+	// URI components methods
 
 	/**
 	 * Initializes all components of this URI builder with the components of the given URI.
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 2437b9ba0d..92070f08ac 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
@@ -67,7 +67,7 @@ public class UriTemplate implements Serializable {
 		this.uriTemplate = uriTemplate;
 		this.variableNames = parser.getVariableNames();
 		this.matchPattern = parser.getMatchPattern();
-        this.uriComponents = UriComponentsBuilder.fromUriString(uriTemplate).build();
+		this.uriComponents = UriComponentsBuilder.fromUriString(uriTemplate).build();
 	}
 
 	/**
@@ -78,7 +78,7 @@ public class UriTemplate implements Serializable {
 		return this.variableNames;
 	}
 
-    // expanding
+	// expanding
 
 	/**
 	 * Given the Map of variables, expands this template into a URI. The Map keys represent variable names,
@@ -98,12 +98,12 @@ public class UriTemplate implements Serializable {
 	 * 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 = uriComponents.expand(uriVariables);
 		UriComponents encodedComponents = expandedComponents.encode();
-        return encodedComponents.toUri();
+		return encodedComponents.toUri();
 	}
 
-    /**
+	/**
 	 * Given an array of variables, expand this template into a full URI. The array represent variable values.
 	 * The order of variables is significant.
 	 * <p>Example:
@@ -118,12 +118,12 @@ public class UriTemplate implements Serializable {
 	 * or if it does not contain sufficient variables
 	 */
 	public URI expand(Object... uriVariableValues) {
-        UriComponents expandedComponents = uriComponents.expand(uriVariableValues);
+		UriComponents expandedComponents = uriComponents.expand(uriVariableValues);
 		UriComponents encodedComponents = expandedComponents.encode();
-        return encodedComponents.toUri();
+		return encodedComponents.toUri();
 	}
 
-    // matching
+	// matching
 
 	/**
 	 * Indicate whether the given URI matches this template.
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 4c2b036a6c..d8d3ce2446 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
@@ -142,16 +142,16 @@ public abstract class WebUtils {
 		String root = servletContext.getRealPath("/");
 		if (root == null) {
 			throw new IllegalStateException(
-			    "Cannot set web app root system property when WAR file is not expanded");
+				"Cannot set web app root system property when WAR file is not expanded");
 		}
 		String param = servletContext.getInitParameter(WEB_APP_ROOT_KEY_PARAM);
 		String key = (param != null ? param : DEFAULT_WEB_APP_ROOT_KEY);
 		String oldValue = System.getProperty(key);
 		if (oldValue != null && !StringUtils.pathEquals(oldValue, root)) {
 			throw new IllegalStateException(
-			    "Web app root system property already set to different value: '" +
-			    key + "' = [" + oldValue + "] instead of [" + root + "] - " +
-			    "Choose unique values for the 'webAppRootKey' context-param in your web.xml files!");
+				"Web app root system property already set to different value: '" +
+				key + "' = [" + oldValue + "] instead of [" + root + "] - " +
+				"Choose unique values for the 'webAppRootKey' context-param in your web.xml files!");
 		}
 		System.setProperty(key, root);
 		servletContext.log("Set web app root system property: '" + key + "' = [" + root + "]");
@@ -279,7 +279,7 @@ public abstract class WebUtils {
 	 * @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) {
@@ -330,13 +330,13 @@ public abstract class WebUtils {
 			}
 			catch (InstantiationException ex) {
 				throw new IllegalArgumentException(
-				    "Could not instantiate class [" + clazz.getName() +
-				    "] for session attribute '" + name + "': " + ex.getMessage());
+					"Could not instantiate class [" + clazz.getName() +
+					"] for session attribute '" + name + "': " + ex.getMessage());
 			}
 			catch (IllegalAccessException ex) {
 				throw new IllegalArgumentException(
-				    "Could not access default constructor of class [" + clazz.getName() +
-				    "] for session attribute '" + name + "': " + ex.getMessage());
+					"Could not access default constructor of class [" + clazz.getName() +
+					"] for session attribute '" + name + "': " + ex.getMessage());
 			}
 			session.setAttribute(name, sessionObject);
 		}
diff --git a/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java b/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java
index 0ce0dc19e4..2af35321ff 100644
--- a/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java
+++ b/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java
@@ -245,8 +245,8 @@ public abstract class AbstractHttpRequestFactoryTestCase {
 	@SuppressWarnings("serial")
 	private static class EchoServlet extends HttpServlet {
 
-        @Override
-        protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		@Override
+		protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 			echo(req, resp);
 		}
 
diff --git a/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java b/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java
index 3591eaca44..113f3d4910 100644
--- a/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java
+++ b/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java
@@ -31,69 +31,69 @@ import org.springframework.util.Assert;
  */
 public abstract class FreePortScanner {
 
-    private static final int MIN_SAFE_PORT = 1024;
+	private static final int MIN_SAFE_PORT = 1024;
 
-    private static final int MAX_PORT = 65535;
+	private static final int MAX_PORT = 65535;
 
-    private static final Random random = new Random();
+	private static final Random random = new Random();
 
-    /**
-     * Returns the number of a free port in the default range.
-     */
-    public static int getFreePort() {
-        return getFreePort(MIN_SAFE_PORT, MAX_PORT);
-    }
+	/**
+	 * Returns the number of a free port in the default range.
+	 */
+	public static int getFreePort() {
+		return getFreePort(MIN_SAFE_PORT, MAX_PORT);
+	}
 
-    /**
-     * Returns the number of a free port in the given range.
-     */
-    public static int getFreePort(int minPort, int maxPort) {
-        Assert.isTrue(minPort > 0, "'minPort' must be larger than 0");
-        Assert.isTrue(maxPort > minPort, "'maxPort' must be larger than minPort");
-        int portRange = maxPort - minPort;
-        int candidatePort;
-        int searchCounter = 0;
-        do {
-            if (++searchCounter > portRange) {
-                throw new IllegalStateException(
-                        String.format("There were no ports available in the range %d to %d", minPort, maxPort));
-            }
-            candidatePort = getRandomPort(minPort, portRange);
-        }
-        while (!isPortAvailable(candidatePort));
+	/**
+	 * Returns the number of a free port in the given range.
+	 */
+	public static int getFreePort(int minPort, int maxPort) {
+		Assert.isTrue(minPort > 0, "'minPort' must be larger than 0");
+		Assert.isTrue(maxPort > minPort, "'maxPort' must be larger than minPort");
+		int portRange = maxPort - minPort;
+		int candidatePort;
+		int searchCounter = 0;
+		do {
+			if (++searchCounter > portRange) {
+				throw new IllegalStateException(
+						String.format("There were no ports available in the range %d to %d", minPort, maxPort));
+			}
+			candidatePort = getRandomPort(minPort, portRange);
+		}
+		while (!isPortAvailable(candidatePort));
 
-        return candidatePort;
-    }
+		return candidatePort;
+	}
 
-    private static int getRandomPort(int minPort, int portRange) {
-        return minPort + random.nextInt(portRange);
-    }
+	private static int getRandomPort(int minPort, int portRange) {
+		return minPort + random.nextInt(portRange);
+	}
 
-    private static boolean isPortAvailable(int port) {
-        ServerSocket serverSocket;
-        try {
-            serverSocket = new ServerSocket();
-        }
-        catch (IOException ex) {
-            throw new IllegalStateException("Unable to create ServerSocket.", ex);
-        }
+	private static boolean isPortAvailable(int port) {
+		ServerSocket serverSocket;
+		try {
+			serverSocket = new ServerSocket();
+		}
+		catch (IOException ex) {
+			throw new IllegalStateException("Unable to create ServerSocket.", ex);
+		}
 
-        try {
-            InetSocketAddress sa = new InetSocketAddress(port);
-            serverSocket.bind(sa);
-            return true;
-        }
-        catch (IOException ex) {
-            return false;
-        }
-        finally {
-            try {
-                serverSocket.close();
-            }
-            catch (IOException ex) {
-                // ignore
-            }
-        }
-    }
+		try {
+			InetSocketAddress sa = new InetSocketAddress(port);
+			serverSocket.bind(sa);
+			return true;
+		}
+		catch (IOException ex) {
+			return false;
+		}
+		finally {
+			try {
+				serverSocket.close();
+			}
+			catch (IOException ex) {
+				// ignore
+			}
+		}
+	}
 
 }
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 1f870a8f7a..6352a49758 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
@@ -373,13 +373,13 @@ public class CommonsMultipartResolverTests {
 					}
 					List<FileItem> fileItems = new ArrayList<FileItem>();
 					MockFileItem fileItem1 = new MockFileItem(
-					    "field1", "type1", empty ? "" : "field1.txt", empty ? "" : "text1");
+						"field1", "type1", empty ? "" : "field1.txt", empty ? "" : "text1");
 					MockFileItem fileItem1x = new MockFileItem(
-					    "field1", "type1", empty ? "" : "field1.txt", empty ? "" : "text1");
+						"field1", "type1", empty ? "" : "field1.txt", empty ? "" : "text1");
 					MockFileItem fileItem2 = new MockFileItem(
-					    "field2", "type2", empty ? "" : "C:/field2.txt", empty ? "" : "text2");
+						"field2", "type2", empty ? "" : "C:/field2.txt", empty ? "" : "text2");
 					MockFileItem fileItem2x = new MockFileItem(
-					    "field2x", "type2", empty ? "" : "C:\\field2x.txt", empty ? "" : "text2");
+						"field2x", "type2", empty ? "" : "C:\\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");
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 057733e943..8205ca6cdf 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
@@ -38,11 +38,11 @@ public class UriComponentsBuilderTests {
 	public void plain() throws URISyntaxException {
 		UriComponentsBuilder builder = UriComponentsBuilder.newInstance();
 		UriComponents result = builder.scheme("http").host("example.com").path("foo").queryParam("bar").fragment("baz").build();
-        assertEquals("http", result.getScheme());
-        assertEquals("example.com", result.getHost());
-        assertEquals("foo", result.getPath());
-        assertEquals("bar", result.getQuery());
-        assertEquals("baz", result.getFragment());
+		assertEquals("http", result.getScheme());
+		assertEquals("example.com", result.getHost());
+		assertEquals("foo", result.getPath());
+		assertEquals("bar", result.getQuery());
+		assertEquals("baz", result.getFragment());
 
 		URI expected = new URI("http://example.com/foo?bar#baz");
 		assertEquals("Invalid result URI", expected, result.toUri());
@@ -51,29 +51,29 @@ public class UriComponentsBuilderTests {
 	@Test
 	public void fromPath() throws URISyntaxException {
 		UriComponents result = UriComponentsBuilder.fromPath("foo").queryParam("bar").fragment("baz").build();
-        assertEquals("foo", result.getPath());
-        assertEquals("bar", result.getQuery());
-        assertEquals("baz", result.getFragment());
+		assertEquals("foo", result.getPath());
+		assertEquals("bar", result.getQuery());
+		assertEquals("baz", result.getFragment());
 
 		URI expected = new URI("/foo?bar#baz");
 		assertEquals("Invalid result URI", expected, result.toUri());
 
 		result = UriComponentsBuilder.fromPath("/foo").build();
-        assertEquals("/foo", result.getPath());
+		assertEquals("/foo", result.getPath());
 
-        expected = new URI("/foo");
+		expected = new URI("/foo");
 		assertEquals("Invalid result URI", expected, result.toUri());
 	}
 
 	@Test
 	public void fromHierarchicalUri() throws URISyntaxException {
 		URI uri = new URI("http://example.com/foo?bar#baz");
-        UriComponents result = UriComponentsBuilder.fromUri(uri).build();
-        assertEquals("http", result.getScheme());
-        assertEquals("example.com", result.getHost());
-        assertEquals("/foo", result.getPath());
-        assertEquals("bar", result.getQuery());
-        assertEquals("baz", result.getFragment());
+		UriComponents result = UriComponentsBuilder.fromUri(uri).build();
+		assertEquals("http", result.getScheme());
+		assertEquals("example.com", result.getHost());
+		assertEquals("/foo", result.getPath());
+		assertEquals("bar", result.getQuery());
+		assertEquals("baz", result.getFragment());
 
 		assertEquals("Invalid result URI", uri, result.toUri());
 	}
@@ -81,24 +81,24 @@ public class UriComponentsBuilderTests {
 	@Test
 	public void fromOpaqueUri() throws URISyntaxException {
 		URI uri = new URI("mailto:foo@bar.com#baz");
-        UriComponents result = UriComponentsBuilder.fromUri(uri).build();
-        assertEquals("mailto", result.getScheme());
-        assertEquals("foo@bar.com", result.getSchemeSpecificPart());
-        assertEquals("baz", result.getFragment());
+		UriComponents result = UriComponentsBuilder.fromUri(uri).build();
+		assertEquals("mailto", result.getScheme());
+		assertEquals("foo@bar.com", result.getSchemeSpecificPart());
+		assertEquals("baz", result.getFragment());
 
 		assertEquals("Invalid result URI", uri, result.toUri());
 	}
 
 	// SPR-9317
 
-    @Test
-    public void fromUriEncodedQuery() throws URISyntaxException {
-        URI uri = new URI("http://www.example.org/?param=aGVsbG9Xb3JsZA%3D%3D");
-        String fromUri = UriComponentsBuilder.fromUri(uri).build().getQueryParams().get("param").get(0);
-        String fromUriString = UriComponentsBuilder.fromUriString(uri.toString()).build().getQueryParams().get("param").get(0);
+	@Test
+	public void fromUriEncodedQuery() throws URISyntaxException {
+		URI uri = new URI("http://www.example.org/?param=aGVsbG9Xb3JsZA%3D%3D");
+		String fromUri = UriComponentsBuilder.fromUri(uri).build().getQueryParams().get("param").get(0);
+		String fromUriString = UriComponentsBuilder.fromUriString(uri.toString()).build().getQueryParams().get("param").get(0);
 
-        assertEquals(fromUri, fromUriString);
-    }
+		assertEquals(fromUri, fromUriString);
+	}
 
 	@Test
 	public void fromUriString() {
@@ -115,42 +115,42 @@ public class UriComponentsBuilderTests {
 		result = UriComponentsBuilder.fromUriString(
 				"http://arjen:foobar@java.sun.com:80/javase/6/docs/api/java/util/BitSet.html?foo=bar#and(java.util.BitSet)")
 				.build();
-        assertEquals("http", result.getScheme());
-        assertEquals("arjen:foobar", result.getUserInfo());
-        assertEquals("java.sun.com", result.getHost());
-        assertEquals(80, result.getPort());
-        assertEquals("/javase/6/docs/api/java/util/BitSet.html", result.getPath());
-        assertEquals("foo=bar", result.getQuery());
+		assertEquals("http", result.getScheme());
+		assertEquals("arjen:foobar", result.getUserInfo());
+		assertEquals("java.sun.com", result.getHost());
+		assertEquals(80, result.getPort());
+		assertEquals("/javase/6/docs/api/java/util/BitSet.html", result.getPath());
+		assertEquals("foo=bar", result.getQuery());
 		MultiValueMap<String, String> expectedQueryParams = new LinkedMultiValueMap<String, String>(1);
 		expectedQueryParams.add("foo", "bar");
 		assertEquals(expectedQueryParams, result.getQueryParams());
-        assertEquals("and(java.util.BitSet)", result.getFragment());
+		assertEquals("and(java.util.BitSet)", result.getFragment());
 
-        result = UriComponentsBuilder.fromUriString("mailto:java-net@java.sun.com#baz").build();
-        assertEquals("mailto", result.getScheme());
-        assertNull(result.getUserInfo());
-        assertNull(result.getHost());
-        assertEquals(-1, result.getPort());
-        assertEquals("java-net@java.sun.com", result.getSchemeSpecificPart());
-        assertNull(result.getPath());
-        assertNull(result.getQuery());
-        assertEquals("baz", result.getFragment());
+		result = UriComponentsBuilder.fromUriString("mailto:java-net@java.sun.com#baz").build();
+		assertEquals("mailto", result.getScheme());
+		assertNull(result.getUserInfo());
+		assertNull(result.getHost());
+		assertEquals(-1, result.getPort());
+		assertEquals("java-net@java.sun.com", result.getSchemeSpecificPart());
+		assertNull(result.getPath());
+		assertNull(result.getQuery());
+		assertEquals("baz", result.getFragment());
 
-        result = UriComponentsBuilder.fromUriString("docs/guide/collections/designfaq.html#28").build();
-        assertNull(result.getScheme());
-        assertNull(result.getUserInfo());
-        assertNull(result.getHost());
-        assertEquals(-1, result.getPort());
-        assertEquals("docs/guide/collections/designfaq.html", result.getPath());
-        assertNull(result.getQuery());
-        assertEquals("28", result.getFragment());
+		result = UriComponentsBuilder.fromUriString("docs/guide/collections/designfaq.html#28").build();
+		assertNull(result.getScheme());
+		assertNull(result.getUserInfo());
+		assertNull(result.getHost());
+		assertEquals(-1, result.getPort());
+		assertEquals("docs/guide/collections/designfaq.html", result.getPath());
+		assertNull(result.getQuery());
+		assertEquals("28", result.getFragment());
 	}
 
 	// SPR-9832
 
 	@Test
 	public void fromUriStringQueryParamWithReservedCharInValue() throws URISyntaxException {
-        String uri = "http://www.google.com/ig/calculator?q=1USD=?EUR";
+		String uri = "http://www.google.com/ig/calculator?q=1USD=?EUR";
 		UriComponents result = UriComponentsBuilder.fromUriString(uri).build();
 
 		assertEquals("q=1USD=?EUR", result.getQuery());
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
index 50b1fc07ee..c9f8d60917 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriComponentsTests.java
@@ -26,25 +26,25 @@ import static org.junit.Assert.*;
 /** @author Arjen Poutsma */
 public class UriComponentsTests {
 
-    @Test
-    public void encode() {
-        UriComponents uriComponents = UriComponentsBuilder.fromPath("/hotel list").build();
-        UriComponents encoded = uriComponents.encode();
-        assertEquals("/hotel%20list", encoded.getPath());
-    }
+	@Test
+	public void encode() {
+		UriComponents uriComponents = UriComponentsBuilder.fromPath("/hotel list").build();
+		UriComponents encoded = uriComponents.encode();
+		assertEquals("/hotel%20list", encoded.getPath());
+	}
 
-    @Test
-    public void toUriEncoded() throws URISyntaxException {
-        UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/hotel list/Z\u00fcrich").build();
-        UriComponents encoded = uriComponents.encode();
-        assertEquals(new URI("http://example.com/hotel%20list/Z%C3%BCrich"), encoded.toUri());
-    }
+	@Test
+	public void toUriEncoded() throws URISyntaxException {
+		UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/hotel list/Z\u00fcrich").build();
+		UriComponents encoded = uriComponents.encode();
+		assertEquals(new URI("http://example.com/hotel%20list/Z%C3%BCrich"), encoded.toUri());
+	}
 
-    @Test
-    public void toUriNotEncoded() throws URISyntaxException {
-        UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/hotel list/Z\u00fcrich").build();
-        assertEquals(new URI("http://example.com/hotel%20list/Z\u00fcrich"), uriComponents.toUri());
-    }
+	@Test
+	public void toUriNotEncoded() throws URISyntaxException {
+		UriComponents uriComponents = UriComponentsBuilder.fromUriString("http://example.com/hotel list/Z\u00fcrich").build();
+		assertEquals(new URI("http://example.com/hotel%20list/Z\u00fcrich"), uriComponents.toUri());
+	}
 
 	@Test
 	public void expand() {
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
index 557ba7ca9f..ebd3cea217 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriTemplateTests.java
@@ -53,15 +53,15 @@ public class UriTemplateTests {
 		template.expand("1");
 	}
 
-    @Test
-    public void expandMap() throws Exception {
-        Map<String, String> uriVariables = new HashMap<String, String>(2);
-        uriVariables.put("booking", "42");
-        uriVariables.put("hotel", "1");
-        UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
-        URI result = template.expand(uriVariables);
-        assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result);
-    }
+	@Test
+	public void expandMap() throws Exception {
+		Map<String, String> uriVariables = new HashMap<String, String>(2);
+		uriVariables.put("booking", "42");
+		uriVariables.put("hotel", "1");
+		UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+		URI result = template.expand(uriVariables);
+		assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result);
+	}
 
 	@Test
 	public void expandMapDuplicateVariables() throws Exception {
@@ -81,13 +81,13 @@ public class UriTemplateTests {
 		assertEquals("Invalid expanded template", new URI("http://example.com/hotels/1/bookings/42"), result);
 	}
 
-    @Test
-    public void expandMapEncoded() throws Exception {
-        Map<String, String> uriVariables = Collections.singletonMap("hotel", "Z\u00fcrich");
-        UriTemplate template = new UriTemplate("http://example.com/hotel list/{hotel}");
-        URI result = template.expand(uriVariables);
-        assertEquals("Invalid expanded template", new URI("http://example.com/hotel%20list/Z%C3%BCrich"), result);
-    }
+	@Test
+	public void expandMapEncoded() throws Exception {
+		Map<String, String> uriVariables = Collections.singletonMap("hotel", "Z\u00fcrich");
+		UriTemplate template = new UriTemplate("http://example.com/hotel list/{hotel}");
+		URI result = template.expand(uriVariables);
+		assertEquals("Invalid expanded template", new URI("http://example.com/hotel%20list/Z%C3%BCrich"), result);
+	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void expandMapUnboundVariables() throws Exception {
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 e9bd670d8f..5382523989 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
@@ -98,7 +98,7 @@ public abstract class PortletApplicationContextUtils {
 	 * @see org.springframework.web.context.WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE
 	 */
 	public static ApplicationContext getRequiredWebApplicationContext(PortletContext pc)
-	    throws IllegalStateException {
+		throws IllegalStateException {
 
 		ApplicationContext wac = getWebApplicationContext(pc);
 		if (wac == null) {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
index 8d5c00dce5..d1dc0c2663 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
@@ -381,7 +381,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
 			if (other instanceof SpecialRequestTypePredicate) {
 				return this.getClass().getName().compareTo(other.getClass().getName());
 			}
-            return -1;
+			return -1;
 		}
 	}
 
@@ -413,7 +413,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
 			if (other instanceof SpecialRequestTypePredicate) {
 				return this.getClass().getName().compareTo(other.getClass().getName());
 			}
-            return -1;
+			return -1;
 		}
 	}
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
index cef74bee41..f2fc531e76 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
@@ -158,9 +158,9 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 		pvs = new MutablePropertyValues();
 		pvs.add("order", "1");
 		pvs.add("exceptionMappings",
-		    "java.lang.IllegalAccessException=failed-illegalaccess\n" +
-		    "PortletRequestBindingException=failed-binding\n" +
-		    "NoHandlerFoundException=failed-unavailable");
+			"java.lang.IllegalAccessException=failed-illegalaccess\n" +
+			"PortletRequestBindingException=failed-binding\n" +
+			"NoHandlerFoundException=failed-unavailable");
 		pvs.add("defaultErrorView", "failed-default-1");
 		registerSingleton("exceptionResolver", SimpleMappingExceptionResolver.class, pvs);
 
@@ -376,7 +376,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 	public static class MyHandlerInterceptor1 extends HandlerInterceptorAdapter {
 
 		public boolean preHandleRender(RenderRequest request, RenderResponse response, Object handler)
-		    throws PortletException {
+			throws PortletException {
 			if (request.getAttribute("test2-remove-never") != null) {
 				throw new PortletException("Wrong interceptor order");
 			}
@@ -412,7 +412,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 	public static class MyHandlerInterceptor2 extends HandlerInterceptorAdapter {
 
 		public boolean preHandleRender(RenderRequest request, RenderResponse response, Object handler)
-		    throws PortletException {
+			throws PortletException {
 			if (request.getAttribute("test1-remove-post") == null) {
 				throw new PortletException("Wrong interceptor order");
 			}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java
index becdc05c01..71fd56e812 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java
@@ -1197,7 +1197,7 @@ public class Portlet20AnnotationControllerTests {
 		@ActionMapping(params = "action=details")
 		public void renderDetails(ActionRequest request, ActionResponse response, Model model) {
 			response.setRenderParameter("test", "details");
-	    }
+		}
 
 		@ResourceMapping
 		public void myDefaultResource(Writer writer) throws IOException {
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 25d396b87e..d03b286724 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
@@ -39,64 +39,64 @@ import org.springframework.web.context.support.ServletContextResourcePatternReso
  */
 public class SpringWildcardServletTilesApplicationContext extends ServletApplicationContext {
 
-    /**
-     * The pattern resolver.
-     */
-    protected ResourcePatternResolver resolver;
+	/**
+	 * The pattern resolver.
+	 */
+	protected ResourcePatternResolver resolver;
 
-    /**
-     * Constructor.
-     *
-     * @param servletContext The servlet context.
-     */
-    public SpringWildcardServletTilesApplicationContext(ServletContext servletContext) {
-        super(servletContext);
-        resolver = new ServletContextResourcePatternResolver(servletContext);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param servletContext The servlet context.
+	 */
+	public SpringWildcardServletTilesApplicationContext(ServletContext servletContext) {
+		super(servletContext);
+		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();
-        }
-        return retValue;
-    }
+	@Override
+	public ApplicationResource getResource(String localePath) {
+		ApplicationResource retValue = null;
+		Collection<ApplicationResource> urlSet = getResources(localePath);
+		if (urlSet != null && !urlSet.isEmpty()) {
+			retValue = urlSet.iterator().next();
+		}
+		return retValue;
+	}
 
-    @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();
-        }
-        return retValue;
-    }
+	@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();
+		}
+		return retValue;
+	}
 
-    @Override
-    public Collection<ApplicationResource> getResources(String path) {
-        Resource[] resources;
-        try {
-            resources = resolver.getResources(path);
-        } catch (IOException e) {
-            return Collections.<ApplicationResource> emptyList();
-        }
-        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);
-                }
-            }
-        }
-        return resourceList;
-    }
+	@Override
+	public Collection<ApplicationResource> getResources(String path) {
+		Resource[] resources;
+		try {
+			resources = resolver.getResources(path);
+		} catch (IOException e) {
+			return Collections.<ApplicationResource> emptyList();
+		}
+		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);
+				}
+			}
+		}
+		return resourceList;
+	}
 
 }
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
index aeee264e48..5d86f05988 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
@@ -229,7 +229,7 @@ public abstract class HttpServletBean extends HttpServlet
 		 * @throws ServletException if any required properties are missing
 		 */
 		public ServletConfigPropertyValues(ServletConfig config, Set<String> requiredProperties)
-		    throws ServletException {
+			throws ServletException {
 
 			Set<String> missingProps = (requiredProperties != null && !requiredProperties.isEmpty()) ?
 					new HashSet<String>(requiredProperties) : null;
@@ -247,9 +247,9 @@ public abstract class HttpServletBean extends HttpServlet
 			// Fail if we are still missing properties.
 			if (missingProps != null && missingProps.size() > 0) {
 				throw new ServletException(
-				    "Initialization from ServletConfig for servlet '" + config.getServletName() +
-				    "' failed; the following required properties were missing: " +
-				    StringUtils.collectionToDelimitedString(missingProps, ", "));
+					"Initialization from ServletConfig for servlet '" + config.getServletName() +
+					"' failed; the following required properties were missing: " +
+					StringUtils.collectionToDelimitedString(missingProps, ", "));
 			}
 		}
 	}
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 dea8fddc99..4251077f27 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
@@ -191,7 +191,7 @@ public class ResourceServlet extends HttpServletBean {
 	 */
 	@Override
 	protected final void doGet(HttpServletRequest request, HttpServletResponse response)
-	    throws ServletException, IOException {
+		throws ServletException, IOException {
 
 		// determine URL of resource to include
 		String resourceUrl = determineResourceUrl(request);
@@ -247,7 +247,7 @@ public class ResourceServlet extends HttpServletBean {
 	 * @throws IOException if thrown by the RequestDispatcher
 	 */
 	private boolean includeDefaultUrl(HttpServletRequest request, HttpServletResponse response)
-	    throws ServletException, IOException {
+		throws ServletException, IOException {
 
 		if (this.defaultUrl == null) {
 			return false;
@@ -265,13 +265,13 @@ public class ResourceServlet extends HttpServletBean {
 	 * @throws IOException if thrown by the RequestDispatcher
 	 */
 	private void doInclude(HttpServletRequest request, HttpServletResponse response, String resourceUrl)
-	    throws ServletException, IOException {
+		throws ServletException, IOException {
 
 		if (this.contentType != null) {
 			response.setContentType(this.contentType);
 		}
 		String[] resourceUrls =
-		    StringUtils.tokenizeToStringArray(resourceUrl, RESOURCE_URL_DELIMITERS);
+			StringUtils.tokenizeToStringArray(resourceUrl, RESOURCE_URL_DELIMITERS);
 		for (int i = 0; i < resourceUrls.length; i++) {
 			// check whether URL matches allowed resources
 			if (this.allowedResources != null && !this.pathMatcher.match(this.allowedResources, resourceUrls[i])) {
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 fa44b4628a..8a05cf7382 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
@@ -57,7 +57,7 @@ class ResourcesBeanDefinitionParser implements BeanDefinitionParser {
 		String resourceRequestPath = element.getAttribute("mapping");
 		if (!StringUtils.hasText(resourceRequestPath)) {
 			parserContext.getReaderContext().error("The 'mapping' attribute is required.", parserContext.extractSource(element));
-	        return null;
+			return null;
 		}
 		urlMap.put(resourceRequestPath, resourceHandlerName);
 
@@ -85,7 +85,7 @@ class ResourcesBeanDefinitionParser implements BeanDefinitionParser {
 		String locationAttr = element.getAttribute("location");
 		if (!StringUtils.hasText(locationAttr)) {
 			parserContext.getReaderContext().error("The 'location' attribute is required.", parserContext.extractSource(element));
-	        return null;
+			return null;
 		}
 
 		ManagedList<String> locations = new ManagedList<String>();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
index 455977159c..7e1754192c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
@@ -35,7 +35,7 @@ public abstract class HandlerInterceptorAdapter implements AsyncHandlerIntercept
 	 * This implementation always returns <code>true</code>.
 	 */
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
-	    throws Exception {
+		throws Exception {
 		return true;
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java
index c9aafcab00..8773e47a36 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java
@@ -226,7 +226,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 */
 	@Override
 	protected final void onBindAndValidate(HttpServletRequest request, Object command, BindException errors)
-	    throws Exception {
+		throws Exception {
 
 		onBindAndValidate(request, command, errors, getCurrentPage(request));
 	}
@@ -248,7 +248,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * @see org.springframework.validation.Errors
 	 */
 	protected void onBindAndValidate(HttpServletRequest request, Object command, BindException errors, int page)
-	    throws Exception {
+		throws Exception {
 	}
 
 	/**
@@ -266,7 +266,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 */
 	@Override
 	protected final Map referenceData(HttpServletRequest request, Object command, Errors errors)
-	    throws Exception {
+		throws Exception {
 
 		return referenceData(request, command, errors, getCurrentPage(request));
 	}
@@ -286,7 +286,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * @see ModelAndView
 	 */
 	protected Map referenceData(HttpServletRequest request, Object command, Errors errors, int page)
-	    throws Exception {
+		throws Exception {
 
 		return referenceData(request, page);
 	}
@@ -315,7 +315,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	@Override
 	protected ModelAndView showForm(
 			HttpServletRequest request, HttpServletResponse response, BindException errors)
-	    throws Exception {
+		throws Exception {
 
 		return showPage(request, errors, getInitialPage(request, errors.getTarget()));
 	}
@@ -331,7 +331,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * @throws Exception in case of invalid state or arguments
 	 */
 	protected final ModelAndView showPage(HttpServletRequest request, BindException errors, int page)
-	    throws Exception {
+		throws Exception {
 
 		if (page >= 0 && page < getPageCount(request, errors.getTarget())) {
 			if (logger.isDebugEnabled()) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
index 47f3df7c86..74587e1ecd 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
@@ -434,7 +434,7 @@ public abstract class BaseCommandController extends AbstractController {
 	 * @see #initBinder
 	 */
 	protected ServletRequestDataBinder createBinder(HttpServletRequest request, Object command)
-	    throws Exception {
+		throws Exception {
 
 		ServletRequestDataBinder binder = new ServletRequestDataBinder(command, getCommandName());
 		prepareBinder(binder);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
index f78fa50f7b..f7aef89a17 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
@@ -138,7 +138,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle
 
 
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
-	    throws ServletException {
+		throws ServletException {
 
 		String lookupPath = this.urlPathHelper.getLookupPathForRequest(request);
 		if (logger.isDebugEnabled()) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
index 29859d39b9..5ed48aee95 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
@@ -500,7 +500,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 	 * @return the HttpInputMessage instance to use
 	 * @throws Exception in case of errors
 	 */
-    protected HttpInputMessage createHttpInputMessage(HttpServletRequest servletRequest) throws Exception {
+	protected HttpInputMessage createHttpInputMessage(HttpServletRequest servletRequest) throws Exception {
 		return new ServletServerHttpRequest(servletRequest);
 	}
 
@@ -512,7 +512,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 	 * @return the HttpInputMessage instance to use
 	 * @throws Exception in case of errors
 	 */
-    protected HttpOutputMessage createHttpOutputMessage(HttpServletResponse servletResponse) throws Exception {
+	protected HttpOutputMessage createHttpOutputMessage(HttpServletResponse servletResponse) throws Exception {
 		return new ServletServerHttpResponse(servletResponse);
 	}
 
@@ -803,7 +803,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 			return AnnotationMethodHandlerAdapter.this.createHttpInputMessage(servletRequest);
 		}
 
-        @Override
+		@Override
 		protected HttpOutputMessage createHttpOutputMessage(NativeWebRequest webRequest) throws Exception {
 			HttpServletResponse servletResponse = (HttpServletResponse) webRequest.getNativeResponse();
 			return AnnotationMethodHandlerAdapter.this.createHttpOutputMessage(servletResponse);
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 7e37632960..ccdf7d3703 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
@@ -82,8 +82,8 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe
 	 * {@link #writeWithMessageConverters(Object, MethodParameter, ServletServerHttpRequest, ServletServerHttpResponse)}
 	 */
 	protected <T> void writeWithMessageConverters(T returnValue,
-												  MethodParameter returnType,
-												  NativeWebRequest webRequest)
+												MethodParameter returnType,
+												NativeWebRequest webRequest)
 			throws IOException, HttpMediaTypeNotAcceptableException {
 		ServletServerHttpRequest inputMessage = createInputMessage(webRequest);
 		ServletServerHttpResponse outputMessage = createOutputMessage(webRequest);
@@ -103,9 +103,9 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe
 	 */
 	@SuppressWarnings("unchecked")
 	protected <T> void writeWithMessageConverters(T returnValue,
-												  MethodParameter returnType,
-												  ServletServerHttpRequest inputMessage,
-												  ServletServerHttpResponse outputMessage)
+												MethodParameter returnType,
+												ServletServerHttpRequest inputMessage,
+												ServletServerHttpResponse outputMessage)
 			throws IOException, HttpMediaTypeNotAcceptableException {
 
 		Class<?> returnValueClass = returnValue.getClass();
@@ -173,11 +173,11 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe
 		}
 		else if (!allSupportedMediaTypes.isEmpty()) {
 			List<MediaType> result = new ArrayList<MediaType>();
-            for (HttpMessageConverter<?> converter : messageConverters) {
-                if (converter.canWrite(returnValueClass, null)) {
-                	result.addAll(converter.getSupportedMediaTypes());
-                }
-            }
+			for (HttpMessageConverter<?> converter : messageConverters) {
+				if (converter.canWrite(returnValueClass, null)) {
+					result.addAll(converter.getSupportedMediaTypes());
+				}
+			}
 			return result;
 		}
 		else {
@@ -199,4 +199,4 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe
 		return MediaType.SPECIFICITY_COMPARATOR.compare(acceptType, produceType) <= 0 ? acceptType : produceType;
 	}
 
-}
\ No newline at end of file
+}
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 87be6bcedb..1ddd0064cc 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
@@ -55,7 +55,7 @@ public abstract class RequestContextUtils {
 	 * @throws IllegalStateException if no servlet-specific context has been found
 	 */
 	public static WebApplicationContext getWebApplicationContext(ServletRequest request)
-	    throws IllegalStateException {
+		throws IllegalStateException {
 
 		return getWebApplicationContext(request, null);
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
index 22a3971cb9..a99d7e38a3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
@@ -117,14 +117,14 @@ public class ButtonTag extends AbstractHtmlElementTag {
 		tagWriter.writeAttribute("value", processFieldValue(getName(), valueToUse, getType()));
 	}
 
-    /**
-     * Return the default value.
-     *
-     * @return The default value if none supplied.
-     */
-    protected String getDefaultValue() {
-        return "Submit";
-    }
+	/**
+	 * Return the default value.
+	 *
+	 * @return The default value if none supplied.
+	 */
+	protected String getDefaultValue() {
+		return "Submit";
+	}
 
 	/**
 	 * Get the value of the '<code>type</code>' attribute. Subclasses
diff --git a/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java b/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java
index 3591eaca44..113f3d4910 100644
--- a/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java
+++ b/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java
@@ -31,69 +31,69 @@ import org.springframework.util.Assert;
  */
 public abstract class FreePortScanner {
 
-    private static final int MIN_SAFE_PORT = 1024;
+	private static final int MIN_SAFE_PORT = 1024;
 
-    private static final int MAX_PORT = 65535;
+	private static final int MAX_PORT = 65535;
 
-    private static final Random random = new Random();
+	private static final Random random = new Random();
 
-    /**
-     * Returns the number of a free port in the default range.
-     */
-    public static int getFreePort() {
-        return getFreePort(MIN_SAFE_PORT, MAX_PORT);
-    }
+	/**
+	 * Returns the number of a free port in the default range.
+	 */
+	public static int getFreePort() {
+		return getFreePort(MIN_SAFE_PORT, MAX_PORT);
+	}
 
-    /**
-     * Returns the number of a free port in the given range.
-     */
-    public static int getFreePort(int minPort, int maxPort) {
-        Assert.isTrue(minPort > 0, "'minPort' must be larger than 0");
-        Assert.isTrue(maxPort > minPort, "'maxPort' must be larger than minPort");
-        int portRange = maxPort - minPort;
-        int candidatePort;
-        int searchCounter = 0;
-        do {
-            if (++searchCounter > portRange) {
-                throw new IllegalStateException(
-                        String.format("There were no ports available in the range %d to %d", minPort, maxPort));
-            }
-            candidatePort = getRandomPort(minPort, portRange);
-        }
-        while (!isPortAvailable(candidatePort));
+	/**
+	 * Returns the number of a free port in the given range.
+	 */
+	public static int getFreePort(int minPort, int maxPort) {
+		Assert.isTrue(minPort > 0, "'minPort' must be larger than 0");
+		Assert.isTrue(maxPort > minPort, "'maxPort' must be larger than minPort");
+		int portRange = maxPort - minPort;
+		int candidatePort;
+		int searchCounter = 0;
+		do {
+			if (++searchCounter > portRange) {
+				throw new IllegalStateException(
+						String.format("There were no ports available in the range %d to %d", minPort, maxPort));
+			}
+			candidatePort = getRandomPort(minPort, portRange);
+		}
+		while (!isPortAvailable(candidatePort));
 
-        return candidatePort;
-    }
+		return candidatePort;
+	}
 
-    private static int getRandomPort(int minPort, int portRange) {
-        return minPort + random.nextInt(portRange);
-    }
+	private static int getRandomPort(int minPort, int portRange) {
+		return minPort + random.nextInt(portRange);
+	}
 
-    private static boolean isPortAvailable(int port) {
-        ServerSocket serverSocket;
-        try {
-            serverSocket = new ServerSocket();
-        }
-        catch (IOException ex) {
-            throw new IllegalStateException("Unable to create ServerSocket.", ex);
-        }
+	private static boolean isPortAvailable(int port) {
+		ServerSocket serverSocket;
+		try {
+			serverSocket = new ServerSocket();
+		}
+		catch (IOException ex) {
+			throw new IllegalStateException("Unable to create ServerSocket.", ex);
+		}
 
-        try {
-            InetSocketAddress sa = new InetSocketAddress(port);
-            serverSocket.bind(sa);
-            return true;
-        }
-        catch (IOException ex) {
-            return false;
-        }
-        finally {
-            try {
-                serverSocket.close();
-            }
-            catch (IOException ex) {
-                // ignore
-            }
-        }
-    }
+		try {
+			InetSocketAddress sa = new InetSocketAddress(port);
+			serverSocket.bind(sa);
+			return true;
+		}
+		catch (IOException ex) {
+			return false;
+		}
+		finally {
+			try {
+				serverSocket.close();
+			}
+			catch (IOException ex) {
+				// ignore
+			}
+		}
+	}
 
 }
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 6901b88910..cae1504005 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
@@ -152,8 +152,8 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 		pvs = new MutablePropertyValues();
 		pvs.add("order", "1");
 		pvs.add("exceptionMappings",
-		    "java.lang.IllegalAccessException=failed2\n" +
-		    "ServletRequestBindingException=failed3");
+			"java.lang.IllegalAccessException=failed2\n" +
+			"ServletRequestBindingException=failed3");
 		pvs.add("defaultErrorView", "failed0");
 		registerSingleton("exceptionResolver1", SimpleMappingExceptionResolver.class, pvs);
 
@@ -250,7 +250,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 		}
 
 		public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object delegate)
-		    throws ServletException, IllegalAccessException {
+			throws ServletException, IllegalAccessException {
 			((MyHandler) delegate).doSomething(request);
 			return null;
 		}
@@ -268,7 +268,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 		}
 
 		public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object delegate)
-		    throws IOException, ServletException {
+			throws IOException, ServletException {
 			throw new ServletException("dummy");
 		}
 
@@ -281,7 +281,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 	public static class MyHandlerInterceptor1 implements HandlerInterceptor {
 
 		public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
-		    throws ServletException {
+			throws ServletException {
 			if (request.getAttribute("test2") != null) {
 				throw new ServletException("Wrong interceptor order");
 			}
@@ -317,7 +317,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 	public static class MyHandlerInterceptor2 implements HandlerInterceptor {
 
 		public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
-		    throws ServletException {
+			throws ServletException {
 			if (request.getAttribute("test1x") == null) {
 				throw new ServletException("Wrong interceptor order");
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
index 0df717c1b0..1d48f052d5 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
@@ -405,21 +405,21 @@ public class WizardFormControllerTests extends TestCase {
 						errors.rejectValue("age", "AGE_REQUIRED", null, "Age is required");
 					}
 					break;
-			  default:
+			default:
 					throw new IllegalArgumentException("Invalid page number");
 			}
 		}
 
 		protected ModelAndView processFinish(
 				HttpServletRequest request, HttpServletResponse response, Object command, BindException errors)
-		    throws ServletException, IOException {
+			throws ServletException, IOException {
 			assertTrue(getCurrentPage(request) == 0 || getCurrentPage(request) == 1);
 			return new ModelAndView("success", getCommandName(), command);
 		}
 
 		protected ModelAndView processCancel(
 				HttpServletRequest request, HttpServletResponse response, Object command, BindException errors)
-		    throws ServletException, IOException {
+			throws ServletException, IOException {
 			assertTrue(getCurrentPage(request) == 0 || getCurrentPage(request) == 1);
 			return new ModelAndView("cancel", getCommandName(), command);
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
index e7aa5e97bc..f9c1b200c2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
@@ -183,7 +183,7 @@ public class Spr7839Tests {
 
 	public static class JavaBean {
 
-	    private NestedBean nested;
+		private NestedBean nested;
 
 		public NestedBean getNested() {
 			return nested;
@@ -198,25 +198,25 @@ public class Spr7839Tests {
 
 	public static class NestedBean {
 
-	    private String foo;
+		private String foo;
 
-	    private List<NestedBean> list;
+		private List<NestedBean> list;
 
-	    private List<List<NestedBean>> listOfLists;
+		private List<List<NestedBean>> listOfLists;
 
-	    private List<NestedBean>[] arrayOfLists;
+		private List<NestedBean>[] arrayOfLists;
 
-	    private Map<String, NestedBean> map;
+		private Map<String, NestedBean> map;
 
-	    private Map<String, List<Integer>> mapOfLists;
+		private Map<String, List<Integer>> mapOfLists;
 
-	    public NestedBean() {
+		public NestedBean() {
 
-	    }
+		}
 
-	    public NestedBean(String foo) {
-	    	this.foo = foo;
-	    }
+		public NestedBean(String foo) {
+			this.foo = foo;
+		}
 
 		public String getFoo() {
 			return foo;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
index 2513f86e21..315bfec3fc 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
@@ -107,8 +107,8 @@ public class RequestPartIntegrationTests {
 		converter.setPartConverters(Arrays.<HttpMessageConverter<?>>asList(
 				new ResourceHttpMessageConverter(), new MappingJacksonHttpMessageConverter()));
 
- 		restTemplate = new RestTemplate(new HttpComponentsClientHttpRequestFactory());
- 		restTemplate.setMessageConverters(Arrays.<HttpMessageConverter<?>>asList(converter));
+		restTemplate = new RestTemplate(new HttpComponentsClientHttpRequestFactory());
+		restTemplate.setMessageConverters(Arrays.<HttpMessageConverter<?>>asList(converter));
 	}
 
 	@AfterClass
@@ -174,10 +174,10 @@ public class RequestPartIntegrationTests {
 
 		@RequestMapping(value = "/test", method = RequestMethod.POST, consumes = { "multipart/mixed", "multipart/form-data" })
 		public ResponseEntity<Object> create(@RequestPart("json-data") TestData testData, @RequestPart("file-data") MultipartFile file) {
-	        String url = "http://localhost:8080/test/" + testData.getName() + "/" + file.getOriginalFilename();
-	        HttpHeaders headers = new HttpHeaders();
+			String url = "http://localhost:8080/test/" + testData.getName() + "/" + file.getOriginalFilename();
+			HttpHeaders headers = new HttpHeaders();
 			headers.setLocation(URI.create(url));
-	        return new ResponseEntity<Object>(headers, HttpStatus.CREATED);
+			return new ResponseEntity<Object>(headers, HttpStatus.CREATED);
 		}
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java
index d29bdf01ab..96cca6d869 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/DispatcherServletInitializerTests.java
@@ -87,7 +87,7 @@ public class DispatcherServletInitializerTests {
 
 		@Override
 		public ServletRegistration.Dynamic addServlet(String servletName,
-		                                              Servlet servlet) {
+													  Servlet servlet) {
 			servlets.put(servletName, servlet);
 			MockServletRegistration registration = new MockServletRegistration();
 			registrations.put(servletName, registration);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java
index 9840933209..d1cd12d8b4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java
@@ -368,7 +368,7 @@ public class MappingJackson2JsonViewTests {
 		}
 
 		@Override
-	    public JsonSerializer<Object> createSerializer(SerializerProvider prov, JavaType type, BeanProperty property) throws JsonMappingException {
+		public JsonSerializer<Object> createSerializer(SerializerProvider prov, JavaType type, BeanProperty property) throws JsonMappingException {
 			if (type.getRawClass() == TestBeanSimple.class) {
 				return new TestBeanSimpleSerializer();
 			}

From 8597ec25ec4da57b93aaf956b1219db4d214e961 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Mon, 17 Dec 2012 10:14:56 +0100
Subject: [PATCH 17/36] Fix various Javadoc warnings

Issue: SPR-10128
---
 .../aop/aspectj/AspectJExpressionPointcutTests.java       | 4 ++--
 .../mock/staticmock/AbstractMethodMockingControl.aj       | 2 +-
 .../beans/factory/support/BeanFactoryGenericsTests.java   | 2 +-
 .../ejb/support/AbstractStatelessSessionBean.java         | 8 ++++----
 .../framework/autoproxy/AdvisorAutoProxyCreatorTests.java | 2 +-
 .../java/org/springframework/core/env/Environment.java    | 6 +++---
 .../core/simple/ParameterizedBeanPropertyRowMapper.java   | 2 +-
 .../jdbc/datasource/init/DatabasePopulatorTests.java      | 4 ++--
 .../web/servlet/mvc/method/annotation/package-info.java   | 8 +++-----
 9 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
index 954377c0e2..2b09c8a30d 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
@@ -121,8 +121,8 @@ public final class AspectJExpressionPointcutTests {
 
 	/**
 	 * This and target are equivalent. Really instanceof pointcuts.
-	 * @throws Exception
 	 * @param which this or target
+	 * @throws Exception
 	 * @throws NoSuchMethodException
 	 * @throws SecurityException
 	 */
@@ -367,4 +367,4 @@ class CallCountingInterceptor implements MethodInterceptor {
 		this.count = 0;
 	}
 
-}
\ No newline at end of file
+}
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 165252eecf..ccc3aa2c69 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
@@ -106,7 +106,7 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 		 * Validate the call and provide the expected return value
 		 * @param lastSig
 		 * @param args
-		 * @return
+		 * @return the return value
 		 */
 		public Object respond(String lastSig, Object[] args) {
 			Call call = nextCall();
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 be2cfdf297..f01cc9b303 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
@@ -630,8 +630,8 @@ public class BeanFactoryGenericsTests {
 	 * public static <T> T createMock(Class<T> toMock)
 	 * }</pre>
 	 *
+	 * See SPR-9493
 	 * @since 3.2
-	 * @see SPR-9493
 	 */
 	@Test
 	public void parameterizedFactoryMethod() {
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
index da11f8e521..d9efd0760d 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
@@ -81,16 +81,16 @@ public abstract class AbstractStatelessSessionBean extends AbstractSessionBean {
 
 
 	/**
-	 * @see javax.ejb.SessionBean#ejbActivate(). This method always throws an exception, as
-	 * it should not be invoked by the EJB container.
+	 * This method always throws an exception, as it should not be invoked by the EJB container.
+	 * @see javax.ejb.SessionBean#ejbActivate()
 	 */
 	public void ejbActivate() throws EJBException {
 		throw new IllegalStateException("ejbActivate must not be invoked on a stateless session bean");
 	}
 
 	/**
-	 * @see javax.ejb.SessionBean#ejbPassivate(). This method always throws an exception, as
-	 * it should not be invoked by the EJB container.
+	 * This method always throws an exception, as it should not be invoked by the EJB container.
+	 * @see javax.ejb.SessionBean#ejbPassivate()
 	 */
 	public void ejbPassivate() throws EJBException {
 		throw new IllegalStateException("ejbPassivate must not be invoked on a stateless session bean");
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
index 478a68aafd..185075670f 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
@@ -41,7 +41,7 @@ import test.mixin.Lockable;
 /**
  * Tests for auto proxy creation by advisor recognition.
  *
- * @see org.springframework.aop.framework.autoproxy.AdvisorAutoProxyCreatorIntegrationTests;
+ * @see org.springframework.aop.framework.autoproxy.AdvisorAutoProxyCreatorIntegrationTests
  *
  * @author Rod Johnson
  * @author Dave Syer
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 a0347acd5a..aee71bf709 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-2011 the original author or authors.
+ * 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.
@@ -102,8 +102,8 @@ public interface Environment extends PropertyResolver {
 	 * 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, {@code env.acceptsProfiles("p1", "!p2")} will return true if profile 'p1'
-	 * is active or 'p2' is not active.
+	 * example, <pre>env.acceptsProfiles("p1", "!p2")</pre> will return 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
 	 * @see #getActiveProfiles
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
index b33aa545ff..863f91ba0e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
@@ -36,7 +36,7 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
  * float, Float, double, Double, BigDecimal, <code>java.util.Date</code>, etc.
  *
  * <p>The mapper can be configured to use the primitives default value when mapping null values
- * by setting the {@link #setPrimitivesDefaultedForNullValue 'primitivesDefaultedForNullValue'}
+ * by setting the '{@link #setPrimitivesDefaultedForNullValue primitivesDefaultedForNullValue}'
  * flag to 'true'.
  *
  * <p>To facilitate mapping between columns and fields that don't have matching names,
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
index e5dd4b0712..4645558cd4 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
@@ -251,7 +251,7 @@ public class DatabasePopulatorTests {
 	}
 
 	/**
-	 * @see SPR-9457
+	 * See SPR-9457
 	 */
 	@Test
 	public void usesBoundConnectionIfAvailable() throws SQLException {
@@ -269,7 +269,7 @@ public class DatabasePopulatorTests {
 	}
 
 	/**
-	 * @see SPR-9781
+	 * See SPR-9781
 	 */
 	@Test(timeout = 1000)
 	public void executesHugeScriptInReasonableTime() throws SQLException {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java
index d266fe365d..46c680b5ad 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java
@@ -1,9 +1,7 @@
-
 /**
- * MVC infrastructure for annotation-based handler method processing,
- * building on the <code>org.springframework.web.method.annotation</code> package.
- * Entry points are {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping}
+ * MVC infrastructure for annotation-based handler method processing, building on the
+ * {@code org.springframework.web.method.annotation} package. Entry points are
+ * {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping}
  * and {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter}.
  */
 package org.springframework.web.servlet.mvc.method.annotation;
-

From 9540d2c81b93b9062faf79d4df998525f3dedb7c Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Tue, 18 Dec 2012 14:45:36 +0100
Subject: [PATCH 18/36] Replace <code> with {@code} throughout Javadoc

Issue: SPR-10128
---
 .../java/org/springframework/aop/Advisor.java |   2 +-
 .../aop/AfterReturningAdvice.java             |   2 +-
 .../aop/IntroductionAwareMethodMatcher.java   |   6 +-
 .../aop/MethodBeforeAdvice.java               |   2 +-
 .../springframework/aop/MethodMatcher.java    |  22 +--
 .../org/springframework/aop/Pointcut.java     |   4 +-
 .../aop/ProxyMethodInvocation.java            |  16 +-
 .../springframework/aop/TargetClassAware.java |   2 +-
 .../org/springframework/aop/TargetSource.java |  12 +-
 .../springframework/aop/TrueClassFilter.java  |   2 +-
 .../aop/TrueMethodMatcher.java                |   2 +-
 .../org/springframework/aop/TruePointcut.java |   2 +-
 .../aop/aspectj/AbstractAspectJAdvice.java    |   4 +-
 .../aop/aspectj/AspectInstanceFactory.java    |   4 +-
 .../AspectJAdviceParameterNameDiscoverer.java |  92 ++++-----
 .../aop/aspectj/AspectJAopUtils.java          |   6 +-
 .../aspectj/AspectJExpressionPointcut.java    |  10 +-
 .../aop/aspectj/AspectJProxyUtils.java        |   2 +-
 .../aspectj/AspectJWeaverMessageHandler.java  |   2 +-
 .../MethodInvocationProceedingJoinPoint.java  |  12 +-
 .../aop/aspectj/RuntimeTestWalker.java        |   2 +-
 .../aspectj/SimpleAspectInstanceFactory.java  |   4 +-
 .../SingletonAspectInstanceFactory.java       |   2 +-
 .../aop/aspectj/TypePatternClassFilter.java   |  12 +-
 ...nnotationAwareAspectJAutoProxyCreator.java |   2 +-
 .../annotation/AspectJAdvisorFactory.java     |   6 +-
 .../annotation/AspectJProxyFactory.java       |   2 +-
 .../aspectj/annotation/AspectMetadata.java    |   4 +-
 ...ntiationModelAwarePointcutAdvisorImpl.java |   2 +-
 .../ReflectiveAspectJAdvisorFactory.java      |   2 +-
 ...pleMetadataAwareAspectInstanceFactory.java |   2 +-
 ...tonMetadataAwareAspectInstanceFactory.java |   2 +-
 .../AspectJPrecedenceComparator.java          |  10 +-
 .../aop/aspectj/package-info.java             |   3 +-
 ...erceptorDrivenBeanDefinitionDecorator.java |   6 +-
 .../config/AdvisorComponentDefinition.java    |   2 +-
 .../aop/config/AopConfigUtils.java            |   2 +-
 .../aop/config/AopNamespaceHandler.java       |  16 +-
 .../aop/config/AopNamespaceUtils.java         |   6 +-
 .../AspectJAutoProxyBeanDefinitionParser.java |   2 +-
 .../config/ConfigBeanDefinitionParser.java    |  28 +--
 .../ScopedProxyBeanDefinitionDecorator.java   |   2 +-
 .../AbstractAdvisingBeanPostProcessor.java    |   2 +-
 .../aop/framework/Advised.java                |  22 +--
 .../aop/framework/AdvisedSupport.java         |   4 +-
 .../aop/framework/AopContext.java             |  14 +-
 .../aop/framework/AopProxy.java               |  10 +-
 .../aop/framework/AopProxyUtils.java          |   6 +-
 .../aop/framework/CglibAopProxy.java          |  18 +-
 .../aop/framework/JdkDynamicAopProxy.java     |   2 +-
 .../aop/framework/ProxyConfig.java            |   2 +-
 .../aop/framework/ProxyCreatorSupport.java    |   2 +-
 .../aop/framework/ProxyFactory.java           |  10 +-
 .../aop/framework/ProxyFactoryBean.java       |   6 +-
 .../framework/ReflectiveMethodInvocation.java |   2 +-
 .../aop/framework/adapter/AdvisorAdapter.java |   2 +-
 .../adapter/AdvisorAdapterRegistry.java       |   2 +-
 .../adapter/ThrowsAdviceInterceptor.java      |   4 +-
 .../AbstractAdvisorAutoProxyCreator.java      |   2 +-
 .../autoproxy/AbstractAutoProxyCreator.java   |  16 +-
 .../framework/autoproxy/AutoProxyUtils.java   |   2 +-
 .../BeanFactoryAdvisorRetrievalHelper.java    |   2 +-
 .../DefaultAdvisorAutoProxyCreator.java       |   4 +-
 .../autoproxy/ProxyCreationContext.java       |   4 +-
 .../autoproxy/TargetSourceCreator.java        |   2 +-
 ...ctBeanFactoryBasedTargetSourceCreator.java |   8 +-
 .../AbstractMonitoringInterceptor.java        |   6 +-
 .../interceptor/AbstractTraceInterceptor.java |  64 +++----
 .../AsyncExecutionInterceptor.java            |   8 +-
 .../CustomizableTraceInterceptor.java         | 146 +++++++-------
 .../aop/interceptor/DebugInterceptor.java     |   6 +-
 .../interceptor/ExposeBeanNameAdvisors.java   |   6 +-
 .../ExposeInvocationInterceptor.java          |   2 +-
 .../PerformanceMonitorInterceptor.java        |   4 +-
 .../interceptor/SimpleTraceInterceptor.java   |   4 +-
 .../support/AbstractExpressionPointcut.java   |   2 +-
 .../support/AbstractRegexpMethodPointcut.java |  12 +-
 .../springframework/aop/support/AopUtils.java |  14 +-
 .../aop/support/ComposablePointcut.java       |  12 +-
 .../DefaultBeanFactoryPointcutAdvisor.java    |   2 +-
 .../support/DefaultIntroductionAdvisor.java   |   2 +-
 .../aop/support/DefaultPointcutAdvisor.java   |   6 +-
 ...erTargetObjectIntroductionInterceptor.java |   2 +-
 .../DelegatingIntroductionInterceptor.java    |   2 +-
 .../aop/support/JdkRegexpMethodPointcut.java  |  20 +-
 .../aop/support/MethodMatchers.java           |   6 +-
 .../aop/support/NameMatchMethodPointcut.java  |   2 +-
 .../NameMatchMethodPointcutAdvisor.java       |   2 +-
 .../support/RegexpMethodPointcutAdvisor.java  |   2 +-
 .../AnnotationMatchingPointcut.java           |   4 +-
 .../AbstractBeanFactoryBasedTargetSource.java |   6 +-
 .../AbstractLazyCreationTargetSource.java     |   8 +-
 .../target/AbstractPoolingTargetSource.java   |   2 +-
 .../AbstractPrototypeBasedTargetSource.java   |   4 +-
 .../aop/target/CommonsPoolTargetSource.java   |  26 +--
 .../aop/target/EmptyTargetSource.java         |  16 +-
 .../aop/target/LazyInitTargetSource.java      |   4 +-
 .../aop/target/ThreadLocalTargetSource.java   |   2 +-
 .../AbstractRefreshableTargetSource.java      |   6 +-
 .../BeanFactoryRefreshableTargetSource.java   |   2 +-
 .../AspectJPrecedenceComparatorTests.java     |  23 ---
 .../aspectj/AbstractBeanConfigurerAspect.aj   |   2 +-
 ...nterfaceDrivenDependencyInjectionAspect.aj |  24 +--
 .../aspectj/AnnotationBeanConfigurerAspect.aj |   2 +-
 ...nterfaceDrivenDependencyInjectionAspect.aj |   2 +-
 ...otationDrivenStaticEntityMockingControl.aj |   2 +-
 .../aspectj/AbstractTransactionAspect.aj      |   2 +-
 .../beans/BeanMetadataAttribute.java          |   4 +-
 .../beans/BeanMetadataAttributeAccessor.java  |   4 +-
 .../beans/BeanMetadataElement.java            |   4 +-
 .../org/springframework/beans/BeanUtils.java  |  64 +++----
 .../springframework/beans/BeanWrapper.java    |   4 +-
 .../beans/BeanWrapperImpl.java                |  16 +-
 .../beans/CachedIntrospectionResults.java     |   2 +-
 .../ConversionNotSupportedException.java      |  10 +-
 .../GenericTypeAwarePropertyDescriptor.java   |   2 +-
 .../org/springframework/beans/Mergeable.java  |   4 +-
 .../beans/MutablePropertyValues.java          |  12 +-
 .../beans/PropertyAccessException.java        |   2 +-
 .../beans/PropertyAccessor.java               |   8 +-
 .../beans/PropertyAccessorUtils.java          |   4 +-
 .../beans/PropertyBatchUpdateException.java   |   4 +-
 .../beans/PropertyEditorRegistrar.java        |  10 +-
 .../beans/PropertyEditorRegistry.java         |  14 +-
 .../beans/PropertyEditorRegistrySupport.java  |  20 +-
 .../beans/PropertyMatches.java                |   2 +-
 .../springframework/beans/PropertyValue.java  |  10 +-
 .../springframework/beans/PropertyValues.java |   6 +-
 .../springframework/beans/TypeConverter.java  |  16 +-
 .../beans/TypeConverterDelegate.java          |  24 +--
 .../beans/TypeMismatchException.java          |  16 +-
 .../beans/annotation/AnnotationBeanUtils.java |   6 +-
 .../beans/factory/BeanClassLoaderAware.java   |  10 +-
 .../beans/factory/BeanCreationException.java  |   2 +-
 .../factory/BeanDefinitionStoreException.java |   6 +-
 .../beans/factory/BeanFactory.java            |  42 ++--
 .../beans/factory/BeanFactoryAware.java       |   2 +-
 .../beans/factory/BeanFactoryUtils.java       |  10 +-
 .../beans/factory/FactoryBean.java            |  18 +-
 .../FactoryBeanNotInitializedException.java   |   2 +-
 .../factory/HierarchicalBeanFactory.java      |   8 +-
 .../beans/factory/ListableBeanFactory.java    |  46 ++---
 .../beans/factory/ObjectFactory.java          |   4 +-
 .../beans/factory/SmartFactoryBean.java       |   8 +-
 .../factory/access/BeanFactoryLocator.java    |  24 +--
 .../factory/access/BeanFactoryReference.java  |  10 +-
 .../access/SingletonBeanFactoryLocator.java   |  24 +--
 .../access/el/SpringBeanELResolver.java       |   4 +-
 .../annotation/AnnotatedBeanDefinition.java   |   2 +-
 .../beans/factory/annotation/Autowired.java   |   2 +-
 .../AutowiredAnnotationBeanPostProcessor.java |  10 +-
 .../factory/annotation/Configurable.java      |   2 +-
 .../RequiredAnnotationBeanPostProcessor.java  |  10 +-
 .../factory/config/AbstractFactoryBean.java   |   8 +-
 .../config/AutowireCapableBeanFactory.java    |  18 +-
 .../beans/factory/config/BeanDefinition.java  |  24 +--
 .../factory/config/BeanDefinitionHolder.java  |   6 +-
 .../factory/config/BeanPostProcessor.java     |  10 +-
 .../beans/factory/config/BeanReference.java   |   2 +-
 .../config/BeanReferenceFactoryBean.java      |   2 +-
 .../config/ConfigurableBeanFactory.java       |  12 +-
 .../ConfigurableListableBeanFactory.java      |   2 +-
 .../config/ConstructorArgumentValues.java     |  38 ++--
 .../config/CustomEditorConfigurer.java        |   4 +-
 .../factory/config/DependencyDescriptor.java  |  14 +-
 .../DestructionAwareBeanPostProcessor.java    |   2 +-
 .../InstantiationAwareBeanPostProcessor.java  |  12 +-
 .../beans/factory/config/ListFactoryBean.java |   2 +-
 .../config/MethodInvokingFactoryBean.java     |   2 +-
 .../ObjectFactoryCreatingFactoryBean.java     |   2 +-
 .../PreferencesPlaceholderConfigurer.java     |   4 +-
 .../config/PropertyOverrideConfigurer.java    |   2 +-
 .../config/PropertyPlaceholderConfigurer.java |  12 +-
 .../config/ProviderCreatingFactoryBean.java   |   4 +-
 .../config/RuntimeBeanNameReference.java      |   2 +-
 .../factory/config/RuntimeBeanReference.java  |   2 +-
 .../beans/factory/config/Scope.java           |  24 +--
 .../config/ServiceLocatorFactoryBean.java     |  26 +--
 .../factory/config/SingletonBeanRegistry.java |  16 +-
 ...rtInstantiationAwareBeanPostProcessor.java |   6 +-
 .../factory/config/TypedStringValue.java      |   2 +-
 .../factory/parsing/AliasDefinition.java      |   2 +-
 .../parsing/BeanComponentDefinition.java      |   2 +-
 .../factory/parsing/ComponentDefinition.java  |  22 +--
 .../parsing/ConstructorArgumentEntry.java     |   4 +-
 .../parsing/FailFastProblemReporter.java      |   4 +-
 .../factory/parsing/ImportDefinition.java     |   4 +-
 .../beans/factory/parsing/Location.java       |   6 +-
 .../factory/parsing/NullSourceExtractor.java  |   4 +-
 .../beans/factory/parsing/ParseState.java     |  10 +-
 .../parsing/PassThroughSourceExtractor.java   |   4 +-
 .../beans/factory/parsing/Problem.java        |   8 +-
 .../factory/parsing/ProblemReporter.java      |   6 +-
 .../beans/factory/parsing/PropertyEntry.java  |   2 +-
 .../factory/parsing/SourceExtractor.java      |   6 +-
 .../AbstractAutowireCapableBeanFactory.java   |  42 ++--
 .../support/AbstractBeanDefinition.java       |  42 ++--
 .../support/AbstractBeanDefinitionReader.java |   8 +-
 .../factory/support/AbstractBeanFactory.java  |  34 ++--
 .../support/AutowireCandidateQualifier.java   |   4 +-
 .../support/AutowireCandidateResolver.java    |   2 +-
 .../support/BeanDefinitionBuilder.java        |  24 +--
 .../support/BeanDefinitionDefaults.java       |   2 +-
 .../factory/support/BeanDefinitionReader.java |  34 ++--
 .../support/BeanDefinitionReaderUtils.java    |   2 +-
 .../support/BeanDefinitionRegistry.java       |   2 +-
 .../support/BeanDefinitionValueResolver.java  |   4 +-
 ...CglibSubclassingInstantiationStrategy.java |   4 +-
 .../factory/support/ConstructorResolver.java  |   6 +-
 .../support/DefaultListableBeanFactory.java   |  10 +-
 .../support/DefaultSingletonBeanRegistry.java |   4 +-
 .../support/DisposableBeanAdapter.java        |   2 +-
 .../support/FactoryBeanRegistrySupport.java   |   4 +-
 .../support/GenericBeanDefinition.java        |   6 +-
 .../support/InstantiationStrategy.java        |   8 +-
 .../beans/factory/support/ManagedList.java    |   2 +-
 .../beans/factory/support/ManagedMap.java     |   2 +-
 .../factory/support/ManagedProperties.java    |   2 +-
 .../beans/factory/support/ManagedSet.java     |   2 +-
 .../beans/factory/support/MethodOverride.java |   2 +-
 .../factory/support/MethodOverrides.java      |   2 +-
 .../PropertiesBeanDefinitionReader.java       |  24 +--
 .../factory/support/RootBeanDefinition.java   |   2 +-
 .../SimpleSecurityContextProvider.java        |   6 +-
 .../beans/factory/support/package-info.java   |   5 +-
 .../factory/wiring/BeanConfigurerSupport.java |   6 +-
 .../beans/factory/wiring/BeanWiringInfo.java  |   8 +-
 .../wiring/BeanWiringInfoResolver.java        |   2 +-
 .../xml/AbstractBeanDefinitionParser.java     |  14 +-
 .../AbstractSimpleBeanDefinitionParser.java   |  32 ++--
 .../AbstractSingleBeanDefinitionParser.java   |  28 +--
 .../factory/xml/BeanDefinitionDecorator.java  |   8 +-
 .../xml/BeanDefinitionDocumentReader.java     |   2 +-
 .../xml/BeanDefinitionParserDelegate.java     |  16 +-
 .../DefaultBeanDefinitionDocumentReader.java  |   2 +-
 .../xml/DefaultNamespaceHandlerResolver.java  |  14 +-
 .../factory/xml/DelegatingEntityResolver.java |   2 +-
 .../xml/DocumentDefaultsDefinition.java       |   6 +-
 .../beans/factory/xml/DocumentLoader.java     |   2 +-
 .../beans/factory/xml/NamespaceHandler.java   |  16 +-
 .../factory/xml/NamespaceHandlerResolver.java |   2 +-
 .../factory/xml/PluggableSchemaResolver.java  |  12 +-
 .../SimpleConstructorNamespaceHandler.java    |  12 +-
 .../xml/SimplePropertyNamespaceHandler.java   |  12 +-
 .../factory/xml/UtilNamespaceHandler.java     |   2 +-
 .../factory/xml/XmlBeanDefinitionReader.java  |  14 +-
 .../beans/factory/xml/package-info.java       |   3 +-
 .../propertyeditors/CharacterEditor.java      |  14 +-
 .../beans/propertyeditors/CharsetEditor.java  |   4 +-
 .../propertyeditors/ClassArrayEditor.java     |  18 +-
 .../beans/propertyeditors/ClassEditor.java    |   8 +-
 .../beans/propertyeditors/CurrencyEditor.java |   2 +-
 .../propertyeditors/CustomBooleanEditor.java  |   4 +-
 .../CustomCollectionEditor.java               |   6 +-
 .../propertyeditors/CustomDateEditor.java     |  10 +-
 .../propertyeditors/CustomMapEditor.java      |   6 +-
 .../propertyeditors/CustomNumberEditor.java   |  14 +-
 .../beans/propertyeditors/FileEditor.java     |   2 +-
 .../propertyeditors/InputSourceEditor.java    |   6 +-
 .../propertyeditors/InputStreamEditor.java    |   4 +-
 .../beans/propertyeditors/LocaleEditor.java   |   4 +-
 .../beans/propertyeditors/PatternEditor.java  |   6 +-
 .../propertyeditors/PropertiesEditor.java     |  10 +-
 .../StringArrayPropertyEditor.java            |  20 +-
 .../propertyeditors/StringTrimmerEditor.java  |  10 +-
 .../beans/propertyeditors/TimeZoneEditor.java |   4 +-
 .../beans/propertyeditors/URIEditor.java      |   6 +-
 .../beans/propertyeditors/URLEditor.java      |   2 +-
 .../beans/propertyeditors/UUIDEditor.java     |   2 +-
 .../ArgumentConvertingMethodInvoker.java      |   2 +-
 .../beans/support/MutableSortDefinition.java  |   2 +-
 .../beans/support/PagedListHolder.java        |   8 +-
 .../support/ResourceEditorRegistrar.java      |   2 +-
 .../DefaultListableBeanFactoryTests.java      |   2 +-
 .../cache/ehcache/EhCacheFactoryBean.java     |   2 +-
 .../cache/jcache/JCacheCache.java             |   4 +-
 .../mail/SimpleMailMessage.java               |  14 +-
 .../javamail/ConfigurableMimeFileTypeMap.java |  36 ++--
 .../mail/javamail/InternetAddressEditor.java  |   2 +-
 .../mail/javamail/JavaMailSender.java         |   4 +-
 .../mail/javamail/JavaMailSenderImpl.java     |  48 ++---
 .../mail/javamail/MimeMessageHelper.java      |  64 +++----
 .../mail/javamail/MimeMessagePreparator.java  |   2 +-
 .../mail/javamail/SmartMimeMessage.java       |   8 +-
 .../commonj/ScheduledTimerListener.java       |   4 +-
 .../commonj/TimerManagerAccessor.java         |   4 +-
 .../scheduling/quartz/CronTriggerBean.java    |   6 +-
 .../quartz/CronTriggerFactoryBean.java        |  10 +-
 .../quartz/JobDetailAwareTrigger.java         |   2 +-
 .../scheduling/quartz/JobDetailBean.java      |   4 +-
 .../quartz/JobDetailFactoryBean.java          |   2 +-
 .../quartz/LocalTaskExecutorThreadPool.java   |   4 +-
 .../scheduling/quartz/QuartzJobBean.java      |   2 +-
 .../scheduling/quartz/SchedulerAccessor.java  |   8 +-
 .../quartz/SchedulerFactoryBean.java          |   6 +-
 .../scheduling/quartz/SimpleTriggerBean.java  |   6 +-
 .../quartz/SimpleTriggerFactoryBean.java      |  10 +-
 .../quartz/SpringBeanJobFactory.java          |   2 +-
 .../FreeMarkerConfigurationFactory.java       |  24 +--
 .../ui/jasperreports/JasperReportsUtils.java  | 108 +++++------
 .../ui/velocity/CommonsLoggingLogSystem.java  |   6 +-
 .../ui/velocity/SpringResourceLoader.java     |   6 +-
 .../ui/velocity/VelocityEngineFactory.java    |  10 +-
 .../java/org/springframework/cache/Cache.java |   4 +-
 .../cache/concurrent/ConcurrentMapCache.java  |   6 +-
 .../cache/support/SimpleValueWrapper.java     |   2 +-
 .../context/ApplicationContext.java           |  12 +-
 .../context/ApplicationContextAware.java      |   2 +-
 .../context/ApplicationContextException.java  |   4 +-
 .../context/ApplicationEvent.java             |   2 +-
 .../context/ApplicationListener.java          |   2 +-
 .../ConfigurableApplicationContext.java       |   4 +-
 .../context/HierarchicalMessageSource.java    |   4 +-
 .../springframework/context/Lifecycle.java    |   2 +-
 .../context/MessageSource.java                |  10 +-
 .../context/MessageSourceResolvable.java      |   2 +-
 .../context/ResourceLoaderAware.java          |  10 +-
 .../access/ContextBeanFactoryReference.java   |   4 +-
 .../access/ContextJndiBeanFactoryLocator.java |   6 +-
 .../ContextSingletonBeanFactoryLocator.java   |   4 +-
 .../AnnotationBeanNameGenerator.java          |   8 +-
 .../annotation/AnnotationConfigUtils.java     |   2 +-
 .../AnnotationScopeMetadataResolver.java      |   4 +-
 .../context/annotation/Bean.java              |   2 +-
 .../ClassPathBeanDefinitionScanner.java       |   4 +-
 .../CommonAnnotationBeanPostProcessor.java    |  40 ++--
 .../annotation/ScopeMetadataResolver.java     |   8 +-
 .../config/ContextNamespaceHandler.java       |   2 +-
 .../event/ApplicationContextEvent.java        |   8 +-
 .../context/event/ContextClosedEvent.java     |   6 +-
 .../context/event/ContextRefreshedEvent.java  |   6 +-
 .../context/event/ContextStartedEvent.java    |   6 +-
 .../context/event/ContextStoppedEvent.java    |   6 +-
 .../event/EventPublicationInterceptor.java    |  12 +-
 .../SimpleApplicationEventMulticaster.java    |   2 +-
 .../context/expression/MapAccessor.java       |   2 +-
 .../context/i18n/LocaleContextHolder.java     |  14 +-
 .../context/i18n/SimpleLocaleContext.java     |   4 +-
 .../support/AbstractApplicationContext.java   |  28 +--
 .../support/AbstractMessageSource.java        |  18 +-
 ...ctRefreshableConfigApplicationContext.java |   6 +-
 .../AbstractXmlApplicationContext.java        |   6 +-
 .../support/ApplicationObjectSupport.java     |   4 +-
 .../support/ContextTypeMatchClassLoader.java  |   2 +-
 .../DefaultMessageSourceResolvable.java       |   2 +-
 .../support/GenericApplicationContext.java    |   4 +-
 .../support/GenericXmlApplicationContext.java |   2 +-
 .../support/MessageSourceAccessor.java        |   8 +-
 .../support/MessageSourceResourceBundle.java  |   6 +-
 .../context/support/MessageSourceSupport.java |   8 +-
 ...ReloadableResourceBundleMessageSource.java |   8 +-
 .../support/ResourceBundleMessageSource.java  |  22 +--
 .../context/support/SimpleThreadScope.java    |   4 +-
 .../weaving/DefaultContextLoadTimeWeaver.java |   6 +-
 .../context/weaving/LoadTimeWeaverAware.java  |   4 +-
 .../weaving/LoadTimeWeaverAwareProcessor.java |  16 +-
 .../AbstractRemoteSlsbInvokerInterceptor.java |   6 +-
 .../AbstractSlsbInvokerInterceptor.java       |   2 +-
 .../ejb/config/JeeNamespaceHandler.java       |   2 +-
 .../JndiLookupBeanDefinitionParser.java       |   2 +-
 ...lStatelessSessionBeanDefinitionParser.java |   2 +-
 ...eStatelessSessionBeanDefinitionParser.java |   2 +-
 .../SpringBeanAutowiringInterceptor.java      |  18 +-
 .../ejb/interceptor/package-info.java         |   3 +-
 .../ejb/support/AbstractEnterpriseBean.java   |  24 +--
 .../support/AbstractJmsMessageDrivenBean.java |   4 +-
 .../support/AbstractMessageDrivenBean.java    |  16 +-
 .../support/AbstractStatefulSessionBean.java  |  32 ++--
 .../support/AbstractStatelessSessionBean.java |  16 +-
 .../ejb/support/package-info.java             |   7 +-
 .../format/AnnotationFormatterFactory.java    |  12 +-
 .../format/FormatterRegistry.java             |  14 +-
 .../format/annotation/DateTimeFormat.java     |  12 +-
 .../format/annotation/NumberFormat.java       |   4 +-
 .../format/datetime/joda/JodaTimeContext.java |   4 +-
 .../datetime/joda/JodaTimeContextHolder.java  |   6 +-
 .../format/datetime/package-info.java         |   2 +-
 .../number/AbstractNumberFormatter.java       |   2 +-
 .../format/number/package-info.java           |   2 +-
 ...ormattingConversionServiceFactoryBean.java |   2 +-
 .../InstrumentationLoadTimeWeaver.java        |   4 +-
 .../classloading/LoadTimeWeaver.java          |  22 +--
 .../ReflectiveLoadTimeWeaver.java             |   8 +-
 .../SimpleInstrumentableClassLoader.java      |  16 +-
 .../classloading/SimpleLoadTimeWeaver.java    |  16 +-
 .../glassfish/GlassFishLoadTimeWeaver.java    |  10 +-
 .../jboss/JBossLoadTimeWeaver.java            |   4 +-
 .../jboss/JBossMCTranslatorAdapter.java       |   2 +-
 .../oc4j/OC4JClassPreprocessorAdapter.java    |   2 +-
 .../classloading/oc4j/OC4JLoadTimeWeaver.java |   2 +-
 .../WebLogicClassPreProcessorAdapter.java     |   2 +-
 .../weblogic/WebLogicLoadTimeWeaver.java      |   4 +-
 .../WebSphereClassPreDefinePlugin.java        |   2 +-
 .../websphere/WebSphereLoadTimeWeaver.java    |   4 +-
 .../jmx/MBeanServerNotFoundException.java     |   6 +-
 .../jmx/access/ConnectorDelegate.java         |  10 +-
 .../access/InvalidInvocationException.java    |   2 +-
 .../access/InvocationFailureException.java    |   4 +-
 .../jmx/access/MBeanClientInterceptor.java    |  46 ++---
 .../access/MBeanConnectFailureException.java  |   2 +-
 .../access/MBeanInfoRetrievalException.java   |   4 +-
 .../jmx/access/MBeanProxyFactoryBean.java     |   4 +-
 .../access/NotificationListenerRegistrar.java |  12 +-
 .../jmx/export/MBeanExportException.java      |   4 +-
 .../jmx/export/MBeanExporter.java             | 142 +++++++-------
 .../jmx/export/MBeanExporterListener.java     |   4 +-
 .../UnableToRegisterMBeanException.java       |   4 +-
 .../AnnotationJmxAttributeSource.java         |   2 +-
 .../annotation/ManagedOperationParameter.java |   4 +-
 .../ManagedOperationParameters.java           |   2 +-
 .../export/annotation/ManagedResource.java    |   2 +-
 .../assembler/AbstractMBeanInfoAssembler.java |  30 +--
 .../AbstractReflectiveMBeanInfoAssembler.java |  98 +++++-----
 .../AutodetectCapableMBeanInfoAssembler.java  |   8 +-
 .../InterfaceBasedMBeanInfoAssembler.java     |  58 +++---
 .../export/assembler/MBeanInfoAssembler.java  |   2 +-
 .../assembler/MetadataMBeanInfoAssembler.java |  48 ++---
 .../MethodExclusionMBeanInfoAssembler.java    |  18 +-
 .../MethodNameBasedMBeanInfoAssembler.java    |  16 +-
 .../SimpleReflectiveMBeanInfoAssembler.java   |  10 +-
 .../metadata/InvalidMetadataException.java    |   4 +-
 .../export/metadata/JmxAttributeSource.java   |  44 ++---
 .../jmx/export/metadata/ManagedResource.java  |   2 +-
 .../export/naming/IdentityNamingStrategy.java |   6 +-
 .../jmx/export/naming/KeyNamingStrategy.java  |  34 ++--
 .../export/naming/MetadataNamingStrategy.java |  18 +-
 .../export/naming/ObjectNamingStrategy.java   |  14 +-
 .../jmx/export/naming/SelfNaming.java         |   4 +-
 .../ModelMBeanNotificationPublisher.java      |  10 +-
 .../notification/NotificationPublisher.java   |   6 +-
 .../support/ConnectorServerFactoryBean.java   |  48 ++---
 .../springframework/jmx/support/JmxUtils.java |  42 ++--
 .../jmx/support/MBeanRegistrationSupport.java |  12 +-
 .../MBeanServerConnectionFactoryBean.java     |  30 +--
 .../jmx/support/MBeanServerFactoryBean.java   |  56 +++---
 .../support/NotificationListenerHolder.java   |  14 +-
 .../jmx/support/ObjectNameManager.java        |  32 ++--
 .../WebSphereMBeanServerFactoryBean.java      |   4 +-
 .../jmx/support/package-info.java             |   5 +-
 .../springframework/jndi/JndiCallback.java    |   2 +-
 .../jndi/JndiLocatorDelegate.java             |   6 +-
 .../jndi/JndiObjectTargetSource.java          |   6 +-
 .../springframework/jndi/JndiTemplate.java    |  14 +-
 .../jndi/support/SimpleJndiBeanFactory.java   |   2 +-
 .../rmi/CodebaseAwareObjectInputStream.java   |   4 +-
 .../rmi/JndiRmiClientInterceptor.java         |   2 +-
 .../remoting/rmi/JndiRmiProxyFactoryBean.java |   2 +-
 .../remoting/rmi/JndiRmiServiceExporter.java  |   4 +-
 .../RemoteInvocationSerializingExporter.java  |   4 +-
 .../remoting/rmi/RmiBasedExporter.java        |   2 +-
 .../remoting/rmi/RmiClientInterceptor.java    |  10 +-
 .../rmi/RmiClientInterceptorUtils.java        |   4 +-
 .../remoting/rmi/RmiInvocationHandler.java    |   2 +-
 .../remoting/rmi/RmiProxyFactoryBean.java     |   4 +-
 .../remoting/rmi/RmiRegistryFactoryBean.java  |  12 +-
 .../remoting/rmi/RmiServiceExporter.java      |  24 +--
 .../remoting/soap/SoapFaultException.java     |   2 +-
 .../remoting/support/RemoteAccessor.java      |   2 +-
 .../remoting/support/RemoteExporter.java      |   2 +-
 .../remoting/support/RemoteInvocation.java    |   4 +-
 .../RemoteInvocationBasedAccessor.java        |   2 +-
 .../support/RemoteInvocationResult.java       |   4 +-
 .../support/RemoteInvocationUtils.java        |   6 +-
 .../remoting/support/RemotingSupport.java     |   4 +-
 .../scheduling/SchedulingAwareRunnable.java   |   2 +-
 .../scheduling/SchedulingTaskExecutor.java    |  12 +-
 .../scheduling/TaskScheduler.java             |   6 +-
 .../springframework/scheduling/Trigger.java   |   2 +-
 .../scheduling/TriggerContext.java            |   6 +-
 .../annotation/AsyncAnnotationAdvisor.java    |   8 +-
 .../AsyncAnnotationBeanPostProcessor.java     |   4 +-
 .../scheduling/annotation/AsyncResult.java    |   4 +-
 .../scheduling/annotation/EnableAsync.java    |   2 +-
 .../ConcurrentTaskExecutor.java               |   2 +-
 .../ThreadPoolTaskExecutor.java               |  10 +-
 .../concurrent/ConcurrentTaskExecutor.java    |   4 +-
 .../concurrent/ConcurrentTaskScheduler.java   |   2 +-
 .../ExecutorConfigurationSupport.java         |   8 +-
 .../concurrent/ForkJoinPoolFactoryBean.java   |   8 +-
 .../concurrent/ScheduledExecutorTask.java     |   8 +-
 .../ThreadPoolExecutorFactoryBean.java        |   4 +-
 .../concurrent/ThreadPoolTaskExecutor.java    |   6 +-
 .../concurrent/ThreadPoolTaskScheduler.java   |   2 +-
 .../scheduling/concurrent/package-info.java   |   7 +-
 .../config/TaskNamespaceHandler.java          |   2 +-
 .../scheduling/support/PeriodicTrigger.java   |   2 +-
 .../scheduling/timer/DelegatingTimerTask.java |   6 +-
 .../MethodInvokingTimerTaskFactoryBean.java   |   4 +-
 .../scheduling/timer/ScheduledTimerTask.java  |   8 +-
 .../scheduling/timer/TimerFactoryBean.java    |   6 +-
 .../scheduling/timer/TimerTaskExecutor.java   |   6 +-
 .../scripting/ScriptCompilationException.java |   2 +-
 .../scripting/ScriptFactory.java              |  18 +-
 .../scripting/ScriptSource.java               |   4 +-
 .../scripting/bsh/BshScriptFactory.java       |   4 +-
 .../scripting/bsh/BshScriptUtils.java         |  12 +-
 .../config/LangNamespaceHandler.java          |   2 +-
 .../config/ScriptBeanDefinitionParser.java    |  16 +-
 .../groovy/GroovyObjectCustomizer.java        |   2 +-
 .../scripting/groovy/GroovyScriptFactory.java |   4 +-
 .../scripting/jruby/JRubyScriptUtils.java     |  10 +-
 .../RefreshableScriptTargetSource.java        |   2 +-
 .../support/ScriptFactoryPostProcessor.java   |  10 +-
 .../scripting/support/StaticScriptSource.java |   2 +-
 .../springframework/ui/ExtendedModelMap.java  |   2 +-
 .../java/org/springframework/ui/Model.java    |  22 +--
 .../java/org/springframework/ui/ModelMap.java |  26 +--
 .../ui/context/HierarchicalThemeSource.java   |   4 +-
 .../org/springframework/ui/context/Theme.java |   4 +-
 .../ui/context/ThemeSource.java               |   2 +-
 .../ui/context/package-info.java              |  13 +-
 .../support/ResourceBundleThemeSource.java    |   2 +-
 .../support/UiApplicationContextUtils.java    |   2 +-
 .../validation/AbstractBindingResult.java     |   4 +-
 .../AbstractPropertyBindingResult.java        |   2 +-
 .../validation/BeanPropertyBindingResult.java |   6 +-
 .../validation/BindingErrorProcessor.java     |  26 +--
 .../validation/BindingResult.java             |  12 +-
 .../validation/BindingResultUtils.java        |   4 +-
 .../validation/DataBinder.java                |  10 +-
 .../DefaultBindingErrorProcessor.java         |   4 +-
 .../DefaultMessageCodesResolver.java          |   2 +-
 .../springframework/validation/Errors.java    |  56 +++---
 .../validation/FieldError.java                |   2 +-
 .../validation/MessageCodesResolver.java      |   2 +-
 .../validation/ObjectError.java               |   2 +-
 .../validation/ValidationUtils.java           |  58 +++---
 .../springframework/validation/Validator.java |  26 +--
 .../validation/annotation/package-info.java   |   2 +-
 .../LocalValidatorFactoryBean.java            |   4 +-
 .../MethodValidationInterceptor.java          |   2 +-
 .../SpringValidatorAdapter.java               |   2 +-
 .../aop/framework/AbstractAopProxyTests.java  |   2 +-
 .../jmx/AbstractMBeanServerTests.java         |   6 +-
 .../mock/jndi/ExpectedLookupTemplate.java     |   2 +-
 .../mock/jndi/SimpleNamingContext.java        |   4 +-
 .../mock/jndi/SimpleNamingContextBuilder.java |  14 +-
 .../core/AttributeAccessor.java               |  16 +-
 .../core/BridgeMethodResolver.java            |  10 +-
 .../core/CollectionFactory.java               |   8 +-
 .../core/ConfigurableObjectInputStream.java   |   4 +-
 .../org/springframework/core/Constants.java   |  38 ++--
 .../org/springframework/core/Conventions.java |  38 ++--
 .../org/springframework/core/ErrorCoded.java  |   2 +-
 .../core/GenericCollectionTypeResolver.java   |  62 +++---
 .../core/GenericTypeResolver.java             |  12 +-
 .../core/InfrastructureProxy.java             |   2 +-
 .../org/springframework/core/JdkVersion.java  |  10 +-
 ...lVariableTableParameterNameDiscoverer.java |   2 +-
 .../springframework/core/MethodParameter.java |  20 +-
 .../core/NestedCheckedException.java          |  16 +-
 .../core/NestedIOException.java               |   4 +-
 .../core/NestedRuntimeException.java          |  16 +-
 .../springframework/core/OrderComparator.java |   6 +-
 .../org/springframework/core/Ordered.java     |   2 +-
 .../core/OverridingClassLoader.java           |  10 +-
 .../core/ParameterNameDiscoverer.java         |   8 +-
 .../PrioritizedParameterNameDiscoverer.java   |   6 +-
 .../core/SimpleAliasRegistry.java             |   2 +-
 .../core/SmartClassLoader.java                |   2 +-
 .../springframework/core/SpringVersion.java   |   4 +-
 .../AnnotationAwareOrderComparator.java       |   2 +-
 .../core/annotation/AnnotationUtils.java      |  62 +++---
 .../core/annotation/Order.java                |   2 +-
 .../core/convert/Property.java                |   8 +-
 .../core/convert/TypeDescriptor.java          |  42 ++--
 .../FallbackObjectToStringConverter.java      |   2 +-
 .../support/GenericConversionService.java     |   4 +-
 .../convert/support/IdToEntityConverter.java  |   2 +-
 .../support/ObjectToObjectConverter.java      |   2 +-
 .../enums/AbstractGenericLabeledEnum.java     |   2 +-
 .../core/enums/LabeledEnum.java               |  10 +-
 .../core/enums/LabeledEnumResolver.java       |  10 +-
 .../core/enums/LetterCodedLabeledEnum.java    |   4 +-
 .../core/enums/ShortCodedLabeledEnum.java     |   4 +-
 .../core/enums/StaticLabeledEnum.java         |   2 +-
 .../core/enums/StaticLabeledEnumResolver.java |   4 +-
 .../core/enums/StringCodedLabeledEnum.java    |   4 +-
 .../core/env/AbstractEnvironment.java         |   2 +-
 .../springframework/core/env/Environment.java |   2 +-
 .../core/io/AbstractResource.java             |   8 +-
 .../core/io/ByteArrayResource.java            |   2 +-
 .../core/io/ClassPathResource.java            |  10 +-
 .../core/io/ClassRelativeResourceLoader.java  |   4 +-
 .../core/io/DefaultResourceLoader.java        |   4 +-
 .../core/io/DescriptiveResource.java          |   2 +-
 .../core/io/FileSystemResource.java           |   2 +-
 .../core/io/InputStreamResource.java          |   6 +-
 .../core/io/InputStreamSource.java            |   6 +-
 .../org/springframework/core/io/Resource.java |  14 +-
 .../core/io/ResourceEditor.java               |  20 +-
 .../core/io/ResourceLoader.java               |   2 +-
 .../springframework/core/io/UrlResource.java  |   4 +-
 .../org/springframework/core/io/VfsUtils.java |   4 +-
 .../core/io/WritableResource.java             |   4 +-
 .../core/io/support/EncodedResource.java      |   6 +-
 .../io/support/LocalizedResourceHelper.java   |   4 +-
 .../PathMatchingResourcePatternResolver.java  |  68 +++----
 .../io/support/PropertiesLoaderSupport.java   |   2 +-
 .../io/support/PropertiesLoaderUtils.java     |   4 +-
 .../support/ResourceArrayPropertyEditor.java  |  10 +-
 .../core/io/support/ResourcePatternUtils.java |   4 +-
 .../support/SerializationFailedException.java |   4 +-
 .../core/style/DefaultToStringStyler.java     |   4 +-
 .../core/style/DefaultValueStyler.java        |   2 +-
 .../core/style/StylerUtils.java               |   2 +-
 .../core/style/ToStringCreator.java           |   4 +-
 .../core/style/ToStringStyler.java            |   6 +-
 .../core/task/AsyncTaskExecutor.java          |  10 +-
 .../core/task/SimpleAsyncTaskExecutor.java    |   6 +-
 .../core/task/SyncTaskExecutor.java           |   6 +-
 .../core/task/TaskExecutor.java               |   4 +-
 .../core/task/TaskRejectedException.java      |   6 +-
 .../core/task/TaskTimeoutException.java       |   6 +-
 .../task/support/ExecutorServiceAdapter.java  |  12 +-
 .../task/support/TaskExecutorAdapter.java     |   4 +-
 .../core/type/AnnotationMetadata.java         |   8 +-
 .../core/type/ClassMetadata.java              |   6 +-
 .../core/type/MethodMetadata.java             |   2 +-
 .../core/type/StandardClassMetadata.java      |   2 +-
 .../core/type/StandardMethodMetadata.java     |   2 +-
 .../classreading/MetadataReaderFactory.java   |   4 +-
 .../classreading/SimpleMetadataReader.java    |   2 +-
 .../type/filter/AnnotationTypeFilter.java     |   4 +-
 .../springframework/util/AntPathMatcher.java  |  50 ++---
 .../java/org/springframework/util/Assert.java |  80 ++++----
 .../util/AutoPopulatingList.java              |  14 +-
 .../util/CachingMapDecorator.java             |   8 +-
 .../org/springframework/util/ClassUtils.java  | 118 ++++++------
 .../springframework/util/CollectionUtils.java |  46 ++---
 .../util/CommonsLogWriter.java                |   2 +-
 .../util/ConcurrencyThrottleSupport.java      |   4 +-
 .../util/CustomizableThreadCreator.java       |   4 +-
 .../util/DefaultPropertiesPersister.java      |  12 +-
 .../springframework/util/FileSystemUtils.java |  14 +-
 .../util/LinkedCaseInsensitiveMap.java        |   2 +-
 .../springframework/util/Log4jConfigurer.java |   2 +-
 .../springframework/util/MethodInvoker.java   |  10 +-
 .../springframework/util/MultiValueMap.java   |   2 +-
 .../org/springframework/util/NumberUtils.java |  24 +--
 .../org/springframework/util/ObjectUtils.java | 146 +++++++-------
 .../org/springframework/util/PathMatcher.java |  30 +--
 .../util/PropertiesPersister.java             |   6 +-
 .../util/PropertyPlaceholderHelper.java       |  18 +-
 .../springframework/util/ReflectionUtils.java |  50 ++---
 .../springframework/util/ResourceUtils.java   |  24 +--
 .../org/springframework/util/StopWatch.java   |   4 +-
 .../org/springframework/util/StringUtils.java | 156 +++++++--------
 .../util/SystemPropertyUtils.java             |   4 +-
 .../util/comparator/BooleanComparator.java    |   4 +-
 .../util/comparator/NullSafeComparator.java   |  10 +-
 .../util/comparator/package-info.java         |   3 +-
 .../util/xml/AbstractStaxContentHandler.java  |   8 +-
 .../util/xml/AbstractStaxXMLReader.java       |  22 +--
 .../util/xml/AbstractXMLReader.java           |  14 +-
 .../util/xml/AbstractXMLStreamReader.java     |   2 +-
 .../util/xml/DomContentHandler.java           |   4 +-
 .../springframework/util/xml/DomUtils.java    |  30 +--
 .../util/xml/SimpleNamespaceContext.java      |   6 +-
 .../util/xml/SimpleSaxErrorHandler.java       |   2 +-
 .../xml/SimpleTransformErrorListener.java     |   2 +-
 .../util/xml/StaxEventContentHandler.java     |  14 +-
 .../util/xml/StaxEventXMLReader.java          |  12 +-
 .../springframework/util/xml/StaxResult.java  |  44 ++---
 .../springframework/util/xml/StaxSource.java  |  44 ++---
 .../util/xml/StaxStreamContentHandler.java    |   6 +-
 .../util/xml/StaxStreamXMLReader.java         |  12 +-
 .../springframework/util/xml/StaxUtils.java   |  10 +-
 .../util/xml/TransformerUtils.java            |   6 +-
 .../factory/annotation/TestAutowired.java     |   2 +-
 ...hMatchingResourcePatternResolverTests.java |   2 +-
 .../util/ResourceUtilsTests.java              |   2 +-
 .../xml/AbstractStaxXMLReaderTestCase.java    |   2 +-
 .../expression/BeanResolver.java              |   2 +-
 .../expression/ConstructorResolver.java       |   2 +-
 .../expression/MethodResolver.java            |   2 +-
 .../expression/TypedValue.java                |   2 +-
 .../common/CompositeStringExpression.java     |   2 +-
 .../spel/ast/OperatorInstanceof.java          |   2 +-
 .../TomcatInstrumentableClassLoader.java      |  20 +-
 .../InstrumentationSavingAgent.java           |   4 +-
 .../jdbc/BadSqlGrammarException.java          |   2 +-
 .../jdbc/InvalidResultSetAccessException.java |   2 +-
 .../jdbc/core/BeanPropertyRowMapper.java      |  10 +-
 .../jdbc/core/CallableStatementCallback.java  |   6 +-
 .../core/CallableStatementCreatorFactory.java |   4 +-
 .../jdbc/core/ColumnMapRowMapper.java         |   4 +-
 .../jdbc/core/ConnectionCallback.java         |   8 +-
 ...rruptibleBatchPreparedStatementSetter.java |  14 +-
 .../jdbc/core/JdbcOperations.java             | 100 +++++-----
 .../jdbc/core/JdbcTemplate.java               |  10 +-
 .../jdbc/core/ParameterMapper.java            |   2 +-
 .../jdbc/core/PreparedStatementCallback.java  |  10 +-
 .../core/PreparedStatementCreatorFactory.java |  12 +-
 .../jdbc/core/ResultSetExtractor.java         |   2 +-
 .../core/ResultSetSupportingSqlParameter.java |   2 +-
 .../jdbc/core/RowCallbackHandler.java         |   2 +-
 .../jdbc/core/RowCountCallbackHandler.java    |   2 +-
 .../springframework/jdbc/core/RowMapper.java  |   4 +-
 .../core/RowMapperResultSetExtractor.java     |   2 +-
 .../jdbc/core/SingleColumnRowMapper.java      |  28 +--
 .../jdbc/core/SqlInOutParameter.java          |   4 +-
 .../jdbc/core/SqlParameter.java               |  24 +--
 .../jdbc/core/SqlParameterValue.java          |   8 +-
 .../jdbc/core/SqlProvider.java                |   2 +-
 .../jdbc/core/SqlReturnResultSet.java         |   2 +-
 .../jdbc/core/SqlReturnType.java              |   4 +-
 .../jdbc/core/SqlReturnUpdateCount.java       |   6 +-
 .../core/SqlRowSetResultSetExtractor.java     |   8 +-
 .../jdbc/core/SqlTypeValue.java               |   6 +-
 .../jdbc/core/StatementCallback.java          |  10 +-
 .../jdbc/core/StatementCreatorUtils.java      |   8 +-
 .../AbstractSqlParameterSource.java           |   4 +-
 .../namedparam/MapSqlParameterSource.java     |   8 +-
 .../NamedParameterJdbcOperations.java         |  20 +-
 .../NamedParameterJdbcTemplate.java           |   2 +-
 .../core/namedparam/NamedParameterUtils.java  |   4 +-
 .../core/namedparam/SqlParameterSource.java   |   6 +-
 .../namedparam/SqlParameterSourceUtils.java   |   2 +-
 .../jdbc/core/namedparam/package-info.java    |   3 +-
 .../jdbc/core/simple/AbstractJdbcCall.java    |   8 +-
 .../jdbc/core/simple/AbstractJdbcInsert.java  |   2 +-
 .../ParameterizedBeanPropertyRowMapper.java   |   4 +-
 .../ParameterizedSingleColumnRowMapper.java   |   6 +-
 .../jdbc/core/simple/SimpleJdbcCall.java      |   4 +-
 .../core/simple/SimpleJdbcCallOperations.java |   6 +-
 .../jdbc/core/simple/SimpleJdbcInsert.java    |   4 +-
 .../core/simple/SimpleJdbcOperations.java     |  68 +++----
 .../jdbc/core/simple/package-info.java        |   9 +-
 ...rruptibleBatchPreparedStatementSetter.java |   4 +-
 ...tLobCreatingPreparedStatementCallback.java |   2 +-
 ...bstractLobStreamingResultSetExtractor.java |   6 +-
 .../core/support/AbstractSqlTypeValue.java    |   4 +-
 .../support/JdbcBeanDefinitionReader.java     |   2 +-
 .../jdbc/core/support/JdbcDaoSupport.java     |   2 +-
 .../jdbc/core/support/package-info.java       |   3 +-
 .../jdbc/datasource/AbstractDataSource.java   |   2 +-
 .../AbstractDriverBasedDataSource.java        |   4 +-
 .../jdbc/datasource/ConnectionHolder.java     |   6 +-
 .../jdbc/datasource/ConnectionProxy.java      |   2 +-
 .../DataSourceTransactionManager.java         |   2 +-
 .../jdbc/datasource/DataSourceUtils.java      |  10 +-
 .../datasource/DriverManagerDataSource.java   |   4 +-
 .../IsolationLevelDataSourceAdapter.java      |   6 +-
 .../datasource/SimpleDriverDataSource.java    |   2 +-
 .../SingleConnectionDataSource.java           |  12 +-
 .../jdbc/datasource/SmartDataSource.java      |   4 +-
 .../TransactionAwareDataSourceProxy.java      |   6 +-
 .../UserCredentialsDataSourceAdapter.java     |  14 +-
 .../WebSphereDataSourceAdapter.java           |  12 +-
 .../embedded/EmbeddedDatabaseBuilder.java     |   4 +-
 .../embedded/EmbeddedDatabaseFactory.java     |   2 +-
 .../lookup/AbstractRoutingDataSource.java     |   4 +-
 .../lookup/BeanFactoryDataSourceLookup.java   |   4 +-
 .../datasource/lookup/DataSourceLookup.java   |   4 +-
 .../lookup/MapDataSourceLookup.java           |   4 +-
 .../jdbc/object/BatchSqlUpdate.java           |  24 +--
 .../object/MappingSqlQueryWithParameters.java |   6 +-
 .../jdbc/object/RdbmsOperation.java           |  26 +--
 .../springframework/jdbc/object/SqlCall.java  |   6 +-
 .../jdbc/object/SqlFunction.java              |  14 +-
 .../jdbc/object/SqlOperation.java             |   6 +-
 .../springframework/jdbc/object/SqlQuery.java |  30 +--
 .../jdbc/object/SqlUpdate.java                |  12 +-
 .../jdbc/object/StoredProcedure.java          |  12 +-
 .../jdbc/object/UpdatableSqlQuery.java        |   6 +-
 .../jdbc/object/package-info.java             |   5 +-
 ...bstractFallbackSQLExceptionTranslator.java |  18 +-
 ...CustomSQLExceptionTranslatorRegistrar.java |   2 +-
 .../CustomSQLExceptionTranslatorRegistry.java |   2 +-
 .../jdbc/support/JdbcAccessor.java            |   2 +-
 .../jdbc/support/JdbcUtils.java               |  18 +-
 .../jdbc/support/KeyHolder.java               |   2 +-
 .../SQLErrorCodeSQLExceptionTranslator.java   |   6 +-
 .../jdbc/support/SQLErrorCodes.java           |   2 +-
 .../jdbc/support/SQLErrorCodesFactory.java    |  22 +--
 .../SQLExceptionSubclassTranslator.java       |   2 +-
 .../jdbc/support/SQLExceptionTranslator.java  |  10 +-
 .../jdbc/support/SqlValue.java                |   2 +-
 .../AbstractDataFieldMaxValueIncrementer.java |   2 +-
 .../AbstractSequenceMaxValueIncrementer.java  |   2 +-
 .../incrementer/DerbyMaxValueIncrementer.java |   4 +-
 .../SqlServerMaxValueIncrementer.java         |   4 +-
 .../SybaseAnywhereMaxValueIncrementer.java    |   6 +-
 .../SybaseMaxValueIncrementer.java            |   6 +-
 .../jdbc/support/lob/DefaultLobHandler.java   |  24 +--
 .../lob/JtaLobCreatorSynchronization.java     |   4 +-
 .../jdbc/support/lob/LobCreator.java          |  30 +--
 .../jdbc/support/lob/LobCreatorUtils.java     |   2 +-
 .../jdbc/support/lob/LobHandler.java          |  64 +++----
 .../jdbc/support/lob/OracleLobHandler.java    |  32 ++--
 .../lob/SpringLobCreatorSynchronization.java  |   4 +-
 .../nativejdbc/C3P0NativeJdbcExtractor.java   |   6 +-
 .../CommonsDbcpNativeJdbcExtractor.java       |   6 +-
 .../nativejdbc/JBossNativeJdbcExtractor.java  |  12 +-
 .../nativejdbc/Jdbc4NativeJdbcExtractor.java  |  12 +-
 .../nativejdbc/NativeJdbcExtractor.java       |  16 +-
 .../NativeJdbcExtractorAdapter.java           |  20 +-
 .../OracleJdbc4NativeJdbcExtractor.java       |  10 +-
 .../nativejdbc/SimpleNativeJdbcExtractor.java |   6 +-
 .../WebLogicNativeJdbcExtractor.java          |  10 +-
 .../WebSphereNativeJdbcExtractor.java         |  10 +-
 .../rowset/ResultSetWrappingSqlRowSet.java    |  14 +-
 .../ResultSetWrappingSqlRowSetMetaData.java   |   4 +-
 .../jdbc/support/rowset/SqlRowSet.java        |  14 +-
 .../support/rowset/SqlRowSetMetaData.java     |   4 +-
 .../jdbc/support/xml/Jdbc4SqlXmlHandler.java  |   2 +-
 .../jdbc/support/xml/SqlXmlHandler.java       |  54 +++---
 .../xml/SqlXmlObjectMappingHandler.java       |   8 +-
 .../support/xml/XmlBinaryStreamProvider.java  |   6 +-
 .../xml/XmlCharacterStreamProvider.java       |   6 +-
 .../jdbc/support/xml/XmlResultProvider.java   |   8 +-
 .../org/springframework/jms/JmsException.java |   4 +-
 .../config/JcaListenerContainerParser.java    |   2 +-
 .../config/JmsListenerContainerParser.java    |   2 +-
 .../connection/CachingConnectionFactory.java  |   6 +-
 .../connection/ConnectionFactoryUtils.java    |  30 +--
 .../DelegatingConnectionFactory.java          |   2 +-
 .../jms/connection/JmsResourceHolder.java     |   4 +-
 .../jms/connection/JmsTransactionManager.java |   4 +-
 .../connection/JmsTransactionManager102.java  |   4 +-
 .../jms/connection/SessionProxy.java          |   2 +-
 .../connection/SingleConnectionFactory.java   |  12 +-
 .../SingleConnectionFactory102.java           |   4 +-
 .../connection/SmartConnectionFactory.java    |   2 +-
 ...ransactionAwareConnectionFactoryProxy.java |   2 +-
 ...erCredentialsConnectionFactoryAdapter.java |  22 +--
 .../jms/core/BrowserCallback.java             |   6 +-
 .../jms/core/JmsOperations.java               |  46 ++---
 .../springframework/jms/core/JmsTemplate.java |  32 ++--
 .../jms/core/JmsTemplate102.java              |   2 +-
 .../jms/core/MessageCreator.java              |  12 +-
 .../jms/core/ProducerCallback.java            |   6 +-
 .../jms/core/SessionCallback.java             |   4 +-
 .../jms/core/support/package-info.java        |   3 +-
 .../AbstractJmsListeningContainer.java        |   8 +-
 .../AbstractMessageListenerContainer.java     |  14 +-
 ...stractPollingMessageListenerContainer.java |  10 +-
 .../DefaultMessageListenerContainer.java      |  14 +-
 .../DefaultMessageListenerContainer102.java   |   2 +-
 .../listener/SessionAwareMessageListener.java |   4 +-
 .../SimpleMessageListenerContainer.java       |   4 +-
 .../SimpleMessageListenerContainer102.java    |   2 +-
 .../adapter/MessageListenerAdapter.java       |  56 +++---
 .../DefaultJmsActivationSpecFactory.java      |   2 +-
 .../endpoint/JmsMessageEndpointFactory.java   |   2 +-
 .../StandardJmsActivationSpecFactory.java     |   4 +-
 .../remoting/JmsInvokerClientInterceptor.java |   4 +-
 .../remoting/JmsInvokerProxyFactoryBean.java  |   4 +-
 .../remoting/JmsInvokerServiceExporter.java   |   4 +-
 .../jms/support/JmsAccessor.java              |   8 +-
 .../springframework/jms/support/JmsUtils.java |  30 +--
 .../MarshallingMessageConverter.java          |   8 +-
 .../converter/SimpleMessageConverter.java     |   2 +-
 .../converter/SimpleMessageConverter102.java  |   4 +-
 .../BeanFactoryDestinationResolver.java       |   4 +-
 .../destination/DestinationResolver.java      |   4 +-
 .../DynamicDestinationResolver.java           |   2 +-
 .../destination/JmsDestinationAccessor.java   |   2 +-
 .../destination/JndiDestinationResolver.java  |   4 +-
 .../hibernate4/HibernateSystemException.java  |   2 +-
 .../HibernateTransactionManager.java          |  14 +-
 .../hibernate4/LocalSessionFactoryBean.java   |   6 +-
 .../LocalSessionFactoryBuilder.java           |   6 +-
 .../orm/hibernate4/SessionFactoryUtils.java   |   8 +-
 .../SpringFlushSynchronization.java           |   2 +-
 .../hibernate4/SpringJtaSessionContext.java   |   2 +-
 .../orm/hibernate4/package-info.java          |   3 +-
 .../support/OpenSessionInViewFilter.java      |  12 +-
 .../support/OpenSessionInViewInterceptor.java |  24 +--
 .../orm/hibernate4/support/package-info.java  |   2 +-
 .../web/DelegatingServletInputStream.java     |   4 +-
 .../web/DelegatingServletOutputStream.java    |   4 +-
 .../mock/web/HeaderValueHolder.java           |   2 +-
 .../mock/web/MockHttpServletRequest.java      |  22 +--
 .../mock/web/MockHttpServletResponse.java     |  10 +-
 .../AbstractSessionFactoryBean.java           |  16 +-
 .../orm/hibernate3/HibernateAccessor.java     |  12 +-
 .../orm/hibernate3/HibernateCallback.java     |  12 +-
 .../orm/hibernate3/HibernateInterceptor.java  |  10 +-
 .../orm/hibernate3/HibernateOperations.java   |  76 ++++----
 .../hibernate3/HibernateSystemException.java  |   2 +-
 .../orm/hibernate3/HibernateTemplate.java     |  46 ++---
 .../HibernateTransactionManager.java          |  22 +--
 .../LocalDataSourceConnectionProvider.java    |   2 +-
 .../LocalJtaDataSourceConnectionProvider.java |   2 +-
 .../hibernate3/LocalSessionFactoryBean.java   |  20 +-
 .../orm/hibernate3/SessionFactoryUtils.java   |  54 +++---
 ...tionAwareDataSourceConnectionProvider.java |   2 +-
 .../AnnotationSessionFactoryBean.java         |   6 +-
 .../orm/hibernate3/package-info.java          |   3 +-
 .../hibernate3/support/AbstractLobType.java   |   2 +-
 .../hibernate3/support/BlobByteArrayType.java |   2 +-
 .../support/BlobSerializableType.java         |   2 +-
 .../hibernate3/support/BlobStringType.java    |  12 +-
 .../hibernate3/support/ClobStringType.java    |   2 +-
 .../support/HibernateDaoSupport.java          |   4 +-
 .../IdTransferringMergeEventListener.java     |   8 +-
 .../support/OpenSessionInViewFilter.java      |  14 +-
 .../support/OpenSessionInViewInterceptor.java |  38 ++--
 .../orm/hibernate3/support/package-info.java  |   3 +-
 .../orm/ibatis/SqlMapClientCallback.java      |  10 +-
 .../orm/ibatis/SqlMapClientFactoryBean.java   |   8 +-
 .../orm/ibatis/SqlMapClientTemplate.java      |   6 +-
 .../orm/ibatis/support/package-info.java      |   3 +-
 .../orm/jdo/DefaultJdoDialect.java            |  28 +--
 .../springframework/orm/jdo/JdoAccessor.java  |   2 +-
 .../springframework/orm/jdo/JdoCallback.java  |   8 +-
 .../springframework/orm/jdo/JdoDialect.java   |  16 +-
 .../orm/jdo/JdoInterceptor.java               |  10 +-
 .../orm/jdo/JdoOperations.java                |  26 +--
 .../orm/jdo/JdoSystemException.java           |   2 +-
 .../springframework/orm/jdo/JdoTemplate.java  |  18 +-
 .../orm/jdo/JdoTransactionManager.java        |   6 +-
 .../LocalPersistenceManagerFactoryBean.java   |  12 +-
 .../jdo/PersistenceManagerFactoryUtils.java   |  26 +--
 ...onAwarePersistenceManagerFactoryProxy.java |  10 +-
 .../orm/jdo/support/JdoDaoSupport.java        |   4 +-
 .../OpenPersistenceManagerInViewFilter.java   |   4 +-
 .../SpringPersistenceManagerProxyBean.java    |   6 +-
 .../orm/jdo/support/package-info.java         |   3 +-
 .../jpa/AbstractEntityManagerFactoryBean.java |  12 +-
 .../orm/jpa/DefaultJpaDialect.java            |  10 +-
 .../orm/jpa/EntityManagerFactoryAccessor.java |   6 +-
 .../orm/jpa/EntityManagerFactoryInfo.java     |  24 +--
 .../orm/jpa/EntityManagerFactoryUtils.java    |  28 +--
 .../orm/jpa/EntityManagerProxy.java           |   2 +-
 .../orm/jpa/ExtendedEntityManagerCreator.java |  30 +--
 .../springframework/orm/jpa/JpaAccessor.java  |   4 +-
 .../springframework/orm/jpa/JpaCallback.java  |  20 +-
 .../springframework/orm/jpa/JpaDialect.java   |  16 +-
 .../orm/jpa/JpaInterceptor.java               |  12 +-
 .../orm/jpa/JpaOperations.java                |  10 +-
 .../orm/jpa/JpaSystemException.java           |   2 +-
 .../springframework/orm/jpa/JpaTemplate.java  |   8 +-
 .../orm/jpa/JpaTransactionManager.java        |   6 +-
 .../orm/jpa/JpaVendorAdapter.java             |   4 +-
 ...ocalContainerEntityManagerFactoryBean.java |  40 ++--
 .../jpa/LocalEntityManagerFactoryBean.java    |   4 +-
 .../orm/jpa/SharedEntityManagerCreator.java   |   4 +-
 .../ClassFileTransformerAdapter.java          |   2 +-
 .../DefaultPersistenceUnitManager.java        |  62 +++---
 .../PersistenceUnitManager.java               |   4 +-
 .../PersistenceUnitPostProcessor.java         |   2 +-
 .../PersistenceUnitReader.java                |  14 +-
 .../orm/jpa/support/JpaDaoSupport.java        |   4 +-
 .../OpenEntityManagerInViewFilter.java        |   6 +-
 ...ersistenceAnnotationBeanPostProcessor.java |  40 ++--
 .../jpa/support/SharedEntityManagerBean.java  |   2 +-
 .../orm/jpa/support/package-info.java         |   3 +-
 .../jpa/vendor/AbstractJpaVendorAdapter.java  |   2 +-
 .../orm/jpa/vendor/Database.java              |   2 +-
 .../vendor/EclipseLinkJpaVendorAdapter.java   |   2 +-
 .../HibernateJpaSessionFactoryBean.java       |   2 +-
 .../jpa/vendor/HibernateJpaVendorAdapter.java |   2 +-
 .../orm/jpa/vendor/OpenJpaDialect.java        |  12 +-
 .../orm/jpa/vendor/OpenJpaVendorAdapter.java  |   2 +-
 .../jpa/vendor/TopLinkJpaVendorAdapter.java   |   2 +-
 .../mock/jndi/ExpectedLookupTemplate.java     |   2 +-
 .../mock/jndi/SimpleNamingContext.java        |   4 +-
 .../mock/jndi/SimpleNamingContextBuilder.java |  14 +-
 ...DependencyInjectionSpringContextTests.java |   8 +-
 .../AbstractSingleSpringContextTests.java     |  16 +-
 .../test/AbstractSpringContextTests.java      |  10 +-
 ...sactionalDataSourceSpringContextTests.java |   2 +-
 ...stractTransactionalSpringContextTests.java |   6 +-
 ...ractAnnotationAwareTransactionalTests.java |  10 +-
 .../test/annotation/DirtiesContext.java       |   4 +-
 .../test/annotation/IfProfileValue.java       |   6 +-
 .../test/annotation/ProfileValueSource.java   |   4 +-
 .../test/annotation/ProfileValueUtils.java    |  22 +--
 .../test/annotation/Rollback.java             |   2 +-
 .../test/jdbc/JdbcTestUtils.java              |   6 +-
 .../test/jpa/AbstractJpaTests.java            |   4 +-
 .../OrmXmlOverridingShadowingClassLoader.java |   4 +-
 .../oxm/GenericMarshaller.java                |   4 +-
 .../oxm/GenericUnmarshaller.java              |   4 +-
 .../org/springframework/oxm/Marshaller.java   |  10 +-
 .../oxm/MarshallingException.java             |   4 +-
 .../oxm/MarshallingFailureException.java      |   4 +-
 .../oxm/UncategorizedMappingException.java    |   2 +-
 .../org/springframework/oxm/Unmarshaller.java |   4 +-
 .../oxm/UnmarshallingFailureException.java    |   4 +-
 .../oxm/ValidationFailureException.java       |   4 +-
 .../oxm/XmlMappingException.java              |   4 +-
 .../oxm/castor/CastorMappingException.java    |   2 +-
 .../oxm/castor/CastorMarshaller.java          |  36 ++--
 .../CastorMarshallerBeanDefinitionParser.java |   2 +-
 .../Jaxb2MarshallerBeanDefinitionParser.java  |   2 +-
 .../JibxMarshallerBeanDefinitionParser.java   |   4 +-
 .../oxm/config/OxmNamespaceHandler.java       |   2 +-
 ...mlBeansMarshallerBeanDefinitionParser.java |   2 +-
 .../oxm/jaxb/Jaxb2Marshaller.java             |  42 ++--
 .../oxm/jibx/JibxMarshaller.java              |  24 +--
 .../oxm/mime/MimeContainer.java               |   6 +-
 .../oxm/support/AbstractMarshaller.java       | 168 ++++++++--------
 .../oxm/support/MarshallingSource.java        |  18 +-
 .../oxm/support/SaxResourceUtils.java         |   6 +-
 .../oxm/xmlbeans/XmlBeansMarshaller.java      |  20 +-
 .../oxm/xmlbeans/XmlOptionsFactoryBean.java   |   8 +-
 .../oxm/xstream/XStreamMarshaller.java        |  30 +--
 .../oxm/xstream/XStreamUtils.java             |   8 +-
 .../tiles/ComponentControllerSupport.java     |  10 +-
 .../web/servlet/view/tiles/TilesView.java     |   2 +-
 .../struts/ActionServletAwareProcessor.java   |   2 +-
 .../web/struts/ContextLoaderPlugIn.java       |   4 +-
 .../web/struts/DelegatingActionProxy.java     |  60 +++---
 .../web/struts/DelegatingActionUtils.java     |   8 +-
 .../struts/DelegatingRequestProcessor.java    |  74 +++----
 .../DelegatingTilesRequestProcessor.java      |   2 +-
 .../web/struts/SpringBindingActionForm.java   |   8 +-
 .../mock/http/client/package-info.java        |   4 +-
 .../mock/http/package-info.java               |   4 +-
 .../mock/jndi/ExpectedLookupTemplate.java     |   2 +-
 .../mock/jndi/SimpleNamingContext.java        |   4 +-
 .../mock/jndi/SimpleNamingContextBuilder.java |  14 +-
 .../web/DelegatingServletInputStream.java     |   4 +-
 .../web/DelegatingServletOutputStream.java    |   4 +-
 .../mock/web/HeaderValueHolder.java           |   2 +-
 .../mock/web/MockHttpServletRequest.java      |  18 +-
 .../mock/web/MockHttpServletResponse.java     |  10 +-
 .../mock/web/MockPageContext.java             |   4 +-
 ...DependencyInjectionSpringContextTests.java |   8 +-
 .../AbstractSingleSpringContextTests.java     |  16 +-
 .../test/AbstractSpringContextTests.java      |  10 +-
 ...sactionalDataSourceSpringContextTests.java |   2 +-
 ...stractTransactionalSpringContextTests.java |   6 +-
 .../springframework/test/AssertThrows.java    |  34 ++--
 ...ractAnnotationAwareTransactionalTests.java |  10 +-
 .../test/annotation/DirtiesContext.java       |  14 +-
 .../test/annotation/IfProfileValue.java       |  14 +-
 .../test/annotation/ProfileValueSource.java   |   4 +-
 .../test/annotation/ProfileValueUtils.java    |  28 +--
 .../test/annotation/Rollback.java             |   2 +-
 .../test/context/ActiveProfiles.java          |   4 +-
 .../test/context/ContextCache.java            |  20 +-
 .../test/context/ContextConfiguration.java    |  10 +-
 .../test/context/ContextLoader.java           |  10 +-
 .../test/context/ContextLoaderUtils.java      |  22 +--
 .../context/MergedContextConfiguration.java   |  18 +-
 .../test/context/SmartContextLoader.java      |  18 +-
 .../test/context/TestContext.java             |  30 +--
 .../test/context/TestContextManager.java      |  40 ++--
 .../test/context/TestExecutionListener.java   |  14 +-
 .../test/context/TestExecutionListeners.java  |  26 +--
 .../AbstractJUnit38SpringContextTests.java    |   8 +-
 ...ransactionalJUnit38SpringContextTests.java |   4 +-
 ...TransactionalJUnit4SpringContextTests.java |   2 +-
 .../junit4/SpringJUnit4ClassRunner.java       |  60 +++---
 .../RunAfterTestClassCallbacks.java           |  10 +-
 .../RunAfterTestMethodCallbacks.java          |  12 +-
 .../RunBeforeTestClassCallbacks.java          |   8 +-
 .../RunBeforeTestMethodCallbacks.java         |  10 +-
 .../statements/SpringFailOnTimeout.java       |  10 +-
 .../junit4/statements/SpringRepeat.java       |   6 +-
 .../junit4/statements/package-info.java       |   3 +-
 .../support/AbstractContextLoader.java        |  32 ++--
 .../AbstractDelegatingSmartContextLoader.java |   4 +-
 .../support/AbstractGenericContextLoader.java |  28 +--
 .../AnnotationConfigContextLoader.java        |  28 +--
 .../AnnotationConfigContextLoaderUtils.java   |  12 +-
 ...endencyInjectionTestExecutionListener.java |   4 +-
 .../DirtiesContextTestExecutionListener.java  |  10 +-
 .../GenericPropertiesContextLoader.java       |   2 +-
 .../support/GenericXmlContextLoader.java      |   2 +-
 .../AbstractTestNGSpringContextTests.java     |   2 +-
 ...TransactionalTestNGSpringContextTests.java |   2 +-
 .../context/transaction/AfterTransaction.java |   6 +-
 .../transaction/BeforeTransaction.java        |   6 +-
 .../TransactionalTestExecutionListener.java   |  20 +-
 .../web/AbstractGenericWebContextLoader.java  |   4 +-
 .../web/AnnotationConfigWebContextLoader.java |  18 +-
 .../web/GenericXmlWebContextLoader.java       |   2 +-
 .../web/WebMergedContextConfiguration.java    |  12 +-
 .../test/jdbc/JdbcTestUtils.java              |   2 +-
 .../test/jdbc/SimpleJdbcTestUtils.java        |   6 +-
 .../test/jpa/AbstractAspectjJpaTests.java     |   8 +-
 .../test/jpa/AbstractJpaTests.java            |   4 +-
 .../OrmXmlOverridingShadowingClassLoader.java |   4 +-
 .../test/web/AbstractModelAndViewTests.java   |  40 ++--
 .../test/web/ModelAndViewAssert.java          |  40 ++--
 .../mock/web/MockPageContextTests.java        |   2 +-
 ...dingPropertiesAndInheritedLoaderTests.java |   2 +-
 ...ithPropertiesExtendingPropertiesTests.java |   2 +-
 ...ssLevelTransactionalSpringRunnerTests.java |   2 +-
 ...rceSpringJUnit4ClassRunnerAppCtxTests.java |   2 +-
 ...ckFalseTransactionalSpringRunnerTests.java |   2 +-
 ...ackTrueTransactionalSpringRunnerTests.java |   2 +-
 ...odLevelTransactionalSpringRunnerTests.java |   4 +-
 ...cesSpringJUnit4ClassRunnerAppCtxTests.java |   6 +-
 ...sedSpringJUnit4ClassRunnerAppCtxTests.java |   4 +-
 .../SpringJUnit4ClassRunnerAppCtxTests.java   |   4 +-
 ...figSpringJUnit4ClassRunnerAppCtxTests.java |   2 +-
 .../annotation/PojoAndStringConfig.java       |   2 +-
 ...ustomizedGenericXmlContextLoaderTests.java |   2 +-
 ...mlContextLoaderResourceLocationsTests.java |   4 +-
 .../transaction/TransactionTestUtils.java     |  18 +-
 ...ChainedPersistenceExceptionTranslator.java |   2 +-
 .../dao/support/DaoSupport.java               |   2 +-
 .../dao/support/DataAccessUtils.java          |  22 +--
 ...stenceExceptionTranslationInterceptor.java |   2 +-
 .../PersistenceExceptionTranslator.java       |   2 +-
 .../cci/InvalidResultSetAccessException.java  |   2 +-
 .../connection/ConnectionFactoryUtils.java    |  12 +-
 ...onnectionSpecConnectionFactoryAdapter.java |  14 +-
 .../connection/NotSupportedRecordFactory.java |   2 +-
 .../connection/SingleConnectionFactory.java   |   4 +-
 ...ransactionAwareConnectionFactoryProxy.java |  10 +-
 .../jca/cci/core/CciTemplate.java             |  10 +-
 .../jca/cci/core/ConnectionCallback.java      |   8 +-
 .../jca/cci/core/InteractionCallback.java     |   8 +-
 .../jca/cci/core/RecordCreator.java           |   8 +-
 .../jca/cci/core/RecordExtractor.java         |   2 +-
 .../jca/cci/core/support/CciDaoSupport.java   |   2 +-
 .../jca/cci/core/support/package-info.java    |   3 +-
 .../cci/object/MappingRecordOperation.java    |  20 +-
 .../jca/cci/object/SimpleRecordOperation.java |   4 +-
 .../jca/cci/object/package-info.java          |   5 +-
 .../springframework/jca/cci/package-info.java |   3 +-
 .../jca/context/BootstrapContextAware.java    |   4 +-
 .../context/SpringContextResourceAdapter.java |   6 +-
 .../AbstractMessageEndpointFactory.java       |  18 +-
 .../GenericMessageEndpointFactory.java        |   2 +-
 .../jca/support/SimpleBootstrapContext.java   |   8 +-
 .../jca/work/WorkManagerTaskExecutor.java     |  10 +-
 .../PlatformTransactionManager.java           |   6 +-
 .../transaction/SavepointManager.java         |   4 +-
 .../transaction/TransactionDefinition.java    |  44 ++---
 .../TransactionSystemException.java           |   4 +-
 .../AnnotationTransactionAttributeSource.java |  10 +-
 .../transaction/annotation/Isolation.java     |   6 +-
 .../transaction/annotation/Propagation.java   |   4 +-
 .../TransactionAnnotationParser.java          |   4 +-
 .../transaction/annotation/Transactional.java |   4 +-
 .../AnnotationDrivenBeanDefinitionParser.java |   2 +-
 .../config/TxNamespaceHandler.java            |   6 +-
 ...actFallbackTransactionAttributeSource.java |  18 +-
 .../DefaultTransactionAttribute.java          |   2 +-
 .../MethodMapTransactionAttributeSource.java  |   4 +-
 .../interceptor/NoRollbackRuleAttribute.java  |  10 +-
 .../interceptor/RollbackRuleAttribute.java    |  20 +-
 .../RuleBasedTransactionAttribute.java        |   8 +-
 .../interceptor/TransactionAspectSupport.java |  32 ++--
 .../interceptor/TransactionAttribute.java     |   4 +-
 .../TransactionAttributeEditor.java           |   4 +-
 .../TransactionAttributeSource.java           |   6 +-
 .../TransactionAttributeSourceEditor.java     |   6 +-
 .../TransactionAttributeSourcePointcut.java   |   2 +-
 .../interceptor/TransactionInterceptor.java   |   2 +-
 .../JtaAfterCompletionSynchronization.java    |   4 +-
 .../jta/JtaTransactionManager.java            |  38 ++--
 .../jta/OC4JJtaTransactionManager.java        |   6 +-
 .../jta/SpringJtaSynchronizationAdapter.java  |  14 +-
 .../transaction/jta/TransactionFactory.java   |   6 +-
 .../jta/WebLogicJtaTransactionManager.java    |   6 +-
 .../jta/WebSphereUowTransactionManager.java   |  12 +-
 .../AbstractPlatformTransactionManager.java   | 100 +++++-----
 .../support/AbstractTransactionStatus.java    |   4 +-
 ...kPreferringPlatformTransactionManager.java |   8 +-
 .../support/DefaultTransactionDefinition.java |  20 +-
 .../ResourceHolderSynchronization.java        |  16 +-
 .../support/ResourceTransactionManager.java   |   2 +-
 .../support/SimpleTransactionStatus.java      |   2 +-
 .../support/TransactionCallback.java          |   4 +-
 .../TransactionCallbackWithoutResult.java     |   2 +-
 .../support/TransactionOperations.java        |   2 +-
 .../support/TransactionSynchronization.java   |  10 +-
 .../TransactionSynchronizationManager.java    |  26 +--
 .../TransactionSynchronizationUtils.java      |  20 +-
 .../support/TransactionTemplate.java          |   2 +-
 .../mock/jndi/ExpectedLookupTemplate.java     |   2 +-
 .../mock/jndi/SimpleNamingContext.java        |   4 +-
 .../mock/jndi/SimpleNamingContextBuilder.java |  14 +-
 ...TransactionAttributeSourceEditorTests.java |   2 +-
 .../org/springframework/http/MediaType.java   |  34 ++--
 .../springframework/http/MediaTypeEditor.java |   4 +-
 .../http/client/ClientHttpRequest.java        |   2 +-
 .../http/client/ClientHttpResponse.java       |   4 +-
 .../CommonsClientHttpRequestFactory.java      |   8 +-
 .../http/client/package-info.java             |   5 +-
 .../AbstractHttpMessageConverter.java         |   4 +-
 .../ByteArrayHttpMessageConverter.java        |   2 +-
 .../converter/StringHttpMessageConverter.java |   2 +-
 .../MappingJackson2HttpMessageConverter.java  |   2 +-
 .../MappingJacksonHttpMessageConverter.java   |   2 +-
 .../xml/MarshallingHttpMessageConverter.java  |   2 +-
 .../springframework/http/package-info.java    |   3 +-
 .../http/server/package-info.java             |   5 +-
 .../caucho/HessianClientInterceptor.java      |   2 +-
 .../remoting/caucho/HessianExporter.java      |   2 +-
 .../AbstractHttpInvokerRequestExecutor.java   |  20 +-
 .../HttpInvokerClientConfiguration.java       |   2 +-
 .../jaxrpc/JaxRpcPortClientInterceptor.java   |  12 +-
 .../jaxrpc/JaxRpcPortProxyFactoryBean.java    |   2 +-
 .../jaxrpc/JaxRpcServicePostProcessor.java    |   4 +-
 .../jaxrpc/JaxRpcSoapFaultException.java      |   2 +-
 .../jaxrpc/LocalJaxRpcServiceFactory.java     |   4 +-
 .../jaxrpc/LocalJaxRpcServiceFactoryBean.java |   2 +-
 .../jaxrpc/ServletEndpointSupport.java        |   2 +-
 .../jaxws/JaxWsPortClientInterceptor.java     |   2 +-
 .../web/HttpRequestHandler.java               |   6 +-
 .../web/bind/EscapedErrors.java               |   2 +-
 .../web/bind/ServletRequestDataBinder.java    |   8 +-
 .../web/bind/ServletRequestUtils.java         |  24 +--
 ...sfiedServletRequestParameterException.java |   4 +-
 .../web/bind/WebDataBinder.java               |  10 +-
 .../web/bind/annotation/CookieValue.java      |   6 +-
 .../web/bind/annotation/ExceptionHandler.java |   8 +-
 .../web/bind/annotation/InitBinder.java       |   2 +-
 .../web/bind/annotation/MatrixVariable.java   |   8 +-
 .../web/bind/annotation/RequestBody.java      |   6 +-
 .../web/bind/annotation/RequestHeader.java    |   8 +-
 .../web/bind/annotation/RequestMapping.java   |  32 ++--
 .../web/bind/annotation/RequestParam.java     |   8 +-
 .../web/bind/annotation/RequestPart.java      |   6 +-
 .../bind/annotation/SessionAttributes.java    |   4 +-
 .../web/bind/annotation/ValueConstants.java   |   2 +-
 .../support/HandlerMethodResolver.java        |   4 +-
 .../ConfigurableWebBindingInitializer.java    |  10 +-
 .../bind/support/SessionAttributeStore.java   |   4 +-
 .../web/bind/support/SimpleSessionStatus.java |   2 +-
 .../web/bind/support/WebArgumentResolver.java |   2 +-
 .../bind/support/WebRequestDataBinder.java    |   6 +-
 .../client/DefaultResponseErrorHandler.java   |   2 +-
 .../client/HttpMessageConverterExtractor.java |   2 +-
 .../web/client/ResponseErrorHandler.java      |   4 +-
 .../web/client/RestOperations.java            |  36 ++--
 .../web/client/RestTemplate.java              |   4 +-
 .../web/client/support/package-info.java      |   3 +-
 .../ConfigurableWebApplicationContext.java    |   2 +-
 .../web/context/ContextLoader.java            |  14 +-
 .../web/context/ContextLoaderListener.java    |   2 +-
 .../web/context/ServletConfigAware.java       |   4 +-
 .../web/context/ServletContextAware.java      |   4 +-
 .../web/context/WebApplicationContext.java    |   4 +-
 .../request/FacesRequestAttributes.java       |   2 +-
 ...g4jNestedDiagnosticContextInterceptor.java |   2 +-
 .../web/context/request/NativeWebRequest.java |   4 +-
 .../context/request/RequestAttributes.java    |   8 +-
 .../context/request/RequestContextHolder.java |   8 +-
 .../request/RequestContextListener.java       |   4 +-
 .../web/context/request/RequestScope.java     |   6 +-
 .../request/ServletRequestAttributes.java     |   2 +-
 .../web/context/request/SessionScope.java     |  10 +-
 .../web/context/request/WebRequest.java       |   8 +-
 .../request/WebRequestInterceptor.java        |   4 +-
 ...tractRefreshableWebApplicationContext.java |   2 +-
 .../support/GenericWebApplicationContext.java |   4 +-
 .../support/HttpRequestHandlerServlet.java    |   2 +-
 .../ServletContextParameterFactoryBean.java   |   2 +-
 ...tContextPropertyPlaceholderConfigurer.java |   8 +-
 .../support/ServletContextResource.java       |  14 +-
 ...ServletContextResourcePatternResolver.java |   4 +-
 .../context/support/ServletContextScope.java  |   2 +-
 .../support/SpringBeanAutowiringSupport.java  |  10 +-
 .../support/WebApplicationContextUtils.java   |   6 +-
 .../support/WebApplicationObjectSupport.java  |   8 +-
 .../web/context/support/package-info.java     |   3 +-
 .../filter/AbstractRequestLoggingFilter.java  |  36 ++--
 .../web/filter/GenericFilterBean.java         |  22 +--
 .../web/filter/HiddenHttpMethodFilter.java    |   8 +-
 .../web/filter/OncePerRequestFilter.java      |   8 +-
 .../web/filter/RequestContextFilter.java      |   2 +-
 .../web/filter/ShallowEtagHeaderFilter.java   |   6 +-
 .../web/jsf/DecoratingNavigationHandler.java  |  26 +--
 .../jsf/DelegatingNavigationHandlerProxy.java |  12 +-
 .../DelegatingPhaseListenerMulticaster.java   |  14 +-
 .../web/jsf/DelegatingVariableResolver.java   |  14 +-
 .../web/jsf/FacesContextUtils.java            |   8 +-
 ...WebApplicationContextVariableResolver.java |   8 +-
 .../web/jsf/el/SpringBeanFacesELResolver.java |  10 +-
 .../WebApplicationContextFacesELResolver.java |   8 +-
 .../web/method/package-info.java              |   3 +-
 .../method/support/ModelAndViewContainer.java |   2 +-
 .../web/multipart/MultipartFile.java          |   6 +-
 .../web/multipart/MultipartRequest.java       |   4 +-
 .../web/multipart/MultipartResolver.java      |  16 +-
 .../commons/CommonsFileUploadSupport.java     |   6 +-
 .../commons/CommonsMultipartFile.java         |   2 +-
 .../commons/CommonsMultipartResolver.java     |   4 +-
 .../multipart/support/MultipartFilter.java    |  10 +-
 .../StandardServletMultipartResolver.java     |   2 +-
 .../web/util/ExpressionEvaluationUtils.java   |  16 +-
 .../util/HtmlCharacterEntityReferences.java   |   2 +-
 .../springframework/web/util/HtmlUtils.java   |   2 +-
 .../web/util/HttpSessionMutexListener.java    |   4 +-
 .../web/util/IntrospectorCleanupListener.java |   4 +-
 .../web/util/Log4jConfigListener.java         |   4 +-
 .../web/util/Log4jWebConfigurer.java          |   8 +-
 .../web/util/NestedServletException.java      |   4 +-
 .../springframework/web/util/TagUtils.java    |  34 ++--
 .../springframework/web/util/UriTemplate.java |  38 ++--
 .../springframework/web/util/UriUtils.java    |   4 +-
 .../web/util/UrlPathHelper.java               |  14 +-
 .../web/util/WebAppRootListener.java          |   4 +-
 .../springframework/web/util/WebUtils.java    |  78 ++++----
 .../test/DelegatingServletInputStream.java    |   4 +-
 .../test/DelegatingServletOutputStream.java   |   4 +-
 .../mock/web/test/HeaderValueHolder.java      |   2 +-
 .../mock/web/test/MockHttpServletRequest.java |  16 +-
 .../web/test/MockHttpServletResponse.java     |  10 +-
 .../mock/web/test/MockPageContext.java        |   4 +-
 .../web/jsf/MockFacesContext.java             |   2 +-
 .../web/portlet/DispatcherPortlet.java        |  20 +-
 .../web/portlet/FrameworkPortlet.java         |  14 +-
 .../web/portlet/GenericPortletBean.java       |   8 +-
 .../web/portlet/HandlerAdapter.java           |  20 +-
 .../web/portlet/HandlerExceptionResolver.java |   4 +-
 .../web/portlet/HandlerExecutionChain.java    |   4 +-
 .../web/portlet/HandlerInterceptor.java       |  98 +++++-----
 .../web/portlet/HandlerMapping.java           |   6 +-
 .../web/portlet/ModelAndView.java             |  34 ++--
 .../bind/PortletRequestDataBinder.java        |   8 +-
 .../web/portlet/bind/PortletRequestUtils.java |  24 +--
 .../bind/annotation/ActionMapping.java        |   2 +-
 ...ConfigurablePortletApplicationContext.java |   2 +-
 .../PortletApplicationContextUtils.java       |   2 +-
 .../context/PortletContextResource.java       |  14 +-
 ...PortletContextResourcePatternResolver.java |   8 +-
 .../portlet/context/PortletContextScope.java  |   2 +-
 .../context/PortletRequestAttributes.java     |   2 +-
 .../portlet/context/PortletWebRequest.java    |   4 +-
 .../AbstractHandlerExceptionResolver.java     |   2 +-
 .../handler/AbstractHandlerMapping.java       |  24 +--
 .../AbstractMapBasedHandlerMapping.java       |   4 +-
 .../handler/HandlerInterceptorAdapter.java    |   2 +-
 .../handler/ParameterHandlerMapping.java      |   2 +-
 .../handler/ParameterMappingInterceptor.java  |  12 +-
 .../handler/PortletModeHandlerMapping.java    |   2 +-
 .../PortletModeParameterHandlerMapping.java   |   2 +-
 .../SimpleMappingExceptionResolver.java       |   8 +-
 .../handler/SimplePortletHandlerAdapter.java  |   2 +-
 .../handler/SimplePortletPostProcessor.java   |   6 +-
 .../WebRequestHandlerInterceptorAdapter.java  |   6 +-
 .../CommonsPortletMultipartResolver.java      |   4 +-
 .../multipart/PortletMultipartResolver.java   |  14 +-
 .../mvc/AbstractCommandController.java        |   4 +-
 .../web/portlet/mvc/AbstractController.java   |  16 +-
 .../portlet/mvc/AbstractFormController.java   |  84 ++++----
 .../mvc/AbstractWizardFormController.java     |  52 ++---
 .../portlet/mvc/BaseCommandController.java    |  50 ++---
 .../web/portlet/mvc/Controller.java           |   4 +-
 .../mvc/ParameterizableViewController.java    |   2 +-
 .../mvc/PortletWrappingController.java        |   4 +-
 .../portlet/mvc/ResourceAwareController.java  |   2 +-
 .../web/portlet/mvc/SimpleFormController.java |  88 ++++-----
 .../AnnotationMethodHandlerAdapter.java       |  12 +-
 ...otationMethodHandlerExceptionResolver.java |   2 +-
 .../DefaultAnnotationHandlerMapping.java      |   6 +-
 .../web/portlet/mvc/package-info.java         |   7 +-
 .../web/portlet/util/PortletUtils.java        |  28 +--
 .../web/DelegatingServletOutputStream.java    |   4 +-
 .../mock/web/HeaderValueHolder.java           |   2 +-
 .../mock/web/MockHttpServletResponse.java     |  10 +-
 .../servlet/view/tiles3/TilesConfigurer.java  |   2 +-
 .../web/servlet/DispatcherServlet.java        |  24 +--
 .../web/servlet/FrameworkServlet.java         |  28 +--
 .../web/servlet/HandlerAdapter.java           |  14 +-
 .../web/servlet/HandlerExceptionResolver.java |   4 +-
 .../web/servlet/HandlerExecutionChain.java    |   6 +-
 .../web/servlet/HandlerInterceptor.java       |  10 +-
 .../web/servlet/HandlerMapping.java           |   8 +-
 .../web/servlet/HttpServletBean.java          |  10 +-
 .../web/servlet/LocaleResolver.java           |  10 +-
 .../web/servlet/ModelAndView.java             |  34 ++--
 .../servlet/RequestToViewNameTranslator.java  |   2 +-
 .../web/servlet/ResourceServlet.java          |  12 +-
 .../org/springframework/web/servlet/View.java |   4 +-
 .../web/servlet/ViewRendererServlet.java      |   2 +-
 .../web/servlet/ViewResolver.java             |   6 +-
 .../AbstractDetectingUrlHandlerMapping.java   |   2 +-
 .../AbstractHandlerExceptionResolver.java     |   8 +-
 .../handler/AbstractHandlerMapping.java       |  26 +--
 ...bstractHandlerMethodExceptionResolver.java |   4 +-
 .../handler/AbstractUrlHandlerMapping.java    |  10 +-
 .../ConversionServiceExposingInterceptor.java |   2 +-
 .../handler/HandlerInterceptorAdapter.java    |   2 +-
 .../SimpleMappingExceptionResolver.java       |  14 +-
 .../handler/SimpleServletHandlerAdapter.java  |   2 +-
 .../handler/SimpleServletPostProcessor.java   |   6 +-
 .../handler/SimpleUrlHandlerMapping.java      |   8 +-
 .../i18n/AcceptHeaderLocaleResolver.java      |   2 +-
 .../servlet/i18n/CookieLocaleResolver.java    |   2 +-
 .../web/servlet/i18n/FixedLocaleResolver.java |   2 +-
 .../servlet/i18n/SessionLocaleResolver.java   |   6 +-
 .../mvc/AbstractCommandController.java        |   4 +-
 .../web/servlet/mvc/AbstractController.java   |  16 +-
 .../servlet/mvc/AbstractFormController.java   |  48 ++---
 .../mvc/AbstractUrlViewController.java        |   8 +-
 .../mvc/AbstractWizardFormController.java     |  34 ++--
 .../servlet/mvc/BaseCommandController.java    |  26 +--
 .../mvc/CancellableFormController.java        |  40 ++--
 .../web/servlet/mvc/Controller.java           |  16 +-
 .../web/servlet/mvc/LastModified.java         |   6 +-
 .../mvc/ParameterizableViewController.java    |   2 +-
 .../mvc/ServletForwardingController.java      |   6 +-
 .../mvc/ServletWrappingController.java        |   4 +-
 .../web/servlet/mvc/SimpleFormController.java |  36 ++--
 .../mvc/UrlFilenameViewController.java        |  18 +-
 .../servlet/mvc/WebContentInterceptor.java    |   2 +-
 .../AnnotationMethodHandlerAdapter.java       |  16 +-
 ...otationMethodHandlerExceptionResolver.java |   2 +-
 .../DefaultAnnotationHandlerMapping.java      |   2 +-
 .../ResponseStatusExceptionResolver.java      |   4 +-
 .../method/AbstractHandlerMethodAdapter.java  |   2 +-
 .../ExtendedServletRequestDataBinder.java     |   4 +-
 .../RequestMappingHandlerAdapter.java         |  10 +-
 .../web/servlet/mvc/method/package-info.java  |   3 +-
 .../AbstractUrlMethodNameResolver.java        |   6 +-
 .../InternalPathMethodNameResolver.java       |   2 +-
 .../mvc/multiaction/MethodNameResolver.java   |   2 +-
 .../multiaction/MultiActionController.java    |  38 ++--
 .../ParameterMethodNameResolver.java          |   6 +-
 .../PropertiesMethodNameResolver.java         |   6 +-
 .../web/servlet/mvc/package-info.java         |   7 +-
 .../AbstractControllerUrlHandlerMapping.java  |   2 +-
 .../AnnotationControllerTypePredicate.java    |   2 +-
 .../ControllerBeanNameHandlerMapping.java     |   2 +-
 .../ControllerClassNameHandlerMapping.java    |  20 +-
 .../DefaultHandlerExceptionResolver.java      |   4 +-
 .../resource/ResourceHttpRequestHandler.java  |   8 +-
 .../web/servlet/support/BindStatus.java       |  20 +-
 .../support/JspAwareRequestContext.java       |   8 +-
 .../web/servlet/support/JstlUtils.java        |   4 +-
 .../web/servlet/support/RequestContext.java   |  58 +++---
 .../servlet/support/RequestContextUtils.java  |   6 +-
 .../servlet/support/WebContentGenerator.java  |   8 +-
 .../web/servlet/tags/BindTag.java             |   6 +-
 .../web/servlet/tags/EditorAwareTag.java      |   2 +-
 .../servlet/tags/HtmlEscapingAwareTag.java    |   4 +-
 .../web/servlet/tags/MessageTag.java          |   2 +-
 .../web/servlet/tags/ParamAware.java          |   4 +-
 .../servlet/tags/RequestContextAwareTag.java  |   4 +-
 .../web/servlet/tags/TransformTag.java        |   2 +-
 .../web/servlet/tags/UrlTag.java              |   4 +-
 .../tags/form/AbstractCheckedElementTag.java  |  22 +--
 .../form/AbstractDataBoundFormElementTag.java |  18 +-
 .../servlet/tags/form/AbstractFormTag.java    |  14 +-
 .../tags/form/AbstractHtmlElementBodyTag.java |   2 +-
 .../tags/form/AbstractHtmlElementTag.java     |  64 +++----
 .../form/AbstractHtmlInputElementTag.java     |  36 ++--
 .../form/AbstractMultiCheckedElementTag.java  |  46 ++---
 .../form/AbstractSingleCheckedElementTag.java |  18 +-
 .../web/servlet/tags/form/ButtonTag.java      |  24 +--
 .../web/servlet/tags/form/CheckboxTag.java    |  12 +-
 .../web/servlet/tags/form/CheckboxesTag.java  |   4 +-
 .../web/servlet/tags/form/ErrorsTag.java      |  32 ++--
 .../web/servlet/tags/form/FormTag.java        |  56 +++---
 .../web/servlet/tags/form/HiddenInputTag.java |  10 +-
 .../web/servlet/tags/form/InputTag.java       |  36 ++--
 .../web/servlet/tags/form/LabelTag.java       |  30 +--
 .../web/servlet/tags/form/OptionTag.java      |  40 ++--
 .../web/servlet/tags/form/OptionWriter.java   |  62 +++---
 .../web/servlet/tags/form/OptionsTag.java     |  40 ++--
 .../servlet/tags/form/PasswordInputTag.java   |  12 +-
 .../web/servlet/tags/form/RadioButtonTag.java |   4 +-
 .../servlet/tags/form/RadioButtonsTag.java    |   4 +-
 .../web/servlet/tags/form/SelectTag.java      |  64 +++----
 .../tags/form/SelectedValueComparator.java    |  20 +-
 .../web/servlet/tags/form/TagIdGenerator.java |   8 +-
 .../web/servlet/tags/form/TagWriter.java      |   2 +-
 .../web/servlet/tags/form/TextareaTag.java    |  14 +-
 .../web/servlet/tags/form/ValueFormatter.java |   6 +-
 .../web/servlet/tags/form/package-info.java   |   3 +-
 .../web/servlet/tags/package-info.java        |   3 +-
 .../servlet/theme/CookieThemeResolver.java    |   2 +-
 .../web/servlet/theme/FixedThemeResolver.java |   2 +-
 .../servlet/theme/SessionThemeResolver.java   |   4 +-
 .../web/servlet/theme/package-info.java       |  13 +-
 .../view/AbstractCachingViewResolver.java     |   6 +-
 .../servlet/view/AbstractUrlBasedView.java    |   6 +-
 .../web/servlet/view/AbstractView.java        |  16 +-
 .../view/ContentNegotiatingViewResolver.java  |   4 +-
 .../DefaultRequestToViewNameTranslator.java   |   4 +-
 .../servlet/view/InternalResourceView.java    |  16 +-
 .../view/InternalResourceViewResolver.java    |   4 +-
 .../web/servlet/view/JstlView.java            |   8 +-
 .../web/servlet/view/RedirectView.java        |  16 +-
 .../view/ResourceBundleViewResolver.java      |  36 ++--
 .../servlet/view/UrlBasedViewResolver.java    |  22 +--
 .../view/document/AbstractPdfView.java        |  16 +-
 .../view/freemarker/FreeMarkerView.java       |   6 +-
 ...AbstractJasperReportsSingleFormatView.java |  16 +-
 .../AbstractJasperReportsView.java            | 180 +++++++++---------
 .../ConfigurableJasperReportsView.java        |   8 +-
 .../jasperreports/JasperReportsCsvView.java   |   2 +-
 .../jasperreports/JasperReportsHtmlView.java  |   2 +-
 .../JasperReportsMultiFormatView.java         |  46 ++---
 .../jasperreports/JasperReportsPdfView.java   |   2 +-
 .../JasperReportsViewResolver.java            |  10 +-
 .../jasperreports/JasperReportsXlsView.java   |   2 +-
 .../servlet/view/tiles2/TilesConfigurer.java  |   2 +-
 .../view/velocity/VelocityConfigurer.java     |   4 +-
 .../view/velocity/VelocityLayoutView.java     |  12 +-
 .../velocity/VelocityLayoutViewResolver.java  |   4 +-
 .../servlet/view/velocity/VelocityView.java   |  26 +--
 .../view/velocity/VelocityViewResolver.java   |   4 +-
 .../web/servlet/view/xml/MarshallingView.java |   6 +-
 .../servlet/view/xslt/AbstractXsltView.java   |  38 ++--
 .../web/servlet/view/xslt/XsltView.java       |  16 +-
 .../servlet/view/xslt/XsltViewResolver.java   |   4 +-
 .../web/servlet/tags/form/SelectTagTests.java |   8 +-
 .../web/servlet/tags/form/TestTypes.java      |   2 +-
 1503 files changed, 8001 insertions(+), 8060 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/Advisor.java b/spring-aop/src/main/java/org/springframework/aop/Advisor.java
index ff4e1745d8..8fe320c032 100644
--- a/spring-aop/src/main/java/org/springframework/aop/Advisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/Advisor.java
@@ -50,7 +50,7 @@ public interface Advisor {
 	 * (for example, creating a mixin) or shared with all instances of
 	 * the advised class obtained from the same Spring bean factory.
 	 * <p><b>Note that this method is not currently used by the framework.</b>
-	 * Typical Advisor implementations always return <code>true</code>.
+	 * Typical Advisor implementations always return {@code true}.
 	 * Use singleton/prototype bean definitions or appropriate programmatic
 	 * proxy creation to ensure that Advisors have the correct lifecycle model.
 	 * @return whether this advice is associated with a particular target instance
diff --git a/spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java b/spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java
index ac4b9ba227..f79397741e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java
@@ -33,7 +33,7 @@ public interface AfterReturningAdvice extends AfterAdvice {
 	 * @param returnValue the value returned by the method, if any
 	 * @param method method being invoked
 	 * @param args arguments to the method
-	 * @param target target of the method invocation. May be <code>null</code>.
+	 * @param target target of the method invocation. May be {@code null}.
 	 * @throws Throwable if this object wishes to abort the call.
 	 * Any exception thrown will be returned to the caller if it's
 	 * allowed by the method signature. Otherwise the exception
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 1363960890..0ab9dd6b9b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java
@@ -33,10 +33,10 @@ public interface IntroductionAwareMethodMatcher extends MethodMatcher {
 	 * instead of the 2-arg {@link #matches(java.lang.reflect.Method, Class)} method
 	 * if the caller supports the extended IntroductionAwareMethodMatcher interface.
 	 * @param method the candidate method
-	 * @param targetClass the target class (may be <code>null</code>, in which case
+	 * @param targetClass the target class (may be {@code null}, in which case
 	 * the candidate class must be taken to be the method's declaring class)
-	 * @param hasIntroductions <code>true</code> if the object on whose behalf we are
-	 * asking is the subject on one or more introductions; <code>false</code> otherwise
+	 * @param hasIntroductions {@code true} if the object on whose behalf we are
+	 * 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);
diff --git a/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java b/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java
index 63ee9c9dff..cf3c87d2d1 100644
--- a/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java
@@ -33,7 +33,7 @@ public interface MethodBeforeAdvice extends BeforeAdvice {
 	 * Callback before a given method is invoked.
 	 * @param method method being invoked
 	 * @param args arguments to the method
-	 * @param target target of the method invocation. May be <code>null</code>.
+	 * @param target target of the method invocation. May be {@code null}.
 	 * @throws Throwable if this object wishes to abort the call.
 	 * Any exception thrown will be returned to the caller if it's
 	 * allowed by the method signature. Otherwise the exception
diff --git a/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java
index 40ebad2777..af2fb26fc1 100644
--- a/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java
@@ -26,15 +26,15 @@ import java.lang.reflect.Method;
  * also makes arguments for a particular call available, and any effects of running
  * previous advice applying to the joinpoint.
  *
- * <p>If an implementation returns <code>false</code> from its {@link #isRuntime()}
+ * <p>If an implementation returns {@code false} from its {@link #isRuntime()}
  * method, evaluation can be performed statically, and the result will be the same
  * for all invocations of this method, whatever their arguments. This means that
- * if the {@link #isRuntime()} method returns <code>false</code>, the 3-arg
+ * if the {@link #isRuntime()} method returns {@code false}, the 3-arg
  * {@link #matches(java.lang.reflect.Method, Class, Object[])} method will never be invoked.
  *
- * <p>If an implementation returns <code>true</code> from its 2-arg
+ * <p>If an implementation returns {@code true} from its 2-arg
  * {@link #matches(java.lang.reflect.Method, Class)} method and its {@link #isRuntime()} method
- * returns <code>true</code>, the 3-arg {@link #matches(java.lang.reflect.Method, Class, Object[])}
+ * returns {@code true}, the 3-arg {@link #matches(java.lang.reflect.Method, Class, Object[])}
  * method will be invoked <i>immediately before each potential execution of the related advice</i>,
  * to decide whether the advice should run. All previous advice, such as earlier interceptors
  * in an interceptor chain, will have run, so any state changes they have produced in
@@ -49,11 +49,11 @@ public interface MethodMatcher {
 
 	/**
 	 * Perform static checking whether the given method matches. If this
-	 * returns <code>false</code> or if the {@link #isRuntime()} method
-	 * returns <code>false</code>, no runtime check (i.e. no.
+	 * returns {@code false} or if the {@link #isRuntime()} method
+	 * returns {@code false}, no runtime check (i.e. no.
 	 * {@link #matches(java.lang.reflect.Method, Class, Object[])} call) will be made.
 	 * @param method the candidate method
-	 * @param targetClass the target class (may be <code>null</code>, in which case
+	 * @param targetClass the target class (may be {@code null}, in which case
 	 * the candidate class must be taken to be the method's declaring class)
 	 * @return whether or not this method matches statically
 	 */
@@ -62,7 +62,7 @@ public interface MethodMatcher {
 	/**
 	 * Is this MethodMatcher dynamic, that is, must a final call be made on the
 	 * {@link #matches(java.lang.reflect.Method, Class, Object[])} method at
-	 * runtime even if the 2-arg matches method returns <code>true</code>?
+	 * runtime even if the 2-arg matches method returns {@code true}?
 	 * <p>Can be invoked when an AOP proxy is created, and need not be invoked
 	 * again before each method invocation,
 	 * @return whether or not a runtime match via the 3-arg
@@ -75,12 +75,12 @@ public interface MethodMatcher {
 	 * Check whether there a runtime (dynamic) match for this method,
 	 * which must have matched statically.
 	 * <p>This method is invoked only if the 2-arg matches method returns
-	 * <code>true</code> for the given method and target class, and if the
-	 * {@link #isRuntime()} method returns <code>true</code>. Invoked
+	 * {@code true} for the given method and target class, and if the
+	 * {@link #isRuntime()} method returns {@code true}. Invoked
 	 * immediately before potential running of the advice, after any
 	 * advice earlier in the advice chain has run.
 	 * @param method the candidate method
-	 * @param targetClass the target class (may be <code>null</code>, in which case
+	 * @param targetClass the target class (may be {@code null}, in which case
 	 * the candidate class must be taken to be the method's declaring class)
 	 * @param args arguments to the method
 	 * @return whether there's a runtime match
diff --git a/spring-aop/src/main/java/org/springframework/aop/Pointcut.java b/spring-aop/src/main/java/org/springframework/aop/Pointcut.java
index cebbfa023c..05addda78b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/Pointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/Pointcut.java
@@ -34,13 +34,13 @@ public interface Pointcut {
 
 	/**
 	 * Return the ClassFilter for this pointcut.
-	 * @return the ClassFilter (never <code>null</code>)
+	 * @return the ClassFilter (never {@code null})
 	 */
 	ClassFilter getClassFilter();
 
 	/**
 	 * Return the MethodMatcher for this pointcut.
-	 * @return the MethodMatcher (never <code>null</code>)
+	 * @return the MethodMatcher (never {@code null})
 	 */
 	MethodMatcher getMethodMatcher();
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java
index 00015a5d9e..e49c697f3c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java
+++ b/spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java
@@ -40,22 +40,22 @@ public interface ProxyMethodInvocation extends MethodInvocation {
 	Object getProxy();
 
 	/**
-	 * Create a clone of this object. If cloning is done before <code>proceed()</code>
-	 * is invoked on this object, <code>proceed()</code> can be invoked once per clone
+	 * Create a clone of this object. If cloning is done before {@code proceed()}
+	 * is invoked on this object, {@code proceed()} can be invoked once per clone
 	 * to invoke the joinpoint (and the rest of the advice chain) more than once.
 	 * @return an invocable clone of this invocation.
-	 * <code>proceed()</code> can be called once per clone.
+	 * {@code proceed()} can be called once per clone.
 	 */
 	MethodInvocation invocableClone();
 
 	/**
-	 * Create a clone of this object. If cloning is done before <code>proceed()</code>
-	 * is invoked on this object, <code>proceed()</code> can be invoked once per clone
+	 * Create a clone of this object. If cloning is done before {@code proceed()}
+	 * is invoked on this object, {@code proceed()} can be invoked once per clone
 	 * to invoke the joinpoint (and the rest of the advice chain) more than once.
 	 * @param arguments the arguments that the cloned invocation is supposed to use,
 	 * overriding the original arguments
 	 * @return an invocable clone of this invocation.
-	 * <code>proceed()</code> can be called once per clone.
+	 * {@code proceed()} can be called once per clone.
 	 */
 	MethodInvocation invocableClone(Object[] arguments);
 
@@ -71,14 +71,14 @@ public interface ProxyMethodInvocation extends MethodInvocation {
 	 * <p>Such attributes are not used within the AOP framework itself. They are
 	 * just kept as part of the invocation object, for use in special interceptors.
 	 * @param key the name of the attribute
-	 * @param value the value of the attribute, or <code>null</code> to reset it
+	 * @param value the value of the attribute, or {@code null} to reset it
 	 */
 	void setUserAttribute(String key, Object value);
 
 	/**
 	 * Return the value of the specified user attribute.
 	 * @param key the name of the attribute
-	 * @return the value of the attribute, or <code>null</code> if not set
+	 * @return the value of the attribute, or {@code null} if not set
 	 * @see #setUserAttribute
 	 */
 	Object getUserAttribute(String key);
diff --git a/spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java b/spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java
index 5334ae26ff..53f308b332 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java
@@ -32,7 +32,7 @@ public interface TargetClassAware {
 	/**
 	 * Return the target class behind the implementing object
 	 * (typically a proxy configuration or an actual proxy).
-	 * @return the target Class, or <code>null</code> if not known
+	 * @return the target Class, or {@code null} if not known
 	 */
 	Class<?> getTargetClass();
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/TargetSource.java b/spring-aop/src/main/java/org/springframework/aop/TargetSource.java
index f5be5fdb9b..bd3185952f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TargetSource.java
@@ -17,16 +17,16 @@
 package org.springframework.aop;
 
 /**
- * A <code>TargetSource</code> is used to obtain the current "target" of
+ * A {@code TargetSource} is used to obtain the current "target" of
  * an AOP invocation, which will be invoked via reflection if no around
  * advice chooses to end the interceptor chain itself.
  *
- * <p>If a <code>TargetSource</code> is "static", it will always return
+ * <p>If a {@code TargetSource} is "static", it will always return
  * the same target, allowing optimizations in the AOP framework. Dynamic
  * target sources can support pooling, hot swapping, etc.
  *
  * <p>Application developers don't usually need to work with
- * <code>TargetSources</code> directly: this is an AOP framework interface.
+ * {@code TargetSources} directly: this is an AOP framework interface.
  *
  * @author Rod Johnson
  */
@@ -34,8 +34,8 @@ public interface TargetSource extends TargetClassAware {
 
 	/**
 	 * Return the type of targets returned by this {@link TargetSource}.
-	 * <p>Can return <code>null</code>, although certain usages of a
-	 * <code>TargetSource</code> might just work with a predetermined
+	 * <p>Can return {@code null}, although certain usages of a
+	 * {@code TargetSource} might just work with a predetermined
 	 * target class.
 	 * @return the type of targets returned by this {@link TargetSource}
 	 */
@@ -46,7 +46,7 @@ public interface TargetSource extends TargetClassAware {
 	 * <p>In that case, there will be no need to invoke
 	 * {@link #releaseTarget(Object)}, and the AOP framework can cache
 	 * the return value of {@link #getTarget()}.
-	 * @return <code>true</code> if the target is immutable
+	 * @return {@code true} if the target is immutable
 	 * @see #getTarget
 	 */
 	boolean isStatic();
diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
index 4cf96a3fca..b510df206f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
@@ -40,7 +40,7 @@ class TrueClassFilter implements ClassFilter, Serializable {
 	/**
 	 * Required to support serialization. Replaces with canonical
 	 * instance on deserialization, protecting Singleton pattern.
-	 * Alternative to overriding <code>equals()</code>.
+	 * Alternative to overriding {@code equals()}.
 	 */
 	private Object readResolve() {
 		return INSTANCE;
diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
index 53e50f3c83..d6d67efc72 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
@@ -50,7 +50,7 @@ class TrueMethodMatcher implements MethodMatcher, Serializable {
 	/**
 	 * Required to support serialization. Replaces with canonical
 	 * instance on deserialization, protecting Singleton pattern.
-	 * Alternative to overriding <code>equals()</code>.
+	 * Alternative to overriding {@code equals()}.
 	 */
 	private Object readResolve() {
 		return INSTANCE;
diff --git a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
index 87365aa1ef..c286cb1809 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
@@ -44,7 +44,7 @@ class TruePointcut implements Pointcut, Serializable {
 	/**
 	 * Required to support serialization. Replaces with canonical
 	 * instance on deserialization, protecting Singleton pattern.
-	 * Alternative to overriding <code>equals()</code>.
+	 * Alternative to overriding {@code equals()}.
 	 */
 	private Object readResolve() {
 		return INSTANCE;
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 734f4befb6..515358c3e3 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
@@ -347,8 +347,8 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 	 * on subsequent advice invocations can be as fast as possible.
 	 * <p>If the first argument is of type JoinPoint or ProceedingJoinPoint then we
 	 * pass a JoinPoint in that position (ProceedingJoinPoint for around advice).
-	 * <p>If the first argument is of type <code>JoinPoint.StaticPart</code>
-	 * then we pass a <code>JoinPoint.StaticPart</code> in that position.
+	 * <p>If the first argument is of type {@code JoinPoint.StaticPart}
+	 * then we pass a {@code JoinPoint.StaticPart} in that position.
 	 * <p>Remaining arguments have to be bound by pointcut evaluation at
 	 * a given join point. We will get back a map from argument name to
 	 * value. We need to calculate which advice parameter needs to be bound
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java
index 0794a3fe1b..3c16911977 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java
@@ -34,13 +34,13 @@ public interface AspectInstanceFactory extends Ordered {
 
 	/**
 	 * Create an instance of this factory's aspect.
-	 * @return the aspect instance (never <code>null</code>)
+	 * @return the aspect instance (never {@code null})
 	 */
 	Object getAspectInstance();
 
 	/**
 	 * Expose the aspect class loader that this factory uses.
-	 * @return the aspect class loader (never <code>null</code>)
+	 * @return the aspect class loader (never {@code null})
 	 */
 	ClassLoader getAspectClassLoader();
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
index 7a9dba9612..66a04dc022 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
@@ -36,82 +36,82 @@ import org.springframework.util.StringUtils;
 /**
  * {@link ParameterNameDiscoverer} implementation that tries to deduce parameter names
  * for an advice method from the pointcut expression, returning, and throwing clauses.
- * If an unambiguous interpretation is not available, it returns <code>null</code>.
+ * If an unambiguous interpretation is not available, it returns {@code null}.
  *
  * <p>This class interprets arguments in the following way:
  * <ol>
  * <li>If the first parameter of the method is of type {@link JoinPoint}
  * or {@link ProceedingJoinPoint}, it is assumed to be for passing
- * <code>thisJoinPoint</code> to the advice, and the parameter name will
- * be assigned the value <code>"thisJoinPoint"</code>.</li>
+ * {@code thisJoinPoint} to the advice, and the parameter name will
+ * be assigned the value {@code "thisJoinPoint"}.</li>
  * <li>If the first parameter of the method is of type
- * <code>JoinPoint.StaticPart</code>, it is assumed to be for passing
- * <code>"thisJoinPointStaticPart"</code> to the advice, and the parameter name
- * will be assigned the value <code>"thisJoinPointStaticPart"</code>.</li>
+ * {@code JoinPoint.StaticPart}, it is assumed to be for passing
+ * {@code "thisJoinPointStaticPart"} to the advice, and the parameter name
+ * will be assigned the value {@code "thisJoinPointStaticPart"}.</li>
  * <li>If a {@link #setThrowingName(String) throwingName} has been set, and
- * there are no unbound arguments of type <code>Throwable+</code>, then an
+ * there are no unbound arguments of type {@code Throwable+}, then an
  * {@link IllegalArgumentException} is raised. If there is more than one
- * unbound argument of type <code>Throwable+</code>, then an
+ * unbound argument of type {@code Throwable+}, then an
  * {@link AmbiguousBindingException} is raised. If there is exactly one
- * unbound argument of type <code>Throwable+</code>, then the corresponding
+ * unbound argument of type {@code Throwable+}, then the corresponding
  * parameter name is assigned the value &lt;throwingName&gt;.</li>
  * <li>If there remain unbound arguments, then the pointcut expression is
- * examined. Let <code>a</code> be the number of annotation-based pointcut
+ * examined. Let {@code a} be the number of annotation-based pointcut
  * expressions (&#64;annotation, &#64;this, &#64;target, &#64;args,
  * &#64;within, &#64;withincode) that are used in binding form. Usage in
  * binding form has itself to be deduced: if the expression inside the
  * pointcut is a single string literal that meets Java variable name
- * conventions it is assumed to be a variable name. If <code>a</code> is
- * zero we proceed to the next stage. If <code>a</code> &gt; 1 then an
- * <code>AmbiguousBindingException</code> is raised. If <code>a</code> == 1,
- * and there are no unbound arguments of type <code>Annotation+</code>,
- * then an <code>IllegalArgumentException</code> is raised. if there is
+ * conventions it is assumed to be a variable name. If {@code a} is
+ * zero we proceed to the next stage. If {@code a} &gt; 1 then an
+ * {@code AmbiguousBindingException} is raised. If {@code a} == 1,
+ * and there are no unbound arguments of type {@code Annotation+},
+ * then an {@code IllegalArgumentException} is raised. if there is
  * exactly one such argument, then the corresponding parameter name is
  * assigned the value from the pointcut expression.</li>
  * <li>If a returningName has been set, and there are no unbound arguments
- * then an <code>IllegalArgumentException</code> is raised. If there is
+ * then an {@code IllegalArgumentException} is raised. If there is
  * more than one unbound argument then an
- * <code>AmbiguousBindingException</code> is raised. If there is exactly
+ * {@code AmbiguousBindingException} is raised. If there is exactly
  * one unbound argument then the corresponding parameter name is assigned
  * the value &lt;returningName&gt;.</li>
  * <li>If there remain unbound arguments, then the pointcut expression is
- * examined once more for <code>this</code>, <code>target</code>, and
- * <code>args</code> pointcut expressions used in the binding form (binding
+ * examined once more for {@code this}, {@code target}, and
+ * {@code args} pointcut expressions used in the binding form (binding
  * forms are deduced as described for the annotation based pointcuts). If
  * there remains more than one unbound argument of a primitive type (which
- * can only be bound in <code>args</code>) then an
- * <code>AmbiguousBindingException</code> is raised. If there is exactly
- * one argument of a primitive type, then if exactly one <code>args</code>
+ * can only be bound in {@code args}) then an
+ * {@code AmbiguousBindingException} is raised. If there is exactly
+ * one argument of a primitive type, then if exactly one {@code args}
  * bound variable was found, we assign the corresponding parameter name
- * the variable name. If there were no <code>args</code> bound variables
- * found an <code>IllegalStateException</code> is raised. If there are
- * multiple <code>args</code> bound variables, an
- * <code>AmbiguousBindingException</code> is raised. At this point, if
+ * the variable name. If there were no {@code args} bound variables
+ * found an {@code IllegalStateException} is raised. If there are
+ * multiple {@code args} bound variables, an
+ * {@code AmbiguousBindingException} is raised. At this point, if
  * there remains more than one unbound argument we raise an
- * <code>AmbiguousBindingException</code>. If there are no unbound arguments
+ * {@code AmbiguousBindingException}. If there are no unbound arguments
  * remaining, we are done. If there is exactly one unbound argument
  * remaining, and only one candidate variable name unbound from
- * <code>this</code>, <code>target</code>, or <code>args</code>, it is
+ * {@code this}, {@code target}, or {@code args}, it is
  * assigned as the corresponding parameter name. If there are multiple
- * possibilities, an <code>AmbiguousBindingException</code> is raised.</li>
+ * possibilities, an {@code AmbiguousBindingException} is raised.</li>
  * </ol>
  *
- * <p>The behavior on raising an <code>IllegalArgumentException</code> or
- * <code>AmbiguousBindingException</code> is configurable to allow this discoverer
+ * <p>The behavior on raising an {@code IllegalArgumentException} or
+ * {@code AmbiguousBindingException} is configurable to allow this discoverer
  * to be used as part of a chain-of-responsibility. By default the condition will
- * be logged and the <code>getParameterNames(..)</code> method will simply return
- * <code>null</code>. If the {@link #setRaiseExceptions(boolean) raiseExceptions}
- * property is set to <code>true</code>, the conditions will be thrown as
- * <code>IllegalArgumentException</code> and <code>AmbiguousBindingException</code>,
+ * be logged and the {@code getParameterNames(..)} method will simply return
+ * {@code null}. If the {@link #setRaiseExceptions(boolean) raiseExceptions}
+ * property is set to {@code true}, the conditions will be thrown as
+ * {@code IllegalArgumentException} and {@code AmbiguousBindingException},
  * respectively.
  *
  * <p>Was that perfectly clear? ;)
  *
  * <p>Short version: If an unambiguous binding can be deduced, then it is.
- * If the advice requirements cannot possibly be satisfied, then <code>null</code>
+ * If the advice requirements cannot possibly be satisfied, then {@code null}
  * is returned. By setting the {@link #setRaiseExceptions(boolean) raiseExceptions}
- * property to <code>true</code>, descriptive exceptions will be thrown instead of
- * returning <code>null</code> in the case that the parameter names cannot be discovered.
+ * property to {@code true}, descriptive exceptions will be thrown instead of
+ * returning {@code null} in the case that the parameter names cannot be discovered.
  *
  * @author Adrian Colyer
  * @since 2.0
@@ -191,14 +191,14 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	/**
 	 * Indicate whether {@link IllegalArgumentException} and {@link AmbiguousBindingException}
 	 * must be thrown as appropriate in the case of failing to deduce advice parameter names.
-	 * @param raiseExceptions <code>true</code> if exceptions are to be thrown
+	 * @param raiseExceptions {@code true} if exceptions are to be thrown
 	 */
 	public void setRaiseExceptions(boolean raiseExceptions) {
 		this.raiseExceptions = raiseExceptions;
 	}
 
 	/**
-	 * If <code>afterReturning</code> advice binds the return value, the
+	 * If {@code afterReturning} advice binds the return value, the
 	 * returning variable name must be specified.
 	 * @param returningName the name of the returning variable
 	 */
@@ -207,7 +207,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	}
 
 	/**
-	 * If <code>afterThrowing</code> advice binds the thrown value, the
+	 * If {@code afterThrowing} advice binds the thrown value, the
 	 * throwing variable name must be specified.
 	 * @param throwingName the name of the throwing variable
 	 */
@@ -305,9 +305,9 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 
 	/**
 	 * An advice method can never be a constructor in Spring.
-	 * @return <code>null</code>
+	 * @return {@code null}
 	 * @throws UnsupportedOperationException if
-	 * {@link #setRaiseExceptions(boolean) raiseExceptions} has been set to <code>true</code>
+	 * {@link #setRaiseExceptions(boolean) raiseExceptions} has been set to {@code true}
 	 */
 	public String[] getParameterNames(Constructor ctor) {
 		if (this.raiseExceptions) {
@@ -493,7 +493,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	}
 
 	/**
-	 * Given an args pointcut body (could be <code>args</code> or <code>at_args</code>),
+	 * Given an args pointcut body (could be {@code args} or {@code at_args}),
 	 * add any candidate variable names to the given list.
 	 */
 	private void maybeExtractVariableNamesFromArgs(String argsSpec, List<String> varNames) {
@@ -726,7 +726,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	}
 
 	/*
-	 * Return <code>true</code> if the given argument type is a subclass
+	 * Return {@code true} if the given argument type is a subclass
 	 * of the given supertype.
 	 */
 	private boolean isSubtypeOf(Class supertype, int argumentNumber) {
@@ -755,7 +755,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 
 	/*
 	 * Find the argument index with the given type, and bind the given
-	 * <code>varName</code> in that position.
+	 * {@code varName} in that position.
 	 */
 	private void findAndBind(Class argumentType, String varName) {
 		for (int i = 0; i < this.argumentTypes.length; i++) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java
index d8fe47d3e6..16308507e1 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java
@@ -32,7 +32,7 @@ import org.springframework.aop.BeforeAdvice;
 public abstract class AspectJAopUtils {
 
 	/**
-	 * Return <code>true</code> if the advisor is a form of before advice.
+	 * Return {@code true} if the advisor is a form of before advice.
 	 */
 	public static boolean isBeforeAdvice(Advisor anAdvisor) {
 		AspectJPrecedenceInformation precedenceInfo = getAspectJPrecedenceInformationFor(anAdvisor);
@@ -43,7 +43,7 @@ public abstract class AspectJAopUtils {
 	}
 
 	/**
-	 * Return <code>true</code> if the advisor is a form of after advice.
+	 * Return {@code true} if the advisor is a form of after advice.
 	 */
 	public static boolean isAfterAdvice(Advisor anAdvisor) {
 		AspectJPrecedenceInformation precedenceInfo = getAspectJPrecedenceInformationFor(anAdvisor);
@@ -56,7 +56,7 @@ public abstract class AspectJAopUtils {
 	/**
 	 * Return the AspectJPrecedenceInformation provided by this advisor or its advice.
 	 * If neither the advisor nor the advice have precedence information, this method
-	 * will return <code>null</code>.
+	 * will return {@code null}.
 	 */
 	public static AspectJPrecedenceInformation getAspectJPrecedenceInformationFor(Advisor anAdvisor) {
 		if (anAdvisor instanceof AspectJPrecedenceInformation) {
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 f3334ea569..470ed686f3 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
@@ -223,9 +223,9 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 
 	/**
 	 * If a pointcut expression has been specified in XML, the user cannot
-	 * write <code>and</code> as "&&" (though &amp;&amp; will work).
-	 * We also allow <code>and</code> between two pointcut sub-expressions.
-	 * <p>This method converts back to <code>&&</code> for the AspectJ pointcut parser.
+	 * write {@code and} as "&&" (though &amp;&amp; will work).
+	 * We also allow {@code and} between two pointcut sub-expressions.
+	 * <p>This method converts back to {@code &&} for the AspectJ pointcut parser.
 	 */
 	private String replaceBooleanOperators(String pcExpr) {
 		String result = StringUtils.replace(pcExpr, " and ", " && ");
@@ -494,10 +494,10 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 
 
 	/**
-	 * Handler for the Spring-specific <code>bean()</code> pointcut designator
+	 * Handler for the Spring-specific {@code bean()} pointcut designator
 	 * extension to AspectJ.
 	 * <p>This handler must be added to each pointcut object that needs to
-	 * handle the <code>bean()</code> PCD. Matching context is obtained
+	 * handle the {@code bean()} PCD. Matching context is obtained
 	 * automatically by examining a thread local variable and therefore a matching
 	 * context need not be set on the pointcut.
 	 */
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
index 8b39665a05..8d80da138c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
@@ -37,7 +37,7 @@ public abstract class AspectJProxyUtils {
 	 * and make available the current AspectJ JoinPoint. The call will have no effect if there are no
 	 * AspectJ advisors in the advisor chain.
 	 * @param advisors Advisors available
-	 * @return <code>true</code> if any special {@link Advisor Advisors} were added, otherwise <code>false</code>.
+	 * @return {@code true} if any special {@link Advisor Advisors} were added, otherwise {@code false}.
 	 */
 	public static boolean makeAdvisorChainAspectJCapableIfNecessary(List<Advisor> advisors) {
 		// Don't add advisors to an empty list; may indicate that proxying is just not required
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 5732ae1451..c8329e413a 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
@@ -33,7 +33,7 @@ import org.aspectj.bridge.IMessageHandler;
  * <p><code class="code">-XmessageHandlerClass:org.springframework.aop.aspectj.AspectJWeaverMessageHandler</code>
  *
  * <p>to the weaver; for example, specifying the following in a
- * "<code>META-INF/aop.xml</code> file:
+ * "{@code META-INF/aop.xml} file:
  *
  * <p><code class="code">&lt;weaver options="..."/&gt;</code>
  *
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
index b718359ff9..a2e8a6a64c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
@@ -34,11 +34,11 @@ import org.springframework.util.Assert;
  * Implementation of AspectJ ProceedingJoinPoint interface
  * wrapping an AOP Alliance MethodInvocation.
  *
- * <p><b>Note</b>: the <code>getThis()</code> method returns the current Spring AOP proxy.
- * The <code>getTarget()</code> method returns the current Spring AOP target (which may be
- * <code>null</code> if there is no target), and is a plain POJO without any advice.
+ * <p><b>Note</b>: the {@code getThis()} method returns the current Spring AOP proxy.
+ * The {@code getTarget()} method returns the current Spring AOP target (which may be
+ * {@code null} if there is no target), and is a plain POJO without any advice.
  * <b>If you want to call the object and have the advice take effect, use
- * <code>getThis()</code>.</b> A common example is casting the object to an
+ * {@code getThis()}.</b> A common example is casting the object to an
  * introduced interface in the implementation of an introduction.
  *
  * <p>Of course there is no such distinction between target and proxy in AspectJ.
@@ -92,14 +92,14 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 	}
 
 	/**
-	 * Returns the Spring AOP proxy. Cannot be <code>null</code>.
+	 * Returns the Spring AOP proxy. Cannot be {@code null}.
 	 */
 	public Object getThis() {
 		return this.methodInvocation.getProxy();
 	}
 
 	/**
-	 * Returns the Spring AOP target. May be <code>null</code> if there is no target.
+	 * Returns the Spring AOP target. May be {@code null} if there is no target.
 	 */
 	public Object getTarget() {
 		return this.methodInvocation.getThis();
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 208c65cb82..4cc0b44f74 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
@@ -44,7 +44,7 @@ import org.springframework.util.ReflectionUtils;
  * <p>It relies on implementation specific knowledge in AspectJ to break
  * encapsulation and do something AspectJ was not designed to do: query
  * the types of runtime tests that will be performed. The code here should
- * migrate to <code>ShadowMatch.getVariablesInvolvedInRuntimeTest()</code>
+ * migrate to {@code ShadowMatch.getVariablesInvolvedInRuntimeTest()}
  * or some similar operation.
  *
  * <p>See <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=151593"/>.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java
index 8c0f70fe98..3316e76582 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java
@@ -42,7 +42,7 @@ public class SimpleAspectInstanceFactory implements AspectInstanceFactory {
 	}
 
 	/**
-	 * Return the specified aspect class (never <code>null</code>).
+	 * Return the specified aspect class (never {@code null}).
 	 */
 	public final Class getAspectClass() {
 		return this.aspectClass;
@@ -81,7 +81,7 @@ public class SimpleAspectInstanceFactory implements AspectInstanceFactory {
 	 * Determine a fallback order for the case that the aspect instance
 	 * does not express an instance-specific order through implementing
 	 * the {@link org.springframework.core.Ordered} interface.
-	 * <p>The default implementation simply returns <code>Ordered.LOWEST_PRECEDENCE</code>.
+	 * <p>The default implementation simply returns {@code Ordered.LOWEST_PRECEDENCE}.
 	 * @param aspectClass the aspect class
 	 */
 	protected int getOrderForAspectClass(Class<?> aspectClass) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
index c50b359452..58173805d7 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
@@ -71,7 +71,7 @@ public class SingletonAspectInstanceFactory implements AspectInstanceFactory {
 	 * Determine a fallback order for the case that the aspect instance
 	 * does not express an instance-specific order through implementing
 	 * the {@link org.springframework.core.Ordered} interface.
-	 * <p>The default implementation simply returns <code>Ordered.LOWEST_PRECEDENCE</code>.
+	 * <p>The default implementation simply returns {@code Ordered.LOWEST_PRECEDENCE}.
 	 * @param aspectClass the aspect class
 	 */
 	protected int getOrderForAspectClass(Class<?> aspectClass) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
index e6fa6f0dd7..1ae00d2421 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
@@ -50,7 +50,7 @@ public class TypePatternClassFilter implements ClassFilter {
 	 * Create a fully configured {@link TypePatternClassFilter} using the
 	 * given type pattern.
 	 * @param typePattern the type pattern that AspectJ weaver should parse
-	 * @throws IllegalArgumentException if the supplied <code>typePattern</code> is <code>null</code>
+	 * @throws IllegalArgumentException if the supplied {@code typePattern} is {@code null}
 	 * or is recognized as invalid
 	 */
 	public TypePatternClassFilter(String typePattern) {
@@ -68,11 +68,11 @@ public class TypePatternClassFilter implements ClassFilter {
 	 * <code class="code">
 	 * org.springframework.beans.ITestBean+
 	 * </code>
-	 * This will match the <code>ITestBean</code> interface and any class
+	 * This will match the {@code ITestBean} interface and any class
 	 * that implements it.
 	 * <p>These conventions are established by AspectJ, not Spring AOP.
 	 * @param typePattern the type pattern that AspectJ weaver should parse
-	 * @throws IllegalArgumentException if the supplied <code>typePattern</code> is <code>null</code>
+	 * @throws IllegalArgumentException if the supplied {@code typePattern} is {@code null}
 	 * or is recognized as invalid
 	 */
 	public void setTypePattern(String typePattern) {
@@ -102,9 +102,9 @@ public class TypePatternClassFilter implements ClassFilter {
 
 	/**
 	 * If a type pattern has been specified in XML, the user cannot
-	 * write <code>and</code> as "&&" (though &amp;&amp; will work).
-	 * We also allow <code>and</code> between two sub-expressions.
-	 * <p>This method converts back to <code>&&</code> for the AspectJ pointcut parser.
+	 * write {@code and} as "&&" (though &amp;&amp; will work).
+	 * We also allow {@code and} between two sub-expressions.
+	 * <p>This method converts back to {@code &&} for the AspectJ pointcut parser.
 	 */
 	private String replaceBooleanOperators(String pcExpr) {
 		pcExpr = StringUtils.replace(pcExpr," and "," && ");
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 d19a5d7c67..a871be26d3 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
@@ -103,7 +103,7 @@ public class AnnotationAwareAspectJAutoProxyCreator extends AspectJAwareAdvisorA
 	/**
 	 * Check whether the given aspect bean is eligible for auto-proxying.
 	 * <p>If no &lt;aop:include&gt; elements were used then "includePatterns" will be
-	 * <code>null</code> and all beans are included. If "includePatterns" is non-null,
+	 * {@code null} and all beans are included. If "includePatterns" is non-null,
 	 * then one of the patterns must match.
 	 */
 	protected boolean isEligibleAspectBean(String beanName) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java
index d6141af1ab..a85a138ca2 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java
@@ -40,7 +40,7 @@ public interface AspectJAdvisorFactory {
 	/**
 	 * Determine whether or not the given class is an aspect, as reported
 	 * by AspectJ's {@link org.aspectj.lang.reflect.AjTypeSystem}.
-	 * <p>Will simply return <code>false</code> if the supposed aspect is
+	 * <p>Will simply return {@code false} if the supposed aspect is
 	 * invalid (such as an extension of a concrete aspect class).
 	 * Will return true for some aspects that Spring AOP cannot process,
 	 * such as those with unsupported instantiation models.
@@ -75,7 +75,7 @@ public interface AspectJAdvisorFactory {
 	 * @param aif the aspect instance factory
 	 * @param declarationOrderInAspect the declaration order within the aspect
 	 * @param aspectName the name of the aspect
-	 * @return <code>null</code> if the method is not an AspectJ advice method
+	 * @return {@code null} if the method is not an AspectJ advice method
 	 * or if it is a pointcut that will be used by other advice but will not
 	 * create a Spring advice in its own right
 	 */
@@ -89,7 +89,7 @@ public interface AspectJAdvisorFactory {
 	 * @param aif the aspect instance factory
 	 * @param declarationOrderInAspect the declaration order within the aspect
 	 * @param aspectName the name of the aspect
-	 * @return <code>null</code> if the method is not an AspectJ advice method
+	 * @return {@code null} if the method is not an AspectJ advice method
 	 * or if it is a pointcut that will be used by other advice but will not
 	 * create a Spring advice in its own right
 	 * @see org.springframework.aop.aspectj.AspectJAroundAdvice
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java
index cbe06d3c27..f7a264eb37 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java
@@ -72,7 +72,7 @@ public class AspectJProxyFactory extends ProxyCreatorSupport {
 	}
 
 	/**
-	 * Create a new <code>AspectJProxyFactory</code>.
+	 * Create a new {@code AspectJProxyFactory}.
 	 * No target, only interfaces. Must add interceptors.
 	 */
 	public AspectJProxyFactory(Class[] interfaces) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
index 9125cbee2a..3aefe815c9 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
@@ -109,7 +109,7 @@ public class AspectMetadata {
 	}
 
 	/**
-	 * Extract contents from String of form <code>pertarget(contents)</code>.
+	 * Extract contents from String of form {@code pertarget(contents)}.
 	 */
 	private String findPerClause(Class<?> aspectClass) {
 		// TODO when AspectJ provides this, we can remove this hack. Hence we don't
@@ -144,7 +144,7 @@ public class AspectMetadata {
 
 	/**
 	 * Return a Spring pointcut expression for a singleton aspect.
-	 * (e.g. <code>Pointcut.TRUE</code> if it's a singleton).
+	 * (e.g. {@code Pointcut.TRUE} if it's a singleton).
 	 */
 	public Pointcut getPerClausePointcut() {
 		return this.perClausePointcut;
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
index 071468141c..bf1856b6a4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
@@ -103,7 +103,7 @@ class InstantiationModelAwarePointcutAdvisorImpl
 
 	/**
 	 * This is only of interest for Spring AOP: AspectJ instantiation semantics
-	 * are much richer. In AspectJ terminology, all a return of <code>true</code>
+	 * are much richer. In AspectJ terminology, all a return of {@code true}
 	 * means here is that the aspect is not a SINGLETON.
 	 */
 	public boolean isPerInstance() {
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
index 35ade227ce..f8d684bc3b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
@@ -144,7 +144,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	 * for the given introduction field.
 	 * <p>Resulting Advisors will need to be evaluated for targets.
 	 * @param introductionField the field to introspect
-	 * @return <code>null</code> if not an Advisor
+	 * @return {@code null} if not an Advisor
 	 */
 	private Advisor getDeclareParentsAdvisor(Field introductionField) {
 		DeclareParents declareParents = introductionField.getAnnotation(DeclareParents.class);
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 33d19a8811..5bea20f88f 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
@@ -53,7 +53,7 @@ public class SimpleMetadataAwareAspectInstanceFactory extends SimpleAspectInstan
 	 * Determine a fallback order for the case that the aspect instance
 	 * does not express an instance-specific order through implementing
 	 * the {@link org.springframework.core.Ordered} interface.
-	 * <p>The default implementation simply returns <code>Ordered.LOWEST_PRECEDENCE</code>.
+	 * <p>The default implementation simply returns {@code Ordered.LOWEST_PRECEDENCE}.
 	 * @param aspectClass the aspect class
 	 */
 	@Override
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 aa279de07c..8478f7390d 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
@@ -54,7 +54,7 @@ public class SingletonMetadataAwareAspectInstanceFactory extends SingletonAspect
 	/**
 	 * Check whether the aspect class carries an
 	 * {@link org.springframework.core.annotation.Order} annotation,
-	 * falling back to <code>Ordered.LOWEST_PRECEDENCE</code>.
+	 * falling back to {@code Ordered.LOWEST_PRECEDENCE}.
 	 * @see org.springframework.core.annotation.Order
 	 */
 	@Override
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
index 8d21b47b5e..d05e67b5da 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
@@ -27,15 +27,15 @@ import org.springframework.util.Assert;
 /**
  * Orders AspectJ advice/advisors by precedence (<i>not</i> invocation order).
  *
- * <p>Given two pieces of advice, <code>a</code> and <code>b</code>:
+ * <p>Given two pieces of advice, {@code a} and {@code b}:
  * <ul>
- *   <li>if <code>a</code> and <code>b</code> are defined in different
+ *   <li>if {@code a} and {@code b} are defined in different
  *   aspects, then the advice in the aspect with the lowest order
  *   value has the highest precedence</li>
- *   <li>if <code>a</code> and <code>b</code> are defined in the same
- *   aspect, then if one of <code>a</code> or <code>b</code> is a form of
+ *   <li>if {@code a} and {@code b} are defined in the same
+ *   aspect, then if one of {@code a} or {@code b} is a form of
  *   after advice, then the advice declared last in the aspect has the
- *   highest precedence. If neither <code>a</code> nor <code>b</code> is a
+ *   highest precedence. If neither {@code a} nor {@code b} is a
  *   form of after advice, then the advice declared first in the aspect has
  *   the highest precedence.</li>
  * </ul>
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java
index 6dc2fdb0c0..99d336b05a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/package-info.java
@@ -1,4 +1,3 @@
-
 /**
  *
  * AspectJ integration package. Includes Spring AOP advice implementations for AspectJ 5
@@ -6,7 +5,7 @@
  * implementation that allows use of the AspectJ pointcut expression language with the Spring AOP
  * runtime framework.
  *
- * <p>Note that use of this package does <i>not</i> require the use of the <code>ajc</code> compiler
+ * <p>Note that use of this package does <i>not</i> require the use of the {@code ajc} compiler
  * or AspectJ load-time weaver. It is intended to enable the use of a valuable subset of AspectJ
  * functionality, with consistent semantics, with the proxy-based Spring AOP framework.
  *
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
index 173148c5ca..e8decbf469 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
@@ -40,7 +40,7 @@ import org.springframework.util.StringUtils;
  * to the resulting bean.
  *
  * <p>This base class controls the creation of the {@link ProxyFactoryBean} bean definition
- * and wraps the original as an inner-bean definition for the <code>target</code> property
+ * and wraps the original as an inner-bean definition for the {@code target} property
  * of {@link ProxyFactoryBean}.
  *
  * <p>Chaining is correctly handled, ensuring that only one {@link ProxyFactoryBean} definition
@@ -48,7 +48,7 @@ import org.springframework.util.StringUtils;
  * already created the {@link org.springframework.aop.framework.ProxyFactoryBean} then the
  * interceptor is simply added to the existing definition.
  *
- * <p>Subclasses have only to create the <code>BeanDefinition</code> to the interceptor that
+ * <p>Subclasses have only to create the {@code BeanDefinition} to the interceptor that
  * they wish to add.
  *
  * @author Rob Harrop
@@ -118,7 +118,7 @@ public abstract class AbstractInterceptorDrivenBeanDefinitionDecorator implement
 	}
 
 	/**
-	 * Subclasses should implement this method to return the <code>BeanDefinition</code>
+	 * Subclasses should implement this method to return the {@code BeanDefinition}
 	 * for the interceptor they wish to apply to the bean being decorated.
 	 */
 	protected abstract BeanDefinition createInterceptorDefinition(Node node);
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
index 36eda24329..b28e6d3e03 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
 /**
  * {@link org.springframework.beans.factory.parsing.ComponentDefinition}
  * that bridges the gap between the advisor bean definition configured
- * by the <code>&lt;aop:advisor&gt;</code> tag and the component definition
+ * by the {@code &lt;aop:advisor&gt;} tag and the component definition
  * infrastructure.
  *
  * @author Rob Harrop
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java b/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java
index d3f28a464f..6d97412f9d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java
@@ -34,7 +34,7 @@ import org.springframework.util.Assert;
  * <p>Only a single auto-proxy creator can be registered yet multiple concrete
  * implementations are available. Therefore this class wraps a simple escalation
  * protocol, allowing classes to request a particular auto-proxy creator and know
- * that class, <code>or a subclass thereof</code>, will eventually be resident
+ * that class, {@code or a subclass thereof}, will eventually be resident
  * in the application context.
  *
  * @author Rob Harrop
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java
index 9f0dc56d03..b250bf747e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java
@@ -21,21 +21,21 @@ import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * <code>NamespaceHandler</code> for the <code>aop</code> namespace.
+ * {@code NamespaceHandler} for the {@code aop} namespace.
  *
  * <p>Provides a {@link org.springframework.beans.factory.xml.BeanDefinitionParser} for the
- * <code>&lt;aop:config&gt;</code> tag. A <code>config</code> tag can include nested
- * <code>pointcut</code>, <code>advisor</code> and <code>aspect</code> tags.
+ * {@code &lt;aop:config&gt;} tag. A {@code config} tag can include nested
+ * {@code pointcut}, {@code advisor} and {@code aspect} tags.
  *
- * <p>The <code>pointcut</code> tag allows for creation of named
+ * <p>The {@code pointcut} tag allows for creation of named
  * {@link AspectJExpressionPointcut} beans using a simple syntax:
  * <pre class="code">
  * &lt;aop:pointcut id=&quot;getNameCalls&quot; expression=&quot;execution(* *..ITestBean.getName(..))&quot;/&gt;
  * </pre>
  *
- * <p>Using the <code>advisor</code> tag you can configure an {@link org.springframework.aop.Advisor}
+ * <p>Using the {@code advisor} tag you can configure an {@link org.springframework.aop.Advisor}
  * and have it applied to all relevant beans in you {@link org.springframework.beans.factory.BeanFactory}
- * automatically. The <code>advisor</code> tag supports both in-line and referenced
+ * automatically. The {@code advisor} tag supports both in-line and referenced
  * {@link org.springframework.aop.Pointcut Pointcuts}:
  *
  * <pre class="code">
@@ -56,8 +56,8 @@ public class AopNamespaceHandler extends NamespaceHandlerSupport {
 
 	/**
 	 * Register the {@link BeanDefinitionParser BeanDefinitionParsers} for the
-	 * '<code>config</code>', '<code>spring-configured</code>', '<code>aspectj-autoproxy</code>'
-	 * and '<code>scoped-proxy</code>' tags.
+	 * '{@code config}', '{@code spring-configured}', '{@code aspectj-autoproxy}'
+	 * and '{@code scoped-proxy}' tags.
 	 */
 	public void init() {
 		// In 2.0 XSD as well as in 2.1 XSD.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java
index ae9888dca4..9d19ec544b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.xml.ParserContext;
 
 /**
  * Utility class for handling registration of auto-proxy creators used internally
- * by the '<code>aop</code>' namespace tags.
+ * by the '{@code aop}' namespace tags.
  *
  * <p>Only a single auto-proxy creator can be registered and multiple tags may wish
  * to register different concrete implementations. As such this class delegates to
@@ -42,12 +42,12 @@ import org.springframework.beans.factory.xml.ParserContext;
 public abstract class AopNamespaceUtils {
 
 	/**
-	 * The <code>proxy-target-class</code> attribute as found on AOP-related XML tags.
+	 * The {@code proxy-target-class} attribute as found on AOP-related XML tags.
 	 */
 	public static final String PROXY_TARGET_CLASS_ATTRIBUTE = "proxy-target-class";
 
 	/**
-	 * The <code>expose-proxy</code> attribute as found on AOP-related XML tags.
+	 * The {@code expose-proxy} attribute as found on AOP-related XML tags.
 	 */
 	private static final String EXPOSE_PROXY_ATTRIBUTE = "expose-proxy";
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
index 0aca37520b..d9e5b43615 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
@@ -27,7 +27,7 @@ import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 
 /**
- * {@link BeanDefinitionParser} for the <code>aspectj-autoproxy</code> tag,
+ * {@link BeanDefinitionParser} for the {@code aspectj-autoproxy} tag,
  * enabling the automatic application of @AspectJ-style aspects found in
  * the {@link org.springframework.beans.factory.BeanFactory}.
  *
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
index 8613647b15..f97d8230eb 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
@@ -49,7 +49,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 
 /**
- * {@link BeanDefinitionParser} for the <code>&lt;aop:config&gt;</code> tag.
+ * {@link BeanDefinitionParser} for the {@code &lt;aop:config&gt;} tag.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -122,8 +122,8 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 
 	/**
 	 * Configures the auto proxy creator needed to support the {@link BeanDefinition BeanDefinitions}
-	 * created by the '<code>&lt;aop:config/&gt;</code>' tag. Will force class proxying if the
-	 * '<code>proxy-target-class</code>' attribute is set to '<code>true</code>'.
+	 * created by the '{@code &lt;aop:config/&gt;}' tag. Will force class proxying if the
+	 * '{@code proxy-target-class}' attribute is set to '{@code true}'.
 	 * @see AopNamespaceUtils
 	 */
 	private void configureAutoProxyCreator(ParserContext parserContext, Element element) {
@@ -131,7 +131,7 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 	}
 
 	/**
-	 * Parses the supplied <code>&lt;advisor&gt;</code> element and registers the resulting
+	 * Parses the supplied {@code &lt;advisor&gt;} element and registers the resulting
 	 * {@link org.springframework.aop.Advisor} and any resulting {@link org.springframework.aop.Pointcut}
 	 * with the supplied {@link BeanDefinitionRegistry}.
 	 */
@@ -168,7 +168,7 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 
 	/**
 	 * Create a {@link RootBeanDefinition} for the advisor described in the supplied. Does <strong>not</strong>
-	 * parse any associated '<code>pointcut</code>' or '<code>pointcut-ref</code>' attributes.
+	 * parse any associated '{@code pointcut}' or '{@code pointcut-ref}' attributes.
 	 */
 	private AbstractBeanDefinition createAdvisorBeanDefinition(Element advisorElement, ParserContext parserContext) {
 		RootBeanDefinition advisorDefinition = new RootBeanDefinition(DefaultBeanFactoryPointcutAdvisor.class);
@@ -257,9 +257,9 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 	}
 
 	/**
-	 * Return <code>true</code> if the supplied node describes an advice type. May be one of:
-	 * '<code>before</code>', '<code>after</code>', '<code>after-returning</code>',
-	 * '<code>after-throwing</code>' or '<code>around</code>'.
+	 * Return {@code true} if the supplied node describes an advice type. May be one of:
+	 * '{@code before}', '{@code after}', '{@code after-returning}',
+	 * '{@code after-throwing}' or '{@code around}'.
 	 */
 	private boolean isAdviceNode(Node aNode, ParserContext parserContext) {
 		if (!(aNode instanceof Element)) {
@@ -273,7 +273,7 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 	}
 
 	/**
-	 * Parse a '<code>declare-parents</code>' element and register the appropriate
+	 * Parse a '{@code declare-parents}' element and register the appropriate
 	 * DeclareParentsAdvisor with the BeanDefinitionRegistry encapsulated in the
 	 * supplied ParserContext.
 	 */
@@ -304,8 +304,8 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 	}
 
 	/**
-	 * Parses one of '<code>before</code>', '<code>after</code>', '<code>after-returning</code>',
-	 * '<code>after-throwing</code>' or '<code>around</code>' and registers the resulting
+	 * Parses one of '{@code before}', '{@code after}', '{@code after-returning}',
+	 * '{@code after-throwing}' or '{@code around}' and registers the resulting
 	 * BeanDefinition with the supplied BeanDefinitionRegistry.
 	 * @return the generated advice RootBeanDefinition
 	 */
@@ -427,7 +427,7 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 	}
 
 	/**
-	 * Parses the supplied <code>&lt;pointcut&gt;</code> and registers the resulting
+	 * Parses the supplied {@code &lt;pointcut&gt;} and registers the resulting
 	 * Pointcut with the BeanDefinitionRegistry.
 	 */
 	private AbstractBeanDefinition parsePointcut(Element pointcutElement, ParserContext parserContext) {
@@ -460,8 +460,8 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 	}
 
 	/**
-	 * Parses the <code>pointcut</code> or <code>pointcut-ref</code> attributes of the supplied
-	 * {@link Element} and add a <code>pointcut</code> property as appropriate. Generates a
+	 * Parses the {@code pointcut} or {@code pointcut-ref} attributes of the supplied
+	 * {@link Element} and add a {@code pointcut} property as appropriate. Generates a
 	 * {@link org.springframework.beans.factory.config.BeanDefinition} for the pointcut if  necessary
 	 * and returns its bean name, otherwise returns the bean name of the referred pointcut.
 	 */
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
index bbba335bb6..797b5f6698 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
@@ -27,7 +27,7 @@ import org.springframework.beans.factory.xml.ParserContext;
 
 /**
  * {@link BeanDefinitionDecorator} responsible for parsing the
- * <code>&lt;aop:scoped-proxy/&gt;</code> tag.
+ * {@code &lt;aop:scoped-proxy/&gt;} tag.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
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 cf22fddded..a78e33daf2 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
@@ -93,7 +93,7 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig
 	/**
 	 * Check whether the given bean is eligible for advising with this
 	 * post-processor's {@link Advisor}.
-	 * <p>Implements caching of <code>canApply</code> results per bean name.
+	 * <p>Implements caching of {@code canApply} results per bean name.
 	 * @param bean the bean instance
 	 * @param beanName the name of the bean
 	 * @see AopUtils#canApply(Advisor, Class)
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 c166ddc04d..ffc317ce37 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
@@ -77,7 +77,7 @@ public interface Advised extends TargetClassAware {
 	 * Set whether the proxy should be exposed by the AOP framework as a
 	 * ThreadLocal for retrieval via the AopContext class. This is useful
 	 * if an advised object needs to call another advised method on itself.
-	 * (If it uses <code>this</code>, the invocation will not be advised).
+	 * (If it uses {@code this}, the invocation will not be advised).
 	 * <p>Default is "false", for optimal performance.
 	 */
 	void setExposeProxy(boolean exposeProxy);
@@ -85,7 +85,7 @@ public interface Advised extends TargetClassAware {
 	/**
 	 * Return whether the factory should expose the proxy as a ThreadLocal.
 	 * This can be necessary if a target object needs to invoke a method on itself
-	 * benefitting from advice. (If it invokes a method on <code>this</code> no advice
+	 * benefitting from advice. (If it invokes a method on {@code this} no advice
 	 * will apply.) Getting the proxy is analogous to an EJB calling getEJBObject().
 	 * @see AopContext
 	 */
@@ -110,7 +110,7 @@ public interface Advised extends TargetClassAware {
 
 	/**
 	 * Return the advisors applying to this proxy.
-	 * @return a list of Advisors applying to this proxy (never <code>null</code>)
+	 * @return a list of Advisors applying to this proxy (never {@code null})
 	 */
 	Advisor[] getAdvisors();
 
@@ -135,7 +135,7 @@ public interface Advised extends TargetClassAware {
 	/**
 	 * Remove the given advisor.
 	 * @param advisor the advisor to remove
-	 * @return <code>true</code> if the advisor was removed; <code>false</code>
+	 * @return {@code true} if the advisor was removed; {@code false}
 	 * if the advisor was not found and hence could not be removed
 	 */
 	boolean removeAdvisor(Advisor advisor);
@@ -165,7 +165,7 @@ public interface Advised extends TargetClassAware {
 	 * @param a the advisor to replace
 	 * @param b the advisor to replace it with
 	 * @return whether it was replaced. If the advisor wasn't found in the
-	 * list of advisors, this method returns <code>false</code> and does nothing.
+	 * list of advisors, this method returns {@code false} and does nothing.
 	 * @throws AopConfigException in case of invalid advice
 	 */
 	boolean replaceAdvisor(Advisor a, Advisor b) throws AopConfigException;
@@ -174,9 +174,9 @@ public interface Advised extends TargetClassAware {
 	/**
 	 * Add the given AOP Alliance advice to the tail of the advice (interceptor) chain.
 	 * <p>This will be wrapped in a DefaultPointcutAdvisor with a pointcut that always
-	 * applies, and returned from the <code>getAdvisors()</code> method in this wrapped form.
+	 * applies, and returned from the {@code getAdvisors()} method in this wrapped form.
 	 * <p>Note that the given advice will apply to all invocations on the proxy,
-	 * even to the <code>toString()</code> method! Use appropriate advice implementations
+	 * even to the {@code toString()} method! Use appropriate advice implementations
 	 * or specify appropriate pointcuts to apply to a narrower set of methods.
 	 * @param advice advice to add to the tail of the chain
 	 * @throws AopConfigException in case of invalid advice
@@ -191,7 +191,7 @@ public interface Advised extends TargetClassAware {
 	 * with a pointcut that always applies, and returned from the {@link #getAdvisors()}
 	 * method in this wrapped form.
 	 * <p>Note: The given advice will apply to all invocations on the proxy,
-	 * even to the <code>toString()</code> method! Use appropriate advice implementations
+	 * even to the {@code toString()} method! Use appropriate advice implementations
 	 * or specify appropriate pointcuts to apply to a narrower set of methods.
 	 * @param pos index from 0 (head)
 	 * @param advice advice to add at the specified position in the advice chain
@@ -202,8 +202,8 @@ public interface Advised extends TargetClassAware {
 	/**
 	 * Remove the Advisor containing the given advice.
 	 * @param advice the advice to remove
-	 * @return <code>true</code> of the advice was found and removed;
-	 * <code>false</code> if there was no such advice
+	 * @return {@code true} of the advice was found and removed;
+	 * {@code false} if there was no such advice
 	 */
 	boolean removeAdvice(Advice advice);
 
@@ -219,7 +219,7 @@ public interface Advised extends TargetClassAware {
 
 
 	/**
-	 * As <code>toString()</code> will normally be delegated to the target,
+	 * As {@code toString()} will normally be delegated to the target,
 	 * this returns the equivalent for the AOP proxy.
 	 * @return a string description of the proxy configuration
 	 */
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 ebb59896ec..63d8711269 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
@@ -184,7 +184,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}
 
 	/**
-	 * Return the advisor chain factory to use (never <code>null</code>).
+	 * Return the advisor chain factory to use (never {@code null}).
 	 */
 	public AdvisorChainFactory getAdvisorChainFactory() {
 		return this.advisorChainFactory;
@@ -221,7 +221,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	 * Remove a proxied interface.
 	 * <p>Does nothing if the given interface isn't proxied.
 	 * @param intf the interface to remove from the proxy
-	 * @return <code>true</code> if the interface was removed; <code>false</code>
+	 * @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) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java
index 299ebfa31a..ca61dcc557 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java
@@ -21,9 +21,9 @@ import org.springframework.core.NamedThreadLocal;
 /**
  * Class containing static methods used to obtain information about the current AOP invocation.
  *
- * <p>The <code>currentProxy()</code> method is usable if the AOP framework is configured to
+ * <p>The {@code currentProxy()} method is usable if the AOP framework is configured to
  * expose the current proxy (not the default). It returns the AOP proxy in use. Target objects
- * or advice can use this to make advised calls, in the same way as <code>getEJBObject()</code>
+ * or advice can use this to make advised calls, in the same way as {@code getEJBObject()}
  * can be used in EJBs. They can also use it to find advice configuration.
  *
  * <p>Spring's AOP framework does not expose proxies by default, as there is a performance cost
@@ -42,7 +42,7 @@ public abstract class AopContext {
 
 	/**
 	 * ThreadLocal holder for AOP proxy associated with this thread.
-	 * Will contain <code>null</code> unless the "exposeProxy" property on
+	 * Will contain {@code null} unless the "exposeProxy" property on
 	 * the controlling proxy configuration has been set to "true".
 	 * @see ProxyConfig#setExposeProxy
 	 */
@@ -53,7 +53,7 @@ public abstract class AopContext {
 	 * Try to return the current AOP proxy. This method is usable only if the
 	 * calling method has been invoked via AOP, and the AOP framework has been set
 	 * to expose proxies. Otherwise, this method will throw an IllegalStateException.
-	 * @return Object the current AOP proxy (never returns <code>null</code>)
+	 * @return Object the current AOP proxy (never returns {@code null})
 	 * @throws IllegalStateException if the proxy cannot be found, because the
 	 * method was invoked outside an AOP invocation context, or because the
 	 * AOP framework has not been configured to expose the proxy
@@ -68,10 +68,10 @@ public abstract class AopContext {
 	}
 
 	/**
-	 * Make the given proxy available via the <code>currentProxy()</code> method.
+	 * Make the given proxy available via the {@code currentProxy()} method.
 	 * <p>Note that the caller should be careful to keep the old value as appropriate.
-	 * @param proxy the proxy to expose (or <code>null</code> to reset it)
-	 * @return the old proxy, which may be <code>null</code> if none was bound
+	 * @param proxy the proxy to expose (or {@code null} to reset it)
+	 * @return the old proxy, which may be {@code null} if none was bound
 	 * @see #currentProxy()
 	 */
 	static Object setCurrentProxy(Object proxy) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java
index 2fe5af6c35..c002e43a51 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java
@@ -33,20 +33,20 @@ public interface AopProxy {
 	 * Create a new proxy object.
 	 * <p>Uses the AopProxy's default class loader (if necessary for proxy creation):
 	 * usually, the thread context class loader.
-	 * @return the new proxy object (never <code>null</code>)
-	 * @see java.lang.Thread#getContextClassLoader()
+	 * @return the new proxy object (never {@code null})
+	 * @see Thread#getContextClassLoader()
 	 */
 	Object getProxy();
 
 	/**
 	 * Create a new proxy object.
 	 * <p>Uses the given class loader (if necessary for proxy creation).
-	 * <code>null</code> will simply be passed down and thus lead to the low-level
+	 * {@code null} will simply be passed down and thus lead to the low-level
 	 * proxy facility's default, which is usually different from the default chosen
 	 * by the AopProxy implementation's {@link #getProxy()} method.
 	 * @param classLoader the class loader to create the proxy with
-	 * (or <code>null</code> for the low-level proxy facility's default)
-	 * @return the new proxy object (never <code>null</code>)
+	 * (or {@code null} for the low-level proxy facility's default)
+	 * @return the new proxy object (never {@code null})
 	 */
 	Object getProxy(ClassLoader classLoader);
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
index 28e48adb4f..a602cefe37 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
@@ -44,9 +44,9 @@ public abstract class AopProxyUtils {
 	 * as long as possible without side effects, that is, just for singleton targets.
 	 * @param candidate the instance to check (might be an AOP proxy)
 	 * @return the target class (or the plain class of the given object as fallback;
-	 * never <code>null</code>)
+	 * never {@code null})
 	 * @see org.springframework.aop.TargetClassAware#getTargetClass()
-	 * @see org.springframework.aop.framework.Advised#getTargetSource()
+	 * @see Advised#getTargetSource()
 	 */
 	public static Class<?> ultimateTargetClass(Object candidate) {
 		Assert.notNull(candidate, "Candidate object must not be null");
@@ -112,7 +112,7 @@ public abstract class AopProxyUtils {
 	 * i.e. all non-Advised interfaces that the proxy implements.
 	 * @param proxy the proxy to analyze (usually a JDK dynamic proxy)
 	 * @return all user-specified interfaces that the proxy implements,
-	 * in the original order (never <code>null</code> or empty)
+	 * in the original order (never {@code null} or empty)
 	 * @see Advised
 	 */
 	public static Class[] proxiedUserInterfaces(Object proxy) {
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 bbf7015e0a..5801458ff0 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
@@ -234,7 +234,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 	}
 
 	/**
-	 * Checks to see whether the supplied <code>Class</code> has already been validated and
+	 * Checks to see whether the supplied {@code Class} has already been validated and
 	 * validates it if not.
 	 */
 	private void validateClassIfNecessary(Class<?> proxySuperClass) {
@@ -249,7 +249,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 	}
 
 	/**
-	 * Checks for final methods on the <code>Class</code> and writes warnings to the log
+	 * Checks for final methods on the {@code Class} and writes warnings to the log
 	 * for each one found.
 	 */
 	private void doValidateClass(Class<?> proxySuperClass) {
@@ -376,7 +376,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 	 * Method interceptor used for static targets with no advice chain. The call
 	 * is passed directly back to the target. Used when the proxy needs to be
 	 * exposed and it can't be determined that the method won't return
-	 * <code>this</code>.
+	 * {@code this}.
 	 */
 	private static class StaticUnadvisedInterceptor implements MethodInterceptor, Serializable {
 
@@ -509,7 +509,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 
 
 	/**
-	 * Dispatcher for the <code>equals</code> method.
+	 * Dispatcher for the {@code equals} method.
 	 * Ensures that the method call is always handled by this class.
 	 */
 	private static class EqualsInterceptor implements MethodInterceptor, Serializable {
@@ -541,7 +541,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 
 
 	/**
-	 * Dispatcher for the <code>hashCode</code> method.
+	 * Dispatcher for the {@code hashCode} method.
 	 * Ensures that the method call is always handled by this class.
 	 */
 	private static class HashCodeInterceptor implements MethodInterceptor, Serializable {
@@ -609,7 +609,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 					oldProxy = AopContext.setCurrentProxy(proxy);
 					setProxyContext = true;
 				}
-				// May be <code>null</code>. Get as late as possible to minimize the time we
+				// 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) {
@@ -745,11 +745,11 @@ final class CglibAopProxy implements AopProxy, Serializable {
 		 * invoke the advice chain. Otherwise a DyanmicAdvisedInterceptor is
 		 * used.</dd>
 		 * <dt>For non-advised methods:</dt>
-		 * <dd>Where it can be determined that the method will not return <code>this</code>
-		 * or when <code>ProxyFactory.getExposeProxy()</code> returns <code>false</code>,
+		 * <dd>Where it can be determined that the method will not return {@code this}
+		 * or when {@code ProxyFactory.getExposeProxy()} returns {@code false},
 		 * then a Dispatcher is used. For static targets, the StaticDispatcher is used;
 		 * and for dynamic targets, a DynamicUnadvisedInterceptor is used.
-		 * If it possible for the method to return <code>this</code> then a
+		 * If it possible for the method to return {@code this} then a
 		 * StaticUnadvisedInterceptor is used for static targets - the
 		 * DynamicUnadvisedInterceptor already considers this.</dd>
 		 * </dl>
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 24c0610c08..7e10c4c228 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
@@ -143,7 +143,7 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
 
 
 	/**
-	 * Implementation of <code>InvocationHandler.invoke</code>.
+	 * Implementation of {@code InvocationHandler.invoke}.
 	 * <p>Callers will see exactly the exception thrown by the target,
 	 * unless a hook method throws an exception.
 	 */
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java
index e012777285..e8decfcf94 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java
@@ -112,7 +112,7 @@ public class ProxyConfig implements Serializable {
 	 * Set whether the proxy should be exposed by the AOP framework as a
 	 * ThreadLocal for retrieval via the AopContext class. This is useful
 	 * if an advised object needs to call another advised method on itself.
-	 * (If it uses <code>this</code>, the invocation will not be advised).
+	 * (If it uses {@code this}, the invocation will not be advised).
 	 * <p>Default is "false", in order to avoid unnecessary extra interception.
 	 * This means that no guarantees are provided that AopContext access will
 	 * work consistently within any method of the advised object.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java
index c5eeb924ec..c34bb113ab 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java
@@ -95,7 +95,7 @@ public class ProxyCreatorSupport extends AdvisedSupport {
 
 	/**
 	 * Subclasses should call this to get a new AOP proxy. They should <b>not</b>
-	 * create an AOP proxy with <code>this</code> as an argument.
+	 * create an AOP proxy with {@code this} as an argument.
 	 */
 	protected final synchronized AopProxy createAopProxy() {
 		if (!this.active) {
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 989160bf65..acc4b69054 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
@@ -74,7 +74,7 @@ public class ProxyFactory extends ProxyCreatorSupport {
 	}
 
 	/**
-	 * Create a ProxyFactory for the specified <code>TargetSource</code>,
+	 * Create a ProxyFactory for the specified {@code TargetSource},
 	 * making the proxy implement the specified interface.
 	 * @param proxyInterface the interface that the proxy should implement
 	 * @param targetSource the TargetSource that the proxy should invoke
@@ -103,7 +103,7 @@ public class ProxyFactory extends ProxyCreatorSupport {
 	 * or removed interfaces. Can add and remove interceptors.
 	 * <p>Uses the given class loader (if necessary for proxy creation).
 	 * @param classLoader the class loader to create the proxy with
-	 * (or <code>null</code> for the low-level proxy facility's default)
+	 * (or {@code null} for the low-level proxy facility's default)
 	 * @return the proxy object
 	 */
 	public Object getProxy(ClassLoader classLoader) {
@@ -127,7 +127,7 @@ public class ProxyFactory extends ProxyCreatorSupport {
 	}
 
 	/**
-	 * Create a proxy for the specified <code>TargetSource</code>,
+	 * Create a proxy for the specified {@code TargetSource},
 	 * implementing the specified interface.
 	 * @param proxyInterface the interface that the proxy should implement
 	 * @param targetSource the TargetSource that the proxy should invoke
@@ -140,8 +140,8 @@ public class ProxyFactory extends ProxyCreatorSupport {
 	}
 
 	/**
-	 * Create a proxy for the specified <code>TargetSource</code> that extends
-	 * the target class of the <code>TargetSource</code>.
+	 * Create a proxy for the specified {@code TargetSource} that extends
+	 * the target class of the {@code TargetSource}.
 	 * @param targetSource the TargetSource that the proxy should invoke
 	 * @return the proxy object
 	 */
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 a9b039f35f..6cd0d15155 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
@@ -233,7 +233,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 	 * Return a proxy. Invoked when clients obtain beans from this factory bean.
 	 * Create an instance of the AOP proxy to be returned by this factory.
 	 * The instance will be cached for a singleton, and create on each call to
-	 * <code>getObject()</code> for a proxy.
+	 * {@code getObject()} for a proxy.
 	 * @return a fresh AOP proxy reflecting the current state of this factory
 	 */
 	public Object getObject() throws BeansException {
@@ -351,7 +351,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 
 	/**
 	 * Return the proxy object to expose.
-	 * <p>The default implementation uses a <code>getProxy</code> call with
+	 * <p>The default implementation uses a {@code getProxy} call with
 	 * the factory's bean class loader. Can be overridden to specify a
 	 * custom class loader.
 	 * @param aopProxy the prepared AopProxy instance to get the proxy from
@@ -392,7 +392,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 	 * which concludes the interceptorNames list, is an Advisor or Advice,
 	 * or may be a target.
 	 * @param beanName bean name to check
-	 * @return <code>true</code> if it's an Advisor or Advice
+	 * @return {@code true} if it's an Advisor or Advice
 	 */
 	private boolean isNamedBeanAnAdvisorOrAdvice(String beanName) {
 		Class namedBeanClass = this.beanFactory.getType(beanName);
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
index 10578d9960..5062a916c5 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
@@ -253,7 +253,7 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	 * This method provides an invocation-bound alternative to a ThreadLocal.
 	 * <p>This map is initialized lazily and is not used in the AOP framework itself.
 	 * @return any user attributes associated with this invocation
-	 * (never <code>null</code>)
+	 * (never {@code null})
 	 */
 	public Map<String, Object> getUserAttributes() {
 		if (this.userAttributes == null) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java
index 5acc518359..b1f5a6396d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java
@@ -38,7 +38,7 @@ public interface AdvisorAdapter {
 
 	/**
 	 * Does this adapter understand this advice object? Is it valid to
-	 * invoke the <code>getInterceptors</code> method with an Advisor that
+	 * invoke the {@code getInterceptors} method with an Advisor that
 	 * contains this advice as an argument?
 	 * @param advice an Advice such as a BeforeAdvice
 	 * @return whether this adapter understands the given advice object
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java
index f0b38d0d67..1c69281c70 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java
@@ -38,7 +38,7 @@ public interface AdvisorAdapterRegistry {
 	 * {@link org.springframework.aop.AfterReturningAdvice},
 	 * {@link org.springframework.aop.ThrowsAdvice}.
 	 * @param advice object that should be an advice
-	 * @return an Advisor wrapping the given advice. Never returns <code>null</code>.
+	 * @return an Advisor wrapping the given advice. Never returns {@code null}.
 	 * If the advice parameter is an Advisor, return it.
 	 * @throws UnknownAdviceTypeException if no registered advisor adapter
 	 * can wrap the supposed advice
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
index 81023c1251..32f3d2d44d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
@@ -32,10 +32,10 @@ import org.springframework.util.Assert;
 /**
  * Interceptor to wrap an after-throwing advice.
  *
- * <p>The signatures on handler methods on the <code>ThrowsAdvice</code>
+ * <p>The signatures on handler methods on the {@code ThrowsAdvice}
  * implementation method argument must be of the form:<br>
  *
- * <code>void afterThrowing([Method, args, target], ThrowableSubclass);</code>
+ * {@code void afterThrowing([Method, args, target], ThrowableSubclass);}
  *
  * <p>Only the last argument is required.
  *
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java
index 8bca7ccd9d..dba5d066d5 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java
@@ -76,7 +76,7 @@ public abstract class AbstractAdvisorAutoProxyCreator extends AbstractAutoProxyC
 	 * Find all eligible Advisors for auto-proxying this class.
 	 * @param beanClass the clazz to find advisors for
 	 * @param beanName the name of the currently proxied bean
-	 * @return the empty List, not <code>null</code>,
+	 * @return the empty List, not {@code null},
 	 * if there are no pointcuts or interceptors
 	 * @see #findCandidateAdvisors
 	 * @see #sortAdvisors
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 4e4f638008..bcef35918f 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
@@ -147,7 +147,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	/**
 	 * Set the ordering which will apply to this class's implementation
 	 * of Ordered, used when applying multiple BeanPostProcessors.
-	 * <p>Default value is <code>Integer.MAX_VALUE</code>, meaning that it's non-ordered.
+	 * <p>Default value is {@code Integer.MAX_VALUE}, meaning that it's non-ordered.
 	 * @param order ordering value
 	 */
 	public final void setOrder(int order) {
@@ -243,7 +243,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 
 	/**
 	 * Return the owning BeanFactory.
-	 * May be <code>null</code>, as this object doesn't need to belong to a bean factory.
+	 * May be {@code null}, as this object doesn't need to belong to a bean factory.
 	 */
 	protected BeanFactory getBeanFactory() {
 		return this.beanFactory;
@@ -390,10 +390,10 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	}
 
 	/**
-	 * Subclasses should override this method to return <code>true</code> if the
+	 * Subclasses should override this method to return {@code true} if the
 	 * given bean should not be considered for auto-proxying by this post-processor.
 	 * <p>Sometimes we need to be able to avoid this happening if it will lead to
-	 * a circular reference. This implementation returns <code>false</code>.
+	 * a circular reference. This implementation returns {@code false}.
 	 * @param beanClass the class of the bean
 	 * @param beanName the name of the bean
 	 * @return whether to skip the given bean
@@ -404,7 +404,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 
 	/**
 	 * Create a target source for bean instances. Uses any TargetSourceCreators if set.
-	 * Returns <code>null</code> if no custom TargetSource should be used.
+	 * Returns {@code null} if no custom TargetSource should be used.
 	 * <p>This implementation uses the "customTargetSourceCreators" property.
 	 * Subclasses can override this method to use a different mechanism.
 	 * @param beanClass the class of the bean to create a TargetSource for
@@ -497,7 +497,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	 * Return whether the Advisors returned by the subclass are pre-filtered
 	 * to match the bean's target class already, allowing the ClassFilter check
 	 * to be skipped when building advisors chains for AOP invocations.
-	 * <p>Default is <code>false</code>. Subclasses may override this if they
+	 * <p>Default is {@code false}. Subclasses may override this if they
 	 * will always return pre-filtered Advisors.
 	 * @return whether the Advisors are pre-filtered
 	 * @see #getAdvicesAndAdvisorsForBean
@@ -581,10 +581,10 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	 * @param beanName the name of the bean
 	 * @param customTargetSource the TargetSource returned by the
 	 * {@link #getCustomTargetSource} method: may be ignored.
-	 * Will be <code>null</code> if no custom target source is in use.
+	 * Will be {@code null} if no custom target source is in use.
 	 * @return an array of additional interceptors for the particular bean;
 	 * or an empty array if no additional interceptors but just the common ones;
-	 * or <code>null</code> if no proxy at all, not even with the common interceptors.
+	 * or {@code null} if no proxy at all, not even with the common interceptors.
 	 * See constants DO_NOT_PROXY and PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS.
 	 * @throws BeansException in case of errors
 	 * @see #DO_NOT_PROXY
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java
index dbc184c2a3..b48ae0905e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java
@@ -33,7 +33,7 @@ public abstract class AutoProxyUtils {
 	/**
 	 * Bean definition attribute that may indicate whether a given bean is supposed
 	 * to be proxied with its target class (in case of it getting proxied in the first
-	 * place). The value is <code>Boolean.TRUE</code> or <code>Boolean.FALSE</code>.
+	 * place). The value is {@code Boolean.TRUE} or {@code Boolean.FALSE}.
 	 * <p>Proxy factories can set this attribute if they built a target class proxy
 	 * for a specific bean, and want to enforce that that bean can always be cast
 	 * to its target class (even if AOP advices get applied through auto-proxying).
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 4000181369..ab056cd688 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
@@ -107,7 +107,7 @@ public class BeanFactoryAdvisorRetrievalHelper {
 
 	/**
 	 * Determine whether the aspect bean with the given name is eligible.
-	 * <p>The default implementation always returns <code>true</code>.
+	 * <p>The default implementation always returns {@code true}.
 	 * @param beanName the name of the aspect bean
 	 * @return whether the bean is eligible
 	 */
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
index cfc4e09cf9..741cd1ae1a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
@@ -24,10 +24,10 @@ import org.springframework.beans.factory.BeanNameAware;
  * no special code to handle any particular aspects, such as pooling aspects.
  *
  * <p>It's possible to filter out advisors - for example, to use multiple post processors
- * of this type in the same factory - by setting the <code>usePrefix</code> property
+ * of this type in the same factory - by setting the {@code usePrefix} property
  * to true, in which case only advisors beginning with the DefaultAdvisorAutoProxyCreator's
  * bean name followed by a dot (like "aapc.") will be used. This default prefix can be
- * changed from the bean name by setting the <code>advisorBeanNamePrefix</code> property.
+ * changed from the bean name by setting the {@code advisorBeanNamePrefix} property.
  * The separator (.) will also be used in this case.
  *
  * @author Rod Johnson
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java
index 244b1eadd5..0adb7d7e2a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java
@@ -35,7 +35,7 @@ public class ProxyCreationContext {
 
 	/**
 	 * Return the name of the currently proxied bean instance.
-	 * @return the name of the bean, or <code>null</code> if none available
+	 * @return the name of the bean, or {@code null} if none available
 	 */
 	public static String getCurrentProxiedBeanName() {
 		return currentProxiedBeanName.get();
@@ -43,7 +43,7 @@ public class ProxyCreationContext {
 
 	/**
 	 * Set the name of the currently proxied bean instance.
-	 * @param beanName the name of the bean, or <code>null</code> to reset it
+	 * @param beanName the name of the bean, or {@code null} to reset it
 	 */
 	static void setCurrentProxiedBeanName(String beanName) {
 		if (beanName != null) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java
index 735a65b852..5acae865f4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java
@@ -35,7 +35,7 @@ public interface TargetSourceCreator {
 	 * Create a special TargetSource for the given bean, if any.
 	 * @param beanClass the class of the bean to create a TargetSource for
 	 * @param beanName the name of the bean
-	 * @return a special TargetSource or <code>null</code> if this TargetSourceCreator isn't
+	 * @return a special TargetSource or {@code null} if this TargetSourceCreator isn't
 	 * interested in the particular bean
 	 */
 	TargetSource getTargetSource(Class<?> beanClass, String beanName);
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
index a7bf4b490c..510b6d8da1 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
@@ -184,14 +184,14 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
 
 	/**
 	 * Subclasses must implement this method to return a new AbstractPrototypeBasedTargetSource
-	 * if they wish to create a custom TargetSource for this bean, or <code>null</code> if they are
+	 * if they wish to create a custom TargetSource for this bean, or {@code null} if they are
 	 * not interested it in, in which case no special target source will be created.
-	 * Subclasses should not call <code>setTargetBeanName</code> or <code>setBeanFactory</code>
+	 * Subclasses should not call {@code setTargetBeanName} or {@code setBeanFactory}
 	 * on the AbstractPrototypeBasedTargetSource: This class' implementation of
-	 * <code>getTargetSource()</code> will do that.
+	 * {@code getTargetSource()} will do that.
 	 * @param beanClass the class of the bean to create a TargetSource for
 	 * @param beanName the name of the bean
-	 * @return the AbstractPrototypeBasedTargetSource, or <code>null</code> if we don't match this
+	 * @return the AbstractPrototypeBasedTargetSource, or {@code null} if we don't match this
 	 */
 	protected abstract AbstractBeanFactoryBasedTargetSource createBeanFactoryBasedTargetSource(
 			Class<?> beanClass, String beanName);
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
index 8eb36f0964..2f5bf13495 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
@@ -22,10 +22,10 @@ import org.aopalliance.intercept.MethodInvocation;
 
 /**
  * Base class for monitoring interceptors, such as performance monitors.
- * Provides <code>prefix</code> and <code>suffix</code> properties
+ * Provides {@code prefix} and {@code suffix} properties
  * that help to classify/group performance monitoring results.
  *
- * <p>Subclasses should call the <code>createInvocationTraceName(MethodInvocation)</code>
+ * <p>Subclasses should call the {@code createInvocationTraceName(MethodInvocation)}
  * method to create a name for the given trace that includes information about the
  * method invocation under trace along with the prefix and suffix added as appropriate.
  *
@@ -87,7 +87,7 @@ public abstract class AbstractMonitoringInterceptor extends AbstractTraceInterce
 
 
 	/**
-	 * Create a <code>String</code> name for the given <code>MethodInvocation</code>
+	 * Create a {@code String} name for the given {@code MethodInvocation}
 	 * that can be used for trace/logging purposes. This name is made up of the
 	 * configured prefix, followed by the fully-qualified name of the method being
 	 * invoked, followed by the configured suffix.
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
index 2c367c20c0..0defe95a51 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
@@ -26,16 +26,16 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.aop.support.AopUtils;
 
 /**
- * Base <code>MethodInterceptor</code> implementation for tracing.
+ * Base {@code MethodInterceptor} implementation for tracing.
  *
  * <p>By default, log messages are written to the log for the interceptor class,
- * not the class which is being intercepted. Setting the <code>useDynamicLogger</code>
- * bean property to <code>true</code> causes all log messages to be written to
- * the <code>Log</code> for the target class being intercepted.
+ * not the class which is being intercepted. Setting the {@code useDynamicLogger}
+ * bean property to {@code true} causes all log messages to be written to
+ * the {@code Log} for the target class being intercepted.
  *
- * <p>Subclasses must implement the <code>invokeUnderTrace</code> method, which
+ * <p>Subclasses must implement the {@code invokeUnderTrace} method, which
  * is invoked by this class ONLY when a particular invocation SHOULD be traced.
- * Subclasses should write to the <code>Log</code> instance provided.
+ * Subclasses should write to the {@code Log} instance provided.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -46,8 +46,8 @@ import org.springframework.aop.support.AopUtils;
 public abstract class AbstractTraceInterceptor implements MethodInterceptor, Serializable {
 
 	/**
-	 * The default <code>Log</code> instance used to write trace messages.
-	 * This instance is mapped to the implementing <code>Class</code>.
+	 * The default {@code Log} instance used to write trace messages.
+	 * This instance is mapped to the implementing {@code Class}.
 	 */
 	protected transient Log defaultLogger = LogFactory.getLog(getClass());
 
@@ -61,9 +61,9 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser
 	/**
 	 * Set whether to use a dynamic logger or a static logger.
 	 * Default is a static logger for this trace interceptor.
-	 * <p>Used to determine which <code>Log</code> instance should be used to write
+	 * <p>Used to determine which {@code Log} instance should be used to write
 	 * log messages for a particular method invocation: a dynamic one for the
-	 * <code>Class</code> getting called, or a static one for the <code>Class</code>
+	 * {@code Class} getting called, or a static one for the {@code Class}
 	 * of the trace interceptor.
 	 * <p><b>NOTE:</b> Specify either this property or "loggerName", not both.
 	 * @see #getLoggerForInvocation(org.aopalliance.intercept.MethodInvocation)
@@ -99,9 +99,9 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser
 
 
 	/**
-	 * Determines whether or not logging is enabled for the particular <code>MethodInvocation</code>.
+	 * Determines whether or not logging is enabled for the particular {@code MethodInvocation}.
 	 * If not, the method invocation proceeds as normal, otherwise the method invocation is passed
-	 * to the <code>invokeUnderTrace</code> method for handling.
+	 * to the {@code invokeUnderTrace} method for handling.
 	 * @see #invokeUnderTrace(org.aopalliance.intercept.MethodInvocation, org.apache.commons.logging.Log)
 	 */
 	public Object invoke(MethodInvocation invocation) throws Throwable {
@@ -115,13 +115,13 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser
 	}
 
 	/**
-	 * Return the appropriate <code>Log</code> instance to use for the given
-	 * <code>MethodInvocation</code>. If the <code>useDynamicLogger</code> flag
-	 * is set, the <code>Log</code> instance will be for the target class of the
-	 * <code>MethodInvocation</code>, otherwise the <code>Log</code> will be the
+	 * Return the appropriate {@code Log} instance to use for the given
+	 * {@code MethodInvocation}. If the {@code useDynamicLogger} flag
+	 * is set, the {@code Log} instance will be for the target class of the
+	 * {@code MethodInvocation}, otherwise the {@code Log} will be the
 	 * default static logger.
-	 * @param invocation the <code>MethodInvocation</code> being traced
-	 * @return the <code>Log</code> instance to use
+	 * @param invocation the {@code MethodInvocation} being traced
+	 * @return the {@code Log} instance to use
 	 * @see #setUseDynamicLogger
 	 */
 	protected Log getLoggerForInvocation(MethodInvocation invocation) {
@@ -146,12 +146,12 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser
 
 	/**
 	 * Determine whether the interceptor should kick in, that is,
-	 * whether the <code>invokeUnderTrace</code> method should be called.
-	 * <p>Default behavior is to check whether the given <code>Log</code>
+	 * whether the {@code invokeUnderTrace} method should be called.
+	 * <p>Default behavior is to check whether the given {@code Log}
 	 * instance is enabled. Subclasses can override this to apply the
 	 * interceptor in other cases as well.
-	 * @param invocation the <code>MethodInvocation</code> being traced
-	 * @param logger the <code>Log</code> instance to check
+	 * @param invocation the {@code MethodInvocation} being traced
+	 * @param logger the {@code Log} instance to check
 	 * @see #invokeUnderTrace
 	 * @see #isLogEnabled
 	 */
@@ -161,9 +161,9 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser
 
 	/**
 	 * Determine whether the given {@link Log} instance is enabled.
-	 * <p>Default is <code>true</code> when the "trace" level is enabled.
+	 * <p>Default is {@code true} when the "trace" level is enabled.
 	 * Subclasses can override this to change the level under which 'tracing' occurs.
-	 * @param logger the <code>Log</code> instance to check
+	 * @param logger the {@code Log} instance to check
 	 */
 	protected boolean isLogEnabled(Log logger) {
 		return logger.isTraceEnabled();
@@ -172,16 +172,16 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser
 
 	/**
 	 * Subclasses must override this method to perform any tracing around the
-	 * supplied <code>MethodInvocation</code>. Subclasses are responsible for
-	 * ensuring that the <code>MethodInvocation</code> actually executes by
-	 * calling <code>MethodInvocation.proceed()</code>.
-	 * <p>By default, the passed-in <code>Log</code> instance will have log level
+	 * supplied {@code MethodInvocation}. Subclasses are responsible for
+	 * ensuring that the {@code MethodInvocation} actually executes by
+	 * calling {@code MethodInvocation.proceed()}.
+	 * <p>By default, the passed-in {@code Log} instance will have log level
 	 * "trace" enabled. Subclasses do not have to check for this again, unless
-	 * they overwrite the <code>isInterceptorEnabled</code> method to modify
+	 * they overwrite the {@code isInterceptorEnabled} method to modify
 	 * the default behavior.
-	 * @param logger the <code>Log</code> to write trace messages to
-	 * @return the result of the call to <code>MethodInvocation.proceed()</code>
-	 * @throws Throwable if the call to <code>MethodInvocation.proceed()</code>
+	 * @param logger the {@code Log} to write trace messages to
+	 * @return the result of the call to {@code MethodInvocation.proceed()}
+	 * @throws Throwable if the call to {@code MethodInvocation.proceed()}
 	 * encountered any errors
 	 * @see #isInterceptorEnabled
 	 * @see #isLogEnabled
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 8b2c788ef3..792639b1c6 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
@@ -30,19 +30,19 @@ import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.util.ReflectionUtils;
 
 /**
- * AOP Alliance <code>MethodInterceptor</code> that processes method invocations
+ * AOP Alliance {@code MethodInterceptor} that processes method invocations
  * asynchronously, using a given {@link org.springframework.core.task.AsyncTaskExecutor}.
  * Typically used with the {@link org.springframework.scheduling.annotation.Async} annotation.
  *
  * <p>In terms of target method signatures, any parameter types are supported.
- * However, the return type is constrained to either <code>void</code> or
- * <code>java.util.concurrent.Future</code>. In the latter case, the Future handle
+ * However, the return type is constrained to either {@code void} or
+ * {@code java.util.concurrent.Future}. In the latter case, the Future handle
  * returned from the proxy will be an actual asynchronous Future that can be used
  * to track the result of the asynchronous method execution. However, since the
  * target method needs to implement the same signature, it will have to return
  * a temporary Future handle that just passes the return value through
  * (like Spring's {@link org.springframework.scheduling.annotation.AsyncResult}
- * or EJB 3.1's <code>javax.ejb.AsyncResult</code>).
+ * or EJB 3.1's {@code javax.ejb.AsyncResult}).
  *
  * <p>As of Spring 3.1.2 the {@code AnnotationAsyncExecutionInterceptor} subclass is
  * preferred for use due to its support for executor qualification in conjunction with
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 db00bcbbf6..63e7c8d5b1 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
@@ -30,7 +30,7 @@ import org.springframework.util.StopWatch;
 import org.springframework.util.StringUtils;
 
 /**
- * <code>MethodInterceptor</code> implementation that allows for highly customizable
+ * {@code MethodInterceptor} implementation that allows for highly customizable
  * method-level tracing, using placeholders.
  *
  * <p>Trace messages are written on method entry, and if the method invocation succeeds
@@ -40,19 +40,19 @@ import org.springframework.util.StringUtils;
  * messages. The placeholders available are:
  *
  * <p><ul>
- * <li><code>$[methodName]</code> - replaced with the name of the method being invoked</li>
- * <li><code>$[targetClassName]</code> - replaced with the name of the class that is
+ * <li>{@code $[methodName]} - replaced with the name of the method being invoked</li>
+ * <li>{@code $[targetClassName]} - replaced with the name of the class that is
  * the target of the invocation</li>
- * <li><code>$[targetClassShortName]</code> - replaced with the short name of the class
+ * <li>{@code $[targetClassShortName]} - replaced with the short name of the class
  * that is the target of the invocation</li>
- * <li><code>$[returnValue]</code> - replaced with the value returned by the invocation</li>
- * <li><code>$[argumentTypes]</code> - replaced with a comma-separated list of the
+ * <li>{@code $[returnValue]} - replaced with the value returned by the invocation</li>
+ * <li>{@code $[argumentTypes]} - replaced with a comma-separated list of the
  * short class names of the method arguments</li>
- * <li><code>$[arguments]</code> - replaced with a comma-separated list of the
- * <code>String</code> representation of the method arguments</li>
- * <li><code>$[exception]</code> - replaced with the <code>String</code> representation
- * of any <code>Throwable</code> raised during the invocation</li>
- * <li><code>$[invocationTime]</code> - replaced with the time, in milliseconds,
+ * <li>{@code $[arguments]} - replaced with a comma-separated list of the
+ * {@code String} representation of the method arguments</li>
+ * <li>{@code $[exception]} - replaced with the {@code String} representation
+ * of any {@code Throwable} raised during the invocation</li>
+ * <li>{@code $[invocationTime]} - replaced with the time, in milliseconds,
  * taken by the method invocation</li>
  * </ul>
  *
@@ -70,56 +70,56 @@ import org.springframework.util.StringUtils;
 public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 
 	/**
-	 * The <code>$[methodName]</code> placeholder.
+	 * The {@code $[methodName]} placeholder.
 	 * Replaced with the name of the method being invoked.
 	 */
 	public static final String PLACEHOLDER_METHOD_NAME = "$[methodName]";
 
 	/**
-	 * The <code>$[targetClassName]</code> placeholder.
-	 * Replaced with the fully-qualifed name of the <code>Class</code>
+	 * The {@code $[targetClassName]} placeholder.
+	 * Replaced with the fully-qualifed name of the {@code Class}
 	 * of the method invocation target.
 	 */
 	public static final String PLACEHOLDER_TARGET_CLASS_NAME = "$[targetClassName]";
 
 	/**
-	 * The <code>$[targetClassShortName]</code> placeholder.
-	 * Replaced with the short name of the <code>Class</code> of the
+	 * The {@code $[targetClassShortName]} placeholder.
+	 * Replaced with the short name of the {@code Class} of the
 	 * method invocation target.
 	 */
 	public static final String PLACEHOLDER_TARGET_CLASS_SHORT_NAME = "$[targetClassShortName]";
 
 	/**
-	 * The <code>$[returnValue]</code> placeholder.
-	 * Replaced with the <code>String</code> representation of the value
+	 * The {@code $[returnValue]} placeholder.
+	 * Replaced with the {@code String} representation of the value
 	 * returned by the method invocation.
 	 */
 	public static final String PLACEHOLDER_RETURN_VALUE = "$[returnValue]";
 
 	/**
-	 * The <code>$[argumentTypes]</code> placeholder.
+	 * The {@code $[argumentTypes]} placeholder.
 	 * Replaced with a comma-separated list of the argument types for the
 	 * method invocation. Argument types are written as short class names.
 	 */
 	public static final String PLACEHOLDER_ARGUMENT_TYPES = "$[argumentTypes]";
 
 	/**
-	 * The <code>$[arguments]</code> placeholder.
+	 * The {@code $[arguments]} placeholder.
 	 * Replaced with a comma separated list of the argument values for the
-	 * method invocation. Relies on the <code>toString()</code> method of
+	 * method invocation. Relies on the {@code toString()} method of
 	 * each argument type.
 	 */
 	public static final String PLACEHOLDER_ARGUMENTS = "$[arguments]";
 
 	/**
-	 * The <code>$[exception]</code> placeholder.
-	 * Replaced with the <code>String</code> representation of any
-	 * <code>Throwable</code> raised during method invocation.
+	 * The {@code $[exception]} placeholder.
+	 * Replaced with the {@code String} representation of any
+	 * {@code Throwable} raised during method invocation.
 	 */
 	public static final String PLACEHOLDER_EXCEPTION = "$[exception]";
 
 	/**
-	 * The <code>$[invocationTime]</code> placeholder.
+	 * The {@code $[invocationTime]} placeholder.
 	 * Replaced with the time taken by the invocation (in milliseconds).
 	 */
 	public static final String PLACEHOLDER_INVOCATION_TIME = "$[invocationTime]";
@@ -143,12 +143,12 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 			"Exception thrown in method '" + PLACEHOLDER_METHOD_NAME + "' of class [" + PLACEHOLDER_TARGET_CLASS_NAME + "]";
 
 	/**
-	 * The <code>Pattern</code> used to match placeholders.
+	 * The {@code Pattern} used to match placeholders.
 	 */
 	private static final Pattern PATTERN = Pattern.compile("\\$\\[\\p{Alpha}+\\]");
 
 	/**
-	 * The <code>Set</code> of allowed placeholders.
+	 * The {@code Set} of allowed placeholders.
 	 */
 	private static final Set ALLOWED_PLACEHOLDERS =
 			new Constants(CustomizableTraceInterceptor.class).getValues("PLACEHOLDER_");
@@ -174,10 +174,10 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 	 * Set the template used for method entry log messages.
 	 * This template can contain any of the following placeholders:
 	 * <ul>
-	 * <li><code>$[targetClassName]</code></li>
-	 * <li><code>$[targetClassShortName]</code></li>
-	 * <li><code>$[argumentTypes]</code></li>
-	 * <li><code>$[arguments]</code></li>
+	 * <li>{@code $[targetClassName]}</li>
+	 * <li>{@code $[targetClassShortName]}</li>
+	 * <li>{@code $[argumentTypes]}</li>
+	 * <li>{@code $[arguments]}</li>
 	 * </ul>
 	 */
 	public void setEnterMessage(String enterMessage) throws IllegalArgumentException {
@@ -196,12 +196,12 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 	 * Set the template used for method exit log messages.
 	 * This template can contain any of the following placeholders:
 	 * <ul>
-	 * <li><code>$[targetClassName]</code></li>
-	 * <li><code>$[targetClassShortName]</code></li>
-	 * <li><code>$[argumentTypes]</code></li>
-	 * <li><code>$[arguments]</code></li>
-	 * <li><code>$[returnValue]</code></li>
-	 * <li><code>$[invocationTime]</code></li>
+	 * <li>{@code $[targetClassName]}</li>
+	 * <li>{@code $[targetClassShortName]}</li>
+	 * <li>{@code $[argumentTypes]}</li>
+	 * <li>{@code $[arguments]}</li>
+	 * <li>{@code $[returnValue]}</li>
+	 * <li>{@code $[invocationTime]}</li>
 	 * </ul>
 	 */
 	public void setExitMessage(String exitMessage) {
@@ -216,11 +216,11 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 	 * Set the template used for method exception log messages.
 	 * This template can contain any of the following placeholders:
 	 * <ul>
-	 * <li><code>$[targetClassName]</code></li>
-	 * <li><code>$[targetClassShortName]</code></li>
-	 * <li><code>$[argumentTypes]</code></li>
-	 * <li><code>$[arguments]</code></li>
-	 * <li><code>$[exception]</code></li>
+	 * <li>{@code $[targetClassName]}</li>
+	 * <li>{@code $[targetClassShortName]}</li>
+	 * <li>{@code $[argumentTypes]}</li>
+	 * <li>{@code $[arguments]}</li>
+	 * <li>{@code $[exception]}</li>
 	 * </ul>
 	 */
 	public void setExceptionMessage(String exceptionMessage) {
@@ -235,10 +235,10 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 
 
 	/**
-	 * Writes a log message before the invocation based on the value of <code>enterMessage</code>.
+	 * Writes a log message before the invocation based on the value of {@code enterMessage}.
 	 * If the invocation succeeds, then a log message is written on exit based on the value
-	 * <code>exitMessage</code>. If an exception occurs during invocation, then a message is
-	 * written based on the value of <code>exceptionMessage</code>.
+	 * {@code exitMessage}. If an exception occurs during invocation, then a message is
+	 * written based on the value of {@code exceptionMessage}.
 	 * @see #setEnterMessage
 	 * @see #setExitMessage
 	 * @see #setExceptionMessage
@@ -277,7 +277,7 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 	}
 
 	/**
-	 * Writes the supplied message to the supplied <code>Log</code> instance.
+	 * Writes the supplied message to the supplied {@code Log} instance.
 	 * @see #writeToLog(org.apache.commons.logging.Log, String, Throwable)
 	 */
 	protected void writeToLog(Log logger, String message) {
@@ -286,8 +286,8 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 
 	/**
 	 * Writes the supplied message and {@link Throwable} to the
-	 * supplied <code>Log</code> instance. By default messages are written
-	 * at <code>TRACE</code> level. Sub-classes can override this method
+	 * supplied {@code Log} instance. By default messages are written
+	 * at {@code TRACE} level. Sub-classes can override this method
 	 * to control which level the message is written at.
 	 */
 	protected void writeToLog(Log logger, String message, Throwable ex) {
@@ -303,16 +303,16 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 	 * Replace the placeholders in the given message with the supplied values,
 	 * or values derived from those supplied.
 	 * @param message the message template containing the placeholders to be replaced
-	 * @param methodInvocation the <code>MethodInvocation</code> being logged.
-	 * Used to derive values for all placeholders except <code>$[exception]</code>
-	 * and <code>$[returnValue]</code>.
+	 * @param methodInvocation the {@code MethodInvocation} being logged.
+	 * Used to derive values for all placeholders except {@code $[exception]}
+	 * and {@code $[returnValue]}.
 	 * @param returnValue any value returned by the invocation.
-	 * Used to replace the <code>$[returnValue]</code> placeholder. May be <code>null</code>.
-	 * @param throwable any <code>Throwable</code> raised during the invocation.
-	 * The value of <code>Throwable.toString()</code> is replaced for the
-	 * <code>$[exception]</code> placeholder. May be <code>null</code>.
+	 * Used to replace the {@code $[returnValue]} placeholder. May be {@code null}.
+	 * @param throwable any {@code Throwable} raised during the invocation.
+	 * The value of {@code Throwable.toString()} is replaced for the
+	 * {@code $[exception]} placeholder. May be {@code null}.
 	 * @param invocationTime the value to write in place of the
-	 * <code>$[invocationTime]</code> placeholder
+	 * {@code $[invocationTime]} placeholder
 	 * @return the formatted output to write to the log
 	 */
 	protected String replacePlaceholders(String message, MethodInvocation methodInvocation,
@@ -360,12 +360,12 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 	}
 
 	/**
-	 * Adds the <code>String</code> representation of the method return value
-	 * to the supplied <code>StringBuffer</code>. Correctly handles
-	 * <code>null</code> and <code>void</code> results.
-	 * @param methodInvocation the <code>MethodInvocation</code> that returned the value
-	 * @param matcher the <code>Matcher</code> containing the matched placeholder
-	 * @param output the <code>StringBuffer</code> to write output to
+	 * Adds the {@code String} representation of the method return value
+	 * to the supplied {@code StringBuffer}. Correctly handles
+	 * {@code null} and {@code void} results.
+	 * @param methodInvocation the {@code MethodInvocation} that returned the value
+	 * @param matcher the {@code Matcher} containing the matched placeholder
+	 * @param output the {@code StringBuffer} to write output to
 	 * @param returnValue the value returned by the method invocation.
 	 */
 	private void appendReturnValue(
@@ -383,14 +383,14 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 	}
 
 	/**
-	 * Adds a comma-separated list of the short <code>Class</code> names of the
+	 * Adds a comma-separated list of the short {@code Class} names of the
 	 * method argument types to the output. For example, if a method has signature
-	 * <code>put(java.lang.String, java.lang.Object)</code> then the value returned
-	 * will be <code>String, Object</code>.
-	 * @param methodInvocation the <code>MethodInvocation</code> being logged.
-	 * Arguments will be retrieved from the corresponding <code>Method</code>.
-	 * @param matcher the <code>Matcher</code> containing the state of the output
-	 * @param output the <code>StringBuffer</code> containing the output
+	 * {@code put(java.lang.String, java.lang.Object)} then the value returned
+	 * will be {@code String, Object}.
+	 * @param methodInvocation the {@code MethodInvocation} being logged.
+	 * Arguments will be retrieved from the corresponding {@code Method}.
+	 * @param matcher the {@code Matcher} containing the state of the output
+	 * @param output the {@code StringBuffer} containing the output
 	 */
 	private void appendArgumentTypes(MethodInvocation methodInvocation, Matcher matcher, StringBuffer output) {
 		Class[] argumentTypes = methodInvocation.getMethod().getParameterTypes();
@@ -402,9 +402,9 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 	}
 
 	/**
-	 * Checks to see if the supplied <code>String</code> has any placeholders
+	 * Checks to see if the supplied {@code String} has any placeholders
 	 * that are not specified as constants on this class and throws an
-	 * <code>IllegalArgumentException</code> if so.
+	 * {@code IllegalArgumentException} if so.
 	 */
 	private void checkForInvalidPlaceholders(String message) throws IllegalArgumentException {
 		Matcher matcher = PATTERN.matcher(message);
@@ -417,8 +417,8 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 	}
 
 	/**
-	 * Replaces <code>$</code> in inner class names with <code>\$</code>.
-	 * <p>This code is equivalent to JDK 1.5's <code>quoteReplacement</code>
+	 * 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.
 	 */
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java
index 665238f35b..e027d9a13b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java
@@ -19,13 +19,13 @@ package org.springframework.aop.interceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
 /**
- * AOP Alliance <code>MethodInterceptor</code> that can be introduced in a chain
+ * AOP Alliance {@code MethodInterceptor} that can be introduced in a chain
  * to display verbose information about intercepted invocations to the logger.
  *
  * <p>Logs full invocation details on method entry and method exit,
  * including invocation arguments and invocation count. This is only
- * intended for debugging purposes; use <code>SimpleTraceInterceptor</code>
- * or <code>CustomizableTraceInterceptor</code> for pure tracing purposes.
+ * intended for debugging purposes; use {@code SimpleTraceInterceptor}
+ * or {@code CustomizableTraceInterceptor} for pure tracing purposes.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
index 5fbb6ad8e8..42750137ac 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
@@ -29,7 +29,7 @@ import org.springframework.beans.factory.NamedBean;
 /**
  * Convenient methods for creating advisors that may be used when autoproxying beans
  * created with the Spring IoC container, binding the bean name to the current
- * invocation. May support a <code>bean()</code> pointcut designator with AspectJ.
+ * invocation. May support a {@code bean()} pointcut designator with AspectJ.
  *
  * <p>Typically used in Spring auto-proxying, where the bean name is known
  * at proxy creation time.
@@ -52,7 +52,7 @@ public abstract class ExposeBeanNameAdvisors {
 	 * Find the bean name for the current invocation. Assumes that an ExposeBeanNameAdvisor
 	 * has been included in the interceptor chain, and that the invocation is exposed
 	 * with ExposeInvocationInterceptor.
-	 * @return the bean name (never <code>null</code>)
+	 * @return the bean name (never {@code null})
 	 * @throws IllegalStateException if the bean name has not been exposed
 	 */
 	public static String getBeanName() throws IllegalStateException {
@@ -63,7 +63,7 @@ public abstract class ExposeBeanNameAdvisors {
 	 * Find the bean name for the given invocation. Assumes that an ExposeBeanNameAdvisor
 	 * has been included in the interceptor chain.
 	 * @param mi MethodInvocation that should contain the bean name as an attribute
-	 * @return the bean name (never <code>null</code>)
+	 * @return the bean name (never {@code null})
 	 * @throws IllegalStateException if the bean name has not been exposed
 	 */
 	public static String getBeanName(MethodInvocation mi) throws IllegalStateException {
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
index 86ac202756..51de80ec0f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
@@ -101,7 +101,7 @@ public class ExposeInvocationInterceptor implements MethodInterceptor, Ordered,
 	/**
 	 * Required to support serialization. Replaces with canonical instance
 	 * on deserialization, protecting Singleton pattern.
-	 * <p>Alternative to overriding the <code>equals</code> method.
+	 * <p>Alternative to overriding the {@code equals} method.
 	 */
 	private Object readResolve() {
 		return INSTANCE;
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
index f22f54a77b..7db0a7ed3d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
@@ -22,10 +22,10 @@ import org.apache.commons.logging.Log;
 import org.springframework.util.StopWatch;
 
 /**
- * Simple AOP Alliance <code>MethodInterceptor</code> for performance monitoring.
+ * Simple AOP Alliance {@code MethodInterceptor} for performance monitoring.
  * This interceptor has no effect on the intercepted method call.
  *
- * <p>Uses a <code>StopWatch</code> for the actual performance measuring.
+ * <p>Uses a {@code StopWatch} for the actual performance measuring.
  *
  * @author Rod Johnson
  * @author Dmitriy Kopylenko
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java
index 34d0185561..6a7fb5c171 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java
@@ -20,11 +20,11 @@ import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.logging.Log;
 
 /**
- * Simple AOP Alliance <code>MethodInterceptor</code> that can be introduced
+ * Simple AOP Alliance {@code MethodInterceptor} that can be introduced
  * in a chain to display verbose trace information about intercepted method
  * invocations, with method entry and method exit info.
  *
- * <p>Consider using <code>CustomizableTraceInterceptor</code> for more
+ * <p>Consider using {@code CustomizableTraceInterceptor} for more
  * advanced needs.
  *
  * @author Dmitriy Kopylenko
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
index 743d4559fd..db654b56a0 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
@@ -46,7 +46,7 @@ public abstract class AbstractExpressionPointcut implements ExpressionPointcut,
 	 * Return location information about the pointcut expression
 	 * if available. This is useful in debugging.
 	 * @return location information as a human-readable String,
-	 * or <code>null</code> if none is available
+	 * or {@code null} if none is available
 	 */
 	public String getLocation() {
 		return this.location;
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 ac64a99226..3967691556 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
@@ -34,8 +34,8 @@ import org.springframework.util.StringUtils;
  * </ul>
  *
  * <p>Note: the regular expressions must be a match. For example,
- * <code>.*get.*</code> will match com.mycom.Foo.getBar().
- * <code>get.*</code> will not.
+ * {@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
@@ -172,17 +172,17 @@ public abstract class AbstractRegexpMethodPointcut extends StaticMethodMatcherPo
 
 	/**
 	 * Does the pattern at the given index match this string?
-	 * @param pattern <code>String</code> pattern to match
+	 * @param pattern {@code String} pattern to match
 	 * @param patternIndex index of pattern from 0
-	 * @return <code>true</code> if there is a match, else <code>false</code>.
+	 * @return {@code true} if there is a match, else {@code false}.
 	 */
 	protected abstract boolean matches(String pattern, int patternIndex);
 
 	/**
 	 * Does the exclusion pattern at the given index match this string?
-	 * @param pattern <code>String</code> pattern to match.
+	 * @param pattern {@code String} pattern to match.
 	 * @param patternIndex index of pattern starting from 0.
-	 * @return <code>true</code> if there is a match, else <code>false</code>.
+	 * @return {@code true} if there is a match, else {@code false}.
 	 */
 	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 86234323a2..fdd985191e 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
@@ -109,7 +109,7 @@ public abstract class AopUtils {
 	 * <p>Returns the target class for an AOP proxy and the plain class else.
 	 * @param candidate the instance to check (might be an AOP proxy)
 	 * @return the target class (or the plain class of the given object as fallback;
-	 * never <code>null</code>)
+	 * never {@code null})
 	 * @see org.springframework.aop.TargetClassAware#getTargetClass()
 	 * @see org.springframework.aop.framework.AopProxyUtils#ultimateTargetClass(Object)
 	 */
@@ -161,17 +161,17 @@ public abstract class AopUtils {
 	/**
 	 * Given a method, which may come from an interface, and a target class used
 	 * in the current AOP invocation, find the corresponding target method if there
-	 * is one. E.g. the method may be <code>IFoo.bar()</code> and the target class
-	 * may be <code>DefaultFoo</code>. In this case, the method may be
-	 * <code>DefaultFoo.bar()</code>. This enables attributes on that method to be found.
+	 * is one. E.g. the method may be {@code IFoo.bar()} and the target class
+	 * may be {@code DefaultFoo}. In this case, the method may be
+	 * {@code DefaultFoo.bar()}. This enables attributes on that method to be found.
 	 * <p><b>NOTE:</b> In contrast to {@link org.springframework.util.ClassUtils#getMostSpecificMethod},
 	 * this method resolves Java 5 bridge methods in order to retrieve attributes
 	 * from the <i>original</i> method definition.
 	 * @param method the method to be invoked, which may come from an interface
 	 * @param targetClass the target class for the current invocation.
-	 * May be <code>null</code> or may not even implement the method.
+	 * May be {@code null} or may not even implement the method.
 	 * @return the specific target method, or the original method if the
-	 * <code>targetClass</code> doesn't implement it or is <code>null</code>
+	 * {@code targetClass} doesn't implement it or is {@code null}
 	 * @see org.springframework.util.ClassUtils#getMostSpecificMethod
 	 */
 	public static Method getMostSpecificMethod(Method method, Class<?> targetClass) {
@@ -268,7 +268,7 @@ public abstract class AopUtils {
 	}
 
 	/**
-	 * Determine the sublist of the <code>candidateAdvisors</code> list
+	 * Determine the sublist of the {@code candidateAdvisors} list
 	 * that is applicable to the given class.
 	 * @param candidateAdvisors the Advisors to evaluate
 	 * @param clazz the target class
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 b92e535f63..1ec8a01229 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
@@ -28,9 +28,9 @@ import org.springframework.util.ObjectUtils;
  * Convenient class for building up pointcuts. All methods return
  * ComposablePointcut, so we can use a concise idiom like:
  *
- * <code>
+ * {@code
  * Pointcut pc = new ComposablePointcut().union(classFilter).intersection(methodMatcher).intersection(pointcut);
- * </code>
+ * }
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -49,8 +49,8 @@ public class ComposablePointcut implements Pointcut, Serializable {
 
 
 	/**
-	 * Create a default ComposablePointcut, with <code>ClassFilter.TRUE</code>
-	 * and <code>MethodMatcher.TRUE</code>.
+	 * Create a default ComposablePointcut, with {@code ClassFilter.TRUE}
+	 * and {@code MethodMatcher.TRUE}.
 	 */
 	public ComposablePointcut() {
 		this.classFilter = ClassFilter.TRUE;
@@ -69,7 +69,7 @@ public class ComposablePointcut implements Pointcut, Serializable {
 
 	/**
 	 * Create a ComposablePointcut for the given ClassFilter,
-	 * with <code>MethodMatcher.TRUE</code>.
+	 * with {@code MethodMatcher.TRUE}.
 	 * @param classFilter the ClassFilter to use
 	 */
 	public ComposablePointcut(ClassFilter classFilter) {
@@ -80,7 +80,7 @@ public class ComposablePointcut implements Pointcut, Serializable {
 
 	/**
 	 * Create a ComposablePointcut for the given MethodMatcher,
-	 * with <code>ClassFilter.TRUE</code>.
+	 * with {@code ClassFilter.TRUE}.
 	 * @param methodMatcher the MethodMatcher to use
 	 */
 	public ComposablePointcut(MethodMatcher methodMatcher) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
index 0de1c9fd08..9059a86669 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
@@ -39,7 +39,7 @@ public class DefaultBeanFactoryPointcutAdvisor extends AbstractBeanFactoryPointc
 
 	/**
 	 * Specify the pointcut targeting the advice.
-	 * <p>Default is <code>Pointcut.TRUE</code>.
+	 * <p>Default is {@code Pointcut.TRUE}.
 	 * @see #setAdviceBeanName
 	 */
 	public void setPointcut(Pointcut pointcut) {
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 8d5eac8966..36c81c130b 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
@@ -62,7 +62,7 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil
 	 * Create a DefaultIntroductionAdvisor for the given advice.
 	 * @param advice the Advice to apply
 	 * @param introductionInfo the IntroductionInfo that describes
-	 * the interface to introduce (may be <code>null</code>)
+	 * the interface to introduce (may be {@code null})
 	 */
 	public DefaultIntroductionAdvisor(Advice advice, IntroductionInfo introductionInfo) {
 		Assert.notNull(advice, "Advice must not be null");
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
index 2e97d6de12..7cb9ffb44e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
@@ -42,14 +42,14 @@ public class DefaultPointcutAdvisor extends AbstractGenericPointcutAdvisor imple
 	/**
 	 * Create an empty DefaultPointcutAdvisor.
 	 * <p>Advice must be set before use using setter methods.
-	 * Pointcut will normally be set also, but defaults to <code>Pointcut.TRUE</code>.
+	 * Pointcut will normally be set also, but defaults to {@code Pointcut.TRUE}.
 	 */
 	public DefaultPointcutAdvisor() {
 	}
 
 	/**
 	 * Create a DefaultPointcutAdvisor that matches all methods.
-	 * <p><code>Pointcut.TRUE</code> will be used as Pointcut.
+	 * <p>{@code Pointcut.TRUE} will be used as Pointcut.
 	 * @param advice the Advice to use
 	 */
 	public DefaultPointcutAdvisor(Advice advice) {
@@ -69,7 +69,7 @@ public class DefaultPointcutAdvisor extends AbstractGenericPointcutAdvisor imple
 
 	/**
 	 * Specify the pointcut targeting the advice.
-	 * <p>Default is <code>Pointcut.TRUE</code>.
+	 * <p>Default is {@code Pointcut.TRUE}.
 	 * @see #setAdvice
 	 */
 	public void setPointcut(Pointcut pointcut) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
index 8cac8329e3..7e0747ab86 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
@@ -34,7 +34,7 @@ import org.springframework.aop.ProxyMethodInvocation;
  * object will have its <i>own</i> delegate (whereas DelegatingIntroductionInterceptor
  * shares the same delegate, and hence the same state across all targets).
  *
- * <p>The <code>suppressInterface</code> method can be used to suppress interfaces
+ * <p>The {@code suppressInterface} method can be used to suppress interfaces
  * implemented by the delegate class but which should not be introduced to the
  * owning AOP proxy.
  *
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
index 340e66639d..738c336643 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
  * All interfaces except IntroductionInterceptor are picked up from
  * the subclass or delegate by default.
  *
- * <p>The <code>suppressInterface</code> method can be used to suppress interfaces
+ * <p>The {@code suppressInterface} method can be used to suppress interfaces
  * implemented by the delegate but which should not be introduced to the owning
  * AOP proxy.
  *
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
index 61595ff86a..af1b41c711 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 /**
- * Regular expression pointcut based on the <code>java.util.regex</code> package.
+ * Regular expression pointcut based on the {@code java.util.regex} package.
  * Supports the following JavaBean properties:
  * <ul>
  * <li>pattern: regular expression for the fully-qualified method names to match
@@ -30,8 +30,8 @@ import java.util.regex.PatternSyntaxException;
  * </ul>
  *
  * <p>Note: the regular expressions must be a match. For example,
- * <code>.*get.*</code> will match com.mycom.Foo.getBar().
- * <code>get.*</code> will not.
+ * {@code .*get.*} will match com.mycom.Foo.getBar().
+ * {@code get.*} will not.
  *
  * @author Dmitriy Kopylenko
  * @author Rob Harrop
@@ -51,7 +51,7 @@ public class JdkRegexpMethodPointcut extends AbstractRegexpMethodPointcut {
 
 
 	/**
-	 * Initialize {@link Pattern Patterns} from the supplied <code>String[]</code>.
+	 * Initialize {@link Pattern Patterns} from the supplied {@code String[]}.
 	 */
 	@Override
 	protected void initPatternRepresentation(String[] patterns) throws PatternSyntaxException {
@@ -59,7 +59,7 @@ public class JdkRegexpMethodPointcut extends AbstractRegexpMethodPointcut {
 	}
 
 	/**
-	 * Initialize exclusion {@link Pattern Patterns} from the supplied <code>String[]</code>.
+	 * Initialize exclusion {@link Pattern Patterns} from the supplied {@code String[]}.
 	 */
 	@Override
 	protected void initExcludedPatternRepresentation(String[] excludedPatterns) throws PatternSyntaxException {
@@ -67,8 +67,8 @@ public class JdkRegexpMethodPointcut extends AbstractRegexpMethodPointcut {
 	}
 
 	/**
-	 * Returns <code>true</code> if the {@link Pattern} at index <code>patternIndex</code>
-	 * matches the supplied candidate <code>String</code>.
+	 * Returns {@code true} if the {@link Pattern} at index {@code patternIndex}
+	 * matches the supplied candidate {@code String}.
 	 */
 	@Override
 	protected boolean matches(String pattern, int patternIndex) {
@@ -77,8 +77,8 @@ public class JdkRegexpMethodPointcut extends AbstractRegexpMethodPointcut {
 	}
 
 	/**
-	 * Returns <code>true</code> if the exclusion {@link Pattern} at index <code>patternIndex</code>
-	 * matches the supplied candidate <code>String</code>.
+	 * Returns {@code true} if the exclusion {@link Pattern} at index {@code patternIndex}
+	 * matches the supplied candidate {@code String}.
 	 */
 	@Override
 	protected boolean matchesExclusion(String candidate, int patternIndex) {
@@ -88,7 +88,7 @@ public class JdkRegexpMethodPointcut extends AbstractRegexpMethodPointcut {
 
 
 	/**
-	 * Compiles the supplied <code>String[]</code> into an array of
+	 * Compiles the supplied {@code String[]} into an array of
 	 * {@link Pattern} objects and returns that array.
 	 */
 	private Pattern[] compilePatterns(String[] source) throws PatternSyntaxException {
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 b4d4fd6f47..54c612d4cb 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
@@ -82,10 +82,10 @@ public abstract class MethodMatchers {
 	 * (if applicable).
 	 * @param mm the MethodMatcher to apply (may be an IntroductionAwareMethodMatcher)
 	 * @param method the candidate method
-	 * @param targetClass the target class (may be <code>null</code>, in which case
+	 * @param targetClass the target class (may be {@code null}, in which case
 	 * the candidate class must be taken to be the method's declaring class)
-	 * @param hasIntroductions <code>true</code> if the object on whose behalf we are
-	 * asking is the subject on one or more introductions; <code>false</code> otherwise
+	 * @param hasIntroductions {@code true} if the object on whose behalf we are
+	 * 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) {
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 44a03380ff..0cb2e94d5c 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
@@ -42,7 +42,7 @@ public class NameMatchMethodPointcut extends StaticMethodMatcherPointcut impleme
 
 	/**
 	 * Convenience method when we have only a single method name to match.
-	 * Use either this method or <code>setMappedNames</code>, not both.
+	 * Use either this method or {@code setMappedNames}, not both.
 	 * @see #setMappedNames
 	 */
 	public void setMappedName(String mappedName) {
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 4cd21ec070..46e4f9b876 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
@@ -53,7 +53,7 @@ public class NameMatchMethodPointcutAdvisor extends AbstractGenericPointcutAdvis
 
 	/**
 	 * Convenience method when we have only a single method name to match.
-	 * Use either this method or <code>setMappedNames</code>, not both.
+	 * Use either this method or {@code setMappedNames}, not both.
 	 * @see #setMappedNames
 	 * @see NameMatchMethodPointcut#setMappedName
 	 */
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 a610e37f71..74a71b6937 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
@@ -128,7 +128,7 @@ public class RegexpMethodPointcutAdvisor extends AbstractGenericPointcutAdvisor
 	/**
 	 * Create the actual pointcut: By default, a {@link JdkRegexpMethodPointcut}
 	 * will be used.
-	 * @return the Pointcut instance (never <code>null</code>)
+	 * @return the Pointcut instance (never {@code null})
 	 */
 	protected AbstractRegexpMethodPointcut createPointcut() {
 		return new JdkRegexpMethodPointcut();
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 01181525e8..9bafe1bd49 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
@@ -64,9 +64,9 @@ public class AnnotationMatchingPointcut implements Pointcut {
 	/**
 	 * Create a new AnnotationMatchingPointcut for the given annotation type.
 	 * @param classAnnotationType the annotation type to look for at the class level
-	 * (can be <code>null</code>)
+	 * (can be {@code null})
 	 * @param methodAnnotationType the annotation type to look for at the method level
-	 * (can be <code>null</code>)
+	 * (can be {@code null})
 	 */
 	public AnnotationMatchingPointcut(
 			Class<? extends Annotation> classAnnotationType, Class<? extends Annotation> methodAnnotationType) {
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 2980b0bf42..8a2d9a6a27 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
@@ -94,8 +94,8 @@ public abstract class AbstractBeanFactoryBasedTargetSource
 	/**
 	 * Specify the target class explicitly, to avoid any kind of access to the
 	 * target bean (for example, to avoid initialization of a FactoryBean instance).
-	 * <p>Default is to detect the type automatically, through a <code>getType</code>
-	 * call on the BeanFactory (or even a full <code>getBean</code> call as fallback).
+	 * <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) {
 		this.targetClass = targetClass;
@@ -103,7 +103,7 @@ public abstract class AbstractBeanFactoryBasedTargetSource
 
 	/**
 	 * Set the owning BeanFactory. We need to save a reference so that we can
-	 * use the <code>getBean</code> method on every invocation.
+	 * use the {@code getBean} method on every invocation.
 	 */
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (this.targetBeanName == null) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java
index 3119e847f1..86259b7abe 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java
@@ -26,7 +26,7 @@ import org.springframework.aop.TargetSource;
  * lazily create a user-managed object.
  *
  * <p>Creation of the lazy target object is controlled by the user by implementing
- * the {@link #createObject()} method. This <code>TargetSource</code> will invoke
+ * the {@link #createObject()} method. This {@code TargetSource} will invoke
  * this method the first time the proxy is accessed.
  *
  * <p>Useful when you need to pass a reference to some dependency to an object
@@ -57,11 +57,11 @@ public abstract class AbstractLazyCreationTargetSource implements TargetSource {
 	}
 
 	/**
-	 * This default implementation returns <code>null</code> if the
-	 * target is <code>null</code> (it is hasn't yet been initialized),
+	 * This default implementation returns {@code null} if the
+	 * target is {@code null} (it is hasn't yet been initialized),
 	 * or the target class if the target has already been initialized.
 	 * <p>Subclasses may wish to override this method in order to provide
-	 * a meaningful value when the target is still <code>null</code>.
+	 * a meaningful value when the target is still {@code null}.
 	 * @see #isInitialized()
 	 */
 	public synchronized Class<?> getTargetClass() {
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 3c73521e74..ccb8b56637 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
@@ -102,7 +102,7 @@ public abstract class AbstractPoolingTargetSource extends AbstractPrototypeBased
 	/**
 	 * Return the given object to the pool.
 	 * @param target object that must have been acquired from the pool
-	 * via a call to <code>getTarget()</code>
+	 * via a call to {@code getTarget()}
 	 * @throws Exception to allow pooling APIs to throw exception
 	 * @see #getTarget
 	 */
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 f2677afbc2..4880d5119b 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
@@ -33,7 +33,7 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory;
  * new-instance-per-invocation strategy.
  *
  * <p>Such TargetSources must run in a {@link BeanFactory}, as it needs to
- * call the <code>getBean</code> method to create a new prototype instance.
+ * call the {@code getBean} method to create a new prototype instance.
  * Therefore, this base class extends {@link AbstractBeanFactoryBasedTargetSource}.
  *
  * @author Rod Johnson
@@ -102,7 +102,7 @@ public abstract class AbstractPrototypeBasedTargetSource extends AbstractBeanFac
 	/**
 	 * Replaces this object with a SingletonTargetSource on serialization.
 	 * Protected as otherwise it won't be invoked for subclasses.
-	 * (The <code>writeReplace()</code> method must be visible to the class
+	 * (The {@code writeReplace()} method must be visible to the class
 	 * being serialized.)
 	 * <p>With this implementation of this method, there is no need to mark
 	 * non-serializable fields in this class or subclasses as transient.
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 ba3e32d1f4..24920b3987 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
@@ -27,19 +27,19 @@ import org.springframework.core.Constants;
  * TargetSource implementation that holds objects in a configurable
  * Jakarta Commons Pool.
  *
- * <p>By default, an instance of <code>GenericObjectPool</code> is created.
- * Subclasses may change the type of <code>ObjectPool</code> used by
- * overriding the <code>createObjectPool()</code> method.
+ * <p>By default, an instance of {@code GenericObjectPool} is created.
+ * Subclasses may change the type of {@code ObjectPool} used by
+ * overriding the {@code createObjectPool()} method.
  *
  * <p>Provides many configuration properties mirroring those of the Commons Pool
- * <code>GenericObjectPool</code> class; these properties are passed to the
- * <code>GenericObjectPool</code> during construction. If creating a subclass of this
- * class to change the <code>ObjectPool</code> implementation type, pass in the values
+ * {@code GenericObjectPool} class; these properties are passed to the
+ * {@code GenericObjectPool} during construction. If creating a subclass of this
+ * class to change the {@code ObjectPool} implementation type, pass in the values
  * of configuration properties that are relevant to your chosen implementation.
  *
- * <p>The <code>testOnBorrow</code>, <code>testOnReturn</code> and <code>testWhileIdle</code>
+ * <p>The {@code testOnBorrow}, {@code testOnReturn} and {@code testWhileIdle}
  * properties are explictly not mirrored because the implementation of
- * <code>PoolableObjectFactory</code> used by this class does not implement
+ * {@code PoolableObjectFactory} used by this class does not implement
  * meaningful validation. All exposed Commons Pool properties use the corresponding
  * Commons Pool defaults: for example,
  *
@@ -74,7 +74,7 @@ public class CommonsPoolTargetSource extends AbstractPoolingTargetSource
 	private byte whenExhaustedAction = GenericObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION;
 
 	/**
-	 * The Jakarta Commons <code>ObjectPool</code> used to pool target objects
+	 * The Jakarta Commons {@code ObjectPool} used to pool target objects
 	 */
 	private ObjectPool pool;
 
@@ -217,7 +217,7 @@ public class CommonsPoolTargetSource extends AbstractPoolingTargetSource
 	 * Subclasses can override this if they want to return a specific Commons pool.
 	 * They should apply any configuration properties to the pool here.
 	 * <p>Default is a GenericObjectPool instance with the given pool size.
-	 * @return an empty Commons <code>ObjectPool</code>.
+	 * @return an empty Commons {@code ObjectPool}.
 	 * @see org.apache.commons.pool.impl.GenericObjectPool
 	 * @see #setMaxSize
 	 */
@@ -235,7 +235,7 @@ public class CommonsPoolTargetSource extends AbstractPoolingTargetSource
 
 
 	/**
-	 * Borrow an object from the <code>ObjectPool</code>.
+	 * Borrow an object from the {@code ObjectPool}.
 	 */
 	@Override
 	public Object getTarget() throws Exception {
@@ -243,7 +243,7 @@ public class CommonsPoolTargetSource extends AbstractPoolingTargetSource
 	}
 
 	/**
-	 * Returns the specified object to the underlying <code>ObjectPool</code>.
+	 * Returns the specified object to the underlying {@code ObjectPool}.
 	 */
 	@Override
 	public void releaseTarget(Object target) throws Exception {
@@ -260,7 +260,7 @@ public class CommonsPoolTargetSource extends AbstractPoolingTargetSource
 
 
 	/**
-	 * Closes the underlying <code>ObjectPool</code> when destroying this object.
+	 * Closes the underlying {@code ObjectPool} when destroying this object.
 	 */
 	public void destroy() throws Exception {
 		logger.debug("Closing Commons ObjectPool");
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
index d67b03f0f3..f6358585e2 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
@@ -22,7 +22,7 @@ import org.springframework.aop.TargetSource;
 import org.springframework.util.ObjectUtils;
 
 /**
- * Canonical <code>TargetSource</code> when there is no target
+ * Canonical {@code TargetSource} when there is no target
  * (or just the target class known), and behavior is supplied
  * by interfaces and advisors only.
  *
@@ -47,7 +47,7 @@ public class EmptyTargetSource implements TargetSource, Serializable {
 
 	/**
 	 * Return an EmptyTargetSource for the given target Class.
-	 * @param targetClass the target Class (may be <code>null</code>)
+	 * @param targetClass the target Class (may be {@code null})
 	 * @see #getTargetClass()
 	 */
 	public static EmptyTargetSource forClass(Class targetClass) {
@@ -56,7 +56,7 @@ public class EmptyTargetSource implements TargetSource, Serializable {
 
 	/**
 	 * Return an EmptyTargetSource for the given target Class.
-	 * @param targetClass the target Class (may be <code>null</code>)
+	 * @param targetClass the target Class (may be {@code null})
 	 * @param isStatic whether the TargetSource should be marked as static
 	 * @see #getTargetClass()
 	 */
@@ -76,9 +76,9 @@ public class EmptyTargetSource implements TargetSource, Serializable {
 
 	/**
 	 * Create a new instance of the {@link EmptyTargetSource} class.
-	 * <p>This constructor is <code>private</code> to enforce the
+	 * <p>This constructor is {@code private} to enforce the
 	 * Singleton pattern / factory method pattern.
-	 * @param targetClass the target class to expose (may be <code>null</code>)
+	 * @param targetClass the target class to expose (may be {@code null})
 	 * @param isStatic whether the TargetSource is marked as static
 	 */
 	private EmptyTargetSource(Class targetClass, boolean isStatic) {
@@ -87,21 +87,21 @@ public class EmptyTargetSource implements TargetSource, Serializable {
 	}
 
 	/**
-	 * Always returns the specified target Class, or <code>null</code> if none.
+	 * Always returns the specified target Class, or {@code null} if none.
 	 */
 	public Class<?> getTargetClass() {
 		return this.targetClass;
 	}
 
 	/**
-	 * Always returns <code>true</code>.
+	 * Always returns {@code true}.
 	 */
 	public boolean isStatic() {
 		return this.isStatic;
 	}
 
 	/**
-	 * Always returns <code>null</code>.
+	 * Always returns {@code null}.
 	 */
 	public Object getTarget() {
 		return null;
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
index 2786e16fba..a87f92092a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
@@ -26,9 +26,9 @@ import org.springframework.beans.BeansException;
  * the actual target object should not be initialized until first use.
  * When the target bean is defined in an
  * {@link org.springframework.context.ApplicationContext} (or a
- * <code>BeanFactory</code> that is eagerly pre-instantiating singleton beans)
+ * {@code BeanFactory} that is eagerly pre-instantiating singleton beans)
  * it must be marked as "lazy-init" too, else it will be instantiated by said
- * <code>ApplicationContext</code> (or <code>BeanFactory</code>) on startup.
+ * {@code ApplicationContext} (or {@code BeanFactory}) on startup.
  * <p>For example:
  *
  * <pre class="code">
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 dd39eecbcb..ca20b2ceea 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
@@ -37,7 +37,7 @@ import org.springframework.core.NamedThreadLocal;
  * for example, if one caller makes repeated calls on the AOP proxy.
  *
  * <p>Cleanup of thread-bound objects is performed on BeanFactory destruction,
- * calling their <code>DisposableBean.destroy()</code> method if available.
+ * calling their {@code DisposableBean.destroy()} method if available.
  * Be aware that many thread-bound objects can be around until the application
  * actually shuts down.
  *
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java
index befbcf3939..865e4fa699 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java
@@ -56,7 +56,7 @@ public abstract class AbstractRefreshableTargetSource implements TargetSource, R
 	 * Set the delay between refresh checks, in milliseconds.
 	 * Default is -1, indicating no refresh checks at all.
 	 * <p>Note that an actual refresh will only happen when
-	 * {@link #requiresRefresh()} returns <code>true</code>.
+	 * {@link #requiresRefresh()} returns {@code true}.
 	 */
 	public void setRefreshCheckDelay(long refreshCheckDelay) {
 		this.refreshCheckDelay = refreshCheckDelay;
@@ -131,7 +131,7 @@ public abstract class AbstractRefreshableTargetSource implements TargetSource, R
 	/**
 	 * Determine whether a refresh is required.
 	 * Invoked for each refresh check, after the refresh check delay has elapsed.
-	 * <p>The default implementation always returns <code>true</code>, triggering
+	 * <p>The default implementation always returns {@code true}, triggering
 	 * a refresh every time the delay has elapsed. To be overridden by subclasses
 	 * with an appropriate check of the underlying target resource.
 	 * @return whether a refresh is required
@@ -143,7 +143,7 @@ public abstract class AbstractRefreshableTargetSource implements TargetSource, R
 	/**
 	 * Obtain a fresh target object.
 	 * <p>Only invoked if a refresh check has found that a refresh is required
-	 * (that is, {@link #requiresRefresh()} has returned <code>true</code>).
+	 * (that is, {@link #requiresRefresh()} has returned {@code true}).
 	 * @return the fresh target object
 	 */
 	protected abstract Object freshTarget();
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java
index ac39d756c7..76c17e3337 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java
@@ -22,7 +22,7 @@ import org.springframework.util.Assert;
 /**
  * Refreshable TargetSource that fetches fresh target beans from a BeanFactory.
  *
- * <p>Can be subclassed to override <code>requiresRefresh()</code> to suppress
+ * <p>Can be subclassed to override {@code requiresRefresh()} to suppress
  * unnecessary refreshes. By default, a refresh will be performed every time
  * the "refreshCheckDelay" has elapsed.
  *
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
index 8af3a40d8a..de10e14b42 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
@@ -41,29 +41,6 @@ import org.springframework.aop.support.DefaultPointcutAdvisor;
  */
 public final class AspectJPrecedenceComparatorTests {
 
-	/*
-	 * Specification for the comparator (as defined in the
-	 * AspectJPrecedenceComparator class)
-	 *
-	 * <p>
-	 * Orders AspectJ advice/advisors by invocation order.
-	 * </p>
-	 * <p>
-	 * Given two pieces of advice, <code>a</code> and <code>b</code>:
-	 * </p>
-	 * <ul>
-	 *   <li>if <code>a</code> and <code>b</code> are defined in different
-	 *   aspects, then the advice in the aspect with the lowest order
-	 *   value has the highest precedence</li>
-	 *   <li>if <code>a</code> and <code>b</code> are defined in the same
-	 *   aspect, then if one of <code>a</code> or <code>b</code> is a form of
-	 *   after advice, then the advice declared last in the aspect has the
-	 *   highest precedence. If neither <code>a</code> nor <code>b</code> is a
-	 *   form of after advice, then the advice declared first in the aspect has
-	 *   the highest precedence.</li>
-	 * </ul>
-	 */
-
 	private static final int HIGH_PRECEDENCE_ADVISOR_ORDER = 100;
 	private static final int LOW_PRECEDENCE_ADVISOR_ORDER = 200;
 	private static final int EARLY_ADVICE_DECLARATION_ORDER = 5;
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj
index 2061f62321..5abf0e2989 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.wiring.BeanConfigurerSupport;
  * pointcut in subaspects.
  *
  * <p>Subaspects may also need a metadata resolution strategy, in the
- * <code>BeanWiringInfoResolver</code> interface. The default implementation
+ * {@code BeanWiringInfoResolver} interface. The default implementation
  * looks for a bean with the same name as the FQN. This is the default name
  * of a bean in a Spring container if the id value is not supplied explicitly.
  *
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 fee434c3e3..0a7303eca8 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
@@ -29,8 +29,8 @@ import java.io.Serializable;
  * <p>
  * There are two cases that needs to be handled:
  * <ol>
- *   <li>Normal object creation via the '<code>new</code>' operator: this is
- *       taken care of by advising <code>initialization()</code> join points.</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
@@ -41,21 +41,21 @@ import java.io.Serializable;
  *       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,
+ *           {@code private}. 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.
+ *       <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</code>. However, this shouldn't be a big burden, since
+ *           {@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</code> should not
+ *           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()</code>, if any, must be
- *       <code>public</code>) can be lifted as well if we were to use an
- *       experimental feature in AspectJ - the <code>hasmethod()</code> PCD.</li>
+ *       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>
@@ -103,17 +103,17 @@ public abstract aspect AbstractInterfaceDrivenDependencyInjectionAspect extends
 		ConfigurableObject+ && Serializable+	implements ConfigurableDeserializationSupport;
 
 	/**
-	 * A marker interface to which the <code>readResolve()</code> is introduced.
+	 * A marker interface to which the {@code readResolve()} is introduced.
 	 */
 	static interface ConfigurableDeserializationSupport extends Serializable {
 	}
 
 	/**
-	 * Introduce the <code>readResolve()</code> method so that we can advise its
+	 * 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</code> class of ConfigurableObject type,
+	 * {@code Serializable} class of ConfigurableObject type,
 	 * that implementation will take precedence (a good thing, since we are
 	 * merely interested in an opportunity to detect deserialization.)
 	 */
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 20b151ed31..06e32f4bfb 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
@@ -32,7 +32,7 @@ import org.springframework.beans.factory.wiring.BeanConfigurerSupport;
  * annotation to identify which classes need autowiring.
  *
  * <p>The bean name to look up will be taken from the
- * <code>&#64;Configurable</code> annotation if specified, otherwise the
+ * {@code &#64;Configurable} annotation if specified, otherwise the
  * default bean name to look up will be the FQN of the class being configured.
  *
  * @author Rod Johnson
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
index bee02ac9be..d91b05d117 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
@@ -22,7 +22,7 @@ package org.springframework.beans.factory.aspectj;
  * the use of the &#64;Configurable annotation.
  *
  * The subaspect of this aspect doesn't need to include any AOP constructs.
- * For example, here is a subaspect that configures the <code>PricingStrategyClient</code> objects.
+ * For example, here is a subaspect that configures the {@code PricingStrategyClient} objects.
  * <pre>
  * aspect PricingStrategyDependencyInjectionAspect
  *        extends GenericInterfaceDrivenDependencyInjectionAspect<PricingStrategyClient> {
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 f6c9b7b0a9..56bf082939 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
@@ -18,7 +18,7 @@ package org.springframework.mock.staticmock;
 
 /**
  * Annotation-based aspect to use in test build to enable mocking static methods
- * on JPA-annotated <code>@Entity</code> classes, as used by Roo for finders.
+ * on JPA-annotated {@code @Entity} classes, as used by Roo for finders.
  *
  * <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.
diff --git a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj
index 27a09bb462..3daa476116 100644
--- a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj
@@ -25,7 +25,7 @@ import org.springframework.transaction.interceptor.TransactionAttributeSource;
 
 /**
  * Abstract superaspect for AspectJ transaction aspects. Concrete
- * subaspects will implement the <code>transactionalMethodExecution()</code>
+ * subaspects will implement the {@code transactionalMethodExecution()}
  * pointcut using a strategy such as Java 5 annotations.
  *
  * <p>Suitable for use inside or outside the Spring IoC container.
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
index 8af75c662a..6890b9e706 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
@@ -37,7 +37,7 @@ public class BeanMetadataAttribute implements BeanMetadataElement {
 
 	/**
 	 * Create a new AttributeValue instance.
-	 * @param name the name of the attribute (never <code>null</code>)
+	 * @param name the name of the attribute (never {@code null})
 	 * @param value the value of the attribute (possibly before type conversion)
 	 */
 	public BeanMetadataAttribute(String name, Object value) {
@@ -62,7 +62,7 @@ public class BeanMetadataAttribute implements BeanMetadataElement {
 	}
 
 	/**
-	 * Set the configuration source <code>Object</code> for this metadata element.
+	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
 	 */
 	public void setSource(Object source) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
index 39c28b5747..d059f8e2fa 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
@@ -32,7 +32,7 @@ public class BeanMetadataAttributeAccessor extends AttributeAccessorSupport impl
 
 
 	/**
-	 * Set the configuration source <code>Object</code> for this metadata element.
+	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
 	 */
 	public void setSource(Object source) {
@@ -56,7 +56,7 @@ public class BeanMetadataAttributeAccessor extends AttributeAccessorSupport impl
 	 * Look up the given BeanMetadataAttribute in this accessor's set of attributes.
 	 * @param name the name of the attribute
 	 * @return the corresponding BeanMetadataAttribute object,
-	 * or <code>null</code> if no such attribute defined
+	 * or {@code null} if no such attribute defined
 	 */
 	public BeanMetadataAttribute getMetadataAttribute(String name) {
 		return (BeanMetadataAttribute) super.getAttribute(name);
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java
index 5d39c7f4fd..70b3667bee 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java
@@ -26,8 +26,8 @@ package org.springframework.beans;
 public interface BeanMetadataElement {
 
 	/**
-	 * Return the configuration source <code>Object</code> for this metadata element
-	 * (may be <code>null</code>).
+	 * Return the configuration source {@code Object} for this metadata element
+	 * (may be {@code null}).
 	 */
 	Object getSource();
 
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 8c82e9ed51..0a605478c1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
@@ -169,14 +169,14 @@ public abstract class BeanUtils {
 	 * Find a method with the given method name and the given parameter types,
 	 * declared on the given class or one of its superclasses. Prefers public methods,
 	 * but will return a protected, package access, or private method too.
-	 * <p>Checks <code>Class.getMethod</code> first, falling back to
-	 * <code>findDeclaredMethod</code>. This allows to find public methods
+	 * <p>Checks {@code Class.getMethod} first, falling back to
+	 * {@code findDeclaredMethod}. This allows to find public methods
 	 * without issues even in environments with restricted Java security settings.
 	 * @param clazz the class to check
 	 * @param methodName the name of the method to find
 	 * @param paramTypes the parameter types of the method to find
-	 * @return the Method object, or <code>null</code> if not found
-	 * @see java.lang.Class#getMethod
+	 * @return the Method object, or {@code null} if not found
+	 * @see Class#getMethod
 	 * @see #findDeclaredMethod
 	 */
 	public static Method findMethod(Class<?> clazz, String methodName, Class<?>... paramTypes) {
@@ -192,12 +192,12 @@ public abstract class BeanUtils {
 	 * Find a method with the given method name and the given parameter types,
 	 * declared on the given class or one of its superclasses. Will return a public,
 	 * protected, package access, or private method.
-	 * <p>Checks <code>Class.getDeclaredMethod</code>, cascading upwards to all superclasses.
+	 * <p>Checks {@code Class.getDeclaredMethod}, cascading upwards to all superclasses.
 	 * @param clazz the class to check
 	 * @param methodName the name of the method to find
 	 * @param paramTypes the parameter types of the method to find
-	 * @return the Method object, or <code>null</code> if not found
-	 * @see java.lang.Class#getDeclaredMethod
+	 * @return the Method object, or {@code null} if not found
+	 * @see Class#getDeclaredMethod
 	 */
 	public static Method findDeclaredMethod(Class<?> clazz, String methodName, Class<?>[] paramTypes) {
 		try {
@@ -215,15 +215,15 @@ public abstract class BeanUtils {
 	 * Find a method with the given method name and minimal parameters (best case: none),
 	 * declared on the given class or one of its superclasses. Prefers public methods,
 	 * but will return a protected, package access, or private method too.
-	 * <p>Checks <code>Class.getMethods</code> first, falling back to
-	 * <code>findDeclaredMethodWithMinimalParameters</code>. This allows for finding public
+	 * <p>Checks {@code Class.getMethods} first, falling back to
+	 * {@code findDeclaredMethodWithMinimalParameters}. This allows for finding public
 	 * methods without issues even in environments with restricted Java security settings.
 	 * @param clazz the class to check
 	 * @param methodName the name of the method to find
-	 * @return the Method object, or <code>null</code> if not found
+	 * @return the Method object, or {@code null} if not found
 	 * @throws IllegalArgumentException if methods of the given name were found but
 	 * could not be resolved to a unique method with minimal parameters
-	 * @see java.lang.Class#getMethods
+	 * @see Class#getMethods
 	 * @see #findDeclaredMethodWithMinimalParameters
 	 */
 	public static Method findMethodWithMinimalParameters(Class<?> clazz, String methodName)
@@ -240,13 +240,13 @@ public abstract class BeanUtils {
 	 * Find a method with the given method name and minimal parameters (best case: none),
 	 * declared on the given class or one of its superclasses. Will return a public,
 	 * protected, package access, or private method.
-	 * <p>Checks <code>Class.getDeclaredMethods</code>, cascading upwards to all superclasses.
+	 * <p>Checks {@code Class.getDeclaredMethods}, cascading upwards to all superclasses.
 	 * @param clazz the class to check
 	 * @param methodName the name of the method to find
-	 * @return the Method object, or <code>null</code> if not found
+	 * @return the Method object, or {@code null} if not found
 	 * @throws IllegalArgumentException if methods of the given name were found but
 	 * could not be resolved to a unique method with minimal parameters
-	 * @see java.lang.Class#getDeclaredMethods
+	 * @see Class#getDeclaredMethods
 	 */
 	public static Method findDeclaredMethodWithMinimalParameters(Class<?> clazz, String methodName)
 			throws IllegalArgumentException {
@@ -263,7 +263,7 @@ public abstract class BeanUtils {
 	 * in the given list of methods.
 	 * @param methods the methods to check
 	 * @param methodName the name of the method to find
-	 * @return the Method object, or <code>null</code> if not found
+	 * @return the Method object, or {@code null} if not found
 	 * @throws IllegalArgumentException if methods of the given name were found but
 	 * could not be resolved to a unique method with minimal parameters
 	 */
@@ -297,17 +297,17 @@ public abstract class BeanUtils {
 	}
 
 	/**
-	 * Parse a method signature in the form <code>methodName[([arg_list])]</code>,
-	 * where <code>arg_list</code> is an optional, comma-separated list of fully-qualified
-	 * type names, and attempts to resolve that signature against the supplied <code>Class</code>.
-	 * <p>When not supplying an argument list (<code>methodName</code>) the method whose name
+	 * Parse a method signature in the form {@code methodName[([arg_list])]},
+	 * where {@code arg_list} is an optional, comma-separated list of fully-qualified
+	 * type names, and attempts to resolve that signature against the supplied {@code Class}.
+	 * <p>When not supplying an argument list ({@code methodName}) the method whose name
 	 * matches and has the least number of parameters will be returned. When supplying an
 	 * argument type list, only the method whose name and argument types match will be returned.
-	 * <p>Note then that <code>methodName</code> and <code>methodName()</code> are <strong>not</strong>
-	 * resolved in the same way. The signature <code>methodName</code> means the method called
-	 * <code>methodName</code> with the least number of arguments, whereas <code>methodName()</code>
-	 * means the method called <code>methodName</code> with exactly 0 arguments.
-	 * <p>If no method can be found, then <code>null</code> is returned.
+	 * <p>Note then that {@code methodName} and {@code methodName()} are <strong>not</strong>
+	 * resolved in the same way. The signature {@code methodName} means the method called
+	 * {@code methodName} with the least number of arguments, whereas {@code methodName()}
+	 * means the method called {@code methodName} with exactly 0 arguments.
+	 * <p>If no method can be found, then {@code null} is returned.
 	 * @param signature the method signature as String representation
 	 * @param clazz the class to resolve the method signature against
 	 * @return the resolved Method
@@ -353,9 +353,9 @@ public abstract class BeanUtils {
 
 
 	/**
-	 * Retrieve the JavaBeans <code>PropertyDescriptor</code>s of a given class.
+	 * Retrieve the JavaBeans {@code PropertyDescriptor}s of a given class.
 	 * @param clazz the Class to retrieve the PropertyDescriptors for
-	 * @return an array of <code>PropertyDescriptors</code> for the given class
+	 * @return an array of {@code PropertyDescriptors} for the given class
 	 * @throws BeansException if PropertyDescriptor look fails
 	 */
 	public static PropertyDescriptor[] getPropertyDescriptors(Class<?> clazz) throws BeansException {
@@ -364,10 +364,10 @@ public abstract class BeanUtils {
 	}
 
 	/**
-	 * Retrieve the JavaBeans <code>PropertyDescriptors</code> for the given property.
+	 * Retrieve the JavaBeans {@code PropertyDescriptors} for the given property.
 	 * @param clazz the Class to retrieve the PropertyDescriptor for
 	 * @param propertyName the name of the property
-	 * @return the corresponding PropertyDescriptor, or <code>null</code> if none
+	 * @return the corresponding PropertyDescriptor, or {@code null} if none
 	 * @throws BeansException if PropertyDescriptor lookup fails
 	 */
 	public static PropertyDescriptor getPropertyDescriptor(Class<?> clazz, String propertyName)
@@ -378,11 +378,11 @@ public abstract class BeanUtils {
 	}
 
 	/**
-	 * Find a JavaBeans <code>PropertyDescriptor</code> for the given method,
+	 * 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
-	 * @return the corresponding PropertyDescriptor, or <code>null</code> if none
+	 * @return the corresponding PropertyDescriptor, or {@code null} if none
 	 * @throws BeansException if PropertyDescriptor lookup fails
 	 */
 	public static PropertyDescriptor findPropertyForMethod(Method method) throws BeansException {
@@ -403,7 +403,7 @@ public abstract class BeanUtils {
 	 * {@link java.beans.PropertyEditorManager} but isolated from the latter's
 	 * registered default editors for primitive types.
 	 * @param targetType the type to find an editor for
-	 * @return the corresponding editor, or <code>null</code> if none found
+	 * @return the corresponding editor, or {@code null} if none found
 	 */
 	public static PropertyEditor findEditorByConvention(Class<?> targetType) {
 		if (targetType == null || targetType.isArray() || unknownEditorTypes.containsKey(targetType)) {
@@ -453,7 +453,7 @@ public abstract class BeanUtils {
 	 * given classes/interfaces, if possible.
 	 * @param propertyName the name of the bean property
 	 * @param beanClasses the classes to check against
-	 * @return the property type, or <code>Object.class</code> as fallback
+	 * @return the property type, or {@code Object.class} as fallback
 	 */
 	public static Class<?> findPropertyType(String propertyName, Class<?>[] beanClasses) {
 		if (beanClasses != null) {
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 aea348d6fd..070fdbf8de 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java
@@ -50,14 +50,14 @@ public interface BeanWrapper extends ConfigurablePropertyAccessor {
 
 	/**
 	 * Return the bean instance wrapped by this object, if any.
-	 * @return the bean instance, or <code>null</code> if none set
+	 * @return the bean instance, or {@code null} if none set
 	 */
 	Object getWrappedInstance();
 
 	/**
 	 * Return the type of the wrapped JavaBean object.
 	 * @return the type of the wrapped bean instance,
-	 * or <code>null</code> if no wrapped object has been set
+	 * or {@code null} if no wrapped object has been set
 	 */
 	Class getWrappedClass();
 
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 1754c8745d..85d7fb0093 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
@@ -55,18 +55,18 @@ import org.springframework.util.StringUtils;
  * for all typical use cases. Caches introspection results for efficiency.
  *
  * <p>Note: Auto-registers default property editors from the
- * <code>org.springframework.beans.propertyeditors</code> package, which apply
+ * {@code org.springframework.beans.propertyeditors} package, which apply
  * in addition to the JDK's standard PropertyEditors. Applications can call
  * the {@link #registerCustomEditor(Class, java.beans.PropertyEditor)} method
  * to register an editor for a particular instance (i.e. they are not shared
  * across the application). See the base class
  * {@link PropertyEditorRegistrySupport} for details.
  *
- * <p><code>BeanWrapperImpl</code> will convert collection and array values
+ * <p>{@code BeanWrapperImpl} will convert collection and array values
  * to the corresponding target collections or arrays, if necessary. Custom
  * property editors that deal with collections or arrays can either be
- * written via PropertyEditor's <code>setValue</code>, or against a
- * comma-delimited String via <code>setAsText</code>, as String arrays are
+ * written via PropertyEditor's {@code setValue}, or against a
+ * comma-delimited String via {@code setAsText}, as String arrays are
  * converted in such a format if the array itself is not assignable.
  *
  * <p><b>NOTE: As of Spring 2.5, this is - for almost all purposes - an
@@ -179,7 +179,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 	 * registering a nested path that the object is in.
 	 * @param object object wrapped by this BeanWrapper
 	 * @param nestedPath the nested path of the object
-	 * @param superBw the containing BeanWrapper (must not be <code>null</code>)
+	 * @param superBw the containing BeanWrapper (must not be {@code null})
 	 */
 	private BeanWrapperImpl(Object object, String nestedPath, BeanWrapperImpl superBw) {
 		setWrappedInstance(object, nestedPath, superBw.getWrappedInstance());
@@ -341,10 +341,10 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 
 	/**
 	 * Internal version of {@link #getPropertyDescriptor}:
-	 * Returns <code>null</code> if not found rather than throwing an exception.
+	 * Returns {@code null} if not found rather than throwing an exception.
 	 * @param propertyName the property to obtain the descriptor for
 	 * @return the property descriptor for the specified property,
-	 * or <code>null</code> if not found
+	 * or {@code null} if not found
 	 * @throws BeansException in case of introspection failure
 	 */
 	protected PropertyDescriptor getPropertyDescriptorInternal(String propertyName) throws BeansException {
@@ -474,7 +474,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 	/**
 	 * Convert the given value for the specified property to the latter's type.
 	 * <p>This method is only intended for optimizations in a BeanFactory.
-	 * Use the <code>convertIfNecessary</code> methods for programmatic conversion.
+	 * Use the {@code convertIfNecessary} methods for programmatic conversion.
 	 * @param value the value to convert
 	 * @param propertyName the target property
 	 * (note that nested or indexed properties are not supported here)
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 2e9dde90b8..47ff208dd4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java
+++ b/spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java
@@ -87,7 +87,7 @@ public class CachedIntrospectionResults {
 	 * whose lifecycle is not coupled to the application. In such a scenario,
 	 * CachedIntrospectionResults would by default not cache any of the application's
 	 * classes, since they would create a leak in the common ClassLoader.
-	 * <p>Any <code>acceptClassLoader</code> call at application startup should
+	 * <p>Any {@code acceptClassLoader} call at application startup should
 	 * be paired with a {@link #clearClassLoader} call at application shutdown.
 	 * @param classLoader the ClassLoader to accept
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java b/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java
index afd6a0fc09..7ea4ed901a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java
@@ -30,8 +30,8 @@ public class ConversionNotSupportedException extends TypeMismatchException {
 	/**
 	 * Create a new ConversionNotSupportedException.
 	 * @param propertyChangeEvent the PropertyChangeEvent that resulted in the problem
-	 * @param requiredType the required target type (or <code>null</code> if not known)
-	 * @param cause the root cause (may be <code>null</code>)
+	 * @param requiredType the required target type (or {@code null} if not known)
+	 * @param cause the root cause (may be {@code null})
 	 */
 	public ConversionNotSupportedException(PropertyChangeEvent propertyChangeEvent, Class requiredType, Throwable cause) {
 		super(propertyChangeEvent, requiredType, cause);
@@ -39,9 +39,9 @@ public class ConversionNotSupportedException extends TypeMismatchException {
 
 	/**
 	 * Create a new ConversionNotSupportedException.
-	 * @param value the offending value that couldn't be converted (may be <code>null</code>)
-	 * @param requiredType the required target type (or <code>null</code> if not known)
-	 * @param cause the root cause (may be <code>null</code>)
+	 * @param value the offending value that couldn't be converted (may be {@code null})
+	 * @param requiredType the required target type (or {@code null} if not known)
+	 * @param cause the root cause (may be {@code null})
 	 */
 	public ConversionNotSupportedException(Object value, Class requiredType, Throwable cause) {
 		super(value, requiredType, cause);
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 e9675f52e4..20260432a2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java
@@ -32,7 +32,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * Extension of the standard JavaBeans PropertyDescriptor class,
- * overriding <code>getPropertyType()</code> such that a generically
+ * overriding {@code getPropertyType()} such that a generically
  * declared type will be resolved against the containing bean class.
  *
  * @author Juergen Hoeller
diff --git a/spring-beans/src/main/java/org/springframework/beans/Mergeable.java b/spring-beans/src/main/java/org/springframework/beans/Mergeable.java
index 97f742c442..dc142e0f99 100644
--- a/spring-beans/src/main/java/org/springframework/beans/Mergeable.java
+++ b/spring-beans/src/main/java/org/springframework/beans/Mergeable.java
@@ -40,9 +40,9 @@ public interface Mergeable {
 	 * the callee's value set must override those of the supplied object.
 	 * @param parent the object to merge with
 	 * @return the result of the merge operation
-	 * @throws IllegalArgumentException if the supplied parent is <code>null</code>
+	 * @throws IllegalArgumentException if the supplied parent is {@code null}
 	 * @exception IllegalStateException if merging is not enabled for this instance
-	 * (i.e. <code>mergeEnabled</code> equals <code>false</code>).
+	 * (i.e. {@code mergeEnabled} equals {@code false}).
 	 */
 	Object merge(Object parent);
 
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 470a705dd5..94ba9a1af6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
+++ b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
@@ -46,7 +46,7 @@ public class MutablePropertyValues implements PropertyValues, Serializable {
 
 	/**
 	 * Creates a new empty MutablePropertyValues object.
-	 * <p>Property values can be added with the <code>add</code> method.
+	 * <p>Property values can be added with the {@code add} method.
 	 * @see #add(String, Object)
 	 */
 	public MutablePropertyValues() {
@@ -176,7 +176,7 @@ public class MutablePropertyValues implements PropertyValues, Serializable {
 	}
 
 	/**
-	 * Overloaded version of <code>addPropertyValue</code> that takes
+	 * Overloaded version of {@code addPropertyValue} that takes
 	 * a property name and a property value.
 	 * <p>Note: As of Spring 3.0, we recommend using the more concise
 	 * and chaining-capable variant {@link #add}.
@@ -234,7 +234,7 @@ public class MutablePropertyValues implements PropertyValues, Serializable {
 	}
 
 	/**
-	 * Overloaded version of <code>removePropertyValue</code> that takes a property name.
+	 * Overloaded version of {@code removePropertyValue} that takes a property name.
 	 * @param propertyName name of the property
 	 * @see #removePropertyValue(PropertyValue)
 	 */
@@ -291,7 +291,7 @@ public class MutablePropertyValues implements PropertyValues, Serializable {
 	 * Register the specified property as "processed" in the sense
 	 * of some processor calling the corresponding setter method
 	 * outside of the PropertyValue(s) mechanism.
-	 * <p>This will lead to <code>true</code> being returned from
+	 * <p>This will lead to {@code true} being returned from
 	 * a {@link #contains} call for the specified property.
 	 * @param propertyName the name of the property.
 	 */
@@ -311,8 +311,8 @@ public class MutablePropertyValues implements PropertyValues, Serializable {
 	}
 
 	/**
-	 * Return whether this holder contains converted values only (<code>true</code>),
-	 * or whether the values still need to be converted (<code>false</code>).
+	 * Return whether this holder contains converted values only ({@code true}),
+	 * or whether the values still need to be converted ({@code false}).
 	 */
 	public boolean isConverted() {
 		return this.converted;
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
index cb17396c8c..004310ac8d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
@@ -55,7 +55,7 @@ public abstract class PropertyAccessException extends BeansException implements
 
 	/**
 	 * Return the PropertyChangeEvent that resulted in the problem.
-	 * <p>May be <code>null</code>; only available if an actual bean property
+	 * <p>May be {@code null}; only available if an actual bean property
 	 * was affected.
 	 */
 	public PropertyChangeEvent getPropertyChangeEvent() {
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 280f1d90eb..80168252ac 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java
@@ -57,7 +57,7 @@ public interface PropertyAccessor {
 
 	/**
 	 * Determine whether the specified property is readable.
-	 * <p>Returns <code>false</code> if the property doesn't exist.
+	 * <p>Returns {@code false} if the property doesn't exist.
 	 * @param propertyName the property to check
 	 * (may be a nested path and/or an indexed/mapped property)
 	 * @return whether the property is readable
@@ -66,7 +66,7 @@ public interface PropertyAccessor {
 
 	/**
 	 * Determine whether the specified property is writable.
-	 * <p>Returns <code>false</code> if the property doesn't exist.
+	 * <p>Returns {@code false} if the property doesn't exist.
 	 * @param propertyName the property to check
 	 * (may be a nested path and/or an indexed/mapped property)
 	 * @return whether the property is writable
@@ -80,7 +80,7 @@ public interface PropertyAccessor {
 	 * @param propertyName the property to check
 	 * (may be a nested path and/or an indexed/mapped property)
 	 * @return the property type for the particular property,
-	 * or <code>null</code> if not determinable
+	 * or {@code null} if not determinable
 	 * @throws InvalidPropertyException if there is no such property or
 	 * if the property isn't readable
 	 * @throws PropertyAccessException if the property was valid but the
@@ -94,7 +94,7 @@ public interface PropertyAccessor {
 	 * @param propertyName the property to check
 	 * (may be a nested path and/or an indexed/mapped property)
 	 * @return the property type for the particular property,
-	 * or <code>null</code> if not determinable
+	 * or {@code null} if not determinable
 	 * @throws InvalidPropertyException if there is no such property or
 	 * if the property isn't readable
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java
index 53d1377282..9fa559a8e9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java
@@ -132,8 +132,8 @@ public abstract class PropertyAccessorUtils {
 	/**
 	 * Determine the canonical name for the given property path.
 	 * Removes surrounding quotes from map keys:<br>
-	 * <code>map['key']</code> -> <code>map[key]</code><br>
-	 * <code>map["key"]</code> -> <code>map[key]</code>
+	 * {@code map['key']} -> {@code map[key]}<br>
+	 * {@code map["key"]} -> {@code map[key]}
 	 * @param propertyName the bean property path
 	 * @return the canonical representation of the property path
 	 */
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 d7a574cc43..378315bea7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java
@@ -61,14 +61,14 @@ public class PropertyBatchUpdateException extends BeansException {
 
 	/**
 	 * Return an array of the propertyAccessExceptions stored in this object.
-	 * <p>Will return the empty array (not <code>null</code>) if there were no errors.
+	 * <p>Will return the empty array (not {@code null}) if there were no errors.
 	 */
 	public final PropertyAccessException[] getPropertyAccessExceptions() {
 		return this.propertyAccessExceptions;
 	}
 
 	/**
-	 * Return the exception for this field, or <code>null</code> if there isn't any.
+	 * Return the exception for this field, or {@code null} if there isn't any.
 	 */
 	public PropertyAccessException getPropertyAccessException(String propertyName) {
 		for (PropertyAccessException pae : this.propertyAccessExceptions) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java
index 56dddc4de5..c14de75ed1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java
@@ -34,14 +34,14 @@ public interface PropertyEditorRegistrar {
 
 	/**
 	 * Register custom {@link java.beans.PropertyEditor PropertyEditors} with
-	 * the given <code>PropertyEditorRegistry</code>.
+	 * the given {@code PropertyEditorRegistry}.
 	 * <p>The passed-in registry will usually be a {@link BeanWrapper} or a
 	 * {@link org.springframework.validation.DataBinder DataBinder}.
 	 * <p>It is expected that implementations will create brand new
-	 * <code>PropertyEditors</code> instances for each invocation of this
-	 * method (since <code>PropertyEditors</code> are not threadsafe).
-	 * @param registry the <code>PropertyEditorRegistry</code> to register the
-	 * custom <code>PropertyEditors</code> with
+	 * {@code PropertyEditors} instances for each invocation of this
+	 * method (since {@code PropertyEditors} are not threadsafe).
+	 * @param registry the {@code PropertyEditorRegistry} to register the
+	 * custom {@code PropertyEditors} with
 	 */
 	void registerCustomEditors(PropertyEditorRegistry registry);
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java
index a14d3c0e92..9eb3af78af 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java
@@ -47,7 +47,7 @@ public interface PropertyEditorRegistry {
 	 * <p>If the property path denotes an array or Collection property,
 	 * the editor will get applied either to the array/Collection itself
 	 * (the {@link PropertyEditor} has to create an array or Collection value) or
-	 * to each element (the <code>PropertyEditor</code> has to create the element type),
+	 * to each element (the {@code PropertyEditor} has to create the element type),
 	 * depending on the specified required type.
 	 * <p>Note: Only one single registered custom editor per property path
 	 * is supported. In the case of a Collection/array, do not register an editor
@@ -55,24 +55,24 @@ public interface PropertyEditorRegistry {
 	 * <p>For example, if you wanted to register an editor for "items[n].quantity"
 	 * (for all values n), you would use "items.quantity" as the value of the
 	 * 'propertyPath' argument to this method.
-	 * @param requiredType the type of the property. This may be <code>null</code>
+	 * @param requiredType the type of the property. This may be {@code null}
 	 * if a property is given but should be specified in any case, in particular in
 	 * case of a Collection - making clear whether the editor is supposed to apply
 	 * to the entire Collection itself or to each of its entries. So as a general rule:
-	 * <b>Do not specify <code>null</code> here in case of a Collection/array!</b>
+	 * <b>Do not specify {@code null} here in case of a Collection/array!</b>
 	 * @param propertyPath the path of the property (name or nested path), or
-	 * <code>null</code> if registering an editor for all properties of the given type
+	 * {@code null} if registering an editor for all properties of the given type
 	 * @param propertyEditor editor to register
 	 */
 	void registerCustomEditor(Class<?> requiredType, String propertyPath, PropertyEditor propertyEditor);
 
 	/**
 	 * Find a custom property editor for the given type and property.
-	 * @param requiredType the type of the property (can be <code>null</code> if a property
+	 * @param requiredType the type of the property (can be {@code null} if a property
 	 * is given but should be specified in any case for consistency checking)
 	 * @param propertyPath the path of the property (name or nested path), or
-	 * <code>null</code> if looking for an editor for all properties of the given type
-	 * @return the registered editor, or <code>null</code> if none
+	 * {@code null} if looking for an editor for all properties of the given type
+	 * @return the registered editor, or {@code null} if none
 	 */
 	PropertyEditor findCustomEditor(Class<?> requiredType, String propertyPath);
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
index 2b547c0edf..6b3aa68b6d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
@@ -163,7 +163,7 @@ public class PropertyEditorRegistrySupport implements PropertyEditorRegistry {
 	 * Retrieve the default editor for the given property type, if any.
 	 * <p>Lazily registers the default editors, if they are active.
 	 * @param requiredType type of the property
-	 * @return the default editor, or <code>null</code> if none found
+	 * @return the default editor, or {@code null} if none found
 	 * @see #registerDefaultEditors
 	 */
 	public PropertyEditor getDefaultEditor(Class<?> requiredType) {
@@ -349,9 +349,9 @@ public class PropertyEditorRegistrySupport implements PropertyEditorRegistry {
 	 * Determine whether this registry contains a custom editor
 	 * for the specified array/collection element.
 	 * @param elementType the target type of the element
-	 * (can be <code>null</code> if not known)
+	 * (can be {@code null} if not known)
 	 * @param propertyPath the property path (typically of the array/collection;
-	 * can be <code>null</code> if not known)
+	 * can be {@code null} if not known)
 	 * @return whether a matching custom editor has been found
 	 */
 	public boolean hasCustomEditorForElement(Class<?> elementType, String propertyPath) {
@@ -372,11 +372,11 @@ public class PropertyEditorRegistrySupport implements PropertyEditorRegistry {
 	 * Determine the property type for the given property path.
 	 * <p>Called by {@link #findCustomEditor} if no required type has been specified,
 	 * to be able to find a type-specific editor even if just given a property path.
-	 * <p>The default implementation always returns <code>null</code>.
-	 * BeanWrapperImpl overrides this with the standard <code>getPropertyType</code>
+	 * <p>The default implementation always returns {@code null}.
+	 * BeanWrapperImpl overrides this with the standard {@code getPropertyType}
 	 * method as defined by the BeanWrapper interface.
 	 * @param propertyPath the property path to determine the type for
-	 * @return the type of the property, or <code>null</code> if not determinable
+	 * @return the type of the property, or {@code null} if not determinable
 	 * @see BeanWrapper#getPropertyType(String)
 	 */
 	protected Class<?> getPropertyType(String propertyPath) {
@@ -387,7 +387,7 @@ public class PropertyEditorRegistrySupport implements PropertyEditorRegistry {
 	 * Get custom editor that has been registered for the given property.
 	 * @param propertyName the property path to look for
 	 * @param requiredType the type to look for
-	 * @return the custom editor, or <code>null</code> if none specific for this property
+	 * @return the custom editor, or {@code null} if none specific for this property
 	 */
 	private PropertyEditor getCustomEditor(String propertyName, Class<?> requiredType) {
 		CustomEditorHolder holder = this.customEditorsForPath.get(propertyName);
@@ -397,9 +397,9 @@ public class PropertyEditorRegistrySupport implements PropertyEditorRegistry {
 	/**
 	 * Get custom editor for the given type. If no direct match found,
 	 * try custom editor for superclass (which will in any case be able
-	 * to render a value as String via <code>getAsText</code>).
+	 * to render a value as String via {@code getAsText}).
 	 * @param requiredType the type to look for
-	 * @return the custom editor, or <code>null</code> if none found for this type
+	 * @return the custom editor, or {@code null} if none found for this type
 	 * @see java.beans.PropertyEditor#getAsText()
 	 */
 	private PropertyEditor getCustomEditor(Class<?> requiredType) {
@@ -436,7 +436,7 @@ public class PropertyEditorRegistrySupport implements PropertyEditorRegistry {
 	 * Guess the property type of the specified property from the registered
 	 * custom editors (provided that they were registered for a specific type).
 	 * @param propertyName the name of the property
-	 * @return the property type, or <code>null</code> if not determinable
+	 * @return the property type, or {@code null} if not determinable
 	 */
 	protected Class<?> guessPropertyTypeFromEditors(String propertyName) {
 		if (this.customEditorsForPath != null) {
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 0c68290650..9584b49107 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java
@@ -122,7 +122,7 @@ final class PropertyMatches {
 
 	/**
 	 * Generate possible property alternatives for the given property and
-	 * class. Internally uses the <code>getStringDistance</code> method, which
+	 * class. Internally uses the {@code getStringDistance} method, which
 	 * in turn uses the Levenshtein algorithm to determine the distance between
 	 * two Strings.
 	 * @param propertyDescriptors the JavaBeans property descriptors to search
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 abc9c66662..426476b89b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java
@@ -65,7 +65,7 @@ public class PropertyValue extends BeanMetadataAttributeAccessor implements Seri
 
 	/**
 	 * Create a new PropertyValue instance.
-	 * @param name the name of the property (never <code>null</code>)
+	 * @param name the name of the property (never {@code null})
 	 * @param value the value of the property (possibly before type conversion)
 	 */
 	public PropertyValue(String name, Object value) {
@@ -75,7 +75,7 @@ public class PropertyValue extends BeanMetadataAttributeAccessor implements Seri
 
 	/**
 	 * Copy constructor.
-	 * @param original the PropertyValue to copy (never <code>null</code>)
+	 * @param original the PropertyValue to copy (never {@code null})
 	 */
 	public PropertyValue(PropertyValue original) {
 		Assert.notNull(original, "Original must not be null");
@@ -94,7 +94,7 @@ public class PropertyValue extends BeanMetadataAttributeAccessor implements Seri
 	/**
 	 * Constructor that exposes a new value for an original value holder.
 	 * The original holder will be exposed as source of the new holder.
-	 * @param original the PropertyValue to link to (never <code>null</code>)
+	 * @param original the PropertyValue to link to (never {@code null})
 	 * @param newValue the new value to apply
 	 */
 	public PropertyValue(PropertyValue original, Object newValue) {
@@ -149,8 +149,8 @@ public class PropertyValue extends BeanMetadataAttributeAccessor implements Seri
 	}
 
 	/**
-	 * Return whether this holder contains a converted value already (<code>true</code>),
-	 * or whether the value still needs to be converted (<code>false</code>).
+	 * Return whether this holder contains a converted value already ({@code true}),
+	 * or whether the value still needs to be converted ({@code false}).
 	 */
 	public synchronized boolean isConverted() {
 		return this.converted;
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java b/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java
index ad9dbba66e..6ecb77e16d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java
@@ -35,17 +35,17 @@ public interface PropertyValues {
 	/**
 	 * Return the property value with the given name, if any.
 	 * @param propertyName the name to search for
-	 * @return the property value, or <code>null</code>
+	 * @return the property value, or {@code null}
 	 */
 	PropertyValue getPropertyValue(String propertyName);
 
 	/**
 	 * Return the changes since the previous PropertyValues.
-	 * Subclasses should also override <code>equals</code>.
+	 * Subclasses should also override {@code equals}.
 	 * @param old old property values
 	 * @return PropertyValues updated or new properties.
 	 * Return empty PropertyValues if there are no changes.
-	 * @see java.lang.Object#equals
+	 * @see Object#equals
 	 */
 	PropertyValues changesSince(PropertyValues old);
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeConverter.java b/spring-beans/src/main/java/org/springframework/beans/TypeConverter.java
index 383f8e0d1e..2efc1edf73 100644
--- a/spring-beans/src/main/java/org/springframework/beans/TypeConverter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/TypeConverter.java
@@ -33,11 +33,11 @@ public interface TypeConverter {
 
 	/**
 	 * Convert the value to the required type (if necessary from a String).
-	 * <p>Conversions from String to any type will typically use the <code>setAsText</code>
+	 * <p>Conversions from String to any type will typically use the {@code setAsText}
 	 * method of the PropertyEditor class, or a Spring Converter in a ConversionService.
 	 * @param value the value to convert
 	 * @param requiredType the type we must convert to
-	 * (or <code>null</code> if not known, for example in case of a collection element)
+	 * (or {@code null} if not known, for example in case of a collection element)
 	 * @return the new value, possibly the result of type conversion
 	 * @throws TypeMismatchException if type conversion failed
 	 * @see java.beans.PropertyEditor#setAsText(String)
@@ -49,13 +49,13 @@ public interface TypeConverter {
 
 	/**
 	 * Convert the value to the required type (if necessary from a String).
-	 * <p>Conversions from String to any type will typically use the <code>setAsText</code>
+	 * <p>Conversions from String to any type will typically use the {@code setAsText}
 	 * method of the PropertyEditor class, or a Spring Converter in a ConversionService.
 	 * @param value the value to convert
 	 * @param requiredType the type we must convert to
-	 * (or <code>null</code> if not known, for example in case of a collection element)
+	 * (or {@code null} if not known, for example in case of a collection element)
 	 * @param methodParam the method parameter that is the target of the conversion
-	 * (for analysis of generic types; may be <code>null</code>)
+	 * (for analysis of generic types; may be {@code null})
 	 * @return the new value, possibly the result of type conversion
 	 * @throws TypeMismatchException if type conversion failed
 	 * @see java.beans.PropertyEditor#setAsText(String)
@@ -68,13 +68,13 @@ public interface TypeConverter {
 
 	/**
 	 * Convert the value to the required type (if necessary from a String).
-	 * <p>Conversions from String to any type will typically use the <code>setAsText</code>
+	 * <p>Conversions from String to any type will typically use the {@code setAsText}
 	 * method of the PropertyEditor class, or a Spring Converter in a ConversionService.
 	 * @param value the value to convert
 	 * @param requiredType the type we must convert to
-	 * (or <code>null</code> if not known, for example in case of a collection element)
+	 * (or {@code null} if not known, for example in case of a collection element)
 	 * @param field the reflective field that is the target of the conversion
-	 * (for analysis of generic types; may be <code>null</code>)
+	 * (for analysis of generic types; may be {@code null})
 	 * @return the new value, possibly the result of type conversion
 	 * @throws TypeMismatchException if type conversion failed
 	 * @see java.beans.PropertyEditor#setAsText(String)
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 9b47e79443..24bc57e9e3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
+++ b/spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
@@ -81,9 +81,9 @@ class TypeConverterDelegate {
 	 * Convert the value to the specified required type.
 	 * @param newValue the proposed new value
 	 * @param requiredType the type we must convert to
-	 * (or <code>null</code> if not known, for example in case of a collection element)
+	 * (or {@code null} if not known, for example in case of a collection element)
 	 * @param methodParam the method parameter that is the target of the conversion
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @return the new value, possibly the result of type conversion
 	 * @throws IllegalArgumentException if type conversion failed
 	 */
@@ -98,9 +98,9 @@ class TypeConverterDelegate {
 	 * Convert the value to the specified required type.
 	 * @param newValue the proposed new value
 	 * @param requiredType the type we must convert to
-	 * (or <code>null</code> if not known, for example in case of a collection element)
+	 * (or {@code null} if not known, for example in case of a collection element)
 	 * @param field the reflective field that is the target of the conversion
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @return the new value, possibly the result of type conversion
 	 * @throws IllegalArgumentException if type conversion failed
 	 */
@@ -114,10 +114,10 @@ class TypeConverterDelegate {
 	/**
 	 * Convert the value to the required type for the specified property.
 	 * @param propertyName name of the property
-	 * @param oldValue the previous value, if available (may be <code>null</code>)
+	 * @param oldValue the previous value, if available (may be {@code null})
 	 * @param newValue the proposed new value
 	 * @param requiredType the type we must convert to
-	 * (or <code>null</code> if not known, for example in case of a collection element)
+	 * (or {@code null} if not known, for example in case of a collection element)
 	 * @return the new value, possibly the result of type conversion
 	 * @throws IllegalArgumentException if type conversion failed
 	 */
@@ -132,10 +132,10 @@ class TypeConverterDelegate {
 	 * Convert the value to the required type (if necessary from a String),
 	 * for the specified property.
 	 * @param propertyName name of the property
-	 * @param oldValue the previous value, if available (may be <code>null</code>)
+	 * @param oldValue the previous value, if available (may be {@code null})
 	 * @param newValue the proposed new value
 	 * @param requiredType the type we must convert to
-	 * (or <code>null</code> if not known, for example in case of a collection element)
+	 * (or {@code null} if not known, for example in case of a collection element)
 	 * @param typeDescriptor the descriptor for the target property or field
 	 * @return the new value, possibly the result of type conversion
 	 * @throws IllegalArgumentException if type conversion failed
@@ -326,7 +326,7 @@ class TypeConverterDelegate {
 	/**
 	 * Find a default editor for the given type.
 	 * @param requiredType the type to find an editor for
-	 * @return the corresponding editor, or <code>null</code> if none
+	 * @return the corresponding editor, or {@code null} if none
 	 */
 	private PropertyEditor findDefaultEditor(Class requiredType) {
 		PropertyEditor editor = null;
@@ -344,10 +344,10 @@ class TypeConverterDelegate {
 	/**
 	 * Convert the value to the required type (if necessary from a String),
 	 * using the given property editor.
-	 * @param oldValue the previous value, if available (may be <code>null</code>)
+	 * @param oldValue the previous value, if available (may be {@code null})
 	 * @param newValue the proposed new value
 	 * @param requiredType the type we must convert to
-	 * (or <code>null</code> if not known, for example in case of a collection element)
+	 * (or {@code null} if not known, for example in case of a collection element)
 	 * @param editor the PropertyEditor to use
 	 * @return the new value, possibly the result of type conversion
 	 * @throws IllegalArgumentException if type conversion failed
@@ -434,7 +434,7 @@ class TypeConverterDelegate {
 
 	/**
 	 * Convert the given text value using the given property editor.
-	 * @param oldValue the previous value, if available (may be <code>null</code>)
+	 * @param oldValue the previous value, if available (may be {@code null})
 	 * @param newTextValue the proposed text value
 	 * @param editor the PropertyEditor to use
 	 * @return the converted value
diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
index f2d05a31f0..0e1930bbb2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
@@ -51,8 +51,8 @@ public class TypeMismatchException extends PropertyAccessException {
 	/**
 	 * Create a new TypeMismatchException.
 	 * @param propertyChangeEvent the PropertyChangeEvent that resulted in the problem
-	 * @param requiredType the required target type (or <code>null</code> if not known)
-	 * @param cause the root cause (may be <code>null</code>)
+	 * @param requiredType the required target type (or {@code null} if not known)
+	 * @param cause the root cause (may be {@code null})
 	 */
 	public TypeMismatchException(PropertyChangeEvent propertyChangeEvent, Class requiredType, Throwable cause) {
 		super(propertyChangeEvent,
@@ -69,8 +69,8 @@ public class TypeMismatchException extends PropertyAccessException {
 
 	/**
 	 * Create a new TypeMismatchException without PropertyChangeEvent.
-	 * @param value the offending value that couldn't be converted (may be <code>null</code>)
-	 * @param requiredType the required target type (or <code>null</code> if not known)
+	 * @param value the offending value that couldn't be converted (may be {@code null})
+	 * @param requiredType the required target type (or {@code null} if not known)
 	 */
 	public TypeMismatchException(Object value, Class requiredType) {
 		this(value, requiredType, null);
@@ -78,9 +78,9 @@ public class TypeMismatchException extends PropertyAccessException {
 
 	/**
 	 * Create a new TypeMismatchException without PropertyChangeEvent.
-	 * @param value the offending value that couldn't be converted (may be <code>null</code>)
-	 * @param requiredType the required target type (or <code>null</code> if not known)
-	 * @param cause the root cause (may be <code>null</code>)
+	 * @param value the offending value that couldn't be converted (may be {@code null})
+	 * @param requiredType the required target type (or {@code null} if not known)
+	 * @param cause the root cause (may be {@code null})
 	 */
 	public TypeMismatchException(Object value, Class requiredType, Throwable cause) {
 		super("Failed to convert value of type '" + ClassUtils.getDescriptiveType(value) + "'" +
@@ -92,7 +92,7 @@ public class TypeMismatchException extends PropertyAccessException {
 
 
 	/**
-	 * Return the offending value (may be <code>null</code>)
+	 * Return the offending value (may be {@code null})
 	 */
 	@Override
 	public Object getValue() {
diff --git a/spring-beans/src/main/java/org/springframework/beans/annotation/AnnotationBeanUtils.java b/spring-beans/src/main/java/org/springframework/beans/annotation/AnnotationBeanUtils.java
index db3c74965b..f6e1b737ff 100644
--- a/spring-beans/src/main/java/org/springframework/beans/annotation/AnnotationBeanUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/annotation/AnnotationBeanUtils.java
@@ -38,7 +38,7 @@ public abstract class AnnotationBeanUtils {
 
 	/**
 	 * Copy the properties of the supplied {@link Annotation} to the supplied target bean.
-	 * Any properties defined in <code>excludedProperties</code> will not be copied.
+	 * Any properties defined in {@code excludedProperties} will not be copied.
 	 * @param ann the annotation to copy from
 	 * @param bean the bean instance to copy to
 	 * @param excludedProperties the names of excluded properties, if any
@@ -50,11 +50,11 @@ public abstract class AnnotationBeanUtils {
 
 	/**
 	 * Copy the properties of the supplied {@link Annotation} to the supplied target bean.
-	 * Any properties defined in <code>excludedProperties</code> will not be copied.
+	 * Any properties defined in {@code excludedProperties} will not be copied.
 	 * <p>A specified value resolver may resolve placeholders in property values, for example.
 	 * @param ann the annotation to copy from
 	 * @param bean the bean instance to copy to
-	 * @param valueResolver a resolve to post-process String property values (may be <code>null</code>)
+	 * @param valueResolver a resolve to post-process String property values (may be {@code null})
 	 * @param excludedProperties the names of excluded properties, if any
 	 * @see org.springframework.beans.BeanWrapper
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java
index 5ec4832163..b27aa6f432 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java
@@ -42,12 +42,12 @@ public interface BeanClassLoaderAware extends Aware {
 	 * a bean instance.
 	 * <p>Invoked <i>after</i> the population of normal bean properties but
 	 * <i>before</i> an initialization callback such as
-	 * {@link org.springframework.beans.factory.InitializingBean InitializingBean's}
-	 * {@link org.springframework.beans.factory.InitializingBean#afterPropertiesSet()}
+	 * {@link InitializingBean InitializingBean's}
+	 * {@link InitializingBean#afterPropertiesSet()}
 	 * method or a custom init-method.
-	 * @param classLoader the owning class loader; may be <code>null</code> in
-	 * which case a default <code>ClassLoader</code> must be used, for example
-	 * the <code>ClassLoader</code> obtained via
+	 * @param classLoader the owning class loader; may be {@code null} in
+	 * which case a default {@code ClassLoader} must be used, for example
+	 * the {@code ClassLoader} obtained via
 	 * {@link org.springframework.util.ClassUtils#getDefaultClassLoader()}
 	 */
 	void setBeanClassLoader(ClassLoader classLoader);
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 486f9248e7..15235f2106 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
@@ -135,7 +135,7 @@ public class BeanCreationException extends FatalBeanException {
 
 	/**
 	 * Return the related causes, if any.
-	 * @return the array of related causes, or <code>null</code> if none
+	 * @return the array of related causes, or {@code null} if none
 	 */
 	public Throwable[] getRelatedCauses() {
 		if (this.relatedCauses == null) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java
index be86fbd860..9536dec6df 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java
@@ -44,7 +44,7 @@ public class BeanDefinitionStoreException extends FatalBeanException {
 	/**
 	 * Create a new BeanDefinitionStoreException.
 	 * @param msg the detail message (used as exception message as-is)
-	 * @param cause the root cause (may be <code>null</code>)
+	 * @param cause the root cause (may be {@code null})
 	 */
 	public BeanDefinitionStoreException(String msg, Throwable cause) {
 		super(msg, cause);
@@ -64,7 +64,7 @@ public class BeanDefinitionStoreException extends FatalBeanException {
 	 * Create a new BeanDefinitionStoreException.
 	 * @param resourceDescription description of the resource that the bean definition came from
 	 * @param msg the detail message (used as exception message as-is)
-	 * @param cause the root cause (may be <code>null</code>)
+	 * @param cause the root cause (may be {@code null})
 	 */
 	public BeanDefinitionStoreException(String resourceDescription, String msg, Throwable cause) {
 		super(msg, cause);
@@ -88,7 +88,7 @@ public class BeanDefinitionStoreException extends FatalBeanException {
 	 * @param beanName the name of the bean requested
 	 * @param msg the detail message (appended to an introductory message that indicates
 	 * the resource and the name of the bean)
-	 * @param cause the root cause (may be <code>null</code>)
+	 * @param cause the root cause (may be {@code null})
 	 */
 	public BeanDefinitionStoreException(String resourceDescription, String beanName, String msg, Throwable cause) {
 		super("Invalid bean definition with name '" + beanName + "' defined in " + resourceDescription + ": " + msg, cause);
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 58bba15a4f..0debc41c7d 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
@@ -48,7 +48,7 @@ import org.springframework.beans.BeansException;
  * implemented using this BeanFactory interface and its subinterfaces.
  *
  * <p>Normally a BeanFactory will load bean definitions stored in a configuration
- * source (such as an XML document), and use the <code>org.springframework.beans</code>
+ * source (such as an XML document), and use the {@code org.springframework.beans}
  * package to configure the beans. However, an implementation could simply return
  * Java objects it creates as necessary directly in Java code. There are no
  * constraints on how the definitions could be stored: LDAP, RDBMS, XML,
@@ -63,26 +63,26 @@ import org.springframework.beans.BeansException;
  *
  * <p>Bean factory implementations should support the standard bean lifecycle interfaces
  * as far as possible. The full set of initialization methods and their standard order is:<br>
- * 1. BeanNameAware's <code>setBeanName</code><br>
- * 2. BeanClassLoaderAware's <code>setBeanClassLoader</code><br>
- * 3. BeanFactoryAware's <code>setBeanFactory</code><br>
- * 4. ResourceLoaderAware's <code>setResourceLoader</code>
+ * 1. BeanNameAware's {@code setBeanName}<br>
+ * 2. BeanClassLoaderAware's {@code setBeanClassLoader}<br>
+ * 3. BeanFactoryAware's {@code setBeanFactory}<br>
+ * 4. ResourceLoaderAware's {@code setResourceLoader}
  * (only applicable when running in an application context)<br>
- * 5. ApplicationEventPublisherAware's <code>setApplicationEventPublisher</code>
+ * 5. ApplicationEventPublisherAware's {@code setApplicationEventPublisher}
  * (only applicable when running in an application context)<br>
- * 6. MessageSourceAware's <code>setMessageSource</code>
+ * 6. MessageSourceAware's {@code setMessageSource}
  * (only applicable when running in an application context)<br>
- * 7. ApplicationContextAware's <code>setApplicationContext</code>
+ * 7. ApplicationContextAware's {@code setApplicationContext}
  * (only applicable when running in an application context)<br>
- * 8. ServletContextAware's <code>setServletContext</code>
+ * 8. ServletContextAware's {@code setServletContext}
  * (only applicable when running in a web application context)<br>
- * 9. <code>postProcessBeforeInitialization</code> methods of BeanPostProcessors<br>
- * 10. InitializingBean's <code>afterPropertiesSet</code><br>
+ * 9. {@code postProcessBeforeInitialization} methods of BeanPostProcessors<br>
+ * 10. InitializingBean's {@code afterPropertiesSet}<br>
  * 11. a custom init-method definition<br>
- * 12. <code>postProcessAfterInitialization</code> methods of BeanPostProcessors
+ * 12. {@code postProcessAfterInitialization} methods of BeanPostProcessors
  *
  * <p>On shutdown of a bean factory, the following lifecycle methods apply:<br>
- * 1. DisposableBean's <code>destroy</code><br>
+ * 1. DisposableBean's {@code destroy}<br>
  * 2. a custom destroy-method definition
  *
  * @author Rod Johnson
@@ -109,7 +109,7 @@ public interface BeanFactory {
 	/**
 	 * Used to dereference a {@link FactoryBean} instance and distinguish it from
 	 * beans <i>created</i> by the FactoryBean. For example, if the bean named
-	 * <code>myJndiObject</code> is a FactoryBean, getting <code>&myJndiObject</code>
+	 * {@code myJndiObject} is a FactoryBean, getting {@code &myJndiObject}
 	 * will return the factory, not the instance returned by the factory.
 	 */
 	String FACTORY_BEAN_PREFIX = "&";
@@ -139,8 +139,8 @@ public interface BeanFactory {
 	 * Will ask the parent factory if the bean cannot be found in this factory instance.
 	 * @param name the name of the bean to retrieve
 	 * @param requiredType type the bean must match. Can be an interface or superclass
-	 * of the actual class, or <code>null</code> for any match. For example, if the value
-	 * is <code>Object.class</code>, this method will succeed whatever the class of the
+	 * of the actual class, or {@code null} for any match. For example, if the value
+	 * is {@code Object.class}, this method will succeed whatever the class of the
 	 * returned instance.
 	 * @return an instance of the bean
 	 * @throws NoSuchBeanDefinitionException if there's no such bean definition
@@ -200,7 +200,7 @@ public interface BeanFactory {
 	/**
 	 * Is this bean a shared singleton? That is, will {@link #getBean} always
 	 * return the same instance?
-	 * <p>Note: This method returning <code>false</code> does not clearly indicate
+	 * <p>Note: This method returning {@code false} does not clearly indicate
 	 * independent instances. It indicates non-singleton instances, which may correspond
 	 * to a scoped bean as well. Use the {@link #isPrototype} operation to explicitly
 	 * check for independent instances.
@@ -217,7 +217,7 @@ public interface BeanFactory {
 	/**
 	 * Is this bean a prototype? That is, will {@link #getBean} always return
 	 * independent instances?
-	 * <p>Note: This method returning <code>false</code> does not clearly indicate
+	 * <p>Note: This method returning {@code false} does not clearly indicate
 	 * a singleton object. It indicates non-independent instances, which may correspond
 	 * to a scoped bean as well. Use the {@link #isSingleton} operation to explicitly
 	 * check for a shared singleton instance.
@@ -240,8 +240,8 @@ public interface BeanFactory {
 	 * Will ask the parent factory if the bean cannot be found in this factory instance.
 	 * @param name the name of the bean to query
 	 * @param targetType the type to match against
-	 * @return <code>true</code> if the bean type matches,
-	 * <code>false</code> if it doesn't match or cannot be determined yet
+	 * @return {@code true} if the bean type matches,
+	 * {@code false} if it doesn't match or cannot be determined yet
 	 * @throws NoSuchBeanDefinitionException if there is no bean with the given name
 	 * @since 2.0.1
 	 * @see #getBean
@@ -257,7 +257,7 @@ public interface BeanFactory {
 	 * <p>Translates aliases back to the corresponding canonical bean name.
 	 * Will ask the parent factory if the bean cannot be found in this factory instance.
 	 * @param name the name of the bean to query
-	 * @return the type of the bean, or <code>null</code> if not determinable
+	 * @return the type of the bean, or {@code null} if not determinable
 	 * @throws NoSuchBeanDefinitionException if there is no bean with the given name
 	 * @since 1.1.2
 	 * @see #getBean
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java
index f9ea34c86b..1a7df36df2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java
@@ -45,7 +45,7 @@ public interface BeanFactoryAware extends Aware {
 	 * <p>Invoked after the population of normal bean properties
 	 * but before an initialization callback such as
 	 * {@link InitializingBean#afterPropertiesSet()} or a custom init-method.
-	 * @param beanFactory owning BeanFactory (never <code>null</code>).
+	 * @param beanFactory owning BeanFactory (never {@code null}).
 	 * The bean can immediately call methods on the factory.
 	 * @throws BeansException in case of initialization errors
 	 * @see BeanInitializationException
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 a2888182ba..2a4f577a1c 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
@@ -133,7 +133,7 @@ public abstract class BeanFactoryUtils {
 	 * <p>Does consider objects created by FactoryBeans, which means that FactoryBeans
 	 * will get initialized. If the object created by the FactoryBean doesn't match,
 	 * the raw FactoryBean itself will be matched against the type.
-	 * <p>This version of <code>beanNamesForTypeIncludingAncestors</code> automatically
+	 * <p>This version of {@code beanNamesForTypeIncludingAncestors} automatically
 	 * includes prototypes and FactoryBeans.
 	 * @param lbf the bean factory
 	 * @param type the type that beans must match
@@ -300,7 +300,7 @@ public abstract class BeanFactoryUtils {
 	 * <p>Does consider objects created by FactoryBeans, which means that FactoryBeans
 	 * will get initialized. If the object created by the FactoryBean doesn't match,
 	 * the raw FactoryBean itself will be matched against the type.
-	 * <p>This version of <code>beanOfTypeIncludingAncestors</code> automatically includes
+	 * <p>This version of {@code beanOfTypeIncludingAncestors} automatically includes
 	 * prototypes and FactoryBeans.
 	 * <p><b>Note: Beans of the same name will take precedence at the 'lowest' factory level,
 	 * i.e. such beans will be returned from the lowest factory that they are being found in,
@@ -310,7 +310,7 @@ public abstract class BeanFactoryUtils {
 	 * @param lbf the bean factory
 	 * @param type type of bean to match
 	 * @return the matching bean instance
-	 * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
+	 * @throws NoSuchBeanDefinitionException
 	 * if 0 or more than 1 beans of the given type were found
 	 * @throws BeansException if the bean could not be created
 	 */
@@ -375,12 +375,12 @@ public abstract class BeanFactoryUtils {
 	 * <p>Does consider objects created by FactoryBeans, which means that FactoryBeans
 	 * will get initialized. If the object created by the FactoryBean doesn't match,
 	 * the raw FactoryBean itself will be matched against the type.
-	 * <p>This version of <code>beanOfType</code> automatically includes
+	 * <p>This version of {@code beanOfType} automatically includes
 	 * prototypes and FactoryBeans.
 	 * @param lbf the bean factory
 	 * @param type type of bean to match
 	 * @return the matching bean instance
-	 * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
+	 * @throws NoSuchBeanDefinitionException
 	 * if 0 or more than 1 beans of the given type were found
 	 * @throws BeansException if the bean could not be created
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java
index 5f30376f11..d16bd68551 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java
@@ -60,12 +60,12 @@ public interface FactoryBean<T> {
 	 * <p>If this FactoryBean is not fully initialized yet at the time of
 	 * the call (for example because it is involved in a circular reference),
 	 * throw a corresponding {@link FactoryBeanNotInitializedException}.
-	 * <p>As of Spring 2.0, FactoryBeans are allowed to return <code>null</code>
+	 * <p>As of Spring 2.0, FactoryBeans are allowed to return {@code null}
 	 * objects. The factory will consider this as normal value to be used; it
 	 * will not throw a FactoryBeanNotInitializedException in this case anymore.
 	 * FactoryBean implementations are encouraged to throw
 	 * FactoryBeanNotInitializedException themselves now, as appropriate.
-	 * @return an instance of the bean (can be <code>null</code>)
+	 * @return an instance of the bean (can be {@code null})
 	 * @throws Exception in case of creation errors
 	 * @see FactoryBeanNotInitializedException
 	 */
@@ -73,7 +73,7 @@ public interface FactoryBean<T> {
 
 	/**
 	 * Return the type of object that this FactoryBean creates,
-	 * or <code>null</code> if not known in advance.
+	 * or {@code null} if not known in advance.
 	 * <p>This allows one to check for specific types of beans without
 	 * instantiating objects, for example on autowiring.
 	 * <p>In the case of implementations that are creating a singleton object,
@@ -84,10 +84,10 @@ public interface FactoryBean<T> {
 	 * been fully initialized. It must not rely on state created during
 	 * initialization; of course, it can still use such state if available.
 	 * <p><b>NOTE:</b> Autowiring will simply ignore FactoryBeans that return
-	 * <code>null</code> here. Therefore it is highly recommended to implement
+	 * {@code null} here. Therefore it is highly recommended to implement
 	 * this method properly, using the current state of the FactoryBean.
 	 * @return the type of object that this FactoryBean creates,
-	 * or <code>null</code> if not known at the time of the call
+	 * or {@code null} if not known at the time of the call
 	 * @see ListableBeanFactory#getBeansOfType
 	 */
 	Class<?> getObjectType();
@@ -97,20 +97,20 @@ public interface FactoryBean<T> {
 	 * will {@link #getObject()} always return the same object
 	 * (a reference that can be cached)?
 	 * <p><b>NOTE:</b> If a FactoryBean indicates to hold a singleton object,
-	 * the object returned from <code>getObject()</code> might get cached
-	 * by the owning BeanFactory. Hence, do not return <code>true</code>
+	 * the object returned from {@code getObject()} might get cached
+	 * by the owning BeanFactory. Hence, do not return {@code true}
 	 * unless the FactoryBean always exposes the same reference.
 	 * <p>The singleton status of the FactoryBean itself will generally
 	 * be provided by the owning BeanFactory; usually, it has to be
 	 * defined as singleton there.
-	 * <p><b>NOTE:</b> This method returning <code>false</code> does not
+	 * <p><b>NOTE:</b> This method returning {@code false} does not
 	 * necessarily indicate that returned objects are independent instances.
 	 * An implementation of the extended {@link SmartFactoryBean} interface
 	 * may explicitly indicate independent instances through its
 	 * {@link SmartFactoryBean#isPrototype()} method. Plain {@link FactoryBean}
 	 * implementations which do not implement this extended interface are
 	 * simply assumed to always return independent instances if the
-	 * <code>isSingleton()</code> implementation returns <code>false</code>.
+	 * {@code isSingleton()} implementation returns {@code false}.
 	 * @return whether the exposed object is a singleton
 	 * @see #getObject()
 	 * @see SmartFactoryBean#isPrototype()
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java
index bffb2c14f9..66b317222f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java
@@ -19,7 +19,7 @@ package org.springframework.beans.factory;
 import org.springframework.beans.FatalBeanException;
 
 /**
- * Exception to be thrown from a FactoryBean's <code>getObject()</code> method
+ * Exception to be thrown from a FactoryBean's {@code getObject()} method
  * if the bean is not fully initialized yet, for example because it is involved
  * in a circular reference.
  *
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java
index f471915b0a..d48bdba6d7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java
@@ -20,7 +20,7 @@ package org.springframework.beans.factory;
  * Sub-interface implemented by bean factories that can be part
  * of a hierarchy.
  *
- * <p>The corresponding <code>setParentBeanFactory</code> method for bean
+ * <p>The corresponding {@code setParentBeanFactory} method for bean
  * factories that allow setting the parent in a configurable
  * fashion can be found in the ConfigurableBeanFactory interface.
  *
@@ -32,18 +32,18 @@ package org.springframework.beans.factory;
 public interface HierarchicalBeanFactory extends BeanFactory {
 
 	/**
-	 * Return the parent bean factory, or <code>null</code> if there is none.
+	 * Return the parent bean factory, or {@code null} if there is none.
 	 */
 	BeanFactory getParentBeanFactory();
 
 	/**
 	 * Return whether the local bean factory contains a bean of the given name,
 	 * ignoring beans defined in ancestor contexts.
-	 * <p>This is an alternative to <code>containsBean</code>, ignoring a bean
+	 * <p>This is an alternative to {@code containsBean}, ignoring a bean
 	 * of the given name from an ancestor bean factory.
 	 * @param name the name of the bean to query
 	 * @return whether a bean with the given name is defined in the local factory
-	 * @see org.springframework.beans.factory.BeanFactory#containsBean
+	 * @see BeanFactory#containsBean
 	 */
 	boolean containsLocalBean(String name);
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
index 64e86dc2c4..6f8d57ff85 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
@@ -36,15 +36,15 @@ import org.springframework.beans.BeansException;
  * <p>The methods in this interface will just respect bean definitions of this factory.
  * They will ignore any singleton beans that have been registered by other means like
  * {@link org.springframework.beans.factory.config.ConfigurableBeanFactory}'s
- * <code>registerSingleton</code> method, with the exception of
- * <code>getBeanNamesOfType</code> and <code>getBeansOfType</code> which will check
- * such manually registered singletons too. Of course, BeanFactory's <code>getBean</code>
+ * {@code registerSingleton} method, with the exception of
+ * {@code getBeanNamesOfType} and {@code getBeansOfType} which will check
+ * such manually registered singletons too. Of course, BeanFactory's {@code getBean}
  * does allow transparent access to such special beans as well. However, in typical
  * scenarios, all beans will be defined by external bean definitions anyway, so most
  * applications don't need to worry about this differentation.
  *
- * <p><b>NOTE:</b> With the exception of <code>getBeanDefinitionCount</code>
- * and <code>containsBeanDefinition</code>, the methods in this interface
+ * <p><b>NOTE:</b> With the exception of {@code getBeanDefinitionCount}
+ * and {@code containsBeanDefinition}, the methods in this interface
  * are not designed for frequent invocation. Implementations may be slow.
  *
  * @author Rod Johnson
@@ -87,7 +87,7 @@ public interface ListableBeanFactory extends BeanFactory {
 
 	/**
 	 * Return the names of beans matching the given type (including subclasses),
-	 * judging from either bean definitions or the value of <code>getObjectType</code>
+	 * judging from either bean definitions or the value of {@code getObjectType}
 	 * in the case of FactoryBeans.
 	 * <p><b>NOTE: This method introspects top-level beans only.</b> It does <i>not</i>
 	 * check nested beans which might match the specified type as well.
@@ -95,16 +95,16 @@ public interface ListableBeanFactory extends BeanFactory {
 	 * will get initialized. If the object created by the FactoryBean doesn't match,
 	 * the raw FactoryBean itself will be matched against the type.
 	 * <p>Does not consider any hierarchy this factory may participate in.
-	 * Use BeanFactoryUtils' <code>beanNamesForTypeIncludingAncestors</code>
+	 * Use BeanFactoryUtils' {@code beanNamesForTypeIncludingAncestors}
 	 * to include beans in ancestor factories too.
 	 * <p>Note: Does <i>not</i> ignore singleton beans that have been registered
 	 * by other means than bean definitions.
-	 * <p>This version of <code>getBeanNamesForType</code> matches all kinds of beans,
+	 * <p>This version of {@code getBeanNamesForType} matches all kinds of beans,
 	 * be it singletons, prototypes, or FactoryBeans. In most implementations, the
-	 * result will be the same as for <code>getBeanNamesOfType(type, true, true)</code>.
+	 * result will be the same as for {@code getBeanNamesOfType(type, true, true)}.
 	 * <p>Bean names returned by this method should always return bean names <i>in the
 	 * order of definition</i> in the backend configuration, as far as possible.
-	 * @param type the class or interface to match, or <code>null</code> for all bean names
+	 * @param type the class or interface to match, or {@code null} for all bean names
 	 * @return the names of beans (or objects created by FactoryBeans) matching
 	 * the given object type (including subclasses), or an empty array if none
 	 * @see FactoryBean#getObjectType
@@ -114,7 +114,7 @@ public interface ListableBeanFactory extends BeanFactory {
 
 	/**
 	 * Return the names of beans matching the given type (including subclasses),
-	 * judging from either bean definitions or the value of <code>getObjectType</code>
+	 * judging from either bean definitions or the value of {@code getObjectType}
 	 * in the case of FactoryBeans.
 	 * <p><b>NOTE: This method introspects top-level beans only.</b> It does <i>not</i>
 	 * check nested beans which might match the specified type as well.
@@ -124,13 +124,13 @@ public interface ListableBeanFactory extends BeanFactory {
 	 * type. If "allowEagerInit" is not set, only raw FactoryBeans will be checked
 	 * (which doesn't require initialization of each FactoryBean).
 	 * <p>Does not consider any hierarchy this factory may participate in.
-	 * Use BeanFactoryUtils' <code>beanNamesForTypeIncludingAncestors</code>
+	 * Use BeanFactoryUtils' {@code beanNamesForTypeIncludingAncestors}
 	 * to include beans in ancestor factories too.
 	 * <p>Note: Does <i>not</i> ignore singleton beans that have been registered
 	 * by other means than bean definitions.
 	 * <p>Bean names returned by this method should always return bean names <i>in the
 	 * order of definition</i> in the backend configuration, as far as possible.
-	 * @param type the class or interface to match, or <code>null</code> for all bean names
+	 * @param type the class or interface to match, or {@code null} for all bean names
 	 * @param includeNonSingletons whether to include prototype or scoped beans too
 	 * or just singletons (also applies to FactoryBeans)
 	 * @param allowEagerInit whether to initialize <i>lazy-init singletons</i> and
@@ -148,24 +148,24 @@ public interface ListableBeanFactory extends BeanFactory {
 	/**
 	 * Return the bean instances that match the given object type (including
 	 * subclasses), judging from either bean definitions or the value of
-	 * <code>getObjectType</code> in the case of FactoryBeans.
+	 * {@code getObjectType} in the case of FactoryBeans.
 	 * <p><b>NOTE: This method introspects top-level beans only.</b> It does <i>not</i>
 	 * check nested beans which might match the specified type as well.
 	 * <p>Does consider objects created by FactoryBeans, which means that FactoryBeans
 	 * will get initialized. If the object created by the FactoryBean doesn't match,
 	 * the raw FactoryBean itself will be matched against the type.
 	 * <p>Does not consider any hierarchy this factory may participate in.
-	 * Use BeanFactoryUtils' <code>beansOfTypeIncludingAncestors</code>
+	 * Use BeanFactoryUtils' {@code beansOfTypeIncludingAncestors}
 	 * to include beans in ancestor factories too.
 	 * <p>Note: Does <i>not</i> ignore singleton beans that have been registered
 	 * by other means than bean definitions.
 	 * <p>This version of getBeansOfType matches all kinds of beans, be it
 	 * singletons, prototypes, or FactoryBeans. In most implementations, the
-	 * result will be the same as for <code>getBeansOfType(type, true, true)</code>.
+	 * result will be the same as for {@code getBeansOfType(type, true, true)}.
 	 * <p>The Map returned by this method should always return bean names and
 	 * corresponding bean instances <i>in the order of definition</i> in the
 	 * backend configuration, as far as possible.
-	 * @param type the class or interface to match, or <code>null</code> for all concrete beans
+	 * @param type the class or interface to match, or {@code null} for all concrete beans
 	 * @return a Map with the matching beans, containing the bean names as
 	 * keys and the corresponding bean instances as values
 	 * @throws BeansException if a bean could not be created
@@ -178,7 +178,7 @@ public interface ListableBeanFactory extends BeanFactory {
 	/**
 	 * Return the bean instances that match the given object type (including
 	 * subclasses), judging from either bean definitions or the value of
-	 * <code>getObjectType</code> in the case of FactoryBeans.
+	 * {@code getObjectType} in the case of FactoryBeans.
 	 * <p><b>NOTE: This method introspects top-level beans only.</b> It does <i>not</i>
 	 * check nested beans which might match the specified type as well.
 	 * <p>Does consider objects created by FactoryBeans if the "allowEagerInit" flag is set,
@@ -187,14 +187,14 @@ public interface ListableBeanFactory extends BeanFactory {
 	 * type. If "allowEagerInit" is not set, only raw FactoryBeans will be checked
 	 * (which doesn't require initialization of each FactoryBean).
 	 * <p>Does not consider any hierarchy this factory may participate in.
-	 * Use BeanFactoryUtils' <code>beansOfTypeIncludingAncestors</code>
+	 * Use BeanFactoryUtils' {@code beansOfTypeIncludingAncestors}
 	 * to include beans in ancestor factories too.
 	 * <p>Note: Does <i>not</i> ignore singleton beans that have been registered
 	 * by other means than bean definitions.
 	 * <p>The Map returned by this method should always return bean names and
 	 * corresponding bean instances <i>in the order of definition</i> in the
 	 * backend configuration, as far as possible.
-	 * @param type the class or interface to match, or <code>null</code> for all concrete beans
+	 * @param type the class or interface to match, or {@code null} for all concrete beans
 	 * @param includeNonSingletons whether to include prototype or scoped beans too
 	 * or just singletons (also applies to FactoryBeans)
 	 * @param allowEagerInit whether to initialize <i>lazy-init singletons</i> and
@@ -212,7 +212,7 @@ public interface ListableBeanFactory extends BeanFactory {
 			throws BeansException;
 
 	/**
-	 * Find all beans whose <code>Class</code> has the supplied {@link java.lang.annotation.Annotation} type.
+	 * Find all beans whose {@code Class} has the supplied {@link java.lang.annotation.Annotation} type.
 	 * @param annotationType the type of annotation to look for
 	 * @return a Map with the matching beans, containing the bean names as
 	 * keys and the corresponding bean instances as values
@@ -222,12 +222,12 @@ public interface ListableBeanFactory extends BeanFactory {
 			throws BeansException;
 
 	/**
-	 * Find a {@link Annotation} of <code>annotationType</code> on the specified
+	 * Find a {@link Annotation} of {@code annotationType} on the specified
 	 * bean, traversing its interfaces and super classes if no annotation can be
 	 * found on the given class itself.
 	 * @param beanName the name of the bean to look for annotations on
 	 * @param annotationType the annotation class to look for
-	 * @return the annotation of the given type found, or <code>null</code>
+	 * @return the annotation of the given type found, or {@code null}
 	 */
 	<A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType);
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java
index b81ee6ca37..78640789b0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java
@@ -29,7 +29,7 @@ import org.springframework.beans.BeansException;
  * of the latter are normally meant to be defined as SPI instances in a
  * {@link BeanFactory}, while implementations of this class are normally meant
  * to be fed as an API to other beans (through injection). As such, the
- * <code>getObject()</code> method has different exception handling behavior.
+ * {@code getObject()} method has different exception handling behavior.
  *
  * @author Colin Sampaleanu
  * @since 1.0.2
@@ -40,7 +40,7 @@ public interface ObjectFactory<T> {
 	/**
 	 * Return an instance (possibly shared or independent)
 	 * of the object managed by this factory.
-	 * @return an instance of the bean (should never be <code>null</code>)
+	 * @return an instance of the bean (should never be {@code null})
 	 * @throws BeansException in case of creation errors
 	 */
 	T getObject() throws BeansException;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java
index c54676eda1..a8e20e049c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java
@@ -20,12 +20,12 @@ package org.springframework.beans.factory;
  * Extension of the {@link FactoryBean} interface. Implementations may
  * indicate whether they always return independent instances, for the
  * case where their {@link #isSingleton()} implementation returning
- * <code>false</code> does not clearly indicate independent instances.
+ * {@code false} does not clearly indicate independent instances.
  *
  * <p>Plain {@link FactoryBean} implementations which do not implement
  * this extended interface are simply assumed to always return independent
  * instances if their {@link #isSingleton()} implementation returns
- * <code>false</code>; the exposed object is only accessed on demand.
+ * {@code false}; the exposed object is only accessed on demand.
  *
  * <p><b>NOTE:</b> This interface is a special purpose interface, mainly for
  * internal use within the framework and within collaborating frameworks.
@@ -47,7 +47,7 @@ public interface SmartFactoryBean<T> extends FactoryBean<T> {
 	 * be provided by the owning {@link BeanFactory}; usually, it has to be
 	 * defined as singleton there.
 	 * <p>This method is supposed to strictly check for independent instances;
-	 * it should not return <code>true</code> for scoped objects or other
+	 * it should not return {@code true} for scoped objects or other
 	 * kinds of non-singleton, non-independent objects. For this reason,
 	 * this is not simply the inverted form of {@link #isSingleton()}.
 	 * @return whether the exposed object is a prototype
@@ -62,7 +62,7 @@ public interface SmartFactoryBean<T> extends FactoryBean<T> {
 	 * of its singleton object (if any)?
 	 * <p>A standard FactoryBean is not expected to initialize eagerly:
 	 * Its {@link #getObject()} will only be called for actual access, even
-	 * in case of a singleton object. Returning <code>true</code> from this
+	 * in case of a singleton object. Returning {@code true} from this
 	 * method suggests that {@link #getObject()} should be called eagerly,
 	 * also applying post-processors eagerly. This may make sense in case
 	 * of a {@link #isSingleton() singleton} object, in particular if
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java
index b4308aa7e9..ef2e40e34c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java
@@ -21,7 +21,7 @@ import org.springframework.beans.BeansException;
 /**
  * Defines a contract for the lookup, use, and release of a
  * {@link org.springframework.beans.factory.BeanFactory},
- * or a <code>BeanFactory</code> subclass such as an
+ * or a {@code BeanFactory} subclass such as an
  * {@link org.springframework.context.ApplicationContext}.
  *
  * <p>Where this interface is implemented as a singleton class such as
@@ -29,20 +29,20 @@ import org.springframework.beans.BeansException;
  * suggests that it be used sparingly and with caution. By far the vast majority
  * of the code inside an application is best written in a Dependency Injection
  * style, where that code is served out of a
- * <code>BeanFactory</code>/<code>ApplicationContext</code> container, and has
+ * {@code BeanFactory}/{@code ApplicationContext} container, and has
  * its own dependencies supplied by the container when it is created. However,
  * even such a singleton implementation sometimes has its use in the small glue
  * layers of code that is sometimes needed to tie other code together. For
  * example, third party code may try to construct new objects directly, without
- * the ability to force it to get these objects out of a <code>BeanFactory</code>.
+ * the ability to force it to get these objects out of a {@code BeanFactory}.
  * If the object constructed by the third party code is just a small stub or
  * proxy, which then uses an implementation of this class to get a
- * <code>BeanFactory</code> from which it gets the real object, to which it
+ * {@code BeanFactory} from which it gets the real object, to which it
  * delegates, then proper Dependency Injection has been achieved.
  *
  * <p>As another example, in a complex J2EE app with multiple layers, with each
- * layer having its own <code>ApplicationContext</code> definition (in a
- * hierarchy), a class like <code>SingletonBeanFactoryLocator</code> may be used
+ * layer having its own {@code ApplicationContext} definition (in a
+ * hierarchy), a class like {@code SingletonBeanFactoryLocator} may be used
  * to demand load these contexts.
  *
  * @author Colin Sampaleanu
@@ -55,13 +55,13 @@ public interface BeanFactoryLocator {
 	/**
 	 * Use the {@link org.springframework.beans.factory.BeanFactory} (or derived
 	 * interface such as {@link org.springframework.context.ApplicationContext})
-	 * specified by the <code>factoryKey</code> parameter.
+	 * specified by the {@code factoryKey} parameter.
 	 * <p>The definition is possibly loaded/created as needed.
-	 * @param factoryKey a resource name specifying which <code>BeanFactory</code> the
-	 * <code>BeanFactoryLocator</code> must return for usage. The actual meaning of the
-	 * resource name is specific to the implementation of <code>BeanFactoryLocator</code>.
-	 * @return the <code>BeanFactory</code> instance, wrapped as a {@link BeanFactoryReference} object
-	 * @throws BeansException if there is an error loading or accessing the <code>BeanFactory</code>
+	 * @param factoryKey a resource name specifying which {@code BeanFactory} the
+	 * {@code BeanFactoryLocator} must return for usage. The actual meaning of the
+	 * resource name is specific to the implementation of {@code BeanFactoryLocator}.
+	 * @return the {@code BeanFactory} instance, wrapped as a {@link BeanFactoryReference} object
+	 * @throws BeansException if there is an error loading or accessing the {@code BeanFactory}
 	 */
 	BeanFactoryReference useBeanFactory(String factoryKey) throws BeansException;
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java
index 953b0cacf4..efe23a7479 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java
@@ -34,7 +34,7 @@ public interface BeanFactoryReference {
 
 	/**
 	 * Return the {@link BeanFactory} instance held by this reference.
-	 * @throws IllegalStateException if invoked after <code>release()</code> has been called
+	 * @throws IllegalStateException if invoked after {@code release()} has been called
 	 */
 	BeanFactory getFactory();
 
@@ -42,14 +42,14 @@ public interface BeanFactoryReference {
 	 * Indicate that the {@link BeanFactory} instance referred to by this object is not
 	 * needed any longer by the client code which obtained the {@link BeanFactoryReference}.
 	 * <p>Depending on the actual implementation of {@link BeanFactoryLocator}, and
-	 * the actual type of <code>BeanFactory</code>, this may possibly not actually
-	 * do anything; alternately in the case of a 'closeable' <code>BeanFactory</code>
+	 * the actual type of {@code BeanFactory}, this may possibly not actually
+	 * do anything; alternately in the case of a 'closeable' {@code BeanFactory}
 	 * or derived class (such as {@link org.springframework.context.ApplicationContext})
 	 * may 'close' it, or may 'close' it once no more references remain.
 	 * <p>In an EJB usage scenario this would normally be called from
-	 * <code>ejbRemove()</code> and <code>ejbPassivate()</code>.
+	 * {@code ejbRemove()} and {@code ejbPassivate()}.
 	 * <p>This is safe to call multiple times.
-	 * @throws FatalBeanException if the <code>BeanFactory</code> cannot be released
+	 * @throws FatalBeanException if the {@code BeanFactory} cannot be released
 	 * @see BeanFactoryLocator
 	 * @see org.springframework.context.access.ContextBeanFactoryReference
 	 * @see org.springframework.context.ConfigurableApplicationContext#close()
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
index 61eea7a094..00fb3e690b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
@@ -66,12 +66,12 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * <p>Consider an example application scenario:
  *
  * <ul>
- * <li><code>com.mycompany.myapp.util.applicationContext.xml</code> -
+ * <li>{@code com.mycompany.myapp.util.applicationContext.xml} -
  * ApplicationContext definition file which defines beans for 'util' layer.
- * <li><code>com.mycompany.myapp.dataaccess-applicationContext.xml</code> -
+ * <li>{@code com.mycompany.myapp.dataaccess-applicationContext.xml} -
  * ApplicationContext definition file which defines beans for 'data access' layer.
  * Depends on the above.
- * <li><code>com.mycompany.myapp.services.applicationContext.xml</code> -
+ * <li>{@code com.mycompany.myapp.services.applicationContext.xml} -
  * ApplicationContext definition file which defines beans for 'services' layer.
  * Depends on the above.
  * </ul>
@@ -107,7 +107,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  *
  * <p>Given the above-mentioned three ApplicationContexts, consider the simplest
  * SingletonBeanFactoryLocator usage scenario, where there is only one single
- * <code>beanRefFactory.xml</code> definition file:
+ * {@code beanRefFactory.xml} definition file:
  *
  * <pre class="code">&lt;?xml version="1.0" encoding="UTF-8"?>
  * &lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
@@ -137,7 +137,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * MyClass zed = bf.getFactory().getBean("mybean");
  * </pre>
  *
- * Another relatively simple variation of the <code>beanRefFactory.xml</code> definition file could be:
+ * Another relatively simple variation of the {@code beanRefFactory.xml} definition file could be:
  *
  * <pre class="code">&lt;?xml version="1.0" encoding="UTF-8"?>
  * &lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
@@ -193,10 +193,10 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * actual definition file(s) for the SingletonBeanFactoryLocator maps that id to
  * a real context id.
  *
- * <p>A final example is more complex, with a <code>beanRefFactory.xml</code> for every module.
+ * <p>A final example is more complex, with a {@code beanRefFactory.xml} for every module.
  * All the files are automatically combined to create the final definition.
  *
- * <p><code>beanRefFactory.xml</code> file inside jar for util module:
+ * <p>{@code beanRefFactory.xml} file inside jar for util module:
  *
  * <pre class="code">&lt;?xml version="1.0" encoding="UTF-8"?>
  * &lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
@@ -211,7 +211,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * &lt;/beans>
  * </pre>
  *
- * <code>beanRefFactory.xml</code> file inside jar for data-access module:<br>
+ * {@code beanRefFactory.xml} file inside jar for data-access module:<br>
  *
  * <pre class="code">&lt;?xml version="1.0" encoding="UTF-8"?>
  * &lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
@@ -230,7 +230,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * &lt;/beans>
  * </pre>
  *
- * <code>beanRefFactory.xml</code> file inside jar for services module:
+ * {@code beanRefFactory.xml} file inside jar for services module:
  *
  * <pre class="code">&lt;?xml version="1.0" encoding="UTF-8"?>
  * &lt;!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
@@ -249,7 +249,7 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * &lt;/beans>
  * </pre>
  *
- * <code>beanRefFactory.xml</code> file inside jar for mypackage module. This doesn't
+ * {@code beanRefFactory.xml} file inside jar for mypackage module. This doesn't
  * create any of its own contexts, but allows the other ones to be referred to be
  * a name known to this module:
  *
@@ -280,7 +280,7 @@ public class SingletonBeanFactoryLocator implements BeanFactoryLocator {
 	/**
 	 * Returns an instance which uses the default "classpath*:beanRefFactory.xml",
 	 * as the name of the definition file(s). All resources returned by calling the
-	 * current thread context ClassLoader's <code>getResources</code> method with
+	 * current thread context ClassLoader's {@code getResources} method with
 	 * this name will be combined to create a BeanFactory definition set.
 	 * @return the corresponding BeanFactoryLocator instance
 	 * @throws BeansException in case of factory loading failure
@@ -293,7 +293,7 @@ public class SingletonBeanFactoryLocator implements BeanFactoryLocator {
 	 * Returns an instance which uses the the specified selector, as the name of the
 	 * definition file(s). In the case of a name with a Spring 'classpath*:' prefix,
 	 * or with no prefix, which is treated the same, the current thread context
-	 * ClassLoader's <code>getResources</code> method will be called with this value
+	 * ClassLoader's {@code getResources} method will be called with this value
 	 * to get all resources having that name. These resources will then be combined to
 	 * form a definition. In the case where the name uses a Spring 'classpath:' prefix,
 	 * or a standard URL prefix, then only one resource file will be loaded as the
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 73a86c078c..6b439391e9 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
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.BeanFactory;
 
 /**
- * Unified EL <code>ELResolver</code> that delegates to a Spring BeanFactory,
+ * Unified EL {@code ELResolver} that delegates to a Spring BeanFactory,
  * resolving name references to Spring-defined beans.
  *
  * @author Juergen Hoeller
@@ -110,7 +110,7 @@ public abstract class SpringBeanELResolver extends ELResolver {
 	/**
 	 * Retrieve the Spring BeanFactory to delegate bean name resolution to.
 	 * @param elContext the current ELContext
-	 * @return the Spring BeanFactory (never <code>null</code>)
+	 * @return the Spring BeanFactory (never {@code null})
 	 */
 	protected abstract BeanFactory getBeanFactory(ELContext elContext);
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java
index 4e53fec1ad..811898742d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java
@@ -34,7 +34,7 @@ public interface AnnotatedBeanDefinition extends BeanDefinition {
 	/**
 	 * Obtain the annotation metadata (as well as basic class metadata)
 	 * for this bean definition's bean class.
-	 * @return the annotation metadata object (never <code>null</code>)
+	 * @return the annotation metadata object (never {@code null})
 	 */
 	AnnotationMetadata getMetadata();
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java
index 7d2178da0a..fc8b49bc20 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.java
@@ -71,7 +71,7 @@ public @interface Autowired {
 
 	/**
 	 * Declares whether the annotated dependency is required.
-	 * <p>Defaults to <code>true</code>.
+	 * <p>Defaults to {@code true}.
 	 */
 	boolean required() default true;
 
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 5b1d61b543..e1f0e2f392 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
@@ -67,10 +67,10 @@ import org.springframework.util.ReflectionUtils;
  * Spring's {@link Autowired @Autowired} and {@link Value @Value} annotations.
  *
  * <p>Also supports JSR-330's {@link javax.inject.Inject @Inject} annotation,
- * if available, as a direct alternative to Spring's own <code>@Autowired</code>.
+ * if available, as a direct alternative to Spring's own {@code @Autowired}.
  *
  * <p>Only one constructor (at max) of any given bean class may carry this
- * annotation with the 'required' parameter set to <code>true</code>,
+ * annotation with the 'required' parameter set to {@code true},
  * indicating <i>the</i> constructor to autowire when used as a Spring bean.
  * If multiple <i>non-required</i> constructors carry the annotation, they
  * will be considered as candidates for autowiring. The constructor with
@@ -187,8 +187,8 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 	/**
 	 * Set the boolean value that marks a dependency as required
 	 * <p>For example if using 'required=true' (the default),
-	 * this value should be <code>true</code>; but if using
-	 * 'optional=false', this value should be <code>false</code>.
+	 * this value should be {@code true}; but if using
+	 * 'optional=false', this value should be {@code false}.
 	 * @see #setRequiredParameterName(String)
 	 */
 	public void setRequiredParameterValue(boolean requiredParameterValue) {
@@ -292,7 +292,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 
 	/**
 	 * 'Native' processing method for direct calls with an arbitrary target instance,
-	 * resolving all of its fields and methods which are annotated with <code>@Autowired</code>.
+	 * resolving all of its fields and methods which are annotated with {@code @Autowired}.
 	 * @param bean the target instance to process
 	 * @throws BeansException if autowiring failed
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java
index 84102e70e9..205fed0aeb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
 /**
  * Marks a class as being eligible for Spring-driven configuration.
  *
- * <p>Typically used with the AspectJ <code>AnnotationBeanConfigurerAspect</code>.
+ * <p>Typically used with the AspectJ {@code AnnotationBeanConfigurerAspect}.
  *
  * @author Rod Johnson
  * @author Rob Harrop
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
index e4db17e1eb..862dbd6fa6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
@@ -57,7 +57,7 @@ import org.springframework.util.Assert;
  * still be desirable), because all that this class does is enforce that a
  * 'required' property has actually been configured with a value. It does
  * <b>not</b> check anything else... In particular, it does not check that a
- * configured value is not <code>null</code>.
+ * configured value is not {@code null}.
  *
  * <p>Note: A default RequiredAnnotationBeanPostProcessor will be registered
  * by the "context:annotation-config" and "context:component-scan" XML tags.
@@ -163,7 +163,7 @@ public class RequiredAnnotationBeanPostProcessor extends InstantiationAwareBeanP
 	 * {@link #SKIP_REQUIRED_CHECK_ATTRIBUTE} attribute in the bean definition, if any.
 	 * @param beanFactory the BeanFactory to check against
 	 * @param beanName the name of the bean to check against
-	 * @return <code>true</code> to skip the bean; <code>false</code> to process it
+	 * @return {@code true} to skip the bean; {@code false} to process it
 	 */
 	protected boolean shouldSkip(ConfigurableListableBeanFactory beanFactory, String beanName) {
 		if (beanFactory == null || !beanFactory.containsBeanDefinition(beanName)) {
@@ -178,9 +178,9 @@ public class RequiredAnnotationBeanPostProcessor extends InstantiationAwareBeanP
 	 * <p>This implementation looks for the existence of a
 	 * {@link #setRequiredAnnotationType "required" annotation}
 	 * on the supplied {@link PropertyDescriptor property}.
-	 * @param propertyDescriptor the target PropertyDescriptor (never <code>null</code>)
-	 * @return <code>true</code> if the supplied property has been marked as being required;
-	 * <code>false</code> if not, or if the supplied property does not have a setter method
+	 * @param propertyDescriptor the target PropertyDescriptor (never {@code null})
+	 * @return {@code true} if the supplied property has been marked as being required;
+	 * {@code false} if not, or if the supplied property does not have a setter method
 	 */
 	protected boolean isRequiredProperty(PropertyDescriptor propertyDescriptor) {
 		Method setter = propertyDescriptor.getWriteMethod();
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 320db67077..5939524eea 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
@@ -41,7 +41,7 @@ import org.springframework.util.ReflectionUtils;
  * Simple template superclass for {@link FactoryBean} implementations that
  * creates a singleton or a prototype object, depending on a flag.
  *
- * <p>If the "singleton" flag is <code>true</code> (the default),
+ * <p>If the "singleton" flag is {@code true} (the default),
  * this class will create the object that it creates exactly once
  * on initialization and subsequently return said singleton instance
  * on all calls to the {@link #getObject()} method.
@@ -78,7 +78,7 @@ public abstract class AbstractFactoryBean<T>
 
 	/**
 	 * Set if a singleton should be created, or a new object on each request
-	 * otherwise. Default is <code>true</code> (a singleton).
+	 * otherwise. Default is {@code true} (a singleton).
 	 */
 	public void setSingleton(boolean singleton) {
 		this.singleton = singleton;
@@ -211,11 +211,11 @@ public abstract class AbstractFactoryBean<T>
 	 * FactoryBean is supposed to implement, for use with an 'early singleton
 	 * proxy' that will be exposed in case of a circular reference.
 	 * <p>The default implementation returns this FactoryBean's object type,
-	 * provided that it is an interface, or <code>null</code> else. The latter
+	 * provided that it is an interface, or {@code null} else. The latter
 	 * indicates that early singleton access is not supported by this FactoryBean.
 	 * This will lead to a FactoryBeanNotInitializedException getting thrown.
 	 * @return the interfaces to use for 'early singletons',
-	 * or <code>null</code> to indicate a FactoryBeanNotInitializedException
+	 * or {@code null} to indicate a FactoryBeanNotInitializedException
 	 * @see org.springframework.beans.factory.FactoryBeanNotInitializedException
 	 */
 	protected Class[] getEarlySingletonInterfaces() {
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 050ca889ca..2040f6f420 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
@@ -137,8 +137,8 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
 
 	/**
 	 * Configure the given raw bean: autowiring bean properties, applying
-	 * bean property values, applying factory callbacks such as <code>setBeanName</code>
-	 * and <code>setBeanFactory</code>, and also applying all bean post processors
+	 * bean property values, applying factory callbacks such as {@code setBeanName}
+	 * and {@code setBeanFactory}, and also applying all bean post processors
 	 * (including ones which might wrap the given raw bean).
 	 * <p>This is effectively a superset of what {@link #initializeBean} provides,
 	 * fully applying the configuration specified by the corresponding bean definition.
@@ -158,7 +158,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
 	 * Resolve the specified dependency against the beans defined in this factory.
 	 * @param descriptor the descriptor for the dependency
 	 * @param beanName the name of the bean which declares the present dependency
-	 * @return the resolved object, or <code>null</code> if none found
+	 * @return the resolved object, or {@code null} if none found
 	 * @throws BeansException in dependency resolution failed
 	 */
 	Object resolveDependency(DependencyDescriptor descriptor, String beanName) throws BeansException;
@@ -190,7 +190,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
 	/**
 	 * Instantiate a new bean instance of the given class with the specified autowire
 	 * strategy. All constants defined in this interface are supported here.
-	 * Can also be invoked with <code>AUTOWIRE_NO</code> in order to just apply
+	 * Can also be invoked with {@code AUTOWIRE_NO} in order to just apply
 	 * before-instantiation callbacks (e.g. for annotation-driven injection).
 	 * <p>Does <i>not</i> apply standard {@link BeanPostProcessor BeanPostProcessors}
 	 * callbacks or perform any further initialization of the bean. This interface
@@ -217,7 +217,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
 
 	/**
 	 * Autowire the bean properties of the given bean instance by name or type.
-	 * Can also be invoked with <code>AUTOWIRE_NO</code> in order to just apply
+	 * Can also be invoked with {@code AUTOWIRE_NO} in order to just apply
 	 * after-instantiation callbacks (e.g. for annotation-driven injection).
 	 * <p>Does <i>not</i> apply standard {@link BeanPostProcessor BeanPostProcessors}
 	 * callbacks or perform any further initialization of the bean. This interface
@@ -262,7 +262,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
 
 	/**
 	 * Initialize the given raw bean, applying factory callbacks
-	 * such as <code>setBeanName</code> and <code>setBeanFactory</code>,
+	 * such as {@code setBeanName} and {@code setBeanFactory},
 	 * also applying all bean post processors (including ones which
 	 * might wrap the given raw bean).
 	 * <p>Note that no bean definition of the given name has to exist
@@ -278,7 +278,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
 
 	/**
 	 * Apply {@link BeanPostProcessor BeanPostProcessors} to the given existing bean
-	 * instance, invoking their <code>postProcessBeforeInitialization</code> methods.
+	 * instance, invoking their {@code postProcessBeforeInitialization} methods.
 	 * The returned bean instance may be a wrapper around the original.
 	 * @param existingBean the new bean instance
 	 * @param beanName the name of the bean
@@ -291,7 +291,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
 
 	/**
 	 * Apply {@link BeanPostProcessor BeanPostProcessors} to the given existing bean
-	 * instance, invoking their <code>postProcessAfterInitialization</code> methods.
+	 * instance, invoking their {@code postProcessAfterInitialization} methods.
 	 * The returned bean instance may be a wrapper around the original.
 	 * @param existingBean the new bean instance
 	 * @param beanName the name of the bean
@@ -310,7 +310,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
 	 * resolving the present dependency) are supposed to be added to
 	 * @param typeConverter the TypeConverter to use for populating arrays and
 	 * collections
-	 * @return the resolved object, or <code>null</code> if none found
+	 * @return the resolved object, or {@code null} if none found
 	 * @throws BeansException in dependency resolution failed
 	 */
 	Object resolveDependency(DependencyDescriptor descriptor, String beanName,
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java
index f71ec5da20..4102753bfc 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java
@@ -54,16 +54,16 @@ public interface BeanDefinition extends AttributeAccessor, BeanMetadataElement {
 
 
 	/**
-	 * Role hint indicating that a <code>BeanDefinition</code> is a major part
+	 * Role hint indicating that a {@code BeanDefinition} is a major part
 	 * of the application. Typically corresponds to a user-defined bean.
 	 */
 	int ROLE_APPLICATION = 0;
 
 	/**
-	 * Role hint indicating that a <code>BeanDefinition</code> is a supporting
+	 * Role hint indicating that a {@code BeanDefinition} is a supporting
 	 * part of some larger configuration, typically an outer
 	 * {@link org.springframework.beans.factory.parsing.ComponentDefinition}.
-	 * <code>SUPPORT</code> beans are considered important enough to be aware
+	 * {@code SUPPORT} beans are considered important enough to be aware
 	 * of when looking more closely at a particular
 	 * {@link org.springframework.beans.factory.parsing.ComponentDefinition},
 	 * but not when looking at the overall configuration of an application.
@@ -71,7 +71,7 @@ public interface BeanDefinition extends AttributeAccessor, BeanMetadataElement {
 	int ROLE_SUPPORT = 1;
 
 	/**
-	 * Role hint indicating that a <code>BeanDefinition</code> is providing an
+	 * Role hint indicating that a {@code BeanDefinition} is providing an
 	 * entirely background role and has no relevance to the end-user. This hint is
 	 * used when registering beans that are completely part of the internal workings
 	 * of a {@link org.springframework.beans.factory.parsing.ComponentDefinition}.
@@ -126,14 +126,14 @@ public interface BeanDefinition extends AttributeAccessor, BeanMetadataElement {
 	 * The method will be invoked on the specified factory bean, if any,
 	 * or otherwise as a static method on the local bean class.
 	 * @param factoryMethodName static factory method name,
-	 * or <code>null</code> if normal constructor creation should be used
+	 * or {@code null} if normal constructor creation should be used
 	 * @see #getBeanClassName()
 	 */
 	void setFactoryMethodName(String factoryMethodName);
 
 	/**
 	 * Return the name of the current target scope for this bean,
-	 * or <code>null</code> if not known yet.
+	 * or {@code null} if not known yet.
 	 */
 	String getScope();
 
@@ -152,7 +152,7 @@ public interface BeanDefinition extends AttributeAccessor, BeanMetadataElement {
 
 	/**
 	 * Set whether this bean should be lazily initialized.
-	 * <p>If <code>false</code>, the bean will get instantiated on startup by bean
+	 * <p>If {@code false}, the bean will get instantiated on startup by bean
 	 * factories that perform eager initialization of singletons.
 	 */
 	void setLazyInit(boolean lazyInit);
@@ -196,14 +196,14 @@ public interface BeanDefinition extends AttributeAccessor, BeanMetadataElement {
 	/**
 	 * Return the constructor argument values for this bean.
 	 * <p>The returned instance can be modified during bean factory post-processing.
-	 * @return the ConstructorArgumentValues object (never <code>null</code>)
+	 * @return the ConstructorArgumentValues object (never {@code null})
 	 */
 	ConstructorArgumentValues getConstructorArgumentValues();
 
 	/**
 	 * Return the property values to be applied to a new instance of the bean.
 	 * <p>The returned instance can be modified during bean factory post-processing.
-	 * @return the MutablePropertyValues object (never <code>null</code>)
+	 * @return the MutablePropertyValues object (never {@code null})
 	 */
 	MutablePropertyValues getPropertyValues();
 
@@ -228,9 +228,9 @@ public interface BeanDefinition extends AttributeAccessor, BeanMetadataElement {
 	boolean isAbstract();
 
 	/**
-	 * Get the role hint for this <code>BeanDefinition</code>. The role hint
+	 * Get the role hint for this {@code BeanDefinition}. The role hint
 	 * provides tools with an indication of the importance of a particular
-	 * <code>BeanDefinition</code>.
+	 * {@code BeanDefinition}.
 	 * @see #ROLE_APPLICATION
 	 * @see #ROLE_INFRASTRUCTURE
 	 * @see #ROLE_SUPPORT
@@ -249,7 +249,7 @@ public interface BeanDefinition extends AttributeAccessor, BeanMetadataElement {
 	String getResourceDescription();
 
 	/**
-	 * Return the originating BeanDefinition, or <code>null</code> if none.
+	 * Return the originating BeanDefinition, or {@code null} if none.
 	 * Allows for retrieving the decorated bean definition, if any.
 	 * <p>Note that this method returns the immediate originator. Iterate through the
 	 * originator chain to find the original BeanDefinition as defined by the user.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
index cd2dd25093..d14e2f3c0b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
@@ -57,7 +57,7 @@ public class BeanDefinitionHolder implements BeanMetadataElement {
 	 * Create a new BeanDefinitionHolder.
 	 * @param beanDefinition the BeanDefinition to wrap
 	 * @param beanName the name of the bean, as specified for the bean definition
-	 * @param aliases alias names for the bean, or <code>null</code> if none
+	 * @param aliases alias names for the bean, or {@code null} if none
 	 */
 	public BeanDefinitionHolder(BeanDefinition beanDefinition, String beanName, String[] aliases) {
 		Assert.notNull(beanDefinition, "BeanDefinition must not be null");
@@ -71,7 +71,7 @@ public class BeanDefinitionHolder implements BeanMetadataElement {
 	 * Copy constructor: Create a new BeanDefinitionHolder with the
 	 * same contents as the given BeanDefinitionHolder instance.
 	 * <p>Note: The wrapped BeanDefinition reference is taken as-is;
-	 * it is <code>not</code> deeply copied.
+	 * it is {@code not} deeply copied.
 	 * @param beanDefinitionHolder the BeanDefinitionHolder to copy
 	 */
 	public BeanDefinitionHolder(BeanDefinitionHolder beanDefinitionHolder) {
@@ -98,7 +98,7 @@ public class BeanDefinitionHolder implements BeanMetadataElement {
 
 	/**
 	 * Return the alias names for the bean, as specified directly for the bean definition.
-	 * @return the array of alias names, or <code>null</code> if none
+	 * @return the array of alias names, or {@code null} if none
 	 */
 	public String[] getAliases() {
 		return this.aliases;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java
index ee23681759..52d03678bc 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java
@@ -43,13 +43,13 @@ public interface BeanPostProcessor {
 
 	/**
 	 * Apply this BeanPostProcessor to the given new bean instance <i>before</i> any bean
-	 * initialization callbacks (like InitializingBean's <code>afterPropertiesSet</code>
+	 * initialization callbacks (like InitializingBean's {@code afterPropertiesSet}
 	 * or a custom init-method). The bean will already be populated with property values.
 	 * The returned bean instance may be a wrapper around the original.
 	 * @param bean the new bean instance
 	 * @param beanName the name of the bean
 	 * @return the bean instance to use, either the original or a wrapped one; if
-	 * <code>null</code>, no subsequent BeanPostProcessors will be invoked
+	 * {@code null}, no subsequent BeanPostProcessors will be invoked
 	 * @throws org.springframework.beans.BeansException in case of errors
 	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet
 	 */
@@ -57,20 +57,20 @@ public interface BeanPostProcessor {
 
 	/**
 	 * Apply this BeanPostProcessor to the given new bean instance <i>after</i> any bean
-	 * initialization callbacks (like InitializingBean's <code>afterPropertiesSet</code>
+	 * initialization callbacks (like InitializingBean's {@code afterPropertiesSet}
 	 * or a custom init-method). The bean will already be populated with property values.
 	 * The returned bean instance may be a wrapper around the original.
 	 * <p>In case of a FactoryBean, this callback will be invoked for both the FactoryBean
 	 * instance and the objects created by the FactoryBean (as of Spring 2.0). The
 	 * post-processor can decide whether to apply to either the FactoryBean or created
-	 * objects or both through corresponding <code>bean instanceof FactoryBean</code> checks.
+	 * objects or both through corresponding {@code bean instanceof FactoryBean} checks.
 	 * <p>This callback will also be invoked after a short-circuiting triggered by a
 	 * {@link InstantiationAwareBeanPostProcessor#postProcessBeforeInstantiation} method,
 	 * in contrast to all other BeanPostProcessor callbacks.
 	 * @param bean the new bean instance
 	 * @param beanName the name of the bean
 	 * @return the bean instance to use, either the original or a wrapped one; if
-	 * <code>null</code>, no subsequent BeanPostProcessors will be invoked
+	 * {@code null}, no subsequent BeanPostProcessors will be invoked
 	 * @throws org.springframework.beans.BeansException in case of errors
 	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet
 	 * @see org.springframework.beans.factory.FactoryBean
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java
index 2dac38ecc7..b396d2367b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java
@@ -33,7 +33,7 @@ import org.springframework.beans.BeanMetadataElement;
 public interface BeanReference extends BeanMetadataElement {
 
 	/**
-	 * Return the target bean name that this reference points to (never <code>null</code>).
+	 * Return the target bean name that this reference points to (never {@code null}).
 	 */
 	String getBeanName();
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java
index 1a382a6324..e7c232d97b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.SmartFactoryBean;
  * using this FactoryBean to link it in and expose it under a different name.
  * Effectively, this corresponds to an alias for the target bean.
  *
- * <p><b>NOTE:</b> For XML bean definition files, an <code>&lt;alias&gt;</code>
+ * <p><b>NOTE:</b> For XML bean definition files, an {@code &lt;alias&gt;}
  * tag is available that effectively achieves the same.
  *
  * <p>A special capability of this FactoryBean is enabled through its configuration
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java
index 35e44cfeee..d04eb15d81 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableBeanFactory.java
@@ -51,14 +51,14 @@ public interface ConfigurableBeanFactory extends HierarchicalBeanFactory, Single
 
 	/**
 	 * Scope identifier for the standard singleton scope: "singleton".
-	 * Custom scopes can be added via <code>registerScope</code>.
+	 * Custom scopes can be added via {@code registerScope}.
 	 * @see #registerScope
 	 */
 	String SCOPE_SINGLETON = "singleton";
 
 	/**
 	 * Scope identifier for the standard prototype scope: "prototype".
-	 * Custom scopes can be added via <code>registerScope</code>.
+	 * Custom scopes can be added via {@code registerScope}.
 	 * @see #registerScope
 	 */
 	String SCOPE_PROTOTYPE = "prototype";
@@ -83,7 +83,7 @@ public interface ConfigurableBeanFactory extends HierarchicalBeanFactory, Single
 	 * Spring 2.0 by default: Bean definitions only carry bean class names,
 	 * to be resolved once the factory processes the bean definition.
 	 * @param beanClassLoader the class loader to use,
-	 * or <code>null</code> to suggest the default class loader
+	 * or {@code null} to suggest the default class loader
 	 */
 	void setBeanClassLoader(ClassLoader beanClassLoader);
 
@@ -255,14 +255,14 @@ public interface ConfigurableBeanFactory extends HierarchicalBeanFactory, Single
 	 * <p>This will only return explicitly registered scopes.
 	 * Built-in scopes such as "singleton" and "prototype" won't be exposed.
 	 * @param scopeName the name of the scope
-	 * @return the registered Scope implementation, or <code>null</code> if none
+	 * @return the registered Scope implementation, or {@code null} if none
 	 * @see #registerScope
 	 */
 	Scope getRegisteredScope(String scopeName);
 
 	/**
 	 * Provides a security access control context relevant to this factory.
-	 * @return the applicable AccessControlContext (never <code>null</code>)
+	 * @return the applicable AccessControlContext (never {@code null})
 	 * @since 3.0
 	 */
 	AccessControlContext getAccessControlContext();
@@ -314,7 +314,7 @@ public interface ConfigurableBeanFactory extends HierarchicalBeanFactory, Single
 	 * Determine whether the bean with the given name is a FactoryBean.
 	 * @param name the name of the bean to check
 	 * @return whether the bean is a FactoryBean
-	 * (<code>false</code> means the bean exists but is not a FactoryBean)
+	 * ({@code false} means the bean exists but is not a FactoryBean)
 	 * @throws NoSuchBeanDefinitionException if there is no bean with the given name
 	 * @since 2.5
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java
index 459003bb3d..956448d332 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java
@@ -115,7 +115,7 @@ public interface ConfigurableListableBeanFactory
 	/**
 	 * Return whether this factory's bean definitions are frozen,
 	 * i.e. are not supposed to be modified or post-processed any further.
-	 * @return <code>true</code> if the factory's configuration is considered frozen
+	 * @return {@code true} if the factory's configuration is considered frozen
 	 */
 	boolean isConfigurationFrozen();
 
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 3a3aa9df17..4d013fae16 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
@@ -142,9 +142,9 @@ public class ConstructorArgumentValues {
 	/**
 	 * Get argument value for the given index in the constructor argument list.
 	 * @param index the index in the constructor argument list
-	 * @param requiredType the type to match (can be <code>null</code> to match
+	 * @param requiredType the type to match (can be {@code null} to match
 	 * untyped values only)
-	 * @return the ValueHolder for the argument, or <code>null</code> if none set
+	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
 	public ValueHolder getIndexedArgumentValue(int index, Class requiredType) {
 		return getIndexedArgumentValue(index, requiredType, null);
@@ -153,11 +153,11 @@ public class ConstructorArgumentValues {
 	/**
 	 * Get argument value for the given index in the constructor argument list.
 	 * @param index the index in the constructor argument list
-	 * @param requiredType the type to match (can be <code>null</code> to match
+	 * @param requiredType the type to match (can be {@code null} to match
 	 * untyped values only)
-	 * @param requiredName the type to match (can be <code>null</code> to match
+	 * @param requiredName the type to match (can be {@code null} to match
 	 * unnamed values only)
-	 * @return the ValueHolder for the argument, or <code>null</code> if none set
+	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
 	public ValueHolder getIndexedArgumentValue(int index, Class requiredType, String requiredName) {
 		Assert.isTrue(index >= 0, "Index must not be negative");
@@ -245,7 +245,7 @@ public class ConstructorArgumentValues {
 	/**
 	 * Look for a generic argument value that matches the given type.
 	 * @param requiredType the type to match
-	 * @return the ValueHolder for the argument, or <code>null</code> if none set
+	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
 	public ValueHolder getGenericArgumentValue(Class requiredType) {
 		return getGenericArgumentValue(requiredType, null, null);
@@ -255,7 +255,7 @@ public class ConstructorArgumentValues {
 	 * Look for a generic argument value that matches the given type.
 	 * @param requiredType the type to match
 	 * @param requiredName the name to match
-	 * @return the ValueHolder for the argument, or <code>null</code> if none set
+	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
 	public ValueHolder getGenericArgumentValue(Class requiredType, String requiredName) {
 		return getGenericArgumentValue(requiredType, requiredName, null);
@@ -265,13 +265,13 @@ public class ConstructorArgumentValues {
 	 * Look for the next generic argument value that matches the given type,
 	 * ignoring argument values that have already been used in the current
 	 * resolution process.
-	 * @param requiredType the type to match (can be <code>null</code> to find
+	 * @param requiredType the type to match (can be {@code null} to find
 	 * an arbitrary next generic argument value)
-	 * @param requiredName the name to match (can be <code>null</code> to not
+	 * @param requiredName the name to match (can be {@code null} to not
 	 * match argument values by name)
 	 * @param usedValueHolders a Set of ValueHolder objects that have already been used
 	 * in the current resolution process and should therefore not be returned again
-	 * @return the ValueHolder for the argument, or <code>null</code> if none found
+	 * @return the ValueHolder for the argument, or {@code null} if none found
 	 */
 	public ValueHolder getGenericArgumentValue(Class requiredType, String requiredName, Set<ValueHolder> usedValueHolders) {
 		for (ValueHolder valueHolder : this.genericArgumentValues) {
@@ -310,7 +310,7 @@ public class ConstructorArgumentValues {
 	 * 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
-	 * @return the ValueHolder for the argument, or <code>null</code> if none set
+	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
 	public ValueHolder getArgumentValue(int index, Class requiredType) {
 		return getArgumentValue(index, requiredType, null, null);
@@ -322,7 +322,7 @@ public class ConstructorArgumentValues {
 	 * @param index the index in the constructor argument list
 	 * @param requiredType the type to match
 	 * @param requiredName the name to match
-	 * @return the ValueHolder for the argument, or <code>null</code> if none set
+	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
 	public ValueHolder getArgumentValue(int index, Class requiredType, String requiredName) {
 		return getArgumentValue(index, requiredType, requiredName, null);
@@ -332,13 +332,13 @@ public class ConstructorArgumentValues {
 	 * 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</code> to find
+	 * @param requiredType the type to match (can be {@code null} to find
 	 * an untyped 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</code> if none set
+	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
 	public ValueHolder getArgumentValue(int index, Class requiredType, String requiredName, Set<ValueHolder> usedValueHolders) {
 		Assert.isTrue(index >= 0, "Index must not be negative");
@@ -512,7 +512,7 @@ public class ConstructorArgumentValues {
 		}
 
 		/**
-		 * Set the configuration source <code>Object</code> for this metadata element.
+		 * Set the configuration source {@code Object} for this metadata element.
 		 * <p>The exact type of the object will depend on the configuration mechanism used.
 		 */
 		public void setSource(Object source) {
@@ -524,8 +524,8 @@ public class ConstructorArgumentValues {
 		}
 
 		/**
-		 * Return whether this holder contains a converted value already (<code>true</code>),
-		 * or whether the value still needs to be converted (<code>false</code>).
+		 * Return whether this holder contains a converted value already ({@code true}),
+		 * or whether the value still needs to be converted ({@code false}).
 		 */
 		public synchronized boolean isConverted() {
 			return this.converted;
@@ -551,7 +551,7 @@ public class ConstructorArgumentValues {
 		/**
 		 * Determine whether the content of this ValueHolder is equal
 		 * to the content of the given other ValueHolder.
-		 * <p>Note that ValueHolder does not implement <code>equals</code>
+		 * <p>Note that ValueHolder does not implement {@code equals}
 		 * directly, to allow for multiple ValueHolder instances with the
 		 * same content to reside in the same Set.
 		 */
@@ -562,7 +562,7 @@ public class ConstructorArgumentValues {
 
 		/**
 		 * Determine whether the hash code of the content of this ValueHolder.
-		 * <p>Note that ValueHolder does not implement <code>hashCode</code>
+		 * <p>Note that ValueHolder does not implement {@code hashCode}
 		 * directly, to allow for multiple ValueHolder instances with the
 		 * same content to reside in the same Set.
 		 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
index 2118bdae98..d3e6796a7d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
@@ -126,10 +126,10 @@ public class CustomEditorConfigurer implements BeanFactoryPostProcessor, BeanCla
 	/**
 	 * Specify the {@link PropertyEditorRegistrar PropertyEditorRegistrars}
 	 * to apply to beans defined within the current application context.
-	 * <p>This allows for sharing <code>PropertyEditorRegistrars</code> with
+	 * <p>This allows for sharing {@code PropertyEditorRegistrars} with
 	 * {@link org.springframework.validation.DataBinder DataBinders}, etc.
 	 * Furthermore, it avoids the need for synchronization on custom editors:
-	 * A <code>PropertyEditorRegistrar</code> will always create fresh editor
+	 * A {@code PropertyEditorRegistrar} will always create fresh editor
 	 * instances for each bean creation attempt.
 	 * @see ConfigurableListableBeanFactory#addPropertyEditorRegistrar
 	 */
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 ba38a85c4b..67559bea8e 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
@@ -143,7 +143,7 @@ public class DependencyDescriptor implements Serializable {
 	/**
 	 * Return the wrapped MethodParameter, if any.
 	 * <p>Note: Either MethodParameter or Field is available.
-	 * @return the MethodParameter, or <code>null</code> if none
+	 * @return the MethodParameter, or {@code null} if none
 	 */
 	public MethodParameter getMethodParameter() {
 		return this.methodParameter;
@@ -152,7 +152,7 @@ public class DependencyDescriptor implements Serializable {
 	/**
 	 * Return the wrapped Field, if any.
 	 * <p>Note: Either MethodParameter or Field is available.
-	 * @return the Field, or <code>null</code> if none
+	 * @return the Field, or {@code null} if none
 	 */
 	public Field getField() {
 		return this.field;
@@ -199,7 +199,7 @@ public class DependencyDescriptor implements Serializable {
 
 	/**
 	 * Determine the name of the wrapped parameter/field.
-	 * @return the declared name (never <code>null</code>)
+	 * @return the declared name (never {@code null})
 	 */
 	public String getDependencyName() {
 		return (this.field != null ? this.field.getName() : this.methodParameter.getParameterName());
@@ -207,7 +207,7 @@ public class DependencyDescriptor implements Serializable {
 
 	/**
 	 * Determine the declared (non-generic) type of the wrapped parameter/field.
-	 * @return the declared type (never <code>null</code>)
+	 * @return the declared type (never {@code null})
 	 */
 	public Class<?> getDependencyType() {
 		if (this.field != null) {
@@ -238,7 +238,7 @@ public class DependencyDescriptor implements Serializable {
 
 	/**
 	 * Determine the generic element type of the wrapped Collection parameter/field, if any.
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public Class<?> getCollectionType() {
 		return (this.field != null ?
@@ -248,7 +248,7 @@ public class DependencyDescriptor implements Serializable {
 
 	/**
 	 * Determine the generic key type of the wrapped Map parameter/field, if any.
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public Class<?> getMapKeyType() {
 		return (this.field != null ?
@@ -258,7 +258,7 @@ public class DependencyDescriptor implements Serializable {
 
 	/**
 	 * Determine the generic value type of the wrapped Map parameter/field, if any.
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public Class<?> getMapValueType() {
 		return (this.field != null ?
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java
index c7acb6bdff..df8cb8447f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java
@@ -32,7 +32,7 @@ public interface DestructionAwareBeanPostProcessor extends BeanPostProcessor {
 	/**
 	 * Apply this BeanPostProcessor to the given bean instance before
 	 * its destruction. Can invoke custom destruction callbacks.
-	 * <p>Like DisposableBean's <code>destroy</code> and a custom destroy method,
+	 * <p>Like DisposableBean's {@code destroy} and a custom destroy method,
 	 * this callback just applies to singleton beans in the factory (including
 	 * inner beans).
 	 * @param bean the bean instance to be destroyed
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
index f0d5b59a92..7eca9097c1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
@@ -61,7 +61,7 @@ public interface InstantiationAwareBeanPostProcessor extends BeanPostProcessor {
 	 * @param beanClass the class of the bean to be instantiated
 	 * @param beanName the name of the bean
 	 * @return the bean object to expose instead of a default instance of the target bean,
-	 * or <code>null</code> to proceed with default instantiation
+	 * or {@code null} to proceed with default instantiation
 	 * @throws org.springframework.beans.BeansException in case of errors
 	 * @see org.springframework.beans.factory.support.AbstractBeanDefinition#hasBeanClass
 	 * @see org.springframework.beans.factory.support.AbstractBeanDefinition#getFactoryMethodName
@@ -76,9 +76,9 @@ public interface InstantiationAwareBeanPostProcessor extends BeanPostProcessor {
 	 * for a typical example.
 	 * @param bean the bean instance created, with properties not having been set yet
 	 * @param beanName the name of the bean
-	 * @return <code>true</code> if properties should be set on the bean; <code>false</code>
-	 * if property population should be skipped. Normal implementations should return <code>true</code>.
-	 * Returning <code>false</code> will also prevent any subsequent InstantiationAwareBeanPostProcessor
+	 * @return {@code true} if properties should be set on the bean; {@code false}
+	 * if property population should be skipped. Normal implementations should return {@code true}.
+	 * Returning {@code false} will also prevent any subsequent InstantiationAwareBeanPostProcessor
 	 * instances being invoked on this bean instance.
 	 * @throws org.springframework.beans.BeansException in case of errors
 	 */
@@ -91,13 +91,13 @@ public interface InstantiationAwareBeanPostProcessor extends BeanPostProcessor {
 	 * <p>Also allows for replacing the property values to apply, typically through
 	 * creating a new MutablePropertyValues instance based on the original PropertyValues,
 	 * adding or removing specific values.
-	 * @param pvs the property values that the factory is about to apply (never <code>null</code>)
+	 * @param pvs the property values that the factory is about to apply (never {@code null})
 	 * @param pds the relevant property descriptors for the target bean (with ignored
 	 * dependency types - which the factory handles specifically - already filtered out)
 	 * @param bean the bean instance created, but whose properties have not yet been set
 	 * @param beanName the name of the bean
 	 * @return the actual property values to apply to to the given bean
-	 * (can be the passed-in PropertyValues instance), or <code>null</code>
+	 * (can be the passed-in PropertyValues instance), or {@code null}
 	 * to skip property population
 	 * @throws org.springframework.beans.BeansException in case of errors
 	 * @see org.springframework.beans.MutablePropertyValues
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java
index 7ceb21f753..299b588fc6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java
@@ -49,7 +49,7 @@ public class ListFactoryBean extends AbstractFactoryBean<List> {
 	/**
 	 * Set the class to use for the target List. Can be populated with a fully
 	 * qualified class name when defined in a Spring application context.
-	 * <p>Default is a <code>java.util.ArrayList</code>.
+	 * <p>Default is a {@code java.util.ArrayList}.
 	 * @see java.util.ArrayList
 	 */
 	public void setTargetListClass(Class targetListClass) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
index 758092b812..b544f2f1e2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
@@ -194,7 +194,7 @@ public class MethodInvokingFactoryBean extends ArgumentConvertingMethodInvoker
 
 	/**
 	 * Return the type of object that this FactoryBean creates,
-	 * or <code>null</code> if not known in advance.
+	 * or {@code null} if not known in advance.
 	 */
 	public Class<?> getObjectType() {
 		if (!isPrepared()) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java
index d2fc8ab259..c9bf53b3ba 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java
@@ -57,7 +57,7 @@ import org.springframework.util.Assert;
  *
  *&lt;/beans&gt;</pre>
  *
- * <p>The attendant <code>MyClientBean</code> class implementation might look
+ * <p>The attendant {@code MyClientBean} class implementation might look
  * something like this:
  *
  * <pre class="code">package a.b.c;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
index 2e0aabceba..a202e5a958 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.InitializingBean;
 
 /**
  * Subclass of PropertyPlaceholderConfigurer that supports JDK 1.4's
- * Preferences API (<code>java.util.prefs</code>).
+ * Preferences API ({@code java.util.prefs}).
  *
  * <p>Tries to resolve placeholders as keys first in the user preferences,
  * then in the system preferences, then in this configurer's properties.
@@ -110,7 +110,7 @@ public class PreferencesPlaceholderConfigurer extends PropertyPlaceholderConfigu
 	 * @param path the preferences path (placeholder part before '/')
 	 * @param key the preferences key (placeholder part after '/')
 	 * @param preferences the Preferences to resolve against
-	 * @return the value for the placeholder, or <code>null</code> if none found
+	 * @return the value for the placeholder, or {@code null} if none found
 	 */
 	protected String resolvePlaceholder(String path, String key, Preferences preferences) {
 		if (path != null) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java
index 736a7d14fd..9dbcb9becb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyOverrideConfigurer.java
@@ -52,7 +52,7 @@ import org.springframework.beans.factory.BeanInitializationException;
  * the same bean property, the <i>last</i> one will win (due to the overriding mechanism).
  *
  * <p>Property values can be converted after reading them in, through overriding
- * the <code>convertPropertyValue</code> method. For example, encrypted values
+ * the {@code convertPropertyValue} method. For example, encrypted values
  * can be detected and decrypted accordingly before processing them.
  *
  * @author Juergen Hoeller
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 442f541c50..197c2ad306 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
@@ -137,8 +137,8 @@ public class PropertyPlaceholderConfigurer extends PlaceholderConfigurerSupport
 	/**
 	 * Resolve the given placeholder using the given properties, performing
 	 * a system properties check according to the given mode.
-	 * <p>The default implementation delegates to <code>resolvePlaceholder
-	 * (placeholder, props)</code> before/after the system properties check.
+	 * <p>The default implementation delegates to {@code resolvePlaceholder
+	 * (placeholder, props)} before/after the system properties check.
 	 * <p>Subclasses can override this for custom resolution strategies,
 	 * including customized points for the system properties check.
 	 * @param placeholder the placeholder to resolve
@@ -174,7 +174,7 @@ public class PropertyPlaceholderConfigurer extends PlaceholderConfigurerSupport
 	 * after this method is invoked, according to the system properties mode.
 	 * @param placeholder the placeholder to resolve
 	 * @param props the merged properties of this configurer
-	 * @return the resolved value, of <code>null</code> if none
+	 * @return the resolved value, of {@code null} if none
 	 * @see #setSystemPropertiesMode
 	 */
 	protected String resolvePlaceholder(String placeholder, Properties props) {
@@ -185,10 +185,10 @@ public class PropertyPlaceholderConfigurer extends PlaceholderConfigurerSupport
 	 * Resolve the given key as JVM system property, and optionally also as
 	 * system environment variable if no matching system property has been found.
 	 * @param key the placeholder to resolve as system property key
-	 * @return the system property value, or <code>null</code> if not found
+	 * @return the system property value, or {@code null} if not found
 	 * @see #setSearchSystemEnvironment
-	 * @see java.lang.System#getProperty(String)
-	 * @see java.lang.System#getenv(String)
+	 * @see System#getProperty(String)
+	 * @see System#getenv(String)
 	 */
 	protected String resolveSystemProperty(String key) {
 		try {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
index 317defbe96..0ce9e083cd 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
@@ -31,8 +31,8 @@ import org.springframework.util.Assert;
  * <p>This is basically a JSR-330 compliant variant of Spring's good old
  * {@link ObjectFactoryCreatingFactoryBean}. It can be used for traditional
  * external dependency injection configuration that targets a property or
- * constructor argument of type <code>javax.inject.Provider</code>, as an
- * alternative to JSR-330's <code>@Inject</code> annotation-driven approach.
+ * constructor argument of type {@code javax.inject.Provider}, as an
+ * alternative to JSR-330's {@code @Inject} annotation-driven approach.
  *
  * @author Juergen Hoeller
  * @since 3.0.2
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
index 92e3fd1899..d9c775743d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
@@ -49,7 +49,7 @@ public class RuntimeBeanNameReference implements BeanReference {
 	}
 
 	/**
-	 * Set the configuration source <code>Object</code> for this metadata element.
+	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
 	 */
 	public void setSource(Object source) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
index 9bef3a1e81..55ab063ef6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
@@ -74,7 +74,7 @@ public class RuntimeBeanReference implements BeanReference {
 	}
 
 	/**
-	 * Set the configuration source <code>Object</code> for this metadata element.
+	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
 	 */
 	public void setSource(Object source) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java
index 9da178b2ef..7e299321f0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java
@@ -38,14 +38,14 @@ import org.springframework.beans.factory.ObjectFactory;
  * this SPI is completely generic: It provides the ability to get and put
  * objects from any underlying storage mechanism, such as an HTTP session
  * or a custom conversation mechanism. The name passed into this class's
- * <code>get</code> and <code>remove</code> methods will identify the
+ * {@code get} and {@code remove} methods will identify the
  * target object in the current scope.
  *
- * <p><code>Scope</code> implementations are expected to be thread-safe.
- * One <code>Scope</code> instance can be used with multiple bean factories
+ * <p>{@code Scope} implementations are expected to be thread-safe.
+ * One {@code Scope} instance can be used with multiple bean factories
  * at the same time, if desired (unless it explicitly wants to be aware of
  * the containing BeanFactory), with any number of threads accessing
- * the <code>Scope</code> concurrently from any number of factories.
+ * the {@code Scope} concurrently from any number of factories.
  *
  * @author Juergen Hoeller
  * @author Rob Harrop
@@ -67,14 +67,14 @@ public interface Scope {
 	 * @param name the name of the object to retrieve
 	 * @param objectFactory the {@link ObjectFactory} to use to create the scoped
 	 * object if it is not present in the underlying storage mechanism
-	 * @return the desired object (never <code>null</code>)
+	 * @return the desired object (never {@code null})
 	 */
 	Object get(String name, ObjectFactory<?> objectFactory);
 
 	/**
-	 * Remove the object with the given <code>name</code> from the underlying scope.
-	 * <p>Returns <code>null</code> if no object was found; otherwise
-	 * returns the removed <code>Object</code>.
+	 * Remove the object with the given {@code name} from the underlying scope.
+	 * <p>Returns {@code null} if no object was found; otherwise
+	 * returns the removed {@code Object}.
 	 * <p>Note that an implementation should also remove a registered destruction
 	 * callback for the specified object, if any. It does, however, <i>not</i>
 	 * need to <i>execute</i> a registered destruction callback in this case,
@@ -83,7 +83,7 @@ public interface Scope {
 	 * {@link UnsupportedOperationException} if they do not support explicitly
 	 * removing an object.
 	 * @param name the name of the object to remove
-	 * @return the removed object, or <code>null</code> if no object was present
+	 * @return the removed object, or {@code null} if no object was present
 	 * @see #registerDestructionCallback
 	 */
 	Object remove(String name);
@@ -122,7 +122,7 @@ public interface Scope {
 	 * Resolve the contextual object for the given key, if any.
 	 * E.g. the HttpServletRequest object for key "request".
 	 * @param key the contextual key
-	 * @return the corresponding object, or <code>null</code> if none found
+	 * @return the corresponding object, or {@code null} if none found
 	 */
 	Object resolveContextualObject(String key);
 
@@ -135,9 +135,9 @@ public interface Scope {
 	 * case of a custom conversation that sits within the overall session,
 	 * the specific ID for the current conversation would be appropriate.
 	 * <p><b>Note: This is an optional operation.</b> It is perfectly valid to
-	 * return <code>null</code> in an implementation of this method if the
+	 * return {@code null} in an implementation of this method if the
 	 * underlying storage mechanism has no obvious candidate for such an ID.
-	 * @return the conversation ID, or <code>null</code> if there is no
+	 * @return the conversation ID, or {@code null} if there is no
 	 * conversation ID for the current scope
 	 */
 	String getConversationId();
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
index 192f6b7e66..1fb0c2005a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
@@ -36,8 +36,8 @@ import org.springframework.util.StringUtils;
 
 /**
  * A {@link FactoryBean} implementation that takes an interface which must have one or more
- * methods with the signatures <code>MyType xxx()</code> or <code>MyType xxx(MyIdType id)</code>
- * (typically, <code>MyService getService()</code> or <code>MyService getService(String id)</code>)
+ * methods with the signatures {@code MyType xxx()} or {@code MyType xxx(MyIdType id)}
+ * (typically, {@code MyService getService()} or {@code MyService getService(String id)})
  * and creates a dynamic proxy which implements that interface, delegating to an
  * underlying {@link org.springframework.beans.factory.BeanFactory}.
  *
@@ -51,7 +51,7 @@ import org.springframework.util.StringUtils;
  * setter or constructor injection of the target bean is preferable.</b>
  *
  * <p>On invocation of the no-arg factory method, or the single-arg factory
- * method with a String id of <code>null</code> or empty String, if exactly
+ * method with a String id of {@code null} or empty String, if exactly
  * <b>one</b> bean in the factory matches the return type of the factory
  * method, that bean is returned, otherwise a
  * {@link org.springframework.beans.factory.NoSuchBeanDefinitionException}
@@ -64,7 +64,7 @@ import org.springframework.util.StringUtils;
  *
  * <p>A factory method argument will usually be a String, but can also be an
  * int or a custom enumeration type, for example, stringified via
- * <code>toString</code>. The resulting String can be used as bean name as-is,
+ * {@code toString}. The resulting String can be used as bean name as-is,
  * provided that corresponding beans are defined in the bean factory.
  * Alternatively, {@link #setServiceMappings(java.util.Properties) a custom mapping}
  * between service ids and bean names can be defined.
@@ -99,7 +99,7 @@ import org.springframework.util.StringUtils;
  *
  *&lt;/beans></pre>
  *
- * <p>The attendant <code>MyClientBean</code> class implementation might then
+ * <p>The attendant {@code MyClientBean} class implementation might then
  * look something like this:
  *
  * <pre class="code">package a.b.c;
@@ -151,7 +151,7 @@ import org.springframework.util.StringUtils;
  *
  *&lt;/beans></pre>
  *
- * <p>The attendant <code>MyClientBean</code> class implementation might then
+ * <p>The attendant {@code MyClientBean} class implementation might then
  * look something like this:
  *
  * <pre class="code">package a.b.c;
@@ -202,8 +202,8 @@ public class ServiceLocatorFactoryBean implements FactoryBean<Object>, BeanFacto
 
 	/**
 	 * Set the service locator interface to use, which must have one or more methods with
-	 * the signatures <code>MyType xxx()</code> or <code>MyType xxx(MyIdType id)</code>
-	 * (typically, <code>MyService getService()</code> or <code>MyService getService(String id)</code>).
+	 * the signatures {@code MyType xxx()} or {@code MyType xxx(MyIdType id)}
+	 * (typically, {@code MyService getService()} or {@code MyService getService(String id)}).
 	 * See the {@link ServiceLocatorFactoryBean class-level Javadoc} for
 	 * information on the semantics of such methods.
 	 */
@@ -214,8 +214,8 @@ public class ServiceLocatorFactoryBean implements FactoryBean<Object>, BeanFacto
 	/**
 	 * Set the exception class that the service locator should throw if service
 	 * lookup failed. The specified exception class must have a constructor
-	 * with one of the following parameter types: <code>(String, Throwable)</code>
-	 * or <code>(Throwable)</code> or <code>(String)</code>.
+	 * with one of the following parameter types: {@code (String, Throwable)}
+	 * or {@code (Throwable)} or {@code (String)}.
 	 * <p>If not specified, subclasses of Spring's BeansException will be thrown,
 	 * for example NoSuchBeanDefinitionException. As those are unchecked, the
 	 * caller does not need to handle them, so it might be acceptable that
@@ -236,7 +236,7 @@ public class ServiceLocatorFactoryBean implements FactoryBean<Object>, BeanFacto
 	 * Set mappings between service ids (passed into the service locator)
 	 * and bean names (in the bean factory). Service ids that are not defined
 	 * here will be treated as bean names as-is.
-	 * <p>The empty string as service id key defines the mapping for <code>null</code> and
+	 * <p>The empty string as service id key defines the mapping for {@code null} and
 	 * empty string, and for factory methods without parameter. If not defined,
 	 * a single matching bean will be retrieved from the bean factory.
 	 * @param serviceMappings mappings between service ids and bean names,
@@ -271,8 +271,8 @@ public class ServiceLocatorFactoryBean implements FactoryBean<Object>, BeanFacto
 	 * Determine the constructor to use for the given service locator exception
 	 * class. Only called in case of a custom service locator exception.
 	 * <p>The default implementation looks for a constructor with one of the
-	 * following parameter types: <code>(String, Throwable)</code>
-	 * or <code>(Throwable)</code> or <code>(String)</code>.
+	 * following parameter types: {@code (String, Throwable)}
+	 * or {@code (Throwable)} or {@code (String)}.
 	 * @param exceptionClass the exception class
 	 * @return the constructor to use
 	 * @see #setServiceLocatorExceptionClass
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java
index 9bbc3ad07d..2d94806085 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java
@@ -37,9 +37,9 @@ public interface SingletonBeanRegistry {
 	 * under the given bean name.
 	 * <p>The given instance is supposed to be fully initialized; the registry
 	 * will not perform any initialization callbacks (in particular, it won't
-	 * call InitializingBean's <code>afterPropertiesSet</code> method).
+	 * call InitializingBean's {@code afterPropertiesSet} method).
 	 * The given instance will not receive any destruction callbacks
-	 * (like DisposableBean's <code>destroy</code> method) either.
+	 * (like DisposableBean's {@code destroy} method) either.
 	 * <p>When running within a full BeanFactory: <b>Register a bean definition
 	 * instead of an existing instance if your bean is supposed to receive
 	 * initialization and/or destruction callbacks.</b>
@@ -65,23 +65,23 @@ public interface SingletonBeanRegistry {
 	 * <p><b>NOTE:</b> This lookup method is not aware of FactoryBean prefixes or aliases.
 	 * You need to resolve the canonical bean name first before obtaining the singleton instance.
 	 * @param beanName the name of the bean to look for
-	 * @return the registered singleton object, or <code>null</code> if none found
+	 * @return the registered singleton object, or {@code null} if none found
 	 * @see ConfigurableListableBeanFactory#getBeanDefinition
 	 */
 	Object getSingleton(String beanName);
 
 	/**
 	 * Check if this registry contains a singleton instance with the given name.
-	 * <p>Only checks already instantiated singletons; does not return <code>true</code>
+	 * <p>Only checks already instantiated singletons; does not return {@code true}
 	 * for singleton bean definitions which have not been instantiated yet.
 	 * <p>The main purpose of this method is to check manually registered singletons
 	 * (see {@link #registerSingleton}). Can also be used to check whether a
 	 * singleton defined by a bean definition has already been created.
 	 * <p>To check whether a bean factory contains a bean definition with a given name,
-	 * use ListableBeanFactory's <code>containsBeanDefinition</code>. Calling both
-	 * <code>containsBeanDefinition</code> and <code>containsSingleton</code> answers
+	 * use ListableBeanFactory's {@code containsBeanDefinition}. Calling both
+	 * {@code containsBeanDefinition} and {@code containsSingleton} answers
 	 * whether a specific bean factory contains a local bean instance with the given name.
-	 * <p>Use BeanFactory's <code>containsBean</code> for general checks whether the
+	 * <p>Use BeanFactory's {@code containsBean} for general checks whether the
 	 * factory knows about a bean with a given name (whether manually registered singleton
 	 * instance or created by bean definition), also checking ancestor factories.
 	 * <p><b>NOTE:</b> This lookup method is not aware of FactoryBean prefixes or aliases.
@@ -101,7 +101,7 @@ public interface SingletonBeanRegistry {
 	 * <p>The main purpose of this method is to check manually registered singletons
 	 * (see {@link #registerSingleton}). Can also be used to check which singletons
 	 * defined by a bean definition have already been created.
-	 * @return the list of names as a String array (never <code>null</code>)
+	 * @return the list of names as a String array (never {@code null})
 	 * @see #registerSingleton
 	 * @see org.springframework.beans.factory.support.BeanDefinitionRegistry#getBeanDefinitionNames
 	 * @see org.springframework.beans.factory.ListableBeanFactory#getBeanDefinitionNames
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java
index ff28d38b94..fe77b35478 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java
@@ -41,16 +41,16 @@ public interface SmartInstantiationAwareBeanPostProcessor extends InstantiationA
 	 * processor's {@link #postProcessBeforeInstantiation} callback.
 	 * @param beanClass the raw class of the bean
 	 * @param beanName the name of the bean
-	 * @return the type of the bean, or <code>null</code> if not predictable
+	 * @return the type of the bean, or {@code null} if not predictable
 	 * @throws org.springframework.beans.BeansException in case of errors
 	 */
 	Class<?> predictBeanType(Class<?> beanClass, String beanName) throws BeansException;
 
 	/**
 	 * Determine the candidate constructors to use for the given bean.
-	 * @param beanClass the raw class of the bean (never <code>null</code>)
+	 * @param beanClass the raw class of the bean (never {@code null})
 	 * @param beanName the name of the bean
-	 * @return the candidate constructors, or <code>null</code> if none specified
+	 * @return the candidate constructors, or {@code null} if none specified
 	 * @throws org.springframework.beans.BeansException in case of errors
 	 */
 	Constructor<?>[] determineCandidateConstructors(Class<?> beanClass, String beanName) throws BeansException;
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 01e7cb52e2..3f79e9ff5a 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
@@ -164,7 +164,7 @@ public class TypedStringValue implements BeanMetadataElement {
 
 
 	/**
-	 * Set the configuration source <code>Object</code> for this metadata element.
+	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
 	 */
 	public void setSource(Object source) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java
index dd81c9d9b9..d37d64258c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java
@@ -48,7 +48,7 @@ public class AliasDefinition implements BeanMetadataElement {
 	 * Create a new AliasDefinition.
 	 * @param beanName the canonical name of the bean
 	 * @param alias the alias registered for the bean
-	 * @param source the source object (may be <code>null</code>)
+	 * @param source the source object (may be {@code null})
 	 */
 	public AliasDefinition(String beanName, String alias, Object source) {
 		Assert.notNull(beanName, "Bean name must not be null");
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
index 83dcab0f14..ff5da625e4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
@@ -54,7 +54,7 @@ public class BeanComponentDefinition extends BeanDefinitionHolder implements Com
 	 * Create a new BeanComponentDefinition for the given bean.
 	 * @param beanDefinition the BeanDefinition
 	 * @param beanName the name of the bean
-	 * @param aliases alias names for the bean, or <code>null</code> if none
+	 * @param aliases alias names for the bean, or {@code null} if none
 	 */
 	public BeanComponentDefinition(BeanDefinition beanDefinition, String beanName, String[] aliases) {
 		super(beanDefinition, beanName, aliases);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java
index b20786a201..0f16202654 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java
@@ -33,18 +33,18 @@ import org.springframework.beans.factory.config.BeanReference;
  * applications it is important that there is some mechanism in place to tie the {@link BeanDefinition BeanDefinitions}
  * in the {@link org.springframework.beans.factory.BeanFactory} back to the configuration data in a way
  * that has concrete meaning to the end user. As such, {@link org.springframework.beans.factory.xml.NamespaceHandler}
- * implementations are able to publish events in the form of a <code>ComponentDefinition</code> for each
- * logical entity being configured. Third parties can then {@link org.springframework.beans.factory.parsing.ReaderEventListener subscribe to these events},
+ * implementations are able to publish events in the form of a {@code ComponentDefinition} for each
+ * logical entity being configured. Third parties can then {@link ReaderEventListener subscribe to these events},
  * allowing for a user-centric view of the bean metadata.
  *
- * <p>Each <code>ComponentDefinition</code> has a {@link #getSource source object} which is configuration-specific.
+ * <p>Each {@code ComponentDefinition} has a {@link #getSource source object} which is configuration-specific.
  * In the case of XML-based configuration this is typically the {@link org.w3c.dom.Node} which contains the user
  * supplied configuration information. In addition to this, each {@link BeanDefinition} enclosed in a
- * <code>ComponentDefinition</code> has its own {@link BeanDefinition#getSource() source object} which may point
+ * {@code ComponentDefinition} has its own {@link BeanDefinition#getSource() source object} which may point
  * to a different, more specific, set of configuration data. Beyond this, individual pieces of bean metadata such
  * as the {@link org.springframework.beans.PropertyValue PropertyValues} may also have a source object giving an
  * even greater level of detail. Source object extraction is handled through the
- * {@link org.springframework.beans.factory.parsing.SourceExtractor} which can be customized as required.
+ * {@link SourceExtractor} which can be customized as required.
  *
  * <p>Whilst direct access to important {@link BeanReference BeanReferences} is provided through
  * {@link #getBeanReferences}, tools may wish to inspect all {@link BeanDefinition BeanDefinitions} to gather
@@ -60,7 +60,7 @@ import org.springframework.beans.factory.config.BeanReference;
  * {@link BeanDefinition#getRole role identifier}. The role is essentially a hint to the tool as to how
  * important the configuration provider believes a {@link BeanDefinition} is to the end user. It is expected
  * that tools will <strong>not</strong> display all {@link BeanDefinition BeanDefinitions} for a given
- * <code>ComponentDefinition</code> choosing instead to filter based on the role. Tools may choose to make
+ * {@code ComponentDefinition} choosing instead to filter based on the role. Tools may choose to make
  * this filtering user configurable. Particular notice should be given to the
  * {@link BeanDefinition#ROLE_INFRASTRUCTURE INFRASTRUCTURE role identifier}. {@link BeanDefinition BeanDefinitions}
  * classified with this role are completely unimportant to the end user and are required only for
@@ -77,7 +77,7 @@ import org.springframework.beans.factory.config.BeanReference;
 public interface ComponentDefinition extends BeanMetadataElement {
 
 	/**
-	 * Get the user-visible name of this <code>ComponentDefinition</code>.
+	 * Get the user-visible name of this {@code ComponentDefinition}.
 	 * <p>This should link back directly to the corresponding configuration data
 	 * for this component in a given context.
 	 */
@@ -86,14 +86,14 @@ public interface ComponentDefinition extends BeanMetadataElement {
 	/**
 	 * Return a friendly description of the described component.
 	 * <p>Implementations are encouraged to return the same value from
-	 * <code>toString()</code>.
+	 * {@code toString()}.
 	 */
 	String getDescription();
 
 	/**
 	 * Return the {@link BeanDefinition BeanDefinitions} that were registered
-	 * to form this <code>ComponentDefinition</code>.
-	 * <p>It should be noted that a <code>ComponentDefinition</code> may well be related with
+	 * to form this {@code ComponentDefinition}.
+	 * <p>It should be noted that a {@code ComponentDefinition} may well be related with
 	 * other {@link BeanDefinition BeanDefinitions} via {@link BeanReference references},
 	 * however these are <strong>not</strong> included as they may be not available immediately.
 	 * Important {@link BeanReference BeanReferences} are available from {@link #getBeanReferences()}.
@@ -112,7 +112,7 @@ public interface ComponentDefinition extends BeanMetadataElement {
 
 	/**
 	 * Return the set of {@link BeanReference BeanReferences} that are considered
-	 * to be important to this <code>ComponentDefinition</code>.
+	 * to be important to this {@code ComponentDefinition}.
 	 * <p>Other {@link BeanReference BeanReferences} may exist within the associated
 	 * {@link BeanDefinition BeanDefinitions}, however these are not considered
 	 * to be needed for validation or for user visualization.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java
index 86540ef078..b5a99a8890 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java
@@ -41,9 +41,9 @@ public class ConstructorArgumentEntry implements ParseState.Entry {
 
 	/**
 	 * Creates a new instance of the {@link ConstructorArgumentEntry} class
-	 * representing a constructor argument at the supplied <code>index</code>.
+	 * representing a constructor argument at the supplied {@code index}.
 	 * @param index the index of the constructor argument
-	 * @throws IllegalArgumentException if the supplied <code>index</code>
+	 * @throws IllegalArgumentException if the supplied {@code index}
 	 * is less than zero
 	 */
 	public ConstructorArgumentEntry(int index) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
index 97ce2d3dde..4462ef760f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
@@ -41,7 +41,7 @@ public class FailFastProblemReporter implements ProblemReporter {
 
 	/**
 	 * Set the {@link Log logger} that is to be used to report warnings.
-	 * <p>If set to <code>null</code> then a default {@link Log logger} set to
+	 * <p>If set to {@code null} then a default {@link Log logger} set to
 	 * the name of the instance class will be used.
 	 * @param logger the {@link Log logger} that is to be used to report warnings
 	 */
@@ -69,7 +69,7 @@ public class FailFastProblemReporter implements ProblemReporter {
 	}
 
 	/**
-	 * Writes the supplied {@link Problem} to the {@link Log} at <code>WARN</code> level.
+	 * Writes the supplied {@link Problem} to the {@link Log} at {@code WARN} level.
 	 * @param problem the source of the warning
 	 */
 	public void warning(Problem problem) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java
index 4b7a834d08..e58a4276bb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java
@@ -47,7 +47,7 @@ public class ImportDefinition implements BeanMetadataElement {
 	/**
 	 * Create a new ImportDefinition.
 	 * @param importedResource the location of the imported resource
-	 * @param source the source object (may be <code>null</code>)
+	 * @param source the source object (may be {@code null})
 	 */
 	public ImportDefinition(String importedResource, Object source) {
 		this(importedResource, null, source);
@@ -56,7 +56,7 @@ public class ImportDefinition implements BeanMetadataElement {
 	/**
 	 * Create a new ImportDefinition.
 	 * @param importedResource the location of the imported resource
-	 * @param source the source object (may be <code>null</code>)
+	 * @param source the source object (may be {@code null})
 	 */
 	public ImportDefinition(String importedResource, Resource[] actualResources, Object source) {
 		Assert.notNull(importedResource, "Imported resource must not be null");
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java
index c5cbcbecbe..71a155efe4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
  * {@link #getSource() source} location might be 'The bean defined on
  * line 76 of beans.properties has an invalid Class'; another source might
  * be the actual DOM Element from a parsed XML {@link org.w3c.dom.Document};
- * or the source object might simply be <code>null</code>.
+ * or the source object might simply be {@code null}.
  *
  * @author Rob Harrop
  * @since 2.0
@@ -51,7 +51,7 @@ public class Location {
 	 * Create a new instance of the {@link Location} class.
 	 * @param resource the resource with which this location is associated
 	 * @param source the actual location within the associated resource
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 */
 	public Location(Resource resource, Object source) {
 		Assert.notNull(resource, "Resource must not be null");
@@ -69,7 +69,7 @@ public class Location {
 
 	/**
 	 * Get the actual location within the associated {@link #getResource() resource}
-	 * (may be <code>null</code>).
+	 * (may be {@code null}).
 	 * <p>See the {@link Location class level javadoc for this class} for examples
 	 * of what the actual type of the returned object may be.
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java
index d95cf1ff1c..6726bbac41 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java
@@ -19,7 +19,7 @@ package org.springframework.beans.factory.parsing;
 import org.springframework.core.io.Resource;
 
 /**
- * Simple implementation of {@link SourceExtractor} that returns <code>null</code>
+ * Simple implementation of {@link SourceExtractor} that returns {@code null}
  * as the source metadata.
  *
  * <p>This is the default implementation and prevents too much metadata from being
@@ -31,7 +31,7 @@ import org.springframework.core.io.Resource;
 public class NullSourceExtractor implements SourceExtractor {
 
 	/**
-	 * This implementation simply returns <code>null</code> for any input.
+	 * This implementation simply returns {@code null} for any input.
 	 */
 	public Object extractSource(Object sourceCandidate, Resource definitionResource) {
 		return null;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java
index 7ef3254da7..4f9882f293 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java
@@ -44,15 +44,15 @@ public final class ParseState {
 
 
 	/**
-	 * Create a new <code>ParseState</code> with an empty {@link Stack}.
+	 * Create a new {@code ParseState} with an empty {@link Stack}.
 	 */
 	public ParseState() {
 		this.state = new Stack();
 	}
 
 	/**
-	 * Create a new <code>ParseState</code> whose {@link Stack} is a {@link Object#clone clone}
-	 * of that of the passed in <code>ParseState</code>.
+	 * Create a new {@code ParseState} whose {@link Stack} is a {@link Object#clone clone}
+	 * of that of the passed in {@code ParseState}.
 	 */
 	private ParseState(ParseState other) {
 		this.state = (Stack) other.state.clone();
@@ -75,7 +75,7 @@ public final class ParseState {
 
 	/**
 	 * Return the {@link Entry} currently at the top of the {@link Stack} or
-	 * <code>null</code> if the {@link Stack} is empty.
+	 * {@code null} if the {@link Stack} is empty.
 	 */
 	public Entry peek() {
 		return (Entry) (this.state.empty() ? null : this.state.peek());
@@ -91,7 +91,7 @@ public final class ParseState {
 
 
 	/**
-	 * Returns a tree-style representation of the current <code>ParseState</code>.
+	 * Returns a tree-style representation of the current {@code ParseState}.
 	 */
 	@Override
 	public String toString() {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java
index 573244001d..f11e44e4f9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java
@@ -35,9 +35,9 @@ import org.springframework.core.io.Resource;
 public class PassThroughSourceExtractor implements SourceExtractor {
 
 	/**
-	 * Simply returns the supplied <code>sourceCandidate</code> as-is.
+	 * Simply returns the supplied {@code sourceCandidate} as-is.
 	 * @param sourceCandidate the source metadata
-	 * @return the supplied <code>sourceCandidate</code>
+	 * @return the supplied {@code sourceCandidate}
 	 */
 	public Object extractSource(Object sourceCandidate, Resource definingResource) {
 		return sourceCandidate;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java
index b895ad23ba..42f1bc82e0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java
@@ -61,8 +61,8 @@ public class Problem {
 
 	/**
 	 * Create a new instance of the {@link Problem} class.
-	 * @param message	a message detailing the problem
-	 * @param rootCause the underlying expection that caused the error (may be <code>null</code>)
+	 * @param message    a message detailing the problem
+	 * @param rootCause the underlying expection that caused the error (may be {@code null})
 	 * @param parseState the {@link ParseState} at the time of the error
 	 * @param location the location within a bean configuration source that triggered the error
 	 */
@@ -100,14 +100,14 @@ public class Problem {
 	}
 
 	/**
-	 * Get the {@link ParseState} at the time of the error (may be <code>null</code>).
+	 * Get the {@link ParseState} at the time of the error (may be {@code null}).
 	 */
 	public ParseState getParseState() {
 		return this.parseState;
 	}
 
 	/**
-	 * Get the underlying expection that caused the error (may be <code>null</code>).
+	 * Get the underlying expection that caused the error (may be {@code null}).
 	 */
 	public Throwable getRootCause() {
 		return this.rootCause;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java
index a9e1bedbe9..0bbbb4deee 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java
@@ -31,21 +31,21 @@ public interface ProblemReporter {
 	 * Called when a fatal error is encountered during the parsing process.
 	 * <p>Implementations must treat the given problem as fatal,
 	 * i.e. they have to eventually raise an exception.
-	 * @param problem the source of the error (never <code>null</code>)
+	 * @param problem the source of the error (never {@code null})
 	 */
 	void fatal(Problem problem);
 
 	/**
 	 * Called when an error is encountered during the parsing process.
 	 * <p>Implementations may choose to treat errors as fatal.
-	 * @param problem the source of the error (never <code>null</code>)
+	 * @param problem the source of the error (never {@code null})
 	 */
 	void error(Problem problem);
 
 	/**
 	 * Called when a warning is raised during the parsing process.
 	 * <p>Warnings are <strong>never</strong> considered to be fatal.
-	 * @param problem the source of the warning (never <code>null</code>)
+	 * @param problem the source of the warning (never {@code null})
 	 */
 	void warning(Problem problem);
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java
index 18875d3af3..6d602ea28a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java
@@ -32,7 +32,7 @@ public class PropertyEntry implements ParseState.Entry {
 	/**
 	 * Creates a new instance of the {@link PropertyEntry} class.
 	 * @param name the name of the JavaBean property represented by this instance
-	 * @throws IllegalArgumentException if the supplied <code>name</code> is <code>null</code>
+	 * @throws IllegalArgumentException if the supplied {@code name} is {@code null}
 	 * or consists wholly of whitespace
 	 */
 	public PropertyEntry(String name) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java
index 55988c3726..88c2bcf9f4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java
@@ -38,10 +38,10 @@ public interface SourceExtractor {
 	/**
 	 * Extract the source metadata from the candidate object supplied
 	 * by the configuration parser.
-	 * @param sourceCandidate the original source metadata (never <code>null</code>)
+	 * @param sourceCandidate the original source metadata (never {@code null})
 	 * @param definingResource the resource that defines the given source object
-	 * (may be <code>null</code>)
-	 * @return the source metadata object to store (may be <code>null</code>)
+	 * (may be {@code null})
+	 * @return the source metadata object to store (may be {@code null})
 	 */
 	Object extractSource(Object sourceCandidate, Resource definingResource);
 
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 7d06a13b08..92c74dde60 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
@@ -164,7 +164,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 
 	/**
 	 * Create a new AbstractAutowireCapableBeanFactory with the given parent.
-	 * @param parentBeanFactory parent bean factory, or <code>null</code> if none
+	 * @param parentBeanFactory parent bean factory, or {@code null} if none
 	 */
 	public AbstractAutowireCapableBeanFactory(BeanFactory parentBeanFactory) {
 		this();
@@ -467,13 +467,13 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 
 	/**
 	 * Actually create the specified bean. Pre-creation processing has already happened
-	 * at this point, e.g. checking <code>postProcessBeforeInstantiation</code> callbacks.
+	 * at this point, e.g. checking {@code postProcessBeforeInstantiation} callbacks.
 	 * <p>Differentiates between default bean instantiation, use of a
 	 * factory method, and autowiring a constructor.
 	 * @param beanName the name of the bean
 	 * @param mbd the merged bean definition for the bean
 	 * @param args arguments to use if creating a prototype using explicit arguments to a
-	 * static factory method. This parameter must be <code>null</code> except in this case.
+	 * static factory method. This parameter must be {@code null} except in this case.
 	 * @return a new instance of the bean
 	 * @throws BeanCreationException if the bean could not be created
 	 * @see #instantiateBean
@@ -606,8 +606,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	 * @param beanName the name of the bean (for error handling purposes)
 	 * @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</code> will never be exposed to application code)
-	 * @return the type for the bean if determinable, or <code>null</code> else
+	 * (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
 	 * @see #createBean
 	 */
 	protected Class getTypeForFactoryMethod(String beanName, RootBeanDefinition mbd, Class[] typesToMatch) {
@@ -668,7 +668,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	/**
 	 * This implementation attempts to query the FactoryBean's generic parameter metadata
 	 * if present to determine the object type. If not present, i.e. the FactoryBean is
-	 * declared as a raw type, checks the FactoryBean's <code>getObjectType</code> method
+	 * declared as a raw type, checks the FactoryBean's {@code getObjectType} method
 	 * on a plain instance of the FactoryBean, without bean properties applied yet.
 	 * If this doesn't return a type yet, a full creation of the FactoryBean is
 	 * used as fallback (through delegation to the superclass's implementation).
@@ -755,11 +755,11 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 
 	/**
 	 * Obtain a "shortcut" singleton FactoryBean instance to use for a
-	 * <code>getObjectType()</code> call, without full initialization
+	 * {@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</code> to indicate
+	 * @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) {
@@ -796,11 +796,11 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 
 	/**
 	 * Obtain a "shortcut" non-singleton FactoryBean instance to use for a
-	 * <code>getObjectType()</code> call, without full initialization
+	 * {@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</code> to indicate
+	 * @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) {
@@ -827,7 +827,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 
 	/**
 	 * Apply MergedBeanDefinitionPostProcessors to the specified bean definition,
-	 * invoking their <code>postProcessMergedBeanDefinition</code> methods.
+	 * invoking their {@code postProcessMergedBeanDefinition} methods.
 	 * @param mbd the merged bean definition for the bean
 	 * @param beanType the actual type of the managed bean instance
 	 * @param beanName the name of the bean
@@ -856,7 +856,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	 * before-instantiation shortcut for the specified bean.
 	 * @param beanName the name of the bean
 	 * @param mbd the bean definition for the bean
-	 * @return the shortcut-determined bean instance, or <code>null</code> if none
+	 * @return the shortcut-determined bean instance, or {@code null} if none
 	 */
 	protected Object resolveBeforeInstantiation(String beanName, RootBeanDefinition mbd) {
 		Object bean = null;
@@ -875,13 +875,13 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 
 	/**
 	 * Apply InstantiationAwareBeanPostProcessors to the specified bean definition
-	 * (by class and name), invoking their <code>postProcessBeforeInstantiation</code> methods.
+	 * (by class and name), invoking their {@code postProcessBeforeInstantiation} methods.
 	 * <p>Any returned object will be used as the bean instead of actually instantiating
-	 * the target bean. A <code>null</code> return value from the post-processor will
+	 * the target bean. A {@code null} return value from the post-processor will
 	 * result in the target bean being instantiated.
 	 * @param beanClass the class of the bean to be instantiated
 	 * @param beanName the name of the bean
-	 * @return the bean object to use instead of a default instance of the target bean, or <code>null</code>
+	 * @return the bean object to use instead of a default instance of the target bean, or {@code null}
 	 * @throws BeansException if any post-processing failed
 	 * @see InstantiationAwareBeanPostProcessor#postProcessBeforeInstantiation
 	 */
@@ -962,7 +962,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	 * {@link SmartInstantiationAwareBeanPostProcessor SmartInstantiationAwareBeanPostProcessors}.
 	 * @param beanClass the raw class of the bean
 	 * @param beanName the name of the bean
-	 * @return the candidate constructors, or <code>null</code> if none specified
+	 * @return the candidate constructors, or {@code null} if none specified
 	 * @throws org.springframework.beans.BeansException in case of errors
 	 * @see org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor#determineCandidateConstructors
 	 */
@@ -1019,7 +1019,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	 * @param beanName the name of the bean
 	 * @param mbd the bean definition for the bean
 	 * @param explicitArgs argument values passed in programmatically via the getBean method,
-	 * or <code>null</code> if none (-> use constructor argument values from bean definition)
+	 * or {@code null} if none (-> use constructor argument values from bean definition)
 	 * @return BeanWrapper for the new instance
 	 * @see #getBean(String, Object[])
 	 */
@@ -1040,7 +1040,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	 * @param mbd the bean definition for the bean
 	 * @param ctors the chosen candidate constructors
 	 * @param explicitArgs argument values passed in programmatically via the getBean method,
-	 * or <code>null</code> if none (-> use constructor argument values from bean definition)
+	 * or {@code null} if none (-> use constructor argument values from bean definition)
 	 * @return BeanWrapper for the new instance
 	 */
 	protected BeanWrapper autowireConstructor(
@@ -1452,7 +1452,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	 * @param beanName the bean name in the factory (for debugging purposes)
 	 * @param bean the new bean instance we may need to initialize
 	 * @param mbd the bean definition that the bean was created with
-	 * (can also be <code>null</code>, if given an existing bean instance)
+	 * (can also be {@code null}, if given an existing bean instance)
 	 * @return the initialized bean instance (potentially wrapped)
 	 * @see BeanNameAware
 	 * @see BeanClassLoaderAware
@@ -1516,7 +1516,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	 * @param beanName the bean name in the factory (for debugging purposes)
 	 * @param bean the new bean instance we may need to initialize
 	 * @param mbd the merged bean definition that the bean was created with
-	 * (can also be <code>null</code>, if given an existing bean instance)
+	 * (can also be {@code null}, if given an existing bean instance)
 	 * @throws Throwable if thrown by init methods or by the invocation process
 	 * @see #invokeCustomInitMethod
 	 */
@@ -1619,7 +1619,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 
 
 	/**
-	 * Applies the <code>postProcessAfterInitialization</code> callback of all
+	 * Applies the {@code postProcessAfterInitialization} callback of all
 	 * registered BeanPostProcessors, giving them a chance to post-process the
 	 * object obtained from FactoryBeans (for example, to auto-proxy them).
 	 * @see #applyBeanPostProcessorsAfterInitialization
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 652d45afb2..db41eb0002 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
@@ -277,13 +277,13 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	 * definition (presumably the child).
 	 * <ul>
 	 * <li>Will override beanClass if specified in the given bean definition.
-	 * <li>Will always take <code>abstract</code>, <code>scope</code>,
-	 * <code>lazyInit</code>, <code>autowireMode</code>, <code>dependencyCheck</code>,
-	 * and <code>dependsOn</code> from the given bean definition.
-	 * <li>Will add <code>constructorArgumentValues</code>, <code>propertyValues</code>,
-	 * <code>methodOverrides</code> from the given bean definition to existing ones.
-	 * <li>Will override <code>factoryBeanName</code>, <code>factoryMethodName</code>,
-	 * <code>initMethodName</code>, and <code>destroyMethodName</code> if specified
+	 * <li>Will always take {@code abstract}, {@code scope},
+	 * {@code lazyInit}, {@code autowireMode}, {@code dependencyCheck},
+	 * and {@code dependsOn} from the given bean definition.
+	 * <li>Will add {@code constructorArgumentValues}, {@code propertyValues},
+	 * {@code methodOverrides} from the given bean definition to existing ones.
+	 * <li>Will override {@code factoryBeanName}, {@code factoryMethodName},
+	 * {@code initMethodName}, and {@code destroyMethodName} if specified
 	 * in the given bean definition.
 	 * </ul>
 	 */
@@ -369,7 +369,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 
 	/**
 	 * Return the class of the wrapped bean, if already resolved.
-	 * @return the bean class, or <code>null</code> if none defined
+	 * @return the bean class, or {@code null} if none defined
 	 * @throws IllegalStateException if the bean definition does not define a bean class,
 	 * or a specified bean class name has not been resolved into an actual Class
 	 */
@@ -499,7 +499,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 
 	/**
 	 * Set whether this bean should be lazily initialized.
-	 * <p>If <code>false</code>, the bean will get instantiated on startup by bean
+	 * <p>If {@code false}, the bean will get instantiated on startup by bean
 	 * factories that perform eager initialization of singletons.
 	 */
 	public void setLazyInit(boolean lazyInit) {
@@ -696,7 +696,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	}
 
 	/**
-	 * Specify whether to resolve constructors in lenient mode (<code>true</code>,
+	 * 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,
 	 * whereas lenient mode would use the one with the 'closest' type matches).
@@ -721,7 +721,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	}
 
 	/**
-	 * Return constructor argument values for this bean (never <code>null</code>).
+	 * Return constructor argument values for this bean (never {@code null}).
 	 */
 	public ConstructorArgumentValues getConstructorArgumentValues() {
 		return this.constructorArgumentValues;
@@ -742,7 +742,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	}
 
 	/**
-	 * Return property values for this bean (never <code>null</code>).
+	 * Return property values for this bean (never {@code null}).
 	 */
 	public MutablePropertyValues getPropertyValues() {
 		return this.propertyValues;
@@ -782,7 +782,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	}
 
 	/**
-	 * Set the name of the initializer method. The default is <code>null</code>
+	 * Set the name of the initializer method. The default is {@code null}
 	 * in which case there is no initializer method.
 	 */
 	public void setInitMethodName(String initMethodName) {
@@ -798,7 +798,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 
 	/**
 	 * Specify whether or not the configured init method is the default.
-	 * Default value is <code>false</code>.
+	 * Default value is {@code false}.
 	 * @see #setInitMethodName
 	 */
 	public void setEnforceInitMethod(boolean enforceInitMethod) {
@@ -814,7 +814,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	}
 
 	/**
-	 * Set the name of the destroy method. The default is <code>null</code>
+	 * Set the name of the destroy method. The default is {@code null}
 	 * in which case there is no destroy method.
 	 */
 	public void setDestroyMethodName(String destroyMethodName) {
@@ -830,7 +830,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 
 	/**
 	 * Specify whether or not the configured destroy method is the default.
-	 * Default value is <code>false</code>.
+	 * Default value is {@code false}.
 	 * @see #setDestroyMethodName
 	 */
 	public void setEnforceDestroyMethod(boolean enforceDestroyMethod) {
@@ -849,7 +849,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	/**
 	 * Set whether this bean definition is 'synthetic', that is, not defined
 	 * by the application itself (for example, an infrastructure bean such
-	 * as a helper for auto-proxying, created through <code>&ltaop:config&gt;</code>).
+	 * as a helper for auto-proxying, created through {@code &ltaop:config&gt;}).
 	 */
 	public void setSynthetic(boolean synthetic) {
 		this.synthetic = synthetic;
@@ -864,14 +864,14 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	}
 
 	/**
-	 * Set the role hint for this <code>BeanDefinition</code>.
+	 * Set the role hint for this {@code BeanDefinition}.
 	 */
 	public void setRole(int role) {
 		this.role = role;
 	}
 
 	/**
-	 * Return the role hint for this <code>BeanDefinition</code>.
+	 * Return the role hint for this {@code BeanDefinition}.
 	 */
 	public int getRole() {
 		return this.role;
@@ -981,9 +981,9 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 
 
 	/**
-	 * Public declaration of Object's <code>clone()</code> method.
+	 * Public declaration of Object's {@code clone()} method.
 	 * Delegates to {@link #cloneBeanDefinition()}.
-	 * @see java.lang.Object#clone()
+	 * @see Object#clone()
 	 */
 	@Override
 	public Object clone() {
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 d0f524ed7d..615839c213 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
@@ -112,7 +112,7 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
 	 * will be capable of resolving resource patterns to Resource arrays.
 	 * <p>Default is PathMatchingResourcePatternResolver, also capable of
 	 * resource pattern resolving through the ResourcePatternResolver interface.
-	 * <p>Setting this to <code>null</code> suggests that absolute resource loading
+	 * <p>Setting this to {@code null} suggests that absolute resource loading
 	 * is not available for this bean definition reader.
 	 * @see org.springframework.core.io.support.ResourcePatternResolver
 	 * @see org.springframework.core.io.support.PathMatchingResourcePatternResolver
@@ -127,10 +127,10 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
 
 	/**
 	 * Set the ClassLoader to use for bean classes.
-	 * <p>Default is <code>null</code>, which suggests to not load bean classes
+	 * <p>Default is {@code null}, which suggests to not load bean classes
 	 * eagerly but rather to just register bean definitions with class names,
 	 * with the corresponding Classes to be resolved later (or never).
-	 * @see java.lang.Thread#getContextClassLoader()
+	 * @see Thread#getContextClassLoader()
 	 */
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
@@ -187,7 +187,7 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
 	 * @param location the resource location, to be loaded with the ResourceLoader
 	 * (or ResourcePatternResolver) of this bean definition reader
 	 * @param actualResources a Set to be filled with the actual Resource objects
-	 * that have been resolved during the loading process. May be <code>null</code>
+	 * that have been resolved during the loading process. May be {@code null}
 	 * to indicate that the caller is not interested in those Resource objects.
 	 * @return the number of bean definitions found
 	 * @throws BeanDefinitionStoreException in case of loading or parsing errors
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 b5699c2fb8..8db728ae57 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
@@ -178,7 +178,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 
 	/**
 	 * Create a new AbstractBeanFactory with the given parent.
-	 * @param parentBeanFactory parent bean factory, or <code>null</code> if none
+	 * @param parentBeanFactory parent bean factory, or {@code null} if none
 	 * @see #getBean
 	 */
 	public AbstractBeanFactory(BeanFactory parentBeanFactory) {
@@ -718,7 +718,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 
 	/**
 	 * Return the custom TypeConverter to use, if any.
-	 * @return the custom TypeConverter, or <code>null</code> if none specified
+	 * @return the custom TypeConverter, or {@code null} if none specified
 	 */
 	protected TypeConverter getCustomTypeConverter() {
 		return this.typeConverter;
@@ -858,7 +858,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	/**
 	 * Return a 'merged' BeanDefinition for the given bean name,
 	 * merging a child bean definition with its parent if necessary.
-	 * <p>This <code>getMergedBeanDefinition</code> considers bean definition
+	 * <p>This {@code getMergedBeanDefinition} considers bean definition
 	 * in ancestors as well.
 	 * @param name the name of the bean to retrieve the merged definition for
 	 * (may be an alias)
@@ -1116,7 +1116,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	 * @param beanName the name of the bean definition
 	 * @param bd the original bean definition (Root/ChildBeanDefinition)
 	 * @param containingBd the containing bean definition in case of inner bean,
-	 * or <code>null</code> in case of a top-level bean
+	 * or {@code null} in case of a top-level bean
 	 * @return a (potentially merged) RootBeanDefinition for the given bean
 	 * @throws BeanDefinitionStoreException in case of an invalid bean definition
 	 */
@@ -1234,8 +1234,8 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	 * @param mbd the merged bean definition to determine the class for
 	 * @param beanName the name of the bean (for error handling purposes)
 	 * @param typesToMatch the types to match in case of internal type matching purposes
-	 * (also signals that the returned <code>Class</code> will never be exposed to application code)
-	 * @return the resolved bean class (or <code>null</code> if none)
+	 * (also signals that the returned {@code Class} will never be exposed to application code)
+	 * @return the resolved bean class (or {@code null} if none)
 	 * @throws CannotLoadBeanClassException if we failed to load the class
 	 */
 	protected Class<?> resolveBeanClass(final RootBeanDefinition mbd, String beanName, final Class<?>... typesToMatch)
@@ -1313,8 +1313,8 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	 * @param beanName the name of the bean
 	 * @param mbd the merged bean definition to determine the type for
 	 * @param typesToMatch the types to match in case of internal type matching purposes
-	 * (also signals that the returned <code>Class</code> will never be exposed to application code)
-	 * @return the type of the bean, or <code>null</code> if not predictable
+	 * (also signals that the returned {@code Class} will never be exposed to application code)
+	 * @return the type of the bean, or {@code null} if not predictable
 	 */
 	protected Class<?> predictBeanType(String beanName, RootBeanDefinition mbd, Class<?>... typesToMatch) {
 		if (mbd.getFactoryMethodName() != null) {
@@ -1337,15 +1337,15 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	/**
 	 * Determine the bean type for the given FactoryBean definition, as far as possible.
 	 * Only called if there is no singleton instance registered for the target bean already.
-	 * <p>The default implementation creates the FactoryBean via <code>getBean</code>
-	 * to call its <code>getObjectType</code> method. Subclasses are encouraged to optimize
+	 * <p>The default implementation creates the FactoryBean via {@code getBean}
+	 * to call its {@code getObjectType} method. Subclasses are encouraged to optimize
 	 * this, typically by just instantiating the FactoryBean but not populating it yet,
-	 * trying whether its <code>getObjectType</code> method already returns a type.
+	 * trying whether its {@code getObjectType} method already returns a type.
 	 * If no type found, a full FactoryBean creation as performed by this implementation
 	 * should be used as fallback.
 	 * @param beanName the name of the bean
 	 * @param mbd the merged bean definition for the bean
-	 * @return the type for the bean if determinable, or <code>null</code> else
+	 * @return the type for the bean if determinable, or {@code null} else
 	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
 	 * @see #getBean(String)
 	 */
@@ -1381,7 +1381,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	 * Determine whether the specified bean is eligible for having
 	 * its bean definition metadata cached.
 	 * @param beanName the name of the bean
-	 * @return <code>true</code> if the bean's metadata may be cached
+	 * @return {@code true} if the bean's metadata may be cached
 	 * at this point already
 	 */
 	protected boolean isBeanEligibleForMetadataCaching(String beanName) {
@@ -1392,7 +1392,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	 * Remove the singleton instance (if any) for the given bean name,
 	 * but only if it hasn't been used for other purposes than type checking.
 	 * @param beanName the name of the bean
-	 * @return <code>true</code> if actually removed, <code>false</code> otherwise
+	 * @return {@code true} if actually removed, {@code false} otherwise
 	 */
 	protected boolean removeSingletonIfCreatedForTypeCheckOnly(String beanName) {
 		if (!this.alreadyCreated.containsKey(beanName)) {
@@ -1512,7 +1512,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	/**
 	 * Check if this bean factory contains a bean definition with the given name.
 	 * Does not consider any hierarchy this factory may participate in.
-	 * Invoked by <code>containsBean</code> when no cached singleton instance is found.
+	 * Invoked by {@code containsBean} when no cached singleton instance is found.
 	 * <p>Depending on the nature of the concrete bean factory implementation,
 	 * this operation might be expensive (for example, because of directory lookups
 	 * in external registries). However, for listable bean factories, this usually
@@ -1537,7 +1537,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	 * public interface there. The same implementation can serve for both this
 	 * template method and the public interface method in that case.
 	 * @param beanName the name of the bean to find a definition for
-	 * @return the BeanDefinition for this prototype name (never <code>null</code>)
+	 * @return the BeanDefinition for this prototype name (never {@code null})
 	 * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
 	 * if the bean definition cannot be resolved
 	 * @throws BeansException in case of errors
@@ -1557,7 +1557,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	 * @param beanName the name of the bean
 	 * @param mbd the merged bean definition for the bean
 	 * @param args arguments to use if creating a prototype using explicit arguments to a
-	 * static factory method. This parameter must be <code>null</code> except in this case.
+	 * static factory method. This parameter must be {@code null} except in this case.
 	 * @return a new instance of the bean
 	 * @throws BeanCreationException if the bean could not be created
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java
index 58c560c917..6723fed6c6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java
@@ -59,7 +59,7 @@ public class AutowireCandidateQualifier extends BeanMetadataAttributeAccessor {
 
 	/**
 	 * Construct a qualifier to match against an annotation of the
-	 * given type whose <code>value</code> attribute also matches
+	 * given type whose {@code value} attribute also matches
 	 * the specified value.
 	 * @param type the annotation type
 	 * @param value the annotation value to match
@@ -70,7 +70,7 @@ public class AutowireCandidateQualifier extends BeanMetadataAttributeAccessor {
 
 	/**
 	 * Construct a qualifier to match against an annotation of the
-	 * given type name whose <code>value</code> attribute also matches
+	 * given type name whose {@code value} attribute also matches
 	 * the specified value.
 	 * <p>The type name may match the fully-qualified class name of
 	 * the annotation or the short class name (without the package).
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java
index 0f30540e67..3906928b5f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java
@@ -42,7 +42,7 @@ public interface AutowireCandidateResolver {
 	 * Determine whether a default value is suggested for the given dependency.
 	 * @param descriptor the descriptor for the target method parameter or field
 	 * @return the value suggested (typically an expression String),
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 * @since 3.0
 	 */
 	Object getSuggestedValue(DependencyDescriptor descriptor);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
index 3b338d5b27..2b354882df 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
@@ -33,7 +33,7 @@ import org.springframework.util.ObjectUtils;
 public class BeanDefinitionBuilder  {
 
 	/**
-	 * Create a new <code>BeanDefinitionBuilder</code> used to construct a {@link GenericBeanDefinition}.
+	 * Create a new {@code BeanDefinitionBuilder} used to construct a {@link GenericBeanDefinition}.
 	 */
 	public static BeanDefinitionBuilder genericBeanDefinition() {
 		BeanDefinitionBuilder builder = new BeanDefinitionBuilder();
@@ -42,8 +42,8 @@ public class BeanDefinitionBuilder  {
 	}
 
 	/**
-	 * Create a new <code>BeanDefinitionBuilder</code> used to construct a {@link GenericBeanDefinition}.
-	 * @param beanClass the <code>Class</code> of the bean that the definition is being created for
+	 * Create a new {@code BeanDefinitionBuilder} used to construct a {@link GenericBeanDefinition}.
+	 * @param beanClass the {@code Class} of the bean that the definition is being created for
 	 */
 	public static BeanDefinitionBuilder genericBeanDefinition(Class beanClass) {
 		BeanDefinitionBuilder builder = new BeanDefinitionBuilder();
@@ -53,7 +53,7 @@ public class BeanDefinitionBuilder  {
 	}
 
 	/**
-	 * Create a new <code>BeanDefinitionBuilder</code> used to construct a {@link GenericBeanDefinition}.
+	 * Create a new {@code BeanDefinitionBuilder} used to construct a {@link GenericBeanDefinition}.
 	 * @param beanClassName the class name for the bean that the definition is being created for
 	 */
 	public static BeanDefinitionBuilder genericBeanDefinition(String beanClassName) {
@@ -64,16 +64,16 @@ public class BeanDefinitionBuilder  {
 	}
 
 	/**
-	 * Create a new <code>BeanDefinitionBuilder</code> used to construct a {@link RootBeanDefinition}.
-	 * @param beanClass the <code>Class</code> of the bean that the definition is being created for
+	 * Create a new {@code BeanDefinitionBuilder} used to construct a {@link RootBeanDefinition}.
+	 * @param beanClass the {@code Class} of the bean that the definition is being created for
 	 */
 	public static BeanDefinitionBuilder rootBeanDefinition(Class beanClass) {
 		return rootBeanDefinition(beanClass, null);
 	}
 
 	/**
-	 * Create a new <code>BeanDefinitionBuilder</code> used to construct a {@link RootBeanDefinition}.
-	 * @param beanClass the <code>Class</code> of the bean that the definition is being created for
+	 * Create a new {@code BeanDefinitionBuilder} used to construct a {@link RootBeanDefinition}.
+	 * @param beanClass the {@code Class} of the bean that the definition is being created for
 	 * @param factoryMethodName the name of the method to use to construct the bean instance
 	 */
 	public static BeanDefinitionBuilder rootBeanDefinition(Class beanClass, String factoryMethodName) {
@@ -85,7 +85,7 @@ public class BeanDefinitionBuilder  {
 	}
 
 	/**
-	 * Create a new <code>BeanDefinitionBuilder</code> used to construct a {@link RootBeanDefinition}.
+	 * Create a new {@code BeanDefinitionBuilder} used to construct a {@link RootBeanDefinition}.
 	 * @param beanClassName the class name for the bean that the definition is being created for
 	 */
 	public static BeanDefinitionBuilder rootBeanDefinition(String beanClassName) {
@@ -93,7 +93,7 @@ public class BeanDefinitionBuilder  {
 	}
 
 	/**
-	 * Create a new <code>BeanDefinitionBuilder</code> used to construct a {@link RootBeanDefinition}.
+	 * Create a new {@code BeanDefinitionBuilder} used to construct a {@link RootBeanDefinition}.
 	 * @param beanClassName the class name for the bean that the definition is being created for
 	 * @param factoryMethodName the name of the method to use to construct the bean instance
 	 */
@@ -106,7 +106,7 @@ public class BeanDefinitionBuilder  {
 	}
 
 	/**
-	 * Create a new <code>BeanDefinitionBuilder</code> used to construct a {@link ChildBeanDefinition}.
+	 * Create a new {@code BeanDefinitionBuilder} used to construct a {@link ChildBeanDefinition}.
 	 * @param parentName the name of the parent bean
 	 */
 	public static BeanDefinitionBuilder childBeanDefinition(String parentName) {
@@ -117,7 +117,7 @@ public class BeanDefinitionBuilder  {
 
 
 	/**
-	 * The <code>BeanDefinition</code> instance we are creating.
+	 * The {@code BeanDefinition} instance we are creating.
 	 */
 	private AbstractBeanDefinition beanDefinition;
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java
index 00d5c0bbc0..542f1d5b62 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java
@@ -19,7 +19,7 @@ package org.springframework.beans.factory.support;
 import org.springframework.util.StringUtils;
 
 /**
- * A simple holder for <code>BeanDefinition</code> property defaults.
+ * A simple holder for {@code BeanDefinition} property defaults.
  *
  * @author Mark Fisher
  * @since 2.5
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 e9ff9c9abe..813e8d4b6f 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
@@ -46,27 +46,27 @@ 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)</code> 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();
 
 	/**
 	 * Return the class loader to use for bean classes.
-	 * <p><code>null</code> suggests to not load bean classes eagerly
+	 * <p>{@code null} suggests to not load bean classes eagerly
 	 * but rather to just register bean definitions with class names,
 	 * with the corresponding Classes to be resolved later (or never).
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
index 1d80a290cf..4a13bc1b2d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
@@ -49,7 +49,7 @@ public class BeanDefinitionReaderUtils {
 	 * @param parentName the name of the parent bean, if any
 	 * @param className the name of the bean class, if any
 	 * @param classLoader the ClassLoader to use for loading bean classes
-	 * (can be <code>null</code> to just register bean classes by name)
+	 * (can be {@code null} to just register bean classes by name)
 	 * @return the bean definition
 	 * @throws ClassNotFoundException if the bean class could not be loaded
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
index 23191913de..fd50469024 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
@@ -71,7 +71,7 @@ public interface BeanDefinitionRegistry extends AliasRegistry {
 	/**
 	 * Return the BeanDefinition for the given bean name.
 	 * @param beanName name of the bean to find a definition for
-	 * @return the BeanDefinition for the given name (never <code>null</code>)
+	 * @return the BeanDefinition for the given name (never {@code null})
 	 * @throws NoSuchBeanDefinitionException if there is no such bean definition
 	 */
 	BeanDefinition getBeanDefinition(String beanName) throws NoSuchBeanDefinitionException;
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 83bc48f20b..4ee6d218fa 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
@@ -94,7 +94,7 @@ class BeanDefinitionValueResolver {
 	 * Collections that will need to be resolved.
 	 * <li>A ManagedMap. In this case the value may be a RuntimeBeanReference
 	 * or Collection that will need to be resolved.
-	 * <li>An ordinary object or <code>null</code>, in which case it's left alone.
+	 * <li>An ordinary object or {@code null}, in which case it's left alone.
 	 * @param argName the name of the argument that the value is defined for
 	 * @param value the value object to resolve
 	 * @return the resolved object
@@ -232,7 +232,7 @@ class BeanDefinitionValueResolver {
 	/**
 	 * Resolve the target type in the given TypedStringValue.
 	 * @param value the TypedStringValue to resolve
-	 * @return the resolved target type (or <code>null</code> if none specified)
+	 * @return the resolved target type (or {@code null} if none specified)
 	 * @throws ClassNotFoundException if the specified type cannot be resolved
 	 * @see TypedStringValue#resolveTargetType
 	 */
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 ce25df0711..dc601c3bd4 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
@@ -98,10 +98,10 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 		/**
 		 * Create a new instance of a dynamically generated subclasses implementing the
 		 * required lookups.
-		 * @param ctor constructor to use. If this is <code>null</code>, use the
+		 * @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</code>.
+		 * Ignored if the ctor parameter is {@code null}.
 		 * @return new instance of the dynamically generated class
 		 */
 		public Object instantiate(Constructor ctor, Object[] args) {
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 a14e5b2b4d..da0103b654 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
@@ -97,9 +97,9 @@ class ConstructorResolver {
 	 * dependency resolution.
 	 * @param beanName the name of the bean
 	 * @param mbd the merged bean definition for the bean
-	 * @param chosenCtors chosen candidate constructors (or <code>null</code> if none)
+	 * @param chosenCtors chosen candidate constructors (or {@code null} if none)
 	 * @param explicitArgs argument values passed in programmatically via the getBean method,
-	 * or <code>null</code> if none (-> use constructor argument values from bean definition)
+	 * or {@code null} if none (-> use constructor argument values from bean definition)
 	 * @return a BeanWrapper for the new instance
 	 */
 	public BeanWrapper autowireConstructor(
@@ -333,7 +333,7 @@ class ConstructorResolver {
 	 * @param beanName the name of the bean
 	 * @param mbd the merged bean definition for the bean
 	 * @param explicitArgs argument values passed in programmatically via the getBean
-	 * method, or <code>null</code> if none (-> use constructor argument values from bean definition)
+	 * 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) {
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 306ffa03f5..ced19e9326 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
@@ -228,7 +228,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	}
 
 	/**
-	 * Return the autowire candidate resolver for this BeanFactory (never <code>null</code>).
+	 * Return the autowire candidate resolver for this BeanFactory (never {@code null}).
 	 */
 	public AutowireCandidateResolver getAutowireCandidateResolver() {
 		return this.autowireCandidateResolver;
@@ -454,7 +454,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	}
 
 	/**
-	 * Find a {@link Annotation} of <code>annotationType</code> on the specified
+	 * Find a {@link Annotation} of {@code annotationType} on the specified
 	 * bean, traversing its interfaces and super classes if no annotation can be
 	 * 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).
@@ -847,7 +847,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	 * (may be an array component type or collection element type)
 	 * @param descriptor the descriptor of the dependency to resolve
 	 * @return a Map of candidate names and candidate instances that match
-	 * the required type (never <code>null</code>)
+	 * the required type (never {@code null})
 	 * @throws BeansException in case of errors
 	 * @see #autowireByType
 	 * @see #autowireConstructor
@@ -881,7 +881,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	 * @param candidateBeans a Map of candidate names and candidate instances
 	 * that match the required type, as returned by {@link #findAutowireCandidates}
 	 * @param descriptor the target dependency to match against
-	 * @return the name of the primary candidate, or <code>null</code> if none found
+	 * @return the name of the primary candidate, or {@code null} if none found
 	 */
 	protected String determinePrimaryCandidate(Map<String, Object> candidateBeans, DependencyDescriptor descriptor) {
 		String primaryBeanName = null;
@@ -1056,7 +1056,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 
 
 	/**
-	 * Separate inner class for avoiding a hard dependency on the <code>javax.inject</code> API.
+	 * Separate inner class for avoiding a hard dependency on the {@code javax.inject} API.
 	 */
 	private class DependencyProviderFactory {
 
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 64346bd9f2..cbf7c872ff 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
@@ -173,7 +173,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 	 * reference to a currently created singleton (resolving a circular reference).
 	 * @param beanName the name of the bean to look for
 	 * @param allowEarlyReference whether early references should be created or not
-	 * @return the registered singleton object, or <code>null</code> if none found
+	 * @return the registered singleton object, or {@code null} if none found
 	 */
 	protected Object getSingleton(String beanName, boolean allowEarlyReference) {
 		Object singletonObject = this.singletonObjects.get(beanName);
@@ -469,7 +469,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 	}
 
 	/**
-	 * Destroy the given bean. Delegates to <code>destroyBean</code>
+	 * Destroy the given bean. Delegates to {@code destroyBean}
 	 * if a corresponding disposable bean instance is found.
 	 * @param beanName the name of the bean
 	 * @see #destroyBean
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 d493bc80d0..990438597f 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
@@ -94,7 +94,7 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 
 	/**
 	 * Create a new DisposableBeanAdapter for the given bean.
-	 * @param bean the bean instance (never <code>null</code>)
+	 * @param bean the bean instance (never {@code null})
 	 * @param beanName the name of the bean
 	 * @param beanDefinition the merged bean definition
 	 * @param postProcessors the List of BeanPostProcessors
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 37faa4357d..71a22243f7 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
@@ -50,7 +50,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
 	 * Determine the type for the given FactoryBean.
 	 * @param factoryBean the FactoryBean instance to check
 	 * @return the FactoryBean's object type,
-	 * or <code>null</code> if the type cannot be determined yet
+	 * or {@code null} if the type cannot be determined yet
 	 */
 	protected Class getTypeForFactoryBean(final FactoryBean factoryBean) {
 		try {
@@ -78,7 +78,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
 	 * in cached form. Quick check for minimal synchronization.
 	 * @param beanName the name of the bean
 	 * @return the object obtained from the FactoryBean,
-	 * or <code>null</code> if not available
+	 * or {@code null} if not available
 	 */
 	protected Object getCachedObjectForFactoryBean(String beanName) {
 		Object object = this.factoryBeanObjectCache.get(beanName);
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 84dc678991..9ebb74b632 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
@@ -24,10 +24,10 @@ import org.springframework.beans.factory.config.BeanDefinition;
  * constructor argument values and property values. Additionally, deriving from a
  * parent bean definition can be flexibly configured through the "parentName" property.
  *
- * <p>In general, use this <code>GenericBeanDefinition</code> class for the purpose of
+ * <p>In general, use this {@code GenericBeanDefinition} class for the purpose of
  * registering user-visible bean definitions (which a post-processor might operate on,
- * potentially even reconfiguring the parent name). Use <code>RootBeanDefinition</code> /
- * <code>ChildBeanDefinition</code> where parent/child relationships happen to be pre-determined.
+ * potentially even reconfiguring the parent name). Use {@code RootBeanDefinition} /
+ * {@code ChildBeanDefinition} where parent/child relationships happen to be pre-determined.
  *
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java
index eed3665757..6be1f2399c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java
@@ -37,7 +37,7 @@ public interface InstantiationStrategy {
 	 * Return an instance of the bean with the given name in this factory.
 	 * @param beanDefinition the bean definition
 	 * @param beanName name of the bean when it's created in this context.
-	 * The name can be <code>null</code> if we're autowiring a bean that
+	 * The name can be {@code null} if we're autowiring a bean that
 	 * doesn't belong to the factory.
 	 * @param owner owning BeanFactory
 	 * @return a bean instance for this bean definition
@@ -51,7 +51,7 @@ public interface InstantiationStrategy {
 	 * creating it via the given constructor.
 	 * @param beanDefinition the bean definition
 	 * @param beanName name of the bean when it's created in this context.
-	 * The name can be <code>null</code> if we're autowiring a bean
+	 * The name can be {@code null} if we're autowiring a bean
 	 * that doesn't belong to the factory.
 	 * @param owner owning BeanFactory
 	 * @param ctor the constructor to use
@@ -67,11 +67,11 @@ public interface InstantiationStrategy {
 	 * creating it via the given factory method.
 	 * @param beanDefinition bean definition
 	 * @param beanName name of the bean when it's created in this context.
-	 * The name can be <code>null</code> if we're autowiring a bean
+	 * The name can be {@code null} if we're autowiring a bean
 	 * that doesn't belong to the factory.
 	 * @param owner owning BeanFactory
 	 * @param factoryBean the factory bean instance to call the factory method on,
-	 * or <code>null</code> in case of a static factory method
+	 * or {@code null} in case of a static factory method
 	 * @param factoryMethod the factory method to use
 	 * @param args the factory method arguments to apply
 	 * @return a bean instance for this bean definition
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
index 682e2a9548..353538c991 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
@@ -49,7 +49,7 @@ public class ManagedList<E> extends ArrayList<E> implements Mergeable, BeanMetad
 
 
 	/**
-	 * Set the configuration source <code>Object</code> for this metadata element.
+	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
 	 */
 	public void setSource(Object source) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
index ccf1e1641d..0a0bd10a15 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
@@ -50,7 +50,7 @@ public class ManagedMap<K, V> extends LinkedHashMap<K, V> implements Mergeable,
 
 
 	/**
-	 * Set the configuration source <code>Object</code> for this metadata element.
+	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
 	 */
 	public void setSource(Object source) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
index 91a433bc6c..a90f86dce9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
@@ -37,7 +37,7 @@ public class ManagedProperties extends Properties implements Mergeable, BeanMeta
 
 
 	/**
-	 * Set the configuration source <code>Object</code> for this metadata element.
+	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
 	 */
 	public void setSource(Object source) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
index 70f53f05a8..a60272d12e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
@@ -48,7 +48,7 @@ public class ManagedSet<E> extends LinkedHashSet<E> implements Mergeable, BeanMe
 
 
 	/**
-	 * Set the configuration source <code>Object</code> for this metadata element.
+	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
 	 */
 	public void setSource(Object source) {
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 af32ccb075..c29fbaaa7d 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
@@ -76,7 +76,7 @@ public abstract class MethodOverride implements BeanMetadataElement {
 	}
 
 	/**
-	 * Set the configuration source <code>Object</code> for this metadata element.
+	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
 	 */
 	public void setSource(Object source) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
index 72dd7fd4ca..d336ef8855 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
@@ -86,7 +86,7 @@ public class MethodOverrides {
 	/**
 	 * Return the override for the given method, if any.
 	 * @param method method to check for overrides for
-	 * @return the method override, or <code>null</code> if none
+	 * @return the method override, or {@code null} if none
 	 */
 	public MethodOverride getOverride(Method method) {
 		for (MethodOverride override : this.overrides) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
index 1dde9b3e2d..8927b9b073 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
@@ -88,42 +88,42 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader
 	public static final String SEPARATOR = ".";
 
 	/**
-	 * Special key to distinguish <code>owner.(class)=com.myapp.MyClass</code>-
+	 * Special key to distinguish {@code owner.(class)=com.myapp.MyClass}-
 	 */
 	public static final String CLASS_KEY = "(class)";
 
 	/**
-	 * Special key to distinguish <code>owner.(parent)=parentBeanName</code>.
+	 * Special key to distinguish {@code owner.(parent)=parentBeanName}.
 	 */
 	public static final String PARENT_KEY = "(parent)";
 
 	/**
-	 * Special key to distinguish <code>owner.(scope)=prototype</code>.
+	 * Special key to distinguish {@code owner.(scope)=prototype}.
 	 * Default is "true".
 	 */
 	public static final String SCOPE_KEY = "(scope)";
 
 	/**
-	 * Special key to distinguish <code>owner.(singleton)=false</code>.
+	 * Special key to distinguish {@code owner.(singleton)=false}.
 	 * Default is "true".
 	 */
 	public static final String SINGLETON_KEY = "(singleton)";
 
 	/**
-	 * Special key to distinguish <code>owner.(abstract)=true</code>
+	 * Special key to distinguish {@code owner.(abstract)=true}
 	 * Default is "false".
 	 */
 	public static final String ABSTRACT_KEY = "(abstract)";
 
 	/**
-	 * Special key to distinguish <code>owner.(lazy-init)=true</code>
+	 * Special key to distinguish {@code owner.(lazy-init)=true}
 	 * Default is "false".
 	 */
 	public static final String LAZY_INIT_KEY = "(lazy-init)";
 
 	/**
 	 * Property suffix for references to other beans in the current
-	 * BeanFactory: e.g. <code>owner.dog(ref)=fido</code>.
+	 * BeanFactory: e.g. {@code owner.dog(ref)=fido}.
 	 * Whether this is a reference to a singleton or a prototype
 	 * will depend on the definition of the target bean.
 	 */
@@ -212,7 +212,7 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader
 	 * Load bean definitions from the specified properties file.
 	 * @param resource the resource descriptor for the properties file
 	 * @param prefix a filter within the keys in the map: e.g. 'beans.'
-	 * (can be empty or <code>null</code>)
+	 * (can be empty or {@code null})
 	 * @return the number of bean definitions found
 	 * @throws BeanDefinitionStoreException in case of loading or parsing errors
 	 */
@@ -236,7 +236,7 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader
 	 * @param encodedResource the resource descriptor for the properties file,
 	 * allowing to specify an encoding to use for parsing the file
 	 * @param prefix a filter within the keys in the map: e.g. 'beans.'
-	 * (can be empty or <code>null</code>)
+	 * (can be empty or {@code null})
 	 * @return the number of bean definitions found
 	 * @throws BeanDefinitionStoreException in case of loading or parsing errors
 	 */
@@ -282,7 +282,7 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader
 	 * standard Java internationalization support.
 	 * @param rb the ResourceBundle to load from
 	 * @param prefix a filter within the keys in the map: e.g. 'beans.'
-	 * (can be empty or <code>null</code>)
+	 * (can be empty or {@code null})
 	 * @return the number of bean definitions found
 	 * @throws BeanDefinitionStoreException in case of loading or parsing errors
 	 */
@@ -319,7 +319,7 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader
 	 * will be strings if coming from a Properties file etc. Property names
 	 * (keys) <b>must</b> be Strings. Class keys must be Strings.
 	 * @param prefix a filter within the keys in the map: e.g. 'beans.'
-	 * (can be empty or <code>null</code>)
+	 * (can be empty or {@code null})
 	 * @return the number of bean definitions found
 	 * @throws BeansException in case of loading or parsing errors
 	 */
@@ -334,7 +334,7 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader
 	 * will be strings if coming from a Properties file etc. Property names
 	 * (keys) <b>must</b> be strings. Class keys must be Strings.
 	 * @param prefix a filter within the keys in the map: e.g. 'beans.'
-	 * (can be empty or <code>null</code>)
+	 * (can be empty or {@code null})
 	 * @param resourceDescription description of the resource that the
 	 * Map came from (for logging purposes)
 	 * @return the number of bean definitions found
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 aaa6597275..2e5e49ac94 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
@@ -268,7 +268,7 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
 
 	/**
 	 * Return the resolved factory method as a Java Method object, if available.
-	 * @return the factory method, or <code>null</code> if not found or not resolved yet
+	 * @return the factory method, or {@code null} if not found or not resolved yet
 	 */
 	public Method getResolvedFactoryMethod() {
 		synchronized (this.constructorArgumentLock) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
index dbc12b05fc..7287049bc3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
@@ -31,7 +31,7 @@ public class SimpleSecurityContextProvider implements SecurityContextProvider {
 
 
 	/**
-	 * Construct a new <code>SimpleSecurityContextProvider</code> instance.
+	 * Construct a new {@code SimpleSecurityContextProvider} instance.
 	 * <p>The security context will be retrieved on each call from the current
 	 * thread.
 	 */
@@ -40,10 +40,10 @@ public class SimpleSecurityContextProvider implements SecurityContextProvider {
 	}
 
 	/**
-	 * Construct a new <code>SimpleSecurityContextProvider</code> instance.
+	 * Construct a new {@code SimpleSecurityContextProvider} instance.
 	 * <p>If the given control context is null, the security context will be
 	 * retrieved on each call from the current thread.
-	 * @param acc access control context (can be <code>null</code>)
+	 * @param acc access control context (can be {@code null})
 	 * @see AccessController#getContext()
 	 */
 	public SimpleSecurityContextProvider(AccessControlContext acc) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java
index 2523fc71fd..89971b330a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/package-info.java
@@ -1,8 +1,7 @@
-
 /**
  *
- * Classes supporting the <code>org.springframework.beans.factory</code> package.
- * Contains abstract base classes for <code>BeanFactory</code> implementations.
+ * Classes supporting the {@code org.springframework.beans.factory} package.
+ * Contains abstract base classes for {@code BeanFactory} implementations.
  *
  *
  */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
index 6bc42d0137..0e129d6e38 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
@@ -36,7 +36,7 @@ import org.springframework.util.ClassUtils;
  * <p>Subclasses may also need a custom metadata resolution strategy, in the
  * {@link BeanWiringInfoResolver} interface. The default implementation looks
  * for a bean with the same name as the fully-qualified class name. (This is
- * the default name of the bean in a Spring XML file if the '<code>id</code>'
+ * the default name of the bean in a Spring XML file if the '{@code id}'
  * attribute is not used.)
 
  * @author Rob Harrop
@@ -87,7 +87,7 @@ public class BeanConfigurerSupport implements BeanFactoryAware, InitializingBean
 	 * Create the default BeanWiringInfoResolver to be used if none was
 	 * specified explicitly.
 	 * <p>The default implementation builds a {@link ClassNameBeanWiringInfoResolver}.
-	 * @return the default BeanWiringInfoResolver (never <code>null</code>)
+	 * @return the default BeanWiringInfoResolver (never {@code null})
 	 */
 	protected BeanWiringInfoResolver createDefaultBeanWiringInfoResolver() {
 		return new ClassNameBeanWiringInfoResolver();
@@ -115,7 +115,7 @@ public class BeanConfigurerSupport implements BeanFactoryAware, InitializingBean
 	 * <p>Subclasses can override this to provide custom configuration logic.
 	 * Typically called by an aspect, for all bean instances matched by a
 	 * pointcut.
-	 * @param beanInstance the bean instance to configure (must <b>not</b> be <code>null</code>)
+	 * @param beanInstance the bean instance to configure (must <b>not</b> be {@code null})
 	 */
 	public void configureBean(Object beanInstance) {
 		if (this.beanFactory == null) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java
index 5ed7b79f11..4ec68342d5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java
@@ -22,7 +22,7 @@ import org.springframework.util.Assert;
 /**
  * Holder for bean wiring metadata information about a particular class. Used in
  * conjunction with the {@link org.springframework.beans.factory.annotation.Configurable}
- * annotation and the AspectJ <code>AnnotationBeanConfigurerAspect</code>.
+ * annotation and the AspectJ {@code AnnotationBeanConfigurerAspect}.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -67,7 +67,7 @@ public class BeanWiringInfo {
 	/**
 	 * Create a new BeanWiringInfo that points to the given bean name.
 	 * @param beanName the name of the bean definition to take the property values from
-	 * @throws IllegalArgumentException if the supplied beanName is <code>null</code>,
+	 * @throws IllegalArgumentException if the supplied beanName is {@code null},
 	 * is empty, or consists wholly of whitespace
 	 */
 	public BeanWiringInfo(String beanName) {
@@ -79,7 +79,7 @@ public class BeanWiringInfo {
 	 * @param beanName the name of the bean definition to take the property values from
 	 * @param isDefaultBeanName whether the given bean name is a suggested
 	 * default bean name, not necessarily matching an actual bean definition
-	 * @throws IllegalArgumentException if the supplied beanName is <code>null</code>,
+	 * @throws IllegalArgumentException if the supplied beanName is {@code null},
 	 * is empty, or consists wholly of whitespace
 	 */
 	public BeanWiringInfo(String beanName, boolean isDefaultBeanName) {
@@ -94,7 +94,7 @@ public class BeanWiringInfo {
 	 * {@link #AUTOWIRE_BY_TYPE}
 	 * @param dependencyCheck whether to perform a dependency check for object
 	 * references in the bean instance (after autowiring)
-	 * @throws IllegalArgumentException if the supplied <code>autowireMode</code>
+	 * @throws IllegalArgumentException if the supplied {@code autowireMode}
 	 * is not one of the allowed values
 	 * @see #AUTOWIRE_BY_NAME
 	 * @see #AUTOWIRE_BY_TYPE
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java
index a8b0873da4..ab648bdbb9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java
@@ -37,7 +37,7 @@ public interface BeanWiringInfoResolver {
 	/**
 	 * Resolve the BeanWiringInfo for the given bean instance.
 	 * @param beanInstance the bean instance to resolve info for
-	 * @return the BeanWiringInfo, or <code>null</code> if not found
+	 * @return the BeanWiringInfo, or {@code null} if not found
 	 */
 	BeanWiringInfo resolveWiringInfo(Object beanInstance);
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
index 5a7315f81c..9782f086be 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
@@ -36,7 +36,7 @@ import org.springframework.util.StringUtils;
  * <p>Use this {@link BeanDefinitionParser} implementation when you want
  * to parse some arbitrarily complex XML into one or more
  * {@link BeanDefinition BeanDefinitions}. If you just want to parse some
- * XML into a single <code>BeanDefinition</code>, you may wish to consider
+ * XML into a single {@code BeanDefinition}, you may wish to consider
  * the simpler convenience extensions of this class, namely
  * {@link AbstractSingleBeanDefinitionParser} and
  * {@link AbstractSimpleBeanDefinitionParser}.
@@ -121,8 +121,8 @@ public abstract class AbstractBeanDefinitionParser implements BeanDefinitionPars
 	 * {@link BeanDefinitionHolder bean} is actually even registered, or to
 	 * register even more beans.
 	 * <p>The default implementation registers the supplied {@link BeanDefinitionHolder bean}
-	 * with the supplied {@link BeanDefinitionRegistry registry} only if the <code>isNested</code>
-	 * parameter is <code>false</code>, because one typically does not want inner beans
+	 * with the supplied {@link BeanDefinitionRegistry registry} only if the {@code isNested}
+	 * parameter is {@code false}, because one typically does not want inner beans
 	 * to be registered as top level beans.
 	 * @param definition the bean definition to be registered
 	 * @param registry the registry that the bean is to be registered with
@@ -172,11 +172,11 @@ public abstract class AbstractBeanDefinitionParser implements BeanDefinitionPars
 	 * Controls whether this parser is supposed to fire a
 	 * {@link org.springframework.beans.factory.parsing.BeanComponentDefinition}
 	 * event after parsing the bean definition.
-	 * <p>This implementation returns <code>true</code> by default; that is,
+	 * <p>This implementation returns {@code true} by default; that is,
 	 * an event will be fired when a bean definition has been completely parsed.
-	 * Override this to return <code>false</code> in order to suppress the event.
-	 * @return <code>true</code> in order to fire a component registration event
-	 * after parsing the bean definition; <code>false</code> to suppress the event
+	 * Override this to return {@code false} in order to suppress the event.
+	 * @return {@code true} in order to fire a component registration event
+	 * after parsing the bean definition; {@code false} to suppress the event
 	 * @see #postProcessComponentDefinition
 	 * @see org.springframework.beans.factory.parsing.ReaderContext#fireComponentRegistered
 	 */
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 b933e488cf..99bd416cb9 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
@@ -32,7 +32,7 @@ import org.springframework.util.StringUtils;
  *
  * <p>Extend this parser class when you want to create a single
  * bean definition from a relatively simple custom XML element. The
- * resulting <code>BeanDefinition</code> will be automatically
+ * resulting {@code BeanDefinition} will be automatically
  * registered with the relevant
  * {@link org.springframework.beans.factory.support.BeanDefinitionRegistry}.
  *
@@ -55,7 +55,7 @@ import org.springframework.util.StringUtils;
  *
  * <p>All that is required of the Java developer tasked with writing
  * the parser to parse the above XML tag into an actual
- * <code>SimpleCache</code> bean definition is the following:
+ * {@code SimpleCache} bean definition is the following:
  *
  * <pre class="code">public class SimpleCacheBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
  *
@@ -64,7 +64,7 @@ import org.springframework.util.StringUtils;
  *     }
  * }</pre>
  *
- * <p>Please note that the <code>AbstractSimpleBeanDefinitionParser</code>
+ * <p>Please note that the {@code AbstractSimpleBeanDefinitionParser}
  * is limited to populating the created bean definition with property values.
  * if you want to parse constructor arguments and nested elements from the
  * supplied XML element, then you will have to implement the
@@ -74,7 +74,7 @@ import org.springframework.util.StringUtils;
  * classes directly.
  *
  * <p>The process of actually registering the
- * <code>SimpleCacheBeanDefinitionParser</code> with the Spring XML parsing
+ * {@code SimpleCacheBeanDefinitionParser} with the Spring XML parsing
  * infrastructure is described in the Spring Framework reference documentation
  * (in one of the appendices).
  *
@@ -83,21 +83,21 @@ import org.springframework.util.StringUtils;
  * {@link org.springframework.beans.factory.xml.UtilNamespaceHandler.PropertiesBeanDefinitionParser};
  * the observant (and even not so observant) reader will immediately notice that
  * there is next to no code in the implementation. The
- * <code>PropertiesBeanDefinitionParser</code> populates a
+ * {@code PropertiesBeanDefinitionParser} populates a
  * {@link org.springframework.beans.factory.config.PropertiesFactoryBean}
  * from an XML element that looks like this:
  *
  * <pre class="code">&lt;util:properties location="jdbc.properties"/&gt;</pre>
  *
  * <p>The observant reader will notice that the sole attribute on the
- * <code>&lt;util:properties/&gt;</code> element matches the
+ * {@code &lt;util:properties/&gt;} element matches the
  * {@link org.springframework.beans.factory.config.PropertiesFactoryBean#setLocation(org.springframework.core.io.Resource)}
- * method name on the <code>PropertiesFactoryBean</code> (the general
+ * method name on the {@code PropertiesFactoryBean} (the general
  * usage thus illustrated holds true for any number of attributes).
- * All that the <code>PropertiesBeanDefinitionParser</code> needs
+ * All that the {@code PropertiesBeanDefinitionParser} needs
  * actually do is supply an implementation of the
  * {@link #getBeanClass(org.w3c.dom.Element)} method to return the
- * <code>PropertiesFactoryBean</code> type.
+ * {@code PropertiesFactoryBean} type.
  *
  * @author Rob Harrop
  * @author Rick Evans
@@ -120,7 +120,7 @@ public abstract class AbstractSimpleBeanDefinitionParser extends AbstractSingleB
 	 * reconcile the name of an attribute with the name of a JavaBean
 	 * property.
 	 * @param element the XML element being parsed
-	 * @param builder used to define the <code>BeanDefinition</code>
+	 * @param builder used to define the {@code BeanDefinition}
 	 * @see #extractPropertyName(String)
 	 */
 	@Override
@@ -144,7 +144,7 @@ public abstract class AbstractSimpleBeanDefinitionParser extends AbstractSingleB
 	 * <p>The default implementation considers any attribute as eligible,
 	 * except for the "id" attribute and namespace declaration attributes.
 	 * @param attribute the XML attribute to check
-	 * @param parserContext the <code>ParserContext</code>
+	 * @param parserContext the {@code ParserContext}
 	 * @see #isEligibleAttribute(String)
 	 */
 	protected boolean isEligibleAttribute(Attr attribute, ParserContext parserContext) {
@@ -177,7 +177,7 @@ public abstract class AbstractSimpleBeanDefinitionParser extends AbstractSingleB
 	 * <p>The default implementation considers any attribute as eligible,
 	 * except for the "id" attribute.
 	 * @param attributeName the attribute name taken straight from the
-	 * XML element being parsed (never <code>null</code>)
+	 * XML element being parsed (never {@code null})
 	 */
 	protected boolean isEligibleAttribute(String attributeName) {
 		return !ID_ATTRIBUTE.equals(attributeName);
@@ -190,11 +190,11 @@ public abstract class AbstractSimpleBeanDefinitionParser extends AbstractSingleB
 	 * method to perform the extraction.
 	 * <p>The name returned must obey the standard JavaBean property name
 	 * conventions. For example for a class with a setter method
-	 * '<code>setBingoHallFavourite(String)</code>', the name returned had
-	 * better be '<code>bingoHallFavourite</code>' (with that exact casing).
+	 * '{@code setBingoHallFavourite(String)}', the name returned had
+	 * better be '{@code bingoHallFavourite}' (with that exact casing).
 	 * @param attributeName the attribute name taken straight from the
-	 * XML element being parsed (never <code>null</code>)
-	 * @return the extracted JavaBean property name (must never be <code>null</code>)
+	 * XML element being parsed (never {@code null})
+	 * @return the extracted JavaBean property name (must never be {@code null})
 	 */
 	protected String extractPropertyName(String attributeName) {
 		return Conventions.attributeNameToPropertyName(attributeName);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java
index 1c32c4f22d..f86dc30f70 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java
@@ -23,17 +23,17 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 
 /**
  * Base class for those {@link BeanDefinitionParser} implementations that
- * need to parse and define just a <i>single</i> <code>BeanDefinition</code>.
+ * need to parse and define just a <i>single</i> {@code BeanDefinition}.
  *
  * <p>Extend this parser class when you want to create a single bean definition
  * from an arbitrarily complex XML element. You may wish to consider extending
  * the {@link AbstractSimpleBeanDefinitionParser} when you want to create a
  * single bean definition from a relatively simple custom XML element.
  *
- * <p>The resulting <code>BeanDefinition</code> will be automatically registered
+ * <p>The resulting {@code BeanDefinition} will be automatically registered
  * with the {@link org.springframework.beans.factory.support.BeanDefinitionRegistry}.
  * Your job simply is to {@link #doParse parse} the custom XML {@link Element}
- * into a single <code>BeanDefinition</code>.
+ * into a single {@code BeanDefinition}.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -53,7 +53,7 @@ public abstract class AbstractSingleBeanDefinitionParser extends AbstractBeanDef
 	 * @param parserContext the object encapsulating the current state of the parsing process
 	 * @return the BeanDefinition resulting from the parsing of the supplied {@link Element}
 	 * @throws IllegalStateException if the bean {@link Class} returned from
-	 * {@link #getBeanClass(org.w3c.dom.Element)} is <code>null</code>
+	 * {@link #getBeanClass(org.w3c.dom.Element)} is {@code null}
 	 * @see #doParse
 	 */
 	@Override
@@ -89,11 +89,11 @@ public abstract class AbstractSingleBeanDefinitionParser extends AbstractBeanDef
 	/**
 	 * Determine the name for the parent of the currently parsed bean,
 	 * in case of the current bean being defined as a child bean.
-	 * <p>The default implementation returns <code>null</code>,
+	 * <p>The default implementation returns {@code null},
 	 * indicating a root bean definition.
-	 * @param element the <code>Element</code> that is being parsed
+	 * @param element the {@code Element} that is being parsed
 	 * @return the name of the parent bean for the currently parsed bean,
-	 * or <code>null</code> if none
+	 * or {@code null} if none
 	 */
 	protected String getParentName(Element element) {
 		return null;
@@ -106,9 +106,9 @@ public abstract class AbstractSingleBeanDefinitionParser extends AbstractBeanDef
 	 * dependence on the bean implementation class. The BeanDefinitionParser
 	 * and its NamespaceHandler can be used within an IDE plugin then, even
 	 * if the application classes are not available on the plugin's classpath.
-	 * @param element the <code>Element</code> that is being parsed
+	 * @param element the {@code Element} that is being parsed
 	 * @return the {@link Class} of the bean that is being defined via parsing
-	 * the supplied <code>Element</code>, or <code>null</code> if none
+	 * the supplied {@code Element}, or {@code null} if none
 	 * @see #getBeanClassName
 	 */
 	protected Class<?> getBeanClass(Element element) {
@@ -117,9 +117,9 @@ public abstract class AbstractSingleBeanDefinitionParser extends AbstractBeanDef
 
 	/**
 	 * Determine the bean class name corresponding to the supplied {@link Element}.
-	 * @param element the <code>Element</code> that is being parsed
+	 * @param element the {@code Element} that is being parsed
 	 * @return the class name of the bean that is being defined via parsing
-	 * the supplied <code>Element</code>, or <code>null</code> if none
+	 * the supplied {@code Element}, or {@code null} if none
 	 * @see #getBeanClass
 	 */
 	protected String getBeanClassName(Element element) {
@@ -129,11 +129,11 @@ public abstract class AbstractSingleBeanDefinitionParser extends AbstractBeanDef
 	/**
 	 * Parse the supplied {@link Element} and populate the supplied
 	 * {@link BeanDefinitionBuilder} as required.
-	 * <p>The default implementation delegates to the <code>doParse</code>
+	 * <p>The default implementation delegates to the {@code doParse}
 	 * version without ParserContext argument.
 	 * @param element the XML element being parsed
 	 * @param parserContext the object encapsulating the current state of the parsing process
-	 * @param builder used to define the <code>BeanDefinition</code>
+	 * @param builder used to define the {@code BeanDefinition}
 	 * @see #doParse(Element, BeanDefinitionBuilder)
 	 */
 	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
@@ -145,7 +145,7 @@ public abstract class AbstractSingleBeanDefinitionParser extends AbstractBeanDef
 	 * {@link BeanDefinitionBuilder} as required.
 	 * <p>The default implementation does nothing.
 	 * @param element the XML element being parsed
-	 * @param builder used to define the <code>BeanDefinition</code>
+	 * @param builder used to define the {@code BeanDefinition}
 	 */
 	protected void doParse(Element element, BeanDefinitionBuilder builder) {
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java
index b1a1d2c9e6..b1713f24e8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java
@@ -21,16 +21,16 @@ import org.w3c.dom.Node;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 
 /**
- * Interface used by the {@link org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader}
- * to handle custom, nested (directly under a <code>&lt;bean&gt;</code>) tags.
+ * Interface used by the {@link DefaultBeanDefinitionDocumentReader}
+ * to handle custom, nested (directly under a {@code &lt;bean&gt;}) tags.
  *
  * <p>Decoration may also occur based on custom attributes applied to the
- * <code>&lt;bean&gt;</code> tag. Implementations are free to turn the metadata in the
+ * {@code &lt;bean&gt;} tag. Implementations are free to turn the metadata in the
  * custom tag into as many
  * {@link org.springframework.beans.factory.config.BeanDefinition BeanDefinitions} as
  * required and to transform the
  * {@link org.springframework.beans.factory.config.BeanDefinition} of the enclosing
- * <code>&lt;bean&gt;</code> tag, potentially even returning a completely different
+ * {@code &lt;bean&gt;} tag, potentially even returning a completely different
  * {@link org.springframework.beans.factory.config.BeanDefinition} to replace the
  * original.
  *
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 ec161a0684..ecf5980def 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
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
  *
  * <p>Instantiated per document to parse: Implementations can hold
  * state in instance variables during the execution of the
- * <code>registerBeanDefinitions</code> method, for example global
+ * {@code registerBeanDefinitions} method, for example global
  * settings that are defined for all bean definitions in the document.
  *
  * @author Juergen Hoeller
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 1109ed3b8c..7041e4753b 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
@@ -406,7 +406,7 @@ public class BeanDefinitionParserDelegate {
 	}
 
 	/**
-	 * Return the defaults definition object, or <code>null</code> if the
+	 * Return the defaults definition object, or {@code null} if the
 	 * defaults have been initialized yet.
 	 */
 	public DocumentDefaultsDefinition getDefaults() {
@@ -415,7 +415,7 @@ public class BeanDefinitionParserDelegate {
 
 	/**
 	 * Return the default settings for bean definitions as indicated within
-	 * the attributes of the top-level <code>&lt;beans/&gt;</code> element.
+	 * the attributes of the top-level {@code &lt;beans/&gt;} element.
 	 */
 	public BeanDefinitionDefaults getBeanDefinitionDefaults() {
 		BeanDefinitionDefaults bdd = new BeanDefinitionDefaults();
@@ -429,7 +429,7 @@ public class BeanDefinitionParserDelegate {
 
 	/**
 	 * Return any patterns provided in the 'default-autowire-candidates'
-	 * attribute of the top-level <code>&lt;beans/&gt;</code> element.
+	 * attribute of the top-level {@code &lt;beans/&gt;} element.
 	 */
 	public String[] getAutowireCandidatePatterns() {
 		String candidatePattern = this.defaults.getAutowireCandidates();
@@ -438,7 +438,7 @@ public class BeanDefinitionParserDelegate {
 
 
 	/**
-	 * Parses the supplied <code>&lt;bean&gt;</code> element. May return <code>null</code>
+	 * Parses the supplied {@code &lt;bean&gt;} element. May return {@code null}
 	 * if there were errors during parse. Errors are reported to the
 	 * {@link org.springframework.beans.factory.parsing.ProblemReporter}.
 	 */
@@ -447,7 +447,7 @@ public class BeanDefinitionParserDelegate {
 	}
 
 	/**
-	 * Parses the supplied <code>&lt;bean&gt;</code> element. May return <code>null</code>
+	 * Parses the supplied {@code &lt;bean&gt;} element. May return {@code null}
 	 * if there were errors during parse. Errors are reported to the
 	 * {@link org.springframework.beans.factory.parsing.ProblemReporter}.
 	 */
@@ -534,7 +534,7 @@ public class BeanDefinitionParserDelegate {
 
 	/**
 	 * Parse the bean definition itself, without regard to name or aliases. May return
-	 * <code>null</code> if problems occurred during the parsing of the bean definition.
+	 * {@code null} if problems occurred during the parsing of the bean definition.
 	 */
 	public AbstractBeanDefinition parseBeanDefinitionElement(
 			Element ele, String beanName, BeanDefinition containingBean) {
@@ -1035,7 +1035,7 @@ public class BeanDefinitionParserDelegate {
 	 * constructor-arg element.
 	 * @param ele subelement of property element; we don't know which yet
 	 * @param defaultValueType the default type (class name) for any
-	 * <code>&lt;value&gt;</code> tag that might be created
+	 * {@code &lt;value&gt;} tag that might be created
 	 */
 	public Object parsePropertySubElement(Element ele, BeanDefinition bd, String defaultValueType) {
 		if (!isDefaultNamespace(ele)) {
@@ -1513,7 +1513,7 @@ public class BeanDefinitionParserDelegate {
 	/**
 	 * Ges the local name for the supplied {@link Node}. The default implementation calls {@link Node#getLocalName}.
 	 * Subclasses may override the default implementation to provide a different mechanism for getting the local name.
-	 * @param node the <code>Node</code>
+	 * @param node the {@code Node}
 	 */
 	public String getLocalName(Node node) {
 		return node.getLocalName();
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 913c7db1a6..c6d9f5140a 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
@@ -46,7 +46,7 @@ import org.springframework.util.StringUtils;
  *
  * <p>The structure, elements and attribute names of the required XML document
  * are hard-coded in this class. (Of course a transform could be run if necessary
- * to produce this format). <code>&lt;beans&gt;</code> doesn't need to be the root
+ * to produce this format). {@code &lt;beans&gt;} doesn't need to be the root
  * element of the XML document: This class will parse all bean definition elements
  * in the XML file, not regarding the actual root element.
  *
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java
index 56fe15eb80..6699253594 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java
@@ -37,7 +37,7 @@ import org.springframework.util.CollectionUtils;
  * contained in mapping file.
  *
  * <p>By default, this implementation looks for the mapping file at
- * <code>META-INF/spring.handlers</code>, but this can be changed using the
+ * {@code META-INF/spring.handlers}, but this can be changed using the
  * {@link #DefaultNamespaceHandlerResolver(ClassLoader, String)} constructor.
  *
  * @author Rob Harrop
@@ -68,7 +68,7 @@ public class DefaultNamespaceHandlerResolver implements NamespaceHandlerResolver
 
 
 	/**
-	 * Create a new <code>DefaultNamespaceHandlerResolver</code> using the
+	 * Create a new {@code DefaultNamespaceHandlerResolver} using the
 	 * default mapping file location.
 	 * <p>This constructor will result in the thread context ClassLoader being used
 	 * to load resources.
@@ -79,10 +79,10 @@ public class DefaultNamespaceHandlerResolver implements NamespaceHandlerResolver
 	}
 
 	/**
-	 * Create a new <code>DefaultNamespaceHandlerResolver</code> using the
+	 * Create a new {@code DefaultNamespaceHandlerResolver} using the
 	 * default mapping file location.
 	 * @param classLoader the {@link ClassLoader} instance used to load mapping resources
-	 * (may be <code>null</code>, in which case the thread context ClassLoader will be used)
+	 * (may be {@code null}, in which case the thread context ClassLoader will be used)
 	 * @see #DEFAULT_HANDLER_MAPPINGS_LOCATION
 	 */
 	public DefaultNamespaceHandlerResolver(ClassLoader classLoader) {
@@ -90,10 +90,10 @@ public class DefaultNamespaceHandlerResolver implements NamespaceHandlerResolver
 	}
 
 	/**
-	 * Create a new <code>DefaultNamespaceHandlerResolver</code> using the
+	 * Create a new {@code DefaultNamespaceHandlerResolver} using the
 	 * supplied mapping file location.
 	 * @param classLoader the {@link ClassLoader} instance used to load mapping resources
-	 * may be <code>null</code>, in which case the thread context ClassLoader will be used)
+	 * may be {@code null}, in which case the thread context ClassLoader will be used)
 	 * @param handlerMappingsLocation the mapping file location
 	 */
 	public DefaultNamespaceHandlerResolver(ClassLoader classLoader, String handlerMappingsLocation) {
@@ -107,7 +107,7 @@ public class DefaultNamespaceHandlerResolver implements NamespaceHandlerResolver
 	 * Locate the {@link NamespaceHandler} for the supplied namespace URI
 	 * from the configured mappings.
 	 * @param namespaceUri the relevant namespace URI
-	 * @return the located {@link NamespaceHandler}, or <code>null</code> if none found
+	 * @return the located {@link NamespaceHandler}, or {@code null} if none found
 	 */
 	public NamespaceHandler resolve(String namespaceUri) {
 		Map<String, Object> handlerMappings = getHandlerMappings();
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
index cd33ef1476..4450b30bd7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
@@ -55,7 +55,7 @@ public class DelegatingEntityResolver implements EntityResolver {
 	 * <p>Configures the {@link PluggableSchemaResolver} with the supplied
 	 * {@link ClassLoader}.
 	 * @param classLoader the ClassLoader to use for loading
-	 * (can be <code>null</code>) to use the default ClassLoader)
+	 * (can be {@code null}) to use the default ClassLoader)
 	 */
 	public DelegatingEntityResolver(ClassLoader classLoader) {
 		this.dtdResolver = new BeansDtdResolver();
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java
index 163e4ce9e9..b927112b63 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java
@@ -19,9 +19,9 @@ package org.springframework.beans.factory.xml;
 import org.springframework.beans.factory.parsing.DefaultsDefinition;
 
 /**
- * Simple JavaBean that holds the defaults specified at the <code>&lt;beans&gt;</code>
+ * Simple JavaBean that holds the defaults specified at the {@code &lt;beans&gt;}
  * level in a standard Spring XML bean definition document:
- * <code>default-lazy-init</code>, <code>default-autowire</code>, etc.
+ * {@code default-lazy-init}, {@code default-autowire}, etc.
  *
  * @author Juergen Hoeller
  * @since 2.0.2
@@ -146,7 +146,7 @@ public class DocumentDefaultsDefinition implements DefaultsDefinition {
 	}
 
 	/**
-	 * Set the configuration source <code>Object</code> for this metadata element.
+	 * Set the configuration source {@code Object} for this metadata element.
 	 * <p>The exact type of the object will depend on the configuration mechanism used.
 	 */
 	public void setSource(Object source) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java
index 676eacd289..348f4f6dc4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java
@@ -38,7 +38,7 @@ public interface DocumentLoader {
 	 * @param validationMode the type of validation
 	 * {@link org.springframework.util.xml.XmlValidationModeDetector#VALIDATION_DTD DTD}
 	 * or {@link org.springframework.util.xml.XmlValidationModeDetector#VALIDATION_XSD XSD})
-	 * @param namespaceAware <code>true</code> if support for XML namespaces is to be provided
+	 * @param namespaceAware {@code true} if support for XML namespaces is to be provided
 	 * @return the loaded {@link Document document}
 	 * @throws Exception if an error occurs
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java
index a3bf241ae7..823e3015ce 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java
@@ -32,8 +32,8 @@ import org.springframework.beans.factory.config.BeanDefinitionHolder;
  * custom nested tags.
  *
  * <p>The parser will call {@link #parse} when it encounters a custom tag
- * directly under the <code>&lt;beans&gt;</code> tags and {@link #decorate} when
- * it encounters a custom tag directly under a <code>&lt;bean&gt;</code> tag.
+ * directly under the {@code &lt;beans&gt;} tags and {@link #decorate} when
+ * it encounters a custom tag directly under a {@code &lt;bean&gt;} tag.
  *
  * <p>Developers writing their own custom element extensions typically will
  * not implement this interface drectly, but rather make use of the provided
@@ -59,14 +59,14 @@ public interface NamespaceHandler {
 	 * {@link BeanDefinition BeanDefinitions} with the
 	 * {@link org.springframework.beans.factory.support.BeanDefinitionRegistry}
 	 * that is embedded in the supplied {@link ParserContext}.
-	 * <p>Implementations should return the primary <code>BeanDefinition</code>
+	 * <p>Implementations should return the primary {@code BeanDefinition}
 	 * that results from the parse phase if they wish to be used nested
-	 * inside (for example) a <code>&lt;property&gt;</code> tag.
-	 * <p>Implementations may return <code>null</code> if they will
+	 * inside (for example) a {@code &lt;property&gt;} tag.
+	 * <p>Implementations may return {@code null} if they will
 	 * <strong>not</strong> be used in a nested scenario.
-	 * @param element the element that is to be parsed into one or more <code>BeanDefinitions</code>
+	 * @param element the element that is to be parsed into one or more {@code BeanDefinitions}
 	 * @param parserContext the object encapsulating the current state of the parsing process
-	 * @return the primary <code>BeanDefinition</code> (can be <code>null</code> as explained above)
+	 * @return the primary {@code BeanDefinition} (can be {@code null} as explained above)
 	 */
 	BeanDefinition parse(Element element, ParserContext parserContext);
 
@@ -86,7 +86,7 @@ public interface NamespaceHandler {
 	 * @param parserContext the object encapsulating the current state of the parsing process
 	 * @return the decorated definition (to be registered in the BeanFactory),
 	 * or simply the original bean definition if no decoration is required.
-	 * A <code>null</code> value is strictly speaking invalid, but will be leniently
+	 * A {@code null} value is strictly speaking invalid, but will be leniently
 	 * treated like the case where the original bean definition gets returned.
 	 */
 	BeanDefinitionHolder decorate(Node source, BeanDefinitionHolder definition, ParserContext parserContext);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java
index ba9d173b1d..12e95b0b42 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java
@@ -31,7 +31,7 @@ public interface NamespaceHandlerResolver {
 	 * Resolve the namespace URI and return the located {@link NamespaceHandler}
 	 * implementation.
 	 * @param namespaceUri the relevant namespace URI
-	 * @return the located {@link NamespaceHandler} (may be <code>null</code>)
+	 * @return the located {@link NamespaceHandler} (may be {@code null})
 	 */
 	NamespaceHandler resolve(String namespaceUri);
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
index d4f1f1bbf6..8c0d2e77a0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
@@ -38,12 +38,12 @@ import org.springframework.util.CollectionUtils;
  * local {@link ClassPathResource classpath resources} using a set of mappings files.
  *
  * <p>By default, this class will look for mapping files in the classpath using the pattern:
- * <code>META-INF/spring.schemas</code> allowing for multiple files to exist on the
+ * {@code META-INF/spring.schemas} allowing for multiple files to exist on the
  * classpath at any one time.
  *
- * The format of <code>META-INF/spring.schemas</code> is a properties
- * file where each line should be of the form <code>systemId=schema-location</code>
- * where <code>schema-location</code> should also be a schema file in the classpath.
+ * The format of {@code META-INF/spring.schemas} is a properties
+ * file where each line should be of the form {@code systemId=schema-location}
+ * where {@code schema-location} should also be a schema file in the classpath.
  * Since systemId is commonly a URL, one must be careful to escape any ':' characters
  * which are treated as delimiters in properties files.
  *
@@ -77,7 +77,7 @@ public class PluggableSchemaResolver implements EntityResolver {
 	 * Loads the schema URL -> schema file location mappings using the default
 	 * mapping file pattern "META-INF/spring.schemas".
 	 * @param classLoader the ClassLoader to use for loading
-	 * (can be <code>null</code>) to use the default ClassLoader)
+	 * (can be {@code null}) to use the default ClassLoader)
 	 * @see PropertiesLoaderUtils#loadAllProperties(String, ClassLoader)
 	 */
 	public PluggableSchemaResolver(ClassLoader classLoader) {
@@ -89,7 +89,7 @@ public class PluggableSchemaResolver implements EntityResolver {
 	 * Loads the schema URL -> schema file location mappings using the given
 	 * mapping file pattern.
 	 * @param classLoader the ClassLoader to use for loading
-	 * (can be <code>null</code>) to use the default ClassLoader)
+	 * (can be {@code null}) to use the default ClassLoader)
 	 * @param schemaMappingsLocation the location of the file that defines schema mappings
 	 * (must not be empty)
 	 * @see PropertiesLoaderUtils#loadAllProperties(String, ClassLoader)
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 69d2fc4164..ab933ffc9b 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
@@ -29,21 +29,21 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
 /**
- * Simple <code>NamespaceHandler</code> implementation that maps custom
+ * Simple {@code NamespaceHandler} implementation that maps custom
  * attributes directly through to bean properties. An important point to note is
- * that this <code>NamespaceHandler</code> does not have a corresponding schema
+ * 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</code> is shown below:
+ * 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;
  * </pre>
  *
- * Here the '<code>c:name</code>' corresponds directly to the '<code>name</code>
- * ' argument declared on the constructor of class '<code>TestBean</code>'. The
- * '<code>c:work-ref</code>' attributes corresponds to the '<code>work</code>'
+ * Here the '{@code c:name}' corresponds directly to the '{@code name}
+ * ' argument declared on the constructor of class '{@code TestBean}'. The
+ * '{@code c:work-ref}' attributes corresponds to the '{@code work}'
  * argument and, rather than being the concrete value, it contains the name of
  * the bean that will be considered as a parameter.
  *
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
index ee8101b46e..259c592ef7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
@@ -27,19 +27,19 @@ import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.core.Conventions;
 
 /**
- * Simple <code>NamespaceHandler</code> implementation that maps custom attributes
+ * Simple {@code NamespaceHandler} implementation that maps custom attributes
  * directly through to bean properties. An important point to note is that this
- * <code>NamespaceHandler</code> does not have a corresponding schema since there
+ * {@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</code> is shown below:
+ * <p>An example of the usage of this {@code NamespaceHandler} is shown below:
  *
  * <pre class="code">
  * &lt;bean id=&quot;rob&quot; class=&quot;..TestBean&quot; p:name=&quot;Rob Harrop&quot; p:spouse-ref=&quot;sally&quot;/&gt;</pre>
  *
- * Here the '<code>p:name</code>' corresponds directly to the '<code>name</code>'
- * property on class '<code>TestBean</code>'. The '<code>p:spouse-ref</code>'
- * attributes corresponds to the '<code>spouse</code>' property and, rather
+ * Here the '{@code p:name}' corresponds directly to the '{@code name}'
+ * property on class '{@code TestBean}'. The '{@code p:spouse-ref}'
+ * attributes corresponds to the '{@code spouse}' property and, rather
  * than being the concrete value, it contains the name of the bean that will
  * be injected into that property.
  *
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java
index 128da8a46f..064ffd30cb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java
@@ -34,7 +34,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.util.StringUtils;
 
 /**
- * {@link NamespaceHandler} for the <code>util</code> namespace.
+ * {@link NamespaceHandler} for the {@code util} namespace.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
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 d858fe4def..c819bbb7a6 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
@@ -136,7 +136,7 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
 	}
 
 	/**
-	 * Set whether to use XML validation. Default is <code>true</code>.
+	 * Set whether to use XML validation. Default is {@code true}.
 	 * <p>This method switches namespace awareness on if validation is turned off,
 	 * in order to still process schema namespaces properly in such a scenario.
 	 * @see #setValidationMode
@@ -212,7 +212,7 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
 
 	/**
 	 * Specify the {@link SourceExtractor} to use.
-	 * <p>The default implementation is {@link NullSourceExtractor} which simply returns <code>null</code>
+	 * <p>The default implementation is {@link NullSourceExtractor} which simply returns {@code null}
 	 * as the source object. This means that - during normal runtime execution -
 	 * no additional source metadata is attached to the bean configuration metadata.
 	 */
@@ -266,7 +266,7 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
 	}
 
 	/**
-	 * Set an implementation of the <code>org.xml.sax.ErrorHandler</code>
+	 * Set an implementation of the {@code org.xml.sax.ErrorHandler}
 	 * interface for custom handling of XML parsing errors and warnings.
 	 * <p>If not set, a default SimpleSaxErrorHandler is used that simply
 	 * logs warnings using the logger instance of the view class,
@@ -363,7 +363,7 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
 	 * Load bean definitions from the specified XML file.
 	 * @param inputSource the SAX InputSource to read from
 	 * @param resourceDescription a description of the resource
-	 * (can be <code>null</code> or empty)
+	 * (can be {@code null} or empty)
 	 * @return the number of bean definitions found
 	 * @throws BeanDefinitionStoreException in case of loading or parsing errors
 	 */
@@ -439,7 +439,7 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
 
 	/**
 	 * Detects which kind of validation to perform on the XML file identified
-	 * by the supplied {@link Resource}. If the file has a <code>DOCTYPE</code>
+	 * by the supplied {@link Resource}. If the file has a {@code DOCTYPE}
 	 * definition then DTD validation is used otherwise XSD validation is assumed.
 	 * <p>Override this method if you would like to customize resolution
 	 * of the {@link #VALIDATION_AUTO} mode.
@@ -475,9 +475,9 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
 
 	/**
 	 * Register the bean definitions contained in the given DOM document.
-	 * Called by <code>loadBeanDefinitions</code>.
+	 * Called by {@code loadBeanDefinitions}.
 	 * <p>Creates a new instance of the parser class and invokes
-	 * <code>registerBeanDefinitions</code> on it.
+	 * {@code registerBeanDefinitions} on it.
 	 * @param doc the DOM document
 	 * @param resource the resource descriptor (for context information)
 	 * @return the number of bean definitions found
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/package-info.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/package-info.java
index c3c0379244..1d2043d258 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/package-info.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/package-info.java
@@ -1,7 +1,6 @@
-
 /**
  *
- * Contains an abstract XML-based <code>BeanFactory</code> implementation,
+ * Contains an abstract XML-based {@code BeanFactory} implementation,
  * including a standard "spring-beans" DTD.
  *
  */
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
index 5cdcb1d500..6e51f97fe5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
@@ -21,22 +21,22 @@ import java.beans.PropertyEditorSupport;
 import org.springframework.util.StringUtils;
 
 /**
- * Editor for a {@link java.lang.Character}, to populate a property
- * of type <code>Character</code> or <code>char</code> from a String value.
+ * Editor for a {@link Character}, to populate a property
+ * of type {@code Character} or {@code char} from a String value.
  *
  * <p>Note that the JDK does not contain a default
- * {@link java.beans.PropertyEditor property editor} for <code>char</code>!
+ * {@link java.beans.PropertyEditor property editor} for {@code char}!
  * {@link org.springframework.beans.BeanWrapperImpl} will register this
  * editor by default.
  *
  * <p>Also supports conversion from a Unicode character sequence; e.g.
- * <code>u0041</code> ('A').
+ * {@code u0041} ('A').
  *
  * @author Juergen Hoeller
  * @author Rob Harrop
  * @author Rick Evans
  * @since 1.2
- * @see java.lang.Character
+ * @see Character
  * @see org.springframework.beans.BeanWrapperImpl
  */
 public class CharacterEditor extends PropertyEditorSupport {
@@ -58,9 +58,9 @@ public class CharacterEditor extends PropertyEditorSupport {
 	/**
 	 * Create a new CharacterEditor instance.
 	 * <p>The "allowEmpty" parameter controls whether an empty String is
-	 * to be allowed in parsing, i.e. be interpreted as the <code>null</code>
+	 * to be allowed in parsing, i.e. be interpreted as the {@code null}
 	 * value when {@link #setAsText(String) text is being converted}. If
-	 * <code>false</code>, an {@link IllegalArgumentException} will be thrown
+	 * {@code false}, an {@link IllegalArgumentException} will be thrown
 	 * at that time.
 	 * @param allowEmpty if empty strings are to be allowed
 	 */
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java
index 5d742a9253..2c87af1f7a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java
@@ -22,11 +22,11 @@ import java.nio.charset.Charset;
 import org.springframework.util.StringUtils;
 
 /**
- * Editor for <code>java.nio.charset.Charset<code>, translating charset
+ * Editor for {@code java.nio.charset.Charset}, translating charset
  * String representations into Charset objects and back.
  *
  * <p>Expects the same syntax as Charset's {@link java.nio.charset.Charset#name()},
- * e.g. <code>UTF-8</code>, <code>ISO-8859-16</code>, etc.
+ * e.g. {@code UTF-8}, {@code ISO-8859-16}, etc.
  *
  * @author Arjen Poutsma
  * @since 2.5.4
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java
index 4db48197f8..42420f9fd0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java
@@ -23,9 +23,9 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * Property editor for an array of {@link java.lang.Class Classes}, to enable
- * the direct population of a <code>Class[]</code> property without having to
- * use a <code>String</code> class name property as bridge.
+ * Property editor for an array of {@link Class Classes}, to enable
+ * the direct population of a {@code Class[]} property without having to
+ * use a {@code String} class name property as bridge.
  *
  * <p>Also supports "java.lang.String[]"-style array class names, in contrast
  * to the standard {@link Class#forName(String)} method.
@@ -40,18 +40,18 @@ public class ClassArrayEditor extends PropertyEditorSupport {
 
 
 	/**
-	 * Create a default <code>ClassEditor</code>, using the thread
-	 * context <code>ClassLoader</code>.
+	 * Create a default {@code ClassEditor}, using the thread
+	 * context {@code ClassLoader}.
 	 */
 	public ClassArrayEditor() {
 		this(null);
 	}
 
 	/**
-	 * Create a default <code>ClassArrayEditor</code>, using the given
-	 * <code>ClassLoader</code>.
-	 * @param classLoader the <code>ClassLoader</code> to use
-	 * (or pass <code>null</code> for the thread context <code>ClassLoader</code>)
+	 * Create a default {@code ClassArrayEditor}, using the given
+	 * {@code ClassLoader}.
+	 * @param classLoader the {@code ClassLoader} to use
+	 * (or pass {@code null} for the thread context {@code ClassLoader})
 	 */
 	public ClassArrayEditor(ClassLoader classLoader) {
 		this.classLoader = (classLoader != null ? classLoader : ClassUtils.getDefaultClassLoader());
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java
index 4f5fffce46..59dba77c36 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java
@@ -22,8 +22,8 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * Property editor for {@link java.lang.Class java.lang.Class}, to enable the direct
- * population of a <code>Class</code> property without recourse to having to use a
+ * Property editor for {@link Class java.lang.Class}, to enable the direct
+ * population of a {@code Class} property without recourse to having to use a
  * String class name property as bridge.
  *
  * <p>Also supports "java.lang.String[]"-style array class names, in contrast to the
@@ -32,7 +32,7 @@ import org.springframework.util.StringUtils;
  * @author Juergen Hoeller
  * @author Rick Evans
  * @since 13.05.2003
- * @see java.lang.Class#forName
+ * @see Class#forName
  * @see org.springframework.util.ClassUtils#forName(String, ClassLoader)
  */
 public class ClassEditor extends PropertyEditorSupport {
@@ -50,7 +50,7 @@ public class ClassEditor extends PropertyEditorSupport {
 	/**
 	 * Create a default ClassEditor, using the given ClassLoader.
 	 * @param classLoader the ClassLoader to use
-	 * (or <code>null</code> for the thread context ClassLoader)
+	 * (or {@code null} for the thread context ClassLoader)
 	 */
 	public ClassEditor(ClassLoader classLoader) {
 		this.classLoader = (classLoader != null ? classLoader : ClassUtils.getDefaultClassLoader());
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java
index 910016ac86..433e126749 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java
@@ -20,7 +20,7 @@ import java.beans.PropertyEditorSupport;
 import java.util.Currency;
 
 /**
- * Editor for <code>java.util.Currency</code>, translating currency codes into Currency
+ * Editor for {@code java.util.Currency}, translating currency codes into Currency
  * objects. Exposes the currency code as text representation of a Currency object.
  *
  * @author Juergen Hoeller
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 b75520e06a..934fa37bb3 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
@@ -29,8 +29,8 @@ import org.springframework.util.StringUtils;
  * them in the UI form.
  *
  * <p>In web MVC code, this editor will typically be registered with
- * <code>binder.registerCustomEditor</code> calls in an implementation
- * of BaseCommandController's <code>initBinder</code> method.
+ * {@code binder.registerCustomEditor} calls in an implementation
+ * of BaseCommandController's {@code initBinder} method.
  *
  * @author Juergen Hoeller
  * @since 10.06.2003
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
index a355ffcb7a..b78db5ea5e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
@@ -49,7 +49,7 @@ public class CustomCollectionEditor extends PropertyEditorSupport {
 
 	/**
 	 * Create a new CustomCollectionEditor for the given target type,
-	 * keeping an incoming <code>null</code> as-is.
+	 * keeping an incoming {@code null} as-is.
 	 * @param collectionType the target type, which needs to be a
 	 * sub-interface of Collection or a concrete Collection class
 	 * @see java.util.Collection
@@ -72,7 +72,7 @@ public class CustomCollectionEditor extends PropertyEditorSupport {
 	 * TreeSet for SortedSet, and LinkedHashSet for Set.
 	 * @param collectionType the target type, which needs to be a
 	 * sub-interface of Collection or a concrete Collection class
-	 * @param nullAsEmptyCollection whether to convert an incoming <code>null</code>
+	 * @param nullAsEmptyCollection whether to convert an incoming {@code null}
 	 * value to an empty Collection (of the appropriate type)
 	 * @see java.util.Collection
 	 * @see java.util.ArrayList
@@ -198,7 +198,7 @@ public class CustomCollectionEditor extends PropertyEditorSupport {
 
 
 	/**
-	 * This implementation returns <code>null</code> to indicate that
+	 * This implementation returns {@code null} to indicate that
 	 * there is no appropriate text representation.
 	 */
 	@Override
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java
index 5f4acc9151..03e1d9c8f2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java
@@ -24,8 +24,8 @@ import java.util.Date;
 import org.springframework.util.StringUtils;
 
 /**
- * Property editor for <code>java.util.Date</code>,
- * supporting a custom <code>java.text.DateFormat</code>.
+ * Property editor for {@code java.util.Date},
+ * supporting a custom {@code java.text.DateFormat}.
  *
  * <p>This is not meant to be used as system PropertyEditor but rather
  * as locale-specific date editor within custom controller code,
@@ -33,8 +33,8 @@ import org.springframework.util.StringUtils;
  * and rendering them in the UI form.
  *
  * <p>In web MVC code, this editor will typically be registered with
- * <code>binder.registerCustomEditor</code> calls in a custom
- * <code>initBinder</code> method.
+ * {@code binder.registerCustomEditor} calls in a custom
+ * {@code initBinder} method.
  *
  * @author Juergen Hoeller
  * @since 28.04.2003
@@ -76,7 +76,7 @@ public class CustomDateEditor extends PropertyEditorSupport {
 	 * <p>The "exactDateLength" parameter states that IllegalArgumentException gets
 	 * thrown if the String does not exactly match the length specified. This is useful
 	 * because SimpleDateFormat does not enforce strict parsing of the year part,
-	 * not even with <code>setLenient(false)</code>. Without an "exactDateLength"
+	 * not even with {@code setLenient(false)}. Without an "exactDateLength"
 	 * specified, the "01/01/05" would get parsed to "01/01/0005". However, even
 	 * with an "exactDateLength" specified, prepended zeros in the day or month
 	 * part may still allow for a shorter year part, so consider this as just
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java
index d66eca4f17..81134a6931 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java
@@ -40,7 +40,7 @@ public class CustomMapEditor extends PropertyEditorSupport {
 
 	/**
 	 * Create a new CustomMapEditor for the given target type,
-	 * keeping an incoming <code>null</code> as-is.
+	 * keeping an incoming {@code null} as-is.
 	 * @param mapType the target type, which needs to be a
 	 * sub-interface of Map or a concrete Map class
 	 * @see java.util.Map
@@ -63,7 +63,7 @@ public class CustomMapEditor extends PropertyEditorSupport {
 	 * and LinkedHashMap for Map.
 	 * @param mapType the target type, which needs to be a
 	 * sub-interface of Map or a concrete Map class
-	 * @param nullAsEmptyMap ap whether to convert an incoming <code>null</code>
+	 * @param nullAsEmptyMap ap whether to convert an incoming {@code null}
 	 * value to an empty Map (of the appropriate type)
 	 * @see java.util.Map
 	 * @see java.util.TreeMap
@@ -189,7 +189,7 @@ public class CustomMapEditor extends PropertyEditorSupport {
 
 
 	/**
-	 * This implementation returns <code>null</code> to indicate that
+	 * This implementation returns {@code null} to indicate that
 	 * there is no appropriate text representation.
 	 */
 	@Override
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java
index eaf799f528..3e3072f0ec 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java
@@ -26,7 +26,7 @@ import org.springframework.util.StringUtils;
  * Property editor for any Number subclass such as Short, Integer, Long,
  * BigInteger, Float, Double, BigDecimal. Can use a given NumberFormat for
  * (locale-specific) parsing and rendering, or alternatively the default
- * <code>decode</code> / <code>valueOf</code> / <code>toString</code> methods.
+ * {@code decode} / {@code valueOf} / {@code toString} methods.
  *
  * <p>This is not meant to be used as system PropertyEditor but rather
  * as locale-specific number editor within custom controller code,
@@ -34,12 +34,12 @@ import org.springframework.util.StringUtils;
  * and rendering them in the UI form.
  *
  * <p>In web MVC code, this editor will typically be registered with
- * <code>binder.registerCustomEditor</code> calls in a custom
- * <code>initBinder</code> method.
+ * {@code binder.registerCustomEditor} calls in a custom
+ * {@code initBinder} method.
  *
  * @author Juergen Hoeller
  * @since 06.06.2003
- * @see java.lang.Number
+ * @see Number
  * @see java.text.NumberFormat
  * @see org.springframework.validation.DataBinder#registerCustomEditor
  * @see org.springframework.web.servlet.mvc.BaseCommandController#initBinder
@@ -55,10 +55,10 @@ public class CustomNumberEditor extends PropertyEditorSupport {
 
 	/**
 	 * Create a new CustomNumberEditor instance, using the default
-	 * <code>valueOf</code> methods for parsing and <code>toString</code>
+	 * {@code valueOf} methods for parsing and {@code toString}
 	 * methods for rendering.
 	 * <p>The "allowEmpty" parameter states if an empty String should
-	 * be allowed for parsing, i.e. get interpreted as <code>null</code> value.
+	 * be allowed for parsing, i.e. get interpreted as {@code null} value.
 	 * Else, an IllegalArgumentException gets thrown in that case.
 	 * @param numberClass Number subclass to generate
 	 * @param allowEmpty if empty strings should be allowed
@@ -75,7 +75,7 @@ public class CustomNumberEditor extends PropertyEditorSupport {
 	 * Create a new CustomNumberEditor instance, using the given NumberFormat
 	 * for parsing and rendering.
 	 * <p>The allowEmpty parameter states if an empty String should
-	 * be allowed for parsing, i.e. get interpreted as <code>null</code> value.
+	 * be allowed for parsing, i.e. get interpreted as {@code null} value.
 	 * Else, an IllegalArgumentException gets thrown in that case.
 	 * @param numberClass Number subclass to generate
 	 * @param numberFormat NumberFormat to use for parsing and rendering
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java
index f21053e868..2fb351b55f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java
@@ -27,7 +27,7 @@ import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * Editor for <code>java.io.File</code>, to directly populate a File property
+ * Editor for {@code java.io.File}, to directly populate a File property
  * from a Spring resource location.
  *
  * <p>Supports Spring-style URL notation: any fully qualified standard URL
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java
index 3701b55cc3..982f9438d6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java
@@ -26,7 +26,7 @@ import org.springframework.core.io.ResourceEditor;
 import org.springframework.util.Assert;
 
 /**
- * Editor for <code>org.xml.sax.InputSource</code>, converting from a
+ * Editor for {@code org.xml.sax.InputSource}, converting from a
  * Spring resource location String to a SAX InputSource object.
  *
  * <p>Supports Spring-style URL notation: any fully qualified standard URL
@@ -37,8 +37,8 @@ import org.springframework.util.Assert;
  * @see org.xml.sax.InputSource
  * @see org.springframework.core.io.ResourceEditor
  * @see org.springframework.core.io.ResourceLoader
- * @see org.springframework.beans.propertyeditors.URLEditor
- * @see org.springframework.beans.propertyeditors.FileEditor
+ * @see URLEditor
+ * @see FileEditor
  */
 public class InputSourceEditor extends PropertyEditorSupport {
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java
index 7099897730..efa3908b2d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java
@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
 
 /**
  * One-way PropertyEditor which can convert from a text String to a
- * <code>java.io.InputStream</code>, interpreting the given String
+ * {@code java.io.InputStream}, interpreting the given String
  * as Spring resource location (e.g. a URL String).
  *
  * <p>Supports Spring-style URL notation: any fully qualified standard URL
@@ -79,7 +79,7 @@ public class InputStreamEditor extends PropertyEditorSupport {
 	}
 
 	/**
-	 * This implementation returns <code>null</code> to indicate that
+	 * This implementation returns {@code null} to indicate that
 	 * there is no appropriate text representation.
 	 */
 	@Override
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java
index 9e0944662c..753ba19c5b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java
@@ -21,9 +21,9 @@ import java.beans.PropertyEditorSupport;
 import org.springframework.util.StringUtils;
 
 /**
- * Editor for <code>java.util.Locale</code>, to directly populate a Locale property.
+ * Editor for {@code java.util.Locale}, to directly populate a Locale property.
  *
- * <p>Expects the same syntax as Locale's <code>toString</code>, i.e. language +
+ * <p>Expects the same syntax as Locale's {@code toString}, i.e. language +
  * optionally country + optionally variant, separated by "_" (e.g. "en", "en_US").
  * Also accepts spaces as separators, as alternative to underscores.
  *
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java
index 41f9952b5c..886a1075c9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java
@@ -20,8 +20,8 @@ import java.beans.PropertyEditorSupport;
 import java.util.regex.Pattern;
 
 /**
- * Editor for <code>java.util.regex.Pattern</code>, to directly populate a Pattern property.
- * Expects the same syntax as Pattern's <code>compile</code> method.
+ * Editor for {@code java.util.regex.Pattern}, to directly populate a Pattern property.
+ * Expects the same syntax as Pattern's {@code compile} method.
  *
  * @author Juergen Hoeller
  * @since 2.0.1
@@ -42,7 +42,7 @@ public class PatternEditor extends PropertyEditorSupport {
 
 	/**
 	 * Create a new PatternEditor with the given settings.
-	 * @param flags the <code>java.util.regex.Pattern</code> flags to apply
+	 * @param flags the {@code java.util.regex.Pattern} flags to apply
 	 * @see java.util.regex.Pattern#compile(String, int)
 	 * @see java.util.regex.Pattern#CASE_INSENSITIVE
 	 * @see java.util.regex.Pattern#MULTILINE
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java
index 7f5f291b70..a608128bee 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java
@@ -25,11 +25,11 @@ import java.util.Properties;
 /**
  * Custom {@link java.beans.PropertyEditor} for {@link Properties} objects.
  *
- * <p>Handles conversion from content {@link String} to <code>Properties</code> object.
- * Also handles {@link Map} to <code>Properties</code> conversion, for populating
- * a <code>Properties</code> object via XML "map" entries.
+ * <p>Handles conversion from content {@link String} to {@code Properties} object.
+ * Also handles {@link Map} to {@code Properties} conversion, for populating
+ * a {@code Properties} object via XML "map" entries.
  *
- * <p>The required format is defined in the standard <code>Properties</code>
+ * <p>The required format is defined in the standard {@code Properties}
  * documentation. Each property must be on a new line.
  *
  * @author Rod Johnson
@@ -61,7 +61,7 @@ public class PropertiesEditor extends PropertyEditorSupport {
 	}
 
 	/**
-	 * Take {@link Properties} as-is; convert {@link Map} into <code>Properties</code>.
+	 * Take {@link Properties} as-is; convert {@link Map} into {@code Properties}.
 	 */
 	@Override
 	public void setValue(Object value) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java
index 5bcecaf973..716872c5e2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java
@@ -71,8 +71,8 @@ public class StringArrayPropertyEditor extends PropertyEditorSupport {
 	/**
 	 * Create a new StringArrayPropertyEditor with the given separator.
 	 * @param separator the separator to use for splitting a {@link String}
-	 * @param emptyArrayAsNull <code>true</code> if an empty String array
-	 * is to be transformed into <code>null</code>
+	 * @param emptyArrayAsNull {@code true} if an empty String array
+	 * is to be transformed into {@code null}
 	 */
 	public StringArrayPropertyEditor(String separator, boolean emptyArrayAsNull) {
 		this(separator, null, emptyArrayAsNull);
@@ -81,9 +81,9 @@ public class StringArrayPropertyEditor extends PropertyEditorSupport {
 	/**
 	 * Create a new StringArrayPropertyEditor with the given separator.
 	 * @param separator the separator to use for splitting a {@link String}
-	 * @param emptyArrayAsNull <code>true</code> if an empty String array
-	 * is to be transformed into <code>null</code>
-	 * @param trimValues <code>true</code> if the values in the parsed arrays
+	 * @param emptyArrayAsNull {@code true} if an empty String array
+	 * is to be transformed into {@code null}
+	 * @param trimValues {@code true} if the values in the parsed arrays
 	 * are to be be trimmed of whitespace (default is true).
 	 */
 	public StringArrayPropertyEditor(String separator, boolean emptyArrayAsNull, boolean trimValues) {
@@ -96,8 +96,8 @@ public class StringArrayPropertyEditor extends PropertyEditorSupport {
 	 * @param charsToDelete a set of characters to delete, in addition to
 	 * trimming an input String. Useful for deleting unwanted line breaks:
 	 * e.g. "\r\n\f" will delete all new lines and line feeds in a String.
-	 * @param emptyArrayAsNull <code>true</code> if an empty String array
-	 * is to be transformed into <code>null</code>
+	 * @param emptyArrayAsNull {@code true} if an empty String array
+	 * is to be transformed into {@code null}
 	 */
 	public StringArrayPropertyEditor(String separator, String charsToDelete, boolean emptyArrayAsNull) {
 		this(separator, charsToDelete, emptyArrayAsNull, true);
@@ -109,9 +109,9 @@ public class StringArrayPropertyEditor extends PropertyEditorSupport {
 	 * @param charsToDelete a set of characters to delete, in addition to
 	 * trimming an input String. Useful for deleting unwanted line breaks:
 	 * e.g. "\r\n\f" will delete all new lines and line feeds in a String.
-	 * @param emptyArrayAsNull <code>true</code> if an empty String array
-	 * is to be transformed into <code>null</code>
-	 * @param trimValues <code>true</code> if the values in the parsed arrays
+	 * @param emptyArrayAsNull {@code true} if an empty String array
+	 * is to be transformed into {@code null}
+	 * @param trimValues {@code true} if the values in the parsed arrays
 	 * are to be be trimmed of whitespace (default is true).
 	 */
 	public StringArrayPropertyEditor(String separator, String charsToDelete, boolean emptyArrayAsNull, boolean trimValues) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java
index c277c44f74..f05dd43961 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java
@@ -23,7 +23,7 @@ import org.springframework.util.StringUtils;
 /**
  * Property editor that trims Strings.
  *
- * <p>Optionally allows transforming an empty string into a <code>null</code> value.
+ * <p>Optionally allows transforming an empty string into a {@code null} value.
  * Needs to be explicitly registered, e.g. for command binding.
  *
  * @author Juergen Hoeller
@@ -39,8 +39,8 @@ public class StringTrimmerEditor extends PropertyEditorSupport {
 
 	/**
 	 * Create a new StringTrimmerEditor.
-	 * @param emptyAsNull <code>true</code> if an empty String is to be
-	 * transformed into <code>null</code>
+	 * @param emptyAsNull {@code true} if an empty String is to be
+	 * transformed into {@code null}
 	 */
 	public StringTrimmerEditor(boolean emptyAsNull) {
 		this.charsToDelete = null;
@@ -52,8 +52,8 @@ public class StringTrimmerEditor extends PropertyEditorSupport {
 	 * @param charsToDelete a set of characters to delete, in addition to
 	 * trimming an input String. Useful for deleting unwanted line breaks:
 	 * e.g. "\r\n\f" will delete all new lines and line feeds in a String.
-	 * @param emptyAsNull <code>true</code> if an empty String is to be
-	 * transformed into <code>null</code>
+	 * @param emptyAsNull {@code true} if an empty String is to be
+	 * transformed into {@code null}
 	 */
 	public StringTrimmerEditor(String charsToDelete, boolean emptyAsNull) {
 		this.charsToDelete = charsToDelete;
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java
index 832488ffaf..2059c660c4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java
@@ -20,7 +20,7 @@ import java.beans.PropertyEditorSupport;
 import java.util.TimeZone;
 
 /**
- * Editor for <code>java.util.TimeZone</code>, translating timezone IDs into
+ * Editor for {@code java.util.TimeZone}, translating timezone IDs into
  * TimeZone objects. Does not expose a text representation for TimeZone objects.
  *
  * @author Juergen Hoeller
@@ -35,7 +35,7 @@ public class TimeZoneEditor extends PropertyEditorSupport {
 	}
 
 	/**
-	 * This implementation returns <code>null</code> to indicate that
+	 * This implementation returns {@code null} to indicate that
 	 * there is no appropriate text representation.
 	 */
 	@Override
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java
index add95f10c3..84febdf01d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java
@@ -27,7 +27,7 @@ import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * Editor for <code>java.net.URI</code>, to directly populate a URI property
+ * Editor for {@code java.net.URI}, to directly populate a URI property
  * instead of using a String property as bridge.
  *
  * <p>Supports Spring-style URI notation: any fully qualified standard URI
@@ -79,7 +79,7 @@ public class URIEditor extends PropertyEditorSupport {
 	 * Create a new URIEditor, using the given ClassLoader to resolve
 	 * "classpath:" locations into physical resource URLs.
 	 * @param classLoader the ClassLoader to use for resolving "classpath:" locations
-	 * (may be <code>null</code> to indicate the default ClassLoader)
+	 * (may be {@code null} to indicate the default ClassLoader)
 	 */
 	public URIEditor(ClassLoader classLoader) {
 		this.classLoader = (classLoader != null ? classLoader : ClassUtils.getDefaultClassLoader());
@@ -90,7 +90,7 @@ public class URIEditor extends PropertyEditorSupport {
 	 * Create a new URIEditor, using the given ClassLoader to resolve
 	 * "classpath:" locations into physical resource URLs.
 	 * @param classLoader the ClassLoader to use for resolving "classpath:" locations
-	 * (may be <code>null</code> to indicate the default ClassLoader)
+	 * (may be {@code null} to indicate the default ClassLoader)
 	 * @param encode indicates whether Strings will be encoded or not
 	 */
 	public URIEditor(ClassLoader classLoader, boolean encode) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java
index bffeffc1ef..be8bf5c69c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java
@@ -25,7 +25,7 @@ import org.springframework.core.io.ResourceEditor;
 import org.springframework.util.Assert;
 
 /**
- * Editor for <code>java.net.URL</code>, to directly populate a URL property
+ * Editor for {@code java.net.URL}, to directly populate a URL property
  * instead of using a String property as bridge.
  *
  * <p>Supports Spring-style URL notation: any fully qualified standard URL
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java
index 98c9ea54f5..fd938eef80 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java
@@ -22,7 +22,7 @@ import java.util.UUID;
 import org.springframework.util.StringUtils;
 
 /**
- * Editor for <code>java.util.UUID</code>, translating UUID
+ * Editor for {@code java.util.UUID}, translating UUID
  * String representations into UUID objects and back.
  *
  * @author Juergen Hoeller
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java b/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java
index 36c185f919..486d13ed74 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java
@@ -125,7 +125,7 @@ public class ArgumentConvertingMethodInvoker extends MethodInvoker {
 	 * Actually find a method with matching parameter type, i.e. where each
 	 * argument value is assignable to the corresponding parameter type.
 	 * @param arguments the argument values to match against method parameters
-	 * @return a matching method, or <code>null</code> if none
+	 * @return a matching method, or {@code null} if none
 	 */
 	protected Method doFindMatchingMethod(Object[] arguments) {
 		TypeConverter converter = getTypeConverter();
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
index c9a369c639..2f7892a963 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
@@ -76,7 +76,7 @@ public class MutableSortDefinition implements SortDefinition, Serializable {
 	/**
 	 * Create a new MutableSortDefinition.
 	 * @param toggleAscendingOnSameProperty whether to toggle the ascending flag
-	 * if the same property gets set again (that is, <code>setProperty</code> gets
+	 * if the same property gets set again (that is, {@code setProperty} gets
 	 * called with already set property name again).
 	 */
 	public MutableSortDefinition(boolean toggleAscendingOnSameProperty) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java b/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java
index 2ed2c98955..9d09ca22a2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java
@@ -288,9 +288,9 @@ public class PagedListHolder<E> implements Serializable {
 
 
 	/**
-	 * Resort the list if necessary, i.e. if the current <code>sort</code> instance
-	 * isn't equal to the backed-up <code>sortUsed</code> instance.
-	 * <p>Calls <code>doSort</code> to trigger actual sorting.
+	 * Resort the list if necessary, i.e. if the current {@code sort} instance
+	 * isn't equal to the backed-up {@code sortUsed} instance.
+	 * <p>Calls {@code doSort} to trigger actual sorting.
 	 * @see #doSort
 	 */
 	public void resort() {
@@ -309,7 +309,7 @@ public class PagedListHolder<E> implements Serializable {
 	 * Can be overridden in subclasses, in particular in case of custom
 	 * extensions to the SortDefinition interface. Is allowed to return
 	 * null, which means that no sort state will be held, triggering
-	 * actual sorting for each <code>resort</code> call.
+	 * actual sorting for each {@code resort} call.
 	 * @param sort the current SortDefinition object
 	 * @return a deep copy of the SortDefinition object
 	 * @see MutableSortDefinition#MutableSortDefinition(SortDefinition)
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 bcf6c8931c..3f4abc6568 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
@@ -91,7 +91,7 @@ public class ResourceEditorRegistrar implements PropertyEditorRegistrar {
 
 
 	/**
-	 * Populate the given <code>registry</code> with the following resource editors:
+	 * Populate the given {@code registry} with the following resource editors:
 	 * ResourceEditor, InputStreamEditor, InputSourceEditor, FileEditor, URLEditor,
 	 * URIEditor, ClassEditor, ClassArrayEditor.
 	 * <p>If this registrar has been configured with a {@link ResourcePatternResolver},
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 5c821a4f80..24d271c47b 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
@@ -1310,7 +1310,7 @@ public class DefaultListableBeanFactoryTests {
 	 * Verifies that a dependency on a {@link FactoryBean} can <strong>not</strong>
 	 * be autowired <em>by name</em>, as &amp; is an illegal character in
 	 * Java method names. In other words, you can't name a method
-	 * <code>set&amp;FactoryBean(...)</code>.
+	 * {@code set&amp;FactoryBean(...)}.
 	 */
 	@Test(expected=TypeMismatchException.class)
 	public void testAutowireBeanWithFactoryBeanByName() {
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 2527180e03..fc2ad00022 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
@@ -112,7 +112,7 @@ public class EhCacheFactoryBean implements FactoryBean<Ehcache>, BeanNameAware,
 
 	/**
 	 * Set a CacheManager from which to retrieve a named Cache instance.
-	 * By default, <code>CacheManager.getInstance()</code> will be called.
+	 * By default, {@code CacheManager.getInstance()} will be called.
 	 * <p>Note that in particular for persistent caches, it is advisable to
 	 * properly handle the shutdown of the CacheManager: Set up a separate
 	 * EhCacheManagerFactoryBean and pass a reference to this bean property.
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 0e66d5ebe4..d47e3dcb92 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
@@ -99,7 +99,7 @@ public class JCacheCache implements Cache {
 
 	/**
 	 * Convert the given value from the internal store to a user value
-	 * returned from the get method (adapting <code>null</code>).
+	 * returned from the get method (adapting {@code null}).
 	 * @param storeValue the store value
 	 * @return the value to return to the user
 	 */
@@ -112,7 +112,7 @@ public class JCacheCache implements Cache {
 
 	/**
 	 * Convert the given user value, as passed into the put method,
-	 * to a value in the internal store (adapting <code>null</code>).
+	 * to a value in the internal store (adapting {@code null}).
 	 * @param userValue the given user value
 	 * @return the value to store
 	 */
diff --git a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
index 518d846c1e..4691c85e0b 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
@@ -26,7 +26,7 @@ import org.springframework.util.Assert;
 /**
  * Models a simple mail message, including data such as the from, to, cc, subject, and text fields.
  *
- * <p>Consider <code>JavaMailSender</code> and JavaMail <code>MimeMessages</code> for creating
+ * <p>Consider {@code JavaMailSender} and JavaMail {@code MimeMessages} for creating
  * more sophisticated messages, for example messages with attachments, special
  * character encodings, or personal names that accompany mail addresses.
  *
@@ -59,15 +59,15 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 
 
 	/**
-	 * Create a new <code>SimpleMailMessage</code>.
+	 * Create a new {@code SimpleMailMessage}.
 	 */
 	public SimpleMailMessage() {
 	}
 
 	/**
-	 * Copy constructor for creating a new <code>SimpleMailMessage</code> from the state
-	 * of an existing <code>SimpleMailMessage</code> instance.
-	 * @throws IllegalArgumentException if the supplied message is <code>null</code>
+	 * Copy constructor for creating a new {@code SimpleMailMessage} from the state
+	 * of an existing {@code SimpleMailMessage} instance.
+	 * @throws IllegalArgumentException if the supplied message is {@code null}
 	 */
 	public SimpleMailMessage(SimpleMailMessage original) {
 		Assert.notNull(original, "The 'original' message argument cannot be null");
@@ -167,8 +167,8 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 
 	/**
 	 * Copy the contents of this message to the given target message.
-	 * @param target the <code>MailMessage</code> to copy to
-	 * @throws IllegalArgumentException if the supplied <code>target</code> is <code>null</code>
+	 * @param target the {@code MailMessage} to copy to
+	 * @throws IllegalArgumentException if the supplied {@code target} is {@code null}
 	 */
 	public void copyTo(MailMessage target) {
 		Assert.notNull(target, "The 'target' message argument cannot be null");
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 e0fdfadf7e..f3ceba872e 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
@@ -27,9 +27,9 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
 /**
- * Spring-configurable <code>FileTypeMap</code> implementation that will read
+ * Spring-configurable {@code FileTypeMap} implementation that will read
  * MIME type to file extension mappings from a standard JavaMail MIME type
- * mapping file, using a standard <code>MimetypesFileTypeMap</code> underneath.
+ * mapping file, using a standard {@code MimetypesFileTypeMap} underneath.
  *
  * <p>The mapping file should be in the following format, as specified by the
  * Java Activation Framework:
@@ -38,18 +38,18 @@ import org.springframework.core.io.Resource;
  * # map text/html to .htm and .html files
  * text/html  html htm HTML HTM</pre>
  *
- * Lines starting with <code>#</code> are treated as comments and are ignored. All
+ * Lines starting with {@code #} are treated as comments and are ignored. All
  * other lines are treated as mappings. Each mapping line should contain the MIME
  * type as the first entry and then each file extension to map to that MIME type
  * as subsequent entries. Each entry is separated by spaces or tabs.
  *
- * <p>By default, the mappings in the <code>mime.types</code> file located in the
+ * <p>By default, the mappings in the {@code mime.types} file located in the
  * same package as this class are used, which cover many common file extensions
- * (in contrast to the out-of-the-box mappings in <code>activation.jar</code>).
- * This can be overridden using the <code>mappingLocation</code> property.
+ * (in contrast to the out-of-the-box mappings in {@code activation.jar}).
+ * This can be overridden using the {@code mappingLocation} property.
  *
- * <p>Additional mappings can be added via the <code>mappings</code> bean property,
- * as lines that follow the <code>mime.types<code> file format.
+ * <p>Additional mappings can be added via the {@code mappings} bean property,
+ * as lines that follow the {@code mime.types} file format.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -61,7 +61,7 @@ import org.springframework.core.io.Resource;
 public class ConfigurableMimeFileTypeMap extends FileTypeMap implements InitializingBean {
 
 	/**
-	 * The <code>Resource</code> to load the mapping file from.
+	 * The {@code Resource} to load the mapping file from.
 	 */
 	private Resource mappingLocation = new ClassPathResource("mime.types", getClass());
 
@@ -72,16 +72,16 @@ public class ConfigurableMimeFileTypeMap extends FileTypeMap implements Initiali
 
 	/**
 	 * The delegate FileTypeMap, compiled from the mappings in the mapping file
-	 * and the entries in the <code>mappings</code> property.
+	 * and the entries in the {@code mappings} property.
 	 */
 	private FileTypeMap fileTypeMap;
 
 
 	/**
-	 * Specify the <code>Resource</code> from which mappings are loaded.
-	 * <p>Needs to follow the <code>mime.types<code> file format, as specified
+	 * Specify the {@code Resource} from which mappings are loaded.
+	 * <p>Needs to follow the {@code mime.types} file format, as specified
 	 * by the Java Activation Framework, containing lines such as:<br>
-	 * <code>text/html  html htm HTML HTM</code>
+	 * {@code text/html  html htm HTML HTM}
 	 */
 	public void setMappingLocation(Resource mappingLocation) {
 		this.mappingLocation = mappingLocation;
@@ -89,9 +89,9 @@ public class ConfigurableMimeFileTypeMap extends FileTypeMap implements Initiali
 
 	/**
 	 * Specify additional MIME type mappings as lines that follow the
-	 * <code>mime.types<code> file format, as specified by the
+	 * {@code mime.types} file format, as specified by the
 	 * Java Activation Framework, for example:<br>
-	 * <code>text/html  html htm HTML HTM</code>
+	 * {@code text/html  html htm HTML HTM}
 	 */
 	public void setMappings(String[] mappings) {
 		this.mappings = mappings;
@@ -107,7 +107,7 @@ public class ConfigurableMimeFileTypeMap extends FileTypeMap implements Initiali
 
 	/**
 	 * Return the delegate FileTypeMap, compiled from the mappings in the mapping file
-	 * and the entries in the <code>mappings</code> property.
+	 * and the entries in the {@code mappings} property.
 	 * @see #setMappingLocation
 	 * @see #setMappings
 	 * @see #createFileTypeMap
@@ -131,8 +131,8 @@ public class ConfigurableMimeFileTypeMap extends FileTypeMap implements Initiali
 	 * <p>The default implementation creates an Activation Framework {@link MimetypesFileTypeMap},
 	 * passing in an InputStream from the mapping resource (if any) and registering
 	 * the mapping lines programmatically.
-	 * @param mappingLocation a <code>mime.types</code> mapping resource (can be <code>null</code>)
-	 * @param mappings MIME type mapping lines (can be <code>null</code>)
+	 * @param mappingLocation a {@code mime.types} mapping resource (can be {@code null})
+	 * @param mappings MIME type mapping lines (can be {@code null})
 	 * @return the compiled FileTypeMap
 	 * @throws IOException if resource access failed
 	 * @see javax.activation.MimetypesFileTypeMap#MimetypesFileTypeMap(java.io.InputStream)
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java
index 2647d76ef4..057d6f78e2 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java
@@ -24,7 +24,7 @@ import javax.mail.internet.InternetAddress;
 import org.springframework.util.StringUtils;
 
 /**
- * Editor for <code>java.mail.internet.InternetAddress</code>,
+ * Editor for {@code java.mail.internet.InternetAddress},
  * to directly populate an InternetAddress property.
  *
  * <p>Expects the same syntax as InternetAddress's constructor with
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java
index ea2a0efbd0..bae5d7fb96 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java
@@ -49,8 +49,8 @@ import org.springframework.mail.MailSender;
  * {@link org.springframework.mail.MailSender} client, but still straightforward
  * compared to traditional JavaMail code: Just let {@link #createMimeMessage()}
  * return a plain {@link MimeMessage} created with a
- * <code>Session.getInstance(new Properties())</code> call, and check the passed-in
- * messages in your mock implementations of the various <code>send</code> methods.
+ * {@code Session.getInstance(new Properties())} call, and check the passed-in
+ * messages in your mock implementations of the various {@code send} methods.
  *
  * @author Juergen Hoeller
  * @since 07.10.2003
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
index 8c4557974c..ed9151bfdf 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
@@ -51,8 +51,8 @@ import org.springframework.util.Assert;
  * specified, possibly pulled from an application server's JNDI environment.
  *
  * <p>Non-default properties in this object will always override the settings
- * in the JavaMail <code>Session</code>. Note that if overriding all values locally,
- * there is no added value in setting a pre-configured <code>Session</code>.
+ * in the JavaMail {@code Session}. Note that if overriding all values locally,
+ * there is no added value in setting a pre-configured {@code Session}.
  *
  * @author Dmitriy Kopylenko
  * @author Juergen Hoeller
@@ -97,7 +97,7 @@ public class JavaMailSenderImpl implements JavaMailSender {
 
 
 	/**
-	 * Create a new instance of the <code>JavaMailSenderImpl</code> class.
+	 * Create a new instance of the {@code JavaMailSenderImpl} class.
 	 * <p>Initializes the {@link #setDefaultFileTypeMap "defaultFileTypeMap"}
 	 * property with a default {@link ConfigurableMimeFileTypeMap}.
 	 */
@@ -109,8 +109,8 @@ public class JavaMailSenderImpl implements JavaMailSender {
 
 
 	/**
-	 * Set JavaMail properties for the <code>Session</code>.
-	 * <p>A new <code>Session</code> will be created with those properties.
+	 * Set JavaMail properties for the {@code Session}.
+	 * <p>A new {@code Session} will be created with those properties.
 	 * Use either this method or {@link #setSession}, but not both.
 	 * <p>Non-default properties in this instance will override given
 	 * JavaMail properties.
@@ -133,11 +133,11 @@ public class JavaMailSenderImpl implements JavaMailSender {
 	}
 
 	/**
-	 * Set the JavaMail <code>Session</code>, possibly pulled from JNDI.
-	 * <p>Default is a new <code>Session</code> without defaults, that is
+	 * Set the JavaMail {@code Session}, possibly pulled from JNDI.
+	 * <p>Default is a new {@code Session} without defaults, that is
 	 * completely configured via this instance's properties.
-	 * <p>If using a pre-configured <code>Session</code>, non-default properties
-	 * in this instance will override the settings in the <code>Session</code>.
+	 * <p>If using a pre-configured {@code Session}, non-default properties
+	 * in this instance will override the settings in the {@code Session}.
 	 * @see #setJavaMailProperties
 	 */
 	public synchronized void setSession(Session session) {
@@ -146,7 +146,7 @@ public class JavaMailSenderImpl implements JavaMailSender {
 	}
 
 	/**
-	 * Return the JavaMail <code>Session</code>,
+	 * Return the JavaMail {@code Session},
 	 * lazily initializing it if hasn't been specified explicitly.
 	 */
 	public synchronized Session getSession() {
@@ -203,11 +203,11 @@ public class JavaMailSenderImpl implements JavaMailSender {
 
 	/**
 	 * Set the username for the account at the mail host, if any.
-	 * <p>Note that the underlying JavaMail <code>Session</code> has to be
-	 * configured with the property <code>"mail.smtp.auth"</code> set to
-	 * <code>true</code>, else the specified username will not be sent to the
+	 * <p>Note that the underlying JavaMail {@code Session} has to be
+	 * configured with the property {@code "mail.smtp.auth"} set to
+	 * {@code true}, else the specified username will not be sent to the
 	 * mail server by the JavaMail runtime. If you are not explicitly passing
-	 * in a <code>Session</code> to use, simply specify this setting via
+	 * in a {@code Session} to use, simply specify this setting via
 	 * {@link #setJavaMailProperties}.
 	 * @see #setSession
 	 * @see #setPassword
@@ -225,11 +225,11 @@ public class JavaMailSenderImpl implements JavaMailSender {
 
 	/**
 	 * Set the password for the account at the mail host, if any.
-	 * <p>Note that the underlying JavaMail <code>Session</code> has to be
-	 * configured with the property <code>"mail.smtp.auth"</code> set to
-	 * <code>true</code>, else the specified password will not be sent to the
+	 * <p>Note that the underlying JavaMail {@code Session} has to be
+	 * configured with the property {@code "mail.smtp.auth"} set to
+	 * {@code true}, else the specified password will not be sent to the
 	 * mail server by the JavaMail runtime. If you are not explicitly passing
-	 * in a <code>Session</code> to use, simply specify this setting via
+	 * in a {@code Session} to use, simply specify this setting via
 	 * {@link #setJavaMailProperties}.
 	 * @see #setSession
 	 * @see #setUsername
@@ -256,7 +256,7 @@ public class JavaMailSenderImpl implements JavaMailSender {
 
 	/**
 	 * Return the default encoding for {@link MimeMessage MimeMessages},
-	 * or <code>null</code> if none.
+	 * or {@code null} if none.
 	 */
 	public String getDefaultEncoding() {
 		return this.defaultEncoding;
@@ -265,14 +265,14 @@ public class JavaMailSenderImpl implements JavaMailSender {
 	/**
 	 * Set the default Java Activation {@link FileTypeMap} to use for
 	 * {@link MimeMessage MimeMessages} created by this instance.
-	 * <p>A <code>FileTypeMap</code> specified here will be autodetected by
+	 * <p>A {@code FileTypeMap} specified here will be autodetected by
 	 * {@link MimeMessageHelper}, avoiding the need to specify the
-	 * <code>FileTypeMap</code> for each <code>MimeMessageHelper</code> instance.
+	 * {@code FileTypeMap} for each {@code MimeMessageHelper} instance.
 	 * <p>For example, you can specify a custom instance of Spring's
 	 * {@link ConfigurableMimeFileTypeMap} here. If not explicitly specified,
-	 * a default <code>ConfigurableMimeFileTypeMap</code> will be used, containing
+	 * a default {@code ConfigurableMimeFileTypeMap} will be used, containing
 	 * an extended set of MIME type mappings (as defined by the
-	 * <code>mime.types</code> file contained in the Spring jar).
+	 * {@code mime.types} file contained in the Spring jar).
 	 * @see MimeMessageHelper#setFileTypeMap
 	 */
 	public void setDefaultFileTypeMap(FileTypeMap defaultFileTypeMap) {
@@ -281,7 +281,7 @@ public class JavaMailSenderImpl implements JavaMailSender {
 
 	/**
 	 * Return the default Java Activation {@link FileTypeMap} for
-	 * {@link MimeMessage MimeMessages}, or <code>null</code> if none.
+	 * {@link MimeMessage MimeMessages}, or {@code null} if none.
 	 */
 	public FileTypeMap getDefaultFileTypeMap() {
 		return this.defaultFileTypeMap;
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
index bef2498eea..840320741b 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
@@ -355,7 +355,7 @@ public class MimeMessageHelper {
 	/**
 	 * Set the given MimeMultipart objects for use by this MimeMessageHelper.
 	 * @param root the root MimeMultipart object, which attachments will be added to;
-	 * or <code>null</code> to indicate no multipart at all
+	 * or {@code null} to indicate no multipart at all
 	 * @param main the main MimeMultipart object, which text(s) and inline elements
 	 * will be added to (can be the same as the root multipart object, or an element
 	 * nested underneath the root multipart element)
@@ -420,7 +420,7 @@ public class MimeMessageHelper {
 	 * Determine the default encoding for the given MimeMessage.
 	 * @param mimeMessage the passed-in MimeMessage
 	 * @return the default encoding associated with the MimeMessage,
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 */
 	protected String getDefaultEncoding(MimeMessage mimeMessage) {
 		if (mimeMessage instanceof SmartMimeMessage) {
@@ -456,12 +456,12 @@ public class MimeMessageHelper {
 	}
 
 	/**
-	 * Set the Java Activation Framework <code>FileTypeMap</code> to use
+	 * Set the Java Activation Framework {@code FileTypeMap} to use
 	 * for determining the content type of inline content and attachments
 	 * that get added to the message.
-	 * <p>Default is the <code>FileTypeMap</code> that the underlying
+	 * <p>Default is the {@code FileTypeMap} that the underlying
 	 * MimeMessage carries, if any, or the Activation Framework's default
-	 * <code>FileTypeMap</code> instance else.
+	 * {@code FileTypeMap} instance else.
 	 * @see #addInline
 	 * @see #addAttachment
 	 * @see #getDefaultFileTypeMap(javax.mail.internet.MimeMessage)
@@ -474,7 +474,7 @@ public class MimeMessageHelper {
 	}
 
 	/**
-	 * Return the <code>FileTypeMap</code> used by this MimeMessageHelper.
+	 * Return the {@code FileTypeMap} used by this MimeMessageHelper.
 	 */
 	public FileTypeMap getFileTypeMap() {
 		return this.fileTypeMap;
@@ -485,7 +485,7 @@ public class MimeMessageHelper {
 	 * Set whether to validate all addresses which get passed to this helper.
 	 * Default is "false".
 	 * <p>Note that this is by default just available for JavaMail >= 1.3.
-	 * You can override the default <code>validateAddress method</code> for
+	 * You can override the default {@code validateAddress method} for
 	 * validation on older JavaMail versions (or for custom validation).
 	 * @see #validateAddress
 	 */
@@ -503,7 +503,7 @@ public class MimeMessageHelper {
 	/**
 	 * Validate the given mail address.
 	 * Called by all of MimeMessageHelper's address setters and adders.
-	 * <p>Default implementation invokes <code>InternetAddress.validate()</code>,
+	 * <p>Default implementation invokes {@code InternetAddress.validate()},
 	 * provided that address validation is activated for the helper instance.
 	 * <p>Note that this method will just work on JavaMail >= 1.3. You can override
 	 * it for validation on older JavaMail versions or for custom validation.
@@ -730,7 +730,7 @@ public class MimeMessageHelper {
 
 	/**
 	 * Set the sent-date of the message.
-	 * @param sentDate the date to set (never <code>null</code>)
+	 * @param sentDate the date to set (never {@code null})
 	 * @throws MessagingException in case of errors
 	 */
 	public void setSentDate(Date sentDate) throws MessagingException {
@@ -758,7 +758,7 @@ public class MimeMessageHelper {
 	 * Set the given text directly as content in non-multipart mode
 	 * or as default body part in multipart mode.
 	 * Always applies the default content type "text/plain".
-	 * <p><b>NOTE:</b> Invoke {@link #addInline} <i>after</i> <code>setText</code>;
+	 * <p><b>NOTE:</b> Invoke {@link #addInline} <i>after</i> {@code setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param text the text for the message
 	 * @throws MessagingException in case of errors
@@ -771,7 +771,7 @@ public class MimeMessageHelper {
 	 * Set the given text directly as content in non-multipart mode
 	 * or as default body part in multipart mode.
 	 * The "html" flag determines the content type to apply.
-	 * <p><b>NOTE:</b> Invoke {@link #addInline} <i>after</i> <code>setText</code>;
+	 * <p><b>NOTE:</b> Invoke {@link #addInline} <i>after</i> {@code setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param text the text for the message
 	 * @param html whether to apply content type "text/html" for an
@@ -798,7 +798,7 @@ public class MimeMessageHelper {
 	/**
 	 * Set the given plain text and HTML text as alternatives, offering
 	 * both options to the email client. Requires multipart mode.
-	 * <p><b>NOTE:</b> Invoke {@link #addInline} <i>after</i> <code>setText</code>;
+	 * <p><b>NOTE:</b> Invoke {@link #addInline} <i>after</i> {@code setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param plainText the plain text for the message
 	 * @param htmlText the HTML text for the message
@@ -860,16 +860,16 @@ public class MimeMessageHelper {
 
 	/**
 	 * Add an inline element to the MimeMessage, taking the content from a
-	 * <code>javax.activation.DataSource</code>.
+	 * {@code javax.activation.DataSource}.
 	 * <p>Note that the InputStream returned by the DataSource implementation
 	 * needs to be a <i>fresh one on each call</i>, as JavaMail will invoke
-	 * <code>getInputStream()</code> multiple times.
-	 * <p><b>NOTE:</b> Invoke <code>addInline</code> <i>after</i> {@link #setText};
+	 * {@code getInputStream()} multiple times.
+	 * <p><b>NOTE:</b> Invoke {@code addInline} <i>after</i> {@link #setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param contentId the content ID to use. Will end up as "Content-ID" header
 	 * in the body part, surrounded by angle brackets: e.g. "myId" -> "&lt;myId&gt;".
 	 * Can be referenced in HTML source via src="cid:myId" expressions.
-	 * @param dataSource the <code>javax.activation.DataSource</code> to take
+	 * @param dataSource the {@code javax.activation.DataSource} to take
 	 * the content from, determining the InputStream and the content type
 	 * @throws MessagingException in case of errors
 	 * @see #addInline(String, java.io.File)
@@ -889,11 +889,11 @@ public class MimeMessageHelper {
 
 	/**
 	 * Add an inline element to the MimeMessage, taking the content from a
-	 * <code>java.io.File</code>.
+	 * {@code java.io.File}.
 	 * <p>The content type will be determined by the name of the given
 	 * content file. Do not use this for temporary files with arbitrary
 	 * filenames (possibly ending in ".tmp" or the like)!
-	 * <p><b>NOTE:</b> Invoke <code>addInline</code> <i>after</i> {@link #setText};
+	 * <p><b>NOTE:</b> Invoke {@code addInline} <i>after</i> {@link #setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param contentId the content ID to use. Will end up as "Content-ID" header
 	 * in the body part, surrounded by angle brackets: e.g. "myId" -> "&lt;myId&gt;".
@@ -913,14 +913,14 @@ public class MimeMessageHelper {
 
 	/**
 	 * Add an inline element to the MimeMessage, taking the content from a
-	 * <code>org.springframework.core.io.Resource</code>.
+	 * {@code org.springframework.core.io.Resource}.
 	 * <p>The content type will be determined by the name of the given
 	 * content file. Do not use this for temporary files with arbitrary
 	 * filenames (possibly ending in ".tmp" or the like)!
 	 * <p>Note that the InputStream returned by the Resource implementation
 	 * needs to be a <i>fresh one on each call</i>, as JavaMail will invoke
-	 * <code>getInputStream()</code> multiple times.
-	 * <p><b>NOTE:</b> Invoke <code>addInline</code> <i>after</i> {@link #setText};
+	 * {@code getInputStream()} multiple times.
+	 * <p><b>NOTE:</b> Invoke {@code addInline} <i>after</i> {@link #setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param contentId the content ID to use. Will end up as "Content-ID" header
 	 * in the body part, surrounded by angle brackets: e.g. "myId" -> "&lt;myId&gt;".
@@ -939,14 +939,14 @@ public class MimeMessageHelper {
 
 	/**
 	 * Add an inline element to the MimeMessage, taking the content from an
-	 * <code>org.springframework.core.InputStreamResource</code>, and
+	 * {@code org.springframework.core.InputStreamResource}, and
 	 * specifying the content type explicitly.
 	 * <p>You can determine the content type for any given filename via a Java
 	 * Activation Framework's FileTypeMap, for example the one held by this helper.
 	 * <p>Note that the InputStream returned by the InputStreamSource implementation
 	 * needs to be a <i>fresh one on each call</i>, as JavaMail will invoke
-	 * <code>getInputStream()</code> multiple times.
-	 * <p><b>NOTE:</b> Invoke <code>addInline</code> <i>after</i> <code>setText</code>;
+	 * {@code getInputStream()} multiple times.
+	 * <p><b>NOTE:</b> Invoke {@code addInline} <i>after</i> {@code setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param contentId the content ID to use. Will end up as "Content-ID" header
 	 * in the body part, surrounded by angle brackets: e.g. "myId" -> "&lt;myId&gt;".
@@ -974,13 +974,13 @@ public class MimeMessageHelper {
 
 	/**
 	 * Add an attachment to the MimeMessage, taking the content from a
-	 * <code>javax.activation.DataSource</code>.
+	 * {@code javax.activation.DataSource}.
 	 * <p>Note that the InputStream returned by the DataSource implementation
 	 * needs to be a <i>fresh one on each call</i>, as JavaMail will invoke
-	 * <code>getInputStream()</code> multiple times.
+	 * {@code getInputStream()} multiple times.
 	 * @param attachmentFilename the name of the attachment as it will
 	 * appear in the mail (the content type will be determined by this)
-	 * @param dataSource the <code>javax.activation.DataSource</code> to take
+	 * @param dataSource the {@code javax.activation.DataSource} to take
 	 * the content from, determining the InputStream and the content type
 	 * @throws MessagingException in case of errors
 	 * @see #addAttachment(String, org.springframework.core.io.InputStreamSource)
@@ -998,7 +998,7 @@ public class MimeMessageHelper {
 
 	/**
 	 * Add an attachment to the MimeMessage, taking the content from a
-	 * <code>java.io.File</code>.
+	 * {@code java.io.File}.
 	 * <p>The content type will be determined by the name of the given
 	 * content file. Do not use this for temporary files with arbitrary
 	 * filenames (possibly ending in ".tmp" or the like)!
@@ -1018,13 +1018,13 @@ public class MimeMessageHelper {
 
 	/**
 	 * Add an attachment to the MimeMessage, taking the content from an
-	 * <code>org.springframework.core.io.InputStreamResource</code>.
+	 * {@code org.springframework.core.io.InputStreamResource}.
 	 * <p>The content type will be determined by the given filename for
 	 * the attachment. Thus, any content source will be fine, including
 	 * temporary files with arbitrary filenames.
 	 * <p>Note that the InputStream returned by the InputStreamSource
 	 * implementation needs to be a <i>fresh one on each call</i>, as
-	 * JavaMail will invoke <code>getInputStream()</code> multiple times.
+	 * JavaMail will invoke {@code getInputStream()} multiple times.
 	 * @param attachmentFilename the name of the attachment as it will
 	 * appear in the mail
 	 * @param inputStreamSource the resource to take the content from
@@ -1043,10 +1043,10 @@ public class MimeMessageHelper {
 
 	/**
 	 * Add an attachment to the MimeMessage, taking the content from an
-	 * <code>org.springframework.core.io.InputStreamResource</code>.
+	 * {@code org.springframework.core.io.InputStreamResource}.
 	 * <p>Note that the InputStream returned by the InputStreamSource
 	 * implementation needs to be a <i>fresh one on each call</i>, as
-	 * JavaMail will invoke <code>getInputStream()</code> multiple times.
+	 * JavaMail will invoke {@code getInputStream()} multiple times.
 	 * @param attachmentFilename the name of the attachment as it will
 	 * appear in the mail
 	 * @param inputStreamSource the resource to take the content from
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java
index 8ac0e8be2e..dd6417b182 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java
@@ -21,7 +21,7 @@ import javax.mail.internet.MimeMessage;
 /**
  * Callback interface for the preparation of JavaMail MIME messages.
  *
- * <p>The corresponding <code>send</code> methods of {@link JavaMailSender}
+ * <p>The corresponding {@code send} methods of {@link JavaMailSender}
  * will take care of the actual creation of a {@link MimeMessage} instance,
  * and of proper exception conversion.
  *
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java
index 6a3bcd4957..2e46fa1029 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java
@@ -45,8 +45,8 @@ class SmartMimeMessage extends MimeMessage {
 	/**
 	 * Create a new SmartMimeMessage.
 	 * @param session the JavaMail Session to create the message for
-	 * @param defaultEncoding the default encoding, or <code>null</code> if none
-	 * @param defaultFileTypeMap the default FileTypeMap, or <code>null</code> if none
+	 * @param defaultEncoding the default encoding, or {@code null} if none
+	 * @param defaultFileTypeMap the default FileTypeMap, or {@code null} if none
 	 */
 	public SmartMimeMessage(Session session, String defaultEncoding, FileTypeMap defaultFileTypeMap) {
 		super(session);
@@ -56,14 +56,14 @@ class SmartMimeMessage extends MimeMessage {
 
 
 	/**
-	 * Return the default encoding of this message, or <code>null</code> if none.
+	 * Return the default encoding of this message, or {@code null} if none.
 	 */
 	public final String getDefaultEncoding() {
 		return this.defaultEncoding;
 	}
 
 	/**
-	 * Return the default FileTypeMap of this message, or <code>null</code> if none.
+	 * Return the default FileTypeMap of this message, or {@code null} if none.
 	 */
 	public final FileTypeMap getDefaultFileTypeMap() {
 		return this.defaultFileTypeMap;
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java
index 34a61b8f17..25931464c9 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java
@@ -179,7 +179,7 @@ public class ScheduledTimerListener {
 	 * <p><b>Note:</b> A period of 0 (for example as fixed delay) <i>is</i>
 	 * supported, because the CommonJ specification defines this as a legal value.
 	 * Hence a value of 0 will result in immediate re-execution after a job has
-	 * finished (not in one-time execution like with <code>java.util.Timer</code>).
+	 * finished (not in one-time execution like with {@code java.util.Timer}).
 	 * @see #setFixedRate
 	 * @see #isOneTimeTask()
 	 * @see commonj.timers.TimerManager#schedule(commonj.timers.TimerListener, long, long)
@@ -197,7 +197,7 @@ public class ScheduledTimerListener {
 
 	/**
 	 * Is this task only ever going to execute once?
-	 * @return <code>true</code> if this task is only ever going to execute once
+	 * @return {@code true} if this task is only ever going to execute once
 	 * @see #getPeriod()
 	 */
 	public boolean isOneTimeTask() {
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
index 46db6ee2c0..2eae87785d 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
@@ -74,8 +74,8 @@ public abstract class TimerManagerAccessor extends JndiLocatorSupport
 	 * <p>Default is "false", i.e. managing an independent TimerManager instance.
 	 * This is what the CommonJ specification suggests that application servers
 	 * are supposed to offer via JNDI lookups, typically declared as a
-	 * <code>resource-ref</code> of type <code>commonj.timers.TimerManager</code>
-	 * in <code>web.xml<code>, with <code>res-sharing-scope</code> set to 'Unshareable'.
+	 * {@code resource-ref} of type {@code commonj.timers.TimerManager}
+	 * in {@code web.xml}, with {@code res-sharing-scope} set to 'Unshareable'.
 	 * <p>Switch this flag to "true" if you are obtaining a shared TimerManager,
 	 * typically through specifying the JNDI location of a TimerManager that
 	 * has been explicitly declared as 'Shareable'. Note that WebLogic's
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 cee2683dce..a8beff8eba 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
@@ -33,7 +33,7 @@ import org.springframework.util.Assert;
  * Convenience subclass of Quartz's {@link org.quartz.CronTrigger} class,
  * making bean-style usage easier.
  *
- * <p><code>CronTrigger</code> itself is already a JavaBean but lacks sensible defaults.
+ * <p>{@code CronTrigger} itself is already a JavaBean but lacks sensible defaults.
  * This class uses the Spring bean name as job name, the Quartz default group
  * ("DEFAULT") as job group, the current time as start time, and indefinite
  * repetition, if not specified.
@@ -44,7 +44,7 @@ import org.springframework.util.Assert;
  * instead of registering the JobDetail separately.
  *
  * <p><b>NOTE: This convenience subclass does not work against Quartz 2.0.</b>
- * Use Quartz 2.0's native <code>JobDetailImpl</code> class or the new Quartz 2.0
+ * 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.
@@ -90,7 +90,7 @@ public class CronTriggerBean extends CronTrigger
 	/**
 	 * Set the misfire instruction via the name of the corresponding
 	 * constant in the {@link org.quartz.CronTrigger} class.
-	 * Default is <code>MISFIRE_INSTRUCTION_SMART_POLICY</code>.
+	 * Default is {@code MISFIRE_INSTRUCTION_SMART_POLICY}.
 	 * @see org.quartz.CronTrigger#MISFIRE_INSTRUCTION_FIRE_ONCE_NOW
 	 * @see org.quartz.CronTrigger#MISFIRE_INSTRUCTION_DO_NOTHING
 	 * @see org.quartz.Trigger#MISFIRE_INSTRUCTION_SMART_POLICY
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 b205e6d73a..101c3fdf04 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
@@ -40,7 +40,7 @@ import org.springframework.util.ReflectionUtils;
  * A Spring {@link FactoryBean} for creating a Quartz {@link org.quartz.CronTrigger}
  * instance, supporting bean-style usage for trigger configuration.
  *
- * <p><code>CronTrigger(Impl)</code> itself is already a JavaBean but lacks sensible defaults.
+ * <p>{@code CronTrigger(Impl)} itself is already a JavaBean but lacks sensible defaults.
  * This class uses the Spring bean name as job name, the Quartz default group ("DEFAULT")
  * as job group, the current time as start time, and indefinite repetition, if not specified.
  *
@@ -58,9 +58,9 @@ import org.springframework.util.ReflectionUtils;
  * @see #setGroup
  * @see #setStartDelay
  * @see #setJobDetail
- * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setTriggers
- * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setJobDetails
- * @see org.springframework.scheduling.quartz.SimpleTriggerBean
+ * @see SchedulerFactoryBean#setTriggers
+ * @see SchedulerFactoryBean#setJobDetails
+ * @see SimpleTriggerBean
  */
 public class CronTriggerFactoryBean implements FactoryBean<CronTrigger>, BeanNameAware, InitializingBean {
 
@@ -182,7 +182,7 @@ public class CronTriggerFactoryBean implements FactoryBean<CronTrigger>, BeanNam
 	/**
 	 * Set the misfire instruction via the name of the corresponding
 	 * constant in the {@link org.quartz.CronTrigger} class.
-	 * Default is <code>MISFIRE_INSTRUCTION_SMART_POLICY</code>.
+	 * Default is {@code MISFIRE_INSTRUCTION_SMART_POLICY}.
 	 * @see org.quartz.CronTrigger#MISFIRE_INSTRUCTION_FIRE_ONCE_NOW
 	 * @see org.quartz.CronTrigger#MISFIRE_INSTRUCTION_DO_NOTHING
 	 * @see org.quartz.Trigger#MISFIRE_INSTRUCTION_SMART_POLICY
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java
index dcbfdc12dc..0971d96d54 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java
@@ -49,7 +49,7 @@ public interface JobDetailAwareTrigger {
 
 	/**
 	 * Return the JobDetail that this Trigger is associated with.
-	 * @return the associated JobDetail, or <code>null</code> if none
+	 * @return the associated JobDetail, or {@code null} if none
 	 */
 	JobDetail getJobDetail();
 
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 34c8395c93..44830fea5d 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
@@ -31,12 +31,12 @@ import org.springframework.context.ApplicationContextAware;
  * Convenience subclass of Quartz's {@link org.quartz.JobDetail} class,
  * making bean-style usage easier.
  *
- * <p><code>JobDetail</code> itself is already a JavaBean but lacks
+ * <p>{@code JobDetail} itself is already a JavaBean but lacks
  * 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: This convenience subclass does not work against Quartz 2.0.</b>
- * Use Quartz 2.0's native <code>JobDetailImpl</code> class or the new Quartz 2.0
+ * 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.
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 921a5e03d4..81d370646a 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
@@ -35,7 +35,7 @@ import org.springframework.context.ApplicationContextAware;
  * A Spring {@link FactoryBean} for creating a Quartz {@link org.quartz.JobDetail}
  * instance, supporting bean-style usage for JobDetail configuration.
  *
- * <p><code>JobDetail(Impl)</code> itself is already a JavaBean but lacks
+ * <p>{@code JobDetail(Impl)} itself is already a JavaBean but lacks
  * sensible defaults. This class uses the Spring bean name as job name,
  * and the Quartz default group ("DEFAULT") as job group if not specified.
  *
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 71bcd7852c..e0307f6e25 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
@@ -83,8 +83,8 @@ public class LocalTaskExecutorThreadPool implements ThreadPool {
 		// The present implementation always returns 1, making Quartz (1.6)
 		// always schedule any tasks that it feels like scheduling.
 		// This could be made smarter for specific TaskExecutors,
-		// for example calling <code>getMaximumPoolSize() - getActiveCount()</code>
-		// on a <code>java.util.concurrent.ThreadPoolExecutor</code>.
+		// for example calling {@code getMaximumPoolSize() - getActiveCount()}
+		// on a {@code java.util.concurrent.ThreadPoolExecutor}.
 		return 1;
 	}
 
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 6b193b43d5..7886278857 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
@@ -92,7 +92,7 @@ public abstract class QuartzJobBean implements Job {
 
 	/**
 	 * This implementation applies the passed-in job data map as bean property
-	 * values, and delegates to <code>executeInternal</code> afterwards.
+	 * values, and delegates to {@code executeInternal} afterwards.
 	 * @see #executeInternal
 	 */
 	public final void execute(JobExecutionContext context) throws JobExecutionException {
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 07e85c514c..9c65590231 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
@@ -333,8 +333,8 @@ public abstract class SchedulerAccessor implements ResourceLoaderAware {
 	 * Add the given job to the Scheduler, if it doesn't already exist.
 	 * Overwrites the job in any case if "overwriteExistingJobs" is set.
 	 * @param jobDetail the job to add
-	 * @return <code>true</code> if the job was actually added,
-	 * <code>false</code> if it already existed before
+	 * @return {@code true} if the job was actually added,
+	 * {@code false} if it already existed before
 	 * @see #setOverwriteExistingJobs
 	 */
 	private boolean addJobToScheduler(JobDetail jobDetail) throws SchedulerException {
@@ -351,8 +351,8 @@ public abstract class SchedulerAccessor implements ResourceLoaderAware {
 	 * Add the given trigger to the Scheduler, if it doesn't already exist.
 	 * Overwrites the trigger in any case if "overwriteExistingJobs" is set.
 	 * @param trigger the trigger to add
-	 * @return <code>true</code> if the trigger was actually added,
-	 * <code>false</code> if it already existed before
+	 * @return {@code true} if the trigger was actually added,
+	 * {@code false} if it already existed before
 	 * @see #setOverwriteExistingJobs
 	 */
 	private boolean addTriggerToScheduler(Trigger trigger) throws SchedulerException {
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 966ad09b74..17940bece4 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
@@ -57,7 +57,7 @@ import org.springframework.util.CollectionUtils;
  *
  * <p>For dynamic registration of jobs at runtime, use a bean reference to
  * this SchedulerFactoryBean to get direct access to the Quartz Scheduler
- * (<code>org.quartz.Scheduler</code>). This allows you to create new jobs
+ * ({@code org.quartz.Scheduler}). This allows you to create new jobs
  * and triggers, and also to control and monitor the entire Scheduler.
  *
  * <p>Note that Quartz instantiates a new Job for each execution, in
@@ -201,7 +201,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
 	/**
 	 * Set the Quartz SchedulerFactory implementation to use.
 	 * <p>Default is StdSchedulerFactory, reading in the standard
-	 * <code>quartz.properties</code> from <code>quartz.jar</code>.
+	 * {@code quartz.properties} from {@code quartz.jar}.
 	 * To use custom Quartz properties, specify the "configLocation"
 	 * or "quartzProperties" bean property on this FactoryBean.
 	 * @see org.quartz.impl.StdSchedulerFactory
@@ -571,7 +571,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
 	/**
 	 * Create the Scheduler instance for the given factory and scheduler name.
 	 * Called by {@link #afterPropertiesSet}.
-	 * <p>The default implementation invokes SchedulerFactory's <code>getScheduler</code>
+	 * <p>The default implementation invokes SchedulerFactory's {@code getScheduler}
 	 * method. Can be overridden for custom Scheduler creation.
 	 * @param schedulerFactory the factory to create the Scheduler with
 	 * @param schedulerName the name of the scheduler to create
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 ca9d44c658..045478804f 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
@@ -32,7 +32,7 @@ import org.springframework.core.Constants;
  * Convenience subclass of Quartz's {@link org.quartz.SimpleTrigger} class,
  * making bean-style usage easier.
  *
- * <p><code>SimpleTrigger</code> itself is already a JavaBean but lacks sensible defaults.
+ * <p>{@code SimpleTrigger} itself is already a JavaBean but lacks sensible defaults.
  * This class uses the Spring bean name as job name, the Quartz default group
  * ("DEFAULT") as job group, the current time as start time, and indefinite
  * repetition, if not specified.
@@ -43,7 +43,7 @@ import org.springframework.core.Constants;
  * instead of registering the JobDetail separately.
  *
  * <p><b>NOTE: This convenience subclass does not work against Quartz 2.0.</b>
- * Use Quartz 2.0's native <code>JobDetailImpl</code> class or the new Quartz 2.0
+ * 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.
@@ -93,7 +93,7 @@ public class SimpleTriggerBean extends SimpleTrigger
 	/**
 	 * Set the misfire instruction via the name of the corresponding
 	 * constant in the {@link org.quartz.SimpleTrigger} class.
-	 * Default is <code>MISFIRE_INSTRUCTION_SMART_POLICY</code>.
+	 * Default is {@code MISFIRE_INSTRUCTION_SMART_POLICY}.
 	 * @see org.quartz.SimpleTrigger#MISFIRE_INSTRUCTION_FIRE_NOW
 	 * @see org.quartz.SimpleTrigger#MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_EXISTING_COUNT
 	 * @see org.quartz.SimpleTrigger#MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_REMAINING_COUNT
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 5baffd047d..15d1e901ab 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
@@ -40,7 +40,7 @@ import org.springframework.util.ReflectionUtils;
  * A Spring {@link FactoryBean} for creating a Quartz {@link org.quartz.SimpleTrigger}
  * instance, supporting bean-style usage for trigger configuration.
  *
- * <p><code>SimpleTrigger(Impl)</code> itself is already a JavaBean but lacks sensible defaults.
+ * <p>{@code SimpleTrigger(Impl)} itself is already a JavaBean but lacks sensible defaults.
  * This class uses the Spring bean name as job name, the Quartz default group ("DEFAULT")
  * as job group, the current time as start time, and indefinite repetition, if not specified.
  *
@@ -58,9 +58,9 @@ import org.springframework.util.ReflectionUtils;
  * @see #setGroup
  * @see #setStartDelay
  * @see #setJobDetail
- * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setTriggers
- * @see org.springframework.scheduling.quartz.SchedulerFactoryBean#setJobDetails
- * @see org.springframework.scheduling.quartz.CronTriggerBean
+ * @see SchedulerFactoryBean#setTriggers
+ * @see SchedulerFactoryBean#setJobDetails
+ * @see CronTriggerBean
  */
 public class SimpleTriggerFactoryBean implements FactoryBean<SimpleTrigger>, BeanNameAware, InitializingBean {
 
@@ -183,7 +183,7 @@ public class SimpleTriggerFactoryBean implements FactoryBean<SimpleTrigger>, Bea
 	/**
 	 * Set the misfire instruction via the name of the corresponding
 	 * constant in the {@link org.quartz.SimpleTrigger} class.
-	 * Default is <code>MISFIRE_INSTRUCTION_SMART_POLICY</code>.
+	 * Default is {@code MISFIRE_INSTRUCTION_SMART_POLICY}.
 	 * @see org.quartz.SimpleTrigger#MISFIRE_INSTRUCTION_FIRE_NOW
 	 * @see org.quartz.SimpleTrigger#MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_EXISTING_COUNT
 	 * @see org.quartz.SimpleTrigger#MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_REMAINING_COUNT
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 5e555e2d04..c6811478ae 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
@@ -53,7 +53,7 @@ public class SpringBeanJobFactory extends AdaptableJobFactory implements Schedul
 
 	/**
 	 * Specify the unknown properties (not found in the bean) that should be ignored.
-	 * <p>Default is <code>null</code>, indicating that all unknown properties
+	 * <p>Default is {@code null}, indicating that all unknown properties
 	 * should be ignored. Specify an empty array to throw an exception in case
 	 * of any unknown properties, or a list of property names that should be
 	 * ignored if there is no corresponding property found on the particular
diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java
index 2abf6296e2..d4f050e8a8 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java
@@ -47,12 +47,12 @@ import org.springframework.util.CollectionUtils;
  * <p>The optional "configLocation" property sets the location of a FreeMarker
  * properties file, within the current application. FreeMarker properties can be
  * overridden via "freemarkerSettings". All of these properties will be set by
- * calling FreeMarker's <code>Configuration.setSettings()</code> method and are
+ * calling FreeMarker's {@code Configuration.setSettings()} method and are
  * subject to constraints set by FreeMarker.
  *
  * <p>The "freemarkerVariables" property can be used to specify a Map of
  * shared variables that will be applied to the Configuration via the
- * <code>setAllSharedVariables()</code> method. Like <code>setSettings()</code>,
+ * {@code setAllSharedVariables()} method. Like {@code setSettings()},
  * these entries are subject to FreeMarker constraints.
  *
  * <p>The simplest way to use this class is to specify a "templateLoaderPath";
@@ -109,7 +109,7 @@ public class FreeMarkerConfigurationFactory {
 
 	/**
 	 * Set properties that contain well-known FreeMarker keys which will be
-	 * passed to FreeMarker's <code>Configuration.setSettings</code> method.
+	 * passed to FreeMarker's {@code Configuration.setSettings} method.
 	 * @see freemarker.template.Configuration#setSettings
 	 */
 	public void setFreemarkerSettings(Properties settings) {
@@ -118,7 +118,7 @@ public class FreeMarkerConfigurationFactory {
 
 	/**
 	 * Set a Map that contains well-known FreeMarker objects which will be passed
-	 * to FreeMarker's <code>Configuration.setAllSharedVariables()</code> method.
+	 * to FreeMarker's {@code Configuration.setAllSharedVariables()} method.
 	 * @see freemarker.template.Configuration#setAllSharedVariables
 	 */
 	public void setFreemarkerVariables(Map<String, Object> variables) {
@@ -138,7 +138,7 @@ public class FreeMarkerConfigurationFactory {
 	}
 
 	/**
-	 * Set a List of <code>TemplateLoader<code>s that will be used to search
+	 * Set a List of {@code TemplateLoader}s that will be used to search
 	 * for templates. For example, one or more custom loaders such as database
 	 * loaders could be configured and injected here.
 	 * @deprecated as of Spring 2.0.1, in favor of the "preTemplateLoaders"
@@ -154,7 +154,7 @@ public class FreeMarkerConfigurationFactory {
 	}
 
 	/**
-	 * Set a List of <code>TemplateLoader<code>s that will be used to search
+	 * Set a List of {@code TemplateLoader}s that will be used to search
 	 * for templates. For example, one or more custom loaders such as database
 	 * loaders could be configured and injected here.
 	 * <p>The {@link TemplateLoader TemplateLoaders} specified here will be
@@ -169,7 +169,7 @@ public class FreeMarkerConfigurationFactory {
 	}
 
 	/**
-	 * Set a List of <code>TemplateLoader<code>s that will be used to search
+	 * Set a List of {@code TemplateLoader}s that will be used to search
 	 * for templates. For example, one or more custom loaders such as database
 	 * loaders can be configured.
 	 * <p>The {@link TemplateLoader TemplateLoaders} specified here will be
@@ -198,13 +198,13 @@ public class FreeMarkerConfigurationFactory {
 	 * pseudo URLs are supported, as understood by ResourceEditor. Allows for
 	 * relative paths when running in an ApplicationContext.
 	 * <p>Will define a path for the default FreeMarker template loader.
-	 * If a specified resource cannot be resolved to a <code>java.io.File</code>,
+	 * If a specified resource cannot be resolved to a {@code java.io.File},
 	 * a generic SpringTemplateLoader will be used, without modification detection.
 	 * <p>To enforce the use of SpringTemplateLoader, i.e. to not resolve a path
 	 * as file system resource in any case, turn off the "preferFileSystemAccess"
 	 * flag. See the latter's javadoc for details.
 	 * <p>If you wish to specify your own list of TemplateLoaders, do not set this
-	 * property and instead use <code>setTemplateLoaders(List templateLoaders)</code>
+	 * property and instead use {@code setTemplateLoaders(List templateLoaders)}
 	 * @see org.springframework.core.io.ResourceEditor
 	 * @see org.springframework.context.ApplicationContext#getResource
 	 * @see freemarker.template.Configuration#setDirectoryForTemplateLoading
@@ -323,7 +323,7 @@ public class FreeMarkerConfigurationFactory {
 	/**
 	 * Return a new Configuration object. Subclasses can override this for
 	 * custom initialization, or for using a mock object for testing.
-	 * <p>Called by <code>createConfiguration()</code>.
+	 * <p>Called by {@code createConfiguration()}.
 	 * @return the Configuration object
 	 * @throws IOException if a config file wasn't found
 	 * @throws TemplateException on FreeMarker initialization failure
@@ -374,7 +374,7 @@ public class FreeMarkerConfigurationFactory {
 	 * To be overridden by subclasses that want to to register custom
 	 * TemplateLoader instances after this factory created its default
 	 * template loaders.
-	 * <p>Called by <code>createConfiguration()</code>. Note that specified
+	 * <p>Called by {@code createConfiguration()}. Note that specified
 	 * "postTemplateLoaders" will be registered <i>after</i> any loaders
 	 * registered by this callback; as a consequence, they are are <i>not</i>
 	 * included in the given List.
@@ -411,7 +411,7 @@ public class FreeMarkerConfigurationFactory {
 	 * To be overridden by subclasses that want to to perform custom
 	 * post-processing of the Configuration object after this factory
 	 * performed its default initialization.
-	 * <p>Called by <code>createConfiguration()</code>.
+	 * <p>Called by {@code createConfiguration()}.
 	 * @param config the current Configuration object
 	 * @throws IOException if a config file wasn't found
 	 * @throws TemplateException on FreeMarker initialization failure
diff --git a/spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java b/spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java
index a4da611b26..b74611a4b0 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/jasperreports/JasperReportsUtils.java
@@ -46,13 +46,13 @@ import net.sf.jasperreports.engine.export.JRXlsExporter;
 public abstract class JasperReportsUtils {
 
 	/**
-	 * Convert the given report data value to a <code>JRDataSource</code>.
-	 * <p>In the default implementation, a <code>JRDataSource</code>,
-	 * <code>java.util.Collection</code> or object array is detected.
-	 * The latter are converted to <code>JRBeanCollectionDataSource</code>
-	 * or <code>JRBeanArrayDataSource</code>, respectively.
+	 * Convert the given report data value to a {@code JRDataSource}.
+	 * <p>In the default implementation, a {@code JRDataSource},
+	 * {@code java.util.Collection} or object array is detected.
+	 * The latter are converted to {@code JRBeanCollectionDataSource}
+	 * or {@code JRBeanArrayDataSource}, respectively.
 	 * @param value the report data value to convert
-	 * @return the JRDataSource (never <code>null</code>)
+	 * @return the JRDataSource (never {@code null})
 	 * @throws IllegalArgumentException if the value could not be converted
 	 * @see net.sf.jasperreports.engine.JRDataSource
 	 * @see net.sf.jasperreports.engine.data.JRBeanCollectionDataSource
@@ -74,14 +74,14 @@ public abstract class JasperReportsUtils {
 	}
 
 	/**
-	 * Render the supplied <code>JasperPrint</code> instance using the
-	 * supplied <code>JRAbstractExporter</code> instance and write the results
-	 * to the supplied <code>Writer</code>.
-	 * <p>Make sure that the <code>JRAbstractExporter</code> implementation
-	 * you supply is capable of writing to a <code>Writer</code>.
-	 * @param exporter the <code>JRAbstractExporter</code> to use to render the report
-	 * @param print the <code>JasperPrint</code> instance to render
-	 * @param writer the <code>Writer</code> to write the result to
+	 * Render the supplied {@code JasperPrint} instance using the
+	 * supplied {@code JRAbstractExporter} instance and write the results
+	 * to the supplied {@code Writer}.
+	 * <p>Make sure that the {@code JRAbstractExporter} implementation
+	 * you supply is capable of writing to a {@code Writer}.
+	 * @param exporter the {@code JRAbstractExporter} to use to render the report
+	 * @param print the {@code JasperPrint} instance to render
+	 * @param writer the {@code Writer} to write the result to
 	 * @throws JRException if rendering failed
 	 */
 	public static void render(JRExporter exporter, JasperPrint print, Writer writer)
@@ -93,14 +93,14 @@ public abstract class JasperReportsUtils {
 	}
 
 	/**
-	 * Render the supplied <code>JasperPrint</code> instance using the
-	 * supplied <code>JRAbstractExporter</code> instance and write the results
-	 * to the supplied <code>OutputStream</code>.
-	 * <p>Make sure that the <code>JRAbstractExporter</code> implementation you
-	 * supply is capable of writing to a <code>OutputStream</code>.
-	 * @param exporter the <code>JRAbstractExporter</code> to use to render the report
-	 * @param print the <code>JasperPrint</code> instance to render
-	 * @param outputStream the <code>OutputStream</code> to write the result to
+	 * Render the supplied {@code JasperPrint} instance using the
+	 * supplied {@code JRAbstractExporter} instance and write the results
+	 * to the supplied {@code OutputStream}.
+	 * <p>Make sure that the {@code JRAbstractExporter} implementation you
+	 * supply is capable of writing to a {@code OutputStream}.
+	 * @param exporter the {@code JRAbstractExporter} to use to render the report
+	 * @param print the {@code JasperPrint} instance to render
+	 * @param outputStream the {@code OutputStream} to write the result to
 	 * @throws JRException if rendering failed
 	 */
 	public static void render(JRExporter exporter, JasperPrint print, OutputStream outputStream)
@@ -113,11 +113,11 @@ public abstract class JasperReportsUtils {
 
 	/**
 	 * Render a report in CSV format using the supplied report data.
-	 * Writes the results to the supplied <code>Writer</code>.
-	 * @param report the <code>JasperReport</code> instance to render
+	 * Writes the results to the supplied {@code Writer}.
+	 * @param report the {@code JasperReport} instance to render
 	 * @param parameters the parameters to use for rendering
-	 * @param writer the <code>Writer</code> to write the rendered report to
-	 * @param reportData a <code>JRDataSource</code>, <code>java.util.Collection</code> or object array
+	 * @param writer the {@code Writer} to write the rendered report to
+	 * @param reportData a {@code JRDataSource}, {@code java.util.Collection} or object array
 	 * (converted accordingly), representing the report data to read fields from
 	 * @throws JRException if rendering failed
 	 * @see #convertReportData
@@ -131,11 +131,11 @@ public abstract class JasperReportsUtils {
 
 	/**
 	 * Render a report in CSV format using the supplied report data.
-	 * Writes the results to the supplied <code>Writer</code>.
-	 * @param report the <code>JasperReport</code> instance to render
+	 * Writes the results to the supplied {@code Writer}.
+	 * @param report the {@code JasperReport} instance to render
 	 * @param parameters the parameters to use for rendering
-	 * @param writer the <code>Writer</code> to write the rendered report to
-	 * @param reportData a <code>JRDataSource</code>, <code>java.util.Collection</code> or object array
+	 * @param writer the {@code Writer} to write the rendered report to
+	 * @param reportData a {@code JRDataSource}, {@code java.util.Collection} or object array
 	 * (converted accordingly), representing the report data to read fields from
 	 * @param exporterParameters a {@link Map} of {@link JRExporterParameter exporter parameters}
 	 * @throws JRException if rendering failed
@@ -152,11 +152,11 @@ public abstract class JasperReportsUtils {
 
 	/**
 	 * Render a report in HTML format using the supplied report data.
-	 * Writes the results to the supplied <code>Writer</code>.
-	 * @param report the <code>JasperReport</code> instance to render
+	 * Writes the results to the supplied {@code Writer}.
+	 * @param report the {@code JasperReport} instance to render
 	 * @param parameters the parameters to use for rendering
-	 * @param writer the <code>Writer</code> to write the rendered report to
-	 * @param reportData a <code>JRDataSource</code>, <code>java.util.Collection</code> or object array
+	 * @param writer the {@code Writer} to write the rendered report to
+	 * @param reportData a {@code JRDataSource}, {@code java.util.Collection} or object array
 	 * (converted accordingly), representing the report data to read fields from
 	 * @throws JRException if rendering failed
 	 * @see #convertReportData
@@ -170,11 +170,11 @@ public abstract class JasperReportsUtils {
 
 	/**
 	 * Render a report in HTML format using the supplied report data.
-	 * Writes the results to the supplied <code>Writer</code>.
-	 * @param report the <code>JasperReport</code> instance to render
+	 * Writes the results to the supplied {@code Writer}.
+	 * @param report the {@code JasperReport} instance to render
 	 * @param parameters the parameters to use for rendering
-	 * @param writer the <code>Writer</code> to write the rendered report to
-	 * @param reportData a <code>JRDataSource</code>, <code>java.util.Collection</code> or object array
+	 * @param writer the {@code Writer} to write the rendered report to
+	 * @param reportData a {@code JRDataSource}, {@code java.util.Collection} or object array
 	 * (converted accordingly), representing the report data to read fields from
 	 * @param exporterParameters a {@link Map} of {@link JRExporterParameter exporter parameters}
 	 * @throws JRException if rendering failed
@@ -191,11 +191,11 @@ public abstract class JasperReportsUtils {
 
 	/**
 	 * Render a report in PDF format using the supplied report data.
-	 * Writes the results to the supplied <code>OutputStream</code>.
-	 * @param report the <code>JasperReport</code> instance to render
+	 * Writes the results to the supplied {@code OutputStream}.
+	 * @param report the {@code JasperReport} instance to render
 	 * @param parameters the parameters to use for rendering
-	 * @param stream the <code>OutputStream</code> to write the rendered report to
-	 * @param reportData a <code>JRDataSource</code>, <code>java.util.Collection</code> or object array
+	 * @param stream the {@code OutputStream} to write the rendered report to
+	 * @param reportData a {@code JRDataSource}, {@code java.util.Collection} or object array
 	 * (converted accordingly), representing the report data to read fields from
 	 * @throws JRException if rendering failed
 	 * @see #convertReportData
@@ -209,11 +209,11 @@ public abstract class JasperReportsUtils {
 
 	/**
 	 * Render a report in PDF format using the supplied report data.
-	 * Writes the results to the supplied <code>OutputStream</code>.
-	 * @param report the <code>JasperReport</code> instance to render
+	 * Writes the results to the supplied {@code OutputStream}.
+	 * @param report the {@code JasperReport} instance to render
 	 * @param parameters the parameters to use for rendering
-	 * @param stream the <code>OutputStream</code> to write the rendered report to
-	 * @param reportData a <code>JRDataSource</code>, <code>java.util.Collection</code> or object array
+	 * @param stream the {@code OutputStream} to write the rendered report to
+	 * @param reportData a {@code JRDataSource}, {@code java.util.Collection} or object array
 	 * (converted accordingly), representing the report data to read fields from
 	 * @param exporterParameters a {@link Map} of {@link JRExporterParameter exporter parameters}
 	 * @throws JRException if rendering failed
@@ -230,11 +230,11 @@ public abstract class JasperReportsUtils {
 
 	/**
 	 * Render a report in XLS format using the supplied report data.
-	 * Writes the results to the supplied <code>OutputStream</code>.
-	 * @param report the <code>JasperReport</code> instance to render
+	 * Writes the results to the supplied {@code OutputStream}.
+	 * @param report the {@code JasperReport} instance to render
 	 * @param parameters the parameters to use for rendering
-	 * @param stream the <code>OutputStream</code> to write the rendered report to
-	 * @param reportData a <code>JRDataSource</code>, <code>java.util.Collection</code> or object array
+	 * @param stream the {@code OutputStream} to write the rendered report to
+	 * @param reportData a {@code JRDataSource}, {@code java.util.Collection} or object array
 	 * (converted accordingly), representing the report data to read fields from
 	 * @throws JRException if rendering failed
 	 * @see #convertReportData
@@ -248,11 +248,11 @@ public abstract class JasperReportsUtils {
 
 	/**
 	 * Render a report in XLS format using the supplied report data.
-	 * Writes the results to the supplied <code>OutputStream</code>.
-	 * @param report the <code>JasperReport</code> instance to render
+	 * Writes the results to the supplied {@code OutputStream}.
+	 * @param report the {@code JasperReport} instance to render
 	 * @param parameters the parameters to use for rendering
-	 * @param stream the <code>OutputStream</code> to write the rendered report to
-	 * @param reportData a <code>JRDataSource</code>, <code>java.util.Collection</code> or object array
+	 * @param stream the {@code OutputStream} to write the rendered report to
+	 * @param reportData a {@code JRDataSource}, {@code java.util.Collection} or object array
 	 * (converted accordingly), representing the report data to read fields from
 	 * @param exporterParameters a {@link Map} of {@link JRExporterParameter exporter parameters}
 	 * @throws JRException if rendering failed
diff --git a/spring-context-support/src/main/java/org/springframework/ui/velocity/CommonsLoggingLogSystem.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/CommonsLoggingLogSystem.java
index b845d6c6ae..160516db63 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/velocity/CommonsLoggingLogSystem.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/velocity/CommonsLoggingLogSystem.java
@@ -26,14 +26,14 @@ import org.apache.velocity.runtime.log.LogSystem;
  * Velocity LogSystem implementation for Jakarta Commons Logging.
  * Used by VelocityConfigurer to redirect log output.
  *
- * <p><b>NOTE:</b> To be replaced by Velocity 1.5's <code>LogChute</code> mechanism
- * and Velocity 1.6's <code>CommonsLogLogChute</code> implementation once we
+ * <p><b>NOTE:</b> To be replaced by Velocity 1.5's {@code LogChute} mechanism
+ * and Velocity 1.6's {@code CommonsLogLogChute} implementation once we
  * upgrade to Velocity 1.6+ (likely Velocity 1.7+) in a future version of Spring.
  *
  * @author Juergen Hoeller
  * @since 07.08.2003
  * @see VelocityEngineFactoryBean
- * @deprecated as of Spring 3.2, in favor of Velocity 1.6's <code>CommonsLogLogChute</code>
+ * @deprecated as of Spring 3.2, in favor of Velocity 1.6's {@code CommonsLogLogChute}
  */
 @Deprecated
 public class CommonsLoggingLogSystem implements LogSystem {
diff --git a/spring-context-support/src/main/java/org/springframework/ui/velocity/SpringResourceLoader.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/SpringResourceLoader.java
index e93ed15530..f03a8e6190 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/velocity/SpringResourceLoader.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/velocity/SpringResourceLoader.java
@@ -32,15 +32,15 @@ import org.springframework.util.StringUtils;
 /**
  * Velocity ResourceLoader adapter that loads via a Spring ResourceLoader.
  * Used by VelocityEngineFactory for any resource loader path that cannot
- * be resolved to a <code>java.io.File</code>.
+ * be resolved to a {@code java.io.File}.
  *
  * <p>Note that this loader does not allow for modification detection:
- * Use Velocity's default FileResourceLoader for <code>java.io.File</code>
+ * Use Velocity's default FileResourceLoader for {@code java.io.File}
  * resources.
  *
  * <p>Expects "spring.resource.loader" and "spring.resource.loader.path"
  * application attributes in the Velocity runtime: the former of type
- * <code>org.springframework.core.io.ResourceLoader</code>, the latter a String.
+ * {@code org.springframework.core.io.ResourceLoader}, the latter a String.
  *
  * @author Juergen Hoeller
  * @since 14.03.2004
diff --git a/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java
index 302f989f7b..0ff54aeba0 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java
@@ -131,7 +131,7 @@ public class VelocityEngineFactory {
 	 * pseudo URLs are supported, as understood by ResourceLoader. Allows for
 	 * relative paths when running in an ApplicationContext.
 	 * <p>Will define a path for the default Velocity resource loader with the name
-	 * "file". If the specified resource cannot be resolved to a <code>java.io.File</code>,
+	 * "file". If the specified resource cannot be resolved to a {@code java.io.File},
 	 * a generic SpringResourceLoader will be used under the name "spring", without
 	 * modification detection.
 	 * <p>Note that resource caching will be enabled in any case. With the file
@@ -270,7 +270,7 @@ public class VelocityEngineFactory {
 	/**
 	 * Return a new VelocityEngine. Subclasses can override this for
 	 * custom initialization, or for using a mock object for testing.
-	 * <p>Called by <code>createVelocityEngine()</code>.
+	 * <p>Called by {@code createVelocityEngine()}.
 	 * @return the VelocityEngine instance
 	 * @throws IOException if a config file wasn't found
 	 * @throws VelocityException on Velocity initialization failure
@@ -283,7 +283,7 @@ public class VelocityEngineFactory {
 	/**
 	 * Initialize a Velocity resource loader for the given VelocityEngine:
 	 * either a standard Velocity FileResourceLoader or a SpringResourceLoader.
-	 * <p>Called by <code>createVelocityEngine()</code>.
+	 * <p>Called by {@code createVelocityEngine()}.
 	 * @param velocityEngine the VelocityEngine to configure
 	 * @param resourceLoaderPath the path to load Velocity resources from
 	 * @see org.apache.velocity.runtime.resource.loader.FileResourceLoader
@@ -334,7 +334,7 @@ public class VelocityEngineFactory {
 
 	/**
 	 * Initialize a SpringResourceLoader for the given VelocityEngine.
-	 * <p>Called by <code>initVelocityResourceLoader</code>.
+	 * <p>Called by {@code initVelocityResourceLoader}.
 	 * @param velocityEngine the VelocityEngine to configure
 	 * @param resourceLoaderPath the path to load Velocity resources from
 	 * @see SpringResourceLoader
@@ -357,7 +357,7 @@ public class VelocityEngineFactory {
 	 * To be implemented by subclasses that want to to perform custom
 	 * post-processing of the VelocityEngine after this FactoryBean
 	 * performed its default configuration (but before VelocityEngine.init).
-	 * <p>Called by <code>createVelocityEngine()</code>.
+	 * <p>Called by {@code createVelocityEngine()}.
 	 * @param velocityEngine the current VelocityEngine
 	 * @throws IOException if a config file wasn't found
 	 * @throws VelocityException on Velocity initialization failure
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 32cedfe6de..5035789d1e 100644
--- a/spring-context/src/main/java/org/springframework/cache/Cache.java
+++ b/spring-context/src/main/java/org/springframework/cache/Cache.java
@@ -40,10 +40,10 @@ public interface Cache {
 
 	/**
 	 * Return the value to which this cache maps the specified key. Returns
-	 * <code>null</code> if the cache contains no mapping for this key.
+	 * {@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,
-	 * or <code>null</code> if the cache contains no mapping for this key
+	 * or {@code null} if the cache contains no mapping for this key
 	 */
 	ValueWrapper get(Object key);
 
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 0da4c6850b..11891d48bb 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
@@ -73,7 +73,7 @@ public class ConcurrentMapCache implements Cache {
 	 * given internal 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</code> values
+	 * @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) {
@@ -115,7 +115,7 @@ public class ConcurrentMapCache implements Cache {
 
 	/**
 	 * Convert the given value from the internal store to a user value
-	 * returned from the get method (adapting <code>null</code>).
+	 * returned from the get method (adapting {@code null}).
 	 * @param storeValue the store value
 	 * @return the value to return to the user
 	 */
@@ -128,7 +128,7 @@ public class ConcurrentMapCache implements Cache {
 
 	/**
 	 * Convert the given user value, as passed into the put method,
-	 * to a value in the internal store (adapting <code>null</code>).
+	 * to a value in the internal store (adapting {@code null}).
 	 * @param userValue the given user value
 	 * @return the value to store
 	 */
diff --git a/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java b/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java
index 8f2fb39166..5ff3aaf9e8 100644
--- a/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java
+++ b/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java
@@ -32,7 +32,7 @@ public class SimpleValueWrapper implements ValueWrapper {
 
 	/**
 	 * Create a new SimpleValueWrapper instance for exposing the given value.
-	 * @param value the value to expose (may be <code>null</code>)
+	 * @param value the value to expose (may be {@code null})
 	 */
 	public SimpleValueWrapper(Object value) {
 		this.value = value;
diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationContext.java b/spring-context/src/main/java/org/springframework/context/ApplicationContext.java
index 2ded439068..2565e481a3 100644
--- a/spring-context/src/main/java/org/springframework/context/ApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/ApplicationContext.java
@@ -59,7 +59,7 @@ public interface ApplicationContext extends EnvironmentCapable, ListableBeanFact
 
 	/**
 	 * Return the unique id of this application context.
-	 * @return the unique id of the context, or <code>null</code> if none
+	 * @return the unique id of the context, or {@code null} if none
 	 */
 	String getId();
 
@@ -71,8 +71,8 @@ public interface ApplicationContext extends EnvironmentCapable, ListableBeanFact
 
 	/**
 	 * Return a friendly name for this context.
-	 * @return a display name for this context (never <code>null</code>)
-	*/
+	 * @return a display name for this context (never {@code null})
+	 */
 	String getDisplayName();
 
 	/**
@@ -82,9 +82,9 @@ public interface ApplicationContext extends EnvironmentCapable, ListableBeanFact
 	long getStartupDate();
 
 	/**
-	 * Return the parent context, or <code>null</code> if there is no parent
+	 * Return the parent context, or {@code null} if there is no parent
 	 * and this is the root of the context hierarchy.
-	 * @return the parent context, or <code>null</code> if there is no parent
+	 * @return the parent context, or {@code null} if there is no parent
 	 */
 	ApplicationContext getParent();
 
@@ -101,7 +101,7 @@ public interface ApplicationContext extends EnvironmentCapable, ListableBeanFact
 	 * @return the AutowireCapableBeanFactory for this context
 	 * @throws IllegalStateException if the context does not support
 	 * the AutowireCapableBeanFactory interface or does not hold an autowire-capable
-	 * bean factory yet (usually if <code>refresh()</code> has never been called)
+	 * bean factory yet (usually if {@code refresh()} has never been called)
 	 * @see ConfigurableApplicationContext#refresh()
 	 * @see ConfigurableApplicationContext#getBeanFactory()
 	 */
diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java b/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java
index 8c74f2974a..594af464c0 100644
--- a/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java
+++ b/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java
@@ -29,7 +29,7 @@ import org.springframework.beans.factory.Aware;
  * for bean lookup purposes.
  *
  * <p>This interface can also be implemented if an object needs access to file
- * resources, i.e. wants to call <code>getResource</code>, wants to publish
+ * resources, i.e. wants to call {@code getResource}, wants to publish
  * an application event, or requires access to the MessageSource. However,
  * it is preferable to implement the more specific {@link ResourceLoaderAware},
  * {@link ApplicationEventPublisherAware} or {@link MessageSourceAware} interface
diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java b/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java
index 9c9f4066a4..9956972b12 100644
--- a/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java
+++ b/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java
@@ -26,7 +26,7 @@ import org.springframework.beans.FatalBeanException;
 public class ApplicationContextException extends FatalBeanException {
 
 	/**
-	 * Create a new <code>ApplicationContextException</code>
+	 * Create a new {@code ApplicationContextException}
 	 * with the specified detail message and no root cause.
 	 * @param msg the detail message
 	 */
@@ -35,7 +35,7 @@ public class ApplicationContextException extends FatalBeanException {
 	}
 
 	/**
-	 * Create a new <code>ApplicationContextException</code>
+	 * Create a new {@code ApplicationContextException}
 	 * with the specified detail message and the given root cause.
 	 * @param msg the detail message
 	 * @param cause the root cause
diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationEvent.java b/spring-context/src/main/java/org/springframework/context/ApplicationEvent.java
index 66bddfcfd2..464a440af6 100644
--- a/spring-context/src/main/java/org/springframework/context/ApplicationEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/ApplicationEvent.java
@@ -36,7 +36,7 @@ public abstract class ApplicationEvent extends EventObject {
 
 	/**
 	 * Create a new ApplicationEvent.
-	 * @param source the component that published the event (never <code>null</code>)
+	 * @param source the component that published the event (never {@code null})
 	 */
 	public ApplicationEvent(Object source) {
 		super(source);
diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationListener.java b/spring-context/src/main/java/org/springframework/context/ApplicationListener.java
index fc40e50222..d79e741cff 100644
--- a/spring-context/src/main/java/org/springframework/context/ApplicationListener.java
+++ b/spring-context/src/main/java/org/springframework/context/ApplicationListener.java
@@ -20,7 +20,7 @@ import java.util.EventListener;
 
 /**
  * Interface to be implemented by application event listeners.
- * Based on the standard <code>java.util.EventListener</code> interface
+ * Based on the standard {@code java.util.EventListener} interface
  * for the Observer design pattern.
  *
  * <p>As of Spring 3.0, an ApplicationListener can generically declare the event type
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 264d9b569e..9d0bdc4b7c 100644
--- a/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java
@@ -153,10 +153,10 @@ public interface ConfigurableApplicationContext extends ApplicationContext, Life
 	/**
 	 * Close this application context, releasing all resources and locks that the
 	 * implementation might hold. This includes destroying all cached singleton beans.
-	 * <p>Note: Does <i>not</i> invoke <code>close</code> on a parent context;
+	 * <p>Note: Does <i>not</i> invoke {@code close} on a parent context;
 	 * parent contexts have their own, independent lifecycle.
 	 * <p>This method can be called multiple times without side effects: Subsequent
-	 * <code>close</code> calls on an already closed context will be ignored.
+	 * {@code close} calls on an already closed context will be ignored.
 	 */
 	void close();
 
diff --git a/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java b/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java
index dc15274a85..3339abe70e 100644
--- a/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java
@@ -30,12 +30,12 @@ public interface HierarchicalMessageSource extends MessageSource {
 	 * that this object can't resolve.
 	 * @param parent the parent MessageSource that will be used to
 	 * resolve messages that this object can't resolve.
-	 * May be <code>null</code>, in which case no further resolution is possible.
+	 * May be {@code null}, in which case no further resolution is possible.
 	 */
 	void setParentMessageSource(MessageSource parent);
 
 	/**
-	 * Return the parent of this MessageSource, or <code>null</code> if none.
+	 * Return the parent of this MessageSource, or {@code null} if none.
 	 */
 	MessageSource getParentMessageSource();
 
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 748bb35041..b1d00e13f2 100644
--- a/spring-context/src/main/java/org/springframework/context/Lifecycle.java
+++ b/spring-context/src/main/java/org/springframework/context/Lifecycle.java
@@ -68,7 +68,7 @@ public interface Lifecycle {
 
 	/**
 	 * Check whether this component is currently running.
-	 * <p>In the case of a container, this will return <code>true</code>
+	 * <p>In the case of a container, this will return {@code true}
 	 * only if <i>all</i> components that apply are currently running.
 	 * @return whether the component is currently running
 	 */
diff --git a/spring-context/src/main/java/org/springframework/context/MessageSource.java b/spring-context/src/main/java/org/springframework/context/MessageSource.java
index b83ec2a014..62e1f9729b 100644
--- a/spring-context/src/main/java/org/springframework/context/MessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/MessageSource.java
@@ -44,7 +44,7 @@ public interface MessageSource {
 	 * qualified class name, thus avoiding conflict and ensuring maximum clarity.
 	 * @param args array of arguments that will be filled in for params within
 	 * the message (params look like "{0}", "{1,date}", "{2,time}" within a message),
-	 * or <code>null</code> if none.
+	 * or {@code null} if none.
 	 * @param defaultMessage String to return if the lookup fails
 	 * @param locale the Locale in which to do the lookup
 	 * @return the resolved message if the lookup was successful;
@@ -58,7 +58,7 @@ public interface MessageSource {
 	 * @param code the code to lookup up, such as 'calculator.noRateSet'
 	 * @param args Array of arguments that will be filled in for params within
 	 * the message (params look like "{0}", "{1,date}", "{2,time}" within a message),
-	 * or <code>null</code> if none.
+	 * or {@code null} if none.
 	 * @param locale the Locale in which to do the lookup
 	 * @return the resolved message
 	 * @throws NoSuchMessageException if the message wasn't found
@@ -68,10 +68,10 @@ public interface MessageSource {
 
 	/**
 	 * Try to resolve the message using all the attributes contained within the
-	 * <code>MessageSourceResolvable</code> argument that was passed in.
-	 * <p>NOTE: We must throw a <code>NoSuchMessageException</code> on this method
+	 * {@code MessageSourceResolvable} argument that was passed in.
+	 * <p>NOTE: We must throw a {@code NoSuchMessageException} on this method
 	 * since at the time of calling this method we aren't able to determine if the
-	 * <code>defaultMessage</code> property of the resolvable is null or not.
+	 * {@code defaultMessage} property of the resolvable is null or not.
 	 * @param resolvable value object storing attributes required to properly resolve a message
 	 * @param locale the Locale in which to do the lookup
 	 * @return the resolved message
diff --git a/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java b/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java
index 6590f111d5..d344a6dadf 100644
--- a/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java
+++ b/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java
@@ -46,7 +46,7 @@ public interface MessageSourceResolvable {
 
 	/**
 	 * Return the default message to be used to resolve this message.
-	 * @return the default message, or <code>null</code> if no default
+	 * @return the default message, or {@code null} if no default
 	 */
 	String getDefaultMessage();
 
diff --git a/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java b/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java
index 6b413e6204..c13e5902f3 100644
--- a/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java
+++ b/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java
@@ -41,7 +41,7 @@ import org.springframework.core.io.ResourceLoader;
  * to resolve resource patterns into arrays of Resource objects. This will always
  * work when running in an ApplicationContext (the context interface extends
  * ResourcePatternResolver). Use a PathMatchingResourcePatternResolver as default.
- * See also the <code>ResourcePatternUtils.getResourcePatternResolver</code> method.
+ * See also the {@code ResourcePatternUtils.getResourcePatternResolver} method.
  *
  * <p>As alternative to a ResourcePatternResolver dependency, consider exposing
  * bean properties of type Resource array, populated via pattern Strings with
@@ -64,11 +64,11 @@ public interface ResourceLoaderAware extends Aware {
 	/**
 	 * Set the ResourceLoader that this object runs in.
 	 * <p>This might be a ResourcePatternResolver, which can be checked
-	 * through <code>instanceof ResourcePatternResolver</code>. See also the
-	 * <code>ResourcePatternUtils.getResourcePatternResolver</code> method.
+	 * through {@code instanceof ResourcePatternResolver}. See also the
+	 * {@code ResourcePatternUtils.getResourcePatternResolver} method.
 	 * <p>Invoked after population of normal bean properties but before an init callback
-	 * like InitializingBean's <code>afterPropertiesSet</code> or a custom init-method.
-	 * Invoked before ApplicationContextAware's <code>setApplicationContext</code>.
+	 * like InitializingBean's {@code afterPropertiesSet} or a custom init-method.
+	 * Invoked before ApplicationContextAware's {@code setApplicationContext}.
 	 * @param resourceLoader ResourceLoader object to be used by this object
 	 * @see org.springframework.core.io.support.ResourcePatternResolver
 	 * @see org.springframework.core.io.support.ResourcePatternUtils#getResourcePatternResolver
diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java b/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
index 43d674367d..4a608ec060 100644
--- a/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
+++ b/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
@@ -25,9 +25,9 @@ import org.springframework.context.ConfigurableApplicationContext;
  * ApplicationContext-specific implementation of BeanFactoryReference,
  * wrapping a newly created ApplicationContext, closing it on release.
  *
- * <p>As per BeanFactoryReference contract, <code>release</code> may be called
+ * <p>As per BeanFactoryReference contract, {@code release} may be called
  * more than once, with subsequent calls not doing anything. However, calling
- * <code>getFactory</code> after a <code>release</code> call will cause an exception.
+ * {@code getFactory} after a {@code release} call will cause an exception.
  *
  * @author Juergen Hoeller
  * @author Colin Sampaleanu
diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java b/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java
index 9996b9473b..8372bb00b9 100644
--- a/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java
+++ b/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java
@@ -50,9 +50,9 @@ public class ContextJndiBeanFactoryLocator extends JndiLocatorSupport implements
 
 	/**
 	 * Load/use a bean factory, as specified by a factory key which is a JNDI
-	 * address, of the form <code>java:comp/env/ejb/BeanFactoryPath</code>. The
+	 * address, of the form {@code java:comp/env/ejb/BeanFactoryPath}. The
 	 * contents of this JNDI location must be a string containing one or more
-	 * classpath resource names (separated by any of the delimiters '<code>,; \t\n</code>'
+	 * classpath resource names (separated by any of the delimiters '{@code ,; \t\n}'
 	 * if there is more than one. The resulting BeanFactory (or ApplicationContext)
 	 * will be created from the combined resources.
 	 * @see #createBeanFactory
@@ -77,7 +77,7 @@ public class ContextJndiBeanFactoryLocator extends JndiLocatorSupport implements
 	 * Create the BeanFactory instance, given an array of class path resource Strings
 	 * which should be combined. This is split out as a separate method so that
 	 * subclasses can override the actual BeanFactory implementation class.
-	 * <p>Delegates to <code>createApplicationContext</code> by default,
+	 * <p>Delegates to {@code createApplicationContext} by default,
 	 * wrapping the result in a ContextBeanFactoryReference.
 	 * @param resources an array of Strings representing classpath resource names
 	 * @return the created BeanFactory, wrapped in a BeanFactoryReference
diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java b/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java
index cc250cafdd..2f9d9d5cc8 100644
--- a/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java
+++ b/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java
@@ -60,7 +60,7 @@ public class ContextSingletonBeanFactoryLocator extends SingletonBeanFactoryLoca
 	/**
 	 * Returns an instance which uses the default "classpath*:beanRefContext.xml", as
 	 * the name of the definition file(s). All resources returned by the current
-	 * thread's context class loader's <code>getResources</code> method with this
+	 * thread's context class loader's {@code getResources} method with this
 	 * name will be combined to create a definition, which is just a BeanFactory.
 	 * @return the corresponding BeanFactoryLocator instance
 	 * @throws BeansException in case of factory loading failure
@@ -73,7 +73,7 @@ public class ContextSingletonBeanFactoryLocator extends SingletonBeanFactoryLoca
 	 * Returns an instance which uses the the specified selector, as the name of the
 	 * definition file(s). In the case of a name with a Spring "classpath*:" prefix,
 	 * or with no prefix, which is treated the same, the current thread's context class
-	 * loader's <code>getResources</code> method will be called with this value to get
+	 * loader's {@code getResources} method will be called with this value to get
 	 * all resources having that name. These resources will then be combined to form a
 	 * definition. In the case where the name uses a Spring "classpath:" prefix, or
 	 * a standard URL prefix, then only one resource file will be loaded as the
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 1a185248ba..c09600998c 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
@@ -79,7 +79,7 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
 	/**
 	 * Derive a bean name from one of the annotations on the class.
 	 * @param annotatedDef the annotation-aware bean definition
-	 * @return the bean name, or <code>null</code> if none is found
+	 * @return the bean name, or {@code null} if none is found
 	 */
 	protected String determineBeanNameFromAnnotation(AnnotatedBeanDefinition annotatedDef) {
 		AnnotationMetadata amd = annotatedDef.getMetadata();
@@ -103,7 +103,7 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
 
 	/**
 	 * Check whether the given annotation is a stereotype that is allowed
-	 * to suggest a component name through its annotation <code>value()</code>.
+	 * to suggest a component name through its annotation {@code value()}.
 	 * @param annotationType the name of the annotation class to check
 	 * @param metaAnnotationTypes the names of meta-annotations on the given annotation
 	 * @param attributes the map of attributes for the given annotation
@@ -124,7 +124,7 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
 	 * <p>The default implementation delegates to {@link #buildDefaultBeanName(BeanDefinition)}.
 	 * @param definition the bean definition to build a bean name for
 	 * @param registry the registry that the given bean definition is being registered with
-	 * @return the default bean name (never <code>null</code>)
+	 * @return the default bean name (never {@code null})
 	 */
 	protected String buildDefaultBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
 		return buildDefaultBeanName(definition);
@@ -138,7 +138,7 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
 	 * "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</code>)
+	 * @return the default bean name (never {@code null})
 	 */
 	protected String buildDefaultBeanName(BeanDefinition definition) {
 		String shortClassName = ClassUtils.getShortName(definition.getBeanClassName());
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 793ba314b4..f283bb6d2c 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
@@ -170,7 +170,7 @@ public class AnnotationConfigUtils {
 	 * Register all relevant annotation post processors in the given registry.
 	 * @param registry the registry to operate on
 	 * @param source the configuration source element (already extracted)
-	 * that this registration was triggered from. May be <code>null</code>.
+	 * that this registration was triggered from. May be {@code null}.
 	 * @return a Set of BeanDefinitionHolders, containing all bean definitions
 	 * that have actually been registered by this call
 	 */
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
index 493745bd82..f678425ea8 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
@@ -44,7 +44,7 @@ public class AnnotationScopeMetadataResolver implements ScopeMetadataResolver {
 	private final ScopedProxyMode defaultProxyMode;
 
 	/**
-	 * Create a new instance of the <code>AnnotationScopeMetadataResolver</code> class.
+	 * Create a new instance of the {@code AnnotationScopeMetadataResolver} class.
 	 * @see #AnnotationScopeMetadataResolver(ScopedProxyMode)
 	 * @see ScopedProxyMode#NO
 	 */
@@ -53,7 +53,7 @@ public class AnnotationScopeMetadataResolver implements ScopeMetadataResolver {
 	}
 
 	/**
-	 * Create a new instance of the <code>AnnotationScopeMetadataResolver</code> class.
+	 * Create a new instance of the {@code AnnotationScopeMetadataResolver} class.
 	 * @param defaultProxyMode the desired scoped-proxy mode
 	 */
 	public AnnotationScopeMetadataResolver(ScopedProxyMode defaultProxyMode) {
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 4f40ea26ae..a0c8ab1159 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
@@ -78,7 +78,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
  * classes. In this case, bean methods may reference other {@code @Bean} methods
  * in the same class by calling them <i>directly</i>. This ensures that references between
  * beans are strongly typed and navigable. Such so-called <em>'inter-bean references'</em> are
- * guaranteed to respect scoping and AOP semantics, just like <code>getBean()</code> lookups
+ * guaranteed to respect scoping and AOP semantics, just like {@code getBean()} lookups
  * would. These are the semantics known from the original 'Spring JavaConfig' project
  * which require CGLIB subclassing of each such configuration class at runtime. As a
  * consequence, {@code @Configuration} classes and their factory methods must not be
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 bc2ed4e63c..9b6917c580 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
@@ -291,8 +291,8 @@ public class ClassPathBeanDefinitionScanner extends ClassPathScanningCandidateCo
 	 * bean definition needs to be registered or conflicts with an existing definition.
 	 * @param beanName the suggested name for the bean
 	 * @param beanDefinition the corresponding bean definition
-	 * @return <code>true</code> if the bean can be registered as-is;
-	 * <code>false</code> if it should be skipped because there is an
+	 * @return {@code true} if the bean can be registered as-is;
+	 * {@code false} if it should be skipped because there is an
 	 * existing, compatible bean definition for the specified name
 	 * @throws ConflictingBeanDefinitionException if an existing, incompatible
 	 * bean definition has been found for the specified name
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 4de429f2c4..a105e147f7 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
@@ -69,7 +69,7 @@ import org.springframework.util.StringUtils;
 /**
  * {@link org.springframework.beans.factory.config.BeanPostProcessor} implementation
  * that supports common Java annotations out of the box, in particular the JSR-250
- * annotations in the <code>javax.annotation</code> package. These common Java
+ * annotations in the {@code javax.annotation} package. These common Java
  * annotations are supported in many Java EE 5 technologies (e.g. JSF 1.2),
  * as well as in Java 6's JAX-WS.
  *
@@ -80,9 +80,9 @@ import org.springframework.util.StringUtils;
  *
  * <p>The central element is the {@link javax.annotation.Resource} annotation
  * for annotation-driven injection of named beans, by default from the containing
- * Spring BeanFactory, with only <code>mappedName</code> references resolved in JNDI.
+ * Spring BeanFactory, with only {@code mappedName} references resolved in JNDI.
  * The {@link #setAlwaysUseJndiLookup "alwaysUseJndiLookup" flag} enforces JNDI lookups
- * equivalent to standard Java EE 5 resource injection for <code>name</code> references
+ * equivalent to standard Java EE 5 resource injection for {@code name} references
  * and default names as well. The target beans can be simple POJOs, with no special
  * requirements other than the type having to match.
  *
@@ -116,9 +116,9 @@ import org.springframework.util.StringUtils;
  *   &lt;property name="alwaysUseJndiLookup" value="true"/&gt;
  * &lt;/bean&gt;</pre>
  *
- * <code>mappedName</code> references will always be resolved in JNDI,
+ * {@code mappedName} references will always be resolved in JNDI,
  * allowing for global JNDI names (including "java:" prefix) as well. The
- * "alwaysUseJndiLookup" flag just affects <code>name</code> references and
+ * "alwaysUseJndiLookup" flag just affects {@code name} references and
  * default names (inferred from the field name / property name).
  *
  * <p><b>NOTE:</b> A default CommonAnnotationBeanPostProcessor will be registered
@@ -196,9 +196,9 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 
 
 	/**
-	 * Ignore the given resource type when resolving <code>@Resource</code>
+	 * Ignore the given resource type when resolving {@code @Resource}
 	 * annotations.
-	 * <p>By default, the <code>javax.xml.ws.WebServiceContext</code> interface
+	 * <p>By default, the {@code javax.xml.ws.WebServiceContext} interface
 	 * will be ignored, since it will be resolved by the JAX-WS runtime.
 	 * @param resourceType the resource type to ignore
 	 */
@@ -223,11 +223,11 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 
 	/**
 	 * Set whether to always use JNDI lookups equivalent to standard Java EE 5 resource
-	 * injection, <b>even for <code>name</code> attributes and default names</b>.
+	 * injection, <b>even for {@code name} attributes and default names</b>.
 	 * <p>Default is "false": Resource names are used for Spring bean lookups in the
-	 * containing BeanFactory; only <code>mappedName</code> attributes point directly
+	 * containing BeanFactory; only {@code mappedName} attributes point directly
 	 * into JNDI. Switch this flag to "true" for enforcing Java EE style JNDI lookups
-	 * in any case, even for <code>name</code> attributes and default names.
+	 * in any case, even for {@code name} attributes and default names.
 	 * @see #setJndiFactory
 	 * @see #setResourceFactory
 	 */
@@ -236,11 +236,11 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 	}
 
 	/**
-	 * Specify the factory for objects to be injected into <code>@Resource</code> /
-	 * <code>@WebServiceRef</code> / <code>@EJB</code> annotated fields and setter methods,
-	 * <b>for <code>mappedName</code> attributes that point directly into JNDI</b>.
+	 * Specify the factory for objects to be injected into {@code @Resource} /
+	 * {@code @WebServiceRef} / {@code @EJB} annotated fields and setter methods,
+	 * <b>for {@code mappedName} attributes that point directly into JNDI</b>.
 	 * This factory will also be used if "alwaysUseJndiLookup" is set to "true" in order
-	 * to enforce JNDI lookups even for <code>name</code> attributes and default names.
+	 * to enforce JNDI lookups even for {@code name} attributes and default names.
 	 * <p>The default is a {@link org.springframework.jndi.support.SimpleJndiBeanFactory}
 	 * for JNDI lookup behavior equivalent to standard Java EE 5 resource injection.
 	 * @see #setResourceFactory
@@ -252,15 +252,15 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 	}
 
 	/**
-	 * Specify the factory for objects to be injected into <code>@Resource</code> /
-	 * <code>@WebServiceRef</code> / <code>@EJB</code> annotated fields and setter methods,
-	 * <b>for <code>name</code> attributes and default names</b>.
+	 * Specify the factory for objects to be injected into {@code @Resource} /
+	 * {@code @WebServiceRef} / {@code @EJB} annotated fields and setter methods,
+	 * <b>for {@code name} attributes and default names</b>.
 	 * <p>The default is the BeanFactory that this post-processor is defined in,
 	 * if any, looking up resource names as Spring bean names. Specify the resource
 	 * factory explicitly for programmatic usage of this post-processor.
 	 * <p>Specifying Spring's {@link org.springframework.jndi.support.SimpleJndiBeanFactory}
 	 * leads to JNDI lookup behavior equivalent to standard Java EE 5 resource injection,
-	 * even for <code>name</code> attributes and default names. This is the same behavior
+	 * even for {@code name} attributes and default names. This is the same behavior
 	 * that the "alwaysUseJndiLookup" flag enables.
 	 * @see #setAlwaysUseJndiLookup
 	 */
@@ -399,7 +399,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 	 * Obtain the resource object for the given name and type.
 	 * @param element the descriptor for the annotated field/method
 	 * @param requestingBeanName the name of the requesting bean
-	 * @return the resource object (never <code>null</code>)
+	 * @return the resource object (never {@code null})
 	 * @throws BeansException if we failed to obtain the target resource
 	 */
 	protected Object getResource(LookupElement element, String requestingBeanName) throws BeansException {
@@ -422,7 +422,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 	 * @param factory the factory to autowire against
 	 * @param element the descriptor for the annotated field/method
 	 * @param requestingBeanName the name of the requesting bean
-	 * @return the resource object (never <code>null</code>)
+	 * @return the resource object (never {@code null})
 	 * @throws BeansException if we failed to obtain the target resource
 	 */
 	protected Object autowireResource(BeanFactory factory, LookupElement element, String requestingBeanName)
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java
index 54bafe39a5..03a8a1306f 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java
@@ -29,15 +29,15 @@ public interface ScopeMetadataResolver {
 
 	/**
 	 * Resolve the {@link ScopeMetadata} appropriate to the supplied
-	 * bean <code>definition</code>.
+	 * bean {@code definition}.
 	 * <p>Implementations can of course use any strategy they like to
 	 * determine the scope metadata, but some implementations that spring
 	 * immediately to mind might be to use source level annotations
 	 * present on {@link BeanDefinition#getBeanClassName() the class} of the
-	 * supplied <code>definition</code>, or to use metadata present in the
-	 * {@link BeanDefinition#attributeNames()} of the supplied <code>definition</code>.
+	 * supplied {@code definition}, or to use metadata present in the
+	 * {@link BeanDefinition#attributeNames()} of the supplied {@code definition}.
 	 * @param definition the target bean definition
-	 * @return the relevant scope metadata; never <code>null</code>
+	 * @return the relevant scope metadata; never {@code null}
 	 */
 	ScopeMetadata resolveScopeMetadata(BeanDefinition definition);
 
diff --git a/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java b/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java
index 62f83a8f0d..b095d47d98 100644
--- a/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.ComponentScanBeanDefinitionParser;
 
 /**
  * {@link org.springframework.beans.factory.xml.NamespaceHandler}
- * for the '<code>context</code>' namespace.
+ * for the '{@code context}' namespace.
  *
  * @author Mark Fisher
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java b/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java
index bc9dbb3d5f..9e79349feb 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java
@@ -20,7 +20,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
 
 /**
- * Base class for events raised for an <code>ApplicationContext</code>.
+ * Base class for events raised for an {@code ApplicationContext}.
  *
  * @author Juergen Hoeller
  * @since 2.5
@@ -29,15 +29,15 @@ public abstract class ApplicationContextEvent extends ApplicationEvent {
 
 	/**
 	 * Create a new ContextStartedEvent.
-	 * @param source the <code>ApplicationContext</code> that the event is raised for
-	 * (must not be <code>null</code>)
+	 * @param source the {@code ApplicationContext} that the event is raised for
+	 * (must not be {@code null})
 	 */
 	public ApplicationContextEvent(ApplicationContext source) {
 		super(source);
 	}
 
 	/**
-	 * Get the <code>ApplicationContext</code> that the event was raised for.
+	 * Get the {@code ApplicationContext} that the event was raised for.
 	 */
 	public final ApplicationContext getApplicationContext() {
 		return (ApplicationContext) getSource();
diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java
index e53df33896..82a5b47eba 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java
@@ -19,7 +19,7 @@ package org.springframework.context.event;
 import org.springframework.context.ApplicationContext;
 
 /**
- * Event raised when an <code>ApplicationContext</code> gets closed.
+ * Event raised when an {@code ApplicationContext} gets closed.
  *
  * @author Juergen Hoeller
  * @since 12.08.2003
@@ -29,8 +29,8 @@ public class ContextClosedEvent extends ApplicationContextEvent {
 
 	/**
 	 * Creates a new ContextClosedEvent.
-	 * @param source the <code>ApplicationContext</code> that has been closed
-	 * (must not be <code>null</code>)
+	 * @param source the {@code ApplicationContext} that has been closed
+	 * (must not be {@code null})
 	 */
 	public ContextClosedEvent(ApplicationContext source) {
 		super(source);
diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java
index 9b448cb3b4..bc6d2255b7 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java
@@ -19,7 +19,7 @@ package org.springframework.context.event;
 import org.springframework.context.ApplicationContext;
 
 /**
- * Event raised when an <code>ApplicationContext</code> gets initialized or refreshed.
+ * Event raised when an {@code ApplicationContext} gets initialized or refreshed.
  *
  * @author Juergen Hoeller
  * @since 04.03.2003
@@ -29,8 +29,8 @@ public class ContextRefreshedEvent extends ApplicationContextEvent {
 
 	/**
 	 * Create a new ContextRefreshedEvent.
-	 * @param source the <code>ApplicationContext</code> that has been initialized
-	 * or refreshed (must not be <code>null</code>)
+	 * @param source the {@code ApplicationContext} that has been initialized
+	 * or refreshed (must not be {@code null})
 	 */
 	public ContextRefreshedEvent(ApplicationContext source) {
 		super(source);
diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java
index bc3e7163c1..edef2350db 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java
@@ -19,7 +19,7 @@ package org.springframework.context.event;
 import org.springframework.context.ApplicationContext;
 
 /**
- * Event raised when an <code>ApplicationContext</code> gets started.
+ * Event raised when an {@code ApplicationContext} gets started.
  *
  * @author Mark Fisher
  * @author Juergen Hoeller
@@ -30,8 +30,8 @@ public class ContextStartedEvent extends ApplicationContextEvent {
 
 	/**
 	 * Create a new ContextStartedEvent.
-	 * @param source the <code>ApplicationContext</code> that has been started
-	 * (must not be <code>null</code>)
+	 * @param source the {@code ApplicationContext} that has been started
+	 * (must not be {@code null})
 	 */
 	public ContextStartedEvent(ApplicationContext source) {
 		super(source);
diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java
index a00f82baea..5e995ab6c3 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java
@@ -19,7 +19,7 @@ package org.springframework.context.event;
 import org.springframework.context.ApplicationContext;
 
 /**
- * Event raised when an <code>ApplicationContext</code> gets stopped.
+ * Event raised when an {@code ApplicationContext} gets stopped.
  *
  * @author Mark Fisher
  * @author Juergen Hoeller
@@ -30,8 +30,8 @@ public class ContextStoppedEvent extends ApplicationContextEvent {
 
 	/**
 	 * Create a new ContextStoppedEvent.
-	 * @param source the <code>ApplicationContext</code> that has been stopped
-	 * (must not be <code>null</code>)
+	 * @param source the {@code ApplicationContext} that has been stopped
+	 * (must not be {@code null})
 	 */
 	public ContextStoppedEvent(ApplicationContext source) {
 		super(source);
diff --git a/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java b/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java
index 98d08dbcf3..abaddb72b3 100644
--- a/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java
@@ -28,8 +28,8 @@ import org.springframework.context.ApplicationEventPublisherAware;
 
 /**
  * {@link MethodInterceptor Interceptor} that publishes an
- * <code>ApplicationEvent</code> to all <code>ApplicationListeners</code>
- * registered with an <code>ApplicationEventPublisher</code> after each
+ * {@code ApplicationEvent} to all {@code ApplicationListeners}
+ * registered with an {@code ApplicationEventPublisher} after each
  * <i>successful</i> method invocation.
  *
  * <p>Note that this interceptor is only capable of publishing <i>stateless</i>
@@ -56,11 +56,11 @@ public class EventPublicationInterceptor
 	/**
 	 * Set the application event class to publish.
 	 * <p>The event class <b>must</b> have a constructor with a single
-	 * <code>Object</code> argument for the event source. The interceptor
+	 * {@code Object} argument for the event source. The interceptor
 	 * will pass in the invoked object.
-	 * @throws IllegalArgumentException if the supplied <code>Class</code> is
-	 * <code>null</code> or if it is not an <code>ApplicationEvent</code> subclass or
-	 * if it does not expose a constructor that takes a single <code>Object</code> argument
+	 * @throws IllegalArgumentException if the supplied {@code Class} is
+	 * {@code null} or if it is not an {@code ApplicationEvent} subclass or
+	 * if it does not expose a constructor that takes a single {@code Object} argument
 	 */
 	public void setApplicationEventClass(Class applicationEventClass) {
 		if (ApplicationEvent.class.equals(applicationEventClass) ||
diff --git a/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
index d84d0d17b0..dcaf8fc14e 100644
--- a/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
+++ b/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
@@ -27,7 +27,7 @@ import org.springframework.context.ApplicationListener;
  *
  * <p>Multicasts all events to all registered listeners, leaving it up to
  * the listeners to ignore events that they are not interested in.
- * Listeners will usually perform corresponding <code>instanceof</code>
+ * Listeners will usually perform corresponding {@code instanceof}
  * checks on the passed-in event object.
  *
  * <p>By default, all listeners are invoked in the calling thread.
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 53ed9ce911..efd11eb77d 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
@@ -63,7 +63,7 @@ public class MapAccessor implements PropertyAccessor {
 
 
 	/**
-	 * Exception thrown from <code>read</code> in order to reset a cached
+	 * Exception thrown from {@code read} in order to reset a cached
 	 * PropertyAccessor, allowing other accessors to have a try.
 	 */
 	private static class MapAccessException extends AccessException {
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 5f3cabedf4..6ace399333 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
@@ -25,7 +25,7 @@ import org.springframework.core.NamedThreadLocal;
  * Simple holder class that associates a LocaleContext instance
  * with the current thread. The LocaleContext will be inherited
  * by any child threads spawned by the current thread if the
- * <code>inheritable<code> flag is set to <code>true</code>.
+ * {@code inheritable} flag is set to {@code true}.
  *
  * <p>Used as a central holder for the current Locale in Spring,
  * wherever necessary: for example, in MessageSourceAccessor.
@@ -68,9 +68,9 @@ public abstract class LocaleContextHolder {
 	/**
 	 * Associate the given LocaleContext with the current thread.
 	 * @param localeContext the current LocaleContext,
-	 * or <code>null</code> to reset the thread-bound context
+	 * or {@code null} to reset the thread-bound context
 	 * @param inheritable whether to expose the LocaleContext as inheritable
-	 * for child threads (using an {@link java.lang.InheritableThreadLocal})
+	 * for child threads (using an {@link InheritableThreadLocal})
 	 */
 	public static void setLocaleContext(LocaleContext localeContext, boolean inheritable) {
 		if (localeContext == null) {
@@ -90,7 +90,7 @@ public abstract class LocaleContextHolder {
 
 	/**
 	 * Return the LocaleContext associated with the current thread, if any.
-	 * @return the current LocaleContext, or <code>null</code> if none
+	 * @return the current LocaleContext, or {@code null} if none
 	 */
 	public static LocaleContext getLocaleContext() {
 		LocaleContext localeContext = localeContextHolder.get();
@@ -104,7 +104,7 @@ public abstract class LocaleContextHolder {
 	 * Associate the given Locale with the current thread.
 	 * <p>Will implicitly create a LocaleContext for the given Locale,
 	 * <i>not</i> exposing it as inheritable for child threads.
-	 * @param locale the current Locale, or <code>null</code> to reset
+	 * @param locale the current Locale, or {@code null} to reset
 	 * the thread-bound context
 	 * @see SimpleLocaleContext#SimpleLocaleContext(java.util.Locale)
 	 */
@@ -115,10 +115,10 @@ public abstract class LocaleContextHolder {
 	/**
 	 * Associate the given Locale with the current thread.
 	 * <p>Will implicitly create a LocaleContext for the given Locale.
-	 * @param locale the current Locale, or <code>null</code> to reset
+	 * @param locale the current Locale, or {@code null} to reset
 	 * the thread-bound context
 	 * @param inheritable whether to expose the LocaleContext as inheritable
-	 * for child threads (using an {@link java.lang.InheritableThreadLocal})
+	 * for child threads (using an {@link InheritableThreadLocal})
 	 * @see SimpleLocaleContext#SimpleLocaleContext(java.util.Locale)
 	 */
 	public static void setLocale(Locale locale, boolean inheritable) {
diff --git a/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java b/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java
index c55773f320..b21e35e772 100644
--- a/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java
+++ b/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java
@@ -22,7 +22,7 @@ import org.springframework.util.Assert;
 
 /**
  * Simple implementation of the {@link LocaleContext} interface,
- * always returning a specified <code>Locale</code>.
+ * always returning a specified {@code Locale}.
  *
  * @author Juergen Hoeller
  * @since 1.2
@@ -34,7 +34,7 @@ public class SimpleLocaleContext implements LocaleContext {
 
 	/**
 	 * Create a new SimpleLocaleContext that exposes the specified Locale.
-	 * Every <code>getLocale()</code> will return this Locale.
+	 * Every {@code getLocale()} will return this Locale.
 	 * @param locale the Locale to expose
 	 */
 	public SimpleLocaleContext(Locale locale) {
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 120ee42154..6bfc380aa5 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
@@ -264,14 +264,14 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 
 	/**
 	 * Return a friendly name for this context.
-	 * @return a display name for this context (never <code>null</code>)
+	 * @return a display name for this context (never {@code null})
 	 */
 	public String getDisplayName() {
 		return this.displayName;
 	}
 
 	/**
-	 * Return the parent context, or <code>null</code> if there is no parent
+	 * Return the parent context, or {@code null} if there is no parent
 	 * (that is, this context is the root of the context hierarchy).
 	 */
 	public ApplicationContext getParent() {
@@ -339,7 +339,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 
 	/**
 	 * Return the internal ApplicationEventMulticaster used by the context.
-	 * @return the internal ApplicationEventMulticaster (never <code>null</code>)
+	 * @return the internal ApplicationEventMulticaster (never {@code null})
 	 * @throws IllegalStateException if the context has not been initialized yet
 	 */
 	private ApplicationEventMulticaster getApplicationEventMulticaster() throws IllegalStateException {
@@ -352,7 +352,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 
 	/**
 	 * Return the internal LifecycleProcessor used by the context.
-	 * @return the internal LifecycleProcessor (never <code>null</code>)
+	 * @return the internal LifecycleProcessor (never {@code null})
 	 * @throws IllegalStateException if the context has not been initialized yet
 	 */
 	private LifecycleProcessor getLifecycleProcessor() {
@@ -371,7 +371,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * <p>Can be overridden in subclasses, for extended resolution strategies,
 	 * for example in a web environment.
 	 * <p><b>Do not call this when needing to resolve a location pattern.</b>
-	 * Call the context's <code>getResources</code> method instead, which
+	 * Call the context's {@code getResources} method instead, which
 	 * will delegate to the ResourcePatternResolver.
 	 * @return the ResourcePatternResolver for this context
 	 * @see #getResources
@@ -952,7 +952,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	}
 
 	/**
-	 * Cancel this context's refresh attempt, resetting the <code>active</code> flag
+	 * Cancel this context's refresh attempt, resetting the {@code active} flag
 	 * after an exception got thrown.
 	 * @param ex the exception that led to the cancellation
 	 */
@@ -966,8 +966,8 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	/**
 	 * Register a shutdown hook with the JVM runtime, closing this context
 	 * on JVM shutdown unless it has already been closed at that time.
-	 * <p>Delegates to <code>doClose()</code> for the actual closing procedure.
-	 * @see java.lang.Runtime#addShutdownHook
+	 * <p>Delegates to {@code doClose()} for the actual closing procedure.
+	 * @see Runtime#addShutdownHook
 	 * @see #close()
 	 * @see #doClose()
 	 */
@@ -989,7 +989,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * Only called when the ApplicationContext itself is running
 	 * as a bean in another BeanFactory or ApplicationContext,
 	 * which is rather unusual.
-	 * <p>The <code>close</code> method is the native way to
+	 * <p>The {@code close} method is the native way to
 	 * shut down an ApplicationContext.
 	 * @see #close()
 	 * @see org.springframework.beans.factory.access.SingletonBeanFactoryLocator
@@ -1000,7 +1000,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 
 	/**
 	 * Close this application context, destroying all beans in its bean factory.
-	 * <p>Delegates to <code>doClose()</code> for the actual closing procedure.
+	 * <p>Delegates to {@code doClose()} for the actual closing procedure.
 	 * Also removes a JVM shutdown hook, if registered, as it's not needed anymore.
 	 * @see #doClose()
 	 * @see #registerShutdownHook()
@@ -1024,7 +1024,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	/**
 	 * Actually performs context closing: publishes a ContextClosedEvent and
 	 * destroys the singletons in the bean factory of this application context.
-	 * <p>Called by both <code>close()</code> and a JVM shutdown hook, if any.
+	 * <p>Called by both {@code close()} and a JVM shutdown hook, if any.
 	 * @see org.springframework.context.event.ContextClosedEvent
 	 * @see #destroyBeans()
 	 * @see #close()
@@ -1078,7 +1078,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	/**
 	 * Template method for destroying all beans that this context manages.
 	 * The default implementation destroy all cached singletons in this context,
-	 * invoking <code>DisposableBean.destroy()</code> and/or the specified
+	 * invoking {@code DisposableBean.destroy()} and/or the specified
 	 * "destroy-method".
 	 * <p>Can be overridden to add context-specific bean destruction steps
 	 * right before or right after standard singleton destruction,
@@ -1240,7 +1240,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 
 	/**
 	 * Return the internal MessageSource used by the context.
-	 * @return the internal MessageSource (never <code>null</code>)
+	 * @return the internal MessageSource (never {@code null})
 	 * @throws IllegalStateException if the context has not been initialized yet
 	 */
 	private MessageSource getMessageSource() throws IllegalStateException {
@@ -1318,7 +1318,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * <p>Note: Subclasses should check whether the context is still active before
 	 * returning the internal bean factory. The internal factory should generally be
 	 * considered unavailable once the context has been closed.
-	 * @return this application context's internal bean factory (never <code>null</code>)
+	 * @return this application context's internal bean factory (never {@code null})
 	 * @throws IllegalStateException if the context does not hold an internal bean factory yet
 	 * (usually if {@link #refresh()} has never been called) or if the context has been
 	 * closed already
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java
index 3d9231a0fc..a7f44dca16 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java
@@ -164,13 +164,13 @@ public abstract class AbstractMessageSource extends MessageSourceSupport impleme
 
 	/**
 	 * Resolve the given code and arguments as message in the given Locale,
-	 * returning <code>null</code> if not found. Does <i>not</i> fall back to
-	 * the code as default message. Invoked by <code>getMessage</code> methods.
+	 * returning {@code null} if not found. Does <i>not</i> fall back to
+	 * the code as default message. Invoked by {@code getMessage} methods.
 	 * @param code the code to lookup up, such as 'calculator.noRateSet'
 	 * @param args array of arguments that will be filled in for params
 	 * within the message
 	 * @param locale the Locale in which to do the lookup
-	 * @return the resolved message, or <code>null</code> if not found
+	 * @return the resolved message, or {@code null} if not found
 	 * @see #getMessage(String, Object[], String, Locale)
 	 * @see #getMessage(String, Object[], Locale)
 	 * @see #getMessage(MessageSourceResolvable, Locale)
@@ -220,7 +220,7 @@ public abstract class AbstractMessageSource extends MessageSourceSupport impleme
 	 * @param args array of arguments that will be filled in for params
 	 * within the message
 	 * @param locale the Locale in which to do the lookup
-	 * @return the resolved message, or <code>null</code> if not found
+	 * @return the resolved message, or {@code null} if not found
 	 * @see #getParentMessageSource()
 	 */
 	protected String getMessageFromParent(String code, Object[] args, Locale locale) {
@@ -244,10 +244,10 @@ public abstract class AbstractMessageSource extends MessageSourceSupport impleme
 	 * Return a fallback default message for the given code, if any.
 	 * <p>Default is to return the code itself if "useCodeAsDefaultMessage" is activated,
 	 * or return no fallback else. In case of no fallback, the caller will usually
-	 * receive a NoSuchMessageException from <code>getMessage</code>.
+	 * receive a NoSuchMessageException from {@code getMessage}.
 	 * @param code the message code that we couldn't resolve
 	 * and that we didn't receive an explicit default message for
-	 * @return the default message to use, or <code>null</code> if none
+	 * @return the default message to use, or {@code null} if none
 	 * @see #setUseCodeAsDefaultMessage
 	 */
 	protected String getDefaultMessage(String code) {
@@ -289,14 +289,14 @@ public abstract class AbstractMessageSource extends MessageSourceSupport impleme
 	 * <p>The default implementation <i>does</i> use MessageFormat, through
 	 * delegating to the {@link #resolveCode} method. Subclasses are encouraged
 	 * to replace this with optimized resolution.
-	 * <p>Unfortunately, <code>java.text.MessageFormat</code> is not implemented
+	 * <p>Unfortunately, {@code java.text.MessageFormat} is not implemented
 	 * in an efficient fashion. In particular, it does not detect that a message
 	 * pattern doesn't contain argument placeholders in the first place. Therefore,
 	 * it is advisable to circumvent MessageFormat for messages without arguments.
 	 * @param code the code of the message to resolve
 	 * @param locale the Locale to resolve the code for
 	 * (subclasses are encouraged to support internationalization)
-	 * @return the message String, or <code>null</code> if not found
+	 * @return the message String, or {@code null} if not found
 	 * @see #resolveCode
 	 * @see java.text.MessageFormat
 	 */
@@ -320,7 +320,7 @@ public abstract class AbstractMessageSource extends MessageSourceSupport impleme
 	 * @param code the code of the message to resolve
 	 * @param locale the Locale to resolve the code for
 	 * (subclasses are encouraged to support internationalization)
-	 * @return the MessageFormat for the message, or <code>null</code> if not found
+	 * @return the MessageFormat for the message, or {@code null} if not found
 	 * @see #resolveCodeWithoutArguments(String, java.util.Locale)
 	 */
 	protected abstract MessageFormat resolveCode(String code, Locale locale);
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java
index 77155fb220..5e8377c999 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java
@@ -90,9 +90,9 @@ public abstract class AbstractRefreshableConfigApplicationContext extends Abstra
 	 * Return an array of resource locations, referring to the XML bean definition
 	 * files that this context should be built with. Can also include location
 	 * patterns, which will get resolved via a ResourcePatternResolver.
-	 * <p>The default implementation returns <code>null</code>. Subclasses can override
+	 * <p>The default implementation returns {@code null}. Subclasses can override
 	 * this to provide a set of resource locations to load bean definitions from.
-	 * @return an array of resource locations, or <code>null</code> if none
+	 * @return an array of resource locations, or {@code null} if none
 	 * @see #getResources
 	 * @see #getResourcePatternResolver
 	 */
@@ -103,7 +103,7 @@ public abstract class AbstractRefreshableConfigApplicationContext extends Abstra
 	/**
 	 * Return the default config locations to use, for the case where no
 	 * explicit config locations have been specified.
-	 * <p>The default implementation returns <code>null</code>,
+	 * <p>The default implementation returns {@code null},
 	 * requiring explicit config locations.
 	 * @return an array of default config locations, if any
 	 * @see #setConfigLocations
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java
index 20c2734f76..3f88a900db 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java
@@ -63,7 +63,7 @@ public abstract class AbstractXmlApplicationContext extends AbstractRefreshableC
 
 
 	/**
-	 * Set whether to use XML validation. Default is <code>true</code>.
+	 * Set whether to use XML validation. Default is {@code true}.
 	 */
 	public void setValidating(boolean validating) {
 		this.validating = validating;
@@ -131,9 +131,9 @@ public abstract class AbstractXmlApplicationContext extends AbstractRefreshableC
 	/**
 	 * Return an array of Resource objects, referring to the XML bean definition
 	 * files that this context should be built with.
-	 * <p>The default implementation returns <code>null</code>. Subclasses can override
+	 * <p>The default implementation returns {@code null}. Subclasses can override
 	 * this to provide pre-built Resource objects rather than location Strings.
-	 * @return an array of Resource objects, or <code>null</code> if none
+	 * @return an array of Resource objects, or {@code null} if none
 	 * @see #getConfigLocations()
 	 */
 	protected Resource[] getConfigResources() {
diff --git a/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
index 675cb8f200..a872b76b78 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
@@ -95,7 +95,7 @@ public abstract class ApplicationObjectSupport implements ApplicationContextAwar
 
 	/**
 	 * Determine the context class that any context passed to
-	 * <code>setApplicationContext</code> must be an instance of.
+	 * {@code setApplicationContext} must be an instance of.
 	 * Can be overridden in subclasses.
 	 * @see #setApplicationContext
 	 */
@@ -105,7 +105,7 @@ public abstract class ApplicationObjectSupport implements ApplicationContextAwar
 
 	/**
 	 * Subclasses can override this for custom initialization behavior.
-	 * Gets called by <code>setApplicationContext</code> after setting the context instance.
+	 * Gets called by {@code setApplicationContext} after setting the context instance.
 	 * <p>Note: Does </i>not</i> get called on reinitialization of the context
 	 * but rather just on first initialization of this object's context reference.
 	 * <p>The default implementation calls the overloaded {@link #initApplicationContext()}
diff --git a/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java b/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java
index 9570bcb0d5..6930177ded 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java
@@ -28,7 +28,7 @@ import org.springframework.util.ReflectionUtils;
 /**
  * Special variant of an overriding ClassLoader, used for temporary type
  * matching in {@link AbstractApplicationContext}. Redefines classes from
- * a cached byte array for every <code>loadClass</code> call in order to
+ * a cached byte array for every {@code loadClass} call in order to
  * pick up recently loaded types in the parent ClassLoader.
  *
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
index dab8670443..67c9bc99c6 100644
--- a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
+++ b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
@@ -131,7 +131,7 @@ public class DefaultMessageSourceResolvable implements MessageSourceResolvable,
 	/**
 	 * Default implementation exposes the attributes of this MessageSourceResolvable.
 	 * To be overridden in more specific subclasses, potentially including the
-	 * resolvable content through <code>resolvableToString()</code>.
+	 * resolvable content through {@code resolvableToString()}.
 	 * @see #resolvableToString()
 	 */
 	@Override
diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
index 8a5da83ddc..83c6db1b52 100644
--- a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
@@ -178,7 +178,7 @@ public class GenericApplicationContext extends AbstractApplicationContext implem
 
 	/**
 	 * Set a ResourceLoader to use for this context. If set, the context will
-	 * delegate all <code>getResource</code> calls to the given ResourceLoader.
+	 * delegate all {@code getResource} calls to the given ResourceLoader.
 	 * If not set, default resource loading will apply.
 	 * <p>The main reason to specify a custom ResourceLoader is to resolve
 	 * resource paths (without URL prefix) in a specific fashion.
@@ -186,7 +186,7 @@ public class GenericApplicationContext extends AbstractApplicationContext implem
 	 * To resolve resource paths as file system locations, specify a
 	 * FileSystemResourceLoader here.
 	 * <p>You can also pass in a full ResourcePatternResolver, which will
-	 * be autodetected by the context and used for <code>getResources</code>
+	 * be autodetected by the context and used for {@code getResources}
 	 * calls as well. Else, default resource pattern matching will apply.
 	 * @see #getResource
 	 * @see org.springframework.core.io.DefaultResourceLoader
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 00b6555849..5384a333be 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
@@ -84,7 +84,7 @@ public class GenericXmlApplicationContext extends GenericApplicationContext {
 	}
 
 	/**
-	 * Set whether to use XML validation. Default is <code>true</code>.
+	 * Set whether to use XML validation. Default is {@code true}.
 	 */
 	public void setValidating(boolean validating) {
 		this.reader.setValidating(validating);
diff --git a/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java b/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java
index 34cb5e51db..e026e5c98f 100644
--- a/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java
+++ b/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java
@@ -97,7 +97,7 @@ public class MessageSourceAccessor {
 	/**
 	 * Retrieve the message for the given code and the default Locale.
 	 * @param code code of the message
-	 * @param args arguments for the message, or <code>null</code> if none
+	 * @param args arguments for the message, or {@code null} if none
 	 * @param defaultMessage String to return if the lookup fails
 	 * @return the message
 	 */
@@ -108,7 +108,7 @@ public class MessageSourceAccessor {
 	/**
 	 * Retrieve the message for the given code and the given Locale.
 	 * @param code code of the message
-	 * @param args arguments for the message, or <code>null</code> if none
+	 * @param args arguments for the message, or {@code null} if none
 	 * @param defaultMessage String to return if the lookup fails
 	 * @param locale Locale in which to do lookup
 	 * @return the message
@@ -141,7 +141,7 @@ public class MessageSourceAccessor {
 	/**
 	 * Retrieve the message for the given code and the default Locale.
 	 * @param code code of the message
-	 * @param args arguments for the message, or <code>null</code> if none
+	 * @param args arguments for the message, or {@code null} if none
 	 * @return the message
 	 * @throws org.springframework.context.NoSuchMessageException if not found
 	 */
@@ -152,7 +152,7 @@ public class MessageSourceAccessor {
 	/**
 	 * Retrieve the message for the given code and the given Locale.
 	 * @param code code of the message
-	 * @param args arguments for the message, or <code>null</code> if none
+	 * @param args arguments for the message, or {@code null} if none
 	 * @param locale Locale in which to do lookup
 	 * @return the message
 	 * @throws org.springframework.context.NoSuchMessageException if not found
diff --git a/spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java b/spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java
index c5fe46acf5..4dd8bce351 100644
--- a/spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java
+++ b/spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java
@@ -67,7 +67,7 @@ public class MessageSourceResourceBundle extends ResourceBundle {
 
 	/**
 	 * This implementation resolves the code in the MessageSource.
-	 * Returns <code>null</code> if the message could not be resolved.
+	 * Returns {@code null} if the message could not be resolved.
 	 */
 	@Override
 	protected Object handleGetObject(String code) {
@@ -80,7 +80,7 @@ public class MessageSourceResourceBundle extends ResourceBundle {
 	}
 
 	/**
-	 * This implementation returns <code>null</code>, as a MessageSource does
+	 * This implementation returns {@code null}, as a MessageSource does
 	 * not allow for enumerating the defined message codes.
 	 */
 	@Override
@@ -90,7 +90,7 @@ public class MessageSourceResourceBundle extends ResourceBundle {
 
 	/**
 	 * This implementation exposes the specified Locale for introspection
-	 * through the standard <code>ResourceBundle.getLocale()</code> method.
+	 * through the standard {@code ResourceBundle.getLocale()} method.
 	 */
 	@Override
 	public Locale getLocale() {
diff --git a/spring-context/src/main/java/org/springframework/context/support/MessageSourceSupport.java b/spring-context/src/main/java/org/springframework/context/support/MessageSourceSupport.java
index b7601375a7..d863add687 100644
--- a/spring-context/src/main/java/org/springframework/context/support/MessageSourceSupport.java
+++ b/spring-context/src/main/java/org/springframework/context/support/MessageSourceSupport.java
@@ -32,7 +32,7 @@ import org.springframework.util.ObjectUtils;
  * methods defined in the {@link org.springframework.context.MessageSource}.
  *
  * <p>{@link AbstractMessageSource} derives from this class, providing concrete
- * <code>getMessage</code> implementations that delegate to a central template
+ * {@code getMessage} implementations that delegate to a central template
  * method for message code resolution.
  *
  * @author Juergen Hoeller
@@ -87,12 +87,12 @@ public abstract class MessageSourceSupport {
 	 * Render the given default message String. The default message is
 	 * passed in as specified by the caller and can be rendered into
 	 * a fully formatted default message shown to the user.
-	 * <p>The default implementation passes the String to <code>formatMessage</code>,
+	 * <p>The default implementation passes the String to {@code formatMessage},
 	 * resolving any argument placeholders found in them. Subclasses may override
 	 * this method to plug in custom processing of default messages.
 	 * @param defaultMessage the passed-in default message String
 	 * @param args array of arguments that will be filled in for params within
-	 * the message, or <code>null</code> if none.
+	 * the message, or {@code null} if none.
 	 * @param locale the Locale used for formatting
 	 * @return the rendered default message (with resolved arguments)
 	 * @see #formatMessage(String, Object[], java.util.Locale)
@@ -107,7 +107,7 @@ public abstract class MessageSourceSupport {
 	 * any argument placeholders found in them.
 	 * @param msg the message to format
 	 * @param args array of arguments that will be filled in for params within
-	 * the message, or <code>null</code> if none
+	 * the message, or {@code null} if none
 	 * @param locale the Locale used for formatting
 	 * @return the formatted message (with resolved arguments)
 	 */
diff --git a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
index 44d284c9a5..e428c760b9 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
@@ -174,7 +174,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource
 	/**
 	 * Set the default charset to use for parsing properties files.
 	 * Used if no file-specific charset is specified for a file.
-	 * <p>Default is none, using the <code>java.util.Properties</code>
+	 * <p>Default is none, using the {@code java.util.Properties}
 	 * default encoding: ISO-8859-1.
 	 * <p>Only applies to classic properties files, not to XML files.
 	 * @param defaultEncoding the default charset
@@ -205,7 +205,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource
 	 * fallback will be the default file (e.g. "messages.properties" for
 	 * basename "messages").
 	 * <p>Falling back to the system Locale is the default behavior of
-	 * <code>java.util.ResourceBundle</code>. However, this is often not desirable
+	 * {@code java.util.ResourceBundle}. However, this is often not desirable
 	 * in an application server environment, where the system Locale is not relevant
 	 * to the application at all: Set this flag to "false" in such a scenario.
 	 */
@@ -217,7 +217,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource
 	 * Set the number of seconds to cache loaded properties files.
 	 * <ul>
 	 * <li>Default is "-1", indicating to cache forever (just like
-	 * <code>java.util.ResourceBundle</code>).
+	 * {@code java.util.ResourceBundle}).
 	 * <li>A positive number will cache loaded properties files for the given
 	 * number of seconds. This is essentially the interval between refresh checks.
 	 * Note that a refresh attempt will first check the last-modified timestamp
@@ -445,7 +445,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource
 
 	/**
 	 * Refresh the PropertiesHolder for the given bundle filename.
-	 * The holder can be <code>null</code> if not cached before, or a timed-out cache entry
+	 * The holder can be {@code null} if not cached before, or a timed-out cache entry
 	 * (potentially getting re-validated against the current last-modified timestamp).
 	 * @param filename the bundle filename (basename + Locale)
 	 * @param propHolder the current PropertiesHolder for the bundle
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 bf99812553..eeca86a108 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
@@ -49,9 +49,9 @@ import org.springframework.util.StringUtils;
  * the generated MessageFormats for each message. It also implements rendering of
  * no-arg messages without MessageFormat, as supported by the AbstractMessageSource
  * base class. The caching provided by this MessageSource is significantly faster
- * than the built-in caching of the <code>java.util.ResourceBundle</code> class.
+ * than the built-in caching of the {@code java.util.ResourceBundle} class.
  *
- * <p>Unfortunately, <code>java.util.ResourceBundle</code> caches loaded bundles
+ * <p>Unfortunately, {@code java.util.ResourceBundle} caches loaded bundles
  * forever: Reloading a bundle during VM execution is <i>not</i> possible.
  * As this MessageSource relies on ResourceBundle, it faces the same limitation.
  * Consider {@link ReloadableResourceBundleMessageSource} for an alternative
@@ -103,7 +103,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement
 	/**
 	 * Set a single basename, following {@link java.util.ResourceBundle} conventions:
 	 * essentially, a fully-qualified classpath location. If it doesn't contain a
-	 * package qualifier (such as <code>org.mypackage</code>), it will be resolved
+	 * package qualifier (such as {@code org.mypackage}), it will be resolved
 	 * from the classpath root.
 	 * <p>Messages will normally be held in the "/lib" or "/classes" directory of
 	 * a web application's WAR structure. They can also be held in jar files on
@@ -111,7 +111,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement
 	 * <p>Note that ResourceBundle names are effectively classpath locations: As a
 	 * consequence, the JDK's standard ResourceBundle treats dots as package separators.
 	 * This means that "test.theme" is effectively equivalent to "test/theme",
-	 * just like it is for programmatic <code>java.util.ResourceBundle</code> usage.
+	 * just like it is for programmatic {@code java.util.ResourceBundle} usage.
 	 * @see #setBasenames
 	 * @see java.util.ResourceBundle#getBundle(String)
 	 */
@@ -122,7 +122,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement
 	/**
 	 * Set an array of basenames, each following {@link java.util.ResourceBundle}
 	 * conventions: essentially, a fully-qualified classpath location. If it
-	 * doesn't contain a package qualifier (such as <code>org.mypackage</code>),
+	 * doesn't contain a package qualifier (such as {@code org.mypackage}),
 	 * it will be resolved from the classpath root.
 	 * <p>The associated resource bundles will be checked sequentially
 	 * when resolving a message code. Note that message definitions in a
@@ -131,7 +131,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement
 	 * <p>Note that ResourceBundle names are effectively classpath locations: As a
 	 * consequence, the JDK's standard ResourceBundle treats dots as package separators.
 	 * This means that "test.theme" is effectively equivalent to "test/theme",
-	 * just like it is for programmatic <code>java.util.ResourceBundle</code> usage.
+	 * just like it is for programmatic {@code java.util.ResourceBundle} usage.
 	 * @see #setBasename
 	 * @see java.util.ResourceBundle#getBundle(String)
 	 */
@@ -151,7 +151,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement
 
 	/**
 	 * Set the default charset to use for parsing resource bundle files.
-	 * <p>Default is none, using the <code>java.util.ResourceBundle</code>
+	 * <p>Default is none, using the {@code java.util.ResourceBundle}
 	 * default encoding: ISO-8859-1.
 	 * <p><b>NOTE: Only works on JDK 1.6 and higher.</b> Consider using
 	 * {@link ReloadableResourceBundleMessageSource} for JDK 1.5 support
@@ -167,7 +167,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement
 	 * fallback will be the default file (e.g. "messages.properties" for
 	 * basename "messages").
 	 * <p>Falling back to the system Locale is the default behavior of
-	 * <code>java.util.ResourceBundle</code>. However, this is often not desirable
+	 * {@code java.util.ResourceBundle}. However, this is often not desirable
 	 * in an application server environment, where the system Locale is not relevant
 	 * to the application at all: Set this flag to "false" in such a scenario.
 	 * <p><b>NOTE: Only works on JDK 1.6 and higher.</b> Consider using
@@ -266,7 +266,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement
 	 * fetching already generated MessageFormats from the cache.
 	 * @param basename the basename of the ResourceBundle
 	 * @param locale the Locale to find the ResourceBundle for
-	 * @return the resulting ResourceBundle, or <code>null</code> if none
+	 * @return the resulting ResourceBundle, or {@code null} if none
 	 * found for the given basename and Locale
 	 */
 	protected ResourceBundle getResourceBundle(String basename, Locale locale) {
@@ -338,7 +338,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement
 	 * @param bundle the ResourceBundle to work on
 	 * @param code the message code to retrieve
 	 * @param locale the Locale to use to build the MessageFormat
-	 * @return the resulting MessageFormat, or <code>null</code> if no message
+	 * @return the resulting MessageFormat, or {@code null} if no message
 	 * defined for the given code
 	 * @throws MissingResourceException if thrown by the ResourceBundle
 	 */
@@ -413,7 +413,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement
 
 
 	/**
-	 * Custom implementation of Java 6's <code>ResourceBundle.Control</code>,
+	 * Custom implementation of Java 6's {@code ResourceBundle.Control},
 	 * adding support for custom file encodings, deactivating the fallback to the
 	 * system locale and activating ResourceBundle's native cache, if desired.
 	 */
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 c30f65e58c..6c8cbc99d7 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
@@ -29,11 +29,11 @@ import org.springframework.core.NamedThreadLocal;
 /**
  * Thread-backed {@link Scope} implementation.
  *
- * <p><strong>Note</strong> that the <code>SimpleThreadScope</code> <em>does not clean up any objects</em> associated
+ * <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>For a implementation of a thread-based <code>Scope</code> with support for destruction callbacks, refer to <a
+ * <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>Thanks to Eugene Kuleshov for submitting the original prototype for a thread scope!
diff --git a/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
index 0630d290c6..4e82ef9cdb 100644
--- a/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
@@ -35,11 +35,11 @@ import org.springframework.instrument.classloading.websphere.WebSphereLoadTimeWe
 
 /**
  * Default {@link LoadTimeWeaver} bean for use in an application context,
- * decorating an automatically detected internal <code>LoadTimeWeaver</code>.
+ * decorating an automatically detected internal {@code LoadTimeWeaver}.
  *
  * <p>Typically registered for the default bean name
- * "<code>loadTimeWeaver</code>"; the most convenient way to achieve this is
- * Spring's <code>&lt;context:load-time-weaver&gt;</code> XML tag.
+ * "{@code loadTimeWeaver}"; the most convenient way to achieve this is
+ * Spring's {@code &lt;context:load-time-weaver&gt;} XML tag.
  *
  * <p>This class implements a runtime environment check for obtaining
  * the appropriate weaver implementation: As of Spring 3.1, it detects
diff --git a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java
index c53250a999..6c87480fe4 100644
--- a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java
+++ b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java
@@ -41,10 +41,10 @@ public interface LoadTimeWeaverAware extends Aware {
 	 * {@link org.springframework.context.ApplicationContextAware ApplicationContextAware's}
 	 * {@link org.springframework.context.ApplicationContextAware#setApplicationContext setApplicationContext(..)}.
 	 * <p><b>NOTE:</b> This method will only be called if there actually is a
-	 * <code>LoadTimeWeaver</code> available in the application context. If
+	 * {@code LoadTimeWeaver} available in the application context. If
 	 * there is none, the method will simply not get invoked, assuming that the
 	 * implementing object is able to activate its weaving dependency accordingly.
-	 * @param loadTimeWeaver the <code>LoadTimeWeaver</code> instance (never <code>null</code>)
+	 * @param loadTimeWeaver the {@code LoadTimeWeaver} instance (never {@code null})
 	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext
 	 */
diff --git a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java
index 93a112d9b8..58ac5f4254 100644
--- a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
  *
  * <p>{@link org.springframework.context.ApplicationContext Application contexts}
  * will automatically register this with their underlying {@link BeanFactory bean factory},
- * provided that a default <code>LoadTimeWeaver</code> is actually available.
+ * provided that a default {@code LoadTimeWeaver} is actually available.
  *
  * <p>Applications should not use this class directly.
  *
@@ -48,7 +48,7 @@ public class LoadTimeWeaverAwareProcessor implements BeanPostProcessor, BeanFact
 
 
 	/**
-	 * Create a new <code>LoadTimeWeaverAwareProcessor</code> that will
+	 * Create a new {@code LoadTimeWeaverAwareProcessor} that will
 	 * auto-retrieve the {@link LoadTimeWeaver} from the containing
 	 * {@link BeanFactory}, expecting a bean named
 	 * {@link ConfigurableApplicationContext#LOAD_TIME_WEAVER_BEAN_NAME "loadTimeWeaver"}.
@@ -57,21 +57,21 @@ public class LoadTimeWeaverAwareProcessor implements BeanPostProcessor, BeanFact
 	}
 
 	/**
-	 * Create a new <code>LoadTimeWeaverAwareProcessor</code> for the given
+	 * Create a new {@code LoadTimeWeaverAwareProcessor} for the given
 	 * {@link LoadTimeWeaver}.
-	 * <p>If the given <code>loadTimeWeaver</code> is <code>null</code>, then a
-	 * <code>LoadTimeWeaver</code> will be auto-retrieved from the containing
+	 * <p>If the given {@code loadTimeWeaver} is {@code null}, then a
+	 * {@code LoadTimeWeaver} will be auto-retrieved from the containing
 	 * {@link BeanFactory}, expecting a bean named
 	 * {@link ConfigurableApplicationContext#LOAD_TIME_WEAVER_BEAN_NAME "loadTimeWeaver"}.
-	 * @param loadTimeWeaver the specific <code>LoadTimeWeaver</code> that is to be used
+	 * @param loadTimeWeaver the specific {@code LoadTimeWeaver} that is to be used
 	 */
 	public LoadTimeWeaverAwareProcessor(LoadTimeWeaver loadTimeWeaver) {
 		this.loadTimeWeaver = loadTimeWeaver;
 	}
 
 	/**
-	 * Create a new <code>LoadTimeWeaverAwareProcessor</code>.
-	 * <p>The <code>LoadTimeWeaver</code> will be auto-retrieved from
+	 * Create a new {@code LoadTimeWeaverAwareProcessor}.
+	 * <p>The {@code LoadTimeWeaver} will be auto-retrieved from
 	 * the given {@link BeanFactory}, expecting a bean named
 	 * {@link ConfigurableApplicationContext#LOAD_TIME_WEAVER_BEAN_NAME "loadTimeWeaver"}.
 	 * @param beanFactory the BeanFactory to retrieve the LoadTimeWeaver from
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
index 7f2ba5ff57..c80aef379b 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
@@ -53,10 +53,10 @@ public abstract class AbstractRemoteSlsbInvokerInterceptor extends AbstractSlsbI
 
 	/**
 	 * Set a home interface that this invoker will narrow to before performing
-	 * the parameterless SLSB <code>create()</code> call that returns the actual
+	 * the parameterless SLSB {@code create()} call that returns the actual
 	 * SLSB proxy.
 	 * <p>Default is none, which will work on all J2EE servers that are not based
-	 * on CORBA. A plain <code>javax.ejb.EJBHome</code> interface is known to be
+	 * on CORBA. A plain {@code javax.ejb.EJBHome} interface is known to be
 	 * sufficient to make a WebSphere 5.0 Remote SLSB work. On other servers,
 	 * the specific home interface for the target SLSB might be necessary.
 	 */
@@ -128,7 +128,7 @@ public abstract class AbstractRemoteSlsbInvokerInterceptor extends AbstractSlsbI
 
 
 	/**
-	 * Fetches an EJB home object and delegates to <code>doInvoke</code>.
+	 * Fetches an EJB home object and delegates to {@code doInvoke}.
 	 * <p>If configured to refresh on connect failure, it will call
 	 * {@link #refreshAndRetry} on corresponding RMI exceptions.
 	 * @see #getHome
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
index fb51f51634..652205cd52 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
@@ -205,7 +205,7 @@ public abstract class AbstractSlsbInvokerInterceptor extends JndiObjectLocator
 
 
 	/**
-	 * Invokes the <code>create()</code> method on the cached EJB home object.
+	 * Invokes the {@code create()} method on the cached EJB home object.
 	 * @return a new EJBObject or EJBLocalObject
 	 * @throws NamingException if thrown by JNDI
 	 * @throws InvocationTargetException if thrown by the create method
diff --git a/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java b/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java
index 8a8e6d204a..b5841ca19d 100644
--- a/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java
@@ -20,7 +20,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
  * {@link org.springframework.beans.factory.xml.NamespaceHandler}
- * for the '<code>jee</code>' namespace.
+ * for the '{@code jee}' namespace.
  *
  * @author Rob Harrop
  * @since 2.0
diff --git a/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java
index 266c9ebe5b..81ea064909 100644
--- a/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java
@@ -26,7 +26,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * Simple {@link org.springframework.beans.factory.xml.BeanDefinitionParser} implementation that
- * translates <code>jndi-lookup</code> tag into {@link JndiObjectFactoryBean} definitions.
+ * translates {@code jndi-lookup} tag into {@link JndiObjectFactoryBean} definitions.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java
index 0a6f8bad14..eeb2191cf7 100644
--- a/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java
@@ -22,7 +22,7 @@ import org.springframework.ejb.access.LocalStatelessSessionProxyFactoryBean;
 
 /**
  * {@link org.springframework.beans.factory.xml.BeanDefinitionParser}
- * implementation for parsing '<code>local-slsb</code>' tags and
+ * implementation for parsing '{@code local-slsb}' tags and
  * creating {@link LocalStatelessSessionProxyFactoryBean} definitions.
  *
  * @author Rob Harrop
diff --git a/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java
index 954dc100d3..0b1669a407 100644
--- a/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java
@@ -22,7 +22,7 @@ import org.springframework.ejb.access.SimpleRemoteStatelessSessionProxyFactoryBe
 
 /**
  * {@link org.springframework.beans.factory.xml.BeanDefinitionParser}
- * implementation for parsing '<code>remote-slsb</code>' tags and
+ * implementation for parsing '{@code remote-slsb}' tags and
  * creating {@link SimpleRemoteStatelessSessionProxyFactoryBean} definitions.
  *
  * @author Rob Harrop
diff --git a/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java
index 251e688b84..7349999328 100644
--- a/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java
@@ -34,13 +34,13 @@ import org.springframework.context.access.ContextSingletonBeanFactoryLocator;
 
 /**
  * EJB3-compliant interceptor class that injects Spring beans into
- * fields and methods which are annotated with <code>@Autowired</code>.
+ * fields and methods which are annotated with {@code @Autowired}.
  * Performs injection after construction as well as after activation
  * of a passivated bean.
  *
- * <p>To be applied through an <code>@Interceptors</code> annotation in
+ * <p>To be applied through an {@code @Interceptors} annotation in
  * the EJB Session Bean or Message-Driven Bean class, or through an
- * <code>interceptor-binding</code> XML element in the EJB deployment descriptor.
+ * {@code interceptor-binding} XML element in the EJB deployment descriptor.
  *
  * <p>Delegates to Spring's {@link AutowiredAnnotationBeanPostProcessor}
  * underneath, allowing for customization of its specific settings through
@@ -60,7 +60,7 @@ import org.springframework.context.access.ContextSingletonBeanFactoryLocator;
  *
  * <p><b>WARNING: Do not define the same bean as Spring-managed bean and as
  * EJB3 session bean in the same deployment unit.</b> In particular, be
- * careful when using the <code>&lt;context:component-scan&gt;</code> feature
+ * careful when using the {@code &lt;context:component-scan&gt;} feature
  * in combination with the deployment of Spring-based EJB3 session beans:
  * Make sure that the EJB3 session beans are <i>not</i> autodetected as
  * Spring-managed beans as well, using appropriate package restrictions.
@@ -130,7 +130,7 @@ public class SpringBeanAutowiringInterceptor {
 	/**
 	 * Determine the BeanFactory for autowiring the given target bean.
 	 * @param target the target bean to autowire
-	 * @return the BeanFactory to use (never <code>null</code>)
+	 * @return the BeanFactory to use (never {@code null})
 	 * @see #getBeanFactoryReference
 	 */
 	protected BeanFactory getBeanFactory(Object target) {
@@ -146,7 +146,7 @@ public class SpringBeanAutowiringInterceptor {
 	 * <p>The default implementation delegates to {@link #getBeanFactoryLocator}
 	 * and {@link #getBeanFactoryLocatorKey}.
 	 * @param target the target bean to autowire
-	 * @return the BeanFactoryReference to use (never <code>null</code>)
+	 * @return the BeanFactoryReference to use (never {@code null})
 	 * @see #getBeanFactoryLocator
 	 * @see #getBeanFactoryLocatorKey
 	 * @see org.springframework.beans.factory.access.BeanFactoryLocator#useBeanFactory(String)
@@ -163,7 +163,7 @@ public class SpringBeanAutowiringInterceptor {
 	 * <p>The default implementation exposes Spring's default
 	 * {@link ContextSingletonBeanFactoryLocator}.
 	 * @param target the target bean to autowire
-	 * @return the BeanFactoryLocator to use (never <code>null</code>)
+	 * @return the BeanFactoryLocator to use (never {@code null})
 	 * @see org.springframework.context.access.ContextSingletonBeanFactoryLocator#getInstance()
 	 */
 	protected BeanFactoryLocator getBeanFactoryLocator(Object target) {
@@ -174,11 +174,11 @@ public class SpringBeanAutowiringInterceptor {
 	 * Determine the BeanFactoryLocator key to use. This typically indicates
 	 * the bean name of the ApplicationContext definition in
 	 * <strong>classpath*:beanRefContext.xml</strong> resource files.
-	 * <p>The default is <code>null</code>, indicating the single
+	 * <p>The default is {@code null}, indicating the single
 	 * ApplicationContext defined in the locator. This must be overridden
 	 * if more than one shared ApplicationContext definition is available.
 	 * @param target the target bean to autowire
-	 * @return the BeanFactoryLocator key to use (or <code>null</code> for
+	 * @return the BeanFactoryLocator key to use (or {@code null} for
 	 * referring to the single ApplicationContext defined in the locator)
 	 */
 	protected String getBeanFactoryLocatorKey(Object target) {
diff --git a/spring-context/src/main/java/org/springframework/ejb/interceptor/package-info.java b/spring-context/src/main/java/org/springframework/ejb/interceptor/package-info.java
index 37ae510197..212598c424 100644
--- a/spring-context/src/main/java/org/springframework/ejb/interceptor/package-info.java
+++ b/spring-context/src/main/java/org/springframework/ejb/interceptor/package-info.java
@@ -1,9 +1,8 @@
-
 /**
  *
  * Support classes for EJB 3 Session Beans and Message-Driven Beans,
  * performing injection of Spring beans through an EJB 3 interceptor
- * that processes Spring's <code>@Autowired</code> annotation.
+ * that processes Spring's {@code @Autowired} annotation.
  *
  */
 package org.springframework.ejb.interceptor;
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
index 0764faa0c1..897ffd3023 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
@@ -35,15 +35,15 @@ import org.springframework.util.WeakReferenceMonitor;
  * facade, with the business logic deferred to beans in the BeanFactory. Default
  * is to use a {@link org.springframework.context.access.ContextJndiBeanFactoryLocator},
  * which will initialize an XML ApplicationContext from the class path (based on a JNDI
- * name specified). For a different locator strategy, <code>setBeanFactoryLocator</code>
- * may be called (<i>before</i> your EJB's <code>ejbCreate</code> method is invoked,
- * e.g. in <code>setSessionContext</code>). For use of a shared ApplicationContext between
+ * name specified). For a different locator strategy, {@code setBeanFactoryLocator}
+ * may be called (<i>before</i> your EJB's {@code ejbCreate} method is invoked,
+ * e.g. in {@code setSessionContext}). For use of a shared ApplicationContext between
  * multiple EJBs, where the container class loader setup supports this visibility, you may
  * instead use a {@link org.springframework.context.access.ContextSingletonBeanFactoryLocator}.
  * Alternatively, {@link #setBeanFactoryLocator} may be called with a custom implementation
  * of the {@link org.springframework.beans.factory.access.BeanFactoryLocator} interface.
  *
- * <p>Note that we cannot use <code>final</code> for our implementation of EJB lifecycle
+ * <p>Note that we cannot use {@code final} for our implementation of EJB lifecycle
  * methods, as this would violate the EJB specification.
  *
  * @author Rod Johnson
@@ -77,10 +77,10 @@ public abstract class AbstractEnterpriseBean implements EnterpriseBean {
 	 * ContextJndiBeanFactoryLocator.
 	 * <p>Can be invoked before loadBeanFactory, for example in constructor or
 	 * setSessionContext if you want to override the default locator.
-	 * <p>Note that the BeanFactory is automatically loaded by the <code>ejbCreate</code>
+	 * <p>Note that the BeanFactory is automatically loaded by the {@code ejbCreate}
 	 * implementations of AbstractStatelessSessionBean and
 	 * AbstractMessageDriverBean but needs to be explicitly loaded in custom
-	 * AbstractStatefulSessionBean <code>ejbCreate</code> methods.
+	 * AbstractStatefulSessionBean {@code ejbCreate} methods.
 	 * @see AbstractStatelessSessionBean#ejbCreate
 	 * @see AbstractMessageDrivenBean#ejbCreate
 	 * @see AbstractStatefulSessionBean#loadBeanFactory
@@ -96,7 +96,7 @@ public abstract class AbstractEnterpriseBean implements EnterpriseBean {
 	 * ContextJndiBeanFactoryLocator, this is the JNDI path. The default value
 	 * of this property is "java:comp/env/ejb/BeanFactoryPath".
 	 * <p>Can be invoked before {@link #loadBeanFactory}, for example in the constructor
-	 * or <code>setSessionContext</code> if you want to override the default locator key.
+	 * or {@code setSessionContext} if you want to override the default locator key.
 	 * @see #BEAN_FACTORY_PATH_ENVIRONMENT_KEY
 	 */
 	public void setBeanFactoryLocatorKey(String factoryKey) {
@@ -127,7 +127,7 @@ public abstract class AbstractEnterpriseBean implements EnterpriseBean {
 
 	/**
 	 * Unload the Spring BeanFactory instance. The default {@link #ejbRemove()}
-	 * method invokes this method, but subclasses which override <code>ejbRemove()</code>
+	 * method invokes this method, but subclasses which override {@code ejbRemove()}
 	 * must invoke this method themselves.
 	 * <p>Package-visible as it shouldn't be called directly by user-created
 	 * subclasses.
@@ -142,7 +142,7 @@ public abstract class AbstractEnterpriseBean implements EnterpriseBean {
 	}
 
 	/**
-	 * May be called after <code>ejbCreate()</code>.
+	 * May be called after {@code ejbCreate()}.
 	 * @return the bean factory
 	 */
 	protected BeanFactory getBeanFactory() {
@@ -150,7 +150,7 @@ public abstract class AbstractEnterpriseBean implements EnterpriseBean {
 	}
 
 	/**
-	 * EJB lifecycle method, implemented to invoke <code>onEjbRemove()</code>
+	 * EJB lifecycle method, implemented to invoke {@code onEjbRemove()}
 	 * and unload the BeanFactory afterwards.
 	 * <p>Don't override it (although it can't be made final): code your shutdown
 	 * in {@link #onEjbRemove()}.
@@ -162,11 +162,11 @@ public abstract class AbstractEnterpriseBean implements EnterpriseBean {
 
 	/**
 	 * Subclasses must implement this method to do any initialization they would
-	 * otherwise have done in an <code>ejbRemove()</code> method.
+	 * otherwise have done in an {@code ejbRemove()} method.
 	 * The BeanFactory will be unloaded afterwards.
 	 * <p>This implementation is empty, to be overridden in subclasses.
 	 * The same restrictions apply to the work of this method as to an
-	 * <code>ejbRemove()<code> method.
+	 * {@code ejbRemove()} method.
 	 */
 	protected void onEjbRemove() {
 		// empty
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
index cb9db418a5..cf7240d90b 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
@@ -20,7 +20,7 @@ import javax.jms.MessageListener;
 
 /**
  * Convenient base class for JMS-based EJB 2.x MDBs. Requires subclasses
- * to implement the JMS <code>javax.jms.MessageListener</code> interface.
+ * to implement the JMS {@code javax.jms.MessageListener} interface.
  *
  * @author Rod Johnson
  * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style
@@ -29,6 +29,6 @@ import javax.jms.MessageListener;
 public abstract class AbstractJmsMessageDrivenBean extends AbstractMessageDrivenBean implements MessageListener {
 
 	// Empty: The purpose of this class is to ensure
-	// that subclasses implement <code>javax.jms.MessageListener</code>.
+	// that subclasses implement {@code javax.jms.MessageListener}.
 
 }
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
index 8d661b480c..b17f95f7e6 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
@@ -29,15 +29,15 @@ import org.apache.commons.logging.LogFactory;
  *
  * <p>This class ensures that subclasses have access to the
  * MessageDrivenContext provided by the EJB container, and implement
- * a no-arg <code>ejbCreate()</code> method as required by the EJB
- * specification. This <code>ejbCreate()</code> method loads a BeanFactory,
- * before invoking the <code>onEjbCreate()</code> method, which is
+ * a no-arg {@code ejbCreate()} method as required by the EJB
+ * specification. This {@code ejbCreate()} method loads a BeanFactory,
+ * before invoking the {@code onEjbCreate()} method, which is
  * supposed to contain subclass-specific initialization.
  *
  * <p>NB: We cannot use final methods to implement EJB API methods,
  * as this violates the EJB specification. However, there should be
- * no need to override the <code>setMessageDrivenContext</code> or
- * <code>ejbCreate()</code> methods.
+ * no need to override the {@code setMessageDrivenContext} or
+ * {@code ejbCreate()} methods.
  *
  * @author Rod Johnson
  * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style
@@ -83,10 +83,10 @@ public abstract class AbstractMessageDrivenBean extends AbstractEnterpriseBean
 
 	/**
 	 * Subclasses must implement this method to do any initialization they would
-	 * otherwise have done in an <code>ejbCreate()</code> method. In contrast
-	 * to <code>ejbCreate()</code>, the BeanFactory will have been loaded here.
+	 * otherwise have done in an {@code ejbCreate()} method. In contrast
+	 * to {@code ejbCreate()}, the BeanFactory will have been loaded here.
 	 * <p>The same restrictions apply to the work of this method as
-	 * to an <code>ejbCreate()</code> method.
+	 * to an {@code ejbCreate()} method.
 	 */
 	protected abstract void onEjbCreate();
 
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
index b36b8fcb4c..1a708e4f8b 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
@@ -22,20 +22,20 @@ import org.springframework.beans.FatalBeanException;
 /**
  * Convenient base class for EJB 2.x stateful session beans (SFSBs).
  * SFSBs should extend this class, leaving them to implement the
- * <code>ejbActivate()</code> and <code>ejbPassivate()</code> lifecycle
+ * {@code ejbActivate()} and {@code ejbPassivate()} lifecycle
  * methods to comply with the requirements of the EJB specification.
  *
- * <p><b>Note: Subclasses should invoke the <code>loadBeanFactory()</code>
- * method in their custom <code>ejbCreate()</code> and <code>ejbActivate()</code>
- * methods, and should invoke the <code>unloadBeanFactory()</code> method in
- * their <code>ejbPassivate</code> method.</b>
+ * <p><b>Note: Subclasses should invoke the {@code loadBeanFactory()}
+ * method in their custom {@code ejbCreate()} and {@code ejbActivate()}
+ * methods, and should invoke the {@code unloadBeanFactory()} method in
+ * their {@code ejbPassivate} method.</b>
  *
  * <p><b>Note: The default BeanFactoryLocator used by this class's superclass
  * (ContextJndiBeanFactoryLocator) is <b>not</b> serializable. Therefore,
  * when using the default BeanFactoryLocator, or another variant which is
- * not serializable, subclasses must call <code>setBeanFactoryLocator(null)</code>
- * in <code>ejbPassivate()</code>, with a corresponding call to
- * <code>setBeanFactoryLocator(xxx)</code> in <code>ejbActivate()</code>
+ * not serializable, subclasses must call {@code setBeanFactoryLocator(null)}
+ * in {@code ejbPassivate()}, with a corresponding call to
+ * {@code setBeanFactoryLocator(xxx)} in {@code ejbActivate()}
  * unless relying on the default locator.
  *
  * @author Rod Johnson
@@ -48,13 +48,13 @@ public abstract class AbstractStatefulSessionBean extends AbstractSessionBean {
 
 	/**
 	 * Load a Spring BeanFactory namespace. Exposed for subclasses
-	 * to load a BeanFactory in their <code>ejbCreate()</code> methods.
+	 * to load a BeanFactory in their {@code ejbCreate()} methods.
 	 * Those callers would normally want to catch BeansException and
 	 * rethrow it as {@link javax.ejb.CreateException}. Unless the
 	 * BeanFactory is known to be serializable, this method must also
-	 * be called from <code>ejbActivate()</code>, to reload a context
-	 * removed via a call to <code>unloadBeanFactory()</code> from
-	 * the <code>ejbPassivate()</code> implementation.
+	 * be called from {@code ejbActivate()}, to reload a context
+	 * removed via a call to {@code unloadBeanFactory()} from
+	 * the {@code ejbPassivate()} implementation.
 	 */
 	@Override
 	protected void loadBeanFactory() throws BeansException {
@@ -62,12 +62,12 @@ public abstract class AbstractStatefulSessionBean extends AbstractSessionBean {
 	}
 
 	/**
-	 * Unload the Spring BeanFactory instance. The default <code>ejbRemove()</code>
+	 * Unload the Spring BeanFactory instance. The default {@code ejbRemove()}
 	 * method invokes this method, but subclasses which override
-	 * <code>ejbRemove()</code> must invoke this method themselves.
+	 * {@code ejbRemove()} must invoke this method themselves.
 	 * <p>Unless the BeanFactory is known to be serializable, this method
-	 * must also be called from <code>ejbPassivate()</code>, with a corresponding
-	 * call to <code>loadBeanFactory()</code> from <code>ejbActivate()</code>.
+	 * must also be called from {@code ejbPassivate()}, with a corresponding
+	 * call to {@code loadBeanFactory()} from {@code ejbActivate()}.
 	 */
 	@Override
 	protected void unloadBeanFactory() throws FatalBeanException {
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
index d9efd0760d..187965bea5 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
@@ -32,15 +32,15 @@ import org.apache.commons.logging.LogFactory;
  * not be overriden by subclasses. (Unfortunately the EJB specification
  * forbids enforcing this by making EJB lifecycle methods final.)
  *
- * <p>There should be no need to override the <code>setSessionContext()</code>
- * or <code>ejbCreate()</code> lifecycle methods.
+ * <p>There should be no need to override the {@code setSessionContext()}
+ * or {@code ejbCreate()} lifecycle methods.
  *
- * <p>Subclasses are left to implement the <code>onEjbCreate()</code> method
+ * <p>Subclasses are left to implement the {@code onEjbCreate()} method
  * to do whatever initialization they wish to do after their BeanFactory has
- * already been loaded, and is available from the <code>getBeanFactory()</code>
+ * already been loaded, and is available from the {@code getBeanFactory()}
  * method.
  *
- * <p>This class provides the no-arg <code>ejbCreate()</code> method required
+ * <p>This class provides the no-arg {@code ejbCreate()} method required
  * by the EJB specification, but not the SessionBean interface, eliminating
  * a common cause of EJB deployment failure.
  *
@@ -71,10 +71,10 @@ public abstract class AbstractStatelessSessionBean extends AbstractSessionBean {
 
 	/**
 	 * Subclasses must implement this method to do any initialization
-	 * they would otherwise have done in an <code>ejbCreate()</code> method.
-	 * In contrast to <code>ejbCreate</code>, the BeanFactory will have been loaded here.
+	 * they would otherwise have done in an {@code ejbCreate()} method.
+	 * In contrast to {@code ejbCreate}, the BeanFactory will have been loaded here.
 	 * <p>The same restrictions apply to the work of this method as
-	 * to an <code>ejbCreate()</code> method.
+	 * to an {@code ejbCreate()} method.
 	 * @throws CreateException
 	 */
 	protected abstract void onEjbCreate() throws CreateException;
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/package-info.java b/spring-context/src/main/java/org/springframework/ejb/support/package-info.java
index 185a3a5002..1f5975a35c 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/package-info.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/package-info.java
@@ -1,4 +1,3 @@
-
 /**
  *
  * <p>Base classes to make implementing EJB 2.x beans simpler and less error-prone,
@@ -11,13 +10,13 @@
  * behind the BeanFactory as required.</p>
  *
  * <p>Note that the default behavior is to look for an EJB environment variable
- * with name <code>ejb/BeanFactoryPath</code> that specifies the
+ * with name {@code ejb/BeanFactoryPath} that specifies the
  * location <i>on the classpath</i> of an XML bean factory definition
- * file (such as <code>/com/mycom/mypackage/mybeans.xml</code>).
+ * file (such as {@code /com/mycom/mypackage/mybeans.xml}).
  * If this JNDI key is missing, your EJB subclass won't successfully
  * initialize in the container.</p>
  *
- * <p><b>Check out the <code>org.springframework.ejb.interceptor</code>
+ * <p><b>Check out the {@code org.springframework.ejb.interceptor}
  * package for equivalent support for the EJB 3 component model</b>,
  * providing annotation-based autowiring using an EJB 3 interceptor.</p>
  *
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 454649b2a4..0a620e9e8c 100644
--- a/spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java
@@ -21,8 +21,8 @@ import java.util.Set;
 /**
  * A factory that creates formatters to format values of fields annotated with a particular {@link Annotation}.
  *
- * <p>For example, a <code>DateTimeFormatAnnotationFormatterFactory</code> might create a formatter
- * that formats <code>Date</code> values set on fields annotated with <code>@DateTimeFormat</code>.
+ * <p>For example, a {@code DateTimeFormatAnnotationFormatterFactory} might create a formatter
+ * that formats {@code Date} values set on fields annotated with {@code @DateTimeFormat}.
  *
  * @author Keith Donald
  * @since 3.0
@@ -36,8 +36,8 @@ public interface AnnotationFormatterFactory<A extends Annotation> {
 	Set<Class<?>> getFieldTypes();
 
 	/**
-	 * Get the Printer to print the value of a field of <code>fieldType</code> annotated with <code>annotation</code>.
-	 * If the type &lt;T&gt; the printer accepts is not assignable to <code>fieldType</code>, a coersion from <code>fieldType</code> 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}.
+	 * 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.
 	 * @param annotation the annotation instance
 	 * @param fieldType the type of field that was annotated
 	 * @return the printer
@@ -45,8 +45,8 @@ 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</code> annotated with <code>annotation</code>.
-	 * If the object the parser returns is not assignable to <code>fieldType</code>, a coersion to <code>fieldType</code> 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}.
+	 * 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.
 	 * @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/FormatterRegistry.java b/spring-context/src/main/java/org/springframework/format/FormatterRegistry.java
index cd80f93198..5613c74eb8 100644
--- a/spring-context/src/main/java/org/springframework/format/FormatterRegistry.java
+++ b/spring-context/src/main/java/org/springframework/format/FormatterRegistry.java
@@ -40,9 +40,9 @@ public interface FormatterRegistry extends ConverterRegistry {
 
 	/**
 	 * Adds a Formatter to format fields of the given type.
-	 * <p>On print, if the Formatter's type T is declared and <code>fieldType</code> is not assignable to T,
-	 * a coersion to T will be attempted before delegating to <code>formatter</code> to print a field value.
-	 * On parse, if the parsed object returned by <code>formatter</code> is not assignable to the runtime field type,
+	 * <p>On print, if the Formatter's type T is declared and {@code fieldType} is not assignable to T,
+	 * a coersion to T will be attempted before delegating to {@code formatter} to print a field value.
+	 * On parse, if the parsed object returned by {@code formatter} is not assignable to the runtime field type,
 	 * a coersion to the field type will be attempted before returning the parsed field value.
 	 * @param fieldType the field type to format
 	 * @param formatter the formatter to add
@@ -51,10 +51,10 @@ public interface FormatterRegistry extends ConverterRegistry {
 
 	/**
 	 * Adds a Printer/Parser pair to format fields of a specific type.
-	 * The formatter will delegate to the specified <code>printer</code> for printing
-	 * and the specified <code>parser</code> for parsing.
-	 * <p>On print, if the Printer's type T is declared and <code>fieldType</code> is not assignable to T,
-	 * a coersion to T will be attempted before delegating to <code>printer</code> to print a field value.
+	 * The formatter will delegate to the specified {@code printer} for printing
+	 * and the specified {@code parser} for parsing.
+	 * <p>On print, if the Printer's type T is declared and {@code fieldType} is not assignable to T,
+	 * a coersion to T will be attempted before delegating to {@code printer} to print a field value.
 	 * On parse, if the object returned by the Parser is not assignable to the runtime field type,
 	 * a coersion to the field type will be attempted before returning the parsed field value.
 	 * @param fieldType the field type to format
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 c5e526e8e0..8d22560e0f 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
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
 /**
  * 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>, <code>java.util.Calendar</code>, <code>java.long.Long</code>, or Joda Time fields.
+ * 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.
  * The first character of the code is the date style, and the second character is the time style.
@@ -32,8 +32,8 @@ import java.lang.annotation.Target;
  * 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</code>.
+ <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).
  * When the pattern attribute is specified, it takes precedence over both the style and ISO attribute.
@@ -78,17 +78,17 @@ public @interface DateTimeFormat {
 	public enum ISO {
 
 		/**
-		 * The most common ISO Date Format <code>yyyy-MM-dd</code> 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</code> 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</code> e.g. 2000-10-31 01:30:00.000-05:00.
+		 * 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.
 		 */
 		DATE_TIME,
diff --git a/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java b/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java
index 60761a254e..55de49ff82 100644
--- a/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java
+++ b/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java
@@ -24,10 +24,10 @@ import java.lang.annotation.Target;
 /**
  * Declares that a field should be formatted as a number.
  * Supports formatting by style or custom pattern string.
- * Can be applied to any JDK <code>java.lang.Number</code> type.
+ * Can be applied to any JDK {@code java.lang.Number} type.
  * <p>
  * For style-based formatting, set the {@link #style()} attribute to be the desired {@link Style}.
- * For custom formatting, set the {@link #pattern()} attribute to be the number pattern, such as <code>#,###.##</code>.
+ * For custom formatting, set the {@link #pattern()} attribute to be the number pattern, such as {@code #, ###.##}.
  * <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 the style attribute.
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 2e8cf23435..c15a36eb8c 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
@@ -22,7 +22,7 @@ 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</code> property value indicate the user has not specified a setting.
+ * A {@code null} property value indicate the user has not specified a setting.
  *
  * @author Keith Donald
  * @since 3.0
@@ -67,7 +67,7 @@ public class JodaTimeContext {
 
 
 	/**
-	 * Gets the Formatter with the this context's settings applied to the base <code>formatter</code>.
+	 * 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
 	 */
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 58c94b1482..f1f0a76bfe 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
@@ -45,7 +45,7 @@ public final class JodaTimeContextHolder {
 	/**
 	 * Associate the given JodaTimeContext with the current thread.
 	 * @param jodaTimeContext the current JodaTimeContext,
-	 * or <code>null</code> to reset the thread-bound context
+	 * or {@code null} to reset the thread-bound context
 	 */
 	public static void setJodaTimeContext(JodaTimeContext jodaTimeContext) {
 		if (jodaTimeContext == null) {
@@ -58,7 +58,7 @@ public final class JodaTimeContextHolder {
 
 	/**
 	 * Return the JodaTimeContext associated with the current thread, if any.
-	 * @return the current JodaTimeContext, or <code>null</code> if none
+	 * @return the current JodaTimeContext, or {@code null} if none
 	 */
 	public static JodaTimeContext getJodaTimeContext() {
 		return jodaTimeContextHolder.get();
@@ -69,7 +69,7 @@ public final class JodaTimeContextHolder {
 	 * Obtain a DateTimeFormatter with user-specific settings applied to the given base Formatter.
 	 * @param formatter the base formatter that establishes default formatting rules
 	 * (generally user independent)
-	 * @param locale the current user locale (may be <code>null</code> if not known)
+	 * @param locale the current user locale (may be {@code null} if not known)
 	 * @return the user-specific DateTimeFormatter
 	 */
 	public static DateTimeFormatter getFormatter(DateTimeFormatter formatter, Locale locale) {
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/package-info.java b/spring-context/src/main/java/org/springframework/format/datetime/package-info.java
index 77c347658e..62d9dbb0ee 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/package-info.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/package-info.java
@@ -1,4 +1,4 @@
 /**
- * Formatters for <code>java.util.Date</code> properties.
+ * Formatters for {@code java.util.Date} properties.
  */
 package org.springframework.format.datetime;
diff --git a/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java b/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java
index 0d1d5aa973..ad3c1d4137 100644
--- a/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java
+++ b/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java
@@ -67,7 +67,7 @@ public abstract class AbstractNumberFormatter implements Formatter<Number> {
 	/**
 	 * Obtain a concrete NumberFormat for the specified locale.
 	 * @param locale the current locale
-	 * @return the NumberFormat instance (never <code>null</code>)
+	 * @return the NumberFormat instance (never {@code null})
 	 */
 	protected abstract NumberFormat getNumberFormat(Locale locale);
 
diff --git a/spring-context/src/main/java/org/springframework/format/number/package-info.java b/spring-context/src/main/java/org/springframework/format/number/package-info.java
index d06b1325cc..f406a63fd0 100644
--- a/spring-context/src/main/java/org/springframework/format/number/package-info.java
+++ b/spring-context/src/main/java/org/springframework/format/number/package-info.java
@@ -1,4 +1,4 @@
 /**
- * Formatters for <code>java.lang.Number</code> properties.
+ * Formatters for {@code java.lang.Number} properties.
  */
 package org.springframework.format.number;
diff --git a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
index 410c63cf91..a86ccf2c5f 100644
--- a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
@@ -42,7 +42,7 @@ import org.springframework.util.StringValueResolver;
  * of registrars to use through {@link #setFormatterRegistrars(Set)}.
  *
  * <p>A good example for registering converters and formatters in code is
- * <code>JodaTimeFormatterRegistrar</code>, which registers a number of
+ * {@code JodaTimeFormatterRegistrar}, which registers a number of
  * date-related formatters and converters. For a more detailed list of cases
  * see {@link #setFormatterRegistrars(Set)}
  *
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java
index fb71a52219..8a4422d93e 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java
@@ -34,7 +34,7 @@ import org.springframework.util.ClassUtils;
  *
  * <p><code class="code">-javaagent:path/to/org.springframework.instrument.jar</code>
  *
- * <p>where <code>org.springframework.instrument.jar</code> is a JAR file containing
+ * <p>where {@code org.springframework.instrument.jar} is a JAR file containing
  * the {@link InstrumentationSavingAgent} class, as shipped with Spring.
  *
  * <p>In Eclipse, for example, set the "Run configuration"'s JVM args to be of the form:
@@ -133,7 +133,7 @@ public class InstrumentationLoadTimeWeaver implements LoadTimeWeaver {
 
 	/**
 	 * Obtain the Instrumentation instance for the current VM, if available.
-	 * @return the Instrumentation instance, or <code>null</code> if none found
+	 * @return the Instrumentation instance, or {@code null} if none found
 	 * @see #isInstrumentationAvailable()
 	 */
 	private static Instrumentation getInstrumentation() {
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java
index 9e518009cd..74b24b9b90 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java
@@ -22,8 +22,8 @@ import java.lang.instrument.ClassFileTransformer;
  * Defines the contract for adding one or more
  * {@link ClassFileTransformer ClassFileTransformers} to a {@link ClassLoader}.
  *
- * <p>Implementations may operate on the current context <code>ClassLoader</code>
- * or expose their own instrumentable <code>ClassLoader</code>.
+ * <p>Implementations may operate on the current context {@code ClassLoader}
+ * or expose their own instrumentable {@code ClassLoader}.
  *
  * @author Rod Johnson
  * @author Costin Leau
@@ -33,29 +33,29 @@ import java.lang.instrument.ClassFileTransformer;
 public interface LoadTimeWeaver {
 
 	/**
-	 * Add a <code>ClassFileTransformer</code> to be applied by this
-	 * <code>LoadTimeWeaver</code>.
-	 * @param transformer the <code>ClassFileTransformer</code> to add
+	 * Add a {@code ClassFileTransformer} to be applied by this
+	 * {@code LoadTimeWeaver}.
+	 * @param transformer the {@code ClassFileTransformer} to add
 	 */
 	void addTransformer(ClassFileTransformer transformer);
 
 	/**
-	 * Return a <code>ClassLoader</code> that supports instrumentation
+	 * Return a {@code ClassLoader} that supports instrumentation
 	 * through AspectJ-style load-time weaving based on user-defined
 	 * {@link ClassFileTransformer ClassFileTransformers}.
-	 * <p>May be the current <code>ClassLoader</code>, or a <code>ClassLoader</code>
+	 * <p>May be the current {@code ClassLoader}, or a {@code ClassLoader}
 	 * created by this {@link LoadTimeWeaver} instance.
-	 * @return the <code>ClassLoader</code> which will expose
+	 * @return the {@code ClassLoader} which will expose
 	 * instrumented classes according to the registered transformers
 	 */
 	ClassLoader getInstrumentableClassLoader();
 
 	/**
-	 * Return a throwaway <code>ClassLoader</code>, enabling classes to be
-	 * loaded and inspected without affecting the parent <code>ClassLoader</code>.
+	 * Return a throwaway {@code ClassLoader}, enabling classes to be
+	 * loaded and inspected without affecting the parent {@code ClassLoader}.
 	 * <p>Should <i>not</i> return the same instance of the {@link ClassLoader}
 	 * returned from an invocation of {@link #getInstrumentableClassLoader()}.
-	 * @return a temporary throwaway <code>ClassLoader</code>; should return
+	 * @return a temporary throwaway {@code ClassLoader}; should return
 	 * a new instance for each call, with no existing state
 	 */
 	ClassLoader getThrowawayClassLoader();
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 d9630c0622..9e143d576a 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
@@ -32,9 +32,9 @@ import org.springframework.util.ReflectionUtils;
  * support the following weaving methods (as defined in the {@link LoadTimeWeaver}
  * interface):
  * <ul>
- * <li><code>public void addTransformer(java.lang.instrument.ClassFileTransformer)</code>:
+ * <li>{@code public void addTransformer(java.lang.instrument.ClassFileTransformer)}:
  * for registering the given ClassFileTransformer on this ClassLoader
- * <li><code>public ClassLoader getThrowawayClassLoader()</code>:
+ * <li>{@code public ClassLoader getThrowawayClassLoader()}:
  * for obtaining a throwaway class loader for this ClassLoader (optional;
  * ReflectiveLoadTimeWeaver will fall back to a SimpleThrowawayClassLoader if
  * that method isn't available)
@@ -88,9 +88,9 @@ public class ReflectiveLoadTimeWeaver implements LoadTimeWeaver {
 
 	/**
 	 * Create a new SimpleLoadTimeWeaver for the given class loader.
-	 * @param classLoader the <code>ClassLoader</code> to delegate to for
+	 * @param classLoader the {@code ClassLoader} to delegate to for
 	 * weaving (<i>must</i> support the required weaving methods).
-	 * @throws IllegalStateException if the supplied <code>ClassLoader</code>
+	 * @throws IllegalStateException if the supplied {@code ClassLoader}
 	 * does not support the required weaving methods
 	 */
 	public ReflectiveLoadTimeWeaver(ClassLoader classLoader) {
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java
index 191db3f83c..b13ba8bd63 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java
@@ -21,7 +21,7 @@ import java.lang.instrument.ClassFileTransformer;
 import org.springframework.core.OverridingClassLoader;
 
 /**
- * Simplistic implementation of an instrumentable <code>ClassLoader</code>.
+ * Simplistic implementation of an instrumentable {@code ClassLoader}.
  *
  * <p>Usable in tests and standalone environments.
  *
@@ -35,10 +35,10 @@ public class SimpleInstrumentableClassLoader extends OverridingClassLoader  {
 
 
 	/**
-	 * Create a new <code>SimpleLoadTimeWeaver</code> for the given
-	 * <code>ClassLoader</code>.
-	 * @param parent the <code>ClassLoader</code> to build a simple
-	 * instrumentable <code>ClassLoader</code> for
+	 * Create a new {@code SimpleLoadTimeWeaver} for the given
+	 * {@code ClassLoader}.
+	 * @param parent the {@code ClassLoader} to build a simple
+	 * instrumentable {@code ClassLoader} for
 	 */
 	public SimpleInstrumentableClassLoader(ClassLoader parent) {
 		super(parent);
@@ -47,9 +47,9 @@ public class SimpleInstrumentableClassLoader extends OverridingClassLoader  {
 
 
 	/**
-	 * Add a <code>ClassFileTransformer</code> to be applied by this
-	 * <code>ClassLoader</code>.
-	 * @param transformer the <code>ClassFileTransformer</code> to register
+	 * Add a {@code ClassFileTransformer} to be applied by this
+	 * {@code ClassLoader}.
+	 * @param transformer the {@code ClassFileTransformer} to register
 	 */
 	public void addTransformer(ClassFileTransformer transformer) {
 		this.weavingTransformer.addTransformer(transformer);
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java
index 5393bad255..ab17d2a991 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java
@@ -22,12 +22,12 @@ import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
 /**
- * <code>LoadTimeWeaver</code> that builds and exposes a
+ * {@code LoadTimeWeaver} that builds and exposes a
  * {@link SimpleInstrumentableClassLoader}.
  *
  * <p>Mainly intended for testing environments, where it is sufficient to
  * perform all class transformation on a newly created
- * <code>ClassLoader</code> instance.
+ * {@code ClassLoader} instance.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -42,8 +42,8 @@ public class SimpleLoadTimeWeaver implements LoadTimeWeaver {
 
 
 	/**
-	 * Create a new <code>SimpleLoadTimeWeaver</code> for the current context
-	 * <code>ClassLoader</code>.
+	 * Create a new {@code SimpleLoadTimeWeaver} for the current context
+	 * {@code ClassLoader}.
 	 * @see SimpleInstrumentableClassLoader
 	 */
 	public SimpleLoadTimeWeaver() {
@@ -51,10 +51,10 @@ public class SimpleLoadTimeWeaver implements LoadTimeWeaver {
 	}
 
 	/**
-	 * Create a new <code>SimpleLoadTimeWeaver</code> for the given
-	 * <code>ClassLoader</code>.
-	 * @param classLoader the <code>ClassLoader</code> to build a simple
-	 * instrumentable <code>ClassLoader</code> on top of
+	 * Create a new {@code SimpleLoadTimeWeaver} for the given
+	 * {@code ClassLoader}.
+	 * @param classLoader the {@code ClassLoader} to build a simple
+	 * instrumentable {@code ClassLoader} on top of
 	 */
 	public SimpleLoadTimeWeaver(SimpleInstrumentableClassLoader classLoader) {
 		Assert.notNull(classLoader, "ClassLoader must not be null");
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
index 82efcf3907..2ad5bcf016 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
@@ -38,7 +38,7 @@ public class GlassFishLoadTimeWeaver implements LoadTimeWeaver {
 
 
 	/**
-	 * Creates a new instance of the <code>GlassFishLoadTimeWeaver</code> class
+	 * Creates a new instance of the {@code GlassFishLoadTimeWeaver} class
 	 * using the default {@link ClassLoader}.
 	 * @see #GlassFishLoadTimeWeaver(ClassLoader)
 	 */
@@ -47,10 +47,10 @@ public class GlassFishLoadTimeWeaver implements LoadTimeWeaver {
 	}
 
 	/**
-	 * Creates a new instance of the <code>GlassFishLoadTimeWeaver</code> class.
-	 * @param classLoader the specific {@link ClassLoader} to use; must not be <code>null</code>
-	 * @throws IllegalArgumentException if the supplied <code>classLoader</code> is <code>null</code>;
-	 * or if the supplied <code>classLoader</code> is not an
+	 * Creates a new instance of the {@code GlassFishLoadTimeWeaver} class.
+	 * @param classLoader the specific {@link ClassLoader} to use; must not be {@code null}
+	 * @throws IllegalArgumentException if the supplied {@code classLoader} is {@code null};
+	 * or if the supplied {@code classLoader} is not an
 	 * {@link org.glassfish.api.deployment.InstrumentableClassLoader InstrumentableClassLoader}
 	 */
 	public GlassFishLoadTimeWeaver(ClassLoader classLoader) {
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
index 706fda3830..260d1d4885 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
@@ -56,8 +56,8 @@ public class JBossLoadTimeWeaver implements LoadTimeWeaver {
 	/**
 	 * Create a new instance of the {@link JBossLoadTimeWeaver} class using
 	 * the supplied {@link ClassLoader}.
-	 * @param classLoader the <code>ClassLoader</code> to delegate to for weaving
-	 * (must not be <code>null</code>)
+	 * @param classLoader the {@code ClassLoader} to delegate to for weaving
+	 * (must not be {@code null})
 	 */
 	public JBossLoadTimeWeaver(ClassLoader classLoader) {
 		Assert.notNull(classLoader, "ClassLoader must not be null");
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
index 4dffbe6f5d..b5e1cd4ec3 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
@@ -37,7 +37,7 @@ class JBossMCTranslatorAdapter implements InvocationHandler {
 	/**
 	 * Creates a new {@link JBossMCTranslatorAdapter}.
 	 * @param transformer the {@link ClassFileTransformer} to be adapted (must
-	 * not be <code>null</code>)
+	 * not be {@code null})
 	 */
 	public JBossMCTranslatorAdapter(ClassFileTransformer transformer) {
 		this.transformer = transformer;
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
index 75f1ea6865..06498c5aef 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
@@ -37,7 +37,7 @@ class OC4JClassPreprocessorAdapter implements InvocationHandler {
 	/**
 	 * Creates a new {@link OC4JClassPreprocessorAdapter}.
 	 * @param transformer the {@link ClassFileTransformer} to be adapted (must
-	 * not be <code>null</code>)
+	 * not be {@code null})
 	 */
 	public OC4JClassPreprocessorAdapter(ClassFileTransformer transformer) {
 		this.transformer = transformer;
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
index f96e8d73b0..1e71d0cdbb 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
@@ -54,7 +54,7 @@ public class OC4JLoadTimeWeaver implements LoadTimeWeaver {
 	/**
 	 * Creates a new instance of the {@link OC4JLoadTimeWeaver} class
 	 * using the supplied {@link ClassLoader}.
-	 * @param classLoader the <code>ClassLoader</code> to delegate to for weaving
+	 * @param classLoader the {@code ClassLoader} to delegate to for weaving
 	 */
 	public OC4JLoadTimeWeaver(ClassLoader classLoader) {
 		Assert.notNull(classLoader, "ClassLoader must not be null");
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 4fe58d444d..087872aded 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
@@ -42,7 +42,7 @@ class WebLogicClassPreProcessorAdapter implements InvocationHandler {
 	/**
 	 * Creates a new {@link WebLogicClassPreProcessorAdapter}.
 	 * @param transformer the {@link ClassFileTransformer} to be adapted (must
-	 * not be <code>null</code>)
+	 * not be {@code null})
 	 */
 	public WebLogicClassPreProcessorAdapter(ClassFileTransformer transformer, ClassLoader loader) {
 		this.transformer = transformer;
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
index e60ceb81e9..4197c2f044 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
@@ -49,8 +49,8 @@ public class WebLogicLoadTimeWeaver implements LoadTimeWeaver {
 	/**
 	 * Creates a new instance of the {@link WebLogicLoadTimeWeaver} class using
 	 * the supplied {@link ClassLoader}.
-	 * @param classLoader the <code>ClassLoader</code> to delegate to for
-	 * weaving (must not be <code>null</code>)
+	 * @param classLoader the {@code ClassLoader} to delegate to for
+	 * weaving (must not be {@code null})
 	 */
 	public WebLogicLoadTimeWeaver(ClassLoader classLoader) {
 		Assert.notNull(classLoader, "ClassLoader must not be null");
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
index 32227c0b47..5d952e0a9e 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
@@ -40,7 +40,7 @@ class WebSphereClassPreDefinePlugin implements InvocationHandler {
 	/**
 	 * Create a new {@link WebSphereClassPreDefinePlugin}.
 	 * @param transformer the {@link ClassFileTransformer} to be adapted
-	 * (must not be <code>null</code>)
+	 * (must not be {@code null})
 	 */
 	public WebSphereClassPreDefinePlugin(ClassFileTransformer transformer) {
 		this.transformer = transformer;
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
index 1344bef8aa..215c8d5735 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
@@ -46,8 +46,8 @@ public class WebSphereLoadTimeWeaver implements LoadTimeWeaver {
 	/**
 	 * Create a new instance of the {@link WebSphereLoadTimeWeaver} class using
 	 * the supplied {@link ClassLoader}.
-	 * @param classLoader the <code>ClassLoader</code> to delegate to for weaving
-	 * (must not be <code>null</code>)
+	 * @param classLoader the {@code ClassLoader} to delegate to for weaving
+	 * (must not be {@code null})
 	 */
 	public WebSphereLoadTimeWeaver(ClassLoader classLoader) {
 		Assert.notNull(classLoader, "ClassLoader must not be null");
diff --git a/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java b/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java
index dce8a8bc11..002f59a2cd 100644
--- a/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java
@@ -17,7 +17,7 @@
 package org.springframework.jmx;
 
 /**
- * Exception thrown when we cannot locate an instance of an <code>MBeanServer</code>,
+ * Exception thrown when we cannot locate an instance of an {@code MBeanServer},
  * or when more than one instance is found.
  *
  * @author Rob Harrop
@@ -28,7 +28,7 @@ package org.springframework.jmx;
 public class MBeanServerNotFoundException extends JmxException {
 
 	/**
-	 * Create a new <code>MBeanServerNotFoundException</code> with the
+	 * Create a new {@code MBeanServerNotFoundException} with the
 	 * supplied error message.
 	 * @param msg the error message
 	 */
@@ -37,7 +37,7 @@ public class MBeanServerNotFoundException extends JmxException {
 	}
 
 	/**
-	 * Create a new <code>MBeanServerNotFoundException</code> with the
+	 * Create a new {@code MBeanServerNotFoundException} with the
 	 * specified error message and root cause.
 	 * @param msg the error message
 	 * @param cause the root cause
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java b/spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java
index f4df31dcbc..7f987272cf 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java
@@ -44,11 +44,11 @@ class ConnectorDelegate {
 
 
 	/**
-	 * Connects to the remote <code>MBeanServer</code> using the configured <code>JMXServiceURL</code>:
+	 * Connects to the remote {@code MBeanServer} using the configured {@code JMXServiceURL}:
 	 * to the specified JMX service, or to a local MBeanServer if no service URL specified.
-	 * @param serviceUrl the JMX service URL to connect to (may be <code>null</code>)
-	 * @param environment the JMX environment for the connector (may be <code>null</code>)
-	 * @param agentId the local JMX MBeanServer's agent id (may be <code>null</code>)
+	 * @param serviceUrl the JMX service URL to connect to (may be {@code null})
+	 * @param environment the JMX environment for the connector (may be {@code null})
+	 * @param agentId the local JMX MBeanServer's agent id (may be {@code null})
 	 */
 	public MBeanServerConnection connect(JMXServiceURL serviceUrl, Map<String, ?> environment, String agentId)
 			throws MBeanServerNotFoundException {
@@ -72,7 +72,7 @@ class ConnectorDelegate {
 	}
 
 	/**
-	 * Closes any <code>JMXConnector</code> that may be managed by this interceptor.
+	 * Closes any {@code JMXConnector} that may be managed by this interceptor.
 	 */
 	public void close() {
 		if (this.connector != null) {
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java b/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java
index e2bdf79938..dc802df679 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java
@@ -30,7 +30,7 @@ import javax.management.JMRuntimeException;
 public class InvalidInvocationException extends JMRuntimeException {
 
 	/**
-	 * Create a new <code>InvalidInvocationException</code> with the supplied
+	 * Create a new {@code InvalidInvocationException} with the supplied
 	 * error message.
 	 * @param msg the detail message
 	 */
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java b/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java
index 61a3d8828f..b1a65e4c75 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java
@@ -29,7 +29,7 @@ import org.springframework.jmx.JmxException;
 public class InvocationFailureException extends JmxException {
 
 	/**
-	 * Create a new <code>InvocationFailureException</code> with the supplied
+	 * Create a new {@code InvocationFailureException} with the supplied
 	 * error message.
 	 * @param msg the detail message
 	 */
@@ -38,7 +38,7 @@ public class InvocationFailureException extends JmxException {
 	}
 
 	/**
-	 * Create a new <code>InvocationFailureException</code> with the
+	 * Create a new {@code InvocationFailureException} with the
 	 * specified error message and root cause.
 	 * @param msg the detail message
 	 * @param cause the root cause
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 0396c0dfb8..761996d8ba 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
@@ -66,12 +66,12 @@ import org.springframework.util.ReflectionUtils;
 
 /**
  * {@link org.aopalliance.intercept.MethodInterceptor} that routes calls to an
- * MBean running on the supplied <code>MBeanServerConnection</code>.
- * Works for both local and remote <code>MBeanServerConnection</code>s.
+ * MBean running on the supplied {@code MBeanServerConnection}.
+ * Works for both local and remote {@code MBeanServerConnection}s.
  *
- * <p>By default, the <code>MBeanClientInterceptor</code> will connect to the
- * <code>MBeanServer</code> and cache MBean metadata at startup. This can
- * be undesirable when running against a remote <code>MBeanServer</code>
+ * <p>By default, the {@code MBeanClientInterceptor} will connect to the
+ * {@code MBeanServer} and cache MBean metadata at startup. This can
+ * be undesirable when running against a remote {@code MBeanServer}
  * that may not be running when the application starts. Through setting the
  * {@link #setConnectOnStartup(boolean) connectOnStartup} property to "false",
  * you can defer this process until the first invocation against the proxy.
@@ -127,7 +127,7 @@ public class MBeanClientInterceptor
 
 
 	/**
-	 * Set the <code>MBeanServerConnection</code> used to connect to the
+	 * Set the {@code MBeanServerConnection} used to connect to the
 	 * MBean which all invocations are routed to.
 	 */
 	public void setServer(MBeanServerConnection server) {
@@ -135,7 +135,7 @@ public class MBeanClientInterceptor
 	}
 
 	/**
-	 * Set the service URL of the remote <code>MBeanServer</code>.
+	 * Set the service URL of the remote {@code MBeanServer}.
 	 */
 	public void setServiceUrl(String url) throws MalformedURLException {
 		this.serviceUrl = new JMXServiceURL(url);
@@ -161,7 +161,7 @@ public class MBeanClientInterceptor
 	}
 
 	/**
-	 * Set the agent id of the <code>MBeanServer</code> to locate.
+	 * Set the agent id of the {@code MBeanServer} to locate.
 	 * <p>Default is none. If specified, this will result in an
 	 * attempt being made to locate the attendant MBeanServer, unless
 	 * the {@link #setServiceUrl "serviceUrl"} property has been set.
@@ -173,7 +173,7 @@ public class MBeanClientInterceptor
 	}
 
 	/**
-	 * Set whether or not the proxy should connect to the <code>MBeanServer</code>
+	 * Set whether or not the proxy should connect to the {@code MBeanServer}
 	 * at creation time ("true") or the first time it is invoked ("false").
 	 * Default is "true".
 	 */
@@ -192,8 +192,8 @@ public class MBeanClientInterceptor
 	}
 
 	/**
-	 * Set the <code>ObjectName</code> of the MBean which calls are routed to,
-	 * as <code>ObjectName</code> instance or as <code>String</code>.
+	 * Set the {@code ObjectName} of the MBean which calls are routed to,
+	 * as {@code ObjectName} instance or as {@code String}.
 	 */
 	public void setObjectName(Object objectName) throws MalformedObjectNameException {
 		this.objectName = ObjectNameManager.getInstance(objectName);
@@ -202,9 +202,9 @@ public class MBeanClientInterceptor
 	/**
 	 * Set whether to use strict casing for attributes. Enabled by default.
 	 * <p>When using strict casing, a JavaBean property with a getter such as
-	 * <code>getFoo()</code> translates to an attribute called <code>Foo</code>.
-	 * With strict casing disabled, <code>getFoo()</code> would translate to just
-	 * <code>foo</code>.
+	 * {@code getFoo()} translates to an attribute called {@code Foo}.
+	 * With strict casing disabled, {@code getFoo()} would translate to just
+	 * {@code foo}.
 	 */
 	public void setUseStrictCasing(boolean useStrictCasing) {
 		this.useStrictCasing = useStrictCasing;
@@ -221,7 +221,7 @@ public class MBeanClientInterceptor
 
 	/**
 	 * Return the management interface of the target MBean,
-	 * or <code>null</code> if none specified.
+	 * or {@code null} if none specified.
 	 */
 	protected final Class getManagementInterface() {
 		return this.managementInterface;
@@ -233,7 +233,7 @@ public class MBeanClientInterceptor
 
 
 	/**
-	 * Prepares the <code>MBeanServerConnection</code> if the "connectOnStartup"
+	 * Prepares the {@code MBeanServerConnection} if the "connectOnStartup"
 	 * is turned on (which it is by default).
 	 */
 	public void afterPropertiesSet() {
@@ -247,7 +247,7 @@ public class MBeanClientInterceptor
 	}
 
 	/**
-	 * Ensures that an <code>MBeanServerConnection</code> is configured and attempts
+	 * Ensures that an {@code MBeanServerConnection} is configured and attempts
 	 * to detect a local connection if one is not supplied.
 	 */
 	public void prepare() {
@@ -336,7 +336,7 @@ public class MBeanClientInterceptor
 
 	/**
 	 * Route the invocation to the configured managed resource..
-	 * @param invocation the <code>MethodInvocation</code> to re-route
+	 * @param invocation the {@code MethodInvocation} to re-route
 	 * @return the value returned as a result of the re-routed invocation
 	 * @throws Throwable an invocation error propagated to the user
 	 * @see #doInvoke
@@ -391,9 +391,9 @@ public class MBeanClientInterceptor
 
 	/**
 	 * Route the invocation to the configured managed resource. Correctly routes JavaBean property
-	 * access to <code>MBeanServerConnection.get/setAttribute</code> and method invocation to
-	 * <code>MBeanServerConnection.invoke</code>.
-	 * @param invocation the <code>MethodInvocation</code> to re-route
+	 * access to {@code MBeanServerConnection.get/setAttribute} and method invocation to
+	 * {@code MBeanServerConnection.invoke}.
+	 * @param invocation the {@code MethodInvocation} to re-route
 	 * @return the value returned as a result of the re-routed invocation
 	 * @throws Throwable an invocation error propagated to the user
 	 */
@@ -525,7 +525,7 @@ public class MBeanClientInterceptor
 	/**
 	 * Convert the given result object (from attribute access or operation invocation)
 	 * to the specified target class for returning from the proxy method.
-	 * @param result the result object as returned by the <code>MBeanServer</code>
+	 * @param result the result object as returned by the {@code MBeanServer}
 	 * @param parameter the method parameter of the proxy method that's been invoked
 	 * @return the converted result object, or the passed-in object if no conversion
 	 * is necessary
@@ -619,7 +619,7 @@ public class MBeanClientInterceptor
 		private final Class[] parameterTypes;
 
 		/**
-		 * Create a new instance of <code>MethodCacheKey</code> with the supplied
+		 * Create a new instance of {@code MethodCacheKey} with the supplied
 		 * method name and parameter list.
 		 * @param name the name of the method
 		 * @param parameterTypes the arguments in the method signature
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java
index 06eb49b9e2..3591725b06 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java
@@ -29,7 +29,7 @@ import org.springframework.jmx.JmxException;
 public class MBeanConnectFailureException extends JmxException {
 
 	/**
-	 * Create a new <code>MBeanConnectFailureException</code>
+	 * Create a new {@code MBeanConnectFailureException}
 	 * with the specified error message and root cause.
 	 * @param msg the detail message
 	 * @param cause the root cause
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java
index 2dee72b91d..8a6fa34b8e 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java
@@ -31,7 +31,7 @@ import org.springframework.jmx.JmxException;
 public class MBeanInfoRetrievalException extends JmxException {
 
 	/**
-	 * Create a new <code>MBeanInfoRetrievalException</code> with the
+	 * Create a new {@code MBeanInfoRetrievalException} with the
 	 * specified error message.
 	 * @param msg the detail message
 	 */
@@ -40,7 +40,7 @@ public class MBeanInfoRetrievalException extends JmxException {
 	}
 
 	/**
-	 * Create a new <code>MBeanInfoRetrievalException</code> with the
+	 * Create a new {@code MBeanInfoRetrievalException} with the
 	 * specified error message and root cause.
 	 * @param msg the detail message
 	 * @param cause the root cause
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java
index 3cd7878f01..26fcda79bf 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java
@@ -37,7 +37,7 @@ import org.springframework.util.ClassUtils;
  *
  * <p>Attempting to invoke or access any method or property on the proxy
  * interface that does not correspond to the management interface will lead
- * to an <code>InvalidInvocationException</code>.
+ * to an {@code InvalidInvocationException}.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -72,7 +72,7 @@ public class MBeanProxyFactoryBean extends MBeanClientInterceptor
 	}
 
 	/**
-	 * Checks that the <code>proxyInterface</code> has been specified and then
+	 * Checks that the {@code proxyInterface} has been specified and then
 	 * generates the proxy for the target MBean.
 	 */
 	@Override
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java b/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java
index 9c9f5330d5..c600f1279d 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java
@@ -66,7 +66,7 @@ public class NotificationListenerRegistrar extends NotificationListenerHolder
 
 
 	/**
-	 * Set the <code>MBeanServerConnection</code> used to connect to the
+	 * Set the {@code MBeanServerConnection} used to connect to the
 	 * MBean which all invocations are routed to.
 	 */
 	public void setServer(MBeanServerConnection server) {
@@ -93,14 +93,14 @@ public class NotificationListenerRegistrar extends NotificationListenerHolder
 	}
 
 	/**
-	 * Set the service URL of the remote <code>MBeanServer</code>.
+	 * Set the service URL of the remote {@code MBeanServer}.
 	 */
 	public void setServiceUrl(String url) throws MalformedURLException {
 		this.serviceUrl = new JMXServiceURL(url);
 	}
 
 	/**
-	 * Set the agent id of the <code>MBeanServer</code> to locate.
+	 * Set the agent id of the {@code MBeanServer} to locate.
 	 * <p>Default is none. If specified, this will result in an
 	 * attempt being made to locate the attendant MBeanServer, unless
 	 * the {@link #setServiceUrl "serviceUrl"} property has been set.
@@ -123,8 +123,8 @@ public class NotificationListenerRegistrar extends NotificationListenerHolder
 	}
 
 	/**
-	 * Registers the specified <code>NotificationListener</code>.
-	 * <p>Ensures that an <code>MBeanServerConnection</code> is configured and attempts
+	 * Registers the specified {@code NotificationListener}.
+	 * <p>Ensures that an {@code MBeanServerConnection} is configured and attempts
 	 * to detect a local connection if one is not supplied.
 	 */
 	public void prepare() {
@@ -151,7 +151,7 @@ public class NotificationListenerRegistrar extends NotificationListenerHolder
 	}
 
 	/**
-	 * Unregisters the specified <code>NotificationListener</code>.
+	 * Unregisters the specified {@code NotificationListener}.
 	 */
 	public void destroy() {
 		try {
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java
index a6e2ec1f4a..ab8cf1676c 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java
@@ -28,7 +28,7 @@ import org.springframework.jmx.JmxException;
 public class MBeanExportException extends JmxException {
 
 	/**
-	 * Create a new <code>MBeanExportException</code> with the
+	 * Create a new {@code MBeanExportException} with the
 	 * specified error message.
 	 * @param msg the detail message
 	 */
@@ -37,7 +37,7 @@ public class MBeanExportException extends JmxException {
 	}
 
 	/**
-	 * Create a new <code>MBeanExportException</code> with the
+	 * Create a new {@code MBeanExportException} with the
 	 * specified error message and root cause.
 	 * @param msg the detail message
 	 * @param cause the root cause
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 ac847a193a..d26d1de70c 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
@@ -123,11 +123,11 @@ public class MBeanExporter extends MBeanRegistrationSupport
 
 	/**
 	 * Wildcard used to map a {@link javax.management.NotificationListener}
-	 * to all MBeans registered by the <code>MBeanExporter</code>.
+	 * to all MBeans registered by the {@code MBeanExporter}.
 	 */
 	private static final String WILDCARD = "*";
 
-	/** Constant for the JMX <code>mr_type</code> "ObjectReference" */
+	/** Constant for the JMX {@code mr_type} "ObjectReference" */
 	private static final String MR_TYPE_OBJECT_REFERENCE = "ObjectReference";
 
 	/** Prefix for the autodetect constants defined in this class */
@@ -179,12 +179,12 @@ public class MBeanExporter extends MBeanRegistrationSupport
 
 
 	/**
-	 * Supply a <code>Map</code> of beans to be registered with the JMX
-	 * <code>MBeanServer</code>.
+	 * Supply a {@code Map} of beans to be registered with the JMX
+	 * {@code MBeanServer}.
 	 * <p>The String keys are the basis for the creation of JMX object names.
-	 * By default, a JMX <code>ObjectName</code> will be created straight
+	 * By default, a JMX {@code ObjectName} will be created straight
 	 * from the given key. This can be customized through specifying a
-	 * custom <code>NamingStrategy</code>.
+	 * custom {@code NamingStrategy}.
 	 * <p>Both bean instances and bean names are allowed as values.
 	 * Bean instances are typically linked in through bean references.
 	 * Bean names will be resolved as beans in the current factory, respecting
@@ -201,10 +201,10 @@ public class MBeanExporter extends MBeanRegistrationSupport
 
 	/**
 	 * Set whether to autodetect MBeans in the bean factory that this exporter
-	 * runs in. Will also ask an <code>AutodetectCapableMBeanInfoAssembler</code>
+	 * runs in. Will also ask an {@code AutodetectCapableMBeanInfoAssembler}
 	 * if available.
 	 * <p>This feature is turned off by default. Explicitly specify
-	 * <code>true</code> here to enable autodetection.
+	 * {@code true} here to enable autodetection.
 	 * @see #setAssembler
 	 * @see AutodetectCapableMBeanInfoAssembler
 	 * @see #isMBean
@@ -216,7 +216,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	/**
 	 * Set the autodetection mode to use.
 	 * @exception IllegalArgumentException if the supplied value is not
-	 * one of the <code>AUTODETECT_</code> constants
+	 * one of the {@code AUTODETECT_} constants
 	 * @see #setAutodetectModeName(String)
 	 * @see #AUTODETECT_ALL
 	 * @see #AUTODETECT_ASSEMBLER
@@ -233,7 +233,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	/**
 	 * Set the autodetection mode to use by name.
 	 * @exception IllegalArgumentException if the supplied value is not resolvable
-	 * to one of the <code>AUTODETECT_</code> constants or is <code>null</code>
+	 * to one of the {@code AUTODETECT_} constants or is {@code null}
 	 * @see #setAutodetectMode(int)
 	 * @see #AUTODETECT_ALL
 	 * @see #AUTODETECT_ASSEMBLER
@@ -259,10 +259,10 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	}
 
 	/**
-	 * Set the implementation of the <code>MBeanInfoAssembler</code> interface to use
-	 * for this exporter. Default is a <code>SimpleReflectiveMBeanInfoAssembler</code>.
+	 * Set the implementation of the {@code MBeanInfoAssembler} interface to use
+	 * for this exporter. Default is a {@code SimpleReflectiveMBeanInfoAssembler}.
 	 * <p>The passed-in assembler can optionally implement the
-	 * <code>AutodetectCapableMBeanInfoAssembler</code> interface, which enables it
+	 * {@code AutodetectCapableMBeanInfoAssembler} interface, which enables it
 	 * to participate in the exporter's MBean autodetection process.
 	 * @see org.springframework.jmx.export.assembler.SimpleReflectiveMBeanInfoAssembler
 	 * @see org.springframework.jmx.export.assembler.AutodetectCapableMBeanInfoAssembler
@@ -274,8 +274,8 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	}
 
 	/**
-	 * Set the implementation of the <code>ObjectNamingStrategy</code> interface
-	 * to use for this exporter. Default is a <code>KeyNamingStrategy</code>.
+	 * Set the implementation of the {@code ObjectNamingStrategy} interface
+	 * to use for this exporter. Default is a {@code KeyNamingStrategy}.
 	 * @see org.springframework.jmx.export.naming.KeyNamingStrategy
 	 * @see org.springframework.jmx.export.naming.MetadataNamingStrategy
 	 */
@@ -284,7 +284,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	}
 
 	/**
-	 * Set the <code>MBeanExporterListener</code>s that should be notified
+	 * Set the {@code MBeanExporterListener}s that should be notified
 	 * of MBean registration and unregistration events.
 	 * @see MBeanExporterListener
 	 */
@@ -303,8 +303,8 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	 * Indicates whether Spring should ensure that {@link ObjectName ObjectNames}
 	 * generated by the configured {@link ObjectNamingStrategy} for
 	 * runtime-registered MBeans ({@link #registerManagedResource}) should get
-	 * modified: to ensure uniqueness for every instance of a managed <code>Class</code>.
-	 * <p>The default value is <code>true</code>.
+	 * modified: to ensure uniqueness for every instance of a managed {@code Class}.
+	 * <p>The default value is {@code true}.
 	 * @see #registerManagedResource
 	 * @see JmxUtils#appendIdentityToObjectName(javax.management.ObjectName, Object)
 	 */
@@ -316,7 +316,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	 * Indicates whether or not the managed resource should be exposed on the
 	 * {@link Thread#getContextClassLoader() thread context ClassLoader} before
 	 * allowing any invocations on the MBean to occur.
-	 * <p>The default value is <code>true</code>, exposing a {@link SpringModelMBean}
+	 * <p>The default value is {@code true}, exposing a {@link SpringModelMBean}
 	 * which performs thread context ClassLoader management. Switch this flag off to
 	 * expose a standard JMX {@link javax.management.modelmbean.RequiredModelMBean}.
 	 */
@@ -339,10 +339,10 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	/**
 	 * Set the {@link NotificationListener NotificationListeners} to register
 	 * with the {@link javax.management.MBeanServer}.
-	 * <P>The key of each entry in the <code>Map</code> is a {@link String}
+	 * <P>The key of each entry in the {@code Map} is a {@link String}
 	 * representation of the {@link javax.management.ObjectName} or the bean
 	 * name of the MBean the listener should be registered for. Specifying an
-	 * asterisk (<code>*</code>) for a key will cause the listener to be
+	 * asterisk ({@code *}) for a key will cause the listener to be
 	 * associated with all MBeans registered by this class at startup time.
 	 * <p>The value of each entry is the
 	 * {@link javax.management.NotificationListener} to register. For more
@@ -379,7 +379,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	 * This callback is only required for resolution of bean names in the
 	 * {@link #setBeans(java.util.Map) "beans"} {@link Map} and for
 	 * autodetection of MBeans (in the latter case, a
-	 * <code>ListableBeanFactory</code> is required).
+	 * {@code ListableBeanFactory} is required).
 	 * @see #setBeans
 	 * @see #setAutodetect
 	 */
@@ -399,7 +399,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 
 	/**
 	 * Start bean registration automatically when deployed in an
-	 * <code>ApplicationContext</code>.
+	 * {@code ApplicationContext}.
 	 * @see #registerBeans()
 	 */
 	public void afterPropertiesSet() {
@@ -423,7 +423,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 
 	/**
 	 * Unregisters all beans that this exported has exposed via JMX
-	 * when the enclosing <code>ApplicationContext</code> is destroyed.
+	 * when the enclosing {@code ApplicationContext} is destroyed.
 	 */
 	public void destroy() {
 		logger.info("Unregistering JMX-exposed beans on shutdown");
@@ -483,16 +483,16 @@ public class MBeanExporter extends MBeanRegistrationSupport
 
 	/**
 	 * Registers the defined beans with the {@link MBeanServer}.
-	 * <p>Each bean is exposed to the <code>MBeanServer</code> via a
-	 * <code>ModelMBean</code>. The actual implemetation of the
-	 * <code>ModelMBean</code> interface used depends on the implementation of
-	 * the <code>ModelMBeanProvider</code> interface that is configured. By
-	 * default the <code>RequiredModelMBean</code> class that is supplied with
+	 * <p>Each bean is exposed to the {@code MBeanServer} via a
+	 * {@code ModelMBean}. The actual implemetation of the
+	 * {@code ModelMBean} interface used depends on the implementation of
+	 * the {@code ModelMBeanProvider} interface that is configured. By
+	 * default the {@code RequiredModelMBean} class that is supplied with
 	 * all JMX implementations is used.
 	 * <p>The management interface produced for each bean is dependent on the
-	 * <code>MBeanInfoAssembler</code> implementation being used. The
-	 * <code>ObjectName</code> given to each bean is dependent on the
-	 * implementation of the <code>ObjectNamingStrategy</code> interface being used.
+	 * {@code MBeanInfoAssembler} implementation being used. The
+	 * {@code ObjectName} given to each bean is dependent on the
+	 * implementation of the {@code ObjectNamingStrategy} interface being used.
 	 */
 	protected void registerBeans() {
 		// The beans property may be null, for example if we are relying solely on autodetection.
@@ -544,18 +544,18 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	/**
 	 * Registers an individual bean with the {@link #setServer MBeanServer}.
 	 * <p>This method is responsible for deciding <strong>how</strong> a bean
-	 * should be exposed to the <code>MBeanServer</code>. Specifically, if the
-	 * supplied <code>mapValue</code> is the name of a bean that is configured
+	 * 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</code> so that the the lazy load behavior is
+	 * the {@code MBeanServer} so that the the lazy load behavior is
 	 * honored. If the bean is already an MBean then it will be registered
-	 * directly with the <code>MBeanServer</code> without any intervention. For
+	 * directly with the {@code MBeanServer} without any intervention. For
 	 * all other beans or bean names, the resource itself is registered with
-	 * the <code>MBeanServer</code> directly.
+	 * the {@code MBeanServer} directly.
 	 * @param mapValue the value configured for this bean in the beans map;
-	 * may be either the <code>String</code> name of a bean, or the bean itself
+	 * 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</code> under which the resource was registered
+	 * @return the {@code ObjectName} under which the resource was registered
 	 * @throws MBeanExportException if the export failed
 	 * @see #setBeans
 	 * @see #registerBeanInstance
@@ -605,11 +605,11 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	}
 
 	/**
-	 * Replaces any bean names used as keys in the <code>NotificationListener</code>
-	 * mappings with their corresponding <code>ObjectName</code> values.
+	 * Replaces any bean names used as keys in the {@code NotificationListener}
+	 * mappings with their corresponding {@code ObjectName} values.
 	 * @param beanName the name of the bean to be registered
-	 * @param objectName the <code>ObjectName</code> under which the bean will be registered
-	 * with the <code>MBeanServer</code>
+	 * @param objectName the {@code ObjectName} under which the bean will be registered
+	 * with the {@code MBeanServer}
 	 */
 	private void replaceNotificationListenerBeanNameKeysIfNecessary(String beanName, ObjectName objectName) {
 		if (this.notificationListeners != null) {
@@ -621,11 +621,11 @@ public class MBeanExporter extends MBeanRegistrationSupport
 
 	/**
 	 * Registers an existing MBean or an MBean adapter for a plain bean
-	 * with the <code>MBeanServer</code>.
+	 * with the {@code MBeanServer}.
 	 * @param bean the bean to register, either an MBean or a plain bean
 	 * @param beanKey the key associated with this bean in the beans map
-	 * @return the <code>ObjectName</code> under which the bean was registered
-	 * with the <code>MBeanServer</code>
+	 * @return the {@code ObjectName} under which the bean was registered
+	 * with the {@code MBeanServer}
 	 */
 	private ObjectName registerBeanInstance(Object bean, String beanKey) throws JMException {
 		ObjectName objectName = getObjectName(bean, beanKey);
@@ -660,11 +660,11 @@ public class MBeanExporter extends MBeanRegistrationSupport
 
 	/**
 	 * Registers beans that are configured for lazy initialization with the
-	 * <code>MBeanServer<code> indirectly through a proxy.
-	 * @param beanName the name of the bean in the <code>BeanFactory</code>
+	 * {@code MBeanServer} indirectly through a proxy.
+	 * @param beanName the name of the bean in the {@code BeanFactory}
 	 * @param beanKey the key associated with this bean in the beans map
-	 * @return the <code>ObjectName</code> under which the bean was registered
-	 * with the <code>MBeanServer</code>
+	 * @return the {@code ObjectName} under which the bean was registered
+	 * with the {@code MBeanServer}
 	 */
 	private ObjectName registerLazyInit(String beanName, String beanKey) throws JMException {
 		ProxyFactory proxyFactory = new ProxyFactory();
@@ -710,15 +710,15 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	}
 
 	/**
-	 * Retrieve the <code>ObjectName</code> for a bean.
-	 * <p>If the bean implements the <code>SelfNaming</code> interface, then the
-	 * <code>ObjectName</code> will be retrieved using <code>SelfNaming.getObjectName()</code>.
-	 * Otherwise, the configured <code>ObjectNamingStrategy</code> is used.
-	 * @param bean the name of the bean in the <code>BeanFactory</code>
+	 * Retrieve the {@code ObjectName} for a bean.
+	 * <p>If the bean implements the {@code SelfNaming} interface, then the
+	 * {@code ObjectName} will be retrieved using {@code SelfNaming.getObjectName()}.
+	 * Otherwise, the configured {@code ObjectNamingStrategy} is used.
+	 * @param bean the name of the bean in the {@code BeanFactory}
 	 * @param beanKey the key associated with the bean in the beans map
-	 * @return the <code>ObjectName</code> for the supplied bean
+	 * @return the {@code ObjectName} for the supplied bean
 	 * @throws javax.management.MalformedObjectNameException
-	 * if the retrieved <code>ObjectName</code> is malformed
+	 * if the retrieved {@code ObjectName} is malformed
 	 */
 	protected ObjectName getObjectName(Object bean, String beanKey) throws MalformedObjectNameException {
 		if (bean instanceof SelfNaming) {
@@ -749,7 +749,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	 * for the target's MBean/MXBean interface in case of an AOP proxy,
 	 * delegating the interface's management operations to the proxy.
 	 * @param bean the original bean instance
-	 * @return the adapted MBean, or <code>null</code> if not possible
+	 * @return the adapted MBean, or {@code null} if not possible
 	 */
 	@SuppressWarnings("unchecked")
 	protected DynamicMBean adaptMBeanIfPossible(Object bean) throws JMException {
@@ -800,11 +800,11 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	}
 
 	/**
-	 * Create an instance of a class that implements <code>ModelMBean</code>.
-	 * <p>This method is called to obtain a <code>ModelMBean</code> instance to
+	 * Create an instance of a class that implements {@code ModelMBean}.
+	 * <p>This method is called to obtain a {@code ModelMBean} instance to
 	 * use when registering a bean. This method is called once per bean during the
-	 * registration phase and must return a new instance of <code>ModelMBean</code>
-	 * @return a new instance of a class that implements <code>ModelMBean</code>
+	 * registration phase and must return a new instance of {@code ModelMBean}
+	 * @return a new instance of a class that implements {@code ModelMBean}
 	 * @throws javax.management.MBeanException if creation of the ModelMBean failed
 	 */
 	protected ModelMBean createModelMBean() throws MBeanException {
@@ -812,7 +812,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	}
 
 	/**
-	 * Gets the <code>ModelMBeanInfo</code> for the bean with the supplied key
+	 * Gets the {@code ModelMBeanInfo} for the bean with the supplied key
 	 * and of the supplied type.
 	 */
 	private ModelMBeanInfo getMBeanInfo(Object managedBean, String beanKey) throws JMException {
@@ -831,9 +831,9 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	//---------------------------------------------------------------------
 
 	/**
-	 * Invoked when using an <code>AutodetectCapableMBeanInfoAssembler</code>.
+	 * Invoked when using an {@code AutodetectCapableMBeanInfoAssembler}.
 	 * Gives the assembler the opportunity to add additional beans from the
-	 * <code>BeanFactory</code> to the list of beans to be exposed via JMX.
+	 * {@code BeanFactory} to the list of beans to be exposed via JMX.
 	 * <p>This implementation prevents a bean from being added to the list
 	 * automatically if it has already been added manually, and it prevents
 	 * certain internal classes from being registered automatically.
@@ -847,8 +847,8 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	}
 
 	/**
-	 * Attempts to detect any beans defined in the <code>ApplicationContext</code> that are
-	 * valid MBeans and registers them automatically with the <code>MBeanServer</code>.
+	 * Attempts to detect any beans defined in the {@code ApplicationContext} that are
+	 * valid MBeans and registers them automatically with the {@code MBeanServer}.
 	 */
 	private void autodetectMBeans() {
 		autodetect(new AutodetectCallback() {
@@ -860,9 +860,9 @@ public class MBeanExporter extends MBeanRegistrationSupport
 
 	/**
 	 * Performs the actual autodetection process, delegating to an
-	 * <code>AutodetectCallback</code> instance to vote on the inclusion of a
+	 * {@code AutodetectCallback} instance to vote on the inclusion of a
 	 * given bean.
-	 * @param callback the <code>AutodetectCallback</code> to use when deciding
+	 * @param callback the {@code AutodetectCallback} to use when deciding
 	 * whether to include a bean or not
 	 */
 	private void autodetect(AutodetectCallback callback) {
@@ -997,7 +997,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	 * and any remaining listeners that have yet to be notified will not (obviously)
 	 * receive the {@link MBeanExporterListener#mbeanRegistered(javax.management.ObjectName)}
 	 * callback.
-	 * @param objectName the <code>ObjectName</code> of the registered MBean
+	 * @param objectName the {@code ObjectName} of the registered MBean
 	 */
 	@Override
 	protected void onRegister(ObjectName objectName) {
@@ -1012,7 +1012,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	 * and any remaining listeners that have yet to be notified will not (obviously)
 	 * receive the {@link MBeanExporterListener#mbeanUnregistered(javax.management.ObjectName)}
 	 * callback.
-	 * @param objectName the <code>ObjectName</code> of the unregistered MBean
+	 * @param objectName the {@code ObjectName} of the unregistered MBean
 	 */
 	@Override
 	protected void onUnregister(ObjectName objectName) {
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java
index d586531f29..18b0c14b2d 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java
@@ -31,14 +31,14 @@ public interface MBeanExporterListener {
 	/**
 	 * Called by {@link MBeanExporter} after an MBean has been <i>successfully</i>
 	 * registered with an {@link javax.management.MBeanServer}.
-	 * @param objectName the <code>ObjectName</code> of the registered MBean
+	 * @param objectName the {@code ObjectName} of the registered MBean
 	 */
 	void mbeanRegistered(ObjectName objectName);
 
 	/**
 	 * Called by {@link MBeanExporter} after an MBean has been <i>successfully</i>
 	 * unregistered from an {@link javax.management.MBeanServer}.
-	 * @param objectName the <code>ObjectName</code> of the unregistered MBean
+	 * @param objectName the {@code ObjectName} of the unregistered MBean
 	 */
 	void mbeanUnregistered(ObjectName objectName);
 
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java b/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java
index d738cf37d3..45cbac17ba 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java
@@ -26,7 +26,7 @@ package org.springframework.jmx.export;
 public class UnableToRegisterMBeanException extends MBeanExportException {
 
 	/**
-	 * Create a new <code>UnableToRegisterMBeanException</code> with the
+	 * Create a new {@code UnableToRegisterMBeanException} with the
 	 * specified error message.
 	 * @param msg the detail message
 	 */
@@ -35,7 +35,7 @@ public class UnableToRegisterMBeanException extends MBeanExportException {
 	}
 
 	/**
-	 * Create a new <code>UnableToRegisterMBeanException</code> with the
+	 * Create a new {@code UnableToRegisterMBeanException} with the
 	 * specified error message and root cause.
 	 * @param msg the detail message
 	 * @param cause the root caus
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 4603a4d320..741932841d 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
@@ -36,7 +36,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.util.StringValueResolver;
 
 /**
- * Implementation of the <code>JmxAttributeSource</code> interface that
+ * Implementation of the {@code JmxAttributeSource} interface that
  * reads JDK 1.5+ annotations and exposes the corresponding attributes.
  *
  * @author Rob Harrop
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
index 937bbf2e75..bc8b02d6f3 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
@@ -18,8 +18,8 @@ package org.springframework.jmx.export.annotation;
 
 /**
  * JDK 1.5+ method-level annotation used to provide metadata about operation
- * parameters, corresponding to a <code>ManagedOperationParameter</code> attribute.
- * Used as part of a <code>ManagedOperationParameters</code> annotation.
+ * parameters, corresponding to a {@code ManagedOperationParameter} attribute.
+ * Used as part of a {@code ManagedOperationParameters} annotation.
  *
  * @author Rob Harrop
  * @since 1.2
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java
index 23fc2c77dc..1bef5da10b 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
 /**
  * JDK 1.5+ method-level annotation used to provide metadata about
  * operation parameters, corresponding to an array of
- * <code>ManagedOperationParameter</code> attributes.
+ * {@code ManagedOperationParameter} attributes.
  *
  * @author Rob Harrop
  * @since 1.2
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java
index 2d693f507a..ef5a2534b5 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java
@@ -44,7 +44,7 @@ import java.lang.annotation.Target;
 public @interface ManagedResource {
 
 	/**
-	 * The annotation value is equivalent to the <code>objectName</code>
+	 * The annotation value is equivalent to the {@code objectName}
 	 * attribute, for simple default usage.
 	 */
 	String value() default "";
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
index c0a95abb4f..07f976c0e9 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
@@ -29,8 +29,8 @@ import org.springframework.aop.support.AopUtils;
 import org.springframework.jmx.support.JmxUtils;
 
 /**
- * Abstract implementation of the <code>MBeanInfoAssembler</code> interface
- * that encapsulates the creation of a <code>ModelMBeanInfo</code> instance
+ * Abstract implementation of the {@code MBeanInfoAssembler} interface
+ * that encapsulates the creation of a {@code ModelMBeanInfo} instance
  * but delegates the creation of metadata to subclasses.
  *
  * <p>This class offers two flavors of Class extraction from a managed bean
@@ -46,7 +46,7 @@ import org.springframework.jmx.support.JmxUtils;
 public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler {
 
 	/**
-	 * Create an instance of the <code>ModelMBeanInfoSupport</code> class supplied with all
+	 * Create an instance of the {@code ModelMBeanInfoSupport} class supplied with all
 	 * JMX implementations and populates the metadata through calls to the subclass.
 	 * @param managedBean the bean that will be exposed (might be an AOP proxy)
 	 * @param beanKey the key associated with the managed bean
@@ -123,7 +123,7 @@ public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler {
 	 * based on the class name.
 	 * @param managedBean the bean instance (might be an AOP proxy)
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @return the MBean description
 	 * @throws JMException in case of errors
 	 */
@@ -137,7 +137,7 @@ public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler {
 	 * based on the class name.
 	 * @param managedBean the bean instance (might be an AOP proxy)
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @throws JMException in case of errors
 	 */
 	protected String getDescription(Object managedBean, String beanKey) throws JMException {
@@ -149,14 +149,14 @@ public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler {
 	}
 
 	/**
-	 * Called after the <code>ModelMBeanInfo</code> instance has been constructed but
-	 * before it is passed to the <code>MBeanExporter</code>.
+	 * Called after the {@code ModelMBeanInfo} instance has been constructed but
+	 * before it is passed to the {@code MBeanExporter}.
 	 * <p>Subclasses can implement this method to add additional descriptors to the
 	 * MBean metadata. Default implementation is empty.
-	 * @param descriptor the <code>Descriptor</code> for the MBean resource.
+	 * @param descriptor the {@code Descriptor} for the MBean resource.
 	 * @param managedBean the bean instance (might be an AOP proxy)
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @throws JMException in case of errors
 	 */
 	protected void populateMBeanDescriptor(Descriptor descriptor, Object managedBean, String beanKey)
@@ -167,10 +167,10 @@ public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler {
 	 * Get the constructor metadata for the MBean resource. Subclasses should implement
 	 * this method to return the appropriate metadata for all constructors that should
 	 * be exposed in the management interface for the managed resource.
-	 * <p>Default implementation returns an empty array of <code>ModelMBeanConstructorInfo</code>.
+	 * <p>Default implementation returns an empty array of {@code ModelMBeanConstructorInfo}.
 	 * @param managedBean the bean instance (might be an AOP proxy)
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @return the constructor metadata
 	 * @throws JMException in case of errors
 	 */
@@ -183,10 +183,10 @@ public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler {
 	 * Get the notification metadata for the MBean resource. Subclasses should implement
 	 * this method to return the appropriate metadata for all notifications that should
 	 * be exposed in the management interface for the managed resource.
-	 * <p>Default implementation returns an empty array of <code>ModelMBeanNotificationInfo</code>.
+	 * <p>Default implementation returns an empty array of {@code ModelMBeanNotificationInfo}.
 	 * @param managedBean the bean instance (might be an AOP proxy)
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @return the notification metadata
 	 * @throws JMException in case of errors
 	 */
@@ -202,7 +202,7 @@ public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler {
 	 * be exposed in the management interface for the managed resource.
 	 * @param managedBean the bean instance (might be an AOP proxy)
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @return the attribute metadata
 	 * @throws JMException in case of errors
 	 */
@@ -215,7 +215,7 @@ public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler {
 	 * be exposed in the management interface for the managed resource.
 	 * @param managedBean the bean instance (might be an AOP proxy)
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @return the operation metadata
 	 * @throws JMException in case of errors
 	 */
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 c346c10d54..d38e5be948 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
@@ -41,11 +41,11 @@ import org.springframework.jmx.support.JmxUtils;
  * is contained in this class, but this class makes no decisions as to
  * which methods and properties are to be exposed. Instead it gives
  * subclasses a chance to 'vote' on each property or method through
- * the <code>includeXXX</code> methods.
+ * the {@code includeXXX} methods.
  *
  * <p>Subclasses are also given the opportunity to populate attribute
  * and operation metadata with additional descriptors once the metadata
- * is assembled through the <code>populateXXXDescriptor</code> methods.
+ * is assembled through the {@code populateXXXDescriptor} methods.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -184,16 +184,16 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	 * <p>Default is none, not explicitly setting that field, as recommended by the
 	 * JMX 1.2 specification. This should result in "never cache" behavior, always
 	 * reading attribute values freshly (which corresponds to a "currencyTimeLimit"
-	 * of <code>-1</code> in JMX 1.2).
+	 * of {@code -1} in JMX 1.2).
 	 * <p>However, some JMX implementations (that do not follow the JMX 1.2 spec
 	 * in that respect) might require an explicit value to be set here to get
 	 * "never cache" behavior: for example, JBoss 3.2.x.
 	 * <p>Note that the "currencyTimeLimit" value can also be specified on a
 	 * managed attribute or operation. The default value will apply if not
-	 * overridden with a "currencyTimeLimit" value <code>>= 0</code> there:
-	 * a metadata "currencyTimeLimit" value of <code>-1</code> indicates
-	 * to use the default; a value of <code>0</code> indicates to "always cache"
-	 * and will be translated to <code>Integer.MAX_VALUE</code>; a positive
+	 * overridden with a "currencyTimeLimit" value {@code >= 0} there:
+	 * a metadata "currencyTimeLimit" value of {@code -1} indicates
+	 * to use the default; a value of {@code 0} indicates to "always cache"
+	 * and will be translated to {@code Integer.MAX_VALUE}; a positive
 	 * value indicates the number of cache seconds.
 	 * @see org.springframework.jmx.export.metadata.AbstractJmxAttribute#setCurrencyTimeLimit
 	 * @see #applyCurrencyTimeLimit(javax.management.Descriptor, int)
@@ -212,9 +212,9 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	/**
 	 * Set whether to use strict casing for attributes. Enabled by default.
 	 * <p>When using strict casing, a JavaBean property with a getter such as
-	 * <code>getFoo()</code> translates to an attribute called <code>Foo</code>.
-	 * With strict casing disabled, <code>getFoo()</code> would translate to just
-	 * <code>foo</code>.
+	 * {@code getFoo()} translates to an attribute called {@code Foo}.
+	 * With strict casing disabled, {@code getFoo()} would translate to just
+	 * {@code foo}.
 	 */
 	public void setUseStrictCasing(boolean useStrictCasing) {
 		this.useStrictCasing = useStrictCasing;
@@ -231,13 +231,13 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	 * Set whether to expose the JMX descriptor field "class" for managed operations.
 	 * Default is "false", letting the JMX implementation determine the actual class
 	 * through reflection.
-	 * <p>Set this property to <code>true</code> for JMX implementations that
+	 * <p>Set this property to {@code true} for JMX implementations that
 	 * require the "class" field to be specified, for example WebLogic's.
 	 * In that case, Spring will expose the target class name there, in case of
 	 * a plain bean instance or a CGLIB proxy. When encountering a JDK dynamic
 	 * proxy, the <b>first</b> interface implemented by the proxy will be specified.
 	 * <p><b>WARNING:</b> Review your proxy definitions when exposing a JDK dynamic
-	 * proxy through JMX, in particular with this property turned to <code>true</code>:
+	 * proxy through JMX, in particular with this property turned to {@code true}:
 	 * the specified interface list should start with your management interface in
 	 * this case, with all other interfaces following. In general, consider exposing
 	 * your target bean directly or a CGLIB proxy for it instead.
@@ -262,7 +262,7 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	 * metadata is assembled and passed to the subclass for descriptor population.
 	 * @param managedBean the bean instance (might be an AOP proxy)
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @return the attribute metadata
 	 * @throws JMException in case of errors
 	 * @see #populateAttributeDescriptor
@@ -317,7 +317,7 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	 * field set to the appropriate value.
 	 * @param managedBean the bean instance (might be an AOP proxy)
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @return the operation metadata
 	 * @see #populateOperationDescriptor
 	 */
@@ -378,13 +378,13 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	}
 
 	/**
-	 * Creates an instance of <code>ModelMBeanOperationInfo</code> for the
+	 * Creates an instance of {@code ModelMBeanOperationInfo} for the
 	 * given method. Populates the parameter info for the operation.
-	 * @param method the <code>Method</code> to create a <code>ModelMBeanOperationInfo</code> for
+	 * @param method the {@code Method} to create a {@code ModelMBeanOperationInfo} for
 	 * @param name the name for the operation info
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
-	 * @return the <code>ModelMBeanOperationInfo</code>
+	 * of the {@code MBeanExporter}
+	 * @return the {@code ModelMBeanOperationInfo}
 	 */
 	protected ModelMBeanOperationInfo createModelMBeanOperationInfo(Method method, String name, String beanKey) {
 		MBeanParameterInfo[] params = getOperationParameters(method, beanKey);
@@ -421,21 +421,21 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 
 	/**
 	 * Allows subclasses to vote on the inclusion of a particular attribute accessor.
-	 * @param method the accessor <code>Method</code>
+	 * @param method the accessor {@code Method}
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
-	 * @return <code>true</code> if the accessor should be included in the management interface,
-	 * otherwise <code>false<code>
+	 * of the {@code MBeanExporter}
+	 * @return {@code true} if the accessor should be included in the management interface,
+	 * otherwise {@code false}
 	 */
 	protected abstract boolean includeReadAttribute(Method method, String beanKey);
 
 	/**
 	 * Allows subclasses to vote on the inclusion of a particular attribute mutator.
-	 * @param method the mutator <code>Method</code>.
+	 * @param method the mutator {@code Method}.
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
-	 * @return <code>true</code> if the mutator should be included in the management interface,
-	 * otherwise <code>false<code>
+	 * of the {@code MBeanExporter}
+	 * @return {@code true} if the mutator should be included in the management interface,
+	 * otherwise {@code false}
 	 */
 	protected abstract boolean includeWriteAttribute(Method method, String beanKey);
 
@@ -443,7 +443,7 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	 * Allows subclasses to vote on the inclusion of a particular operation.
 	 * @param method the operation method
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @return whether the operation should be included in the management interface
 	 */
 	protected abstract boolean includeOperation(Method method, String beanKey);
@@ -451,10 +451,10 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	/**
 	 * Get the description for a particular attribute.
 	 * <p>The default implementation returns a description for the operation
-	 * that is the name of corresponding <code>Method</code>.
+	 * that is the name of corresponding {@code Method}.
 	 * @param propertyDescriptor the PropertyDescriptor for the attribute
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @return the description for the attribute
 	 */
 	protected String getAttributeDescription(PropertyDescriptor propertyDescriptor, String beanKey) {
@@ -464,10 +464,10 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	/**
 	 * Get the description for a particular operation.
 	 * <p>The default implementation returns a description for the operation
-	 * that is the name of corresponding <code>Method</code>.
+	 * that is the name of corresponding {@code Method}.
 	 * @param method the operation method
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @return the description for the operation
 	 */
 	protected String getOperationDescription(Method method, String beanKey) {
@@ -476,11 +476,11 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 
 	/**
 	 * Create parameter info for the given method.
-	 * <p>The default implementation returns an empty arry of <code>MBeanParameterInfo</code>.
-	 * @param method the <code>Method</code> to get the parameter information for
+	 * <p>The default implementation returns an empty arry of {@code MBeanParameterInfo}.
+	 * @param method the {@code Method} to get the parameter information for
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
-	 * @return the <code>MBeanParameterInfo</code> array
+	 * of the {@code MBeanExporter}
+	 * @return the {@code MBeanParameterInfo} array
 	 */
 	protected MBeanParameterInfo[] getOperationParameters(Method method, String beanKey) {
 		return new MBeanParameterInfo[0];
@@ -488,13 +488,13 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 
 
 	/**
-	 * Allows subclasses to add extra fields to the <code>Descriptor</code> for an MBean.
-	 * <p>The default implementation sets the <code>currencyTimeLimit</code> field to
+	 * Allows subclasses to add extra fields to the {@code Descriptor} for an MBean.
+	 * <p>The default implementation sets the {@code currencyTimeLimit} field to
 	 * the specified "defaultCurrencyTimeLimit", if any (by default none).
-	 * @param descriptor the <code>Descriptor</code> for the MBean resource.
+	 * @param descriptor the {@code Descriptor} for the MBean resource.
 	 * @param managedBean the bean instance (might be an AOP proxy)
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @see #setDefaultCurrencyTimeLimit(Integer)
 	 * @see #applyDefaultCurrencyTimeLimit(javax.management.Descriptor)
 	 */
@@ -504,15 +504,15 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	}
 
 	/**
-	 * Allows subclasses to add extra fields to the <code>Descriptor</code> for a
+	 * Allows subclasses to add extra fields to the {@code Descriptor} for a
 	 * particular attribute.
-	 * <p>The default implementation sets the <code>currencyTimeLimit</code> field to
+	 * <p>The default implementation sets the {@code currencyTimeLimit} field to
 	 * the specified "defaultCurrencyTimeLimit", if any (by default none).
 	 * @param desc the attribute descriptor
 	 * @param getter the accessor method for the attribute
 	 * @param setter the mutator method for the attribute
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @see #setDefaultCurrencyTimeLimit(Integer)
 	 * @see #applyDefaultCurrencyTimeLimit(javax.management.Descriptor)
 	 */
@@ -521,14 +521,14 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	}
 
 	/**
-	 * Allows subclasses to add extra fields to the <code>Descriptor</code> for a
+	 * Allows subclasses to add extra fields to the {@code Descriptor} for a
 	 * particular operation.
-	 * <p>The default implementation sets the <code>currencyTimeLimit</code> field to
+	 * <p>The default implementation sets the {@code currencyTimeLimit} field to
 	 * the specified "defaultCurrencyTimeLimit", if any (by default none).
 	 * @param desc the operation descriptor
 	 * @param method the method corresponding to the operation
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 * @see #setDefaultCurrencyTimeLimit(Integer)
 	 * @see #applyDefaultCurrencyTimeLimit(javax.management.Descriptor)
 	 */
@@ -537,7 +537,7 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 	}
 
 	/**
-	 * Set the <code>currencyTimeLimit</code> field to the specified
+	 * Set the {@code currencyTimeLimit} field to the specified
 	 * "defaultCurrencyTimeLimit", if any (by default none).
 	 * @param desc the JMX attribute or operation descriptor
 	 * @see #setDefaultCurrencyTimeLimit(Integer)
@@ -550,10 +550,10 @@ public abstract class AbstractReflectiveMBeanInfoAssembler extends AbstractMBean
 
 	/**
 	 * Apply the given JMX "currencyTimeLimit" value to the given descriptor.
-	 * <p>The default implementation sets a value <code>>0</code> as-is (as number of cache seconds),
-	 * turns a value of <code>0</code> into <code>Integer.MAX_VALUE</code> ("always cache")
+	 * <p>The default implementation sets a value {@code >0} as-is (as number of cache seconds),
+	 * turns a value of {@code 0} into {@code Integer.MAX_VALUE} ("always cache")
 	 * and sets the "defaultCurrencyTimeLimit" (if any, indicating "never cache") in case of
-	 * a value <code><0</code>. This follows the recommendation in the JMX 1.2 specification.
+	 * a value {@code <0}. This follows the recommendation in the JMX 1.2 specification.
 	 * @param desc the JMX attribute or operation descriptor
 	 * @param currencyTimeLimit the "currencyTimeLimit" value to apply
 	 * @see #setDefaultCurrencyTimeLimit(Integer)
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java
index 4c87da3bac..1d5233570d 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java
@@ -17,9 +17,9 @@
 package org.springframework.jmx.export.assembler;
 
 /**
- * Extends the <code>MBeanInfoAssembler</code> to add autodetection logic.
+ * Extends the {@code MBeanInfoAssembler} to add autodetection logic.
  * Implementations of this interface are given the opportunity by the
- * <code>MBeanExporter</code> to include additional beans in the registration process.
+ * {@code MBeanExporter} to include additional beans in the registration process.
  *
  * <p>The exact mechanism for deciding which beans to include is left to
  * implementing classes.
@@ -32,8 +32,8 @@ public interface AutodetectCapableMBeanInfoAssembler extends MBeanInfoAssembler
 
 	/**
 	 * Indicate whether a particular bean should be included in the registration
-	 * process, if it is not specified in the <code>beans</code> map of the
-	 * <code>MBeanExporter</code>.
+	 * process, if it is not specified in the {@code beans} map of the
+	 * {@code MBeanExporter}.
 	 * @param beanClass the class of the bean (might be a proxy class)
 	 * @param beanName the name of the bean in the bean factory
 	 */
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java
index 4605a4161a..538e247121 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java
@@ -30,23 +30,23 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * Subclass of <code>AbstractReflectiveMBeanInfoAssembler</code> that allows for
+ * Subclass of {@code AbstractReflectiveMBeanInfoAssembler} that allows for
  * the management interface of a bean to be defined using arbitrary interfaces.
  * Any methods or properties that are defined in those interfaces are exposed
  * as MBean operations and attributes.
  *
  * <p>By default, this class votes on the inclusion of each operation or attribute
  * based on the interfaces implemented by the bean class. However, you can supply an
- * array of interfaces via the <code>managedInterfaces</code> property that will be
+ * array of interfaces via the {@code managedInterfaces} property that will be
  * used instead. If you have multiple beans and you wish each bean to use a different
  * set of interfaces, then you can map bean keys (that is the name used to pass the
- * bean to the <code>MBeanExporter</code>) to a list of interface names using the
- * <code>interfaceMappings</code> property.
+ * bean to the {@code MBeanExporter}) to a list of interface names using the
+ * {@code interfaceMappings} property.
  *
- * <p>If you specify values for both <code>interfaceMappings</code> and
- * <code>managedInterfaces</code>, Spring will attempt to find interfaces in the
+ * <p>If you specify values for both {@code interfaceMappings} and
+ * {@code managedInterfaces}, Spring will attempt to find interfaces in the
  * mappings first. If no interfaces for the bean are found, it will use the
- * interfaces defined by <code>managedInterfaces</code>.
+ * interfaces defined by {@code managedInterfaces}.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -66,14 +66,14 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI
 	private Class[] managedInterfaces;
 
 	/**
-	 * Stores the mappings of bean keys to an array of <code>Class</code>es.
+	 * Stores the mappings of bean keys to an array of {@code Class}es.
 	 */
 	private Properties interfaceMappings;
 
 	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
 
 	/**
-	 * Stores the mappings of bean keys to an array of <code>Class</code>es.
+	 * Stores the mappings of bean keys to an array of {@code Class}es.
 	 */
 	private Map<String, Class[]> resolvedInterfaceMappings;
 
@@ -81,7 +81,7 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI
 	/**
 	 * Set the array of interfaces to use for creating the management info.
 	 * These interfaces will be used for a bean if no entry corresponding to
-	 * that bean is found in the <code>interfaceMappings</code> property.
+	 * that bean is found in the {@code interfaceMappings} property.
 	 * @param managedInterfaces an array of classes indicating the interfaces to use.
 	 * Each entry <strong>MUST</strong> be an interface.
 	 * @see #setInterfaceMappings
@@ -157,13 +157,13 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI
 
 
 	/**
-	 * Check to see if the <code>Method</code> is declared in
+	 * Check to see if the {@code Method} is declared in
 	 * one of the configured interfaces and that it is public.
-	 * @param method the accessor <code>Method</code>.
+	 * @param method the accessor {@code Method}.
 	 * @param beanKey the key associated with the MBean in the
-	 * <code>beans</code> <code>Map</code>.
-	 * @return <code>true</code> if the <code>Method</code> is declared in one of the
-	 * configured interfaces, otherwise <code>false</code>.
+	 * {@code beans} {@code Map}.
+	 * @return {@code true} if the {@code Method} is declared in one of the
+	 * configured interfaces, otherwise {@code false}.
 	 */
 	@Override
 	protected boolean includeReadAttribute(Method method, String beanKey) {
@@ -171,13 +171,13 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI
 	}
 
 	/**
-	 * Check to see if the <code>Method</code> is declared in
+	 * Check to see if the {@code Method} is declared in
 	 * one of the configured interfaces and that it is public.
-	 * @param method the mutator <code>Method</code>.
+	 * @param method the mutator {@code Method}.
 	 * @param beanKey the key associated with the MBean in the
-	 * <code>beans</code> <code>Map</code>.
-	 * @return <code>true</code> if the <code>Method</code> is declared in one of the
-	 * configured interfaces, otherwise <code>false</code>.
+	 * {@code beans} {@code Map}.
+	 * @return {@code true} if the {@code Method} is declared in one of the
+	 * configured interfaces, otherwise {@code false}.
 	 */
 	@Override
 	protected boolean includeWriteAttribute(Method method, String beanKey) {
@@ -185,13 +185,13 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI
 	}
 
 	/**
-	 * Check to see if the <code>Method</code> is declared in
+	 * Check to see if the {@code Method} is declared in
 	 * one of the configured interfaces and that it is public.
-	 * @param method the operation <code>Method</code>.
+	 * @param method the operation {@code Method}.
 	 * @param beanKey the key associated with the MBean in the
-	 * <code>beans</code> <code>Map</code>.
-	 * @return <code>true</code> if the <code>Method</code> is declared in one of the
-	 * configured interfaces, otherwise <code>false</code>.
+	 * {@code beans} {@code Map}.
+	 * @return {@code true} if the {@code Method} is declared in one of the
+	 * configured interfaces, otherwise {@code false}.
 	 */
 	@Override
 	protected boolean includeOperation(Method method, String beanKey) {
@@ -199,12 +199,12 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI
 	}
 
 	/**
-	 * Check to see if the <code>Method</code> is both public and declared in
+	 * Check to see if the {@code Method} is both public and declared in
 	 * one of the configured interfaces.
-	 * @param method the <code>Method</code> to check.
+	 * @param method the {@code Method} to check.
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * @return <code>true</code> if the <code>Method</code> is declared in one of the
-	 * configured interfaces and is public, otherwise <code>false</code>.
+	 * @return {@code true} if the {@code Method} is declared in one of the
+	 * configured interfaces and is public, otherwise {@code false}.
 	 */
 	private boolean isPublicInInterface(Method method, String beanKey) {
 		return ((method.getModifiers() & Modifier.PUBLIC) > 0) && isDeclaredInInterface(method, beanKey);
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java
index 0d0976ea06..32a713b399 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java
@@ -23,7 +23,7 @@ import javax.management.modelmbean.ModelMBeanInfo;
  * Interface to be implemented by all classes that can
  * create management interface metadata for a managed resource.
  *
- * <p>Used by the <code>MBeanExporter</code> to generate the management
+ * <p>Used by the {@code MBeanExporter} to generate the management
  * interface for any bean that is not an MBean.
  *
  * @author Rob Harrop
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 9f035edc5b..0a05442500 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
@@ -39,13 +39,13 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Implementation of the {@link org.springframework.jmx.export.assembler.MBeanInfoAssembler}
+ * Implementation of the {@link MBeanInfoAssembler}
  * interface that reads the management interface information from source level metadata.
  *
  * <p>Uses the {@link JmxAttributeSource} strategy interface, so that
  * metadata can be read using any supported implementation. Out of the box,
  * Spring provides an implementation based on JDK 1.5+ annotations,
- * <code>AnnotationJmxAttributeSource</code>.
+ * {@code AnnotationJmxAttributeSource}.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -61,15 +61,15 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 
 
 	/**
-	 * Create a new <code>MetadataMBeanInfoAssembler<code> which needs to be
+	 * Create a new {@code MetadataMBeanInfoAssembler} which needs to be
 	 * configured through the {@link #setAttributeSource} method.
 	 */
 	public MetadataMBeanInfoAssembler() {
 	}
 
 	/**
-	 * Create a new <code>MetadataMBeanInfoAssembler<code> for the given
-	 * <code>JmxAttributeSource</code>.
+	 * Create a new {@code MetadataMBeanInfoAssembler} for the given
+	 * {@code JmxAttributeSource}.
 	 * @param attributeSource the JmxAttributeSource to use
 	 */
 	public MetadataMBeanInfoAssembler(JmxAttributeSource attributeSource) {
@@ -79,7 +79,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 
 
 	/**
-	 * Set the <code>JmxAttributeSource</code> implementation to use for
+	 * Set the {@code JmxAttributeSource} implementation to use for
 	 * reading the metadata from the bean class.
 	 * @see org.springframework.jmx.export.annotation.AnnotationJmxAttributeSource
 	 */
@@ -110,7 +110,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 
 	/**
 	 * Used for autodetection of beans. Checks to see if the bean's class has a
-	 * <code>ManagedResource</code> attribute. If so it will add it list of included beans.
+	 * {@code ManagedResource} attribute. If so it will add it list of included beans.
 	 * @param beanClass the class of the bean
 	 * @param beanName the name of the bean in the bean factory
 	 */
@@ -158,21 +158,21 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 	}
 
 	/**
-	 * Checks to see if the given Method has the <code>ManagedAttribute</code> attribute.
+	 * Checks to see if the given Method has the {@code ManagedAttribute} attribute.
 	 */
 	private boolean hasManagedAttribute(Method method) {
 		return (this.attributeSource.getManagedAttribute(method) != null);
 	}
 
 	/**
-	 * Checks to see if the given Method has the <code>ManagedMetric</code> attribute.
+	 * Checks to see if the given Method has the {@code ManagedMetric} attribute.
 	 */
 	private boolean hasManagedMetric(Method method) {
 		return (this.attributeSource.getManagedMetric(method) != null);
 	}
 
 	/**
-	 * Checks to see if the given Method has the <code>ManagedOperation</code> attribute.
+	 * Checks to see if the given Method has the {@code ManagedOperation} attribute.
 	 * @param method the method to check
 	 */
 	private boolean hasManagedOperation(Method method) {
@@ -182,7 +182,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 
 	/**
 	 * Reads managed resource description from the source level metadata.
-	 * Returns an empty <code>String</code> if no description can be found.
+	 * Returns an empty {@code String} if no description can be found.
 	 */
 	@Override
 	protected String getDescription(Object managedBean, String beanKey) {
@@ -221,7 +221,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 	}
 
 	/**
-	 * Retrieves the description for the supplied <code>Method</code> from the
+	 * Retrieves the description for the supplied {@code Method} from the
 	 * metadata. Uses the method name is no description is present in the metadata.
 	 */
 	@Override
@@ -248,8 +248,8 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 	}
 
 	/**
-	 * Reads <code>MBeanParameterInfo</code> from the <code>ManagedOperationParameter</code>
-	 * attributes attached to a method. Returns an empty array of <code>MBeanParameterInfo</code>
+	 * Reads {@code MBeanParameterInfo} from the {@code ManagedOperationParameter}
+	 * attributes attached to a method. Returns an empty array of {@code MBeanParameterInfo}
 	 * if no attributes are found.
 	 */
 	@Override
@@ -272,7 +272,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 	}
 
 	/**
-	 * Reads the {@link ManagedNotification} metadata from the <code>Class</code> of the managed resource
+	 * Reads the {@link ManagedNotification} metadata from the {@code Class} of the managed resource
 	 * and generates and returns the corresponding {@link ModelMBeanNotificationInfo} metadata.
 	 */
 	@Override
@@ -291,10 +291,10 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 	}
 
 	/**
-	 * Adds descriptor fields from the <code>ManagedResource</code> attribute
-	 * to the MBean descriptor. Specifically, adds the <code>currencyTimeLimit</code>,
-	 * <code>persistPolicy</code>, <code>persistPeriod</code>, <code>persistLocation</code>
-	 * and <code>persistName</code> descriptor fields if they are present in the metadata.
+	 * Adds descriptor fields from the {@code ManagedResource} attribute
+	 * to the MBean descriptor. Specifically, adds the {@code currencyTimeLimit},
+	 * {@code persistPolicy}, {@code persistPeriod}, {@code persistLocation}
+	 * and {@code persistName} descriptor fields if they are present in the metadata.
 	 */
 	@Override
 	protected void populateMBeanDescriptor(Descriptor desc, Object managedBean, String beanKey) {
@@ -328,7 +328,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 	}
 
 	/**
-	 * Adds descriptor fields from the <code>ManagedAttribute</code> attribute or the <code>ManagedMetric</code> attribute
+	 * Adds descriptor fields from the {@code ManagedAttribute} attribute or the {@code ManagedMetric} attribute
 	 * to the attribute descriptor.
 	 */
 	@Override
@@ -388,8 +388,8 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 	}
 
 	/**
-	 * Adds descriptor fields from the <code>ManagedAttribute</code> attribute
-	 * to the attribute descriptor. Specifically, adds the <code>currencyTimeLimit</code>
+	 * Adds descriptor fields from the {@code ManagedAttribute} attribute
+	 * to the attribute descriptor. Specifically, adds the {@code currencyTimeLimit}
 	 * descriptor field if it is present in the metadata.
 	 */
 	@Override
@@ -401,11 +401,11 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 	}
 
 	/**
-	 * Determines which of two <code>int</code> values should be used as the value
+	 * Determines which of two {@code int} values should be used as the value
 	 * for an attribute descriptor. In general, only the getter or the setter will
 	 * be have a non-negative value so we use that value. In the event that both values
 	 * are non-negative, we use the greater of the two. This method can be used to
-	 * resolve any <code>int</code> valued descriptor where there are two possible values.
+	 * resolve any {@code int} valued descriptor where there are two possible values.
 	 * @param getter the int value associated with the getter for this attribute
 	 * @param setter the int associated with the setter for this attribute
 	 */
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 5672cda258..b3ba402b6b 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
@@ -28,22 +28,22 @@ import java.util.Set;
 import org.springframework.util.StringUtils;
 
 /**
- * <code>AbstractReflectiveMBeanInfoAssembler</code> subclass that allows
+ * {@code AbstractReflectiveMBeanInfoAssembler} subclass that allows
  * method names to be explicitly excluded as MBean operations and attributes.
  *
  * <p>Any method not explicitly excluded from the management interface will be exposed to
  * JMX. JavaBean getters and setters will automatically be exposed as JMX attributes.
  *
- * <p>You can supply an array of method names via the <code>ignoredMethods</code>
+ * <p>You can supply an array of method names via the {@code ignoredMethods}
  * property. If you have multiple beans and you wish each bean to use a different
  * set of method names, then you can map bean keys (that is the name used to pass
- * the bean to the <code>MBeanExporter</code>) to a list of method names using the
- * <code>ignoredMethodMappings</code> property.
+ * the bean to the {@code MBeanExporter}) to a list of method names using the
+ * {@code ignoredMethodMappings} property.
  *
- * <p>If you specify values for both <code>ignoredMethodMappings</code> and
- * <code>ignoredMethods</code>, Spring will attempt to find method names in the
+ * <p>If you specify values for both {@code ignoredMethodMappings} and
+ * {@code ignoredMethods}, Spring will attempt to find method names in the
  * mappings first. If no method names for the bean are found, it will use the
- * method names defined by <code>ignoredMethods</code>.
+ * method names defined by {@code ignoredMethods}.
  *
  * @author Rob Harrop
  * @author Seth Ladd
@@ -65,7 +65,7 @@ public class MethodExclusionMBeanInfoAssembler extends AbstractConfigurableMBean
 	/**
 	 * Set the array of method names to be <b>ignored</b> when creating the management info.
 	 * <p>These method names will be used for a bean if no entry corresponding to
-	 * that bean is found in the <code>ignoredMethodsMappings</code> property.
+	 * that bean is found in the {@code ignoredMethodsMappings} property.
 	 * @see #setIgnoredMethodMappings(java.util.Properties)
 	 */
 	public void setIgnoredMethods(String[] ignoredMethodNames) {
@@ -109,7 +109,7 @@ public class MethodExclusionMBeanInfoAssembler extends AbstractConfigurableMBean
 	 * that is, not configured as to be ignored.
 	 * @param method the operation method
 	 * @param beanKey the key associated with the MBean in the beans map
-	 * of the <code>MBeanExporter</code>
+	 * of the {@code MBeanExporter}
 	 */
 	protected boolean isNotIgnored(Method method, String beanKey) {
 		if (this.ignoredMethodMappings != null) {
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 d047b4b2e8..a28e57b465 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
@@ -28,20 +28,20 @@ import java.util.Set;
 import org.springframework.util.StringUtils;
 
 /**
- * Subclass of <code>AbstractReflectiveMBeanInfoAssembler</code> that allows
+ * Subclass of {@code AbstractReflectiveMBeanInfoAssembler} that allows
  * to specify method names to be exposed as MBean operations and attributes.
  * JavaBean getters and setters will automatically be exposed as JMX attributes.
  *
- * <p>You can supply an array of method names via the <code>managedMethods</code>
+ * <p>You can supply an array of method names via the {@code managedMethods}
  * property. If you have multiple beans and you wish each bean to use a different
  * set of method names, then you can map bean keys (that is the name used to pass
- * the bean to the <code>MBeanExporter</code>) to a list of method names using the
- * <code>methodMappings</code> property.
+ * the bean to the {@code MBeanExporter}) to a list of method names using the
+ * {@code methodMappings} property.
  *
- * <p>If you specify values for both <code>methodMappings</code> and
- * <code>managedMethods</code>, Spring will attempt to find method names in the
+ * <p>If you specify values for both {@code methodMappings} and
+ * {@code managedMethods}, Spring will attempt to find method names in the
  * mappings first. If no method names for the bean are found, it will use the
- * method names defined by <code>managedMethods</code>.
+ * method names defined by {@code managedMethods}.
  *
  * @author Juergen Hoeller
  * @since 1.2
@@ -68,7 +68,7 @@ public class MethodNameBasedMBeanInfoAssembler extends AbstractConfigurableMBean
 	/**
 	 * Set the array of method names to use for creating the management info.
 	 * These method names will be used for a bean if no entry corresponding to
-	 * that bean is found in the <code>methodMappings</code> property.
+	 * that bean is found in the {@code methodMappings} property.
 	 * @param methodNames an array of method names indicating the methods to use
 	 * @see #setMethodMappings
 	 */
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java
index 0e1c26d398..9fbad2dd3b 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java
@@ -19,7 +19,7 @@ package org.springframework.jmx.export.assembler;
 import java.lang.reflect.Method;
 
 /**
- * Simple subclass of <code>AbstractReflectiveMBeanInfoAssembler</code>
+ * Simple subclass of {@code AbstractReflectiveMBeanInfoAssembler}
  * that always votes yes for method and property inclusion, effectively exposing
  * all public methods and properties as operations and attributes.
  *
@@ -30,7 +30,7 @@ import java.lang.reflect.Method;
 public class SimpleReflectiveMBeanInfoAssembler extends AbstractConfigurableMBeanInfoAssembler {
 
 	/**
-	 * Always returns <code>true</code>.
+	 * Always returns {@code true}.
 	 */
 	@Override
 	protected boolean includeReadAttribute(Method method, String beanKey) {
@@ -38,7 +38,7 @@ public class SimpleReflectiveMBeanInfoAssembler extends AbstractConfigurableMBea
 	}
 
 	/**
-	 * Always returns <code>true</code>.
+	 * Always returns {@code true}.
 	 */
 	@Override
 	protected boolean includeWriteAttribute(Method method, String beanKey) {
@@ -46,8 +46,8 @@ public class SimpleReflectiveMBeanInfoAssembler extends AbstractConfigurableMBea
 	}
 
   /**
-	 * Always returns <code>true</code>.
-	 */
+   * Always returns {@code true}.
+   */
 	@Override
 	protected boolean includeOperation(Method method, String beanKey) {
 		return true;
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java
index d44dbb2616..e3e5d3616e 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java
@@ -19,7 +19,7 @@ package org.springframework.jmx.export.metadata;
 import org.springframework.jmx.JmxException;
 
 /**
- * Thrown by the <code>JmxAttributeSource</code> when it encounters
+ * Thrown by the {@code JmxAttributeSource} when it encounters
  * incorrect metadata on a managed resource or one of its methods.
  *
  * @author Rob Harrop
@@ -30,7 +30,7 @@ import org.springframework.jmx.JmxException;
 public class InvalidMetadataException extends JmxException {
 
 	/**
-	 * Create a new <code>InvalidMetadataException</code> with the supplied
+	 * Create a new {@code InvalidMetadataException} with the supplied
 	 * error message.
 	 * @param msg the detail message
 	 */
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java
index 2a18efa50d..dec9a77ea8 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java
@@ -19,7 +19,7 @@ package org.springframework.jmx.export.metadata;
 import java.lang.reflect.Method;
 
 /**
- * Interface used by the <code>MetadataMBeanInfoAssembler</code> to
+ * Interface used by the {@code MetadataMBeanInfoAssembler} to
  * read source-level metadata from a managed resource's class.
  *
  * @author Rob Harrop
@@ -31,50 +31,50 @@ import java.lang.reflect.Method;
 public interface JmxAttributeSource {
 
 	/**
-	 * Implementations should return an instance of <code>ManagedResource</code>
-	 * if the supplied <code>Class</code> has the appropriate metadata.
-	 * Otherwise should return <code>null</code>.
+	 * Implementations should return an instance of {@code ManagedResource}
+	 * if the supplied {@code Class} has the appropriate metadata.
+	 * Otherwise should return {@code null}.
 	 * @param clazz the class to read the attribute data from
-	 * @return the attribute, or <code>null</code> if not found
+	 * @return the attribute, or {@code null} if not found
 	 * @throws InvalidMetadataException in case of invalid attributes
 	 */
 	ManagedResource getManagedResource(Class<?> clazz) throws InvalidMetadataException;
 
 	/**
-	 * Implementations should return an instance of <code>ManagedAttribute</code>
-	 * if the supplied <code>Method</code> has the corresponding metadata.
-	 * Otherwise should return <code>null</code>.
+	 * Implementations should return an instance of {@code ManagedAttribute}
+	 * if the supplied {@code Method} has the corresponding metadata.
+	 * Otherwise should return {@code null}.
 	 * @param method the method to read the attribute data from
-	 * @return the attribute, or <code>null</code> if not found
+	 * @return the attribute, or {@code null} if not found
 	 * @throws InvalidMetadataException in case of invalid attributes
 	 */
 	ManagedAttribute getManagedAttribute(Method method) throws InvalidMetadataException;
 
 	/**
-	 * Implementations should return an instance of <code>ManagedMetric</code>
-	 * if the supplied <code>Method</code> has the corresponding metadata.
-	 * Otherwise should return <code>null</code>.
+	 * Implementations should return an instance of {@code ManagedMetric}
+	 * if the supplied {@code Method} has the corresponding metadata.
+	 * Otherwise should return {@code null}.
 	 * @param method the method to read the attribute data from
-	 * @return the metric, or <code>null</code> if not found
+	 * @return the metric, or {@code null} if not found
 	 * @throws InvalidMetadataException in case of invalid attributes
 	 */
 	ManagedMetric getManagedMetric(Method method) throws InvalidMetadataException;
 
 	/**
-	 * Implementations should return an instance of <code>ManagedOperation</code>
-	 * if the supplied <code>Method</code> has the corresponding metadata.
-	 * Otherwise should return <code>null</code>.
+	 * Implementations should return an instance of {@code ManagedOperation}
+	 * if the supplied {@code Method} has the corresponding metadata.
+	 * Otherwise should return {@code null}.
 	 * @param method the method to read the attribute data from
-	 * @return the attribute, or <code>null</code> if not found
+	 * @return the attribute, or {@code null} if not found
 	 * @throws InvalidMetadataException in case of invalid attributes
 	 */
 	ManagedOperation getManagedOperation(Method method) throws InvalidMetadataException;
 
 	/**
-	 * Implementations should return an array of <code>ManagedOperationParameter</code>
-	 * if the supplied <code>Method</code> has the corresponding metadata. Otherwise
+	 * Implementations should return an array of {@code ManagedOperationParameter}
+	 * if the supplied {@code Method} has the corresponding metadata. Otherwise
 	 * should return an empty array if no metadata is found.
-	 * @param method the <code>Method</code> to read the metadata from
+	 * @param method the {@code Method} to read the metadata from
 	 * @return the parameter information.
 	 * @throws InvalidMetadataException in the case of invalid attributes.
 	 */
@@ -82,9 +82,9 @@ public interface JmxAttributeSource {
 
 	/**
 	 * Implementations should return an array of {@link ManagedNotification ManagedNotifications}
-	 * if the supplied the <code>Class</code> has the corresponding metadata. Otherwise
+	 * if the supplied the {@code Class} has the corresponding metadata. Otherwise
 	 * should return an empty array.
-	 * @param clazz the <code>Class</code> to read the metadata from
+	 * @param clazz the {@code Class} to read the metadata from
 	 * @return the notification information
 	 * @throws InvalidMetadataException in the case of invalid metadata
 	 */
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java
index 4445c197e7..93b6d1193f 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java
@@ -19,7 +19,7 @@ package org.springframework.jmx.export.metadata;
 /**
  * Metadata indicating that instances of an annotated class
  * are to be registered with a JMX server.
- * Only valid when used on a <code>Class</code>.
+ * Only valid when used on a {@code Class}.
  *
  * @author Rob Harrop
  * @since 1.2
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java
index 1dfa78fd2d..f183061332 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java
@@ -26,10 +26,10 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 
 /**
- * An implementation of the <code>ObjectNamingStrategy</code> interface that
+ * An implementation of the {@code ObjectNamingStrategy} interface that
  * creates a name based on the the identity of a given instance.
  *
- * <p>The resulting <code>ObjectName</code> will be in the form
+ * <p>The resulting {@code ObjectName} will be in the form
  * <i>package</i>:class=<i>class name</i>,hashCode=<i>identity hash (in hex)</i>
  *
  * @author Rob Harrop
@@ -44,7 +44,7 @@ public class IdentityNamingStrategy implements ObjectNamingStrategy {
 
 
 	/**
-	 * Returns an instance of <code>ObjectName</code> based on the identity
+	 * Returns an instance of {@code ObjectName} based on the identity
 	 * of the managed resource.
 	 */
 	public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException {
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
index 27e58109a1..65efbb76f7 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
@@ -32,15 +32,15 @@ import org.springframework.jmx.support.ObjectNameManager;
 import org.springframework.util.CollectionUtils;
 
 /**
- * <code>ObjectNamingStrategy</code> implementation that builds
- * <code>ObjectName</code> instances from the key used in the
- * "beans" map passed to <code>MBeanExporter</code>.
+ * {@code ObjectNamingStrategy} implementation that builds
+ * {@code ObjectName} instances from the key used in the
+ * "beans" map passed to {@code MBeanExporter}.
  *
- * <p>Can also check object name mappings, given as <code>Properties</code>
- * or as <code>mappingLocations</code> of properties files. The key used
- * to look up is the key used in <code>MBeanExporter</code>'s "beans" map.
+ * <p>Can also check object name mappings, given as {@code Properties}
+ * or as {@code mappingLocations} of properties files. The key used
+ * to look up is the key used in {@code MBeanExporter}'s "beans" map.
  * If no mapping is found for a given key, the key itself is used to
- * build an <code>ObjectName</code>.
+ * build an {@code ObjectName}.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -53,25 +53,25 @@ import org.springframework.util.CollectionUtils;
 public class KeyNamingStrategy implements ObjectNamingStrategy, InitializingBean {
 
 	/**
-	 * <code>Log</code> instance for this class.
+	 * {@code Log} instance for this class.
 	 */
 	protected final Log logger = LogFactory.getLog(getClass());
 
 	/**
-	 * Stores the mappings of bean key to <code>ObjectName</code>.
+	 * Stores the mappings of bean key to {@code ObjectName}.
 	 */
 	private Properties mappings;
 
 	/**
-	 * Stores the <code>Resource</code>s containing properties that should be loaded
-	 * into the final merged set of <code>Properties</code> used for <code>ObjectName</code>
+	 * Stores the {@code Resource}s containing properties that should be loaded
+	 * into the final merged set of {@code Properties} used for {@code ObjectName}
 	 * resolution.
 	 */
 	private Resource[] mappingLocations;
 
 	/**
-	 * Stores the result of merging the <code>mappings</code> <code>Properties</code>
-	 * with the the properties stored in the resources defined by <code>mappingLocations</code>.
+	 * Stores the result of merging the {@code mappings} {@code Properties}
+	 * with the the properties stored in the resources defined by {@code mappingLocations}.
 	 */
 	private Properties mergedMappings;
 
@@ -103,9 +103,9 @@ public class KeyNamingStrategy implements ObjectNamingStrategy, InitializingBean
 
 
 	/**
-	 * Merges the <code>Properties</code> configured in the <code>mappings</code> and
-	 * <code>mappingLocations</code> into the final <code>Properties</code> instance
-	 * used for <code>ObjectName</code> resolution.
+	 * Merges the {@code Properties} configured in the {@code mappings} and
+	 * {@code mappingLocations} into the final {@code Properties} instance
+	 * used for {@code ObjectName} resolution.
 	 * @throws IOException
 	 */
 	public void afterPropertiesSet() throws IOException {
@@ -126,7 +126,7 @@ public class KeyNamingStrategy implements ObjectNamingStrategy, InitializingBean
 
 
 	/**
-	 * Attempts to retrieve the <code>ObjectName</code> via the given key, trying to
+	 * Attempts to retrieve the {@code ObjectName} via the given key, trying to
 	 * find a mapped value in the mappings first.
 	 */
 	public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException {
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java
index 2f496163be..ba4d86085a 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java
@@ -31,8 +31,8 @@ import org.springframework.util.StringUtils;
 
 /**
  * An implementation of the {@link ObjectNamingStrategy} interface
- * that reads the <code>ObjectName</code> from the source-level metadata.
- * Falls back to the bean key (bean name) if no <code>ObjectName</code>
+ * that reads the {@code ObjectName} from the source-level metadata.
+ * Falls back to the bean key (bean name) if no {@code ObjectName}
  * can be found in source-level metadata.
  *
  * <p>Uses the {@link JmxAttributeSource} strategy interface, so that
@@ -49,7 +49,7 @@ import org.springframework.util.StringUtils;
 public class MetadataNamingStrategy implements ObjectNamingStrategy, InitializingBean {
 
 	/**
-	 * The <code>JmxAttributeSource</code> implementation to use for reading metadata.
+	 * The {@code JmxAttributeSource} implementation to use for reading metadata.
 	 */
 	private JmxAttributeSource attributeSource;
 
@@ -57,15 +57,15 @@ public class MetadataNamingStrategy implements ObjectNamingStrategy, Initializin
 
 
 	/**
-	 * Create a new <code>MetadataNamingStrategy<code> which needs to be
+	 * Create a new {@code MetadataNamingStrategy} which needs to be
 	 * configured through the {@link #setAttributeSource} method.
 	 */
 	public MetadataNamingStrategy() {
 	}
 
 	/**
-	 * Create a new <code>MetadataNamingStrategy<code> for the given
-	 * <code>JmxAttributeSource</code>.
+	 * Create a new {@code MetadataNamingStrategy} for the given
+	 * {@code JmxAttributeSource}.
 	 * @param attributeSource the JmxAttributeSource to use
 	 */
 	public MetadataNamingStrategy(JmxAttributeSource attributeSource) {
@@ -75,7 +75,7 @@ public class MetadataNamingStrategy implements ObjectNamingStrategy, Initializin
 
 
 	/**
-	 * Set the implementation of the <code>JmxAttributeSource</code> interface to use
+	 * Set the implementation of the {@code JmxAttributeSource} interface to use
 	 * when reading the source-level metadata.
 	 */
 	public void setAttributeSource(JmxAttributeSource attributeSource) {
@@ -102,8 +102,8 @@ public class MetadataNamingStrategy implements ObjectNamingStrategy, Initializin
 
 
 	/**
-	 * Reads the <code>ObjectName</code> from the source-level metadata associated
-	 * with the managed resource's <code>Class</code>.
+	 * Reads the {@code ObjectName} from the source-level metadata associated
+	 * with the managed resource's {@code Class}.
 	 */
 	public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException {
 		Class managedClass = AopUtils.getTargetClass(managedBean);
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java
index ba0bbdc5fb..edfe3f81dc 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java
@@ -20,9 +20,9 @@ import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
 /**
- * Strategy interface that encapsulates the creation of <code>ObjectName</code> instances.
+ * Strategy interface that encapsulates the creation of {@code ObjectName} instances.
  *
- * <p>Used by the <code>MBeanExporter</code> to obtain <code>ObjectName</code>s
+ * <p>Used by the {@code MBeanExporter} to obtain {@code ObjectName}s
  * when registering beans.
  *
  * @author Rob Harrop
@@ -33,13 +33,13 @@ import javax.management.ObjectName;
 public interface ObjectNamingStrategy {
 
 	/**
-	 * Obtain an <code>ObjectName</code> for the supplied bean.
+	 * Obtain an {@code ObjectName} for the supplied bean.
 	 * @param managedBean the bean that will be exposed under the
-	 * returned <code>ObjectName</code>
+	 * returned {@code ObjectName}
 	 * @param beanKey the key associated with this bean in the beans map
-	 * passed to the <code>MBeanExporter</code>
-	 * @return the <code>ObjectName</code> instance
-	 * @throws MalformedObjectNameException if the resulting <code>ObjectName</code> is invalid
+	 * passed to the {@code MBeanExporter}
+	 * @return the {@code ObjectName} instance
+	 * @throws MalformedObjectNameException if the resulting {@code ObjectName} is invalid
 	 */
 	ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException;
 
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java
index 4c564ecb80..74fe92ec2b 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java
@@ -21,7 +21,7 @@ import javax.management.ObjectName;
 
 /**
  * Interface that allows infrastructure components to provide their own
- * <code>ObjectName</code>s to the <code>MBeanExporter</code>.
+ * {@code ObjectName}s to the {@code MBeanExporter}.
  *
  * <p><b>Note:</b> This interface is mainly intended for internal usage.
  *
@@ -32,7 +32,7 @@ import javax.management.ObjectName;
 public interface SelfNaming {
 
 	/**
-	 * Return the <code>ObjectName</code> for the implementing object.
+	 * Return the {@code ObjectName} for the implementing object.
 	 * @throws MalformedObjectNameException if thrown by the ObjectName constructor
 	 * @see javax.management.ObjectName#ObjectName(String)
 	 * @see javax.management.ObjectName#getInstance(String)
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
index 29d87d7ab3..170c1c35d2 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
@@ -42,7 +42,7 @@ public class ModelMBeanNotificationPublisher implements NotificationPublisher {
 
 	/**
 	 * The {@link ModelMBean} instance wrapping the managed resource into which this
-	 * <code>NotificationPublisher</code> will be injected.
+	 * {@code NotificationPublisher} will be injected.
 	 */
 	private final ModelMBeanNotificationBroadcaster modelMBean;
 
@@ -61,10 +61,10 @@ public class ModelMBeanNotificationPublisher implements NotificationPublisher {
 	 * Create a new instance of the {@link ModelMBeanNotificationPublisher} class
 	 * that will publish all {@link javax.management.Notification Notifications}
 	 * to the supplied {@link ModelMBean}.
-	 * @param modelMBean the target {@link ModelMBean}; must not be <code>null</code>
+	 * @param modelMBean the target {@link ModelMBean}; must not be {@code null}
 	 * @param objectName the {@link ObjectName} of the source {@link ModelMBean}
 	 * @param managedResource the managed resource exposed by the supplied {@link ModelMBean}
-	 * @throws IllegalArgumentException if any of the parameters is <code>null</code>
+	 * @throws IllegalArgumentException if any of the parameters is {@code null}
 	 */
 	public ModelMBeanNotificationPublisher(
 			ModelMBeanNotificationBroadcaster modelMBean, ObjectName objectName, Object managedResource) {
@@ -82,8 +82,8 @@ public class ModelMBeanNotificationPublisher implements NotificationPublisher {
 	 * Send the supplied {@link Notification} using the wrapped
 	 * {@link ModelMBean} instance.
 	 * @param notification the {@link Notification} to be sent
-	 * @throws IllegalArgumentException if the supplied <code>notification</code> is <code>null</code>
-	 * @throws UnableToSendNotificationException if the supplied <code>notification</code> could not be sent
+	 * @throws IllegalArgumentException if the supplied {@code notification} is {@code null}
+	 * @throws UnableToSendNotificationException if the supplied {@code notification} could not be sent
 	 */
 	public void sendNotification(Notification notification) {
 		Assert.notNull(notification, "Notification must not be null");
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java
index a2fd23186a..64d4dcbfe1 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java
@@ -23,14 +23,14 @@ import javax.management.Notification;
  * without being aware of how those notifications are being transmitted to the
  * {@link javax.management.MBeanServer}.
  *
- * <p>Managed resources can access a <code>NotificationPublisher</code> by
+ * <p>Managed resources can access a {@code NotificationPublisher} by
  * implementing the {@link NotificationPublisherAware} interface. After a particular
  * managed resource instance is registered with the {@link javax.management.MBeanServer},
- * Spring will inject a <code>NotificationPublisher</code> instance into it if that
+ * Spring will inject a {@code NotificationPublisher} instance into it if that
  * resource implements the {@link NotificationPublisherAware} inteface.
  *
  * <p>Each managed resource instance will have a distinct instance of a
- * <code>NotificationPublisher</code> implementation. This instance will keep
+ * {@code NotificationPublisher} implementation. This instance will keep
  * track of all the {@link javax.management.NotificationListener NotificationListeners}
  * registered for a particular mananaged resource.
  *
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 a86f2a7c89..888e7eb1cf 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
@@ -39,17 +39,17 @@ import org.springframework.util.CollectionUtils;
  * {@link FactoryBean} that creates a JSR-160 {@link JMXConnectorServer},
  * optionally registers it with the {@link MBeanServer} and then starts it.
  *
- * <p>The <code>JMXConnectorServer</code> can be started in a separate thread by setting the
- * <code>threaded</code> property to <code>true</code>. You can configure this thread to be a
- * daemon thread by setting the <code>daemon</code> property to <code>true</code>.
+ * <p>The {@code JMXConnectorServer} can be started in a separate thread by setting the
+ * {@code threaded} property to {@code true}. You can configure this thread to be a
+ * daemon thread by setting the {@code daemon} property to {@code true}.
  *
- * <p>The <code>JMXConnectorServer</code> is correctly shutdown when an instance of this
- * class is destroyed on shutdown of the containing <code>ApplicationContext</code>.
+ * <p>The {@code JMXConnectorServer} is correctly shutdown when an instance of this
+ * class is destroyed on shutdown of the containing {@code ApplicationContext}.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
  * @since 1.2
- * @see	FactoryBean
+ * @see    FactoryBean
  * @see JMXConnectorServer
  * @see MBeanServer
  */
@@ -76,23 +76,23 @@ public class ConnectorServerFactoryBean extends MBeanRegistrationSupport
 
 
 	/**
-	 * Set the service URL for the <code>JMXConnectorServer</code>.
+	 * Set the service URL for the {@code JMXConnectorServer}.
 	 */
 	public void setServiceUrl(String serviceUrl) {
 		this.serviceUrl = serviceUrl;
 	}
 
 	/**
-	 * Set the environment properties used to construct the <code>JMXConnectorServer</code>
-	 * as <code>java.util.Properties</code> (String key/value pairs).
+	 * Set the environment properties used to construct the {@code JMXConnectorServer}
+	 * as {@code java.util.Properties} (String key/value pairs).
 	 */
 	public void setEnvironment(Properties environment) {
 		CollectionUtils.mergePropertiesIntoMap(environment, this.environment);
 	}
 
 	/**
-	 * Set the environment properties used to construct the <code>JMXConnector</code>
-	 * as a <code>Map</code> of String keys and arbitrary Object values.
+	 * Set the environment properties used to construct the {@code JMXConnector}
+	 * as a {@code Map} of String keys and arbitrary Object values.
 	 */
 	public void setEnvironmentMap(Map<String, ?> environment) {
 		if (environment != null) {
@@ -101,31 +101,31 @@ public class ConnectorServerFactoryBean extends MBeanRegistrationSupport
 	}
 
 	/**
-	 * Set an MBeanServerForwarder to be applied to the <code>JMXConnectorServer</code>.
+	 * Set an MBeanServerForwarder to be applied to the {@code JMXConnectorServer}.
 	 */
 	public void setForwarder(MBeanServerForwarder forwarder) {
 		this.forwarder = forwarder;
 	}
 
 	/**
-	 * Set the <code>ObjectName</code> used to register the <code>JMXConnectorServer</code>
-	 * itself with the <code>MBeanServer</code>, as <code>ObjectName</code> instance
-	 * or as <code>String</code>.
-	 * @throws MalformedObjectNameException if the <code>ObjectName</code> is malformed
+	 * Set the {@code ObjectName} used to register the {@code JMXConnectorServer}
+	 * itself with the {@code MBeanServer}, as {@code ObjectName} instance
+	 * or as {@code String}.
+	 * @throws MalformedObjectNameException if the {@code ObjectName} is malformed
 	 */
 	public void setObjectName(Object objectName) throws MalformedObjectNameException {
 		this.objectName = ObjectNameManager.getInstance(objectName);
 	}
 
 	/**
-	 * Set whether the <code>JMXConnectorServer</code> should be started in a separate thread.
+	 * Set whether the {@code JMXConnectorServer} should be started in a separate thread.
 	 */
 	public void setThreaded(boolean threaded) {
 		this.threaded = threaded;
 	}
 
 	/**
-	 * Set whether any threads started for the <code>JMXConnectorServer</code> should be
+	 * Set whether any threads started for the {@code JMXConnectorServer} should be
 	 * started as daemon threads.
 	 */
 	public void setDaemon(boolean daemon) {
@@ -134,12 +134,12 @@ public class ConnectorServerFactoryBean extends MBeanRegistrationSupport
 
 
 	/**
-	 * Start the connector server. If the <code>threaded</code> flag is set to <code>true</code>,
-	 * the <code>JMXConnectorServer</code> will be started in a separate thread.
-	 * If the <code>daemon</code> flag is set to <code>true</code>, that thread will be
+	 * Start the connector server. If the {@code threaded} flag is set to {@code true},
+	 * 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
-	 * with the <code>MBeanServer</code>
+	 * with the {@code MBeanServer}
 	 * @throws IOException if there is a problem starting the connector server
 	 */
 	public void afterPropertiesSet() throws JMException, IOException {
@@ -214,8 +214,8 @@ public class ConnectorServerFactoryBean extends MBeanRegistrationSupport
 
 
 	/**
-	 * Stop the <code>JMXConnectorServer</code> managed by an instance of this class.
-	 * Automatically called on <code>ApplicationContext</code> shutdown.
+	 * Stop the {@code JMXConnectorServer} managed by an instance of this class.
+	 * Automatically called on {@code ApplicationContext} shutdown.
 	 * @throws IOException if there is an error stopping the connector server
 	 */
 	public void destroy() throws IOException {
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 dd008404df..9d95040119 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
@@ -74,12 +74,12 @@ public abstract class JmxUtils {
 
 
 	/**
-	 * Attempt to find a locally running <code>MBeanServer</code>. Fails if no
-	 * <code>MBeanServer</code> can be found. Logs a warning if more than one
-	 * <code>MBeanServer</code> found, returning the first one from the list.
-	 * @return the <code>MBeanServer</code> if found
+	 * Attempt to find a locally running {@code MBeanServer}. Fails if no
+	 * {@code MBeanServer} can be found. Logs a warning if more than one
+	 * {@code MBeanServer} found, returning the first one from the list.
+	 * @return the {@code MBeanServer} if found
 	 * @throws org.springframework.jmx.MBeanServerNotFoundException
-	 * if no <code>MBeanServer</code> could be found
+	 * if no {@code MBeanServer} could be found
 	 * @see javax.management.MBeanServerFactory#findMBeanServer
 	 */
 	public static MBeanServer locateMBeanServer() throws MBeanServerNotFoundException {
@@ -87,15 +87,15 @@ public abstract class JmxUtils {
 	}
 
 	/**
-	 * Attempt to find a locally running <code>MBeanServer</code>. Fails if no
-	 * <code>MBeanServer</code> can be found. Logs a warning if more than one
-	 * <code>MBeanServer</code> found, returning the first one from the list.
+	 * Attempt to find a locally running {@code MBeanServer}. Fails if no
+	 * {@code MBeanServer} can be found. Logs a warning if more than one
+	 * {@code MBeanServer} found, returning the first one from the list.
 	 * @param agentId the agent identifier of the MBeanServer to retrieve.
-	 * If this parameter is <code>null</code>, all registered MBeanServers are considered.
+	 * If this parameter is {@code null}, all registered MBeanServers are considered.
 	 * If the empty String is given, the platform MBeanServer will be returned.
-	 * @return the <code>MBeanServer</code> if found
+	 * @return the {@code MBeanServer} if found
 	 * @throws org.springframework.jmx.MBeanServerNotFoundException
-	 * if no <code>MBeanServer</code> could be found
+	 * if no {@code MBeanServer} could be found
 	 * @see javax.management.MBeanServerFactory#findMBeanServer(String)
 	 */
 	public static MBeanServer locateMBeanServer(String agentId) throws MBeanServerNotFoundException {
@@ -139,8 +139,8 @@ public abstract class JmxUtils {
 	}
 
 	/**
-	 * Convert an array of <code>MBeanParameterInfo</code> into an array of
-	 * <code>Class</code> instances corresponding to the parameters.
+	 * Convert an array of {@code MBeanParameterInfo} into an array of
+	 * {@code Class} instances corresponding to the parameters.
 	 * @param paramInfo the JMX parameter info
 	 * @return the parameter types as classes
 	 * @throws ClassNotFoundException if a parameter type could not be resolved
@@ -150,8 +150,8 @@ public abstract class JmxUtils {
 	}
 
 	/**
-	 * Convert an array of <code>MBeanParameterInfo</code> into an array of
-	 * <code>Class</code> instances corresponding to the parameters.
+	 * Convert an array of {@code MBeanParameterInfo} into an array of
+	 * {@code Class} instances corresponding to the parameters.
 	 * @param paramInfo the JMX parameter info
 	 * @param classLoader the ClassLoader to use for loading parameter types
 	 * @return the parameter types as classes
@@ -171,7 +171,7 @@ public abstract class JmxUtils {
 	}
 
 	/**
-	 * Create a <code>String[]</code> representing the argument signature of a
+	 * Create a {@code String[]} representing the argument signature of a
 	 * method. Each element in the array is the fully qualified class name
 	 * of the corresponding argument in the methods signature.
 	 * @param method the method to build an argument signature for
@@ -189,9 +189,9 @@ public abstract class JmxUtils {
 	/**
 	 * Return the JMX attribute name to use for the given JavaBeans property.
 	 * <p>When using strict casing, a JavaBean property with a getter method
-	 * such as <code>getFoo()</code> translates to an attribute called
-	 * <code>Foo</code>. With strict casing disabled, <code>getFoo()</code>
-	 * would translate to just <code>foo</code>.
+	 * such as {@code getFoo()} translates to an attribute called
+	 * {@code Foo}. With strict casing disabled, {@code getFoo()}
+	 * would translate to just {@code foo}.
 	 * @param property the JavaBeans property descriptor
 	 * @param useStrictCasing whether to use strict casing
 	 * @return the JMX attribute name to use
@@ -207,7 +207,7 @@ public abstract class JmxUtils {
 
 	/**
 	 * Append an additional key/value pair to an existing {@link ObjectName} with the key being
-	 * the static value <code>identity</code> and the value being the identity hash code of the
+	 * the static value {@code identity} and the value being the identity hash code of the
 	 * managed resource being exposed on the supplied {@link ObjectName}. This can be used to
 	 * provide a unique {@link ObjectName} for each distinct instance of a particular bean or
 	 * class. Useful when generating {@link ObjectName ObjectNames} at runtime for a set of
@@ -321,7 +321,7 @@ public abstract class JmxUtils {
 	/**
 	 * Check whether MXBean support is available, i.e. whether we're running
 	 * on Java 6 or above.
-	 * @return <code>true</code> if available; <code>false</code> otherwise
+	 * @return {@code true} if available; {@code false} otherwise
 	 */
 	public static boolean isMXBeanSupportAvailable() {
 		return 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 f8ac78b9f1..74b0a3f3c0 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
@@ -100,12 +100,12 @@ public class MBeanRegistrationSupport {
 	private static final Constants constants = new Constants(MBeanRegistrationSupport.class);
 
 	/**
-	 * <code>Log</code> instance for this class.
+	 * {@code Log} instance for this class.
 	 */
 	protected final Log logger = LogFactory.getLog(getClass());
 
 	/**
-	 * The <code>MBeanServer</code> instance being used to register beans.
+	 * The {@code MBeanServer} instance being used to register beans.
 	 */
 	protected MBeanServer server;
 
@@ -122,16 +122,16 @@ public class MBeanRegistrationSupport {
 
 
 	/**
-	 * Specify the <code>MBeanServer</code> instance with which all beans should
-	 * be registered. The <code>MBeanExporter</code> will attempt to locate an
-	 * existing <code>MBeanServer</code> if none is supplied.
+	 * Specify the {@code MBeanServer} instance with which all beans should
+	 * be registered. The {@code MBeanExporter} will attempt to locate an
+	 * existing {@code MBeanServer} if none is supplied.
 	 */
 	public void setServer(MBeanServer server) {
 		this.server = server;
 	}
 
 	/**
-	 * Return the <code>MBeanServer</code> that the beans will be registered with.
+	 * Return the {@code MBeanServer} that the beans will be registered with.
 	 */
 	public final MBeanServer getServer() {
 		return this.server;
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
index 48bcd30a7b..00e0ffba6b 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
@@ -37,9 +37,9 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
 
 /**
- * {@link FactoryBean} that creates a JMX 1.2 <code>MBeanServerConnection</code>
- * to a remote <code>MBeanServer</code> exposed via a <code>JMXServerConnector</code>.
- * Exposes the <code>MBeanServer</code> for bean references.
+ * {@link FactoryBean} that creates a JMX 1.2 {@code MBeanServerConnection}
+ * to a remote {@code MBeanServer} exposed via a {@code JMXServerConnector}.
+ * Exposes the {@code MBeanServer} for bean references.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -68,23 +68,23 @@ public class MBeanServerConnectionFactoryBean
 
 
 	/**
-	 * Set the service URL of the remote <code>MBeanServer</code>.
+	 * Set the service URL of the remote {@code MBeanServer}.
 	 */
 	public void setServiceUrl(String url) throws MalformedURLException {
 		this.serviceUrl = new JMXServiceURL(url);
 	}
 
 	/**
-	 * Set the environment properties used to construct the <code>JMXConnector</code>
-	 * as <code>java.util.Properties</code> (String key/value pairs).
+	 * Set the environment properties used to construct the {@code JMXConnector}
+	 * as {@code java.util.Properties} (String key/value pairs).
 	 */
 	public void setEnvironment(Properties environment) {
 		CollectionUtils.mergePropertiesIntoMap(environment, this.environment);
 	}
 
 	/**
-	 * Set the environment properties used to construct the <code>JMXConnector</code>
-	 * as a <code>Map</code> of String keys and arbitrary Object values.
+	 * Set the environment properties used to construct the {@code JMXConnector}
+	 * as a {@code Map} of String keys and arbitrary Object values.
 	 */
 	public void setEnvironmentMap(Map<String, ?> environment) {
 		if (environment != null) {
@@ -107,8 +107,8 @@ public class MBeanServerConnectionFactoryBean
 
 
 	/**
-	 * Creates a <code>JMXConnector</code> for the given settings
-	 * and exposes the associated <code>MBeanServerConnection</code>.
+	 * Creates a {@code JMXConnector} for the given settings
+	 * and exposes the associated {@code MBeanServerConnection}.
 	 */
 	public void afterPropertiesSet() throws IOException {
 		if (this.serviceUrl == null) {
@@ -124,7 +124,7 @@ public class MBeanServerConnectionFactoryBean
 	}
 
 	/**
-	 * Connects to the remote <code>MBeanServer</code> using the configured service URL and
+	 * Connects to the remote {@code MBeanServer} using the configured service URL and
 	 * environment properties.
 	 */
 	private void connect() throws IOException {
@@ -133,7 +133,7 @@ public class MBeanServerConnectionFactoryBean
 	}
 
 	/**
-	 * Creates lazy proxies for the <code>JMXConnector</code> and <code>MBeanServerConnection</code>
+	 * Creates lazy proxies for the {@code JMXConnector} and {@code MBeanServerConnection}
 	 */
 	private void createLazyConnection() {
 		this.connectorTargetSource = new JMXConnectorLazyInitTargetSource();
@@ -160,7 +160,7 @@ public class MBeanServerConnectionFactoryBean
 
 
 	/**
-	 * Closes the underlying <code>JMXConnector</code>.
+	 * Closes the underlying {@code JMXConnector}.
 	 */
 	public void destroy() throws IOException {
 		if (this.connectorTargetSource == null || this.connectorTargetSource.isInitialized()) {
@@ -170,7 +170,7 @@ public class MBeanServerConnectionFactoryBean
 
 
 	/**
-	 * Lazily creates a <code>JMXConnector</code> using the configured service URL
+	 * Lazily creates a {@code JMXConnector} using the configured service URL
 	 * and environment properties.
 	 * @see MBeanServerConnectionFactoryBean#setServiceUrl(String)
 	 * @see MBeanServerConnectionFactoryBean#setEnvironment(java.util.Properties)
@@ -190,7 +190,7 @@ public class MBeanServerConnectionFactoryBean
 
 
 	/**
-	 * Lazily creates an <code>MBeanServerConnection</code>.
+	 * Lazily creates an {@code MBeanServerConnection}.
 	 */
 	private class MBeanServerConnectionLazyInitTargetSource extends AbstractLazyCreationTargetSource {
 
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java
index 3f4b1c9ab7..304780f693 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java
@@ -31,12 +31,12 @@ import org.springframework.jmx.MBeanServerNotFoundException;
  * {@link FactoryBean} that obtains an {@link javax.management.MBeanServer} reference
  * through the standard JMX 1.2 {@link javax.management.MBeanServerFactory}
  * API (which is available on JDK 1.5 or as part of a JMX 1.2 provider).
- * Exposes the <code>MBeanServer</code> for bean references.
+ * Exposes the {@code MBeanServer} for bean references.
  *
- * <p>By default, <code>MBeanServerFactoryBean</code> will always create
- * a new <code>MBeanServer</code> even if one is already running. To have
- * the <code>MBeanServerFactoryBean</code> attempt to locate a running
- * <code>MBeanServer</code> first, set the value of the
+ * <p>By default, {@code MBeanServerFactoryBean} will always create
+ * a new {@code MBeanServer} even if one is already running. To have
+ * the {@code MBeanServerFactoryBean} attempt to locate a running
+ * {@code MBeanServer} first, set the value of the
  * "locateExistingServerIfPossible" property to "true".
  *
  * @author Rob Harrop
@@ -69,16 +69,16 @@ public class MBeanServerFactoryBean implements FactoryBean<MBeanServer>, Initial
 
 
 	/**
-	 * Set whether or not the <code>MBeanServerFactoryBean</code> should attempt
-	 * to locate a running <code>MBeanServer</code> before creating one.
-	 * <p>Default is <code>false</code>.
+	 * Set whether or not the {@code MBeanServerFactoryBean} should attempt
+	 * to locate a running {@code MBeanServer} before creating one.
+	 * <p>Default is {@code false}.
 	 */
 	public void setLocateExistingServerIfPossible(boolean locateExistingServerIfPossible) {
 		this.locateExistingServerIfPossible = locateExistingServerIfPossible;
 	}
 
 	/**
-	 * Set the agent id of the <code>MBeanServer</code> to locate.
+	 * Set the agent id of the {@code MBeanServer} to locate.
 	 * <p>Default is none. If specified, this will result in an
 	 * automatic attempt being made to locate the attendant MBeanServer,
 	 * and (importantly) if said MBeanServer cannot be located no
@@ -92,9 +92,9 @@ public class MBeanServerFactoryBean implements FactoryBean<MBeanServer>, Initial
 	}
 
 	/**
-	 * Set the default domain to be used by the <code>MBeanServer</code>,
-	 * to be passed to <code>MBeanServerFactory.createMBeanServer()</code>
-	 * or <code>MBeanServerFactory.findMBeanServer()<code>.
+	 * Set the default domain to be used by the {@code MBeanServer},
+	 * to be passed to {@code MBeanServerFactory.createMBeanServer()}
+	 * or {@code MBeanServerFactory.findMBeanServer()}.
 	 * <p>Default is none.
 	 * @see javax.management.MBeanServerFactory#createMBeanServer(String)
 	 * @see javax.management.MBeanServerFactory#findMBeanServer(String)
@@ -104,9 +104,9 @@ public class MBeanServerFactoryBean implements FactoryBean<MBeanServer>, Initial
 	}
 
 	/**
-	 * Set whether to register the <code>MBeanServer</code> with the
-	 * <code>MBeanServerFactory</code>, making it available through
-	 * <code>MBeanServerFactory.findMBeanServer()<code>.
+	 * Set whether to register the {@code MBeanServer} with the
+	 * {@code MBeanServerFactory}, making it available through
+	 * {@code MBeanServerFactory.findMBeanServer()}.
 	 * @see javax.management.MBeanServerFactory#createMBeanServer
 	 * @see javax.management.MBeanServerFactory#findMBeanServer
 	 */
@@ -116,7 +116,7 @@ public class MBeanServerFactoryBean implements FactoryBean<MBeanServer>, Initial
 
 
 	/**
-	 * Creates the <code>MBeanServer</code> instance.
+	 * Creates the {@code MBeanServer} instance.
 	 */
 	public void afterPropertiesSet() throws MBeanServerNotFoundException {
 		// Try to locate existing MBeanServer, if desired.
@@ -142,16 +142,16 @@ public class MBeanServerFactoryBean implements FactoryBean<MBeanServer>, Initial
 	}
 
 	/**
-	 * Attempt to locate an existing <code>MBeanServer</code>.
-	 * Called if <code>locateExistingServerIfPossible</code> is set to <code>true</code>.
-	 * <p>The default implementation attempts to find an <code>MBeanServer</code> using
+	 * Attempt to locate an existing {@code MBeanServer}.
+	 * Called if {@code locateExistingServerIfPossible} is set to {@code true}.
+	 * <p>The default implementation attempts to find an {@code MBeanServer} using
 	 * a standard lookup. Subclasses may override to add additional location logic.
 	 * @param agentId the agent identifier of the MBeanServer to retrieve.
-	 * If this parameter is <code>null</code>, all registered MBeanServers are
+	 * If this parameter is {@code null}, all registered MBeanServers are
 	 * considered.
-	 * @return the <code>MBeanServer</code> if found
+	 * @return the {@code MBeanServer} if found
 	 * @throws org.springframework.jmx.MBeanServerNotFoundException
-	 * if no <code>MBeanServer</code> could be found
+	 * if no {@code MBeanServer} could be found
 	 * @see #setLocateExistingServerIfPossible
 	 * @see JmxUtils#locateMBeanServer(String)
 	 * @see javax.management.MBeanServerFactory#findMBeanServer(String)
@@ -161,11 +161,11 @@ public class MBeanServerFactoryBean implements FactoryBean<MBeanServer>, Initial
 	}
 
 	/**
-	 * Create a new <code>MBeanServer</code> instance and register it with the
-	 * <code>MBeanServerFactory</code>, if desired.
-	 * @param defaultDomain the default domain, or <code>null</code> if none
-	 * @param registerWithFactory whether to register the <code>MBeanServer</code>
-	 * with the <code>MBeanServerFactory</code>
+	 * Create a new {@code MBeanServer} instance and register it with the
+	 * {@code MBeanServerFactory}, if desired.
+	 * @param defaultDomain the default domain, or {@code null} if none
+	 * @param registerWithFactory whether to register the {@code MBeanServer}
+	 * with the {@code MBeanServerFactory}
 	 * @see javax.management.MBeanServerFactory#createMBeanServer
 	 * @see javax.management.MBeanServerFactory#newMBeanServer
 	 */
@@ -193,7 +193,7 @@ public class MBeanServerFactoryBean implements FactoryBean<MBeanServer>, Initial
 
 
 	/**
-	 * Unregisters the <code>MBeanServer</code> instance, if necessary.
+	 * Unregisters the {@code MBeanServer} instance, if necessary.
 	 */
 	public void destroy() {
 		if (this.newlyRegistered) {
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java b/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java
index ee0dd33b5c..bce5672138 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java
@@ -65,7 +65,7 @@ public class NotificationListenerHolder {
 	/**
 	 * Set the {@link javax.management.NotificationFilter} associated
 	 * with the encapsulated {@link #getNotificationFilter() NotificationFilter}.
-	 * <p>May be <code>null</code>.
+	 * <p>May be {@code null}.
 	 */
 	public void setNotificationFilter(NotificationFilter notificationFilter) {
 		this.notificationFilter = notificationFilter;
@@ -74,7 +74,7 @@ public class NotificationListenerHolder {
 	/**
 	 * Return the {@link javax.management.NotificationFilter} associated
 	 * with the encapsulated {@link #getNotificationFilter() NotificationFilter}.
-	 * <p>May be <code>null</code>.
+	 * <p>May be {@code null}.
 	 */
 	public NotificationFilter getNotificationFilter() {
 		return this.notificationFilter;
@@ -84,7 +84,7 @@ public class NotificationListenerHolder {
 	 * Set the (arbitrary) object that will be 'handed back' as-is by an
 	 * {@link javax.management.NotificationBroadcaster} when notifying
 	 * any {@link javax.management.NotificationListener}.
-	 * @param handback the handback object (can be <code>null</code>)
+	 * @param handback the handback object (can be {@code null})
 	 * @see javax.management.NotificationListener#handleNotification(javax.management.Notification, Object)
 	 */
 	public void setHandback(Object handback) {
@@ -95,7 +95,7 @@ public class NotificationListenerHolder {
 	 * Return the (arbitrary) object that will be 'handed back' as-is by an
 	 * {@link javax.management.NotificationBroadcaster} when notifying
 	 * any {@link javax.management.NotificationListener}.
-	 * @return the handback object (may be <code>null</code>)
+	 * @return the handback object (may be {@code null})
 	 * @see javax.management.NotificationListener#handleNotification(javax.management.Notification, Object)
 	 */
 	public Object getHandback() {
@@ -106,7 +106,7 @@ public class NotificationListenerHolder {
 	 * Set the {@link javax.management.ObjectName}-style name of the single MBean
 	 * that the encapsulated {@link #getNotificationFilter() NotificationFilter}
 	 * will be registered with to listen for {@link javax.management.Notification Notifications}.
-	 * Can be specified as <code>ObjectName</code> instance or as <code>String</code>.
+	 * Can be specified as {@code ObjectName} instance or as {@code String}.
 	 * @see #setMappedObjectNames
 	 */
 	public void setMappedObjectName(Object mappedObjectName) {
@@ -117,7 +117,7 @@ public class NotificationListenerHolder {
 	 * Set an array of {@link javax.management.ObjectName}-style names of the MBeans
 	 * that the encapsulated {@link #getNotificationFilter() NotificationFilter}
 	 * will be registered with to listen for {@link javax.management.Notification Notifications}.
-	 * Can be specified as <code>ObjectName</code> instances or as <code>String</code>s.
+	 * Can be specified as {@code ObjectName} instances or as {@code String}s.
 	 * @see #setMappedObjectName
 	 */
 	public void setMappedObjectNames(Object[] mappedObjectNames) {
@@ -129,7 +129,7 @@ public class NotificationListenerHolder {
 	 * Return the list of {@link javax.management.ObjectName} String representations for
 	 * which the encapsulated {@link #getNotificationFilter() NotificationFilter} will
 	 * be registered as a listener for {@link javax.management.Notification Notifications}.
-	 * @throws MalformedObjectNameException if an <code>ObjectName</code> is malformed
+	 * @throws MalformedObjectNameException if an {@code ObjectName} is malformed
 	 */
 	public ObjectName[] getResolvedObjectNames() throws MalformedObjectNameException {
 		if (this.mappedObjectNames == null) {
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java b/spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java
index 16a339f4d0..f6621a1dee 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java
@@ -31,10 +31,10 @@ import javax.management.ObjectName;
 public class ObjectNameManager {
 
 	/**
-	 * Retrieve the <code>ObjectName</code> instance corresponding to the supplied name.
-	 * @param objectName the <code>ObjectName</code> in <code>ObjectName</code> or
-	 * <code>String</code> format
-	 * @return the <code>ObjectName</code> instance
+	 * Retrieve the {@code ObjectName} instance corresponding to the supplied name.
+	 * @param objectName the {@code ObjectName} in {@code ObjectName} or
+	 * {@code String} format
+	 * @return the {@code ObjectName} instance
 	 * @throws MalformedObjectNameException in case of an invalid object name specification
 	 * @see ObjectName#ObjectName(String)
 	 * @see ObjectName#getInstance(String)
@@ -51,9 +51,9 @@ public class ObjectNameManager {
 	}
 
 	/**
-	 * Retrieve the <code>ObjectName</code> instance corresponding to the supplied name.
-	 * @param objectName the <code>ObjectName</code> in <code>String</code> format
-	 * @return the <code>ObjectName</code> instance
+	 * Retrieve the {@code ObjectName} instance corresponding to the supplied name.
+	 * @param objectName the {@code ObjectName} in {@code String} format
+	 * @return the {@code ObjectName} instance
 	 * @throws MalformedObjectNameException in case of an invalid object name specification
 	 * @see ObjectName#ObjectName(String)
 	 * @see ObjectName#getInstance(String)
@@ -63,12 +63,12 @@ public class ObjectNameManager {
 	}
 
 	/**
-	 * Retrieve an <code>ObjectName</code> instance for the specified domain and a
+	 * Retrieve an {@code ObjectName} instance for the specified domain and a
 	 * single property with the supplied key and value.
-	 * @param domainName the domain name for the <code>ObjectName</code>
-	 * @param key the key for the single property in the <code>ObjectName</code>
-	 * @param value the value for the single property in the <code>ObjectName</code>
-	 * @return the <code>ObjectName</code> instance
+	 * @param domainName the domain name for the {@code ObjectName}
+	 * @param key the key for the single property in the {@code ObjectName}
+	 * @param value the value for the single property in the {@code ObjectName}
+	 * @return the {@code ObjectName} instance
 	 * @throws MalformedObjectNameException in case of an invalid object name specification
 	 * @see ObjectName#ObjectName(String, String, String)
 	 * @see ObjectName#getInstance(String, String, String)
@@ -80,11 +80,11 @@ public class ObjectNameManager {
 	}
 
 	/**
-	 * Retrieve an <code>ObjectName</code> instance with the specified domain name
+	 * Retrieve an {@code ObjectName} instance with the specified domain name
 	 * and the supplied key/name properties.
-	 * @param domainName the domain name for the <code>ObjectName</code>
-	 * @param properties the properties for the <code>ObjectName</code>
-	 * @return the <code>ObjectName</code> instance
+	 * @param domainName the domain name for the {@code ObjectName}
+	 * @param properties the properties for the {@code ObjectName}
+	 * @return the {@code ObjectName} instance
 	 * @throws MalformedObjectNameException in case of an invalid object name specification
 	 * @see ObjectName#ObjectName(String, java.util.Hashtable)
 	 * @see ObjectName#getInstance(String, java.util.Hashtable)
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
index 875aebaea8..52a2ab42e4 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
@@ -27,10 +27,10 @@ import org.springframework.jmx.MBeanServerNotFoundException;
 
 /**
  * {@link FactoryBean} that obtains a WebSphere {@link javax.management.MBeanServer}
- * reference through WebSphere's proprietary <code>AdminServiceFactory</code> API,
+ * reference through WebSphere's proprietary {@code AdminServiceFactory} API,
  * available on WebSphere 5.1 and higher.
  *
- * <p>Exposes the <code>MBeanServer</code> for bean references.
+ * <p>Exposes the {@code MBeanServer} for bean references.
  * This FactoryBean is a direct alternative to {@link MBeanServerFactoryBean},
  * which uses standard JMX 1.2 API to access the platform's MBeanServer.
  *
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/package-info.java b/spring-context/src/main/java/org/springframework/jmx/support/package-info.java
index 531f710483..81597bbf42 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/package-info.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/package-info.java
@@ -1,8 +1,7 @@
-
 /**
  *
- * Contains support classes for connecting to local and remote <code>MBeanServer</code>s
- * and for exposing an <code>MBeanServer</code> to remote clients.
+ * Contains support classes for connecting to local and remote {@code MBeanServer}s
+ * and for exposing an {@code MBeanServer} to remote clients.
  *
  */
 package org.springframework.jmx.support;
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java b/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java
index 657741816c..325c4f8170 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java
@@ -41,7 +41,7 @@ public interface JndiCallback<T> {
 	 * or cleanup, as the JndiTemplate class will handle this.
 	 * @param ctx the current JNDI context
 	 * @throws NamingException if thrown by JNDI methods
-	 * @return a result object, or <code>null</code>
+	 * @return a result object, or {@code null}
 	 */
 	T doInContext(Context ctx) throws NamingException;
 
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
index 9b4789a724..0f266c64ea 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
@@ -41,7 +41,7 @@ public class JndiLocatorDelegate extends JndiLocatorSupport {
 
 	/**
 	 * Configure a {@code JndiLocatorDelegate} with its "resourceRef" property set to
-	 * <code>true</code>, meaning that all names will be prefixed with "java:comp/env/".
+	 * {@code true}, meaning that all names will be prefixed with "java:comp/env/".
 	 * @see #setResourceRef
 	 */
 	public static JndiLocatorDelegate createDefaultResourceRefLocator() {
@@ -53,8 +53,8 @@ public class JndiLocatorDelegate extends JndiLocatorSupport {
 	/**
 	 * Check whether a default JNDI environment, as in a J2EE environment,
 	 * is available on this JVM.
-	 * @return <code>true</code> if a default InitialContext can be used,
-	 * <code>false</code> if not
+	 * @return {@code true} if a default InitialContext can be used,
+	 * {@code false} if not
 	 */
 	public static boolean isDefaultJndiEnvironmentAvailable() {
 		try {
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
index 86d44b56d0..a2d6b6a04c 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
@@ -22,7 +22,7 @@ import org.springframework.aop.TargetSource;
 
 /**
  * AOP {@link org.springframework.aop.TargetSource} that provides
- * configurable JNDI lookups for <code>getTarget()</code> calls.
+ * configurable JNDI lookups for {@code getTarget()} calls.
  *
  * <p>Can be used as alternative to {@link JndiObjectFactoryBean}, to allow for
  * relocating a JNDI object lazily or for each operation (see "lookupOnStartup"
@@ -42,9 +42,9 @@ import org.springframework.aop.TargetSource;
  *   &lt;property name="targetSource" ref="queueConnectionFactoryTarget"/&gt;
  * &lt;/bean&gt;</pre>
  *
- * A <code>createQueueConnection</code> call on the "queueConnectionFactory" proxy will
+ * A {@code createQueueConnection} call on the "queueConnectionFactory" proxy will
  * cause a lazy JNDI lookup for "JmsQueueConnectionFactory" and a subsequent delegating
- * call to the retrieved QueueConnectionFactory's <code>createQueueConnection</code>.
+ * call to the retrieved QueueConnectionFactory's {@code createQueueConnection}.
  *
  * <p><b>Alternatively, use a {@link JndiObjectFactoryBean} with a "proxyInterface".</b>
  * "lookupOnStartup" and "cache" can then be specified on the JndiObjectFactoryBean,
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java b/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
index c3e1f65a9c..168edb1bc6 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
@@ -77,7 +77,7 @@ public class JndiTemplate {
 	/**
 	 * Execute the given JNDI context callback implementation.
 	 * @param contextCallback JndiCallback implementation
-	 * @return a result object returned by the callback, or <code>null</code>
+	 * @return a result object returned by the callback, or {@code null}
 	 * @throws NamingException thrown by the callback implementation
 	 * @see #createInitialContext
 	 */
@@ -95,7 +95,7 @@ public class JndiTemplate {
 	 * Obtain a JNDI context corresponding to this template's configuration.
 	 * Called by {@link #execute}; may also be called directly.
 	 * <p>The default implementation delegates to {@link #createInitialContext()}.
-	 * @return the JNDI context (never <code>null</code>)
+	 * @return the JNDI context (never {@code null})
 	 * @throws NamingException if context retrieval failed
 	 * @see #releaseContext
 	 */
@@ -105,7 +105,7 @@ public class JndiTemplate {
 
 	/**
 	 * Release a JNDI context as obtained from {@link #getContext()}.
-	 * @param ctx the JNDI context to release (may be <code>null</code>)
+	 * @param ctx the JNDI context to release (may be {@code null})
 	 * @see #getContext
 	 */
 	public void releaseContext(Context ctx) {
@@ -140,7 +140,7 @@ public class JndiTemplate {
 	/**
 	 * Look up the object with the given name in the current JNDI context.
 	 * @param name the JNDI name of the object
-	 * @return object found (cannot be <code>null</code>; if a not so well-behaved
+	 * @return object found (cannot be {@code null}; if a not so well-behaved
 	 * JNDI implementations returns null, a NamingException gets thrown)
 	 * @throws NamingException if there is no object with the given
 	 * name bound to JNDI
@@ -165,10 +165,10 @@ public class JndiTemplate {
 	 * Look up the object with the given name in the current JNDI context.
 	 * @param name the JNDI name of the object
 	 * @param requiredType type the JNDI object must match. Can be an interface or
-	 * superclass of the actual class, or <code>null</code> for any match. For example,
-	 * if the value is <code>Object.class</code>, this method will succeed whatever
+	 * superclass of the actual class, or {@code null} for any match. For example,
+	 * if the value is {@code Object.class}, this method will succeed whatever
 	 * the class of the returned instance.
-	 * @return object found (cannot be <code>null</code>; if a not so well-behaved
+	 * @return object found (cannot be {@code null}; if a not so well-behaved
 	 * JNDI implementations returns null, a NamingException gets thrown)
 	 * @throws NamingException if there is no object with the given
 	 * name bound to JNDI
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 ae62286051..a123d72cb6 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
@@ -47,7 +47,7 @@ import org.springframework.jndi.TypeMismatchNamingException;
  *
  * <p>The main intent of this factory is usage in combination with Spring's
  * {@link org.springframework.context.annotation.CommonAnnotationBeanPostProcessor},
- * configured as "resourceFactory" for resolving <code>@Resource</code>
+ * configured as "resourceFactory" for resolving {@code @Resource}
  * annotations as JNDI objects without intermediate bean definitions.
  * It may be used for similar lookup scenarios as well, of course,
  * in particular if BeanFactory-style type checking is required.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java b/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java
index c43095b0cb..8e0401d6fb 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java
@@ -70,7 +70,7 @@ public class CodebaseAwareObjectInputStream extends ConfigurableObjectInputStrea
 	 * Create a new CodebaseAwareObjectInputStream for the given InputStream and codebase.
 	 * @param in the InputStream to read from
 	 * @param classLoader the ClassLoader to use for loading local classes
-	 * (may be <code>null</code> to indicate RMI's default ClassLoader)
+	 * (may be {@code null} to indicate RMI's default ClassLoader)
 	 * @param codebaseUrl the codebase URL to load classes from if not found locally
 	 * (can consist of multiple URLs, separated by spaces)
 	 * @see java.io.ObjectInputStream#ObjectInputStream(java.io.InputStream)
@@ -86,7 +86,7 @@ public class CodebaseAwareObjectInputStream extends ConfigurableObjectInputStrea
 	 * Create a new CodebaseAwareObjectInputStream for the given InputStream and codebase.
 	 * @param in the InputStream to read from
 	 * @param classLoader the ClassLoader to use for loading local classes
-	 * (may be <code>null</code> to indicate RMI's default ClassLoader)
+	 * (may be {@code null} to indicate RMI's default ClassLoader)
 	 * @param acceptProxyClasses whether to accept deserialization of proxy classes
 	 * (may be deactivated as a security measure)
 	 * @see java.io.ObjectInputStream#ObjectInputStream(java.io.InputStream)
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
index eb07d65c20..55461ba33e 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
@@ -54,7 +54,7 @@ import org.springframework.util.ReflectionUtils;
  * Spring's unchecked RemoteAccessException.
  *
  * <p>The JNDI environment can be specified as "jndiEnvironment" property,
- * or be configured in a <code>jndi.properties</code> file or as system properties.
+ * or be configured in a {@code jndi.properties} file or as system properties.
  * For example:
  *
  * <pre class="code">&lt;property name="jndiEnvironment"&gt;
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
index fb8ced6226..78b9f36a21 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
@@ -38,7 +38,7 @@ import org.springframework.util.ClassUtils;
  * Spring's unchecked RemoteAccessException.
  *
  * <p>The JNDI environment can be specified as "jndiEnvironment" property,
- * or be configured in a <code>jndi.properties</code> file or as system properties.
+ * or be configured in a {@code jndi.properties} file or as system properties.
  * For example:
  *
  * <pre class="code">&lt;property name="jndiEnvironment"&gt;
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
index d5e9c38fc7..fb2bab26a5 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
@@ -42,11 +42,11 @@ import org.springframework.jndi.JndiTemplate;
  *
  * <p>With an RMI invoker, RMI communication works on the {@link RmiInvocationHandler}
  * level, needing only one stub for any service. Service interfaces do not have to
- * extend <code>java.rmi.Remote</code> or throw <code>java.rmi.RemoteException</code>
+ * extend {@code java.rmi.Remote} or throw {@code java.rmi.RemoteException}
  * on all methods, but in and out parameters have to be serializable.
  *
  * <p>The JNDI environment can be specified as "jndiEnvironment" bean property,
- * or be configured in a <code>jndi.properties</code> file or as system properties.
+ * or be configured in a {@code jndi.properties} file or as system properties.
  * For example:
  *
  * <pre class="code">&lt;property name="jndiEnvironment"&gt;
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
index d9b338e759..3a8c2c5ceb 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
@@ -36,8 +36,8 @@ import org.springframework.util.ClassUtils;
  * {@link org.springframework.remoting.support.RemoteInvocationResult} objects,
  * for example Spring's HTTP invoker.
  *
- * <p>Provides template methods for <code>ObjectInputStream</code> and
- * <code>ObjectOutputStream</code> handling.
+ * <p>Provides template methods for {@code ObjectInputStream} and
+ * {@code ObjectOutputStream} handling.
  *
  * @author Juergen Hoeller
  * @since 2.5.1
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java
index e16f174bfc..265d2f7034 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java
@@ -29,7 +29,7 @@ import org.springframework.remoting.support.RemoteInvocationBasedExporter;
  *
  * <p>Using the RMI invoker mechanism, RMI communication operates at the {@link RmiInvocationHandler}
  * level, sharing a common invoker stub for any number of services. Service interfaces are <i>not</i>
- * required to extend <code>java.rmi.Remote</code> or declare <code>java.rmi.RemoteException</code>
+ * required to extend {@code java.rmi.Remote} or declare {@code java.rmi.RemoteException}
  * on all service methods. However, in and out parameters still have to be serializable.
  *
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
index 0ef03a4ef2..177b1982e9 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
@@ -46,8 +46,8 @@ import org.springframework.remoting.support.RemoteInvocationUtils;
  * (e.g. "rmi://localhost:1099/myservice").
  *
  * <p>RMI invokers work at the RmiInvocationHandler level, needing only one stub for
- * any service. Service interfaces do not have to extend <code>java.rmi.Remote</code>
- * or throw <code>java.rmi.RemoteException</code>. Spring's unchecked
+ * any service. Service interfaces do not have to extend {@code java.rmi.Remote}
+ * or throw {@code java.rmi.RemoteException}. Spring's unchecked
  * RemoteAccessException will be thrown on remote invocation failure.
  * Of course, in and out parameters have to be serializable.
  *
@@ -167,7 +167,7 @@ public class RmiClientInterceptor extends RemoteInvocationBasedAccessor
 	 * <p>Called on interceptor initialization if "cacheStub" is "true";
 	 * else called for each invocation by {@link #getStub()}.
 	 * <p>The default implementation looks up the service URL via
-	 * <code>java.rmi.Naming</code>. This can be overridden in subclasses.
+	 * {@code java.rmi.Naming}. This can be overridden in subclasses.
 	 * @return the RMI stub to store in this interceptor
 	 * @throws RemoteLookupFailureException if RMI stub creation failed
 	 * @see #setCacheStub
@@ -243,7 +243,7 @@ public class RmiClientInterceptor extends RemoteInvocationBasedAccessor
 
 
 	/**
-	 * Fetches an RMI stub and delegates to <code>doInvoke</code>.
+	 * Fetches an RMI stub and delegates to {@code doInvoke}.
 	 * If configured to refresh on connect failure, it will call
 	 * {@link #refreshAndRetry} on corresponding RMI exceptions.
 	 * @see #getStub
@@ -401,7 +401,7 @@ public class RmiClientInterceptor extends RemoteInvocationBasedAccessor
 
 	/**
 	 * Dummy URLStreamHandler that's just specified to suppress the standard
-	 * <code>java.net.URL</code> URLStreamHandler lookup, to be able to
+	 * {@code java.net.URL} URLStreamHandler lookup, to be able to
 	 * use the standard URL class for parsing "rmi:..." URLs.
 	 */
 	private static class DummyURLStreamHandler extends URLStreamHandler {
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
index 79407ccdc9..30c18ec60b 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
@@ -62,7 +62,7 @@ public abstract class RmiClientInterceptorUtils {
 	 * implement the invoked method. This typically happens when a non-RMI service
 	 * interface is used for an RMI service. The methods of such a service interface
 	 * have to match the RMI stub methods, but they typically don't declare
-	 * <code>java.rmi.RemoteException</code>: A RemoteException thrown by the RMI stub
+	 * {@code java.rmi.RemoteException}: A RemoteException thrown by the RMI stub
 	 * will be automatically converted to Spring's RemoteAccessException.
 	 * @deprecated as of Spring 2.5, in favor of {@link #invokeRemoteMethod}
 	 */
@@ -199,7 +199,7 @@ public abstract class RmiClientInterceptorUtils {
 	 * Determine whether the given RMI exception indicates a connect failure.
 	 * <p>Treats RMI's ConnectException, ConnectIOException, UnknownHostException,
 	 * NoSuchObjectException and StubNotFoundException as connect failure,
-	 * as well as Oracle's OC4J <code>com.evermind.server.rmi.RMIConnectionException</code>
+	 * as well as Oracle's OC4J {@code com.evermind.server.rmi.RMIConnectionException}
 	 * (which doesn't derive from from any well-known RMI connect exception).
 	 * @param ex the RMI exception to check
 	 * @return whether the exception should be treated as connect failure
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
index e16b8158ca..d878cb33ba 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
@@ -36,7 +36,7 @@ public interface RmiInvocationHandler extends Remote {
 
 	/**
 	 * Return the name of the target interface that this invoker operates on.
-	 * @return the name of the target interface, or <code>null</code> if none
+	 * @return the name of the target interface, or {@code null} if none
 	 * @throws RemoteException in case of communication errors
 	 * @see RmiServiceExporter#getServiceInterface()
 	 */
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
index 89f253e038..ff2687a751 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
@@ -28,8 +28,8 @@ import org.springframework.beans.factory.FactoryBean;
  *
  * <p>The service URL must be a valid RMI URL like "rmi://localhost:1099/myservice".
  * RMI invokers work at the RmiInvocationHandler level, using the same invoker stub
- * for any service. Service interfaces do not have to extend <code>java.rmi.Remote</code>
- * or throw <code>java.rmi.RemoteException</code>. Of course, in and out parameters
+ * for any service. Service interfaces do not have to extend {@code java.rmi.Remote}
+ * or throw {@code java.rmi.RemoteException}. Of course, in and out parameters
  * have to be serializable.
  *
  * <p>With conventional RMI services, this proxy factory is typically used with the
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
index 1d400adffb..275c8b532b 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
@@ -81,7 +81,7 @@ public class RmiRegistryFactoryBean implements FactoryBean<Registry>, Initializi
 
 	/**
 	 * Set the host of the registry for the exported RMI service,
-	 * i.e. <code>rmi://HOST:port/name</code>
+	 * i.e. {@code rmi://HOST:port/name}
 	 * <p>Default is localhost.
 	 */
 	public void setHost(String host) {
@@ -97,8 +97,8 @@ public class RmiRegistryFactoryBean implements FactoryBean<Registry>, Initializi
 
 	/**
 	 * Set the port of the registry for the exported RMI service,
-	 * i.e. <code>rmi://host:PORT/name</code>
-	 * <p>Default is <code>Registry.REGISTRY_PORT</code> (1099).
+	 * i.e. {@code rmi://host:PORT/name}
+	 * <p>Default is {@code Registry.REGISTRY_PORT} (1099).
 	 */
 	public void setPort(int port) {
 		this.port = port;
@@ -113,7 +113,7 @@ public class RmiRegistryFactoryBean implements FactoryBean<Registry>, Initializi
 
 	/**
 	 * Set a custom RMI client socket factory to use for the RMI registry.
-	 * <p>If the given object also implements <code>java.rmi.server.RMIServerSocketFactory</code>,
+	 * <p>If the given object also implements {@code java.rmi.server.RMIServerSocketFactory},
 	 * it will automatically be registered as server socket factory too.
 	 * @see #setServerSocketFactory
 	 * @see java.rmi.server.RMIClientSocketFactory
@@ -127,7 +127,7 @@ public class RmiRegistryFactoryBean implements FactoryBean<Registry>, Initializi
 	/**
 	 * Set a custom RMI server socket factory to use for the RMI registry.
 	 * <p>Only needs to be specified when the client socket factory does not
-	 * implement <code>java.rmi.server.RMIServerSocketFactory</code> already.
+	 * implement {@code java.rmi.server.RMIServerSocketFactory} already.
 	 * @see #setClientSocketFactory
 	 * @see java.rmi.server.RMIClientSocketFactory
 	 * @see java.rmi.server.RMIServerSocketFactory
@@ -272,7 +272,7 @@ public class RmiRegistryFactoryBean implements FactoryBean<Registry>, Initializi
 	/**
 	 * Test the given RMI registry, calling some operation on it to
 	 * check whether it is still active.
-	 * <p>Default implementation calls <code>Registry.list()</code>.
+	 * <p>Default implementation calls {@code Registry.list()}.
 	 * @param registry the RMI registry to test
 	 * @throws RemoteException if thrown by registry methods
 	 * @see java.rmi.registry.Registry#list()
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
index 299f577a5e..6f01f80e33 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
@@ -39,7 +39,7 @@ import org.springframework.beans.factory.InitializingBean;
  *
  * <p>With an RMI invoker, RMI communication works on the {@link RmiInvocationHandler}
  * level, needing only one stub for any service. Service interfaces do not have to
- * extend <code>java.rmi.Remote</code> or throw <code>java.rmi.RemoteException</code>
+ * extend {@code java.rmi.Remote} or throw {@code java.rmi.RemoteException}
  * on all methods, but in and out parameters have to be serializable.
  *
  * <p>The major advantage of RMI, compared to Hessian and Burlap, is serialization.
@@ -52,9 +52,9 @@ import org.springframework.beans.factory.InitializingBean;
  * If one cannot be determined, it will fall back and use the IP address. Depending
  * on your network configuration, in some cases it will resolve the IP to the loopback
  * address. To ensure that RMI will use the host name bound to the correct network
- * interface, you should pass the <code>java.rmi.server.hostname</code> property to the
+ * interface, you should pass the {@code java.rmi.server.hostname} property to the
  * JVM that will export the registry and/or the service using the "-D" JVM argument.
- * For example: <code>-Djava.rmi.server.hostname=myserver.com</code>
+ * For example: {@code -Djava.rmi.server.hostname=myserver.com}
  *
  * @author Juergen Hoeller
  * @since 13.05.2003
@@ -97,7 +97,7 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
 
 	/**
 	 * Set the name of the exported RMI service,
-	 * i.e. <code>rmi://host:port/NAME</code>
+	 * i.e. {@code rmi://host:port/NAME}
 	 */
 	public void setServiceName(String serviceName) {
 		this.serviceName = serviceName;
@@ -113,7 +113,7 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
 
 	/**
 	 * Set a custom RMI client socket factory to use for exporting the service.
-	 * <p>If the given object also implements <code>java.rmi.server.RMIServerSocketFactory</code>,
+	 * <p>If the given object also implements {@code java.rmi.server.RMIServerSocketFactory},
 	 * it will automatically be registered as server socket factory too.
 	 * @see #setServerSocketFactory
 	 * @see java.rmi.server.RMIClientSocketFactory
@@ -127,7 +127,7 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
 	/**
 	 * Set a custom RMI server socket factory to use for exporting the service.
 	 * <p>Only needs to be specified when the client socket factory does not
-	 * implement <code>java.rmi.server.RMIServerSocketFactory</code> already.
+	 * implement {@code java.rmi.server.RMIServerSocketFactory} already.
 	 * @see #setClientSocketFactory
 	 * @see java.rmi.server.RMIClientSocketFactory
 	 * @see java.rmi.server.RMIServerSocketFactory
@@ -157,7 +157,7 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
 
 	/**
 	 * Set the host of the registry for the exported RMI service,
-	 * i.e. <code>rmi://HOST:port/name</code>
+	 * i.e. {@code rmi://HOST:port/name}
 	 * <p>Default is localhost.
 	 */
 	public void setRegistryHost(String registryHost) {
@@ -166,8 +166,8 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
 
 	/**
 	 * Set the port of the registry for the exported RMI service,
-	 * i.e. <code>rmi://host:PORT/name</code>
-	 * <p>Default is <code>Registry.REGISTRY_PORT</code> (1099).
+	 * i.e. {@code rmi://host:PORT/name}
+	 * <p>Default is {@code Registry.REGISTRY_PORT} (1099).
 	 * @see java.rmi.registry.Registry#REGISTRY_PORT
 	 */
 	public void setRegistryPort(int registryPort) {
@@ -176,7 +176,7 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
 
 	/**
 	 * Set a custom RMI client socket factory to use for the RMI registry.
-	 * <p>If the given object also implements <code>java.rmi.server.RMIServerSocketFactory</code>,
+	 * <p>If the given object also implements {@code java.rmi.server.RMIServerSocketFactory},
 	 * it will automatically be registered as server socket factory too.
 	 * @see #setRegistryServerSocketFactory
 	 * @see java.rmi.server.RMIClientSocketFactory
@@ -190,7 +190,7 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
 	/**
 	 * Set a custom RMI server socket factory to use for the RMI registry.
 	 * <p>Only needs to be specified when the client socket factory does not
-	 * implement <code>java.rmi.server.RMIServerSocketFactory</code> already.
+	 * implement {@code java.rmi.server.RMIServerSocketFactory} already.
 	 * @see #setRegistryClientSocketFactory
 	 * @see java.rmi.server.RMIClientSocketFactory
 	 * @see java.rmi.server.RMIServerSocketFactory
@@ -411,7 +411,7 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
 	/**
 	 * Test the given RMI registry, calling some operation on it to
 	 * check whether it is still active.
-	 * <p>Default implementation calls <code>Registry.list()</code>.
+	 * <p>Default implementation calls {@code Registry.list()}.
 	 * @param registry the RMI registry to test
 	 * @throws RemoteException if thrown by registry methods
 	 * @see java.rmi.registry.Registry#list()
diff --git a/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java b/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
index 5785c6a1ee..2a6da0b4fc 100644
--- a/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
+++ b/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
@@ -47,7 +47,7 @@ public abstract class SoapFaultException extends RemoteInvocationFailureExceptio
 	public abstract String getFaultCode();
 
 	/**
-	 * Return the SOAP fault code as a <code>QName</code> object.
+	 * Return the SOAP fault code as a {@code QName} object.
 	 */
 	public abstract QName getFaultCodeAsQName();
 
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java
index b69f61cf1d..6956ee370a 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java
@@ -27,7 +27,7 @@ package org.springframework.remoting.support;
  * <p>Accessors are supposed to throw Spring's generic
  * {@link org.springframework.remoting.RemoteAccessException} in case
  * of remote invocation failure, provided that the service interface
- * does not declare <code>java.rmi.RemoteException</code>.
+ * does not declare {@code java.rmi.RemoteException}.
  *
  * @author Juergen Hoeller
  * @since 13.05.2003
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java
index 79c7bda8c3..b68a6cfd22 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java
@@ -78,7 +78,7 @@ public abstract class RemoteExporter extends RemotingSupport {
 
 	/**
 	 * Set whether to register a RemoteInvocationTraceInterceptor for exported
-	 * services. Only applied when a subclass uses <code>getProxyForService</code>
+	 * services. Only applied when a subclass uses {@code getProxyForService}
 	 * for creating the proxy to expose.
 	 * <p>Default is "true". RemoteInvocationTraceInterceptor's most important value
 	 * is that it logs exception stacktraces on the server, before propagating an
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java
index 491cddbcd5..dc83e38c41 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java
@@ -156,7 +156,7 @@ public class RemoteInvocation implements Serializable {
 	 * <p>The implementation avoids to unnecessarily create the attributes
 	 * Map, to minimize serialization size.
 	 * @param key the attribute key
-	 * @return the attribute value, or <code>null</code> if not defined
+	 * @return the attribute value, or {@code null} if not defined
 	 */
 	public Serializable getAttribute(String key) {
 		if (this.attributes == null) {
@@ -179,7 +179,7 @@ public class RemoteInvocation implements Serializable {
 	/**
 	 * Return the attributes Map. Mainly here for debugging purposes:
 	 * Preferably, use {@link #addAttribute} and {@link #getAttribute}.
-	 * @return the attributes Map, or <code>null</code> if none created
+	 * @return the attributes Map, or {@code null} if none created
 	 * @see #addAttribute
 	 * @see #getAttribute
 	 */
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java
index 4e19191226..8bf4bfe4c5 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java
@@ -73,7 +73,7 @@ public abstract class RemoteInvocationBasedAccessor extends UrlBasedRemoteAccess
 
 	/**
 	 * Recreate the invocation result contained in the given RemoteInvocationResult object.
-	 * <p>The default implementation calls the default <code>recreate()</code> method.
+	 * <p>The default implementation calls the default {@code recreate()} method.
 	 * This can be overridden in subclass to provide custom recreation, potentially
 	 * processing the returned result object.
 	 * @param result the RemoteInvocationResult to recreate
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java
index 5df1f53c25..e6c7a27e78 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java
@@ -80,8 +80,8 @@ public class RemoteInvocationResult implements Serializable {
 
 	/**
 	 * Return whether this invocation result holds an exception.
-	 * If this returns <code>false</code>, the result value applies
-	 * (even if <code>null</code>).
+	 * If this returns {@code false}, the result value applies
+	 * (even if {@code null}).
 	 * @see #getValue
 	 * @see #getException
 	 */
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
index 67a0d3ade5..9649c2f99c 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
@@ -36,11 +36,11 @@ public abstract class RemoteInvocationUtils {
 	 * <p>The given exception is typically thrown on the server and serialized
 	 * as-is, with the client wanting it to contain the client-side portion
 	 * of the stack trace as well. What we can do here is to update the
-	 * <code>StackTraceElement</code> array with the current client-side stack
+	 * {@code StackTraceElement} array with the current client-side stack
 	 * trace, provided that we run on JDK 1.4+.
 	 * @param ex the exception to update
-	 * @see java.lang.Throwable#getStackTrace()
-	 * @see java.lang.Throwable#setStackTrace(StackTraceElement[])
+	 * @see Throwable#getStackTrace()
+	 * @see Throwable#setStackTrace(StackTraceElement[])
 	 */
 	public static void fillInClientStackTraceIfPossible(Throwable ex) {
 		if (ex != null) {
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java b/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
index 3d727eb437..fb95016a49 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
@@ -54,7 +54,7 @@ public abstract class RemotingSupport implements BeanClassLoaderAware {
 	 * Override the thread context ClassLoader with the environment's bean ClassLoader
 	 * if necessary, i.e. if the bean ClassLoader is not equivalent to the thread
 	 * context ClassLoader already.
-	 * @return the original thread context ClassLoader, or <code>null</code> if not overridden
+	 * @return the original thread context ClassLoader, or {@code null} if not overridden
 	 */
 	protected ClassLoader overrideThreadContextClassLoader() {
 		return ClassUtils.overrideThreadContextClassLoader(getBeanClassLoader());
@@ -63,7 +63,7 @@ public abstract class RemotingSupport implements BeanClassLoaderAware {
 	/**
 	 * Reset the original thread context ClassLoader if necessary.
 	 * @param original the original thread context ClassLoader,
-	 * or <code>null</code> if not overridden (and hence nothing to reset)
+	 * or {@code null} if not overridden (and hence nothing to reset)
 	 */
 	protected void resetThreadContextClassLoader(ClassLoader original) {
 		if (original != null) {
diff --git a/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java
index c5db5d903f..9efdba4fc2 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java
@@ -38,7 +38,7 @@ public interface SchedulingAwareRunnable extends Runnable {
 
 	/**
 	 * Return whether the Runnable's operation is long-lived
-	 * (<code>true</code>) versus short-lived (<code>false</code>).
+	 * ({@code true}) versus short-lived ({@code false}).
 	 * <p>In the former case, the task will not allocate a thread from the thread
 	 * pool (if any) but rather be considered as long-running background thread.
 	 * <p>This should be considered a hint. Of course TaskExecutor implementations
diff --git a/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java
index 8dc53e1a69..b567413985 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java
@@ -24,7 +24,7 @@ import org.springframework.core.task.AsyncTaskExecutor;
  *
  * <p>Scheduling clients are encouraged to submit
  * {@link Runnable Runnables} that match the exposed preferences
- * of the <code>TaskExecutor</code> implementation in use.
+ * of the {@code TaskExecutor} implementation in use.
  *
  * @author Juergen Hoeller
  * @since 2.0
@@ -35,19 +35,19 @@ import org.springframework.core.task.AsyncTaskExecutor;
 public interface SchedulingTaskExecutor extends AsyncTaskExecutor {
 
 	/**
-	 * Does this <code>TaskExecutor</code> prefer short-lived tasks over
+	 * Does this {@code TaskExecutor} prefer short-lived tasks over
 	 * long-lived tasks?
-	 * <p>A <code>SchedulingTaskExecutor</code> implementation can indicate
+	 * <p>A {@code SchedulingTaskExecutor} implementation can indicate
 	 * whether it prefers submitted tasks to perform as little work as they
 	 * can within a single task execution. For example, submitted tasks
 	 * might break a repeated loop into individual subtasks which submit a
 	 * follow-up task afterwards (if feasible).
-	 * <p>This should be considered a hint. Of course <code>TaskExecutor</code>
+	 * <p>This should be considered a hint. Of course {@code TaskExecutor}
 	 * clients are free to ignore this flag and hence the
-	 * <code>SchedulingTaskExecutor</code> interface overall. However, thread
+	 * {@code SchedulingTaskExecutor} interface overall. However, thread
 	 * pools will usually indicated a preference for short-lived tasks, to be
 	 * able to perform more fine-grained scheduling.
-	 * @return <code>true</code> if this <code>TaskExecutor</code> prefers
+	 * @return {@code true} if this {@code TaskExecutor} prefers
 	 * short-lived tasks
 	 */
 	boolean prefersShortLivedTasks();
diff --git a/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
index 6546c2160e..b18e7baa58 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
@@ -34,7 +34,7 @@ import java.util.concurrent.ScheduledFuture;
  * and adding extended trigger capabilities.
  *
  * <p>This interface is roughly equivalent to a JSR-236
- * <code>ManagedScheduledExecutorService</code> as supported in Java EE 6
+ * {@code ManagedScheduledExecutorService} as supported in Java EE 6
  * environments. However, at the time of the Spring 3.0 release, the
  * JSR-236 interfaces have not been released in official form yet.
  *
@@ -56,8 +56,8 @@ public interface TaskScheduler {
 	 * e.g. a {@link org.springframework.scheduling.support.CronTrigger} object
 	 * wrapping a cron expression
 	 * @return a {@link ScheduledFuture} representing pending completion of the task,
-	 * or <code>null</code> if the given Trigger object never fires (i.e. returns
-	 * <code>null</code> from {@link Trigger#nextExecutionTime})
+	 * or {@code null} if the given Trigger object never fires (i.e. returns
+	 * {@code null} from {@link Trigger#nextExecutionTime})
 	 * @throws org.springframework.core.task.TaskRejectedException if the given task was not accepted
 	 * for internal reasons (e.g. a pool overload handling policy or a pool shutdown in progress)
 	 * @see org.springframework.scheduling.support.CronTrigger
diff --git a/spring-context/src/main/java/org/springframework/scheduling/Trigger.java b/spring-context/src/main/java/org/springframework/scheduling/Trigger.java
index 1f17217ee9..06f569011a 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/Trigger.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/Trigger.java
@@ -34,7 +34,7 @@ public interface Trigger {
 	 * @param triggerContext context object encapsulating last execution times
 	 * and last completion time
 	 * @return the next execution time as defined by the trigger,
-	 * or <code>null</code> if the trigger won't fire anymore
+	 * or {@code null} if the trigger won't fire anymore
 	 */
 	Date nextExecutionTime(TriggerContext triggerContext);
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java b/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java
index bd483a48e4..5ba5980b1b 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java
@@ -29,19 +29,19 @@ public interface TriggerContext {
 
 	/**
 	 * Return the last <i>scheduled</i> execution time of the task,
-	 * or <code>null</code> if not scheduled before.
+	 * or {@code null} if not scheduled before.
 	 */
 	Date lastScheduledExecutionTime();
 
 	/**
 	 * Return the last <i>actual</i> execution time of the task,
-	 * or <code>null</code> if not scheduled before.
+	 * or {@code null} if not scheduled before.
 	 */
 	Date lastActualExecutionTime();
 
 	/**
 	 * Return the last completion time of the task,
-	 * or <code>null</code> if not scheduled before.
+	 * or {@code null} if not scheduled before.
 	 */
 	Date lastCompletionTime();
 
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 571ac6a30e..873740c21c 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
@@ -39,8 +39,8 @@ import org.springframework.util.Assert;
  * annotation. This annotation can be used at the method and type level in
  * implementation classes as well as in service interfaces.
  *
- * <p>This advisor detects the EJB 3.1 <code>javax.ejb.Asynchronous</code>
- * annotation as well, treating it exactly like Spring's own <code>Async</code>.
+ * <p>This advisor detects the EJB 3.1 {@code javax.ejb.Asynchronous}
+ * annotation as well, treating it exactly like Spring's own {@code Async}.
  * Furthermore, a custom async annotation type may get specified through the
  * {@link #setAsyncAnnotationType "asyncAnnotationType"} property.
  *
@@ -113,7 +113,7 @@ public class AsyncAnnotationAdvisor extends AbstractPointcutAdvisor implements B
 	/**
 	 * Set the 'async' annotation type.
 	 * <p>The default async annotation type is the {@link Async} annotation, as well
-	 * as the EJB 3.1 <code>javax.ejb.Asynchronous</code> annotation (if present).
+	 * as the EJB 3.1 {@code javax.ejb.Asynchronous} annotation (if present).
 	 * <p>This setter property exists so that developers can provide their own
 	 * (non-Spring-specific) annotation type to indicate that a method is to
 	 * be executed asynchronously.
@@ -143,7 +143,7 @@ public class AsyncAnnotationAdvisor extends AbstractPointcutAdvisor implements B
 	/**
 	 * Calculate a pointcut for the given async annotation types, if any.
 	 * @param asyncAnnotationTypes the async annotation types to introspect
-	 * @return the applicable Pointcut object, or <code>null</code> if none
+	 * @return the applicable Pointcut object, or {@code null} if none
 	 */
 	protected Pointcut buildPointcut(Set<Class<? extends Annotation>> asyncAnnotationTypes) {
 		ComposablePointcut result = null;
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 7d175f1a78..f4c7d65125 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
@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
  * be provided as well as the annotation type that indicates a method should be
  * invoked asynchronously. If no annotation type is specified, this post-
  * processor will detect both Spring's {@link Async @Async} annotation as well
- * as the EJB 3.1 <code>javax.ejb.Asynchronous</code> annotation.
+ * as the EJB 3.1 {@code javax.ejb.Asynchronous} annotation.
  *
  * @author Mark Fisher
  * @author Juergen Hoeller
@@ -56,7 +56,7 @@ public class AsyncAnnotationBeanPostProcessor extends AbstractAdvisingBeanPostPr
 	/**
 	 * 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
-	 * <code>javax.ejb.Asynchronous</code> annotation will be detected.
+	 * {@code javax.ejb.Asynchronous} annotation will be detected.
 	 * <p>This setter property exists so that developers can provide their own
 	 * (non-Spring-specific) annotation type to indicate that a method (or all
 	 * methods of a given class) should be invoked asynchronously.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
index bfe91befc4..4f0ee68183 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
@@ -20,12 +20,12 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 /**
- * A pass-through <code>Future</code> handle that can be used for method signatures
+ * A pass-through {@code Future} handle that can be used for method signatures
  * which are declared with a Future return type for asynchronous execution.
  *
  * @author Juergen Hoeller
  * @since 3.0
- * @see org.springframework.scheduling.annotation.Async
+ * @see Async
  */
 public class AsyncResult<V> implements Future<V> {
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
index 415cccbd10..cc1fa39abd 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
@@ -119,7 +119,7 @@ public @interface EnableAsync {
 	/**
 	 * Indicate 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 <code>javax.ejb.Asynchronous</code> annotation will be
+	 * the EJB 3.1 {@code javax.ejb.Asynchronous} annotation will be
 	 * detected. <p>This setter property exists so that developers can provide
 	 * their own (non-Spring-specific) annotation type to indicate that a method
 	 * (or all methods of a given class) should be invoked asynchronously.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java
index bd41353038..ff7760c836 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java
@@ -29,7 +29,7 @@ import org.springframework.scheduling.SchedulingTaskExecutor;
 
 /**
  * Adapter that takes a JSR-166 backport
- * <code>edu.emory.mathcs.backport.java.util.concurrent.Executor</code> and
+ * {@code edu.emory.mathcs.backport.java.util.concurrent.Executor} and
  * exposes a Spring {@link org.springframework.core.task.TaskExecutor} for it.
  *
  * <p><b>NOTE:</b> This class implements Spring's
diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
index 4512536635..9015d05489 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
@@ -130,7 +130,7 @@ public class ThreadPoolTaskExecutor extends CustomizableThreadFactory
 
 	/**
 	 * Set the ThreadPoolExecutor's maximum pool size.
-	 * Default is <code>Integer.MAX_VALUE</code>.
+	 * 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) {
@@ -188,7 +188,7 @@ public class ThreadPoolTaskExecutor extends CustomizableThreadFactory
 
 	/**
 	 * Set the capacity for the ThreadPoolExecutor's BlockingQueue.
-	 * Default is <code>Integer.MAX_VALUE</code>.
+	 * Default is {@code Integer.MAX_VALUE}.
 	 * <p>Any positive value will lead to a LinkedBlockingQueue instance;
 	 * any other value will lead to a SynchronousQueue instance.
 	 * @see edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue
@@ -243,7 +243,7 @@ public class ThreadPoolTaskExecutor extends CustomizableThreadFactory
 
 
 	/**
-	 * Calls <code>initialize()</code> after the container applied all property values.
+	 * Calls {@code initialize()} after the container applied all property values.
 	 * @see #initialize()
 	 */
 	public void afterPropertiesSet() {
@@ -290,7 +290,7 @@ public class ThreadPoolTaskExecutor extends CustomizableThreadFactory
 
 	/**
 	 * Return the underlying ThreadPoolExecutor for native access.
-	 * @return the underlying ThreadPoolExecutor (never <code>null</code>)
+	 * @return the underlying ThreadPoolExecutor (never {@code null})
 	 * @throws IllegalStateException if the ThreadPoolTaskExecutor hasn't been initialized yet
 	 */
 	public ThreadPoolExecutor getThreadPoolExecutor() throws IllegalStateException {
@@ -357,7 +357,7 @@ public class ThreadPoolTaskExecutor extends CustomizableThreadFactory
 
 
 	/**
-	 * Calls <code>shutdown</code> when the BeanFactory destroys
+	 * Calls {@code shutdown} when the BeanFactory destroys
 	 * the task executor instance.
 	 * @see #shutdown()
 	 */
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
index 0c6c821baa..10bb80bae6 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
@@ -29,9 +29,9 @@ import org.springframework.core.task.support.TaskExecutorAdapter;
 import org.springframework.scheduling.SchedulingTaskExecutor;
 
 /**
- * Adapter that takes a JDK 1.5 <code>java.util.concurrent.Executor</code> and
+ * Adapter that takes a JDK 1.5 {@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</code>, adapting
+ * Also detects an extended {@code java.util.concurrent.ExecutorService}, adapting
  * the {@link org.springframework.core.task.AsyncTaskExecutor} interface accordingly.
  *
  * <p>Note that there is a pre-built {@link ThreadPoolTaskExecutor} that allows for
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
index ff4cf939e7..bd41c76a41 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.ErrorHandler;
 
 /**
- * Adapter that takes a JDK 1.5 <code>java.util.concurrent.ScheduledExecutorService</code>
+ * Adapter that takes a JDK 1.5 {@code java.util.concurrent.ScheduledExecutorService}
  * and exposes a Spring {@link org.springframework.scheduling.TaskScheduler} for it.
  * Extends {@link ConcurrentTaskExecutor} in order to implement the
  * {@link org.springframework.scheduling.SchedulingTaskExecutor} interface as well.
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 56bbca108f..d29dc2d90d 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
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.InitializingBean;
 
 /**
  * Base class for classes that are setting up a
- * <code>java.util.concurrent.ExecutorService</code>
+ * {@code java.util.concurrent.ExecutorService}
  * (typically a {@link java.util.concurrent.ThreadPoolExecutor}).
  * Defines common configuration settings and common lifecycle handling.
  *
@@ -100,7 +100,7 @@ public abstract class ExecutorConfigurationSupport extends CustomizableThreadFac
 
 
 	/**
-	 * Calls <code>initialize()</code> after the container applied all property values.
+	 * Calls {@code initialize()} after the container applied all property values.
 	 * @see #initialize()
 	 */
 	public void afterPropertiesSet() {
@@ -122,7 +122,7 @@ public abstract class ExecutorConfigurationSupport extends CustomizableThreadFac
 
 	/**
 	 * Create the target {@link java.util.concurrent.ExecutorService} instance.
-	 * Called by <code>afterPropertiesSet</code>.
+	 * Called by {@code afterPropertiesSet}.
 	 * @param threadFactory the ThreadFactory to use
 	 * @param rejectedExecutionHandler the RejectedExecutionHandler to use
 	 * @return a new ExecutorService instance
@@ -133,7 +133,7 @@ public abstract class ExecutorConfigurationSupport extends CustomizableThreadFac
 
 
 	/**
-	 * Calls <code>shutdown</code> when the BeanFactory destroys
+	 * Calls {@code shutdown} when the BeanFactory destroys
 	 * the task executor instance.
 	 * @see #shutdown()
 	 */
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java
index 873daf3f8b..fe30fd108b 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java
@@ -24,13 +24,13 @@ import org.springframework.beans.factory.InitializingBean;
 
 /**
  * A Spring {@link FactoryBean} that builds and exposes a preconfigured {@link ForkJoinPool}.
- * May be used on Java 7 as well as on Java 6 with <code>jsr166.jar</code> on the classpath
+ * May be used on Java 7 as well as on Java 6 with {@code jsr166.jar} on the classpath
  * (ideally on the VM bootstrap classpath).
  *
  * <p>For details on the ForkJoinPool API and its use with RecursiveActions, see the
  * <a href="http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/ForkJoinPool.html">JDK 7 javadoc</a>.
  *
- * <p><code>jsr166.jar</code>, containing <code>java.util.concurrent</code> updates for Java 6, can be obtained
+ * <p>{@code jsr166.jar}, containing {@code java.util.concurrent} updates for Java 6, can be obtained
  * from the <a href="http://gee.cs.oswego.edu/dl/concurrency-interest/">concurrency interest website</a>.
  *
  * @author Juergen Hoeller
@@ -74,9 +74,9 @@ public class ForkJoinPoolFactoryBean implements FactoryBean<ForkJoinPool>, Initi
 
 	/**
 	 * Specify whether to establish a local first-in-first-out scheduling mode for forked tasks
-	 * that are never joined. This mode (asyncMode = <code>true</code>) may be more appropriate
+	 * that are never joined. This mode (asyncMode = {@code true}) may be more appropriate
 	 * than the default locally stack-based mode in applications in which worker threads only
-	 * process event-style asynchronous tasks. Default is <code>false</code>.
+	 * process event-style asynchronous tasks. Default is {@code false}.
 	 */
 	public void setAsyncMode(boolean asyncMode) {
 		this.asyncMode = asyncMode;
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java
index a0a658a05d..6eadb63739 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java
@@ -131,12 +131,12 @@ public class ScheduledExecutorTask {
 	 * <p>Note that the semantics of the period value vary between fixed-rate and
 	 * fixed-delay execution.
 	 * <p><b>Note:</b> A period of 0 (for example as fixed delay) is <i>not</i> supported,
-	 * simply because <code>java.util.concurrent.ScheduledExecutorService</code> itself
+	 * simply because {@code java.util.concurrent.ScheduledExecutorService} itself
 	 * does not support it. Hence a value of 0 will be treated as one-time execution;
 	 * however, that value should never be specified explicitly in the first place!
 	 * @see #setFixedRate
 	 * @see #isOneTimeTask()
-	 * @see java.util.concurrent.ScheduledExecutorService#scheduleWithFixedDelay(java.lang.Runnable, long, long, java.util.concurrent.TimeUnit)
+	 * @see java.util.concurrent.ScheduledExecutorService#scheduleWithFixedDelay(Runnable, long, long, java.util.concurrent.TimeUnit)
 	 */
 	public void setPeriod(long period) {
 		this.period = period;
@@ -151,7 +151,7 @@ public class ScheduledExecutorTask {
 
 	/**
 	 * Is this task only ever going to execute once?
-	 * @return <code>true</code> if this task is only ever going to execute once
+	 * @return {@code true} if this task is only ever going to execute once
 	 * @see #getPeriod()
 	 */
 	public boolean isOneTimeTask() {
@@ -160,7 +160,7 @@ public class ScheduledExecutorTask {
 
 	/**
 	 * Specify the time unit for the delay and period values.
-	 * Default is milliseconds (<code>TimeUnit.MILLISECONDS</code>).
+	 * Default is milliseconds ({@code TimeUnit.MILLISECONDS}).
 	 * @see java.util.concurrent.TimeUnit#MILLISECONDS
 	 * @see java.util.concurrent.TimeUnit#SECONDS
 	 */
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 1915b978d5..a289179733 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
@@ -78,7 +78,7 @@ public class ThreadPoolExecutorFactoryBean extends ExecutorConfigurationSupport
 
 	/**
 	 * Set the ThreadPoolExecutor's maximum pool size.
-	 * Default is <code>Integer.MAX_VALUE</code>.
+	 * 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) {
@@ -109,7 +109,7 @@ public class ThreadPoolExecutorFactoryBean extends ExecutorConfigurationSupport
 
 	/**
 	 * Set the capacity for the ThreadPoolExecutor's BlockingQueue.
-	 * Default is <code>Integer.MAX_VALUE</code>.
+	 * Default is {@code Integer.MAX_VALUE}.
 	 * <p>Any positive value will lead to a LinkedBlockingQueue instance;
 	 * any other value will lead to a SynchronousQueue instance.
 	 * @see java.util.concurrent.LinkedBlockingQueue
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
index 689cc142da..9ce2bc6b0d 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
@@ -105,7 +105,7 @@ public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport impleme
 
 	/**
 	 * Set the ThreadPoolExecutor's maximum pool size.
-	 * Default is <code>Integer.MAX_VALUE</code>.
+	 * 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) {
@@ -164,7 +164,7 @@ public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport impleme
 
 	/**
 	 * Set the capacity for the ThreadPoolExecutor's BlockingQueue.
-	 * Default is <code>Integer.MAX_VALUE</code>.
+	 * Default is {@code Integer.MAX_VALUE}.
 	 * <p>Any positive value will lead to a LinkedBlockingQueue instance;
 	 * any other value will lead to a SynchronousQueue instance.
 	 * @see java.util.concurrent.LinkedBlockingQueue
@@ -210,7 +210,7 @@ public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport impleme
 
 	/**
 	 * Return the underlying ThreadPoolExecutor for native access.
-	 * @return the underlying ThreadPoolExecutor (never <code>null</code>)
+	 * @return the underlying ThreadPoolExecutor (never {@code null})
 	 * @throws IllegalStateException if the ThreadPoolTaskExecutor hasn't been initialized yet
 	 */
 	public ThreadPoolExecutor getThreadPoolExecutor() throws IllegalStateException {
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 c78ba7876e..b346ec2adf 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
@@ -101,7 +101,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 
 	/**
 	 * Return the underlying ScheduledExecutorService for native access.
-	 * @return the underlying ScheduledExecutorService (never <code>null</code>)
+	 * @return the underlying ScheduledExecutorService (never {@code null})
 	 * @throws IllegalStateException if the ThreadPoolTaskScheduler hasn't been initialized yet
 	 */
 	public ScheduledExecutorService getScheduledExecutor() throws IllegalStateException {
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java
index eb885846aa..00014e0946 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/package-info.java
@@ -1,11 +1,10 @@
-
 /**
  *
  * Scheduling convenience classes for the JDK 1.5+ Executor mechanism
- * in the <code>java.util.concurrent</code> package, allowing to set up a
+ * in the {@code java.util.concurrent} package, allowing to set up a
  * ThreadPoolExecutor or ScheduledThreadPoolExecutor as a bean in a Spring
- * context. Provides support for the native <code>java.util.concurrent</code>
- * interfaces as well as the Spring <code>TaskExecutor</code> mechanism.
+ * context. Provides support for the native {@code java.util.concurrent}
+ * interfaces as well as the Spring {@code TaskExecutor} mechanism.
  *
  */
 package org.springframework.scheduling.concurrent;
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java b/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
index ee08a4c977..12e8aeab07 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
@@ -19,7 +19,7 @@ package org.springframework.scheduling.config;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * <code>NamespaceHandler</code> for the 'task' namespace.
+ * {@code NamespaceHandler} for the 'task' namespace.
  *
  * @author Mark Fisher
  * @since 3.0
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java b/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
index 91a5b42e55..07a1803397 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
  * (i.e. the interval between successive executions is measured from each
  * <emphasis>completion</emphasis> time). To measure the interval between the
  * scheduled <emphasis>start</emphasis> time of each execution instead, set the
- * 'fixedRate' property to <code>true</code>.
+ * 'fixedRate' property to {@code true}.
  * <p>
  * Note that the TaskScheduler interface already defines methods for scheduling
  * tasks at fixed-rate or with fixed-delay. Both also support an optional value
diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java b/spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java
index 68880c1796..677daa138d 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java
@@ -25,15 +25,15 @@ import org.springframework.util.Assert;
 
 /**
  * Simple {@link java.util.TimerTask} adapter that delegates to a
- * given {@link java.lang.Runnable}.
+ * given {@link Runnable}.
  *
  * <p>This is often preferable to deriving from TimerTask, to be able to
  * implement an interface rather than extend an abstract base class.
  *
  * @author Juergen Hoeller
  * @since 1.2.4
- * @deprecated as of Spring 3.0, in favor of the <code>scheduling.concurrent</code>
- * package which is based on Java 5's <code>java.util.concurrent.ExecutorService</code>
+ * @deprecated as of Spring 3.0, in favor of the {@code scheduling.concurrent}
+ * package which is based on Java 5's {@code java.util.concurrent.ExecutorService}
  */
 @Deprecated
 public class DelegatingTimerTask extends TimerTask {
diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java
index f387a0e704..241a96c7cc 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java
@@ -37,8 +37,8 @@ import org.springframework.scheduling.support.MethodInvokingRunnable;
  * @see ScheduledTimerTask#setRunnable
  * @see org.springframework.scheduling.support.MethodInvokingRunnable
  * @see org.springframework.beans.factory.config.MethodInvokingFactoryBean
- * @deprecated as of Spring 3.0, in favor of the <code>scheduling.concurrent</code>
- * package which is based on Java 5's <code>java.util.concurrent.ExecutorService</code>
+ * @deprecated as of Spring 3.0, in favor of the {@code scheduling.concurrent}
+ * package which is based on Java 5's {@code java.util.concurrent.ExecutorService}
  */
 @Deprecated
 public class MethodInvokingTimerTaskFactoryBean extends MethodInvokingRunnable implements FactoryBean<TimerTask> {
diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java b/spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java
index 05b68a4acf..f1885b9701 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java
@@ -37,8 +37,8 @@ import java.util.TimerTask;
  * @see java.util.TimerTask
  * @see java.util.Timer#schedule(TimerTask, long, long)
  * @see java.util.Timer#scheduleAtFixedRate(TimerTask, long, long)
- * @deprecated as of Spring 3.0, in favor of the <code>scheduling.concurrent</code>
- * package which is based on Java 5's <code>java.util.concurrent.ExecutorService</code>
+ * @deprecated as of Spring 3.0, in favor of the {@code scheduling.concurrent}
+ * package which is based on Java 5's {@code java.util.concurrent.ExecutorService}
  */
 @Deprecated
 public class ScheduledTimerTask {
@@ -178,7 +178,7 @@ public class ScheduledTimerTask {
 	 * <p>Note that the semantics of the period value vary between fixed-rate
 	 * and fixed-delay execution.
 	 * <p><b>Note:</b> A period of 0 (for example as fixed delay) is <i>not</i>
-	 * supported, simply because <code>java.util.Timer</code> itself does not
+	 * supported, simply because {@code java.util.Timer} itself does not
 	 * support it. Hence a value of 0 will be treated as one-time execution;
 	 * however, that value should never be specified explicitly in the first place!
 	 * @see #setFixedRate
@@ -198,7 +198,7 @@ public class ScheduledTimerTask {
 
 	/**
 	 * Is this task only ever going to execute once?
-	 * @return <code>true</code> if this task is only ever going to execute once
+	 * @return {@code true} if this task is only ever going to execute once
 	 * @see #getPeriod()
 	 */
 	public boolean isOneTimeTask() {
diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java
index 38c4f8c23a..6ddccd151a 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java
@@ -46,8 +46,8 @@ import org.springframework.util.StringUtils;
  * @see ScheduledTimerTask
  * @see java.util.Timer
  * @see java.util.TimerTask
- * @deprecated as of Spring 3.0, in favor of the <code>scheduling.concurrent</code>
- * package which is based on Java 5's <code>java.util.concurrent.ExecutorService</code>
+ * @deprecated as of Spring 3.0, in favor of the {@code scheduling.concurrent}
+ * package which is based on Java 5's {@code java.util.concurrent.ExecutorService}
  */
 @Deprecated
 public class TimerFactoryBean implements FactoryBean<Timer>, BeanNameAware, InitializingBean, DisposableBean {
@@ -104,7 +104,7 @@ public class TimerFactoryBean implements FactoryBean<Timer>, BeanNameAware, Init
 	}
 
 	/**
-	 * Create a new Timer instance. Called by <code>afterPropertiesSet</code>.
+	 * Create a new Timer instance. Called by {@code afterPropertiesSet}.
 	 * Can be overridden in subclasses to provide custom Timer subclasses.
 	 * @param name the desired name of the Timer's associated thread
 	 * @param daemon whether to create a Timer that runs as daemon thread
diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java
index 9603e95c3d..42626b4e81 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java
@@ -39,8 +39,8 @@ import org.springframework.util.StringUtils;
  * @author Juergen Hoeller
  * @since 2.0
  * @see java.util.Timer
- * @deprecated as of Spring 3.0, in favor of the <code>scheduling.concurrent</code>
- * package which is based on Java 5's <code>java.util.concurrent.ExecutorService</code>
+ * @deprecated as of Spring 3.0, in favor of the {@code scheduling.concurrent}
+ * package which is based on Java 5's {@code java.util.concurrent.ExecutorService}
  */
 @Deprecated
 public class TimerTaskExecutor implements SchedulingTaskExecutor, BeanNameAware, InitializingBean, DisposableBean {
@@ -110,7 +110,7 @@ public class TimerTaskExecutor implements SchedulingTaskExecutor, BeanNameAware,
 	}
 
 	/**
-	 * Create a new {@link Timer} instance. Called by <code>afterPropertiesSet</code>
+	 * Create a new {@link Timer} instance. Called by {@code afterPropertiesSet}
 	 * if no {@link Timer} has been specified explicitly.
 	 * <p>The default implementation creates a plain non-daemon {@link Timer}.
 	 * If overridden, subclasses must take care to ensure that a non-null
diff --git a/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java b/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java
index e6f56a4baf..58586c3e38 100644
--- a/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java
+++ b/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java
@@ -73,7 +73,7 @@ public class ScriptCompilationException extends NestedRuntimeException {
 
 	/**
 	 * Return the source for the offending script.
-	 * @return the source, or <code>null</code> if not available
+	 * @return the source, or {@code null} if not available
 	 */
 	public ScriptSource getScriptSource() {
 		return this.scriptSource;
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 e775f3035d..c2d360fa22 100644
--- a/spring-context/src/main/java/org/springframework/scripting/ScriptFactory.java
+++ b/spring-context/src/main/java/org/springframework/scripting/ScriptFactory.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 /**
  * Script definition interface, encapsulating the configuration
  * of a specific script as well as a factory method for
- * creating the actual scripted Java <code>Object</code>.
+ * creating the actual scripted Java {@code Object}.
  *
  * @author Juergen Hoeller
  * @author Rob Harrop
@@ -45,7 +45,7 @@ public interface ScriptFactory {
 
 	/**
 	 * Return the business interfaces that the script is supposed to implement.
-	 * <p>Can return <code>null</code> if the script itself determines
+	 * <p>Can return {@code null} if the script itself determines
 	 * its Java interfaces (such as in the case of Groovy).
 	 * @return the interfaces for the script
 	 */
@@ -55,7 +55,7 @@ public interface ScriptFactory {
 	 * Return whether the script requires a config interface to be
 	 * generated for it. This is typically the case for scripts that
 	 * do not determine Java signatures themselves, with no appropriate
-	 * config interface specified in <code>getScriptInterfaces()</code>.
+	 * config interface specified in {@code getScriptInterfaces()}.
 	 * @return whether the script requires a generated config interface
 	 * @see #getScriptInterfaces()
 	 */
@@ -67,10 +67,10 @@ public interface ScriptFactory {
 	 * a generated script class. Note that this method may be invoked
 	 * concurrently and must be implemented in a thread-safe fashion.
 	 * @param scriptSource the actual ScriptSource to retrieve
-	 * the script source text from (never <code>null</code>)
+	 * the script source text from (never {@code null})
 	 * @param actualInterfaces the actual interfaces to expose,
 	 * including script interfaces as well as a generated config interface
-	 * (if applicable; may be <code>null</code>)
+	 * (if applicable; may be {@code null})
 	 * @return the scripted Java object
 	 * @throws IOException if script retrieval failed
 	 * @throws ScriptCompilationException if script compilation failed
@@ -84,8 +84,8 @@ public interface ScriptFactory {
 	 * a generated script class. Note that this method may be invoked
 	 * concurrently and must be implemented in a thread-safe fashion.
 	 * @param scriptSource the actual ScriptSource to retrieve
-	 * the script source text from (never <code>null</code>)
-	 * @return the type of the scripted Java object, or <code>null</code>
+	 * the script source text from (never {@code null})
+	 * @return the type of the scripted Java object, or {@code null}
 	 * if none could be determined
 	 * @throws IOException if script retrieval failed
 	 * @throws ScriptCompilationException if script compilation failed
@@ -96,9 +96,9 @@ public interface ScriptFactory {
 
 	/**
 	 * Determine whether a refresh is required (e.g. through
-	 * ScriptSource's <code>isModified()</code> method).
+	 * ScriptSource's {@code isModified()} method).
 	 * @param scriptSource the actual ScriptSource to retrieve
-	 * the script source text from (never <code>null</code>)
+	 * the script source text from (never {@code null})
 	 * @return whether a fresh {@link #getScriptedObject} call is required
 	 * @since 2.5.2
 	 * @see ScriptSource#isModified()
diff --git a/spring-context/src/main/java/org/springframework/scripting/ScriptSource.java b/spring-context/src/main/java/org/springframework/scripting/ScriptSource.java
index 2e5d8727d0..a3ccb89ed4 100644
--- a/spring-context/src/main/java/org/springframework/scripting/ScriptSource.java
+++ b/spring-context/src/main/java/org/springframework/scripting/ScriptSource.java
@@ -38,14 +38,14 @@ public interface ScriptSource {
 	/**
 	 * Indicate whether the underlying script data has been modified since
 	 * the last time {@link #getScriptAsString()} was called.
-	 * Returns <code>true</code> if the script has not been read yet.
+	 * Returns {@code true} if the script has not been read yet.
 	 * @return whether the script data has been modified
 	 */
 	boolean isModified();
 
 	/**
 	 * Determine a class name for the underlying script.
-	 * @return the suggested class name, or <code>null</code> if none available
+	 * @return the suggested class name, or {@code null} if none available
 	 */
 	String suggestedClassName();
 
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 48dbbb8cb0..3f079267c6 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
@@ -58,7 +58,7 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 
 	/**
 	 * Create a new BshScriptFactory for the given script source.
-	 * <p>With this <code>BshScriptFactory</code> variant, the script needs to
+	 * <p>With this {@code BshScriptFactory} variant, the script needs to
 	 * declare a full class or return an actual instance of the scripted object.
 	 * @param scriptSourceLocator a locator that points to the source of the script.
 	 * Interpreted by the post-processor that actually creates the script.
@@ -76,7 +76,7 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 	 * @param scriptSourceLocator a locator that points to the source of the script.
 	 * Interpreted by the post-processor that actually creates the script.
 	 * @param scriptInterfaces the Java interfaces that the scripted object
-	 * is supposed to implement (may be <code>null</code>)
+	 * is supposed to implement (may be {@code null})
 	 */
 	public BshScriptFactory(String scriptSourceLocator, Class[] scriptInterfaces) {
 		Assert.hasText(scriptSourceLocator, "'scriptSourceLocator' must not be empty");
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 395f427eb3..b473a4eb35 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
@@ -41,7 +41,7 @@ public abstract class BshScriptUtils {
 
 	/**
 	 * Create a new BeanShell-scripted object from the given script source.
-	 * <p>With this <code>createBshObject</code> variant, the script needs to
+	 * <p>With this {@code createBshObject} variant, the script needs to
 	 * declare a full class or return an actual instance of the scripted object.
 	 * @param scriptSource the script source text
 	 * @return the scripted Java object
@@ -60,7 +60,7 @@ public abstract class BshScriptUtils {
 	 * specified interfaces, if any, need to be implemented by that class/instance).
 	 * @param scriptSource the script source text
 	 * @param scriptInterfaces the interfaces that the scripted Java object is
-	 * supposed to implement (may be <code>null</code> or empty if the script itself
+	 * 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)
 	 * @return the scripted Java object
 	 * @throws EvalError in case of BeanShell parsing failure
@@ -78,7 +78,7 @@ public abstract class BshScriptUtils {
 	 * specified interfaces, if any, need to be implemented by that class/instance).
 	 * @param scriptSource the script source text
 	 * @param scriptInterfaces the interfaces that the scripted Java object is
-	 * supposed to implement (may be <code>null</code> or empty if the script itself
+	 * 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
 	 * @return the scripted Java object
@@ -108,9 +108,9 @@ public abstract class BshScriptUtils {
 	 * returning the Class defined by the script.
 	 * <p>The script may either declare a full class or return an actual instance of
 	 * the scripted object (in which case the Class of the object will be returned).
-	 * In any other case, the returned Class will be <code>null</code>.
+	 * In any other case, the returned Class will be {@code null}.
 	 * @param scriptSource the script source text
-	 * @return the scripted Java class, or <code>null</code> if none could be determined
+	 * @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 {
@@ -137,7 +137,7 @@ public abstract class BshScriptUtils {
 	 * specified interfaces, if any, need to be implemented by that class/instance).
 	 * @param scriptSource the script source text
 	 * @param scriptInterfaces the interfaces that the scripted Java object is
-	 * supposed to implement (may be <code>null</code> or empty if the script itself
+	 * 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
 	 * @return the scripted Java class or Java object
diff --git a/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java b/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
index b222d23f16..8e2b115e54 100644
--- a/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
@@ -19,7 +19,7 @@ package org.springframework.scripting.config;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * <code>NamespaceHandler</code> that supports the wiring of
+ * {@code NamespaceHandler} that supports the wiring of
  * objects backed by dynamic languages such as Groovy, JRuby and
  * BeanShell. The following is an example (from the reference
  * documentation) that details the wiring of a Groovy backed bean:
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 f5bfb4a734..4cde7aa063 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
@@ -33,18 +33,18 @@ import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 
 /**
- * BeanDefinitionParser implementation for the '<code>&lt;lang:groovy/&gt;</code>',
- * '<code>&lt;lang:jruby/&gt;</code>' and '<code>&lt;lang:bsh/&gt;</code>' tags.
+ * BeanDefinitionParser implementation for the '{@code &lt;lang:groovy/&gt;}',
+ * '{@code &lt;lang:jruby/&gt;}' and '{@code &lt;lang:bsh/&gt;}' tags.
  * 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</code>' attribute) or inline in the XML configuration
- * itself (using the '<code>inline-script</code>' attribute.
+ * 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</code>' attribute.
+ * '{@code refresh-check-delay}' attribute.
  *
  * @author Rob Harrop
  * @author Rod Johnson
@@ -196,9 +196,9 @@ class ScriptBeanDefinitionParser extends AbstractBeanDefinitionParser {
 	}
 
 	/**
-	 * Resolves the script source from either the '<code>script-source</code>' attribute or
-	 * the '<code>inline-script</code>' element. Logs and {@link XmlReaderContext#error} and
-	 * returns <code>null</code> if neither or both of these values are specified.
+	 * Resolves the script source from either the '{@code script-source}' attribute or
+	 * the '{@code inline-script}' element. Logs and {@link XmlReaderContext#error} and
+	 * returns {@code null} if neither or both of these values are specified.
 	 */
 	private String resolveScriptSource(Element element, XmlReaderContext readerContext) {
 		boolean hasScriptSource = element.hasAttribute(SCRIPT_SOURCE_ATTRIBUTE);
diff --git a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java
index 66fe2e95fa..b8dd3e967a 100644
--- a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java
+++ b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java
@@ -36,7 +36,7 @@ public interface GroovyObjectCustomizer {
 	 * Customize the supplied {@link GroovyObject}.
 	 * <p>For example, this can be used to set a custom metaclass to
 	 * handle missing methods.
-	 * @param goo the <code>GroovyObject</code> to customize
+	 * @param goo the {@code GroovyObject} to customize
 	 */
 	void customize(GroovyObject goo);
 
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 b55d507baf..d984d10cda 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
@@ -90,7 +90,7 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
 	 * Interpreted by the post-processor that actually creates the script.
 	 * @param groovyObjectCustomizer a customizer that can set a custom metaclass
 	 * or make other changes to the GroovyObject created by this factory
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 */
 	public GroovyScriptFactory(String scriptSourceLocator, GroovyObjectCustomizer groovyObjectCustomizer) {
 		Assert.hasText(scriptSourceLocator, "'scriptSourceLocator' must not be empty");
@@ -129,7 +129,7 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
 	/**
 	 * Groovy scripts determine their interfaces themselves,
 	 * hence we don't need to explicitly expose interfaces here.
-	 * @return <code>null</code> always
+	 * @return {@code null} always
 	 */
 	public Class[] getScriptInterfaces() {
 		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 bf916f35f0..644bd9f64d 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
@@ -117,7 +117,7 @@ public abstract class JRubyScriptUtils {
 
 	/**
 	 * Find the first {@link ClassNode} under the supplied {@link Node}.
-	 * @return the found <code>ClassNode</code>, or <code>null</code>
+	 * @return the found {@code ClassNode}, or {@code null}
 	 * if no {@link ClassNode} is found
 	 */
 	private static ClassNode findClassNode(Node node) {
@@ -229,16 +229,16 @@ public abstract class JRubyScriptUtils {
 	/**
 	 * Exception thrown in response to a JRuby {@link RaiseException}
 	 * being thrown from a JRuby method invocation.
-	 * <p>Introduced because the <code>RaiseException</code> class does not
+	 * <p>Introduced because the {@code RaiseException} class does not
 	 * have useful {@link Object#toString()}, {@link Throwable#getMessage()},
 	 * and {@link Throwable#printStackTrace} implementations.
 	 */
 	public static class JRubyExecutionException extends NestedRuntimeException {
 
 		/**
-		 * Create a new <code>JRubyException</code>,
-		 * wrapping the given JRuby <code>RaiseException</code>.
-		 * @param ex the cause (must not be <code>null</code>)
+		 * Create a new {@code JRubyException},
+		 * wrapping the given JRuby {@code RaiseException}.
+		 * @param ex the cause (must not be {@code null})
 		 */
 		public JRubyExecutionException(RaiseException ex) {
 			super(buildMessage(ex), ex);
diff --git a/spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java b/spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java
index 02cf979435..9103452d03 100644
--- a/spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java
+++ b/spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java
@@ -63,7 +63,7 @@ public class RefreshableScriptTargetSource extends BeanFactoryRefreshableTargetS
 
 	/**
 	 * Determine whether a refresh is required through calling
-	 * ScriptFactory's <code>requiresScriptedObjectRefresh</code> method.
+	 * ScriptFactory's {@code requiresScriptedObjectRefresh} method.
 	 * @see ScriptFactory#requiresScriptedObjectRefresh(ScriptSource)
 	 */
 	@Override
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 1902621315..d46917005f 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
@@ -85,7 +85,7 @@ import org.springframework.util.StringUtils;
  * At runtime, the actual scripted objects will be exposed for
  * "bshMessenger" and "groovyMessenger", rather than the
  * {@link org.springframework.scripting.ScriptFactory} instances. Both of
- * those are supposed to be castable to the example's <code>Messenger</code>
+ * those are supposed to be castable to the example's {@code Messenger}
  * interfaces here.
  *
  * <pre class="code">&lt;bean class="org.springframework.scripting.support.ScriptFactoryPostProcessor"/&gt;
@@ -106,13 +106,13 @@ import org.springframework.util.StringUtils;
  * (in an effort to illustrate using the {@link ScriptFactoryPostProcessor} itself).
  * In reality, you would never create a &lt;bean/&gt; definition for a
  * {@link ScriptFactoryPostProcessor} explicitly; rather you would import the
- * tags from the <code>'lang'</code> namespace and simply create scripted
+ * tags from the {@code 'lang'} namespace and simply create scripted
  * beans using the tags in that namespace... as part of doing so, a
  * {@link ScriptFactoryPostProcessor} will implicitly be created for you.
  *
  * <p>The Spring reference documentation contains numerous examples of using
- * tags in the <code>'lang'</code> namespace; by way of an example, find below
- * a Groovy-backed bean defined using the <code>'lang:groovy'</code> tag.
+ * tags in the {@code 'lang'} namespace; by way of an example, find below
+ * a Groovy-backed bean defined using the {@code 'lang:groovy'} tag.
  *
  * <pre class="code">
  * &lt;?xml version="1.0" encoding="UTF-8"?&gt;
@@ -541,7 +541,7 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces
 	/**
 	 * Create a refreshable proxy for the given AOP TargetSource.
 	 * @param ts the refreshable TargetSource
-	 * @param interfaces the proxy interfaces (may be <code>null</code> to
+	 * @param interfaces the proxy interfaces (may be {@code null} to
 	 * indicate proxying of all interfaces implemented by the target class)
 	 * @return the generated proxy
 	 * @see RefreshableScriptTargetSource
diff --git a/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java b/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java
index 4d70c6ae37..abacdd4bfa 100644
--- a/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java
+++ b/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java
@@ -50,7 +50,7 @@ public class StaticScriptSource implements ScriptSource {
 	 * Create a new StaticScriptSource for the given script.
 	 * @param script the script String
 	 * @param className the suggested class name for the script
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 */
 	public StaticScriptSource(String script, String className) {
 		setScript(script);
diff --git a/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java b/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java
index dc43645bc1..4d4f37bb16 100644
--- a/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java
+++ b/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java
@@ -21,7 +21,7 @@ import java.util.Map;
 
 /**
  * Subclass of {@link ModelMap} that implements the {@link Model} interface.
- * Java 5 specific like the <code>Model</code> interface itself.
+ * Java 5 specific like the {@code Model} interface itself.
  *
  * @author Juergen Hoeller
  * @since 2.5.1
diff --git a/spring-context/src/main/java/org/springframework/ui/Model.java b/spring-context/src/main/java/org/springframework/ui/Model.java
index 45d805307e..d68710fc61 100644
--- a/spring-context/src/main/java/org/springframework/ui/Model.java
+++ b/spring-context/src/main/java/org/springframework/ui/Model.java
@@ -22,7 +22,7 @@ import java.util.Map;
 /**
  * Java-5-specific interface that defines a holder for model attributes.
  * Primarily designed for adding attributes to the model.
- * Allows for accessing the overall model as a <code>java.util.Map</code>.
+ * Allows for accessing the overall model as a {@code java.util.Map}.
  *
  * @author Juergen Hoeller
  * @since 2.5.1
@@ -31,37 +31,37 @@ public interface Model {
 
 	/**
 	 * Add the supplied attribute under the supplied name.
-	 * @param attributeName the name of the model attribute (never <code>null</code>)
-	 * @param attributeValue the model attribute value (can be <code>null</code>)
+	 * @param attributeName the name of the model attribute (never {@code null})
+	 * @param attributeValue the model attribute value (can be {@code null})
 	 */
 	Model addAttribute(String attributeName, Object attributeValue);
 
 	/**
-	 * Add the supplied attribute to this <code>Map</code> using a
+	 * Add the supplied attribute to this {@code Map} using a
 	 * {@link org.springframework.core.Conventions#getVariableName generated name}.
 	 * <p><emphasis>Note: Empty {@link java.util.Collection Collections} are not added to
 	 * the model when using this method because we cannot correctly determine
-	 * the true convention name. View code should check for <code>null</code> rather
+	 * the true convention name. View code should check for {@code null} rather
 	 * than for empty collections as is already done by JSTL tags.</emphasis>
-	 * @param attributeValue the model attribute value (never <code>null</code>)
+	 * @param attributeValue the model attribute value (never {@code null})
 	 */
 	Model addAttribute(Object attributeValue);
 
 	/**
-	 * Copy all attributes in the supplied <code>Collection</code> into this
-	 * <code>Map</code>, using attribute name generation for each element.
+	 * Copy all attributes in the supplied {@code Collection} into this
+	 * {@code Map}, using attribute name generation for each element.
 	 * @see #addAttribute(Object)
 	 */
 	Model addAllAttributes(Collection<?> attributeValues);
 
 	/**
-	 * Copy all attributes in the supplied <code>Map</code> into this <code>Map</code>.
+	 * Copy all attributes in the supplied {@code Map} into this {@code Map}.
 	 * @see #addAttribute(String, Object)
 	 */
 	Model addAllAttributes(Map<String, ?> attributes);
 
 	/**
-	 * Copy all attributes in the supplied <code>Map</code> into this <code>Map</code>,
+	 * Copy all attributes in the supplied {@code Map} into this {@code Map},
 	 * with existing objects of the same name taking precedence (i.e. not getting
 	 * replaced).
 	 */
@@ -69,7 +69,7 @@ public interface Model {
 
 	/**
 	 * Does this model contain an attribute of the given name?
-	 * @param attributeName the name of the model attribute (never <code>null</code>)
+	 * @param attributeName the name of the model attribute (never {@code null})
 	 * @return whether this model contains a corresponding attribute
 	 */
 	boolean containsAttribute(String attributeName);
diff --git a/spring-context/src/main/java/org/springframework/ui/ModelMap.java b/spring-context/src/main/java/org/springframework/ui/ModelMap.java
index d9dcdecc33..60c89c7bb4 100644
--- a/spring-context/src/main/java/org/springframework/ui/ModelMap.java
+++ b/spring-context/src/main/java/org/springframework/ui/ModelMap.java
@@ -41,13 +41,13 @@ import org.springframework.util.Assert;
 public class ModelMap extends LinkedHashMap<String, Object> {
 
 	/**
-	 * Construct a new, empty <code>ModelMap</code>.
+	 * Construct a new, empty {@code ModelMap}.
 	 */
 	public ModelMap() {
 	}
 
 	/**
-	 * Construct a new <code>ModelMap</code> containing the supplied attribute
+	 * Construct a new {@code ModelMap} containing the supplied attribute
 	 * under the supplied name.
 	 * @see #addAttribute(String, Object)
 	 */
@@ -56,7 +56,7 @@ public class ModelMap extends LinkedHashMap<String, Object> {
 	}
 
 	/**
-	 * Construct a new <code>ModelMap</code> containing the supplied attribute.
+	 * Construct a new {@code ModelMap} containing the supplied attribute.
 	 * Uses attribute name generation to generate the key for the supplied model
 	 * object.
 	 * @see #addAttribute(Object)
@@ -68,8 +68,8 @@ public class ModelMap extends LinkedHashMap<String, Object> {
 
 	/**
 	 * Add the supplied attribute under the supplied name.
-	 * @param attributeName the name of the model attribute (never <code>null</code>)
-	 * @param attributeValue the model attribute value (can be <code>null</code>)
+	 * @param attributeName the name of the model attribute (never {@code null})
+	 * @param attributeValue the model attribute value (can be {@code null})
 	 */
 	public ModelMap addAttribute(String attributeName, Object attributeValue) {
 		Assert.notNull(attributeName, "Model attribute name must not be null");
@@ -78,13 +78,13 @@ public class ModelMap extends LinkedHashMap<String, Object> {
 	}
 
 	/**
-	 * Add the supplied attribute to this <code>Map</code> using a
+	 * Add the supplied attribute to this {@code Map} using a
 	 * {@link org.springframework.core.Conventions#getVariableName generated name}.
 	 * <p><emphasis>Note: Empty {@link Collection Collections} are not added to
 	 * the model when using this method because we cannot correctly determine
-	 * the true convention name. View code should check for <code>null</code> rather
+	 * the true convention name. View code should check for {@code null} rather
 	 * than for empty collections as is already done by JSTL tags.</emphasis>
-	 * @param attributeValue the model attribute value (never <code>null</code>)
+	 * @param attributeValue the model attribute value (never {@code null})
 	 */
 	public ModelMap addAttribute(Object attributeValue) {
 		Assert.notNull(attributeValue, "Model object must not be null");
@@ -95,8 +95,8 @@ public class ModelMap extends LinkedHashMap<String, Object> {
 	}
 
 	/**
-	 * Copy all attributes in the supplied <code>Collection</code> into this
-	 * <code>Map</code>, using attribute name generation for each element.
+	 * Copy all attributes in the supplied {@code Collection} into this
+	 * {@code Map}, using attribute name generation for each element.
 	 * @see #addAttribute(Object)
 	 */
 	public ModelMap addAllAttributes(Collection<?> attributeValues) {
@@ -109,7 +109,7 @@ public class ModelMap extends LinkedHashMap<String, Object> {
 	}
 
 	/**
-	 * Copy all attributes in the supplied <code>Map</code> into this <code>Map</code>.
+	 * Copy all attributes in the supplied {@code Map} into this {@code Map}.
 	 * @see #addAttribute(String, Object)
 	 */
 	public ModelMap addAllAttributes(Map<String, ?> attributes) {
@@ -120,7 +120,7 @@ public class ModelMap extends LinkedHashMap<String, Object> {
 	}
 
 	/**
-	 * Copy all attributes in the supplied <code>Map</code> into this <code>Map</code>,
+	 * Copy all attributes in the supplied {@code Map} into this {@code Map},
 	 * with existing objects of the same name taking precedence (i.e. not getting
 	 * replaced).
 	 */
@@ -137,7 +137,7 @@ public class ModelMap extends LinkedHashMap<String, Object> {
 
 	/**
 	 * Does this model contain an attribute of the given name?
-	 * @param attributeName the name of the model attribute (never <code>null</code>)
+	 * @param attributeName the name of the model attribute (never {@code null})
 	 * @return whether this model contains a corresponding attribute
 	 */
 	public boolean containsAttribute(String attributeName) {
diff --git a/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java
index 13c92582db..a67f083cd0 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java
@@ -30,12 +30,12 @@ public interface HierarchicalThemeSource extends ThemeSource {
 	 * that this object can't resolve.
 	 * @param parent the parent ThemeSource that will be used to
 	 * resolve messages that this object can't resolve.
-	 * May be <code>null</code>, in which case no further resolution is possible.
+	 * May be {@code null}, in which case no further resolution is possible.
 	 */
 	void setParentThemeSource(ThemeSource parent);
 
 	/**
-	 * Return the parent of this ThemeSource, or <code>null</code> if none.
+	 * Return the parent of this ThemeSource, or {@code null} if none.
 	 */
 	ThemeSource getParentThemeSource();
 
diff --git a/spring-context/src/main/java/org/springframework/ui/context/Theme.java b/spring-context/src/main/java/org/springframework/ui/context/Theme.java
index dc435264ab..6dc815ef07 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/Theme.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/Theme.java
@@ -33,14 +33,14 @@ public interface Theme {
 
 	/**
 	 * Return the name of the theme.
-	 * @return the name of the theme (never <code>null</code>)
+	 * @return the name of the theme (never {@code null})
 	 */
 	String getName();
 
 	/**
 	 * Return the specific MessageSource that resolves messages
 	 * with respect to this theme.
-	 * @return the theme-specific MessageSource (never <code>null</code>)
+	 * @return the theme-specific MessageSource (never {@code null})
 	 */
 	MessageSource getMessageSource();
 
diff --git a/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java
index b63b444a67..a4a7e8704c 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java
@@ -32,7 +32,7 @@ public interface ThemeSource {
 	 * <p>The returned Theme will resolve theme-specific messages, codes,
 	 * file paths, etc (e.g. CSS and image files in a web environment).
 	 * @param themeName the name of the theme
-	 * @return the corresponding Theme, or <code>null</code> if none defined.
+	 * @return the corresponding Theme, or {@code null} if none defined.
 	 * Note that, by convention, a ThemeSource should at least be able to
 	 * return a default Theme for the default theme name "theme" but may also
 	 * return default Themes for other theme names.
diff --git a/spring-context/src/main/java/org/springframework/ui/context/package-info.java b/spring-context/src/main/java/org/springframework/ui/context/package-info.java
index a00d7c3fa0..3651f5d762 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/package-info.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/package-info.java
@@ -1,22 +1,21 @@
-
 /**
  *
  * Contains classes defining the application context subinterface
  * for UI applications. The theme feature is added here.
  *
  * <ul>
- *   <li>If no <code>UiApplicationContextUtils.THEME_SOURCE_BEAN_NAME</code>
- * bean is available in the context or parent context, a default <code>ResourceBundleThemeSource</code>
+ *   <li>If no {@code UiApplicationContextUtils.THEME_SOURCE_BEAN_NAME}
+ * bean is available in the context or parent context, a default {@code ResourceBundleThemeSource}
  * will be created for requested themes. In this case, the base name of the property file will match
  * with the theme name.</li>
- *   <li>If the bean is available in the context or parent context, a <code>basenamePrefix</code> can be
+ *   <li>If the bean is available in the context or parent context, a {@code basenamePrefix} can be
  *   set before the theme name for locating the property files like this:
- *   <br><code>
+ *   <br>{@code
  *   	&lt;bean id="themeSource" class="org.springframework.ui.context.support.ResourceBundleThemeSource"&gt;
  * 	<br>	&lt;property name="basenamePrefix"&gt;&lt;value&gt;theme.&lt;/value&gt;&lt;/property&gt;
  * 	<br>&lt;/bean&gt;
- *   </code>
- *   <br> in this case, the themes resource bundles will be named <code>theme.&lt;theme_name&gt;XXX.properties.
+ *   }
+ *   <br> in this case, the themes resource bundles will be named {@code theme.<theme_name>XXX.properties}.
  *   </li>
  *   <li>This can be defined at application level and/or at servlet level for web applications.</li>
  *   <li>Normal i18n features of Resource Bundles are available. So a theme message can be dependant
diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
index 9ba069d921..4cf80c84c0 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
@@ -76,7 +76,7 @@ public class ResourceBundleThemeSource implements HierarchicalThemeSource {
 	 * <p>Note that ResourceBundle names are effectively classpath locations: As a
 	 * consequence, the JDK's standard ResourceBundle treats dots as package separators.
 	 * This means that "test.theme" is effectively equivalent to "test/theme",
-	 * just like it is for programmatic <code>java.util.ResourceBundle</code> usage.
+	 * just like it is for programmatic {@code java.util.ResourceBundle} usage.
 	 * @see java.util.ResourceBundle#getBundle(String)
 	 */
 	public void setBasenamePrefix(String basenamePrefix) {
diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java b/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java
index 3669b47574..e65da9b4bc 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java
@@ -50,7 +50,7 @@ public abstract class UiApplicationContextUtils {
 	 * autodetecting a bean with the name "themeSource". If no such
 	 * bean is found, a default (empty) ThemeSource will be used.
 	 * @param context current application context
-	 * @return the initialized theme source (will never be <code>null</code>)
+	 * @return the initialized theme source (will never be {@code null})
 	 * @see #THEME_SOURCE_BEAN_NAME
 	 */
 	public static ThemeSource initThemeSource(ApplicationContext context) {
diff --git a/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java b/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java
index 7525a3dede..65ead97598 100644
--- a/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java
+++ b/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java
@@ -227,7 +227,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 	/**
 	 * This default implementation determines the type based on the actual
 	 * field value, if any. Subclasses should override this to determine
-	 * the type from a descriptor, even for <code>null</code> values.
+	 * the type from a descriptor, even for {@code null} values.
 	 * @see #getActualFieldValue
 	 */
 	@Override
@@ -295,7 +295,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 	}
 
 	/**
-	 * This implementation returns <code>null</code>.
+	 * This implementation returns {@code null}.
 	 */
 	public PropertyEditorRegistry getPropertyEditorRegistry() {
 		return null;
diff --git a/spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java b/spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
index 27f71d94e4..fb0199e1fc 100644
--- a/spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
+++ b/spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
@@ -131,7 +131,7 @@ public abstract class AbstractPropertyBindingResult extends AbstractBindingResul
 	/**
 	 * Retrieve the custom PropertyEditor for the given field, if any.
 	 * @param fixedField the fully qualified field name
-	 * @return the custom PropertyEditor, or <code>null</code>
+	 * @return the custom PropertyEditor, or {@code null}
 	 */
 	protected PropertyEditor getCustomEditor(String fixedField) {
 		Class<?> targetType = getPropertyAccessor().getPropertyType(fixedField);
diff --git a/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java b/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
index 53311e519f..9043faffd8 100644
--- a/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
+++ b/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
@@ -30,9 +30,9 @@ import org.springframework.util.Assert;
  *
  * <p>Performs standard JavaBean property access, also supporting nested
  * properties. Normally, application code will work with the
- * <code>Errors</code> interface or the <code>BindingResult</code> interface.
- * A {@link DataBinder} returns its <code>BindingResult</code> via
- * {@link org.springframework.validation.DataBinder#getBindingResult()}.
+ * {@code Errors} interface or the {@code BindingResult} interface.
+ * A {@link DataBinder} returns its {@code BindingResult} via
+ * {@link DataBinder#getBindingResult()}.
  *
  * @author Juergen Hoeller
  * @since 2.0
diff --git a/spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java b/spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java
index 2a76abcd2c..6650c3d1c7 100644
--- a/spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java
+++ b/spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java
@@ -19,9 +19,9 @@ package org.springframework.validation;
 import org.springframework.beans.PropertyAccessException;
 
 /**
- * Strategy for processing <code>DataBinder</code>'s missing field errors,
- * and for translating a <code>PropertyAccessException</code> to a
- * <code>FieldError</code>.
+ * Strategy for processing {@code DataBinder}'s missing field errors,
+ * and for translating a {@code PropertyAccessException} to a
+ * {@code FieldError}.
  *
  * <p>The error processor is pluggable so you can treat errors differently
  * if you want to. A default implementation is provided for typical needs.
@@ -47,24 +47,24 @@ public interface BindingErrorProcessor {
 	 * @param missingField the field that was missing during binding
 	 * @param bindingResult the errors object to add the error(s) to.
 	 * You can add more than just one error or maybe even ignore it.
-	 * The <code>BindingResult</code> object features convenience utils such as
-	 * a <code>resolveMessageCodes</code> method to resolve an error code.
+	 * The {@code BindingResult} object features convenience utils such as
+	 * a {@code resolveMessageCodes} method to resolve an error code.
 	 * @see BeanPropertyBindingResult#addError
 	 * @see BeanPropertyBindingResult#resolveMessageCodes
 	 */
 	void processMissingFieldError(String missingField, BindingResult bindingResult);
 
 	/**
-	 * Translate the given <code>PropertyAccessException</code> to an appropriate
-	 * error registered on the given <code>Errors</code> instance.
-	 * <p>Note that two error types are available: <code>FieldError</code> and
-	 * <code>ObjectError</code>. Usually, field errors are created, but in certain
-	 * situations one might want to create a global <code>ObjectError</code> instead.
-	 * @param ex the <code>PropertyAccessException</code> to translate
+	 * Translate the given {@code PropertyAccessException} to an appropriate
+	 * error registered on the given {@code Errors} instance.
+	 * <p>Note that two error types are available: {@code FieldError} and
+	 * {@code ObjectError}. Usually, field errors are created, but in certain
+	 * situations one might want to create a global {@code ObjectError} instead.
+	 * @param ex the {@code PropertyAccessException} to translate
 	 * @param bindingResult the errors object to add the error(s) to.
 	 * You can add more than just one error or maybe even ignore it.
-	 * The <code>BindingResult</code> object features convenience utils such as
-	 * a <code>resolveMessageCodes</code> method to resolve an error code.
+	 * The {@code BindingResult} object features convenience utils such as
+	 * a {@code resolveMessageCodes} method to resolve an error code.
 	 * @see Errors
 	 * @see FieldError
 	 * @see ObjectError
diff --git a/spring-context/src/main/java/org/springframework/validation/BindingResult.java b/spring-context/src/main/java/org/springframework/validation/BindingResult.java
index 3069a42a17..1ee5b66774 100644
--- a/spring-context/src/main/java/org/springframework/validation/BindingResult.java
+++ b/spring-context/src/main/java/org/springframework/validation/BindingResult.java
@@ -64,7 +64,7 @@ public interface BindingResult extends Errors {
 	 * Adding things to the map and then re-calling this method will not work.
 	 * <p>The attributes in the model Map returned by this method are usually
 	 * included in the {@link org.springframework.web.servlet.ModelAndView}
-	 * for a form view that uses Spring's <code>bind</code> tag in a JSP,
+	 * for a form view that uses Spring's {@code bind} tag in a JSP,
 	 * which needs access to the BindingResult instance. Spring's pre-built
 	 * form controllers will do this for you when rendering a form view.
 	 * When building the ModelAndView instance yourself, you need to include
@@ -82,23 +82,23 @@ public interface BindingResult extends Errors {
 	 * Typically used for comparison purposes.
 	 * @param field the field to check
 	 * @return the current value of the field in its raw form,
-	 * or <code>null</code> if not known
+	 * or {@code null} if not known
 	 */
 	Object getRawFieldValue(String field);
 
 	/**
 	 * Find a custom property editor for the given type and property.
 	 * @param field the path of the property (name or nested path), or
-	 * <code>null</code> if looking for an editor for all properties of the given type
-	 * @param valueType the type of the property (can be <code>null</code> if a property
+	 * {@code null} if looking for an editor for all properties of the given type
+	 * @param valueType the type of the property (can be {@code null} if a property
 	 * is given but should be specified in any case for consistency checking)
-	 * @return the registered editor, or <code>null</code> if none
+	 * @return the registered editor, or {@code null} if none
 	 */
 	PropertyEditor findEditor(String field, Class<?> valueType);
 
 	/**
 	 * Return the underlying PropertyEditorRegistry.
-	 * @return the PropertyEditorRegistry, or <code>null</code> if none
+	 * @return the PropertyEditorRegistry, or {@code null} if none
 	 * available for this BindingResult
 	 */
 	PropertyEditorRegistry getPropertyEditorRegistry();
diff --git a/spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java b/spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java
index 7ab8863955..15d0981bfe 100644
--- a/spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java
+++ b/spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java
@@ -33,7 +33,7 @@ public abstract class BindingResultUtils {
 	 * Find the BindingResult for the given name in the given model.
 	 * @param model the model to search
 	 * @param name the name of the target object to find a BindingResult for
-	 * @return the BindingResult, or <code>null</code> if none found
+	 * @return the BindingResult, or {@code null} if none found
 	 * @throws IllegalStateException if the attribute found is not of type BindingResult
 	 */
 	public static BindingResult getBindingResult(Map<?, ?> model, String name) {
@@ -50,7 +50,7 @@ public abstract class BindingResultUtils {
 	 * Find a required BindingResult for the given name in the given model.
 	 * @param model the model to search
 	 * @param name the name of the target object to find a BindingResult for
-	 * @return the BindingResult (never <code>null</code>)
+	 * @return the BindingResult (never {@code null})
 	 * @throws IllegalStateException if no BindingResult found
 	 */
 	public static BindingResult getRequiredBindingResult(Map<?, ?> model, String name) {
diff --git a/spring-context/src/main/java/org/springframework/validation/DataBinder.java b/spring-context/src/main/java/org/springframework/validation/DataBinder.java
index 973e3712ad..a9d5d83587 100644
--- a/spring-context/src/main/java/org/springframework/validation/DataBinder.java
+++ b/spring-context/src/main/java/org/springframework/validation/DataBinder.java
@@ -148,7 +148,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
 
 	/**
 	 * Create a new DataBinder instance, with default object name.
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @see #DEFAULT_OBJECT_NAME
 	 */
@@ -158,7 +158,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
 
 	/**
 	 * Create a new DataBinder instance.
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @param objectName the name of the target object
 	 */
@@ -383,7 +383,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
 	 * fields. Restrict this for example to avoid unwanted modifications
 	 * by malicious users when binding HTTP request parameters.
 	 * <p>Supports "xxx*", "*xxx" and "*xxx*" patterns. More sophisticated matching
-	 * can be implemented by overriding the <code>isAllowed</code> method.
+	 * can be implemented by overriding the {@code isAllowed} method.
 	 * <p>Alternatively, specify a list of <i>disallowed</i> fields.
 	 * @param allowedFields array of field names
 	 * @see #setDisallowedFields
@@ -407,7 +407,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
 	 * Mark fields as disallowed for example to avoid unwanted modifications
 	 * by malicious users when binding HTTP request parameters.
 	 * <p>Supports "xxx*", "*xxx" and "*xxx*" patterns. More sophisticated matching
-	 * can be implemented by overriding the <code>isAllowed</code> method.
+	 * can be implemented by overriding the {@code isAllowed} method.
 	 * <p>Alternatively, specify a list of <i>allowed</i> fields.
 	 * @param disallowedFields array of field names
 	 * @see #setAllowedFields
@@ -475,7 +475,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
 
 	/**
 	 * Set the strategy to use for processing binding errors, that is,
-	 * required field errors and <code>PropertyAccessException</code>s.
+	 * required field errors and {@code PropertyAccessException}s.
 	 * <p>Default is a DefaultBindingErrorProcessor.
 	 * @see DefaultBindingErrorProcessor
 	 */
diff --git a/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java b/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java
index 6f61c910b8..64ea2a3727 100644
--- a/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java
+++ b/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java
@@ -27,8 +27,8 @@ import org.springframework.util.StringUtils;
  * <p>Uses the "required" error code and the field name to resolve message codes
  * for a missing field error.
  *
- * <p>Creates a <code>FieldError</code> for each <code>PropertyAccessException</code>
- * given, using the <code>PropertyAccessException</code>'s error code ("typeMismatch",
+ * <p>Creates a {@code FieldError} for each {@code PropertyAccessException}
+ * given, using the {@code PropertyAccessException}'s error code ("typeMismatch",
  * "methodInvocation") for resolving message codes.
  *
  * @author Alef Arendsen
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 65a3f6efe4..4dc62f449f 100644
--- a/spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
+++ b/spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
@@ -172,7 +172,7 @@ public class DefaultMessageCodesResolver implements MessageCodesResolver, Serial
 	}
 
 	/**
-	 * Add both keyed and non-keyed entries for the supplied <code>field</code>
+	 * Add both keyed and non-keyed entries for the supplied {@code field}
 	 * to the supplied field list.
 	 */
 	protected void buildFieldList(String field, List<String> fieldList) {
diff --git a/spring-context/src/main/java/org/springframework/validation/Errors.java b/spring-context/src/main/java/org/springframework/validation/Errors.java
index 2a4f4ce268..d21cb1f5d1 100644
--- a/spring-context/src/main/java/org/springframework/validation/Errors.java
+++ b/spring-context/src/main/java/org/springframework/validation/Errors.java
@@ -28,10 +28,10 @@ import org.springframework.beans.PropertyAccessor;
  * when binding to a customer object), or nested fields in case of
  * subobjects (e.g. "address.street"). Supports subtree navigation
  * via {@link #setNestedPath(String)}: for example, an
- * <code>AddressValidator</code> validates "address", not being aware
+ * {@code AddressValidator} validates "address", not being aware
  * that this is a subobject of customer.
  *
- * <p>Note: <code>Errors</code> objects are single-threaded.
+ * <p>Note: {@code Errors} objects are single-threaded.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -63,7 +63,7 @@ public interface Errors {
 	 * <p>For example, an address validator could validate the subobject
 	 * "address" of a customer object.
 	 * @param nestedPath nested path within this object,
-	 * e.g. "address" (defaults to "", <code>null</code> is also acceptable).
+	 * e.g. "address" (defaults to "", {@code null} is also acceptable).
 	 * Can end with a dot: both "address" and "address." are valid.
 	 */
 	void setNestedPath(String nestedPath);
@@ -79,7 +79,7 @@ public interface Errors {
 	 * Push the given sub path onto the nested path stack.
 	 * <p>A {@link #popNestedPath()} call will reset the original
 	 * nested path before the corresponding
-	 * <code>pushNestedPath(String)</code> call.
+	 * {@code pushNestedPath(String)} call.
 	 * <p>Using the nested path stack allows to set temporary nested paths
 	 * for subobjects without having to worry about a temporary path holder.
 	 * <p>For example: current path "spouse.", pushNestedPath("child") ->
@@ -116,7 +116,7 @@ public interface Errors {
 	 * using the given error description.
 	 * @param errorCode error code, interpretable as a message key
 	 * @param errorArgs error arguments, for argument binding via MessageFormat
-	 * (can be <code>null</code>)
+	 * (can be {@code null})
 	 * @param defaultMessage fallback default message
 	 */
 	void reject(String errorCode, Object[] errorArgs, String defaultMessage);
@@ -125,11 +125,11 @@ public interface Errors {
 	 * Register a field error for the specified field of the current object
 	 * (respecting the current nested path, if any), using the given error
 	 * description.
-	 * <p>The field name may be <code>null</code> or empty String to indicate
+	 * <p>The field name may be {@code null} or empty String to indicate
 	 * the current object itself rather than a field of it. This may result
 	 * in a corresponding field error within the nested object graph or a
 	 * global error if the current object is the top object.
-	 * @param field the field name (may be <code>null</code> or empty String)
+	 * @param field the field name (may be {@code null} or empty String)
 	 * @param errorCode error code, interpretable as a message key
 	 * @see #getNestedPath()
 	 */
@@ -139,11 +139,11 @@ public interface Errors {
 	 * Register a field error for the specified field of the current object
 	 * (respecting the current nested path, if any), using the given error
 	 * description.
-	 * <p>The field name may be <code>null</code> or empty String to indicate
+	 * <p>The field name may be {@code null} or empty String to indicate
 	 * the current object itself rather than a field of it. This may result
 	 * in a corresponding field error within the nested object graph or a
 	 * global error if the current object is the top object.
-	 * @param field the field name (may be <code>null</code> or empty String)
+	 * @param field the field name (may be {@code null} or empty String)
 	 * @param errorCode error code, interpretable as a message key
 	 * @param defaultMessage fallback default message
 	 * @see #getNestedPath()
@@ -154,29 +154,29 @@ public interface Errors {
 	 * Register a field error for the specified field of the current object
 	 * (respecting the current nested path, if any), using the given error
 	 * description.
-	 * <p>The field name may be <code>null</code> or empty String to indicate
+	 * <p>The field name may be {@code null} or empty String to indicate
 	 * the current object itself rather than a field of it. This may result
 	 * in a corresponding field error within the nested object graph or a
 	 * global error if the current object is the top object.
-	 * @param field the field name (may be <code>null</code> or empty String)
+	 * @param field the field name (may be {@code null} or empty String)
 	 * @param errorCode error code, interpretable as a message key
 	 * @param errorArgs error arguments, for argument binding via MessageFormat
-	 * (can be <code>null</code>)
+	 * (can be {@code null})
 	 * @param defaultMessage fallback default message
 	 * @see #getNestedPath()
 	 */
 	void rejectValue(String field, String errorCode, Object[] errorArgs, String defaultMessage);
 
 	/**
-	 * Add all errors from the given <code>Errors</code> instance to this
-	 * <code>Errors</code> instance.
-	 * <p>This is a onvenience method to avoid repeated <code>reject(..)</code>
-	 * calls for merging an <code>Errors</code> instance into another
-	 * <code>Errors</code> instance.
-	 * <p>Note that the passed-in <code>Errors</code> instance is supposed
+	 * Add all errors from the given {@code Errors} instance to this
+	 * {@code Errors} instance.
+	 * <p>This is a onvenience method to avoid repeated {@code reject(..)}
+	 * calls for merging an {@code Errors} instance into another
+	 * {@code Errors} instance.
+	 * <p>Note that the passed-in {@code Errors} instance is supposed
 	 * to refer to the same target object, or at least contain compatible errors
-	 * that apply to the target object of this <code>Errors</code> instance.
-	 * @param errors the <code>Errors</code> instance to merge in
+	 * that apply to the target object of this {@code Errors} instance.
+	 * @param errors the {@code Errors} instance to merge in
 	 */
 	void addAllErrors(Errors errors);
 
@@ -198,7 +198,7 @@ public interface Errors {
 
 	/**
 	 * Are there any global errors?
-	 * @return <code>true</code> if there are any global errors
+	 * @return {@code true} if there are any global errors
 	 * @see #hasFieldErrors()
 	 */
 	boolean hasGlobalErrors();
@@ -218,13 +218,13 @@ public interface Errors {
 
 	/**
 	 * Get the <i>first</i> global error, if any.
-	 * @return the global error, or <code>null</code>
+	 * @return the global error, or {@code null}
 	 */
 	ObjectError getGlobalError();
 
 	/**
 	 * Are there any field errors?
-	 * @return <code>true</code> if there are any errors associated with a field
+	 * @return {@code true} if there are any errors associated with a field
 	 * @see #hasGlobalErrors()
 	 */
 	boolean hasFieldErrors();
@@ -244,14 +244,14 @@ public interface Errors {
 
 	/**
 	 * Get the <i>first</i> error associated with a field, if any.
-	 * @return the field-specific error, or <code>null</code>
+	 * @return the field-specific error, or {@code null}
 	 */
 	FieldError getFieldError();
 
 	/**
 	 * Are there any errors associated with the given field?
 	 * @param field the field name
-	 * @return <code>true</code> if there were any errors associated with the given field
+	 * @return {@code true} if there were any errors associated with the given field
 	 */
 	boolean hasFieldErrors(String field);
 
@@ -274,7 +274,7 @@ public interface Errors {
 	/**
 	 * Get the first error associated with the given field, if any.
 	 * @param field the field name
-	 * @return the field-specific error, or <code>null</code>
+	 * @return the field-specific error, or {@code null}
 	 */
 	FieldError getFieldError(String field);
 
@@ -291,10 +291,10 @@ public interface Errors {
 	/**
 	 * Return the type of a given field.
 	 * <p>Implementations should be able to determine the type even
-	 * when the field value is <code>null</code>, for example from some
+	 * when the field value is {@code null}, for example from some
 	 * associated descriptor.
 	 * @param field the field name
-	 * @return the type of the field, or <code>null</code> if not determinable
+	 * @return the type of the field, or {@code null} if not determinable
 	 */
 	Class<?> getFieldType(String field);
 
diff --git a/spring-context/src/main/java/org/springframework/validation/FieldError.java b/spring-context/src/main/java/org/springframework/validation/FieldError.java
index e95baf93cf..2f94663cfb 100644
--- a/spring-context/src/main/java/org/springframework/validation/FieldError.java
+++ b/spring-context/src/main/java/org/springframework/validation/FieldError.java
@@ -24,7 +24,7 @@ import org.springframework.util.ObjectUtils;
  * field value.
  *
  * <p>See the {@link DefaultMessageCodesResolver} javadoc for details on
- * how a message code list is built for a <code>FieldError</code>.
+ * how a message code list is built for a {@code FieldError}.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
diff --git a/spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java b/spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java
index 867359f178..5fd476817f 100644
--- a/spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java
+++ b/spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java
@@ -47,7 +47,7 @@ public interface MessageCodesResolver {
 	 * @param errorCode the error code used for rejecting the value
 	 * @param objectName the name of the object
 	 * @param field the field name
-	 * @param fieldType the field type (may be <code>null</code> if not determinable)
+	 * @param fieldType the field type (may be {@code null} if not determinable)
 	 * @return the message codes to use
 	 */
 	String[] resolveMessageCodes(String errorCode, String objectName, String field, Class<?> fieldType);
diff --git a/spring-context/src/main/java/org/springframework/validation/ObjectError.java b/spring-context/src/main/java/org/springframework/validation/ObjectError.java
index fb774d8496..5b2dd29ee4 100644
--- a/spring-context/src/main/java/org/springframework/validation/ObjectError.java
+++ b/spring-context/src/main/java/org/springframework/validation/ObjectError.java
@@ -24,7 +24,7 @@ import org.springframework.util.Assert;
  * an object.
  *
  * <p>See the {@link DefaultMessageCodesResolver} javadoc for details on
- * how a message code list is built for an <code>ObjectError</code>.
+ * how a message code list is built for an {@code ObjectError}.
  *
  * @author Juergen Hoeller
  * @see FieldError
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 914318e254..07d14c681f 100644
--- a/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java
+++ b/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java
@@ -27,7 +27,7 @@ import org.springframework.util.StringUtils;
  * Utility class offering convenient methods for invoking a {@link Validator}
  * and for rejecting empty fields.
  *
- * <p>Checks for an empty field in <code>Validator</code> implementations can become
+ * <p>Checks for an empty field in {@code Validator} implementations can become
  * one-liners when using {@link #rejectIfEmpty} or {@link #rejectIfEmptyOrWhitespace}.
  *
  * @author Juergen Hoeller
@@ -44,11 +44,11 @@ public abstract class ValidationUtils {
 	/**
 	 * Invoke the given {@link Validator} for the supplied object and
 	 * {@link Errors} instance.
-	 * @param validator the <code>Validator</code> to be invoked (must not be <code>null</code>)
+	 * @param validator the {@code Validator} to be invoked (must not be {@code null})
 	 * @param obj the object to bind the parameters to
-	 * @param errors the {@link Errors} instance that should store the errors (must not be <code>null</code>)
-	 * @throws IllegalArgumentException if either of the <code>Validator</code> or <code>Errors</code> arguments is
-	 * <code>null</code>, or if the supplied <code>Validator</code> does not {@link Validator#supports(Class) support}
+	 * @param errors the {@link Errors} instance that should store the errors (must not be {@code null})
+	 * @throws IllegalArgumentException if either of the {@code Validator} or {@code Errors} arguments is
+	 * {@code null}, or if the supplied {@code Validator} does not {@link Validator#supports(Class) support}
 	 * the validation of the supplied object's type
 	 */
 	public static void invokeValidator(Validator validator, Object obj, Errors errors) {
@@ -58,12 +58,12 @@ public abstract class ValidationUtils {
 	/**
 	 * Invoke the given {@link Validator}/{@link SmartValidator} for the supplied object and
 	 * {@link Errors} instance.
-	 * @param validator the <code>Validator</code> to be invoked (must not be <code>null</code>)
+	 * @param validator the {@code Validator} to be invoked (must not be {@code null})
 	 * @param obj the object to bind the parameters to
-	 * @param errors the {@link Errors} instance that should store the errors (must not be <code>null</code>)
+	 * @param errors the {@link Errors} instance that should store the errors (must not be {@code null})
 	 * @param validationHints one or more hint objects to be passed to the validation engine
-	 * @throws IllegalArgumentException if either of the <code>Validator</code> or <code>Errors</code> arguments is
-	 * <code>null</code>, or if the supplied <code>Validator</code> does not {@link Validator#supports(Class) support}
+	 * @throws IllegalArgumentException if either of the {@code Validator} or {@code Errors} arguments is
+	 * {@code null}, or if the supplied {@code Validator} does not {@link Validator#supports(Class) support}
 	 * the validation of the supplied object's type
 	 */
 	public static void invokeValidator(Validator validator, Object obj, Errors errors, Object... validationHints) {
@@ -95,12 +95,12 @@ public abstract class ValidationUtils {
 
 	/**
 	 * Reject the given field with the given error code if the value is empty.
-	 * <p>An 'empty' value in this context means either <code>null</code> or
+	 * <p>An 'empty' value in this context means either {@code null} or
 	 * the empty string "".
 	 * <p>The object whose field is being validated does not need to be passed
 	 * in because the {@link Errors} instance can resolve field values by itself
 	 * (it will usually hold an internal reference to the target object).
-	 * @param errors the <code>Errors</code> instance to register errors on
+	 * @param errors the {@code Errors} instance to register errors on
 	 * @param field the field name to check
 	 * @param errorCode the error code, interpretable as message key
 	 */
@@ -111,12 +111,12 @@ public abstract class ValidationUtils {
 	/**
 	 * Reject the given field with the given error code and default message
 	 * if the value is empty.
-	 * <p>An 'empty' value in this context means either <code>null</code> or
+	 * <p>An 'empty' value in this context means either {@code null} or
 	 * the empty string "".
 	 * <p>The object whose field is being validated does not need to be passed
 	 * in because the {@link Errors} instance can resolve field values by itself
 	 * (it will usually hold an internal reference to the target object).
-	 * @param errors the <code>Errors</code> instance to register errors on
+	 * @param errors the {@code Errors} instance to register errors on
 	 * @param field the field name to check
 	 * @param errorCode error code, interpretable as message key
 	 * @param defaultMessage fallback default message
@@ -128,16 +128,16 @@ public abstract class ValidationUtils {
 	/**
 	 * Reject the given field with the given error codea nd error arguments
 	 * if the value is empty.
-	 * <p>An 'empty' value in this context means either <code>null</code> or
+	 * <p>An 'empty' value in this context means either {@code null} or
 	 * the empty string "".
 	 * <p>The object whose field is being validated does not need to be passed
 	 * in because the {@link Errors} instance can resolve field values by itself
 	 * (it will usually hold an internal reference to the target object).
-	 * @param errors the <code>Errors</code> instance to register errors on
+	 * @param errors the {@code Errors} instance to register errors on
 	 * @param field the field name to check
 	 * @param errorCode the error code, interpretable as message key
 	 * @param errorArgs the error arguments, for argument binding via MessageFormat
-	 * (can be <code>null</code>)
+	 * (can be {@code null})
 	 */
 	public static void rejectIfEmpty(Errors errors, String field, String errorCode, Object[] errorArgs) {
 		rejectIfEmpty(errors, field, errorCode, errorArgs, null);
@@ -146,16 +146,16 @@ public abstract class ValidationUtils {
 	/**
 	 * Reject the given field with the given error code, error arguments
 	 * and default message if the value is empty.
-	 * <p>An 'empty' value in this context means either <code>null</code> or
+	 * <p>An 'empty' value in this context means either {@code null} or
 	 * the empty string "".
 	 * <p>The object whose field is being validated does not need to be passed
 	 * in because the {@link Errors} instance can resolve field values by itself
 	 * (it will usually hold an internal reference to the target object).
-	 * @param errors the <code>Errors</code> instance to register errors on
+	 * @param errors the {@code Errors} instance to register errors on
 	 * @param field the field name to check
 	 * @param errorCode the error code, interpretable as message key
 	 * @param errorArgs the error arguments, for argument binding via MessageFormat
-	 * (can be <code>null</code>)
+	 * (can be {@code null})
 	 * @param defaultMessage fallback default message
 	 */
 	public static void rejectIfEmpty(
@@ -171,12 +171,12 @@ public abstract class ValidationUtils {
 	/**
 	 * Reject the given field with the given error code if the value is empty
 	 * or just contains whitespace.
-	 * <p>An 'empty' value in this context means either <code>null</code>,
+	 * <p>An 'empty' value in this context means either {@code null},
 	 * the empty string "", or consisting wholly of whitespace.
 	 * <p>The object whose field is being validated does not need to be passed
 	 * in because the {@link Errors} instance can resolve field values by itself
 	 * (it will usually hold an internal reference to the target object).
-	 * @param errors the <code>Errors</code> instance to register errors on
+	 * @param errors the {@code Errors} instance to register errors on
 	 * @param field the field name to check
 	 * @param errorCode the error code, interpretable as message key
 	 */
@@ -187,12 +187,12 @@ public abstract class ValidationUtils {
 	/**
 	 * Reject the given field with the given error code and default message
 	 * if the value is empty or just contains whitespace.
-	 * <p>An 'empty' value in this context means either <code>null</code>,
+	 * <p>An 'empty' value in this context means either {@code null},
 	 * the empty string "", or consisting wholly of whitespace.
 	 * <p>The object whose field is being validated does not need to be passed
 	 * in because the {@link Errors} instance can resolve field values by itself
 	 * (it will usually hold an internal reference to the target object).
-	 * @param errors the <code>Errors</code> instance to register errors on
+	 * @param errors the {@code Errors} instance to register errors on
 	 * @param field the field name to check
 	 * @param errorCode the error code, interpretable as message key
 	 * @param defaultMessage fallback default message
@@ -206,16 +206,16 @@ public abstract class ValidationUtils {
 	/**
 	 * Reject the given field with the given error code and error arguments
 	 * if the value is empty or just contains whitespace.
-	 * <p>An 'empty' value in this context means either <code>null</code>,
+	 * <p>An 'empty' value in this context means either {@code null},
 	 * the empty string "", or consisting wholly of whitespace.
 	 * <p>The object whose field is being validated does not need to be passed
 	 * in because the {@link Errors} instance can resolve field values by itself
 	 * (it will usually hold an internal reference to the target object).
-	 * @param errors the <code>Errors</code> instance to register errors on
+	 * @param errors the {@code Errors} instance to register errors on
 	 * @param field the field name to check
 	 * @param errorCode the error code, interpretable as message key
 	 * @param errorArgs the error arguments, for argument binding via MessageFormat
-	 * (can be <code>null</code>)
+	 * (can be {@code null})
 	 */
 	public static void rejectIfEmptyOrWhitespace(
 			Errors errors, String field, String errorCode, Object[] errorArgs) {
@@ -226,16 +226,16 @@ public abstract class ValidationUtils {
 	/**
 	 * Reject the given field with the given error code, error arguments
 	 * and default message if the value is empty or just contains whitespace.
-	 * <p>An 'empty' value in this context means either <code>null</code>,
+	 * <p>An 'empty' value in this context means either {@code null},
 	 * the empty string "", or consisting wholly of whitespace.
 	 * <p>The object whose field is being validated does not need to be passed
 	 * in because the {@link Errors} instance can resolve field values by itself
 	 * (it will usually hold an internal reference to the target object).
-	 * @param errors the <code>Errors</code> instance to register errors on
+	 * @param errors the {@code Errors} instance to register errors on
 	 * @param field the field name to check
 	 * @param errorCode the error code, interpretable as message key
 	 * @param errorArgs the error arguments, for argument binding via MessageFormat
-	 * (can be <code>null</code>)
+	 * (can be {@code null})
 	 * @param defaultMessage fallback default message
 	 */
 	public static void rejectIfEmptyOrWhitespace(
diff --git a/spring-context/src/main/java/org/springframework/validation/Validator.java b/spring-context/src/main/java/org/springframework/validation/Validator.java
index 671cd90bf6..f076ea6fe2 100644
--- a/spring-context/src/main/java/org/springframework/validation/Validator.java
+++ b/spring-context/src/main/java/org/springframework/validation/Validator.java
@@ -26,12 +26,12 @@ package org.springframework.validation;
  * of an application, and supports the encapsulation of validation
  * logic as a first-class citizen in its own right.
  *
- * <p>Find below a simple but complete <code>Validator</code>
+ * <p>Find below a simple but complete {@code Validator}
  * implementation, which validates that the various {@link String}
- * properties of a <code>UserLogin</code> instance are not empty
- * (that is they are not <code>null</code> and do not consist
+ * properties of a {@code UserLogin} instance are not empty
+ * (that is they are not {@code null} and do not consist
  * wholly of whitespace), and that any password that is present is
- * at least <code>'MINIMUM_PASSWORD_LENGTH'</code> characters in length.
+ * at least {@code 'MINIMUM_PASSWORD_LENGTH'} characters in length.
  *
  * <pre class="code"> public class UserLoginValidator implements Validator {
  *
@@ -55,7 +55,7 @@ package org.springframework.validation;
  * }</pre>
  *
  * <p>See also the Spring reference manual for a fuller discussion of
- * the <code>Validator</code> interface and it's role in an enterprise
+ * the {@code Validator} interface and it's role in an enterprise
  * application.
  *
  * @author Rod Johnson
@@ -66,27 +66,27 @@ public interface Validator {
 
 	/**
 	 * Can this {@link Validator} {@link #validate(Object, Errors) validate}
-	 * instances of the supplied <code>clazz</code>?
+	 * instances of the supplied {@code clazz}?
 	 * <p>This method is <i>typically</i> implemented like so:
 	 * <pre class="code">return Foo.class.isAssignableFrom(clazz);</pre>
-	 * (Where <code>Foo</code> is the class (or superclass) of the actual
+	 * (Where {@code Foo} is the class (or superclass) of the actual
 	 * object instance that is to be {@link #validate(Object, Errors) validated}.)
 	 * @param clazz the {@link Class} that this {@link Validator} is
 	 * being asked if it can {@link #validate(Object, Errors) validate}
-	 * @return <code>true</code> if this {@link Validator} can indeed
+	 * @return {@code true} if this {@link Validator} can indeed
 	 * {@link #validate(Object, Errors) validate} instances of the
-	 * supplied <code>clazz</code>
+	 * supplied {@code clazz}
 	 */
 	boolean supports(Class<?> clazz);
 
 	/**
-	 * Validate the supplied <code>target</code> object, which must be
+	 * Validate the supplied {@code target} object, which must be
 	 * of a {@link Class} for which the {@link #supports(Class)} method
-	 * typically has (or would) return <code>true</code>.
+	 * typically has (or would) return {@code true}.
 	 * <p>The supplied {@link Errors errors} instance can be used to report
 	 * any resulting validation errors.
-	 * @param target the object that is to be validated (can be <code>null</code>)
-	 * @param errors contextual state about the validation process (never <code>null</code>)
+	 * @param target the object that is to be validated (can be {@code null})
+	 * @param errors contextual state about the validation process (never {@code null})
 	 * @see ValidationUtils
 	 */
 	void validate(Object target, Errors errors);
diff --git a/spring-context/src/main/java/org/springframework/validation/annotation/package-info.java b/spring-context/src/main/java/org/springframework/validation/annotation/package-info.java
index 2283a3bba6..17f378cb16 100644
--- a/spring-context/src/main/java/org/springframework/validation/annotation/package-info.java
+++ b/spring-context/src/main/java/org/springframework/validation/annotation/package-info.java
@@ -2,7 +2,7 @@
  * Support classes for annotation-based constraint evaluation,
  * e.g. using a JSR-303 Bean Validation provider.
  *
- * <p>Provides an extended variant of JSR-303's <code>@Valid</code>,
+ * <p>Provides an extended variant of JSR-303's {@code @Valid},
  * supporting the specification of validation groups.
  */
 package org.springframework.validation.annotation;
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 a885fddb73..1cc392278f 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
@@ -39,8 +39,8 @@ import org.springframework.core.io.Resource;
 import org.springframework.util.CollectionUtils;
 
 /**
- * This is the central class for <code>javax.validation</code> (JSR-303) setup
- * in a Spring application context: It bootstraps a <code>javax.validation.ValidationFactory</code>
+ * This is the central class for {@code javax.validation} (JSR-303) setup
+ * in a Spring application context: It bootstraps a {@code javax.validation.ValidationFactory}
  * and exposes it through the Spring {@link org.springframework.validation.Validator} interface
  * as well as through the JSR-303 {@link javax.validation.Validator} interface and the
  * {@link javax.validation.ValidatorFactory} interface itself.
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
index 6e92e38fd9..58cd161175 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
@@ -39,7 +39,7 @@ import org.springframework.validation.annotation.Validated;
  * and/or on their return value (in the latter case specified at the method level,
  * typically as inline annotation).
  *
- * <p>E.g.: <code>public @NotNull Object myValidMethod(@NotNull String arg1, @Max(10) int arg2)</code>
+ * <p>E.g.: {@code public @NotNull Object myValidMethod(@NotNull String arg1, @Max(10) int arg2)}
  *
  * <p>Validation groups can be specified through Spring's {@link Validated} annotation
  * at the type level of the containing target class, applying to all public service methods
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
index 0579acce6c..1a51c37bb9 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
@@ -37,7 +37,7 @@ import org.springframework.validation.ObjectError;
 import org.springframework.validation.SmartValidator;
 
 /**
- * Adapter that takes a JSR-303 <code>javax.validator.Validator</code>
+ * Adapter that takes a JSR-303 {@code javax.validator.Validator}
  * and exposes it as a Spring {@link org.springframework.validation.Validator}
  * while also exposing the original JSR-303 Validator interface itself.
  *
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
index ea2b39088c..79fcd4e225 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
@@ -437,7 +437,7 @@ public abstract class AbstractAopProxyTests {
 
 	/**
 	 * Test that the proxy returns itself when the
-	 * target returns <code>this</code>
+	 * target returns {@code this}
 	 */
 	@Test
 	public void testTargetReturnsThis() throws Throwable {
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 ba8775956a..c40b734119 100644
--- a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
@@ -29,12 +29,12 @@ import org.springframework.util.MBeanTestUtils;
 
 /**
  * <strong>Note:</strong> the JMX test suite requires the presence of the
- * <code>jmxremote_optional.jar</code> in your classpath. Thus, if you
+ * {@code jmxremote_optional.jar} in your classpath. Thus, if you
  * run into the <em>"Unsupported protocol: jmxmp"</em> error, you will
  * need to download the
  * <a href="http://www.oracle.com/technetwork/java/javase/tech/download-jsp-141676.html">JMX Remote API 1.0.1_04 Reference Implementation</a>
- * from Oracle and extract <code>jmxremote_optional.jar</code> into your
- * classpath, for example in the <code>lib/ext</code> folder of your JVM.
+ * from Oracle and extract {@code jmxremote_optional.jar} into your
+ * classpath, for example in the {@code lib/ext} folder of your JVM.
  * See also <a href="https://issuetracker.springsource.com/browse/EBR-349">EBR-349</a>.
  *
  * @author Rob Harrop
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index 28670fd438..f372307e58 100644
--- a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -38,7 +38,7 @@ public class ExpectedLookupTemplate extends JndiTemplate {
 
 	/**
 	 * Construct a new JndiTemplate that will always return given objects
-	 * for given names. To be populated through <code>addObject</code> calls.
+	 * for given names. To be populated through {@code addObject} calls.
 	 * @see #addObject(String, Object)
 	 */
 	public ExpectedLookupTemplate() {
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
index b6489e4202..c71d6e8681 100644
--- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
@@ -41,13 +41,13 @@ import org.springframework.util.StringUtils;
  * Mainly for test environments, but also usable for standalone applications.
  *
  * <p>This class is not intended for direct usage by applications, although it
- * can be used for example to override JndiTemplate's <code>createInitialContext</code>
+ * can be used for example to override JndiTemplate's {@code createInitialContext}
  * method in unit tests. Typically, SimpleNamingContextBuilder will be used to
  * set up a JVM-level JNDI environment.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
- * @see org.springframework.mock.jndi.SimpleNamingContextBuilder
+ * @see SimpleNamingContextBuilder
  * @see org.springframework.jndi.JndiTemplate#createInitialContext
  */
 public class SimpleNamingContext implements Context {
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index f6c3f0a376..f21936897b 100644
--- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -33,7 +33,7 @@ import org.springframework.util.ClassUtils;
  * Simple implementation of a JNDI naming context builder.
  *
  * <p>Mainly targeted at test environments, where each test case can
- * configure JNDI appropriately, so that <code>new InitialContext()</code>
+ * configure JNDI appropriately, so that {@code new InitialContext()}
  * will expose the required objects. Also usable for standalone applications,
  * e.g. for binding a JDBC DataSource to a well-known JNDI location, to be
  * able to use traditional J2EE data access code outside of a J2EE container.
@@ -63,7 +63,7 @@ import org.springframework.util.ClassUtils;
  * DataSource ds = new DriverManagerDataSource(...);
  * builder.bind("java:comp/env/jdbc/myds", ds);</pre>
  *
- * Note that you <i>should not</i> call <code>activate()</code> on a builder from
+ * Note that you <i>should not</i> call {@code activate()} on a builder from
  * this factory method, as there will already be an activated one in any case.
  *
  * <p>An instance of this class is only necessary at setup time.
@@ -74,7 +74,7 @@ import org.springframework.util.ClassUtils;
  * @see #emptyActivatedContextBuilder()
  * @see #bind(String, Object)
  * @see #activate()
- * @see org.springframework.mock.jndi.SimpleNamingContext
+ * @see SimpleNamingContext
  * @see org.springframework.jdbc.datasource.SingleConnectionDataSource
  * @see org.springframework.jdbc.datasource.DriverManagerDataSource
  * @see org.apache.commons.dbcp.BasicDataSource
@@ -92,7 +92,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 	/**
 	 * Checks if a SimpleNamingContextBuilder is active.
 	 * @return the current SimpleNamingContextBuilder instance,
-	 * or <code>null</code> if none
+	 * or {@code null} if none
 	 */
 	public static SimpleNamingContextBuilder getCurrentContextBuilder() {
 		return activated;
@@ -129,8 +129,8 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 
 	/**
 	 * Register the context builder by registering it with the JNDI NamingManager.
-	 * Note that once this has been done, <code>new InitialContext()</code> will always
-	 * return a context from this factory. Use the <code>emptyActivatedContextBuilder()</code>
+	 * Note that once this has been done, {@code new InitialContext()} will always
+	 * return a context from this factory. Use the {@code emptyActivatedContextBuilder()}
 	 * static method to get an empty context (for example, in test methods).
 	 * @throws IllegalStateException if there's already a naming context builder
 	 * registered with the JNDI NamingManager
@@ -156,7 +156,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 	 * Temporarily deactivate this context builder. It will remain registered with
 	 * the JNDI NamingManager but will delegate to the standard JNDI InitialContextFactory
 	 * (if configured) instead of exposing its own bound objects.
-	 * <p>Call <code>activate()</code> again in order to expose this context builder's own
+	 * <p>Call {@code activate()} again in order to expose this context builder's own
 	 * bound objects again. Such activate/deactivate sequences can be applied any number
 	 * of times (e.g. within a larger integration test suite running in the same VM).
 	 * @see #activate()
diff --git a/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java b/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java
index f0a11b506c..b0e4757d4c 100644
--- a/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java
+++ b/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java
@@ -26,8 +26,8 @@ package org.springframework.core;
 public interface AttributeAccessor {
 
 	/**
-	 * Set the attribute defined by <code>name</code> to the supplied	<code>value</code>.
-	 * If <code>value</code> is <code>null</code>, the attribute is {@link #removeAttribute removed}.
+	 * Set the attribute defined by {@code name} to the supplied	{@code value}.
+	 * If {@code value} is {@code null}, the attribute is {@link #removeAttribute removed}.
 	 * <p>In general, users should take care to prevent overlaps with other
 	 * metadata attributes by using fully-qualified names, perhaps using
 	 * class or package names as prefix.
@@ -37,24 +37,24 @@ public interface AttributeAccessor {
 	void setAttribute(String name, Object value);
 
 	/**
-	 * Get the value of the attribute identified by <code>name</code>.
-	 * Return <code>null</code> if the attribute doesn't exist.
+	 * Get the value of the attribute identified by {@code name}.
+	 * Return {@code null} if the attribute doesn't exist.
 	 * @param name the unique attribute key
 	 * @return the current value of the attribute, if any
 	 */
 	Object getAttribute(String name);
 
 	/**
-	 * Remove the attribute identified by <code>name</code> and return its value.
-	 * Return <code>null</code> if no attribute under <code>name</code> is found.
+	 * Remove the attribute identified by {@code name} and return its value.
+	 * Return {@code null} if no attribute under {@code name} is found.
 	 * @param name the unique attribute key
 	 * @return the last value of the attribute, if any
 	 */
 	Object removeAttribute(String name);
 
 	/**
-	 * Return <code>true</code> if the attribute identified by <code>name</code> exists.
-	 * Otherwise return <code>false</code>.
+	 * Return {@code true} if the attribute identified by {@code name} exists.
+	 * Otherwise return {@code false}.
 	 * @param name the unique attribute key
 	 */
 	boolean hasAttribute(String name);
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 1a67089bf7..ef63695b57 100644
--- a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
@@ -91,7 +91,7 @@ public abstract class BridgeMethodResolver {
 	 * Searches for the bridged method in the given candidates.
 	 * @param candidateMethods the List of candidate Methods
 	 * @param bridgeMethod the bridge method
-	 * @return the bridged method, or <code>null</code> if none found
+	 * @return the bridged method, or {@code null} if none found
 	 */
 	private static Method searchCandidates(List<Method> candidateMethods, Method bridgeMethod) {
 		if (candidateMethods.isEmpty()) {
@@ -114,7 +114,7 @@ public abstract class BridgeMethodResolver {
 	}
 
 	/**
-	 * Returns <code>true</code> if the supplied '<code>candidateMethod</code>' can be
+	 * Returns {@code true} if the supplied '{@code candidateMethod}' can be
 	 * consider a validate candidate for the {@link Method} that is {@link Method#isBridge() bridged}
 	 * by the supplied {@link Method bridge Method}. This method performs inexpensive
 	 * checks and can be used quickly filter for a set of possible matches.
@@ -166,10 +166,10 @@ public abstract class BridgeMethodResolver {
 	}
 
 	/**
-	 * Returns <code>true</code> if the {@link Type} signature of both the supplied
+	 * Returns {@code true} if the {@link Type} signature of both the supplied
 	 * {@link Method#getGenericParameterTypes() generic Method} and concrete {@link Method}
 	 * are equal after resolving all {@link TypeVariable TypeVariables} using the supplied
-	 * TypeVariable Map, otherwise returns <code>false</code>.
+	 * TypeVariable Map, otherwise returns {@code false}.
 	 */
 	private static boolean isResolvedTypeMatch(
 			Method genericMethod, Method candidateMethod, Map<TypeVariable, Type> typeVariableMap) {
@@ -205,7 +205,7 @@ public abstract class BridgeMethodResolver {
 	/**
 	 * If the supplied {@link Class} has a declared {@link Method} whose signature matches
 	 * that of the supplied {@link Method}, then this matching {@link Method} is returned,
-	 * otherwise <code>null</code> is returned.
+	 * otherwise {@code null} is returned.
 	 */
 	private static Method searchForMatch(Class type, Method bridgeMethod) {
 		return ReflectionUtils.findMethod(type, bridgeMethod.getName(), bridgeMethod.getParameterTypes());
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 9f428dc216..4c1daf0f5f 100644
--- a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
@@ -187,8 +187,8 @@ public abstract class CollectionFactory {
 	 * Determine whether the given collection type is an approximable type,
 	 * i.e. a type that {@link #createApproximateCollection} can approximate.
 	 * @param collectionType the collection type to check
-	 * @return <code>true</code> if the type is approximable,
-	 * <code>false</code> if it is not
+	 * @return {@code true} if the type is approximable,
+	 * {@code false} if it is not
 	 */
 	public static boolean isApproximableCollectionType(Class<?> collectionType) {
 		return (collectionType != null && approximableCollectionTypes.contains(collectionType));
@@ -265,8 +265,8 @@ public abstract class CollectionFactory {
 	 * Determine whether the given map type is an approximable type,
 	 * i.e. a type that {@link #createApproximateMap} can approximate.
 	 * @param mapType the map type to check
-	 * @return <code>true</code> if the type is approximable,
-	 * <code>false</code> if it is not
+	 * @return {@code true} if the type is approximable,
+	 * {@code false} if it is not
 	 */
 	public static boolean isApproximableMapType(Class<?> mapType) {
 		return (mapType != null && approximableMapTypes.contains(mapType));
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 20c729955b..45ff9c468e 100644
--- a/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java
+++ b/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java
@@ -129,7 +129,7 @@ public class ConfigurableObjectInputStream extends ObjectInputStream {
 	 * since there is no fallback available.
 	 * @param className the class name to resolve
 	 * @param ex the original exception thrown when attempting to load the class
-	 * @return the newly resolved class (never <code>null</code>)
+	 * @return the newly resolved class (never {@code null})
 	 */
 	protected Class resolveFallbackIfPossible(String className, ClassNotFoundException ex)
 			throws IOException, ClassNotFoundException{
@@ -140,7 +140,7 @@ public class ConfigurableObjectInputStream extends ObjectInputStream {
 	/**
 	 * 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</code>.
+	 * <p>The default implementation simply returns {@code null}.
 	 */
 	protected ClassLoader getFallbackClassLoader() throws IOException {
 		return null;
diff --git a/spring-core/src/main/java/org/springframework/core/Constants.java b/spring-core/src/main/java/org/springframework/core/Constants.java
index 67621e01f0..3f8d9737bc 100644
--- a/spring-core/src/main/java/org/springframework/core/Constants.java
+++ b/spring-core/src/main/java/org/springframework/core/Constants.java
@@ -28,12 +28,12 @@ import org.springframework.util.ReflectionUtils;
 
 /**
  * This class can be used to parse other classes containing constant definitions
- * in public static final members. The <code>asXXXX</code> methods of this class
+ * in public static final members. The {@code asXXXX} methods of this class
  * allow these constant values to be accessed via their string names.
  *
- * <p>Consider class Foo containing <code>public final static int CONSTANT1 = 66;</code>
- * An instance of this class wrapping <code>Foo.class</code> will return the constant value
- * of 66 from its <code>asNumber</code> method given the argument <code>"CONSTANT1"</code>.
+ * <p>Consider class Foo containing {@code public final static int CONSTANT1 = 66;}
+ * An instance of this class wrapping {@code Foo.class} will return the constant value
+ * of 66 from its {@code asNumber} method given the argument {@code "CONSTANT1"}.
  *
  * <p>This class is ideal for use in PropertyEditors, enabling them to
  * recognize the same names as the constants themselves, and freeing them
@@ -56,7 +56,7 @@ public class Constants {
 	 * Create a new Constants converter class wrapping the given class.
 	 * <p>All <b>public</b> static final variables will be exposed, whatever their type.
 	 * @param clazz the class to analyze
-	 * @throws IllegalArgumentException if the supplied <code>clazz</code> is <code>null</code>
+	 * @throws IllegalArgumentException if the supplied {@code clazz} is {@code null}
 	 */
 	public Constants(Class<?> clazz) {
 		Assert.notNull(clazz);
@@ -102,7 +102,7 @@ public class Constants {
 
 	/**
 	 * Return a constant value cast to a Number.
-	 * @param code the name of the field (never <code>null</code>)
+	 * @param code the name of the field (never {@code null})
 	 * @return the Number value
 	 * @see #asObject
 	 * @throws ConstantException if the field name wasn't found
@@ -118,9 +118,9 @@ public class Constants {
 
 	/**
 	 * Return a constant value as a String.
-	 * @param code the name of the field (never <code>null</code>)
+	 * @param code the name of the field (never {@code null})
 	 * @return the String value
-	 * Works even if it's not a string (invokes <code>toString()</code>).
+	 * Works even if it's not a string (invokes {@code toString()}).
 	 * @see #asObject
 	 * @throws ConstantException if the field name wasn't found
 	 */
@@ -132,7 +132,7 @@ public class Constants {
 	 * Parse the given String (upper or lower case accepted) and return
 	 * the appropriate value if it's the name of a constant field in the
 	 * class that we're analysing.
-	 * @param code the name of the field (never <code>null</code>)
+	 * @param code the name of the field (never {@code null})
 	 * @return the Object value
 	 * @throws ConstantException if there's no such field
 	 */
@@ -151,10 +151,10 @@ public class Constants {
 	 * Return all names of the given group of constants.
 	 * <p>Note that this method assumes that constants are named
 	 * in accordance with the standard Java convention for constant
-	 * values (i.e. all uppercase). The supplied <code>namePrefix</code>
+	 * values (i.e. all uppercase). The supplied {@code namePrefix}
 	 * will be uppercased (in a locale-insensitive fashion) prior to
 	 * the main logic of this method kicking in.
-	 * @param namePrefix prefix of the constant names to search (may be <code>null</code>)
+	 * @param namePrefix prefix of the constant names to search (may be {@code null})
 	 * @return the set of constant names
 	 */
 	public Set<String> getNames(String namePrefix) {
@@ -183,10 +183,10 @@ public class Constants {
 	 * Return all names of the given group of constants.
 	 * <p>Note that this method assumes that constants are named
 	 * in accordance with the standard Java convention for constant
-	 * values (i.e. all uppercase). The supplied <code>nameSuffix</code>
+	 * values (i.e. all uppercase). The supplied {@code nameSuffix}
 	 * will be uppercased (in a locale-insensitive fashion) prior to
 	 * the main logic of this method kicking in.
-	 * @param nameSuffix suffix of the constant names to search (may be <code>null</code>)
+	 * @param nameSuffix suffix of the constant names to search (may be {@code null})
 	 * @return the set of constant names
 	 */
 	public Set<String> getNamesForSuffix(String nameSuffix) {
@@ -205,10 +205,10 @@ public class Constants {
 	 * Return all values of the given group of constants.
 	 * <p>Note that this method assumes that constants are named
 	 * in accordance with the standard Java convention for constant
-	 * values (i.e. all uppercase). The supplied <code>namePrefix</code>
+	 * values (i.e. all uppercase). The supplied {@code namePrefix}
 	 * will be uppercased (in a locale-insensitive fashion) prior to
 	 * the main logic of this method kicking in.
-	 * @param namePrefix prefix of the constant names to search (may be <code>null</code>)
+	 * @param namePrefix prefix of the constant names to search (may be {@code null})
 	 * @return the set of values
 	 */
 	public Set<Object> getValues(String namePrefix) {
@@ -237,10 +237,10 @@ public class Constants {
 	 * Return all values of the given group of constants.
 	 * <p>Note that this method assumes that constants are named
 	 * in accordance with the standard Java convention for constant
-	 * values (i.e. all uppercase). The supplied <code>nameSuffix</code>
+	 * values (i.e. all uppercase). The supplied {@code nameSuffix}
 	 * will be uppercased (in a locale-insensitive fashion) prior to
 	 * the main logic of this method kicking in.
-	 * @param nameSuffix suffix of the constant names to search (may be <code>null</code>)
+	 * @param nameSuffix suffix of the constant names to search (may be {@code null})
 	 * @return the set of values
 	 */
 	public Set<Object> getValuesForSuffix(String nameSuffix) {
@@ -259,7 +259,7 @@ public class Constants {
 	 * Look up the given value within the given group of constants.
 	 * <p>Will return the first match.
 	 * @param value constant value to look up
-	 * @param namePrefix prefix of the constant names to search (may be <code>null</code>)
+	 * @param namePrefix prefix of the constant names to search (may be {@code null})
 	 * @return the name of the constant field
 	 * @throws ConstantException if the value wasn't found
 	 */
@@ -290,7 +290,7 @@ public class Constants {
 	 * Look up the given value within the given group of constants.
 	 * <p>Will return the first match.
 	 * @param value constant value to look up
-	 * @param nameSuffix suffix of the constant names to search (may be <code>null</code>)
+	 * @param nameSuffix suffix of the constant names to search (may be {@code null})
 	 * @return the name of the constant field
 	 * @throws ConstantException if the value wasn't found
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/Conventions.java b/spring-core/src/main/java/org/springframework/core/Conventions.java
index 8a03d43f24..035aefd9f7 100644
--- a/spring-core/src/main/java/org/springframework/core/Conventions.java
+++ b/spring-core/src/main/java/org/springframework/core/Conventions.java
@@ -60,15 +60,15 @@ public abstract class Conventions {
 
 	/**
 	 * Determine the conventional variable name for the supplied
-	 * <code>Object</code> based on its concrete type. The convention
-	 * used is to return the uncapitalized short name of the <code>Class</code>,
+	 * {@code Object} based on its concrete type. The convention
+	 * used is to return the uncapitalized short name of the {@code Class},
 	 * according to JavaBeans property naming rules: So,
-	 * <code>com.myapp.Product</code> becomes <code>product</code>;
-	 * <code>com.myapp.MyProduct</code> becomes <code>myProduct</code>;
-	 * <code>com.myapp.UKProduct</code> becomes <code>UKProduct</code>.
+	 * {@code com.myapp.Product} becomes {@code product};
+	 * {@code com.myapp.MyProduct} becomes {@code myProduct};
+	 * {@code com.myapp.UKProduct} becomes {@code UKProduct}.
 	 * <p>For arrays, we use the pluralized version of the array component type.
-	 * For <code>Collection</code>s we attempt to 'peek ahead' in the
-	 * <code>Collection</code> to determine the component type and
+	 * For {@code Collection}s we attempt to 'peek ahead' in the
+	 * {@code Collection} to determine the component type and
 	 * return the pluralized version of that component type.
 	 * @param value the value to generate a variable name for
 	 * @return the generated variable name
@@ -144,9 +144,9 @@ public abstract class Conventions {
 	 * Determine the conventional variable name for the return type of the supplied method,
 	 * taking the generic collection type (if any) into account, falling back to the
 	 * given return value if the method declaration is not specific enough (i.e. in case of
-	 * the return type being declared as <code>Object</code> or as untyped collection).
+	 * the return type being declared as {@code Object} or as untyped collection).
 	 * @param method the method to generate a variable name for
-	 * @param value the return value (may be <code>null</code> if not available)
+	 * @param value the return value (may be {@code null} if not available)
 	 * @return the generated variable name
 	 */
 	public static String getVariableNameForReturnType(Method method, Object value) {
@@ -157,10 +157,10 @@ public abstract class Conventions {
 	 * Determine the conventional variable name for the return type of the supplied method,
 	 * taking the generic collection type (if any) into account, falling back to the
 	 * given return value if the method declaration is not specific enough (i.e. in case of
-	 * the return type being declared as <code>Object</code> or as untyped collection).
+	 * the return type being declared as {@code Object} or as untyped collection).
 	 * @param method the method to generate a variable name for
 	 * @param resolvedType the resolved return type of the method
-	 * @param value the return value (may be <code>null</code> if not available)
+	 * @param value the return value (may be {@code null} if not available)
 	 * @return the generated variable name
 	 */
 	public static String getVariableNameForReturnType(Method method, Class resolvedType, Object value) {
@@ -206,9 +206,9 @@ public abstract class Conventions {
 	}
 
 	/**
-	 * Convert <code>String</code>s in attribute name format (lowercase, hyphens separating words)
-	 * into property name format (camel-cased). For example, <code>transaction-manager</code> is
-	 * converted into <code>transactionManager</code>.
+	 * Convert {@code String}s in attribute name format (lowercase, hyphens separating words)
+	 * into property name format (camel-cased). For example, {@code transaction-manager} is
+	 * converted into {@code transactionManager}.
 	 */
 	public static String attributeNameToPropertyName(String attributeName) {
 		Assert.notNull(attributeName, "'attributeName' must not be null");
@@ -236,8 +236,8 @@ public abstract class Conventions {
 
 	/**
 	 * Return an attribute name qualified by the supplied enclosing {@link Class}. For example,
-	 * the attribute name '<code>foo</code>' qualified by {@link Class} '<code>com.myapp.SomeClass</code>'
-	 * would be '<code>com.myapp.SomeClass.foo</code>'
+	 * the attribute name '{@code foo}' qualified by {@link Class} '{@code com.myapp.SomeClass}'
+	 * would be '{@code com.myapp.SomeClass.foo}'
 	 */
 	public static String getQualifiedAttributeName(Class enclosingClass, String attributeName) {
 		Assert.notNull(enclosingClass, "'enclosingClass' must not be null");
@@ -281,9 +281,9 @@ public abstract class Conventions {
 	}
 
 	/**
-	 * Retrieves the <code>Class</code> of an element in the <code>Collection</code>.
-	 * The exact element for which the <code>Class</code> is retreived will depend
-	 * on the concrete <code>Collection</code> implementation.
+	 * Retrieves the {@code Class} of an element in the {@code Collection}.
+	 * The exact element for which the {@code Class} is retreived will depend
+	 * on the concrete {@code Collection} implementation.
 	 */
 	private static Object peekAhead(Collection collection) {
 		Iterator it = collection.iterator();
diff --git a/spring-core/src/main/java/org/springframework/core/ErrorCoded.java b/spring-core/src/main/java/org/springframework/core/ErrorCoded.java
index 722dcdb98a..62849516ae 100644
--- a/spring-core/src/main/java/org/springframework/core/ErrorCoded.java
+++ b/spring-core/src/main/java/org/springframework/core/ErrorCoded.java
@@ -32,7 +32,7 @@ public interface ErrorCoded {
 	 * Return the error code associated with this failure.
 	 * The GUI can render this any way it pleases, allowing for localization etc.
 	 * @return a String error code associated with this failure,
-	 * or <code>null</code> if not error-coded
+	 * or {@code null} if not error-coded
 	 */
 	String getErrorCode();
 
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 2e2c4b1d62..4782e44bf4 100644
--- a/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java
@@ -43,7 +43,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * Determine the generic element type of the given Collection class
 	 * (if it declares one through a generic superclass or generic interface).
 	 * @param collectionClass the collection class to introspect
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getCollectionType(Class<? extends Collection> collectionClass) {
 		return extractTypeFromClass(collectionClass, Collection.class, 0);
@@ -53,7 +53,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * Determine the generic key type of the given Map class
 	 * (if it declares one through a generic superclass or generic interface).
 	 * @param mapClass the map class to introspect
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapKeyType(Class<? extends Map> mapClass) {
 		return extractTypeFromClass(mapClass, Map.class, 0);
@@ -63,7 +63,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * Determine the generic value type of the given Map class
 	 * (if it declares one through a generic superclass or generic interface).
 	 * @param mapClass the map class to introspect
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapValueType(Class<? extends Map> mapClass) {
 		return extractTypeFromClass(mapClass, Map.class, 1);
@@ -72,7 +72,7 @@ public abstract class GenericCollectionTypeResolver {
 	/**
 	 * Determine the generic element type of the given Collection field.
 	 * @param collectionField the collection field to introspect
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getCollectionFieldType(Field collectionField) {
 		return getGenericFieldType(collectionField, Collection.class, 0, null, 1);
@@ -84,7 +84,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * @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)
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getCollectionFieldType(Field collectionField, int nestingLevel) {
 		return getGenericFieldType(collectionField, Collection.class, 0, null, nestingLevel);
@@ -98,7 +98,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * nested List, whereas 2 would indicate the element of the nested List)
 	 * @param typeIndexesPerLevel Map keyed by nesting level, with each value
 	 * expressing the type index for traversal at that level
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getCollectionFieldType(Field collectionField, int nestingLevel, Map<Integer, Integer> typeIndexesPerLevel) {
 		return getGenericFieldType(collectionField, Collection.class, 0, typeIndexesPerLevel, nestingLevel);
@@ -107,7 +107,7 @@ public abstract class GenericCollectionTypeResolver {
 	/**
 	 * Determine the generic key type of the given Map field.
 	 * @param mapField the map field to introspect
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapKeyFieldType(Field mapField) {
 		return getGenericFieldType(mapField, Map.class, 0, null, 1);
@@ -119,7 +119,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * @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)
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapKeyFieldType(Field mapField, int nestingLevel) {
 		return getGenericFieldType(mapField, Map.class, 0, null, nestingLevel);
@@ -133,7 +133,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * nested List, whereas 2 would indicate the element of the nested List)
 	 * @param typeIndexesPerLevel Map keyed by nesting level, with each value
 	 * expressing the type index for traversal at that level
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapKeyFieldType(Field mapField, int nestingLevel, Map<Integer, Integer> typeIndexesPerLevel) {
 		return getGenericFieldType(mapField, Map.class, 0, typeIndexesPerLevel, nestingLevel);
@@ -142,7 +142,7 @@ public abstract class GenericCollectionTypeResolver {
 	/**
 	 * Determine the generic value type of the given Map field.
 	 * @param mapField the map field to introspect
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapValueFieldType(Field mapField) {
 		return getGenericFieldType(mapField, Map.class, 1, null, 1);
@@ -154,7 +154,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * @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)
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapValueFieldType(Field mapField, int nestingLevel) {
 		return getGenericFieldType(mapField, Map.class, 1, null, nestingLevel);
@@ -168,7 +168,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * nested List, whereas 2 would indicate the element of the nested List)
 	 * @param typeIndexesPerLevel Map keyed by nesting level, with each value
 	 * expressing the type index for traversal at that level
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapValueFieldType(Field mapField, int nestingLevel, Map<Integer, Integer> typeIndexesPerLevel) {
 		return getGenericFieldType(mapField, Map.class, 1, typeIndexesPerLevel, nestingLevel);
@@ -177,7 +177,7 @@ public abstract class GenericCollectionTypeResolver {
 	/**
 	 * Determine the generic element type of the given Collection parameter.
 	 * @param methodParam the method parameter specification
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getCollectionParameterType(MethodParameter methodParam) {
 		return getGenericParameterType(methodParam, Collection.class, 0);
@@ -186,7 +186,7 @@ public abstract class GenericCollectionTypeResolver {
 	/**
 	 * Determine the generic key type of the given Map parameter.
 	 * @param methodParam the method parameter specification
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapKeyParameterType(MethodParameter methodParam) {
 		return getGenericParameterType(methodParam, Map.class, 0);
@@ -195,7 +195,7 @@ public abstract class GenericCollectionTypeResolver {
 	/**
 	 * Determine the generic value type of the given Map parameter.
 	 * @param methodParam the method parameter specification
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapValueParameterType(MethodParameter methodParam) {
 		return getGenericParameterType(methodParam, Map.class, 1);
@@ -204,7 +204,7 @@ public abstract class GenericCollectionTypeResolver {
 	/**
 	 * Determine the generic element type of the given Collection return type.
 	 * @param method the method to check the return type for
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getCollectionReturnType(Method method) {
 		return getGenericReturnType(method, Collection.class, 0, 1);
@@ -218,7 +218,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * @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)
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getCollectionReturnType(Method method, int nestingLevel) {
 		return getGenericReturnType(method, Collection.class, 0, nestingLevel);
@@ -227,7 +227,7 @@ public abstract class GenericCollectionTypeResolver {
 	/**
 	 * Determine the generic key type of the given Map return type.
 	 * @param method the method to check the return type for
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapKeyReturnType(Method method) {
 		return getGenericReturnType(method, Map.class, 0, 1);
@@ -239,7 +239,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * @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)
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapKeyReturnType(Method method, int nestingLevel) {
 		return getGenericReturnType(method, Map.class, 0, nestingLevel);
@@ -248,7 +248,7 @@ public abstract class GenericCollectionTypeResolver {
 	/**
 	 * Determine the generic value type of the given Map return type.
 	 * @param method the method to check the return type for
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapValueReturnType(Method method) {
 		return getGenericReturnType(method, Map.class, 1, 1);
@@ -260,7 +260,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * @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)
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	public static Class<?> getMapValueReturnType(Method method, int nestingLevel) {
 		return getGenericReturnType(method, Map.class, 1, nestingLevel);
@@ -273,7 +273,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * @param source the source class/interface defining the generic parameter types
 	 * @param typeIndex the index of the type (e.g. 0 for Collections,
 	 * 0 for Map keys, 1 for Map values)
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	private static Class<?> getGenericParameterType(MethodParameter methodParam, Class<?> source, int typeIndex) {
 		return extractType(GenericTypeResolver.getTargetType(methodParam), source, typeIndex,
@@ -287,7 +287,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * @param typeIndex the index of the type (e.g. 0 for Collections,
 	 * 0 for Map keys, 1 for Map values)
 	 * @param nestingLevel the nesting level of the target type
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	private static Class<?> getGenericFieldType(Field field, Class<?> source, int typeIndex,
 			Map<Integer, Integer> typeIndexesPerLevel, int nestingLevel) {
@@ -301,7 +301,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * @param typeIndex the index of the type (e.g. 0 for Collections,
 	 * 0 for Map keys, 1 for Map values)
 	 * @param nestingLevel the nesting level of the target type
-	 * @return the generic type, or <code>null</code> if none
+	 * @return the generic type, or {@code null} if none
 	 */
 	private static Class<?> getGenericReturnType(Method method, Class<?> source, int typeIndex, int nestingLevel) {
 		return extractType(method.getGenericReturnType(), source, typeIndex, null, null, nestingLevel, 1);
@@ -314,7 +314,7 @@ public abstract class GenericCollectionTypeResolver {
 	 * @param typeIndex the index of the actual type argument
 	 * @param nestingLevel the nesting level of the target type
 	 * @param currentLevel the current nested level
-	 * @return the generic type as Class, or <code>null</code> if none
+	 * @return the generic type as Class, or {@code null} if none
 	 */
 	private static Class<?> extractType(Type type, Class<?> source, int typeIndex,
 			Map<TypeVariable, Type> typeVariableMap, Map<Integer, Integer> typeIndexesPerLevel,
@@ -347,11 +347,11 @@ public abstract class GenericCollectionTypeResolver {
 	/**
 	 * Extract the generic type from the given ParameterizedType object.
 	 * @param ptype the ParameterizedType to check
-	 * @param source the expected raw source type (can be <code>null</code>)
+	 * @param source the expected raw source type (can be {@code null})
 	 * @param typeIndex the index of the actual type argument
 	 * @param nestingLevel the nesting level of the target type
 	 * @param currentLevel the current nested level
-	 * @return the generic type as Class, or <code>null</code> if none
+	 * @return the generic type as Class, or {@code null} if none
 	 */
 	private static Class<?> extractTypeFromParameterizedType(ParameterizedType ptype, Class<?> source, int typeIndex,
 			Map<TypeVariable, Type> typeVariableMap, Map<Integer, Integer> typeIndexesPerLevel,
@@ -421,9 +421,9 @@ public abstract class GenericCollectionTypeResolver {
 	/**
 	 * Extract the generic type from the given Class object.
 	 * @param clazz the Class to check
-	 * @param source the expected raw source type (can be <code>null</code>)
+	 * @param source the expected raw source type (can be {@code null})
 	 * @param typeIndex the index of the actual type argument
-	 * @return the generic type as Class, or <code>null</code> if none
+	 * @return the generic type as Class, or {@code null} if none
 	 */
 	private static Class<?> extractTypeFromClass(Class<?> clazz, Class<?> source, int typeIndex) {
 		return extractTypeFromClass(clazz, source, typeIndex, null, null, 1, 1);
@@ -432,11 +432,11 @@ public abstract class GenericCollectionTypeResolver {
 	/**
 	 * Extract the generic type from the given Class object.
 	 * @param clazz the Class to check
-	 * @param source the expected raw source type (can be <code>null</code>)
+	 * @param source the expected raw source type (can be {@code null})
 	 * @param typeIndex the index of the actual type argument
 	 * @param nestingLevel the nesting level of the target type
 	 * @param currentLevel the current nested level
-	 * @return the generic type as Class, or <code>null</code> if none
+	 * @return the generic type as Class, or {@code null} if none
 	 */
 	private static Class<?> extractTypeFromClass(Class<?> clazz, Class<?> source, int typeIndex,
 			Map<TypeVariable, Type> typeVariableMap, Map<Integer, Integer> typeIndexesPerLevel,
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 0320381d0c..cb9e8fba33 100644
--- a/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java
@@ -236,7 +236,7 @@ public abstract class GenericTypeResolver {
 	 * of it.
 	 * @param method the target method to check the return type of
 	 * @param genericIfc the generic interface or superclass to resolve the type argument from
-	 * @return the resolved parameter type of the method return type, or <code>null</code>
+	 * @return the resolved parameter type of the method return type, or {@code null}
 	 * if not resolvable or if the single argument is of type {@link WildcardType}.
 	 */
 	public static Class<?> resolveReturnTypeArgument(Method method, Class<?> genericIfc) {
@@ -265,7 +265,7 @@ public abstract class GenericTypeResolver {
 	 * and possibly declare a concrete type for its type variable.
 	 * @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 the argument, or <code>null</code> if not resolvable
+	 * @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);
@@ -286,7 +286,7 @@ public abstract class GenericTypeResolver {
 	 * @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</code> if not resolvable
+	 * number of actual type arguments, or {@code null} if not resolvable
 	 */
 	public static Class[] resolveTypeArguments(Class clazz, Class genericIfc) {
 		return doResolveTypeArguments(clazz, clazz, genericIfc);
@@ -368,7 +368,7 @@ public abstract class GenericTypeResolver {
 	 * Resolve the specified generic type against the given TypeVariable map.
 	 * @param genericType the generic type to resolve
 	 * @param typeVariableMap the TypeVariable Map to resolved against
-	 * @return the type if it resolves to a Class, or <code>Object.class</code> otherwise
+	 * @return the type if it resolves to a Class, or {@code Object.class} otherwise
 	 */
 	public static Class<?> resolveType(Type genericType, Map<TypeVariable, Type> typeVariableMap) {
 		Type resolvedType = getRawType(genericType, typeVariableMap);
@@ -449,7 +449,7 @@ public abstract class GenericTypeResolver {
 	}
 
 	/**
-	 * Extracts the bound <code>Type</code> for a given {@link TypeVariable}.
+	 * Extracts the bound {@code Type} for a given {@link TypeVariable}.
 	 */
 	static Type extractBoundForTypeVariable(TypeVariable typeVariable) {
 		Type[] bounds = typeVariable.getBounds();
@@ -493,7 +493,7 @@ public abstract class GenericTypeResolver {
 	 * public class FooImpl implements Foo<String, Integer> {
 	 *  ..
 	 * }</pre>
-	 * For '<code>FooImpl</code>' the following mappings would be added to the {@link Map}:
+	 * For '{@code FooImpl}' the following mappings would be added to the {@link Map}:
 	 * {S=java.lang.String, T=java.lang.Integer}.
 	 */
 	private static void populateTypeMapFromParameterizedType(ParameterizedType type, Map<TypeVariable, Type> typeVariableMap) {
diff --git a/spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java b/spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java
index 6bb8076bca..19206573a9 100644
--- a/spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java
+++ b/spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java
@@ -36,7 +36,7 @@ package org.springframework.core;
 public interface InfrastructureProxy {
 
 	/**
-	 * Return the underlying resource (never <code>null</code>).
+	 * Return the underlying resource (never {@code null}).
 	 */
 	Object getWrappedObject();
 
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 a19c2d149b..270b276ebc 100644
--- a/spring-core/src/main/java/org/springframework/core/JdkVersion.java
+++ b/spring-core/src/main/java/org/springframework/core/JdkVersion.java
@@ -77,7 +77,7 @@ public abstract class JdkVersion {
 
 	/**
 	 * Return the full Java version string, as returned by
-	 * <code>System.getProperty("java.version")</code>.
+	 * {@code System.getProperty("java.version")}.
 	 * @return the full Java version string
 	 * @see System#getProperty(String)
 	 */
@@ -87,7 +87,7 @@ public abstract class JdkVersion {
 
 	/**
 	 * Get the major version code. This means we can do things like
-	 * <code>if (getMajorJavaVersion() < JAVA_14)</code>.
+	 * {@code if (getMajorJavaVersion() < JAVA_14)}.
 	 * @return a code comparable to the JAVA_XX codes in this class
 	 * @see #JAVA_13
 	 * @see #JAVA_14
@@ -102,7 +102,7 @@ public abstract class JdkVersion {
 
 	/**
 	 * Convenience method to determine if the current JVM is at least Java 1.4.
-	 * @return <code>true</code> if the current JVM is at least Java 1.4
+	 * @return {@code true} if the current JVM is at least Java 1.4
 	 * @deprecated as of Spring 3.0 which requires Java 1.5+
 	 * @see #getMajorJavaVersion()
 	 * @see #JAVA_14
@@ -118,7 +118,7 @@ public abstract class JdkVersion {
 	/**
 	 * Convenience method to determine if the current JVM is at least
 	 * Java 1.5 (Java 5).
-	 * @return <code>true</code> if the current JVM is at least Java 1.5
+	 * @return {@code true} if the current JVM is at least Java 1.5
 	 * @deprecated as of Spring 3.0 which requires Java 1.5+
 	 * @see #getMajorJavaVersion()
 	 * @see #JAVA_15
@@ -133,7 +133,7 @@ public abstract class JdkVersion {
 	/**
 	 * Convenience method to determine if the current JVM is at least
 	 * Java 1.6 (Java 6).
-	 * @return <code>true</code> if the current JVM is at least Java 1.6
+	 * @return {@code true} if the current JVM is at least Java 1.6
 	 * @deprecated as of Spring 3.0, in favor of reflective checks for
 	 * the specific Java 1.6 classes of interest
 	 * @see #getMajorJavaVersion()
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 b29478ebc0..588472532c 100644
--- a/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
+++ b/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
@@ -40,7 +40,7 @@ import org.springframework.util.ClassUtils;
 /**
  * Implementation of {@link ParameterNameDiscoverer} that uses the LocalVariableTable
  * information in the method attributes to discover parameter names. Returns
- * <code>null</code> if the class file was compiled without debug information.
+ * {@code null} if the class file was compiled without debug information.
  *
  * <p>Uses ObjectWeb's ASM library for analyzing class files. Each discoverer instance
  * caches the ASM discovered information for each introspected Class, in a thread-safe
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 a9ace68956..28e9f90677 100644
--- a/spring-core/src/main/java/org/springframework/core/MethodParameter.java
+++ b/spring-core/src/main/java/org/springframework/core/MethodParameter.java
@@ -145,7 +145,7 @@ public class MethodParameter {
 	/**
 	 * Return the wrapped Method, if any.
 	 * <p>Note: Either Method or Constructor is available.
-	 * @return the Method, or <code>null</code> if none
+	 * @return the Method, or {@code null} if none
 	 */
 	public Method getMethod() {
 		return this.method;
@@ -154,7 +154,7 @@ public class MethodParameter {
 	/**
 	 * Return the wrapped Constructor, if any.
 	 * <p>Note: Either Method or Constructor is available.
-	 * @return the Constructor, or <code>null</code> if none
+	 * @return the Constructor, or {@code null} if none
 	 */
 	public Constructor getConstructor() {
 		return this.constructor;
@@ -200,7 +200,7 @@ public class MethodParameter {
 
 	/**
 	 * Return the type of the method/constructor parameter.
-	 * @return the parameter type (never <code>null</code>)
+	 * @return the parameter type (never {@code null})
 	 */
 	public Class<?> getParameterType() {
 		if (this.parameterType == null) {
@@ -218,7 +218,7 @@ public class MethodParameter {
 
 	/**
 	 * Return the generic type of the method/constructor parameter.
-	 * @return the parameter type (never <code>null</code>)
+	 * @return the parameter type (never {@code null})
 	 */
 	public Type getGenericParameterType() {
 		if (this.genericParameterType == null) {
@@ -267,7 +267,7 @@ public class MethodParameter {
 	/**
 	 * Return the method/constructor annotation of the given type, if available.
 	 * @param annotationType the annotation type to look for
-	 * @return the annotation object, or <code>null</code> if not found
+	 * @return the annotation object, or {@code null} if not found
 	 */
 	public <T extends Annotation> T getMethodAnnotation(Class<T> annotationType) {
 		return getAnnotatedElement().getAnnotation(annotationType);
@@ -293,7 +293,7 @@ public class MethodParameter {
 	/**
 	 * Return the parameter annotation of the given type, if available.
 	 * @param annotationType the annotation type to look for
-	 * @return the annotation object, or <code>null</code> if not found
+	 * @return the annotation object, or {@code null} if not found
 	 */
 	@SuppressWarnings("unchecked")
 	public <T extends Annotation> T getParameterAnnotation(Class<T> annotationType) {
@@ -332,7 +332,7 @@ public class MethodParameter {
 
 	/**
 	 * Return the name of the method/constructor parameter.
-	 * @return the parameter name (may be <code>null</code> if no
+	 * @return the parameter name (may be {@code null} if no
 	 * parameter name metadata is contained in the class file or no
 	 * {@link #initParameterNameDiscovery ParameterNameDiscoverer}
 	 * has been set to begin with)
@@ -379,7 +379,7 @@ public class MethodParameter {
 	/**
 	 * Set the type index for the current nesting level.
 	 * @param typeIndex the corresponding type index
-	 * (or <code>null</code> for the default type index)
+	 * (or {@code null} for the default type index)
 	 * @see #getNestingLevel()
 	 */
 	public void setTypeIndexForCurrentLevel(int typeIndex) {
@@ -388,7 +388,7 @@ public class MethodParameter {
 
 	/**
 	 * Return the type index for the current nesting level.
-	 * @return the corresponding type index, or <code>null</code>
+	 * @return the corresponding type index, or {@code null}
 	 * if none specified (indicating the default type index)
 	 * @see #getNestingLevel()
 	 */
@@ -399,7 +399,7 @@ public class MethodParameter {
 	/**
 	 * Return the type index for the specified nesting level.
 	 * @param nestingLevel the nesting level to check
-	 * @return the corresponding type index, or <code>null</code>
+	 * @return the corresponding type index, or {@code null}
 	 * if none specified (indicating the default type index)
 	 */
 	public Integer getTypeIndexForLevel(int nestingLevel) {
diff --git a/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java b/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java
index 781edfc608..0716a62cb8 100644
--- a/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java
+++ b/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java
@@ -17,11 +17,11 @@
 package org.springframework.core;
 
 /**
- * Handy class for wrapping checked <code>Exceptions</code> with a root cause.
+ * Handy class for wrapping checked {@code Exceptions} with a root cause.
  *
- * <p>This class is <code>abstract</code> to force the programmer to extend
- * the class. <code>getMessage</code> will include nested exception
- * information; <code>printStackTrace</code> and other like methods will
+ * <p>This class is {@code abstract} to force the programmer to extend
+ * the class. {@code getMessage} will include nested exception
+ * information; {@code printStackTrace} and other like methods will
  * delegate to the wrapped exception, if any.
  *
  * <p>The similarity between this class and the {@link NestedRuntimeException}
@@ -47,7 +47,7 @@ public abstract class NestedCheckedException extends Exception {
 
 
 	/**
-	 * Construct a <code>NestedCheckedException</code> with the specified detail message.
+	 * Construct a {@code NestedCheckedException} with the specified detail message.
 	 * @param msg the detail message
 	 */
 	public NestedCheckedException(String msg) {
@@ -55,7 +55,7 @@ public abstract class NestedCheckedException extends Exception {
 	}
 
 	/**
-	 * Construct a <code>NestedCheckedException</code> with the specified detail message
+	 * Construct a {@code NestedCheckedException} with the specified detail message
 	 * and nested exception.
 	 * @param msg the detail message
 	 * @param cause the nested exception
@@ -77,7 +77,7 @@ public abstract class NestedCheckedException extends Exception {
 
 	/**
 	 * Retrieve the innermost cause of this exception, if any.
-	 * @return the innermost exception, or <code>null</code> if none
+	 * @return the innermost exception, or {@code null} if none
 	 */
 	public Throwable getRootCause() {
 		Throwable rootCause = null;
@@ -94,7 +94,7 @@ public abstract class NestedCheckedException extends Exception {
 	 * either the innermost cause (root cause) or this exception itself.
 	 * <p>Differs from {@link #getRootCause()} in that it falls back
 	 * to the present exception if there is no root cause.
-	 * @return the most specific cause (never <code>null</code>)
+	 * @return the most specific cause (never {@code null})
 	 * @since 2.0.3
 	 */
 	public Throwable getMostSpecificCause() {
diff --git a/spring-core/src/main/java/org/springframework/core/NestedIOException.java b/spring-core/src/main/java/org/springframework/core/NestedIOException.java
index 50412d81f8..df9be8c0db 100644
--- a/spring-core/src/main/java/org/springframework/core/NestedIOException.java
+++ b/spring-core/src/main/java/org/springframework/core/NestedIOException.java
@@ -45,7 +45,7 @@ public class NestedIOException extends IOException {
 
 
 	/**
-	 * Construct a <code>NestedIOException</code> with the specified detail message.
+	 * Construct a {@code NestedIOException} with the specified detail message.
 	 * @param msg the detail message
 	 */
 	public NestedIOException(String msg) {
@@ -53,7 +53,7 @@ public class NestedIOException extends IOException {
 	}
 
 	/**
-	 * Construct a <code>NestedIOException</code> with the specified detail message
+	 * Construct a {@code NestedIOException} with the specified detail message
 	 * and nested exception.
 	 * @param msg the detail message
 	 * @param cause the nested exception
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 8c8eaeb067..4d18861b88 100644
--- a/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java
+++ b/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java
@@ -17,11 +17,11 @@
 package org.springframework.core;
 
 /**
- * Handy class for wrapping runtime <code>Exceptions</code> with a root cause.
+ * Handy class for wrapping runtime {@code Exceptions} with a root cause.
  *
- * <p>This class is <code>abstract</code> to force the programmer to extend
- * the class. <code>getMessage</code> will include nested exception
- * information; <code>printStackTrace</code> and other like methods will
+ * <p>This class is {@code abstract} to force the programmer to extend
+ * the class. {@code getMessage} will include nested exception
+ * information; {@code printStackTrace} and other like methods will
  * delegate to the wrapped exception, if any.
  *
  * <p>The similarity between this class and the {@link NestedCheckedException}
@@ -47,7 +47,7 @@ public abstract class NestedRuntimeException extends RuntimeException {
 
 
 	/**
-	 * Construct a <code>NestedRuntimeException</code> with the specified detail message.
+	 * Construct a {@code NestedRuntimeException} with the specified detail message.
 	 * @param msg the detail message
 	 */
 	public NestedRuntimeException(String msg) {
@@ -55,7 +55,7 @@ public abstract class NestedRuntimeException extends RuntimeException {
 	}
 
 	/**
-	 * Construct a <code>NestedRuntimeException</code> with the specified detail message
+	 * Construct a {@code NestedRuntimeException} with the specified detail message
 	 * and nested exception.
 	 * @param msg the detail message
 	 * @param cause the nested exception
@@ -77,7 +77,7 @@ public abstract class NestedRuntimeException extends RuntimeException {
 
 	/**
 	 * Retrieve the innermost cause of this exception, if any.
-	 * @return the innermost exception, or <code>null</code> if none
+	 * @return the innermost exception, or {@code null} if none
 	 * @since 2.0
 	 */
 	public Throwable getRootCause() {
@@ -95,7 +95,7 @@ public abstract class NestedRuntimeException extends RuntimeException {
 	 * either the innermost cause (root cause) or this exception itself.
 	 * <p>Differs from {@link #getRootCause()} in that it falls back
 	 * to the present exception if there is no root cause.
-	 * @return the most specific cause (never <code>null</code>)
+	 * @return the most specific cause (never {@code null})
 	 * @since 2.0.3
 	 */
 	public Throwable getMostSpecificCause() {
diff --git a/spring-core/src/main/java/org/springframework/core/OrderComparator.java b/spring-core/src/main/java/org/springframework/core/OrderComparator.java
index 2cadb0a45b..16158ca1ad 100644
--- a/spring-core/src/main/java/org/springframework/core/OrderComparator.java
+++ b/spring-core/src/main/java/org/springframework/core/OrderComparator.java
@@ -25,9 +25,9 @@ import java.util.List;
  * {@link Comparator} implementation for {@link Ordered} objects,
  * sorting by order value ascending (resp. by priority descending).
  *
- * <p>Non-<code>Ordered</code> objects are treated as greatest order
+ * <p>Non-{@code Ordered} objects are treated as greatest order
  * values, thus ending up at the end of the list, in arbitrary order
- * (just like same order values of <code>Ordered</code> objects).
+ * (just like same order values of {@code Ordered} objects).
  *
  * @author Juergen Hoeller
  * @since 07.04.2003
@@ -64,7 +64,7 @@ public class OrderComparator implements Comparator<Object> {
 	 * <p>The default implementation checks against the {@link Ordered}
 	 * interface. Can be overridden in subclasses.
 	 * @param obj the object to check
-	 * @return the order value, or <code>Ordered.LOWEST_PRECEDENCE</code> as fallback
+	 * @return the order value, or {@code Ordered.LOWEST_PRECEDENCE} as fallback
 	 */
 	protected int getOrder(Object obj) {
 		return (obj instanceof Ordered ? ((Ordered) obj).getOrder() : Ordered.LOWEST_PRECEDENCE);
diff --git a/spring-core/src/main/java/org/springframework/core/Ordered.java b/spring-core/src/main/java/org/springframework/core/Ordered.java
index 86e8dca364..c949b3958e 100644
--- a/spring-core/src/main/java/org/springframework/core/Ordered.java
+++ b/spring-core/src/main/java/org/springframework/core/Ordered.java
@@ -51,7 +51,7 @@ public interface Ordered {
 	/**
 	 * Return the order value of this object, with a
 	 * higher value meaning greater in terms of sorting.
-	 * <p>Normally starting with 0, with <code>Integer.MAX_VALUE</code>
+	 * <p>Normally starting with 0, with {@code Integer.MAX_VALUE}
 	 * indicating the greatest value. Same order values will result
 	 * in arbitrary positions for the affected objects.
 	 * <p>Higher values can be interpreted as lower priority. As a
diff --git a/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java b/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java
index 3d2aaa2538..0d4755229d 100644
--- a/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
 import org.springframework.util.FileCopyUtils;
 
 /**
- * <code>ClassLoader</code> that does <i>not</i> always delegate to the
+ * {@code ClassLoader} that does <i>not</i> always delegate to the
  * parent loader, as normal class loaders do. This enables, for example,
  * instrumentation to be forced in the overriding ClassLoader, or a
  * "throwaway" class loading behavior, where selected classes are
@@ -87,7 +87,7 @@ public class OverridingClassLoader extends DecoratingClassLoader {
 	 * <p>The default implementation delegates to {@link #findLoadedClass},
 	 * {@link #loadBytesForClass} and {@link #defineClass}.
 	 * @param name the name of the class
-	 * @return the Class object, or <code>null</code> if no class defined for that name
+	 * @return the Class object, or {@code null} if no class defined for that name
 	 * @throws ClassNotFoundException if the class for the given name couldn't be loaded
 	 */
 	protected Class loadClassForOverriding(String name) throws ClassNotFoundException {
@@ -108,7 +108,7 @@ public class OverridingClassLoader extends DecoratingClassLoader {
 	 * and {@link #transformIfNecessary}.
 	 * @param name the name of the class
 	 * @return the byte content (with transformers already applied),
-	 * or <code>null</code> if no class defined for that name
+	 * or {@code null} if no class defined for that name
 	 * @throws ClassNotFoundException if the class for the given name couldn't be loaded
 	 */
 	protected byte[] loadBytesForClass(String name) throws ClassNotFoundException {
@@ -130,7 +130,7 @@ public class OverridingClassLoader extends DecoratingClassLoader {
 	/**
 	 * Open an InputStream for the specified class.
 	 * <p>The default implementation loads a standard class file through
-	 * the parent ClassLoader's <code>getResourceAsStream</code> method.
+	 * the parent ClassLoader's {@code getResourceAsStream} method.
 	 * @param name the name of the class
 	 * @return the InputStream containing the byte code for the specified class
 	 */
@@ -145,7 +145,7 @@ public class OverridingClassLoader extends DecoratingClassLoader {
 	 * <p>The default implementation simply returns the given bytes as-is.
 	 * @param name the fully-qualified name of the class being transformed
 	 * @param bytes the raw bytes of the class
-	 * @return the transformed bytes (never <code>null</code>;
+	 * @return the transformed bytes (never {@code null};
 	 * same as the input bytes if the transformation produced no changes)
 	 */
 	protected byte[] transformIfNecessary(String name, byte[] bytes) {
diff --git a/spring-core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java
index 67152fc974..01356c2967 100644
--- a/spring-core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java
+++ b/spring-core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java
@@ -35,19 +35,19 @@ public interface ParameterNameDiscoverer {
 
 	/**
 	 * Return parameter names for this method,
-	 * or <code>null</code> if they cannot be determined.
+	 * or {@code null} if they cannot be determined.
 	 * @param method method to find parameter names for
 	 * @return an array of parameter names if the names can be resolved,
-	 * or <code>null</code> if they cannot
+	 * or {@code null} if they cannot
 	 */
 	String[] getParameterNames(Method method);
 
 	/**
 	 * Return parameter names for this constructor,
-	 * or <code>null</code> if they cannot be determined.
+	 * or {@code null} if they cannot be determined.
 	 * @param ctor constructor to find parameter names for
 	 * @return an array of parameter names if the names can be resolved,
-	 * or <code>null</code> if they cannot
+	 * or {@code null} if they cannot
 	 */
 	String[] getParameterNames(Constructor<?> ctor);
 
diff --git a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
index f15a892208..0e522dacc8 100644
--- a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
+++ b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
@@ -24,10 +24,10 @@ import java.util.List;
 
 /**
  * ParameterNameDiscoverer implementation that tries several ParameterNameDiscoverers
- * in succession. Those added first in the <code>addDiscoverer</code> method have
- * highest priority. If one returns <code>null</code>, the next will be tried.
+ * in succession. Those added first in the {@code addDiscoverer} method have
+ * highest priority. If one returns {@code null}, the next will be tried.
  *
- * <p>The default behavior is always to return <code>null</code>
+ * <p>The default behavior is always to return {@code null}
  * if no discoverer matches.
  *
  * @author Rod Johnson
diff --git a/spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java b/spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java
index 649276ebad..24b33f7683 100644
--- a/spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java
@@ -62,7 +62,7 @@ public class SimpleAliasRegistry implements AliasRegistry {
 
 	/**
 	 * Return whether alias overriding is allowed.
-	 * Default is <code>true</code>.
+	 * Default is {@code true}.
 	 */
 	protected boolean allowAliasOverriding() {
 		return true;
diff --git a/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java b/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
index 16f45d3c6a..72772d1254 100644
--- a/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
@@ -36,7 +36,7 @@ public interface SmartClassLoader {
 	 * ClassLoader) or whether it should be reobtained every time.
 	 * @param clazz the class to check (usually loaded from this ClassLoader)
 	 * @return whether the class should be expected to appear in a reloaded
-	 * version (with a different <code>Class</code> object) later on
+	 * version (with a different {@code Class} object) later on
 	 */
 	boolean isClassReloadable(Class clazz);
 
diff --git a/spring-core/src/main/java/org/springframework/core/SpringVersion.java b/spring-core/src/main/java/org/springframework/core/SpringVersion.java
index 830e8efc81..6d80ff886f 100644
--- a/spring-core/src/main/java/org/springframework/core/SpringVersion.java
+++ b/spring-core/src/main/java/org/springframework/core/SpringVersion.java
@@ -33,8 +33,8 @@ public class SpringVersion {
 
 	/**
 	 * Return the full version string of the present Spring codebase,
-	 * or <code>null</code> if it cannot be determined.
-	 * @see java.lang.Package#getImplementationVersion()
+	 * or {@code null} if it cannot be determined.
+	 * @see Package#getImplementationVersion()
 	 */
 	public static String getVersion() {
 		Package pkg = SpringVersion.class.getPackage();
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 5556aa120f..a24f2cde3a 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
@@ -23,7 +23,7 @@ import org.springframework.core.Ordered;
  * {@link java.util.Comparator} implementation that checks
  * {@link org.springframework.core.Ordered} as well as the
  * {@link Order} annotation, with an order value provided by an
- * <code>Ordered</code> instance overriding a statically defined
+ * {@code Ordered} instance overriding a statically defined
  * annotation value (if any).
  *
  * @author Juergen Hoeller
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 d0de008c2c..e3dce1b2b4 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
@@ -89,7 +89,7 @@ public abstract class AnnotationUtils {
 	}
 
 	/**
-	 * Get a single {@link Annotation} of <code>annotationType</code> from the supplied {@link 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
@@ -111,12 +111,12 @@ public abstract class AnnotationUtils {
 	}
 
 	/**
-	 * Get a single {@link Annotation} of <code>annotationType</code> from the supplied {@link Method},
+	 * Get a single {@link Annotation} of {@code annotationType} from the supplied {@link Method},
 	 * 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</code> if none found
+	 * @return the annotation found, or {@code null} if none found
 	 */
 	public static <A extends Annotation> A findAnnotation(Method method, Class<A> annotationType) {
 		A annotation = getAnnotation(method, annotationType);
@@ -181,7 +181,7 @@ public abstract class AnnotationUtils {
 	}
 
 	/**
-	 * Find a single {@link Annotation} of <code>annotationType</code> from the supplied {@link Class},
+	 * Find a single {@link Annotation} of {@code annotationType} from the supplied {@link Class},
 	 * traversing its interfaces and superclasses if no annotation can be found on the given class itself.
 	 * <p>This method explicitly handles class-level annotations which are not declared as
 	 * {@link java.lang.annotation.Inherited inherited} <i>as well as annotations on interfaces</i>.
@@ -193,7 +193,7 @@ public abstract class AnnotationUtils {
 	 * hierarchy if no match is found.
 	 * @param clazz the class to look for annotations on
 	 * @param annotationType the annotation class to look for
-	 * @return the annotation found, or <code>null</code> if none found
+	 * @return the annotation found, or {@code null} if none found
 	 */
 	public static <A extends Annotation> A findAnnotation(Class<?> clazz, Class<A> annotationType) {
 		Assert.notNull(clazz, "Class must not be null");
@@ -223,20 +223,20 @@ public abstract class AnnotationUtils {
 	}
 
 	/**
-	 * Find the first {@link Class} in the inheritance hierarchy of the specified <code>clazz</code>
-	 * (including the specified <code>clazz</code> itself) which declares an annotation for the
-	 * specified <code>annotationType</code>, or <code>null</code> if not found. If the supplied
-	 * <code>clazz</code> is <code>null</code>, <code>null</code> will be returned.
-	 * <p>If the supplied <code>clazz</code> is an interface, only the interface itself will be checked;
+	 * Find the first {@link Class} in the inheritance hierarchy of the specified {@code clazz}
+	 * (including the specified {@code clazz} itself) which declares an annotation for the
+	 * specified {@code annotationType}, or {@code null} if not found. If the supplied
+	 * {@code clazz} is {@code null}, {@code null} will be returned.
+	 * <p>If the supplied {@code clazz} is an interface, only the interface itself will be checked;
 	 * the inheritance hierarchy for interfaces will not be traversed.
 	 * <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</code>
-	 * @return the first {@link Class} in the inheritance hierarchy of the specified <code>clazz</code>
-	 * which declares an annotation for the specified <code>annotationType</code>, or <code>null</code>
+	 * or {@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
 	 * @see Class#isAnnotationPresent(Class)
 	 * @see Class#getDeclaredAnnotations()
@@ -251,16 +251,16 @@ public abstract class AnnotationUtils {
 	}
 
 	/**
-	 * Determine whether an annotation for the specified <code>annotationType</code> is
-	 * declared locally on the supplied <code>clazz</code>. The supplied {@link Class}
+	 * Determine whether an annotation for the specified {@code annotationType} is
+	 * declared locally on the supplied {@code clazz}. The supplied {@link Class}
 	 * may represent any type.
 	 * <p>Note: This method does <strong>not</strong> determine if the annotation is
 	 * {@link java.lang.annotation.Inherited inherited}. For greater clarity regarding inherited
 	 * annotations, consider using {@link #isAnnotationInherited(Class, Class)} instead.
 	 * @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
-	 * @return <code>true</code> if an annotation for the specified <code>annotationType</code>
-	 * is declared locally on the supplied <code>clazz</code>
+	 * @return {@code true} if an annotation for the specified {@code annotationType}
+	 * is declared locally on the supplied {@code clazz}
 	 * @see Class#getDeclaredAnnotations()
 	 * @see #isAnnotationInherited(Class, Class)
 	 */
@@ -278,17 +278,17 @@ public abstract class AnnotationUtils {
 	}
 
 	/**
-	 * Determine whether an annotation for the specified <code>annotationType</code> is present
-	 * on the supplied <code>clazz</code> and is {@link java.lang.annotation.Inherited inherited}
+	 * Determine whether an annotation for the specified {@code annotationType} is present
+	 * on the supplied {@code clazz} and is {@link java.lang.annotation.Inherited inherited}
 	 * i.e., not declared locally for the class).
-	 * <p>If the supplied <code>clazz</code> is an interface, only the interface itself will be checked.
+	 * <p>If the supplied {@code clazz} is an interface, only the interface itself will be checked.
 	 * In accordance with standard meta-annotation semantics, the inheritance hierarchy for interfaces
 	 * will not be traversed. See the {@link java.lang.annotation.Inherited JavaDoc} for the
 	 * &#064;Inherited meta-annotation for further details regarding annotation inheritance.
 	 * @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
-	 * @return <code>true</code> if an annotation for the specified <code>annotationType</code> is present
-	 * on the supplied <code>clazz</code> and is {@link java.lang.annotation.Inherited inherited}
+	 * @return {@code true} if an annotation for the specified {@code annotationType} is present
+	 * on the supplied {@code clazz} and is {@link java.lang.annotation.Inherited inherited}
 	 * @see Class#isAnnotationPresent(Class)
 	 * @see #isAnnotationDeclaredLocally(Class, Class)
 	 */
@@ -395,10 +395,10 @@ public abstract class AnnotationUtils {
 	}
 
 	/**
-	 * Retrieve the <em>value</em> of the <code>&quot;value&quot;</code> attribute of a
+	 * Retrieve the <em>value</em> of the {@code &quot;value&quot;} attribute of a
 	 * single-element Annotation, given an annotation instance.
 	 * @param annotation the annotation instance from which to retrieve the value
-	 * @return the attribute value, or <code>null</code> if not found
+	 * @return the attribute value, or {@code null} if not found
 	 * @see #getValue(Annotation, String)
 	 */
 	public static Object getValue(Annotation annotation) {
@@ -409,7 +409,7 @@ public abstract class AnnotationUtils {
 	 * Retrieve the <em>value</em> of a named Annotation attribute, given an annotation instance.
 	 * @param annotation the annotation instance from which to retrieve the value
 	 * @param attributeName the name of the attribute value to retrieve
-	 * @return the attribute value, or <code>null</code> if not found
+	 * @return the attribute value, or {@code null} if not found
 	 * @see #getValue(Annotation)
 	 */
 	public static Object getValue(Annotation annotation, String attributeName) {
@@ -423,10 +423,10 @@ public abstract class AnnotationUtils {
 	}
 
 	/**
-	 * Retrieve the <em>default value</em> of the <code>&quot;value&quot;</code> attribute
+	 * Retrieve the <em>default value</em> of the {@code &quot;value&quot;} attribute
 	 * of a single-element Annotation, given an annotation instance.
 	 * @param annotation the annotation instance from which to retrieve the default value
-	 * @return the default value, or <code>null</code> if not found
+	 * @return the default value, or {@code null} if not found
 	 * @see #getDefaultValue(Annotation, String)
 	 */
 	public static Object getDefaultValue(Annotation annotation) {
@@ -437,7 +437,7 @@ public abstract class AnnotationUtils {
 	 * Retrieve the <em>default value</em> of a named Annotation attribute, given an annotation instance.
 	 * @param annotation the annotation instance from which to retrieve the default value
 	 * @param attributeName the name of the attribute value to retrieve
-	 * @return the default value of the named attribute, or <code>null</code> if not found
+	 * @return the default value of the named attribute, or {@code null} if not found
 	 * @see #getDefaultValue(Class, String)
 	 */
 	public static Object getDefaultValue(Annotation annotation, String attributeName) {
@@ -445,10 +445,10 @@ public abstract class AnnotationUtils {
 	}
 
 	/**
-	 * Retrieve the <em>default value</em> of the <code>&quot;value&quot;</code> attribute
+	 * Retrieve the <em>default value</em> of the {@code &quot;value&quot;} attribute
 	 * of a single-element Annotation, given the {@link Class annotation type}.
 	 * @param annotationType the <em>annotation type</em> for which the default value should be retrieved
-	 * @return the default value, or <code>null</code> if not found
+	 * @return the default value, or {@code null} if not found
 	 * @see #getDefaultValue(Class, String)
 	 */
 	public static Object getDefaultValue(Class<? extends Annotation> annotationType) {
@@ -459,7 +459,7 @@ public abstract class AnnotationUtils {
 	 * Retrieve the <em>default value</em> of a named Annotation attribute, given the {@link Class annotation type}.
 	 * @param annotationType the <em>annotation type</em> for which the default value should be retrieved
 	 * @param attributeName the name of the attribute value to retrieve.
-	 * @return the default value of the named attribute, or <code>null</code> if not found
+	 * @return the default value of the named attribute, or {@code null} if not found
 	 * @see #getDefaultValue(Annotation, String)
 	 */
 	public static Object getDefaultValue(Class<? extends Annotation> annotationType, String attributeName) {
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/Order.java b/spring-core/src/main/java/org/springframework/core/annotation/Order.java
index 06f77067b4..478ce0f619 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/Order.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/Order.java
@@ -26,7 +26,7 @@ import org.springframework.core.Ordered;
 /**
  * Annotation that defines ordering. The value is optional, and represents order value
  * as defined in the {@link Ordered} interface. Lower values have higher priority.
- * The default value is <code>Ordered.LOWEST_PRECEDENCE</code>, indicating
+ * The default value is {@code Ordered.LOWEST_PRECEDENCE}, indicating
  * lowest priority (losing to any other specified order value).
  *
  * <p><b>NOTE:</b> Annotation-based ordering is supported for specific kinds of
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 478f175684..11dc4ec4d8 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
@@ -32,7 +32,7 @@ import org.springframework.util.StringUtils;
 
 /**
  * A description of a JavaBeans Property that allows us to avoid a dependency on
- * <code>java.beans.PropertyDescriptor</code>. The <code>java.beans</code> package
+ * {@code java.beans.PropertyDescriptor}. The {@code java.beans} package
  * is not available in a number of environments (e.g. Android, Java ME), so this is
  * desirable for portability of Spring's core conversion facility.
  *
@@ -90,21 +90,21 @@ public final class Property {
 	}
 
 	/**
-	 * The property type: e.g. <code>java.lang.String</code>
+	 * The property type: e.g. {@code java.lang.String}
 	 */
 	public Class<?> getType() {
 		return this.methodParameter.getParameterType();
 	}
 
 	/**
-	 * The property getter method: e.g. <code>getFoo()</code>
+	 * The property getter method: e.g. {@code getFoo()}
 	 */
 	public Method getReadMethod() {
 		return this.readMethod;
 	}
 
 	/**
-	 * The property setter method: e.g. <code>setFoo(String)</code>
+	 * The property setter method: e.g. {@code setFoo(String)}
 	 */
 	public Method getWriteMethod() {
 		return this.writeMethod;
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 b4236c2c59..f320400e6a 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
@@ -169,12 +169,12 @@ public class TypeDescriptor {
 
 	/**
 	 * Creates a type descriptor for a nested type declared within the field.
-	 * <p>For example, if the field is a <code>List&lt;String&gt;</code> and the nestingLevel is 1, the nested type descriptor will be <code>String.class</code>.
-	 * If the field is a <code>List&lt;List&lt;String&gt;&gt;</code> and the nestingLevel is 2, the nested type descriptor will also be a <code>String.class</code>.
-	 * If the field is a <code>Map&lt;Integer, String&gt;</code> and the nestingLevel is 1, the nested type descriptor will be String, derived from the map value.
-	 * If the field is a <code>List&lt;Map&lt;Integer, String&gt;&gt;</code> and the nestingLevel is 2, the nested type descriptor will be String, derived from the map value.
-	 * Returns <code>null</code> if a nested type cannot be obtained because it was not declared.
-	 * For example, if the field is a <code>List&lt;?&gt;</code>, the nested type descriptor returned will be <code>null</code>.
+	 * <p>For example, if the field is a {@code List&lt;String&gt;} and the nestingLevel is 1, the nested type descriptor will be {@code String.class}.
+	 * If the field is a {@code List&lt;List&lt;String&gt;&gt;} and the nestingLevel is 2, the nested type descriptor will also be a {@code String.class}.
+	 * If the field is a {@code Map&lt;Integer, String&gt;} and the nestingLevel is 1, the nested type descriptor will be String, derived from the map value.
+	 * If the field is a {@code List&lt;Map&lt;Integer, String&gt;&gt;} and the nestingLevel is 2, the nested type descriptor will be String, derived from the map value.
+	 * Returns {@code null} if a nested type cannot be obtained because it was not declared.
+	 * For example, if the field is a {@code List&lt;?&gt;}, the nested type descriptor returned will be {@code null}.
 	 * @param field the field
 	 * @param nestingLevel the nesting level of the collection/array element or map key/value declaration within the field
 	 * @return the nested type descriptor at the specified nestingLevel, or null if it could not be obtained
@@ -186,15 +186,15 @@ public class TypeDescriptor {
 
 	/**
 	 * Creates a type descriptor for a nested type declared within the property.
-	 * <p>For example, if the property is a <code>List&lt;String&gt;</code> and the nestingLevel is 1, the nested type descriptor will be <code>String.class</code>.
-	 * If the property is a <code>List&lt;List&lt;String&gt;&gt;</code> and the nestingLevel is 2, the nested type descriptor will also be a <code>String.class</code>.
-	 * If the property is a <code>Map&lt;Integer, String&gt;</code> and the nestingLevel is 1, the nested type descriptor will be String, derived from the map value.
-	 * If the property is a <code>List&lt;Map&lt;Integer, String&gt;&gt;</code> and the nestingLevel is 2, the nested type descriptor will be String, derived from the map value.
-	 * Returns <code>null</code> if a nested type cannot be obtained because it was not declared.
-	 * For example, if the property is a <code>List&lt;?&gt;</code>, the nested type descriptor returned will be <code>null</code>.
+	 * <p>For example, if the property is a {@code List&lt;String&gt;} and the nestingLevel is 1, the nested type descriptor will be {@code String.class}.
+	 * If the property is a {@code List&lt;List&lt;String&gt;&gt;} and the nestingLevel is 2, the nested type descriptor will also be a {@code String.class}.
+	 * If the property is a {@code Map&lt;Integer, String&gt;} and the nestingLevel is 1, the nested type descriptor will be String, derived from the map value.
+	 * If the property is a {@code List&lt;Map&lt;Integer, String&gt;&gt;} and the nestingLevel is 2, the nested type descriptor will be String, derived from the map value.
+	 * Returns {@code null} if a nested type cannot be obtained because it was not declared.
+	 * For example, if the property is a {@code List&lt;?&gt;}, the nested type descriptor returned will be {@code null}.
 	 * @param property the property
 	 * @param nestingLevel the nesting level of the collection/array element or map key/value declaration within the property
-	 * @return the nested type descriptor at the specified nestingLevel, or <code>null</code> if it could not be obtained
+	 * @return the nested type descriptor at the specified nestingLevel, or {@code null} if it could not be obtained
 	 * @throws IllegalArgumentException if the types up to the specified nesting level are not of collection, array, or map types
 	 */
 	public static TypeDescriptor nested(Property property, int nestingLevel) {
@@ -217,7 +217,7 @@ public class TypeDescriptor {
 	 * Returns primitive types as-is.
 	 * <p>See {@link #getObjectType()} for a variation of this operation that resolves primitive types
 	 * to their corresponding Object types if necessary.
-	 * @return the type, or <code>null</code>
+	 * @return the type, or {@code null}
 	 * @see #getObjectType()
 	 */
 	public Class<?> getType() {
@@ -235,11 +235,11 @@ public class TypeDescriptor {
 
 	/**
 	 * Narrows this {@link TypeDescriptor} by setting its type to the class of the provided value.
-	 * If the value is <code>null</code>, no narrowing is performed and this TypeDescriptor is returned unchanged.
+	 * 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</code> would be narrowed to <code>java.util.HashMap</code>
-	 * if it was set to a <code>java.util.HashMap</code> value. The narrowed TypeDescriptor can then be used to convert
+	 * 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)
@@ -304,7 +304,7 @@ public class TypeDescriptor {
 	/**
 	 * Obtain the annotation associated with this type descriptor of the specified type.
 	 * @param annotationType the annotation type
-	 * @return the annotation, or <code>null</code> if no such annotation exists on this type descriptor
+	 * @return the annotation, or {@code null} if no such annotation exists on this type descriptor
 	 */
 	@SuppressWarnings("unchecked")
 	public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
@@ -372,7 +372,7 @@ public class TypeDescriptor {
 	 * 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</code> 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() {
@@ -407,7 +407,7 @@ public class TypeDescriptor {
 	/**
 	 * If this type is a {@link Map} and its key type is parameterized, returns the map's key type.
 	 * If the Map's key type is not parameterized, returns null indicating the key type is not declared.
-	 * @return the Map key type, or <code>null</code> if this type is a Map but its key type is not parameterized
+	 * @return the Map key type, or {@code null} if this type is a Map but its key type is not parameterized
 	 * @throws IllegalStateException if this type is not a java.util.Map
 	 */
 	public TypeDescriptor getMapKeyTypeDescriptor() {
@@ -433,7 +433,7 @@ public class TypeDescriptor {
 	/**
 	 * If this type is a {@link Map} and its value type is parameterized, returns the map's value type.
 	 * If the Map's value type is not parameterized, returns null indicating the value type is not declared.
-	 * @return the Map value type, or <code>null</code> if this type is a Map but its value type is not parameterized
+	 * @return the Map value type, or {@code null} if this type is a Map but its value type is not parameterized
 	 * @throws IllegalStateException if this type is not a java.util.Map
 	 */
 	public TypeDescriptor getMapValueTypeDescriptor() {
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/FallbackObjectToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/FallbackObjectToStringConverter.java
index 268f0300ab..071ad3b647 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/FallbackObjectToStringConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/FallbackObjectToStringConverter.java
@@ -24,7 +24,7 @@ import org.springframework.core.convert.converter.ConditionalGenericConverter;
 
 /**
  * Simply calls {@link Object#toString()} to convert any supported Object to a String.
- * Supports CharSequence, StringWriter, and any class with a String constructor or <code>valueOf(String)</code> method.
+ * Supports CharSequence, StringWriter, and any class with a String constructor or {@code valueOf(String)} method.
  *
  * <p>Used by the default ConversionService as a fallback if there are no other explicit
  * to-String converters registered.
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 f2267fcf3c..148dbee97d 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
@@ -198,7 +198,7 @@ public class GenericConversionService implements ConfigurableConversionService {
 
 	/**
 	 * Template method to convert a null source.
-	 * <p>Default implementation returns <code>null</code>.
+	 * <p>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
@@ -244,7 +244,7 @@ public class GenericConversionService implements ConfigurableConversionService {
 	/**
 	 * 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.
-	 * Returns <code>null</code> otherwise, indicating no suitable converter could be found.
+	 * 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
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 df43fd51a1..2586a4c99a 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
@@ -32,7 +32,7 @@ import org.springframework.util.ReflectionUtils;
  * on the target entity type.
  *
  * <p>For this converter to match, the finder method must be public, static, have the signature
- * <code>find[EntityName]([IdType])</code>, and return an instance of the desired entity type.
+ * {@code find[EntityName]([IdType])}, and return an instance of the desired entity type.
  *
  * @author Keith Donald
  * @since 3.0
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 163fffe3e9..af44fb8e1b 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
@@ -32,7 +32,7 @@ import org.springframework.util.ReflectionUtils;
  * Generic Converter that attempts to convert a source Object to a target type
  * by delegating to methods on the target type.
  *
- * <p>Calls the static <code>valueOf(sourceType)</code> method on the target type
+ * <p>Calls the static {@code valueOf(sourceType)} method on the target type
  * to perform the conversion, if such a method exists. Else calls the target type's
  * Constructor that accepts a single sourceType argument, if such a Constructor exists.
  * Else throws a ConversionFailedException.
diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
index e73babe3ae..d8679525b9 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
@@ -33,7 +33,7 @@ public abstract class AbstractGenericLabeledEnum extends AbstractLabeledEnum {
 
 	/**
 	 * Create a new StaticLabeledEnum instance.
-	 * @param label the label; if <code>null</code>), the enum's code
+	 * @param label the label; if {@code null}), the enum's code
 	 * will be used as label
 	 */
 	protected AbstractGenericLabeledEnum(String label) {
diff --git a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java
index d2aa701b91..25b7e5e1ca 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java
@@ -28,7 +28,7 @@ import org.springframework.util.comparator.NullSafeComparator;
  *
  * <ul>
  * <li>A type that identifies the enum's class.
- * For example: <code>com.mycompany.util.FileFormat</code>.</li>
+ * For example: {@code com.mycompany.util.FileFormat}.</li>
  *
  * <li>A code that uniquely identifies the enum within the context of its type.
  * For example: &quot;CSV&quot;. Different classes of codes are possible
@@ -64,7 +64,7 @@ public interface LabeledEnum extends Comparable, Serializable {
 	// Constants for standard enum ordering (Comparator implementations)
 
 	/**
-	 * Shared Comparator instance that sorts enumerations by <code>CODE_ORDER</code>.
+	 * Shared Comparator instance that sorts enumerations by {@code CODE_ORDER}.
 	 */
 	Comparator CODE_ORDER = new Comparator() {
 		public int compare(Object o1, Object o2) {
@@ -75,7 +75,7 @@ public interface LabeledEnum extends Comparable, Serializable {
 	};
 
 	/**
-	 * Shared Comparator instance that sorts enumerations by <code>LABEL_ORDER</code>.
+	 * Shared Comparator instance that sorts enumerations by {@code LABEL_ORDER}.
 	 */
 	Comparator LABEL_ORDER = new Comparator() {
 		public int compare(Object o1, Object o2) {
@@ -87,8 +87,8 @@ public interface LabeledEnum extends Comparable, Serializable {
 	};
 
 	/**
-	 * Shared Comparator instance that sorts enumerations by <code>LABEL_ORDER</code>,
-	 * then <code>CODE_ORDER</code>.
+	 * Shared Comparator instance that sorts enumerations by {@code LABEL_ORDER},
+	 * then {@code CODE_ORDER}.
 	 */
 	Comparator DEFAULT_ORDER =
 			new CompoundComparator(new Comparator[] { LABEL_ORDER, CODE_ORDER });
diff --git a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java
index 9fb83e5d12..b5416df813 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- * Interface for looking up <code>LabeledEnum</code> instances.
+ * Interface for looking up {@code LabeledEnum} instances.
  *
  * @author Keith Donald
  * @author Juergen Hoeller
@@ -42,16 +42,16 @@ public interface LabeledEnumResolver {
 	/**
 	 * Return a map of enumerations of a particular type. Each element in the
 	 * map should be a key/value pair, where the key is the enum code, and the
-	 * value is the <code>LabeledEnum</code> instance.
+	 * value is the {@code LabeledEnum} instance.
 	 * @param type the enum type
 	 * @return a Map of localized enumeration instances,
-	 * with enum code as key and <code>LabeledEnum</code> instance as value
+	 * with enum code as key and {@code LabeledEnum} instance as value
 	 * @throws IllegalArgumentException if the type is not supported
 	 */
 	public Map getLabeledEnumMap(Class type) throws IllegalArgumentException;
 
 	/**
-	 * Resolve a single <code>LabeledEnum</code> by its identifying code.
+	 * Resolve a single {@code LabeledEnum} by its identifying code.
 	 * @param type the enum type
 	 * @param code the enum code
 	 * @return the enum
@@ -60,7 +60,7 @@ public interface LabeledEnumResolver {
 	public LabeledEnum getLabeledEnumByCode(Class type, Comparable code) throws IllegalArgumentException;
 
 	/**
-	 * Resolve a single <code>LabeledEnum</code> by its identifying code.
+	 * Resolve a single {@code LabeledEnum} by its identifying code.
 	 * @param type the enum type
 	 * @param label the enum label
 	 * @return the enum
diff --git a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
index 31abeab0c8..e78a7eab99 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
@@ -23,7 +23,7 @@ import org.springframework.util.Assert;
  *
  * <p>Should almost always be subclassed, but for some simple situations it may be
  * used directly. Note that you will not be able to use unique type-based functionality
- * like <code>LabeledEnumResolver.getLabeledEnumSet(type)</code> in this case.
+ * like {@code LabeledEnumResolver.getLabeledEnumSet(type)} in this case.
  *
  * @author Keith Donald
  * @since 1.2.2
@@ -41,7 +41,7 @@ public class LetterCodedLabeledEnum extends AbstractGenericLabeledEnum {
 	/**
 	 * Create a new LetterCodedLabeledEnum instance.
 	 * @param code the letter code
-	 * @param label the label (can be <code>null</code>)
+	 * @param label the label (can be {@code null})
 	 */
 	public LetterCodedLabeledEnum(char code, String label) {
 		super(label);
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 f0aab91544..eeb4022b74 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
@@ -21,7 +21,7 @@ package org.springframework.core.enums;
  *
  * <p>Should almost always be subclassed, but for some simple situations it may be
  * used directly. Note that you will not be able to use unique type-based functionality
- * like <code>LabeledEnumResolver.getLabeledEnumSet(type)</code> in this case.
+ * like {@code LabeledEnumResolver.getLabeledEnumSet(type)} in this case.
  *
  * @author Keith Donald
  * @since 1.2.2
@@ -39,7 +39,7 @@ public class ShortCodedLabeledEnum extends AbstractGenericLabeledEnum {
 	/**
 	 * Create a new ShortCodedLabeledEnum instance.
 	 * @param code the short code
-	 * @param label the label (can be <code>null</code>)
+	 * @param label the label (can be {@code null})
 	 */
 	public ShortCodedLabeledEnum(int code, String label) {
 		super(label);
diff --git a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
index 3dad2edda5..26dd2df6e0 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
@@ -60,7 +60,7 @@ public abstract class StaticLabeledEnum extends AbstractLabeledEnum {
 	/**
 	 * Create a new StaticLabeledEnum instance.
 	 * @param code the short code
-	 * @param label the label (can be <code>null</code>)
+	 * @param label the label (can be {@code null})
 	 */
 	protected StaticLabeledEnum(int code, String label) {
 		this.code = new Short((short) code);
diff --git a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java
index c71db32bc3..b8759f1e02 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java
@@ -37,13 +37,13 @@ import org.springframework.util.Assert;
 public class StaticLabeledEnumResolver extends AbstractCachingLabeledEnumResolver {
 
 	/**
-	 * Shared <code>StaticLabeledEnumResolver</code> singleton instance.
+	 * Shared {@code StaticLabeledEnumResolver} singleton instance.
 	 */
 	private static final StaticLabeledEnumResolver INSTANCE = new StaticLabeledEnumResolver();
 
 
 	/**
-	 * Return the shared <code>StaticLabeledEnumResolver</code> singleton instance.
+	 * Return the shared {@code StaticLabeledEnumResolver} singleton instance.
 	 * Mainly for resolving unique StaticLabeledEnum references on deserialization.
 	 * @see StaticLabeledEnum
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
index 9fa24e0cbd..7dfc3b2364 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
@@ -23,7 +23,7 @@ import org.springframework.util.Assert;
  *
  * <p>Should almost always be subclassed, but for some simple situations it may be
  * used directly. Note that you will not be able to use unique type-based
- * functionality like <code>LabeledEnumResolver.getLabeledEnumSet(type) in this case.
+ * functionality like {@code LabeledEnumResolver.getLabeledEnumSet(type)} in this case.
  *
  * @author Keith Donald
  * @author Juergen Hoeller
@@ -43,7 +43,7 @@ public class StringCodedLabeledEnum extends AbstractGenericLabeledEnum {
 	/**
 	 * Create a new StringCodedLabeledEnum instance.
 	 * @param code the String code
-	 * @param label the label (can be <code>null</code>)
+	 * @param label the label (can be {@code null})
 	 */
 	public StringCodedLabeledEnum(String code, String label) {
 		super(label);
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 3c47983560..f8741fb6ea 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
@@ -164,7 +164,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 	 * </pre>
 	 * The search order is now C, D, A, B as desired.
 	 *
-	 * <p>Beyond these recommendations, subclasses may use any of the <code>add&#42;</code>,
+	 * <p>Beyond these recommendations, subclasses may use any of the {@code add&#42;},
 	 * {@code remove}, or {@code replace} methods exposed by {@link MutablePropertySources}
 	 * in order to create the exact arrangement of property sources desired.
 	 *
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 aee71bf709..3f9ee725e2 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
@@ -43,7 +43,7 @@ package org.springframework.core.env;
  * {@code Environment} in order to query profile state or resolve properties directly.
  *
  * <p>In most cases, however, application-level beans should not need to interact with the
- * {@code Environment} directly but instead may have to have <code>${...}</code> property
+ * {@code Environment} directly but instead may have to have {@code ${...}} property
  * values replaced by a property placeholder configurer such as
  * {@link org.springframework.context.support.PropertySourcesPlaceholderConfigurer
  * PropertySourcesPlaceholderConfigurer}, which itself is {@code EnvironmentAware} and
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 637d36d6fa..b035c9ef53 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
@@ -65,14 +65,14 @@ public abstract class AbstractResource implements Resource {
 	}
 
 	/**
-	 * This implementation always returns <code>true</code>.
+	 * This implementation always returns {@code true}.
 	 */
 	public boolean isReadable() {
 		return true;
 	}
 
 	/**
-	 * This implementation always returns <code>false</code>.
+	 * This implementation always returns {@code false}.
 	 */
 	public boolean isOpen() {
 		return false;
@@ -153,7 +153,7 @@ public abstract class AbstractResource implements Resource {
 	/**
 	 * Determine the File to use for timestamp checking.
 	 * <p>The default implementation delegates to {@link #getFile()}.
-	 * @return the File to use for timestamp checking (never <code>null</code>)
+	 * @return the File to use for timestamp checking (never {@code null})
 	 * @throws IOException if the resource cannot be resolved as absolute
 	 * file path, i.e. if the resource is not available in a file system
 	 */
@@ -170,7 +170,7 @@ public abstract class AbstractResource implements Resource {
 	}
 
 	/**
-	 * This implementation always returns <code>null</code>,
+	 * This implementation always returns {@code null},
 	 * assuming that this resource type does not have a filename.
 	 */
 	public String getFilename() {
diff --git a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
index 0e67b3b1fe..2f245121ed 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
@@ -73,7 +73,7 @@ public class ByteArrayResource extends AbstractResource {
 
 
 	/**
-	 * This implementation always returns <code>true</code>.
+	 * This implementation always returns {@code true}.
 	 */
 	@Override
 	public boolean exists() {
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 4ccec827ca..e881d4034c 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
@@ -30,15 +30,15 @@ import org.springframework.util.StringUtils;
  * {@link Resource} implementation for class path resources.
  * Uses either a given ClassLoader or a given Class for loading resources.
  *
- * <p>Supports resolution as <code>java.io.File</code> if the class path
+ * <p>Supports resolution as {@code java.io.File} if the class path
  * resource resides in the file system, but not for resources in a JAR.
  * Always supports resolution as URL.
  *
  * @author Juergen Hoeller
  * @author Sam Brannen
  * @since 28.12.2003
- * @see java.lang.ClassLoader#getResourceAsStream(String)
- * @see java.lang.Class#getResourceAsStream(String)
+ * @see ClassLoader#getResourceAsStream(String)
+ * @see Class#getResourceAsStream(String)
  */
 public class ClassPathResource extends AbstractFileResolvingResource {
 
@@ -69,8 +69,8 @@ public class ClassPathResource extends AbstractFileResolvingResource {
 	 * 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</code> for the thread context class loader
-	 * @see java.lang.ClassLoader#getResourceAsStream(String)
+	 * or {@code null} for the thread context class loader
+	 * @see ClassLoader#getResourceAsStream(String)
 	 */
 	public ClassPathResource(String path, ClassLoader classLoader) {
 		Assert.notNull(path, "Path must not be null");
diff --git a/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java
index d014939b22..51470f45d9 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java
@@ -21,11 +21,11 @@ import org.springframework.util.StringUtils;
 
 /**
  * {@link ResourceLoader} implementation that interprets plain resource paths
- * as relative to a given <code>java.lang.Class</code>.
+ * as relative to a given {@code java.lang.Class}.
  *
  * @author Juergen Hoeller
  * @since 3.0
- * @see java.lang.Class#getResource(String)
+ * @see Class#getResource(String)
  * @see ClassPathResource#ClassPathResource(String, Class)
  */
 public class ClassRelativeResourceLoader extends DefaultResourceLoader {
diff --git a/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java
index 46b5e273aa..ba631801f9 100644
--- a/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java
@@ -55,7 +55,7 @@ public class DefaultResourceLoader implements ResourceLoader {
 
 	/**
 	 * Create a new DefaultResourceLoader.
-	 * @param classLoader the ClassLoader to load class path resources with, or <code>null</code>
+	 * @param classLoader the ClassLoader to load class path resources with, or {@code null}
 	 * for using the thread context class loader at the time of actual resource access
 	 */
 	public DefaultResourceLoader(ClassLoader classLoader) {
@@ -64,7 +64,7 @@ public class DefaultResourceLoader implements ResourceLoader {
 
 
 	/**
-	 * Specify the ClassLoader to load class path resources with, or <code>null</code>
+	 * Specify the ClassLoader to load class path resources with, or {@code null}
 	 * for using the thread context class loader at the time of actual resource access.
 	 * <p>The default is that ClassLoader access will happen using the thread context
 	 * class loader at the time of this ResourceLoader's initialization.
diff --git a/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java b/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
index d7ee370df9..2ff0a1f1c3 100644
--- a/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
@@ -24,7 +24,7 @@ import java.io.InputStream;
  * Simple {@link Resource} implementation that holds a resource description
  * but does not point to an actually readable resource.
  *
- * <p>To be used as placeholder if a <code>Resource</code> argument is
+ * <p>To be used as placeholder if a {@code Resource} argument is
  * expected by an API but not necessarily used for actual reading.
  *
  * @author Juergen Hoeller
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 12daadd208..57da655a5d 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
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * {@link Resource} implementation for <code>java.io.File</code> handles.
+ * {@link Resource} implementation for {@code java.io.File} handles.
  * Obviously supports resolution as File, and also as URL.
  * Implements the extended {@link WritableResource} interface.
  *
diff --git a/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java b/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
index d9558c5182..4b6e7f1fc0 100644
--- a/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
@@ -27,7 +27,7 @@ import java.io.InputStream;
  *
  * <p>In contrast to other Resource implementations, this is a descriptor
  * for an <i>already opened</i> resource - therefore returning "true" from
- * <code>isOpen()</code>. Do not use it if you need to keep the resource
+ * {@code isOpen()}. Do not use it if you need to keep the resource
  * descriptor somewhere, or if you need to read a stream multiple times.
  *
  * @author Juergen Hoeller
@@ -69,7 +69,7 @@ public class InputStreamResource extends AbstractResource {
 
 
 	/**
-	 * This implementation always returns <code>true</code>.
+	 * This implementation always returns {@code true}.
 	 */
 	@Override
 	public boolean exists() {
@@ -77,7 +77,7 @@ public class InputStreamResource extends AbstractResource {
 	}
 
 	/**
-	 * This implementation always returns <code>true</code>.
+	 * This implementation always returns {@code true}.
 	 */
 	@Override
 	public boolean isOpen() {
diff --git a/spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java b/spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java
index 3b1ca88ea2..f31e6ef9a2 100644
--- a/spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/InputStreamSource.java
@@ -25,8 +25,8 @@ import java.io.InputStream;
  * <p>This is the base interface for Spring's more extensive {@link Resource} interface.
  *
  * <p>For single-use streams, {@link InputStreamResource} can be used for any
- * given <code>InputStream</code>. Spring's {@link ByteArrayResource} or any
- * file-based <code>Resource</code> implementation can be used as a concrete
+ * given {@code InputStream}. Spring's {@link ByteArrayResource} or any
+ * file-based {@code Resource} implementation can be used as a concrete
  * instance, allowing one to read the underlying content stream multiple times.
  * This makes this interface useful as an abstract content source for mail
  * attachments, for example.
@@ -46,7 +46,7 @@ public interface InputStreamSource {
 	 * <p>This requirement is particularly important when you consider an API such
 	 * as JavaMail, which needs to be able to read the stream multiple times when
 	 * creating mail attachments. For such a use case, it is <i>required</i>
-	 * that each <code>getInputStream()</code> call returns a fresh stream.
+	 * that each {@code getInputStream()} call returns a fresh stream.
 	 * @return the input stream for the underlying resource (must not be {@code null})
 	 * @throws IOException if the stream could not be opened
 	 * @see org.springframework.mail.javamail.MimeMessageHelper#addAttachment(String, InputStreamSource)
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 b242ffc2c4..ecd739fa98 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
@@ -49,7 +49,7 @@ public interface Resource extends InputStreamSource {
 	/**
 	 * Return whether this resource actually exists in physical form.
 	 * <p>This method performs a definitive existence check, whereas the
-	 * existence of a <code>Resource</code> handle only guarantees a
+	 * existence of a {@code Resource} handle only guarantees a
 	 * valid descriptor handle.
 	 */
 	boolean exists();
@@ -57,9 +57,9 @@ public interface Resource extends InputStreamSource {
 	/**
 	 * Return whether the contents of this resource can be read,
 	 * e.g. via {@link #getInputStream()} or {@link #getFile()}.
-	 * <p>Will be <code>true</code> for typical resource descriptors;
+	 * <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</code> is a definitive indication
+	 * However, a value of {@code false} is a definitive indication
 	 * that the resource content cannot be read.
 	 * @see #getInputStream()
 	 */
@@ -69,7 +69,7 @@ public interface Resource extends InputStreamSource {
 	 * Return whether this resource represents a handle with an open
 	 * stream. If true, the InputStream cannot be read multiple times,
 	 * and must be read and closed to avoid resource leaks.
-	 * <p>Will be <code>false</code> for typical resource descriptors.
+	 * <p>Will be {@code false} for typical resource descriptors.
 	 */
 	boolean isOpen();
 
@@ -119,7 +119,7 @@ public interface Resource extends InputStreamSource {
 	/**
 	 * Determine a filename for this resource, i.e. typically the last
 	 * part of the path: for example, "myfile.txt".
-	 * <p>Returns <code>null</code> if this type of resource does not
+	 * <p>Returns {@code null} if this type of resource does not
 	 * have a filename.
 	 */
 	String getFilename();
@@ -128,8 +128,8 @@ public interface Resource extends InputStreamSource {
 	 * Return a description for this resource,
 	 * to be used for error output when working with the resource.
 	 * <p>Implementations are also encouraged to return this value
-	 * from their <code>toString</code> method.
-	 * @see java.lang.Object#toString()
+	 * from their {@code toString} method.
+	 * @see Object#toString()
 	 */
 	String getDescription();
 
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 0b812a42b8..f8a8430c25 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
@@ -31,9 +31,9 @@ import org.springframework.util.StringUtils;
  * e.g. {@code file:C:/myfile.txt} or {@code classpath:myfile.txt} to
  * {@code Resource} properties instead of using a {@code String} location property.
  *
- * <p>The path may contain <code>${...}</code> placeholders, to be
+ * <p>The path may contain {@code ${...}} placeholders, to be
  * resolved as {@link org.springframework.core.env.Environment} properties:
- * e.g. <code>${user.dir}</code>. Unresolvable placeholders are ignored by default.
+ * e.g. {@code ${user.dir}}. Unresolvable placeholders are ignored by default.
  *
  * <p>Delegates to a {@link ResourceLoader} to do the heavy lifting,
  * by default using a {@link DefaultResourceLoader}.
@@ -67,7 +67,7 @@ public class ResourceEditor extends PropertyEditorSupport {
 	/**
 	 * Create a new instance of the {@link ResourceEditor} class
 	 * using the given {@link ResourceLoader} and a {@link StandardEnvironment}.
-	 * @param resourceLoader the <code>ResourceLoader</code> to use
+	 * @param resourceLoader the {@code ResourceLoader} to use
 	 * @deprecated as of Spring 3.1 in favor of
 	 * {@link #ResourceEditor(ResourceLoader, PropertyResolver)}
 	 */
@@ -79,8 +79,8 @@ public class ResourceEditor extends PropertyEditorSupport {
 	/**
 	 * Create a new instance of the {@link ResourceEditor} class
 	 * using the given {@link ResourceLoader} and {@link PropertyResolver}.
-	 * @param resourceLoader the <code>ResourceLoader</code> to use
-	 * @param propertyResolver the <code>PropertyResolver</code> to use
+	 * @param resourceLoader the {@code ResourceLoader} to use
+	 * @param propertyResolver the {@code PropertyResolver} to use
 	 */
 	public ResourceEditor(ResourceLoader resourceLoader, PropertyResolver propertyResolver) {
 		this(resourceLoader, propertyResolver, true);
@@ -89,7 +89,7 @@ public class ResourceEditor extends PropertyEditorSupport {
 	/**
 	 * Create a new instance of the {@link ResourceEditor} class
 	 * using the given {@link ResourceLoader}.
-	 * @param resourceLoader the <code>ResourceLoader</code> to use
+	 * @param resourceLoader the {@code ResourceLoader} to use
 	 * @param ignoreUnresolvablePlaceholders whether to ignore unresolvable placeholders
 	 * if no corresponding property could be found
 	 * @deprecated as of Spring 3.1 in favor of
@@ -103,10 +103,10 @@ public class ResourceEditor extends PropertyEditorSupport {
 	/**
 	 * Create a new instance of the {@link ResourceEditor} class
 	 * using the given {@link ResourceLoader}.
-	 * @param resourceLoader the <code>ResourceLoader</code> to use
-	 * @param propertyResolver the <code>PropertyResolver</code> to use
+	 * @param resourceLoader the {@code ResourceLoader} to use
+	 * @param propertyResolver the {@code PropertyResolver} to use
 	 * @param ignoreUnresolvablePlaceholders whether to ignore unresolvable placeholders
-	 * if no corresponding property could be found in the given <code>propertyResolver</code>
+	 * if no corresponding property could be found in the given {@code propertyResolver}
 	 */
 	public ResourceEditor(ResourceLoader resourceLoader, PropertyResolver propertyResolver, boolean ignoreUnresolvablePlaceholders) {
 		Assert.notNull(resourceLoader, "ResourceLoader must not be null");
@@ -130,7 +130,7 @@ public class ResourceEditor extends PropertyEditorSupport {
 
 	/**
 	 * Resolve the given path, replacing placeholders with corresponding
-	 * property values from the <code>environment</code> if necessary.
+	 * property values from the {@code environment} if necessary.
 	 * @param path the original file path
 	 * @return the resolved file path
 	 * @see PropertyResolver#resolvePlaceholders
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 3efd0e5cf9..360c8f9cf7 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
@@ -70,7 +70,7 @@ 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</code>)
+	 * @return the ClassLoader (never {@code null})
 	 */
 	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 ae760378e7..5c37b0b448 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
@@ -30,7 +30,7 @@ import org.springframework.util.ResourceUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * {@link Resource} implementation for <code>java.net.URL</code> locators.
+ * {@link Resource} implementation for {@code java.net.URL} locators.
  * Obviously supports resolution as URL, and also as File in case of
  * the "file:" protocol.
  *
@@ -112,7 +112,7 @@ public class UrlResource extends AbstractFileResolvingResource {
 
 	/**
 	 * This implementation opens an InputStream for the given URL.
-	 * It sets the "UseCaches" flag to <code>false</code>,
+	 * It sets the "UseCaches" flag to {@code false},
 	 * mainly to avoid jar file locking on Windows.
 	 * @see java.net.URL#openConnection()
 	 * @see java.net.URLConnection#setUseCaches(boolean)
diff --git a/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java b/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java
index 71c2ceb097..863c8d73ea 100644
--- a/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/io/VfsUtils.java
@@ -33,8 +33,8 @@ import org.springframework.util.ReflectionUtils;
 
 /**
  * Utility for detecting the JBoss VFS version available in the classpath.
- * JBoss AS 5+ uses VFS 2.x (package <code>org.jboss.virtual</code>) while
- * JBoss AS 6+ uses VFS 3.x (package <code>org.jboss.vfs</code>).
+ * JBoss AS 5+ uses VFS 2.x (package {@code org.jboss.virtual}) while
+ * JBoss AS 6+ uses VFS 3.x (package {@code org.jboss.vfs}).
  *
  * <p>Thanks go to Marius Bogoevici for the initial patch.
  *
diff --git a/spring-core/src/main/java/org/springframework/core/io/WritableResource.java b/spring-core/src/main/java/org/springframework/core/io/WritableResource.java
index 1f44c5163e..acb688dad9 100644
--- a/spring-core/src/main/java/org/springframework/core/io/WritableResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/WritableResource.java
@@ -32,9 +32,9 @@ public interface WritableResource extends Resource {
 	/**
 	 * Return whether the contents of this resource can be modified,
 	 * e.g. via {@link #getOutputStream()} or {@link #getFile()}.
-	 * <p>Will be <code>true</code> for typical resource descriptors;
+	 * <p>Will be {@code true} for typical resource descriptors;
 	 * note that actual content writing may still fail when attempted.
-	 * However, a value of <code>false</code> is a definitive indication
+	 * However, a value of {@code false} is a definitive indication
 	 * that the resource content cannot be modified.
 	 * @see #getOutputStream()
 	 * @see #isReadable()
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 c0075caa41..36649fdf18 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
@@ -29,7 +29,7 @@ import org.springframework.util.ObjectUtils;
  * with a specific encoding 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</code>.
+ * a specific encoding (usually through a {@code java.io.Reader}.
  *
  * @author Juergen Hoeller
  * @since 1.2.6
@@ -73,14 +73,14 @@ public class EncodedResource {
 
 	/**
 	 * Return the encoding to use for reading from the resource,
-	 * or <code>null</code> if none specified.
+	 * or {@code null} if none specified.
 	 */
 	public final String getEncoding() {
 		return this.encoding;
 	}
 
 	/**
-	 * Open a <code>java.io.Reader</code> for the specified resource,
+	 * Open a {@code java.io.Reader} for the specified resource,
 	 * using the specified encoding (if any).
 	 * @throws IOException if opening the Reader failed
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java b/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java
index 1300f76f9a..485ddae1f2 100644
--- a/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java
+++ b/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java
@@ -71,7 +71,7 @@ public class LocalizedResourceHelper {
 	 * Find the most specific localized resource for the given name,
 	 * extension and locale:
 	 * <p>The file will be searched with locations in the following order,
-	 * similar to <code>java.util.ResourceBundle</code>'s search order:
+	 * similar to {@code java.util.ResourceBundle}'s search order:
 	 * <ul>
 	 * <li>[name]_[language]_[country]_[variant][extension]
 	 * <li>[name]_[language]_[country][extension]
@@ -82,7 +82,7 @@ public class LocalizedResourceHelper {
 	 * descriptor for the default location will be returned.
 	 * @param name the name of the file, without localization part nor extension
 	 * @param extension the file extension (e.g. ".xls")
-	 * @param locale the current locale (may be <code>null</code>)
+	 * @param locale the current locale (may be {@code null})
 	 * @return the most specific localized resource found
 	 * @see java.util.ResourceBundle
 	 */
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 61a56cdaff..128465c964 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
@@ -52,7 +52,7 @@ import org.springframework.util.StringUtils;
  * specified resource location path into one or more matching Resources.
  * The source path may be a simple path which has a one-to-one mapping to a
  * target {@link org.springframework.core.io.Resource}, or alternatively
- * may contain the special "<code>classpath*:</code>" prefix and/or
+ * may contain the special "{@code classpath*:}" prefix and/or
  * internal Ant-style regular expressions (matched using Spring's
  * {@link org.springframework.util.AntPathMatcher} utility).
  * Both of the latter are effectively wildcards.
@@ -60,14 +60,14 @@ import org.springframework.util.StringUtils;
  * <p><b>No Wildcards:</b>
  *
  * <p>In the simple case, if the specified location path does not start with the
- * <code>"classpath*:</code>" prefix, and does not contain a PathMatcher pattern,
+ * {@code "classpath*:}" prefix, and does not contain a PathMatcher pattern,
  * this resolver will simply return a single resource via a
- * <code>getResource()</code> call on the underlying <code>ResourceLoader</code>.
- * Examples are real URLs such as "<code>file:C:/context.xml</code>", pseudo-URLs
- * such as "<code>classpath:/context.xml</code>", and simple unprefixed paths
- * such as "<code>/WEB-INF/context.xml</code>". The latter will resolve in a
- * fashion specific to the underlying <code>ResourceLoader</code> (e.g.
- * <code>ServletContextResource</code> for a <code>WebApplicationContext</code>).
+ * {@code getResource()} call on the underlying {@code ResourceLoader}.
+ * Examples are real URLs such as "{@code file:C:/context.xml}", pseudo-URLs
+ * such as "{@code classpath:/context.xml}", and simple unprefixed paths
+ * such as "{@code /WEB-INF/context.xml}". The latter will resolve in a
+ * fashion specific to the underlying {@code ResourceLoader} (e.g.
+ * {@code ServletContextResource} for a {@code WebApplicationContext}).
  *
  * <p><b>Ant-style Patterns:</b>
  *
@@ -78,67 +78,67 @@ import org.springframework.util.StringUtils;
  * file:C:/some/path/*-context.xml
  * classpath:com/mycompany/**&#47;applicationContext.xml</pre>
  * the resolver follows a more complex but defined procedure to try to resolve
- * the wildcard. It produces a <code>Resource</code> for the path up to the last
- * non-wildcard segment and obtains a <code>URL</code> from it. If this URL is
- * not a "<code>jar:</code>" URL or container-specific variant (e.g.
- * "<code>zip:</code>" in WebLogic, "<code>wsjar</code>" in WebSphere", etc.),
- * then a <code>java.io.File</code> is obtained from it, and used to resolve the
+ * the wildcard. It produces a {@code Resource} for the path up to the last
+ * non-wildcard segment and obtains a {@code URL} from it. If this URL is
+ * not a "{@code jar:}" URL or container-specific variant (e.g.
+ * "{@code zip:}" in WebLogic, "{@code wsjar}" in WebSphere", etc.),
+ * then a {@code java.io.File} is obtained from it, and used to resolve the
  * wildcard by walking the filesystem. In the case of a jar URL, the resolver
- * either gets a <code>java.net.JarURLConnection</code> from it, or manually parses
+ * either gets a {@code java.net.JarURLConnection} from it, or manually parses
  * the jar URL, and then traverses the contents of the jar file, to resolve the
  * wildcards.
  *
  * <p><b>Implications on portability:</b>
  *
  * <p>If the specified path is already a file URL (either explicitly, or
- * implicitly because the base <code>ResourceLoader</code> is a filesystem one,
+ * implicitly because the base {@code ResourceLoader} is a filesystem one,
  * then wildcarding is guaranteed to work in a completely portable fashion.
  *
  * <p>If the specified path is a classpath location, then the resolver must
  * obtain the last non-wildcard path segment URL via a
- * <code>Classloader.getResource()</code> call. Since this is just a
+ * {@code Classloader.getResource()} call. Since this is just a
  * node of the path (not the file at the end) it is actually undefined
  * (in the ClassLoader Javadocs) exactly what sort of a URL is returned in
- * this case. In practice, it is usually a <code>java.io.File</code> representing
+ * this case. In practice, it is usually a {@code java.io.File} representing
  * the directory, where the classpath resource resolves to a filesystem
  * location, or a jar URL of some sort, where the classpath resource resolves
  * to a jar location. Still, there is a portability concern on this operation.
  *
  * <p>If a jar URL is obtained for the last non-wildcard segment, the resolver
- * must be able to get a <code>java.net.JarURLConnection</code> from it, or
+ * must be able to get a {@code java.net.JarURLConnection} from it, or
  * manually parse the jar URL, to be able to walk the contents of the jar,
  * and resolve the wildcard. This will work in most environments, but will
  * fail in others, and it is strongly recommended that the wildcard
  * resolution of resources coming from jars be thoroughly tested in your
  * specific environment before you rely on it.
  *
- * <p><b><code>classpath*:</code> Prefix:</b>
+ * <p><b>{@code classpath*:} Prefix:</b>
  *
  * <p>There is special support for retrieving multiple class path resources with
- * the same name, via the "<code>classpath*:</code>" prefix. For example,
- * "<code>classpath*:META-INF/beans.xml</code>" will find all "beans.xml"
+ * the same name, via the "{@code classpath*:}" prefix. For example,
+ * "{@code classpath*:META-INF/beans.xml}" will find all "beans.xml"
  * files in the class path, be it in "classes" directories or in JAR files.
  * This is particularly useful for autodetecting config files of the same name
  * at the same location within each jar file. Internally, this happens via a
- * <code>ClassLoader.getResources()</code> call, and is completely portable.
+ * {@code ClassLoader.getResources()} call, and is completely portable.
  *
  * <p>The "classpath*:" prefix can also be combined with a PathMatcher pattern in
  * the rest of the location path, for example "classpath*:META-INF/*-beans.xml".
  * In this case, the resolution strategy is fairly simple: a
- * <code>ClassLoader.getResources()</code> call is used on the last non-wildcard
+ * {@code ClassLoader.getResources()} call is used on the last non-wildcard
  * path segment to get all the matching resources in the class loader hierarchy,
  * and then off each resource the same PathMatcher resolution strategy described
  * above is used for the wildcard subpath.
  *
  * <p><b>Other notes:</b>
  *
- * <p><b>WARNING:</b> Note that "<code>classpath*:</code>" when combined with
+ * <p><b>WARNING:</b> Note that "{@code classpath*:}" when combined with
  * Ant-style patterns will only work reliably with at least one root directory
  * before the pattern starts, unless the actual target files reside in the file
- * system. This means that a pattern like "<code>classpath*:*.xml</code>" will
+ * system. This means that a pattern like "{@code classpath*:*.xml}" will
  * <i>not</i> retrieve files from the root of jar files but rather only from the
  * root of expanded directories. This originates from a limitation in the JDK's
- * <code>ClassLoader.getResources()</code> method which only returns file system
+ * {@code ClassLoader.getResources()} method which only returns file system
  * locations for a passed-in empty String (indicating potential roots to search).
  *
  * <p><b>WARNING:</b> Ant-style patterns with "classpath:" resources are not
@@ -148,9 +148,9 @@ import org.springframework.util.StringUtils;
  * </pre>may be in only one location, but when a path such as<pre>
  *     classpath:com/mycompany/**&#47;service-context.xml
  * </pre>is used to try to resolve it, the resolver will work off the (first) URL
- * returned by <code>getResource("com/mycompany");</code>. If this base package
+ * 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*:<code>" with the same
+ * not be underneath. Therefore, preferably, use "{@code classpath*:}" with the same
  * Ant-style pattern in such a case, which will search <i>all</i> class path
  * locations that contain the root package.
  *
@@ -162,7 +162,7 @@ import org.springframework.util.StringUtils;
  * @see #CLASSPATH_ALL_URL_PREFIX
  * @see org.springframework.util.AntPathMatcher
  * @see org.springframework.core.io.ResourceLoader#getResource(String)
- * @see java.lang.ClassLoader#getResources(String)
+ * @see ClassLoader#getResources(String)
  */
 public class PathMatchingResourcePatternResolver implements ResourcePatternResolver {
 
@@ -201,7 +201,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 	/**
 	 * Create a new PathMatchingResourcePatternResolver with a DefaultResourceLoader.
 	 * @param classLoader the ClassLoader to load classpath resources with,
-	 * or <code>null</code> for using the thread context class loader
+	 * or {@code null} for using the thread context class loader
 	 * at the time of actual resource access
 	 * @see org.springframework.core.io.DefaultResourceLoader
 	 */
@@ -229,7 +229,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 
 	/**
 	 * Return the ClassLoader that this pattern resolver works with
-	 * (never <code>null</code>).
+	 * (never {@code null}).
 	 */
 	public ClassLoader getClassLoader() {
 		return getResourceLoader().getClassLoader();
@@ -356,8 +356,8 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 	/**
 	 * Determine the root directory for the given location.
 	 * <p>Used for determining the starting point for file matching,
-	 * resolving the root directory location to a <code>java.io.File</code>
-	 * and passing it into <code>retrieveMatchingFiles</code>, with the
+	 * resolving the root directory location to a {@code java.io.File}
+	 * and passing it into {@code retrieveMatchingFiles}, with the
 	 * remainder of the location as pattern.
 	 * <p>Will return "/WEB-INF/" for the pattern "/WEB-INF/*.xml",
 	 * for example.
@@ -398,7 +398,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 
 	/**
 	 * Return whether the given resource handle indicates a jar resource
-	 * that the <code>doFindPathMatchingJarResources</code> method can handle.
+	 * that the {@code doFindPathMatchingJarResources} method can handle.
 	 * <p>The default implementation checks against the URL protocols
 	 * "jar", "zip" and "wsjar" (the latter are used by BEA WebLogic Server
 	 * and IBM WebSphere, respectively, but can be treated like jar files).
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 1b427611c4..d99e69806e 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
@@ -118,7 +118,7 @@ public abstract class PropertiesLoaderSupport {
 
 	/**
 	 * Set the encoding to use for parsing properties files.
-	 * <p>Default is none, using the <code>java.util.Properties</code>
+	 * <p>Default is none, using the {@code java.util.Properties}
 	 * default encoding.
 	 * <p>Only applies to classic properties files, not to XML files.
 	 * @see org.springframework.util.PropertiesPersister#load
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 20b74d017a..6f3308d830 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
@@ -29,7 +29,7 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.ResourceUtils;
 
 /**
- * Convenient utility methods for loading of <code>java.util.Properties</code>,
+ * Convenient utility methods for loading of {@code java.util.Properties},
  * performing standard handling of input streams.
  *
  * <p>For more configurable properties loading, including the option of a
@@ -90,7 +90,7 @@ public abstract class PropertiesLoaderUtils {
 	 * found in the class path.
 	 * @param resourceName the name of the class path resource
 	 * @param classLoader the ClassLoader to use for loading
-	 * (or <code>null</code> to use the default class loader)
+	 * (or {@code null} to use the default class loader)
 	 * @return the populated Properties instance
 	 * @throws IOException if loading failed
 	 */
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 d3925dd5b5..02c14657be 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
@@ -32,14 +32,14 @@ import org.springframework.core.io.Resource;
 
 /**
  * Editor for {@link org.springframework.core.io.Resource} arrays, to
- * automatically convert <code>String</code> location patterns
- * (e.g. <code>"file:C:/my*.txt"</code> or <code>"classpath*:myfile.txt"</code>)
- * to <code>Resource</code> array properties. Can also translate a collection
+ * automatically convert {@code String} location patterns
+ * (e.g. {@code "file:C:/my*.txt"} or {@code "classpath*:myfile.txt"})
+ * to {@code Resource} array properties. Can also translate a collection
  * or array of location patterns into a merged Resource array.
  *
- * <p>A path may contain <code>${...}</code> placeholders, to be
+ * <p>A path may contain {@code ${...}} placeholders, to be
  * resolved as {@link org.springframework.core.env.Environment} properties:
- * e.g. <code>${user.dir}</code>. Unresolvable placeholders are ignored by default.
+ * e.g. {@code ${user.dir}}. Unresolvable placeholders are ignored by default.
  *
  * <p>Delegates to a {@link ResourcePatternResolver},
  * by default using a {@link PathMatchingResourcePatternResolver}.
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 702b4be64e..c995946519 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
@@ -25,7 +25,7 @@ import org.springframework.util.ResourceUtils;
  * location that can be loaded via a ResourcePatternResolver.
  *
  * <p>Callers will usually assume that a location is a relative path
- * if the {@link #isUrl(String)} method returns <code>false</code>.
+ * if the {@link #isUrl(String)} method returns {@code false}.
  *
  * @author Juergen Hoeller
  * @since 1.2.3
@@ -54,7 +54,7 @@ public abstract class ResourcePatternUtils {
 	 * ResourcePatternResolver extension, or a PathMatchingResourcePatternResolver
 	 * built on the given ResourceLoader.
 	 * @param resourceLoader the ResourceLoader to build a pattern resolver for
-	 * (may be <code>null</code> to indicate a default ResourceLoader)
+	 * (may be {@code null} to indicate a default ResourceLoader)
 	 * @return the ResourcePatternResolver
 	 * @see PathMatchingResourcePatternResolver
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java
index cd33b6d0b9..a13007fb8d 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java
@@ -31,7 +31,7 @@ import org.springframework.core.NestedRuntimeException;
 public class SerializationFailedException extends NestedRuntimeException {
 
 	/**
-	 * Construct a <code>SerializationException</code> with the specified detail message.
+	 * Construct a {@code SerializationException} with the specified detail message.
 	 * @param message the detail message
 	 */
 	public SerializationFailedException(String message) {
@@ -39,7 +39,7 @@ public class SerializationFailedException extends NestedRuntimeException {
 	}
 
 	/**
-	 * Construct a <code>SerializationException</code> with the specified detail message
+	 * Construct a {@code SerializationException} with the specified detail message
 	 * and nested exception.
 	 * @param message the detail message
 	 * @param cause the nested exception
diff --git a/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java b/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java
index 8d628d6646..be370e60a1 100644
--- a/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java
+++ b/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java
@@ -21,9 +21,9 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 
 /**
- * Spring's default <code>toString()</code> styler.
+ * Spring's default {@code toString()} styler.
  *
- * <p>This class is used by {@link ToStringCreator} to style <code>toString()</code>
+ * <p>This class is used by {@link ToStringCreator} to style {@code toString()}
  * output in a consistent manner according to Spring conventions.
  *
  * @author Keith Donald
diff --git a/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java b/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
index 371b255167..46a3383daf 100644
--- a/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
+++ b/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
@@ -28,7 +28,7 @@ import org.springframework.util.ObjectUtils;
 
 /**
  * Converts objects to String form, generally for debugging purposes,
- * using Spring's <code>toString</code> styling conventions.
+ * using Spring's {@code toString} styling conventions.
  *
  * <p>Uses the reflective visitor pattern underneath the hood to nicely
  * encapsulate styling algorithms for each type of styled object.
diff --git a/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java b/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java
index a49fa80461..8fc918c0ef 100644
--- a/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java
@@ -32,7 +32,7 @@ package org.springframework.core.style;
 public abstract class StylerUtils {
 
 	/**
-	 * Default ValueStyler instance used by the <code>style</code> method.
+	 * Default ValueStyler instance used by the {@code style} method.
 	 * Also available for the {@link ToStringCreator} class in this package.
 	 */
 	static final ValueStyler DEFAULT_VALUE_STYLER = new DefaultValueStyler();
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 51441951d5..08a90a5fd0 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
@@ -19,9 +19,9 @@ package org.springframework.core.style;
 import org.springframework.util.Assert;
 
 /**
- * Utility class that builds pretty-printing <code>toString()</code> methods
+ * Utility class that builds pretty-printing {@code toString()} methods
  * with pluggable styling conventions. By default, ToStringCreator adheres
- * to Spring's <code>toString()</code> styling conventions.
+ * to Spring's {@code toString()} styling conventions.
  *
  * @author Keith Donald
  * @author Juergen Hoeller
diff --git a/spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java b/spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java
index 5c81982c49..785ce79c4b 100644
--- a/spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java
+++ b/spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java
@@ -17,7 +17,7 @@
 package org.springframework.core.style;
 
 /**
- * A strategy interface for pretty-printing <code>toString()</code> methods.
+ * A strategy interface for pretty-printing {@code toString()} methods.
  * Encapsulates the print algorithms; some other object such as a builder
  * should provide the workflow.
  *
@@ -27,14 +27,14 @@ package org.springframework.core.style;
 public interface ToStringStyler {
 
 	/**
-	 * Style a <code>toString()</code>'ed object before its fields are styled.
+	 * Style a {@code toString()}'ed object before its fields are styled.
 	 * @param buffer the buffer to print to
 	 * @param obj the object to style
 	 */
 	void styleStart(StringBuilder buffer, Object obj);
 
 	/**
-	 * Style a <code>toString()</code>'ed object after it's fields are styled.
+	 * Style a {@code toString()}'ed object after it's fields are styled.
 	 * @param buffer the buffer to print to
 	 * @param obj the object to style
 	 */
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 ea1ffbe74d..ece4c3cb26 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
@@ -49,8 +49,8 @@ public interface AsyncTaskExecutor extends TaskExecutor {
 
 
 	/**
-	 * Execute the given <code>task</code>.
-	 * @param task the <code>Runnable</code> to execute (never <code>null</code>)
+	 * Execute the given {@code task}.
+	 * @param task the {@code Runnable} to execute (never {@code null})
 	 * @param startTimeout the time duration (milliseconds) within which the task is
 	 * supposed to start. This is intended as a hint to the executor, allowing for
 	 * preferred handling of immediate tasks. Typical values are {@link #TIMEOUT_IMMEDIATE}
@@ -63,8 +63,8 @@ public interface AsyncTaskExecutor extends TaskExecutor {
 
 	/**
 	 * Submit a Runnable task for execution, receiving a Future representing that task.
-	 * The Future will return a <code>null</code> result upon completion.
-	 * @param task the <code>Runnable</code> to execute (never <code>null</code>)
+	 * The Future will return a {@code null} result upon completion.
+	 * @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
 	 */
@@ -73,7 +73,7 @@ public interface AsyncTaskExecutor extends TaskExecutor {
 	/**
 	 * Submit a Callable task for execution, receiving a Future representing that task.
 	 * The Future will return the Callable's result upon completion.
-	 * @param task the <code>Callable</code> to execute (never <code>null</code>)
+	 * @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
 	 */
diff --git a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
index e92efb8ca3..92c37bc758 100644
--- a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
@@ -129,7 +129,7 @@ public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator implement
 
 	/**
 	 * Return whether this throttle is currently active.
-	 * @return <code>true</code> if the concurrency limit for this instance is active
+	 * @return {@code true} if the concurrency limit for this instance is active
 	 * @see #getConcurrencyLimit()
 	 * @see #setConcurrencyLimit
 	 */
@@ -195,7 +195,7 @@ public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator implement
 
 	/**
 	 * Subclass of the general ConcurrencyThrottleSupport class,
-	 * making <code>beforeAccess()</code> and <code>afterAccess()</code>
+	 * making {@code beforeAccess()} and {@code afterAccess()}
 	 * visible to the surrounding class.
 	 */
 	private static class ConcurrencyThrottleAdapter extends ConcurrencyThrottleSupport {
@@ -213,7 +213,7 @@ public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator implement
 
 
 	/**
-	 * This Runnable calls <code>afterAccess()</code> after the
+	 * This Runnable calls {@code afterAccess()} after the
 	 * target Runnable has finished its execution.
 	 */
 	private class ConcurrencyThrottlingRunnable implements Runnable {
diff --git a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
index d79cb3e533..4b12d67dd8 100644
--- a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
  * in it's thread context, for example the thread context class loader or the
  * thread's current transaction association. That said, in many cases,
  * asynchronous execution will be preferable: choose an asynchronous
- * <code>TaskExecutor</code> instead for such scenarios.
+ * {@code TaskExecutor} instead for such scenarios.
  *
  * @author Juergen Hoeller
  * @since 2.0
@@ -39,9 +39,9 @@ import org.springframework.util.Assert;
 public class SyncTaskExecutor implements TaskExecutor, Serializable {
 
 	/**
-	 * Executes the given <code>task</code> synchronously, through direct
+	 * Executes the given {@code task} synchronously, through direct
 	 * invocation of it's {@link Runnable#run() run()} method.
-	 * @throws IllegalArgumentException if the given <code>task</code> is <code>null</code>
+	 * @throws IllegalArgumentException if the given {@code task} is {@code null}
 	 */
 	public void execute(Runnable task) {
 		Assert.notNull(task, "Runnable must not be null");
diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
index 71956bf224..fe80839acd 100644
--- a/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
@@ -38,11 +38,11 @@ import java.util.concurrent.Executor;
 public interface TaskExecutor extends Executor {
 
 	/**
-	 * Execute the given <code>task</code>.
+	 * Execute the given {@code task}.
 	 * <p>The call might return immediately if the implementation uses
 	 * an asynchronous execution strategy, or might block in the case
 	 * of synchronous execution.
-	 * @param task the <code>Runnable</code> to execute (never <code>null</code>)
+	 * @param task the {@code Runnable} to execute (never {@code null})
 	 * @throws TaskRejectedException if the given task was not accepted
 	 */
 	void execute(Runnable task);
diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
index 1f5ee705f7..4429d0ca9f 100644
--- a/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
+++ b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
@@ -30,7 +30,7 @@ import java.util.concurrent.RejectedExecutionException;
 public class TaskRejectedException extends RejectedExecutionException {
 
 	/**
-	 * Create a new <code>TaskRejectedException</code>
+	 * Create a new {@code TaskRejectedException}
 	 * with the specified detail message and no root cause.
 	 * @param msg the detail message
 	 */
@@ -39,11 +39,11 @@ public class TaskRejectedException extends RejectedExecutionException {
 	}
 
 	/**
-	 * Create a new <code>TaskRejectedException</code>
+	 * Create a new {@code TaskRejectedException}
 	 * with the specified detail message and the given root cause.
 	 * @param msg the detail message
 	 * @param cause the root cause (usually from using an underlying
-	 * API such as the <code>java.util.concurrent</code> package)
+	 * API such as the {@code java.util.concurrent} package)
 	 * @see java.util.concurrent.RejectedExecutionException
 	 */
 	public TaskRejectedException(String msg, Throwable cause) {
diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
index 6b31e0a659..49a218d354 100644
--- a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
+++ b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
@@ -28,7 +28,7 @@ package org.springframework.core.task;
 public class TaskTimeoutException extends TaskRejectedException {
 
 	/**
-	 * Create a new <code>TaskTimeoutException</code>
+	 * Create a new {@code TaskTimeoutException}
 	 * with the specified detail message and no root cause.
 	 * @param msg the detail message
 	 */
@@ -37,11 +37,11 @@ public class TaskTimeoutException extends TaskRejectedException {
 	}
 
 	/**
-	 * Create a new <code>TaskTimeoutException</code>
+	 * Create a new {@code TaskTimeoutException}
 	 * with the specified detail message and the given root cause.
 	 * @param msg the detail message
 	 * @param cause the root cause (usually from using an underlying
-	 * API such as the <code>java.util.concurrent</code> package)
+	 * API such as the {@code java.util.concurrent} package)
 	 * @see java.util.concurrent.RejectedExecutionException
 	 */
 	public TaskTimeoutException(String msg, Throwable cause) {
diff --git a/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
index c9c998f2ae..dea77c827f 100644
--- a/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
+++ b/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
@@ -25,16 +25,16 @@ import org.springframework.util.Assert;
 
 /**
  * Adapter that takes a Spring {@link org.springframework.core.task.TaskExecutor})
- * and exposes a full <code>java.util.concurrent.ExecutorService</code> for it.
+ * and exposes a full {@code java.util.concurrent.ExecutorService} for it.
  *
  * <p>This is primarily for adapting to client components that communicate via the
- * <code>java.util.concurrent.ExecutorService</code> API. It can also be used as
- * common ground between a local Spring <code>TaskExecutor</code> backend and a
- * JNDI-located <code>ManagedExecutorService</code> in a Java EE 6 environment.
+ * {@code java.util.concurrent.ExecutorService} API. It can also be used as
+ * common ground between a local Spring {@code TaskExecutor} backend and a
+ * JNDI-located {@code ManagedExecutorService} in a Java EE 6 environment.
  *
  * <p><b>NOTE:</b> This ExecutorService adapter does <em>not</em> support the
- * lifecycle methods in the <code>java.util.concurrent.ExecutorService</code> API
- * ("shutdown()" etc), similar to a server-wide <code>ManagedExecutorService</code>
+ * lifecycle methods in the {@code java.util.concurrent.ExecutorService} API
+ * ("shutdown()" etc), similar to a server-wide {@code ManagedExecutorService}
  * in a Java EE 6 environment. The lifecycle is always up to the backend pool,
  * with this adapter acting as an access-only proxy for that target pool.
  *
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 1d50109f7a..b5b8ad06f4 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
@@ -28,9 +28,9 @@ import org.springframework.core.task.TaskRejectedException;
 import org.springframework.util.Assert;
 
 /**
- * Adapter that takes a JDK 1.5 <code>java.util.concurrent.Executor</code> and
+ * Adapter that takes a JDK 1.5 {@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</code>, adapting
+ * Also detects an extended {@code java.util.concurrent.ExecutorService}, adapting
  * the {@link org.springframework.core.task.AsyncTaskExecutor} interface accordingly.
  *
  * @author Juergen Hoeller
diff --git a/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java
index 285cc99f93..1d50b7846c 100644
--- a/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java
@@ -65,7 +65,7 @@ public interface AnnotationMetadata extends ClassMetadata {
 	 * Determine whether the underlying class has an annotation or
 	 * meta-annotation of the given type defined.
 	 * <p>This is equivalent to a "hasAnnotation || hasMetaAnnotation"
-	 * check. If this method returns <code>true</code>, then
+	 * check. If this method returns {@code true}, then
 	 * {@link #getAnnotationAttributes} will return a non-null Map.
 	 * @param annotationType the annotation type to look for
 	 * @return whether a matching annotation is defined
@@ -79,7 +79,7 @@ public interface AnnotationMetadata extends ClassMetadata {
 	 * @param annotationType the annotation type to look for
 	 * @return a Map of attributes, with the attribute name as key (e.g. "value")
 	 * and the defined attribute value as Map value. This return value will be
-	 * <code>null</code> if no matching annotation is defined.
+	 * {@code null} if no matching annotation is defined.
 	 */
 	Map<String, Object> getAnnotationAttributes(String annotationType);
 
@@ -93,7 +93,7 @@ public interface AnnotationMetadata extends ClassMetadata {
 	 * references which might potentially have to be loaded first
 	 * @return a Map of attributes, with the attribute name as key (e.g. "value")
 	 * and the defined attribute value as Map value. This return value will be
-	 * <code>null</code> if no matching annotation is defined.
+	 * {@code null} if no matching annotation is defined.
 	 */
 	Map<String, Object> getAnnotationAttributes(String annotationType, boolean classValuesAsString);
 
@@ -107,7 +107,7 @@ public interface AnnotationMetadata extends ClassMetadata {
 	 * Retrieve the method metadata for all methods that are annotated
 	 * (or meta-annotated) with the given annotation type.
 	 * <p>For any returned method, {@link MethodMetadata#isAnnotated} will
-	 * return <code>true</code> for the given annotation type.
+	 * return {@code true} for the given annotation type.
 	 * @param annotationType the annotation type to look for
 	 * @return a Set of {@link MethodMetadata} for methods that have a matching
 	 * annotation. The return value will be an empty set if no methods match
diff --git a/spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java b/spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java
index 3f0556935e..5d80abe5b1 100644
--- a/spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java
@@ -66,14 +66,14 @@ public interface ClassMetadata {
 	 * Return whether the underlying class has an enclosing class
 	 * (i.e. the underlying class is an inner/nested class or
 	 * a local class within a method).
-	 * <p>If this method returns <code>false</code>, then the
+	 * <p>If this method returns {@code false}, then the
 	 * underlying class is a top-level class.
 	 */
 	boolean hasEnclosingClass();
 
 	/**
 	 * Return the name of the enclosing class of the underlying class,
-	 * or <code>null</code> if the underlying class is a top-level class.
+	 * or {@code null} if the underlying class is a top-level class.
 	 */
 	String getEnclosingClassName();
 
@@ -84,7 +84,7 @@ public interface ClassMetadata {
 
 	/**
 	 * Return the name of the super class of the underlying class,
-	 * or <code>null</code> if there is no super class defined.
+	 * or {@code null} if there is no super class defined.
 	 */
 	String getSuperClassName();
 
diff --git a/spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java b/spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java
index 21f715e764..8d6da265fc 100644
--- a/spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java
@@ -72,7 +72,7 @@ public interface MethodMetadata {
 	 * @param annotationType the annotation type to look for
 	 * @return a Map of attributes, with the attribute name as key (e.g. "value")
 	 * and the defined attribute value as Map value. This return value will be
-	 * <code>null</code> if no matching annotation is defined.
+	 * {@code null} if no matching annotation is defined.
 	 */
 	Map<String, Object> getAnnotationAttributes(String annotationType);
 
diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
index d40aea8354..82ff759897 100644
--- a/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
@@ -23,7 +23,7 @@ import org.springframework.util.Assert;
 
 /**
  * {@link ClassMetadata} implementation that uses standard reflection
- * to introspect a given <code>Class</code>.
+ * to introspect a given {@code Class}.
  *
  * @author Juergen Hoeller
  * @since 2.5
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 a9e89dff14..c6564c643f 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
@@ -26,7 +26,7 @@ import org.springframework.util.Assert;
 
 /**
  * {@link MethodMetadata} implementation that uses standard reflection
- * to introspect a given <code>Method</code>.
+ * to introspect a given {@code Method}.
  *
  * @author Juergen Hoeller
  * @author Mark Pollack
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java b/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java
index d8f50427ec..fa77bdccf6 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java
@@ -34,7 +34,7 @@ public interface MetadataReaderFactory {
 	/**
 	 * Obtain a MetadataReader for the given class name.
 	 * @param className the class name (to be resolved to a ".class" file)
-	 * @return a holder for the ClassReader instance (never <code>null</code>)
+	 * @return a holder for the ClassReader instance (never {@code null})
 	 * @throws IOException in case of I/O failure
 	 */
 	MetadataReader getMetadataReader(String className) throws IOException;
@@ -42,7 +42,7 @@ public interface MetadataReaderFactory {
 	/**
 	 * Obtain a MetadataReader for the given resource.
 	 * @param resource the resource (pointing to a ".class" file)
-	 * @return a holder for the ClassReader instance (never <code>null</code>)
+	 * @return a holder for the ClassReader instance (never {@code null})
 	 * @throws IOException in case of I/O failure
 	 */
 	MetadataReader getMetadataReader(Resource resource) throws IOException;
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 182dac134c..b2bf4405da 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
@@ -30,7 +30,7 @@ import org.springframework.core.type.ClassMetadata;
  * {@link org.springframework.asm.ClassReader}.
  *
  * <p>Package-visible in order to allow for repackaging the ASM library
- * without effect on users of the <code>core.type</code> package.
+ * without effect on users of the {@code core.type} package.
  *
  * @author Juergen Hoeller
  * @author Costin Leau
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 73c494b458..61c795c1d1 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
@@ -26,7 +26,7 @@ import org.springframework.core.type.classreading.MetadataReader;
  * A simple filter which matches classes with a given annotation,
  * checking inherited annotations as well.
  *
- * <p>The matching logic mirrors that of <code>Class.isAnnotationPresent()</code>.
+ * <p>The matching logic mirrors that of {@code Class.isAnnotationPresent()}.
  *
  * @author Mark Fisher
  * @author Ramnivas Laddad
@@ -44,7 +44,7 @@ public class AnnotationTypeFilter extends AbstractTypeHierarchyTraversingFilter
 	 * Create a new AnnotationTypeFilter for the given annotation type.
 	 * This filter will also match meta-annotations. To disable the
 	 * meta-annotation matching, use the constructor that accepts a
-	 * '<code>considerMetaAnnotations</code>' argument. The filter will
+	 * '{@code considerMetaAnnotations}' argument. The filter will
 	 * not match interfaces.
 	 * @param annotationType the annotation type to match
 	 */
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 059c9f7a10..bbceda14dc 100644
--- a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
+++ b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
@@ -33,13 +33,13 @@ import java.util.regex.Pattern;
  * <p>The mapping matches URLs using the following rules:<br> <ul> <li>? matches one character</li> <li>* matches zero
  * or more characters</li> <li>** matches zero or more 'directories' in a path</li> </ul>
  *
- * <p>Some examples:<br> <ul> <li><code>com/t?st.jsp</code> - matches <code>com/test.jsp</code> but also
- * <code>com/tast.jsp</code> or <code>com/txst.jsp</code></li> <li><code>com/*.jsp</code> - matches all
- * <code>.jsp</code> files in the <code>com</code> directory</li> <li><code>com/&#42;&#42;/test.jsp</code> - matches all
- * <code>test.jsp</code> files underneath the <code>com</code> path</li> <li><code>org/springframework/&#42;&#42;/*.jsp</code>
- * - matches all <code>.jsp</code> files underneath the <code>org/springframework</code> path</li>
- * <li><code>org/&#42;&#42;/servlet/bla.jsp</code> - matches <code>org/springframework/servlet/bla.jsp</code> but also
- * <code>org/springframework/testing/servlet/bla.jsp</code> and <code>org/servlet/bla.jsp</code></li> </ul>
+ * <p>Some examples:<br> <ul> <li>{@code com/t?st.jsp} - matches {@code com/test.jsp} but also
+ * {@code com/tast.jsp} or {@code com/txst.jsp}</li> <li>{@code com/*.jsp} - matches all
+ * {@code .jsp} files in the {@code com} directory</li> <li>{@code com/&#42;&#42;/test.jsp} - matches all
+ * {@code test.jsp} files underneath the {@code com} path</li> <li>{@code org/springframework/&#42;&#42;/*.jsp}
+ * - matches all {@code .jsp} files underneath the {@code org/springframework} path</li>
+ * <li>{@code org/&#42;&#42;/servlet/bla.jsp} - matches {@code org/springframework/servlet/bla.jsp} but also
+ * {@code org/springframework/testing/servlet/bla.jsp} and {@code org/servlet/bla.jsp}</li> </ul>
  *
  * @author Alef Arendsen
  * @author Juergen Hoeller
@@ -81,12 +81,12 @@ public class AntPathMatcher implements PathMatcher {
 
 
 	/**
-	 * Actually match the given <code>path</code> against the given <code>pattern</code>.
+	 * Actually match the given {@code path} against the given {@code pattern}.
 	 * @param pattern the pattern to match against
 	 * @param path the path String to test
 	 * @param fullMatch whether a full pattern match is required (else a pattern match
 	 * as far as the given base path goes is sufficient)
-	 * @return <code>true</code> if the supplied <code>path</code> matched, <code>false</code> if it didn't
+	 * @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) {
@@ -219,9 +219,9 @@ public class AntPathMatcher implements PathMatcher {
 	 * Tests whether or not a string matches against a pattern. The pattern may contain two special characters:
 	 * <br>'*' means zero or more characters
 	 * <br>'?' means one and only one character
-	 * @param pattern pattern to match against. Must not be <code>null</code>.
-	 * @param str string which must be matched against the pattern. Must not be <code>null</code>.
-	 * @return <code>true</code> if the string matches against the pattern, or <code>false</code> otherwise.
+	 * @param pattern pattern to match against. Must not be {@code null}.
+	 * @param str string which must be matched against the pattern. Must not be {@code null}.
+	 * @return {@code true} if the string matches against the pattern, or {@code false} otherwise.
 	 */
 	private boolean matchStrings(String pattern, String str, Map<String, String> uriTemplateVariables) {
 		AntPathStringMatcher matcher = this.stringMatcherCache.get(pattern);
@@ -234,15 +234,15 @@ public class AntPathMatcher implements PathMatcher {
 
 	/**
 	 * Given a pattern and a full path, determine the pattern-mapped part. <p>For example: <ul>
-	 * <li>'<code>/docs/cvs/commit.html</code>' and '<code>/docs/cvs/commit.html</code> -> ''</li>
-	 * <li>'<code>/docs/*</code>' and '<code>/docs/cvs/commit</code> -> '<code>cvs/commit</code>'</li>
-	 * <li>'<code>/docs/cvs/*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>commit.html</code>'</li>
-	 * <li>'<code>/docs/**</code>' and '<code>/docs/cvs/commit</code> -> '<code>cvs/commit</code>'</li>
-	 * <li>'<code>/docs/**\/*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>cvs/commit.html</code>'</li>
-	 * <li>'<code>/*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>docs/cvs/commit.html</code>'</li>
-	 * <li>'<code>*.html</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>/docs/cvs/commit.html</code>'</li>
-	 * <li>'<code>*</code>' and '<code>/docs/cvs/commit.html</code> -> '<code>/docs/cvs/commit.html</code>'</li> </ul>
-	 * <p>Assumes that {@link #match} returns <code>true</code> for '<code>pattern</code>' and '<code>path</code>', but
+	 * <li>'{@code /docs/cvs/commit.html}' and '{@code /docs/cvs/commit.html} -> ''</li>
+	 * <li>'{@code /docs/*}' and '{@code /docs/cvs/commit} -> '{@code cvs/commit}'</li>
+	 * <li>'{@code /docs/cvs/*.html}' and '{@code /docs/cvs/commit.html} -> '{@code commit.html}'</li>
+	 * <li>'{@code /docs/**}' and '{@code /docs/cvs/commit} -> '{@code cvs/commit}'</li>
+	 * <li>'{@code /docs/**\/*.html}' and '{@code /docs/cvs/commit.html} -> '{@code cvs/commit.html}'</li>
+	 * <li>'{@code /*.html}' and '{@code /docs/cvs/commit.html} -> '{@code docs/cvs/commit.html}'</li>
+	 * <li>'{@code *.html}' and '{@code /docs/cvs/commit.html} -> '{@code /docs/cvs/commit.html}'</li>
+	 * <li>'{@code *}' and '{@code /docs/cvs/commit.html} -> '{@code /docs/cvs/commit.html}'</li> </ul>
+	 * <p>Assumes that {@link #match} returns {@code true} for '{@code pattern}' and '{@code path}', but
 	 * does <strong>not</strong> enforce this.
 	 */
 	public String extractPathWithinPattern(String pattern, String path) {
@@ -369,10 +369,10 @@ public class AntPathMatcher implements PathMatcher {
 
 	/**
 	 * Given a full path, returns a {@link Comparator} suitable for sorting patterns in order of explicitness.
-	 * <p>The returned <code>Comparator</code> will {@linkplain java.util.Collections#sort(java.util.List,
+	 * <p>The returned {@code Comparator} will {@linkplain java.util.Collections#sort(java.util.List,
 	 * java.util.Comparator) sort} a list so that more specific patterns (without uri templates or wild cards) come before
-	 * generic patterns. So given a list with the following patterns: <ol> <li><code>/hotels/new</code></li>
-	 * <li><code>/hotels/{hotel}</code></li> <li><code>/hotels/*</code></li> </ol> the returned comparator will sort this
+	 * generic patterns. So given a list with the following patterns: <ol> <li>{@code /hotels/new}</li>
+	 * <li>{@code /hotels/{hotel}}</li> <li>{@code /hotels/*}</li> </ol> the returned comparator will sort this
 	 * list so that the order will be as indicated.
 	 * <p>The full path given as parameter is used to test for exact matches. So when the given path is {@code /hotels/2},
 	 * the pattern {@code /hotels/2} will be sorted before {@code /hotels/1}.
@@ -525,7 +525,7 @@ public class AntPathMatcher implements PathMatcher {
 
 		/**
 		 * Main entry point.
-		 * @return <code>true</code> if the string matches against the pattern, or <code>false</code> otherwise.
+		 * @return {@code true} if the string matches against the pattern, or {@code false} otherwise.
 		 */
 		public boolean matchStrings(String str, Map<String, String> uriTemplateVariables) {
 			Matcher matcher = this.pattern.matcher(str);
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 d1ecbe54c1..05c1c4babe 100644
--- a/spring-core/src/main/java/org/springframework/util/Assert.java
+++ b/spring-core/src/main/java/org/springframework/util/Assert.java
@@ -24,7 +24,7 @@ import java.util.Map;
  * Useful for identifying programmer errors early and clearly at runtime.
  *
  * <p>For example, if the contract of a public method states it does not
- * allow <code>null</code> arguments, Assert can be used to validate that
+ * allow {@code null} arguments, Assert can be used to validate that
  * contract. Doing this clearly indicates a contract violation when it
  * occurs and protects the class's invariants.
  *
@@ -53,12 +53,12 @@ import java.util.Map;
 public abstract class Assert {
 
 	/**
-	 * Assert a boolean expression, throwing <code>IllegalArgumentException</code>
-	 * if the test result is <code>false</code>.
+	 * Assert a boolean expression, throwing {@code IllegalArgumentException}
+	 * if the test result is {@code false}.
 	 * <pre class="code">Assert.isTrue(i &gt; 0, "The value must be greater than zero");</pre>
 	 * @param expression a boolean expression
 	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if expression is <code>false</code>
+	 * @throws IllegalArgumentException if expression is {@code false}
 	 */
 	public static void isTrue(boolean expression, String message) {
 		if (!expression) {
@@ -67,22 +67,22 @@ public abstract class Assert {
 	}
 
 	/**
-	 * Assert a boolean expression, throwing <code>IllegalArgumentException</code>
-	 * if the test result is <code>false</code>.
+	 * Assert a boolean expression, throwing {@code IllegalArgumentException}
+	 * if the test result is {@code false}.
 	 * <pre class="code">Assert.isTrue(i &gt; 0);</pre>
 	 * @param expression a boolean expression
-	 * @throws IllegalArgumentException if expression is <code>false</code>
+	 * @throws IllegalArgumentException if expression is {@code false}
 	 */
 	public static void isTrue(boolean expression) {
 		isTrue(expression, "[Assertion failed] - this expression must be true");
 	}
 
 	/**
-	 * Assert that an object is <code>null</code> .
+	 * Assert that an object is {@code null} .
 	 * <pre class="code">Assert.isNull(value, "The value must be null");</pre>
 	 * @param object the object to check
 	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the object is not <code>null</code>
+	 * @throws IllegalArgumentException if the object is not {@code null}
 	 */
 	public static void isNull(Object object, String message) {
 		if (object != null) {
@@ -91,21 +91,21 @@ public abstract class Assert {
 	}
 
 	/**
-	 * Assert that an object is <code>null</code> .
+	 * Assert that an object is {@code null} .
 	 * <pre class="code">Assert.isNull(value);</pre>
 	 * @param object the object to check
-	 * @throws IllegalArgumentException if the object is not <code>null</code>
+	 * @throws IllegalArgumentException if the object is not {@code null}
 	 */
 	public static void isNull(Object object) {
 		isNull(object, "[Assertion failed] - the object argument must be null");
 	}
 
 	/**
-	 * Assert that an object is not <code>null</code> .
+	 * Assert that an object is not {@code null} .
 	 * <pre class="code">Assert.notNull(clazz, "The class must not be null");</pre>
 	 * @param object the object to check
 	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the object is <code>null</code>
+	 * @throws IllegalArgumentException if the object is {@code null}
 	 */
 	public static void notNull(Object object, String message) {
 		if (object == null) {
@@ -114,10 +114,10 @@ public abstract class Assert {
 	}
 
 	/**
-	 * Assert that an object is not <code>null</code> .
+	 * Assert that an object is not {@code null} .
 	 * <pre class="code">Assert.notNull(clazz);</pre>
 	 * @param object the object to check
-	 * @throws IllegalArgumentException if the object is <code>null</code>
+	 * @throws IllegalArgumentException if the object is {@code null}
 	 */
 	public static void notNull(Object object) {
 		notNull(object, "[Assertion failed] - this argument is required; it must not be null");
@@ -125,7 +125,7 @@ public abstract class Assert {
 
 	/**
 	 * Assert that the given String is not empty; that is,
-	 * it must not be <code>null</code> and not the empty String.
+	 * it must not be {@code null} and not the empty String.
 	 * <pre class="code">Assert.hasLength(name, "Name must not be empty");</pre>
 	 * @param text the String to check
 	 * @param message the exception message to use if the assertion fails
@@ -139,7 +139,7 @@ public abstract class Assert {
 
 	/**
 	 * Assert that the given String is not empty; that is,
-	 * it must not be <code>null</code> and not the empty String.
+	 * it must not be {@code null} and not the empty String.
 	 * <pre class="code">Assert.hasLength(name);</pre>
 	 * @param text the String to check
 	 * @see StringUtils#hasLength
@@ -151,7 +151,7 @@ public abstract class Assert {
 
 	/**
 	 * Assert that the given String has valid text content; that is, it must not
-	 * be <code>null</code> and must contain at least one non-whitespace character.
+	 * be {@code null} and must contain at least one non-whitespace character.
 	 * <pre class="code">Assert.hasText(name, "'name' must not be empty");</pre>
 	 * @param text the String to check
 	 * @param message the exception message to use if the assertion fails
@@ -165,7 +165,7 @@ public abstract class Assert {
 
 	/**
 	 * Assert that the given String has valid text content; that is, it must not
-	 * be <code>null</code> and must contain at least one non-whitespace character.
+	 * be {@code null} and must contain at least one non-whitespace character.
 	 * <pre class="code">Assert.hasText(name, "'name' must not be empty");</pre>
 	 * @param text the String to check
 	 * @see StringUtils#hasText
@@ -203,11 +203,11 @@ public abstract class Assert {
 
 	/**
 	 * Assert that an array has elements; that is, it must not be
-	 * <code>null</code> and must have at least one element.
+	 * {@code null} and must have at least one element.
 	 * <pre class="code">Assert.notEmpty(array, "The array must have elements");</pre>
 	 * @param array the array to check
 	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the object array is <code>null</code> or has no elements
+	 * @throws IllegalArgumentException if the object array is {@code null} or has no elements
 	 */
 	public static void notEmpty(Object[] array, String message) {
 		if (ObjectUtils.isEmpty(array)) {
@@ -217,10 +217,10 @@ public abstract class Assert {
 
 	/**
 	 * Assert that an array has elements; that is, it must not be
-	 * <code>null</code> and must have at least one element.
+	 * {@code null} and must have at least one element.
 	 * <pre class="code">Assert.notEmpty(array);</pre>
 	 * @param array the array to check
-	 * @throws IllegalArgumentException if the object array is <code>null</code> or has no elements
+	 * @throws IllegalArgumentException if the object array is {@code null} or has no elements
 	 */
 	public static void notEmpty(Object[] array) {
 		notEmpty(array, "[Assertion failed] - this array must not be empty: it must contain at least 1 element");
@@ -232,7 +232,7 @@ public abstract class Assert {
 	 * <pre class="code">Assert.noNullElements(array, "The array must have non-null elements");</pre>
 	 * @param array the array to check
 	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the object array contains a <code>null</code> element
+	 * @throws IllegalArgumentException if the object array contains a {@code null} element
 	 */
 	public static void noNullElements(Object[] array, String message) {
 		if (array != null) {
@@ -249,7 +249,7 @@ public abstract class Assert {
 	 * Note: Does not complain if the array is empty!
 	 * <pre class="code">Assert.noNullElements(array);</pre>
 	 * @param array the array to check
-	 * @throws IllegalArgumentException if the object array contains a <code>null</code> element
+	 * @throws IllegalArgumentException if the object array contains a {@code null} element
 	 */
 	public static void noNullElements(Object[] array) {
 		noNullElements(array, "[Assertion failed] - this array must not contain any null elements");
@@ -257,11 +257,11 @@ public abstract class Assert {
 
 	/**
 	 * Assert that a collection has elements; that is, it must not be
-	 * <code>null</code> and must have at least one element.
+	 * {@code null} and must have at least one element.
 	 * <pre class="code">Assert.notEmpty(collection, "Collection must have elements");</pre>
 	 * @param collection the collection to check
 	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the collection is <code>null</code> or has no elements
+	 * @throws IllegalArgumentException if the collection is {@code null} or has no elements
 	 */
 	public static void notEmpty(Collection collection, String message) {
 		if (CollectionUtils.isEmpty(collection)) {
@@ -271,10 +271,10 @@ public abstract class Assert {
 
 	/**
 	 * Assert that a collection has elements; that is, it must not be
-	 * <code>null</code> and must have at least one element.
+	 * {@code null} and must have at least one element.
 	 * <pre class="code">Assert.notEmpty(collection, "Collection must have elements");</pre>
 	 * @param collection the collection to check
-	 * @throws IllegalArgumentException if the collection is <code>null</code> or has no elements
+	 * @throws IllegalArgumentException if the collection is {@code null} or has no elements
 	 */
 	public static void notEmpty(Collection collection) {
 		notEmpty(collection,
@@ -282,12 +282,12 @@ public abstract class Assert {
 	}
 
 	/**
-	 * Assert that a Map has entries; that is, it must not be <code>null</code>
+	 * Assert that a Map has entries; that is, it must not be {@code null}
 	 * and must have at least one entry.
 	 * <pre class="code">Assert.notEmpty(map, "Map must have entries");</pre>
 	 * @param map the map to check
 	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalArgumentException if the map is <code>null</code> or has no entries
+	 * @throws IllegalArgumentException if the map is {@code null} or has no entries
 	 */
 	public static void notEmpty(Map map, String message) {
 		if (CollectionUtils.isEmpty(map)) {
@@ -296,11 +296,11 @@ public abstract class Assert {
 	}
 
 	/**
-	 * Assert that a Map has entries; that is, it must not be <code>null</code>
+	 * Assert that a Map has entries; that is, it must not be {@code null}
 	 * and must have at least one entry.
 	 * <pre class="code">Assert.notEmpty(map);</pre>
 	 * @param map the map to check
-	 * @throws IllegalArgumentException if the map is <code>null</code> or has no entries
+	 * @throws IllegalArgumentException if the map is {@code null} or has no entries
 	 */
 	public static void notEmpty(Map map) {
 		notEmpty(map, "[Assertion failed] - this map must not be empty; it must contain at least one entry");
@@ -341,7 +341,7 @@ public abstract class Assert {
 	}
 
 	/**
-	 * Assert that <code>superType.isAssignableFrom(subType)</code> is <code>true</code>.
+	 * Assert that {@code superType.isAssignableFrom(subType)} is {@code true}.
 	 * <pre class="code">Assert.isAssignable(Number.class, myClass);</pre>
 	 * @param superType the super type to check
 	 * @param subType the sub type to check
@@ -352,7 +352,7 @@ public abstract class Assert {
 	}
 
 	/**
-	 * Assert that <code>superType.isAssignableFrom(subType)</code> is <code>true</code>.
+	 * Assert that {@code superType.isAssignableFrom(subType)} is {@code true}.
 	 * <pre class="code">Assert.isAssignable(Number.class, myClass);</pre>
 	 * @param superType the super type to check against
 	 * @param subType the sub type to check
@@ -371,13 +371,13 @@ public abstract class Assert {
 
 
 	/**
-	 * Assert a boolean expression, throwing <code>IllegalStateException</code>
-	 * if the test result is <code>false</code>. Call isTrue if you wish to
+	 * Assert a boolean expression, throwing {@code IllegalStateException}
+	 * if the test result is {@code false}. Call isTrue if you wish to
 	 * throw IllegalArgumentException on an assertion failure.
 	 * <pre class="code">Assert.state(id == null, "The id property must not already be initialized");</pre>
 	 * @param expression a boolean expression
 	 * @param message the exception message to use if the assertion fails
-	 * @throws IllegalStateException if expression is <code>false</code>
+	 * @throws IllegalStateException if expression is {@code false}
 	 */
 	public static void state(boolean expression, String message) {
 		if (!expression) {
@@ -387,12 +387,12 @@ public abstract class Assert {
 
 	/**
 	 * Assert a boolean expression, throwing {@link IllegalStateException}
-	 * if the test result is <code>false</code>.
+	 * if the test result is {@code false}.
 	 * <p>Call {@link #isTrue(boolean)} if you wish to
 	 * throw {@link IllegalArgumentException} on an assertion failure.
 	 * <pre class="code">Assert.state(id == null);</pre>
 	 * @param expression a boolean expression
-	 * @throws IllegalStateException if the supplied expression is <code>false</code>
+	 * @throws IllegalStateException if the supplied expression is {@code false}
 	 */
 	public static void state(boolean expression) {
 		state(expression, "[Assertion failed] - this state invariant must be true");
diff --git a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
index e100e44273..7aec04a032 100644
--- a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
+++ b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
@@ -33,7 +33,7 @@ import java.util.ListIterator;
  * <p>Note: This class is not thread-safe. To create a thread-safe version,
  * use the {@link java.util.Collections#synchronizedList} utility methods.
  *
- * <p>Inspired by <code>LazyList</code> from Commons Collections.
+ * <p>Inspired by {@code LazyList} from Commons Collections.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -54,7 +54,7 @@ public class AutoPopulatingList<E> implements List<E>, Serializable {
 
 
 	/**
-	 * Creates a new <code>AutoPopulatingList</code> that is backed by a standard
+	 * Creates a new {@code AutoPopulatingList} that is backed by a standard
 	 * {@link ArrayList} and adds new instances of the supplied {@link Class element Class}
 	 * to the backing {@link List} on demand.
 	 */
@@ -63,7 +63,7 @@ public class AutoPopulatingList<E> implements List<E>, Serializable {
 	}
 
 	/**
-	 * Creates a new <code>AutoPopulatingList</code> that is backed by the supplied {@link List}
+	 * Creates a new {@code AutoPopulatingList} that is backed by the supplied {@link List}
 	 * and adds new instances of the supplied {@link Class element Class} to the backing
 	 * {@link List} on demand.
 	 */
@@ -72,7 +72,7 @@ public class AutoPopulatingList<E> implements List<E>, Serializable {
 	}
 
 	/**
-	 * Creates a new <code>AutoPopulatingList</code> that is backed by a standard
+	 * Creates a new {@code AutoPopulatingList} that is backed by a standard
 	 * {@link ArrayList} and creates new elements on demand using the supplied {@link ElementFactory}.
 	 */
 	public AutoPopulatingList(ElementFactory<E> elementFactory) {
@@ -80,7 +80,7 @@ public class AutoPopulatingList<E> implements List<E>, Serializable {
 	}
 
 	/**
-	 * Creates a new <code>AutoPopulatingList</code> that is backed by the supplied {@link List}
+	 * Creates a new {@code AutoPopulatingList} that is backed by the supplied {@link List}
 	 * and creates new elements on demand using the supplied {@link ElementFactory}.
 	 */
 	public AutoPopulatingList(List<E> backingList, ElementFactory<E> elementFactory) {
@@ -244,8 +244,8 @@ public class AutoPopulatingList<E> implements List<E>, Serializable {
 
 	/**
 	 * Reflective implementation of the ElementFactory interface,
-	 * using <code>Class.newInstance()</code> on a given element class.
-	 * @see java.lang.Class#newInstance()
+	 * using {@code Class.newInstance()} on a given element class.
+	 * @see Class#newInstance()
 	 */
 	private static class ReflectiveElementFactory<E> implements ElementFactory<E>, Serializable {
 
diff --git a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
index b8a615150b..6fa38ca7bb 100644
--- a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
+++ b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
@@ -35,7 +35,7 @@ import java.util.WeakHashMap;
  * expensive values in a target Map. Supports caching weak or strong keys.
  *
  * <p>This class is an abstract template. Caching Map implementations
- * should subclass and override the <code>create(key)</code> method which
+ * should subclass and override the {@code create(key)} method which
  * encapsulates expensive creation of a new object.
  *
  * @author Keith Donald
@@ -263,8 +263,8 @@ public abstract class CachingMapDecorator<K, V> implements Map<K, V>, Serializab
 	 * the given key-value pair.
 	 * @param key the candidate key
 	 * @param value the candidate value
-	 * @return <code>true</code> in order to use a weak reference;
-	 * <code>false</code> otherwise.
+	 * @return {@code true} in order to use a weak reference;
+	 * {@code false} otherwise.
 	 */
 	protected boolean useWeakValue(K key, V value) {
 		return this.weak;
@@ -295,7 +295,7 @@ public abstract class CachingMapDecorator<K, V> implements Map<K, V>, Serializab
 
 	/**
 	 * Create a value to cache for the given key.
-	 * Called by <code>get</code> if there is no value cached already.
+	 * Called by {@code get} if there is no value cached already.
 	 * @param key the cache key
 	 * @see #get(Object)
 	 */
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 6def006232..26f1fafe03 100644
--- a/spring-core/src/main/java/org/springframework/util/ClassUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ClassUtils.java
@@ -147,10 +147,10 @@ public abstract class ClassUtils {
 	 * <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:
 	 * for example, for class path resource loading (but not necessarily for
-	 * <code>Class.forName</code>, which accepts a <code>null</code> ClassLoader
+	 * {@code Class.forName}, which accepts a {@code null} ClassLoader
 	 * reference as well).
-	 * @return the default ClassLoader (never <code>null</code>)
-	 * @see java.lang.Thread#getContextClassLoader()
+	 * @return the default ClassLoader (never {@code null})
+	 * @see Thread#getContextClassLoader()
 	 */
 	public static ClassLoader getDefaultClassLoader() {
 		ClassLoader cl = null;
@@ -172,7 +172,7 @@ public abstract class ClassUtils {
 	 * if necessary, i.e. if the bean ClassLoader is not equivalent to the thread
 	 * context ClassLoader already.
 	 * @param classLoaderToUse the actual ClassLoader to use for the thread context
-	 * @return the original thread context ClassLoader, or <code>null</code> if not overridden
+	 * @return the original thread context ClassLoader, or {@code null} if not overridden
 	 */
 	public static ClassLoader overrideThreadContextClassLoader(ClassLoader classLoaderToUse) {
 		Thread currentThread = Thread.currentThread();
@@ -187,7 +187,7 @@ public abstract class ClassUtils {
 	}
 
 	/**
-	 * Replacement for <code>Class.forName()</code> that also returns Class instances
+	 * Replacement for {@code Class.forName()} that also returns Class instances
 	 * for primitives (like "int") and array class names (like "String[]").
 	 * <p>Always uses the default class loader: that is, preferably the thread context
 	 * class loader, or the ClassLoader that loaded the ClassUtils class as fallback.
@@ -206,13 +206,13 @@ public abstract class ClassUtils {
 	}
 
 	/**
-	 * Replacement for <code>Class.forName()</code> that also returns Class instances
+	 * Replacement for {@code Class.forName()} that also returns Class instances
 	 * 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
 	 * @param classLoader the class loader to use
-	 * (may be <code>null</code>, which indicates the default class loader)
+	 * (may be {@code null}, which indicates the default class loader)
 	 * @return Class instance for the supplied name
 	 * @throws ClassNotFoundException if the class was not found
 	 * @throws LinkageError if the class file could not be loaded
@@ -275,12 +275,12 @@ public abstract class ClassUtils {
 	/**
 	 * Resolve the given class name into a Class instance. Supports
 	 * primitives (like "int") and array class names (like "String[]").
-	 * <p>This is effectively equivalent to the <code>forName</code>
+	 * <p>This is effectively equivalent to the {@code forName}
 	 * method with the same arguments, with the only difference being
 	 * the exceptions thrown in case of class loading failure.
 	 * @param className the name of the Class
 	 * @param classLoader the class loader to use
-	 * (may be <code>null</code>, which indicates the default class loader)
+	 * (may be {@code null}, which indicates the default class loader)
 	 * @return Class instance for the supplied name
 	 * @throws IllegalArgumentException if the class name was not resolvable
 	 * (that is, the class could not be found or the class file could not be loaded)
@@ -306,7 +306,7 @@ public abstract class ClassUtils {
 	 * Does <i>not</i> support the "[]" suffix notation for primitive arrays;
 	 * this is only supported by {@link #forName(String, ClassLoader)}.
 	 * @param name the name of the potentially primitive class
-	 * @return the primitive class, or <code>null</code> if the name does not denote
+	 * @return the primitive class, or {@code null} if the name does not denote
 	 * a primitive class or primitive array class
 	 */
 	public static Class<?> resolvePrimitiveClassName(String name) {
@@ -322,7 +322,7 @@ public abstract class ClassUtils {
 
 	/**
 	 * Determine whether the {@link Class} identified by the supplied name is present
-	 * and can be loaded. Will return <code>false</code> if either the class or
+	 * and can be loaded. Will return {@code false} if either the class or
 	 * one of its dependencies is not present or cannot be loaded.
 	 * @param className the name of the class to check
 	 * @return whether the specified class is present
@@ -335,11 +335,11 @@ public abstract class ClassUtils {
 
 	/**
 	 * Determine whether the {@link Class} identified by the supplied name is present
-	 * and can be loaded. Will return <code>false</code> if either the class or
+	 * and can be loaded. Will return {@code false} if either the class or
 	 * one of its dependencies is not present or cannot be loaded.
 	 * @param className the name of the class to check
 	 * @param classLoader the class loader to use
-	 * (may be <code>null</code>, which indicates the default class loader)
+	 * (may be {@code null}, which indicates the default class loader)
 	 * @return whether the specified class is present
 	 */
 	public static boolean isPresent(String className, ClassLoader classLoader) {
@@ -575,11 +575,11 @@ public abstract class ClassUtils {
 
 	/**
 	 * Determine whether the given class has a public constructor with the given signature.
-	 * <p>Essentially translates <code>NoSuchMethodException</code> to "false".
-	 * @param clazz	the clazz to analyze
+	 * <p>Essentially translates {@code NoSuchMethodException} to "false".
+	 * @param clazz    the clazz to analyze
 	 * @param paramTypes the parameter types of the method
 	 * @return whether the class has a corresponding constructor
-	 * @see java.lang.Class#getMethod
+	 * @see Class#getMethod
 	 */
 	public static boolean hasConstructor(Class<?> clazz, Class<?>... paramTypes) {
 		return (getConstructorIfAvailable(clazz, paramTypes) != null);
@@ -587,12 +587,12 @@ public abstract class ClassUtils {
 
 	/**
 	 * Determine whether the given class has a public constructor with the given signature,
-	 * and return it if available (else return <code>null</code>).
-	 * <p>Essentially translates <code>NoSuchMethodException</code> to <code>null</code>.
-	 * @param clazz	the clazz to analyze
+	 * and return it if available (else return {@code null}).
+	 * <p>Essentially translates {@code NoSuchMethodException} to {@code null}.
+	 * @param clazz    the clazz to analyze
 	 * @param paramTypes the parameter types of the method
-	 * @return the constructor, or <code>null</code> if not found
-	 * @see java.lang.Class#getConstructor
+	 * @return the constructor, or {@code null} if not found
+	 * @see Class#getConstructor
 	 */
 	public static <T> Constructor<T> getConstructorIfAvailable(Class<T> clazz, Class<?>... paramTypes) {
 		Assert.notNull(clazz, "Class must not be null");
@@ -606,12 +606,12 @@ public abstract class ClassUtils {
 
 	/**
 	 * Determine whether the given class has a method with the given signature.
-	 * <p>Essentially translates <code>NoSuchMethodException</code> to "false".
-	 * @param clazz	the clazz to analyze
+	 * <p>Essentially translates {@code NoSuchMethodException} to "false".
+	 * @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
-	 * @see java.lang.Class#getMethod
+	 * @see Class#getMethod
 	 */
 	public static boolean hasMethod(Class<?> clazz, String methodName, Class<?>... paramTypes) {
 		return (getMethodIfAvailable(clazz, methodName, paramTypes) != null);
@@ -619,14 +619,14 @@ public abstract class ClassUtils {
 
 	/**
 	 * Determine whether the given class has a method with the given signature,
-	 * and return it if available (else throws an <code>IllegalStateException</code>).
-	 * <p>Essentially translates <code>NoSuchMethodException</code> to <code>IllegalStateException</code>.
-	 * @param clazz	the clazz to analyze
+	 * and return it if available (else throws an {@code IllegalStateException}).
+	 * <p>Essentially translates {@code NoSuchMethodException} to {@code IllegalStateException}.
+	 * @param clazz    the clazz to analyze
 	 * @param methodName the name of the method
 	 * @param paramTypes the parameter types of the method
-	 * @return the method (never <code>null</code>)
+	 * @return the method (never {@code null})
 	 * @throws IllegalStateException if the method has not been found
-	 * @see java.lang.Class#getMethod
+	 * @see Class#getMethod
 	 */
 	public static Method getMethod(Class<?> clazz, String methodName, Class<?>... paramTypes) {
 		Assert.notNull(clazz, "Class must not be null");
@@ -641,13 +641,13 @@ public abstract class ClassUtils {
 
 	/**
 	 * Determine whether the given class has a method with the given signature,
-	 * and return it if available (else return <code>null</code>).
-	 * <p>Essentially translates <code>NoSuchMethodException</code> to <code>null</code>.
-	 * @param clazz	the clazz to analyze
+	 * and return it if available (else return {@code null}).
+	 * <p>Essentially translates {@code NoSuchMethodException} to {@code null}.
+	 * @param clazz    the clazz to analyze
 	 * @param methodName the name of the method
 	 * @param paramTypes the parameter types of the method
-	 * @return the method, or <code>null</code> if not found
-	 * @see java.lang.Class#getMethod
+	 * @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");
@@ -716,9 +716,9 @@ public abstract class ClassUtils {
 	/**
 	 * Given a method, which may come from an interface, and a target class used
 	 * in the current reflective invocation, find the corresponding target method
-	 * if there is one. E.g. the method may be <code>IFoo.bar()</code> and the
-	 * target class may be <code>DefaultFoo</code>. In this case, the method may be
-	 * <code>DefaultFoo.bar()</code>. This enables attributes on that method to be found.
+	 * if there is one. E.g. the method may be {@code IFoo.bar()} and the
+	 * target class may be {@code DefaultFoo}. In this case, the method may be
+	 * {@code DefaultFoo.bar()}. This enables attributes on that method to be found.
 	 * <p><b>NOTE:</b> In contrast to {@link org.springframework.aop.support.AopUtils#getMostSpecificMethod},
 	 * this method does <i>not</i> resolve Java 5 bridge methods automatically.
 	 * Call {@link org.springframework.core.BridgeMethodResolver#findBridgedMethod}
@@ -729,9 +729,9 @@ public abstract class ClassUtils {
 	 * will fall back to returning the originally provided method.
 	 * @param method the method to be invoked, which may come from an interface
 	 * @param targetClass the target class for the current invocation.
-	 * May be <code>null</code> or may not even implement the method.
+	 * May be {@code null} or may not even implement the method.
 	 * @return the specific target method, or the original method if the
-	 * <code>targetClass</code> doesn't implement it or is <code>null</code>
+	 * {@code targetClass} doesn't implement it or is {@code null}
 	 */
 	public static Method getMostSpecificMethod(Method method, Class<?> targetClass) {
 		if (method != null && isOverridable(method, targetClass) &&
@@ -776,9 +776,9 @@ public abstract class ClassUtils {
 	/**
 	 * Return a public static method of a class.
 	 * @param methodName the static method name
-	 * @param clazz	the class which defines the method
+	 * @param clazz    the class which defines the method
 	 * @param args the parameter types to the method
-	 * @return the static method, or <code>null</code> if no static method was found
+	 * @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
 	 */
 	public static Method getStaticMethod(Class<?> clazz, String methodName, Class<?>... args) {
@@ -915,8 +915,8 @@ public abstract class ClassUtils {
 	}
 
 	/**
-	 * Return a path suitable for use with <code>ClassLoader.getResource</code>
-	 * (also suitable for use with <code>Class.getResource</code> by prepending a
+	 * Return a path suitable for use with {@code ClassLoader.getResource}
+	 * (also suitable for use with {@code Class.getResource} by prepending a
 	 * slash ('/') to the return value). Built by taking the package of the specified
 	 * class file, converting all dots ('.') to slashes ('/'), adding a trailing slash
 	 * if necessary, and concatenating the specified resource name to this.
@@ -924,11 +924,11 @@ public abstract class ClassUtils {
 	 * 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 java.lang.ClassLoader#getResource
-	 * @see java.lang.Class#getResource
+	 * @see ClassLoader#getResource
+	 * @see Class#getResource
 	 */
 	public static String addResourcePathToPackagePath(Class<?> clazz, String resourceName) {
 		Assert.notNull(resourceName, "Resource name must not be null");
@@ -943,10 +943,10 @@ public abstract class ClassUtils {
 	 * class's package name as a pathname, i.e., all dots ('.') are replaced by
 	 * slashes ('/'). Neither a leading nor trailing slash is added. The result
 	 * could be concatenated with a slash and the name of a resource and fed
-	 * directly to <code>ClassLoader.getResource()</code>. For it to be fed to
-	 * <code>Class.getResource</code> instead, a leading slash would also have
+	 * directly to {@code ClassLoader.getResource()}. For it to be fed to
+	 * {@code Class.getResource} instead, a leading slash would also have
 	 * to be prepended to the returned value.
-	 * @param clazz the input class. A <code>null</code> value or the default
+	 * @param clazz the input class. A {@code null} value or the default
 	 * (empty) package will result in an empty string ("") being returned.
 	 * @return a path which represents the package name
 	 * @see ClassLoader#getResource
@@ -968,9 +968,9 @@ public abstract class ClassUtils {
 	/**
 	 * Build a String that consists of the names of the classes/interfaces
 	 * in the given array.
-	 * <p>Basically like <code>AbstractCollection.toString()</code>, but stripping
+	 * <p>Basically like {@code AbstractCollection.toString()}, but stripping
 	 * the "class "/"interface " prefix before every class name.
-	 * @param classes a Collection of Class objects (may be <code>null</code>)
+	 * @param classes a Collection of Class objects (may be {@code null})
 	 * @return a String of form "[com.foo.Bar, com.foo.Baz]"
 	 * @see java.util.AbstractCollection#toString()
 	 */
@@ -981,9 +981,9 @@ public abstract class ClassUtils {
 	/**
 	 * Build a String that consists of the names of the classes/interfaces
 	 * in the given collection.
-	 * <p>Basically like <code>AbstractCollection.toString()</code>, but stripping
+	 * <p>Basically like {@code AbstractCollection.toString()}, but stripping
 	 * the "class "/"interface " prefix before every class name.
-	 * @param classes a Collection of Class objects (may be <code>null</code>)
+	 * @param classes a Collection of Class objects (may be {@code null})
 	 * @return a String of form "[com.foo.Bar, com.foo.Baz]"
 	 * @see java.util.AbstractCollection#toString()
 	 */
@@ -1007,8 +1007,8 @@ public abstract class ClassUtils {
 	 * Copy the given Collection into a Class array.
 	 * The Collection must contain Class elements only.
 	 * @param collection the Collection to copy
-	 * @return the Class array (<code>null</code> if the passed-in
-	 * Collection was <code>null</code>)
+	 * @return the Class array ({@code null} if the passed-in
+	 * Collection was {@code null})
 	 */
 	public static Class<?>[] toClassArray(Collection<Class<?>> collection) {
 		if (collection == null) {
@@ -1045,7 +1045,7 @@ public abstract class ClassUtils {
 	 * <p>If the class itself is an interface, it gets returned as sole interface.
 	 * @param clazz the class to analyze for interfaces
 	 * @param classLoader the ClassLoader that the interfaces need to be visible in
-	 * (may be <code>null</code> when accepting all declared interfaces)
+	 * (may be {@code null} when accepting all declared interfaces)
 	 * @return all interfaces that the given object implements as array
 	 */
 	public static Class<?>[] getAllInterfacesForClass(Class<?> clazz, ClassLoader classLoader) {
@@ -1081,7 +1081,7 @@ public abstract class ClassUtils {
 	 * <p>If the class itself is an interface, it gets returned as sole interface.
 	 * @param clazz the class to analyze for interfaces
 	 * @param classLoader the ClassLoader that the interfaces need to be visible in
-	 * (may be <code>null</code> when accepting all declared interfaces)
+	 * (may be {@code null} when accepting all declared interfaces)
 	 * @return all interfaces that the given object implements as Set
 	 */
 	public static Set<Class> getAllInterfacesForClassAsSet(Class clazz, ClassLoader classLoader) {
@@ -1118,8 +1118,8 @@ public abstract class ClassUtils {
 	/**
 	 * Check whether the given class is visible in the given ClassLoader.
 	 * @param clazz the class to check (typically an interface)
-	 * @param classLoader the ClassLoader to check against (may be <code>null</code>,
-	 * in which case this method will always return <code>true</code>)
+	 * @param classLoader the ClassLoader to check against (may be {@code null},
+	 * in which case this method will always return {@code true})
 	 */
 	public static boolean isVisible(Class<?> clazz, ClassLoader classLoader) {
 		if (classLoader == null) {
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 5d57fbba6b..8f74a05c48 100644
--- a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
@@ -42,8 +42,8 @@ import java.util.Set;
 public abstract class CollectionUtils {
 
 	/**
-	 * Return <code>true</code> if the supplied Collection is <code>null</code>
-	 * or empty. Otherwise, return <code>false</code>.
+	 * 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 abstract class CollectionUtils {
 	}
 
 	/**
-	 * Return <code>true</code> if the supplied Map is <code>null</code>
-	 * or empty. Otherwise, return <code>false</code>.
+	 * 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
 	 */
@@ -64,7 +64,7 @@ public abstract class CollectionUtils {
 	/**
 	 * Convert the supplied array into a List. A primitive array gets
 	 * converted into a List of the appropriate wrapper type.
-	 * <p>A <code>null</code> source value will be converted to an
+	 * <p>A {@code null} source value will be converted to an
 	 * empty List.
 	 * @param source the (potentially primitive) array
 	 * @return the converted List result
@@ -76,7 +76,7 @@ public abstract class CollectionUtils {
 
 	/**
 	 * Merge the given array into the given Collection.
-	 * @param array the array to merge (may be <code>null</code>)
+	 * @param array the array to merge (may be {@code null})
 	 * @param collection the target Collection to merge the array into
 	 */
 	@SuppressWarnings("unchecked")
@@ -93,9 +93,9 @@ public abstract class CollectionUtils {
 	/**
 	 * Merge the given Properties instance into the given Map,
 	 * copying all properties (key-value pairs) over.
-	 * <p>Uses <code>Properties.propertyNames()</code> to even catch
+	 * <p>Uses {@code Properties.propertyNames()} to even catch
 	 * default properties linked into the original Properties instance.
-	 * @param props the Properties instance to merge (may be <code>null</code>)
+	 * @param props the Properties instance to merge (may be {@code null})
 	 * @param map the target Map to merge the properties into
 	 */
 	@SuppressWarnings("unchecked")
@@ -121,7 +121,7 @@ public abstract class CollectionUtils {
 	 * Check whether the given Iterator contains the given element.
 	 * @param iterator the Iterator to check
 	 * @param element the element to look for
-	 * @return <code>true</code> if found, <code>false</code> else
+	 * @return {@code true} if found, {@code false} else
 	 */
 	public static boolean contains(Iterator iterator, Object element) {
 		if (iterator != null) {
@@ -139,7 +139,7 @@ public abstract class CollectionUtils {
 	 * Check whether the given Enumeration contains the given element.
 	 * @param enumeration the Enumeration to check
 	 * @param element the element to look for
-	 * @return <code>true</code> if found, <code>false</code> else
+	 * @return {@code true} if found, {@code false} else
 	 */
 	public static boolean contains(Enumeration enumeration, Object element) {
 		if (enumeration != null) {
@@ -156,10 +156,10 @@ public abstract class CollectionUtils {
 	/**
 	 * Check whether the given Collection contains the given element instance.
 	 * <p>Enforces the given instance to be present, rather than returning
-	 * <code>true</code> for an equal element as well.
+	 * {@code true} for an equal element as well.
 	 * @param collection the Collection to check
 	 * @param element the element to look for
-	 * @return <code>true</code> if found, <code>false</code> else
+	 * @return {@code true} if found, {@code false} else
 	 */
 	public static boolean containsInstance(Collection collection, Object element) {
 		if (collection != null) {
@@ -173,8 +173,8 @@ public abstract class CollectionUtils {
 	}
 
 	/**
-	 * Return <code>true</code> if any element in '<code>candidates</code>' is
-	 * contained in '<code>source</code>'; otherwise returns <code>false</code>.
+	 * Return {@code true} if any element in '{@code candidates}' is
+	 * contained in '{@code source}'; otherwise returns {@code false}.
 	 * @param source the source Collection
 	 * @param candidates the candidates to search for
 	 * @return whether any of the candidates has been found
@@ -192,13 +192,13 @@ public abstract class CollectionUtils {
 	}
 
 	/**
-	 * Return the first element in '<code>candidates</code>' that is contained in
-	 * '<code>source</code>'. If no element in '<code>candidates</code>' is present in
-	 * '<code>source</code>' returns <code>null</code>. Iteration order is
+	 * Return the first element in '{@code candidates}' that is contained in
+	 * '{@code source}'. If no element in '{@code candidates}' is present in
+	 * '{@code source}' returns {@code null}. Iteration order is
 	 * {@link Collection} implementation specific.
 	 * @param source the source Collection
 	 * @param candidates the candidates to search for
-	 * @return the first present object, or <code>null</code> if not found
+	 * @return the first present object, or {@code null} if not found
 	 */
 	public static Object findFirstMatch(Collection source, Collection candidates) {
 		if (isEmpty(source) || isEmpty(candidates)) {
@@ -217,7 +217,7 @@ public abstract class CollectionUtils {
 	 * @param collection the Collection to search
 	 * @param type the type to look for
 	 * @return a value of the given type found if there is a clear match,
-	 * or <code>null</code> if none or more than one such value found
+	 * or {@code null} if none or more than one such value found
 	 */
 	@SuppressWarnings("unchecked")
 	public static <T> T findValueOfType(Collection<?> collection, Class<T> type) {
@@ -244,7 +244,7 @@ public abstract class CollectionUtils {
 	 * @param collection the collection to search
 	 * @param types the types to look for, in prioritized order
 	 * @return a value of one of the given types found if there is a clear match,
-	 * or <code>null</code> if none or more than one such value found
+	 * or {@code null} if none or more than one such value found
 	 */
 	public static Object findValueOfType(Collection<?> collection, Class<?>[] types) {
 		if (isEmpty(collection) || ObjectUtils.isEmpty(types)) {
@@ -262,8 +262,8 @@ public abstract class CollectionUtils {
 	/**
 	 * Determine whether the given Collection only contains a single unique object.
 	 * @param collection the Collection to check
-	 * @return <code>true</code> if the collection contains a single reference or
-	 * multiple references to the same instance, <code>false</code> else
+	 * @return {@code true} if the collection contains a single reference or
+	 * multiple references to the same instance, {@code false} else
 	 */
 	public static boolean hasUniqueObject(Collection collection) {
 		if (isEmpty(collection)) {
@@ -286,7 +286,7 @@ public abstract class CollectionUtils {
 	/**
 	 * Find the common element type of the given Collection, if any.
 	 * @param collection the Collection to check
-	 * @return the common element type, or <code>null</code> if no clear
+	 * @return the common element type, or {@code null} if no clear
 	 * common type has been found (or the collection was empty)
 	 */
 	public static Class<?> findCommonElementType(Collection collection) {
diff --git a/spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java b/spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java
index 361170aac4..76e090ddc7 100644
--- a/spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java
+++ b/spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java
@@ -21,7 +21,7 @@ import java.io.Writer;
 import org.apache.commons.logging.Log;
 
 /**
- * <code>java.io.Writer</code> adapter for a Commons Logging <code>Log</code>.
+ * {@code java.io.Writer} adapter for a Commons Logging {@code Log}.
  *
  * @author Juergen Hoeller
  * @since 2.5.1
diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java b/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
index a845c061c8..11c844ffd7 100644
--- a/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
+++ b/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
@@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory;
  *
  * <p>Designed for use as a base class, with the subclass invoking
  * the {@link #beforeAccess()} and {@link #afterAccess()} methods at
- * appropriate points of its workflow. Note that <code>afterAccess</code>
+ * appropriate points of its workflow. Note that {@code afterAccess}
  * should usually be called in a finally block!
  *
  * <p>The default concurrency limit of this support class is -1
@@ -88,7 +88,7 @@ public abstract class ConcurrencyThrottleSupport implements Serializable {
 
 	/**
 	 * Return whether this throttle is currently active.
-	 * @return <code>true</code> if the concurrency limit for this instance is active
+	 * @return {@code true} if the concurrency limit for this instance is active
 	 * @see #getConcurrencyLimit()
 	 */
 	public boolean isThrottleActive() {
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 d7049ee83e..e21dbd3fca 100644
--- a/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java
+++ b/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java
@@ -131,7 +131,7 @@ public class CustomizableThreadCreator implements Serializable {
 
 	/**
 	 * Return the thread group that threads should be created in
-	 * (or <code>null</code>) for the default group.
+	 * (or {@code null}) for the default group.
 	 */
 	public ThreadGroup getThreadGroup() {
 		return this.threadGroup;
@@ -170,7 +170,7 @@ public class CustomizableThreadCreator implements Serializable {
 
 	/**
 	 * Build the default thread name prefix for this factory.
-	 * @return the default thread name prefix (never <code>null</code>)
+	 * @return the default thread name prefix (never {@code null})
 	 */
 	protected String getDefaultThreadNamePrefix() {
 		return ClassUtils.getShortName(getClass()) + "-";
diff --git a/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java b/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java
index 5739948d34..4d691c2803 100644
--- a/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java
+++ b/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java
@@ -29,17 +29,17 @@ import java.util.Properties;
 
 /**
  * Default implementation of the {@link PropertiesPersister} interface.
- * Follows the native parsing of <code>java.util.Properties</code>.
+ * Follows the native parsing of {@code java.util.Properties}.
  *
  * <p>Allows for reading from any Reader and writing to any Writer, for example
  * to specify a charset for a properties file. This is a capability that standard
- * <code>java.util.Properties</code> unfortunately lacks up until JDK 1.5:
+ * {@code java.util.Properties} unfortunately lacks up until JDK 1.5:
  * You can only load files using the ISO-8859-1 charset there.
  *
- * <p>Loading from and storing to a stream delegates to <code>Properties.load</code>
- * and <code>Properties.store</code>, respectively, to be fully compatible with
+ * <p>Loading from and storing to a stream delegates to {@code Properties.load}
+ * and {@code Properties.store}, respectively, to be fully compatible with
  * the Unicode conversion as implemented by the JDK Properties class. On JDK 1.6,
- * <code>Properties.load/store</code> will also be used for readers/writers,
+ * {@code Properties.load/store} will also be used for readers/writers,
  * effectively turning this class into a plain backwards compatibility adapter.
  *
  * <p>The persistence code that works with Reader/Writer follows the JDK's parsing
@@ -50,7 +50,7 @@ import java.util.Properties;
  * "defaultEncoding" and "fileEncodings" properties).
  *
  * <p>As of Spring 1.2.2, this implementation also supports properties XML files,
- * through the <code>loadFromXml</code> and <code>storeToXml</code> methods.
+ * through the {@code loadFromXml} and {@code storeToXml} methods.
  * The default implementations delegate to JDK 1.5's corresponding methods,
  * throwing an exception if running on an older JDK. Those implementations
  * could be subclassed to apply custom XML handling on JDK 1.4, for example.
diff --git a/spring-core/src/main/java/org/springframework/util/FileSystemUtils.java b/spring-core/src/main/java/org/springframework/util/FileSystemUtils.java
index c82dcee347..41dd4f2c7f 100644
--- a/spring-core/src/main/java/org/springframework/util/FileSystemUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/FileSystemUtils.java
@@ -31,9 +31,9 @@ public abstract class FileSystemUtils {
 	/**
 	 * Delete the supplied {@link File} - for directories,
 	 * recursively delete any nested directories or files as well.
-	 * @param root the root <code>File</code> to delete
-	 * @return <code>true</code> if the <code>File</code> was deleted,
-	 * otherwise <code>false</code>
+	 * @param root the root {@code File} to delete
+	 * @return {@code true} if the {@code File} was deleted,
+	 * otherwise {@code false}
 	 */
 	public static boolean deleteRecursively(File root) {
 		if (root != null && root.exists()) {
@@ -51,8 +51,8 @@ public abstract class FileSystemUtils {
 	}
 
 	/**
-	 * Recursively copy the contents of the <code>src</code> file/directory
-	 * to the <code>dest</code> file/directory.
+	 * Recursively copy the contents of the {@code src} file/directory
+	 * to the {@code dest} file/directory.
 	 * @param src the source directory
 	 * @param dest the destination directory
 	 * @throws IOException in the case of I/O errors
@@ -64,8 +64,8 @@ public abstract class FileSystemUtils {
 	}
 
 	/**
-	 * Actually copy the contents of the <code>src</code> file/directory
-	 * to the <code>dest</code> file/directory.
+	 * Actually copy the contents of the {@code src} file/directory
+	 * to the {@code dest} file/directory.
 	 * @param src the source directory
 	 * @param dest the destination directory
 	 * @throws IOException in the case of I/O errors
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 d43563aac7..3d5f47da6f 100644
--- a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
+++ b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
@@ -28,7 +28,7 @@ import java.util.Map;
  * <p>Preserves the original order as well as the original casing of keys,
  * while allowing for contains, get and remove calls with any case of key.
  *
- * <p>Does <i>not</i> support <code>null</code> keys.
+ * <p>Does <i>not</i> support {@code null} keys.
  *
  * @author Juergen Hoeller
  * @since 3.0
diff --git a/spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java b/spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java
index 202f6ae159..fecdbf4a8d 100644
--- a/spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java
+++ b/spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java
@@ -34,7 +34,7 @@ import org.apache.log4j.xml.DOMConfigurator;
  *
  * <p>For web environments, the analogous Log4jWebConfigurer class can be found
  * in the web package, reading in its configuration from context-params in
- * <code>web.xml</code>. In a J2EE web application, log4j is usually set up
+ * {@code web.xml}. In a J2EE web application, log4j is usually set up
  * via Log4jConfigListener or Log4jConfigServlet, delegating to
  * Log4jWebConfigurer underneath.
  *
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 5d8d3a09a9..8a9569357c 100644
--- a/spring-core/src/main/java/org/springframework/util/MethodInvoker.java
+++ b/spring-core/src/main/java/org/springframework/util/MethodInvoker.java
@@ -188,7 +188,7 @@ public class MethodInvoker {
 
 	/**
 	 * Resolve the given class name into a Class.
-	 * <p>The default implementations uses <code>ClassUtils.forName</code>,
+	 * <p>The default implementations uses {@code ClassUtils.forName},
 	 * using the thread context class loader.
 	 * @param className the class name to resolve
 	 * @return the resolved Class
@@ -200,7 +200,7 @@ public class MethodInvoker {
 
 	/**
 	 * Find a matching method with the specified name for the specified arguments.
-	 * @return a matching method, or <code>null</code> if none
+	 * @return a matching method, or {@code null} if none
 	 * @see #getTargetClass()
 	 * @see #getTargetMethod()
 	 * @see #getArguments()
@@ -233,7 +233,7 @@ public class MethodInvoker {
 	/**
 	 * Return the prepared Method object that will be invoked.
 	 * <p>Can for example be used to determine the return type.
-	 * @return the prepared Method object (never <code>null</code>)
+	 * @return the prepared Method object (never {@code null})
 	 * @throws IllegalStateException if the invoker hasn't been prepared yet
 	 * @see #prepare
 	 * @see #invoke
@@ -257,13 +257,13 @@ public class MethodInvoker {
 	 * Invoke the specified method.
 	 * <p>The invoker needs to have been prepared before.
 	 * @return the object (possibly null) returned by the method invocation,
-	 * or <code>null</code> if the method has a void return type
+	 * or {@code null} if the method has a void return type
 	 * @throws InvocationTargetException if the target method threw an exception
 	 * @throws IllegalAccessException if the target method couldn't be accessed
 	 * @see #prepare
 	 */
 	public Object invoke() throws InvocationTargetException, IllegalAccessException {
-		// In the static case, target will simply be <code>null</code>.
+		// In the static case, target will simply be {@code null}.
 		Object targetObject = getTargetObject();
 		Method preparedMethod = getPreparedMethod();
 		if (targetObject == null && !Modifier.isStatic(preparedMethod.getModifiers())) {
diff --git a/spring-core/src/main/java/org/springframework/util/MultiValueMap.java b/spring-core/src/main/java/org/springframework/util/MultiValueMap.java
index 4678037149..290c2d9f47 100644
--- a/spring-core/src/main/java/org/springframework/util/MultiValueMap.java
+++ b/spring-core/src/main/java/org/springframework/util/MultiValueMap.java
@@ -30,7 +30,7 @@ public interface MultiValueMap<K, V> extends Map<K, List<V>> {
 	/**
 	 * Return the first value for the given key.
 	 * @param key the key
-	 * @return the first value for the specified key, or <code>null</code>
+	 * @return the first value for the specified key, or {@code null}
 	 */
 	V getFirst(K key);
 
diff --git a/spring-core/src/main/java/org/springframework/util/NumberUtils.java b/spring-core/src/main/java/org/springframework/util/NumberUtils.java
index 4dc2d3e6ca..02afc4c860 100644
--- a/spring-core/src/main/java/org/springframework/util/NumberUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/NumberUtils.java
@@ -122,21 +122,21 @@ public abstract class NumberUtils {
 
 	/**
 	 * Parse the given text into a number instance of the given target class,
-	 * using the corresponding <code>decode</code> / <code>valueOf</code> methods.
-	 * <p>Trims the input <code>String</code> before attempting to parse the number.
+	 * using the corresponding {@code decode} / {@code valueOf} methods.
+	 * <p>Trims the input {@code String} before attempting to parse the number.
 	 * Supports numbers in hex format (with leading "0x", "0X" or "#") as well.
 	 * @param text the text to convert
 	 * @param targetClass the target class to parse into
 	 * @return the parsed number
 	 * @throws IllegalArgumentException if the target class is not supported
 	 * (i.e. not a standard Number subclass as included in the JDK)
-	 * @see java.lang.Byte#decode
-	 * @see java.lang.Short#decode
-	 * @see java.lang.Integer#decode
-	 * @see java.lang.Long#decode
+	 * @see Byte#decode
+	 * @see Short#decode
+	 * @see Integer#decode
+	 * @see Long#decode
 	 * @see #decodeBigInteger(String)
-	 * @see java.lang.Float#valueOf
-	 * @see java.lang.Double#valueOf
+	 * @see Float#valueOf
+	 * @see Double#valueOf
 	 * @see java.math.BigDecimal#BigDecimal(String)
 	 */
 	@SuppressWarnings("unchecked")
@@ -177,12 +177,12 @@ public abstract class NumberUtils {
 
 	/**
 	 * Parse the given text into a number instance of the given target class,
-	 * using the given NumberFormat. Trims the input <code>String</code>
+	 * using the given NumberFormat. Trims the input {@code String}
 	 * before attempting to parse the number.
 	 * @param text the text to convert
 	 * @param targetClass the target class to parse into
-	 * @param numberFormat the NumberFormat to use for parsing (if <code>null</code>,
-	 * this method falls back to <code>parseNumber(String, Class)</code>)
+	 * @param numberFormat the NumberFormat to use for parsing (if {@code null},
+	 * this method falls back to {@code parseNumber(String, Class)})
 	 * @return the parsed number
 	 * @throws IllegalArgumentException if the target class is not supported
 	 * (i.e. not a standard Number subclass as included in the JDK)
@@ -223,7 +223,7 @@ public abstract class NumberUtils {
 
 	/**
 	 * Determine whether the given value String indicates a hex number, i.e. needs to be
-	 * passed into <code>Integer.decode</code> instead of <code>Integer.valueOf</code> (etc).
+	 * passed into {@code Integer.decode} instead of {@code Integer.valueOf} (etc).
 	 */
 	private static boolean isHexNumber(String value) {
 		int index = (value.startsWith("-") ? 1 : 0);
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 16a59cbbad..11673b77ed 100644
--- a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java
@@ -96,7 +96,7 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Determine whether the given array is empty:
-	 * i.e. <code>null</code> or of zero length.
+	 * i.e. {@code null} or of zero length.
 	 * @param array the array to check
 	 */
 	public static boolean isEmpty(Object[] array) {
@@ -105,8 +105,8 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Check whether the given array contains the given element.
-	 * @param array the array to check (may be <code>null</code>,
-	 * in which case the return value will always be <code>false</code>)
+	 * @param array the array to check (may be {@code null},
+	 * in which case the return value will always be {@code false})
 	 * @param element the element to check for
 	 * @return whether the element has been found in the given array
 	 */
@@ -173,9 +173,9 @@ public abstract class ObjectUtils {
 	/**
 	 * Append the given object to the given array, returning a new array
 	 * consisting of the input array contents plus the given object.
-	 * @param array the array to append to (can be <code>null</code>)
+	 * @param array the array to append to (can be {@code null})
 	 * @param obj the object to append
-	 * @return the new array (of the same component type; never <code>null</code>)
+	 * @return the new array (of the same component type; never {@code null})
 	 */
 	public static <A,O extends A> A[] addObjectToArray(A[] array, O obj) {
 		Class<?> compType = Object.class;
@@ -198,10 +198,10 @@ public abstract class ObjectUtils {
 	/**
 	 * Convert the given array (which may be a primitive array) to an
 	 * object array (if necessary of primitive wrapper objects).
-	 * <p>A <code>null</code> source value will be converted to an
+	 * <p>A {@code null} source value will be converted to an
 	 * empty Object array.
 	 * @param source the (potentially primitive) array
-	 * @return the corresponding object array (never <code>null</code>)
+	 * @return the corresponding object array (never {@code null})
 	 * @throws IllegalArgumentException if the parameter is not an array
 	 */
 	public static Object[] toObjectArray(Object source) {
@@ -232,10 +232,10 @@ public abstract class ObjectUtils {
 	//---------------------------------------------------------------------
 
 	/**
-	 * Determine if the given objects are equal, returning <code>true</code>
-	 * if both are <code>null</code> or <code>false</code> if only one is
-	 * <code>null</code>.
-	 * <p>Compares arrays with <code>Arrays.equals</code>, performing an equality
+	 * 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
@@ -286,9 +286,9 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Return as hash code for the given object; typically the value of
-	 * <code>{@link Object#hashCode()}</code>. If the object is an array,
-	 * this method will delegate to any of the <code>nullSafeHashCode</code>
-	 * methods for arrays in this class. If the object is <code>null</code>,
+	 * {@code {@link 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 #nullSafeHashCode(Object[])
 	 * @see #nullSafeHashCode(boolean[])
@@ -338,7 +338,7 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Return a hash code based on the contents of the specified array.
-	 * If <code>array</code> is <code>null</code>, this method returns 0.
+	 * If {@code array} is {@code null}, this method returns 0.
 	 */
 	public static int nullSafeHashCode(Object[] array) {
 		if (array == null) {
@@ -354,7 +354,7 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Return a hash code based on the contents of the specified array.
-	 * If <code>array</code> is <code>null</code>, this method returns 0.
+	 * If {@code array} is {@code null}, this method returns 0.
 	 */
 	public static int nullSafeHashCode(boolean[] array) {
 		if (array == null) {
@@ -370,7 +370,7 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Return a hash code based on the contents of the specified array.
-	 * If <code>array</code> is <code>null</code>, this method returns 0.
+	 * If {@code array} is {@code null}, this method returns 0.
 	 */
 	public static int nullSafeHashCode(byte[] array) {
 		if (array == null) {
@@ -386,7 +386,7 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Return a hash code based on the contents of the specified array.
-	 * If <code>array</code> is <code>null</code>, this method returns 0.
+	 * If {@code array} is {@code null}, this method returns 0.
 	 */
 	public static int nullSafeHashCode(char[] array) {
 		if (array == null) {
@@ -402,7 +402,7 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Return a hash code based on the contents of the specified array.
-	 * If <code>array</code> is <code>null</code>, this method returns 0.
+	 * If {@code array} is {@code null}, this method returns 0.
 	 */
 	public static int nullSafeHashCode(double[] array) {
 		if (array == null) {
@@ -418,7 +418,7 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Return a hash code based on the contents of the specified array.
-	 * If <code>array</code> is <code>null</code>, this method returns 0.
+	 * If {@code array} is {@code null}, this method returns 0.
 	 */
 	public static int nullSafeHashCode(float[] array) {
 		if (array == null) {
@@ -434,7 +434,7 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Return a hash code based on the contents of the specified array.
-	 * If <code>array</code> is <code>null</code>, this method returns 0.
+	 * If {@code array} is {@code null}, this method returns 0.
 	 */
 	public static int nullSafeHashCode(int[] array) {
 		if (array == null) {
@@ -450,7 +450,7 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Return a hash code based on the contents of the specified array.
-	 * If <code>array</code> is <code>null</code>, this method returns 0.
+	 * If {@code array} is {@code null}, this method returns 0.
 	 */
 	public static int nullSafeHashCode(long[] array) {
 		if (array == null) {
@@ -466,7 +466,7 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Return a hash code based on the contents of the specified array.
-	 * If <code>array</code> is <code>null</code>, this method returns 0.
+	 * If {@code array} is {@code null}, this method returns 0.
 	 */
 	public static int nullSafeHashCode(short[] array) {
 		if (array == null) {
@@ -481,7 +481,7 @@ public abstract class ObjectUtils {
 	}
 
 	/**
-	 * Return the same value as <code>{@link Boolean#hashCode()}</code>.
+	 * Return the same value as {@code {@link Boolean#hashCode()}}.
 	 * @see Boolean#hashCode()
 	 */
 	public static int hashCode(boolean bool) {
@@ -489,7 +489,7 @@ public abstract class ObjectUtils {
 	}
 
 	/**
-	 * Return the same value as <code>{@link Double#hashCode()}</code>.
+	 * Return the same value as {@code {@link Double#hashCode()}}.
 	 * @see Double#hashCode()
 	 */
 	public static int hashCode(double dbl) {
@@ -498,7 +498,7 @@ public abstract class ObjectUtils {
 	}
 
 	/**
-	 * Return the same value as <code>{@link Float#hashCode()}</code>.
+	 * Return the same value as {@code {@link Float#hashCode()}}.
 	 * @see Float#hashCode()
 	 */
 	public static int hashCode(float flt) {
@@ -506,7 +506,7 @@ public abstract class ObjectUtils {
 	}
 
 	/**
-	 * Return the same value as <code>{@link Long#hashCode()}</code>.
+	 * Return the same value as {@code {@link Long#hashCode()}}.
 	 * @see Long#hashCode()
 	 */
 	public static int hashCode(long lng) {
@@ -520,9 +520,9 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Return a String representation of an object's overall identity.
-	 * @param obj the object (may be <code>null</code>)
+	 * @param obj the object (may be {@code null})
 	 * @return the object's identity as String representation,
-	 * or an empty String if the object was <code>null</code>
+	 * or an empty String if the object was {@code null}
 	 */
 	public static String identityToString(Object obj) {
 		if (obj == null) {
@@ -541,12 +541,12 @@ public abstract class ObjectUtils {
 	}
 
 	/**
-	 * Return a content-based String representation if <code>obj</code> is
-	 * not <code>null</code>; otherwise returns an empty String.
+	 * Return a content-based String representation if {@code obj} is
+	 * not {@code null}; otherwise returns an empty String.
 	 * <p>Differs from {@link #nullSafeToString(Object)} in that it returns
-	 * an empty String rather than "null" for a <code>null</code> value.
+	 * an empty String rather than "null" for a {@code null} value.
 	 * @param obj the object to build a display String for
-	 * @return a display String representation of <code>obj</code>
+	 * @return a display String representation of {@code obj}
 	 * @see #nullSafeToString(Object)
 	 */
 	public static String getDisplayString(Object obj) {
@@ -558,8 +558,8 @@ public abstract class ObjectUtils {
 
 	/**
 	 * Determine the class name for the given object.
-	 * <p>Returns <code>"null"</code> if <code>obj</code> is <code>null</code>.
-	 * @param obj the object to introspect (may be <code>null</code>)
+	 * <p>Returns {@code "null"} if {@code obj} is {@code null}.
+	 * @param obj the object to introspect (may be {@code null})
 	 * @return the corresponding class name
 	 */
 	public static String nullSafeClassName(Object obj) {
@@ -569,9 +569,9 @@ public abstract class ObjectUtils {
 	/**
 	 * Return a String representation of the specified Object.
 	 * <p>Builds a String representation of the contents in case of an array.
-	 * Returns <code>"null"</code> if <code>obj</code> is <code>null</code>.
+	 * Returns {@code "null"} if {@code obj} is {@code null}.
 	 * @param obj the object to build a String representation for
-	 * @return a String representation of <code>obj</code>
+	 * @return a String representation of {@code obj}
 	 */
 	public static String nullSafeToString(Object obj) {
 		if (obj == null) {
@@ -614,11 +614,11 @@ public abstract class ObjectUtils {
 	/**
 	 * Return a String representation of the contents of the specified array.
 	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated
-	 * by the characters <code>", "</code> (a comma followed by a space). Returns
-	 * <code>"null"</code> if <code>array</code> is <code>null</code>.
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space). Returns
+	 * {@code "null"} if {@code array} is {@code null}.
 	 * @param array the array to build a String representation for
-	 * @return a String representation of <code>array</code>
+	 * @return a String representation of {@code array}
 	 */
 	public static String nullSafeToString(Object[] array) {
 		if (array == null) {
@@ -645,11 +645,11 @@ public abstract class ObjectUtils {
 	/**
 	 * Return a String representation of the contents of the specified array.
 	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated
-	 * by the characters <code>", "</code> (a comma followed by a space). Returns
-	 * <code>"null"</code> if <code>array</code> is <code>null</code>.
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space). Returns
+	 * {@code "null"} if {@code array} is {@code null}.
 	 * @param array the array to build a String representation for
-	 * @return a String representation of <code>array</code>
+	 * @return a String representation of {@code array}
 	 */
 	public static String nullSafeToString(boolean[] array) {
 		if (array == null) {
@@ -677,11 +677,11 @@ public abstract class ObjectUtils {
 	/**
 	 * Return a String representation of the contents of the specified array.
 	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated
-	 * by the characters <code>", "</code> (a comma followed by a space). Returns
-	 * <code>"null"</code> if <code>array</code> is <code>null</code>.
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space). Returns
+	 * {@code "null"} if {@code array} is {@code null}.
 	 * @param array the array to build a String representation for
-	 * @return a String representation of <code>array</code>
+	 * @return a String representation of {@code array}
 	 */
 	public static String nullSafeToString(byte[] array) {
 		if (array == null) {
@@ -708,11 +708,11 @@ public abstract class ObjectUtils {
 	/**
 	 * Return a String representation of the contents of the specified array.
 	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated
-	 * by the characters <code>", "</code> (a comma followed by a space). Returns
-	 * <code>"null"</code> if <code>array</code> is <code>null</code>.
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space). Returns
+	 * {@code "null"} if {@code array} is {@code null}.
 	 * @param array the array to build a String representation for
-	 * @return a String representation of <code>array</code>
+	 * @return a String representation of {@code array}
 	 */
 	public static String nullSafeToString(char[] array) {
 		if (array == null) {
@@ -739,11 +739,11 @@ public abstract class ObjectUtils {
 	/**
 	 * Return a String representation of the contents of the specified array.
 	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated
-	 * by the characters <code>", "</code> (a comma followed by a space). Returns
-	 * <code>"null"</code> if <code>array</code> is <code>null</code>.
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space). Returns
+	 * {@code "null"} if {@code array} is {@code null}.
 	 * @param array the array to build a String representation for
-	 * @return a String representation of <code>array</code>
+	 * @return a String representation of {@code array}
 	 */
 	public static String nullSafeToString(double[] array) {
 		if (array == null) {
@@ -771,11 +771,11 @@ public abstract class ObjectUtils {
 	/**
 	 * Return a String representation of the contents of the specified array.
 	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated
-	 * by the characters <code>", "</code> (a comma followed by a space). Returns
-	 * <code>"null"</code> if <code>array</code> is <code>null</code>.
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space). Returns
+	 * {@code "null"} if {@code array} is {@code null}.
 	 * @param array the array to build a String representation for
-	 * @return a String representation of <code>array</code>
+	 * @return a String representation of {@code array}
 	 */
 	public static String nullSafeToString(float[] array) {
 		if (array == null) {
@@ -803,11 +803,11 @@ public abstract class ObjectUtils {
 	/**
 	 * Return a String representation of the contents of the specified array.
 	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated
-	 * by the characters <code>", "</code> (a comma followed by a space). Returns
-	 * <code>"null"</code> if <code>array</code> is <code>null</code>.
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space). Returns
+	 * {@code "null"} if {@code array} is {@code null}.
 	 * @param array the array to build a String representation for
-	 * @return a String representation of <code>array</code>
+	 * @return a String representation of {@code array}
 	 */
 	public static String nullSafeToString(int[] array) {
 		if (array == null) {
@@ -834,11 +834,11 @@ public abstract class ObjectUtils {
 	/**
 	 * Return a String representation of the contents of the specified array.
 	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated
-	 * by the characters <code>", "</code> (a comma followed by a space). Returns
-	 * <code>"null"</code> if <code>array</code> is <code>null</code>.
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space). Returns
+	 * {@code "null"} if {@code array} is {@code null}.
 	 * @param array the array to build a String representation for
-	 * @return a String representation of <code>array</code>
+	 * @return a String representation of {@code array}
 	 */
 	public static String nullSafeToString(long[] array) {
 		if (array == null) {
@@ -865,11 +865,11 @@ public abstract class ObjectUtils {
 	/**
 	 * Return a String representation of the contents of the specified array.
 	 * <p>The String representation consists of a list of the array's elements,
-	 * enclosed in curly braces (<code>"{}"</code>). Adjacent elements are separated
-	 * by the characters <code>", "</code> (a comma followed by a space). Returns
-	 * <code>"null"</code> if <code>array</code> is <code>null</code>.
+	 * enclosed in curly braces ({@code "{}"}). Adjacent elements are separated
+	 * by the characters {@code ", "} (a comma followed by a space). Returns
+	 * {@code "null"} if {@code array} is {@code null}.
 	 * @param array the array to build a String representation for
-	 * @return a String representation of <code>array</code>
+	 * @return a String representation of {@code array}
 	 */
 	public static String nullSafeToString(short[] array) {
 		if (array == null) {
diff --git a/spring-core/src/main/java/org/springframework/util/PathMatcher.java b/spring-core/src/main/java/org/springframework/util/PathMatcher.java
index 5b8d4900e0..0910382f7f 100644
--- a/spring-core/src/main/java/org/springframework/util/PathMatcher.java
+++ b/spring-core/src/main/java/org/springframework/util/PathMatcher.java
@@ -20,7 +20,7 @@ import java.util.Comparator;
 import java.util.Map;
 
 /**
- * Strategy interface for <code>String</code>-based path matching.
+ * Strategy interface for {@code String}-based path matching.
  *
  * <p>Used by {@link org.springframework.core.io.support.PathMatchingResourcePatternResolver},
  * {@link org.springframework.web.servlet.handler.AbstractUrlHandlerMapping},
@@ -37,35 +37,35 @@ import java.util.Map;
 public interface PathMatcher {
 
 	/**
-	 * Does the given <code>path</code> represent a pattern that can be matched
+	 * Does the given {@code path} represent a pattern that can be matched
 	 * by an implementation of this interface?
-	 * <p>If the return value is <code>false</code>, then the {@link #match}
+	 * <p>If the return value is {@code false}, then the {@link #match}
 	 * method does not have to be used because direct equality comparisons
 	 * on the static path Strings will lead to the same result.
 	 * @param path the path String to check
-	 * @return <code>true</code> if the given <code>path</code> represents a pattern
+	 * @return {@code true} if the given {@code path} represents a pattern
 	 */
 	boolean isPattern(String path);
 
 	/**
-	 * Match the given <code>path</code> against the given <code>pattern</code>,
+	 * Match the given {@code path} against the given {@code pattern},
 	 * according to this PathMatcher's matching strategy.
 	 * @param pattern the pattern to match against
 	 * @param path the path String to test
-	 * @return <code>true</code> if the supplied <code>path</code> matched,
-	 * <code>false</code> if it didn't
+	 * @return {@code true} if the supplied {@code path} matched,
+	 * {@code false} if it didn't
 	 */
 	boolean match(String pattern, String path);
 
 	/**
-	 * Match the given <code>path</code> against the corresponding part of the given
-	 * <code>pattern</code>, according to this PathMatcher's matching strategy.
+	 * Match the given {@code path} against the corresponding part of the given
+	 * {@code pattern}, according to this PathMatcher's matching strategy.
 	 * <p>Determines whether the pattern at least matches as far as the given base
 	 * path goes, assuming that a full path may then match as well.
 	 * @param pattern the pattern to match against
 	 * @param path the path String to test
-	 * @return <code>true</code> if the supplied <code>path</code> matched,
-	 * <code>false</code> if it didn't
+	 * @return {@code true} if the supplied {@code path} matched,
+	 * {@code false} if it didn't
 	 */
 	boolean matchStart(String pattern, String path);
 
@@ -80,14 +80,14 @@ public interface PathMatcher {
 	 * determination rules are specified to this PathMatcher's matching strategy.
 	 * <p>A simple implementation may return the given full path as-is in case
 	 * of an actual pattern, and the empty String in case of the pattern not
-	 * containing any dynamic parts (i.e. the <code>pattern</code> parameter being
+	 * containing any dynamic parts (i.e. the {@code pattern} parameter being
 	 * a static path that wouldn't qualify as an actual {@link #isPattern pattern}).
 	 * A sophisticated implementation will differentiate between the static parts
 	 * and the dynamic parts of the given path pattern.
 	 * @param pattern the path pattern
 	 * @param path the full path to introspect
-	 * @return the pattern-mapped part of the given <code>path</code>
-	 * (never <code>null</code>)
+	 * @return the pattern-mapped part of the given {@code path}
+	 * (never {@code null})
 	 */
 	String extractPathWithinPattern(String pattern, String path);
 
@@ -106,7 +106,7 @@ public interface PathMatcher {
 	 * Given a full path, returns a {@link Comparator} suitable for sorting patterns
 	 * in order of explicitness for that path.
 	 * <p>The full algorithm used depends on the underlying implementation, but generally,
-	 * the returned <code>Comparator</code> will
+	 * the returned {@code Comparator} will
 	 * {@linkplain java.util.Collections#sort(java.util.List, java.util.Comparator) sort}
 	 * a list so that more specific patterns come before generic patterns.
 	 * @param path the full path to use for comparison
diff --git a/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java b/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java
index a8edf97060..071a69ee80 100644
--- a/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java
+++ b/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java
@@ -24,16 +24,16 @@ import java.io.Writer;
 import java.util.Properties;
 
 /**
- * Strategy interface for persisting <code>java.util.Properties</code>,
+ * Strategy interface for persisting {@code java.util.Properties},
  * allowing for pluggable parsing strategies.
  *
  * <p>The default implementation is DefaultPropertiesPersister,
- * providing the native parsing of <code>java.util.Properties</code>,
+ * providing the native parsing of {@code java.util.Properties},
  * but allowing for reading from any Reader and writing to any Writer
  * (which allows to specify an encoding for a properties file).
  *
  * <p>As of Spring 1.2.2, this interface also supports properties XML files,
- * through the <code>loadFromXml</code> and <code>storeToXml</code> methods.
+ * through the {@code loadFromXml} and {@code storeToXml} methods.
  * The default implementations delegate to JDK 1.5's corresponding methods.
  *
  * @author Juergen Hoeller
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 df814691d8..5728b28604 100644
--- a/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java
+++ b/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
 
 /**
  * Utility class for working with Strings that have placeholder values in them. A placeholder takes the form
- * <code>${name}</code>. Using <code>PropertyPlaceholderHelper</code> these placeholders can be substituted for
+ * {@code ${name}}. Using {@code PropertyPlaceholderHelper} these placeholders can be substituted for
  * user-supplied values. <p> Values for substitution can be supplied using a {@link Properties} instance or
  * using a {@link PlaceholderResolver}.
  *
@@ -60,7 +60,7 @@ public class PropertyPlaceholderHelper {
 
 
 	/**
-	 * Creates a new <code>PropertyPlaceholderHelper</code> that uses the supplied prefix and suffix.
+	 * 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.
@@ -70,13 +70,13 @@ public class PropertyPlaceholderHelper {
 	}
 
 	/**
-	 * Creates a new <code>PropertyPlaceholderHelper</code> that uses the supplied prefix and suffix.
+	 * Creates a new {@code PropertyPlaceholderHelper} that uses the supplied prefix and suffix.
 	 * @param placeholderPrefix the prefix that denotes the start of a placeholder
 	 * @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</code>) or cause an exception (<code>false</code>).
+	 * ({@code true}) or cause an exception ({@code false}).
 	 */
 	public PropertyPlaceholderHelper(String placeholderPrefix, String placeholderSuffix,
 			String valueSeparator, boolean ignoreUnresolvablePlaceholders) {
@@ -98,10 +98,10 @@ public class PropertyPlaceholderHelper {
 
 
 	/**
-	 * Replaces all placeholders of format <code>${name}</code> with the corresponding property
+	 * 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</code> to use for replacement.
+	 * @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) {
@@ -114,10 +114,10 @@ public class PropertyPlaceholderHelper {
 	}
 
 	/**
-	 * Replaces all placeholders of format <code>${name}</code> with the value returned from the supplied
+	 * 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</code> to use for replacement.
+	 * @param placeholderResolver the {@code PlaceholderResolver} to use for replacement.
 	 * @return the supplied value with placeholders replaced inline.
 	 */
 	public String replacePlaceholders(String value, PlaceholderResolver placeholderResolver) {
@@ -217,7 +217,7 @@ public class PropertyPlaceholderHelper {
 		/**
 		 * 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</code> if no replacement is to be made.
+		 * @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 1ef55a5242..87ba421141 100644
--- a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
@@ -48,10 +48,10 @@ public abstract class ReflectionUtils {
 
 	/**
 	 * Attempt to find a {@link Field field} on the supplied {@link Class} with the
-	 * supplied <code>name</code>. Searches all superclasses up to {@link Object}.
+	 * supplied {@code name}. Searches all superclasses up to {@link Object}.
 	 * @param clazz the class to introspect
 	 * @param name the name of the field
-	 * @return the corresponding Field object, or <code>null</code> if not found
+	 * @return the corresponding Field object, or {@code null} if not found
 	 */
 	public static Field findField(Class<?> clazz, String name) {
 		return findField(clazz, name, null);
@@ -59,12 +59,12 @@ public abstract class ReflectionUtils {
 
 	/**
 	 * Attempt to find a {@link Field field} on the supplied {@link Class} with the
-	 * supplied <code>name</code> and/or {@link Class type}. Searches all superclasses
+	 * supplied {@code name} and/or {@link Class type}. Searches all superclasses
 	 * up to {@link Object}.
 	 * @param clazz the class to introspect
-	 * @param name the name of the field (may be <code>null</code> if type is specified)
-	 * @param type the type of the field (may be <code>null</code> if name is specified)
-	 * @return the corresponding Field object, or <code>null</code> if not found
+	 * @param name the name of the field (may be {@code null} if type is specified)
+	 * @param type the type of the field (may be {@code null} if name is specified)
+	 * @return the corresponding Field object, or {@code null} if not found
 	 */
 	public static Field findField(Class<?> clazz, String name, Class<?> type) {
 		Assert.notNull(clazz, "Class must not be null");
@@ -84,13 +84,13 @@ public abstract class ReflectionUtils {
 
 	/**
 	 * Set the field represented by the supplied {@link Field field object} on the
-	 * specified {@link Object target object} to the specified <code>value</code>.
+	 * specified {@link Object target object} to the specified {@code value}.
 	 * In accordance with {@link Field#set(Object, Object)} semantics, the new value
 	 * is automatically unwrapped if the underlying field has a primitive type.
 	 * <p>Thrown exceptions are handled via a call to {@link #handleReflectionException(Exception)}.
 	 * @param field the field to set
 	 * @param target the target object on which to set the field
-	 * @param value the value to set; may be <code>null</code>
+	 * @param value the value to set; may be {@code null}
 	 */
 	public static void setField(Field field, Object target, Object value) {
 		try {
@@ -126,11 +126,11 @@ public abstract class ReflectionUtils {
 
 	/**
 	 * Attempt to find a {@link Method} on the supplied class with the supplied name
-	 * and no parameters. Searches all superclasses up to <code>Object</code>.
-	 * <p>Returns <code>null</code> if no {@link Method} can be found.
+	 * and no parameters. Searches all superclasses up to {@code Object}.
+	 * <p>Returns {@code null} if no {@link Method} can be found.
 	 * @param clazz the class to introspect
 	 * @param name the name of the method
-	 * @return the Method object, or <code>null</code> if none found
+	 * @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]);
@@ -138,13 +138,13 @@ public abstract class ReflectionUtils {
 
 	/**
 	 * Attempt to find a {@link Method} on the supplied class with the supplied name
-	 * and parameter types. Searches all superclasses up to <code>Object</code>.
-	 * <p>Returns <code>null</code> if no {@link Method} can be found.
+	 * and parameter types. Searches all superclasses up to {@code Object}.
+	 * <p>Returns {@code null} if no {@link Method} can be found.
 	 * @param clazz the class to introspect
 	 * @param name the name of the method
 	 * @param paramTypes the parameter types of the method
-	 * (may be <code>null</code> to indicate any signature)
-	 * @return the Method object, or <code>null</code> if none found
+	 * (may be {@code null} to indicate any signature)
+	 * @return the Method object, or {@code null} if none found
 	 */
 	public static Method findMethod(Class<?> clazz, String name, Class<?>... paramTypes) {
 		Assert.notNull(clazz, "Class must not be null");
@@ -165,7 +165,7 @@ public abstract class ReflectionUtils {
 
 	/**
 	 * Invoke the specified {@link Method} against the supplied target object with no arguments.
-	 * The target object can be <code>null</code> when invoking a static {@link Method}.
+	 * The target object can be {@code null} when invoking a static {@link Method}.
 	 * <p>Thrown exceptions are handled via a call to {@link #handleReflectionException}.
 	 * @param method the method to invoke
 	 * @param target the target object to invoke the method on
@@ -178,12 +178,12 @@ public abstract class ReflectionUtils {
 
 	/**
 	 * Invoke the specified {@link Method} against the supplied target object with the
-	 * supplied arguments. The target object can be <code>null</code> when invoking a
+	 * supplied arguments. The target object can be {@code null} when invoking a
 	 * static {@link Method}.
 	 * <p>Thrown exceptions are handled via a call to {@link #handleReflectionException}.
 	 * @param method the method to invoke
 	 * @param target the target object to invoke the method on
-	 * @param args the invocation arguments (may be <code>null</code>)
+	 * @param args the invocation arguments (may be {@code null})
 	 * @return the invocation result, if any
 	 */
 	public static Object invokeMethod(Method method, Object target, Object... args) {
@@ -214,7 +214,7 @@ public abstract class ReflectionUtils {
 	 * object with the supplied arguments.
 	 * @param method the method to invoke
 	 * @param target the target object to invoke the method on
-	 * @param args the invocation arguments (may be <code>null</code>)
+	 * @param args the invocation arguments (may be {@code null})
 	 * @return the invocation result, if any
 	 * @throws SQLException the JDBC API SQLException to rethrow (if any)
 	 * @see #invokeMethod(java.lang.reflect.Method, Object, Object[])
@@ -318,8 +318,8 @@ public abstract class ReflectionUtils {
 	 * that type can be propagated as-is within a reflective invocation.
 	 * @param method the declaring method
 	 * @param exceptionType the exception to throw
-	 * @return <code>true</code> if the exception can be thrown as-is;
-	 * <code>false</code> if it needs to be wrapped
+	 * @return {@code true} if the exception can be thrown as-is;
+	 * {@code false} if it needs to be wrapped
 	 */
 	public static boolean declaresException(Method method, Class<?> exceptionType) {
 		Assert.notNull(method, "Method must not be null");
@@ -395,7 +395,7 @@ public abstract class ReflectionUtils {
 
 	/**
 	 * Make the given field accessible, explicitly setting it accessible if
-	 * necessary. The <code>setAccessible(true)</code> method is only called
+	 * necessary. The {@code setAccessible(true)} method is only called
 	 * when actually necessary, to avoid unnecessary conflicts with a JVM
 	 * SecurityManager (if active).
 	 * @param field the field to make accessible
@@ -410,7 +410,7 @@ public abstract class ReflectionUtils {
 
 	/**
 	 * Make the given method accessible, explicitly setting it accessible if
-	 * necessary. The <code>setAccessible(true)</code> method is only called
+	 * necessary. The {@code setAccessible(true)} method is only called
 	 * when actually necessary, to avoid unnecessary conflicts with a JVM
 	 * SecurityManager (if active).
 	 * @param method the method to make accessible
@@ -425,7 +425,7 @@ public abstract class ReflectionUtils {
 
 	/**
 	 * Make the given constructor accessible, explicitly setting it accessible
-	 * if necessary. The <code>setAccessible(true)</code> method is only called
+	 * if necessary. The {@code setAccessible(true)} method is only called
 	 * when actually necessary, to avoid unnecessary conflicts with a JVM
 	 * SecurityManager (if active).
 	 * @param ctor the constructor to make accessible
@@ -682,7 +682,7 @@ public abstract class ReflectionUtils {
 
 	/**
 	 * Pre-built MethodFilter that matches all non-bridge methods
-	 * which are not declared on <code>java.lang.Object</code>.
+	 * which are not declared on {@code java.lang.Object}.
 	 */
 	public static MethodFilter USER_DECLARED_METHODS = new MethodFilter() {
 
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 b2041a98bc..8acebff9ab 100644
--- a/spring-core/src/main/java/org/springframework/util/ResourceUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ResourceUtils.java
@@ -30,10 +30,10 @@ import java.net.URLConnection;
  *
  * <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</code>
+ * {@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</code> in the
- * file system through its <code>getFile()</code> method.
+ * object, which in turn allows 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
@@ -107,7 +107,7 @@ public abstract class ResourceUtils {
 	}
 
 	/**
-	 * Resolve the given resource location to a <code>java.net.URL</code>.
+	 * Resolve the given resource location to a {@code java.net.URL}.
 	 * <p>Does not check whether the URL actually exists; simply returns
 	 * the URL that the given location would correspond to.
 	 * @param resourceLocation the resource location to resolve: either a
@@ -144,7 +144,7 @@ public abstract class ResourceUtils {
 	}
 
 	/**
-	 * Resolve the given resource location to a <code>java.io.File</code>,
+	 * 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
 	 * the File that the given location would correspond to.
@@ -178,7 +178,7 @@ public abstract class ResourceUtils {
 	}
 
 	/**
-	 * Resolve the given resource URL to a <code>java.io.File</code>,
+	 * Resolve the given resource URL to a {@code java.io.File},
 	 * i.e. to a file in the file system.
 	 * @param resourceUrl the resource URL to resolve
 	 * @return a corresponding File object
@@ -190,7 +190,7 @@ public abstract class ResourceUtils {
 	}
 
 	/**
-	 * Resolve the given resource URL to a <code>java.io.File</code>,
+	 * Resolve the given resource URL to a {@code java.io.File},
 	 * i.e. to a file in the file system.
 	 * @param resourceUrl the resource URL to resolve
 	 * @param description a description of the original resource that
@@ -216,7 +216,7 @@ public abstract class ResourceUtils {
 	}
 
 	/**
-	 * Resolve the given resource URI to a <code>java.io.File</code>,
+	 * Resolve the given resource URI to a {@code java.io.File},
 	 * i.e. to a file in the file system.
 	 * @param resourceUri the resource URI to resolve
 	 * @return a corresponding File object
@@ -228,7 +228,7 @@ public abstract class ResourceUtils {
 	}
 
 	/**
-	 * Resolve the given resource URI to a <code>java.io.File</code>,
+	 * Resolve the given resource URI to a {@code java.io.File},
 	 * i.e. to a file in the file system.
 	 * @param resourceUri the resource URI to resolve
 	 * @param description a description of the original resource that
@@ -308,7 +308,7 @@ public abstract class ResourceUtils {
 	 * Create a URI instance for the given URL,
 	 * replacing spaces with "%20" quotes first.
 	 * <p>Furthermore, this method works on JDK 1.4 as well,
-	 * in contrast to the <code>URL.toURI()</code> method.
+	 * in contrast to the {@code URL.toURI()} method.
 	 * @param url the URL to convert into a URI instance
 	 * @return the URI instance
 	 * @throws URISyntaxException if the URL wasn't a valid URI
@@ -331,8 +331,8 @@ public abstract class ResourceUtils {
 
 	/**
 	 * Set the {@link URLConnection#setUseCaches "useCaches"} flag on the
-	 * given connection, preferring <code>false</code> but leaving the
-	 * flag at <code>true</code> for JNLP based resources.
+	 * given connection, preferring {@code false} but leaving the
+	 * flag at {@code true} for JNLP based resources.
 	 * @param con the URLConnection to set the flag on
 	 */
 	public static void useCachesIfNecessary(URLConnection con) {
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 896df5cd54..c47c16291f 100644
--- a/spring-core/src/main/java/org/springframework/util/StopWatch.java
+++ b/spring-core/src/main/java/org/springframework/util/StopWatch.java
@@ -24,7 +24,7 @@ import java.util.List;
  * Simple stop watch, allowing for timing of a number of tasks,
  * exposing total running time and running time for each named task.
  *
- * <p>Conceals use of <code>System.currentTimeMillis()</code>, improving the
+ * <p>Conceals use of {@code System.currentTimeMillis()}, improving the
  * readability of application code and reducing the likelihood of calculation errors.
  *
  * <p>Note that this object is not designed to be thread-safe and does not
@@ -250,7 +250,7 @@ public class StopWatch {
 
 	/**
 	 * Return an informative string describing all tasks performed
-	 * For custom reporting, call <code>getTaskInfo()</code> and use the task info directly.
+	 * For custom reporting, call {@code getTaskInfo()} and use the task info directly.
 	 */
 	@Override
 	public String toString() {
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 52874fb729..7fa4b75cf9 100644
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -38,7 +38,7 @@ import java.util.TreeSet;
  * for a more comprehensive suite of String utilities.
  *
  * <p>This class delivers some simple functionality that should really
- * be provided by the core Java <code>String</code> and {@link StringBuilder}
+ * be provided by the core Java {@code String} and {@link StringBuilder}
  * classes, such as the ability to {@link #replace} all occurrences of a given
  * substring in a target string. It also provides easy-to-use methods to convert
  * between delimited strings, such as CSV strings, and collections and arrays.
@@ -72,8 +72,8 @@ public abstract class StringUtils {
 	/**
 	 * Check whether the given String is empty.
 	 * <p>This method accepts any Object as an argument, comparing it to
-	 * <code>null</code> and the empty String. As a consequence, this method
-	 * will never return <code>true</code> for a non-null non-String object.
+	 * {@code null} and the empty String. As a consequence, this method
+	 * will never return {@code true} for a non-null non-String object.
 	 * <p>The Object signature is useful for general attribute handling code
 	 * that commonly deals with Strings but generally has to iterate over
 	 * Objects since attributes may e.g. be primitive value objects as well.
@@ -85,16 +85,16 @@ public abstract class StringUtils {
 	}
 
 	/**
-	 * Check that the given CharSequence is neither <code>null</code> nor of length 0.
-	 * Note: Will return <code>true</code> for a CharSequence that purely consists of whitespace.
+	 * 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>
 	 * StringUtils.hasLength(null) = false
 	 * StringUtils.hasLength("") = false
 	 * StringUtils.hasLength(" ") = true
 	 * StringUtils.hasLength("Hello") = true
 	 * </pre>
-	 * @param str the CharSequence to check (may be <code>null</code>)
-	 * @return <code>true</code> if the CharSequence is not null and has length
+	 * @param str the CharSequence to check (may be {@code null})
+	 * @return {@code true} if the CharSequence is not null and has length
 	 * @see #hasText(String)
 	 */
 	public static boolean hasLength(CharSequence str) {
@@ -102,10 +102,10 @@ public abstract class StringUtils {
 	}
 
 	/**
-	 * Check that the given String is neither <code>null</code> nor of length 0.
-	 * Note: Will return <code>true</code> for a String that purely consists of whitespace.
-	 * @param str the String to check (may be <code>null</code>)
-	 * @return <code>true</code> if the String is not null and has length
+	 * Check that the given String is neither {@code null} nor of length 0.
+	 * Note: Will return {@code true} for a String that purely consists of whitespace.
+	 * @param str the String to check (may be {@code null})
+	 * @return {@code true} if the String is not null and has length
 	 * @see #hasLength(CharSequence)
 	 */
 	public static boolean hasLength(String str) {
@@ -114,7 +114,7 @@ public abstract class StringUtils {
 
 	/**
 	 * Check whether the given CharSequence has actual text.
-	 * More specifically, returns <code>true</code> if the string not <code>null</code>,
+	 * 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>
 	 * StringUtils.hasText(null) = false
@@ -123,10 +123,10 @@ public abstract class StringUtils {
 	 * StringUtils.hasText("12345") = true
 	 * StringUtils.hasText(" 12345 ") = true
 	 * </pre>
-	 * @param str the CharSequence to check (may be <code>null</code>)
-	 * @return <code>true</code> if the CharSequence is not <code>null</code>,
+	 * @param str the CharSequence to check (may be {@code null})
+	 * @return {@code true} if the CharSequence is not {@code null},
 	 * its length is greater than 0, and it does not contain whitespace only
-	 * @see java.lang.Character#isWhitespace
+	 * @see Character#isWhitespace
 	 */
 	public static boolean hasText(CharSequence str) {
 		if (!hasLength(str)) {
@@ -143,10 +143,10 @@ public abstract class StringUtils {
 
 	/**
 	 * Check whether the given String has actual text.
-	 * More specifically, returns <code>true</code> if the string not <code>null</code>,
+	 * 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.
-	 * @param str the String to check (may be <code>null</code>)
-	 * @return <code>true</code> if the String is not <code>null</code>, its length is
+	 * @param str the String to check (may be {@code null})
+	 * @return {@code true} if the String is not {@code null}, its length is
 	 * greater than 0, and it does not contain whitespace only
 	 * @see #hasText(CharSequence)
 	 */
@@ -156,10 +156,10 @@ public abstract class StringUtils {
 
 	/**
 	 * Check whether the given CharSequence contains any whitespace characters.
-	 * @param str the CharSequence to check (may be <code>null</code>)
-	 * @return <code>true</code> if the CharSequence is not empty and
+	 * @param str the CharSequence to check (may be {@code null})
+	 * @return {@code true} if the CharSequence is not empty and
 	 * contains at least 1 whitespace character
-	 * @see java.lang.Character#isWhitespace
+	 * @see Character#isWhitespace
 	 */
 	public static boolean containsWhitespace(CharSequence str) {
 		if (!hasLength(str)) {
@@ -176,8 +176,8 @@ public abstract class StringUtils {
 
 	/**
 	 * Check whether the given String contains any whitespace characters.
-	 * @param str the String to check (may be <code>null</code>)
-	 * @return <code>true</code> if the String is not empty and
+	 * @param str the String to check (may be {@code null})
+	 * @return {@code true} if the String is not empty and
 	 * contains at least 1 whitespace character
 	 * @see #containsWhitespace(CharSequence)
 	 */
@@ -447,7 +447,7 @@ public abstract class StringUtils {
 	 * Quote the given String with single quotes.
 	 * @param str the input String (e.g. "myString")
 	 * @return the quoted String (e.g. "'myString'"),
-	 * or <code>null<code> if the input was <code>null</code>
+	 * or {@code null} if the input was {@code null}
 	 */
 	public static String quote(String str) {
 		return (str != null ? "'" + str + "'" : null);
@@ -484,22 +484,22 @@ public abstract class StringUtils {
 	}
 
 	/**
-	 * Capitalize a <code>String</code>, changing the first letter to
+	 * Capitalize a {@code String}, changing the first letter to
 	 * upper case as per {@link Character#toUpperCase(char)}.
 	 * No other letters are changed.
-	 * @param str the String to capitalize, may be <code>null</code>
-	 * @return the capitalized String, <code>null</code> if null
+	 * @param str the String to capitalize, may be {@code null}
+	 * @return the capitalized String, {@code null} if null
 	 */
 	public static String capitalize(String str) {
 		return changeFirstCharacterCase(str, true);
 	}
 
 	/**
-	 * Uncapitalize a <code>String</code>, changing the first letter to
+	 * Uncapitalize a {@code String}, changing the first letter to
 	 * lower case as per {@link Character#toLowerCase(char)}.
 	 * No other letters are changed.
-	 * @param str the String to uncapitalize, may be <code>null</code>
-	 * @return the uncapitalized String, <code>null</code> if null
+	 * @param str the String to uncapitalize, may be {@code null}
+	 * @return the uncapitalized String, {@code null} if null
 	 */
 	public static String uncapitalize(String str) {
 		return changeFirstCharacterCase(str, false);
@@ -523,8 +523,8 @@ public abstract class StringUtils {
 	/**
 	 * Extract the filename from the given path,
 	 * e.g. "mypath/myfile.txt" -> "myfile.txt".
-	 * @param path the file path (may be <code>null</code>)
-	 * @return the extracted filename, or <code>null</code> if none
+	 * @param path the file path (may be {@code null})
+	 * @return the extracted filename, or {@code null} if none
 	 */
 	public static String getFilename(String path) {
 		if (path == null) {
@@ -537,8 +537,8 @@ public abstract class StringUtils {
 	/**
 	 * Extract the filename extension from the given path,
 	 * e.g. "mypath/myfile.txt" -> "txt".
-	 * @param path the file path (may be <code>null</code>)
-	 * @return the extracted filename extension, or <code>null</code> if none
+	 * @param path the file path (may be {@code null})
+	 * @return the extracted filename extension, or {@code null} if none
 	 */
 	public static String getFilenameExtension(String path) {
 		if (path == null) {
@@ -558,9 +558,9 @@ public abstract class StringUtils {
 	/**
 	 * Strip the filename extension from the given path,
 	 * e.g. "mypath/myfile.txt" -> "mypath/myfile".
-	 * @param path the file path (may be <code>null</code>)
+	 * @param path the file path (may be {@code null})
 	 * @return the path with stripped filename extension,
-	 * or <code>null</code> if none
+	 * or {@code null} if none
 	 */
 	public static String stripFilenameExtension(String path) {
 		if (path == null) {
@@ -672,12 +672,12 @@ public abstract class StringUtils {
 	}
 
 	/**
-	 * Parse the given <code>localeString</code> value into a {@link Locale}.
+	 * 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</code>
-	 * <code>toString()</code> format ("en", "en_UK", etc);
+	 * @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</code> instance
+	 * @return a corresponding {@code Locale} instance
 	 */
 	public static Locale parseLocaleString(String localeString) {
 		String[] parts = tokenizeToStringArray(localeString, "_ ", false, false);
@@ -727,9 +727,9 @@ public abstract class StringUtils {
 	/**
 	 * Append the given String to the given String array, returning a new array
 	 * consisting of the input array contents plus the given String.
-	 * @param array the array to append to (can be <code>null</code>)
+	 * @param array the array to append to (can be {@code null})
 	 * @param str the String to append
-	 * @return the new array (never <code>null</code>)
+	 * @return the new array (never {@code null})
 	 */
 	public static String[] addStringToArray(String[] array, String str) {
 		if (ObjectUtils.isEmpty(array)) {
@@ -745,9 +745,9 @@ public abstract class StringUtils {
 	 * Concatenate the given String arrays into one,
 	 * with overlapping array elements included twice.
 	 * <p>The order of elements in the original arrays is preserved.
-	 * @param array1 the first array (can be <code>null</code>)
-	 * @param array2 the second array (can be <code>null</code>)
-	 * @return the new array (<code>null</code> if both given arrays were <code>null</code>)
+	 * @param array1 the first array (can be {@code null})
+	 * @param array2 the second array (can be {@code null})
+	 * @return the new array ({@code null} if both given arrays were {@code null})
 	 */
 	public static String[] concatenateStringArrays(String[] array1, String[] array2) {
 		if (ObjectUtils.isEmpty(array1)) {
@@ -768,9 +768,9 @@ public abstract class StringUtils {
 	 * <p>The order of elements in the original arrays is preserved
 	 * (with the exception of overlapping elements, which are only
 	 * included on their first occurrence).
-	 * @param array1 the first array (can be <code>null</code>)
-	 * @param array2 the second array (can be <code>null</code>)
-	 * @return the new array (<code>null</code> if both given arrays were <code>null</code>)
+	 * @param array1 the first array (can be {@code null})
+	 * @param array2 the second array (can be {@code null})
+	 * @return the new array ({@code null} if both given arrays were {@code null})
 	 */
 	public static String[] mergeStringArrays(String[] array1, String[] array2) {
 		if (ObjectUtils.isEmpty(array1)) {
@@ -792,7 +792,7 @@ public abstract class StringUtils {
 	/**
 	 * Turn given source String array into sorted array.
 	 * @param array the source array
-	 * @return the sorted array (never <code>null</code>)
+	 * @return the sorted array (never {@code null})
 	 */
 	public static String[] sortStringArray(String[] array) {
 		if (ObjectUtils.isEmpty(array)) {
@@ -806,8 +806,8 @@ public abstract class StringUtils {
 	 * Copy the given Collection into a String array.
 	 * The Collection must contain String elements only.
 	 * @param collection the Collection to copy
-	 * @return the String array (<code>null</code> if the passed-in
-	 * Collection was <code>null</code>)
+	 * @return the String array ({@code null} if the passed-in
+	 * Collection was {@code null})
 	 */
 	public static String[] toStringArray(Collection<String> collection) {
 		if (collection == null) {
@@ -820,8 +820,8 @@ public abstract class StringUtils {
 	 * Copy the given Enumeration into a String array.
 	 * The Enumeration must contain String elements only.
 	 * @param enumeration the Enumeration to copy
-	 * @return the String array (<code>null</code> if the passed-in
-	 * Enumeration was <code>null</code>)
+	 * @return the String array ({@code null} if the passed-in
+	 * Enumeration was {@code null})
 	 */
 	public static String[] toStringArray(Enumeration<String> enumeration) {
 		if (enumeration == null) {
@@ -833,7 +833,7 @@ public abstract class StringUtils {
 
 	/**
 	 * Trim the elements of the given String array,
-	 * calling <code>String.trim()</code> on each of them.
+	 * calling {@code String.trim()} on each of them.
 	 * @param array the original String array
 	 * @return the resulting array (of the same size) with trimmed elements
 	 */
@@ -873,7 +873,7 @@ public abstract class StringUtils {
 	 * @param delimiter to split the string up with
 	 * @return a two element array with index 0 being before the delimiter, and
 	 * index 1 being after the delimiter (neither element includes the delimiter);
-	 * or <code>null</code> if the delimiter wasn't found in the given input String
+	 * or {@code null} if the delimiter wasn't found in the given input String
 	 */
 	public static String[] split(String toSplit, String delimiter) {
 		if (!hasLength(toSplit) || !hasLength(delimiter)) {
@@ -890,14 +890,14 @@ public abstract class StringUtils {
 
 	/**
 	 * Take an array Strings and split each element based on the given delimiter.
-	 * A <code>Properties</code> instance is then generated, with the left of the
+	 * A {@code Properties} instance is then generated, with the left of the
 	 * delimiter providing the key, and the right of the delimiter providing the value.
 	 * <p>Will trim both the key and value before adding them to the
-	 * <code>Properties</code> instance.
+	 * {@code Properties} instance.
 	 * @param array the array to process
 	 * @param delimiter to split each element using (typically the equals symbol)
-	 * @return a <code>Properties</code> instance representing the array contents,
-	 * or <code>null</code> if the array to process was null or empty
+	 * @return a {@code Properties} instance representing the array contents,
+	 * or {@code null} if the array to process was null or empty
 	 */
 	public static Properties splitArrayElementsIntoProperties(String[] array, String delimiter) {
 		return splitArrayElementsIntoProperties(array, delimiter, null);
@@ -905,17 +905,17 @@ public abstract class StringUtils {
 
 	/**
 	 * Take an array Strings and split each element based on the given delimiter.
-	 * A <code>Properties</code> instance is then generated, with the left of the
+	 * A {@code Properties} instance is then generated, with the left of the
 	 * delimiter providing the key, and the right of the delimiter providing the value.
 	 * <p>Will trim both the key and value before adding them to the
-	 * <code>Properties</code> instance.
+	 * {@code Properties} instance.
 	 * @param array the array to process
 	 * @param delimiter to split each element using (typically the equals symbol)
 	 * @param charsToDelete one or more characters to remove from each element
 	 * prior to attempting the split operation (typically the quotation mark
-	 * symbol), or <code>null</code> if no removal should occur
-	 * @return a <code>Properties</code> instance representing the array contents,
-	 * or <code>null</code> if the array to process was <code>null</code> or empty
+	 * symbol), or {@code null} if no removal should occur
+	 * @return a {@code Properties} instance representing the array contents,
+	 * or {@code null} if the array to process was {@code null} or empty
 	 */
 	public static Properties splitArrayElementsIntoProperties(
 			String[] array, String delimiter, String charsToDelete) {
@@ -943,13 +943,13 @@ public abstract class StringUtils {
 	 * <p>The given delimiters string is supposed to consist of any number of
 	 * delimiter characters. Each of those characters can be used to separate
 	 * tokens. A delimiter is always a single character; for multi-character
-	 * delimiters, consider using <code>delimitedListToStringArray</code>
+	 * delimiters, consider using {@code delimitedListToStringArray}
 	 * @param str the String to tokenize
 	 * @param delimiters the delimiter characters, assembled as String
 	 * (each of those characters is individually considered as delimiter).
 	 * @return an array of the tokens
 	 * @see java.util.StringTokenizer
-	 * @see java.lang.String#trim()
+	 * @see String#trim()
 	 * @see #delimitedListToStringArray
 	 */
 	public static String[] tokenizeToStringArray(String str, String delimiters) {
@@ -961,18 +961,18 @@ public abstract class StringUtils {
 	 * <p>The given delimiters string is supposed to consist of any number of
 	 * delimiter characters. Each of those characters can be used to separate
 	 * tokens. A delimiter is always a single character; for multi-character
-	 * delimiters, consider using <code>delimitedListToStringArray</code>
+	 * delimiters, consider using {@code delimitedListToStringArray}
 	 * @param str the String to tokenize
 	 * @param delimiters the delimiter characters, assembled as String
 	 * (each of those characters is individually considered as delimiter)
-	 * @param trimTokens trim the tokens via String's <code>trim</code>
+	 * @param trimTokens trim the tokens via String's {@code trim}
 	 * @param ignoreEmptyTokens omit empty tokens from the result array
 	 * (only applies to tokens that are empty after trimming; StringTokenizer
 	 * will not consider subsequent delimiters as token in the first place).
-	 * @return an array of the tokens (<code>null</code> if the input String
-	 * was <code>null</code>)
+	 * @return an array of the tokens ({@code null} if the input String
+	 * was {@code null})
 	 * @see java.util.StringTokenizer
-	 * @see java.lang.String#trim()
+	 * @see String#trim()
 	 * @see #delimitedListToStringArray
 	 */
 	public static String[] tokenizeToStringArray(
@@ -999,7 +999,7 @@ public abstract class StringUtils {
 	 * Take a String which is a delimited list and convert it to a String array.
 	 * <p>A single delimiter can consists of more than one character: It will still
 	 * be considered as single delimiter string, rather than as bunch of potential
-	 * delimiter characters - in contrast to <code>tokenizeToStringArray</code>.
+	 * delimiter characters - in contrast to {@code tokenizeToStringArray}.
 	 * @param str the input String
 	 * @param delimiter the delimiter between elements (this is a single delimiter,
 	 * rather than a bunch individual delimiter characters)
@@ -1014,7 +1014,7 @@ public abstract class StringUtils {
 	 * Take a String which is a delimited list and convert it to a String array.
 	 * <p>A single delimiter can consists of more than one character: It will still
 	 * be considered as single delimiter string, rather than as bunch of potential
-	 * delimiter characters - in contrast to <code>tokenizeToStringArray</code>.
+	 * delimiter characters - in contrast to {@code tokenizeToStringArray}.
 	 * @param str the input String
 	 * @param delimiter the delimiter between elements (this is a single delimiter,
 	 * rather than a bunch individual delimiter characters)
@@ -1077,7 +1077,7 @@ public abstract class StringUtils {
 
 	/**
 	 * Convenience method to return a Collection as a delimited (e.g. CSV)
-	 * String. E.g. useful for <code>toString()</code> implementations.
+	 * String. E.g. useful for {@code toString()} implementations.
 	 * @param coll the Collection to display
 	 * @param delim the delimiter to use (probably a ",")
 	 * @param prefix the String to start each element with
@@ -1101,7 +1101,7 @@ public abstract class StringUtils {
 
 	/**
 	 * Convenience method to return a Collection as a delimited (e.g. CSV)
-	 * String. E.g. useful for <code>toString()</code> implementations.
+	 * String. E.g. useful for {@code toString()} implementations.
 	 * @param coll the Collection to display
 	 * @param delim the delimiter to use (probably a ",")
 	 * @return the delimited String
@@ -1112,7 +1112,7 @@ public abstract class StringUtils {
 
 	/**
 	 * Convenience method to return a Collection as a CSV String.
-	 * E.g. useful for <code>toString()</code> implementations.
+	 * E.g. useful for {@code toString()} implementations.
 	 * @param coll the Collection to display
 	 * @return the delimited String
 	 */
@@ -1122,7 +1122,7 @@ public abstract class StringUtils {
 
 	/**
 	 * Convenience method to return a String array as a delimited (e.g. CSV)
-	 * String. E.g. useful for <code>toString()</code> implementations.
+	 * String. E.g. useful for {@code toString()} implementations.
 	 * @param arr the array to display
 	 * @param delim the delimiter to use (probably a ",")
 	 * @return the delimited String
@@ -1146,7 +1146,7 @@ public abstract class StringUtils {
 
 	/**
 	 * Convenience method to return a String array as a CSV String.
-	 * E.g. useful for <code>toString()</code> implementations.
+	 * E.g. useful for {@code toString()} implementations.
 	 * @param arr the array to display
 	 * @return the delimited String
 	 */
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 7506863875..da03d54dd2 100644
--- a/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java
@@ -21,8 +21,8 @@ import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver;
 /**
  * Helper class for resolving placeholders in texts. Usually applied to file paths.
  *
- * <p>A text may contain <code>${...}</code> placeholders, to be resolved as system properties: e.g.
- * <code>${user.dir}</code>.  Default values can be supplied using the ":" separator between key
+ * <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
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
index 3dafae0ec8..9b5417c38c 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
@@ -47,8 +47,8 @@ public final class BooleanComparator implements Comparator<Boolean>, Serializabl
 	 * Create a BooleanComparator that sorts boolean values based on
 	 * the provided flag.
 	 * <p>Alternatively, you can use the default shared instances:
-	 * <code>BooleanComparator.TRUE_LOW</code> and
-	 * <code>BooleanComparator.TRUE_HIGH</code>.
+	 * {@code BooleanComparator.TRUE_LOW} and
+	 * {@code BooleanComparator.TRUE_HIGH}.
 	 * @param trueLow whether to treat true as lower or higher than false
 	 * @see #TRUE_LOW
 	 * @see #TRUE_HIGH
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java
index eeb11e1c41..35f37a9ead 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java
@@ -51,16 +51,16 @@ public class NullSafeComparator<T> implements Comparator<T> {
 
 
 	/**
-	 * Create a NullSafeComparator that sorts <code>null</code> based on
+	 * Create a NullSafeComparator that sorts {@code null} based on
 	 * the provided flag, working on Comparables.
 	 * <p>When comparing two non-null objects, their Comparable implementation
 	 * will be used: this means that non-null elements (that this Comparator
 	 * will be applied to) need to implement Comparable.
 	 * <p>As a convenience, you can use the default shared instances:
-	 * <code>NullSafeComparator.NULLS_LOW</code> and
-	 * <code>NullSafeComparator.NULLS_HIGH</code>.
+	 * {@code NullSafeComparator.NULLS_LOW} and
+	 * {@code NullSafeComparator.NULLS_HIGH}.
 	 * @param nullsLow whether to treat nulls lower or higher than non-null objects
-	 * @see java.lang.Comparable
+	 * @see Comparable
 	 * @see #NULLS_LOW
 	 * @see #NULLS_HIGH
 	 */
@@ -71,7 +71,7 @@ public class NullSafeComparator<T> implements Comparator<T> {
 	}
 
 	/**
-	 * Create a NullSafeComparator that sorts <code>null</code> based on the
+	 * Create a NullSafeComparator that sorts {@code null} based on the
 	 * provided flag, decorating the given Comparator.
 	 * <p>When comparing two non-null objects, the specified Comparator will be used.
 	 * The given underlying Comparator must be able to handle the elements that this
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 880b933889..7bcb8576d8 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,7 +1,6 @@
-
 /**
  *
- * Useful generic <code>java.util.Comparator</code> implementations,
+ * Useful generic {@code java.util.Comparator} implementations,
  * such as an invertible comparator and a compound comparator.
  *
  */
diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java
index cc7017335a..a471b24d17 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java
@@ -24,8 +24,8 @@ import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
 /**
- * Abstract base class for SAX <code>ContentHandler</code> implementations that use StAX as a basis. All methods
- * delegate to internal template methods, capable of throwing a <code>XMLStreamException</code>. Additionally, an
+ * Abstract base class for SAX {@code ContentHandler} implementations that use StAX as a basis. All methods
+ * delegate to internal template methods, capable of throwing a {@code XMLStreamException}. Additionally, an
  * namespace context is used to keep track of declared namespaces.
  *
  * @author Arjen Poutsma
@@ -152,8 +152,8 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
 	}
 
 	/**
-	 * Convert a namespace URI and DOM or SAX qualified name to a <code>QName</code>. The qualified name can have the form
-	 * <code>prefix:localname</code> or <code>localName</code>.
+	 * Convert a namespace URI and DOM or SAX qualified name to a {@code QName}. The qualified name can have the form
+	 * {@code prefix:localname} or {@code localName}.
 	 *
 	 * @param namespaceUri  the namespace URI
 	 * @param qualifiedName the qualified name
diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
index 46bbe39b1a..241205c12a 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
@@ -32,7 +32,7 @@ import org.xml.sax.SAXParseException;
 import org.springframework.util.StringUtils;
 
 /**
- * Abstract base class for SAX <code>XMLReader</code> implementations that use StAX as a basis.
+ * Abstract base class for SAX {@code XMLReader} implementations that use StAX as a basis.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -97,24 +97,24 @@ abstract class AbstractStaxXMLReader extends AbstractXMLReader {
 	}
 
 	/**
-	 * Indicates whether the SAX feature <code>http://xml.org/sax/features/namespaces</code> is turned on.
+	 * Indicates whether the SAX feature {@code http://xml.org/sax/features/namespaces} is turned on.
 	 */
 	protected boolean hasNamespacesFeature() {
 		return this.namespacesFeature;
 	}
 
 	/**
-	 * Indicates whether the SAX feature <code>http://xml.org/sax/features/namespaces-prefixes</code> is turned on.
+	 * Indicates whether the SAX feature {@code http://xml.org/sax/features/namespaces-prefixes} is turned on.
 	 */
 	protected boolean hasNamespacePrefixesFeature() {
 		return this.namespacePrefixesFeature;
 	}
 
 	/**
-	 * Convert a <code>QName</code> to a qualified name, as used by DOM and SAX.
-	 * The returned string has a format of <code>prefix:localName</code> if the
-	 * prefix is set, or just <code>localName</code> if not.
-	 * @param qName the <code>QName</code>
+	 * Convert a {@code QName} to a qualified name, as used by DOM and SAX.
+	 * The returned string has a format of {@code prefix:localName} if the
+	 * prefix is set, or just {@code localName} if not.
+	 * @param qName the {@code QName}
 	 * @return the qualified name
 	 */
 	protected String toQualifiedName(QName qName) {
@@ -130,9 +130,9 @@ abstract class AbstractStaxXMLReader extends AbstractXMLReader {
 
 	/**
 	 * Parse the StAX XML reader passed at construction-time.
-	 * <p><b>NOTE:</b>: The given <code>InputSource</code> is not read, but ignored.
+	 * <p><b>NOTE:</b>: The given {@code InputSource} is not read, but ignored.
 	 * @param ignored is ignored
-	 * @throws SAXException a SAX exception, possibly wrapping a <code>XMLStreamException</code>
+	 * @throws SAXException a SAX exception, possibly wrapping a {@code XMLStreamException}
 	 */
 	public final void parse(InputSource ignored) throws SAXException {
 		parse();
@@ -142,7 +142,7 @@ abstract class AbstractStaxXMLReader extends AbstractXMLReader {
 	 * Parse the StAX XML reader passed at construction-time.
 	 * <p><b>NOTE:</b>: The given system identifier is not read, but ignored.
 	 * @param ignored is ignored
-	 * @throws SAXException A SAX exception, possibly wrapping a <code>XMLStreamException</code>
+	 * @throws SAXException A SAX exception, possibly wrapping a {@code XMLStreamException}
 	 */
 	public final void parse(String ignored) throws SAXException {
 		parse();
@@ -205,7 +205,7 @@ abstract class AbstractStaxXMLReader extends AbstractXMLReader {
 	}
 
 	/**
-	 * Implementation of the <code>Locator</code> interface that is based on a StAX <code>Location</code>.
+	 * Implementation of the {@code Locator} interface that is based on a StAX {@code Location}.
 	 * @see Locator
 	 * @see Location
 	 */
diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java
index e13ed7b500..e4e8a68da7 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java
@@ -26,7 +26,7 @@ import org.xml.sax.XMLReader;
 import org.xml.sax.ext.LexicalHandler;
 
 /**
- * Abstract base class for SAX <code>XMLReader</code> implementations. Contains properties as defined in {@link
+ * Abstract base class for SAX {@code XMLReader} implementations. Contains properties as defined in {@link
  * XMLReader}, and does not recognize any features.
  *
  * @author Arjen Poutsma
@@ -85,7 +85,7 @@ abstract class AbstractXMLReader implements XMLReader {
 	}
 
 	/**
-	 * Throws a <code>SAXNotRecognizedException</code> exception.
+	 * Throws a {@code SAXNotRecognizedException} exception.
 	 *
 	 * @throws org.xml.sax.SAXNotRecognizedException
 	 *          always
@@ -95,7 +95,7 @@ abstract class AbstractXMLReader implements XMLReader {
 	}
 
 	/**
-	 * Throws a <code>SAXNotRecognizedException</code> exception.
+	 * Throws a {@code SAXNotRecognizedException} exception.
 	 *
 	 * @throws SAXNotRecognizedException always
 	 */
@@ -104,8 +104,8 @@ abstract class AbstractXMLReader implements XMLReader {
 	}
 
 	/**
-	 * Throws a <code>SAXNotRecognizedException</code> exception when the given property does not signify a lexical
-	 * handler. The property name for a lexical handler is <code>http://xml.org/sax/properties/lexical-handler</code>.
+	 * Throws a {@code SAXNotRecognizedException} exception when the given property does not signify a lexical
+	 * handler. The property name for a lexical handler is {@code http://xml.org/sax/properties/lexical-handler}.
 	 */
 	public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
 		if ("http://xml.org/sax/properties/lexical-handler".equals(name)) {
@@ -117,8 +117,8 @@ abstract class AbstractXMLReader implements XMLReader {
 	}
 
 	/**
-	 * Throws a <code>SAXNotRecognizedException</code> exception when the given property does not signify a lexical
-	 * handler. The property name for a lexical handler is <code>http://xml.org/sax/properties/lexical-handler</code>.
+	 * Throws a {@code SAXNotRecognizedException} exception when the given property does not signify a lexical
+	 * handler. The property name for a lexical handler is {@code http://xml.org/sax/properties/lexical-handler}.
 	 */
 	public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException {
 		if ("http://xml.org/sax/properties/lexical-handler".equals(name)) {
diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
index 0ec61f2e5b..c9ff1853e1 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
@@ -24,7 +24,7 @@ import javax.xml.stream.XMLStreamReader;
 import org.springframework.util.Assert;
 
 /**
- * Abstract base class for <code>XMLStreamReader</code>s.
+ * Abstract base class for {@code XMLStreamReader}s.
  *
  * @author Arjen Poutsma
  * @since 3.0
diff --git a/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java
index d0d15cf9bc..1e3697175d 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java
@@ -32,7 +32,7 @@ import org.xml.sax.SAXException;
 import org.springframework.util.Assert;
 
 /**
- * SAX <code>ContentHandler</code> that transforms callback calls to DOM <code>Node</code>s.
+ * SAX {@code ContentHandler} that transforms callback calls to DOM {@code Node}s.
  *
  * @author Arjen Poutsma
  * @see org.w3c.dom.Node
@@ -47,7 +47,7 @@ class DomContentHandler implements ContentHandler {
 	private final Node node;
 
 	/**
-	 * Creates a new instance of the <code>DomContentHandler</code> with the given node.
+	 * Creates a new instance of the {@code DomContentHandler} with the given node.
 	 *
 	 * @param node the node to publish events to
 	 */
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 d34943281b..7614beacd3 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
@@ -48,11 +48,11 @@ 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</code> method).
+	 * {@code getElementsByTagName} method).
 	 *
-	 * @param ele		   the DOM element to analyze
+	 * @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</code> instances
+	 * @return a List of child {@code org.w3c.dom.Element} instances
 	 * @see org.w3c.dom.Element
 	 * @see org.w3c.dom.Element#getElementsByTagName
 	 */
@@ -74,11 +74,11 @@ public abstract class DomUtils {
 	/**
 	 * 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</code> method).
+	 * {@code getElementsByTagName} method).
 	 *
-	 * @param ele		  the DOM element to analyze
+	 * @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</code> instances
+	 * @return a List of child {@code org.w3c.dom.Element} instances
 	 * @see org.w3c.dom.Element
 	 * @see org.w3c.dom.Element#getElementsByTagName
 	 */
@@ -89,9 +89,9 @@ public abstract class DomUtils {
 	/**
 	 * 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</code> instance, or <code>null</code> if none found
+	 * @return the {@code org.w3c.dom.Element} instance, or {@code null} if none found
 	 */
 	public static Element getChildElementByTagName(Element ele, String childEleName) {
 		Assert.notNull(ele, "Element must not be null");
@@ -109,9 +109,9 @@ public abstract class DomUtils {
 	/**
 	 * 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</code> if no child element found
+	 * @return the extracted text value, or {@code null} if no child element found
 	 */
 	public static String getChildElementValueByTagName(Element ele, String childEleName) {
 		Element child = getChildElementByTagName(ele, childEleName);
@@ -121,8 +121,8 @@ public abstract class DomUtils {
 	/**
 	 * Retrieve 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</code> instances
+	 * @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) {
 		Assert.notNull(ele, "Element must not be null");
@@ -159,8 +159,8 @@ public abstract class DomUtils {
 	}
 
 	/**
-	 * Namespace-aware equals comparison. Returns <code>true</code> if either {@link Node#getLocalName} or {@link
-	 * Node#getNodeName} equals <code>desiredName</code>, otherwise returns <code>false</code>.
+	 * 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");
@@ -169,7 +169,7 @@ public abstract class DomUtils {
 	}
 
 	/**
-	 * Returns a SAX <code>ContentHandler</code> that transforms callback calls to DOM <code>Node</code>s.
+	 * 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
diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
index 95ddc18b61..7eb9b0aedf 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
@@ -28,9 +28,9 @@ import javax.xml.namespace.NamespaceContext;
 import org.springframework.util.Assert;
 
 /**
- * Simple <code>javax.xml.namespace.NamespaceContext</code> implementation. Follows the standard
- * <code>NamespaceContext</code> contract, and is loadable via a <code>java.util.Map</code> or
- * <code>java.util.Properties</code> object
+ * Simple {@code javax.xml.namespace.NamespaceContext} implementation. Follows the standard
+ * {@code NamespaceContext} contract, and is loadable via a {@code java.util.Map} or
+ * {@code java.util.Properties} object
  *
  * @author Arjen Poutsma
  * @since 3.0
diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java
index 5867384c68..c5d587f7f9 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java
@@ -22,7 +22,7 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
 /**
- * Simple <code>org.xml.sax.ErrorHandler</code> implementation:
+ * Simple {@code org.xml.sax.ErrorHandler} implementation:
  * logs warnings using the given Commons Logging logger instance,
  * and rethrows errors to discontinue the XML transformation.
  *
diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java
index e4fed7285e..8b0dc5eea2 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java
@@ -22,7 +22,7 @@ import javax.xml.transform.TransformerException;
 import org.apache.commons.logging.Log;
 
 /**
- * Simple <code>javax.xml.transform.ErrorListener</code> implementation:
+ * Simple {@code javax.xml.transform.ErrorListener} implementation:
  * logs warnings using the given Commons Logging logger instance,
  * and rethrows errors to discontinue the XML transformation.
  *
diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java
index 73769f394d..686ff1a634 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java
@@ -35,8 +35,8 @@ import org.xml.sax.Locator;
 import org.springframework.util.StringUtils;
 
 /**
- * SAX <code>ContentHandler</code> that transforms callback calls to <code>XMLEvent</code>s
- * and writes them to a <code>XMLEventConsumer</code>.
+ * SAX {@code ContentHandler} that transforms callback calls to {@code XMLEvent}s
+ * and writes them to a {@code XMLEventConsumer}.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -51,8 +51,8 @@ class StaxEventContentHandler extends AbstractStaxContentHandler {
 
 
 	/**
-	 * Construct a new instance of the <code>StaxEventContentHandler</code> that writes to the given
-	 * <code>XMLEventConsumer</code>. A default <code>XMLEventFactory</code> will be created.
+	 * Construct a new instance of the {@code StaxEventContentHandler} that writes to the given
+	 * {@code XMLEventConsumer}. A default {@code XMLEventFactory} will be created.
 	 * @param consumer the consumer to write events to
 	 */
 	StaxEventContentHandler(XMLEventConsumer consumer) {
@@ -61,8 +61,8 @@ class StaxEventContentHandler extends AbstractStaxContentHandler {
 	}
 
 	/**
-	 * Construct a new instance of the <code>StaxEventContentHandler</code> that uses the given
-	 * event factory to create events and writes to the given <code>XMLEventConsumer</code>.
+	 * Construct a new instance of the {@code StaxEventContentHandler} that uses the given
+	 * event factory to create events and writes to the given {@code XMLEventConsumer}.
 	 * @param consumer the consumer to write events to
 	 * @param factory  the factory used to create events
 	 */
@@ -123,7 +123,7 @@ class StaxEventContentHandler extends AbstractStaxContentHandler {
 	}
 
 	/**
-	 * Create and return a list of <code>NameSpace</code> objects from the <code>NamespaceContext</code>.
+	 * Create and return a list of {@code NameSpace} objects from the {@code NamespaceContext}.
 	 */
 	private List<Namespace> createNamespaces(SimpleNamespaceContext namespaceContext) {
 		if (namespaceContext == null) {
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 41fe0f116f..04b5eedef2 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
@@ -47,8 +47,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * SAX <code>XMLReader</code> that reads from a StAX <code>XMLEventReader</code>. Consumes <code>XMLEvents</code> from
- * an <code>XMLEventReader</code>, and calls the corresponding methods on the SAX callback interfaces.
+ * SAX {@code XMLReader} that reads from a StAX {@code XMLEventReader}. Consumes {@code XMLEvents} from
+ * an {@code XMLEventReader}, and calls the corresponding methods on the SAX callback interfaces.
  *
  * @author Arjen Poutsma
  * @see XMLEventReader
@@ -71,11 +71,11 @@ class StaxEventXMLReader extends AbstractStaxXMLReader {
 	private String encoding;
 
 	/**
-	 * Constructs a new instance of the <code>StaxEventXmlReader</code> that reads from the given
-	 * <code>XMLEventReader</code>. The supplied event reader must be in <code>XMLStreamConstants.START_DOCUMENT</code> or
-	 * <code>XMLStreamConstants.START_ELEMENT</code> state.
+	 * 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</code> to read from
+	 * @param reader the {@code XMLEventReader} to read from
 	 * @throws IllegalStateException if the reader is not at the start of a document or element
 	 */
 	StaxEventXMLReader(XMLEventReader reader) {
diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxResult.java b/spring-core/src/main/java/org/springframework/util/xml/StaxResult.java
index 47aef074b9..d0149df845 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/StaxResult.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/StaxResult.java
@@ -24,18 +24,18 @@ import javax.xml.transform.sax.SAXResult;
 import org.xml.sax.ContentHandler;
 
 /**
- * Implementation of the <code>Result</code> tagging interface for StAX writers. Can be constructed with a
- * <code>XMLEventConsumer</code> or a <code>XMLStreamWriter</code>.
+ * Implementation of the {@code Result} tagging interface for StAX writers. Can be constructed with a
+ * {@code XMLEventConsumer} or a {@code XMLStreamWriter}.
  *
- * <p>This class is necessary because there is no implementation of <code>Source</code> for StaxReaders in JAXP 1.3.
- * There is a <code>StAXResult</code> in JAXP 1.4 (JDK 1.6), but this class is kept around for back-ward compatibility
+ * <p>This class is necessary because there is no implementation of {@code Source} for StaxReaders in JAXP 1.3.
+ * There is a {@code StAXResult} in JAXP 1.4 (JDK 1.6), but this class is kept around for back-ward compatibility
  * reasons.
  *
- * <p>Even though <code>StaxResult</code> extends from <code>SAXResult</code>, calling the methods of
- * <code>SAXResult</code> is <strong>not supported</strong>. In general, the only supported operation on this class is
- * to use the <code>ContentHandler</code> obtained via {@link #getHandler()} to parse an input source using an
- * <code>XMLReader</code>. Calling {@link #setHandler(org.xml.sax.ContentHandler)} will result in
- * <code>UnsupportedOperationException</code>s.
+ * <p>Even though {@code StaxResult} extends from {@code SAXResult}, calling the methods of
+ * {@code SAXResult} is <strong>not supported</strong>. In general, the only supported operation on this class is
+ * to use the {@code ContentHandler} obtained via {@link #getHandler()} to parse an input source using an
+ * {@code XMLReader}. Calling {@link #setHandler(org.xml.sax.ContentHandler)} will result in
+ * {@code UnsupportedOperationException}s.
  *
  * @author Arjen Poutsma
  * @see XMLEventWriter
@@ -50,9 +50,9 @@ class StaxResult extends SAXResult {
 	private XMLStreamWriter streamWriter;
 
 	/**
-	 * Constructs a new instance of the <code>StaxResult</code> with the specified <code>XMLStreamWriter</code>.
+	 * Constructs a new instance of the {@code StaxResult} with the specified {@code XMLStreamWriter}.
 	 *
-	 * @param streamWriter the <code>XMLStreamWriter</code> to write to
+	 * @param streamWriter the {@code XMLStreamWriter} to write to
 	 */
 	StaxResult(XMLStreamWriter streamWriter) {
 		super.setHandler(new StaxStreamContentHandler(streamWriter));
@@ -60,9 +60,9 @@ class StaxResult extends SAXResult {
 	}
 
 	/**
-	 * Constructs a new instance of the <code>StaxResult</code> with the specified <code>XMLEventWriter</code>.
+	 * Constructs a new instance of the {@code StaxResult} with the specified {@code XMLEventWriter}.
 	 *
-	 * @param eventWriter the <code>XMLEventWriter</code> to write to
+	 * @param eventWriter the {@code XMLEventWriter} to write to
 	 */
 	StaxResult(XMLEventWriter eventWriter) {
 		super.setHandler(new StaxEventContentHandler(eventWriter));
@@ -70,11 +70,11 @@ class StaxResult extends SAXResult {
 	}
 
 	/**
-	 * Constructs a new instance of the <code>StaxResult</code> with the specified <code>XMLEventWriter</code> and
-	 * <code>XMLEventFactory</code>.
+	 * Constructs a new instance of the {@code StaxResult} with the specified {@code XMLEventWriter} and
+	 * {@code XMLEventFactory}.
 	 *
-	 * @param eventWriter  the <code>XMLEventWriter</code> to write to
-	 * @param eventFactory the <code>XMLEventFactory</code> to use for creating events
+	 * @param eventWriter  the {@code XMLEventWriter} to write to
+	 * @param eventFactory the {@code XMLEventFactory} to use for creating events
 	 */
 	StaxResult(XMLEventWriter eventWriter, XMLEventFactory eventFactory) {
 		super.setHandler(new StaxEventContentHandler(eventWriter, eventFactory));
@@ -82,8 +82,8 @@ class StaxResult extends SAXResult {
 	}
 
 	/**
-	 * Returns the <code>XMLEventWriter</code> used by this <code>StaxResult</code>. If this <code>StaxResult</code> was
-	 * created with an <code>XMLStreamWriter</code>, the result will be <code>null</code>.
+	 * Returns the {@code XMLEventWriter} used by this {@code StaxResult}. If this {@code StaxResult} was
+	 * created with an {@code XMLStreamWriter}, the result will be {@code null}.
 	 *
 	 * @return the StAX event writer used by this result
 	 * @see #StaxResult(javax.xml.stream.XMLEventWriter)
@@ -93,8 +93,8 @@ class StaxResult extends SAXResult {
 	}
 
 	/**
-	 * Returns the <code>XMLStreamWriter</code> used by this <code>StaxResult</code>. If this <code>StaxResult</code> was
-	 * created with an <code>XMLEventConsumer</code>, the result will be <code>null</code>.
+	 * Returns the {@code XMLStreamWriter} used by this {@code StaxResult}. If this {@code StaxResult} was
+	 * created with an {@code XMLEventConsumer}, the result will be {@code null}.
 	 *
 	 * @return the StAX stream writer used by this result
 	 * @see #StaxResult(javax.xml.stream.XMLStreamWriter)
@@ -104,7 +104,7 @@ class StaxResult extends SAXResult {
 	}
 
 	/**
-	 * Throws a <code>UnsupportedOperationException</code>.
+	 * Throws a {@code UnsupportedOperationException}.
 	 *
 	 * @throws UnsupportedOperationException always
 	 */
diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxSource.java b/spring-core/src/main/java/org/springframework/util/xml/StaxSource.java
index 9a0b8d11c2..0fcedc8e41 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/StaxSource.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/StaxSource.java
@@ -24,18 +24,18 @@ import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 
 /**
- * Implementation of the <code>Source</code> tagging interface for StAX readers. Can be constructed with a
- * <code>XMLEventReader</code> or a <code>XMLStreamReader</code>.
+ * Implementation of the {@code Source} tagging interface for StAX readers. Can be constructed with a
+ * {@code XMLEventReader} or a {@code XMLStreamReader}.
  *
- * <p>This class is necessary because there is no implementation of <code>Source</code> for StAX Readers in JAXP 1.3.
- * There is a <code>StAXSource</code> in JAXP 1.4 (JDK 1.6), but this class is kept around for back-ward compatibility
+ * <p>This class is necessary because there is no implementation of {@code Source} for StAX Readers in JAXP 1.3.
+ * There is a {@code StAXSource} in JAXP 1.4 (JDK 1.6), but this class is kept around for back-ward compatibility
  * reasons.
  *
- * <p>Even though <code>StaxSource</code> extends from <code>SAXSource</code>, calling the methods of
- * <code>SAXSource</code> is <strong>not supported</strong>. In general, the only supported operation on this class is
- * to use the <code>XMLReader</code> obtained via {@link #getXMLReader()} to parse the input source obtained via {@link
+ * <p>Even though {@code StaxSource} extends from {@code SAXSource}, calling the methods of
+ * {@code SAXSource} is <strong>not supported</strong>. In general, the only supported operation on this class is
+ * to use the {@code XMLReader} obtained via {@link #getXMLReader()} to parse the input source obtained via {@link
  * #getInputSource()}. Calling {@link #setXMLReader(XMLReader)} or {@link #setInputSource(InputSource)} will result in
- * <code>UnsupportedOperationException</code>s.
+ * {@code UnsupportedOperationException}s.
  *
  * @author Arjen Poutsma
  * @see XMLEventReader
@@ -50,11 +50,11 @@ class StaxSource extends SAXSource {
 	private XMLStreamReader streamReader;
 
 	/**
-	 * Constructs a new instance of the <code>StaxSource</code> with the specified <code>XMLStreamReader</code>. The
-	 * supplied stream reader must be in <code>XMLStreamConstants.START_DOCUMENT</code> or
-	 * <code>XMLStreamConstants.START_ELEMENT</code> state.
+	 * Constructs a new instance of the {@code StaxSource} with the specified {@code XMLStreamReader}. The
+	 * supplied stream reader must be in {@code XMLStreamConstants.START_DOCUMENT} or
+	 * {@code XMLStreamConstants.START_ELEMENT} state.
 	 *
-	 * @param streamReader the <code>XMLStreamReader</code> to read from
+	 * @param streamReader the {@code XMLStreamReader} to read from
 	 * @throws IllegalStateException if the reader is not at the start of a document or element
 	 */
 	StaxSource(XMLStreamReader streamReader) {
@@ -63,11 +63,11 @@ class StaxSource extends SAXSource {
 	}
 
 	/**
-	 * Constructs a new instance of the <code>StaxSource</code> with the specified <code>XMLEventReader</code>. The
-	 * supplied event reader must be in <code>XMLStreamConstants.START_DOCUMENT</code> or
-	 * <code>XMLStreamConstants.START_ELEMENT</code> state.
+	 * Constructs a new instance of the {@code StaxSource} with the specified {@code XMLEventReader}. The
+	 * supplied event reader must be in {@code XMLStreamConstants.START_DOCUMENT} or
+	 * {@code XMLStreamConstants.START_ELEMENT} state.
 	 *
-	 * @param eventReader the <code>XMLEventReader</code> to read from
+	 * @param eventReader the {@code XMLEventReader} to read from
 	 * @throws IllegalStateException if the reader is not at the start of a document or element
 	 */
 	StaxSource(XMLEventReader eventReader) {
@@ -76,8 +76,8 @@ class StaxSource extends SAXSource {
 	}
 
 	/**
-	 * Returns the <code>XMLEventReader</code> used by this <code>StaxSource</code>. If this <code>StaxSource</code> was
-	 * created with an <code>XMLStreamReader</code>, the result will be <code>null</code>.
+	 * Returns the {@code XMLEventReader} used by this {@code StaxSource}. If this {@code StaxSource} was
+	 * created with an {@code XMLStreamReader}, the result will be {@code null}.
 	 *
 	 * @return the StAX event reader used by this source
 	 * @see StaxSource#StaxSource(javax.xml.stream.XMLEventReader)
@@ -87,8 +87,8 @@ class StaxSource extends SAXSource {
 	}
 
 	/**
-	 * Returns the <code>XMLStreamReader</code> used by this <code>StaxSource</code>. If this <code>StaxSource</code> was
-	 * created with an <code>XMLEventReader</code>, the result will be <code>null</code>.
+	 * Returns the {@code XMLStreamReader} used by this {@code StaxSource}. If this {@code StaxSource} was
+	 * created with an {@code XMLEventReader}, the result will be {@code null}.
 	 *
 	 * @return the StAX event reader used by this source
 	 * @see StaxSource#StaxSource(javax.xml.stream.XMLEventReader)
@@ -98,7 +98,7 @@ class StaxSource extends SAXSource {
 	}
 
 	/**
-	 * Throws a <code>UnsupportedOperationException</code>.
+	 * Throws a {@code UnsupportedOperationException}.
 	 *
 	 * @throws UnsupportedOperationException always
 	 */
@@ -108,7 +108,7 @@ class StaxSource extends SAXSource {
 	}
 
 	/**
-	 * Throws a <code>UnsupportedOperationException</code>.
+	 * Throws a {@code UnsupportedOperationException}.
 	 *
 	 * @throws UnsupportedOperationException always
 	 */
diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
index 0e2c7859ec..2ae9bcc559 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * SAX <code>ContentHandler</code> that writes to a <code>XMLStreamWriter</code>.
+ * SAX {@code ContentHandler} that writes to a {@code XMLStreamWriter}.
  *
  * @author Arjen Poutsma
  * @see XMLStreamWriter
@@ -39,8 +39,8 @@ class StaxStreamContentHandler extends AbstractStaxContentHandler {
 	private final XMLStreamWriter streamWriter;
 
 	/**
-	 * Constructs a new instance of the <code>StaxStreamContentHandler</code> that writes to the given
-	 * <code>XMLStreamWriter</code>.
+	 * Constructs a new instance of the {@code StaxStreamContentHandler} that writes to the given
+	 * {@code XMLStreamWriter}.
 	 *
 	 * @param streamWriter the stream writer to write to
 	 */
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 7099d32f23..a7dc635476 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
@@ -31,8 +31,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * SAX <code>XMLReader</code> that reads from a StAX <code>XMLStreamReader</code>.  Reads from an
- * <code>XMLStreamReader</code>, and calls the corresponding methods on the SAX callback interfaces.
+ * 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
  * @see XMLStreamReader
@@ -53,11 +53,11 @@ class StaxStreamXMLReader extends AbstractStaxXMLReader {
 	private String encoding;
 
 	/**
-	 * Constructs a new instance of the <code>StaxStreamXmlReader</code> that reads from the given
-	 * <code>XMLStreamReader</code>.  The supplied stream reader must be in <code>XMLStreamConstants.START_DOCUMENT</code>
-	 * or <code>XMLStreamConstants.START_ELEMENT</code> state.
+	 * 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}
+	 * or {@code XMLStreamConstants.START_ELEMENT} state.
 	 *
-	 * @param reader the <code>XMLEventReader</code> to read from
+	 * @param reader the {@code XMLEventReader} to read from
 	 * @throws IllegalStateException if the reader is not at the start of a document or element
 	 */
 	StaxStreamXMLReader(XMLStreamReader reader) {
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 c617dae365..576f39ebcf 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
@@ -267,7 +267,7 @@ public abstract class StaxUtils {
 	/**
 	 * Create a SAX {@link ContentHandler} that writes to the given StAX {@link XMLStreamWriter}.
 	 * @param streamWriter the StAX stream writer
-	 * @return a content handler writing to the <code>streamWriter</code>
+	 * @return a content handler writing to the {@code streamWriter}
 	 */
 	public static ContentHandler createContentHandler(XMLStreamWriter streamWriter) {
 		return new StaxStreamContentHandler(streamWriter);
@@ -276,7 +276,7 @@ public abstract class StaxUtils {
 	/**
 	 * Create a SAX {@link ContentHandler} that writes events to the given StAX {@link XMLEventWriter}.
 	 * @param eventWriter the StAX event writer
-	 * @return a content handler writing to the <code>eventWriter</code>
+	 * @return a content handler writing to the {@code eventWriter}
 	 */
 	public static ContentHandler createContentHandler(XMLEventWriter eventWriter) {
 		return new StaxEventContentHandler(eventWriter);
@@ -285,7 +285,7 @@ public abstract class StaxUtils {
 	/**
 	 * Create a SAX {@link XMLReader} that reads from the given StAX {@link XMLStreamReader}.
 	 * @param streamReader the StAX stream reader
-	 * @return a XMLReader reading from the <code>streamWriter</code>
+	 * @return a XMLReader reading from the {@code streamWriter}
 	 */
 	public static XMLReader createXMLReader(XMLStreamReader streamReader) {
 		return new StaxStreamXMLReader(streamReader);
@@ -294,7 +294,7 @@ public abstract class StaxUtils {
 	/**
 	 * Create a SAX {@link XMLReader} that reads from the given StAX {@link XMLEventReader}.
 	 * @param eventReader the StAX event reader
-	 * @return a XMLReader reading from the <code>eventWriter</code>
+	 * @return a XMLReader reading from the {@code eventWriter}
 	 */
 	public static XMLReader createXMLReader(XMLEventReader eventReader) {
 		return new StaxEventXMLReader(eventReader);
@@ -302,7 +302,7 @@ public abstract class StaxUtils {
 
 	/**
 	 * Return a {@link XMLStreamReader} that reads from a {@link XMLEventReader}. Useful, because the StAX
-	 * <code>XMLInputFactory</code> allows one to create a event reader from a stream reader, but not vice-versa.
+	 * {@code XMLInputFactory} allows one to create a event reader from a stream reader, but not vice-versa.
 	 * @return a stream reader that reads from an event reader
 	 */
 	public static XMLStreamReader createEventStreamReader(XMLEventReader eventReader) throws XMLStreamException {
diff --git a/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java b/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
index 7c615ade5d..d3a202b24c 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
@@ -23,7 +23,7 @@ import org.springframework.util.Assert;
 
 /**
  * Contains common behavior relating to {@link javax.xml.transform.Transformer Transformers}, and the
- * <code>javax.xml.transform</code> package in general.
+ * {@code javax.xml.transform} package in general.
  *
  * @author Rick Evans
  * @author Juergen Hoeller
@@ -39,7 +39,7 @@ public abstract class TransformerUtils {
 
 	/**
 	 * Enable indenting for the supplied {@link javax.xml.transform.Transformer}. <p>If the underlying XSLT engine is
-	 * Xalan, then the special output key <code>indent-amount</code> will be also be set to a value of {@link
+	 * Xalan, then the special output key {@code indent-amount} will be also be set to a value of {@link
 	 * #DEFAULT_INDENT_AMOUNT} characters.
 	 *
 	 * @param transformer the target transformer
@@ -52,7 +52,7 @@ public abstract class TransformerUtils {
 
 	/**
 	 * Enable indenting for the supplied {@link javax.xml.transform.Transformer}. <p>If the underlying XSLT engine is
-	 * Xalan, then the special output key <code>indent-amount</code> will be also be set to a value of {@link
+	 * Xalan, then the special output key {@code indent-amount} will be also be set to a value of {@link
 	 * #DEFAULT_INDENT_AMOUNT} characters.
 	 *
 	 * @param transformer  the target transformer
diff --git a/spring-core/src/test/java/org/springframework/beans/factory/annotation/TestAutowired.java b/spring-core/src/test/java/org/springframework/beans/factory/annotation/TestAutowired.java
index 60e4561b52..bd3e393f6b 100644
--- a/spring-core/src/test/java/org/springframework/beans/factory/annotation/TestAutowired.java
+++ b/spring-core/src/test/java/org/springframework/beans/factory/annotation/TestAutowired.java
@@ -27,7 +27,7 @@ public @interface TestAutowired {
 
 	/**
 	 * Declares whether the annotated dependency is required.
-	 * <p>Defaults to <code>true</code>.
+	 * <p>Defaults to {@code true}.
 	 */
 	boolean required() default true;
 
diff --git a/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
index 694335eeb4..3a6dfe84e5 100644
--- a/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
@@ -31,7 +31,7 @@ import org.springframework.core.io.Resource;
 
 /**
  * If this test case fails, uncomment diagnostics in
- * <code>assertProtocolAndFilenames</code> method.
+ * {@code assertProtocolAndFilenames} method.
  *
  * @author Oliver Hutchison
  * @author Juergen Hoeller
diff --git a/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java
index 9baaf384a0..923c9fe5ac 100644
--- a/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java
@@ -58,7 +58,7 @@ public class ResourceUtilsTests extends TestCase {
 
 	/**
 	 * Dummy URLStreamHandler that's just specified to suppress the standard
-	 * <code>java.net.URL</code> URLStreamHandler lookup, to be able to
+	 * {@code java.net.URL} URLStreamHandler lookup, to be able to
 	 * use the standard URL class for parsing "rmi:..." URLs.
 	 */
 	private static class DummyURLStreamHandler extends URLStreamHandler {
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 83f8221a04..c4fe7632b5 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
@@ -144,7 +144,7 @@ public abstract class AbstractStaxXMLReaderTestCase {
 
 	protected abstract AbstractStaxXMLReader createStaxXmlReader(InputStream inputStream) throws XMLStreamException;
 
-	/** Easymock <code>ArgumentMatcher</code> implementation that matches SAX arguments. */
+	/** Easymock {@code AbstractMatcher} implementation that matches SAX arguments. */
 	protected static class SaxArgumentMatcher extends AbstractMatcher {
 
 		@Override
diff --git a/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java b/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
index 2b5e33d594..041e93a294 100644
--- a/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
+++ b/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
@@ -18,7 +18,7 @@ package org.springframework.expression;
 
 /**
  * A bean resolver can be registered with the evaluation context
- * and will kick in for <code>@myBeanName</code> still expressions.
+ * and will kick in for {@code @myBeanName} still expressions.
  *
  * @author Andy Clement
  * @since 3.0.3
diff --git a/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java b/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java
index 57fb661711..7338413552 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java
@@ -32,7 +32,7 @@ public interface ConstructorResolver {
 	/**
 	 * Within the supplied context determine a suitable constructor on the supplied type that can handle the
 	 * specified arguments. Return a ConstructorExecutor that can be used to invoke that constructor
-	 * (or <code>null</code> if no constructor could be found).
+	 * (or {@code null} if no constructor could be found).
 	 * @param context the current evaluation context
 	 * @param typeName the type upon which to look for the constructor
 	 * @param argumentTypes the arguments that the constructor must be able to handle
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 013bedc6a3..bb92e94fe6 100644
--- a/spring-expression/src/main/java/org/springframework/expression/MethodResolver.java
+++ b/spring-expression/src/main/java/org/springframework/expression/MethodResolver.java
@@ -32,7 +32,7 @@ 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</code> if no method could be found).
+	 * (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/TypedValue.java b/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
index c9db4a8f04..7a4fcef207 100644
--- a/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
+++ b/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
@@ -21,7 +21,7 @@ import org.springframework.core.convert.TypeDescriptor;
 /**
  * Encapsulates an object and a type descriptor that describes it.
  * The type descriptor can hold generic information that would not be
- * accessible through a simple <code>getClass()</code> call on the object.
+ * accessible through a simple {@code getClass()} call on the object.
  *
  * @author Andy Clement
  * @author Juergen Hoeller
diff --git a/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java b/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
index 1a3ff0b672..478841019e 100644
--- a/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
+++ b/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
@@ -30,7 +30,7 @@ import org.springframework.expression.Expression;
  *
  * which will be represented as a CompositeStringExpression of two parts. The first part being a
  * LiteralExpression representing 'Hello ' and the second part being a real expression that will
- * call <code>getName()</code> when invoked.
+ * call {@code getName()} when invoked.
  *
  * @author Andy Clement
  * @author Juergen Hoeller
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java
index e79372898b..86c673429d 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java
@@ -25,7 +25,7 @@ import org.springframework.expression.spel.support.BooleanTypedValue;
 
 /**
  * The operator 'instanceof' checks if an object is of the class specified in the right hand operand,
- * in the same way that <code>instanceof</code> does in Java.
+ * in the same way that {@code instanceof} does in Java.
  *
  * @author Andy Clement
  * @since 3.0
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 e75390d3c1..8468afc531 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
@@ -29,9 +29,9 @@ import org.springframework.instrument.classloading.WeavingTransformer;
  * to loaded classes without the need to use a VM-wide agent.
  *
  * <p>To be registered using a
- * <code><a href="http://tomcat.apache.org/tomcat-5.5-doc/config/loader.html">Loader</a></code> tag
- * in Tomcat's <code><a href="http://tomcat.apache.org/tomcat-5.5-doc/config/context.html">Context</a></code>
- * definition in the <code>server.xml</code> file, with the Spring-provided
+ * {@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.
  * The required configuration tag looks as follows:
  *
@@ -39,8 +39,8 @@ import org.springframework.instrument.classloading.WeavingTransformer;
  *
  * <p>Typically used in combination with a
  * {@link org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver}
- * defined in the Spring application context. The <code>addTransformer</code> and
- * <code>getThrowawayClassLoader</code> methods mirror the corresponding methods
+ * defined in the Spring application context. The {@code addTransformer} and
+ * {@code getThrowawayClassLoader} methods mirror the corresponding methods
  * in the LoadTimeWeaver interface, as expected by ReflectiveLoadTimeWeaver.
  *
  * <p>See the PetClinic sample application for a full example of this
@@ -63,7 +63,7 @@ public class TomcatInstrumentableClassLoader extends WebappClassLoader {
 
 
 	/**
-	 * Create a new <code>TomcatInstrumentableClassLoader</code> using the
+	 * Create a new {@code TomcatInstrumentableClassLoader} using the
 	 * current context class loader.
 	 * @see #TomcatInstrumentableClassLoader(ClassLoader)
 	 */
@@ -73,7 +73,7 @@ public class TomcatInstrumentableClassLoader extends WebappClassLoader {
 	}
 
 	/**
-	 * Create a new <code>TomcatInstrumentableClassLoader</code> with the
+	 * Create a new {@code TomcatInstrumentableClassLoader} with the
 	 * supplied class loader as parent.
 	 * @param parent the parent {@link ClassLoader} to be used
 	 */
@@ -84,7 +84,7 @@ public class TomcatInstrumentableClassLoader extends WebappClassLoader {
 
 
 	/**
-	 * Delegate for LoadTimeWeaver's <code>addTransformer</code> method.
+	 * Delegate for LoadTimeWeaver's {@code addTransformer} method.
 	 * Typically called through ReflectiveLoadTimeWeaver.
 	 * @see org.springframework.instrument.classloading.LoadTimeWeaver#addTransformer
 	 * @see org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver
@@ -94,7 +94,7 @@ public class TomcatInstrumentableClassLoader extends WebappClassLoader {
 	}
 
 	/**
-	 * Delegate for LoadTimeWeaver's <code>getThrowawayClassLoader</code> method.
+	 * Delegate for LoadTimeWeaver's {@code getThrowawayClassLoader} method.
 	 * Typically called through ReflectiveLoadTimeWeaver.
 	 * @see org.springframework.instrument.classloading.LoadTimeWeaver#getThrowawayClassLoader
 	 * @see org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver
@@ -139,7 +139,7 @@ public class TomcatInstrumentableClassLoader extends WebappClassLoader {
 	 * 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</code>
+	 * is {@code null}
 	 */
 	private static void shallowCopyFieldState(final Object src, final Object dest) throws IllegalArgumentException {
 		if (src == null) {
diff --git a/spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java b/spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java
index b94fb35a32..f9745823bf 100644
--- a/spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java
+++ b/spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java
@@ -47,8 +47,8 @@ public class InstrumentationSavingAgent {
 	 * conditional checking with respect to agent availability, consider using
 	 * {@link org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver#getInstrumentation()}
 	 * instead - which will work without the agent class in the classpath as well.
-	 * @return the <code>Instrumentation</code> instance previously saved when
-	 * the {@link #premain} method was called by the JVM; will be <code>null</code>
+	 * @return the {@code Instrumentation} instance previously saved when
+	 * the {@link #premain} method was called by the JVM; will be {@code null}
 	 * if this class was not used as Java agent when this JVM was started.
 	 * @see org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver#getInstrumentation()
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
index e61aefdee7..e63d65216c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
@@ -22,7 +22,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
 
 /**
  * Exception thrown when SQL specified is invalid. Such exceptions always have
- * a <code>java.sql.SQLException</code> root cause.
+ * a {@code java.sql.SQLException} root cause.
  *
  * <p>It would be possible to have subclasses for no such table, no such column etc.
  * A custom SQLExceptionTranslator could create such more specific exceptions,
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java
index d62e1c1fa2..637886a5e2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java
@@ -22,7 +22,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
 
 /**
  * Exception thrown when a ResultSet has been accessed in an invalid fashion.
- * Such exceptions always have a <code>java.sql.SQLException</code> root cause.
+ * Such exceptions always have a {@code java.sql.SQLException} root cause.
  *
  * <p>This typically happens when an invalid ResultSet column index or name
  * has been specified. Also thrown by disconnected SqlRowSets.
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 94bdd80c45..82576b1df0 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
@@ -50,7 +50,7 @@ import org.springframework.util.Assert;
  *
  * <p>Mapping is provided for fields in the target class for many common types, e.g.:
  * String, boolean, Boolean, byte, Byte, short, Short, int, Integer, long, Long,
- * float, Float, double, Double, BigDecimal, <code>java.util.Date</code>, etc.
+ * float, Float, double, Double, BigDecimal, {@code java.util.Date}, etc.
  *
  * <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".
@@ -190,7 +190,7 @@ public class BeanPropertyRowMapper<T> implements RowMapper<T> {
 	/**
 	 * Set whether we're strictly validating that all bean properties have been
 	 * mapped from corresponding database fields.
-	 * <p>Default is <code>false</code>, accepting unpopulated properties in the
+	 * <p>Default is {@code false}, accepting unpopulated properties in the
 	 * target bean.
 	 */
 	public void setCheckFullyPopulated(boolean checkFullyPopulated) {
@@ -208,7 +208,7 @@ public class BeanPropertyRowMapper<T> implements RowMapper<T> {
 	/**
 	 * Set whether we're defaulting Java primitives in the case of mapping a null value
 	 * from corresponding database fields.
-	 * <p>Default is <code>false</code>, throwing an exception when nulls are mapped to Java primitives.
+	 * <p>Default is {@code false}, throwing an exception when nulls are mapped to Java primitives.
 	 */
 	public void setPrimitivesDefaultedForNullValue(boolean primitivesDefaultedForNullValue) {
 		this.primitivesDefaultedForNullValue = primitivesDefaultedForNullValue;
@@ -295,11 +295,11 @@ public class BeanPropertyRowMapper<T> implements RowMapper<T> {
 	 * <p>The default implementation calls
 	 * {@link JdbcUtils#getResultSetValue(java.sql.ResultSet, int, Class)}.
 	 * Subclasses may override this to check specific value types upfront,
-	 * or to post-process values return from <code>getResultSetValue</code>.
+	 * or to post-process values return from {@code getResultSetValue}.
 	 * @param rs is the ResultSet holding the data
 	 * @param index is the column index
 	 * @param pd the bean property that each result object is expected to match
-	 * (or <code>null</code> if none specified)
+	 * (or {@code null} if none specified)
 	 * @return the Object value
 	 * @throws SQLException in case of extraction failure
 	 * @see org.springframework.jdbc.support.JdbcUtils#getResultSetValue(java.sql.ResultSet, int, Class)
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java
index 071f2efccd..08410c3be2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java
@@ -43,7 +43,7 @@ import org.springframework.dao.DataAccessException;
 public interface CallableStatementCallback<T> {
 
 	/**
-	 * Gets called by <code>JdbcTemplate.execute</code> with an active JDBC
+	 * Gets called by {@code JdbcTemplate.execute} with an active JDBC
 	 * CallableStatement. Does not need to care about closing the Statement
 	 * or the Connection, or about handling transactions: this will all be
 	 * handled by Spring's JdbcTemplate.
@@ -52,7 +52,7 @@ public interface CallableStatementCallback<T> {
 	 * within the callback implementation. Spring will close the Statement
 	 * object after the callback returned, but this does not necessarily imply
 	 * that the ResultSet resources will be closed: the Statement objects might
-	 * get pooled by the connection pool, with <code>close</code> calls only
+	 * get pooled by the connection pool, with {@code close} calls only
 	 * returning the object to the pool but not physically closing the resources.
 	 *
 	 * <p>If called without a thread-bound JDBC transaction (initiated by
@@ -67,7 +67,7 @@ public interface CallableStatementCallback<T> {
 	 * the template.
 	 *
 	 * @param cs active JDBC CallableStatement
-	 * @return a result object, or <code>null</code> if none
+	 * @return a result object, or {@code null} if none
 	 * @throws SQLException if thrown by a JDBC method, to be auto-converted
 	 * into a DataAccessException by a SQLExceptionTranslator
 	 * @throws DataAccessException in case of custom exceptions
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
index f5f5d0eed5..8ab1b9c600 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
@@ -42,7 +42,7 @@ public class CallableStatementCreatorFactory {
 	/** The SQL call string, which won't change when the parameters change. */
 	private final String callString;
 
-	/** List of SqlParameter objects. May not be <code>null</code>. */
+	/** List of SqlParameter objects. May not be {@code null}. */
 	private final List<SqlParameter> declaredParameters;
 
 	private int resultSetType = ResultSet.TYPE_FORWARD_ONLY;
@@ -110,7 +110,7 @@ public class CallableStatementCreatorFactory {
 
 	/**
 	 * Return a new CallableStatementCreator instance given this parameters.
-	 * @param params list of parameters (may be <code>null</code>)
+	 * @param params list of parameters (may be {@code null})
 	 */
 	public CallableStatementCreator newCallableStatementCreator(Map<String, ?> params) {
 		return new CallableStatementCreatorImpl(params != null ? params : new HashMap<String, Object>());
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java
index fffcf43ec9..103333fe98 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java
@@ -25,7 +25,7 @@ import org.springframework.jdbc.support.JdbcUtils;
 import org.springframework.util.LinkedCaseInsensitiveMap;
 
 /**
- * {@link RowMapper} implementation that creates a <code>java.util.Map</code>
+ * {@link RowMapper} implementation that creates a {@code java.util.Map}
  * for each row, representing all columns as key-value pairs: one
  * entry for each column, with the column name as key.
  *
@@ -83,7 +83,7 @@ public class ColumnMapRowMapper implements RowMapper<Map<String, Object>> {
 
 	/**
 	 * Retrieve a JDBC object value for the specified column.
-	 * <p>The default implementation uses the <code>getObject</code> method.
+	 * <p>The default implementation uses the {@code getObject} method.
 	 * Additionally, this implementation includes a "hack" to get around Oracle
 	 * returning a non standard object for their TIMESTAMP datatype.
 	 * @param rs is the ResultSet holding the data
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java
index 87f72002d5..e09947ebae 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java
@@ -29,7 +29,7 @@ import org.springframework.dao.DataAccessException;
  * <p>This is particularly useful for delegating to existing data access code
  * that expects a Connection to work on and throws SQLException. For newly
  * written code, it is strongly recommended to use JdbcTemplate's more specific
- * operations, for example a <code>query</code> or <code>update</code> variant.
+ * operations, for example a {@code query} or {@code update} variant.
  *
  * @author Juergen Hoeller
  * @since 1.1.3
@@ -40,7 +40,7 @@ import org.springframework.dao.DataAccessException;
 public interface ConnectionCallback<T> {
 
 	/**
-	 * Gets called by <code>JdbcTemplate.execute</code> with an active JDBC
+	 * Gets called by {@code JdbcTemplate.execute} with an active JDBC
 	 * Connection. Does not need to care about activating or closing the
 	 * Connection, or handling transactions.
 	 *
@@ -52,12 +52,12 @@ public interface ConnectionCallback<T> {
 	 *
 	 * <p>Allows for returning a result object created within the callback, i.e.
 	 * a domain object or a collection of domain objects. Note that there's special
-	 * support for single step actions: see <code>JdbcTemplate.queryForObject</code>
+	 * support for single step actions: see {@code JdbcTemplate.queryForObject}
 	 * etc. A thrown RuntimeException is treated as application exception:
 	 * it gets propagated to the caller of the template.
 	 *
 	 * @param con active JDBC Connection
-	 * @return a result object, or <code>null</code> if none
+	 * @return a result object, or {@code null} if none
 	 * @throws SQLException if thrown by a JDBC method, to be auto-converted
 	 * to a DataAccessException by a SQLExceptionTranslator
 	 * @throws DataAccessException in case of custom exceptions
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java
index 08999f6ea4..57af20c86b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java
@@ -27,12 +27,12 @@ package org.springframework.jdbc.core;
  * <p>The {@link #isBatchExhausted} method is called after each call to
  * {@link #setValues} to determine whether there were some values added,
  * or if the batch was determined to be complete and no additional values
- * were provided during the last call to <code>setValues</code>.
+ * were provided during the last call to {@code setValues}.
  *
  * <p>Consider extending the
  * {@link org.springframework.jdbc.core.support.AbstractInterruptibleBatchPreparedStatementSetter}
  * base class instead of implementing this interface directly, using a single
- * <code>setValuesIfAvailable</code> callback method that checks for available
+ * {@code setValuesIfAvailable} callback method that checks for available
  * values and sets them, returning whether values have actually been provided.
  *
  * @author Thomas Risberg
@@ -45,12 +45,12 @@ public interface InterruptibleBatchPreparedStatementSetter extends BatchPrepared
 
 	/**
 	 * Return whether the batch is complete, that is, whether there were no
-	 * additional values added during the last <code>setValues</code> call.
-	 * <p><b>NOTE:</b> If this method returns <code>true</code>, any parameters
-	 * that might have been set during the last <code>setValues</code> call will
+	 * additional values added during the last {@code setValues} call.
+	 * <p><b>NOTE:</b> If this method returns {@code true}, any parameters
+	 * that might have been set during the last {@code setValues} call will
 	 * be ignored! Make sure that you set a corresponding internal flag if you
-	 * detect exhaustion <i>at the beginning</i> of your <code>setValues</code>
-	 * implementation, letting this method return <code>true</code> based on the flag.
+	 * detect exhaustion <i>at the beginning</i> of your {@code setValues}
+	 * implementation, letting this method return {@code true} based on the flag.
 	 * @param i index of the statement we're issuing in the batch, starting from 0
 	 * @return whether the batch is already exhausted
 	 * @see #setValues
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 e97d7cccbc..4cd1e31cd0 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
@@ -34,8 +34,8 @@ import org.springframework.jdbc.support.rowset.SqlRowSet;
  * However, mocking this interface constitutes significantly less work.
  * As an alternative to a mock objects approach to testing data access code,
  * consider the powerful integration testing support provided in the
- * <code>org.springframework.test</code> package, shipped in
- * <code>spring-test.jar</code>.
+ * {@code org.springframework.test} package, shipped in
+ * {@code spring-test.jar}.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -56,7 +56,7 @@ public interface JdbcOperations {
 	 * <p>The callback action can return a result object, for example a
 	 * domain object or a collection of domain objects.
 	 * @param action the callback object that specifies the action
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws DataAccessException if there is any problem
 	 */
 	<T> T execute(ConnectionCallback<T> action) throws DataAccessException;
@@ -75,7 +75,7 @@ public interface JdbcOperations {
 	 * <p>The callback action can return a result object, for example a
 	 * domain object or a collection of domain objects.
 	 * @param action callback object that specifies the action
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws DataAccessException if there is any problem
 	 */
 	<T> T execute(StatementCallback<T> action) throws DataAccessException;
@@ -92,7 +92,7 @@ public interface JdbcOperations {
 	 * ResultSetExtractor.
 	 * <p>Uses a JDBC Statement, not a PreparedStatement. If you want to
 	 * execute a static query with a PreparedStatement, use the overloaded
-	 * <code>query</code> method with <code>null</code> as argument array.
+	 * {@code query} method with {@code null} as argument array.
 	 * @param sql SQL query to execute
 	 * @param rse object that will extract all rows of results
 	 * @return an arbitrary result object, as returned by the ResultSetExtractor
@@ -106,7 +106,7 @@ public interface JdbcOperations {
 	 * basis with a RowCallbackHandler.
 	 * <p>Uses a JDBC Statement, not a PreparedStatement. If you want to
 	 * execute a static query with a PreparedStatement, use the overloaded
-	 * <code>query</code> method with <code>null</code> as argument array.
+	 * {@code query} method with {@code null} as argument array.
 	 * @param sql SQL query to execute
 	 * @param rch object that will extract results, one row at a time
 	 * @throws DataAccessException if there is any problem executing the query
@@ -119,7 +119,7 @@ public interface JdbcOperations {
 	 * via a RowMapper.
 	 * <p>Uses a JDBC Statement, not a PreparedStatement. If you want to
 	 * execute a static query with a PreparedStatement, use the overloaded
-	 * <code>query</code> method with <code>null</code> as argument array.
+	 * {@code query} method with {@code null} as argument array.
 	 * @param sql SQL query to execute
 	 * @param rowMapper object that will map one object per row
 	 * @return the result List, containing mapped objects
@@ -133,7 +133,7 @@ public interface JdbcOperations {
 	 * object via a RowMapper.
 	 * <p>Uses a JDBC Statement, not a PreparedStatement. If you want to
 	 * execute a static query with a PreparedStatement, use the overloaded
-	 * <code>queryForObject</code> method with <code>null</code> as argument array.
+	 * {@code queryForObject} method with {@code null} as argument array.
 	 * @param sql SQL query to execute
 	 * @param rowMapper object that will map one object per row
 	 * @return the single mapped object
@@ -148,13 +148,13 @@ public interface JdbcOperations {
 	 * Execute a query for a result object, given static SQL.
 	 * <p>Uses a JDBC Statement, not a PreparedStatement. If you want to
 	 * execute a static query with a PreparedStatement, use the overloaded
-	 * <code>queryForObject</code> method with <code>null</code> as argument array.
+	 * {@code queryForObject} method with {@code null} as argument array.
 	 * <p>This method is useful for running static SQL with a known outcome.
 	 * The query is expected to be a single row/single column query; the returned
 	 * result will be directly mapped to the corresponding object type.
 	 * @param sql SQL query to execute
 	 * @param requiredType the type that the result object is expected to match
-	 * @return the result object of the required type, or <code>null</code> in case of SQL NULL
+	 * @return the result object of the required type, or {@code null} in case of SQL NULL
 	 * @throws IncorrectResultSizeDataAccessException if the query does not return
 	 * exactly one row, or does not return exactly one column in that row
 	 * @throws DataAccessException if there is any problem executing the query
@@ -166,7 +166,7 @@ public interface JdbcOperations {
 	 * Execute a query for a result Map, given static SQL.
 	 * <p>Uses a JDBC Statement, not a PreparedStatement. If you want to
 	 * execute a static query with a PreparedStatement, use the overloaded
-	 * <code>queryForMap</code> method with <code>null</code> as argument array.
+	 * {@code queryForMap} method with {@code null} as argument array.
 	 * <p>The query is expected to be a single row query; the result row will be
 	 * mapped to a Map (one entry for each column, using the column name as the key).
 	 * @param sql SQL query to execute
@@ -184,7 +184,7 @@ public interface JdbcOperations {
 	 * Execute a query that results in a long value, given static SQL.
 	 * <p>Uses a JDBC Statement, not a PreparedStatement. If you want to
 	 * execute a static query with a PreparedStatement, use the overloaded
-	 * <code>queryForLong</code> method with <code>null</code> as argument array.
+	 * {@code queryForLong} method with {@code null} as argument array.
 	 * <p>This method is useful for running static SQL with a known outcome.
 	 * The query is expected to be a single row/single column query that results
 	 * in a long value.
@@ -201,7 +201,7 @@ public interface JdbcOperations {
 	 * Execute a query that results in an int value, given static SQL.
 	 * <p>Uses a JDBC Statement, not a PreparedStatement. If you want to
 	 * execute a static query with a PreparedStatement, use the overloaded
-	 * <code>queryForInt</code> method with <code>null</code> as argument array.
+	 * {@code queryForInt} method with {@code null} as argument array.
 	 * <p>This method is useful for running static SQL with a known outcome.
 	 * The query is expected to be a single row/single column query that results
 	 * in an int value.
@@ -218,12 +218,12 @@ public interface JdbcOperations {
 	 * Execute a query for a result list, given static SQL.
 	 * <p>Uses a JDBC Statement, not a PreparedStatement. If you want to
 	 * execute a static query with a PreparedStatement, use the overloaded
-	 * <code>queryForList</code> method with <code>null</code> as argument array.
+	 * {@code queryForList} method with {@code null} as argument array.
 	 * <p>The results will be mapped to a List (one entry for each row) of
 	 * result objects, each of them matching the specified element type.
 	 * @param sql SQL query to execute
 	 * @param elementType the required type of element in the result list
-	 * (for example, <code>Integer.class</code>)
+	 * (for example, {@code Integer.class})
 	 * @return a List of objects that match the specified element type
 	 * @throws DataAccessException if there is any problem executing the query
 	 * @see #queryForList(String, Object[], Class)
@@ -235,7 +235,7 @@ public interface JdbcOperations {
 	 * Execute a query for a result list, given static SQL.
 	 * <p>Uses a JDBC Statement, not a PreparedStatement. If you want to
 	 * execute a static query with a PreparedStatement, use the overloaded
-	 * <code>queryForList</code> method with <code>null</code> as argument array.
+	 * {@code queryForList} method with {@code null} as argument array.
 	 * <p>The results will be mapped to a List (one entry for each row) of
 	 * Maps (one entry for each column using the column name as the key).
 	 * Each element in the list will be of the form returned by this interface's
@@ -251,16 +251,16 @@ public interface JdbcOperations {
 	 * Execute a query for a SqlRowSet, given static SQL.
 	 * <p>Uses a JDBC Statement, not a PreparedStatement. If you want to
 	 * execute a static query with a PreparedStatement, use the overloaded
-	 * <code>queryForRowSet</code> method with <code>null</code> as argument array.
+	 * {@code queryForRowSet} method with {@code null} as argument array.
 	 * <p>The results will be mapped to an SqlRowSet which holds the data in a
 	 * disconnected fashion. This wrapper will translate any SQLExceptions thrown.
 	 * <p>Note that that, for the default implementation, JDBC RowSet support needs to
-	 * be available at runtime: by default, Sun's <code>com.sun.rowset.CachedRowSetImpl</code>
+	 * be available at runtime: by default, Sun's {@code com.sun.rowset.CachedRowSetImpl}
 	 * class is used, which is part of JDK 1.5+ and also available separately as part of
 	 * Sun's JDBC RowSet Implementations download (rowset.jar).
 	 * @param sql SQL query to execute
 	 * @return a SqlRowSet representation (possibly a wrapper around a
-	 * <code>javax.sql.rowset.CachedRowSet</code>)
+	 * {@code javax.sql.rowset.CachedRowSet})
 	 * @throws DataAccessException if there is any problem executing the query
 	 * @see #queryForRowSet(String, Object[])
 	 * @see SqlRowSetResultSetExtractor
@@ -301,7 +301,7 @@ public interface JdbcOperations {
 	 * domain object or a collection of domain objects.
 	 * @param psc object that can create a PreparedStatement given a Connection
 	 * @param action callback object that specifies the action
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @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)
@@ -317,7 +317,7 @@ public interface JdbcOperations {
 	 * domain object or a collection of domain objects.
 	 * @param sql SQL to execute
 	 * @param action callback object that specifies the action
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws DataAccessException if there is any problem
 	 */
 	<T> T execute(String sql, PreparedStatementCallback<T> action) throws DataAccessException;
@@ -340,7 +340,7 @@ public interface JdbcOperations {
 	 * ResultSetExtractor.
 	 * @param sql SQL query to execute
 	 * @param pss object that knows how to set values on the prepared statement.
-	 * If this is <code>null</code>, the SQL will be assumed to contain no bind parameters.
+	 * If this is {@code null}, the SQL will be assumed to contain no bind parameters.
 	 * Even if there are no bind parameters, this object may be used to
 	 * set fetch size and other performance options.
 	 * @param rse object that will extract results
@@ -357,7 +357,7 @@ public interface JdbcOperations {
 	 * @param sql SQL query to execute
 	 * @param args arguments to bind to the query
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (constants from {@code java.sql.Types})
 	 * @param rse object that will extract results
 	 * @return an arbitrary result object, as returned by the ResultSetExtractor
 	 * @throws DataAccessException if the query fails
@@ -415,7 +415,7 @@ public interface JdbcOperations {
 	 * RowCallbackHandler.
 	 * @param sql SQL query to execute
 	 * @param pss object that knows how to set values on the prepared statement.
-	 * If this is <code>null</code>, the SQL will be assumed to contain no bind parameters.
+	 * If this is {@code null}, the SQL will be assumed to contain no bind parameters.
 	 * Even if there are no bind parameters, this object may be used to
 	 * set fetch size and other performance options.
 	 * @param rch object that will extract results, one row at a time
@@ -431,7 +431,7 @@ public interface JdbcOperations {
 	 * @param sql SQL query to execute
 	 * @param args arguments to bind to the query
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (constants from {@code java.sql.Types})
 	 * @param rch object that will extract results, one row at a time
 	 * @throws DataAccessException if the query fails
 	 * @see java.sql.Types
@@ -486,7 +486,7 @@ public interface JdbcOperations {
 	 * to the query, mapping each row to a Java object via a RowMapper.
 	 * @param sql SQL query to execute
 	 * @param pss object that knows how to set values on the prepared statement.
-	 * If this is <code>null</code>, the SQL will be assumed to contain no bind parameters.
+	 * If this is {@code null}, the SQL will be assumed to contain no bind parameters.
 	 * Even if there are no bind parameters, this object may be used to
 	 * set fetch size and other performance options.
 	 * @param rowMapper object that will map one object per row
@@ -503,7 +503,7 @@ public interface JdbcOperations {
 	 * @param sql SQL query to execute
 	 * @param args arguments to bind to the query
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (constants from {@code java.sql.Types})
 	 * @param rowMapper object that will map one object per row
 	 * @return the result List, containing mapped objects
 	 * @throws DataAccessException if the query fails
@@ -550,7 +550,7 @@ public interface JdbcOperations {
 	 * @param args arguments to bind to the query
 	 * (leaving it to the PreparedStatement to guess the corresponding SQL type)
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (constants from {@code java.sql.Types})
 	 * @param rowMapper object that will map one object per row
 	 * @return the single mapped object
 	 * @throws IncorrectResultSizeDataAccessException if the query does not
@@ -604,9 +604,9 @@ public interface JdbcOperations {
 	 * @param sql SQL query to execute
 	 * @param args arguments to bind to the query
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (constants from {@code java.sql.Types})
 	 * @param requiredType the type that the result object is expected to match
-	 * @return the result object of the required type, or <code>null</code> in case of SQL NULL
+	 * @return the result object of the required type, or {@code null} in case of SQL NULL
 	 * @throws IncorrectResultSizeDataAccessException if the query does not return
 	 * exactly one row, or does not return exactly one column in that row
 	 * @throws DataAccessException if the query fails
@@ -627,7 +627,7 @@ public interface JdbcOperations {
 	 * may also contain {@link SqlParameterValue} objects which indicate not
 	 * only the argument value but also the SQL type and optionally the scale
 	 * @param requiredType the type that the result object is expected to match
-	 * @return the result object of the required type, or <code>null</code> in case of SQL NULL
+	 * @return the result object of the required type, or {@code null} in case of SQL NULL
 	 * @throws IncorrectResultSizeDataAccessException if the query does not return
 	 * exactly one row, or does not return exactly one column in that row
 	 * @throws DataAccessException if the query fails
@@ -646,7 +646,7 @@ public interface JdbcOperations {
 	 * (leaving it to the PreparedStatement to guess the corresponding SQL type);
 	 * may also contain {@link SqlParameterValue} objects which indicate not
 	 * only the argument value but also the SQL type and optionally the scale
-	 * @return the result object of the required type, or <code>null</code> in case of SQL NULL
+	 * @return the result object of the required type, or {@code null} in case of SQL NULL
 	 * @throws IncorrectResultSizeDataAccessException if the query does not return
 	 * exactly one row, or does not return exactly one column in that row
 	 * @throws DataAccessException if the query fails
@@ -662,7 +662,7 @@ public interface JdbcOperations {
 	 * @param sql SQL query to execute
 	 * @param args arguments to bind to the query
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (constants from {@code java.sql.Types})
 	 * @return the result Map (one entry for each column, using the
 	 * column name as the key)
 	 * @throws IncorrectResultSizeDataAccessException if the query does not
@@ -705,7 +705,7 @@ public interface JdbcOperations {
 	 * @param sql SQL query to execute
 	 * @param args arguments to bind to the query
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (constants from {@code java.sql.Types})
 	 * @return the long value, or 0 in case of SQL NULL
 	 * @throws IncorrectResultSizeDataAccessException if the query does not return
 	 * exactly one row, or does not return exactly one column in that row
@@ -741,7 +741,7 @@ public interface JdbcOperations {
 	 * @param sql SQL query to execute
 	 * @param args arguments to bind to the query
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (constants from {@code java.sql.Types})
 	 * @return the int value, or 0 in case of SQL NULL
 	 * @throws IncorrectResultSizeDataAccessException if the query does not return
 	 * exactly one row, or does not return exactly one column in that row
@@ -777,9 +777,9 @@ public interface JdbcOperations {
 	 * @param sql SQL query to execute
 	 * @param args arguments to bind to the query
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (constants from {@code java.sql.Types})
 	 * @param elementType the required type of element in the result list
-	 * (for example, <code>Integer.class</code>)
+	 * (for example, {@code Integer.class})
 	 * @return a List of objects that match the specified element type
 	 * @throws DataAccessException if the query fails
 	 * @see #queryForList(String, Class)
@@ -799,7 +799,7 @@ public interface JdbcOperations {
 	 * may also contain {@link SqlParameterValue} objects which indicate not
 	 * only the argument value but also the SQL type and optionally the scale
 	 * @param elementType the required type of element in the result list
-	 * (for example, <code>Integer.class</code>)
+	 * (for example, {@code Integer.class})
 	 * @return a List of objects that match the specified element type
 	 * @throws DataAccessException if the query fails
 	 * @see #queryForList(String, Class)
@@ -814,7 +814,7 @@ public interface JdbcOperations {
 	 * result objects, each of them matching the specified element type.
 	 * @param sql SQL query to execute
 	 * @param elementType the required type of element in the result list
-	 * (for example, <code>Integer.class</code>)
+	 * (for example, {@code Integer.class})
 	 * @param args arguments to bind to the query
 	 * (leaving it to the PreparedStatement to guess the corresponding SQL type);
 	 * may also contain {@link SqlParameterValue} objects which indicate not
@@ -836,7 +836,7 @@ public interface JdbcOperations {
 	 * @param sql SQL query to execute
 	 * @param args arguments to bind to the query
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (constants from {@code java.sql.Types})
 	 * @return a List that contains a Map per row
 	 * @throws DataAccessException if the query fails
 	 * @see #queryForList(String)
@@ -868,15 +868,15 @@ public interface JdbcOperations {
 	 * <p>The results will be mapped to an SqlRowSet which holds the data in a
 	 * disconnected fashion. This wrapper will translate any SQLExceptions thrown.
 	 * <p>Note that that, for the default implementation, JDBC RowSet support needs to
-	 * be available at runtime: by default, Sun's <code>com.sun.rowset.CachedRowSetImpl</code>
+	 * be available at runtime: by default, Sun's {@code com.sun.rowset.CachedRowSetImpl}
 	 * class is used, which is part of JDK 1.5+ and also available separately as part of
 	 * Sun's JDBC RowSet Implementations download (rowset.jar).
 	 * @param sql SQL query to execute
 	 * @param args arguments to bind to the query
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (constants from {@code java.sql.Types})
 	 * @return a SqlRowSet representation (possibly a wrapper around a
-	 * <code>javax.sql.rowset.CachedRowSet</code>)
+	 * {@code javax.sql.rowset.CachedRowSet})
 	 * @throws DataAccessException if there is any problem executing the query
 	 * @see #queryForRowSet(String)
 	 * @see SqlRowSetResultSetExtractor
@@ -891,7 +891,7 @@ public interface JdbcOperations {
 	 * <p>The results will be mapped to an SqlRowSet which holds the data in a
 	 * disconnected fashion. This wrapper will translate any SQLExceptions thrown.
 	 * <p>Note that that, for the default implementation, JDBC RowSet support needs to
-	 * be available at runtime: by default, Sun's <code>com.sun.rowset.CachedRowSetImpl</code>
+	 * be available at runtime: by default, Sun's {@code com.sun.rowset.CachedRowSetImpl}
 	 * class is used, which is part of JDK 1.5+ and also available separately as part of
 	 * Sun's JDBC RowSet Implementations download (rowset.jar).
 	 * @param sql SQL query to execute
@@ -900,7 +900,7 @@ public interface JdbcOperations {
 	 * may also contain {@link SqlParameterValue} objects which indicate not
 	 * only the argument value but also the SQL type and optionally the scale
 	 * @return a SqlRowSet representation (possibly a wrapper around a
-	 * <code>javax.sql.rowset.CachedRowSet</code>)
+	 * {@code javax.sql.rowset.CachedRowSet})
 	 * @throws DataAccessException if there is any problem executing the query
 	 * @see #queryForRowSet(String)
 	 * @see SqlRowSetResultSetExtractor
@@ -941,7 +941,7 @@ public interface JdbcOperations {
 	 * will create the PreparedStatement: The PreparedStatementSetter just needs to
 	 * set parameters.
 	 * @param sql SQL containing bind parameters
-	 * @param pss helper that sets bind parameters. If this is <code>null</code>
+	 * @param pss helper that sets bind parameters. If this is {@code null}
 	 * we run an update with static SQL.
 	 * @return the number of rows affected
 	 * @throws DataAccessException if there is any problem issuing the update
@@ -954,7 +954,7 @@ public interface JdbcOperations {
 	 * @param sql SQL containing bind parameters
 	 * @param args arguments to bind to the query
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (constants from {@code java.sql.Types})
 	 * @return the number of rows affected
 	 * @throws DataAccessException if there is any problem issuing the update
 	 * @see java.sql.Types
@@ -1001,7 +1001,7 @@ public interface JdbcOperations {
 	 * @param sql the SQL statement to execute.
 	 * @param batchArgs the List of Object arrays containing the batch of arguments for the query
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (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);
@@ -1033,7 +1033,7 @@ public interface JdbcOperations {
 	 * domain object or a collection of domain objects.
 	 * @param csc object that can create a CallableStatement given a Connection
 	 * @param action callback object that specifies the action
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @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)
@@ -1049,7 +1049,7 @@ public interface JdbcOperations {
 	 * domain object or a collection of domain objects.
 	 * @param callString the SQL call string to execute
 	 * @param action callback object that specifies the action
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws DataAccessException if there is any problem
 	 */
 	<T> T execute(String callString, CallableStatementCallback<T> action) throws DataAccessException;
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 cce62c60b2..3f0085cebf 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
@@ -57,7 +57,7 @@ import org.springframework.util.LinkedCaseInsensitiveMap;
  * and extract results. This class executes SQL queries or updates, initiating
  * iteration over ResultSets and catching JDBC exceptions and translating
  * them to the generic, more informative exception hierarchy defined in the
- * <code>org.springframework.dao</code> package.
+ * {@code org.springframework.dao} package.
  *
  * <p>Code using this class need only implement callback interfaces, giving
  * them a clearly defined contract. The {@link PreparedStatementCreator} callback
@@ -135,7 +135,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 	 * If this variable is set to true then all results from a stored procedure call
 	 * that don't have a corresponding SqlOutParameter declaration will be bypassed.
 	 * All other results processing will be take place unless the variable
-	 * <code>skipResultsProcessing</code> is set to <code>true</code>.
+	 * {@code skipResultsProcessing} is set to {@code true}.
 	 */
 	private boolean skipUndeclaredResults = false;
 
@@ -355,7 +355,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 
 	/**
 	 * Create a close-suppressing proxy for the given JDBC Connection.
-	 * Called by the <code>execute</code> method.
+	 * Called by the {@code execute} method.
 	 * <p>The proxy also prepares returned JDBC Statements, applying
 	 * statement settings such as fetch size, max rows, and query timeout.
 	 * @param con the JDBC Connection to create a proxy for
@@ -1331,7 +1331,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 	/**
 	 * Throw an SQLWarningException if encountering an actual warning.
 	 * @param warning the warnings object from the current statement.
-	 * May be <code>null</code>, in which case this method does nothing.
+	 * May be {@code null}, in which case this method does nothing.
 	 * @throws SQLWarningException in case of an actual warning to be raised
 	 */
 	protected void handleWarnings(SQLWarning warning) throws SQLWarningException {
@@ -1343,7 +1343,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 	/**
 	 * Determine SQL from potential provider object.
 	 * @param sqlProvider object that's potentially a SqlProvider
-	 * @return the SQL string, or <code>null</code>
+	 * @return the SQL string, or {@code null}
 	 * @see SqlProvider
 	 */
 	private static String getSql(Object sqlProvider) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java
index 515163d784..d241a53896 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java
@@ -40,7 +40,7 @@ public interface ParameterMapper {
 	 * it is best to avoid using such proprietary RDBMS features if possible.
 	 * @throws SQLException if a SQLException is encountered setting
 	 * parameter values (that is, there's no need to catch SQLException)
-	 * @return Map of input parameters, keyed by name (never <code>null</code>)
+	 * @return Map of input parameters, keyed by name (never {@code null})
 	 */
 	Map<String, ?> createMap(Connection con) throws SQLException;
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java
index 5ef02826b4..ec1185db4d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java
@@ -24,8 +24,8 @@ import org.springframework.dao.DataAccessException;
 /**
  * Generic callback interface for code that operates on a PreparedStatement.
  * Allows to execute any number of operations on a single PreparedStatement,
- * for example a single <code>executeUpdate</code> call or repeated
- * <code>executeUpdate</code> calls with varying parameters.
+ * for example a single {@code executeUpdate} call or repeated
+ * {@code executeUpdate} calls with varying parameters.
  *
  * <p>Used internally by JdbcTemplate, but also useful for application code.
  * Note that the passed-in PreparedStatement can have been created by the
@@ -43,7 +43,7 @@ import org.springframework.dao.DataAccessException;
 public interface PreparedStatementCallback<T> {
 
 	/**
-	 * Gets called by <code>JdbcTemplate.execute</code> with an active JDBC
+	 * Gets called by {@code JdbcTemplate.execute} with an active JDBC
 	 * PreparedStatement. Does not need to care about closing the Statement
 	 * or the Connection, or about handling transactions: this will all be
 	 * handled by Spring's JdbcTemplate.
@@ -52,7 +52,7 @@ public interface PreparedStatementCallback<T> {
 	 * within the callback implementation. Spring will close the Statement
 	 * object after the callback returned, but this does not necessarily imply
 	 * that the ResultSet resources will be closed: the Statement objects might
-	 * get pooled by the connection pool, with <code>close</code> calls only
+	 * get pooled by the connection pool, with {@code close} calls only
 	 * returning the object to the pool but not physically closing the resources.
 	 *
 	 * <p>If called without a thread-bound JDBC transaction (initiated by
@@ -68,7 +68,7 @@ public interface PreparedStatementCallback<T> {
 	 * propagated to the caller of the template.
 	 *
 	 * @param ps active JDBC PreparedStatement
-	 * @return a result object, or <code>null</code> if none
+	 * @return a result object, or {@code null} if none
 	 * @throws SQLException if thrown by a JDBC method, to be auto-converted
 	 * to a DataAccessException by a SQLExceptionTranslator
 	 * @throws DataAccessException in case of custom exceptions
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 192a9a267b..6a0a1b944c 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
@@ -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</code>. */
+	/** List of SqlParameter objects. May not be {@code null}. */
 	private final List<SqlParameter> declaredParameters;
 
 	private int resultSetType = ResultSet.TYPE_FORWARD_ONLY;
@@ -144,7 +144,7 @@ public class PreparedStatementCreatorFactory {
 
 	/**
 	 * Return a new PreparedStatementSetter for the given parameters.
-	 * @param params list of parameters (may be <code>null</code>)
+	 * @param params list of parameters (may be {@code null})
 	 */
 	public PreparedStatementSetter newPreparedStatementSetter(List params) {
 		return new PreparedStatementCreatorImpl(params != null ? params : Collections.emptyList());
@@ -152,7 +152,7 @@ public class PreparedStatementCreatorFactory {
 
 	/**
 	 * Return a new PreparedStatementSetter for the given parameters.
-	 * @param params the parameter array (may be <code>null</code>)
+	 * @param params the parameter array (may be {@code null})
 	 */
 	public PreparedStatementSetter newPreparedStatementSetter(Object[] params) {
 		return new PreparedStatementCreatorImpl(params != null ? Arrays.asList(params) : Collections.emptyList());
@@ -160,7 +160,7 @@ public class PreparedStatementCreatorFactory {
 
 	/**
 	 * Return a new PreparedStatementCreator for the given parameters.
-	 * @param params list of parameters (may be <code>null</code>)
+	 * @param params list of parameters (may be {@code null})
 	 */
 	public PreparedStatementCreator newPreparedStatementCreator(List<?> params) {
 		return new PreparedStatementCreatorImpl(params != null ? params : Collections.emptyList());
@@ -168,7 +168,7 @@ public class PreparedStatementCreatorFactory {
 
 	/**
 	 * Return a new PreparedStatementCreator for the given parameters.
-	 * @param params the parameter array (may be <code>null</code>)
+	 * @param params the parameter array (may be {@code null})
 	 */
 	public PreparedStatementCreator newPreparedStatementCreator(Object[] params) {
 		return new PreparedStatementCreatorImpl(params != null ? Arrays.asList(params) : Collections.emptyList());
@@ -178,7 +178,7 @@ public class PreparedStatementCreatorFactory {
 	 * Return a new PreparedStatementCreator for the given parameters.
 	 * @param sqlToUse the actual SQL statement to use (if different from
 	 * the factory's, for example because of named parameter expanding)
-	 * @param params the parameter array (may be <code>null</code>)
+	 * @param params the parameter array (may be {@code null})
 	 */
 	public PreparedStatementCreator newPreparedStatementCreator(String sqlToUse, Object[] params) {
 		return new PreparedStatementCreatorImpl(
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java
index 1544655ea4..44bb3d4e7d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java
@@ -52,7 +52,7 @@ public interface ResultSetExtractor<T> {
 	 * Implementations must implement this method to process the entire ResultSet.
 	 * @param rs ResultSet to extract data from. Implementations should
 	 * not close this: it will be closed by the calling JdbcTemplate.
-	 * @return an arbitrary result object, or <code>null</code> if none
+	 * @return an arbitrary result object, or {@code null} if none
 	 * (the extractor will typically be stateful in the latter case).
 	 * @throws SQLException if a SQLException is encountered getting column
 	 * values or navigating (that is, there's no need to catch SQLException)
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
index 5dc54b2dc1..cccbd5744a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
@@ -127,7 +127,7 @@ public class ResultSetSupportingSqlParameter extends SqlParameter {
 
 
 	/**
-	 * <p>This implementation always returns <code>false</code>.
+	 * <p>This implementation always returns {@code false}.
 	 */
 	@Override
 	public boolean isInputValueProvided() {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java
index 4d34ccffe8..4ee5de64e9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java
@@ -46,7 +46,7 @@ public interface RowCallbackHandler {
 
 	/**
 	 * Implementations must implement this method to process each row of data
-	 * in the ResultSet. This method should not call <code>next()</code> on
+	 * in the ResultSet. This method should not call {@code next()} on
 	 * the ResultSet; it is only supposed to extract values of the current row.
 	 * <p>Exactly what the implementation chooses to do is up to it:
 	 * A trivial implementation might simply count rows, while another
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
index 73df113b54..54b71c1829 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
@@ -66,7 +66,7 @@ public class RowCountCallbackHandler implements RowCallbackHandler {
 	 * Implementation of ResultSetCallbackHandler.
 	 * Work out column size if this is the first row, otherwise just count rows.
 	 * <p>Subclasses can perform custom extraction or processing
-	 * by overriding the <code>processRow(ResultSet, int)</code> method.
+	 * by overriding the {@code processRow(ResultSet, int)} method.
 	 * @see #processRow(java.sql.ResultSet, int)
 	 */
 	public final void processRow(ResultSet rs) throws SQLException {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java
index 56bba1bb55..28e61e1884 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java
@@ -34,7 +34,7 @@ import java.sql.SQLException;
  *
  * <p>Alternatively, consider subclassing
  * {@link org.springframework.jdbc.object.MappingSqlQuery} from the
- * <code>jdbc.object</code> package: Instead of working with separate
+ * {@code jdbc.object} package: Instead of working with separate
  * JdbcTemplate and RowMapper objects, you can build executable query
  * objects (containing row-mapping logic) in that style.
  *
@@ -49,7 +49,7 @@ public interface RowMapper<T> {
 
 	/**
 	 * Implementations must implement this method to map each row of data
-	 * in the ResultSet. This method should not call <code>next()</code> on
+	 * in the ResultSet. This method should not call {@code next()} on
 	 * the ResultSet; it is only supposed to map values of the current row.
 	 * @param rs the ResultSet to map (pre-initialized for the current row)
 	 * @param rowNum the number of the current row
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java
index 8e8b7f7e08..dfd334bd88 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java
@@ -47,7 +47,7 @@ import org.springframework.util.Assert;
  *     "select * from user where id=?", new Object[] {id},
  *     new RowMapperResultSetExtractor(rowMapper, 1));</pre>
  *
- * <p>Alternatively, consider subclassing MappingSqlQuery from the <code>jdbc.object</code>
+ * <p>Alternatively, consider subclassing MappingSqlQuery from the {@code jdbc.object}
  * package: Instead of working with separate JdbcTemplate and RowMapper objects,
  * you can have executable query objects (containing row-mapping logic) there.
  *
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java
index 32311d42c9..40ae15e785 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java
@@ -27,11 +27,11 @@ import org.springframework.util.NumberUtils;
 
 /**
  * {@link RowMapper} implementation that converts a single column into a single
- * result value per row. Expects to operate on a <code>java.sql.ResultSet</code>
+ * result value per row. Expects to operate on a {@code java.sql.ResultSet}
  * that just contains a single column.
  *
  * <p>The type of the result value for each row can be specified. The value
- * for the single column will be extracted from the <code>ResultSet</code>
+ * for the single column will be extracted from the {@code ResultSet}
  * and converted into the specified target type.
  *
  * @author Juergen Hoeller
@@ -72,8 +72,8 @@ public class SingleColumnRowMapper<T> implements RowMapper<T> {
 	/**
 	 * Extract a value for the single column in the current row.
 	 * <p>Validates that there is only one column selected,
-	 * then delegates to <code>getColumnValue()</code> and also
-	 * <code>convertValueToRequiredType</code>, if necessary.
+	 * then delegates to {@code getColumnValue()} and also
+	 * {@code convertValueToRequiredType}, if necessary.
 	 * @see java.sql.ResultSetMetaData#getColumnCount()
 	 * @see #getColumnValue(java.sql.ResultSet, int, Class)
 	 * @see #convertValueToRequiredType(Object, Class)
@@ -108,13 +108,13 @@ public class SingleColumnRowMapper<T> implements RowMapper<T> {
 	 * <p>The default implementation calls
 	 * {@link JdbcUtils#getResultSetValue(java.sql.ResultSet, int, Class)}.
 	 * If no required type has been specified, this method delegates to
-	 * <code>getColumnValue(rs, index)</code>, which basically calls
-	 * <code>ResultSet.getObject(index)</code> but applies some additional
+	 * {@code getColumnValue(rs, index)}, which basically calls
+	 * {@code ResultSet.getObject(index)} but applies some additional
 	 * default conversion to appropriate value types.
 	 * @param rs is the ResultSet holding the data
 	 * @param index is the column index
 	 * @param requiredType the type that each result object is expected to match
-	 * (or <code>null</code> if none specified)
+	 * (or {@code null} if none specified)
 	 * @return the Object value
 	 * @throws SQLException in case of extraction failure
 	 * @see org.springframework.jdbc.support.JdbcUtils#getResultSetValue(java.sql.ResultSet, int, Class)
@@ -133,10 +133,10 @@ public class SingleColumnRowMapper<T> implements RowMapper<T> {
 	/**
 	 * Retrieve a JDBC object value for the specified column, using the most
 	 * appropriate value type. Called if no required type has been specified.
-	 * <p>The default implementation delegates to <code>JdbcUtils.getResultSetValue()</code>,
-	 * which uses the <code>ResultSet.getObject(index)</code> method. Additionally,
+	 * <p>The default implementation delegates to {@code JdbcUtils.getResultSetValue()},
+	 * which uses the {@code ResultSet.getObject(index)} method. Additionally,
 	 * it includes a "hack" to get around Oracle returning a non-standard object for
-	 * their TIMESTAMP datatype. See the <code>JdbcUtils#getResultSetValue()</code>
+	 * their TIMESTAMP datatype. See the {@code JdbcUtils#getResultSetValue()}
 	 * javadoc for details.
 	 * @param rs is the ResultSet holding the data
 	 * @param index is the column index
@@ -152,13 +152,13 @@ public class SingleColumnRowMapper<T> implements RowMapper<T> {
 	 * Convert the given column value to the specified required type.
 	 * Only called if the extracted column value does not match already.
 	 * <p>If the required type is String, the value will simply get stringified
-	 * via <code>toString()</code>. In case of a Number, the value will be
+	 * via {@code toString()}. In case of a Number, the value will be
 	 * converted into a Number, either through number conversion or through
 	 * String parsing (depending on the value type).
-	 * @param value the column value as extracted from <code>getColumnValue()</code>
-	 * (never <code>null</code>)
+	 * @param value the column value as extracted from {@code getColumnValue()}
+	 * (never {@code null})
 	 * @param requiredType the type that each result object is expected to match
-	 * (never <code>null</code>)
+	 * (never {@code null})
 	 * @return the converted value
 	 * @see #getColumnValue(java.sql.ResultSet, int, Class)
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java
index 896bc88061..ad9cd72c28 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java
@@ -18,7 +18,7 @@ package org.springframework.jdbc.core;
 
 /**
  * Subclass of {@link SqlOutParameter} to represent an INOUT parameter.
- * Will return <code>true</code> for SqlParameter's {@link #isInputValueProvided}
+ * Will return {@code true} for SqlParameter's {@link #isInputValueProvided}
  * test, in contrast to a standard SqlOutParameter.
  *
  * <p>Output parameters - like all stored procedure parameters -
@@ -103,7 +103,7 @@ public class SqlInOutParameter extends SqlOutParameter {
 
 
 	/**
-	 * This implementation always returns <code>true</code>.
+	 * This implementation always returns {@code true}.
 	 */
 	@Override
 	public boolean isInputValueProvided() {
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 8b9485e658..1718c349ed 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
@@ -24,7 +24,7 @@ import org.springframework.util.Assert;
 /**
  * Object to represent a SQL parameter definition.
  *
- * <p>Parameters may be anonymous, in which case "name" is <code>null</code>.
+ * <p>Parameters may be anonymous, in which case "name" is {@code null}.
  * However, all parameters must define a SQL type according to {@link java.sql.Types}.
  *
  * @author Rod Johnson
@@ -37,7 +37,7 @@ public class SqlParameter {
 	/** The name of the parameter, if any */
 	private String name;
 
-	/** SQL type constant from <code>java.sql.Types</code> */
+	/** SQL type constant from {@code java.sql.Types} */
 	private final int sqlType;
 
 	/** Used for types that are user-named like: STRUCT, DISTINCT, JAVA_OBJECT, named array types */
@@ -50,7 +50,7 @@ public class SqlParameter {
 
 	/**
 	 * Create a new anonymous SqlParameter, supplying the SQL type.
-	 * @param sqlType SQL type of the parameter according to <code>java.sql.Types</code>
+	 * @param sqlType SQL type of the parameter according to {@code java.sql.Types}
 	 */
 	public SqlParameter(int sqlType) {
 		this.sqlType = sqlType;
@@ -58,7 +58,7 @@ public class SqlParameter {
 
 	/**
 	 * Create a new anonymous SqlParameter, supplying the SQL type.
-	 * @param sqlType SQL type of the parameter according to <code>java.sql.Types</code>
+	 * @param sqlType SQL type of the parameter according to {@code java.sql.Types}
 	 * @param typeName the type name of the parameter (optional)
 	 */
 	public SqlParameter(int sqlType, String typeName) {
@@ -68,7 +68,7 @@ public class SqlParameter {
 
 	/**
 	 * Create a new anonymous SqlParameter, supplying the SQL type.
-	 * @param sqlType SQL type of the parameter according to <code>java.sql.Types</code>
+	 * @param sqlType SQL type of the parameter according to {@code java.sql.Types}
 	 * @param scale the number of digits after the decimal point
 	 * (for DECIMAL and NUMERIC types)
 	 */
@@ -80,7 +80,7 @@ public class SqlParameter {
 	/**
 	 * Create a new SqlParameter, supplying name and SQL type.
 	 * @param name name of the parameter, as used in input and output maps
-	 * @param sqlType SQL type of the parameter according to <code>java.sql.Types</code>
+	 * @param sqlType SQL type of the parameter according to {@code java.sql.Types}
 	 */
 	public SqlParameter(String name, int sqlType) {
 		this.name = name;
@@ -90,7 +90,7 @@ public class SqlParameter {
 	/**
 	 * Create a new SqlParameter, supplying name and SQL type.
 	 * @param name name of the parameter, as used in input and output maps
-	 * @param sqlType SQL type of the parameter according to <code>java.sql.Types</code>
+	 * @param sqlType SQL type of the parameter according to {@code java.sql.Types}
 	 * @param typeName the type name of the parameter (optional)
 	 */
 	public SqlParameter(String name, int sqlType, String typeName) {
@@ -102,7 +102,7 @@ public class SqlParameter {
 	/**
 	 * Create a new SqlParameter, supplying name and SQL type.
 	 * @param name name of the parameter, as used in input and output maps
-	 * @param sqlType SQL type of the parameter according to <code>java.sql.Types</code>
+	 * @param sqlType SQL type of the parameter according to {@code java.sql.Types}
 	 * @param scale the number of digits after the decimal point
 	 * (for DECIMAL and NUMERIC types)
 	 */
@@ -156,8 +156,8 @@ public class SqlParameter {
 
 	/**
 	 * Return whether this parameter holds input values that should be set
-	 * before execution even if they are <code>null</code>.
-	 * <p>This implementation always returns <code>true</code>.
+	 * before execution even if they are {@code null}.
+	 * <p>This implementation always returns {@code true}.
 	 */
 	public boolean isInputValueProvided() {
 		return true;
@@ -166,7 +166,7 @@ public class SqlParameter {
 	/**
 	 * Return whether this parameter is an implicit return parameter used during the
 	 * results preocessing of the CallableStatement.getMoreResults/getUpdateCount.
-	 * <p>This implementation always returns <code>false</code>.
+	 * <p>This implementation always returns {@code false}.
 	 */
 	public boolean isResultsParameter() {
 		return false;
@@ -174,7 +174,7 @@ public class SqlParameter {
 
 
 	/**
-	 * Convert a list of JDBC types, as defined in <code>java.sql.Types</code>,
+	 * 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) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java
index 088b756e76..dba3e8c001 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java
@@ -21,7 +21,7 @@ package org.springframework.jdbc.core;
  * such as the SQL type and the scale for numeric values.
  *
  * <p>Designed for use with {@link JdbcTemplate}'s operations that take an array of
- * argument values: Each such argument value may be a <code>SqlParameterValue</code>,
+ * argument values: Each such argument value may be a {@code SqlParameterValue},
  * indicating the SQL type (and optionally the scale) instead of letting the
  * template guess a default type. Note that this only applies to the operations with
  * a 'plain' argument array, not to the overloaded variants with an explicit type array.
@@ -41,7 +41,7 @@ public class SqlParameterValue extends SqlParameter {
 
 	/**
 	 * Create a new SqlParameterValue, supplying the SQL type.
-	 * @param sqlType SQL type of the parameter according to <code>java.sql.Types</code>
+	 * @param sqlType SQL type of the parameter according to {@code java.sql.Types}
 	 * @param value the value object
 	 */
 	public SqlParameterValue(int sqlType, Object value) {
@@ -51,7 +51,7 @@ public class SqlParameterValue extends SqlParameter {
 
 	/**
 	 * Create a new SqlParameterValue, supplying the SQL type.
-	 * @param sqlType SQL type of the parameter according to <code>java.sql.Types</code>
+	 * @param sqlType SQL type of the parameter according to {@code java.sql.Types}
 	 * @param typeName the type name of the parameter (optional)
 	 * @param value the value object
 	 */
@@ -62,7 +62,7 @@ public class SqlParameterValue extends SqlParameter {
 
 	/**
 	 * Create a new SqlParameterValue, supplying the SQL type.
-	 * @param sqlType SQL type of the parameter according to <code>java.sql.Types</code>
+	 * @param sqlType SQL type of the parameter according to {@code java.sql.Types}
 	 * @param scale the number of digits after the decimal point
 	 * (for DECIMAL and NUMERIC types)
 	 * @param value the value object
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java
index 755990221b..708c7e9a07 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java
@@ -34,7 +34,7 @@ public interface SqlProvider {
 	/**
 	 * Return the SQL string for this object, i.e.
 	 * typically the SQL used for creating statements.
-	 * @return the SQL string, or <code>null</code>
+	 * @return the SQL string, or {@code null}
 	 */
 	String getSql();
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java
index 3a26964cde..4573cb95a5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java
@@ -60,7 +60,7 @@ public class SqlReturnResultSet extends ResultSetSupportingSqlParameter {
 	/**
 	 * Return whether this parameter is an implicit return parameter used during the
 	 * results preocessing of the CallableStatement.getMoreResults/getUpdateCount.
-	 * <p>This implementation always returns <code>true</code>.
+	 * <p>This implementation always returns {@code true}.
 	 */
 	@Override
 	public boolean isResultsParameter() {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java
index f4d056a5ee..543ebb3d12 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java
@@ -21,10 +21,10 @@ import java.sql.SQLException;
 
 /**
  * Interface to be implemented for retrieving values for more complex database-specific
- * types not supported by the standard <code>CallableStatement.getObject</code> method.
+ * types not supported by the standard {@code CallableStatement.getObject} method.
  *
  * <p>Implementations perform the actual work of getting the actual values. They must
- * implement the callback method <code>getTypeValue</code> which can throw SQLExceptions
+ * implement the callback method {@code getTypeValue} which can throw SQLExceptions
  * that will be caught and translated by the calling code. This callback method has
  * access to the underlying Connection via the given CallableStatement object, if that
  * should be needed to create any database-specific objects.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnUpdateCount.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnUpdateCount.java
index b5bb9866bf..397ce33e6f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnUpdateCount.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnUpdateCount.java
@@ -23,8 +23,8 @@ public class SqlReturnUpdateCount extends SqlParameter {
 
 	/**
 	 * Return whether this parameter holds input values that should be set
-	 * before execution even if they are <code>null</code>.
-	 * <p>This implementation always returns <code>false</code>.
+	 * before execution even if they are {@code null}.
+	 * <p>This implementation always returns {@code false}.
 	 */
 	@Override
 	public boolean isInputValueProvided() {
@@ -34,7 +34,7 @@ public class SqlReturnUpdateCount extends SqlParameter {
 	/**
 	 * Return whether this parameter is an implicit return parameter used during the
 	 * results preocessing of the CallableStatement.getMoreResults/getUpdateCount.
-	 * <p>This implementation always returns <code>true</code>.
+	 * <p>This implementation always returns {@code true}.
 	 */
 	@Override
 	public boolean isResultsParameter() {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java
index 4d11377486..38efce95b6 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java
@@ -32,8 +32,8 @@ import org.springframework.jdbc.support.rowset.SqlRowSet;
  *
  * <p>The default implementation uses a standard JDBC CachedRowSet underneath.
  * This means that JDBC RowSet support needs to be available at runtime:
- * by default, Sun's <code>com.sun.rowset.CachedRowSetImpl</code> class on Java 5 and 6,
- * or the <code>javax.sql.rowset.RowSetProvider</code> mechanism on Java 7 / JDBC 4.1.
+ * by default, Sun's {@code com.sun.rowset.CachedRowSetImpl} class on Java 5 and 6,
+ * or the {@code javax.sql.rowset.RowSetProvider} mechanism on Java 7 / JDBC 4.1.
  *
  * @author Juergen Hoeller
  * @since 1.2
@@ -82,10 +82,10 @@ public class SqlRowSetResultSetExtractor implements ResultSetExtractor<SqlRowSet
 
 	/**
 	 * Create a new CachedRowSet instance, to be populated by
-	 * the <code>createSqlRowSet</code> implementation.
+	 * the {@code createSqlRowSet} implementation.
 	 * <p>The default implementation uses JDBC 4.1's RowSetProvider
 	 * when running on JDK 7 or higher, falling back to Sun's
-	 * <code>com.sun.rowset.CachedRowSetImpl</code> class on older JDKs.
+	 * {@code com.sun.rowset.CachedRowSetImpl} class on older JDKs.
 	 * @return a new CachedRowSet instance
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see #createSqlRowSet
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java
index 6a55f386fb..e43a008975 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java
@@ -23,11 +23,11 @@ import org.springframework.jdbc.support.JdbcUtils;
 
 /**
  * Interface to be implemented for setting values for more complex database-specific
- * types not supported by the standard <code>setObject</code> method. This is
+ * types not supported by the standard {@code setObject} method. This is
  * effectively an extended variant of {@link org.springframework.jdbc.support.SqlValue}.
  *
  * <p>Implementations perform the actual work of setting the actual values. They must
- * implement the callback method <code>setTypeValue</code> which can throw SQLExceptions
+ * implement the callback method {@code setTypeValue} which can throw SQLExceptions
  * that will be caught and translated by the calling code. This callback method has
  * access to the underlying Connection via the given PreparedStatement object, if that
  * should be needed to create any database-specific objects.
@@ -44,7 +44,7 @@ public interface SqlTypeValue {
 
 	/**
 	 * Constant that indicates an unknown (or unspecified) SQL type.
-	 * Passed into <code>setTypeValue</code> if the original operation method
+	 * Passed into {@code setTypeValue} if the original operation method
 	 * does not specify a SQL type.
 	 * @see java.sql.Types
 	 * @see JdbcOperations#update(String, Object[])
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java
index b3837c2ddc..47c682070a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java
@@ -24,8 +24,8 @@ import org.springframework.dao.DataAccessException;
 /**
  * Generic callback interface for code that operates on a JDBC Statement.
  * Allows to execute any number of operations on a single Statement,
- * for example a single <code>executeUpdate</code> call or repeated
- * <code>executeUpdate</code> calls with varying SQL.
+ * for example a single {@code executeUpdate} call or repeated
+ * {@code executeUpdate} calls with varying SQL.
  *
  * <p>Used internally by JdbcTemplate, but also useful for application code.
  *
@@ -36,7 +36,7 @@ import org.springframework.dao.DataAccessException;
 public interface StatementCallback<T> {
 
 	/**
-	 * Gets called by <code>JdbcTemplate.execute</code> with an active JDBC
+	 * Gets called by {@code JdbcTemplate.execute} with an active JDBC
 	 * Statement. Does not need to care about closing the Statement or the
 	 * Connection, or about handling transactions: this will all be handled
 	 * by Spring's JdbcTemplate.
@@ -45,7 +45,7 @@ public interface StatementCallback<T> {
 	 * within the callback implementation. Spring will close the Statement
 	 * object after the callback returned, but this does not necessarily imply
 	 * that the ResultSet resources will be closed: the Statement objects might
-	 * get pooled by the connection pool, with <code>close</code> calls only
+	 * get pooled by the connection pool, with {@code close} calls only
 	 * returning the object to the pool but not physically closing the resources.
 	 *
 	 * <p>If called without a thread-bound JDBC transaction (initiated by
@@ -61,7 +61,7 @@ public interface StatementCallback<T> {
 	 * propagated to the caller of the template.
 	 *
 	 * @param stmt active JDBC Statement
-	 * @return a result object, or <code>null</code> if none
+	 * @return a result object, or {@code null} if none
 	 * @throws SQLException if thrown by a JDBC method, to be auto-converted
 	 * to a DataAccessException by a SQLExceptionTranslator
 	 * @throws DataAccessException in case of custom exceptions
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 19b1b67243..8f11d0bb74 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
@@ -92,7 +92,7 @@ public abstract class StatementCreatorUtils {
 	/**
 	 * Derive a default SQL type from the given Java type.
 	 * @param javaType the Java type to translate
-	 * @return the corresponding SQL type, or <code>null</code> if none found
+	 * @return the corresponding SQL type, or {@code null} if none found
 	 */
 	public static int javaTypeToSqlParameterType(Class javaType) {
 		Integer sqlType = javaTypeToSqlTypeMap.get(javaType);
@@ -367,7 +367,7 @@ public abstract class StatementCreatorUtils {
 	}
 
 	/**
-	 * Check whether the given value is a <code>java.util.Date</code>
+	 * 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) {
@@ -380,7 +380,7 @@ public abstract class StatementCreatorUtils {
 	/**
 	 * Clean up all resources held by parameter values which were passed to an
 	 * execute method. This is for example important for closing LOB values.
-	 * @param paramValues parameter values supplied. May be <code>null</code>.
+	 * @param paramValues parameter values supplied. May be {@code null}.
 	 * @see DisposableSqlTypeValue#cleanup()
 	 * @see org.springframework.jdbc.core.support.SqlLobValue#cleanup()
 	 */
@@ -393,7 +393,7 @@ public abstract class StatementCreatorUtils {
 	/**
 	 * Clean up all resources held by parameter values which were passed to an
 	 * execute method. This is for example important for closing LOB values.
-	 * @param paramValues parameter values supplied. May be <code>null</code>.
+	 * @param paramValues parameter values supplied. May be {@code null}.
 	 * @see DisposableSqlTypeValue#cleanup()
 	 * @see org.springframework.jdbc.core.support.SqlLobValue#cleanup()
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java
index 3224f125f8..9262314c93 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java
@@ -59,7 +59,7 @@ public abstract class AbstractSqlParameterSource implements SqlParameterSource {
 	 * Return the SQL type for the given parameter, if registered.
 	 * @param paramName the name of the parameter
 	 * @return the SQL type of the parameter,
-	 * or <code>TYPE_UNKNOWN</code> if not registered
+	 * or {@code TYPE_UNKNOWN} if not registered
 	 */
 	public int getSqlType(String paramName) {
 		Assert.notNull(paramName, "Parameter name must not be null");
@@ -74,7 +74,7 @@ public abstract class AbstractSqlParameterSource implements SqlParameterSource {
 	 * Return the type name for the given parameter, if registered.
 	 * @param paramName the name of the parameter
 	 * @return the type name of the parameter,
-	 * or <code>null</code> if not registered
+	 * or {@code null} if not registered
 	 */
 	public String getTypeName(String paramName) {
 		Assert.notNull(paramName, "Parameter name must not be null");
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
index cd048908b5..7f32e49831 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
  * <p>This class is intended for passing in a simple Map of parameter values
  * to the methods of the {@link NamedParameterJdbcTemplate} class.
  *
- * <p>The <code>addValue</code> methods on this class will make adding several
+ * <p>The {@code addValue} methods on this class will make adding several
  * values easier. The methods return a reference to the {@link MapSqlParameterSource}
  * itself, so you can chain several method calls together within a single statement.
  *
@@ -48,7 +48,7 @@ public class MapSqlParameterSource extends AbstractSqlParameterSource {
 
 	/**
 	 * Create an empty MapSqlParameterSource,
-	 * with values to be added via <code>addValue</code>.
+	 * with values to be added via {@code addValue}.
 	 * @see #addValue(String, Object)
 	 */
 	public MapSqlParameterSource() {
@@ -67,7 +67,7 @@ public class MapSqlParameterSource extends AbstractSqlParameterSource {
 
 	/**
 	 * Create a new MapSqlParameterSource based on a Map.
-	 * @param values a Map holding existing parameter values (can be <code>null</code>)
+	 * @param values a Map holding existing parameter values (can be {@code null})
 	 */
 	public MapSqlParameterSource(Map<String, ?> values) {
 		addValues(values);
@@ -124,7 +124,7 @@ public class MapSqlParameterSource extends AbstractSqlParameterSource {
 
 	/**
 	 * Add a Map of parameters to this parameter source.
-	 * @param values a Map holding existing parameter values (can be <code>null</code>)
+	 * @param values a Map holding existing parameter values (can be {@code null})
 	 * @return a reference to this parameter source,
 	 * so it's possible to chain several calls together
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
index 15a7a9e4ba..8c36763ca2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
@@ -64,7 +64,7 @@ public interface NamedParameterJdbcOperations {
 	 * @param sql SQL to execute
 	 * @param paramSource container of arguments to bind to the query
 	 * @param action callback object that specifies the action
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws DataAccessException if there is any problem
 	 */
 	<T> T execute(String sql, SqlParameterSource paramSource, PreparedStatementCallback<T> action)
@@ -82,7 +82,7 @@ public interface NamedParameterJdbcOperations {
 	 * @param paramMap map of parameters to bind to the query
 	 * (leaving it to the PreparedStatement to guess the corresponding SQL type)
 	 * @param action callback object that specifies the action
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws DataAccessException if there is any problem
 	 */
 	<T> T execute(String sql, Map<String, ?> paramMap, PreparedStatementCallback<T> action)
@@ -207,7 +207,7 @@ public interface NamedParameterJdbcOperations {
 	 * @param sql SQL query to execute
 	 * @param paramSource container of arguments to bind to the query
 	 * @param requiredType the type that the result object is expected to match
-	 * @return the result object of the required type, or <code>null</code> in case of SQL NULL
+	 * @return the result object of the required type, or {@code null} in case of SQL NULL
 	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
 	 * if the query does not return exactly one row, or does not return exactly
 	 * one column in that row
@@ -226,7 +226,7 @@ public interface NamedParameterJdbcOperations {
 	 * @param paramMap map of parameters to bind to the query
 	 * (leaving it to the PreparedStatement to guess the corresponding SQL type)
 	 * @param requiredType the type that the result object is expected to match
-	 * @return the result object of the required type, or <code>null</code> in case of SQL NULL
+	 * @return the result object of the required type, or {@code null} in case of SQL NULL
 	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException
 	 * if the query does not return exactly one row, or does not return exactly
 	 * one column in that row
@@ -346,7 +346,7 @@ public interface NamedParameterJdbcOperations {
 	 * @param sql SQL query to execute
 	 * @param paramSource container of arguments to bind to the query
 	 * @param elementType the required type of element in the result list
-	 * (for example, <code>Integer.class</code>)
+	 * (for example, {@code Integer.class})
 	 * @return a List of objects that match the specified element type
 	 * @throws org.springframework.dao.DataAccessException if the query fails
 	 * @see org.springframework.jdbc.core.JdbcTemplate#queryForList(String, Class)
@@ -364,7 +364,7 @@ public interface NamedParameterJdbcOperations {
 	 * @param paramMap map of parameters to bind to the query
 	 * (leaving it to the PreparedStatement to guess the corresponding SQL type)
 	 * @param elementType the required type of element in the result list
-	 * (for example, <code>Integer.class</code>)
+	 * (for example, {@code Integer.class})
 	 * @return a List of objects that match the specified element type
 	 * @throws org.springframework.dao.DataAccessException if the query fails
 	 * @see org.springframework.jdbc.core.JdbcTemplate#queryForList(String, Class)
@@ -410,13 +410,13 @@ public interface NamedParameterJdbcOperations {
 	 * <p>The results will be mapped to an SqlRowSet which holds the data in a
 	 * disconnected fashion. This wrapper will translate any SQLExceptions thrown.
 	 * <p>Note that that, for the default implementation, JDBC RowSet support needs to
-	 * be available at runtime: by default, Sun's <code>com.sun.rowset.CachedRowSetImpl</code>
+	 * be available at runtime: by default, Sun's {@code com.sun.rowset.CachedRowSetImpl}
 	 * class is used, which is part of JDK 1.5+ and also available separately as part of
 	 * Sun's JDBC RowSet Implementations download (rowset.jar).
 	 * @param sql SQL query to execute
 	 * @param paramSource container of arguments to bind to the query
 	 * @return a SqlRowSet representation (possibly a wrapper around a
-	 * <code>javax.sql.rowset.CachedRowSet</code>)
+	 * {@code javax.sql.rowset.CachedRowSet})
 	 * @throws org.springframework.dao.DataAccessException if there is any problem executing the query
 	 * @see org.springframework.jdbc.core.JdbcTemplate#queryForRowSet(String)
 	 * @see org.springframework.jdbc.core.SqlRowSetResultSetExtractor
@@ -430,14 +430,14 @@ public interface NamedParameterJdbcOperations {
 	 * <p>The results will be mapped to an SqlRowSet which holds the data in a
 	 * disconnected fashion. This wrapper will translate any SQLExceptions thrown.
 	 * <p>Note that that, for the default implementation, JDBC RowSet support needs to
-	 * be available at runtime: by default, Sun's <code>com.sun.rowset.CachedRowSetImpl</code>
+	 * be available at runtime: by default, Sun's {@code com.sun.rowset.CachedRowSetImpl}
 	 * class is used, which is part of JDK 1.5+ and also available separately as part of
 	 * Sun's JDBC RowSet Implementations download (rowset.jar).
 	 * @param sql SQL query to execute
 	 * @param paramMap map of parameters to bind to the query
 	 * (leaving it to the PreparedStatement to guess the corresponding SQL type)
 	 * @return a SqlRowSet representation (possibly a wrapper around a
-	 * <code>javax.sql.rowset.CachedRowSet</code>)
+	 * {@code javax.sql.rowset.CachedRowSet})
 	 * @throws org.springframework.dao.DataAccessException if there is any problem executing the query
 	 * @see org.springframework.jdbc.core.JdbcTemplate#queryForRowSet(String)
 	 * @see org.springframework.jdbc.core.SqlRowSetResultSetExtractor
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 bca63c4511..66131de8a7 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
@@ -305,7 +305,7 @@ public class NamedParameterJdbcTemplate implements NamedParameterJdbcOperations
 
 	/**
 	 * Build a PreparedStatementCreator based on the given SQL and named parameters.
-	 * <p>Note: Not used for the <code>update</code> variant with generated key handling.
+	 * <p>Note: Not used for the {@code update} variant with generated key handling.
 	 * @param sql SQL to execute
 	 * @param paramSource container of arguments to bind
 	 * @return the corresponding PreparedStatementCreator
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 552e3a526c..b28f05c620 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
@@ -304,7 +304,7 @@ public abstract class NamedParameterUtils {
 	 * @param parsedSql the parsed SQL statement
 	 * @param paramSource the source for named parameters
 	 * @param declaredParams the List of declared SqlParameter objects
-	 * (may be <code>null</code>). If specified, the parameter metadata will
+	 * (may be {@code null}). If specified, the parameter metadata will
 	 * be built into the value array in the form of SqlParameterValue objects.
 	 * @return the array of values
 	 */
@@ -340,7 +340,7 @@ public abstract class NamedParameterUtils {
 	 * @param declaredParams the declared SqlParameter objects
 	 * @param paramName the name of the desired parameter
 	 * @param paramIndex the index of the desired parameter
-	 * @return the declared SqlParameter, or <code>null</code> if none found
+	 * @return the declared SqlParameter, or {@code null} if none found
 	 */
 	private static SqlParameter findParameter(List<SqlParameter> declaredParams, String paramName, int paramIndex) {
 		if (declaredParams != null) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
index bdec709afd..2e0b481873 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
@@ -42,7 +42,7 @@ public interface SqlParameterSource {
 
 	/**
 	 * Constant that indicates an unknown (or unspecified) SQL type.
-	 * To be returned from <code>getType</code> when no specific SQL type known.
+	 * To be returned from {@code getType} when no specific SQL type known.
 	 * @see #getSqlType
 	 * @see java.sql.Types
 	 */
@@ -68,7 +68,7 @@ public interface SqlParameterSource {
 	 * Determine the SQL type for the specified named parameter.
 	 * @param paramName the name of the parameter
 	 * @return the SQL type of the specified parameter,
-	 * or <code>TYPE_UNKNOWN</code> if not known
+	 * or {@code TYPE_UNKNOWN} if not known
 	 * @see #TYPE_UNKNOWN
 	 */
 	int getSqlType(String paramName);
@@ -77,7 +77,7 @@ public interface SqlParameterSource {
 	 * Determine the type name for the specified named parameter.
 	 * @param paramName the name of the parameter
 	 * @return the type name of the specified parameter,
-	 * or <code>null</code> if not known
+	 * or {@code null} if not known
 	 */
 	String getTypeName(String paramName);
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java
index 5af6dd9a72..03f2491b99 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java
@@ -22,7 +22,7 @@ import org.springframework.jdbc.core.SqlParameterValue;
 
 /**
  * Class that provides helper methods for the use of {@link SqlParameterSource}
- * with <code>SimpleJdbc</code> classes.
+ * with {@code SimpleJdbc} classes.
  *
  * @author Thomas Risberg
  * @since 2.5
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java
index 55414697b5..2292bf39da 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/package-info.java
@@ -1,4 +1,3 @@
-
 /**
  *
  * JdbcTemplate variant with named parameter support.
@@ -9,7 +8,7 @@
  * NamedParameterJdbcOperations interface.
  *
  * <P>If you need the full power of Spring JDBC for less common operations, use
- * the <code>getJdbcOperations()</code> method of NamedParameterJdbcTemplate and
+ * the {@code getJdbcOperations()} method of NamedParameterJdbcTemplate and
  * work with the returned classic template, or use a JdbcTemplate instance directly.
  *
  */
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 c4a9db61aa..d9e7072431 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
@@ -197,10 +197,10 @@ public abstract class AbstractJdbcCall {
 
 	/**
 	 * Add a declared parameter to the list of parameters for the call.
-	 * Only parameters declared as <code>SqlParameter</code> and <code>SqlInOutParameter</code>
-	 * will be used to provide input values. This is different from the <code>StoredProcedure</code> class
+	 * 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</code>.
+	 * as {@code SqlOutParameter}.
 	 * @param parameter the {@link SqlParameter} to add
 	 */
 	public void addDeclaredParameter(SqlParameter parameter) {
@@ -326,7 +326,7 @@ public abstract class AbstractJdbcCall {
 	/**
 	 * Check whether this operation has been compiled already;
 	 * lazily compile it if not already compiled.
-	 * <p>Automatically called by <code>doExecute</code>.
+	 * <p>Automatically called by {@code doExecute}.
 	 */
 	protected void checkCompiled() {
 		if (!isCompiled()) {
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 55d12b94c6..200514aa83 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
@@ -308,7 +308,7 @@ public abstract class AbstractJdbcInsert {
 	/**
 	 * Check whether this operation has been compiled already;
 	 * lazily compile it if not already compiled.
-	 * <p>Automatically called by <code>validateParameters</code>.
+	 * <p>Automatically called by {@code validateParameters}.
 	 */
 	protected void checkCompiled() {
 		if (!isCompiled()) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
index 863f91ba0e..56109fa9c0 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
@@ -24,7 +24,7 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
  * and it must have a default or no-arg constructor.
  *
  * <p>Uses Java 5 covariant return types to override the return type of the {@link #mapRow}
- * method to be the type parameter <code>T</code>.
+ * method to be the type parameter {@code T}.
  *
  * <p>Column values are mapped based on matching the column name as obtained from result set
  * metadata to public setters for the corresponding properties. The names are matched either
@@ -33,7 +33,7 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
  *
  * <p>Mapping is provided for fields in the target class for many common types, e.g.:
  * String, boolean, Boolean, byte, Byte, short, Short, int, Integer, long, Long,
- * float, Float, double, Double, BigDecimal, <code>java.util.Date</code>, etc.
+ * float, Float, double, Double, BigDecimal, {@code java.util.Date}, etc.
  *
  * <p>The mapper can be configured to use the primitives default value when mapping null values
  * by setting the '{@link #setPrimitivesDefaultedForNullValue primitivesDefaultedForNullValue}'
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java
index 8522d39426..0f60c5da46 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java
@@ -21,14 +21,14 @@ import org.springframework.jdbc.core.SingleColumnRowMapper;
 /**
  * {@link ParameterizedRowMapper} implementation that converts a single column
  * into a single result value per row. Expects to operate on a
- * <code>java.sql.ResultSet</code> that just contains a single column.
+ * {@code java.sql.ResultSet} that just contains a single column.
  *
  * <p>The type of the result value for each row can be specified. The value
- * for the single column will be extracted from the <code>ResultSet</code>
+ * for the single column will be extracted from the {@code ResultSet}
  * and converted into the specified target type.
  *
  * <p>Uses Java 5 covariant return types to override the return type of the
- * {@link #mapRow} method to be the type parameter <code>T</code>.
+ * {@link #mapRow} method to be the type parameter {@code T}.
  *
  * @author Juergen Hoeller
  * @since 2.5.2
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 a83b2e7954..40d805e769 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
@@ -62,7 +62,7 @@ public class SimpleJdbcCall extends AbstractJdbcCall implements SimpleJdbcCallOp
 	/**
 	 * Constructor that takes one parameter with the JDBC DataSource to use when creating the
 	 * JdbcTemplate.
-	 * @param dataSource the <code>DataSource</code> to use
+	 * @param dataSource the {@code DataSource} to use
 	 * @see org.springframework.jdbc.core.JdbcTemplate#setDataSource
 	 */
 	public SimpleJdbcCall(DataSource dataSource) {
@@ -71,7 +71,7 @@ public class SimpleJdbcCall extends AbstractJdbcCall implements SimpleJdbcCallOp
 
 	/**
 	 * Alternative Constructor that takes one parameter with the JdbcTemplate to be used.
-	 * @param jdbcTemplate the <code>JdbcTemplate</code> to use
+	 * @param jdbcTemplate the {@code JdbcTemplate} to use
 	 * @see org.springframework.jdbc.core.JdbcTemplate#setDataSource
 	 */
 	public SimpleJdbcCall(JdbcTemplate jdbcTemplate) {
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 6c2d52d659..14fe2622a9 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
@@ -71,10 +71,10 @@ public interface SimpleJdbcCallOperations {
 	/**
 	 * 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</code> and <code>SqlInOutParameter</code>
-	 * will be used to provide input values.  This is different from the <code>StoredProcedure</code> class
+	 * 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</code>.
+	 * as {@code SqlOutParameter}.
 	 * @param sqlParameters the parameters to use
 	 * @return the instance of this SimpleJdbcCall
 	 */
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 20814d8501..095bc99bdf 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
@@ -53,7 +53,7 @@ public class SimpleJdbcInsert extends AbstractJdbcInsert implements SimpleJdbcIn
 	/**
 	 * Constructor that takes one parameter with the JDBC DataSource to use when creating the
 	 * JdbcTemplate.
-	 * @param dataSource the <code>DataSource</code> to use
+	 * @param dataSource the {@code DataSource} to use
 	 * @see org.springframework.jdbc.core.JdbcTemplate#setDataSource
 	 */
 	public SimpleJdbcInsert(DataSource dataSource) {
@@ -62,7 +62,7 @@ public class SimpleJdbcInsert extends AbstractJdbcInsert implements SimpleJdbcIn
 
 	/**
 	 * Alternative Constructor that takes one parameter with the JdbcTemplate to be used.
-	 * @param jdbcTemplate the <code>JdbcTemplate</code> to use
+	 * @param jdbcTemplate the {@code JdbcTemplate} to use
 	 * @see org.springframework.jdbc.core.JdbcTemplate#setDataSource
 	 */
 	public SimpleJdbcInsert(JdbcTemplate jdbcTemplate) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java
index 45e4644816..6b47fc2db3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java
@@ -58,7 +58,7 @@ public interface SimpleJdbcOperations {
 
 
 	/**
-	 * Query for an <code>int</code> passing in a SQL query
+	 * Query for an {@code int} passing in a SQL query
 	 * using the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
 	 * and a map containing the arguments.
@@ -68,17 +68,17 @@ public interface SimpleJdbcOperations {
 	int queryForInt(String sql, Map<String, ?> args) throws DataAccessException;
 
 	/**
-	 * Query for an <code>int</code> passing in a SQL query
+	 * Query for an {@code int} passing in a SQL query
 	 * using the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
-	 * and a <code>SqlParameterSource</code> containing the arguments.
+	 * and a {@code SqlParameterSource} containing the arguments.
 	 * @param sql the SQL query to run.
-	 * @param args the <code>SqlParameterSource</code> containing the arguments for the query.
+	 * @param args the {@code SqlParameterSource} containing the arguments for the query.
 	 */
 	int queryForInt(String sql, SqlParameterSource args) throws DataAccessException;
 
 	/**
-	 * Query for an <code>int</code> passing in a SQL query
+	 * Query for an {@code int} passing in a SQL query
 	 * using the standard '?' placeholders for parameters
 	 * and a variable number of arguments.
 	 * @param sql the SQL query to run.
@@ -87,7 +87,7 @@ public interface SimpleJdbcOperations {
 	int queryForInt(String sql, Object... args) throws DataAccessException;
 
 	/**
-	 * Query for an <code>long</code> passing in a SQL query
+	 * Query for an {@code long} passing in a SQL query
 	 * using the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
 	 * and a map containing the arguments.
@@ -97,17 +97,17 @@ public interface SimpleJdbcOperations {
 	long queryForLong(String sql, Map<String, ?> args) throws DataAccessException;
 
 	/**
-	 * Query for an <code>long</code> passing in a SQL query
+	 * Query for an {@code long} passing in a SQL query
 	 * using the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
-	 * and a <code>SqlParameterSource</code> containing the arguments.
+	 * and a {@code SqlParameterSource} containing the arguments.
 	 * @param sql the SQL query to run.
-	 * @param args the <code>SqlParameterSource</code> containing the arguments for the query
+	 * @param args the {@code SqlParameterSource} containing the arguments for the query
 	 */
 	long queryForLong(String sql, SqlParameterSource args) throws DataAccessException;
 
 	/**
-	 * Query for an <code>long</code> passing in a SQL query
+	 * Query for an {@code long} passing in a SQL query
 	 * using the standard '?' placeholders for parameters
 	 * and a variable number of arguments.
 	 * @param sql the SQL query to run.
@@ -116,7 +116,7 @@ public interface SimpleJdbcOperations {
 	long queryForLong(String sql, Object... args) throws DataAccessException;
 
 	/**
-	 * Query for an object of type <code>T</code> identified by the supplied @{@link Class}.
+	 * Query for an object of type {@code T} identified by the supplied @{@link Class}.
 	 * Uses sql with the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
 	 * @param sql the SQL query to run
@@ -129,12 +129,12 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for an object of type <code>T</code> identified by the supplied @{@link Class}.
+	 * Query for an object of type {@code T} identified by the supplied @{@link Class}.
 	 * Uses sql with the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
 	 * @param sql the SQL query to run
 	 * @param requiredType the required type of the return value
-	 * @param args the <code>SqlParameterSource</code> containing the arguments for the query
+	 * @param args the {@code SqlParameterSource} containing the arguments for the query
 	 * @see JdbcOperations#queryForObject(String, Class)
 	 * @see JdbcOperations#queryForObject(String, Object[], Class)
 	 */
@@ -142,7 +142,7 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for an object of type <code>T</code> identified by the supplied @{@link Class}.
+	 * Query for an object of type {@code T} identified by the supplied @{@link Class}.
 	 * Uses sql with the standard '?' placeholders for parameters
 	 * @param sql the SQL query to run
 	 * @param requiredType the required type of the return value
@@ -154,7 +154,7 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for an object of type <code>T</code> using the supplied
+	 * Query for an object of type {@code T} using the supplied
 	 * {@link RowMapper} to the query results to the object.
 	 * Uses sql with the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
@@ -168,7 +168,7 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for an object of type <code>T</code> using the supplied
+	 * Query for an object of type {@code T} using the supplied
 	 * {@link ParameterizedRowMapper} to the query results to the object.
 	 * Uses sql with the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
@@ -185,13 +185,13 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for an object of type <code>T</code> using the supplied
+	 * Query for an object of type {@code T} using the supplied
 	 * {@link RowMapper} to the query results to the object.
 	 * Uses sql with the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
 	 * @param sql the SQL query to run
 	 * @param rm the @{@link RowMapper} to use for result mapping
-	 * @param args the <code>SqlParameterSource</code> containing the arguments for the query
+	 * @param args the {@code SqlParameterSource} containing the arguments for the query
 	 * @see JdbcOperations#queryForObject(String, org.springframework.jdbc.core.RowMapper)
 	 * @see JdbcOperations#queryForObject(String, Object[], org.springframework.jdbc.core.RowMapper)
 	 */
@@ -199,13 +199,13 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for an object of type <code>T</code> using the supplied
+	 * Query for an object of type {@code T} using the supplied
 	 * {@link ParameterizedRowMapper} to the query results to the object.
 	 * Uses sql with the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
 	 * @param sql the SQL query to run
 	 * @param rm the @{@link ParameterizedRowMapper} to use for result mapping
-	 * @param args the <code>SqlParameterSource</code> containing the arguments for the query
+	 * @param args the {@code SqlParameterSource} containing the arguments for the query
 	 * @see JdbcOperations#queryForObject(String, org.springframework.jdbc.core.RowMapper)
 	 * @see JdbcOperations#queryForObject(String, Object[], org.springframework.jdbc.core.RowMapper)
 	 * @deprecated as of Spring 3.0: Use the method using the newly genericized RowMapper interface
@@ -216,7 +216,7 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for an object of type <code>T</code> using the supplied
+	 * Query for an object of type {@code T} using the supplied
 	 * {@link RowMapper} to the query results to the object.
 	 * Uses sql with the standard '?' placeholders for parameters
 	 * @param sql the SQL query to run
@@ -229,7 +229,7 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for an object of type <code>T</code> using the supplied
+	 * Query for an object of type {@code T} using the supplied
 	 * {@link ParameterizedRowMapper} to the query results to the object.
 	 * Uses sql with the standard '?' placeholders for parameters
 	 * @param sql the SQL query to run
@@ -245,7 +245,7 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for a {@link List} of <code>Objects</code> of type <code>T</code> using
+	 * Query for a {@link List} of {@code Objects} of type {@code T} using
 	 * the supplied {@link RowMapper} to the query results to the object.
 	 * Uses sql with the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
@@ -259,7 +259,7 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for a {@link List} of <code>Objects</code> of type <code>T</code> using
+	 * Query for a {@link List} of {@code Objects} of type {@code T} using
 	 * the supplied {@link ParameterizedRowMapper} to the query results to the object.
 	 * Uses sql with the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
@@ -276,13 +276,13 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for a {@link List} of <code>Objects</code> of type <code>T</code> using
+	 * Query for a {@link List} of {@code Objects} of type {@code T} using
 	 * the supplied {@link RowMapper} to the query results to the object.
 	 * Uses sql with the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
 	 * @param sql the SQL query to run
 	 * @param rm the @{@link RowMapper} to use for result mapping
-	 * @param args the <code>SqlParameterSource</code> containing the arguments for the query
+	 * @param args the {@code SqlParameterSource} containing the arguments for the query
 	 * @see JdbcOperations#queryForObject(String, org.springframework.jdbc.core.RowMapper)
 	 * @see JdbcOperations#queryForObject(String, Object[], org.springframework.jdbc.core.RowMapper)
 	 */
@@ -290,13 +290,13 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for a {@link List} of <code>Objects</code> of type <code>T</code> using
+	 * Query for a {@link List} of {@code Objects} of type {@code T} using
 	 * the supplied {@link ParameterizedRowMapper} to the query results to the object.
 	 * Uses sql with the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
 	 * @param sql the SQL query to run
 	 * @param rm the @{@link ParameterizedRowMapper} to use for result mapping
-	 * @param args the <code>SqlParameterSource</code> containing the arguments for the query
+	 * @param args the {@code SqlParameterSource} containing the arguments for the query
 	 * @see JdbcOperations#queryForObject(String, org.springframework.jdbc.core.RowMapper)
 	 * @see JdbcOperations#queryForObject(String, Object[], org.springframework.jdbc.core.RowMapper)
 	 * @deprecated as of Spring 3.0: Use the method using the newly genericized RowMapper interface
@@ -307,7 +307,7 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for a {@link List} of <code>Objects</code> of type <code>T</code> using
+	 * Query for a {@link List} of {@code Objects} of type {@code T} using
 	 * the supplied {@link RowMapper} to the query results to the object.
 	 * Uses sql with the standard '?' placeholders for parameters
 	 * @param sql the SQL query to run
@@ -320,7 +320,7 @@ public interface SimpleJdbcOperations {
 			throws DataAccessException;
 
 	/**
-	 * Query for a {@link List} of <code>Objects</code> of type <code>T</code> using
+	 * Query for a {@link List} of {@code Objects} of type {@code T} using
 	 * the supplied {@link ParameterizedRowMapper} to the query results to the object.
 	 * Uses sql with the standard '?' placeholders for parameters
 	 * @param sql the SQL query to run
@@ -356,7 +356,7 @@ public interface SimpleJdbcOperations {
 	 * Uses sql with the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
 	 * @param sql the SQL query to run
-	 * @param args the <code>SqlParameterSource</code> containing the arguments for the query
+	 * @param args the {@code SqlParameterSource} containing the arguments for the query
 	 * @see JdbcOperations#queryForMap(String)
 	 * @see JdbcOperations#queryForMap(String, Object[])
 	 */
@@ -397,7 +397,7 @@ public interface SimpleJdbcOperations {
 	 * Uses sql with the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
 	 * @param sql the SQL query to run
-	 * @param args the <code>SqlParameterSource</code> containing the arguments for the query
+	 * @param args the {@code SqlParameterSource} containing the arguments for the query
 	 * @see JdbcOperations#queryForList(String)
 	 * @see JdbcOperations#queryForList(String, Object[])
 	 */
@@ -433,7 +433,7 @@ public interface SimpleJdbcOperations {
 	 * Uses sql with the named parameter support provided by the
 	 * {@link org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate}
 	 * @param sql the SQL statement to execute
-	 * @param args the <code>SqlParameterSource</code> containing the arguments for the statement
+	 * @param args the {@code SqlParameterSource} containing the arguments for the statement
 	 * @return the numbers of rows affected by the update
 	 * @see NamedParameterJdbcOperations#update(String, SqlParameterSource)
 	 */
@@ -483,7 +483,7 @@ public interface SimpleJdbcOperations {
 	 * @param sql the SQL statement to execute.
 	 * @param batchArgs the List of Object arrays containing the batch of arguments for the query
 	 * @param argTypes SQL types of the arguments
-	 * (constants from <code>java.sql.Types</code>)
+	 * (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);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java
index 90f8f1c873..2dceb5f7c6 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/package-info.java
@@ -1,16 +1,15 @@
-
 /**
  *
  * Simplification layer over JdbcTemplate for Java 5 and above.
  *
- * <p><code>SimpleJdbcInsert</code> and <code>SimpleJdbcCall</code> are classes that takes advantage
+ * <p>{@code SimpleJdbcInsert} and {@code SimpleJdbcCall} are classes that takes advantage
  * of database metadata provided by the JDBC driver to simplify the application code. Much of the
  * parameter specification becomes unnecessary since it can be looked up in the metadata.
  *
- * Note: The <code>SimpleJdbcOperations</code> and <code>SimpleJdbcTemplate</code>, which provides a wrapper
+ * Note: The {@code SimpleJdbcOperations} and {@code SimpleJdbcTemplate}, which provides a wrapper
  * around JdbcTemplate to take advantage of Java 5 features like generics, varargs and autoboxing, is now deprecated
- * since Spring 3.1. All functionality is now available in the <code>JdbcOperations</code> and
- * <code>NamedParametersOperations</code> respectively.
+ * since Spring 3.1. All functionality is now available in the {@code JdbcOperations} and
+ * {@code NamedParametersOperations} respectively.
  *
  */
 package org.springframework.jdbc.core.simple;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java
index 64b115d3fd..773bb23af8 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java
@@ -52,7 +52,7 @@ public abstract class AbstractInterruptibleBatchPreparedStatementSetter
 	}
 
 	/**
-	 * This implementation returns <code>Integer.MAX_VALUE</code>.
+	 * This implementation returns {@code Integer.MAX_VALUE}.
 	 * Can be overridden in subclasses to lower the maximum batch size.
 	 */
 	public int getBatchSize() {
@@ -62,7 +62,7 @@ public abstract class AbstractInterruptibleBatchPreparedStatementSetter
 
 	/**
 	 * Check for available values and set them on the given PreparedStatement.
-	 * If no values are available anymore, return <code>false</code>.
+	 * If no values are available anymore, return {@code false}.
 	 * @param ps PreparedStatement we'll invoke setter methods on
 	 * @param i index of the statement we're issuing in the batch, starting from 0
 	 * @return whether there were values to apply (that is, whether the applied
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java
index 132559ab33..c48c2e46cb 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java
@@ -28,7 +28,7 @@ import org.springframework.jdbc.support.lob.LobHandler;
  * Abstract PreparedStatementCallback implementation that manages a LobCreator.
  * Typically used as inner class, with access to surrounding method arguments.
  *
- * <p>Delegates to the <code>setValues</code> template method for setting values
+ * <p>Delegates to the {@code setValues} template method for setting values
  * on the PreparedStatement, using a given LobCreator for BLOB/CLOB arguments.
  *
  * <p>A usage example with JdbcTemplate:
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java
index df22236518..3cc259f679 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java
@@ -30,7 +30,7 @@ import org.springframework.jdbc.core.ResultSetExtractor;
  * Abstract ResultSetExtractor implementation that assumes streaming of LOB data.
  * Typically used as inner class, with access to surrounding method arguments.
  *
- * <p>Delegates to the <code>streamData</code> template method for streaming LOB
+ * <p>Delegates to the {@code streamData} template method for streaming LOB
  * content to some OutputStream, typically using a LobHandler. Converts an
  * IOException thrown during streaming to a LobRetrievalFailureException.
  *
@@ -44,8 +44,8 @@ import org.springframework.jdbc.core.ResultSetExtractor;
  *		 new AbstractLobStreamingResultSetExtractor() {
  *			 public void streamData(ResultSet rs) throws SQLException, IOException {
  *				 FileCopyUtils.copy(lobHandler.getBlobAsBinaryStream(rs, 1), contentStream);
- *			 }
- *		 }
+ *             }
+ *         }
  * );</pre>
  *
  * @author Juergen Hoeller
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java
index d28df9d412..64ddf0d544 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java
@@ -25,7 +25,7 @@ import org.springframework.jdbc.core.SqlTypeValue;
 /**
  * Abstract implementation of the SqlTypeValue interface, for convenient
  * creation of type values that are supposed to be passed into the
- * <code>PreparedStatement.setObject</code> method. The <code>createTypeValue</code>
+ * {@code PreparedStatement.setObject} method. The {@code createTypeValue}
  * callback method has access to the underlying Connection, if that should
  * be needed to create any database-specific objects.
  *
@@ -65,7 +65,7 @@ public abstract class AbstractSqlTypeValue implements SqlTypeValue {
 	}
 
 	/**
-	 * Create the type value to be passed into <code>PreparedStatement.setObject</code>.
+	 * Create the type value to be passed into {@code PreparedStatement.setObject}.
 	 * @param con the JDBC Connection, if needed to create any database-specific objects
 	 * @param sqlType SQL type of the parameter we are setting
 	 * @param typeName the type name of the parameter
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
index 9eb0fa9b93..12b7af7550 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
@@ -99,7 +99,7 @@ public class JdbcBeanDefinitionReader {
 	 * @param sql SQL query to use for loading bean definitions.
 	 * The first three columns must be bean name, property name and value.
 	 * Any join and any other columns are permitted: e.g.
-	 * <code>SELECT BEAN_NAME, PROPERTY, VALUE FROM CONFIG WHERE CONFIG.APP_ID = 1</code>
+	 * {@code SELECT BEAN_NAME, PROPERTY, VALUE FROM CONFIG WHERE CONFIG.APP_ID = 1}
 	 * It's also possible to perform a join. Column names are not significant --
 	 * only the ordering of these first three columns.
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
index d6ae0fde76..3acae09970 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
@@ -35,7 +35,7 @@ import org.springframework.jdbc.support.SQLExceptionTranslator;
  *
  * <p>This base class is mainly intended for JdbcTemplate usage but can
  * also be used when working with a Connection directly or when using
- * <code>org.springframework.jdbc.object</code> operation objects.
+ * {@code org.springframework.jdbc.object} operation objects.
  *
  * @author Juergen Hoeller
  * @since 28.07.2003
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/package-info.java
index 59bb852cbd..2ae7209956 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/package-info.java
@@ -1,7 +1,6 @@
-
 /**
  *
- * Classes supporting the <code>org.springframework.jdbc.core</code> package.
+ * Classes supporting the {@code org.springframework.jdbc.core} package.
  * Contains a DAO base class for JdbcTemplate usage.
  *
  */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java
index d677b5fd77..0674c79b47 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFactory;
  * implementations, taking care of the padding.
  *
  * <p>'Padding' in the context of this class means default implementations
- * for certain methods from the <code>DataSource</code> interface, such as
+ * for certain methods from the {@code DataSource} interface, such as
  * {@link #getLoginTimeout()}, {@link #setLoginTimeout(int)}, and so forth.
  *
  * @author Juergen Hoeller
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
index 06b142cc79..d93bb083bb 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
@@ -109,7 +109,7 @@ public abstract class AbstractDriverBasedDataSource extends AbstractDataSource {
 
 
 	/**
-	 * This implementation delegates to <code>getConnectionFromDriver</code>,
+	 * This implementation delegates to {@code getConnectionFromDriver},
 	 * using the default username and password of this DataSource.
 	 * @see #getConnectionFromDriver(String, String)
 	 * @see #setUsername
@@ -120,7 +120,7 @@ public abstract class AbstractDriverBasedDataSource extends AbstractDataSource {
 	}
 
 	/**
-	 * This implementation delegates to <code>getConnectionFromDriver</code>,
+	 * This implementation delegates to {@code getConnectionFromDriver},
 	 * using the given username and password.
 	 * @see #getConnectionFromDriver(String, String)
 	 */
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 8b3e3f274b..bc8f6876d3 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
@@ -121,8 +121,8 @@ public class ConnectionHolder extends ResourceHolderSupport {
 
 	/**
 	 * Override the existing Connection handle with the given Connection.
-	 * Reset the handle if given <code>null</code>.
-	 * <p>Used for releasing the Connection on suspend (with a <code>null</code>
+	 * Reset the handle if given {@code null}.
+	 * <p>Used for releasing the Connection on suspend (with a {@code null}
 	 * argument) and setting a fresh Connection on resume.
 	 */
 	protected void setConnection(Connection connection) {
@@ -140,7 +140,7 @@ public class ConnectionHolder extends ResourceHolderSupport {
 
 	/**
 	 * Return the current Connection held by this ConnectionHolder.
-	 * <p>This will be the same Connection until <code>released</code>
+	 * <p>This will be the same Connection until {@code released}
 	 * gets called on the ConnectionHolder, which will reset the
 	 * held Connection, fetching a new Connection on demand.
 	 * @see ConnectionHandle#getConnection()
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java
index c18b51a783..74eff9a816 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java
@@ -40,7 +40,7 @@ public interface ConnectionProxy extends Connection {
 	 * Return the target Connection of this proxy.
 	 * <p>This will typically be the native driver Connection
 	 * or a wrapper from a connection pool.
-	 * @return the underlying Connection (never <code>null</code>)
+	 * @return the underlying Connection (never {@code null})
 	 */
 	Connection getTargetConnection();
 
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 e2b4fb8951..83aa4c4445 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
@@ -33,7 +33,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * {@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</code>
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
index 6179a5103c..7c58f69d61 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
@@ -234,7 +234,7 @@ public abstract class DataSourceUtils {
 	 * bound to the current thread by Spring's transaction facilities.
 	 * @param con the Connection to check
 	 * @param dataSource the DataSource that the Connection was obtained from
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @return whether the Connection is transactional
 	 */
 	public static boolean isConnectionTransactional(Connection con, DataSource dataSource) {
@@ -284,9 +284,9 @@ public abstract class DataSourceUtils {
 	 * Close the given Connection, obtained from the given DataSource,
 	 * if it is not managed externally (that is, not bound to the thread).
 	 * @param con the Connection to close if necessary
-	 * (if this is <code>null</code>, the call will be ignored)
+	 * (if this is {@code null}, the call will be ignored)
 	 * @param dataSource the DataSource that the Connection was obtained from
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @see #getConnection
 	 */
 	public static void releaseConnection(Connection con, DataSource dataSource) {
@@ -306,9 +306,9 @@ public abstract class DataSourceUtils {
 	 * Same as {@link #releaseConnection}, but throwing the original SQLException.
 	 * <p>Directly accessed by {@link TransactionAwareDataSourceProxy}.
 	 * @param con the Connection to close if necessary
-	 * (if this is <code>null</code>, the call will be ignored)
+	 * (if this is {@code null}, the call will be ignored)
 	 * @param dataSource the DataSource that the Connection was obtained from
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see #doGetConnection
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
index 2e8ef41a57..b039303087 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
@@ -27,7 +27,7 @@ import org.springframework.util.ClassUtils;
 /**
  * Simple implementation of the standard JDBC {@link javax.sql.DataSource} interface,
  * configuring the plain old JDBC {@link java.sql.DriverManager} via bean properties, and
- * returning a new {@link java.sql.Connection} from every <code>getConnection</code> call.
+ * returning a new {@link java.sql.Connection} from every {@code getConnection} call.
  *
  * <p><b>NOTE: This class is not an actual connection pool; it does not actually
  * pool Connections.</b> It just serves as simple replacement for a full-blown
@@ -36,7 +36,7 @@ import org.springframework.util.ClassUtils;
  *
  * <p>Useful for test or standalone environments outside of a J2EE container, either
  * as a DataSource bean in a corresponding ApplicationContext or in conjunction with
- * a simple JNDI environment. Pool-assuming <code>Connection.close()</code> calls will
+ * a simple JNDI environment. Pool-assuming {@code Connection.close()} calls will
  * simply close the Connection, so any DataSource-aware persistence code should work.
  *
  * <p><b>NOTE: Within special class loading environments such as OSGi, this class
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java
index 14f76bff32..cbc85e13cc 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java
@@ -27,7 +27,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 /**
  * An adapter for a target {@link javax.sql.DataSource}, applying the current
  * Spring transaction's isolation level (and potentially specified user credentials)
- * to every <code>getConnection</code> call. Also applies the read-only flag,
+ * to every {@code getConnection} call. Also applies the read-only flag,
  * if specified.
  *
  * <p>Can be used to proxy a target JNDI DataSource that does not have the
@@ -109,7 +109,7 @@ public class IsolationLevelDataSourceAdapter extends UserCredentialsDataSourceAd
 
 	/**
 	 * Return the statically specified isolation level,
-	 * or <code>null</code> if none.
+	 * or {@code null} if none.
 	 */
 	protected Integer getIsolationLevel() {
 		return this.isolationLevel;
@@ -139,7 +139,7 @@ public class IsolationLevelDataSourceAdapter extends UserCredentialsDataSourceAd
 	/**
 	 * Determine the current isolation level: either the transaction's
 	 * isolation level or a statically defined isolation level.
-	 * @return the current isolation level, or <code>null</code> if none
+	 * @return the current isolation level, or {@code null} if none
 	 * @see org.springframework.transaction.support.TransactionSynchronizationManager#getCurrentTransactionIsolationLevel()
 	 * @see #setIsolationLevel
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
index b1972b29ae..1791e82fb1 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
 /**
  * Simple implementation of the standard JDBC {@link javax.sql.DataSource} interface,
  * configuring a plain old JDBC {@link java.sql.Driver} via bean properties, and returning
- * a new {@link java.sql.Connection} from every <code>getConnection</code> call.
+ * a new {@link java.sql.Connection} from every {@code getConnection} call.
  *
  * <p><b>NOTE: This class is not an actual connection pool; it does not actually
  * pool Connections.</b> It just serves as simple replacement for a full-blown
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java
index 05edcab08b..ba6495727e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java
@@ -32,15 +32,15 @@ import org.springframework.util.ObjectUtils;
  * which is not closed after use. Obviously, this is not multi-threading capable.
  *
  * <p>Note that at shutdown, someone should close the underlying Connection
- * via the <code>close()</code> method. Client code will never call close
+ * via the {@code close()} method. Client code will never call close
  * on the Connection handle if it is SmartDataSource-aware (e.g. uses
- * <code>DataSourceUtils.releaseConnection</code>).
+ * {@code DataSourceUtils.releaseConnection}).
  *
- * <p>If client code will call <code>close()</code> in the assumption of a pooled
+ * <p>If client code will call {@code close()} in the assumption of a pooled
  * Connection, like when using persistence tools, set "suppressClose" to "true".
  * This will return a close-suppressing proxy instead of the physical Connection.
  * Be aware that you will not be able to cast this to a native
- * <code>OracleConnection</code> or the like anymore; you need to use a
+ * {@code OracleConnection} or the like anymore; you need to use a
  * {@link org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractor} then.
  *
  * <p>This is primarily intended for testing. For example, it enables easy testing
@@ -134,7 +134,7 @@ public class SingleConnectionDataSource extends DriverManagerDataSource
 	 * Create a new SingleConnectionDataSource with a given Connection.
 	 * @param target underlying target Connection
 	 * @param suppressClose if the Connection should be wrapped with a Connection that
-	 * suppresses <code>close()</code> calls (to allow for normal <code>close()</code>
+	 * suppresses {@code close()} calls (to allow for normal {@code close()}
 	 * usage in applications that expect a pooled Connection but do not know our
 	 * SmartDataSource interface)
 	 */
@@ -171,7 +171,7 @@ public class SingleConnectionDataSource extends DriverManagerDataSource
 
 	/**
 	 * Return whether the returned Connection's "autoCommit" setting should be overridden.
-	 * @return the "autoCommit" value, or <code>null</code> if none to be applied
+	 * @return the "autoCommit" value, or {@code null} if none to be applied
 	 */
 	protected Boolean getAutoCommitValue() {
 		return this.autoCommit;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java
index 9885f48efe..f55def12cf 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java
@@ -21,7 +21,7 @@ import java.sql.Connection;
 import javax.sql.DataSource;
 
 /**
- * Extension of the <code>javax.sql.DataSource</code> interface, to be
+ * Extension of the {@code javax.sql.DataSource} interface, to be
  * implemented by special DataSources that return JDBC Connections
  * in an unwrapped fashion.
  *
@@ -40,7 +40,7 @@ public interface SmartDataSource extends DataSource {
 	/**
 	 * Should we close this Connection, obtained from this DataSource?
 	 * <p>Code that uses Connections from a SmartDataSource should always
-	 * perform a check via this method before invoking <code>close()</code>.
+	 * perform a check via this method before invoking {@code close()}.
 	 * <p>Note that the JdbcTemplate class in the 'jdbc.core' package takes care of
 	 * releasing JDBC Connections, freeing application code of this responsibility.
 	 * @param con the Connection to check
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
index 535ef53d10..08b2f590b5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
@@ -46,7 +46,7 @@ import org.springframework.util.Assert;
  *
  * <p>Delegates to {@link DataSourceUtils} for automatically participating in
  * thread-bound transactions, for example managed by {@link DataSourceTransactionManager}.
- * <code>getConnection</code> calls and <code>close</code> calls on returned Connections
+ * {@code getConnection} calls and {@code close} calls on returned Connections
  * will behave properly within a transaction, i.e. always operate on the transactional
  * Connection. If not within a transaction, normal DataSource behavior applies.
  *
@@ -129,7 +129,7 @@ public class TransactionAwareDataSourceProxy extends DelegatingDataSource {
 
 	/**
 	 * Wraps the given Connection with a proxy that delegates every method call to it
-	 * but delegates <code>close()</code> calls to DataSourceUtils.
+	 * but delegates {@code close()} calls to DataSourceUtils.
 	 * @param targetDataSource DataSource that the Connection came from
 	 * @return the wrapped Connection
 	 * @see java.sql.Connection#close()
@@ -145,7 +145,7 @@ public class TransactionAwareDataSourceProxy extends DelegatingDataSource {
 	/**
 	 * Determine whether to obtain a fixed target Connection for the proxy
 	 * or to reobtain the target Connection for each operation.
-	 * <p>The default implementation returns <code>true</code> for all
+	 * <p>The default implementation returns {@code true} for all
 	 * standard cases. This can be overridden through the
 	 * {@link #setReobtainTransactionalConnections "reobtainTransactionalConnections"}
 	 * flag, which enforces a non-fixed target Connection within an active transaction.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
index 166c4d5477..443b408b7f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
@@ -25,14 +25,14 @@ import org.springframework.util.StringUtils;
 
 /**
  * An adapter for a target JDBC {@link javax.sql.DataSource}, applying the specified
- * user credentials to every standard <code>getConnection()</code> call, implicitly
- * invoking <code>getConnection(username, password)</code> on the target.
+ * user credentials to every standard {@code getConnection()} call, implicitly
+ * invoking {@code getConnection(username, password)} on the target.
  * All other methods simply delegate to the corresponding methods of the
  * target DataSource.
  *
  * <p>Can be used to proxy a target JNDI DataSource that does not have user
  * credentials configured. Client code can work with this DataSource as usual,
- * using the standard <code>getConnection()</code> call.
+ * using the standard {@code getConnection()} call.
  *
  * <p>In the following example, client code can simply transparently work with
  * the preconfigured "myDataSource", implicitly accessing "myTargetDataSource"
@@ -50,7 +50,7 @@ import org.springframework.util.StringUtils;
  * &lt;/bean></pre>
  *
  * <p>If the "username" is empty, this proxy will simply delegate to the
- * standard <code>getConnection()</code> method of the target DataSource.
+ * standard {@code getConnection()} method of the target DataSource.
  * This can be used to keep a UserCredentialsDataSourceAdapter bean definition
  * just for the <i>option</i> of implicitly passing in user credentials if
  * the particular target DataSource requires it.
@@ -97,7 +97,7 @@ public class UserCredentialsDataSourceAdapter extends DelegatingDataSource {
 	/**
 	 * Set user credententials for this proxy and the current thread.
 	 * The given username and password will be applied to all subsequent
-	 * <code>getConnection()</code> calls on this DataSource proxy.
+	 * {@code getConnection()} calls on this DataSource proxy.
 	 * <p>This will override any statically specified user credentials,
 	 * that is, values of the "username" and "password" bean properties.
 	 * @param username the username to apply
@@ -146,10 +146,10 @@ public class UserCredentialsDataSourceAdapter extends DelegatingDataSource {
 	}
 
 	/**
-	 * This implementation delegates to the <code>getConnection(username, password)</code>
+	 * This implementation delegates to the {@code getConnection(username, password)}
 	 * method of the target DataSource, passing in the specified user credentials.
 	 * If the specified username is empty, it will simply delegate to the standard
-	 * <code>getConnection()</code> method of the target DataSource.
+	 * {@code getConnection()} method of the target DataSource.
 	 * @param username the username to use
 	 * @param password the password to use
 	 * @return the Connection
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
index af04d4f957..9d6ba9236d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
@@ -125,7 +125,7 @@ public class WebSphereDataSourceAdapter extends IsolationLevelDataSourceAdapter
 
 	/**
 	 * Builds a WebSphere JDBCConnectionSpec object for the current settings
-	 * and calls <code>WSDataSource.getConnection(JDBCConnectionSpec)</code>.
+	 * and calls {@code WSDataSource.getConnection(JDBCConnectionSpec)}.
 	 * @see #createConnectionSpec
 	 * @see com.ibm.websphere.rsadapter.WSDataSource#getConnection(com.ibm.websphere.rsadapter.JDBCConnectionSpec)
 	 */
@@ -144,15 +144,15 @@ public class WebSphereDataSourceAdapter extends IsolationLevelDataSourceAdapter
 	}
 
 	/**
-	 * Create a WebSphere <code>JDBCConnectionSpec</code> object for the given charateristics.
+	 * Create a WebSphere {@code JDBCConnectionSpec} object for the given charateristics.
 	 * <p>The default implementation uses reflection to apply the given settings.
 	 * Can be overridden in subclasses to customize the JDBCConnectionSpec object
 	 * (<a href="http://publib.boulder.ibm.com/infocenter/wasinfo/v6r0/topic/com.ibm.websphere.javadoc.doc/public_html/api/com/ibm/websphere/rsadapter/JDBCConnectionSpec.html">JDBCConnectionSpec javadoc</a>;
 	 * <a href="http://www.ibm.com/developerworks/websphere/library/techarticles/0404_tang/0404_tang.html">IBM developerWorks article</a>).
-	 * @param isolationLevel the isolation level to apply (or <code>null</code> if none)
-	 * @param readOnlyFlag the read-only flag to apply (or <code>null</code> if none)
-	 * @param username the username to apply (<code>null</code> or empty indicates the default)
-	 * @param password the password to apply (may be <code>null</code> or empty)
+	 * @param isolationLevel the isolation level to apply (or {@code null} if none)
+	 * @param readOnlyFlag the read-only flag to apply (or {@code null} if none)
+	 * @param username the username to apply ({@code null} or empty indicates the default)
+	 * @param password the password to apply (may be {@code null} or empty)
 	 * @throws SQLException if thrown by JDBCConnectionSpec API methods
 	 * @see com.ibm.websphere.rsadapter.JDBCConnectionSpec
 	 */
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 6555e2c557..82b0a31c3b 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
@@ -96,8 +96,8 @@ public class EmbeddedDatabaseBuilder {
 
 	/**
 	 * Add default scripts to execute to populate the database.
-	 * <p>The default scripts are <code>schema.sql</code> to create the db
-	 * schema and <code>data.sql</code> to populate the db with data.
+	 * <p>The default scripts are {@code schema.sql} to create the db
+	 * schema and {@code data.sql} to populate the db with data.
 	 * @return this, to facilitate method chaining
 	 */
 	public EmbeddedDatabaseBuilder addDefaultScripts() {
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 bd5e3264eb..6ea06ebb3d 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
@@ -156,7 +156,7 @@ public class EmbeddedDatabaseFactory {
 
 	/**
 	 * Hook that gets the DataSource that provides the connectivity to the embedded database.
-	 * <p>Returns <code>null</code> if the DataSource has not been initialized or the 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.
 	 */
 	protected final DataSource getDataSource() {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
index 4401a64e6f..f42cbb72f8 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
@@ -86,7 +86,7 @@ public abstract class AbstractRoutingDataSource extends AbstractDataSource imple
 	 * in the target DataSource map - simply falling back to the default DataSource
 	 * in that case.
 	 * <p>Switch this flag to "false" if you would prefer the fallback to only apply
-	 * if the lookup key was <code>null</code>. Lookup keys without a DataSource
+	 * if the lookup key was {@code null}. Lookup keys without a DataSource
 	 * entry will then lead to an IllegalStateException.
 	 * @see #setTargetDataSources
 	 * @see #setDefaultTargetDataSource
@@ -141,7 +141,7 @@ public abstract class AbstractRoutingDataSource extends AbstractDataSource imple
 	 * names (to be resolved via a {@link #setDataSourceLookup DataSourceLookup}).
 	 * @param dataSource the data source value object as specified in the
 	 * {@link #setTargetDataSources targetDataSources} map
-	 * @return the resolved DataSource (never <code>null</code>)
+	 * @return the resolved DataSource (never {@code null})
 	 * @throws IllegalArgumentException in case of an unsupported value type
 	 */
 	protected DataSource resolveSpecifiedDataSource(Object dataSource) throws IllegalArgumentException {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
index 144bf69aad..c460b90663 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
  * {@link DataSourceLookup} implementation based on a Spring {@link BeanFactory}.
  *
  * <p>Will lookup Spring managed beans identified by bean name,
- * expecting them to be of type <code>javax.sql.DataSource</code>.
+ * expecting them to be of type {@code javax.sql.DataSource}.
  *
  * @author Costin Leau
  * @author Juergen Hoeller
@@ -41,7 +41,7 @@ public class BeanFactoryDataSourceLookup implements DataSourceLookup, BeanFactor
 
 	/**
 	 * Create a new instance of the {@link BeanFactoryDataSourceLookup} class.
-	 * <p>The BeanFactory to access must be set via <code>setBeanFactory</code>.
+	 * <p>The BeanFactory to access must be set via {@code setBeanFactory}.
 	 * @see #setBeanFactory
 	 */
 	public BeanFactoryDataSourceLookup() {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java
index dd10476a02..55bb0b7493 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java
@@ -22,7 +22,7 @@ import javax.sql.DataSource;
  * Strategy interface for looking up DataSources by name.
  *
  * <p>Used, for example, to resolve data source names in JPA
- * <code>persistence.xml</code> files.
+ * {@code persistence.xml} files.
  *
  * @author Costin Leau
  * @author Juergen Hoeller
@@ -34,7 +34,7 @@ public interface DataSourceLookup {
 	/**
 	 * Retrieve the DataSource identified by the given name.
 	 * @param dataSourceName the name of the DataSource
-	 * @return the DataSource (never <code>null</code>)
+	 * @return the DataSource (never {@code null})
 	 * @throws DataSourceLookupFailureException if the lookup failed
 	 */
 	DataSource getDataSource(String dataSourceName) throws DataSourceLookupFailureException;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
index c8e2d06dc4..e35c827565 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
@@ -67,7 +67,7 @@ public class MapDataSourceLookup implements DataSourceLookup {
 	/**
 	 * Set the {@link Map} of {@link DataSource DataSources}; the keys
 	 * are {@link String Strings}, the values are actual {@link DataSource} instances.
-	 * <p>If the supplied {@link Map} is <code>null</code>, then this method
+	 * <p>If the supplied {@link Map} is {@code null}, then this method
 	 * call effectively has no effect.
 	 * @param dataSources said {@link Map} of {@link DataSource DataSources}
 	 */
@@ -80,7 +80,7 @@ public class MapDataSourceLookup implements DataSourceLookup {
 	/**
 	 * Get the {@link Map} of {@link DataSource DataSources} maintained by this object.
 	 * <p>The returned {@link Map} is {@link Collections#unmodifiableMap(java.util.Map) unmodifiable}.
-	 * @return said {@link Map} of {@link DataSource DataSources} (never <code>null</code>)
+	 * @return said {@link Map} of {@link DataSource DataSources} (never {@code null})
 	 */
 	public Map<String, DataSource> getDataSources() {
 		return Collections.unmodifiableMap(this.dataSources);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
index 3a757389d9..c4898e44b3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
@@ -30,11 +30,11 @@ import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 /**
  * SqlUpdate subclass that performs batch update operations. Encapsulates
  * queuing up records to be updated, and adds them as a single batch once
- * <code>flush</code> is called or the given batch size has been met.
+ * {@code flush} is called or the given batch size has been met.
  *
  * <p>Note that this class is a <b>non-thread-safe object</b>, in contrast
  * to all other JDBC operations objects in this package. You need to create
- * a new instance of it for each use, or call <code>reset</code> before
+ * a new instance of it for each use, or call {@code reset} before
  * reuse within the same thread.
  *
  * @author Keith Donald
@@ -85,7 +85,7 @@ public class BatchSqlUpdate extends SqlUpdate {
 	 * @param ds DataSource to use to obtain connections
 	 * @param sql SQL statement to execute
 	 * @param types SQL types of the parameters, as defined in the
-	 * <code>java.sql.Types</code> class
+	 * {@code java.sql.Types} class
 	 * @see java.sql.Types
 	 */
 	public BatchSqlUpdate(DataSource ds, String sql, int[] types) {
@@ -99,7 +99,7 @@ public class BatchSqlUpdate extends SqlUpdate {
 	 * @param ds DataSource to use to obtain connections
 	 * @param sql SQL statement to execute
 	 * @param types SQL types of the parameters, as defined in the
-	 * <code>java.sql.Types</code> class
+	 * {@code java.sql.Types} class
 	 * @param batchSize the number of statements that will trigger
 	 * an automatic intermediate flush
 	 * @see java.sql.Types
@@ -112,11 +112,11 @@ public class BatchSqlUpdate extends SqlUpdate {
 
 	/**
 	 * Set the number of statements that will trigger an automatic intermediate
-	 * flush. <code>update</code> calls or the given statement parameters will
+	 * flush. {@code update} calls or the given statement parameters will
 	 * be queued until the batch size is met, at which point it will empty the
 	 * queue and execute the batch.
 	 * <p>You can also flush already queued statements with an explicit
-	 * <code>flush</code> call. Note that you need to this after queueing
+	 * {@code flush} call. Note that you need to this after queueing
 	 * all parameters to guarantee that all statements have been flushed.
 	 */
 	public void setBatchSize(int batchSize) {
@@ -144,13 +144,13 @@ public class BatchSqlUpdate extends SqlUpdate {
 
 
 	/**
-	 * Overridden version of <code>update</code> that adds the given statement
+	 * Overridden version of {@code update} that adds the given statement
 	 * parameters to the queue rather than executing them immediately.
-	 * All other <code>update</code> methods of the SqlUpdate base class go
+	 * All other {@code update} methods of the SqlUpdate base class go
 	 * through this method and will thus behave similarly.
-	 * <p>You need to call <code>flush</code> to actually execute the batch.
+	 * <p>You need to call {@code flush} to actually execute the batch.
 	 * If the specified batch size is reached, an implicit flush will happen;
-	 * you still need to finally call <code>flush</code> to flush all statements.
+	 * you still need to finally call {@code flush} to flush all statements.
 	 * @param params array of parameter objects
 	 * @return the number of rows affected by the update (always -1,
 	 * meaning "not applicable", as the statement is not actually
@@ -220,8 +220,8 @@ public class BatchSqlUpdate extends SqlUpdate {
 
 	/**
 	 * Return the number of affected rows for all already executed statements.
-	 * Accumulates all of <code>flush</code>'s return values until
-	 * <code>reset</code> is invoked.
+	 * Accumulates all of {@code flush}'s return values until
+	 * {@code reset} is invoked.
 	 * @return an array of the number of rows affected by each statement
 	 * @see #reset
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
index 4da7af058e..8f7c27ad66 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
@@ -81,9 +81,9 @@ public abstract class MappingSqlQueryWithParameters<T> extends SqlQuery<T> {
 	 * @param rowNum row number (from 0) we're up to
 	 * @param parameters to the query (passed to the execute() method).
 	 * Subclasses are rarely interested in these.
-	 * It can be <code>null</code> if there are no parameters.
+	 * It can be {@code null} if there are no parameters.
 	 * @param context passed to the execute() method.
-	 * It can be <code>null</code> if no contextual information is need.
+	 * It can be {@code null} if no contextual information is need.
 	 * @return an object of the result type
 	 * @throws SQLException if there's an error extracting data.
 	 * Subclasses can simply not catch SQLExceptions, relying on the
@@ -95,7 +95,7 @@ public abstract class MappingSqlQueryWithParameters<T> extends SqlQuery<T> {
 
 	/**
 	 * Implementation of RowMapper that calls the enclosing
-	 * class's <code>mapRow</code> method for each row.
+	 * class's {@code mapRow} method for each row.
 	 */
 	protected class RowMapperImpl implements RowMapper<T> {
 
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 93a89ad13d..9b6fa94dc4 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
@@ -41,12 +41,12 @@ import org.springframework.jdbc.core.SqlParameter;
  *
  * <p>This class and subclasses throw runtime exceptions, defined in the
  * <codeorg.springframework.dao package</code> (and as thrown by the
- * <code>org.springframework.jdbc.core</code> package, which the classes
+ * {@code org.springframework.jdbc.core} package, which the classes
  * in this package use under the hood to perform raw JDBC operations).
  *
  * <p>Subclasses should set SQL and add parameters before invoking the
  * {@link #compile()} method. The order in which parameters are added is
- * significant. The appropriate <code>execute</code> or <code>update</code>
+ * significant. The appropriate {@code execute} or {@code update}
  * method can then be invoked.
  *
  * @author Rod Johnson
@@ -243,11 +243,11 @@ public abstract class RdbmsOperation implements InitializingBean {
 
 	/**
 	 * Add anonymous parameters, specifying only their SQL types
-	 * as defined in the <code>java.sql.Types</code> class.
+	 * as defined in the {@code java.sql.Types} class.
 	 * <p>Parameter ordering is significant. This method is an alternative
 	 * to the {@link #declareParameter} method, which should normally be preferred.
 	 * @param types array of SQL types as defined in the
-	 * <code>java.sql.Types</code> class
+	 * {@code java.sql.Types} class
 	 * @throws InvalidDataAccessApiUsageException if the operation is already compiled
 	 */
 	public void setTypes(int[] types) throws InvalidDataAccessApiUsageException {
@@ -358,7 +358,7 @@ public abstract class RdbmsOperation implements InitializingBean {
 	/**
 	 * Check whether this operation has been compiled already;
 	 * lazily compile it if not already compiled.
-	 * <p>Automatically called by <code>validateParameters</code>.
+	 * <p>Automatically called by {@code validateParameters}.
 	 * @see #validateParameters
 	 */
 	protected void checkCompiled() {
@@ -370,9 +370,9 @@ public abstract class RdbmsOperation implements InitializingBean {
 
 	/**
 	 * Validate the parameters passed to an execute method based on declared parameters.
-	 * Subclasses should invoke this method before every <code>executeQuery()</code>
-	 * or <code>update()</code> method.
-	 * @param parameters parameters supplied (may be <code>null</code>)
+	 * Subclasses should invoke this method before every {@code executeQuery()}
+	 * or {@code update()} method.
+	 * @param parameters parameters supplied (may be {@code null})
 	 * @throws InvalidDataAccessApiUsageException if the parameters are invalid
 	 */
 	protected void validateParameters(Object[] parameters) throws InvalidDataAccessApiUsageException {
@@ -393,9 +393,9 @@ public abstract class RdbmsOperation implements InitializingBean {
 
 	/**
 	 * Validate the named parameters passed to an execute method based on declared parameters.
-	 * Subclasses should invoke this method before every <code>executeQuery()</code> or
-	 * <code>update()</code> method.
-	 * @param parameters parameter Map supplied. May be <code>null</code>.
+	 * Subclasses should invoke this method before every {@code executeQuery()} or
+	 * {@code update()} method.
+	 * @param parameters parameter Map supplied. May be {@code null}.
 	 * @throws InvalidDataAccessApiUsageException if the parameters are invalid
 	 */
 	protected void validateNamedParameters(Map<String, ?> parameters) throws InvalidDataAccessApiUsageException {
@@ -447,7 +447,7 @@ public abstract class RdbmsOperation implements InitializingBean {
 
 	/**
 	 * Return whether BLOB/CLOB parameters are supported for this kind of operation.
-	 * <p>The default is <code>true</code>.
+	 * <p>The default is {@code true}.
 	 */
 	protected boolean supportsLobParameters() {
 		return true;
@@ -456,7 +456,7 @@ public abstract class RdbmsOperation implements InitializingBean {
 	/**
 	 * Return whether this operation accepts additional parameters that are
 	 * given but not actually used. Applies in particular to parameter Maps.
-	 * <p>The default is <code>false</code>.
+	 * <p>The default is {@code false}.
 	 * @see StoredProcedure
 	 */
 	protected boolean allowsUnusedParameters() {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java
index 58c9b137b2..07e30d8b8a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java
@@ -68,7 +68,7 @@ public abstract class SqlCall extends RdbmsOperation {
 	/**
 	 * Constructor to allow use as a JavaBean.
 	 * A DataSource, SQL and any parameters must be supplied before
-	 * invoking the <code>compile</code> method and using this object.
+	 * invoking the {@code compile} method and using this object.
 	 * @see #setDataSource
 	 * @see #setSql
 	 * @see #compile
@@ -179,7 +179,7 @@ public abstract class SqlCall extends RdbmsOperation {
 	/**
 	 * Return a CallableStatementCreator to perform an operation
 	 * with this parameters.
-	 * @param inParams parameters. May be <code>null</code>.
+	 * @param inParams parameters. May be {@code null}.
 	 */
 	protected CallableStatementCreator newCallableStatementCreator(Map<String, ?> inParams) {
 		return this.callableStatementFactory.newCallableStatementCreator(inParams);
@@ -188,7 +188,7 @@ public abstract class SqlCall extends RdbmsOperation {
 	/**
 	 * Return a CallableStatementCreator to perform an operation
 	 * with the parameters returned from this ParameterMapper.
-	 * @param inParamMapper parametermapper. May not be <code>null</code>.
+	 * @param inParamMapper parametermapper. May not be {@code null}.
 	 */
 	protected CallableStatementCreator newCallableStatementCreator(ParameterMapper inParamMapper) {
 		return this.callableStatementFactory.newCallableStatementCreator(inParamMapper);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java
index 69e825a0cd..a234a256cd 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java
@@ -36,16 +36,16 @@ import org.springframework.jdbc.core.SingleColumnRowMapper;
  *
  * <p>This is a concrete class, which there is often no need to subclass.
  * Code using this package can create an object of this type, declaring SQL
- * and parameters, and then invoke the appropriate <code>run</code> method
+ * and parameters, and then invoke the appropriate {@code run} method
  * repeatedly to execute the function. Subclasses are only supposed to add
- * specialized <code>run</code> methods for specific parameter and return types.
+ * specialized {@code run} methods for specific parameter and return types.
  *
  * <p>Like all RdbmsOperation objects, SqlFunction objects are thread-safe.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @author Jean-Pierre Pawlak
- * @see org.springframework.jdbc.object.StoredProcedure
+ * @see StoredProcedure
  */
 public class SqlFunction<T> extends MappingSqlQuery<T> {
 
@@ -55,7 +55,7 @@ public class SqlFunction<T> extends MappingSqlQuery<T> {
 	/**
 	 * Constructor to allow use as a JavaBean.
 	 * A DataSource, SQL and any parameters must be supplied before
-	 * invoking the <code>compile</code> method and using this object.
+	 * invoking the {@code compile} method and using this object.
 	 * @see #setDataSource
 	 * @see #setSql
 	 * @see #compile
@@ -81,7 +81,7 @@ public class SqlFunction<T> extends MappingSqlQuery<T> {
 	 * @param ds DataSource to obtain connections from
 	 * @param sql SQL to execute
 	 * @param types SQL types of the parameters, as defined in the
-	 * <code>java.sql.Types</code> class
+	 * {@code java.sql.Types} class
 	 * @see java.sql.Types
 	 */
 	public SqlFunction(DataSource ds, String sql, int[] types) {
@@ -96,7 +96,7 @@ public class SqlFunction<T> extends MappingSqlQuery<T> {
 	 * @param ds DataSource to obtain connections from
 	 * @param sql SQL to execute
 	 * @param types SQL types of the parameters, as defined in the
-	 * <code>java.sql.Types</code> class
+	 * {@code java.sql.Types} class
 	 * @param resultType the type that the result object is required to match
 	 * @see #setResultType(Class)
 	 * @see java.sql.Types
@@ -182,7 +182,7 @@ public class SqlFunction<T> extends MappingSqlQuery<T> {
 	}
 
 	/**
-	 * Analogous to the <code>SqlQuery.findObject(Object[])</code> method.
+	 * Analogous to the {@code SqlQuery.findObject(Object[])} method.
 	 * This is a generic method to execute a query, taken a number of arguments.
 	 * @param parameters array of parameters. These will be objects or
 	 * object wrapper types for primitives.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java
index ecbe54490a..407356f812 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java
@@ -90,7 +90,7 @@ public abstract class SqlOperation extends RdbmsOperation {
 	/**
 	 * Return a PreparedStatementSetter to perform an operation
 	 * with the given parameters.
-	 * @param params the parameter array (may be <code>null</code>)
+	 * @param params the parameter array (may be {@code null})
 	 */
 	protected final PreparedStatementSetter newPreparedStatementSetter(Object[] params) {
 		return this.preparedStatementFactory.newPreparedStatementSetter(params);
@@ -99,7 +99,7 @@ public abstract class SqlOperation extends RdbmsOperation {
 	/**
 	 * Return a PreparedStatementCreator to perform an operation
 	 * with the given parameters.
-	 * @param params the parameter array (may be <code>null</code>)
+	 * @param params the parameter array (may be {@code null})
 	 */
 	protected final PreparedStatementCreator newPreparedStatementCreator(Object[] params) {
 		return this.preparedStatementFactory.newPreparedStatementCreator(params);
@@ -110,7 +110,7 @@ public abstract class SqlOperation extends RdbmsOperation {
 	 * with the given parameters.
 	 * @param sqlToUse the actual SQL statement to use (if different from
 	 * the factory's, for example because of named parameter expanding)
-	 * @param params the parameter array (may be <code>null</code>)
+	 * @param params the parameter array (may be {@code null})
 	 */
 	protected final PreparedStatementCreator newPreparedStatementCreator(String sqlToUse, Object[] params) {
 		return this.preparedStatementFactory.newPreparedStatementCreator(sqlToUse, params);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java
index 06a07432c1..1da3422648 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java
@@ -33,17 +33,17 @@ import org.springframework.jdbc.core.namedparam.ParsedSql;
  *
  * <p>Subclasses must implement the {@link #newRowMapper} method to provide
  * an object that can extract the results of iterating over the
- * <code>ResultSet</code> created during the execution of the query.
+ * {@code ResultSet} created during the execution of the query.
  *
- * <p>This class provides a number of public <code>execute</code> methods that are
+ * <p>This class provides a number of public {@code execute} methods that are
  * analogous to the different convenient JDO query execute methods. Subclasses
  * can either rely on one of these inherited methods, or can add their own
  * custom execution methods, with meaningful names and typed parameters
  * (definitely a best practice). Each custom query method will invoke one of
  * this class's untyped query methods.
  *
- * <p>Like all <code>RdbmsOperation</code> classes that ship with the Spring
- * Framework, <code>SqlQuery</code> instances are thread-safe after their
+ * <p>Like all {@code RdbmsOperation} classes that ship with the Spring
+ * Framework, {@code SqlQuery} instances are thread-safe after their
  * initialization is complete. That is, after they are constructed and configured
  * via their setter methods, they can be used safely from multiple threads.
  *
@@ -60,15 +60,15 @@ public abstract class SqlQuery<T> extends SqlOperation {
 
 	/**
 	 * Constructor to allow use as a JavaBean.
-	 * <p>The <code>DataSource</code> and SQL must be supplied before
+	 * <p>The {@code DataSource} and SQL must be supplied before
 	 * compilation and use.
 	 */
 	public SqlQuery() {
 	}
 
 	/**
-	 * Convenient constructor with a <code>DataSource</code> and SQL string.
-	 * @param ds the <code>DataSource</code> to use to get connections
+	 * Convenient constructor with a {@code DataSource} and SQL string.
+	 * @param ds the {@code DataSource} to use to get connections
 	 * @param sql the SQL to execute; SQL can also be supplied at runtime
 	 * by overriding the {@link #getSql()} method.
 	 */
@@ -100,7 +100,7 @@ public abstract class SqlQuery<T> extends SqlOperation {
 	 * @param params parameters, similar to JDO query parameters.
 	 * Primitive parameters must be represented by their Object wrapper type.
 	 * The ordering of parameters is significant.
-	 * @param context contextual information passed to the <code>mapRow</code>
+	 * @param context contextual information passed to the {@code mapRow}
 	 * callback method. The JDBC operation itself doesn't rely on this parameter,
 	 * but it can be useful for creating the objects of the result list.
 	 * @return a List of objects, one per row of the ResultSet. Normally all these
@@ -213,7 +213,7 @@ public abstract class SqlQuery<T> extends SqlOperation {
 	 * the SqlParameters. Primitive parameters must be represented by their Object wrapper
 	 * type. The ordering of parameters is not significant since they are supplied in a
 	 * SqlParameterMap which is an implementation of the Map interface.
-	 * @param context contextual information passed to the <code>mapRow</code>
+	 * @param context contextual information passed to the {@code mapRow}
 	 * callback method. The JDBC operation itself doesn't rely on this parameter,
 	 * but it can be useful for creating the objects of the result list.
 	 * @return a List of objects, one per row of the ResultSet. Normally all these
@@ -241,10 +241,10 @@ public abstract class SqlQuery<T> extends SqlOperation {
 
 
 	/**
-	 * Generic object finder method, used by all other <code>findObject</code> methods.
+	 * Generic object finder method, used by all other {@code findObject} methods.
 	 * Object finder methods are like EJB entity bean finders, in that it is
 	 * considered an error if they return more than one result.
-	 * @return the result object, or <code>null</code> if not found. Subclasses may
+	 * @return the result object, or {@code null} if not found. Subclasses may
 	 * choose to treat this as an error and throw an exception.
 	 * @see org.springframework.dao.support.DataAccessUtils#singleResult
 	 */
@@ -325,7 +325,7 @@ public abstract class SqlQuery<T> extends SqlOperation {
 	 * @param paramMap Map of parameter name to parameter object,
 	 * matching named parameters specified in the SQL statement.
 	 * Ordering is not significant.
-	 * @param context contextual information passed to the <code>mapRow</code>
+	 * @param context contextual information passed to the {@code mapRow}
 	 * callback method. The JDBC operation itself doesn't rely on this parameter,
 	 * but it can be useful for creating the objects of the result list.
 	 * @return a List of objects, one per row of the ResultSet. Normally all these
@@ -350,10 +350,10 @@ public abstract class SqlQuery<T> extends SqlOperation {
 	/**
 	 * Subclasses must implement this method to extract an object per row, to be
 	 * returned by the <cod>execute</code> method as an aggregated {@link List}.
-	 * @param parameters the parameters to the <code>execute()</code> method,
-	 * in case subclass is interested; may be <code>null</code> if there
+	 * @param parameters the parameters to the {@code execute()} method,
+	 * in case subclass is interested; may be {@code null} if there
 	 * were no parameters.
-	 * @param context contextual information passed to the <code>mapRow</code>
+	 * @param context contextual information passed to the {@code mapRow}
 	 * callback method. The JDBC operation itself doesn't rely on this parameter,
 	 * but it can be useful for creating the objects of the result list.
 	 * @see #execute
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java
index 90007b646b..ccb848b0f7 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java
@@ -30,15 +30,15 @@ import org.springframework.jdbc.support.KeyHolder;
 /**
  * Reusable operation object representing a SQL update.
  *
- * <p>This class provides a number of <code>update</code> methods,
- * analogous to the <code>execute</code> methods of query objects.
+ * <p>This class provides a number of {@code update} methods,
+ * analogous to the {@code execute} methods of query objects.
  *
  * <p>This class is concrete. Although it can be subclassed (for example
  * to add a custom update method) it can easily be parameterized by setting
  * SQL and declaring parameters.
  *
- * <p>Like all <code>RdbmsOperation</code> classes that ship with the Spring
- * Framework, <code>SqlQuery</code> instances are thread-safe after their
+ * <p>Like all {@code RdbmsOperation} classes that ship with the Spring
+ * Framework, {@code SqlQuery} instances are thread-safe after their
  * initialization is complete. That is, after they are constructed and configured
  * via their setter methods, they can be used safely from multiple threads.
  *
@@ -87,7 +87,7 @@ public class SqlUpdate extends SqlOperation {
 	 * @param ds DataSource to use to obtain connections
 	 * @param sql SQL statement to execute
 	 * @param types SQL types of the parameters, as defined in the
-	 * <code>java.sql.Types</code> class
+	 * {@code java.sql.Types} class
 	 * @see java.sql.Types
 	 */
 	public SqlUpdate(DataSource ds, String sql, int[] types) {
@@ -103,7 +103,7 @@ public class SqlUpdate extends SqlOperation {
 	 * @param ds DataSource to use to obtain connections
 	 * @param sql SQL statement to execute
 	 * @param types SQL types of the parameters, as defined in the
-	 * <code>java.sql.Types</code> class
+	 * {@code java.sql.Types} class
 	 * @param maxRowsAffected the maximum number of rows that may
 	 * be affected by the update
 	 * @see java.sql.Types
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 96e3e1490b..67fbec476d 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
@@ -32,7 +32,7 @@ import org.springframework.jdbc.core.SqlParameter;
  * a typed method for invocation that delegates to the supplied
  * {@link #execute} method.
  *
- * <p>The inherited <code>sql</code> property is the name of the stored
+ * <p>The inherited {@code sql} property is the name of the stored
  * procedure in the RDBMS. Note that JDBC 3.0 introduces named parameters,
  * although the other features provided by this class are still necessary
  * in JDBC 3.0.
@@ -82,9 +82,9 @@ public abstract class StoredProcedure extends SqlCall {
 
 	/**
 	 * Declare a parameter. Overridden method.
-	 * Parameters declared as <code>SqlParameter</code> and <code>SqlInOutParameter</code>
+	 * Parameters declared as {@code SqlParameter} and {@code SqlInOutParameter}
 	 * will always be used to provide input values.  In addition to this any parameter declared
-	 * as <code>SqlOutParameter</code> where an non-null input value is provided will also be used
+	 * as {@code SqlOutParameter} where an non-null input value is provided will also be used
 	 * as an input paraneter.
 	 * <b>Note: Calls to declareParameter must be made in the same order as
 	 * they appear in the database's stored procedure parameter list.</b>
@@ -105,7 +105,7 @@ public abstract class StoredProcedure extends SqlCall {
 	 * must match the order that the parameters where declared in.
 	 * @param inParams variable number of input parameters. Output parameters should
 	 * not be included in this map.
-	 * It is legal for values to be <code>null</code>, and this will produce the
+	 * It is legal for values to be {@code null}, and this will produce the
 	 * correct behavior using a NULL argument to the stored procedure.
 	 * @return map of output params, keyed by name as in parameter declarations.
 	 * Output parameters will appear here, with their values after the
@@ -133,7 +133,7 @@ public abstract class StoredProcedure extends SqlCall {
 	 * Alternatively, they can return void.
 	 * @param inParams map of input parameters, keyed by name as in parameter
 	 * declarations. Output parameters need not (but can) be included in this map.
-	 * It is legal for map entries to be <code>null</code>, and this will produce the
+	 * It is legal for map entries to be {@code null}, and this will produce the
 	 * correct behavior using a NULL argument to the stored procedure.
 	 * @return map of output params, keyed by name as in parameter declarations.
 	 * Output parameters will appear here, with their values after the
@@ -154,7 +154,7 @@ public abstract class StoredProcedure extends SqlCall {
 	 * Alternatively, they can return void.
 	 * @param inParamMapper map of input parameters, keyed by name as in parameter
 	 * declarations. Output parameters need not (but can) be included in this map.
-	 * It is legal for map entries to be <code>null</code>, and this will produce the correct
+	 * It is legal for map entries to be {@code null}, and this will produce the correct
 	 * behavior using a NULL argument to the stored procedure.
 	 * @return map of output params, keyed by name as in parameter declarations.
 	 * Output parameters will appear here, with their values after the
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
index c7733b7130..38e93eb90f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
@@ -57,7 +57,7 @@ public abstract class UpdatableSqlQuery<T> extends SqlQuery<T> {
 
 	/**
 	 * Implementation of the superclass template method. This invokes the subclass's
-	 * implementation of the <code>updateRow()</code> method.
+	 * implementation of the {@code updateRow()} method.
 	 */
 	@Override
 	protected RowMapper<T> newRowMapper(Object[] parameters, Map context) {
@@ -70,7 +70,7 @@ public abstract class UpdatableSqlQuery<T> extends SqlQuery<T> {
 	 * @param rs ResultSet we're working through
 	 * @param rowNum row number (from 0) we're up to
 	 * @param context passed to the execute() method.
-	 * It can be <code>null</code> if no contextual information is need.  If you
+	 * It can be {@code null} if no contextual information is need.  If you
 	 * need to pass in data for each row, you can pass in a HashMap with
 	 * the primary key of the row being the key for the HashMap.  That way
 	 * it is easy to locate the updates for each row
@@ -84,7 +84,7 @@ public abstract class UpdatableSqlQuery<T> extends SqlQuery<T> {
 
 	/**
 	 * Implementation of RowMapper that calls the enclosing
-	 * class's <code>updateRow()</code> method for each row.
+	 * class's {@code updateRow()} method for each row.
 	 */
 	protected class RowMapperImpl implements RowMapper<T> {
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
index f8ec12f7d9..267a785b4d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/package-info.java
@@ -1,4 +1,3 @@
-
 /**
  *
  * The classes in this package represent RDBMS queries, updates,
@@ -7,8 +6,8 @@
  * are "disconnected" from the database.
  *
  * <p>This higher level of JDBC abstraction depends on the lower-level
- * abstraction in the <code>org.springframework.jdbc.core</code> package.
- * Exceptions thrown are as in the <code>org.springframework.dao</code> package,
+ * abstraction in the {@code org.springframework.jdbc.core} package.
+ * Exceptions thrown are as in the {@code org.springframework.dao} package,
  * meaning that code using this package does not need to implement JDBC or
  * RDBMS-specific error handling.
  *
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
index bea2aa7461..0f5273cd26 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
@@ -86,25 +86,25 @@ public abstract class AbstractFallbackSQLExceptionTranslator implements SQLExcep
 	/**
 	 * Template method for actually translating the given exception.
 	 * <p>The passed-in arguments will have been pre-checked. Furthermore, this method
-	 * is allowed to return <code>null</code> to indicate that no exception match has
+	 * is allowed to return {@code null} to indicate that no exception match has
 	 * been found and that fallback translation should kick in.
 	 * @param task readable text describing the task being attempted
-	 * @param sql SQL query or update that caused the problem (may be <code>null</code>)
-	 * @param ex the offending <code>SQLException</code>
-	 * @return the DataAccessException, wrapping the <code>SQLException</code>;
-	 * or <code>null</code> if no exception match found
+	 * @param sql SQL query or update that caused the problem (may be {@code null})
+	 * @param ex the offending {@code SQLException}
+	 * @return the DataAccessException, wrapping the {@code SQLException};
+	 * or {@code null} if no exception match found
 	 */
 	protected abstract DataAccessException doTranslate(String task, String sql, SQLException ex);
 
 
 	/**
-	 * Build a message <code>String</code> for the given {@link java.sql.SQLException}.
+	 * Build a message {@code String} for the given {@link java.sql.SQLException}.
 	 * <p>To be called by translator subclasses when creating an instance of a generic
 	 * {@link org.springframework.dao.DataAccessException} class.
 	 * @param task readable text describing the task being attempted
-	 * @param sql the SQL statement that caused the problem (may be <code>null</code>)
-	 * @param ex the offending <code>SQLException</code>
-	 * @return the message <code>String</code> to use
+	 * @param sql the SQL statement that caused the problem (may be {@code null})
+	 * @param ex the offending {@code SQLException}
+	 * @return the message {@code String} to use
 	 */
 	protected String buildMessage(String task, String sql, SQLException ex) {
 		return task + "; SQL [" + sql + "]; " + ex.getMessage();
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrar.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrar.java
index 0d15a87025..668022162d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrar.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrar.java
@@ -40,7 +40,7 @@ public class CustomSQLExceptionTranslatorRegistrar implements InitializingBean {
 
 	/**
 	 * Setter for a Map of {@link SQLExceptionTranslator} references where the key must
-	 * be the database name as defined in the <code>sql-error-codes.xml</code> file.
+	 * be the database name as defined in the {@code sql-error-codes.xml} file.
 	 * <p>Note that any existing translators will remain unless there is a match in the
 	 * database name, at which point the new translator will replace the existing one.
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistry.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistry.java
index ccbeb4d723..d41d7624b6 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistry.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistry.java
@@ -84,7 +84,7 @@ public class CustomSQLExceptionTranslatorRegistry {
 	/**
 	 * Find a custom translator for the specified database.
 	 * @param dbName the database name
-	 * @return the custom translator, or <code>null</code> if none found
+	 * @return the custom translator, or {@code null} if none found
 	 */
 	public SQLExceptionTranslator findTranslatorForDatabase(String dbName) {
 		return this.translatorMap.get(dbName);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java
index a81b36db81..385dd7c72d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java
@@ -109,7 +109,7 @@ public abstract class JdbcAccessor implements InitializingBean {
 	 * Set whether to lazily initialize the SQLExceptionTranslator for this accessor,
 	 * on first encounter of a SQLException. Default is "true"; can be switched to
 	 * "false" for initialization on startup.
-	 * <p>Early initialization just applies if <code>afterPropertiesSet()</code> is called.
+	 * <p>Early initialization just applies if {@code afterPropertiesSet()} is called.
 	 * @see #getExceptionTranslator()
 	 * @see #afterPropertiesSet()
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
index c3ad8aefac..c312fc3a51 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
@@ -59,7 +59,7 @@ public abstract class JdbcUtils {
 	/**
 	 * Close the given JDBC Connection and ignore any thrown exception.
 	 * This is useful for typical finally blocks in manual JDBC code.
-	 * @param con the JDBC Connection to close (may be <code>null</code>)
+	 * @param con the JDBC Connection to close (may be {@code null})
 	 */
 	public static void closeConnection(Connection con) {
 		if (con != null) {
@@ -79,7 +79,7 @@ public abstract class JdbcUtils {
 	/**
 	 * Close the given JDBC Statement and ignore any thrown exception.
 	 * This is useful for typical finally blocks in manual JDBC code.
-	 * @param stmt the JDBC Statement to close (may be <code>null</code>)
+	 * @param stmt the JDBC Statement to close (may be {@code null})
 	 */
 	public static void closeStatement(Statement stmt) {
 		if (stmt != null) {
@@ -99,7 +99,7 @@ public abstract class JdbcUtils {
 	/**
 	 * Close the given JDBC ResultSet and ignore any thrown exception.
 	 * This is useful for typical finally blocks in manual JDBC code.
-	 * @param rs the JDBC ResultSet to close (may be <code>null</code>)
+	 * @param rs the JDBC ResultSet to close (may be {@code null})
 	 */
 	public static void closeResultSet(ResultSet rs) {
 		if (rs != null) {
@@ -125,7 +125,7 @@ public abstract class JdbcUtils {
 	 * with this case appropriately, e.g. throwing a corresponding exception.
 	 * @param rs is the ResultSet holding the data
 	 * @param index is the column index
-	 * @param requiredType the required value type (may be <code>null</code>)
+	 * @param requiredType the required value type (may be {@code null})
 	 * @return the value object
 	 * @throws SQLException if thrown by the JDBC API
 	 */
@@ -209,11 +209,11 @@ public abstract class JdbcUtils {
 	 * value type. The returned value should be a detached value object, not having
 	 * any ties to the active ResultSet: in particular, it should not be a Blob or
 	 * Clob object but rather a byte array respectively String representation.
-	 * <p>Uses the <code>getObject(index)</code> method, but includes additional "hacks"
+	 * <p>Uses the {@code getObject(index)} method, but includes additional "hacks"
 	 * to get around Oracle 10g returning a non-standard object for its TIMESTAMP
-	 * datatype and a <code>java.sql.Date</code> for DATE columns leaving out the
+	 * datatype and a {@code java.sql.Date} for DATE columns leaving out the
 	 * time portion: These columns will explicitly be extracted as standard
-	 * <code>java.sql.Timestamp</code> object.
+	 * {@code java.sql.Timestamp} object.
 	 * @param rs is the ResultSet holding the data
 	 * @param index is the column index
 	 * @return the value object
@@ -269,7 +269,7 @@ public abstract class JdbcUtils {
 	 * @param dataSource the DataSource to extract metadata for
 	 * @param action callback that will do the actual work
 	 * @return object containing the extracted information, as returned by
-	 * the DatabaseMetaDataCallback's <code>processMetaData</code> method
+	 * the DatabaseMetaDataCallback's {@code processMetaData} method
 	 * @throws MetaDataAccessException if meta data access failed
 	 */
 	public static Object extractDatabaseMetaData(DataSource dataSource, DatabaseMetaDataCallback action)
@@ -349,7 +349,7 @@ public abstract class JdbcUtils {
 	 * to decide whether the set of SQL statements should be executed through
 	 * the JDBC 2.0 batch mechanism or simply in a traditional one-by-one fashion.
 	 * <p>Logs a warning if the "supportsBatchUpdates" methods throws an exception
-	 * and simply returns <code>false</code> in that case.
+	 * and simply returns {@code false} in that case.
 	 * @param con the Connection to check
 	 * @return whether JDBC 2.0 batch updates are supported
 	 * @see java.sql.DatabaseMetaData#supportsBatchUpdates()
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java
index 5be6970438..b4b1031a75 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java
@@ -30,7 +30,7 @@ import org.springframework.dao.InvalidDataAccessApiUsageException;
  * for each row of keys.
  *
  * <p>Most applications only use on key per row and process only one row at a
- * time in an insert statement. In these cases, just call <code>getKey</code>
+ * time in an insert statement. In these cases, just call {@code getKey}
  * to retrieve the key. The returned value is a Number here, which is the
  * usual type for auto-generated keys.
  *
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java
index 5545511b20..c3ec69dd31 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java
@@ -49,7 +49,7 @@ import org.springframework.jdbc.InvalidResultSetAccessException;
  * defining error code mappings for database names from database metadata.
  * <li>Fallback to a fallback translator. {@link SQLStateSQLExceptionTranslator} is the
  * default fallback translator, analyzing the exception's SQL state only. On Java 6
- * which introduces its own <code>SQLException</code> subclass hierarchy, we will
+ * which introduces its own {@code SQLException} subclass hierarchy, we will
  * use {@link SQLExceptionSubclassTranslator} by default, which in turns falls back
  * to Spring's own SQL state translation when not encountering specific subclasses.
  * </ul>
@@ -290,7 +290,7 @@ public class SQLErrorCodeSQLExceptionTranslator extends AbstractFallbackSQLExcep
 	 * Subclasses can override this method to attempt a custom mapping from SQLException
 	 * to DataAccessException.
 	 * @param task readable text describing the task being attempted
-	 * @param sql SQL query or update that caused the problem. May be <code>null</code>.
+	 * @param sql SQL query or update that caused the problem. May be {@code null}.
 	 * @param sqlEx the offending SQLException
 	 * @return null if no custom translation was possible, otherwise a DataAccessException
 	 * resulting from custom translation. This exception should include the sqlEx parameter
@@ -305,7 +305,7 @@ public class SQLErrorCodeSQLExceptionTranslator extends AbstractFallbackSQLExcep
 	 * Create a custom DataAccessException, based on a given exception
 	 * class from a CustomSQLErrorCodesTranslation definition.
 	 * @param task readable text describing the task being attempted
-	 * @param sql SQL query or update that caused the problem. May be <code>null</code>.
+	 * @param sql SQL query or update that caused the problem. May be {@code null}.
 	 * @param sqlEx the offending SQLException
 	 * @param exceptionClass the exception class to use, as defined in the
 	 * CustomSQLErrorCodesTranslation definition
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java
index 298343bf36..a074133f8b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodes.java
@@ -24,7 +24,7 @@ import org.springframework.util.StringUtils;
  *
  * <p>Used by Spring's {@link SQLErrorCodeSQLExceptionTranslator}.
  * The file "sql-error-codes.xml" in this package contains default
- * <code>SQLErrorCodes</code> instances for various databases.
+ * {@code SQLErrorCodes} instances for various databases.
  *
  * @author Thomas Risberg
  * @author Juergen Hoeller
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java
index 445ecf5b1a..e3b81f6c4e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodesFactory.java
@@ -36,7 +36,7 @@ import org.springframework.util.PatternMatchUtils;
  * Factory for creating {@link SQLErrorCodes} based on the
  * "databaseProductName" taken from the {@link java.sql.DatabaseMetaData}.
  *
- * <p>Returns <code>SQLErrorCodes</code> populated with vendor codes
+ * <p>Returns {@code SQLErrorCodes} populated with vendor codes
  * defined in a configuration file named "sql-error-codes.xml".
  * Reads the default file in this package if not overridden by a file in
  * the root of the class path (for example in the "/WEB-INF/classes" directory).
@@ -142,7 +142,7 @@ public class SQLErrorCodesFactory {
 	 * @param path resource path; either a custom path or one of either
 	 * {@link #SQL_ERROR_CODE_DEFAULT_PATH} or
 	 * {@link #SQL_ERROR_CODE_OVERRIDE_PATH}.
-	 * @return the resource, or <code>null</code> if the resource wasn't found
+	 * @return the resource, or {@code null} if the resource wasn't found
 	 * @see #getInstance
 	 */
 	protected Resource loadResource(String path) {
@@ -153,9 +153,9 @@ public class SQLErrorCodesFactory {
 	/**
 	 * Return the {@link SQLErrorCodes} instance for the given database.
 	 * <p>No need for a database metadata lookup.
-	 * @param dbName the database name (must not be <code>null</code>)
-	 * @return the <code>SQLErrorCodes</code> instance for the given database
-	 * @throws IllegalArgumentException if the supplied database name is <code>null</code>
+	 * @param dbName the database name (must not be {@code null})
+	 * @return the {@code SQLErrorCodes} instance for the given database
+	 * @throws IllegalArgumentException if the supplied database name is {@code null}
 	 */
 	public SQLErrorCodes getErrorCodes(String dbName) {
 		Assert.notNull(dbName, "Database product name must not be null");
@@ -188,9 +188,9 @@ public class SQLErrorCodesFactory {
 	 * Return {@link SQLErrorCodes} for the given {@link DataSource},
 	 * evaluating "databaseProductName" from the
 	 * {@link java.sql.DatabaseMetaData}, or an empty error codes
-	 * instance if no <code>SQLErrorCodes</code> were found.
-	 * @param dataSource the <code>DataSource</code> identifying the database
-	 * @return the corresponding <code>SQLErrorCodes</code> object
+	 * instance if no {@code SQLErrorCodes} were found.
+	 * @param dataSource the {@code DataSource} identifying the database
+	 * @return the corresponding {@code SQLErrorCodes} object
 	 * @see java.sql.DatabaseMetaData#getDatabaseProductName()
 	 */
 	public SQLErrorCodes getErrorCodes(DataSource dataSource) {
@@ -234,10 +234,10 @@ public class SQLErrorCodesFactory {
 
 	/**
 	 * Associate the specified database name with the given {@link DataSource}.
-	 * @param dataSource the <code>DataSource</code> identifying the database
+	 * @param dataSource the {@code DataSource} identifying the database
 	 * @param dbName the corresponding database name as stated in the error codes
-	 * definition file (must not be <code>null</code>)
-	 * @return the corresponding <code>SQLErrorCodes</code> object
+	 * definition file (must not be {@code null})
+	 * @return the corresponding {@code SQLErrorCodes} object
 	 */
 	public SQLErrorCodes registerDatabase(DataSource dataSource, String dbName) {
 		synchronized (this.dataSourceCache) {
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 519785aaa7..3284f80ae1 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
@@ -47,7 +47,7 @@ import org.springframework.jdbc.BadSqlGrammarException;
  *
  * <p>This is only available with JDBC 4.0 and later drivers when using Java 6 or later.
  * Falls back to a standard {@link SQLStateSQLExceptionTranslator} if the JDBC driver
- * does not actually expose JDBC 4 compliant <code>SQLException</code> subclasses.
+ * does not actually expose JDBC 4 compliant {@code SQLException} subclasses.
  *
  * @author Thomas Risberg
  * @author Juergen Hoeller
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java
index a4f61535fd..8543e2b177 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java
@@ -38,15 +38,15 @@ public interface SQLExceptionTranslator {
 	/**
 	 * Translate the given {@link SQLException} into a generic {@link DataAccessException}.
 	 * <p>The returned DataAccessException is supposed to contain the original
-	 * <code>SQLException</code> as root cause. However, client code may not generally
+	 * {@code SQLException} as root cause. However, client code may not generally
 	 * rely on this due to DataAccessExceptions possibly being caused by other resource
-	 * APIs as well. That said, a <code>getRootCause() instanceof SQLException</code>
+	 * APIs as well. That said, a {@code getRootCause() instanceof SQLException}
 	 * check (and subsequent cast) is considered reliable when expecting JDBC-based
 	 * access to have happened.
 	 * @param task readable text describing the task being attempted
-	 * @param sql SQL query or update that caused the problem (may be <code>null</code>)
-	 * @param ex the offending <code>SQLException</code>
-	 * @return the DataAccessException, wrapping the <code>SQLException</code>
+	 * @param sql SQL query or update that caused the problem (may be {@code null})
+	 * @param ex the offending {@code SQLException}
+	 * @return the DataAccessException, wrapping the {@code SQLException}
 	 * @see org.springframework.dao.DataAccessException#getRootCause()
 	 */
 	DataAccessException translate(String task, String sql, SQLException ex);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java
index 6397e6761e..3dddd11cc2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java
@@ -23,7 +23,7 @@ import java.sql.SQLException;
  * Simple interface for complex types to be set as statement parameters.
  *
  * <p>Implementations perform the actual work of setting the actual values. They must
- * implement the callback method <code>setValue</code> which can throw SQLExceptions
+ * implement the callback method {@code setValue} which can throw SQLExceptions
  * that will be caught and translated by the calling code. This callback method has
  * access to the underlying Connection via the given PreparedStatement object, if that
  * should be needed to create any database-specific objects.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
index b0e62847f8..3fe391dbb6 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
@@ -24,7 +24,7 @@ import org.springframework.util.Assert;
 
 /**
  * Base implementation of {@link DataFieldMaxValueIncrementer} that delegates
- * to a single {@link #getNextKey} template method that returns a <code>long</code>.
+ * to a single {@link #getNextKey} template method that returns a {@code long}.
  * Uses longs for String values, padding with zeroes if required.
  *
  * @author Dmitriy Kopylenko
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java
index 26fe080031..fc09144c76 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java
@@ -88,7 +88,7 @@ public abstract class AbstractSequenceMaxValueIncrementer extends AbstractDataFi
 	/**
 	 * Return the database-specific query to use for retrieving a sequence value.
 	 * <p>The provided SQL is supposed to result in a single row with a single
-	 * column that allows for extracting a <code>long</code> value.
+	 * column that allows for extracting a {@code long} value.
 	 */
 	protected abstract String getSequenceQuery();
 
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 ddb1e9a725..cb3fe5e1d5 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
@@ -51,10 +51,10 @@ import org.springframework.jdbc.support.JdbcUtils;
  * 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</code> 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)</code>
+ * {@code update(PreparedStatementCreator psc, KeyHolder generatedKeyHolder)}
  * method of the {@link org.springframework.jdbc.core.JdbcTemplate}.
  *
  * <p>Thanks to Endre Stolsvik for the suggestion!
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 fea25531ca..ddcbae6929 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
@@ -32,11 +32,11 @@ import java.sql.SQLException;
  * 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</code> method,
+ * <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)</code>
+ * {@code update(PreparedStatementCreator psc, KeyHolder generatedKeyHolder)}
  * method of the {@link org.springframework.jdbc.core.JdbcTemplate}.
  *
  * <p>Thanks to Preben Nilsson for the suggestion!
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 8b3a04a999..455b11171e 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
@@ -19,7 +19,7 @@ package org.springframework.jdbc.support.incrementer;
 import javax.sql.DataSource;
 
 /**
- * {@link org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer} that increments
+ * {@link DataFieldMaxValueIncrementer} that increments
  * the maximum value of a given Sybase SQL Anywhere table
  * with the equivalent of an auto-increment column. Note: If you use this class, your table key
  * column should <i>NOT</i> be defined as an IDENTITY column, as the sequence table does the job.
@@ -40,11 +40,11 @@ import javax.sql.DataSource;
  * 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</code> 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
- * <code>update(PreparedStatementCreator psc, KeyHolder generatedKeyHolder)</code>
+ * {@code update(PreparedStatementCreator psc, KeyHolder generatedKeyHolder)}
  * method of the {@link org.springframework.jdbc.core.JdbcTemplate}.
  *
  * <p>Thanks to Tarald Saxi Stormark for the suggestion!
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 5ccc969a8f..e98865bdeb 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
@@ -28,7 +28,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 /**
- * {@link org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer} that increments
+ * {@link DataFieldMaxValueIncrementer} that increments
  * the maximum value of a given Sybase SQL Server table
  * with the equivalent of an auto-increment column. Note: If you use this class, your table key
  * column should <i>NOT</i> be defined as an IDENTITY column, as the sequence table does the job.
@@ -49,11 +49,11 @@ import java.sql.SQLException;
  * 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</code> 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
- * <code>update(PreparedStatementCreator psc, KeyHolder generatedKeyHolder)</code>
+ * {@code update(PreparedStatementCreator psc, KeyHolder generatedKeyHolder)}
  * method of the {@link org.springframework.jdbc.core.JdbcTemplate}.
  *
  * <p>Thanks to Yinwei Liu for the suggestion!
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java
index 41c480ade1..3e09b9776d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java
@@ -33,8 +33,8 @@ import org.apache.commons.logging.LogFactory;
 
 /**
  * Default implementation of the {@link LobHandler} interface. Invokes
- * the direct accessor methods that <code>java.sql.ResultSet</code>
- * and <code>java.sql.PreparedStatement</code> offer.
+ * the direct accessor methods that {@code java.sql.ResultSet}
+ * and {@code java.sql.PreparedStatement} offer.
  *
  * <p>This LobHandler should work for any JDBC driver that is JDBC compliant
  * in terms of the spec's suggestions regarding simple BLOB and CLOB handling.
@@ -42,12 +42,12 @@ import org.apache.commons.logging.LogFactory;
  * As a consequence, use {@link OracleLobHandler} for accessing Oracle BLOBs/CLOBs.
  *
  * <p>Some JDBC drivers require values with a BLOB/CLOB target column to be
- * explicitly set through the JDBC <code>setBlob</code> / <code>setClob</code>
+ * explicitly set through the JDBC {@code setBlob} / {@code setClob}
  * API: for example, PostgreSQL's driver. Switch the {@link #setWrapAsLob "wrapAsLob"}
  * property to "true" when operating against such a driver.
  *
  * <p>On JDBC 4.0, this LobHandler also supports streaming the BLOB/CLOB content
- * via the <code>setBlob</code> / <code>setClob</code> variants that take a stream
+ * via the {@code setBlob} / {@code setClob} variants that take a stream
  * argument directly. Consider switching the {@link #setStreamAsLob "streamAsLob"}
  * property to "true" when operating against a fully compliant JDBC 4.0 driver.
  *
@@ -78,10 +78,10 @@ public class DefaultLobHandler extends AbstractLobHandler {
 
 	/**
 	 * Specify whether to submit a byte array / String to the JDBC driver
-	 * wrapped in a JDBC Blob / Clob object, using the JDBC <code>setBlob</code> /
-	 * <code>setClob</code> method with a Blob / Clob argument.
-	 * <p>Default is "false", using the common JDBC 2.0 <code>setBinaryStream</code>
-	 * / <code>setCharacterStream</code> method for setting the content.
+	 * wrapped in a JDBC Blob / Clob object, using the JDBC {@code setBlob} /
+	 * {@code setClob} method with a Blob / Clob argument.
+	 * <p>Default is "false", using the common JDBC 2.0 {@code setBinaryStream}
+	 * / {@code setCharacterStream} method for setting the content.
 	 * Switch this to "true" for explicit Blob / Clob wrapping against
 	 * JDBC drivers that are known to require such wrapping (e.g. PostgreSQL's).
 	 * <p>This setting affects byte array / String arguments as well as stream
@@ -96,10 +96,10 @@ public class DefaultLobHandler extends AbstractLobHandler {
 
 	/**
 	 * Specify whether to submit a binary stream / character stream to the JDBC
-	 * driver as explicit LOB content, using the JDBC 4.0 <code>setBlob</code> /
-	 * <code>setClob</code> method with a stream argument.
-	 * <p>Default is "false", using the common JDBC 2.0 <code>setBinaryStream</code>
-	 * / <code>setCharacterStream</code> method for setting the content.
+	 * driver as explicit LOB content, using the JDBC 4.0 {@code setBlob} /
+	 * {@code setClob} method with a stream argument.
+	 * <p>Default is "false", using the common JDBC 2.0 {@code setBinaryStream}
+	 * / {@code setCharacterStream} method for setting the content.
 	 * Switch this to "true" for explicit JDBC 4.0 usage, provided that your
 	 * JDBC driver actually supports those JDBC 4.0 operations (e.g. Derby's).
 	 * <p>This setting affects stream arguments as well as byte array / String
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java
index 71ff069252..1b826a4b2b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java
@@ -22,12 +22,12 @@ import org.springframework.util.Assert;
 
 /**
  * Callback for resource cleanup at the end of a JTA transaction.
- * Invokes <code>LobCreator.close()</code> to clean up temporary LOBs
+ * Invokes {@code LobCreator.close()} to clean up temporary LOBs
  * that might have been created.
  *
  * @author Juergen Hoeller
  * @since 2.0
- * @see org.springframework.jdbc.support.lob.LobCreator#close()
+ * @see LobCreator#close()
  * @see javax.transaction.Transaction#registerSynchronization
  */
 public class JtaLobCreatorSynchronization implements Synchronization {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreator.java
index 05085a5b63..ad0e3719e3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreator.java
@@ -24,15 +24,15 @@ import java.sql.SQLException;
 
 /**
  * Interface that abstracts potentially database-specific creation of large binary
- * fields and large text fields. Does not work with <code>java.sql.Blob</code>
- * and <code>java.sql.Clob</code> instances in the API, as some JDBC drivers
+ * fields and large text fields. Does not work with {@code java.sql.Blob}
+ * and {@code java.sql.Clob} instances in the API, as some JDBC drivers
  * do not support these types as such.
  *
  * <p>The LOB creation part is where {@link LobHandler} implementations usually
  * differ. Possible strategies include usage of
- * <code>PreparedStatement.setBinaryStream/setCharacterStream</code> but also
- * <code>PreparedStatement.setBlob/setClob</code> with either a stream argument
- * (requires JDBC 4.0) or <code>java.sql.Blob/Clob</code> wrapper objects.
+ * {@code PreparedStatement.setBinaryStream/setCharacterStream} but also
+ * {@code PreparedStatement.setBlob/setClob} with either a stream argument
+ * (requires JDBC 4.0) or {@code java.sql.Blob/Clob} wrapper objects.
  *
  * <p>A LobCreator represents a session for creating BLOBs: It is <i>not</i>
  * thread-safe and needs to be instantiated for each statement execution or for
@@ -61,11 +61,11 @@ public interface LobCreator extends Closeable {
 
 	/**
 	 * Set the given content as bytes on the given statement, using the given
-	 * parameter index. Might simply invoke <code>PreparedStatement.setBytes</code>
+	 * parameter index. Might simply invoke {@code PreparedStatement.setBytes}
 	 * or create a Blob instance for it, depending on the database and driver.
 	 * @param ps the PreparedStatement to the set the content on
 	 * @param paramIndex the parameter index to use
-	 * @param content the content as byte array, or <code>null</code> for SQL NULL
+	 * @param content the content as byte array, or {@code null} for SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.PreparedStatement#setBytes
 	 */
@@ -74,11 +74,11 @@ public interface LobCreator extends Closeable {
 
 	/**
 	 * Set the given content as binary stream on the given statement, using the given
-	 * parameter index. Might simply invoke <code>PreparedStatement.setBinaryStream</code>
+	 * parameter index. Might simply invoke {@code PreparedStatement.setBinaryStream}
 	 * or create a Blob instance for it, depending on the database and driver.
 	 * @param ps the PreparedStatement to the set the content on
 	 * @param paramIndex the parameter index to use
-	 * @param contentStream the content as binary stream, or <code>null</code> for SQL NULL
+	 * @param contentStream the content as binary stream, or {@code null} for SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.PreparedStatement#setBinaryStream
 	 */
@@ -88,11 +88,11 @@ public interface LobCreator extends Closeable {
 
 	/**
 	 * Set the given content as String on the given statement, using the given
-	 * parameter index. Might simply invoke <code>PreparedStatement.setString</code>
+	 * parameter index. Might simply invoke {@code PreparedStatement.setString}
 	 * or create a Clob instance for it, depending on the database and driver.
 	 * @param ps the PreparedStatement to the set the content on
 	 * @param paramIndex the parameter index to use
-	 * @param content the content as String, or <code>null</code> for SQL NULL
+	 * @param content the content as String, or {@code null} for SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.PreparedStatement#setBytes
 	 */
@@ -101,11 +101,11 @@ public interface LobCreator extends Closeable {
 
 	/**
 	 * Set the given content as ASCII stream on the given statement, using the given
-	 * parameter index. Might simply invoke <code>PreparedStatement.setAsciiStream</code>
+	 * parameter index. Might simply invoke {@code PreparedStatement.setAsciiStream}
 	 * or create a Clob instance for it, depending on the database and driver.
 	 * @param ps the PreparedStatement to the set the content on
 	 * @param paramIndex the parameter index to use
-	 * @param asciiStream the content as ASCII stream, or <code>null</code> for SQL NULL
+	 * @param asciiStream the content as ASCII stream, or {@code null} for SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.PreparedStatement#setAsciiStream
 	 */
@@ -115,11 +115,11 @@ public interface LobCreator extends Closeable {
 
 	/**
 	 * Set the given content as character stream on the given statement, using the given
-	 * parameter index. Might simply invoke <code>PreparedStatement.setCharacterStream</code>
+	 * parameter index. Might simply invoke {@code PreparedStatement.setCharacterStream}
 	 * or create a Clob instance for it, depending on the database and driver.
 	 * @param ps the PreparedStatement to the set the content on
 	 * @param paramIndex the parameter index to use
-	 * @param characterStream the content as character stream, or <code>null</code> for SQL NULL
+	 * @param characterStream the content as character stream, or {@code null} for SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.PreparedStatement#setCharacterStream
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java
index b6d57ee63f..57f332309f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java
@@ -48,7 +48,7 @@ public abstract class LobCreatorUtils {
 	 * plain JTA transaction synchronization.
 	 * @param lobCreator the LobCreator to close after transaction completion
 	 * @param jtaTransactionManager the JTA TransactionManager to fall back to
-	 * when no Spring transaction synchronization is active (may be <code>null</code>)
+	 * when no Spring transaction synchronization is active (may be {@code null})
 	 * @throws IllegalStateException if there is neither active Spring transaction
 	 * synchronization nor active JTA transaction synchronization
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java
index f539f8ab8f..17eeee43a2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java
@@ -36,9 +36,9 @@ import java.sql.SQLException;
  *
  * <p>Most databases/drivers should be able to work with {@link DefaultLobHandler},
  * which by default delegates to JDBC's direct accessor methods, avoiding the
- * <code>java.sql.Blob</code> and <code>java.sql.Clob</code> API completely.
+ * {@code java.sql.Blob} and {@code java.sql.Clob} API completely.
  * {@link DefaultLobHandler} can also be configured to access LOBs using
- * <code>PreparedStatement.setBlob/setClob</code> (e.g. for PostgreSQL), through
+ * {@code PreparedStatement.setBlob/setClob} (e.g. for PostgreSQL), through
  * setting the {@link DefaultLobHandler#setWrapAsLob "wrapAsLob"} property.
  *
  * <p>Unfortunately, Oracle 9i just accepts Blob/Clob instances created via its own
@@ -57,8 +57,8 @@ import java.sql.SQLException;
  *
  * <p><b>Summarizing the recommended options (for actual LOB fields):</b>
  * <ul>
- * <li><b>JDBC 4.0 driver:</b> {@link DefaultLobHandler} with <code>streamAsLob=true</code>.
- * <li><b>PostgreSQL:</b> {@link DefaultLobHandler} with <code>wrapAsLob=true</code>.
+ * <li><b>JDBC 4.0 driver:</b> {@link DefaultLobHandler} with {@code streamAsLob=true}.
+ * <li><b>PostgreSQL:</b> {@link DefaultLobHandler} with {@code wrapAsLob=true}.
  * <li><b>Oracle 9i/10g:</b> {@link OracleLobHandler} with a connection-pool-specific
  * {@link OracleLobHandler#setNativeJdbcExtractor NativeJdbcExtractor}.
  * <li>For all other database drivers (and for non-LOB fields that might potentially
@@ -81,11 +81,11 @@ public interface LobHandler {
 
 	/**
 	 * Retrieve the given column as bytes from the given ResultSet.
-	 * Might simply invoke <code>ResultSet.getBytes</code> or work with
-	 * <code>ResultSet.getBlob</code>, depending on the database and driver.
+	 * Might simply invoke {@code ResultSet.getBytes} or work with
+	 * {@code ResultSet.getBlob}, depending on the database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnName the column name to use
-	 * @return the content as byte array, or <code>null</code> in case of SQL NULL
+	 * @return the content as byte array, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getBytes
 	 */
@@ -93,11 +93,11 @@ public interface LobHandler {
 
 	/**
 	 * Retrieve the given column as bytes from the given ResultSet.
-	 * Might simply invoke <code>ResultSet.getBytes</code> or work with
-	 * <code>ResultSet.getBlob</code>, depending on the database and driver.
+	 * Might simply invoke {@code ResultSet.getBytes} or work with
+	 * {@code ResultSet.getBlob}, depending on the database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnIndex the column index to use
-	 * @return the content as byte array, or <code>null</code> in case of SQL NULL
+	 * @return the content as byte array, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getBytes
 	 */
@@ -105,11 +105,11 @@ public interface LobHandler {
 
 	/**
 	 * Retrieve the given column as binary stream from the given ResultSet.
-	 * Might simply invoke <code>ResultSet.getBinaryStream</code> or work with
-	 * <code>ResultSet.getBlob</code>, depending on the database and driver.
+	 * Might simply invoke {@code ResultSet.getBinaryStream} or work with
+	 * {@code ResultSet.getBlob}, depending on the database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnName the column name to use
-	 * @return the content as binary stream, or <code>null</code> in case of SQL NULL
+	 * @return the content as binary stream, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getBinaryStream
 	 */
@@ -117,11 +117,11 @@ public interface LobHandler {
 
 	/**
 	 * Retrieve the given column as binary stream from the given ResultSet.
-	 * Might simply invoke <code>ResultSet.getBinaryStream</code> or work with
-	 * <code>ResultSet.getBlob</code>, depending on the database and driver.
+	 * Might simply invoke {@code ResultSet.getBinaryStream} or work with
+	 * {@code ResultSet.getBlob}, depending on the database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnIndex the column index to use
-	 * @return the content as binary stream, or <code>null</code> in case of SQL NULL
+	 * @return the content as binary stream, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getBinaryStream
 	 */
@@ -129,11 +129,11 @@ public interface LobHandler {
 
 	/**
 	 * Retrieve the given column as String from the given ResultSet.
-	 * Might simply invoke <code>ResultSet.getString</code> or work with
-	 * <code>ResultSet.getClob</code>, depending on the database and driver.
+	 * Might simply invoke {@code ResultSet.getString} or work with
+	 * {@code ResultSet.getClob}, depending on the database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnName the column name to use
-	 * @return the content as String, or <code>null</code> in case of SQL NULL
+	 * @return the content as String, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getString
 	 */
@@ -141,11 +141,11 @@ public interface LobHandler {
 
 	/**
 	 * Retrieve the given column as String from the given ResultSet.
-	 * Might simply invoke <code>ResultSet.getString</code> or work with
-	 * <code>ResultSet.getClob</code>, depending on the database and driver.
+	 * Might simply invoke {@code ResultSet.getString} or work with
+	 * {@code ResultSet.getClob}, depending on the database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnIndex the column index to use
-	 * @return the content as String, or <code>null</code> in case of SQL NULL
+	 * @return the content as String, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getString
 	 */
@@ -153,11 +153,11 @@ public interface LobHandler {
 
 	/**
 	 * Retrieve the given column as ASCII stream from the given ResultSet.
-	 * Might simply invoke <code>ResultSet.getAsciiStream</code> or work with
-	 * <code>ResultSet.getClob</code>, depending on the database and driver.
+	 * Might simply invoke {@code ResultSet.getAsciiStream} or work with
+	 * {@code ResultSet.getClob}, depending on the database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnName the column name to use
-	 * @return the content as ASCII stream, or <code>null</code> in case of SQL NULL
+	 * @return the content as ASCII stream, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getAsciiStream
 	 */
@@ -165,11 +165,11 @@ public interface LobHandler {
 
 	/**
 	 * Retrieve the given column as ASCII stream from the given ResultSet.
-	 * Might simply invoke <code>ResultSet.getAsciiStream</code> or work with
-	 * <code>ResultSet.getClob</code>, depending on the database and driver.
+	 * Might simply invoke {@code ResultSet.getAsciiStream} or work with
+	 * {@code ResultSet.getClob}, depending on the database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnIndex the column index to use
-	 * @return the content as ASCII stream, or <code>null</code> in case of SQL NULL
+	 * @return the content as ASCII stream, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getAsciiStream
 	 */
@@ -177,8 +177,8 @@ public interface LobHandler {
 
 	/**
 	 * Retrieve the given column as character stream from the given ResultSet.
-	 * Might simply invoke <code>ResultSet.getCharacterStream</code> or work with
-	 * <code>ResultSet.getClob</code>, depending on the database and driver.
+	 * Might simply invoke {@code ResultSet.getCharacterStream} or work with
+	 * {@code ResultSet.getClob}, depending on the 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
@@ -189,8 +189,8 @@ public interface LobHandler {
 
 	/**
 	 * Retrieve the given column as character stream from the given ResultSet.
-	 * Might simply invoke <code>ResultSet.getCharacterStream</code> or work with
-	 * <code>ResultSet.getClob</code>, depending on the database and driver.
+	 * Might simply invoke {@code ResultSet.getCharacterStream} or work with
+	 * {@code ResultSet.getClob}, depending on the 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
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
index 10b02fdc2b..5399cf9c91 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
@@ -44,7 +44,7 @@ import org.springframework.util.FileCopyUtils;
 
 /**
  * {@link LobHandler} implementation for Oracle databases. Uses proprietary API
- * to create <code>oracle.sql.BLOB</code> and <code>oracle.sql.CLOB</code>
+ * to create {@code oracle.sql.BLOB} and {@code oracle.sql.CLOB}
  * instances, as necessary when working with Oracle's JDBC driver.
  * Note that this LobHandler requires Oracle JDBC driver 9i or higher!
  *
@@ -55,7 +55,7 @@ import org.springframework.util.FileCopyUtils;
  * to use a strategy like this LobHandler implementation.
  *
  * <p>Needs to work on a native JDBC Connection, to be able to cast it to
- * <code>oracle.jdbc.OracleConnection</code>. If you pass in Connections from a
+ * {@code oracle.jdbc.OracleConnection}. If you pass in Connections from a
  * connection pool (the usual case in a J2EE environment), you need to set an
  * appropriate {@link org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractor}
  * to allow for automatic retrieval of the underlying native JDBC Connection.
@@ -108,13 +108,13 @@ public class OracleLobHandler extends AbstractLobHandler {
 
 	/**
 	 * Set an appropriate NativeJdbcExtractor to be able to retrieve the underlying
-	 * native <code>oracle.jdbc.OracleConnection</code>. This is necessary for
+	 * native {@code oracle.jdbc.OracleConnection}. This is necessary for
 	 * DataSource-based connection pools, as those need to return wrapped JDBC
 	 * Connection handles that cannot be cast to a native Connection implementation.
 	 * <p>Effectively, this LobHandler just invokes a single NativeJdbcExtractor
-	 * method, namely <code>getNativeConnectionFromStatement</code> with a
+	 * method, namely {@code getNativeConnectionFromStatement} with a
 	 * PreparedStatement argument (falling back to a
-	 * <code>PreparedStatement.getConnection()</code> call if no extractor is set).
+	 * {@code PreparedStatement.getConnection()} call if no extractor is set).
 	 * <p>A common choice is {@code SimpleNativeJdbcExtractor}, whose Connection unwrapping
 	 * (which is what OracleLobHandler needs) will work with many connection pools.
 	 * See {@code SimpleNativeJdbcExtractor} and
@@ -131,7 +131,7 @@ public class OracleLobHandler extends AbstractLobHandler {
 	/**
 	 * Set whether to cache the temporary LOB in the buffer cache.
 	 * This value will be passed into BLOB/CLOB.createTemporary.
-	 * <p>Default is <code>true</code>.
+	 * <p>Default is {@code true}.
 	 * <p><strong>See Also:</strong>
 	 * <ul>
 	 * <li><a href="http://download.oracle.com/otn_hosted_doc/jdeveloper/905/jdbc-javadoc/oracle/sql/BLOB.html#createTemporary()">oracle.sql.BLOB.createTemporary</a></li>
@@ -143,13 +143,13 @@ public class OracleLobHandler extends AbstractLobHandler {
 	}
 
 	/**
-	 * Set whether to agressively release any resources used by the LOB. If set to <code>true</code>
+	 * Set whether to agressively release any resources used by the LOB. If set to {@code true}
 	 * then you can only read the LOB values once. Any subsequent reads will fail since the resources
 	 * have been closed.
-	 * <p>Setting this property to <code>true</code> can be useful when your queries generates large
+	 * <p>Setting this property to {@code true} can be useful when your queries generates large
 	 * temporary LOBs that occupy space in the TEMPORARY tablespace or when you want to free up any
 	 * memory allocated by the driver for the LOB reading.
-	 * <p>Default is <code>false</code>.
+	 * <p>Default is {@code false}.
 	 * <p><strong>See Also:</strong>
 	 * <ul>
 	 * <li><a href="http://download.oracle.com/otn_hosted_doc/jdeveloper/905/jdbc-javadoc/oracle/sql/BLOB.html#freeTemporary()">oracle.sql.BLOB.freeTemporary</a></li>
@@ -166,7 +166,7 @@ public class OracleLobHandler extends AbstractLobHandler {
 
 
 	/**
-	 * Retrieve the <code>oracle.sql.BLOB</code> and <code>oracle.sql.CLOB</code>
+	 * Retrieve the {@code oracle.sql.BLOB} and {@code oracle.sql.CLOB}
 	 * classes via reflection, and initialize the values for the
 	 * DURATION_SESSION, MODE_READWRITE and MODE_READONLY constants defined there.
 	 * <p><strong>See Also:</strong>
@@ -262,9 +262,9 @@ public class OracleLobHandler extends AbstractLobHandler {
 
 	/**
 	 * Initialize any LOB resources before a read is done.
-	 * <p>This implementation calls <code>BLOB.open(BLOB.MODE_READONLY)</code> or
-	 * <code>CLOB.open(CLOB.MODE_READONLY)</code> on any non-temporary LOBs if
-	 * <code>releaseResourcesAfterRead</code> property is set to <code>true</code>.
+	 * <p>This implementation calls {@code BLOB.open(BLOB.MODE_READONLY)} or
+	 * {@code CLOB.open(CLOB.MODE_READONLY)} on any non-temporary LOBs if
+	 * {@code releaseResourcesAfterRead} property is set to {@code true}.
 	 * <p>This method can be overridden by sublcasses if different behavior is desired.
 	 * @param con the connection to be usde for initilization
 	 * @param lob the LOB to initialize
@@ -297,11 +297,11 @@ public class OracleLobHandler extends AbstractLobHandler {
 
 	/**
 	 * Release any LOB resources after read is complete.
-	 * <p>If <code>releaseResourcesAfterRead</code> property is set to <code>true</code>
+	 * <p>If {@code releaseResourcesAfterRead} property is set to {@code true}
 	 * then this implementation calls
-	 * <code>BLOB.close()</code> or <code>CLOB.close()</code>
+	 * {@code BLOB.close()} or {@code CLOB.close()}
 	 * on any non-temporary LOBs that are open or
-	 * <code>BLOB.freeTemporary()</code> or <code>CLOB.freeTemporary()</code>
+	 * {@code BLOB.freeTemporary()} or {@code CLOB.freeTemporary()}
 	 * on any temporary LOBs.
 	 * <p>This method can be overridden by sublcasses if different behavior is desired.
 	 * @param con the connection to be usde for initilization
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java
index 11b9de15cf..bfc80b3e7b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java
@@ -22,12 +22,12 @@ import org.springframework.util.Assert;
 
 /**
  * Callback for resource cleanup at the end of a Spring transaction.
- * Invokes <code>LobCreator.close()</code> to clean up temporary LOBs
+ * Invokes {@code LobCreator.close()} to clean up temporary LOBs
  * that might have been created.
  *
  * @author Juergen Hoeller
  * @since 2.0
- * @see org.springframework.jdbc.support.lob.LobCreator#close()
+ * @see LobCreator#close()
  */
 public class SpringLobCreatorSynchronization extends TransactionSynchronizationAdapter {
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java
index 9830899c9d..9112da11d5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java
@@ -31,7 +31,7 @@ import org.springframework.util.ReflectionUtils;
  * <p>Returns underlying native Connections to application code instead of C3P0's
  * wrapper implementations; unwraps the Connection for native Statements.
  * The returned JDBC classes can then safely be cast, e.g. to
- * <code>oracle.jdbc.OracleConnection</code>.
+ * {@code oracle.jdbc.OracleConnection}.
  *
  * <p>This NativeJdbcExtractor can be set just to <i>allow</i> working with
  * a C3P0 DataSource: If a given object is not a C3P0 wrapper, it will be
@@ -87,8 +87,8 @@ public class C3P0NativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 	}
 
 	/**
-	 * Retrieve the Connection via C3P0's <code>rawConnectionOperation</code> API,
-	 * using the <code>getRawConnection</code> as callback to get access to the
+	 * Retrieve the Connection via C3P0's {@code rawConnectionOperation} API,
+	 * using the {@code getRawConnection} as callback to get access to the
 	 * raw Connection (which is otherwise not directly supported by C3P0).
 	 * @see #getRawConnection
 	 */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java
index 9332ca52f5..731b2320c3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java
@@ -33,16 +33,16 @@ import org.springframework.util.ReflectionUtils;
  *
  * <p>Returns the underlying native Connection, Statement, etc to application
  * code instead of DBCP's wrapper implementations. The returned JDBC classes
- * can then safely be cast, e.g. to <code>oracle.jdbc.OracleConnection</code>.
+ * can then safely be cast, e.g. to {@code oracle.jdbc.OracleConnection}.
  *
  * <p>This NativeJdbcExtractor can be set just to <i>allow</i> working with a
  * Commons DBCP DataSource: If a given object is not a Commons DBCP wrapper,
  * it will be returned as-is.
  *
  * <p>Note that this version of CommonsDbcpNativeJdbcExtractor will work
- * against the original Commons DBCP in <code>org.apache.commons.dbcp</code>
+ * against the original Commons DBCP in {@code org.apache.commons.dbcp}
  * as well as against Tomcat 5.5's relocated Commons DBCP version in the
- * <code>org.apache.tomcat.dbcp.dbcp</code> package.
+ * {@code org.apache.tomcat.dbcp.dbcp} package.
  *
  * @author Juergen Hoeller
  * @since 25.08.2003
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java
index b7c9553f2d..81b2d2ae5f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/JBossNativeJdbcExtractor.java
@@ -34,7 +34,7 @@ import org.springframework.util.ReflectionUtils;
  * <p>Returns the underlying native Connection, Statement, etc to
  * application code instead of JBoss' wrapper implementations.
  * The returned JDBC classes can then safely be cast, e.g. to
- * <code>oracle.jdbc.OracleConnection</code>.
+ * {@code oracle.jdbc.OracleConnection}.
  *
  * <p>This NativeJdbcExtractor can be set just to <i>allow</i> working with
  * a JBoss connection pool: If a given object is not a JBoss wrapper,
@@ -108,7 +108,7 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 
 
 	/**
-	 * Retrieve the Connection via JBoss' <code>getUnderlyingConnection</code> method.
+	 * Retrieve the Connection via JBoss' {@code getUnderlyingConnection} method.
 	 */
 	@Override
 	protected Connection doGetNativeConnection(Connection con) throws SQLException {
@@ -119,7 +119,7 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 	}
 
 	/**
-	 * Retrieve the Connection via JBoss' <code>getUnderlyingStatement</code> method.
+	 * Retrieve the Connection via JBoss' {@code getUnderlyingStatement} method.
 	 */
 	@Override
 	public Statement getNativeStatement(Statement stmt) throws SQLException {
@@ -130,7 +130,7 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 	}
 
 	/**
-	 * Retrieve the Connection via JBoss' <code>getUnderlyingStatement</code> method.
+	 * Retrieve the Connection via JBoss' {@code getUnderlyingStatement} method.
 	 */
 	@Override
 	public PreparedStatement getNativePreparedStatement(PreparedStatement ps) throws SQLException {
@@ -138,7 +138,7 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 	}
 
 	/**
-	 * Retrieve the Connection via JBoss' <code>getUnderlyingStatement</code> method.
+	 * Retrieve the Connection via JBoss' {@code getUnderlyingStatement} method.
 	 */
 	@Override
 	public CallableStatement getNativeCallableStatement(CallableStatement cs) throws SQLException {
@@ -146,7 +146,7 @@ public class JBossNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 	}
 
 	/**
-	 * Retrieve the Connection via JBoss' <code>getUnderlyingResultSet</code> method.
+	 * Retrieve the Connection via JBoss' {@code getUnderlyingResultSet} method.
 	 */
 	@Override
 	public ResultSet getNativeResultSet(ResultSet rs) throws SQLException {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java
index cc22956202..412b99bcad 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java
@@ -25,7 +25,7 @@ import java.sql.Statement;
 
 /**
  * {@link NativeJdbcExtractor} implementation that delegates to JDBC 4.0's
- * <code>unwrap</code> method, as defined by {@link java.sql.Wrapper}.
+ * {@code unwrap} method, as defined by {@link java.sql.Wrapper}.
  * You will typically need to specify a vendor {@link #setConnectionType Connection type}
  * / {@link #setStatementType Statement type} / {@link #setResultSetType ResultSet type}
  * to extract, since JDBC 4.0 only actually unwraps to a given target type.
@@ -58,35 +58,35 @@ public class Jdbc4NativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 
 
 	/**
-	 * Set the vendor's Connection type, e.g. <code>oracle.jdbc.OracleConnection</code>.
+	 * Set the vendor's Connection type, e.g. {@code oracle.jdbc.OracleConnection}.
 	 */
 	public void setConnectionType(Class<? extends Connection> connectionType) {
 		this.connectionType = connectionType;
 	}
 
 	/**
-	 * Set the vendor's Statement type, e.g. <code>oracle.jdbc.OracleStatement</code>.
+	 * Set the vendor's Statement type, e.g. {@code oracle.jdbc.OracleStatement}.
 	 */
 	public void setStatementType(Class<? extends Statement> statementType) {
 		this.statementType = statementType;
 	}
 
 	/**
-	 * Set the vendor's PreparedStatement type, e.g. <code>oracle.jdbc.OraclePreparedStatement</code>.
+	 * Set the vendor's PreparedStatement type, e.g. {@code oracle.jdbc.OraclePreparedStatement}.
 	 */
 	public void setPreparedStatementType(Class<? extends PreparedStatement> preparedStatementType) {
 		this.preparedStatementType = preparedStatementType;
 	}
 
 	/**
-	 * Set the vendor's CallableStatement type, e.g. <code>oracle.jdbc.OracleCallableStatement</code>.
+	 * Set the vendor's CallableStatement type, e.g. {@code oracle.jdbc.OracleCallableStatement}.
 	 */
 	public void setCallableStatementType(Class<? extends CallableStatement> callableStatementType) {
 		this.callableStatementType = callableStatementType;
 	}
 
 	/**
-	 * Set the vendor's ResultSet type, e.g. <code>oracle.jdbc.OracleResultSet</code>.
+	 * Set the vendor's ResultSet type, e.g. {@code oracle.jdbc.OracleResultSet}.
 	 */
 	public void setResultSetType(Class<? extends ResultSet> resultSetType) {
 		this.resultSetType = resultSetType;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java
index 08adb762c0..83b6c52401 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java
@@ -26,12 +26,12 @@ import java.sql.Statement;
 /**
  * Interface for extracting native JDBC objects from wrapped objects coming from
  * connection pools. This is necessary to allow for casting to native implementations
- * like <code>OracleConnection</code> or <code>OracleResultSet</code> in application
+ * like {@code OracleConnection} or {@code OracleResultSet} in application
  * code, for example to create Blobs or to access vendor-specific features.
  *
- * <p>Note: Setting a custom <code>NativeJdbcExtractor</code> is just necessary
+ * <p>Note: Setting a custom {@code NativeJdbcExtractor} is just necessary
  * if you intend to cast to database-specific implementations like
- * <code>OracleConnection</code> or <code>OracleResultSet</code>.
+ * {@code OracleConnection} or {@code OracleResultSet}.
  * Otherwise, any wrapped JDBC object will be fine, with no need for unwrapping.
  *
  * <p>Note: To be able to support any pool's strategy of native ResultSet wrapping,
@@ -43,18 +43,18 @@ import java.sql.Statement;
  * <p>When working with a simple connection pool that wraps Connections but not
  * Statements, a {@link SimpleNativeJdbcExtractor} is often sufficient. However,
  * some pools (like Jakarta's Commons DBCP) wrap <i>all</i> JDBC objects that they
- * return: Therefore, you need to use a specific <code>NativeJdbcExtractor</code>
+ * return: Therefore, you need to use a specific {@code NativeJdbcExtractor}
  * (like {@link CommonsDbcpNativeJdbcExtractor}) with them.
  *
  * <p>{@link org.springframework.jdbc.core.JdbcTemplate} can properly apply a
- * <code>NativeJdbcExtractor</code> if specified, unwrapping all JDBC objects
+ * {@code NativeJdbcExtractor} if specified, unwrapping all JDBC objects
  * that it creates. Note that this is just necessary if you intend to cast to
  * native implementations in your data access code.
  *
  * <p>{@link org.springframework.jdbc.support.lob.OracleLobHandler},
  * the Oracle-specific implementation of Spring's
  * {@link org.springframework.jdbc.support.lob.LobHandler} interface, requires a
- * <code>NativeJdbcExtractor</code> for obtaining the native <code>OracleConnection</code>.
+ * {@code NativeJdbcExtractor} for obtaining the native {@code OracleConnection}.
  * This is also necessary for other Oracle-specific features that you may want
  * to leverage in your applications, such as Oracle InterMedia.
  *
@@ -112,10 +112,10 @@ public interface NativeJdbcExtractor {
 
 	/**
 	 * Retrieve the underlying native JDBC Connection for the given Statement.
-	 * Supposed to return the <code>Statement.getConnection()</code> if not
+	 * Supposed to return the {@code Statement.getConnection()} if not
 	 * capable of unwrapping.
 	 * <p>Having this extra method allows for more efficient unwrapping if data
-	 * access code already has a Statement. <code>Statement.getConnection()</code>
+	 * access code already has a Statement. {@code Statement.getConnection()}
 	 * often returns the native JDBC Connection even if the Statement itself
 	 * is wrapped by a pool.
 	 * @param stmt the Statement handle, potentially wrapped by a connection pool
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java
index 659b171fbd..cb1a19fef1 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java
@@ -31,22 +31,22 @@ import org.springframework.jdbc.datasource.DataSourceUtils;
  * for simplified implementation of basic extractors.
  * Basically returns the passed-in JDBC objects on all methods.
  *
- * <p><code>getNativeConnection</code> checks for a ConnectionProxy chain,
+ * <p>{@code getNativeConnection} checks for a ConnectionProxy chain,
  * for example from a TransactionAwareDataSourceProxy, before delegating to
- * <code>doGetNativeConnection</code> for actual unwrapping. You can override
+ * {@code doGetNativeConnection} for actual unwrapping. You can override
  * either of the two for a specific connection pool, but the latter is
  * recommended to participate in ConnectionProxy unwrapping.
  *
- * <p><code>getNativeConnection</code> also applies a fallback if the first
+ * <p>{@code getNativeConnection} also applies a fallback if the first
  * native extraction process failed, that is, returned the same Connection as
  * passed in. It assumes that some additional proxying is going in this case:
  * Hence, it retrieves the underlying native Connection from the DatabaseMetaData
- * via <code>conHandle.getMetaData().getConnection()</code> and retries the native
+ * via {@code conHandle.getMetaData().getConnection()} and retries the native
  * extraction process based on that Connection handle. This works, for example,
- * for the Connection proxies exposed by Hibernate 3.1's <code>Session.connection()</code>.
+ * for the Connection proxies exposed by Hibernate 3.1's {@code Session.connection()}.
  *
- * <p>The <code>getNativeConnectionFromStatement</code> method is implemented
- * to simply delegate to <code>getNativeConnection</code> with the Statement's
+ * <p>The {@code getNativeConnectionFromStatement} method is implemented
+ * to simply delegate to {@code getNativeConnection} with the Statement's
  * Connection. This is what most extractor implementations will stick to,
  * unless there's a more efficient version for a specific pool.
  *
@@ -59,21 +59,21 @@ import org.springframework.jdbc.datasource.DataSourceUtils;
 public abstract class NativeJdbcExtractorAdapter implements NativeJdbcExtractor {
 
 	/**
-	 * Return <code>false</code> by default.
+	 * Return {@code false} by default.
 	 */
 	public boolean isNativeConnectionNecessaryForNativeStatements() {
 		return false;
 	}
 
 	/**
-	 * Return <code>false</code> by default.
+	 * Return {@code false} by default.
 	 */
 	public boolean isNativeConnectionNecessaryForNativePreparedStatements() {
 		return false;
 	}
 
 	/**
-	 * Return <code>false</code> by default.
+	 * Return {@code false} by default.
 	 */
 	public boolean isNativeConnectionNecessaryForNativeCallableStatements() {
 		return false;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java
index b54df13642..ec831758c8 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java
@@ -26,11 +26,11 @@ import java.sql.Statement;
  * A {@link Jdbc4NativeJdbcExtractor} which comes pre-configured for Oracle's JDBC driver,
  * specifying the following vendor-specific API types for unwrapping:
  * <ul>
- * <li><code>oracle.jdbc.OracleConnection</code>
- * <li><code>oracle.jdbc.OracleStatement</code>
- * <li><code>oracle.jdbc.OraclePreparedStatement</code>
- * <li><code>oracle.jdbc.OracleCallableStatement</code>
- * <li><code>oracle.jdbc.OracleResultSet</code>
+ * <li>{@code oracle.jdbc.OracleConnection}
+ * <li>{@code oracle.jdbc.OracleStatement}
+ * <li>{@code oracle.jdbc.OraclePreparedStatement}
+ * <li>{@code oracle.jdbc.OracleCallableStatement}
+ * <li>{@code oracle.jdbc.OracleResultSet}
  * </ul>
  *
  * <p>Note: This will work with any JDBC 4.0 compliant connection pool, without a need for
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java
index 50a9975e9c..1ac690327a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java
@@ -20,14 +20,14 @@ package org.springframework.jdbc.support.nativejdbc;
  * Simple implementation of the {@link NativeJdbcExtractor} interface.
  * Assumes a pool that wraps Connection handles but not DatabaseMetaData:
  * In this case, the underlying native Connection can be retrieved by simply
- * calling <code>conHandle.getMetaData().getConnection()</code>.
+ * calling {@code conHandle.getMetaData().getConnection()}.
  * All other JDBC objects will be returned as passed in.
  *
  * <p>This extractor should work with any pool that does not wrap DatabaseMetaData,
  * and will also work with any plain JDBC driver. Note that a pool can still wrap
  * Statements, PreparedStatements, etc: The only requirement of this extractor is
- * that <code>java.sql.DatabaseMetaData</code> does not get wrapped, returning the
- * native Connection of the JDBC driver on <code>metaData.getConnection()</code>.
+ * that {@code java.sql.DatabaseMetaData} does not get wrapped, returning the
+ * native Connection of the JDBC driver on {@code metaData.getConnection()}.
  *
  * <p>Customize this extractor by setting the "nativeConnectionNecessaryForXxx"
  * flags accordingly: If Statements, PreparedStatements, and/or CallableStatements
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java
index b683195fcb..f0567bc41c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java
@@ -29,7 +29,7 @@ import org.springframework.util.ReflectionUtils;
  * <p>Returns the underlying native Connection to application code instead
  * of WebLogic's wrapper implementation; unwraps the Connection for native
  * statements. The returned JDBC classes can then safely be cast, e.g. to
- * <code>oracle.jdbc.OracleConnection</code>.
+ * {@code oracle.jdbc.OracleConnection}.
  *
  * <p>This NativeJdbcExtractor can be set just to <i>allow</i> working
  * with a WebLogic DataSource: If a given object is not a WebLogic
@@ -68,7 +68,7 @@ public class WebLogicNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 
 
 	/**
-	 * Return <code>true</code>, as WebLogic returns wrapped Statements.
+	 * Return {@code true}, as WebLogic returns wrapped Statements.
 	 */
 	@Override
 	public boolean isNativeConnectionNecessaryForNativeStatements() {
@@ -76,7 +76,7 @@ public class WebLogicNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 	}
 
 	/**
-	 * Return <code>true</code>, as WebLogic returns wrapped PreparedStatements.
+	 * Return {@code true}, as WebLogic returns wrapped PreparedStatements.
 	 */
 	@Override
 	public boolean isNativeConnectionNecessaryForNativePreparedStatements() {
@@ -84,7 +84,7 @@ public class WebLogicNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 	}
 
 	/**
-	 * Return <code>true</code>, as WebLogic returns wrapped CallableStatements.
+	 * Return {@code true}, as WebLogic returns wrapped CallableStatements.
 	 */
 	@Override
 	public boolean isNativeConnectionNecessaryForNativeCallableStatements() {
@@ -92,7 +92,7 @@ public class WebLogicNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 	}
 
 	/**
-	 * Retrieve the Connection via WebLogic's <code>getVendorConnection</code> method.
+	 * Retrieve the Connection via WebLogic's {@code getVendorConnection} method.
 	 */
 	@Override
 	protected Connection doGetNativeConnection(Connection con) throws SQLException {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java
index 6a97587013..d40a575c7a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebSphereNativeJdbcExtractor.java
@@ -29,7 +29,7 @@ import org.springframework.util.ReflectionUtils;
  * <p>Returns the underlying native Connection to application code instead
  * of WebSphere's wrapper implementation; unwraps the Connection for
  * native statements. The returned JDBC classes can then safely be cast,
- * e.g. to <code>oracle.jdbc.OracleConnection</code>.
+ * e.g. to {@code oracle.jdbc.OracleConnection}.
  *
  * <p>This NativeJdbcExtractor can be set just to <i>allow</i> working
  * with a WebSphere DataSource: If a given object is not a WebSphere
@@ -69,7 +69,7 @@ public class WebSphereNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 
 
 	/**
-	 * Return <code>true</code>, as WebSphere returns wrapped Statements.
+	 * Return {@code true}, as WebSphere returns wrapped Statements.
 	 */
 	@Override
 	public boolean isNativeConnectionNecessaryForNativeStatements() {
@@ -77,7 +77,7 @@ public class WebSphereNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 	}
 
 	/**
-	 * Return <code>true</code>, as WebSphere returns wrapped PreparedStatements.
+	 * Return {@code true}, as WebSphere returns wrapped PreparedStatements.
 	 */
 	@Override
 	public boolean isNativeConnectionNecessaryForNativePreparedStatements() {
@@ -85,7 +85,7 @@ public class WebSphereNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 	}
 
 	/**
-	 * Return <code>true</code>, as WebSphere returns wrapped CallableStatements.
+	 * Return {@code true}, as WebSphere returns wrapped CallableStatements.
 	 */
 	@Override
 	public boolean isNativeConnectionNecessaryForNativeCallableStatements() {
@@ -93,7 +93,7 @@ public class WebSphereNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 	}
 
 	/**
-	 * Retrieve the Connection via WebSphere's <code>getNativeConnection</code> method.
+	 * Retrieve the Connection via WebSphere's {@code getNativeConnection} method.
 	 */
 	@Override
 	protected Connection doGetNativeConnection(Connection con) throws SQLException {
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 1256563e9d..ebb2e28ad4 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
@@ -33,24 +33,24 @@ import org.springframework.jdbc.InvalidResultSetAccessException;
 /**
  * Default implementation of Spring's {@link SqlRowSet} interface.
  *
- * <p>This implementation wraps a <code>javax.sql.ResultSet</code>, catching any SQLExceptions
+ * <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
  * to be usable in a disconnected fashion. This means that you will usually pass in a
- * <code>javax.sql.rowset.CachedRowSet</code>, which implements the ResultSet interface.
+ * {@code javax.sql.rowset.CachedRowSet}, which implements the ResultSet interface.
  *
  * <p>Note: Since JDBC 4.0, it has been clarified that any methods using a String to identify
  * the column should be using the column label. The column label is assigned using the ALIAS
  * keyword in the SQL query string. When the query doesn't use an ALIAS, the default label is
  * the column name. Most JDBC ResultSet implementations follow this new pattern but there are
- * exceptions such as the <code>com.sun.rowset.CachedRowSetImpl</code> class which only uses
+ * exceptions such as the {@code com.sun.rowset.CachedRowSetImpl} class which only uses
  * the column name, ignoring any column labels. As of Spring 3.0.5, ResultSetWrappingSqlRowSet
  * will translate column labels to the correct column index to provide better support for the
- * <code>com.sun.rowset.CachedRowSetImpl</code> which is the default implementation used by
+ * {@code com.sun.rowset.CachedRowSetImpl} which is the default implementation used by
  * {@link org.springframework.jdbc.core.JdbcTemplate} when working with RowSets.
  *
- * <p>Note: This class implements the <code>java.io.Serializable</code> marker interface
+ * <p>Note: This class implements the {@code java.io.Serializable} marker interface
  * through the SqlRowSet interface, but is only actually serializable if the disconnected
  * ResultSet/RowSet contained in it is serializable. Most CachedRowSet implementations
  * are actually serializable, so this should usually work out.
@@ -78,7 +78,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * Create a new ResultSetWrappingSqlRowSet for the given ResultSet.
 	 * @param resultSet a disconnected ResultSet to wrap
-	 * (usually a <code>javax.sql.rowset.CachedRowSet</code>)
+	 * (usually a {@code javax.sql.rowset.CachedRowSet})
 	 * @throws InvalidResultSetAccessException if extracting
 	 * the ResultSetMetaData failed
 	 * @see javax.sql.rowset.CachedRowSet
@@ -115,7 +115,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 
 	/**
 	 * Return the underlying ResultSet
-	 * (usually a <code>javax.sql.rowset.CachedRowSet</code>).
+	 * (usually a {@code javax.sql.rowset.CachedRowSet}).
 	 * @see javax.sql.rowset.CachedRowSet
 	 */
 	public final ResultSet getResultSet() {
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 985a199af3..0c294bfe69 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
@@ -25,7 +25,7 @@ import org.springframework.jdbc.InvalidResultSetAccessException;
  * Default implementation of Spring's SqlRowSetMetaData interface.
  * Used by ResultSetWrappingSqlRowSet.
  *
- * <p>This implementation wraps a <code>javax.sql.ResultSetMetaData</code>
+ * <p>This implementation wraps a {@code javax.sql.ResultSetMetaData}
  * instance, catching any SQLExceptions and translating them to the
  * appropriate Spring DataAccessException.
  *
@@ -45,7 +45,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 	 * Create a new ResultSetWrappingSqlRowSetMetaData object
 	 * for the given ResultSetMetaData instance.
 	 * @param resultSetMetaData a disconnected ResultSetMetaData instance
-	 * to wrap (usually a <code>javax.sql.RowSetMetaData</code> instance)
+	 * to wrap (usually a {@code javax.sql.RowSetMetaData} instance)
 	 * @see java.sql.ResultSet#getMetaData
 	 * @see javax.sql.RowSetMetaData
 	 * @see ResultSetWrappingSqlRowSet#getMetaData
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 a88cd0e0e5..c87d829263 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
@@ -27,16 +27,16 @@ import java.util.Map;
 import org.springframework.jdbc.InvalidResultSetAccessException;
 
 /**
- * Mirror interface for <code>javax.sql.RowSet</code>, representing
- * disconnected <code>java.sql.ResultSet</code> data.
+ * Mirror interface for {@code javax.sql.RowSet}, representing
+ * disconnected {@code 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</code>
+ * {@code org.springframework.jdbc.InvalidResultSetAccessException}
  * instead (when appropriate).
  *
- * <p>Note: This interface extends the <code>java.io.Serializable</code>
+ * <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).
  *
@@ -477,10 +477,10 @@ public interface SqlRowSet extends Serializable {
 	boolean relative(int rows) throws InvalidResultSetAccessException;
 
 	/**
-	 * Reports whether the last column read had a value of SQL <code>NULL</code>.
+	 * 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</code> method.
-	 * @return true if the most recent coumn retrieved was SQL <code>NULL</code>,
+	 * the {@code wasNull} method.
+	 * @return true if the most recent coumn retrieved was SQL {@code NULL},
 	 * false otherwise
 	 * @see java.sql.ResultSet#wasNull()
 	 */
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 17ca2b6cc7..9a722a607e 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
@@ -20,12 +20,12 @@ import org.springframework.jdbc.InvalidResultSetAccessException;
 
 /**
  * Meta data interface for Spring's SqlRowSet,
- * analogous to <code>javax.sql.ResultSetMetaData</code>
+ * analogous to {@code javax.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</code>
+ * {@code org.springframework.jdbc.InvalidResultSetAccessException}
  * instead (when appropriate).
  *
  * @author Thomas Risberg
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 b6846b71ee..697f67f3e9 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
@@ -35,7 +35,7 @@ import org.springframework.dao.DataAccessResourceFailureException;
  * Default implementation of the {@link SqlXmlHandler} interface.
  * Provides database-specific implementations for storing and
  * retrieving XML documents to and from fields in a database,
- * relying on the JDBC 4.0 <code>java.sql.SQLXML</code> facility.
+ * relying on the JDBC 4.0 {@code java.sql.SQLXML} facility.
  *
  * @author Thomas Risberg
  * @author Juergen Hoeller
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 b34071201d..acb78b3c06 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
@@ -29,7 +29,7 @@ import org.w3c.dom.Document;
  * Abstraction for handling XML fields in specific databases. Its main purpose
  * is to isolate database-specific handling of XML stored in the database.
  *
- * <p>JDBC 4.0 introduces the new data type <code>java.sql.SQLXML</code>
+ * <p>JDBC 4.0 introduces the new data type {@code java.sql.SQLXML}
  * but most databases and their drivers currently rely on database-specific
  * data types and features.
  *
@@ -51,12 +51,12 @@ public interface SqlXmlHandler {
 
 	/**
 	 * Retrieve the given column as String from the given ResultSet.
-	 * <p>Might simply invoke <code>ResultSet.getString</code> or work with
-	 * <code>SQLXML</code> or database-specific classes depending on the
+	 * <p>Might simply invoke {@code ResultSet.getString} or work with
+	 * {@code SQLXML} or database-specific classes depending on the
 	 * database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnName the column name to use
-	 * @return the content as String, or <code>null</code> in case of SQL NULL
+	 * @return the content as String, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getString
 	 * @see java.sql.ResultSet#getSQLXML
@@ -65,12 +65,12 @@ public interface SqlXmlHandler {
 
 	/**
 	 * Retrieve the given column as String from the given ResultSet.
-	 * <p>Might simply invoke <code>ResultSet.getString</code> or work with
-	 * <code>SQLXML</code> or database-specific classes depending on the
+	 * <p>Might simply invoke {@code ResultSet.getString} or work with
+	 * {@code SQLXML} or database-specific classes depending on the
 	 * database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnIndex the column index to use
-	 * @return the content as String, or <code>null</code> in case of SQL NULL
+	 * @return the content as String, or {@code null} in case of SQL NULL
 	 * @throws SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getString
 	 * @see java.sql.ResultSet#getSQLXML
@@ -79,12 +79,12 @@ public interface SqlXmlHandler {
 
 	/**
 	 * Retrieve the given column as binary stream from the given ResultSet.
-	 * <p>Might simply invoke <code>ResultSet.getAsciiStream</code> or work with
-	 * <code>SQLXML</code> or database-specific classes depending on the
+	 * <p>Might simply invoke {@code ResultSet.getAsciiStream} or work with
+	 * {@code SQLXML} or database-specific classes depending on the
 	 * database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnName the column name to use
-	 * @return the content as a binary stream, or <code>null</code> in case of SQL NULL
+	 * @return the content as a binary 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#getBinaryStream
@@ -93,12 +93,12 @@ public interface SqlXmlHandler {
 
 	/**
 	 * Retrieve the given column as binary stream from the given ResultSet.
-	 * <p>Might simply invoke <code>ResultSet.getAsciiStream</code> or work with
-	 * <code>SQLXML</code> or database-specific classes depending on the
+	 * <p>Might simply invoke {@code ResultSet.getAsciiStream} or work with
+	 * {@code SQLXML} or database-specific classes depending on the
 	 * database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnIndex the column index to use
-	 * @return the content as binary stream, or <code>null</code> in case of SQL NULL
+	 * @return the content as binary 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#getBinaryStream
@@ -107,8 +107,8 @@ public interface SqlXmlHandler {
 
 	/**
 	 * Retrieve the given column as character stream from the given ResultSet.
-	 * <p>Might simply invoke <code>ResultSet.getCharacterStream</code> or work with
-	 * <code>SQLXML</code> or database-specific classes depending on the
+	 * <p>Might simply invoke {@code ResultSet.getCharacterStream} or work with
+	 * {@code SQLXML} or database-specific classes depending on the
 	 * database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnName the column name to use
@@ -121,8 +121,8 @@ public interface SqlXmlHandler {
 
 	/**
 	 * Retrieve the given column as character stream from the given ResultSet.
-	 * <p>Might simply invoke <code>ResultSet.getCharacterStream</code> or work with
-	 * <code>SQLXML</code> or database-specific classes depending on the
+	 * <p>Might simply invoke {@code ResultSet.getCharacterStream} or work with
+	 * {@code SQLXML} or database-specific classes depending on the
 	 * database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnIndex the column index to use
@@ -136,7 +136,7 @@ public interface SqlXmlHandler {
 	/**
 	 * Retrieve the given column as Source implemented using the specified source class
 	 * from the given ResultSet.
-	 * <p>Might work with <code>SQLXML</code> or database-specific classes depending
+	 * <p>Might work with {@code SQLXML} or database-specific classes depending
 	 * on the database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnName the column name to use
@@ -151,7 +151,7 @@ public interface SqlXmlHandler {
 	/**
 	 * Retrieve the given column as Source implemented using the specified source class
 	 * from the given ResultSet.
-	 * <p>Might work with <code>SQLXML</code> or database-specific classes depending
+	 * <p>Might work with {@code SQLXML} or database-specific classes depending
 	 * on the database and driver.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnIndex the column index to use
@@ -169,7 +169,7 @@ public interface SqlXmlHandler {
 	//-------------------------------------------------------------------------
 
 	/**
-	 * Create a <code>SqlXmlValue</code> instance for the given XML data,
+	 * Create a {@code SqlXmlValue} instance for the given XML data,
 	 * as supported by the underlying JDBC driver.
 	 * @param value the XML String value providing XML data
 	 * @return the implementation specific instance
@@ -179,9 +179,9 @@ public interface SqlXmlHandler {
 	SqlXmlValue newSqlXmlValue(String value);
 
 	/**
-	 * Create a <code>SqlXmlValue</code> instance for the given XML data,
+	 * Create a {@code SqlXmlValue} instance for the given XML data,
 	 * as supported by the underlying JDBC driver.
-	 * @param provider the <code>XmlBinaryStreamProvider</code> providing XML data
+	 * @param provider the {@code XmlBinaryStreamProvider} providing XML data
 	 * @return the implementation specific instance
 	 * @see SqlXmlValue
 	 * @see java.sql.SQLXML#setBinaryStream()
@@ -189,9 +189,9 @@ public interface SqlXmlHandler {
 	SqlXmlValue newSqlXmlValue(XmlBinaryStreamProvider provider);
 
 	/**
-	 * Create a <code>SqlXmlValue</code> instance for the given XML data,
+	 * Create a {@code SqlXmlValue} instance for the given XML data,
 	 * as supported by the underlying JDBC driver.
-	 * @param provider the <code>XmlCharacterStreamProvider</code> providing XML data
+	 * @param provider the {@code XmlCharacterStreamProvider} providing XML data
 	 * @return the implementation specific instance
 	 * @see SqlXmlValue
 	 * @see java.sql.SQLXML#setCharacterStream()
@@ -199,10 +199,10 @@ public interface SqlXmlHandler {
 	SqlXmlValue newSqlXmlValue(XmlCharacterStreamProvider provider);
 
 	/**
-	 * Create a <code>SqlXmlValue</code> instance for the given XML data,
+	 * Create a {@code SqlXmlValue} instance for the given XML data,
 	 * as supported by the underlying JDBC driver.
 	 * @param resultClass the Result implementation class to be used
-	 * @param provider the <code>XmlResultProvider</code> that will provide the XML data
+	 * @param provider the {@code XmlResultProvider} that will provide the XML data
 	 * @return the implementation specific instance
 	 * @see SqlXmlValue
 	 * @see java.sql.SQLXML#setResult(Class)
@@ -210,7 +210,7 @@ public interface SqlXmlHandler {
 	SqlXmlValue newSqlXmlValue(Class resultClass, XmlResultProvider provider);
 
 	/**
-	 * Create a <code>SqlXmlValue</code> instance for the given XML data,
+	 * Create a {@code SqlXmlValue} instance for the given XML data,
 	 * as supported by the underlying JDBC driver.
 	 * @param doc the XML Document to be used
 	 * @return the implementation specific instance
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java
index a2605c5834..c1ad737de5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java
@@ -39,7 +39,7 @@ public interface SqlXmlObjectMappingHandler extends SqlXmlHandler {
 	 * <p>Works with an internal Object to XML Mapping implementation.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnName the column name to use
-	 * @return the content as an Object, or <code>null</code> in case of SQL NULL
+	 * @return the content as an Object, or {@code null} in case of SQL NULL
 	 * @throws java.sql.SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getSQLXML
 	 */
@@ -51,15 +51,15 @@ public interface SqlXmlObjectMappingHandler extends SqlXmlHandler {
 	 * <p>Works with an internal Object to XML Mapping implementation.
 	 * @param rs the ResultSet to retrieve the content from
 	 * @param columnIndex the column index to use
-	 * @return the content as an Object, or <code>null</code> in case of SQL NULL
+	 * @return the content as an Object, or {@code null} in case of SQL NULL
 	 * @throws java.sql.SQLException if thrown by JDBC methods
 	 * @see java.sql.ResultSet#getSQLXML
 	 */
 	Object getXmlAsObject(ResultSet rs, int columnIndex) throws SQLException;
 
 	/**
-	 * Get an instance of an <code>SqlXmlValue</code> implementation to be used together
-	 * with the database specific implementation of this <code>SqlXmlObjectMappingHandler</code>.
+	 * Get an instance of an {@code SqlXmlValue} implementation to be used together
+	 * with the database specific implementation of this {@code SqlXmlObjectMappingHandler}.
 	 * @param value the Object to be marshalled to XML
 	 * @return the implementation specific instance
 	 * @see SqlXmlValue
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java
index 5ede88882b..df915e46c6 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java
@@ -20,7 +20,7 @@ import java.io.OutputStream;
 import java.io.IOException;
 
 /**
- * Interface defining handling involved with providing <code>OutputStream</code>
+ * Interface defining handling involved with providing {@code OutputStream}
  * data for XML input.
  *
  * @author Thomas Risberg
@@ -31,8 +31,8 @@ public interface XmlBinaryStreamProvider {
 
 	/**
 	 * Implementations must implement this method to provide the XML content
-	 * for the <code>OutputStream</code>.
-	 * @param outputStream the <code>OutputStream</code> object being used to provide the XML input
+	 * for the {@code OutputStream}.
+	 * @param outputStream the {@code OutputStream} object being used to provide the XML input
 	 * @throws IOException if an I/O error occurs while providing the XML
 	 */
 	void provideXml(OutputStream outputStream) throws IOException;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java
index 02ffbffa36..9d899f8057 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java
@@ -20,7 +20,7 @@ import java.io.Writer;
 import java.io.IOException;
 
 /**
- * Interface defining handling involved with providing <code>Writer</code>
+ * Interface defining handling involved with providing {@code Writer}
  * data for XML input.
  *
  * @author Thomas Risberg
@@ -31,8 +31,8 @@ public interface XmlCharacterStreamProvider {
 
 	/**
 	 * Implementations must implement this method to provide the XML content
-	 * for the <code>Writer</code>.
-	 * @param writer the <code>Writer</code> object being used to provide the XML input
+	 * for the {@code Writer}.
+	 * @param writer the {@code Writer} object being used to provide the XML input
 	 * @throws IOException if an I/O error occurs while providing the XML
 	 */
 	void provideXml(Writer writer) throws IOException;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java
index 9142ecd0b8..49602a6b34 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java
@@ -19,7 +19,7 @@ package org.springframework.jdbc.support.xml;
 import javax.xml.transform.Result;
 
 /**
- * Interface defining handling involved with providing <code>Result</code>
+ * Interface defining handling involved with providing {@code Result}
  * data for XML input.
  *
  * @author Thomas Risberg
@@ -30,9 +30,9 @@ public interface XmlResultProvider {
 
 	/**
 	 * Implementations must implement this method to provide the XML content
-	 * for the <code>Result</code>. Implementations will vary depending on
-	 * the <code>Result</code> implementation used.
-	 * @param result the <code>Result</code> object being used to provide the XML input
+	 * for the {@code Result}. Implementations will vary depending on
+	 * the {@code Result} implementation used.
+	 * @param result the {@code Result} object being used to provide the XML input
 	 */
 	void provideXml(Result result);
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/JmsException.java b/spring-jms/src/main/java/org/springframework/jms/JmsException.java
index 3c379cc7ab..702b5cb09a 100644
--- a/spring-jms/src/main/java/org/springframework/jms/JmsException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/JmsException.java
@@ -51,7 +51,7 @@ public abstract class JmsException extends NestedRuntimeException {
 
 	/**
 	 * Constructor that takes a plain root cause, intended for
-	 * subclasses mirroring corresponding <code>javax.jms</code> exceptions.
+	 * subclasses mirroring corresponding {@code javax.jms} exceptions.
 	 * @param cause the cause of the exception. This argument is generally
 	 * expected to be a proper subclass of {@link javax.jms.JMSException}.
 	 */
@@ -64,7 +64,7 @@ public abstract class JmsException extends NestedRuntimeException {
 	 * Convenience method to get the vendor specific error code if
 	 * the root cause was an instance of JMSException.
 	 * @return a string specifying the vendor-specific error code if the
-	 * root cause is an instance of JMSException, or <code>null</code>
+	 * root cause is an instance of JMSException, or {@code null}
 	 */
 	public String getErrorCode() {
 		Throwable cause = getCause();
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 20df434ebf..4c34748211 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
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.util.StringUtils;
 
 /**
- * Parser for the JMS <code>&lt;jca-listener-container&gt;</code> element.
+ * Parser for the JMS {@code &lt;jca-listener-container&gt;} element.
  *
  * @author Juergen Hoeller
  * @since 2.5
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 a65db63d9d..05ecd8b5de 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
@@ -27,7 +27,7 @@ import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.util.StringUtils;
 
 /**
- * Parser for the JMS <code>&lt;listener-container&gt;</code> element.
+ * Parser for the JMS {@code &lt;listener-container&gt;} element.
  *
  * @author Mark Fisher
  * @author Juergen Hoeller
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 35456ea458..367d8b804a 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
@@ -59,8 +59,8 @@ import org.springframework.util.ObjectUtils;
  *
  * <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:
- * <code>createQueueConnection</code> and <code>createTopicConnection</code> will
- * lead to queue/topic mode, respectively; generic <code>createConnection</code>
+ * {@code createQueueConnection} and {@code createTopicConnection} will
+ * lead to queue/topic mode, respectively; generic {@code createConnection}
  * calls will lead to a JMS 1.1 connection which is able to serve both modes.
  *
  * <p><b>NOTE: This ConnectionFactory requires explicit closing of all Sessions
@@ -71,7 +71,7 @@ import org.springframework.util.ObjectUtils;
  * <p>Note also that MessageConsumers obtained from a cached Session won't get
  * closed until the Session will eventually be removed from the pool. This may
  * lead to semantic side effects in some cases. For a durable subscriber, the
- * logical <code>Session.close()</code> call will also close the subscription.
+ * logical {@code Session.close()} call will also close the subscription.
  * Re-registering a durable consumer for the same subscription on the same
  * Session handle is not supported; close and reobtain a cached Session first.
  *
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java b/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
index a383c3a2fb..e2c006042b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
@@ -57,9 +57,9 @@ public abstract class ConnectionFactoryUtils {
 	 * This is essentially a more sophisticated version of
 	 * {@link org.springframework.jms.support.JmsUtils#closeConnection}.
 	 * @param con the Connection to release
-	 * (if this is <code>null</code>, the call will be ignored)
+	 * (if this is {@code null}, the call will be ignored)
 	 * @param cf the ConnectionFactory that the Connection was obtained from
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @param started whether the Connection might have been started by the application
 	 * @see SmartConnectionFactory#shouldStop
 	 * @see org.springframework.jms.support.JmsUtils#closeConnection
@@ -122,13 +122,13 @@ public abstract class ConnectionFactoryUtils {
 	 * Obtain a JMS Session that is synchronized with the current transaction, if any.
 	 * @param cf the ConnectionFactory to obtain a Session for
 	 * @param existingCon the existing JMS Connection to obtain a Session for
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @param synchedLocalTransactionAllowed whether to allow for a local JMS transaction
 	 * that is synchronized with a Spring-managed transaction (where the main transaction
 	 * might be a JDBC-based one for a specific DataSource, for example), with the JMS
 	 * transaction committing right after the main transaction. If not allowed, the given
 	 * ConnectionFactory needs to handle transaction enlistment underneath the covers.
-	 * @return the transactional Session, or <code>null</code> if none found
+	 * @return the transactional Session, or {@code null} if none found
 	 * @throws JMSException in case of JMS failure
 	 */
 	public static Session getTransactionalSession(
@@ -159,13 +159,13 @@ public abstract class ConnectionFactoryUtils {
 	 * <p>Mainly intended for use with the JMS 1.0.2 API.
 	 * @param cf the ConnectionFactory to obtain a Session for
 	 * @param existingCon the existing JMS Connection to obtain a Session for
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @param synchedLocalTransactionAllowed whether to allow for a local JMS transaction
 	 * that is synchronized with a Spring-managed transaction (where the main transaction
 	 * might be a JDBC-based one for a specific DataSource, for example), with the JMS
 	 * transaction committing right after the main transaction. If not allowed, the given
 	 * ConnectionFactory needs to handle transaction enlistment underneath the covers.
-	 * @return the transactional Session, or <code>null</code> if none found
+	 * @return the transactional Session, or {@code null} if none found
 	 * @throws JMSException in case of JMS failure
 	 */
 	public static QueueSession getTransactionalQueueSession(
@@ -196,13 +196,13 @@ public abstract class ConnectionFactoryUtils {
 	 * <p>Mainly intended for use with the JMS 1.0.2 API.
 	 * @param cf the ConnectionFactory to obtain a Session for
 	 * @param existingCon the existing JMS Connection to obtain a Session for
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @param synchedLocalTransactionAllowed whether to allow for a local JMS transaction
 	 * that is synchronized with a Spring-managed transaction (where the main transaction
 	 * might be a JDBC-based one for a specific DataSource, for example), with the JMS
 	 * transaction committing right after the main transaction. If not allowed, the given
 	 * ConnectionFactory needs to handle transaction enlistment underneath the covers.
-	 * @return the transactional Session, or <code>null</code> if none found
+	 * @return the transactional Session, or {@code null} if none found
 	 * @throws JMSException in case of JMS failure
 	 */
 	public static TopicSession getTransactionalTopicSession(
@@ -230,13 +230,13 @@ public abstract class ConnectionFactoryUtils {
 
 	/**
 	 * Obtain a JMS Session that is synchronized with the current transaction, if any.
-	 * <p>This <code>doGetTransactionalSession</code> variant always starts the underlying
+	 * <p>This {@code doGetTransactionalSession} variant always starts the underlying
 	 * JMS Connection, assuming that the Session will be used for receiving messages.
 	 * @param connectionFactory the JMS ConnectionFactory to bind for
 	 * (used as TransactionSynchronizationManager key)
 	 * @param resourceFactory the ResourceFactory to use for extracting or creating
 	 * JMS resources
-	 * @return the transactional Session, or <code>null</code> if none found
+	 * @return the transactional Session, or {@code null} if none found
 	 * @throws JMSException in case of JMS failure
 	 * @see #doGetTransactionalSession(javax.jms.ConnectionFactory, ResourceFactory, boolean)
 	 */
@@ -254,8 +254,8 @@ public abstract class ConnectionFactoryUtils {
 	 * JMS resources
 	 * @param startConnection whether the underlying JMS Connection approach should be
 	 * started in order to allow for receiving messages. Note that a reused Connection
-	 * may already have been started before, even if this flag is <code>false</code>.
-	 * @return the transactional Session, or <code>null</code> if none found
+	 * may already have been started before, even if this flag is {@code false}.
+	 * @return the transactional Session, or {@code null} if none found
 	 * @throws JMSException in case of JMS failure
 	 */
 	public static Session doGetTransactionalSession(
@@ -335,7 +335,7 @@ public abstract class ConnectionFactoryUtils {
 
 	/**
 	 * Callback interface for resource creation.
-	 * Serving as argument for the <code>doGetTransactionalSession</code> method.
+	 * Serving as argument for the {@code doGetTransactionalSession} method.
 	 */
 	public interface ResourceFactory {
 
@@ -343,7 +343,7 @@ public abstract class ConnectionFactoryUtils {
 		 * Fetch an appropriate Session from the given JmsResourceHolder.
 		 * @param holder the JmsResourceHolder
 		 * @return an appropriate Session fetched from the holder,
-		 * or <code>null</code> if none found
+		 * or {@code null} if none found
 		 */
 		Session getSession(JmsResourceHolder holder);
 
@@ -351,7 +351,7 @@ public abstract class ConnectionFactoryUtils {
 		 * Fetch an appropriate Connection from the given JmsResourceHolder.
 		 * @param holder the JmsResourceHolder
 		 * @return an appropriate Connection fetched from the holder,
-		 * or <code>null</code> if none found
+		 * or {@code null} if none found
 		 */
 		Connection getConnection(JmsResourceHolder holder);
 
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 9fd0e8a3c2..77cd02c180 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
@@ -30,7 +30,7 @@ import org.springframework.util.Assert;
 /**
  * {@link javax.jms.ConnectionFactory} implementation that delegates all calls
  * to a given target {@link javax.jms.ConnectionFactory}, adapting specific
- * <code>create(Queue/Topic)Connection</code> calls to the target ConnectionFactory
+ * {@code create(Queue/Topic)Connection} calls to the target ConnectionFactory
  * if necessary (e.g. when running JMS 1.0.2 API based code against a generic
  * JMS 1.1 ConnectionFactory, such as ActiveMQ's PooledConnectionFactory).
  *
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 1a96d900e2..b8e3e10832 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
@@ -72,7 +72,7 @@ public class JmsResourceHolder extends ResourceHolderSupport {
 	/**
 	 * Create a new JmsResourceHolder that is open for resources to be added.
 	 * @param connectionFactory the JMS ConnectionFactory that this
-	 * resource holder is associated with (may be <code>null</code>)
+	 * resource holder is associated with (may be {@code null})
 	 */
 	public JmsResourceHolder(ConnectionFactory connectionFactory) {
 		this.connectionFactory = connectionFactory;
@@ -101,7 +101,7 @@ public class JmsResourceHolder extends ResourceHolderSupport {
 	/**
 	 * Create a new JmsResourceHolder for the given JMS resources.
 	 * @param connectionFactory the JMS ConnectionFactory that this
-	 * resource holder is associated with (may be <code>null</code>)
+	 * resource holder is associated with (may be {@code null})
 	 * @param connection the JMS Connection
 	 * @param session the JMS Session
 	 */
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 aa6e235651..cc401957b2 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
@@ -69,8 +69,8 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  *
  * <p>The use of a <i>raw</i> target ConnectionFactory would not only be inefficient
  * because of the lack of resource reuse. It might also lead to strange effects
- * when your JMS driver doesn't accept <code>MessageProducer.close()</code> calls
- * and/or <code>MessageConsumer.close()</code> calls before <code>Session.commit()</code>,
+ * when your JMS driver doesn't accept {@code MessageProducer.close()} calls
+ * and/or {@code MessageConsumer.close()} calls before {@code Session.commit()},
  * with the latter supposed to commit all the messages that have been sent through the
  * producer handle and received through the consumer handle. As a safe general solution,
  * always pass in a {@link CachingConnectionFactory} into this transaction manager's
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
index 98fa64296f..dd3bb77342 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
@@ -77,8 +77,8 @@ public class JmsTransactionManager102 extends JmsTransactionManager {
 	 * This tells the JMS 1.0.2 provider which class hierarchy to use for creating
 	 * Connections and Sessions.
 	 * <p>Default is Point-to-Point (Queues).
-	 * @param pubSubDomain <code>true</code> for Publish/Subscribe domain (Topics),
-	 * <code>false</code> for Point-to-Point domain (Queues)
+	 * @param pubSubDomain {@code true} for Publish/Subscribe domain (Topics),
+	 * {@code false} for Point-to-Point domain (Queues)
 	 */
 	public void setPubSubDomain(boolean pubSubDomain) {
 		this.pubSubDomain = pubSubDomain;
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java b/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java
index d0708f5831..aab270cd03 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java
@@ -34,7 +34,7 @@ public interface SessionProxy extends Session {
 	 * Return the target Session of this proxy.
 	 * <p>This will typically be the native provider Session
 	 * or a wrapper from a session pool.
-	 * @return the underlying Session (never <code>null</code>)
+	 * @return the underlying Session (never {@code null})
 	 */
 	Session getTargetSession();
 
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 239c51f28b..5b5510dc4e 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
@@ -52,8 +52,8 @@ import org.springframework.util.Assert;
  *
  * <p>Note that 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:
- * <code>createQueueConnection</code> and <code>createTopicConnection</code> will
- * lead to queue/topic mode, respectively; generic <code>createConnection</code>
+ * {@code createQueueConnection} and {@code createTopicConnection} will
+ * lead to queue/topic mode, respectively; generic {@code createConnection}
  * calls will lead to a JMS 1.1 connection which is able to serve both modes.
  *
  * <p>Useful for testing and standalone environments in order to keep using the
@@ -367,14 +367,14 @@ public class SingleConnectionFactory
 
 	/**
 	 * Template method for obtaining a (potentially cached) Session.
-	 * <p>The default implementation always returns <code>null</code>.
+	 * <p>The default implementation always returns {@code null}.
 	 * Subclasses may override this for exposing specific Session handles,
 	 * possibly delegating to {@link #createSession} for the creation of raw
 	 * Session objects that will then get wrapped and returned from here.
 	 * @param con the JMS Connection to operate on
 	 * @param mode the Session acknowledgement mode
-	 * (<code>Session.TRANSACTED</code> or one of the common modes)
-	 * @return the Session to use, or <code>null</code> to indicate
+	 * ({@code Session.TRANSACTED} or one of the common modes)
+	 * @return the Session to use, or {@code null} to indicate
 	 * creation of a raw standard Session
 	 * @throws JMSException if thrown by the JMS API
 	 */
@@ -387,7 +387,7 @@ public class SingleConnectionFactory
 	 * adaptign 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</code> or one of the common modes)
+	 * ({@code Session.TRANSACTED} or one of the common modes)
 	 * @return the newly created Session
 	 * @throws JMSException if thrown by the JMS API
 	 */
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java
index e5360b54fc..6b6cec1b3f 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java
@@ -71,8 +71,8 @@ public class SingleConnectionFactory102 extends SingleConnectionFactory {
 	 * This tells the JMS 1.0.2 provider which class hierarchy to use for creating
 	 * Connections and Sessions.
 	 * <p>Default is Point-to-Point (Queues).
-	 * @param pubSubDomain <code>true</code> for Publish/Subscribe domain (Topics),
-	 * <code>false</code> for Point-to-Point domain (Queues)
+	 * @param pubSubDomain {@code true} for Publish/Subscribe domain (Topics),
+	 * {@code false} for Point-to-Point domain (Queues)
 	 */
 	public void setPubSubDomain(boolean pubSubDomain) {
 		this.pubSubDomain = pubSubDomain;
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java
index 27b6ec73ad..e7ec4ab035 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java
@@ -20,7 +20,7 @@ import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
 
 /**
- * Extension of the <code>javax.jms.ConnectionFactory</code> interface,
+ * Extension of the {@code javax.jms.ConnectionFactory} interface,
  * indicating how to release Connections obtained from it.
  *
  * @author Juergen Hoeller
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java b/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
index e406bb4ca1..f9ccfb18b9 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
@@ -54,7 +54,7 @@ import org.springframework.util.Assert;
  *
  * <p>Delegates to {@link ConnectionFactoryUtils} for automatically participating
  * in thread-bound transactions, for example managed by {@link JmsTransactionManager}.
- * <code>createSession</code> calls and <code>close</code> calls on returned Sessions
+ * {@code createSession} calls and {@code close} calls on returned Sessions
  * will behave properly within a transaction, that is, always work on the transactional
  * Session. If not within a transaction, normal ConnectionFactory behavior applies.
  *
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
index bf4b44f6cc..8f8b782401 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
@@ -31,14 +31,14 @@ import org.springframework.util.StringUtils;
 
 /**
  * An adapter for a target JMS {@link javax.jms.ConnectionFactory}, applying the
- * given user credentials to every standard <code>createConnection()</code> call,
- * that is, implicitly invoking <code>createConnection(username, password)</code>
+ * given user credentials to every standard {@code createConnection()} call,
+ * that is, implicitly invoking {@code createConnection(username, password)}
  * on the target. All other methods simply delegate to the corresponding methods
  * of the target ConnectionFactory.
  *
  * <p>Can be used to proxy a target JNDI ConnectionFactory that does not have user
  * credentials configured. Client code can work with the ConnectionFactory without
- * passing in username and password on every <code>createConnection()</code> call.
+ * passing in username and password on every {@code createConnection()} call.
  *
  * <p>In the following example, client code can simply transparently work
  * with the preconfigured "myConnectionFactory", implicitly accessing
@@ -56,7 +56,7 @@ import org.springframework.util.StringUtils;
  * &lt;/bean></pre>
  *
  * <p>If the "username" is empty, this proxy will simply delegate to the standard
- * <code>createConnection()</code> method of the target ConnectionFactory.
+ * {@code createConnection()} method of the target ConnectionFactory.
  * This can be used to keep a UserCredentialsConnectionFactoryAdapter bean
  * definition just for the <i>option</i> of implicitly passing in user credentials
  * if the particular target ConnectionFactory requires it.
@@ -114,7 +114,7 @@ public class UserCredentialsConnectionFactoryAdapter
 	/**
 	 * Set user credententials for this proxy and the current thread.
 	 * The given username and password will be applied to all subsequent
-	 * <code>createConnection()</code> calls on this ConnectionFactory proxy.
+	 * {@code createConnection()} calls on this ConnectionFactory proxy.
 	 * <p>This will override any statically specified user credentials,
 	 * that is, values of the "username" and "password" bean properties.
 	 * @param username the username to apply
@@ -159,10 +159,10 @@ public class UserCredentialsConnectionFactoryAdapter
 	}
 
 	/**
-	 * This implementation delegates to the <code>createConnection(username, password)</code>
+	 * This implementation delegates to the {@code createConnection(username, password)}
 	 * method of the target ConnectionFactory, passing in the specified user credentials.
 	 * If the specified username is empty, it will simply delegate to the standard
-	 * <code>createConnection()</code> method of the target ConnectionFactory.
+	 * {@code createConnection()} method of the target ConnectionFactory.
 	 * @param username the username to use
 	 * @param password the password to use
 	 * @return the Connection
@@ -204,10 +204,10 @@ public class UserCredentialsConnectionFactoryAdapter
 	}
 
 	/**
-	 * This implementation delegates to the <code>createQueueConnection(username, password)</code>
+	 * This implementation delegates to the {@code createQueueConnection(username, password)}
 	 * method of the target QueueConnectionFactory, passing in the specified user credentials.
 	 * If the specified username is empty, it will simply delegate to the standard
-	 * <code>createQueueConnection()</code> method of the target ConnectionFactory.
+	 * {@code createQueueConnection()} method of the target ConnectionFactory.
 	 * @param username the username to use
 	 * @param password the password to use
 	 * @return the Connection
@@ -253,10 +253,10 @@ public class UserCredentialsConnectionFactoryAdapter
 	}
 
 	/**
-	 * This implementation delegates to the <code>createTopicConnection(username, password)</code>
+	 * This implementation delegates to the {@code createTopicConnection(username, password)}
 	 * method of the target TopicConnectionFactory, passing in the specified user credentials.
 	 * If the specified username is empty, it will simply delegate to the standard
-	 * <code>createTopicConnection()</code> method of the target ConnectionFactory.
+	 * {@code createTopicConnection()} method of the target ConnectionFactory.
 	 * @param username the username to use
 	 * @param password the password to use
 	 * @return the Connection
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java
index 2ca94fd6bb..520c2d1ccd 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java
@@ -36,9 +36,9 @@ public interface BrowserCallback<T> {
 	/**
 	 * Perform operations on the given {@link javax.jms.Session} and {@link javax.jms.QueueBrowser}.
 	 * <p>The message producer is not associated with any destination.
-	 * @param session the JMS <code>Session</code> object to use
-	 * @param browser the JMS <code>QueueBrowser</code> object to use
-	 * @return a result object from working with the <code>Session</code>, if any (can be <code>null</code>)
+	 * @param session the JMS {@code Session} object to use
+	 * @param browser the JMS {@code QueueBrowser} object to use
+	 * @return a result object from working with the {@code Session}, if any (can be {@code null})
 	 * @throws javax.jms.JMSException if thrown by JMS API methods
 	 */
 	T doInJms(Session session, QueueBrowser browser) throws JMSException;
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
index 039e69680d..e313ba705b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
@@ -28,8 +28,8 @@ import org.springframework.jms.JmsException;
  * <p>Implemented by {@link JmsTemplate}. Not often used but a useful option
  * to enhance testability, as it can easily be mocked or stubbed.
  *
- * <p>Provides <code>JmsTemplate's</code> <code>send(..)</code> and
- * <code>receive(..)</code> methods that mirror various JMS API methods.
+ * <p>Provides {@code JmsTemplate's} {@code send(..)} and
+ * {@code receive(..)} methods that mirror various JMS API methods.
  * See the JMS specification and javadocs for details on those methods.
  *
  * @author Mark Pollack
@@ -198,7 +198,7 @@ public interface JmsOperations {
 	 * <p>This method should be used carefully, since it will block the thread
 	 * until the message becomes available or until the timeout value is exceeded.
 	 * <p>This will only work with a default destination specified!
-	 * @return the message received by the consumer, or <code>null</code> if the timeout expires
+	 * @return the message received by the consumer, or {@code null} if the timeout expires
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	Message receive() throws JmsException;
@@ -209,7 +209,7 @@ public interface JmsOperations {
 	 * <p>This method should be used carefully, since it will block the thread
 	 * until the message becomes available or until the timeout value is exceeded.
 	 * @param destination the destination to receive a message from
-	 * @return the message received by the consumer, or <code>null</code> if the timeout expires
+	 * @return the message received by the consumer, or {@code null} if the timeout expires
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	Message receive(Destination destination) throws JmsException;
@@ -221,7 +221,7 @@ public interface JmsOperations {
 	 * until the message becomes available or until the timeout value is exceeded.
 	 * @param destinationName the name of the destination to send this message to
 	 * (to be resolved to an actual destination by a DestinationResolver)
-	 * @return the message received by the consumer, or <code>null</code> if the timeout expires
+	 * @return the message received by the consumer, or {@code null} if the timeout expires
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	Message receive(String destinationName) throws JmsException;
@@ -232,9 +232,9 @@ public interface JmsOperations {
 	 * <p>This method should be used carefully, since it will block the thread
 	 * until the message becomes available or until the timeout value is exceeded.
 	 * <p>This will only work with a default destination specified!
-	 * @param messageSelector the JMS message selector expression (or <code>null</code> if none).
+	 * @param messageSelector the JMS message selector expression (or {@code null} if none).
 	 * See the JMS specification for a detailed definition of selector expressions.
-	 * @return the message received by the consumer, or <code>null</code> if the timeout expires
+	 * @return the message received by the consumer, or {@code null} if the timeout expires
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	Message receiveSelected(String messageSelector) throws JmsException;
@@ -245,9 +245,9 @@ public interface JmsOperations {
 	 * <p>This method should be used carefully, since it will block the thread
 	 * until the message becomes available or until the timeout value is exceeded.
 	 * @param destination the destination to receive a message from
-	 * @param messageSelector the JMS message selector expression (or <code>null</code> if none).
+	 * @param messageSelector the JMS message selector expression (or {@code null} if none).
 	 * See the JMS specification for a detailed definition of selector expressions.
-	 * @return the message received by the consumer, or <code>null</code> if the timeout expires
+	 * @return the message received by the consumer, or {@code null} if the timeout expires
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	Message receiveSelected(Destination destination, String messageSelector) throws JmsException;
@@ -259,9 +259,9 @@ public interface JmsOperations {
 	 * until the message becomes available or until the timeout value is exceeded.
 	 * @param destinationName the name of the destination to send this message to
 	 * (to be resolved to an actual destination by a DestinationResolver)
-	 * @param messageSelector the JMS message selector expression (or <code>null</code> if none).
+	 * @param messageSelector the JMS message selector expression (or {@code null} if none).
 	 * See the JMS specification for a detailed definition of selector expressions.
-	 * @return the message received by the consumer, or <code>null</code> if the timeout expires
+	 * @return the message received by the consumer, or {@code null} if the timeout expires
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	Message receiveSelected(String destinationName, String messageSelector) throws JmsException;
@@ -278,7 +278,7 @@ public interface JmsOperations {
 	 * <p>This method should be used carefully, since it will block the thread
 	 * until the message becomes available or until the timeout value is exceeded.
 	 * <p>This will only work with a default destination specified!
-	 * @return the message produced for the consumer or <code>null</code> if the timeout expires.
+	 * @return the message produced for the consumer or {@code null} if the timeout expires.
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	Object receiveAndConvert() throws JmsException;
@@ -290,7 +290,7 @@ public interface JmsOperations {
 	 * <p>This method should be used carefully, since it will block the thread
 	 * until the message becomes available or until the timeout value is exceeded.
 	 * @param destination the destination to receive a message from
-	 * @return the message produced for the consumer or <code>null</code> if the timeout expires.
+	 * @return the message produced for the consumer or {@code null} if the timeout expires.
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	Object receiveAndConvert(Destination destination) throws JmsException;
@@ -303,7 +303,7 @@ public interface JmsOperations {
 	 * until the message becomes available or until the timeout value is exceeded.
 	 * @param destinationName the name of the destination to send this message to
 	 * (to be resolved to an actual destination by a DestinationResolver)
-	 * @return the message produced for the consumer or <code>null</code> if the timeout expires.
+	 * @return the message produced for the consumer or {@code null} if the timeout expires.
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	Object receiveAndConvert(String destinationName) throws JmsException;
@@ -315,9 +315,9 @@ public interface JmsOperations {
 	 * <p>This method should be used carefully, since it will block the thread
 	 * until the message becomes available or until the timeout value is exceeded.
 	 * <p>This will only work with a default destination specified!
-	 * @param messageSelector the JMS message selector expression (or <code>null</code> if none).
+	 * @param messageSelector the JMS message selector expression (or {@code null} if none).
 	 * See the JMS specification for a detailed definition of selector expressions.
-	 * @return the message produced for the consumer or <code>null</code> if the timeout expires.
+	 * @return the message produced for the consumer or {@code null} if the timeout expires.
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	Object receiveSelectedAndConvert(String messageSelector) throws JmsException;
@@ -329,9 +329,9 @@ public interface JmsOperations {
 	 * <p>This method should be used carefully, since it will block the thread
 	 * until the message becomes available or until the timeout value is exceeded.
 	 * @param destination the destination to receive a message from
-	 * @param messageSelector the JMS message selector expression (or <code>null</code> if none).
+	 * @param messageSelector the JMS message selector expression (or {@code null} if none).
 	 * See the JMS specification for a detailed definition of selector expressions.
-	 * @return the message produced for the consumer or <code>null</code> if the timeout expires.
+	 * @return the message produced for the consumer or {@code null} if the timeout expires.
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	Object receiveSelectedAndConvert(Destination destination, String messageSelector) throws JmsException;
@@ -344,9 +344,9 @@ public interface JmsOperations {
 	 * until the message becomes available or until the timeout value is exceeded.
 	 * @param destinationName the name of the destination to send this message to
 	 * (to be resolved to an actual destination by a DestinationResolver)
-	 * @param messageSelector the JMS message selector expression (or <code>null</code> if none).
+	 * @param messageSelector the JMS message selector expression (or {@code null} if none).
 	 * See the JMS specification for a detailed definition of selector expressions.
-	 * @return the message produced for the consumer or <code>null</code> if the timeout expires.
+	 * @return the message produced for the consumer or {@code null} if the timeout expires.
 	 * @throws JmsException checked JMSException converted to unchecked
 	 */
 	Object receiveSelectedAndConvert(String destinationName, String messageSelector) throws JmsException;
@@ -389,7 +389,7 @@ public interface JmsOperations {
 	/**
 	 * Browse selected messages in a JMS queue. The callback gives access to the JMS
 	 * Session and QueueBrowser in order to browse the queue and react to the contents.
-	 * @param messageSelector the JMS message selector expression (or <code>null</code> if none).
+	 * @param messageSelector the JMS message selector expression (or {@code null} if none).
 	 * See the JMS specification for a detailed definition of selector expressions.
 	 * @param action callback object that exposes the session/browser pair
 	 * @return the result object from working with the session
@@ -401,7 +401,7 @@ public interface JmsOperations {
 	 * Browse selected messages in a JMS queue. The callback gives access to the JMS
 	 * Session and QueueBrowser in order to browse the queue and react to the contents.
 	 * @param queue the queue to browse
-	 * @param messageSelector the JMS message selector expression (or <code>null</code> if none).
+	 * @param messageSelector the JMS message selector expression (or {@code null} if none).
 	 * See the JMS specification for a detailed definition of selector expressions.
 	 * @param action callback object that exposes the session/browser pair
 	 * @return the result object from working with the session
@@ -414,7 +414,7 @@ public interface JmsOperations {
 	 * Session and QueueBrowser in order to browse the queue and react to the contents.
 	 * @param queueName the name of the queue to browse
 	 * (to be resolved to an actual destination by a DestinationResolver)
-	 * @param messageSelector the JMS message selector expression (or <code>null</code> if none).
+	 * @param messageSelector the JMS message selector expression (or {@code null} if none).
 	 * See the JMS specification for a detailed definition of selector expressions.
 	 * @param action callback object that exposes the session/browser pair
 	 * @return the result object from working with the session
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 66c5d8750a..c2b7ca8a77 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
@@ -60,15 +60,15 @@ import org.springframework.util.Assert;
  * respectively. These defaults can be overridden through the "destinationResolver"
  * and "messageConverter" bean properties.
  *
- * <p><b>NOTE: The <code>ConnectionFactory</code> used with this template should
+ * <p><b>NOTE: The {@code ConnectionFactory} used with this template should
  * return pooled Connections (or a single shared Connection) as well as pooled
  * Sessions and MessageProducers. Otherwise, performance of ad-hoc JMS operations
  * is going to suffer.</b> The simplest option is to use the Spring-provided
  * {@link org.springframework.jms.connection.SingleConnectionFactory} as a
- * decorator for your target <code>ConnectionFactory</code>, reusing a single
+ * decorator for your target {@code ConnectionFactory}, reusing a single
  * JMS Connection in a thread-safe fashion; this is often good enough for the
  * purpose of sending messages via this template. In a J2EE environment,
- * make sure that the <code>ConnectionFactory</code> is obtained from the
+ * make sure that the {@code ConnectionFactory} is obtained from the
  * application's environment naming context via JNDI; application servers
  * typically expose pooled, transaction-aware factories there.
  *
@@ -433,11 +433,11 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 
 	/**
 	 * Execute the action specified by the given action object within a
-	 * JMS Session. Generalized version of <code>execute(SessionCallback)</code>,
+	 * JMS Session. Generalized version of {@code execute(SessionCallback)},
 	 * allowing the JMS Connection to be started on the fly.
-	 * <p>Use <code>execute(SessionCallback)</code> for the general case.
+	 * <p>Use {@code execute(SessionCallback)} for the general case.
 	 * Starting the JMS Connection is just necessary for receiving messages,
-	 * which is preferably achieved through the <code>receive</code> methods.
+	 * which is preferably achieved through the {@code receive} methods.
 	 * @param action callback object that exposes the Session
 	 * @param startConnection whether to start the Connection
 	 * @return the result object from working with the Session
@@ -712,8 +712,8 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	 * Receive a JMS message.
 	 * @param session the JMS Session to operate on
 	 * @param destination the JMS Destination to receive from
-	 * @param messageSelector the message selector for this consumer (can be <code>null</code>)
-	 * @return the JMS Message received, or <code>null</code> if none
+	 * @param messageSelector the message selector for this consumer (can be {@code null})
+	 * @return the JMS Message received, or {@code null} if none
 	 * @throws JMSException if thrown by JMS API methods
 	 */
 	protected Message doReceive(Session session, Destination destination, String messageSelector)
@@ -726,7 +726,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	 * Actually receive a JMS message.
 	 * @param session the JMS Session to operate on
 	 * @param consumer the JMS MessageConsumer to receive with
-	 * @return the JMS Message received, or <code>null</code> if none
+	 * @return the JMS Message received, or {@code null} if none
 	 * @throws JMSException if thrown by JMS API methods
 	 */
 	protected Message doReceive(Session session, MessageConsumer consumer) throws JMSException {
@@ -763,7 +763,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	 * Actually receive a message from the given consumer.
 	 * @param consumer the JMS MessageConsumer to receive with
 	 * @param timeout the receive timeout
-	 * @return the JMS Message received, or <code>null</code> if none
+	 * @return the JMS Message received, or {@code null} if none
 	 * @throws JMSException if thrown by JMS API methods
 	 */
 	private Message doReceive(MessageConsumer consumer, long timeout) throws JMSException {
@@ -809,8 +809,8 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 
 	/**
 	 * Extract the content from the given JMS message.
-	 * @param message the JMS Message to convert (can be <code>null</code>)
-	 * @return the content of the message, or <code>null</code> if none
+	 * @param message the JMS Message to convert (can be {@code null})
+	 * @return the content of the message, or {@code null} if none
 	 */
 	protected Object doConvertFromMessage(Message message) {
 		if (message != null) {
@@ -902,7 +902,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	 * <p>This implementation accepts any JMS 1.1 Connection.
 	 * @param holder the JmsResourceHolder
 	 * @return an appropriate Connection fetched from the holder,
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 */
 	protected Connection getConnection(JmsResourceHolder holder) {
 		return holder.getConnection();
@@ -913,7 +913,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	 * <p>This implementation accepts any JMS 1.1 Session.
 	 * @param holder the JmsResourceHolder
 	 * @return an appropriate Session fetched from the holder,
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 */
 	protected Session getSession(JmsResourceHolder holder) {
 		return holder.getSession();
@@ -976,7 +976,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	 * <p>This implementation uses JMS 1.1 API.
 	 * @param session the JMS Session to create a MessageConsumer for
 	 * @param destination the JMS Destination to create a MessageConsumer for
-	 * @param messageSelector the message selector for this consumer (can be <code>null</code>)
+	 * @param messageSelector the message selector for this consumer (can be {@code null})
 	 * @return the new JMS MessageConsumer
 	 * @throws JMSException if thrown by JMS API methods
 	 */
@@ -1001,7 +1001,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	 * JMS MessageProducer, which needs to be specific to JMS 1.1 or 1.0.2.
 	 * @param session the JMS Session to create a QueueBrowser for
 	 * @param queue the JMS Queue to create a QueueBrowser for
-	 * @param messageSelector the message selector for this consumer (can be <code>null</code>)
+	 * @param messageSelector the message selector for this consumer (can be {@code null})
 	 * @return the new JMS QueueBrowser
 	 * @throws JMSException if thrown by JMS API methods
 	 * @see #setMessageIdEnabled
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java
index 1e6a46e675..5b8c2d7b5f 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java
@@ -246,7 +246,7 @@ public class JmsTemplate102 extends JmsTemplate {
 
 	/**
 	 * This implementation overrides the superclass method to avoid using
-	 * JMS 1.1's Session <code>getAcknowledgeMode()</code> method.
+	 * JMS 1.1's Session {@code getAcknowledgeMode()} method.
 	 * The best we can do here is to check the setting on the template.
 	 * @see #getSessionAcknowledgeMode()
 	 */
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java b/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
index dfaeaceb9d..d7af5cf71b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
@@ -23,14 +23,14 @@ import javax.jms.Session;
 /**
  * Creates a JMS message given a {@link Session}.
  *
- * <p>The <code>Session</code> typically is provided by an instance
+ * <p>The {@code Session} typically is provided by an instance
  * of the {@link JmsTemplate} class.
  *
  * <p>Implementations <i>do not</i> need to concern themselves with
- * checked <code>JMSExceptions</code> (from the '<code>javax.jms</code>'
+ * checked {@code JMSExceptions} (from the '{@code javax.jms}'
  * package) that may be thrown from operations they attempt. The
- * <code>JmsTemplate</code> will catch and handle these
- * <code>JMSExceptions</code> appropriately.
+ * {@code JmsTemplate} will catch and handle these
+ * {@code JMSExceptions} appropriately.
  *
  * @author Mark Pollack
  * @since 1.1
@@ -40,8 +40,8 @@ public interface MessageCreator {
 	/**
 	 * Create a {@link Message} to be sent.
 	 * @param session the JMS {@link Session} to be used to create the
-	 * <code>Message</code> (never <code>null</code>)
-	 * @return the <code>Message</code> to be sent
+	 * {@code Message} (never {@code null})
+	 * @return the {@code Message} to be sent
 	 * @throws javax.jms.JMSException if thrown by JMS API methods
 	 */
 	Message createMessage(Session session) throws JMSException;
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
index 78b82b61e9..04904f452f 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
@@ -44,9 +44,9 @@ public interface ProducerCallback<T> {
 	 * Perform operations on the given {@link Session} and {@link MessageProducer}.
 	 * <p>The message producer is not associated with any destination unless
 	 * when specified in the JmsTemplate call.
-	 * @param session the JMS <code>Session</code> object to use
-	 * @param producer the JMS <code>MessageProducer</code> object to use
-	 * @return a result object from working with the <code>Session</code>, if any (can be <code>null</code>)
+	 * @param session the JMS {@code Session} object to use
+	 * @param producer the JMS {@code MessageProducer} object to use
+	 * @return a result object from working with the {@code Session}, if any (can be {@code null})
 	 * @throws javax.jms.JMSException if thrown by JMS API methods
 	 */
 	T doInJms(Session session, MessageProducer producer) throws JMSException;
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
index 0702989f7b..cc095d13cd 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
@@ -35,8 +35,8 @@ public interface SessionCallback<T> {
 	/**
 	 * Execute any number of operations against the supplied JMS
 	 * {@link Session}, possibly returning a result.
-	 * @param session the JMS <code>Session</code>
-	 * @return a result object from working with the <code>Session</code>, if any (so can be <code>null</code>)
+	 * @param session the JMS {@code Session}
+	 * @return a result object from working with the {@code Session}, if any (so can be {@code null})
 	 * @throws javax.jms.JMSException if thrown by JMS API methods
 	 */
 	T doInJms(Session session) throws JMSException;
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/support/package-info.java b/spring-jms/src/main/java/org/springframework/jms/core/support/package-info.java
index 0f40148762..83f86b0587 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/support/package-info.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/support/package-info.java
@@ -1,7 +1,6 @@
-
 /**
  *
- * Classes supporting the <code>org.springframework.jms.core</code> package.
+ * Classes supporting the {@code org.springframework.jms.core} package.
  * Contains a base class for JmsTemplate usage.
  *
  */
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 6ce99ad089..87507c28b7 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
@@ -343,12 +343,12 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess
 
 	/**
 	 * Check whether this container's listeners are generally allowed to run.
-	 * <p>This implementation always returns <code>true</code>; the default 'running'
+	 * <p>This implementation always returns {@code true}; the default 'running'
 	 * state is purely determined by {@link #start()} / {@link #stop()}.
 	 * <p>Subclasses may override this method to check against temporary
 	 * conditions that prevent listeners from actually running. In other words,
 	 * they may apply further restrictions to the 'running' state, returning
-	 * <code>false</code> if such a restriction prevents listeners from running.
+	 * {@code false} if such a restriction prevents listeners from running.
 	 */
 	protected boolean runningAllowed() {
 		return true;
@@ -470,7 +470,7 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess
 	/**
 	 * Return the shared JMS Connection maintained by this container.
 	 * Available after initialization.
-	 * @return the shared Connection (never <code>null</code>)
+	 * @return the shared Connection (never {@code null})
 	 * @throws IllegalStateException if this container does not maintain a
 	 * shared Connection, or if the Connection hasn't been initialized yet
 	 * @see #sharedConnectionEnabled()
@@ -562,7 +562,7 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess
 	/**
 	 * Reschedule the given task object immediately.
 	 * <p>To be implemented by subclasses if they ever call
-	 * <code>rescheduleTaskIfNecessary</code>.
+	 * {@code rescheduleTaskIfNecessary}.
 	 * This implementation throws an UnsupportedOperationException.
 	 * @param task the task object to reschedule
 	 * @see #rescheduleTaskIfNecessary
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 b735a6632f..120660a985 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
@@ -164,7 +164,7 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
 	}
 
 	/**
-	 * Return the destination to receive messages from. Will be <code>null</code>
+	 * Return the destination to receive messages from. Will be {@code null}
 	 * if the configured destination is not an actual {@link Destination} type;
 	 * c.f. {@link #setDestinationName(String) when the destination is a String}.
 	 */
@@ -181,7 +181,7 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
 	 * container picking up the new destination immediately (works e.g. with
 	 * DefaultMessageListenerContainer, as long as the cache level is less than
 	 * CACHE_CONSUMER). However, this is considered advanced usage; use it with care!
-	 * @param destinationName the desired destination (can be <code>null</code>)
+	 * @param destinationName the desired destination (can be {@code null})
 	 * @see #setDestination(javax.jms.Destination)
 	 */
 	public void setDestinationName(String destinationName) {
@@ -191,7 +191,7 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
 
 	/**
 	 * Return the name of the destination to receive messages from.
-	 * Will be <code>null</code> if the configured destination is not a
+	 * Will be {@code null} if the configured destination is not a
 	 * {@link String} type; c.f. {@link #setDestination(Destination) when
 	 * it is an actual Destination}.
 	 */
@@ -201,14 +201,14 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
 
 	/**
 	 * Return a descriptive String for this container's JMS destination
-	 * (never <code>null</code>).
+	 * (never {@code null}).
 	 */
 	protected String getDestinationDescription() {
 		return this.destination.toString();
 	}
 
 	/**
-	 * Set the JMS message selector expression (or <code>null</code> if none).
+	 * Set the JMS message selector expression (or {@code null} if none).
 	 * Default is none.
 	 * <p>See the JMS specification for a detailed definition of selector expressions.
 	 * <p>Note: The message selector may be replaced at runtime, with the listener
@@ -221,7 +221,7 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
 	}
 
 	/**
-	 * Return the JMS message selector expression (or <code>null</code> if none).
+	 * Return the JMS message selector expression (or {@code null} if none).
 	 */
 	public String getMessageSelector() {
 		return this.messageSelector;
@@ -552,7 +552,7 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
 	/**
 	 * Invoke the specified listener as standard JMS MessageListener.
 	 * <p>Default implementation performs a plain invocation of the
-	 * <code>onMessage</code> method.
+	 * {@code onMessage} method.
 	 * @param listener the JMS MessageListener to invoke
 	 * @param message the received JMS Message
 	 * @throws JMSException if thrown by JMS API methods
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
index 566e3f9de9..d1d6ab289a 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
@@ -49,7 +49,7 @@ import org.springframework.transaction.support.TransactionSynchronizationUtils;
  *
  * <p>The underlying mechanism is based on standard JMS MessageConsumer handling,
  * which is perfectly compatible with both native JMS and JMS in a J2EE environment.
- * Neither the JMS <code>MessageConsumer.setMessageListener</code> facility
+ * Neither the JMS {@code MessageConsumer.setMessageListener} facility
  * nor the JMS ServerSessionPool facility is required. A further advantage
  * of this approach is full control over the listening process, allowing for
  * custom scaling and throttling and of concurrent message processing
@@ -270,7 +270,7 @@ public abstract class AbstractPollingMessageListenerContainer extends AbstractMe
 	 * fetching all requires resources and invoking the listener.
 	 * @param session the JMS Session to work on
 	 * @param consumer the MessageConsumer to work on
-	 * @param status the TransactionStatus (may be <code>null</code>)
+	 * @param status the TransactionStatus (may be {@code null})
 	 * @return whether a message has been received
 	 * @throws JMSException if thrown by JMS methods
 	 * @see #doExecuteListener(javax.jms.Session, javax.jms.Message)
@@ -424,7 +424,7 @@ public abstract class AbstractPollingMessageListenerContainer extends AbstractMe
 	/**
 	 * Receive a message from the given consumer.
 	 * @param consumer the MessageConsumer to use
-	 * @return the Message, or <code>null</code> if none
+	 * @return the Message, or {@code null} if none
 	 * @throws JMSException if thrown by JMS methods
 	 */
 	protected Message receiveMessage(MessageConsumer consumer) throws JMSException {
@@ -461,7 +461,7 @@ public abstract class AbstractPollingMessageListenerContainer extends AbstractMe
 	 * <p>This implementation accepts any JMS 1.1 Connection.
 	 * @param holder the JmsResourceHolder
 	 * @return an appropriate Connection fetched from the holder,
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 */
 	protected Connection getConnection(JmsResourceHolder holder) {
 		return holder.getConnection();
@@ -472,7 +472,7 @@ public abstract class AbstractPollingMessageListenerContainer extends AbstractMe
 	 * <p>This implementation accepts any JMS 1.1 Session.
 	 * @param holder the JmsResourceHolder
 	 * @return an appropriate Session fetched from the holder,
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 */
 	protected Session getSession(JmsResourceHolder holder) {
 		return holder.getSession();
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 b34168a18e..91b15c319d 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
@@ -38,7 +38,7 @@ import org.springframework.util.ClassUtils;
 
 /**
  * Message listener container variant that uses plain JMS client APIs, specifically
- * a loop of <code>MessageConsumer.receive()</code> calls that also allow for
+ * a loop of {@code MessageConsumer.receive()} calls that also allow for
  * transactional reception of messages (registering them with XA transactions).
  * Designed to work in a native JMS environment as well as in a J2EE environment,
  * with only minimal differences in configuration.
@@ -562,7 +562,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
 	/**
 	 * Stop this listener container, invoking the specific callback
 	 * once all listener processing has actually stopped.
-	 * <p>Note: Further <code>stop(runnable)</code> calls (before processing
+	 * <p>Note: Further {@code stop(runnable)} calls (before processing
 	 * has actually stopped) will override the specified callback. Only the
 	 * latest specified callback will be invoked.
 	 * <p>If a subsequent {@link #start()} call restarts the listener container
@@ -617,8 +617,8 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
 	 * not to miss any messages that are just about to be published.
 	 * <p>This method may be polled after a {@link #start()} call, until asynchronous
 	 * registration of consumers has happened which is when the method will start returning
-	 * <code>true</code> &ndash; provided that the listener container ever actually establishes
-	 * a fixed registration. It will then keep returning <code>true</code> until shutdown,
+	 * {@code true} &ndash; provided that the listener container ever actually establishes
+	 * a fixed registration. It will then keep returning {@code true} until shutdown,
 	 * since the container will hold on to at least one consumer registration thereafter.
 	 * <p>Note that a listener container is not bound to having a fixed registration in
 	 * the first place. It may also keep recreating consumers for every invoker execution.
@@ -765,7 +765,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
 
 	/**
 	 * This implementations proceeds even after an exception thrown from
-	 * <code>Connection.start()</code>, relying on listeners to perform
+	 * {@code Connection.start()}, relying on listeners to perform
 	 * appropriate recovery.
 	 */
 	@Override
@@ -780,7 +780,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
 
 	/**
 	 * This implementations proceeds even after an exception thrown from
-	 * <code>Connection.stop()</code>, relying on listeners to perform
+	 * {@code Connection.stop()}, relying on listeners to perform
 	 * appropriate recovery after a restart.
 	 */
 	@Override
@@ -931,7 +931,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
 	//-------------------------------------------------------------------------
 
 	/**
-	 * Runnable that performs looped <code>MessageConsumer.receive()</code> calls.
+	 * Runnable that performs looped {@code MessageConsumer.receive()} calls.
 	 */
 	private class AsyncMessageListenerInvoker implements SchedulingAwareRunnable {
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java
index dfcceeb5dd..a6adf5c0b2 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java
@@ -107,7 +107,7 @@ public class DefaultMessageListenerContainer102 extends DefaultMessageListenerCo
 
 	/**
 	 * This implementation overrides the superclass method to avoid using
-	 * JMS 1.1's Session <code>getAcknowledgeMode()</code> method.
+	 * JMS 1.1's Session {@code getAcknowledgeMode()} method.
 	 * The best we can do here is to check the setting on the listener container.
 	 */
 	protected boolean isClientAcknowledge(Session session) throws JMSException {
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java b/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java
index 1ebd320c1d..e6afb9c1f5 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java
@@ -47,8 +47,8 @@ public interface SessionAwareMessageListener<M extends Message> {
 	 * Callback for processing a received JMS message.
 	 * <p>Implementors are supposed to process the given Message,
 	 * typically sending reply messages through the given Session.
-	 * @param message the received JMS message (never <code>null</code>)
-	 * @param session the underlying JMS Session (never <code>null</code>)
+	 * @param message the received JMS message (never {@code null})
+	 * @param session the underlying JMS Session (never {@code null})
 	 * @throws JMSException if thrown by JMS methods
 	 */
 	void onMessage(M message, Session session) throws JMSException;
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 3bd88b84ba..c3f0f22e59 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
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
 
 /**
  * Message listener container that uses the plain JMS client API's
- * <code>MessageConsumer.setMessageListener()</code> method to
+ * {@code MessageConsumer.setMessageListener()} method to
  * create concurrent MessageConsumers for the specified listeners.
  *
  * <p>This is the simplest form of a message listener container.
@@ -48,7 +48,7 @@ import org.springframework.util.Assert;
  * on acknowledge modes and transaction options.
  *
  * <p>For a different style of MessageListener handling, through looped
- * <code>MessageConsumer.receive()</code> calls that also allow for
+ * {@code MessageConsumer.receive()} calls that also allow for
  * transactional reception of messages (registering them with XA transactions),
  * see {@link DefaultMessageListenerContainer}.
  *
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java
index d93a3045f9..dc4fcabd7b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java
@@ -89,7 +89,7 @@ public class SimpleMessageListenerContainer102 extends SimpleMessageListenerCont
 
 	/**
 	 * This implementation overrides the superclass method to avoid using
-	 * JMS 1.1's Session <code>getAcknowledgeMode()</code> method.
+	 * JMS 1.1's Session {@code getAcknowledgeMode()} method.
 	 * The best we can do here is to check the setting on the listener container.
 	 */
 	protected boolean isClientAcknowledge(Session session) throws JMSException {
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
index 9f070eb9f4..ac915abf7a 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
@@ -53,11 +53,11 @@ import org.springframework.util.ObjectUtils;
  * JMS {@link MessageConverter}. By default, a {@link SimpleMessageConverter}
  * will be used. (If you do not want such automatic message conversion taking
  * place, then be sure to set the {@link #setMessageConverter MessageConverter}
- * to <code>null</code>.)
+ * to {@code null}.)
  *
  * <p>If a target listener method returns a non-null object (typically of a
- * message content type such as <code>String</code> or byte array), it will get
- * wrapped in a JMS <code>Message</code> and sent to the response destination
+ * message content type such as {@code String} or byte array), it will get
+ * wrapped in a JMS {@code Message} and sent to the response destination
  * (either the JMS "reply-to" destination or a
  * {@link #setDefaultResponseDestination(javax.jms.Destination) specified default
  * destination}).
@@ -68,10 +68,10 @@ import org.springframework.util.ObjectUtils;
  * does <i>not</i> support the generation of response messages.
  *
  * <p>Find below some examples of method signatures compliant with this
- * adapter class. This first example handles all <code>Message</code> types
- * and gets passed the contents of each <code>Message</code> type as an
- * argument. No <code>Message</code> will be sent back as all of these
- * methods return <code>void</code>.
+ * adapter class. This first example handles all {@code Message} types
+ * and gets passed the contents of each {@code Message} type as an
+ * argument. No {@code Message} will be sent back as all of these
+ * methods return {@code void}.
  *
  * <pre class="code">public interface MessageContentsDelegate {
  *    void handleMessage(String text);
@@ -80,10 +80,10 @@ import org.springframework.util.ObjectUtils;
  *    void handleMessage(Serializable obj);
  * }</pre>
  *
- * This next example handles all <code>Message</code> types and gets
- * passed the actual (raw) <code>Message</code> as an argument. Again, no
- * <code>Message</code> will be sent back as all of these methods return
- * <code>void</code>.
+ * This next example handles all {@code Message} types and gets
+ * passed the actual (raw) {@code Message} as an argument. Again, no
+ * {@code Message} will be sent back as all of these methods return
+ * {@code void}.
  *
  * <pre class="code">public interface RawMessageDelegate {
  *    void handleMessage(TextMessage message);
@@ -92,22 +92,22 @@ import org.springframework.util.ObjectUtils;
  *    void handleMessage(ObjectMessage message);
  * }</pre>
  *
- * This next example illustrates a <code>Message</code> delegate
- * that just consumes the <code>String</code> contents of
+ * This next example illustrates a {@code Message} delegate
+ * that just consumes the {@code String} contents of
  * {@link javax.jms.TextMessage TextMessages}. Notice also how the
- * name of the <code>Message</code> handling method is different from the
+ * name of the {@code Message} handling method is different from the
  * {@link #ORIGINAL_DEFAULT_LISTENER_METHOD original} (this will have to
- * be configured in the attandant bean definition). Again, no <code>Message</code>
- * will be sent back as the method returns <code>void</code>.
+ * be configured in the attandant bean definition). Again, no {@code Message}
+ * will be sent back as the method returns {@code void}.
  *
  * <pre class="code">public interface TextMessageContentDelegate {
  *    void onMessage(String text);
  * }</pre>
  *
- * This final example illustrates a <code>Message</code> delegate
- * that just consumes the <code>String</code> contents of
+ * This final example illustrates a {@code Message} delegate
+ * that just consumes the {@code String} contents of
  * {@link javax.jms.TextMessage TextMessages}. Notice how the return type
- * of this method is <code>String</code>: This will result in the configured
+ * of this method is {@code String}: This will result in the configured
  * {@link MessageListenerAdapter} sending a {@link javax.jms.TextMessage} in response.
  *
  * <pre class="code">public interface ResponsiveTextMessageContentDelegate {
@@ -396,7 +396,7 @@ public class MessageListenerAdapter
 
 	/**
 	 * Extract the message body from the given JMS message.
-	 * @param message the JMS <code>Message</code>
+	 * @param message the JMS {@code Message}
 	 * @return the content of the message, to be passed into the
 	 * listener method as argument
 	 * @throws JMSException if thrown by JMS API methods
@@ -417,7 +417,7 @@ public class MessageListenerAdapter
 	 * @param originalMessage the JMS request message
 	 * @param extractedMessage the converted JMS request message,
 	 * to be passed into the listener method as argument
-	 * @return the name of the listener method (never <code>null</code>)
+	 * @return the name of the listener method (never {@code null})
 	 * @throws JMSException if thrown by JMS API methods
 	 * @see #setDefaultListenerMethod
 	 */
@@ -482,9 +482,9 @@ public class MessageListenerAdapter
 	/**
 	 * Handle the given result object returned from the listener method,
 	 * sending a response message back.
-	 * @param result the result object to handle (never <code>null</code>)
+	 * @param result the result object to handle (never {@code null})
 	 * @param request the original request message
-	 * @param session the JMS Session to operate on (may be <code>null</code>)
+	 * @param session the JMS Session to operate on (may be {@code null})
 	 * @throws JMSException if thrown by JMS API methods
 	 * @see #buildMessage
 	 * @see #postProcessResponse
@@ -514,7 +514,7 @@ public class MessageListenerAdapter
 	 * Build a JMS message to be sent as response based on the given result object.
 	 * @param session the JMS Session to operate on
 	 * @param result the content of the message, as returned from the listener method
-	 * @return the JMS <code>Message</code> (never <code>null</code>)
+	 * @return the JMS {@code Message} (never {@code null})
 	 * @throws JMSException if thrown by JMS API methods
 	 * @see #setMessageConverter
 	 */
@@ -553,15 +553,15 @@ public class MessageListenerAdapter
 	/**
 	 * Determine a response destination for the given message.
 	 * <p>The default implementation first checks the JMS Reply-To
-	 * {@link Destination} of the supplied request; if that is not <code>null</code>
-	 * it is returned; if it is <code>null</code>, then the configured
+	 * {@link Destination} of the supplied request; if that is not {@code null}
+	 * it is returned; if it is {@code null}, then the configured
 	 * {@link #resolveDefaultResponseDestination default response destination}
-	 * is returned; if this too is <code>null</code>, then an
+	 * is returned; if this too is {@code null}, then an
 	 * {@link InvalidDestinationException} is thrown.
 	 * @param request the original incoming JMS message
 	 * @param response the outgoing JMS message about to be sent
 	 * @param session the JMS Session to operate on
-	 * @return the response destination (never <code>null</code>)
+	 * @return the response destination (never {@code null})
 	 * @throws JMSException if thrown by JMS API methods
 	 * @throws InvalidDestinationException if no {@link Destination} can be determined
 	 * @see #setDefaultResponseDestination
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 b73aebec34..ad366c49e1 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
@@ -164,7 +164,7 @@ public class DefaultJmsActivationSpecFactory extends StandardJmsActivationSpecFa
 	}
 
 	/**
-	 * This implementation maps <code>SESSION_TRANSACTED</code> onto an
+	 * This implementation maps {@code SESSION_TRANSACTED} onto an
 	 * ActivationSpec property named "useRAManagedTransaction", if available
 	 * (following ActiveMQ's naming conventions).
 	 */
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
index ef6ca3ec2f..e2cec097a1 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
@@ -112,7 +112,7 @@ public class JmsMessageEndpointFactory extends AbstractMessageEndpointFactory  {
 	 * Internal exception thrown when a ResourceExeption has been encountered
 	 * during the endpoint invocation.
 	 * <p>Will only be used if the ResourceAdapter does not invoke the
-	 * endpoint's <code>beforeDelivery</code> and <code>afterDelivery</code>
+	 * endpoint's {@code beforeDelivery} and {@code afterDelivery}
 	 * directly, leavng it up to the concrete endpoint to apply those -
 	 * and to handle any ResourceExceptions thrown from them.
 	 */
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 2a4bd7cf1f..10e1cec307 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
@@ -113,7 +113,7 @@ public class StandardJmsActivationSpecFactory implements JmsActivationSpecFactor
 	 * Determine the ActivationSpec class for the given ResourceAdapter,
 	 * if possible. Called if no 'activationSpecClass' has been set explicitly
 	 * @param adapter the ResourceAdapter to check
-	 * @return the corresponding ActivationSpec class, or <code>null</code>
+	 * @return the corresponding ActivationSpec class, or {@code null}
 	 * if not determinable
 	 * @see #setActivationSpecClass
 	 */
@@ -170,7 +170,7 @@ public class StandardJmsActivationSpecFactory implements JmsActivationSpecFactor
 	 * Apply the specified acknowledge mode to the ActivationSpec object.
 	 * <p>This implementation applies the standard JCA 1.5 acknowledge modes
 	 * "Auto-acknowledge" and "Dups-ok-acknowledge". It throws an exception in
-	 * case of <code>CLIENT_ACKNOWLEDGE</code> or <code>SESSION_TRANSACTED</code>
+	 * case of {@code CLIENT_ACKNOWLEDGE} or {@code SESSION_TRANSACTED}
 	 * having been requested.
 	 * @param bw the BeanWrapper wrapping the ActivationSpec object
 	 * @param ackMode the configured acknowledge mode
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
index 7dd6ed748f..7da7f052cf 100644
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
+++ b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
@@ -378,7 +378,7 @@ public class JmsInvokerClientInterceptor implements MethodInterceptor, Initializ
 	 * Extract the invocation result from the response message.
 	 * <p>The default implementation expects a JMS ObjectMessage carrying
 	 * a RemoteInvocationResult object. If an invalid response message is
-	 * encountered, the <code>onInvalidResponse</code> callback gets invoked.
+	 * encountered, the {@code onInvalidResponse} callback gets invoked.
 	 * @param responseMessage the response message
 	 * @return the invocation result
 	 * @throws JMSException is thrown if a JMS exception occurs
@@ -393,7 +393,7 @@ public class JmsInvokerClientInterceptor implements MethodInterceptor, Initializ
 	}
 
 	/**
-	 * Callback that is invoked by <code>extractInvocationResult</code>
+	 * Callback that is invoked by {@code extractInvocationResult}
 	 * when it encounters an invalid response message.
 	 * <p>The default implementation throws a MessageFormatException.
 	 * @param responseMessage the invalid response message
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
index 678b6f30fb..682d927cbe 100644
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
+++ b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
@@ -53,8 +53,8 @@ public class JmsInvokerProxyFactoryBean extends JmsInvokerClientInterceptor
 	/**
 	 * Set the interface that the proxy must implement.
 	 * @param serviceInterface the interface that the proxy must implement
-	 * @throws IllegalArgumentException if the supplied <code>serviceInterface</code>
-	 * is <code>null</code>, or if the supplied <code>serviceInterface</code>
+	 * @throws IllegalArgumentException if the supplied {@code serviceInterface}
+	 * is {@code null}, or if the supplied {@code serviceInterface}
 	 * is not an interface type
 	 */
 	public void setServiceInterface(Class serviceInterface) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
index dd42794609..95c9f5a0f7 100644
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
@@ -105,7 +105,7 @@ public class JmsInvokerServiceExporter extends RemoteInvocationBasedExporter
 	/**
 	 * Read a RemoteInvocation from the given JMS message.
 	 * @param requestMessage current request message
-	 * @return the RemoteInvocation object (or <code>null</code>
+	 * @return the RemoteInvocation object (or {@code null}
 	 * in case of an invalid message that will simply be ignored)
 	 * @throws javax.jms.JMSException in case of message access failure
 	 */
@@ -170,7 +170,7 @@ public class JmsInvokerServiceExporter extends RemoteInvocationBasedExporter
 	 * flag, which is set to "true" (that is, discard invalid messages) by default.
 	 * @param requestMessage the invalid request message
 	 * @return the RemoteInvocation to expose for the invalid request (typically
-	 * <code>null</code> in case of an invalid message that will simply be ignored)
+	 * {@code null} in case of an invalid message that will simply be ignored)
 	 * @throws javax.jms.JMSException in case of the invalid request supposed
 	 * to lead to an exception (instead of ignoring it)
 	 * @see #readRemoteInvocation
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 1c6ffdc5ac..a40b42a3b9 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
@@ -78,7 +78,7 @@ public abstract class JmsAccessor implements InitializingBean {
 	 * Set the transaction mode that is used when creating a JMS {@link Session}.
 	 * Default is "false".
 	 * <p>Note that within a JTA transaction, the parameters passed to
-	 * <code>create(Queue/Topic)Session(boolean transacted, int acknowledgeMode)</code>
+	 * {@code create(Queue/Topic)Session(boolean transacted, int acknowledgeMode)}
 	 * method are not taken into account. Depending on the J2EE transaction context,
 	 * the container makes its own decisions on these values. Analogously, these
 	 * parameters are not taken into account within a locally managed transaction
@@ -159,10 +159,10 @@ public abstract class JmsAccessor implements InitializingBean {
 	 * a Spring runtime {@link org.springframework.jms.JmsException JmsException}
 	 * equivalent.
 	 * <p>The default implementation delegates to the
-	 * {@link org.springframework.jms.support.JmsUtils#convertJmsAccessException} method.
+	 * {@link JmsUtils#convertJmsAccessException} method.
 	 * @param ex the original checked {@link JMSException} to convert
-	 * @return the Spring runtime {@link JmsException} wrapping <code>ex</code>
-	 * @see org.springframework.jms.support.JmsUtils#convertJmsAccessException
+	 * @return the Spring runtime {@link JmsException} wrapping {@code ex}
+	 * @see JmsUtils#convertJmsAccessException
 	 */
 	protected JmsException convertJmsAccessException(JMSException ex) {
 		return JmsUtils.convertJmsAccessException(ex);
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
index 8f97bdf9be..493077a5e8 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
@@ -56,8 +56,8 @@ public abstract class JmsUtils {
 
 	/**
 	 * Close the given JMS Connection and ignore any thrown exception.
-	 * This is useful for typical <code>finally</code> blocks in manual JMS code.
-	 * @param con the JMS Connection to close (may be <code>null</code>)
+	 * This is useful for typical {@code finally} blocks in manual JMS code.
+	 * @param con the JMS Connection to close (may be {@code null})
 	 */
 	public static void closeConnection(Connection con) {
 		closeConnection(con, false);
@@ -65,9 +65,9 @@ public abstract class JmsUtils {
 
 	/**
 	 * Close the given JMS Connection and ignore any thrown exception.
-	 * This is useful for typical <code>finally</code> blocks in manual JMS code.
-	 * @param con the JMS Connection to close (may be <code>null</code>)
-	 * @param stop whether to call <code>stop()</code> before closing
+	 * This is useful for typical {@code finally} blocks in manual JMS code.
+	 * @param con the JMS Connection to close (may be {@code null})
+	 * @param stop whether to call {@code stop()} before closing
 	 */
 	public static void closeConnection(Connection con, boolean stop) {
 		if (con != null) {
@@ -99,8 +99,8 @@ public abstract class JmsUtils {
 
 	/**
 	 * Close the given JMS Session and ignore any thrown exception.
-	 * This is useful for typical <code>finally</code> blocks in manual JMS code.
-	 * @param session the JMS Session to close (may be <code>null</code>)
+	 * This is useful for typical {@code finally} blocks in manual JMS code.
+	 * @param session the JMS Session to close (may be {@code null})
 	 */
 	public static void closeSession(Session session) {
 		if (session != null) {
@@ -119,8 +119,8 @@ public abstract class JmsUtils {
 
 	/**
 	 * Close the given JMS MessageProducer and ignore any thrown exception.
-	 * This is useful for typical <code>finally</code> blocks in manual JMS code.
-	 * @param producer the JMS MessageProducer to close (may be <code>null</code>)
+	 * This is useful for typical {@code finally} blocks in manual JMS code.
+	 * @param producer the JMS MessageProducer to close (may be {@code null})
 	 */
 	public static void closeMessageProducer(MessageProducer producer) {
 		if (producer != null) {
@@ -139,8 +139,8 @@ public abstract class JmsUtils {
 
 	/**
 	 * Close the given JMS MessageConsumer and ignore any thrown exception.
-	 * This is useful for typical <code>finally</code> blocks in manual JMS code.
-	 * @param consumer the JMS MessageConsumer to close (may be <code>null</code>)
+	 * This is useful for typical {@code finally} blocks in manual JMS code.
+	 * @param consumer the JMS MessageConsumer to close (may be {@code null})
 	 */
 	public static void closeMessageConsumer(MessageConsumer consumer) {
 		if (consumer != null) {
@@ -168,8 +168,8 @@ public abstract class JmsUtils {
 
 	/**
 	 * Close the given JMS QueueBrowser and ignore any thrown exception.
-	 * This is useful for typical <code>finally</code> blocks in manual JMS code.
-	 * @param browser the JMS QueueBrowser to close (may be <code>null</code>)
+	 * This is useful for typical {@code finally} blocks in manual JMS code.
+	 * @param browser the JMS QueueBrowser to close (may be {@code null})
 	 */
 	public static void closeQueueBrowser(QueueBrowser browser) {
 		if (browser != null) {
@@ -188,8 +188,8 @@ public abstract class JmsUtils {
 
 	/**
 	 * Close the given JMS QueueRequestor and ignore any thrown exception.
-	 * This is useful for typical <code>finally</code> blocks in manual JMS code.
-	 * @param requestor the JMS QueueRequestor to close (may be <code>null</code>)
+	 * This is useful for typical {@code finally} blocks in manual JMS code.
+	 * @param requestor the JMS QueueRequestor to close (may be {@code null})
 	 */
 	public static void closeQueueRequestor(QueueRequestor requestor) {
 		if (requestor != null) {
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 ec09cf4b65..ab27354c61 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
@@ -59,7 +59,7 @@ public class MarshallingMessageConverter implements MessageConverter, Initializi
 
 
 	/**
-	 * Construct a new <code>MarshallingMessageConverter</code> with no {@link Marshaller}
+	 * Construct a new {@code MarshallingMessageConverter} with no {@link Marshaller}
 	 * or {@link Unmarshaller} set. The marshaller must be set after construction by invoking
 	 * {@link #setMarshaller(Marshaller)} and {@link #setUnmarshaller(Unmarshaller)} .
 	 */
@@ -67,13 +67,13 @@ public class MarshallingMessageConverter implements MessageConverter, Initializi
 	}
 
 	/**
-	 * Construct a new <code>MarshallingMessageConverter</code> with the given {@link Marshaller} set.
+	 * Construct a new {@code MarshallingMessageConverter} with the given {@link Marshaller} set.
 	 * <p>If the given {@link Marshaller} also implements the {@link Unmarshaller} interface,
 	 * it is used for both marshalling and unmarshalling. Otherwise, an exception is thrown.
 	 * <p>Note that all {@link Marshaller} implementations in Spring also implement the
 	 * {@link Unmarshaller} interface, so that you can safely use this constructor.
 	 * @param marshaller object used as marshaller and unmarshaller
-	 * @throws IllegalArgumentException when <code>marshaller</code> does not implement the
+	 * @throws IllegalArgumentException when {@code marshaller} does not implement the
 	 * {@link Unmarshaller} interface as well
 	 */
 	public MarshallingMessageConverter(Marshaller marshaller) {
@@ -91,7 +91,7 @@ public class MarshallingMessageConverter implements MessageConverter, Initializi
 	}
 
 	/**
-	 * Construct a new <code>MarshallingMessageConverter</code> with the
+	 * Construct a new {@code MarshallingMessageConverter} with the
 	 * given Marshaller and Unmarshaller.
 	 * @param marshaller the Marshaller to use
 	 * @param unmarshaller the Unmarshaller to use
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
index 6d58939730..d9be513bca 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
@@ -34,7 +34,7 @@ import org.springframework.util.ObjectUtils;
  * A simple message converter which is able to handle TextMessages, BytesMessages,
  * MapMessages, and ObjectMessages. Used as default conversion strategy
  * by {@link org.springframework.jms.core.JmsTemplate}, for
- * <code>convertAndSend</code> and <code>receiveAndConvert</code> operations.
+ * {@code convertAndSend} and {@code receiveAndConvert} operations.
  *
  * <p>Converts a String to a {@link javax.jms.TextMessage}, a byte array to a
  * {@link javax.jms.BytesMessage}, a Map to a {@link javax.jms.MapMessage}, and
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java
index 9f7b887a31..e9ae82c1de 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java
@@ -28,7 +28,7 @@ import javax.jms.JMSException;
  * as SimpleMessageConverter does for JMS 1.1 providers.
  *
  * <p>The only difference to the default SimpleMessageConverter is that BytesMessage
- * is handled differently: namely, without using the <code>getBodyLength()</code>
+ * is handled differently: namely, without using the {@code getBodyLength()}
  * method which has been introduced in JMS 1.1 and is therefore not available on a
  * JMS 1.0.2 provider.
  *
@@ -46,7 +46,7 @@ public class SimpleMessageConverter102 extends SimpleMessageConverter {
 	/**
 	 * Overrides superclass method to copy bytes from the message into a
 	 * ByteArrayOutputStream, using a buffer, to avoid using the
-	 * <code>getBodyLength()</code> method which has been introduced in
+	 * {@code getBodyLength()} method which has been introduced in
 	 * JMS 1.1 and is therefore not available on a JMS 1.0.2 provider.
 	 * @see javax.jms.BytesMessage#getBodyLength()
 	 */
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
index d1f6ddd3f3..f28ae3a115 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
  * {@link DestinationResolver} implementation based on a Spring {@link BeanFactory}.
  *
  * <p>Will lookup Spring managed beans identified by bean name,
- * expecting them to be of type <code>javax.jms.Destination</code>.
+ * expecting them to be of type {@code javax.jms.Destination}.
  *
  * @author Juergen Hoeller
  * @since 2.5
@@ -42,7 +42,7 @@ public class BeanFactoryDestinationResolver implements DestinationResolver, Bean
 
 	/**
 	 * Create a new instance of the {@link BeanFactoryDestinationResolver} class.
-	 * <p>The BeanFactory to access must be set via <code>setBeanFactory</code>.
+	 * <p>The BeanFactory to access must be set via {@code setBeanFactory}.
 	 * @see #setBeanFactory
 	 */
 	public BeanFactoryDestinationResolver() {
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
index e01c5129c3..0569619c8b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
@@ -44,9 +44,9 @@ public interface DestinationResolver {
 	 * Resolve the given destination name, either as located resource
 	 * or as dynamic destination.
 	 * @param session the current JMS Session
-	 * (may be <code>null</code> if the resolver implementation is able to work without it)
+	 * (may be {@code null} if the resolver implementation is able to work without it)
 	 * @param destinationName the name of the destination
-	 * @param pubSubDomain <code>true</code> if the domain is pub-sub, <code>false</code> if P2P
+	 * @param pubSubDomain {@code true} if the domain is pub-sub, {@code false} if P2P
 	 * @return the JMS destination (either a topic or a queue)
 	 * @throws javax.jms.JMSException if the JMS Session failed to resolve the destination
 	 * @throws DestinationResolutionException in case of general destination resolution failure
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
index 4bbf8fa100..a8aaf1a283 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
@@ -48,7 +48,7 @@ public class DynamicDestinationResolver implements DestinationResolver {
 	 * Resolve the specified destination name as a dynamic destination.
 	 * @param session the current JMS Session
 	 * @param destinationName the name of the destination
-	 * @param pubSubDomain <code>true</code> if the domain is pub-sub, <code>false</code> if P2P
+	 * @param pubSubDomain {@code true} if the domain is pub-sub, {@code false} if P2P
 	 * @return the JMS destination (either a topic or a queue)
 	 * @throws javax.jms.JMSException if resolution failed
 	 * @see #resolveTopic(javax.jms.Session, String)
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java
index 335e14800e..b27bf022af 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java
@@ -57,7 +57,7 @@ public abstract class JmsDestinationAccessor extends JmsAccessor {
 	}
 
 	/**
-	 * Return the DestinationResolver for this accessor (never <code>null</code>).
+	 * Return the DestinationResolver for this accessor (never {@code null}).
 	 */
 	public DestinationResolver getDestinationResolver() {
 		return this.destinationResolver;
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java
index 351a7807c6..b9bf560e8e 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java
@@ -135,8 +135,8 @@ public class JndiDestinationResolver extends JndiLocatorSupport implements Cachi
 	 * the expected type.
 	 * @param destination the Destination object to validate
 	 * @param destinationName the name of the destination
-	 * @param pubSubDomain <code>true</code> if a Topic is expected,
-	 * <code>false</code> in case of a Queue
+	 * @param pubSubDomain {@code true} if a Topic is expected,
+	 * {@code false} in case of a Queue
 	 */
 	protected void validateDestination(Destination destination, String destinationName, boolean pubSubDomain) {
 		Class targetClass = Queue.class;
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java
index da83a5f798..9fbc1574e7 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java
@@ -23,7 +23,7 @@ import org.springframework.dao.UncategorizedDataAccessException;
 /**
  * Hibernate-specific subclass of UncategorizedDataAccessException,
  * for Hibernate system errors that do not match any concrete
- * <code>org.springframework.dao</code> exceptions.
+ * {@code org.springframework.dao} exceptions.
  *
  * @author Juergen Hoeller
  * @since 3.1
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 19d6588b04..ddde103c1d 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
@@ -50,7 +50,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * implementation for a single Hibernate {@link org.hibernate.SessionFactory}.
  * Binds a Hibernate Session from the specified factory to the thread,
  * potentially allowing for one thread-bound Session per factory.
- * <code>SessionFactory.getCurrentSession()</code> is required for Hibernate
+ * {@code SessionFactory.getCurrentSession()} is required for Hibernate
  * access code that needs to support this transaction handling mechanism,
  * with the SessionFactory being configured with {@link SpringSessionContext}.
  *
@@ -188,7 +188,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 
 	/**
 	 * Set whether to autodetect a JDBC DataSource used by the Hibernate SessionFactory,
-	 * if set via SessionFactoryBuilder's <code>setDataSource</code>. Default is "true".
+	 * if set via SessionFactoryBuilder's {@code setDataSource}. Default is "true".
 	 * <p>Can be turned off to deliberately ignore an available DataSource, in order
 	 * to not expose Hibernate transactions as JDBC transactions for that DataSource.
 	 * @see #setDataSource
@@ -204,7 +204,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 	 * JDBC Connection.
 	 * <p>Default is "true". If you turn this flag off, the transaction manager
 	 * will not support per-transaction isolation levels anymore. It will not
-	 * call <code>Connection.setReadOnly(true)</code> for read-only transactions
+	 * call {@code Connection.setReadOnly(true)} for read-only transactions
 	 * anymore either. If this flag is turned off, no cleanup of a JDBC Connection
 	 * is required after a transaction, since no Connection settings will get modified.
 	 * @see java.sql.Connection#setTransactionIsolation
@@ -227,14 +227,14 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 	 * <p>Switch this flag to "true" in order to enforce use of a Hibernate-managed Session.
 	 * Note that this requires {@link org.hibernate.SessionFactory#getCurrentSession()}
 	 * to always return a proper Session when called for a Spring-managed transaction;
-	 * transaction begin will fail if the <code>getCurrentSession()</code> call fails.
+	 * transaction begin will fail if the {@code getCurrentSession()} call fails.
 	 * <p>This mode will typically be used in combination with a custom Hibernate
 	 * {@link org.hibernate.context.CurrentSessionContext} implementation that stores
 	 * Sessions in a place other than Spring's TransactionSynchronizationManager.
 	 * It may also be used in combination with Spring's Open-Session-in-View support
 	 * (using Spring's default {@link SpringSessionContext}), in which case it subtly
 	 * differs from the Spring-managed Session mode: The pre-bound Session will <i>not</i>
-	 * receive a <code>clear()</code> call (on rollback) or a <code>disconnect()</code>
+	 * receive a {@code clear()} call (on rollback) or a {@code disconnect()}
 	 * call (on transaction completion) in such a scenario; this is rather left up
 	 * to a custom CurrentSessionContext implementation (if desired).
 	 */
@@ -583,7 +583,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 
 	/**
 	 * Convert the given HibernateException to an appropriate exception
-	 * from the <code>org.springframework.dao</code> hierarchy.
+	 * from the {@code org.springframework.dao} hierarchy.
 	 * <p>Will automatically apply a specified SQLExceptionTranslator to a
 	 * Hibernate JDBCException, else rely on Hibernate's default translation.
 	 * @param ex HibernateException that occured
@@ -671,7 +671,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 
 	/**
 	 * Holder for suspended resources.
-	 * Used internally by <code>doSuspend</code> and <code>doResume</code>.
+	 * Used internally by {@code doSuspend} and {@code doResume}.
 	 */
 	private static class SuspendedResourcesHolder {
 
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 779d5aca01..dea7f1a139 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
@@ -44,9 +44,9 @@ import org.springframework.core.io.support.ResourcePatternUtils;
  * 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</code> package.
- * However, in practice, it is closer to <code>AnnotationSessionFactoryBean</code> since
- * its core purpose is to bootstrap a <code>SessionFactory</code> from annotation scanning.
+ * 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>NOTE:</b> To set up Hibernate 4 for Spring-driven JTA transactions, make
  * sure to either specify the {@link #setJtaTransactionManager "jtaTransactionManager"}
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 6ad987fdfe..e125abf2b7 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
@@ -79,7 +79,7 @@ public class LocalSessionFactoryBuilder extends Configuration {
 	/**
 	 * Create a new LocalSessionFactoryBuilder for the given DataSource.
 	 * @param dataSource the JDBC DataSource that the resulting Hibernate SessionFactory should be using
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 */
 	public LocalSessionFactoryBuilder(DataSource dataSource) {
 		this(dataSource, new PathMatchingResourcePatternResolver());
@@ -88,7 +88,7 @@ public class LocalSessionFactoryBuilder extends Configuration {
 	/**
 	 * Create a new LocalSessionFactoryBuilder for the given DataSource.
 	 * @param dataSource the JDBC DataSource that the resulting Hibernate SessionFactory should be using
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @param classLoader the ClassLoader to load application classes from
 	 */
 	public LocalSessionFactoryBuilder(DataSource dataSource, ClassLoader classLoader) {
@@ -98,7 +98,7 @@ public class LocalSessionFactoryBuilder extends Configuration {
 	/**
 	 * Create a new LocalSessionFactoryBuilder for the given DataSource.
 	 * @param dataSource the JDBC DataSource that the resulting Hibernate SessionFactory should be using
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @param resourceLoader the ResourceLoader to load application classes from
 	 */
 	public LocalSessionFactoryBuilder(DataSource dataSource, ResourceLoader resourceLoader) {
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SessionFactoryUtils.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SessionFactoryUtils.java
index 2a8a5cd549..b714c667b8 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SessionFactoryUtils.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SessionFactoryUtils.java
@@ -69,7 +69,7 @@ public abstract class SessionFactoryUtils {
 
 	/**
 	 * Order value for TransactionSynchronization objects that clean up Hibernate Sessions.
-	 * Returns <code>DataSourceUtils.CONNECTION_SYNCHRONIZATION_ORDER - 100</code>
+	 * Returns {@code DataSourceUtils.CONNECTION_SYNCHRONIZATION_ORDER - 100}
 	 * to execute Session cleanup before JDBC Connection cleanup, if any.
 	 * @see org.springframework.jdbc.datasource.DataSourceUtils#CONNECTION_SYNCHRONIZATION_ORDER
 	 */
@@ -82,7 +82,7 @@ public abstract class SessionFactoryUtils {
 	/**
 	 * Determine the DataSource of the given SessionFactory.
 	 * @param sessionFactory the SessionFactory to check
-	 * @return the DataSource, or <code>null</code> if none found
+	 * @return the DataSource, or {@code null} if none found
 	 * @see org.hibernate.engine.spi.SessionFactoryImplementor#getConnectionProvider
 	 */
 	public static DataSource getDataSource(SessionFactory sessionFactory) {
@@ -96,7 +96,7 @@ public abstract class SessionFactoryUtils {
 	/**
 	 * Perform actual closing of the Hibernate Session,
 	 * catching and logging any cleanup exceptions thrown.
-	 * @param session the Hibernate Session to close (may be <code>null</code>)
+	 * @param session the Hibernate Session to close (may be {@code null})
 	 * @see org.hibernate.Session#close()
 	 */
 	public static void closeSession(Session session) {
@@ -115,7 +115,7 @@ public abstract class SessionFactoryUtils {
 
 	/**
 	 * Convert the given HibernateException to an appropriate exception
-	 * from the <code>org.springframework.dao</code> hierarchy.
+	 * from the {@code org.springframework.dao} hierarchy.
 	 * @param ex HibernateException that occured
 	 * @return the corresponding DataAccessException instance
 	 * @see HibernateExceptionTranslator#convertHibernateAccessException
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringFlushSynchronization.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringFlushSynchronization.java
index 3850846a7a..11aa50b6e2 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringFlushSynchronization.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringFlushSynchronization.java
@@ -22,7 +22,7 @@ import org.hibernate.Session;
 import org.springframework.transaction.support.TransactionSynchronizationAdapter;
 
 /**
- * Simple synchronization adapter that propagates a <code>flush()</code> call
+ * Simple synchronization adapter that propagates a {@code flush()} call
  * to the underlying Hibernate Session. Used in combination with JTA.
  *
  * @author Juergen Hoeller
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java
index 9c3941d306..92850dbe96 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java
@@ -25,7 +25,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 
 /**
  * Spring-specific subclass of Hibernate's JTASessionContext,
- * setting <code>FlushMode.MANUAL</code> for read-only transactions.
+ * setting {@code FlushMode.MANUAL} for read-only transactions.
  *
  * @author Juergen Hoeller
  * @since 3.1
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/package-info.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/package-info.java
index ef73ff78f9..809ced77e6 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/package-info.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/package-info.java
@@ -1,4 +1,3 @@
-
 /**
  *
  * Package providing integration of
@@ -10,7 +9,7 @@
  * in order to follow native Hibernate recommendations as closely as possible.
  *
  * <p><b>This package supports Hibernate 4.x only.</b>
- * See the <code>org.springframework.orm.hibernate3</code> package for Hibernate 3.x support.
+ * See the {@code org.springframework.orm.hibernate3} package for Hibernate 3.x support.
  *
  */
 package org.springframework.orm.hibernate4;
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 56b8b1a71f..0045a5d3f8 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
@@ -52,11 +52,11 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * as well as for non-transactional execution (if configured appropriately).
  *
  * <p><b>NOTE</b>: This filter will by default <i>not</i> flush the Hibernate Session,
- * with the flush mode set to <code>FlushMode.NEVER</code>. It assumes to be used
+ * with the flush mode set to {@code FlushMode.NEVER}. It assumes to be used
  * in combination with service layer transactions that care for the flushing: The
  * active transaction manager will temporarily change the flush mode to
- * <code>FlushMode.AUTO</code> during a read-write transaction, with the flush
- * mode reset to <code>FlushMode.NEVER</code> at the end of each transaction.
+ * {@code FlushMode.AUTO} during a read-write transaction, with the flush
+ * mode reset to {@code FlushMode.NEVER} at the end of each transaction.
  *
  * <p><b>WARNING:</b> Applying this filter to existing logic can cause issues that
  * have not appeared before, through the use of a single Hibernate Session for the
@@ -65,7 +65,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * processing, to avoid clashes with already loaded instances of the same objects.
  *
  * <p>Looks up the SessionFactory in Spring's root web application context.
- * Supports a "sessionFactoryBeanName" filter init-param in <code>web.xml</code>;
+ * 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).
@@ -194,8 +194,8 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
 	/**
 	 * Open a Session for the SessionFactory that this filter uses.
 	 * <p>The default implementation delegates to the
-	 * <code>SessionFactory.openSession</code> method and
-	 * sets the <code>Session</code>'s flush mode to "MANUAL".
+	 * {@code SessionFactory.openSession} method and
+	 * sets the {@code 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
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 486069f15e..8994255e75 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
@@ -38,7 +38,7 @@ import org.springframework.web.context.request.async.WebAsyncManager;
 import org.springframework.web.context.request.async.WebAsyncUtils;
 
 /**
- * Spring web request interceptor that binds a Hibernate <code>Session</code> to the
+ * Spring web request interceptor that binds a Hibernate {@code Session} to the
  * thread for the entire processing of the request.
  *
  * <p>This class is a concrete expression of the "Open Session in View" pattern, which
@@ -55,8 +55,8 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
  *
  * <p><b>WARNING:</b> Applying this interceptor to existing logic can cause issues
  * that have not appeared before, through the use of a single Hibernate
- * <code>Session</code> for the processing of an entire request. In particular, the
- * reassociation of persistent objects with a Hibernate <code>Session</code> has to
+ * {@code Session} for the processing of an entire request. In particular, the
+ * reassociation of persistent objects with a Hibernate {@code Session} has to
  * occur at the very beginning of request processing, to avoid clashes with already
  * loaded instances of the same objects.
  *
@@ -69,8 +69,8 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
 public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor {
 
 	/**
-	 * Suffix that gets appended to the <code>SessionFactory</code>
-	 * <code>toString()</code> representation for the "participate in existing
+	 * Suffix that gets appended to the {@code SessionFactory}
+	 * {@code toString()} representation for the "participate in existing
 	 * session handling" request attribute.
 	 * @see #getParticipateAttributeName
 	 */
@@ -91,8 +91,8 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 
 
 	/**
-	 * Open a new Hibernate <code>Session</code> according to the settings of this
-	 * <code>HibernateAccessor</code> and bind it to the thread via the
+	 * Open a new Hibernate {@code Session} according to the settings of this
+	 * {@code HibernateAccessor} and bind it to the thread via the
 	 * {@link org.springframework.transaction.support.TransactionSynchronizationManager}.
 	 */
 	public void preHandle(WebRequest request) throws DataAccessException {
@@ -127,7 +127,7 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 	}
 
 	/**
-	 * Unbind the Hibernate <code>Session</code> from the thread and close it).
+	 * Unbind the Hibernate {@code Session} from the thread and close it).
 	 * @see org.springframework.transaction.support.TransactionSynchronizationManager
 	 */
 	public void afterCompletion(WebRequest request, Exception ex) throws DataAccessException {
@@ -165,8 +165,8 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 	/**
 	 * Open a Session for the SessionFactory that this interceptor uses.
 	 * <p>The default implementation delegates to the
-	 * <code>SessionFactory.openSession</code> method and
-	 * sets the <code>Session</code>'s flush mode to "MANUAL".
+	 * {@code SessionFactory.openSession} method and
+	 * sets the {@code 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
@@ -185,8 +185,8 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 	/**
 	 * Return the name of the request attribute that identifies that a request is
 	 * already intercepted.
-	 * <p>The default implementation takes the <code>toString()</code> representation
-	 * of the <code>SessionFactory</code> instance and appends {@link #PARTICIPATE_SUFFIX}.
+	 * <p>The default implementation takes the {@code toString()} representation
+	 * of the {@code SessionFactory} instance and appends {@link #PARTICIPATE_SUFFIX}.
 	 */
 	protected String getParticipateAttributeName() {
 		return getSessionFactory().toString() + PARTICIPATE_SUFFIX;
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/package-info.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/package-info.java
index a761ff6ad4..76374483ad 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/package-info.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/package-info.java
@@ -17,7 +17,7 @@
 
 /**
  *
- * Classes supporting the <code>org.springframework.orm.hibernate4</code> package.
+ * Classes supporting the {@code org.springframework.orm.hibernate4} package.
  *
  */
 package org.springframework.orm.hibernate4.support;
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
index b083e95b27..66ce8a2b07 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
@@ -39,7 +39,7 @@ public class DelegatingServletInputStream extends ServletInputStream {
 
 	/**
 	 * Create a DelegatingServletInputStream for the given source stream.
-	 * @param sourceStream the source stream (never <code>null</code>)
+	 * @param sourceStream the source stream (never {@code null})
 	 */
 	public DelegatingServletInputStream(InputStream sourceStream) {
 		Assert.notNull(sourceStream, "Source InputStream must not be null");
@@ -47,7 +47,7 @@ public class DelegatingServletInputStream extends ServletInputStream {
 	}
 
 	/**
-	 * Return the underlying source stream (never <code>null</code>).
+	 * Return the underlying source stream (never {@code null}).
 	 */
 	public final InputStream getSourceStream() {
 		return this.sourceStream;
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
index 66fca5df2f..784e160483 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
@@ -39,7 +39,7 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 
 	/**
 	 * Create a DelegatingServletOutputStream for the given target stream.
-	 * @param targetStream the target stream (never <code>null</code>)
+	 * @param targetStream the target stream (never {@code null})
 	 */
 	public DelegatingServletOutputStream(OutputStream targetStream) {
 		Assert.notNull(targetStream, "Target OutputStream must not be null");
@@ -47,7 +47,7 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 	}
 
 	/**
-	 * Return the underlying target stream (never <code>null</code>).
+	 * Return the underlying target stream (never {@code null}).
 	 */
 	public final OutputStream getTargetStream() {
 		return this.targetStream;
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
index afe74ad8f0..a6381e92ba 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
@@ -81,7 +81,7 @@ class HeaderValueHolder {
 	 * @param headers the Map of header names to HeaderValueHolders
 	 * @param name the name of the desired header
 	 * @return the corresponding HeaderValueHolder,
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 */
 	public static HeaderValueHolder getByName(Map<String, HeaderValueHolder> headers, String name) {
 		Assert.notNull(name, "Header name must not be null");
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
index 88afb595af..7df22ffaf8 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
@@ -51,7 +51,7 @@ import org.springframework.util.LinkedCaseInsensitiveMap;
  * Mock implementation of the {@link javax.servlet.http.HttpServletRequest} interface.
  *
  * <p>Compatible with Servlet 2.5 and partially with Servlet 3.0 (notable exceptions:
- * the <code>getPart(s)</code> and <code>startAsync</code> families of methods).
+ * the {@code getPart(s)} and {@code startAsync} families of methods).
  *
  * @author Juergen Hoeller
  * @author Rod Johnson
@@ -193,9 +193,9 @@ public class MockHttpServletRequest implements HttpServletRequest {
 
 	/**
 	 * Create a new {@code MockHttpServletRequest} with a default
-	 * {@link org.springframework.mock.web.MockServletContext}.
-	 * @param method the request method (may be <code>null</code>)
-	 * @param requestURI the request URI (may be <code>null</code>)
+	 * {@link MockServletContext}.
+	 * @param method the request method (may be {@code null})
+	 * @param requestURI the request URI (may be {@code null})
 	 * @see #setMethod
 	 * @see #setRequestURI
 	 * @see #MockHttpServletRequest(javax.servlet.ServletContext, String, String)
@@ -207,7 +207,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	/**
 	 * Create a new {@code MockHttpServletRequest} with the supplied {@link javax.servlet.ServletContext}.
 	 * @param servletContext the ServletContext that the request runs in (may be
-	 * <code>null</code> to use a default {@link org.springframework.mock.web.MockServletContext})
+	 * {@code null} to use a default {@link MockServletContext})
 	 * @see #MockHttpServletRequest(javax.servlet.ServletContext, String, String)
 	 */
 	public MockHttpServletRequest(ServletContext servletContext) {
@@ -219,13 +219,13 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	 * {@code method}, and {@code requestURI}.
 	 * <p>The preferred locale will be set to {@link java.util.Locale#ENGLISH}.
 	 * @param servletContext the ServletContext that the request runs in (may be
-	 * <code>null</code> to use a default {@link org.springframework.mock.web.MockServletContext})
-	 * @param method the request method (may be <code>null</code>)
-	 * @param requestURI the request URI (may be <code>null</code>)
+	 * {@code null} to use a default {@link MockServletContext})
+	 * @param method the request method (may be {@code null})
+	 * @param requestURI the request URI (may be {@code null})
 	 * @see #setMethod
 	 * @see #setRequestURI
 	 * @see #setPreferredLocales
-	 * @see org.springframework.mock.web.MockServletContext
+	 * @see MockServletContext
 	 */
 	public MockHttpServletRequest(ServletContext servletContext, String method, String requestURI) {
 		this.servletContext = (servletContext != null ? servletContext : new MockServletContext());
@@ -662,8 +662,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	 * adding the given value (more specifically, its toString representation)
 	 * as further element.
 	 * <p>Multiple values can only be stored as list of Strings, following the
-	 * Servlet spec (see <code>getHeaders</code> accessor). As alternative to
-	 * repeated <code>addHeader</code> calls for individual elements, you can
+	 * Servlet spec (see {@code getHeaders} accessor). As alternative to
+	 * repeated {@code addHeader} calls for individual elements, you can
 	 * use a single call with an entire array or Collection of values as
 	 * parameter.
 	 * @see #getHeaderNames
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
index 88f3dbab08..c86e95a93a 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -108,7 +108,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	/**
 	 * Set whether {@link #getOutputStream()} access is allowed.
-	 * <p>Default is <code>true</code>.
+	 * <p>Default is {@code true}.
 	 */
 	public void setOutputStreamAccessAllowed(boolean outputStreamAccessAllowed) {
 		this.outputStreamAccessAllowed = outputStreamAccessAllowed;
@@ -123,7 +123,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	/**
 	 * Set whether {@link #getWriter()} access is allowed.
-	 * <p>Default is <code>true</code>.
+	 * <p>Default is {@code true}.
 	 */
 	public void setWriterAccessAllowed(boolean writerAccessAllowed) {
 		this.writerAccessAllowed = writerAccessAllowed;
@@ -297,7 +297,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	/**
 	 * Return the names of all specified headers as a Set of Strings.
 	 * <p>As of Servlet 3.0, this method is also defined HttpServletResponse.
-	 * @return the <code>Set</code> of header name <code>Strings</code>, or an empty <code>Set</code> if none
+	 * @return the {@code Set} of header name {@code Strings}, or an empty {@code Set} if none
 	 */
 	public Set<String> getHeaderNames() {
 		return this.headers.keySet();
@@ -310,7 +310,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * As of Spring 3.1, it returns a stringified value for Servlet 3.0 compatibility.
 	 * Consider using {@link #getHeaderValue(String)} for raw Object access.
 	 * @param name the name of the header
-	 * @return the associated header value, or <code>null<code> if none
+	 * @return the associated header value, or {@code null} if none
 	 */
 	public String getHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
@@ -339,7 +339,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * Return the primary value for the given header, if any.
 	 * <p>Will return the first value in case of multiple values.
 	 * @param name the name of the header
-	 * @return the associated header value, or <code>null<code> if none
+	 * @return the associated header value, or {@code null} if none
 	 */
 	public Object getHeaderValue(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java
index 9d712c3aa0..ab39d5980b 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java
@@ -112,7 +112,7 @@ public abstract class AbstractSessionFactoryBean extends HibernateExceptionTrans
 	 * <p>A further benefit of this option is that <i>plain Sessions opened directly
 	 * via the SessionFactory</i>, outside of Spring's Hibernate support, will still
 	 * participate in active Spring-managed transactions. However, consider using
-	 * Hibernate's <code>getCurrentSession()</code> method instead (see javadoc of
+	 * Hibernate's {@code getCurrentSession()} method instead (see javadoc of
 	 * "exposeTransactionAwareSessionFactory" property).
 	 * <p><b>WARNING:</b> When using a transaction-aware JDBC DataSource in combination
 	 * with OpenSessionInViewFilter/Interceptor, whether participating in JTA or
@@ -147,17 +147,17 @@ public abstract class AbstractSessionFactoryBean extends HibernateExceptionTrans
 
 	/**
 	 * Set whether to expose a transaction-aware current Session from the
-	 * SessionFactory's <code>getCurrentSession()</code> method, returning the
+	 * SessionFactory's {@code getCurrentSession()} method, returning the
 	 * Session that's associated with the current Spring-managed transaction, if any.
 	 * <p>Default is "true", letting data access code work with the plain
-	 * Hibernate SessionFactory and its <code>getCurrentSession()</code> method,
+	 * Hibernate SessionFactory and its {@code getCurrentSession()} method,
 	 * while still being able to participate in current Spring-managed transactions:
 	 * with any transaction management strategy, either local or JTA / EJB CMT,
 	 * and any transaction synchronization mechanism, either Spring or JTA.
-	 * Furthermore, <code>getCurrentSession()</code> will also seamlessly work with
+	 * Furthermore, {@code getCurrentSession()} will also seamlessly work with
 	 * a request-scoped Session managed by OpenSessionInViewFilter/Interceptor.
 	 * <p>Turn this flag off to expose the plain Hibernate SessionFactory with
-	 * Hibernate's default <code>getCurrentSession()</code> behavior, supporting
+	 * Hibernate's default {@code getCurrentSession()} behavior, supporting
 	 * plain JTA synchronization only. Alternatively, simply override the
 	 * corresponding Hibernate property "hibernate.current_session_context_class".
 	 * @see SpringSessionContext
@@ -206,7 +206,7 @@ public abstract class AbstractSessionFactoryBean extends HibernateExceptionTrans
 	/**
 	 * Return the exposed SessionFactory.
 	 * Will throw an exception if not initialized yet.
-	 * @return the SessionFactory (never <code>null</code>)
+	 * @return the SessionFactory (never {@code null})
 	 * @throws IllegalStateException if the SessionFactory has not been initialized yet
 	 */
 	protected final SessionFactory getSessionFactory() {
@@ -257,7 +257,7 @@ public abstract class AbstractSessionFactoryBean extends HibernateExceptionTrans
 	/**
 	 * Hook that allows post-processing after the SessionFactory has been
 	 * successfully created. The SessionFactory is already available through
-	 * <code>getSessionFactory()</code> at this point.
+	 * {@code getSessionFactory()} at this point.
 	 * <p>This implementation is empty.
 	 * @throws Exception in case of initialization failure
 	 * @see #getSessionFactory()
@@ -268,7 +268,7 @@ public abstract class AbstractSessionFactoryBean extends HibernateExceptionTrans
 	/**
 	 * Hook that allows shutdown processing before the SessionFactory
 	 * will be closed. The SessionFactory is still available through
-	 * <code>getSessionFactory()</code> at this point.
+	 * {@code getSessionFactory()} at this point.
 	 * <p>This implementation is empty.
 	 * @see #getSessionFactory()
 	 */
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 65b9dd2152..79403bcf45 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
@@ -194,7 +194,7 @@ public abstract class HibernateAccessor implements InitializingBean, BeanFactory
 	}
 
 	/**
-	 * Return the current Hibernate entity interceptor, or <code>null</code> if none.
+	 * Return the current Hibernate entity interceptor, or {@code null} if none.
 	 * Resolves an entity interceptor bean name via the bean factory,
 	 * if necessary.
 	 * @throws IllegalStateException if bean name specified but no bean factory set
@@ -322,7 +322,7 @@ public abstract class HibernateAccessor implements InitializingBean, BeanFactory
 	 * @param session the current Hibernate Session
 	 * @param existingTransaction if executing within an existing transaction
 	 * @return the previous flush mode to restore after the operation,
-	 * or <code>null</code> if none
+	 * or {@code null} if none
 	 * @see #setFlushMode
 	 * @see org.hibernate.Session#setFlushMode
 	 */
@@ -394,7 +394,7 @@ public abstract class HibernateAccessor implements InitializingBean, BeanFactory
 
 	/**
 	 * Convert the given HibernateException to an appropriate exception
-	 * from the <code>org.springframework.dao</code> hierarchy.
+	 * from the {@code org.springframework.dao} hierarchy.
 	 * <p>Will automatically apply a specified SQLExceptionTranslator to a
 	 * Hibernate JDBCException, else rely on Hibernate's default translation.
 	 * @param ex HibernateException that occured
@@ -414,7 +414,7 @@ public abstract class HibernateAccessor implements InitializingBean, BeanFactory
 
 	/**
 	 * Convert the given Hibernate JDBCException to an appropriate exception
-	 * from the <code>org.springframework.dao</code> hierarchy, using the
+	 * from the {@code org.springframework.dao} hierarchy, using the
 	 * given SQLExceptionTranslator.
 	 * @param ex Hibernate JDBCException that occured
 	 * @param translator the SQLExceptionTranslator to use
@@ -426,9 +426,9 @@ public abstract class HibernateAccessor implements InitializingBean, BeanFactory
 
 	/**
 	 * Convert the given SQLException to an appropriate exception from the
-	 * <code>org.springframework.dao</code> hierarchy. Can be overridden in subclasses.
+	 * {@code org.springframework.dao} hierarchy. Can be overridden in subclasses.
 	 * <p>Note that a direct SQLException can just occur when callback code
-	 * performs direct JDBC access via <code>Session.connection()</code>.
+	 * performs direct JDBC access via {@code Session.connection()}.
 	 * @param ex the SQLException
 	 * @return the corresponding DataAccessException instance
 	 * @see #setJdbcExceptionTranslator
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java
index 524b84da55..dd3b144bd3 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java
@@ -24,9 +24,9 @@ import org.hibernate.Session;
 /**
  * Callback interface for Hibernate code. To be used with {@link HibernateTemplate}'s
  * execution methods, often as anonymous classes within a method implementation.
- * A typical implementation will call <code>Session.load/find/update</code> to perform
+ * A typical implementation will call {@code Session.load/find/update} to perform
  * some operations on persistent objects. It can also perform direct JDBC operations
- * via Hibernate's <code>Session.connection()</code>, operating on a JDBC Connection.
+ * via Hibernate's {@code Session.connection()}, operating on a JDBC Connection.
  *
  * <p>Note that Hibernate works on unmodified plain Java objects, performing dirty
  * detection via copies made at load time. Returned objects can thus be used outside
@@ -44,9 +44,9 @@ import org.hibernate.Session;
 public interface HibernateCallback<T> {
 
 	/**
-	 * Gets called by <code>HibernateTemplate.execute</code> with an active
-	 * Hibernate <code>Session</code>. Does not need to care about activating
-	 * or closing the <code>Session</code>, or handling transactions.
+	 * Gets called by {@code HibernateTemplate.execute} with an active
+	 * Hibernate {@code Session}. Does not need to care about activating
+	 * or closing the {@code Session}, or handling transactions.
 	 *
 	 * <p>If called without a thread-bound Hibernate transaction (initiated
 	 * by HibernateTransactionManager), the code will simply get executed on the
@@ -60,7 +60,7 @@ public interface HibernateCallback<T> {
 	 * It gets propagated to the caller of the template.
 	 *
 	 * @param session active Hibernate session
-	 * @return a result object, or <code>null</code> if none
+	 * @return a result object, or {@code null} if none
 	 * @throws HibernateException if thrown by the Hibernate API
 	 * @throws SQLException if thrown by Hibernate-exposed JDBC API
 	 * @see HibernateTemplate#execute
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 d53bee1540..1cd28725b7 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
@@ -32,8 +32,8 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * participates in it.
  *
  * <p>Application code must retrieve a Hibernate Session via the
- * <code>SessionFactoryUtils.getSession</code> method or - preferably -
- * Hibernate's own <code>SessionFactory.getCurrentSession()</code> method, to be
+ * {@code SessionFactoryUtils.getSession} method or - preferably -
+ * 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>
@@ -44,9 +44,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * }</pre>
  *
  * Note that this interceptor automatically translates HibernateExceptions,
- * via delegating to the <code>SessionFactoryUtils.convertHibernateAccessException</code>
+ * via delegating to the {@code SessionFactoryUtils.convertHibernateAccessException}
  * method that converts them to exceptions that are compatible with the
- * <code>org.springframework.dao</code> exception hierarchy (like HibernateTemplate does).
+ * {@code org.springframework.dao} exception hierarchy (like HibernateTemplate does).
  * This can be turned off if the raw exceptions are preferred.
  *
  * <p>This class can be considered a declarative alternative to HibernateTemplate's
@@ -76,7 +76,7 @@ public class HibernateInterceptor extends HibernateAccessor implements MethodInt
 
 	/**
 	 * Set whether to convert any HibernateException raised to a Spring DataAccessException,
-	 * compatible with the <code>org.springframework.dao</code> exception hierarchy.
+	 * compatible with the {@code org.springframework.dao} exception hierarchy.
 	 * <p>Default is "true". Turn this flag off to let the caller receive raw exceptions
 	 * as-is, without any wrapping.
 	 * @see org.springframework.dao.DataAccessException
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 2bf551c381..ac627de205 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
@@ -33,26 +33,26 @@ import org.springframework.dao.DataAccessException;
  * implemented by {@link HibernateTemplate}. Not often used, but a useful
  * option to enhance testability, as it can easily be mocked or stubbed.
  *
- * <p>Defines <code>HibernateTemplate</code>'s data access methods that
+ * <p>Defines {@code HibernateTemplate}'s data access methods that
  * mirror various {@link org.hibernate.Session} methods. Users are
- * strongly encouraged to read the Hibernate <code>Session</code> javadocs
+ * strongly encouraged to read the Hibernate {@code Session} javadocs
  * for details on the semantics of those methods.
  *
  * <p>Note that operations that return an {@link java.util.Iterator} (i.e.
- * <code>iterate(..)</code>) are supposed to be used within Spring-driven
+ * {@code iterate(..)}) are supposed to be used within Spring-driven
  * or JTA-driven transactions (with {@link HibernateTransactionManager},
  * {@link org.springframework.transaction.jta.JtaTransactionManager},
- * or EJB CMT). Else, the <code>Iterator</code> won't be able to read
+ * or EJB CMT). Else, the {@code Iterator} won't be able to read
  * results from its {@link java.sql.ResultSet} anymore, as the underlying
- * Hibernate <code>Session</code> will already have been closed.
+ * Hibernate {@code Session} will already have been closed.
  *
  * <p>Note that lazy loading will just work with an open Hibernate
- * <code>Session</code>, either within a transaction or within
+ * {@code Session}, either within a transaction or within
  * {@link org.springframework.orm.hibernate3.support.OpenSessionInViewFilter}/
  * {@link org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor}.
  * Furthermore, some operations just make sense within transactions,
- * for example: <code>contains</code>, <code>evict</code>, <code>lock</code>,
- * <code>flush</code>, <code>clear</code>.
+ * for example: {@code contains}, {@code evict}, {@code lock},
+ * {@code flush}, {@code clear}.
  *
  * @author Juergen Hoeller
  * @since 1.2
@@ -75,10 +75,10 @@ public interface HibernateOperations {
 	 * <p>Note: Callback code is not supposed to handle transactions itself!
 	 * Use an appropriate transaction manager like
 	 * {@link HibernateTransactionManager}. Generally, callback code must not
-	 * touch any <code>Session</code> lifecycle methods, like close,
+	 * touch any {@code Session} lifecycle methods, like close,
 	 * disconnect, or reconnect, to let the template do its work.
 	 * @param action callback object that specifies the Hibernate action
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
 	 * @see HibernateTransactionManager
 	 * @see org.hibernate.Session
@@ -91,7 +91,7 @@ public interface HibernateOperations {
 	 * <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
-	 * @return a List result returned by the action, or <code>null</code>
+	 * @return a List result returned by the action, or {@code null}
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
 	 */
 	List executeFind(HibernateCallback<?> action) throws DataAccessException;
@@ -103,14 +103,14 @@ public interface HibernateOperations {
 
 	/**
 	 * Return the persistent instance of the given entity class
-	 * with the given identifier, or <code>null</code> if not found.
+	 * with the given identifier, or {@code null} if not found.
 	 * <p>This method is a thin wrapper around
 	 * {@link org.hibernate.Session#get(Class, java.io.Serializable)} for convenience.
 	 * For an explanation of the exact semantics of this method, please do refer to
 	 * the Hibernate API documentation in the first instance.
 	 * @param entityClass a persistent class
 	 * @param id the identifier of the persistent instance
-	 * @return the persistent instance, or <code>null</code> if not found
+	 * @return the persistent instance, or {@code null} if not found
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
 	 * @see org.hibernate.Session#get(Class, java.io.Serializable)
 	 */
@@ -118,7 +118,7 @@ public interface HibernateOperations {
 
 	/**
 	 * Return the persistent instance of the given entity class
-	 * with the given identifier, or <code>null</code> if not found.
+	 * with the given identifier, or {@code null} if not found.
 	 * <p>Obtains the specified lock mode if the instance exists.
 	 * <p>This method is a thin wrapper around
 	 * {@link org.hibernate.Session#get(Class, java.io.Serializable, LockMode)} for convenience.
@@ -127,7 +127,7 @@ public interface HibernateOperations {
 	 * @param entityClass a persistent class
 	 * @param id the identifier of the persistent instance
 	 * @param lockMode the lock mode to obtain
-	 * @return the persistent instance, or <code>null</code> if not found
+	 * @return the persistent instance, or {@code null} if not found
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
 	 * @see org.hibernate.Session#get(Class, java.io.Serializable, org.hibernate.LockMode)
 	 */
@@ -136,14 +136,14 @@ public interface HibernateOperations {
 
 	/**
 	 * Return the persistent instance of the given entity class
-	 * with the given identifier, or <code>null</code> if not found.
+	 * with the given identifier, or {@code null} if not found.
 	 * <p>This method is a thin wrapper around
 	 * {@link org.hibernate.Session#get(String, java.io.Serializable)} for convenience.
 	 * For an explanation of the exact semantics of this method, please do refer to
 	 * the Hibernate API documentation in the first instance.
 	 * @param entityName the name of the persistent entity
 	 * @param id the identifier of the persistent instance
-	 * @return the persistent instance, or <code>null</code> if not found
+	 * @return the persistent instance, or {@code null} if not found
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
 	 * @see org.hibernate.Session#get(Class, java.io.Serializable)
 	 */
@@ -151,7 +151,7 @@ public interface HibernateOperations {
 
 	/**
 	 * Return the persistent instance of the given entity class
-	 * with the given identifier, or <code>null</code> if not found.
+	 * with the given identifier, or {@code null} if not found.
 	 * Obtains the specified lock mode if the instance exists.
 	 * <p>This method is a thin wrapper around
 	 * {@link org.hibernate.Session#get(String, java.io.Serializable, LockMode)} for convenience.
@@ -160,7 +160,7 @@ public interface HibernateOperations {
 	 * @param entityName the name of the persistent entity
 	 * @param id the identifier of the persistent instance
 	 * @param lockMode the lock mode to obtain
-	 * @return the persistent instance, or <code>null</code> if not found
+	 * @return the persistent instance, or {@code null} if not found
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
 	 * @see org.hibernate.Session#get(Class, java.io.Serializable, org.hibernate.LockMode)
 	 */
@@ -308,9 +308,9 @@ public interface HibernateOperations {
 
 	/**
 	 * Return an enabled Hibernate {@link Filter} for the given filter name.
-	 * The returned <code>Filter</code> instance can be used to set filter parameters.
+	 * The returned {@code Filter} instance can be used to set filter parameters.
 	 * @param filterName the name of the filter
-	 * @return the enabled Hibernate <code>Filter</code> (either already
+	 * @return the enabled Hibernate {@code Filter} (either already
 	 * enabled or enabled on the fly by this operation)
 	 * @throws IllegalStateException if we are not running within a
 	 * transactional Session (in which case this operation does not make sense)
@@ -415,7 +415,7 @@ public interface HibernateOperations {
 	 * according to its id (matching the configured "unsaved-value"?).
 	 * Associates the instance with the current Hibernate {@link org.hibernate.Session}.
 	 * @param entity the persistent instance to save or update
-	 * (to be associated with the Hibernate <code>Session</code>)
+	 * (to be associated with the Hibernate {@code Session})
 	 * @throws DataAccessException in case of Hibernate errors
 	 * @see org.hibernate.Session#saveOrUpdate(Object)
 	 */
@@ -424,10 +424,10 @@ public interface HibernateOperations {
 	/**
 	 * Save or update the given persistent instance,
 	 * according to its id (matching the configured "unsaved-value"?).
-	 * Associates the instance with the current Hibernate <code>Session</code>.
+	 * Associates the instance with the current Hibernate {@code Session}.
 	 * @param entityName the name of the persistent entity
 	 * @param entity the persistent instance to save or update
-	 * (to be associated with the Hibernate <code>Session</code>)
+	 * (to be associated with the Hibernate {@code Session})
 	 * @throws DataAccessException in case of Hibernate errors
 	 * @see org.hibernate.Session#saveOrUpdate(String, Object)
 	 */
@@ -436,12 +436,12 @@ public interface HibernateOperations {
 	/**
 	 * Save or update all given persistent instances,
 	 * according to its id (matching the configured "unsaved-value"?).
-	 * Associates the instances with the current Hibernate <code>Session</code>.
+	 * Associates the instances with the current Hibernate {@code Session}.
 	 * @param entities the persistent instances to save or update
-	 * (to be associated with the Hibernate <code>Session</code>)
+	 * (to be associated with the Hibernate {@code Session})
 	 * @throws DataAccessException in case of Hibernate errors
 	 * @deprecated as of Spring 2.5, in favor of individual
-	 * <code>saveOrUpdate</code> or <code>merge</code> usage
+	 * {@code saveOrUpdate} or {@code merge} usage
 	 */
 	@Deprecated
 	void saveOrUpdateAll(Collection entities) throws DataAccessException;
@@ -469,7 +469,7 @@ public interface HibernateOperations {
 
 	/**
 	 * Persist the given transient instance. Follows JSR-220 semantics.
-	 * <p>Similar to <code>save</code>, associating the given object
+	 * <p>Similar to {@code save}, associating the given object
 	 * with the current Hibernate {@link org.hibernate.Session}.
 	 * @param entity the persistent instance to persist
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
@@ -480,7 +480,7 @@ public interface HibernateOperations {
 
 	/**
 	 * Persist the given transient instance. Follows JSR-220 semantics.
-	 * <p>Similar to <code>save</code>, associating the given object
+	 * <p>Similar to {@code save}, associating the given object
 	 * with the current Hibernate {@link org.hibernate.Session}.
 	 * @param entityName the name of the persistent entity
 	 * @param entity the persistent instance to persist
@@ -493,12 +493,12 @@ public interface HibernateOperations {
 	/**
 	 * Copy the state of the given object onto the persistent object
 	 * with the same identifier. Follows JSR-220 semantics.
-	 * <p>Similar to <code>saveOrUpdate</code>, but never associates the given
+	 * <p>Similar to {@code saveOrUpdate}, but never associates the given
 	 * object with the current Hibernate Session. In case of a new entity,
 	 * the state will be copied over as well.
-	 * <p>Note that <code>merge</code> will <i>not</i> update the identifiers
+	 * <p>Note that {@code merge} will <i>not</i> update the identifiers
 	 * in the passed-in object graph (in contrast to TopLink)! Consider
-	 * registering Spring's <code>IdTransferringMergeEventListener</code> if
+	 * registering Spring's {@code IdTransferringMergeEventListener} if
 	 * you would like to have newly assigned ids transferred to the original
 	 * object graph too.
 	 * @param entity the object to merge with the corresponding persistence instance
@@ -513,12 +513,12 @@ public interface HibernateOperations {
 	/**
 	 * Copy the state of the given object onto the persistent object
 	 * with the same identifier. Follows JSR-220 semantics.
-	 * <p>Similar to <code>saveOrUpdate</code>, but never associates the given
+	 * <p>Similar to {@code saveOrUpdate}, but never associates the given
 	 * object with the current Hibernate {@link org.hibernate.Session}. In
 	 * the case of a new entity, the state will be copied over as well.
-	 * <p>Note that <code>merge</code> will <i>not</i> update the identifiers
+	 * <p>Note that {@code merge} will <i>not</i> update the identifiers
 	 * in the passed-in object graph (in contrast to TopLink)! Consider
-	 * registering Spring's <code>IdTransferringMergeEventListener</code>
+	 * registering Spring's {@code IdTransferringMergeEventListener}
 	 * if you would like to have newly assigned ids transferred to the
 	 * original object graph too.
 	 * @param entityName the name of the persistent entity
@@ -891,10 +891,10 @@ public interface HibernateOperations {
 
 	/**
 	 * Immediately close an {@link Iterator} created by any of the various
-	 * <code>iterate(..)</code> operations, instead of waiting until the
+	 * {@code iterate(..)} operations, instead of waiting until the
 	 * session is closed or disconnected.
-	 * @param it the <code>Iterator</code> to close
-	 * @throws DataAccessException if the <code>Iterator</code> could not be closed
+	 * @param it the {@code Iterator} to close
+	 * @throws DataAccessException if the {@code Iterator} could not be closed
 	 * @see org.hibernate.Hibernate#close
 	 */
 	void closeIterator(Iterator it) throws DataAccessException;
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
index f8f0408b40..6497a12ed3 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
@@ -23,7 +23,7 @@ import org.springframework.dao.UncategorizedDataAccessException;
 /**
  * Hibernate-specific subclass of UncategorizedDataAccessException,
  * for Hibernate system errors that do not match any concrete
- * <code>org.springframework.dao</code> exceptions.
+ * {@code org.springframework.dao} exceptions.
  *
  * @author Juergen Hoeller
  * @since 1.2
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 72962e4087..909161b863 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
@@ -49,9 +49,9 @@ import org.springframework.util.Assert;
 /**
  * Helper class that simplifies Hibernate data access code. Automatically
  * converts HibernateExceptions into DataAccessExceptions, following the
- * <code>org.springframework.dao</code> exception hierarchy.
+ * {@code org.springframework.dao} exception hierarchy.
  *
- * <p>The central method is <code>execute</code>, supporting Hibernate access code
+ * <p>The central method is {@code execute}, supporting Hibernate access code
  * implementing the {@link HibernateCallback} interface. It provides Hibernate Session
  * handling such that neither the HibernateCallback implementation nor the calling
  * code needs to explicitly care about retrieving/closing Hibernate Sessions,
@@ -70,7 +70,7 @@ import org.springframework.util.Assert;
  * instead, based on {@link org.hibernate.SessionFactory#getCurrentSession()}.</b>
  *
  * <p>This class can be considered as direct alternative to working with the raw
- * Hibernate3 Session API (through <code>SessionFactory.getCurrentSession()</code>).
+ * Hibernate3 Session API (through {@code SessionFactory.getCurrentSession()}).
  * The major advantage is its automatic conversion to DataAccessExceptions as well
  * as its capability to fall back to 'auto-commit' style behavior when used outside
  * of transactions. <b>Note that HibernateTemplate will perform its own Session
@@ -82,7 +82,7 @@ import org.springframework.util.Assert;
  * The Spring application context will manage its lifecycle, initializing and
  * shutting down the factory as part of the application.
  *
- * <p>Note that operations that return an Iterator (i.e. <code>iterate</code>)
+ * <p>Note that operations that return an Iterator (i.e. {@code iterate})
  * are supposed to be used within Spring-driven or JTA-driven transactions
  * (with HibernateTransactionManager, JtaTransactionManager, or EJB CMT).
  * Else, the Iterator won't be able to read results from its ResultSet anymore,
@@ -91,8 +91,8 @@ import org.springframework.util.Assert;
  * <p>Lazy loading will also just work with an open Hibernate Session,
  * either within a transaction or within OpenSessionInViewFilter/Interceptor.
  * Furthermore, some operations just make sense within transactions,
- * for example: <code>contains</code>, <code>evict</code>, <code>lock</code>,
- * <code>flush</code>, <code>clear</code>.
+ * for example: {@code contains}, {@code evict}, {@code lock},
+ * {@code flush}, {@code clear}.
  *
  * @author Juergen Hoeller
  * @since 1.2
@@ -154,22 +154,22 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 
 	/**
 	 * Set if a new {@link Session} should be created when no transactional
-	 * <code>Session</code> can be found for the current thread.
-	 * The default value is <code>true</code>.
-	 * <p><code>HibernateTemplate</code> is aware of a corresponding
-	 * <code>Session</code> bound to the current thread, for example when using
-	 * {@link HibernateTransactionManager}. If <code>allowCreate</code> is
-	 * <code>true</code>, a new non-transactional <code>Session</code> will be
+	 * {@code Session} can be found for the current thread.
+	 * The default value is {@code true}.
+	 * <p>{@code HibernateTemplate} is aware of a corresponding
+	 * {@code Session} bound to the current thread, for example when using
+	 * {@link HibernateTransactionManager}. If {@code allowCreate} is
+	 * {@code true}, a new non-transactional {@code Session} will be
 	 * created if none is found, which needs to be closed at the end of the operation.
-	 * If <code>false</code>, an {@link IllegalStateException} will get thrown in
+	 * If {@code false}, an {@link IllegalStateException} will get thrown in
 	 * this case.
-	 * <p><b>NOTE: As of Spring 2.5, switching <code>allowCreate</code>
-	 * to <code>false</code> will delegate to Hibernate's
+	 * <p><b>NOTE: As of Spring 2.5, switching {@code allowCreate}
+	 * to {@code false} will delegate to Hibernate's
 	 * {@link org.hibernate.SessionFactory#getCurrentSession()} method,</b>
 	 * which - with Spring-based setup - will by default delegate to Spring's
-	 * <code>SessionFactoryUtils.getSession(sessionFactory, false)</code>.
+	 * {@code SessionFactoryUtils.getSession(sessionFactory, false)}.
 	 * This mode also allows for custom Hibernate CurrentSessionContext strategies
-	 * to be plugged in, whereas <code>allowCreate</code> set to <code>true</code>
+	 * to be plugged in, whereas {@code allowCreate} set to {@code true}
 	 * will always use a Spring-managed Hibernate Session.
 	 * @see SessionFactoryUtils#getSession(SessionFactory, boolean)
 	 */
@@ -211,7 +211,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	 * Set whether to expose the native Hibernate Session to
 	 * HibernateCallback code.
 	 * <p>Default is "false": a Session proxy will be returned, suppressing
-	 * <code>close</code> calls and automatically applying query cache
+	 * {@code close} calls and automatically applying query cache
 	 * settings and transaction timeouts.
 	 * @see HibernateCallback
 	 * @see org.hibernate.Session
@@ -354,7 +354,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	 * <p>This execute variant overrides the template-wide
 	 * {@link #isAlwaysUseNewSession() "alwaysUseNewSession"} setting.
 	 * @param action callback object that specifies the Hibernate action
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
 	 */
 	public <T> T executeWithNewSession(HibernateCallback<T> action) {
@@ -367,7 +367,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	 * <p>This execute variant overrides the template-wide
 	 * {@link #isExposeNativeSession() "exposeNativeSession"} setting.
 	 * @param action callback object that specifies the Hibernate action
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
 	 */
 	public <T> T executeWithNativeSession(HibernateCallback<T> action) {
@@ -381,7 +381,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	 * even if there is a pre-bound transactional Session
 	 * @param enforceNativeSession whether to enforce exposure of the native
 	 * Hibernate Session to callback code
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws org.springframework.dao.DataAccessException in case of Hibernate errors
 	 */
 	protected <T> T doExecute(HibernateCallback<T> action, boolean enforceNewSession, boolean enforceNativeSession)
@@ -443,7 +443,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	 * JDBC Connection as a transactional Session, if applicable), a pre-bound
 	 * Session in case of "allowCreate" turned off, and a pre-bound or new Session
 	 * otherwise (new only if no transactional or otherwise pre-bound Session exists).
-	 * @return the Session to use (never <code>null</code>)
+	 * @return the Session to use (never {@code null})
 	 * @see SessionFactoryUtils#getSession
 	 * @see SessionFactoryUtils#getNewSession
 	 * @see #setAlwaysUseNewSession
@@ -1160,7 +1160,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	/**
 	 * Check whether write operations are allowed on the given Session.
 	 * <p>Default implementation throws an InvalidDataAccessApiUsageException in
-	 * case of <code>FlushMode.MANUAL</code>. Can be overridden in subclasses.
+	 * case of {@code FlushMode.MANUAL}. Can be overridden in subclasses.
 	 * @param session current Hibernate Session
 	 * @throws InvalidDataAccessApiUsageException if write operations are not allowed
 	 * @see #setCheckWriteOperations
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 66d38bde67..94fd197e00 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
@@ -59,7 +59,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * allowing for one thread-bound Session per factory. {@link SessionFactoryUtils}
  * and {@link HibernateTemplate} are aware of thread-bound Sessions and participate
  * in such transactions automatically. Using either of those or going through
- * <code>SessionFactory.getCurrentSession()</code> is required for Hibernate
+ * {@code SessionFactory.getCurrentSession()} is required for Hibernate
  * access code that needs to support this transaction handling mechanism.
  *
  * <p>Supports custom isolation levels, and timeouts that get applied as
@@ -234,7 +234,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 
 	/**
 	 * Set whether to autodetect a JDBC DataSource used by the Hibernate SessionFactory,
-	 * if set via LocalSessionFactoryBean's <code>setDataSource</code>. Default is "true".
+	 * if set via LocalSessionFactoryBean's {@code setDataSource}. Default is "true".
 	 * <p>Can be turned off to deliberately ignore an available DataSource, in order
 	 * to not expose Hibernate transactions as JDBC transactions for that DataSource.
 	 * @see #setDataSource
@@ -251,7 +251,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 	 * JDBC Connection.
 	 * <p>Default is "true". If you turn this flag off, the transaction manager
 	 * will not support per-transaction isolation levels anymore. It will not
-	 * call <code>Connection.setReadOnly(true)</code> for read-only transactions
+	 * call {@code Connection.setReadOnly(true)} for read-only transactions
 	 * anymore either. If this flag is turned off, no cleanup of a JDBC Connection
 	 * is required after a transaction, since no Connection settings will get modified.
 	 * @see java.sql.Connection#setTransactionIsolation
@@ -274,14 +274,14 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 	 * <p>Switch this flag to "true" in order to enforce use of a Hibernate-managed Session.
 	 * Note that this requires {@link org.hibernate.SessionFactory#getCurrentSession()}
 	 * to always return a proper Session when called for a Spring-managed transaction;
-	 * transaction begin will fail if the <code>getCurrentSession()</code> call fails.
+	 * transaction begin will fail if the {@code getCurrentSession()} call fails.
 	 * <p>This mode will typically be used in combination with a custom Hibernate
 	 * {@link org.hibernate.context.CurrentSessionContext} implementation that stores
 	 * Sessions in a place other than Spring's TransactionSynchronizationManager.
 	 * It may also be used in combination with Spring's Open-Session-in-View support
 	 * (using Spring's default {@link SpringSessionContext}), in which case it subtly
 	 * differs from the Spring-managed Session mode: The pre-bound Session will <i>not</i>
-	 * receive a <code>clear()</code> call (on rollback) or a <code>disconnect()</code>
+	 * receive a {@code clear()} call (on rollback) or a {@code disconnect()}
 	 * call (on transaction completion) in such a scenario; this is rather left up
 	 * to a custom CurrentSessionContext implementation (if desired).
 	 */
@@ -295,7 +295,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 	 * commit step. Switch this to "true" in order to enforce an explicit early
 	 * flush right <i>before</i> the actual commit step.
 	 * <p>An early flush happens before the before-commit synchronization phase,
-	 * making flushed state visible to <code>beforeCommit</code> callbacks of registered
+	 * making flushed state visible to {@code beforeCommit} callbacks of registered
 	 * {@link org.springframework.transaction.support.TransactionSynchronization}
 	 * objects. Such explicit flush behavior is consistent with Spring-driven
 	 * flushing in a JTA transaction environment, so may also get enforced for
@@ -342,7 +342,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 	}
 
 	/**
-	 * Return the current Hibernate entity interceptor, or <code>null</code> if none.
+	 * Return the current Hibernate entity interceptor, or {@code null} if none.
 	 * Resolves an entity interceptor bean name via the bean factory,
 	 * if necessary.
 	 * @throws IllegalStateException if bean name specified but no bean factory set
@@ -758,7 +758,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 	 * <p>Default implementation checks the Session's connection release mode
 	 * to be "on_close". Unfortunately, this requires casting to SessionImpl,
 	 * as of Hibernate 3.1. If that cast doesn't work, we'll simply assume
-	 * we're safe and return <code>true</code>.
+	 * we're safe and return {@code true}.
 	 * @param session the Hibernate Session to check
 	 * @see org.hibernate.impl.SessionImpl#getConnectionReleaseMode()
 	 * @see org.hibernate.ConnectionReleaseMode#ON_CLOSE
@@ -775,7 +775,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 
 	/**
 	 * Convert the given HibernateException to an appropriate exception
-	 * from the <code>org.springframework.dao</code> hierarchy.
+	 * from the {@code org.springframework.dao} hierarchy.
 	 * <p>Will automatically apply a specified SQLExceptionTranslator to a
 	 * Hibernate JDBCException, else rely on Hibernate's default translation.
 	 * @param ex HibernateException that occured
@@ -795,7 +795,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 
 	/**
 	 * Convert the given Hibernate JDBCException to an appropriate exception
-	 * from the <code>org.springframework.dao</code> hierarchy, using the
+	 * from the {@code org.springframework.dao} hierarchy, using the
 	 * given SQLExceptionTranslator.
 	 * @param ex Hibernate JDBCException that occured
 	 * @param translator the SQLExceptionTranslator to use
@@ -899,7 +899,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 
 	/**
 	 * Holder for suspended resources.
-	 * Used internally by <code>doSuspend</code> and <code>doResume</code>.
+	 * Used internally by {@code doSuspend} and {@code doResume}.
 	 */
 	private static class SuspendedResourcesHolder {
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java
index 3f97a1d7b9..43d4264ff8 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java
@@ -110,7 +110,7 @@ public class LocalDataSourceConnectionProvider implements ConnectionProvider {
 	}
 
 	/**
-	 * This implementation returns <code>false</code>: We cannot guarantee
+	 * This implementation returns {@code false}: We cannot guarantee
 	 * to receive the same Connection within a transaction, not even when
 	 * dealing with a JNDI DataSource.
 	 */
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java
index b2da29349e..31d069a988 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java
@@ -27,7 +27,7 @@ package org.springframework.orm.hibernate3;
 public class LocalJtaDataSourceConnectionProvider extends LocalDataSourceConnectionProvider {
 
 	/**
-	 * This implementation returns <code>true</code>,
+	 * This implementation returns {@code true},
 	 * since we're assuming a JTA DataSource.
 	 */
 	@Override
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 86fd204884..9310853b6e 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
@@ -79,11 +79,11 @@ import org.springframework.util.StringUtils;
  *
  * <p>This factory bean will by default expose a transaction-aware SessionFactory
  * proxy, letting data access code work with the plain Hibernate SessionFactory
- * and its <code>getCurrentSession()</code> method, while still being able to
+ * and its {@code getCurrentSession()} method, while still being able to
  * participate in current Spring-managed transactions: with any transaction
  * management strategy, either local or JTA / EJB CMT, and any transaction
  * synchronization mechanism, either Spring or JTA. Furthermore,
- * <code>getCurrentSession()</code> will also seamlessly work with
+ * {@code getCurrentSession()} will also seamlessly work with
  * a request-scoped Session managed by
  * {@link org.springframework.orm.hibernate3.support.OpenSessionInViewFilter} /
  * {@link org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor}.
@@ -384,7 +384,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 	 * <p>As of Hibernate 3.3, this is the preferred mechanism for configuring
 	 * caches, superseding the {@link #setCacheProvider CacheProvider SPI}.
 	 * For Hibernate 3.2 compatibility purposes, the accepted reference is of type
-	 * Object: the actual type is <code>org.hibernate.cache.RegionFactory</code>.
+	 * Object: the actual type is {@code org.hibernate.cache.RegionFactory}.
 	 * <p>Note: If this is set, the Hibernate settings should not define a
 	 * cache provider to avoid meaningless double configuration.
 	 * @see org.hibernate.cache.RegionFactory
@@ -825,7 +825,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 	 * To be implemented by subclasses that want to to register further mappings
 	 * on the Configuration object after this FactoryBean registered its specified
 	 * mappings.
-	 * <p>Invoked <i>before</i> the <code>Configuration.buildMappings()</code> call,
+	 * <p>Invoked <i>before</i> the {@code Configuration.buildMappings()} call,
 	 * so that it can still extend and modify the mapping information.
 	 * @param config the current Configuration object
 	 * @throws HibernateException in case of Hibernate initialization errors
@@ -838,7 +838,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 	 * To be implemented by subclasses that want to to perform custom
 	 * post-processing of the Configuration object after this FactoryBean
 	 * performed its default initialization.
-	 * <p>Invoked <i>after</i> the <code>Configuration.buildMappings()</code> call,
+	 * <p>Invoked <i>after</i> the {@code Configuration.buildMappings()} call,
 	 * so that it can operate on the completed and fully parsed mapping information.
 	 * @param config the current Configuration object
 	 * @throws HibernateException in case of Hibernate initialization errors
@@ -917,7 +917,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 	 * on application startup. Can also be invoked manually.
 	 * <p>Fetch the LocalSessionFactoryBean itself rather than the exposed
 	 * SessionFactory to be able to invoke this method, e.g. via
-	 * <code>LocalSessionFactoryBean lsfb = (LocalSessionFactoryBean) ctx.getBean("&mySessionFactory");</code>.
+	 * {@code LocalSessionFactoryBean lsfb = (LocalSessionFactoryBean) ctx.getBean("&mySessionFactory");}.
 	 * <p>Uses the SessionFactory that this bean generates for accessing a
 	 * JDBC connection to perform the script.
 	 * @throws DataAccessException in case of script execution errors
@@ -963,7 +963,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 	 * SchemaValidator class, to be invoked after application startup.
 	 * <p>Fetch the LocalSessionFactoryBean itself rather than the exposed
 	 * SessionFactory to be able to invoke this method, e.g. via
-	 * <code>LocalSessionFactoryBean lsfb = (LocalSessionFactoryBean) ctx.getBean("&mySessionFactory");</code>.
+	 * {@code LocalSessionFactoryBean lsfb = (LocalSessionFactoryBean) ctx.getBean("&mySessionFactory");}.
 	 * <p>Uses the SessionFactory that this bean generates for accessing a
 	 * JDBC connection to perform the script.
 	 * @throws DataAccessException in case of script execution errors
@@ -1007,7 +1007,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 	 * SchemaExport class, to be invoked on application setup.
 	 * <p>Fetch the LocalSessionFactoryBean itself rather than the exposed
 	 * SessionFactory to be able to invoke this method, e.g. via
-	 * <code>LocalSessionFactoryBean lsfb = (LocalSessionFactoryBean) ctx.getBean("&mySessionFactory");</code>.
+	 * {@code LocalSessionFactoryBean lsfb = (LocalSessionFactoryBean) ctx.getBean("&mySessionFactory");}.
 	 * <p>Uses the SessionFactory that this bean generates for accessing a
 	 * JDBC connection to perform the script.
 	 * @throws org.springframework.dao.DataAccessException in case of script execution errors
@@ -1038,7 +1038,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 	 * SchemaExport class, to be invoked on application setup.
 	 * <p>Fetch the LocalSessionFactoryBean itself rather than the exposed
 	 * SessionFactory to be able to invoke this method, e.g. via
-	 * <code>LocalSessionFactoryBean lsfb = (LocalSessionFactoryBean) ctx.getBean("&mySessionFactory");</code>.
+	 * {@code LocalSessionFactoryBean lsfb = (LocalSessionFactoryBean) ctx.getBean("&mySessionFactory");}.
 	 * <p>Uses the SessionFactory that this bean generates for accessing a
 	 * JDBC connection to perform the script.
 	 * @throws DataAccessException in case of script execution errors
@@ -1078,7 +1078,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 	/**
 	 * Execute the given schema script on the given JDBC Connection.
 	 * <p>Note that the default implementation will log unsuccessful statements
-	 * and continue to execute. Override the <code>executeSchemaStatement</code>
+	 * and continue to execute. Override the {@code executeSchemaStatement}
 	 * method to treat failures differently.
 	 * @param con the JDBC Connection to execute the script on
 	 * @param sql the SQL statements to execute
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 73aeefdd1f..49c49a6976 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
@@ -99,7 +99,7 @@ public abstract class SessionFactoryUtils {
 
 	/**
 	 * Order value for TransactionSynchronization objects that clean up Hibernate Sessions.
-	 * Returns <code>DataSourceUtils.CONNECTION_SYNCHRONIZATION_ORDER - 100</code>
+	 * Returns {@code DataSourceUtils.CONNECTION_SYNCHRONIZATION_ORDER - 100}
 	 * to execute Session cleanup before JDBC Connection cleanup, if any.
 	 * @see org.springframework.jdbc.datasource.DataSourceUtils#CONNECTION_SYNCHRONIZATION_ORDER
 	 */
@@ -115,7 +115,7 @@ public abstract class SessionFactoryUtils {
 	/**
 	 * Determine the DataSource of the given SessionFactory.
 	 * @param sessionFactory the SessionFactory to check
-	 * @return the DataSource, or <code>null</code> if none found
+	 * @return the DataSource, or {@code null} if none found
 	 * @see org.hibernate.engine.SessionFactoryImplementor#getConnectionProvider
 	 * @see LocalDataSourceConnectionProvider
 	 */
@@ -153,7 +153,7 @@ public abstract class SessionFactoryUtils {
 	 * SessionFactoryImplementor (the usual case), falling back to the
 	 * SessionFactory reference that the Session itself carries.
 	 * @param sessionFactory Hibernate SessionFactory
-	 * @param session Hibernate Session (can also be <code>null</code>)
+	 * @param session Hibernate Session (can also be {@code null})
 	 * @return the JTA TransactionManager, if any
 	 * @see javax.transaction.TransactionManager
 	 * @see SessionFactoryImplementor#getTransactionManager
@@ -179,9 +179,9 @@ public abstract class SessionFactoryUtils {
 	 * Get a Hibernate Session for the given SessionFactory. Is aware of and will
 	 * return any existing corresponding Session bound to the current thread, for
 	 * example when using {@link HibernateTransactionManager}. Will create a new
-	 * Session otherwise, if "allowCreate" is <code>true</code>.
-	 * <p>This is the <code>getSession</code> method used by typical data access code,
-	 * in combination with <code>releaseSession</code> called when done with
+	 * Session otherwise, if "allowCreate" is {@code true}.
+	 * <p>This is the {@code getSession} method used by typical data access code,
+	 * in combination with {@code releaseSession} called when done with
 	 * the Session. Note that HibernateTemplate allows to write data access code
 	 * without caring about such resource handling.
 	 * @param sessionFactory Hibernate SessionFactory to create the session with
@@ -190,7 +190,7 @@ public abstract class SessionFactoryUtils {
 	 * @return the Hibernate Session
 	 * @throws DataAccessResourceFailureException if the Session couldn't be created
 	 * @throws IllegalStateException if no thread-bound Session found and
-	 * "allowCreate" is <code>false</code>
+	 * "allowCreate" is {@code false}
 	 * @see #getSession(SessionFactory, Interceptor, SQLExceptionTranslator)
 	 * @see #releaseSession
 	 * @see HibernateTemplate
@@ -217,9 +217,9 @@ public abstract class SessionFactoryUtils {
 	 * (i.e. on LocalSessionFactoryBean), on HibernateTransactionManager, or on
 	 * HibernateInterceptor/HibernateTemplate.
 	 * @param sessionFactory Hibernate SessionFactory to create the session with
-	 * @param entityInterceptor Hibernate entity interceptor, or <code>null</code> if none
+	 * @param entityInterceptor Hibernate entity interceptor, or {@code null} if none
 	 * @param jdbcExceptionTranslator SQLExcepionTranslator to use for flushing the
-	 * Session on transaction synchronization (may be <code>null</code>; only used
+	 * Session on transaction synchronization (may be {@code null}; only used
 	 * when actually registering a transaction synchronization)
 	 * @return the Hibernate Session
 	 * @throws DataAccessResourceFailureException if the Session couldn't be created
@@ -243,7 +243,7 @@ public abstract class SessionFactoryUtils {
 	 * Get a Hibernate Session for the given SessionFactory. Is aware of and will
 	 * return any existing corresponding Session bound to the current thread, for
 	 * example when using {@link HibernateTransactionManager}. Will create a new
-	 * Session otherwise, if "allowCreate" is <code>true</code>.
+	 * Session otherwise, if "allowCreate" is {@code true}.
 	 * <p>Throws the original HibernateException, in contrast to {@link #getSession}.
 	 * @param sessionFactory Hibernate SessionFactory to create the session with
 	 * @param allowCreate whether a non-transactional Session should be created
@@ -262,18 +262,18 @@ public abstract class SessionFactoryUtils {
 	 * Get a Hibernate Session for the given SessionFactory. Is aware of and will
 	 * return any existing corresponding Session bound to the current thread, for
 	 * example when using {@link HibernateTransactionManager}. Will create a new
-	 * Session otherwise, if "allowCreate" is <code>true</code>.
+	 * Session otherwise, if "allowCreate" is {@code true}.
 	 * <p>Same as {@link #getSession}, but throwing the original HibernateException.
 	 * @param sessionFactory Hibernate SessionFactory to create the session with
-	 * @param entityInterceptor Hibernate entity interceptor, or <code>null</code> if none
+	 * @param entityInterceptor Hibernate entity interceptor, or {@code null} if none
 	 * @param jdbcExceptionTranslator SQLExcepionTranslator to use for flushing the
-	 * Session on transaction synchronization (may be <code>null</code>)
+	 * Session on transaction synchronization (may be {@code null})
 	 * @param allowCreate whether a non-transactional Session should be created
 	 * when no transactional Session can be found for the current thread
 	 * @return the Hibernate Session
 	 * @throws HibernateException if the Session couldn't be created
 	 * @throws IllegalStateException if no thread-bound Session found and
-	 * "allowCreate" is <code>false</code>
+	 * "allowCreate" is {@code false}
 	 */
 	private static Session doGetSession(
 			SessionFactory sessionFactory, Interceptor entityInterceptor,
@@ -366,7 +366,7 @@ public abstract class SessionFactoryUtils {
 	 * @param sessionHolder the SessionHolder to check
 	 * @param sessionFactory the SessionFactory to get the JTA TransactionManager from
 	 * @param jdbcExceptionTranslator SQLExcepionTranslator to use for flushing the
-	 * Session on transaction synchronization (may be <code>null</code>)
+	 * Session on transaction synchronization (may be {@code null})
 	 * @return the associated Session, if any
 	 * @throws DataAccessResourceFailureException if the Session couldn't be created
 	 */
@@ -438,7 +438,7 @@ public abstract class SessionFactoryUtils {
 	 * @param session the Session to register
 	 * @param sessionFactory the SessionFactory that the Session was created with
 	 * @param jdbcExceptionTranslator SQLExcepionTranslator to use for flushing the
-	 * Session on transaction synchronization (may be <code>null</code>)
+	 * Session on transaction synchronization (may be {@code null})
 	 */
 	private static void registerJtaSynchronization(Session session, SessionFactory sessionFactory,
 			SQLExceptionTranslator jdbcExceptionTranslator, SessionHolder sessionHolder) {
@@ -504,7 +504,7 @@ public abstract class SessionFactoryUtils {
 	 * that shares the transaction's JDBC Connection. More specifically,
 	 * it will use the same JDBC Connection as the pre-bound Hibernate Session.
 	 * @param sessionFactory Hibernate SessionFactory to create the session with
-	 * @param entityInterceptor Hibernate entity interceptor, or <code>null</code> if none
+	 * @param entityInterceptor Hibernate entity interceptor, or {@code null} if none
 	 * @return the new Session
 	 */
 	public static Session getNewSession(SessionFactory sessionFactory, Interceptor entityInterceptor) {
@@ -537,10 +537,10 @@ public abstract class SessionFactoryUtils {
 
 	/**
 	 * Stringify the given Session for debug logging.
-	 * Returns output equivalent to <code>Object.toString()</code>:
+	 * Returns output equivalent to {@code Object.toString()}:
 	 * the fully qualified class name + "@" + the identity hash code.
 	 * <p>The sole reason why this is necessary is because Hibernate3's
-	 * <code>Session.toString()</code> implementation is broken (and won't be fixed):
+	 * {@code Session.toString()} implementation is broken (and won't be fixed):
 	 * it logs the toString representation of all persistent objects in the Session,
 	 * which might lead to ConcurrentModificationExceptions if the persistent objects
 	 * in turn refer to the Session (for example, for lazy loading).
@@ -554,7 +554,7 @@ public abstract class SessionFactoryUtils {
 	/**
 	 * Return whether there is a transactional Hibernate Session for the current thread,
 	 * that is, a Session bound to the current thread by Spring's transaction facilities.
-	 * @param sessionFactory Hibernate SessionFactory to check (may be <code>null</code>)
+	 * @param sessionFactory Hibernate SessionFactory to check (may be {@code null})
 	 * @return whether there is a transactional Session for current thread
 	 */
 	public static boolean hasTransactionalSession(SessionFactory sessionFactory) {
@@ -571,7 +571,7 @@ public abstract class SessionFactoryUtils {
 	 * bound to the current thread by Spring's transaction facilities.
 	 * @param session the Hibernate Session to check
 	 * @param sessionFactory Hibernate SessionFactory that the Session was created with
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @return whether the Session is transactional
 	 */
 	public static boolean isSessionTransactional(Session session, SessionFactory sessionFactory) {
@@ -588,7 +588,7 @@ public abstract class SessionFactoryUtils {
 	 * Hibernate Query object.
 	 * @param query the Hibernate Query object
 	 * @param sessionFactory Hibernate SessionFactory that the Query was created for
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @see org.hibernate.Query#setTimeout
 	 */
 	public static void applyTransactionTimeout(Query query, SessionFactory sessionFactory) {
@@ -620,7 +620,7 @@ public abstract class SessionFactoryUtils {
 
 	/**
 	 * Convert the given HibernateException to an appropriate exception
-	 * from the <code>org.springframework.dao</code> hierarchy.
+	 * from the {@code org.springframework.dao} hierarchy.
 	 * @param ex HibernateException that occured
 	 * @return the corresponding DataAccessException instance
 	 * @see HibernateAccessor#convertHibernateAccessException
@@ -753,9 +753,9 @@ public abstract class SessionFactoryUtils {
 	/**
 	 * Close the given Session, created via the given factory,
 	 * if it is not managed externally (i.e. not bound to the thread).
-	 * @param session the Hibernate Session to close (may be <code>null</code>)
+	 * @param session the Hibernate Session to close (may be {@code null})
 	 * @param sessionFactory Hibernate SessionFactory that the Session was created with
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 */
 	public static void releaseSession(Session session, SessionFactory sessionFactory) {
 		if (session == null) {
@@ -771,7 +771,7 @@ public abstract class SessionFactoryUtils {
 	 * Close the given Session or register it for deferred close.
 	 * @param session the Hibernate Session to close
 	 * @param sessionFactory Hibernate SessionFactory that the Session was created with
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @see #initDeferredClose
 	 * @see #processDeferredClose
 	 */
@@ -792,7 +792,7 @@ public abstract class SessionFactoryUtils {
 	/**
 	 * Perform actual closing of the Hibernate Session,
 	 * catching and logging any cleanup exceptions thrown.
-	 * @param session the Hibernate Session to close (may be <code>null</code>)
+	 * @param session the Hibernate Session to close (may be {@code null})
 	 * @see org.hibernate.Session#close()
 	 */
 	public static void closeSession(Session session) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java
index e8233d2c1e..a1895bdf4f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java
@@ -44,7 +44,7 @@ public class TransactionAwareDataSourceConnectionProvider extends LocalDataSourc
 	}
 
 	/**
-	 * This implementation returns <code>true</code>: We can guarantee
+	 * This implementation returns {@code true}: We can guarantee
 	 * to receive the same Connection within a transaction, as we are
 	 * exposing a TransactionAwareDataSourceProxy.
 	 */
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 3264e821ce..1e035d7e54 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
@@ -141,9 +141,9 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem
 	/**
 	 * Specify custom type filters for Spring-based scanning for entity classes.
 	 * <p>Default is to search all specified packages for classes annotated with
-	 * <code>@javax.persistence.Entity</code>, <code>@javax.persistence.Embeddable</code>
-	 * or <code>@javax.persistence.MappedSuperclass</code>, as well as for
-	 * Hibernate's special <code>@org.hibernate.annotations.Entity</code>.
+	 * {@code @javax.persistence.Entity}, {@code @javax.persistence.Embeddable}
+	 * or {@code @javax.persistence.MappedSuperclass}, as well as for
+	 * Hibernate's special {@code @org.hibernate.annotations.Entity}.
 	 * @see #setPackagesToScan
 	 */
 	public void setEntityTypeFilters(TypeFilter[] entityTypeFilters) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java
index ce3b14842b..306abce348 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/package-info.java
@@ -1,4 +1,3 @@
-
 /**
  *
  * Package providing integration of
@@ -10,7 +9,7 @@
  * for local Hibernate transactions.
  *
  * <p><b>This package supports Hibernate 3.x only.</b>
- * See the <code>org.springframework.orm.hibernate4</code> package for Hibernate 4.x support.
+ * See the {@code org.springframework.orm.hibernate4} package for Hibernate 4.x support.
  *
  */
 package org.springframework.orm.hibernate3;
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
index 814da12370..2cf7e05a0a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
@@ -81,7 +81,7 @@ public abstract class AbstractLobType implements UserType {
 
 	/**
 	 * Constructor used for testing: takes an explicit LobHandler
-	 * and an explicit JTA TransactionManager (can be <code>null</code>).
+	 * and an explicit JTA TransactionManager (can be {@code null}).
 	 */
 	protected AbstractLobType(LobHandler lobHandler, TransactionManager jtaTransactionManager) {
 		this.lobHandler = lobHandler;
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java
index c30f81fdb1..e1df9f74c7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java
@@ -54,7 +54,7 @@ public class BlobByteArrayType extends AbstractLobType  {
 
 	/**
 	 * Constructor used for testing: takes an explicit LobHandler
-	 * and an explicit JTA TransactionManager (can be <code>null</code>).
+	 * and an explicit JTA TransactionManager (can be {@code null}).
 	 */
 	protected BlobByteArrayType(LobHandler lobHandler, TransactionManager jtaTransactionManager) {
 		super(lobHandler, jtaTransactionManager);
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java
index 9334c8db88..8b3d3339fb 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java
@@ -70,7 +70,7 @@ public class BlobSerializableType extends AbstractLobType {
 
 	/**
 	 * Constructor used for testing: takes an explicit LobHandler
-	 * and an explicit JTA TransactionManager (can be <code>null</code>).
+	 * and an explicit JTA TransactionManager (can be {@code null}).
 	 */
 	protected BlobSerializableType(LobHandler lobHandler, TransactionManager jtaTransactionManager) {
 		super(lobHandler, jtaTransactionManager);
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java
index be7ac8f15c..1638d2e031 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java
@@ -34,7 +34,7 @@ import org.springframework.jdbc.support.lob.LobHandler;
  * <p>This is intended for the (arguably unnatural, but still common) case
  * where character data is stored in a binary LOB. This requires encoding
  * and decoding the characters within this UserType; see the javadoc of the
- * <code>getCharacterEncoding()</code> method.
+ * {@code getCharacterEncoding()} method.
  *
  * <p>Can also be defined in generic Hibernate mappings, as DefaultLobCreator will
  * work with most JDBC-compliant database drivers. In this case, the field type
@@ -60,7 +60,7 @@ public class BlobStringType extends AbstractLobType {
 
 	/**
 	 * Constructor used for testing: takes an explicit LobHandler
-	 * and an explicit JTA TransactionManager (can be <code>null</code>).
+	 * and an explicit JTA TransactionManager (can be {@code null}).
 	 */
 	protected BlobStringType(LobHandler lobHandler, TransactionManager jtaTransactionManager) {
 		super(lobHandler, jtaTransactionManager);
@@ -108,13 +108,13 @@ public class BlobStringType extends AbstractLobType {
 	/**
 	 * Determine the character encoding to apply to the BLOB's bytes
 	 * to turn them into a String.
-	 * <p>Default is <code>null</code>, indicating to use the platform
+	 * <p>Default is {@code null}, indicating to use the platform
 	 * default encoding. To be overridden in subclasses for a specific
 	 * encoding such as "ISO-8859-1" or "UTF-8".
-	 * @return the character encoding to use, or <code>null</code>
+	 * @return the character encoding to use, or {@code null}
 	 * to use the platform default encoding
-	 * @see java.lang.String#String(byte[], String)
-	 * @see java.lang.String#getBytes(String)
+	 * @see String#String(byte[], String)
+	 * @see String#getBytes(String)
 	 */
 	protected String getCharacterEncoding() {
 		return null;
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
index af8640ba8e..9bf08b94d4 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
@@ -56,7 +56,7 @@ public class ClobStringType extends AbstractLobType {
 
 	/**
 	 * Constructor used for testing: takes an explicit LobHandler
-	 * and an explicit JTA TransactionManager (can be <code>null</code>).
+	 * and an explicit JTA TransactionManager (can be {@code null}).
 	 */
 	protected ClobStringType(LobHandler lobHandler, TransactionManager jtaTransactionManager) {
 		super(lobHandler, jtaTransactionManager);
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 644103394e..a59ed3d9bb 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
@@ -105,7 +105,7 @@ public abstract class HibernateDaoSupport extends DaoSupport {
 	 * 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())</code>, in which
+	 * {@code new HibernateTemplate(getSessionFactory())}, in which
 	 * case you're allowed to customize the settings on the resulting instance.
 	 */
 	public final HibernateTemplate getHibernateTemplate() {
@@ -175,7 +175,7 @@ public abstract class HibernateDaoSupport extends DaoSupport {
 
 	/**
 	 * Convert the given HibernateException to an appropriate exception from the
-	 * <code>org.springframework.dao</code> hierarchy. Will automatically detect
+	 * {@code org.springframework.dao} hierarchy. Will automatically detect
 	 * wrapped SQLExceptions and convert them accordingly.
 	 * <p>Delegates to the
 	 * {@link org.springframework.orm.hibernate3.HibernateTemplate#convertHibernateAccessException}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
index 4392b39e9f..d4a31646f3 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
@@ -27,7 +27,7 @@ import org.hibernate.persister.entity.EntityPersister;
 /**
  * Extension of Hibernate's DefaultMergeEventListener, transferring the ids
  * of newly saved objects to the corresponding original objects (that are part
- * of the detached object graph passed into the <code>merge</code> method).
+ * of the detached object graph passed into the {@code merge} method).
  *
  * <p>Transferring newly assigned ids to the original graph allows for continuing
  * to use the original object graph, despite merged copies being registered with
@@ -37,10 +37,10 @@ import org.hibernate.persister.entity.EntityPersister;
  *
  * <p>The merge behavior given by this MergeEventListener is nearly identical
  * to TopLink's merge behavior. See PetClinic for an example, which relies on
- * ids being available for newly saved objects: the <code>HibernateClinic</code>
- * and <code>TopLinkClinic</code> DAO implementations both use straight merge
+ * ids being available for newly saved objects: the {@code HibernateClinic}
+ * and {@code TopLinkClinic} DAO implementations both use straight merge
  * calls, with the Hibernate SessionFactory configuration specifying an
- * <code>IdTransferringMergeEventListener</code>.
+ * {@code IdTransferringMergeEventListener}.
  *
  * <p>Typically specified as entry for LocalSessionFactoryBean's "eventListeners"
  * map, with key "merge".
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 f9cc4c3f8d..7aab7c8910 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
@@ -53,11 +53,11 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * as for non-transactional execution (if configured appropriately).
  *
  * <p><b>NOTE</b>: This filter will by default <i>not</i> flush the Hibernate Session,
- * with the flush mode set to <code>FlushMode.NEVER</code>. It assumes to be used
+ * with the flush mode set to {@code FlushMode.NEVER}. It assumes to be used
  * in combination with service layer transactions that care for the flushing: The
  * active transaction manager will temporarily change the flush mode to
- * <code>FlushMode.AUTO</code> during a read-write transaction, with the flush
- * mode reset to <code>FlushMode.NEVER</code> at the end of each transaction.
+ * {@code FlushMode.AUTO} during a read-write transaction, with the flush
+ * mode reset to {@code FlushMode.NEVER} at the end of each transaction.
  * If you intend to use this filter without transactions, consider changing
  * the default flush mode (through the "flushMode" property).
  *
@@ -74,13 +74,13 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * for deferred close, though, actually processed at request completion.
  *
  * <p>A single session per request allows for most efficient first-level caching,
- * but can cause side effects, for example on <code>saveOrUpdate</code> or when
+ * but can cause side effects, for example on {@code saveOrUpdate} or when
  * continuing after a rolled-back transaction. The deferred close strategy is as safe
  * as no Open Session in View in that respect, while still allowing for lazy loading
  * in views (but not providing a first-level cache for the entire request).
  *
  * <p>Looks up the SessionFactory in Spring's root web application context.
- * Supports a "sessionFactoryBeanName" filter init-param in <code>web.xml</code>;
+ * 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).
@@ -282,8 +282,8 @@ public class OpenSessionInViewFilter extends OncePerRequestFilter {
 	 * Get a Session for the SessionFactory that this filter uses.
 	 * Note that this just applies in single session mode!
 	 * <p>The default implementation delegates to the
-	 * <code>SessionFactoryUtils.getSession</code> method and
-	 * sets the <code>Session</code>'s flush mode to "MANUAL".
+	 * {@code SessionFactoryUtils.getSession} method and
+	 * sets the {@code Session}'s flush mode to "MANUAL".
 	 * <p>Can be overridden in subclasses for creating a Session with a
 	 * custom entity interceptor or JDBC exception translator.
 	 * @param sessionFactory the SessionFactory that this filter uses
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 59bdc8e642..692db0ba20 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
@@ -34,14 +34,14 @@ import org.springframework.web.context.request.async.WebAsyncManager;
 import org.springframework.web.context.request.async.WebAsyncUtils;
 
 /**
- * Spring web request interceptor that binds a Hibernate <code>Session</code> to the
+ * Spring web request interceptor that binds a Hibernate {@code Session} to the
  * thread for the entire processing of the request.
  *
  * <p>This class is a concrete expression of the "Open Session in View" pattern, which
  * is a pattern that allows for the lazy loading of associations in web views despite
  * the original transactions already being completed.
  *
- * <p>This interceptor makes Hibernate <code>Sessions</code> available via the current
+ * <p>This interceptor makes Hibernate {@code Sessions} available via the current
  * thread, which will be autodetected by transaction managers. It is suitable for
  * service layer transactions via
  * {@link org.springframework.orm.hibernate3.HibernateTransactionManager} or
@@ -49,11 +49,11 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
  * non-transactional execution (if configured appropriately).
  *
  * <p><b>NOTE</b>: This interceptor will by default <i>not</i> flush the Hibernate
- * <code>Session</code>, with the flush mode being set to <code>FlushMode.NEVER</code>.
+ * {@code Session}, with the flush mode being set to {@code FlushMode.NEVER}.
  * It assumes that it will be used in combination with service layer transactions
  * that handle the flushing: the active transaction manager will temporarily change
- * the flush mode to <code>FlushMode.AUTO</code> during a read-write transaction,
- * with the flush mode reset to <code>FlushMode.NEVER</code> at the end of each
+ * the flush mode to {@code FlushMode.AUTO} during a read-write transaction,
+ * with the flush mode reset to {@code FlushMode.NEVER} at the end of each
  * transaction. If you intend to use this interceptor without transactions, consider
  * changing the default flush mode (through the
  * {@link #setFlushMode(int) "flushMode"} property).
@@ -66,8 +66,8 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
  *
  * <p><b>WARNING:</b> Applying this interceptor to existing logic can cause issues
  * that have not appeared before, through the use of a single Hibernate
- * <code>Session</code> for the processing of an entire request. In particular, the
- * reassociation of persistent objects with a Hibernate <code>Session</code> has to
+ * {@code Session} for the processing of an entire request. In particular, the
+ * reassociation of persistent objects with a Hibernate {@code Session} has to
  * occur at the very beginning of request processing, to avoid clashes with already
  * loaded instances of the same objects.
  *
@@ -79,7 +79,7 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
  * request completion.
  *
  * <p>A single session per request allows for the most efficient first-level caching,
- * but can cause side effects, for example on <code>saveOrUpdate</code> or when
+ * but can cause side effects, for example on {@code saveOrUpdate} or when
  * continuing after a rolled-back transaction. The deferred close strategy is as safe
  * as no Open Session in View in that respect, while still allowing for lazy loading
  * in views (but not providing a first-level cache for the entire request).
@@ -97,8 +97,8 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
 public class OpenSessionInViewInterceptor extends HibernateAccessor implements AsyncWebRequestInterceptor {
 
 	/**
-	 * Suffix that gets appended to the <code>SessionFactory</code>
-	 * <code>toString()</code> representation for the "participate in existing
+	 * Suffix that gets appended to the {@code SessionFactory}
+	 * {@code toString()} representation for the "participate in existing
 	 * session handling" request attribute.
 	 * @see #getParticipateAttributeName
 	 */
@@ -109,8 +109,8 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 
 
 	/**
-	 * Create a new <code>OpenSessionInViewInterceptor</code>,
-	 * turning the default flushMode to <code>FLUSH_NEVER</code>.
+	 * Create a new {@code OpenSessionInViewInterceptor},
+	 * turning the default flushMode to {@code FLUSH_NEVER}.
 	 * @see #setFlushMode
 	 */
 	public OpenSessionInViewInterceptor() {
@@ -139,8 +139,8 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 
 
 	/**
-	 * Open a new Hibernate <code>Session</code> according to the settings of this
-	 * <code>HibernateAccessor</code> and bind it to the thread via the
+	 * Open a new Hibernate {@code Session} according to the settings of this
+	 * {@code HibernateAccessor} and bind it to the thread via the
 	 * {@link TransactionSynchronizationManager}.
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession
 	 */
@@ -183,9 +183,9 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 	}
 
 	/**
-	 * Flush the Hibernate <code>Session</code> before view rendering, if necessary.
+	 * Flush the Hibernate {@code Session} before view rendering, if necessary.
 	 * <p>Note that this just applies in {@link #isSingleSession() single session mode}!
-	 * <p>The default is <code>FLUSH_NEVER</code> to avoid this extra flushing,
+	 * <p>The default is {@code FLUSH_NEVER} to avoid this extra flushing,
 	 * assuming that service layer transactions have flushed their changes on commit.
 	 * @see #setFlushMode
 	 */
@@ -205,7 +205,7 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 	}
 
 	/**
-	 * Unbind the Hibernate <code>Session</code> from the thread and close it (in
+	 * Unbind the Hibernate {@code Session} from the thread and close it (in
 	 * single session mode), or process deferred close for all sessions that have
 	 * been opened during the current request (in deferred close mode).
 	 * @see org.springframework.transaction.support.TransactionSynchronizationManager
@@ -257,8 +257,8 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 	/**
 	 * Return the name of the request attribute that identifies that a request is
 	 * already intercepted.
-	 * <p>The default implementation takes the <code>toString()</code> representation
-	 * of the <code>SessionFactory</code> instance and appends {@link #PARTICIPATE_SUFFIX}.
+	 * <p>The default implementation takes the {@code toString()} representation
+	 * of the {@code SessionFactory} instance and appends {@link #PARTICIPATE_SUFFIX}.
 	 */
 	protected String getParticipateAttributeName() {
 		return getSessionFactory().toString() + PARTICIPATE_SUFFIX;
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/package-info.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/package-info.java
index 0ff94249f5..2472009eed 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/package-info.java
@@ -1,7 +1,6 @@
-
 /**
  *
- * Classes supporting the <code>org.springframework.orm.hibernate3</code> package.
+ * Classes supporting the {@code org.springframework.orm.hibernate3} package.
  * Contains a DAO base class for HibernateTemplate usage.
  *
  */
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
index 0048217563..faf8b0e66f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
@@ -23,7 +23,7 @@ import com.ibatis.sqlmap.client.SqlMapExecutor;
 /**
  * Callback interface for data access code that works with the iBATIS
  * {@link com.ibatis.sqlmap.client.SqlMapExecutor} interface. To be used
- * with {@link SqlMapClientTemplate}'s <code>execute</code> method,
+ * with {@link SqlMapClientTemplate}'s {@code execute} method,
  * assumably often as anonymous classes within a method implementation.
  *
  * @author Juergen Hoeller
@@ -37,9 +37,9 @@ import com.ibatis.sqlmap.client.SqlMapExecutor;
 public interface SqlMapClientCallback<T> {
 
 	/**
-	 * Gets called by <code>SqlMapClientTemplate.execute</code> with an active
-	 * <code>SqlMapExecutor</code>. Does not need to care about activating
-	 * or closing the <code>SqlMapExecutor</code>, or handling transactions.
+	 * Gets called by {@code SqlMapClientTemplate.execute} with an active
+	 * {@code SqlMapExecutor}. Does not need to care about activating
+	 * or closing the {@code SqlMapExecutor}, or handling transactions.
 	 *
 	 * <p>If called without a thread-bound JDBC transaction (initiated by
 	 * DataSourceTransactionManager), the code will simply get executed on the
@@ -54,7 +54,7 @@ public interface SqlMapClientCallback<T> {
 	 *
 	 * @param executor an active iBATIS SqlMapSession, passed-in as
 	 * SqlMapExecutor interface here to avoid manual lifecycle handling
-	 * @return a result object, or <code>null</code> if none
+	 * @return a result object, or {@code null} if none
 	 * @throws SQLException if thrown by the iBATIS SQL Maps API
 	 * @see SqlMapClientTemplate#execute
 	 * @see SqlMapClientTemplate#executeWithListResult
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
index ee77fe4306..061e6b9ecc 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
@@ -147,7 +147,7 @@ public class SqlMapClientFactoryBean implements FactoryBean<SqlMapClient>, Initi
 
 	/**
 	 * Set optional properties to be passed into the SqlMapClientBuilder, as
-	 * alternative to a <code>&lt;properties&gt;</code> tag in the sql-map-config.xml
+	 * alternative to a {@code &lt;properties&gt;} tag in the sql-map-config.xml
 	 * file. Will be used to resolve placeholders in the config file.
 	 * @see #setConfigLocation
 	 * @see com.ibatis.sqlmap.client.SqlMapClientBuilder#buildSqlMapClient(java.io.InputStream, java.util.Properties)
@@ -205,7 +205,7 @@ public class SqlMapClientFactoryBean implements FactoryBean<SqlMapClient>, Initi
 
 	/**
 	 * Set the iBATIS TransactionConfig class to use. Default is
-	 * <code>com.ibatis.sqlmap.engine.transaction.external.ExternalTransactionConfig</code>.
+	 * {@code com.ibatis.sqlmap.engine.transaction.external.ExternalTransactionConfig}.
 	 * <p>Will only get applied when using a Spring-managed DataSource.
 	 * An instance of this class will get populated with the given DataSource
 	 * and initialized with the given properties.
@@ -235,7 +235,7 @@ public class SqlMapClientFactoryBean implements FactoryBean<SqlMapClient>, Initi
 	 * @see com.ibatis.sqlmap.engine.transaction.jdbc.JdbcTransactionConfig
 	 * @see com.ibatis.sqlmap.engine.transaction.jta.JtaTransactionConfig
 	 * @see com.ibatis.sqlmap.client.SqlMapTransactionManager
-	 	 */
+	 */
 	public void setTransactionConfigClass(Class transactionConfigClass) {
 		if (transactionConfigClass == null || !TransactionConfig.class.isAssignableFrom(transactionConfigClass)) {
 			throw new IllegalArgumentException("Invalid transactionConfigClass: does not implement " +
@@ -320,7 +320,7 @@ public class SqlMapClientFactoryBean implements FactoryBean<SqlMapClient>, Initi
 	 * on iBATIS 2.3 and higher) or on a Reader (on iBATIS up to version 2.2).
 	 * @param configLocations the config files to load from
 	 * @param properties the SqlMapClient properties (if any)
-	 * @return the SqlMapClient instance (never <code>null</code>)
+	 * @return the SqlMapClient instance (never {@code null})
 	 * @throws IOException if loading the config file failed
 	 * @see com.ibatis.sqlmap.client.SqlMapClientBuilder#buildSqlMapClient
 	 */
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
index 5d454b85cb..4c868c7ec2 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
@@ -39,7 +39,7 @@ import org.springframework.util.Assert;
  * Helper class that simplifies data access via the iBATIS
  * {@link com.ibatis.sqlmap.client.SqlMapClient} API, converting checked
  * SQLExceptions into unchecked DataAccessExceptions, following the
- * <code>org.springframework.dao</code> exception hierarchy.
+ * {@code org.springframework.dao} exception hierarchy.
  * Uses the same {@link org.springframework.jdbc.support.SQLExceptionTranslator}
  * mechanism as {@link org.springframework.jdbc.core.JdbcTemplate}.
  *
@@ -61,7 +61,7 @@ import org.springframework.util.Assert;
  * 		 executor.update("insertSomethingElse", "myOtherParamValue");
  * 		 executor.executeBatch();
  * 		 return null;
- * 	 }
+ *      }
  * });</pre>
  *
  * The template needs a SqlMapClient to work on, passed in via the "sqlMapClient"
@@ -152,7 +152,7 @@ public class SqlMapClientTemplate extends JdbcAccessor implements SqlMapClientOp
 	/**
 	 * Execute the given data access action on a SqlMapExecutor.
 	 * @param action callback object that specifies the data access action
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws DataAccessException in case of SQL Maps errors
 	 */
 	public <T> T execute(SqlMapClientCallback<T> action) throws DataAccessException {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/package-info.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/package-info.java
index 9c503fe569..c0d26486f0 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/package-info.java
@@ -1,7 +1,6 @@
-
 /**
  *
- * Classes supporting the <code>org.springframework.orm.ibatis</code> package.
+ * Classes supporting the {@code org.springframework.orm.ibatis} package.
  * Contains a DAO base class for SqlMapClientTemplate usage.
  *
  */
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 5b08921b71..9dbf9c5b7e 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
@@ -43,16 +43,16 @@ import org.springframework.util.ReflectionUtils;
  * Updated to build on JDO 2.0 or higher, as of Spring 2.5.
  * Used as default dialect by {@link JdoAccessor} and {@link JdoTransactionManager}.
  *
- * <p>Simply begins a standard JDO transaction in <code>beginTransaction</code>.
- * Returns a handle for a JDO2 DataStoreConnection on <code>getJdbcConnection</code>.
- * Calls the corresponding JDO2 PersistenceManager operation on <code>flush</code>
- * Ignores a given query timeout in <code>applyQueryTimeout</code>.
+ * <p>Simply begins a standard JDO transaction in {@code beginTransaction}.
+ * Returns a handle for a JDO2 DataStoreConnection on {@code getJdbcConnection}.
+ * Calls the corresponding JDO2 PersistenceManager operation on {@code flush}
+ * Ignores a given query timeout in {@code applyQueryTimeout}.
  * Uses a Spring SQLExceptionTranslator for exception translation, if applicable.
  *
  * <p>Note that, even with JDO2, vendor-specific subclasses are still necessary
  * for special transaction semantics and more sophisticated exception translation.
  * Furthermore, vendor-specific subclasses are encouraged to expose the native JDBC
- * Connection on <code>getJdbcConnection</code>, rather than JDO2's wrapper handle.
+ * Connection on {@code getJdbcConnection}, rather than JDO2's wrapper handle.
  *
  * <p>This class also implements the PersistenceExceptionTranslator interface,
  * as autodetected by Spring's PersistenceExceptionTranslationPostProcessor,
@@ -122,7 +122,7 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 	//-------------------------------------------------------------------------
 
 	/**
-	 * This implementation invokes the standard JDO <code>Transaction.begin</code>
+	 * This implementation invokes the standard JDO {@code Transaction.begin}
 	 * method. Throws an InvalidIsolationLevelException if a non-default isolation
 	 * level is set.
 	 * @see javax.jdo.Transaction#begin
@@ -152,7 +152,7 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 	 * This implementation returns a DataStoreConnectionHandle for JDO2,
 	 * which will also work on JDO1 until actually accessing the JDBC Connection.
 	 * <p>For pre-JDO2 implementations, override this method to return the
-	 * Connection through the corresponding vendor-specific mechanism, or <code>null</code>
+	 * Connection through the corresponding vendor-specific mechanism, or {@code null}
 	 * if the Connection is not retrievable.
 	 * <p><b>NOTE:</b> A JDO2 DataStoreConnection is always a wrapper,
 	 * never the native JDBC Connection. If you need access to the native JDBC
@@ -164,7 +164,7 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 	 * fetched Connection to be closed before continuing PersistenceManager work.
 	 * For this reason, the exposed ConnectionHandle eagerly releases its JDBC
 	 * Connection at the end of each JDBC data access operation (that is, on
-	 * <code>DataSourceUtils.releaseConnection</code>).
+	 * {@code DataSourceUtils.releaseConnection}).
 	 * @see javax.jdo.PersistenceManager#getDataStoreConnection()
 	 * @see org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractor
 	 * @see org.springframework.jdbc.datasource.DataSourceUtils#releaseConnection
@@ -180,7 +180,7 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 	 * will implicitly be closed with the PersistenceManager.
 	 * <p>If the JDO provider returns a Connection handle that it
 	 * expects the application to close, the dialect needs to invoke
-	 * <code>Connection.close</code> here.
+	 * {@code Connection.close} here.
 	 * @see java.sql.Connection#close()
 	 */
 	public void releaseJdbcConnection(ConnectionHandle conHandle, PersistenceManager pm)
@@ -212,7 +212,7 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 	 * Implementation of the PersistenceExceptionTranslator interface,
 	 * as autodetected by Spring's PersistenceExceptionTranslationPostProcessor.
 	 * <p>Converts the exception if it is a JDOException, using this JdoDialect.
-	 * Else returns <code>null</code> to indicate an unknown exception.
+	 * Else returns {@code null} to indicate an unknown exception.
 	 * @see org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor
 	 * @see #translateException
 	 */
@@ -237,10 +237,10 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 
 	/**
 	 * Template method for extracting a SQL String from the given exception.
-	 * <p>Default implementation always returns <code>null</code>. Can be overridden in
+	 * <p>Default implementation always returns {@code null}. Can be overridden in
 	 * subclasses to extract SQL Strings for vendor-specific exception classes.
 	 * @param ex the JDOException, containing a SQLException
-	 * @return the SQL String, or <code>null</code> if none found
+	 * @return the SQL String, or {@code null} if none found
 	 */
 	protected String extractSqlStringFromException(JDOException ex) {
 		return null;
@@ -249,8 +249,8 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 
 	/**
 	 * ConnectionHandle implementation that fetches a new JDO2 DataStoreConnection
-	 * for every <code>getConnection</code> call and closes the Connection on
-	 * <code>releaseConnection</code>. This is necessary because JDO2 requires the
+	 * for every {@code getConnection} call and closes the Connection on
+	 * {@code releaseConnection}. This is necessary because JDO2 requires the
 	 * fetched Connection to be closed before continuing PersistenceManager work.
 	 * @see javax.jdo.PersistenceManager#getDataStoreConnection()
 	 */
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java
index d747628b82..890c95dce2 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java
@@ -158,7 +158,7 @@ public abstract class JdoAccessor implements InitializingBean {
 
 	/**
 	 * Convert the given JDOException to an appropriate exception from the
-	 * <code>org.springframework.dao</code> hierarchy.
+	 * {@code org.springframework.dao} hierarchy.
 	 * <p>Default implementation delegates to the JdoDialect.
 	 * May be overridden in subclasses.
 	 * @param ex JDOException that occured
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java
index b079e01b28..4da9c50583 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java
@@ -48,9 +48,9 @@ import javax.jdo.PersistenceManager;
 public interface JdoCallback<T> {
 
 	/**
-	 * Gets called by <code>JdoTemplate.execute</code> with an active JDO
-	 * <code>PersistenceManager</code>. Does not need to care about activating
-	 * or closing the <code>PersistenceManager</code>, or handling transactions.
+	 * Gets called by {@code JdoTemplate.execute} with an active JDO
+	 * {@code PersistenceManager}. Does not need to care about activating
+	 * or closing the {@code PersistenceManager}, or handling transactions.
 	 *
 	 * <p>Note that JDO callback code will not flush any modifications to the
 	 * database if not executed within a transaction. Thus, you need to make
@@ -63,7 +63,7 @@ public interface JdoCallback<T> {
 	 * It gets propagated to the caller of the template.
 	 *
 	 * @param pm active PersistenceManager
-	 * @return a result object, or <code>null</code> if none
+	 * @return a result object, or {@code null} if none
 	 * @throws JDOException if thrown by the JDO API
 	 * @see JdoTemplate#execute
 	 * @see JdoTemplate#executeFind
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java
index 91120706ff..de2662d6fe 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java
@@ -60,12 +60,12 @@ public interface JdoDialect {
 	 * given Spring transaction definition (in particular, an isolation level
 	 * and a timeout). Invoked by JdoTransactionManager on transaction begin.
 	 * <p>An implementation can configure the JDO Transaction object and then
-	 * invoke <code>begin</code>, or invoke a special begin method that takes,
+	 * invoke {@code begin}, or invoke a special begin method that takes,
 	 * for example, an isolation level.
 	 * <p>An implementation can also apply read-only flag and isolation level to the
 	 * underlying JDBC Connection before beginning the transaction. In that case,
 	 * a transaction data object can be returned that holds the previous isolation
-	 * level (and possibly other data), to be reset in <code>cleanupTransaction</code>.
+	 * level (and possibly other data), to be reset in {@code cleanupTransaction}.
 	 * <p>Implementations can also use the Spring transaction name, as exposed by the
 	 * passed-in TransactionDefinition, to optimize for specific data access use cases
 	 * (effectively using the current transaction name as use case identifier).
@@ -101,7 +101,7 @@ public interface JdoDialect {
 	 * if accessing a relational database. This method will just get invoked if actually
 	 * needing access to the underlying JDBC Connection, usually within an active JDO
 	 * transaction (for example, by JdoTransactionManager). The returned handle will
-	 * be passed into the <code>releaseJdbcConnection</code> method when not needed anymore.
+	 * be passed into the {@code releaseJdbcConnection} method when not needed anymore.
 	 * <p>Implementations are encouraged to return an unwrapped Connection object, i.e.
 	 * the Connection as they got it from the connection pool. This makes it easier for
 	 * application code to get at the underlying native JDBC Connection, like an
@@ -110,12 +110,12 @@ public interface JdoDialect {
 	 * <p>In a simple case where the returned Connection will be auto-closed with the
 	 * PersistenceManager or can be released via the Connection object itself, an
 	 * implementation can return a SimpleConnectionHandle that just contains the
-	 * Connection. If some other object is needed in <code>releaseJdbcConnection</code>,
+	 * Connection. If some other object is needed in {@code releaseJdbcConnection},
 	 * an implementation should use a special handle that references that other object.
 	 * @param pm the current JDO PersistenceManager
 	 * @param readOnly whether the Connection is only needed for read-only purposes
 	 * @return a handle for the JDBC Connection, to be passed into
-	 * <code>releaseJdbcConnection</code>, or <code>null</code>
+	 * {@code releaseJdbcConnection}, or {@code null}
 	 * if no JDBC Connection can be retrieved
 	 * @throws JDOException if thrown by JDO methods
 	 * @throws SQLException if thrown by JDBC methods
@@ -130,10 +130,10 @@ public interface JdoDialect {
 
 	/**
 	 * Release the given JDBC Connection, which has originally been retrieved
-	 * via <code>getJdbcConnection</code>. This should be invoked in any case,
+	 * via {@code getJdbcConnection}. This should be invoked in any case,
 	 * to allow for proper release of the retrieved Connection handle.
 	 * <p>An implementation might simply do nothing, if the Connection returned
-	 * by <code>getJdbcConnection</code> will be implicitly closed when the JDO
+	 * by {@code getJdbcConnection} will be implicitly closed when the JDO
 	 * transaction completes or when the PersistenceManager is closed.
 	 * @param conHandle the JDBC Connection handle to release
 	 * @param pm the current JDO PersistenceManager
@@ -170,7 +170,7 @@ public interface JdoDialect {
 	 * <p>Can use a SQLExceptionTranslator for translating underlying SQLExceptions
 	 * in a database-specific fashion.
 	 * @param ex the JDOException thrown
-	 * @return the corresponding DataAccessException (must not be <code>null</code>)
+	 * @return the corresponding DataAccessException (must not be {@code null})
 	 * @see JdoAccessor#convertJdoAccessException
 	 * @see JdoTransactionManager#convertJdoAccessException
 	 * @see PersistenceManagerFactoryUtils#convertJdoAccessException
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java
index 1a3c51d789..129f998b8b 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java
@@ -31,9 +31,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * or from a surrounding JDO-intercepted method), the interceptor simply participates in it.
  *
  * <p>Application code must retrieve a JDO PersistenceManager via the
- * <code>PersistenceManagerFactoryUtils.getPersistenceManager</code> method,
+ * {@code PersistenceManagerFactoryUtils.getPersistenceManager} method,
  * to be able to detect a thread-bound PersistenceManager. It is preferable to use
- * <code>getPersistenceManager</code> with allowCreate=false, if the code relies on
+ * {@code getPersistenceManager} with allowCreate=false, if the code relies on
  * the interceptor to provide proper PersistenceManager handling. Typically, the code
  * will look like as follows:
  *
@@ -44,9 +44,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * }</pre>
  *
  * <p>Note that this interceptor automatically translates JDOExceptions, via
- * delegating to the <code>PersistenceManagerFactoryUtils.convertJdoAccessException</code>
+ * delegating to the {@code PersistenceManagerFactoryUtils.convertJdoAccessException}
  * method that converts them to exceptions that are compatible with the
- * <code>org.springframework.dao</code> exception hierarchy (like JdoTemplate does).
+ * {@code org.springframework.dao} exception hierarchy (like JdoTemplate does).
  * This can be turned off if the raw exceptions are preferred.
  *
  * <p>This class can be considered a declarative alternative to JdoTemplate's
@@ -80,7 +80,7 @@ public class JdoInterceptor extends JdoAccessor implements MethodInterceptor {
 
 	/**
 	 * Set whether to convert any JDOException raised to a Spring DataAccessException,
-	 * compatible with the <code>org.springframework.dao</code> exception hierarchy.
+	 * compatible with the {@code org.springframework.dao} exception hierarchy.
 	 * <p>Default is "true". Turn this flag off to let the caller receive raw exceptions
 	 * as-is, without any wrapping.
 	 * @see org.springframework.dao.DataAccessException
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java
index 57354e29a4..d2b4a67baf 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOperations.java
@@ -26,17 +26,17 @@ import org.springframework.dao.DataAccessException;
  * implemented by {@link JdoTemplate}. Not often used, but a useful
  * option to enhance testability, as it can easily be mocked or stubbed.
  *
- * <p>Defines <code>JdoTemplate</code>'s data access methods that mirror
+ * <p>Defines {@code JdoTemplate}'s data access methods that mirror
  * various JDO {@link javax.jdo.PersistenceManager} methods. Users are
- * strongly encouraged to read the JDO <code>PersistenceManager</code>
+ * strongly encouraged to read the JDO {@code PersistenceManager}
  * javadocs for details on the semantics of those methods.
  *
  * <p>Note that lazy loading will just work with an open JDO
- * <code>PersistenceManager</code>, either within a managed transaction or within
+ * {@code PersistenceManager}, either within a managed transaction or within
  * {@link org.springframework.orm.jdo.support.OpenPersistenceManagerInViewFilter}/
  * {@link org.springframework.orm.jdo.support.OpenPersistenceManagerInViewInterceptor}.
  * Furthermore, some operations just make sense within transactions,
- * for example: <code>evict</code>, <code>evictAll</code>, <code>flush</code>.
+ * for example: {@code evict}, {@code evictAll}, {@code flush}.
  *
  * <p>Updated to build on JDO 2.0 or higher, as of Spring 2.5.
  *
@@ -64,7 +64,7 @@ public interface JdoOperations {
 	 * <p>Note: Callback code is not supposed to handle transactions itself!
 	 * Use an appropriate transaction manager like JdoTransactionManager.
 	 * @param action callback object that specifies the JDO action
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws org.springframework.dao.DataAccessException in case of JDO errors
 	 * @see JdoTransactionManager
 	 * @see javax.jdo.PersistenceManager
@@ -76,7 +76,7 @@ public interface JdoOperations {
 	 * Collection. This is a convenience method for executing JDO queries
 	 * within an action.
 	 * @param action callback object that specifies the JDO action
-	 * @return a Collection result returned by the action, or <code>null</code>
+	 * @return a Collection result returned by the action, or {@code null}
 	 * @throws org.springframework.dao.DataAccessException in case of JDO errors
 	 */
 	Collection executeFind(JdoCallback<?> action) throws DataAccessException;
@@ -247,7 +247,7 @@ public interface JdoOperations {
 	 * Find all persistent instances of the given class that match the given
 	 * JDOQL filter.
 	 * @param entityClass a persistent class
-	 * @param filter the JDOQL filter to match (or <code>null</code> if none)
+	 * @param filter the JDOQL filter to match (or {@code null} if none)
 	 * @return the persistent instances
 	 * @throws org.springframework.dao.DataAccessException in case of JDO errors
 	 * @see javax.jdo.PersistenceManager#newQuery(Class, String)
@@ -258,8 +258,8 @@ public interface JdoOperations {
 	 * Find all persistent instances of the given class that match the given
 	 * JDOQL filter, with the given result ordering.
 	 * @param entityClass a persistent class
-	 * @param filter the JDOQL filter to match (or <code>null</code> if none)
-	 * @param ordering the ordering of the result (or <code>null</code> if none)
+	 * @param filter the JDOQL filter to match (or {@code null} if none)
+	 * @param ordering the ordering of the result (or {@code null} if none)
 	 * @return the persistent instances
 	 * @throws org.springframework.dao.DataAccessException in case of JDO errors
 	 * @see javax.jdo.PersistenceManager#newQuery(Class, String)
@@ -291,7 +291,7 @@ public interface JdoOperations {
 	 * @param filter the JDOQL filter to match
 	 * @param parameters the JDOQL parameter declarations
 	 * @param values the corresponding parameter values
-	 * @param ordering the ordering of the result (or <code>null</code> if none)
+	 * @param ordering the ordering of the result (or {@code null} if none)
 	 * @return the persistent instances
 	 * @throws org.springframework.dao.DataAccessException in case of JDO errors
 	 * @see javax.jdo.PersistenceManager#newQuery(Class, String)
@@ -327,7 +327,7 @@ public interface JdoOperations {
 	 * @param filter the JDOQL filter to match
 	 * @param parameters the JDOQL parameter declarations
 	 * @param values a Map with parameter names as keys and parameter values
-	 * @param ordering the ordering of the result (or <code>null</code> if none)
+	 * @param ordering the ordering of the result (or {@code null} if none)
 	 * @return the persistent instances
 	 * @throws org.springframework.dao.DataAccessException in case of JDO errors
 	 * @see javax.jdo.PersistenceManager#newQuery(Class, String)
@@ -342,8 +342,8 @@ public interface JdoOperations {
 	/**
 	 * Find persistent instances through the given query object
 	 * in the specified query language.
-	 * @param language the query language (<code>javax.jdo.Query#JDOQL</code>
-	 * or <code>javax.jdo.Query#SQL</code>, for example)
+	 * @param language the query language ({@code javax.jdo.Query#JDOQL}
+	 * or {@code javax.jdo.Query#SQL}, for example)
 	 * @param queryObject the query object for the specified language
 	 * @return the persistent instances
 	 * @throws org.springframework.dao.DataAccessException in case of JDO errors
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
index 6d193d463f..bd293b51a7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
@@ -23,7 +23,7 @@ import org.springframework.dao.UncategorizedDataAccessException;
 /**
  * JDO-specific subclass of UncategorizedDataAccessException,
  * for JDO system errors that do not match any concrete
- * <code>org.springframework.dao</code> exceptions.
+ * {@code org.springframework.dao} exceptions.
  *
  * @author Juergen Hoeller
  * @since 03.06.2003
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
index 397f58c3f4..3ec8e037fd 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
@@ -36,9 +36,9 @@ import org.springframework.util.ClassUtils;
 /**
  * Helper class that simplifies JDO data access code, and converts
  * JDOExceptions into Spring DataAccessExceptions, following the
- * <code>org.springframework.dao</code> exception hierarchy.
+ * {@code org.springframework.dao} exception hierarchy.
  *
- * <p>The central method is <code>execute</code>, supporting JDO access code
+ * <p>The central method is {@code execute}, supporting JDO access code
  * implementing the {@link JdoCallback} interface. It provides JDO PersistenceManager
  * handling such that neither the JdoCallback implementation nor the calling
  * code needs to explicitly care about retrieving/closing PersistenceManagers,
@@ -47,7 +47,7 @@ import org.springframework.util.ClassUtils;
  * <p>Typically used to implement data access or business logic services that
  * use JDO within their implementation but are JDO-agnostic in their interface.
  * The latter or code calling the latter only have to deal with business
- * objects, query objects, and <code>org.springframework.dao</code> exceptions.
+ * objects, query objects, and {@code org.springframework.dao} exceptions.
  *
  * <p>Can be used within a service implementation via direct instantiation
  * with a PersistenceManagerFactory reference, or get prepared in an
@@ -58,7 +58,7 @@ import org.springframework.util.ClassUtils;
  *
  * <p>This class can be considered as direct alternative to working with the
  * raw JDO PersistenceManager API (through
- * <code>PersistenceManagerFactoryUtils.getPersistenceManager()</code>).
+ * {@code PersistenceManagerFactoryUtils.getPersistenceManager()}).
  * The major advantage is its automatic conversion to DataAccessExceptions, the
  * major disadvantage that no checked application exceptions can get thrown from
  * within data access code. Corresponding checks and the actual throwing of such
@@ -73,7 +73,7 @@ import org.springframework.util.ClassUtils;
  * either within a Spring-driven transaction (with JdoTransactionManager or
  * JtaTransactionManager) or within OpenPersistenceManagerInViewFilter/Interceptor.
  * Furthermore, some operations just make sense within transactions,
- * for example: <code>evict</code>, <code>evictAll</code>, <code>flush</code>.
+ * for example: {@code evict}, {@code evictAll}, {@code flush}.
  *
  * <p><b>NOTE: This class requires JDO 2.0 or higher, as of Spring 2.5.</b>
  * As of Spring 3.0, it follows JDO 2.1 conventions in terms of generic
@@ -152,7 +152,7 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 	/**
 	 * Set whether to expose the native JDO PersistenceManager to JdoCallback
 	 * code. Default is "false": a PersistenceManager proxy will be returned,
-	 * suppressing <code>close</code> calls and automatically applying transaction
+	 * suppressing {@code close} calls and automatically applying transaction
 	 * timeouts (if any).
 	 * <p>As there is often a need to cast to a provider-specific PersistenceManager
 	 * class in DAOs that use provider-specific functionality, the exposed proxy
@@ -194,7 +194,7 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 	 * @param action callback object that specifies the JDO action
 	 * @param exposeNativePersistenceManager whether to expose the native
 	 * JDO persistence manager to callback code
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws org.springframework.dao.DataAccessException in case of JDO errors
 	 */
 	public <T> T execute(JdoCallback<T> action, boolean exposeNativePersistenceManager) throws DataAccessException {
@@ -224,7 +224,7 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 
 	/**
 	 * Create a close-suppressing proxy for the given JDO PersistenceManager.
-	 * Called by the <code>execute</code> method.
+	 * Called by the {@code execute} method.
 	 * <p>The proxy also prepares returned JDO Query objects.
 	 * @param pm the JDO PersistenceManager to create a proxy for
 	 * @return the PersistenceManager proxy, implementing all interfaces
@@ -242,7 +242,7 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 
 	/**
 	 * Post-process the given result object, which might be a Collection.
-	 * Called by the <code>execute</code> method.
+	 * Called by the {@code execute} method.
 	 * <p>Default implementation always returns the passed-in Object as-is.
 	 * Subclasses might override this to automatically detach result
 	 * collections or even single result objects.
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 e109f86894..2bd4b8b79f 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
@@ -195,7 +195,7 @@ public class JdoTransactionManager extends AbstractPlatformTransactionManager
 
 	/**
 	 * Set whether to autodetect a JDBC DataSource used by the JDO PersistenceManagerFactory,
-	 * as returned by the <code>getConnectionFactory()</code> method. Default is "true".
+	 * as returned by the {@code getConnectionFactory()} method. Default is "true".
 	 * <p>Can be turned off to deliberately ignore an available DataSource,
 	 * to not expose JDO transactions as JDBC transactions for that DataSource.
 	 * @see #setDataSource
@@ -509,7 +509,7 @@ public class JdoTransactionManager extends AbstractPlatformTransactionManager
 
 	/**
 	 * Convert the given JDOException to an appropriate exception from the
-	 * <code>org.springframework.dao</code> hierarchy.
+	 * {@code org.springframework.dao} hierarchy.
 	 * <p>The default implementation delegates to the JdoDialect.
 	 * May be overridden in subclasses.
 	 * @param ex JDOException that occured
@@ -588,7 +588,7 @@ public class JdoTransactionManager extends AbstractPlatformTransactionManager
 
 	/**
 	 * Holder for suspended resources.
-	 * Used internally by <code>doSuspend</code> and <code>doResume</code>.
+	 * Used internally by {@code doSuspend} and {@code doResume}.
 	 */
 	private static class SuspendedResourcesHolder {
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
index 723445fcb9..e0aa2c7685 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
@@ -93,9 +93,9 @@ import org.springframework.util.CollectionUtils;
  * into a JDO PersistenceManagerFactory. With the standard properties-driven approach,
  * you can only use an internal connection pool or a JNDI DataSource.
  *
- * <p>The <code>close()</code> method is standardized in JDO; don't forget to
+ * <p>The {@code close()} method is standardized in JDO; don't forget to
  * specify it as "destroy-method" for any PersistenceManagerFactory instance.
- * Note that this FactoryBean will automatically invoke <code>close()</code> for
+ * Note that this FactoryBean will automatically invoke {@code close()} for
  * the PersistenceManagerFactory that it creates, without any special configuration.
  *
  * @author Juergen Hoeller
@@ -164,7 +164,7 @@ public class LocalPersistenceManagerFactoryBean implements FactoryBean<Persisten
 
 	/**
 	 * Specify JDO properties as a Map, to be passed into
-	 * <code>JDOHelper.getPersistenceManagerFactory</code> (if any).
+	 * {@code JDOHelper.getPersistenceManagerFactory} (if any).
 	 * <p>Can be populated with a "map" or "props" element in XML bean definitions.
 	 * @see javax.jdo.JDOHelper#getPersistenceManagerFactory(java.util.Map)
 	 */
@@ -244,7 +244,7 @@ public class LocalPersistenceManagerFactoryBean implements FactoryBean<Persisten
 	 * Subclasses can override this to perform custom initialization of the
 	 * PersistenceManagerFactory instance, creating it for the specified name.
 	 * <p>The default implementation invokes JDOHelper's
-	 * <code>getPersistenceManagerFactory(String)</code> method.
+	 * {@code getPersistenceManagerFactory(String)} method.
 	 * A custom implementation could prepare the instance in a specific way,
 	 * or use a custom PersistenceManagerFactory implementation.
 	 * @param name the name of the desired PersistenceManagerFactory
@@ -260,7 +260,7 @@ public class LocalPersistenceManagerFactoryBean implements FactoryBean<Persisten
 	 * PersistenceManagerFactory instance, creating it via the given Properties
 	 * that got prepared by this LocalPersistenceManagerFactoryBean.
 	 * <p>The default implementation invokes JDOHelper's
-	 * <code>getPersistenceManagerFactory(Map)</code> method.
+	 * {@code getPersistenceManagerFactory(Map)} method.
 	 * A custom implementation could prepare the instance in a specific way,
 	 * or use a custom PersistenceManagerFactory implementation.
 	 * @param props the merged properties prepared by this LocalPersistenceManagerFactoryBean
@@ -293,7 +293,7 @@ public class LocalPersistenceManagerFactoryBean implements FactoryBean<Persisten
 	 * Implementation of the PersistenceExceptionTranslator interface,
 	 * as autodetected by Spring's PersistenceExceptionTranslationPostProcessor.
 	 * <p>Converts the exception if it is a JDOException, preferably using a specified
-	 * JdoDialect. Else returns <code>null</code> to indicate an unknown exception.
+	 * JdoDialect. Else returns {@code null} to indicate an unknown exception.
 	 * @see org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor
 	 * @see JdoDialect#translateException
 	 * @see PersistenceManagerFactoryUtils#convertJdoAccessException
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
index 0ec7f40a25..55c5d6b33c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
@@ -75,8 +75,8 @@ public abstract class PersistenceManagerFactoryUtils {
 	 * <p>If a DataSource is found, creates a SQLErrorCodeSQLExceptionTranslator for the
 	 * DataSource; else, falls back to a SQLStateSQLExceptionTranslator.
 	 * @param connectionFactory the connection factory of the PersistenceManagerFactory
-	 * (may be <code>null</code>)
-	 * @return the SQLExceptionTranslator (never <code>null</code>)
+	 * (may be {@code null})
+	 * @return the SQLExceptionTranslator (never {@code null})
 	 * @see javax.jdo.PersistenceManagerFactory#getConnectionFactory()
 	 * @see org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator
 	 * @see org.springframework.jdbc.support.SQLStateSQLExceptionTranslator
@@ -95,14 +95,14 @@ public abstract class PersistenceManagerFactoryUtils {
 	 * Obtain a JDO PersistenceManager via the given factory. Is aware of a
 	 * corresponding PersistenceManager bound to the current thread,
 	 * for example when using JdoTransactionManager. Will create a new
-	 * PersistenceManager else, if "allowCreate" is <code>true</code>.
+	 * PersistenceManager else, if "allowCreate" is {@code true}.
 	 * @param pmf PersistenceManagerFactory to create the PersistenceManager with
 	 * @param allowCreate if a non-transactional PersistenceManager should be created
 	 * when no transactional PersistenceManager can be found for the current thread
 	 * @return the PersistenceManager
 	 * @throws DataAccessResourceFailureException if the PersistenceManager couldn't be obtained
 	 * @throws IllegalStateException if no thread-bound PersistenceManager found and
-	 * "allowCreate" is <code>false</code>
+	 * "allowCreate" is {@code false}
 	 * @see JdoTransactionManager
 	 */
 	public static PersistenceManager getPersistenceManager(PersistenceManagerFactory pmf, boolean allowCreate)
@@ -120,15 +120,15 @@ public abstract class PersistenceManagerFactoryUtils {
 	 * Obtain a JDO PersistenceManager via the given factory. Is aware of a
 	 * corresponding PersistenceManager bound to the current thread,
 	 * for example when using JdoTransactionManager. Will create a new
-	 * PersistenceManager else, if "allowCreate" is <code>true</code>.
-	 * <p>Same as <code>getPersistenceManager</code>, but throwing the original JDOException.
+	 * PersistenceManager else, if "allowCreate" is {@code true}.
+	 * <p>Same as {@code getPersistenceManager}, but throwing the original JDOException.
 	 * @param pmf PersistenceManagerFactory to create the PersistenceManager with
 	 * @param allowCreate if a non-transactional PersistenceManager should be created
 	 * when no transactional PersistenceManager can be found for the current thread
 	 * @return the PersistenceManager
 	 * @throws JDOException if the PersistenceManager couldn't be created
 	 * @throws IllegalStateException if no thread-bound PersistenceManager found and
-	 * "allowCreate" is <code>false</code>
+	 * "allowCreate" is {@code false}
 	 * @see #getPersistenceManager(javax.jdo.PersistenceManagerFactory, boolean)
 	 * @see JdoTransactionManager
 	 */
@@ -176,7 +176,7 @@ public abstract class PersistenceManagerFactoryUtils {
 	 * bound to the current thread by Spring's transaction facilities.
 	 * @param pm the JDO PersistenceManager to check
 	 * @param pmf JDO PersistenceManagerFactory that the PersistenceManager
-	 * was created with (can be <code>null</code>)
+	 * was created with (can be {@code null})
 	 * @return whether the PersistenceManager is transactional
 	 */
 	public static boolean isPersistenceManagerTransactional(
@@ -195,7 +195,7 @@ public abstract class PersistenceManagerFactoryUtils {
 	 * @param query the JDO Query object
 	 * @param pmf JDO PersistenceManagerFactory that the Query was created for
 	 * @param jdoDialect the JdoDialect to use for applying a query timeout
-	 * (must not be <code>null</code>)
+	 * (must not be {@code null})
 	 * @throws JDOException if thrown by JDO methods
 	 * @see JdoDialect#applyQueryTimeout
 	 */
@@ -212,7 +212,7 @@ public abstract class PersistenceManagerFactoryUtils {
 
 	/**
 	 * Convert the given JDOException to an appropriate exception from the
-	 * <code>org.springframework.dao</code> hierarchy.
+	 * {@code org.springframework.dao} hierarchy.
 	 * <p>The most important cases like object not found or optimistic locking
 	 * failure are covered here. For more fine-granular conversion, JdoAccessor and
 	 * JdoTransactionManager support sophisticated translation of exceptions via a
@@ -251,7 +251,7 @@ public abstract class PersistenceManagerFactoryUtils {
 	 * if it is not managed externally (i.e. not bound to the thread).
 	 * @param pm PersistenceManager to close
 	 * @param pmf PersistenceManagerFactory that the PersistenceManager was created with
-	 * (can be <code>null</code>)
+	 * (can be {@code null})
 	 */
 	public static void releasePersistenceManager(PersistenceManager pm, PersistenceManagerFactory pmf) {
 		try {
@@ -267,10 +267,10 @@ public abstract class PersistenceManagerFactoryUtils {
 
 	/**
 	 * Actually release a PersistenceManager for the given factory.
-	 * Same as <code>releasePersistenceManager</code>, but throwing the original JDOException.
+	 * Same as {@code releasePersistenceManager}, but throwing the original JDOException.
 	 * @param pm PersistenceManager to close
 	 * @param pmf PersistenceManagerFactory that the PersistenceManager was created with
-	 * (can be <code>null</code>)
+	 * (can be {@code null})
 	 * @throws JDOException if thrown by JDO methods
 	 */
 	public static void doReleasePersistenceManager(PersistenceManager pm, PersistenceManagerFactory pmf)
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java
index a01ba2f117..b0603ebf5a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java
@@ -31,11 +31,11 @@ import org.springframework.util.ClassUtils;
  * Proxy for a target JDO {@link javax.jdo.PersistenceManagerFactory},
  * returning the current thread-bound PersistenceManager (the Spring-managed
  * transactional PersistenceManager or the single OpenPersistenceManagerInView
- * PersistenceManager) on <code>getPersistenceManager()</code>, if any.
+ * PersistenceManager) on {@code getPersistenceManager()}, if any.
  *
- * <p>Essentially, <code>getPersistenceManager()</code> calls get seamlessly
+ * <p>Essentially, {@code getPersistenceManager()} calls get seamlessly
  * forwarded to {@link PersistenceManagerFactoryUtils#getPersistenceManager}.
- * Furthermore, <code>PersistenceManager.close</code> calls get forwarded to
+ * Furthermore, {@code PersistenceManager.close} calls get forwarded to
  * {@link PersistenceManagerFactoryUtils#releasePersistenceManager}.
  *
  * <p>The main advantage of this proxy is that it allows DAOs to work with a
@@ -104,8 +104,8 @@ public class TransactionAwarePersistenceManagerFactoryProxy implements FactoryBe
 	 * <p>Default is "true". Can be turned off to enforce access to
 	 * transactional PersistenceManagers, which safely allows for DAOs
 	 * written to get a PersistenceManager without explicit closing
-	 * (i.e. a <code>PersistenceManagerFactory.getPersistenceManager()</code>
-	 * call without corresponding <code>PersistenceManager.close()</code> call).
+	 * (i.e. a {@code PersistenceManagerFactory.getPersistenceManager()}
+	 * call without corresponding {@code PersistenceManager.close()} call).
 	 * @see PersistenceManagerFactoryUtils#getPersistenceManager(javax.jdo.PersistenceManagerFactory, boolean)
 	 */
 	public void setAllowCreate(boolean allowCreate) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java
index 5b0ec257b1..81e1362c6a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java
@@ -37,12 +37,12 @@ import org.springframework.orm.jdo.PersistenceManagerFactoryUtils;
  * <p>This base class is mainly intended for JdoTemplate usage but can also
  * be used when working with PersistenceManagerFactoryUtils directly, for example
  * in combination with JdoInterceptor-managed PersistenceManagers. Convenience
- * <code>getPersistenceManager</code> and <code>releasePersistenceManager</code>
+ * {@code getPersistenceManager} and {@code releasePersistenceManager}
  * methods are provided for that usage style.
  *
  * <p>This class will create its own JdoTemplate if only a PersistenceManagerFactory
  * is passed in. The "allowCreate" flag on that JdoTemplate will be "true" by default.
- * A custom JdoTemplate instance can be used through overriding <code>createJdoTemplate</code>.
+ * A custom JdoTemplate instance can be used through overriding {@code createJdoTemplate}.
  *
  * @author Juergen Hoeller
  * @since 28.07.2003
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 f3ad90ecfb..506cfde95e 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
@@ -45,7 +45,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * as for non-transactional read-only execution.
  *
  * <p>Looks up the PersistenceManagerFactory in Spring's root web application context.
- * Supports a "persistenceManagerFactoryBeanName" filter init-param in <code>web.xml</code>;
+ * 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).
@@ -118,7 +118,7 @@ public class OpenPersistenceManagerInViewFilter extends OncePerRequestFilter {
 	/**
 	 * Look up the PersistenceManagerFactory that this filter should use,
 	 * taking the current HTTP request as argument.
-	 * <p>Default implementation delegates to the <code>lookupPersistenceManagerFactory</code>
+	 * <p>Default implementation delegates to the {@code lookupPersistenceManagerFactory}
 	 * without arguments.
 	 * @return the PersistenceManagerFactory to use
 	 * @see #lookupPersistenceManagerFactory()
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java
index a27a1c7f2b..16dbe855c9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java
@@ -105,7 +105,7 @@ public class SpringPersistenceManagerProxyBean implements FactoryBean<Persistenc
 	/**
 	 * Specify the PersistenceManager interface to expose,
 	 * possibly including vendor extensions.
-	 * <p>Default is the standard <code>javax.jdo.PersistenceManager</code> interface.
+	 * <p>Default is the standard {@code javax.jdo.PersistenceManager} interface.
 	 */
 	public void setPersistenceManagerInterface(Class<? extends PersistenceManager> persistenceManagerInterface) {
 		this.persistenceManagerInterface = persistenceManagerInterface;
@@ -127,8 +127,8 @@ public class SpringPersistenceManagerProxyBean implements FactoryBean<Persistenc
 	 * <p>Default is "true". Can be turned off to enforce access to
 	 * transactional PersistenceManagers, which safely allows for DAOs
 	 * written to get a PersistenceManager without explicit closing
-	 * (i.e. a <code>PersistenceManagerFactory.getPersistenceManager()</code>
-	 * call without corresponding <code>PersistenceManager.close()</code> call).
+	 * (i.e. a {@code PersistenceManagerFactory.getPersistenceManager()}
+	 * call without corresponding {@code PersistenceManager.close()} call).
 	 * @see org.springframework.orm.jdo.PersistenceManagerFactoryUtils#getPersistenceManager(javax.jdo.PersistenceManagerFactory, boolean)
 	 */
 	public void setAllowCreate(boolean allowCreate) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/package-info.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/package-info.java
index d38c0c3fee..8801fcd13f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/package-info.java
@@ -1,7 +1,6 @@
-
 /**
  *
- * Classes supporting the <code>org.springframework.orm.jdo</code> package.
+ * Classes supporting the {@code org.springframework.orm.jdo} package.
  * Contains a DAO base class for JdoTemplate usage.
  *
  */
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
index 46f9e167a9..bf49c8aa40 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
@@ -163,7 +163,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 
 	/**
 	 * Specify JPA properties, to be passed into
-	 * <code>Persistence.createEntityManagerFactory</code> (if any).
+	 * {@code Persistence.createEntityManagerFactory} (if any).
 	 * <p>Can be populated with a String "value" (parsed via PropertiesEditor) or a
 	 * "props" element in XML bean definitions.
 	 * @see javax.persistence.Persistence#createEntityManagerFactory(String, java.util.Map)
@@ -175,7 +175,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 
 	/**
 	 * Specify JPA properties as a Map, to be passed into
-	 * <code>Persistence.createEntityManagerFactory</code> (if any).
+	 * {@code Persistence.createEntityManagerFactory} (if any).
 	 * <p>Can be populated with a "map" or "props" element in XML bean definitions.
 	 * @see javax.persistence.Persistence#createEntityManagerFactory(String, java.util.Map)
 	 * @see javax.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory(javax.persistence.spi.PersistenceUnitInfo, java.util.Map)
@@ -200,7 +200,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 	 * Specify the (potentially vendor-specific) EntityManagerFactory interface
 	 * that this EntityManagerFactory proxy is supposed to implement.
 	 * <p>The default will be taken from the specific JpaVendorAdapter, if any,
-	 * or set to the standard <code>javax.persistence.EntityManagerFactory</code>
+	 * or set to the standard {@code javax.persistence.EntityManagerFactory}
 	 * interface else.
 	 * @see JpaVendorAdapter#getEntityManagerFactoryInterface()
 	 */
@@ -213,7 +213,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 	 * Specify the (potentially vendor-specific) EntityManager interface
 	 * that this factory's EntityManagers are supposed to implement.
 	 * <p>The default will be taken from the specific JpaVendorAdapter, if any,
-	 * or set to the standard <code>javax.persistence.EntityManager</code>
+	 * or set to the standard {@code javax.persistence.EntityManager}
 	 * interface else.
 	 * @see JpaVendorAdapter#getEntityManagerInterface()
 	 * @see EntityManagerFactoryInfo#getEntityManagerInterface()
@@ -254,7 +254,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 
 	/**
 	 * Return the JpaVendorAdapter implementation for this
-	 * EntityManagerFactory, or <code>null</code> if not known.
+	 * EntityManagerFactory, or {@code null} if not known.
 	 */
 	public JpaVendorAdapter getJpaVendorAdapter() {
 		return this.jpaVendorAdapter;
@@ -383,7 +383,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 
 	/**
 	 * Subclasses must implement this method to create the EntityManagerFactory
-	 * that will be returned by the <code>getObject()</code> method.
+	 * that will be returned by the {@code getObject()} method.
 	 * @return EntityManagerFactory instance returned by this FactoryBean
 	 * @throws PersistenceException if the EntityManager cannot be created
 	 */
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 6e3aab3155..ecf62bb232 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
@@ -48,12 +48,12 @@ public class DefaultJpaDialect implements JpaDialect, Serializable {
 	//-------------------------------------------------------------------------
 
 	/**
-	 * This implementation invokes the standard JPA <code>Transaction.begin</code>
+	 * This implementation invokes the standard JPA {@code Transaction.begin}
 	 * method. Throws an InvalidIsolationLevelException if a non-default isolation
 	 * level is set.
 	 * <p>This implementation does not return any transaction data Object, since there
 	 * is no state to be kept for a standard JPA transaction. Hence, subclasses do not
-	 * have to care about the return value (<code>null</code>) of this implementation
+	 * have to care about the return value ({@code null}) of this implementation
 	 * and are free to return their own transaction data Object.
 	 * @see javax.persistence.EntityTransaction#begin
 	 * @see org.springframework.transaction.InvalidIsolationLevelException
@@ -78,7 +78,7 @@ public class DefaultJpaDialect implements JpaDialect, Serializable {
 	}
 
 	/**
-	 * This implementation does nothing, since the default <code>beginTransaction</code>
+	 * This implementation does nothing, since the default {@code beginTransaction}
 	 * implementation does not require any cleanup.
 	 * @see #beginTransaction
 	 */
@@ -86,7 +86,7 @@ public class DefaultJpaDialect implements JpaDialect, Serializable {
 	}
 
 	/**
-	 * This implementation always returns <code>null</code>,
+	 * This implementation always returns {@code null},
 	 * indicating that no JDBC Connection can be provided.
 	 */
 	public ConnectionHandle getJdbcConnection(EntityManager entityManager, boolean readOnly)
@@ -100,7 +100,7 @@ public class DefaultJpaDialect implements JpaDialect, Serializable {
 	 * will implicitly be closed with the EntityManager.
 	 * <p>If the JPA implementation returns a Connection handle that it expects
 	 * the application to close after use, the dialect implementation needs to invoke
-	 * <code>Connection.close()</code> (or some other method with similar effect) here.
+	 * {@code Connection.close()} (or some other method with similar effect) here.
 	 * @see java.sql.Connection#close()
 	 */
 	public void releaseJdbcConnection(ConnectionHandle conHandle, EntityManager em)
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
index 005b6c1c6a..61fd9480a0 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
@@ -94,7 +94,7 @@ public abstract class EntityManagerFactoryAccessor implements BeanFactoryAware {
 
 	/**
 	 * Specify JPA properties, to be passed into
-	 * <code>EntityManagerFactory.createEntityManager(Map)</code> (if any).
+	 * {@code EntityManagerFactory.createEntityManager(Map)} (if any).
 	 * <p>Can be populated with a String "value" (parsed via PropertiesEditor)
 	 * or a "props" element in XML bean definitions.
 	 * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
@@ -105,7 +105,7 @@ public abstract class EntityManagerFactoryAccessor implements BeanFactoryAware {
 
 	/**
 	 * Specify JPA properties as a Map, to be passed into
-	 * <code>EntityManagerFactory.createEntityManager(Map)</code> (if any).
+	 * {@code EntityManagerFactory.createEntityManager(Map)} (if any).
 	 * <p>Can be populated with a "map" or "props" element in XML bean definitions.
 	 * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
 	 */
@@ -158,7 +158,7 @@ public abstract class EntityManagerFactoryAccessor implements BeanFactoryAware {
 
 	/**
 	 * Obtain the transactional EntityManager for this accessor's EntityManagerFactory, if any.
-	 * @return the transactional EntityManager, or <code>null</code> if none
+	 * @return the transactional EntityManager, or {@code null} if none
 	 * @throws IllegalStateException if this accessor is not configured with an EntityManagerFactory
 	 * @see EntityManagerFactoryUtils#getTransactionalEntityManager(javax.persistence.EntityManagerFactory)
 	 * @see EntityManagerFactoryUtils#getTransactionalEntityManager(javax.persistence.EntityManagerFactory, java.util.Map)
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
index 140d1fef0b..9e89098473 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
@@ -36,7 +36,7 @@ public interface EntityManagerFactoryInfo {
 
 	/**
 	 * Return the raw underlying EntityManagerFactory.
-	 * @return the unadorned EntityManagerFactory (never <code>null</code>)
+	 * @return the unadorned EntityManagerFactory (never {@code null})
 	 */
 	EntityManagerFactory getNativeEntityManagerFactory();
 
@@ -44,7 +44,7 @@ public interface EntityManagerFactoryInfo {
 	 * Return the underlying PersistenceProvider that the underlying
 	 * EntityManagerFactory was created with.
 	 * @return the PersistenceProvider used to create this EntityManagerFactory,
-	 * or <code>null</code> if the standard JPA provider autodetection process
+	 * or {@code null} if the standard JPA provider autodetection process
 	 * was used to configure the EntityManagerFactory
 	 */
 	PersistenceProvider getPersistenceProvider();
@@ -53,17 +53,17 @@ public interface EntityManagerFactoryInfo {
 	 * Return the PersistenceUnitInfo used to create this
 	 * EntityManagerFactory, if the in-container API was used.
 	 * @return the PersistenceUnitInfo used to create this EntityManagerFactory,
-	 * or <code>null</code> if the in-container contract was not used to
+	 * or {@code null} if the in-container contract was not used to
 	 * configure the EntityManagerFactory
 	 */
 	PersistenceUnitInfo getPersistenceUnitInfo();
 
 	/**
 	 * Return the name of the persistence unit used to create this
-	 * EntityManagerFactory, or <code>null</code> if it is an unnamed default.
-	 * <p>If <code>getPersistenceUnitInfo()</code> returns non-null, the result of
-	 * <code>getPersistenceUnitName()</code> must be equal to the value returned by
-	 * <code>PersistenceUnitInfo.getPersistenceUnitName()</code>.
+	 * EntityManagerFactory, or {@code null} if it is an unnamed default.
+	 * <p>If {@code getPersistenceUnitInfo()} returns non-null, the result of
+	 * {@code getPersistenceUnitName()} must be equal to the value returned by
+	 * {@code PersistenceUnitInfo.getPersistenceUnitName()}.
 	 * @see #getPersistenceUnitInfo()
 	 * @see javax.persistence.spi.PersistenceUnitInfo#getPersistenceUnitName()
 	 */
@@ -72,22 +72,22 @@ public interface EntityManagerFactoryInfo {
 	/**
 	 * Return the JDBC DataSource that this EntityManagerFactory
 	 * obtains its JDBC Connections from.
-	 * @return the JDBC DataSource, or <code>null</code> if not known
+	 * @return the JDBC DataSource, or {@code null} if not known
 	 */
 	DataSource getDataSource();
 
 	/**
 	 * Return the (potentially vendor-specific) EntityManager interface
 	 * that this factory's EntityManagers will implement.
-	 * <p>A <code>null</code> return value suggests that autodetection is supposed
-	 * to happen: either based on a target <code>EntityManager</code> instance
-	 * or simply defaulting to <code>javax.persistence.EntityManager</code>.
+	 * <p>A {@code null} return value suggests that autodetection is supposed
+	 * to happen: either based on a target {@code EntityManager} instance
+	 * or simply defaulting to {@code javax.persistence.EntityManager}.
 	 */
 	Class<? extends EntityManager> getEntityManagerInterface();
 
 	/**
 	 * Return the vendor-specific JpaDialect implementation for this
-	 * EntityManagerFactory, or <code>null</code> if not known.
+	 * EntityManagerFactory, or {@code null} if not known.
 	 */
 	JpaDialect getJpaDialect();
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
index 11b743aecf..9419950001 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
@@ -81,7 +81,7 @@ public abstract class EntityManagerFactoryUtils {
 	 * the persistence unit name will be matched against the Spring bean name,
 	 * assuming that the EntityManagerFactory bean names follow that convention.
 	 * @param beanFactory the ListableBeanFactory to search
-	 * @param unitName the name of the persistence unit (may be <code>null</code> or empty,
+	 * @param unitName the name of the persistence unit (may be {@code null} or empty,
 	 * in which case a single bean of type EntityManagerFactory will be searched for)
 	 * @return the EntityManagerFactory
 	 * @throws NoSuchBeanDefinitionException if there is no such EntityManagerFactory in the context
@@ -116,9 +116,9 @@ public abstract class EntityManagerFactoryUtils {
 	 * Obtain a JPA EntityManager from the given factory. Is aware of a
 	 * corresponding EntityManager bound to the current thread,
 	 * for example when using JpaTransactionManager.
-	 * <p>Note: Will return <code>null</code> if no thread-bound EntityManager found!
+	 * <p>Note: Will return {@code null} if no thread-bound EntityManager found!
 	 * @param emf EntityManagerFactory to create the EntityManager with
-	 * @return the EntityManager, or <code>null</code> if none found
+	 * @return the EntityManager, or {@code null} if none found
 	 * @throws DataAccessResourceFailureException if the EntityManager couldn't be obtained
 	 * @see JpaTransactionManager
 	 */
@@ -132,11 +132,11 @@ public abstract class EntityManagerFactoryUtils {
 	 * Obtain a JPA EntityManager from the given factory. Is aware of a
 	 * corresponding EntityManager bound to the current thread,
 	 * for example when using JpaTransactionManager.
-	 * <p>Note: Will return <code>null</code> if no thread-bound EntityManager found!
+	 * <p>Note: Will return {@code null} if no thread-bound EntityManager found!
 	 * @param emf EntityManagerFactory to create the EntityManager with
-	 * @param properties the properties to be passed into the <code>createEntityManager</code>
-	 * call (may be <code>null</code>)
-	 * @return the EntityManager, or <code>null</code> if none found
+	 * @param properties the properties to be passed into the {@code createEntityManager}
+	 * call (may be {@code null})
+	 * @return the EntityManager, or {@code null} if none found
 	 * @throws DataAccessResourceFailureException if the EntityManager couldn't be obtained
 	 * @see JpaTransactionManager
 	 */
@@ -154,11 +154,11 @@ public abstract class EntityManagerFactoryUtils {
 	 * Obtain a JPA EntityManager from the given factory. Is aware of a
 	 * corresponding EntityManager bound to the current thread,
 	 * for example when using JpaTransactionManager.
-	 * <p>Same as <code>getEntityManager</code>, but throwing the original PersistenceException.
+	 * <p>Same as {@code getEntityManager}, but throwing the original PersistenceException.
 	 * @param emf EntityManagerFactory to create the EntityManager with
-	 * @param properties the properties to be passed into the <code>createEntityManager</code>
-	 * call (may be <code>null</code>)
-	 * @return the EntityManager, or <code>null</code> if none found
+	 * @param properties the properties to be passed into the {@code createEntityManager}
+	 * call (may be {@code null})
+	 * @return the EntityManager, or {@code null} if none found
 	 * @throws javax.persistence.PersistenceException if the EntityManager couldn't be created
 	 * @see #getTransactionalEntityManager(javax.persistence.EntityManagerFactory)
 	 * @see JpaTransactionManager
@@ -273,7 +273,7 @@ public abstract class EntityManagerFactoryUtils {
 
 	/**
 	 * Convert the given runtime exception to an appropriate exception from the
-	 * <code>org.springframework.dao</code> hierarchy.
+	 * {@code org.springframework.dao} hierarchy.
 	 * Return null if no translation is appropriate: any other exception may
 	 * have resulted from user code, and should not be translated.
 	 * <p>The most important cases like object not found or optimistic locking failure
@@ -281,7 +281,7 @@ public abstract class EntityManagerFactoryUtils {
 	 * support sophisticated translation of exceptions via a JpaDialect.
 	 * @param ex runtime exception that occurred
 	 * @return the corresponding DataAccessException instance,
-	 * or <code>null</code> if the exception should not be translated
+	 * or {@code null} if the exception should not be translated
 	 */
 	public static DataAccessException convertJpaAccessExceptionIfPossible(RuntimeException ex) {
 		// Following the JPA specification, a persistence provider can also
@@ -327,7 +327,7 @@ public abstract class EntityManagerFactoryUtils {
 	/**
 	 * Close the given JPA EntityManager,
 	 * catching and logging any cleanup exceptions thrown.
-	 * @param em the JPA EntityManager to close (may be <code>null</code>)
+	 * @param em the JPA EntityManager to close (may be {@code null})
 	 * @see javax.persistence.EntityManager#close()
 	 */
 	public static void closeEntityManager(EntityManager em) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java
index 575fe432ad..14419ff144 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java
@@ -38,7 +38,7 @@ public interface EntityManagerProxy extends EntityManager {
 	 * <p>In case of a shared ("transactional") EntityManager, this will be
 	 * the raw EntityManager that is currently associated with the transaction.
 	 * Outside of a transaction, an IllegalStateException will be thrown.
-	 * @return the underlying raw EntityManager (never <code>null</code>)
+	 * @return the underlying raw EntityManager (never {@code null})
 	 * @throws IllegalStateException if no underlying EntityManager is available
 	 */
 	EntityManager getTargetEntityManager() throws IllegalStateException;
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
index eb5109f9b3..21a844ed4a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
@@ -48,7 +48,7 @@ import org.springframework.util.CollectionUtils;
  * semantics for "extended" EntityManagers.
  *
  * <p>Supports explicit joining of a transaction through the
- * <code>joinTransaction()</code> method ("application-managed extended
+ * {@code joinTransaction()} method ("application-managed extended
  * EntityManager") as well as automatic joining on each operation
  * ("container-managed extended EntityManager").
  *
@@ -60,11 +60,11 @@ public abstract class ExtendedEntityManagerCreator {
 
 	/**
 	 * Create an EntityManager that can join transactions with the
-	 * <code>joinTransaction()</code> method, but is not automatically
+	 * {@code joinTransaction()} method, but is not automatically
 	 * managed by the container.
 	 * @param rawEntityManager raw EntityManager
 	 * @param plusOperations an implementation of the EntityManagerPlusOperations
-	 * interface, if those operations should be exposed (may be <code>null</code>)
+	 * interface, if those operations should be exposed (may be {@code null})
 	 * @return an application-managed EntityManager that can join transactions
 	 * but does not participate in them automatically
 	 */
@@ -76,14 +76,14 @@ public abstract class ExtendedEntityManagerCreator {
 
 	/**
 	 * Create an EntityManager that can join transactions with the
-	 * <code>joinTransaction()</code> method, but is not automatically
+	 * {@code joinTransaction()} method, but is not automatically
 	 * managed by the container.
 	 * @param rawEntityManager raw EntityManager
 	 * @param plusOperations an implementation of the EntityManagerPlusOperations
-	 * interface, if those operations should be exposed (may be <code>null</code>)
+	 * interface, if those operations should be exposed (may be {@code null})
 	 * @param exceptionTranslator the exception translator to use for translating
 	 * JPA commit/rollback exceptions during transaction synchronization
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @return an application-managed EntityManager that can join transactions
 	 * but does not participate in them automatically
 	 */
@@ -96,7 +96,7 @@ public abstract class ExtendedEntityManagerCreator {
 
 	/**
 	 * Create an EntityManager that can join transactions with the
-	 * <code>joinTransaction()</code> method, but is not automatically
+	 * {@code joinTransaction()} method, but is not automatically
 	 * managed by the container.
 	 * @param rawEntityManager raw EntityManager
 	 * @param emfInfo the EntityManagerFactoryInfo to obtain the
@@ -116,7 +116,7 @@ public abstract class ExtendedEntityManagerCreator {
 	 * operation in a transaction.
 	 * @param rawEntityManager raw EntityManager
 	 * @param plusOperations an implementation of the EntityManagerPlusOperations
-	 * interface, if those operations should be exposed (may be <code>null</code>)
+	 * interface, if those operations should be exposed (may be {@code null})
 	 * @return a container-managed EntityManager that will automatically participate
 	 * in any managed transaction
 	 */
@@ -131,10 +131,10 @@ public abstract class ExtendedEntityManagerCreator {
 	 * operation in a transaction.
 	 * @param rawEntityManager raw EntityManager
 	 * @param plusOperations an implementation of the EntityManagerPlusOperations
-	 * interface, if those operations should be exposed (may be <code>null</code>)
+	 * interface, if those operations should be exposed (may be {@code null})
 	 * @param exceptionTranslator the exception translator to use for translating
 	 * JPA commit/rollback exceptions during transaction synchronization
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @return a container-managed EntityManager that will automatically participate
 	 * in any managed transaction
 	 */
@@ -183,8 +183,8 @@ public abstract class ExtendedEntityManagerCreator {
 	 * If this implements the EntityManagerFactoryInfo interface, appropriate handling
 	 * of the native EntityManagerFactory and available EntityManagerPlusOperations
 	 * will automatically apply.
-	 * @param properties the properties to be passed into the <code>createEntityManager</code>
-	 * call (may be <code>null</code>)
+	 * @param properties the properties to be passed into the {@code createEntityManager}
+	 * call (may be {@code null})
 	 * @return a container-managed EntityManager that will automatically participate
 	 * in any managed transaction
 	 * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
@@ -234,12 +234,12 @@ public abstract class ExtendedEntityManagerCreator {
 	 * Actually create the EntityManager proxy.
 	 * @param rawEm raw EntityManager
 	 * @param emIfc the (potentially vendor-specific) EntityManager
-	 * interface to proxy, or <code>null</code> for default detection of all interfaces
+	 * interface to proxy, or {@code null} for default detection of all interfaces
 	 * @param plusOperations an implementation of the EntityManagerPlusOperations
-	 * interface, if those operations should be exposed (may be <code>null</code>)
+	 * interface, if those operations should be exposed (may be {@code null})
 	 * @param exceptionTranslator the PersistenceException translator to use
 	 * @param jta whether to create a JTA-aware EntityManager
-	 * (or <code>null</code> if not known in advance)
+	 * (or {@code null} if not known in advance)
 	 * @param containerManaged whether to follow container-managed EntityManager
 	 * or application-managed EntityManager semantics
 	 * @return the EntityManager proxy
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java
index 3a823fe9b7..4495341ec4 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java
@@ -40,7 +40,7 @@ import org.springframework.dao.support.DataAccessUtils;
  * @see JpaInterceptor
  * @see JpaDialect
  * @deprecated as of Spring 3.1, in favor of native EntityManager usage
- * (typically obtained through <code>@PersistenceContext</code>)
+ * (typically obtained through {@code @PersistenceContext})
  */
 @Deprecated
 public abstract class JpaAccessor extends EntityManagerFactoryAccessor implements InitializingBean {
@@ -141,7 +141,7 @@ public abstract class JpaAccessor extends EntityManagerFactoryAccessor implement
 
 	/**
 	 * Convert the given runtime exception to an appropriate exception from the
-	 * <code>org.springframework.dao</code> hierarchy if necessary, or
+	 * {@code org.springframework.dao} hierarchy if necessary, or
 	 * return the exception itself if it is not persistence related
 	 * <p>Default implementation delegates to the JpaDialect.
 	 * May be overridden in subclasses.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java
index 7802c4473b..f3b1c81b9a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java
@@ -22,23 +22,23 @@ import javax.persistence.PersistenceException;
 /**
  * Callback interface for JPA code. To be used with {@link JpaTemplate}'s
  * execution method, often as anonymous classes within a method implementation.
- * A typical implementation will call <code>EntityManager.find/merge</code>
+ * A typical implementation will call {@code EntityManager.find/merge}
  * to perform some operations on persistent objects.
  *
  * @author Juergen Hoeller
  * @since 2.0
- * @see org.springframework.orm.jpa.JpaTemplate
- * @see org.springframework.orm.jpa.JpaTransactionManager
+ * @see JpaTemplate
+ * @see JpaTransactionManager
  * @deprecated as of Spring 3.1, in favor of native EntityManager usage
- * (typically obtained through <code>@PersistenceContext</code>)
+ * (typically obtained through {@code @PersistenceContext})
  */
 @Deprecated
 public interface JpaCallback<T> {
 
 	/**
-	 * Gets called by <code>JpaTemplate.execute</code> with an active
-	 * JPA <code>EntityManager</code>. Does not need to care about activating
-	 * or closing the <code>EntityManager</code>, or handling transactions.
+	 * Gets called by {@code JpaTemplate.execute} with an active
+	 * JPA {@code EntityManager}. Does not need to care about activating
+	 * or closing the {@code EntityManager}, or handling transactions.
 	 *
 	 * <p>Note that JPA callback code will not flush any modifications to the
 	 * database if not executed within a transaction. Thus, you need to make
@@ -51,10 +51,10 @@ public interface JpaCallback<T> {
 	 * It gets propagated to the caller of the template.
 	 *
 	 * @param em active EntityManager
-	 * @return a result object, or <code>null</code> if none
+	 * @return a result object, or {@code null} if none
 	 * @throws PersistenceException if thrown by the JPA API
-	 * @see org.springframework.orm.jpa.JpaTemplate#execute
-	 * @see org.springframework.orm.jpa.JpaTemplate#executeFind
+	 * @see JpaTemplate#execute
+	 * @see JpaTemplate#executeFind
 	 */
 	T doInJpa(EntityManager em) throws PersistenceException;
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
index 0d0562dbd6..6af89c88c9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
@@ -104,11 +104,11 @@ public interface JpaDialect extends PersistenceExceptionTranslator {
 	 * given Spring transaction definition (in particular, an isolation level
 	 * and a timeout). Called by JpaTransactionManager on transaction begin.
 	 * <p>An implementation can configure the JPA Transaction object and then
-	 * invoke <code>begin</code>, or invoke a special begin method that takes,
+	 * invoke {@code begin}, or invoke a special begin method that takes,
 	 * for example, an isolation level.
 	 * <p>An implementation can apply the read-only flag as flush mode. In that case,
 	 * a transaction data object can be returned that holds the previous flush mode
-	 * (and possibly other data), to be reset in <code>cleanupTransaction</code>.
+	 * (and possibly other data), to be reset in {@code cleanupTransaction}.
 	 * It may also apply the read-only flag and isolation level to the underlying
 	 * JDBC Connection before beginning the transaction.
 	 * <p>Implementations can also use the Spring transaction name, as exposed by the
@@ -138,7 +138,7 @@ public interface JpaDialect extends PersistenceExceptionTranslator {
 	 * EntityManagerFactoryUtils when enlisting an EntityManager in a JTA transaction.
 	 * <p>An implementation can apply the read-only flag as flush mode. In that case,
 	 * a transaction data object can be returned that holds the previous flush mode
-	 * (and possibly other data), to be reset in <code>cleanupTransaction</code>.
+	 * (and possibly other data), to be reset in {@code cleanupTransaction}.
 	 * <p>Implementations can also use the Spring transaction name, as exposed by the
 	 * passed-in TransactionDefinition, to optimize for specific data access use cases
 	 * (effectively using the current transaction name as use case identifier).
@@ -171,7 +171,7 @@ public interface JpaDialect extends PersistenceExceptionTranslator {
 	 * if accessing a relational database. This method will just get invoked if actually
 	 * needing access to the underlying JDBC Connection, usually within an active JPA
 	 * transaction (for example, by JpaTransactionManager). The returned handle will
-	 * be passed into the <code>releaseJdbcConnection</code> method when not needed anymore.
+	 * be passed into the {@code releaseJdbcConnection} method when not needed anymore.
 	 * <p>This strategy is necessary as JPA 1.0 does not provide a standard way to retrieve
 	 * the underlying JDBC Connection (due to the fact that a JPA implementation might not
 	 * work with a relational database at all).
@@ -183,12 +183,12 @@ public interface JpaDialect extends PersistenceExceptionTranslator {
 	 * <p>In a simple case where the returned Connection will be auto-closed with the
 	 * EntityManager or can be released via the Connection object itself, an
 	 * implementation can return a SimpleConnectionHandle that just contains the
-	 * Connection. If some other object is needed in <code>releaseJdbcConnection</code>,
+	 * Connection. If some other object is needed in {@code releaseJdbcConnection},
 	 * an implementation should use a special handle that references that other object.
 	 * @param entityManager the current JPA EntityManager
 	 * @param readOnly whether the Connection is only needed for read-only purposes
 	 * @return a handle for the JDBC Connection, to be passed into
-	 * <code>releaseJdbcConnection</code>, or <code>null</code>
+	 * {@code releaseJdbcConnection}, or {@code null}
 	 * if no JDBC Connection can be retrieved
 	 * @throws javax.persistence.PersistenceException if thrown by JPA methods
 	 * @throws java.sql.SQLException if thrown by JDBC methods
@@ -203,10 +203,10 @@ public interface JpaDialect extends PersistenceExceptionTranslator {
 
 	/**
 	 * Release the given JDBC Connection, which has originally been retrieved
-	 * via <code>getJdbcConnection</code>. This should be invoked in any case,
+	 * via {@code getJdbcConnection}. This should be invoked in any case,
 	 * to allow for proper release of the retrieved Connection handle.
 	 * <p>An implementation might simply do nothing, if the Connection returned
-	 * by <code>getJdbcConnection</code> will be implicitly closed when the JPA
+	 * by {@code getJdbcConnection} will be implicitly closed when the JPA
 	 * transaction completes or when the EntityManager is closed.
 	 * @param conHandle the JDBC Connection handle to release
 	 * @param entityManager the current JPA EntityManager
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java
index 3d5c3a62e7..b1cbfd409d 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java
@@ -30,8 +30,8 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * or from a surrounding JPA-intercepted method), the interceptor simply participates in it.
  *
  * <p>Application code must retrieve a JPA EntityManager via the
- * <code>EntityManagerFactoryUtils.getEntityManager</code> method or - preferably -
- * via a shared <code>EntityManager</code> reference, to be able to detect a
+ * {@code EntityManagerFactoryUtils.getEntityManager} method or - preferably -
+ * via a shared {@code EntityManager} reference, to be able to detect a
  * thread-bound EntityManager. Typically, the code will look like as follows:
  *
  * <pre>
@@ -40,9 +40,9 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * }</pre>
  *
  * <p>Note that this interceptor automatically translates PersistenceExceptions,
- * via delegating to the <code>EntityManagerFactoryUtils.convertJpaAccessException</code>
+ * via delegating to the {@code EntityManagerFactoryUtils.convertJpaAccessException}
  * method that converts them to exceptions that are compatible with the
- * <code>org.springframework.dao</code> exception hierarchy (like JpaTemplate does).
+ * {@code org.springframework.dao} exception hierarchy (like JpaTemplate does).
  *
  * <p>This class can be considered a declarative alternative to JpaTemplate's
  * callback approach. The advantages are:
@@ -63,7 +63,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @see JpaTransactionManager
  * @see JpaTemplate
  * @deprecated as of Spring 3.1, in favor of native EntityManager usage
- * (typically obtained through <code>@PersistenceContext</code>) and
+ * (typically obtained through {@code @PersistenceContext}) and
  * AOP-driven exception translation through
  * {@link org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor}
  */
@@ -75,7 +75,7 @@ public class JpaInterceptor extends JpaAccessor implements MethodInterceptor {
 
 	/**
 	 * Set whether to convert any PersistenceException raised to a Spring DataAccessException,
-	 * compatible with the <code>org.springframework.dao</code> exception hierarchy.
+	 * compatible with the {@code org.springframework.dao} exception hierarchy.
 	 * <p>Default is "true". Turn this flag off to let the caller receive raw exceptions
 	 * as-is, without any wrapping.
 	 * @see org.springframework.dao.DataAccessException
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java
index 1d7de7954b..0eaa5a6b61 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java
@@ -26,17 +26,17 @@ import org.springframework.dao.DataAccessException;
  * implemented by {@link JpaTemplate}. Not often used, but a useful
  * option to enhance testability, as it can easily be mocked or stubbed.
  *
- * <p>Defines <code>JpaTemplate</code>'s data access methods that mirror
+ * <p>Defines {@code JpaTemplate}'s data access methods that mirror
  * various {@link javax.persistence.EntityManager} methods. Users are
- * strongly encouraged to read the JPA <code>EntityManager</code>
+ * strongly encouraged to read the JPA {@code EntityManager}
  * javadocs for details on the semantics of those methods.
  *
  * <p>Note that lazy loading will just work with an open JPA
- * <code>EntityManager</code>, either within a managed transaction or within
+ * {@code EntityManager}, either within a managed transaction or within
  * {@link org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter}/
  * {@link org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor}.
  * Furthermore, some operations just make sense within transactions,
- * for example: <code>flush</code>, <code>clear</code>.
+ * for example: {@code flush}, {@code clear}.
  *
  * @author Juergen Hoeller
  * @since 2.0
@@ -47,7 +47,7 @@ import org.springframework.dao.DataAccessException;
  * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter
  * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor
  * @deprecated as of Spring 3.1, in favor of native EntityManager usage
- * (typically obtained through <code>@PersistenceContext</code>).
+ * (typically obtained through {@code @PersistenceContext}).
  * Note that this interface did not get upgraded to JPA 2.0 and never will.
  */
 @Deprecated
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
index 362374a6b5..a1742e2d3f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
@@ -23,7 +23,7 @@ import org.springframework.dao.UncategorizedDataAccessException;
 /**
  * JPA-specific subclass of UncategorizedDataAccessException,
  * for JPA system errors that do not match any concrete
- * <code>org.springframework.dao</code> exceptions.
+ * {@code org.springframework.dao} exceptions.
  *
  * @author Juergen Hoeller
  * @since 2.0
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java
index a0422e1972..d853b300fb 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java
@@ -36,7 +36,7 @@ import org.springframework.util.ClassUtils;
  * Helper class that allows for writing JPA data access code in the same style
  * as with Spring's well-known JdoTemplate and HibernateTemplate classes.
  * Automatically converts PersistenceExceptions into Spring DataAccessExceptions,
- * following the <code>org.springframework.dao</code> exception hierarchy.
+ * following the {@code org.springframework.dao} exception hierarchy.
  *
  * <p>The central method is of this template is "execute", supporting JPA access code
  * implementing the {@link JpaCallback} interface. It provides JPA EntityManager
@@ -86,7 +86,7 @@ import org.springframework.util.ClassUtils;
  * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter
  * @see org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor
  * @deprecated as of Spring 3.1, in favor of native EntityManager usage
- * (typically obtained through <code>@PersistenceContext</code>)
+ * (typically obtained through {@code @PersistenceContext})
  * Note that this class did not get upgraded to JPA 2.0 and never will.
  */
 @Deprecated
@@ -123,7 +123,7 @@ public class JpaTemplate extends JpaAccessor implements JpaOperations {
 	/**
 	 * Set whether to expose the native JPA EntityManager to JpaCallback
 	 * code. Default is "false": a EntityManager proxy will be returned,
-	 * suppressing <code>close</code> calls and automatically applying transaction
+	 * suppressing {@code close} calls and automatically applying transaction
 	 * timeouts (if any).
 	 * <p>As there is often a need to cast to a provider-specific EntityManager
 	 * class in DAOs that use the JPA 1.0 API, for JPA 2.0 previews and other
@@ -165,7 +165,7 @@ public class JpaTemplate extends JpaAccessor implements JpaOperations {
 	 * @param action callback object that specifies the JPA action
 	 * @param exposeNativeEntityManager whether to expose the native
 	 * JPA entity manager to callback code
-	 * @return a result object returned by the action, or <code>null</code>
+	 * @return a result object returned by the action, or {@code null}
 	 * @throws org.springframework.dao.DataAccessException in case of JPA errors
 	 */
 	public <T> T execute(JpaCallback<T> action, boolean exposeNativeEntityManager) throws DataAccessException {
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 a01f5ca69d..1fc5051713 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
@@ -181,7 +181,7 @@ public class JpaTransactionManager extends AbstractPlatformTransactionManager
 
 	/**
 	 * Specify JPA properties, to be passed into
-	 * <code>EntityManagerFactory.createEntityManager(Map)</code> (if any).
+	 * {@code EntityManagerFactory.createEntityManager(Map)} (if any).
 	 * <p>Can be populated with a String "value" (parsed via PropertiesEditor)
 	 * or a "props" element in XML bean definitions.
 	 * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
@@ -192,7 +192,7 @@ public class JpaTransactionManager extends AbstractPlatformTransactionManager
 
 	/**
 	 * Specify JPA properties as a Map, to be passed into
-	 * <code>EntityManagerFactory.createEntityManager(Map)</code> (if any).
+	 * {@code EntityManagerFactory.createEntityManager(Map)} (if any).
 	 * <p>Can be populated with a "map" or "props" element in XML bean definitions.
 	 * @see javax.persistence.EntityManagerFactory#createEntityManager(java.util.Map)
 	 */
@@ -698,7 +698,7 @@ public class JpaTransactionManager extends AbstractPlatformTransactionManager
 
 	/**
 	 * Holder for suspended resources.
-	 * Used internally by <code>doSuspend</code> and <code>doResume</code>.
+	 * Used internally by {@code doSuspend} and {@code doResume}.
 	 */
 	private static class SuspendedResourcesHolder {
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java
index 4f180d2ceb..975f07e106 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java
@@ -54,7 +54,7 @@ public interface JpaVendorAdapter {
 	 * the EntityManagerFactory bean, which might potentially override
 	 * individual JPA property values specified here.
 	 * @return a Map of JPA properties, as as accepted by the standard
-	 * JPA bootstrap facilities, or <code>null</code> or an empty Map
+	 * JPA bootstrap facilities, or {@code null} or an empty Map
 	 * if there are no such properties to expose
 	 * @see javax.persistence.Persistence#createEntityManagerFactory(String, java.util.Map)
 	 * @see javax.persistence.spi.PersistenceProvider#createContainerEntityManagerFactory(javax.persistence.spi.PersistenceUnitInfo, java.util.Map)
@@ -63,7 +63,7 @@ public interface JpaVendorAdapter {
 
 	/**
 	 * Return the vendor-specific JpaDialect implementation for this
-	 * provider, or <code>null</code> if there is none.
+	 * provider, or {@code null} if there is none.
 	 */
 	JpaDialect getJpaDialect();
 
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 5101620a5e..2779211fed 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
@@ -41,19 +41,19 @@ import org.springframework.util.ClassUtils;
  * up a shared JPA EntityManagerFactory in a Spring application context;
  * the EntityManagerFactory can then be passed to JPA-based DAOs via
  * dependency injection. Note that switching to a JNDI lookup or to a
- * {@link org.springframework.orm.jpa.LocalEntityManagerFactoryBean}
+ * {@link LocalEntityManagerFactoryBean}
  * definition is just a matter of configuration!
  *
  * <p>As with {@link LocalEntityManagerFactoryBean}, configuration settings
- * are usually read in from a <code>META-INF/persistence.xml</code> config file,
+ * are usually read in from a {@code META-INF/persistence.xml} config file,
  * residing in the class path, according to the general JPA configuration contract.
  * However, this FactoryBean is more flexible in that you can override the location
- * of the <code>persistence.xml</code> file, specify the JDBC DataSources to link to,
+ * of the {@code persistence.xml} file, specify the JDBC DataSources to link to,
  * etc. Furthermore, it allows for pluggable class instrumentation through Spring's
  * {@link org.springframework.instrument.classloading.LoadTimeWeaver} abstraction,
  * instead of being tied to a special VM agent specified on JVM startup.
  *
- * <p>Internally, this FactoryBean parses the <code>persistence.xml</code> file
+ * <p>Internally, this FactoryBean parses the {@code persistence.xml} file
  * itself and creates a corresponding {@link javax.persistence.spi.PersistenceUnitInfo}
  * object (with further configuration merged in, such as JDBC DataSources and the
  * Spring LoadTimeWeaver), to be passed to the chosen JPA
@@ -97,7 +97,7 @@ public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManage
 	 * <p>For reuse of existing persistence unit configuration or more advanced forms
 	 * of custom persistence unit handling, consider defining a separate
 	 * PersistenceUnitManager bean (typically a DefaultPersistenceUnitManager instance)
-	 * and linking it in here. <code>persistence.xml</code> location, DataSource
+	 * and linking it in here. {@code persistence.xml} location, DataSource
 	 * configuration and LoadTimeWeaver will be defined on that separate
 	 * DefaultPersistenceUnitManager bean in such a scenario.
 	 * @see #setPersistenceXmlLocation
@@ -110,12 +110,12 @@ public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManage
 	}
 
 	/**
-	 * Set the location of the <code>persistence.xml</code> file
+	 * Set the location of the {@code persistence.xml} file
 	 * we want to use. This is a Spring resource location.
 	 * <p>Default is "classpath:META-INF/persistence.xml".
 	 * <p><b>NOTE: Only applied if no external PersistenceUnitManager specified.</b>
 	 * @param persistenceXmlLocation a Spring resource String
-	 * identifying the location of the <code>persistence.xml</code> file
+	 * identifying the location of the {@code persistence.xml} file
 	 * that this LocalContainerEntityManagerFactoryBean should parse
 	 * @see #setPersistenceUnitManager
 	 */
@@ -136,8 +136,8 @@ public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManage
 
 	/**
 	 * Set whether to use Spring-based scanning for entity classes in the classpath
-	 * instead of using JPA's standard scanning of jar files with <code>persistence.xml</code>
-	 * markers in them. In case of Spring-based scanning, no <code>persistence.xml</code>
+	 * instead of using JPA's standard scanning of jar files with {@code persistence.xml}
+	 * markers in them. In case of Spring-based scanning, no {@code persistence.xml}
 	 * is necessary; all you need to do is to specify base packages to search here.
 	 * <p>Default is none. Specify packages to search for autodetection of your entity
 	 * classes in the classpath. This is analogous to Spring's component-scan feature
@@ -152,13 +152,13 @@ public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManage
 	}
 
 	/**
-	 * Specify one or more mapping resources (equivalent to <code>&lt;mapping-file&gt;</code>
-	 * entries in <code>persistence.xml</code>) for the default persistence unit.
+	 * Specify one or more mapping resources (equivalent to {@code &lt;mapping-file&gt;}
+	 * entries in {@code persistence.xml}) for the default persistence unit.
 	 * Can be used on its own or in combination with entity scanning in the classpath,
-	 * in both cases avoiding <code>persistence.xml</code>.
+	 * in both cases avoiding {@code persistence.xml}.
 	 * <p>Note that mapping resources must be relative to the classpath root,
 	 * e.g. "META-INF/mappings.xml" or "com/mycompany/repository/mappings.xml",
-	 * so that they can be loaded through <code>ClassLoader.getResource</code>.
+	 * so that they can be loaded through {@code ClassLoader.getResource}.
 	 * <p><b>NOTE: Only applied if no external PersistenceUnitManager specified.</b>
 	 * @see #setPersistenceUnitManager
 	 */
@@ -169,11 +169,11 @@ public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManage
 	/**
 	 * Specify the JDBC DataSource that the JPA persistence provider is supposed
 	 * to use for accessing the database. This is an alternative to keeping the
-	 * JDBC configuration in <code>persistence.xml</code>, passing in a Spring-managed
+	 * JDBC configuration in {@code persistence.xml}, passing in a Spring-managed
 	 * DataSource instead.
 	 * <p>In JPA speak, a DataSource passed in here will be used as "nonJtaDataSource"
 	 * on the PersistenceUnitInfo passed to the PersistenceProvider, as well as
-	 * overriding data source configuration in <code>persistence.xml</code> (if any).
+	 * overriding data source configuration in {@code persistence.xml} (if any).
 	 * Note that this variant typically works for JTA transaction management as well;
 	 * if it does not, consider using the explicit {@link #setJtaDataSource} instead.
 	 * <p><b>NOTE: Only applied if no external PersistenceUnitManager specified.</b>
@@ -188,11 +188,11 @@ public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManage
 	/**
 	 * Specify the JDBC DataSource that the JPA persistence provider is supposed
 	 * to use for accessing the database. This is an alternative to keeping the
-	 * JDBC configuration in <code>persistence.xml</code>, passing in a Spring-managed
+	 * JDBC configuration in {@code persistence.xml}, passing in a Spring-managed
 	 * DataSource instead.
 	 * <p>In JPA speak, a DataSource passed in here will be used as "jtaDataSource"
 	 * on the PersistenceUnitInfo passed to the PersistenceProvider, as well as
-	 * overriding data source configuration in <code>persistence.xml</code> (if any).
+	 * overriding data source configuration in {@code persistence.xml} (if any).
 	 * <p><b>NOTE: Only applied if no external PersistenceUnitManager specified.</b>
 	 * @see javax.persistence.spi.PersistenceUnitInfo#getJtaDataSource()
 	 * @see #setPersistenceUnitManager
@@ -207,7 +207,7 @@ public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManage
 	 * PersistenceUnitInfo used for creating this EntityManagerFactory.
 	 * <p>Such post-processors can, for example, register further entity
 	 * classes and jar files, in addition to the metadata read from
-	 * <code>persistence.xml</code>.
+	 * {@code persistence.xml}.
 	 * <p><b>NOTE: Only applied if no external PersistenceUnitManager specified.</b>
 	 * @see #setPersistenceUnitManager
 	 */
@@ -229,7 +229,7 @@ public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManage
 	 * <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>
-	 * Consider using the <code>context:load-time-weaver</code> XML tag for creating
+	 * Consider using the {@code context:load-time-weaver} XML tag for creating
 	 * such a shared LoadTimeWeaver (autodetecting the environment by default).
 	 * <p><b>NOTE: Only applied if no external PersistenceUnitManager specified.</b>
 	 * Otherwise, the external {@link #setPersistenceUnitManager PersistenceUnitManager}
@@ -295,7 +295,7 @@ public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManage
 	 * Determine the PersistenceUnitInfo to use for the EntityManagerFactory
 	 * created by this bean.
 	 * <p>The default implementation reads in all persistence unit infos from
-	 * <code>persistence.xml</code>, as defined in the JPA specification.
+	 * {@code persistence.xml}, as defined in the JPA specification.
 	 * If no entity manager name was specified, it takes the first info in the
 	 * array as returned by the reader. Otherwise, it checks for a matching name.
 	 * @param persistenceUnitManager the PersistenceUnitManager to obtain from
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 ab31443142..7896175a2a 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
@@ -28,10 +28,10 @@ import javax.persistence.spi.PersistenceProvider;
  * shared JPA EntityManagerFactory in a Spring application context; the
  * EntityManagerFactory can then be passed to JPA-based DAOs via
  * dependency injection. Note that switching to a JNDI lookup or to a
- * {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean}
+ * {@link LocalContainerEntityManagerFactoryBean}
  * definition is just a matter of configuration!
  *
- * <p>Configuration settings are usually read from a <code>META-INF/persistence.xml</code>
+ * <p>Configuration settings are usually read from a {@code META-INF/persistence.xml}
  * config file, residing in the class path, according to the JPA standalone bootstrap
  * contract. Additionally, most JPA providers will require a special VM agent
  * (specified on JVM startup) that allows them to instrument application classes.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
index b6e03c619e..6b2dac821a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
@@ -71,7 +71,7 @@ public abstract class SharedEntityManagerCreator {
 	 * appropriate handling of the native EntityManagerFactory and available
 	 * {@link EntityManagerPlusOperations} will automatically apply.
 	 * @param properties the properties to be passed into the
-	 * <code>createEntityManager</code> call (may be <code>null</code>)
+	 * {@code createEntityManager} call (may be {@code null})
 	 * @return a shareable transaction EntityManager proxy
 	 */
 	public static EntityManager createSharedEntityManager(EntityManagerFactory emf, Map properties) {
@@ -100,7 +100,7 @@ public abstract class SharedEntityManagerCreator {
 	 * Create a transactional EntityManager proxy for the given EntityManagerFactory.
 	 * @param emf EntityManagerFactory to obtain EntityManagers from as needed
 	 * @param properties the properties to be passed into the
-	 * <code>createEntityManager</code> call (may be <code>null</code>)
+	 * {@code createEntityManager} call (may be {@code null})
 	 * @param entityManagerInterfaces the interfaces to be implemented by the
 	 * EntityManager. Allows the addition or specification of proprietary interfaces.
 	 * @return a shareable transactional EntityManager proxy
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
index 2b1fb8687f..dcc6f13f1a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.util.Assert;
 
 /**
- * Simple adapter that implements the <code>java.lang.instrument.ClassFileTransformer</code>
+ * Simple adapter that implements the {@code java.lang.instrument.ClassFileTransformer}
  * interface based on a JPA ClassTransformer which a JPA PersistenceProvider asks the
  * PersistenceUnitInfo to install in the current runtime.
  *
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 728e5f832b..233ae1fbf5 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
@@ -61,10 +61,10 @@ import org.springframework.util.ResourceUtils;
  * Used as internal default by
  * {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean}.
  *
- * <p>Supports standard JPA scanning for <code>persistence.xml</code> files,
+ * <p>Supports standard JPA scanning for {@code persistence.xml} files,
  * with configurable file locations, JDBC DataSource lookup and load-time weaving.
  *
- * <p>The default XML file location is <code>classpath*:META-INF/persistence.xml</code>,
+ * <p>The default XML file location is {@code classpath*:META-INF/persistence.xml},
  * scanning for all matching files in the class path (as defined in the JPA specification).
  * DataSource names are by default interpreted as JNDI names, and no load time weaving
  * is available (which requires weaving to be turned off in the persistence provider).
@@ -80,7 +80,7 @@ public class DefaultPersistenceUnitManager
 		implements PersistenceUnitManager, ResourceLoaderAware, LoadTimeWeaverAware, InitializingBean {
 
 	/**
-	 * Default location of the <code>persistence.xml</code> file:
+	 * Default location of the {@code persistence.xml} file:
 	 * "classpath*:META-INF/persistence.xml".
 	 */
 	public final static String DEFAULT_PERSISTENCE_XML_LOCATION = "classpath*:META-INF/persistence.xml";
@@ -131,7 +131,7 @@ public class DefaultPersistenceUnitManager
 
 
 	/**
-	 * Specify the location of the <code>persistence.xml</code> files to load.
+	 * Specify the location of the {@code persistence.xml} files to load.
 	 * These can be specified as Spring resource locations and/or location patterns.
 	 * <p>Default is "classpath*:META-INF/persistence.xml".
 	 */
@@ -140,11 +140,11 @@ public class DefaultPersistenceUnitManager
 	}
 
 	/**
-	 * Specify multiple locations of <code>persistence.xml</code> files to load.
+	 * Specify multiple locations of {@code persistence.xml} files to load.
 	 * These can be specified as Spring resource locations and/or location patterns.
 	 * <p>Default is "classpath*:META-INF/persistence.xml".
 	 * @param persistenceXmlLocations an array of Spring resource Strings
-	 * identifying the location of the <code>persistence.xml</code> files to read
+	 * identifying the location of the {@code persistence.xml} files to read
 	 */
 	public void setPersistenceXmlLocations(String... persistenceXmlLocations) {
 		this.persistenceXmlLocations = persistenceXmlLocations;
@@ -163,7 +163,7 @@ public class DefaultPersistenceUnitManager
 
 	/**
 	 * Specify the name of the default persistence unit, if any. Default is "default".
-	 * <p>Primarily applied to a scanned persistence unit without <code>persistence.xml</code>.
+	 * <p>Primarily applied to a scanned persistence unit without {@code persistence.xml}.
 	 * Also applicable to selecting a default unit from several persistence units available.
 	 * @see #setPackagesToScan
 	 * @see #obtainDefaultPersistenceUnitInfo
@@ -174,8 +174,8 @@ public class DefaultPersistenceUnitManager
 
 	/**
 	 * Set whether to use Spring-based scanning for entity classes in the classpath
-	 * instead of using JPA's standard scanning of jar files with <code>persistence.xml</code>
-	 * markers in them. In case of Spring-based scanning, no <code>persistence.xml</code>
+	 * instead of using JPA's standard scanning of jar files with {@code persistence.xml}
+	 * markers in them. In case of Spring-based scanning, no {@code persistence.xml}
 	 * is necessary; all you need to do is to specify base packages to search here.
 	 * <p>Default is none. Specify packages to search for autodetection of your entity
 	 * classes in the classpath. This is analogous to Spring's component-scan feature
@@ -186,13 +186,13 @@ public class DefaultPersistenceUnitManager
 	}
 
 	/**
-	 * Specify one or more mapping resources (equivalent to <code>&lt;mapping-file&gt;</code>
-	 * entries in <code>persistence.xml</code>) for the default persistence unit.
+	 * Specify one or more mapping resources (equivalent to {@code &lt;mapping-file&gt;}
+	 * entries in {@code persistence.xml}) for the default persistence unit.
 	 * Can be used on its own or in combination with entity scanning in the classpath,
-	 * in both cases avoiding <code>persistence.xml</code>.
+	 * in both cases avoiding {@code persistence.xml}.
 	 * <p>Note that mapping resources must be relative to the classpath root,
 	 * e.g. "META-INF/mappings.xml" or "com/mycompany/repository/mappings.xml",
-	 * so that they can be loaded through <code>ClassLoader.getResource</code>.
+	 * so that they can be loaded through {@code ClassLoader.getResource}.
 	 * @see #setPackagesToScan
 	 */
 	public void setMappingResources(String... mappingResources) {
@@ -202,9 +202,9 @@ public class DefaultPersistenceUnitManager
 	/**
 	 * Specify the JDBC DataSources that the JPA persistence provider is supposed
 	 * to use for accessing the database, resolving data source names in
-	 * <code>persistence.xml</code> against Spring-managed DataSources.
+	 * {@code persistence.xml} against Spring-managed DataSources.
 	 * <p>The specified Map needs to define data source names for specific DataSource
-	 * objects, matching the data source names used in <code>persistence.xml</code>.
+	 * objects, matching the data source names used in {@code persistence.xml}.
 	 * If not specified, data source names will be resolved as JNDI names instead
 	 * (as defined by standard JPA).
 	 * @see org.springframework.jdbc.datasource.lookup.MapDataSourceLookup
@@ -215,13 +215,13 @@ public class DefaultPersistenceUnitManager
 
 	/**
 	 * Specify the JDBC DataSourceLookup that provides DataSources for the
-	 * persistence provider, resolving data source names in <code>persistence.xml</code>
+	 * persistence provider, resolving data source names in {@code persistence.xml}
 	 * against Spring-managed DataSource instances.
 	 * <p>Default is JndiDataSourceLookup, which resolves DataSource names as
 	 * JNDI names (as defined by standard JPA). Specify a BeanFactoryDataSourceLookup
 	 * instance if you want DataSource names to be resolved against Spring bean names.
 	 * <p>Alternatively, consider passing in a map from names to DataSource instances
-	 * via the "dataSources" property. If the <code>persistence.xml</code> file
+	 * via the "dataSources" property. If the {@code persistence.xml} file
 	 * does not define DataSource names at all, specify a default DataSource
 	 * via the "defaultDataSource" property.
 	 * @see org.springframework.jdbc.datasource.lookup.JndiDataSourceLookup
@@ -235,7 +235,7 @@ public class DefaultPersistenceUnitManager
 
 	/**
 	 * Return the JDBC DataSourceLookup that provides DataSources for the
-	 * persistence provider, resolving data source names in <code>persistence.xml</code>
+	 * persistence provider, resolving data source names in {@code persistence.xml}
 	 * against Spring-managed DataSource instances.
 	 */
 	public DataSourceLookup getDataSourceLookup() {
@@ -244,7 +244,7 @@ public class DefaultPersistenceUnitManager
 
 	/**
 	 * Specify the JDBC DataSource that the JPA persistence provider is supposed to use
-	 * for accessing the database if none has been specified in <code>persistence.xml</code>.
+	 * for accessing the database if none has been specified in {@code persistence.xml}.
 	 * This variant indicates no special transaction setup, i.e. typical resource-local.
 	 * <p>In JPA speak, a DataSource passed in here will be uses as "nonJtaDataSource"
 	 * on the PersistenceUnitInfo passed to the PersistenceProvider, provided that
@@ -257,7 +257,7 @@ public class DefaultPersistenceUnitManager
 
 	/**
 	 * Return the JDBC DataSource that the JPA persistence provider is supposed to use
-	 * for accessing the database if none has been specified in <code>persistence.xml</code>.
+	 * for accessing the database if none has been specified in {@code persistence.xml}.
 	 */
 	public DataSource getDefaultDataSource() {
 		return this.defaultDataSource;
@@ -265,7 +265,7 @@ public class DefaultPersistenceUnitManager
 
 	/**
 	 * Specify the JDBC DataSource that the JPA persistence provider is supposed to use
-	 * for accessing the database if none has been specified in <code>persistence.xml</code>.
+	 * for accessing the database if none has been specified in {@code persistence.xml}.
 	 * This variant indicates that JTA is supposed to be used as transaction type.
 	 * <p>In JPA speak, a DataSource passed in here will be uses as "jtaDataSource"
 	 * on the PersistenceUnitInfo passed to the PersistenceProvider, provided that
@@ -278,7 +278,7 @@ public class DefaultPersistenceUnitManager
 
 	/**
 	 * Return the JTA-aware DataSource that the JPA persistence provider is supposed to use
-	 * for accessing the database if none has been specified in <code>persistence.xml</code>.
+	 * for accessing the database if none has been specified in {@code persistence.xml}.
 	 */
 	public DataSource getDefaultJtaDataSource() {
 		return this.defaultJtaDataSource;
@@ -288,7 +288,7 @@ public class DefaultPersistenceUnitManager
 	 * Set the PersistenceUnitPostProcessors to be applied to each
 	 * PersistenceUnitInfo that has been parsed by this manager.
 	 * <p>Such post-processors can, for example, register further entity classes and
-	 * jar files, in addition to the metadata read from <code>persistence.xml</code>.
+	 * jar files, in addition to the metadata read from {@code persistence.xml}.
 	 */
 	public void setPersistenceUnitPostProcessors(PersistenceUnitPostProcessor... postProcessors) {
 		this.persistenceUnitPostProcessors = postProcessors;
@@ -316,7 +316,7 @@ public class DefaultPersistenceUnitManager
 	 * <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>
-	 * Consider using the <code>context:load-time-weaver</code> XML tag for creating
+	 * 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
@@ -348,7 +348,7 @@ public class DefaultPersistenceUnitManager
 
 	/**
 	 * Prepare the PersistenceUnitInfos according to the configuration
-	 * of this manager: scanning for <code>persistence.xml</code> files,
+	 * of this manager: scanning for {@code persistence.xml} files,
 	 * parsing all matching files, configuring and post-processing them.
 	 * <p>PersistenceUnitInfos cannot be obtained before this preparation
 	 * method has been invoked.
@@ -394,7 +394,7 @@ public class DefaultPersistenceUnitManager
 	}
 
 	/**
-	 * Read all persistence unit infos from <code>persistence.xml</code>,
+	 * Read all persistence unit infos from {@code persistence.xml},
 	 * as defined in the JPA specification.
 	 */
 	private List<SpringPersistenceUnitInfo> readPersistenceUnitInfos() {
@@ -499,7 +499,7 @@ public class DefaultPersistenceUnitManager
 	 * <p>This can be used in {@link #postProcessPersistenceUnitInfo} implementations,
 	 * detecting existing persistence units of the same name and potentially merging them.
 	 * @param persistenceUnitName the name of the desired persistence unit
-	 * @return the PersistenceUnitInfo in mutable form, or <code>null</code> if not available
+	 * @return the PersistenceUnitInfo in mutable form, or {@code null} if not available
 	 */
 	protected final MutablePersistenceUnitInfo getPersistenceUnitInfo(String persistenceUnitName) {
 		PersistenceUnitInfo pui = this.persistenceUnitInfos.get(persistenceUnitName);
@@ -519,7 +519,7 @@ public class DefaultPersistenceUnitManager
 	 * <p>The default implementation delegates to all registered PersistenceUnitPostProcessors.
 	 * It is usually preferable to register further entity classes, jar files etc there
 	 * rather than in a subclass of this manager, to be able to reuse the post-processors.
-	 * @param pui the chosen PersistenceUnitInfo, as read from <code>persistence.xml</code>.
+	 * @param pui the chosen PersistenceUnitInfo, as read from {@code persistence.xml}.
 	 * Passed in as MutablePersistenceUnitInfo.
 	 * @see #setPersistenceUnitPostProcessors
 	 */
@@ -534,7 +534,7 @@ public class DefaultPersistenceUnitManager
 
 	/**
 	 * Return whether an override of a same-named persistence unit is allowed.
-	 * <p>Default is <code>false</code>. May be overridden to return <code>true</code>,
+	 * <p>Default is {@code false}. May be overridden to return {@code true},
 	 * for example if {@link #postProcessPersistenceUnitInfo} is able to handle that case.
 	 */
 	protected boolean isPersistenceUnitOverrideAllowed() {
@@ -577,8 +577,8 @@ public class DefaultPersistenceUnitManager
 
 	/**
 	 * Decorator that exposes a JPA 2.0 compliant PersistenceUnitInfo interface for a
-	 * JPA 1.0 based SpringPersistenceUnitInfo object, adapting the <code>getSharedCacheMode</code>
-	 * and <code>getValidationMode</code> methods from String names to enum return values.
+	 * JPA 1.0 based SpringPersistenceUnitInfo object, adapting the {@code getSharedCacheMode}
+	 * and {@code getValidationMode} methods from String names to enum return values.
 	 */
 	private static class Jpa2PersistenceUnitInfoDecorator implements InvocationHandler {
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java
index d44fc6037f..e5a8cbd885 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java
@@ -38,7 +38,7 @@ public interface PersistenceUnitManager {
 
 	/**
 	 * Obtain the default PersistenceUnitInfo from this manager.
-	 * @return the PersistenceUnitInfo (never <code>null</code>)
+	 * @return the PersistenceUnitInfo (never {@code null})
 	 * @throws IllegalStateException if there is no default PersistenceUnitInfo defined
 	 * or it has already been obtained
 	 */
@@ -47,7 +47,7 @@ public interface PersistenceUnitManager {
 	/**
 	 * Obtain the specified PersistenceUnitInfo from this manager.
 	 * @param persistenceUnitName the name of the desired persistence unit
-	 * @return the PersistenceUnitInfo (never <code>null</code>)
+	 * @return the PersistenceUnitInfo (never {@code null})
 	 * @throws IllegalArgumentException if no PersistenceUnitInfo with the given
 	 * name is defined
 	 * @throws IllegalStateException if the PersistenceUnitInfo with the given
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java
index 42f0aa6be6..85e4903555 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java
@@ -31,7 +31,7 @@ public interface PersistenceUnitPostProcessor {
 	/**
 	 * Post-process the given PersistenceUnitInfo, for example registering
 	 * further entity classes and jar files.
-	 * @param pui the chosen PersistenceUnitInfo, as read from <code>persistence.xml</code>.
+	 * @param pui the chosen PersistenceUnitInfo, as read from {@code persistence.xml}.
 	 * Passed in as MutablePersistenceUnitInfo.
 	 */
 	void postProcessPersistenceUnitInfo(MutablePersistenceUnitInfo pui);
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 d823e45c53..3d4ae96845 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
@@ -43,7 +43,7 @@ import org.springframework.util.xml.DomUtils;
 import org.springframework.util.xml.SimpleSaxErrorHandler;
 
 /**
- * Internal helper class for reading JPA-compliant <code>persistence.xml</code> files.
+ * Internal helper class for reading JPA-compliant {@code persistence.xml} files.
  *
  * @author Costin Leau
  * @author Juergen Hoeller
@@ -93,7 +93,7 @@ class PersistenceUnitReader {
 	 * Create a new PersistenceUnitReader.
 	 * @param resourcePatternResolver the ResourcePatternResolver to use for loading resources
 	 * @param dataSourceLookup the DataSourceLookup to resolve DataSource names in
-	 * <code>persistence.xml</code> files against
+	 * {@code persistence.xml} files against
 	 */
 	public PersistenceUnitReader(ResourcePatternResolver resourcePatternResolver, DataSourceLookup dataSourceLookup) {
 		Assert.notNull(resourcePatternResolver, "ResourceLoader must not be null");
@@ -185,7 +185,7 @@ class PersistenceUnitReader {
 
 	/**
 	 * Determine the persistence unit root URL based on the given resource
-	 * (which points to the <code>persistence.xml</code> file we're reading).
+	 * (which points to the {@code persistence.xml} file we're reading).
 	 * @param resource the resource to check
 	 * @return the corresponding persistence unit root URL
 	 * @throws IOException if the checking failed
@@ -291,7 +291,7 @@ class PersistenceUnitReader {
 	}
 
 	/**
-	 * Parse the <code>property</code> XML elements.
+	 * Parse the {@code property} XML elements.
 	 */
 	@SuppressWarnings("unchecked")
 	protected void parseProperties(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) {
@@ -308,7 +308,7 @@ class PersistenceUnitReader {
 	}
 
 	/**
-	 * Parse the <code>class</code> XML elements.
+	 * Parse the {@code class} XML elements.
 	 */
 	@SuppressWarnings("unchecked")
 	protected void parseManagedClasses(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) {
@@ -321,7 +321,7 @@ class PersistenceUnitReader {
 	}
 
 	/**
-	 * Parse the <code>mapping-file</code> XML elements.
+	 * Parse the {@code mapping-file} XML elements.
 	 */
 	@SuppressWarnings("unchecked")
 	protected void parseMappingFiles(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) {
@@ -335,7 +335,7 @@ class PersistenceUnitReader {
 	}
 
 	/**
-	 * Parse the <code>jar-file</code> XML elements.
+	 * Parse the {@code jar-file} XML elements.
 	 */
 	@SuppressWarnings("unchecked")
 	protected void parseJarFiles(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) throws IOException {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java
index 2463146789..02bbf299ea 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java
@@ -34,7 +34,7 @@ import org.springframework.orm.jpa.JpaTemplate;
  *
  * <p>This class will create its own JpaTemplate if an EntityManagerFactory
  * or EntityManager reference is passed in. A custom JpaTemplate instance
- * can be used through overriding <code>createJpaTemplate</code>.
+ * can be used through overriding {@code createJpaTemplate}.
  *
  * @author Juergen Hoeller
  * @since 2.0
@@ -44,7 +44,7 @@ import org.springframework.orm.jpa.JpaTemplate;
  * @see #setJpaTemplate
  * @see org.springframework.orm.jpa.JpaTemplate
  * @deprecated as of Spring 3.1, in favor of native EntityManager usage
- * (typically obtained through <code>@PersistenceContext</code>)
+ * (typically obtained through {@code @PersistenceContext})
  */
 @Deprecated
 public abstract class JpaDaoSupport extends DaoSupport {
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 fbce1e10bb..7de9bf3429 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
@@ -53,10 +53,10 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * as for non-transactional read-only execution.
  *
  * <p>Looks up the EntityManagerFactory in Spring's root web application context.
- * Supports an "entityManagerFactoryBeanName" filter init-param in <code>web.xml</code>;
+ * Supports an "entityManagerFactoryBeanName" filter init-param in {@code web.xml};
  * the default bean name is "entityManagerFactory". As an alternative, the
  * "persistenceUnitName" init-param allows for retrieval by logical unit name
- * (as specified in <code>persistence.xml</code>).
+ * (as specified in {@code persistence.xml}).
  *
  * @author Juergen Hoeller
  * @since 2.0
@@ -195,7 +195,7 @@ public class OpenEntityManagerInViewFilter extends OncePerRequestFilter {
 	/**
 	 * Look up the EntityManagerFactory that this filter should use,
 	 * taking the current HTTP request as argument.
-	 * <p>The default implementation delegates to the <code>lookupEntityManagerFactory</code>
+	 * <p>The default implementation delegates to the {@code lookupEntityManagerFactory}
 	 * without arguments, caching the EntityManagerFactory reference once obtained.
 	 * @return the EntityManagerFactory to use
 	 * @see #lookupEntityManagerFactory()
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 bba586e14c..ac9c408f02 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
@@ -69,14 +69,14 @@ import org.springframework.util.StringUtils;
  * and {@link javax.persistence.EntityManager}. Any such annotated fields or methods
  * in any Spring-managed object will automatically be injected.
  *
- * <p>This post-processor will inject sub-interfaces of <code>EntityManagerFactory</code>
- * and <code>EntityManager</code> if the annotated fields or methods are declared as such.
+ * <p>This post-processor will inject sub-interfaces of {@code EntityManagerFactory}
+ * and {@code EntityManager} if the annotated fields or methods are declared as such.
  * The actual type will be verified early, with the exception of a shared ("transactional")
- * <code>EntityManager</code> reference, where type mismatches might be detected as late
+ * {@code EntityManager} reference, where type mismatches might be detected as late
  * as on the first actual invocation.
  *
  * <p>Note: In the present implementation, PersistenceAnnotationBeanPostProcessor
- * only supports <code>@PersistenceUnit</code> and <code>@PersistenceContext</code>
+ * only supports {@code @PersistenceUnit} and {@code @PersistenceContext}
  * with the "unitName" attribute, or no attribute at all (for the default unit).
  * If those annotations are present with the "name" attribute at the class level,
  * they will simply be ignored, since those only serve as deployment hint
@@ -89,7 +89,7 @@ import org.springframework.util.StringUtils;
  * with the bean name used as fallback unit name if no deployed name found.
  * Typically, Spring's {@link org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean}
  * will be used for setting up such EntityManagerFactory beans. Alternatively,
- * such beans may also be obtained from JNDI, e.g. using the <code>jee:jndi-lookup</code>
+ * such beans may also be obtained from JNDI, e.g. using the {@code jee:jndi-lookup}
  * XML configuration element (with the bean name matching the requested unit name).
  * In both cases, the post-processor definition will look as simple as this:
  *
@@ -98,7 +98,7 @@ import org.springframework.util.StringUtils;
  *
  * In the JNDI case, specify the corresponding JNDI names in this post-processor's
  * {@link #setPersistenceUnits "persistenceUnits" map}, typically with matching
- * <code>persistence-unit-ref</code> entries in the Java EE deployment descriptor.
+ * {@code persistence-unit-ref} entries in the Java EE deployment descriptor.
  * By default, those names are considered as resource references (according to the
  * Java EE resource-ref convention), located underneath the "java:comp/env/" namespace.
  * For example:
@@ -119,13 +119,13 @@ import org.springframework.util.StringUtils;
  * Persistence contexts (i.e. EntityManager references) will be built based on
  * those server-provided EntityManagerFactory references, using Spring's own
  * transaction synchronization facilities for transactional EntityManager handling
- * (typically with Spring's <code>@Transactional</code> annotation for demarcation
+ * (typically with Spring's {@code @Transactional} annotation for demarcation
  * and {@link org.springframework.transaction.jta.JtaTransactionManager} as backend).
  *
  * <p>If you prefer the Java EE server's own EntityManager handling, specify entries
  * in this post-processor's {@link #setPersistenceContexts "persistenceContexts" map}
  * (or {@link #setExtendedPersistenceContexts "extendedPersistenceContexts" map},
- * typically with matching <code>persistence-context-ref</code> entries in the
+ * typically with matching {@code persistence-context-ref} entries in the
  * Java EE deployment descriptor. For example:
  *
  * <pre class="code">
@@ -144,7 +144,7 @@ import org.springframework.util.StringUtils;
  * pointing to matching JNDI locations.
  *
  * <p><b>NOTE: In general, do not inject EXTENDED EntityManagers into STATELESS beans,
- * i.e. do not use <code>@PersistenceContext</code> with type <code>EXTENDED</code> in
+ * i.e. do not use {@code @PersistenceContext} with type {@code EXTENDED} in
  * Spring beans defined with scope 'singleton' (Spring's default scope).</b>
  * Extended EntityManagers are <i>not</i> thread-safe, hence they must not be used
  * in concurrently accessed beans (which Spring-managed singletons usually are).
@@ -218,7 +218,7 @@ public class PersistenceAnnotationBeanPostProcessor
 	 * Specify the persistence units for EntityManagerFactory lookups,
 	 * as a Map from persistence unit name to persistence unit JNDI name
 	 * (which needs to resolve to an EntityManagerFactory instance).
-	 * <p>JNDI names specified here should refer to <code>persistence-unit-ref</code>
+	 * <p>JNDI names specified here should refer to {@code persistence-unit-ref}
 	 * entries in the Java EE deployment descriptor, matching the target persistence unit.
 	 * <p>In case of no unit name specified in the annotation, the specified value
 	 * for the {@link #setDefaultPersistenceUnitName default persistence unit}
@@ -229,7 +229,7 @@ public class PersistenceAnnotationBeanPostProcessor
 	 * references obtained from JNDI. No separate EntityManagerFactory bean
 	 * definitions are necessary in such a scenario.
 	 * <p>If no corresponding "persistenceContexts"/"extendedPersistenceContexts"
-	 * are specified, <code>@PersistenceContext</code> will be resolved to
+	 * are specified, {@code @PersistenceContext} will be resolved to
 	 * EntityManagers built on top of the EntityManagerFactory defined here.
 	 * Note that those will be Spring-managed EntityManagers, which implement
 	 * transaction synchronization based on Spring's facilities.
@@ -244,9 +244,9 @@ public class PersistenceAnnotationBeanPostProcessor
 	 * Specify the <i>transactional</i> persistence contexts for EntityManager lookups,
 	 * as a Map from persistence unit name to persistence context JNDI name
 	 * (which needs to resolve to an EntityManager instance).
-	 * <p>JNDI names specified here should refer to <code>persistence-context-ref</code>
+	 * <p>JNDI names specified here should refer to {@code persistence-context-ref}
 	 * entries in the Java EE deployment descriptors, matching the target persistence unit
-	 * and being set up with persistence context type <code>Transaction</code>.
+	 * and being set up with persistence context type {@code Transaction}.
 	 * <p>In case of no unit name specified in the annotation, the specified value
 	 * for the {@link #setDefaultPersistenceUnitName default persistence unit}
 	 * will be taken (by default, the value mapped to the empty String),
@@ -265,9 +265,9 @@ public class PersistenceAnnotationBeanPostProcessor
 	 * Specify the <i>extended</i> persistence contexts for EntityManager lookups,
 	 * as a Map from persistence unit name to persistence context JNDI name
 	 * (which needs to resolve to an EntityManager instance).
-	 * <p>JNDI names specified here should refer to <code>persistence-context-ref</code>
+	 * <p>JNDI names specified here should refer to {@code persistence-context-ref}
 	 * entries in the Java EE deployment descriptors, matching the target persistence unit
-	 * and being set up with persistence context type <code>Extended</code>.
+	 * and being set up with persistence context type {@code Extended}.
 	 * <p>In case of no unit name specified in the annotation, the specified value
 	 * for the {@link #setDefaultPersistenceUnitName default persistence unit}
 	 * will be taken (by default, the value mapped to the empty String),
@@ -284,8 +284,8 @@ public class PersistenceAnnotationBeanPostProcessor
 
 	/**
 	 * Specify the default persistence unit name, to be used in case
-	 * of no unit name specified in an <code>@PersistenceUnit</code> /
-	 * <code>@PersistenceContext</code> annotation.
+	 * of no unit name specified in an {@code @PersistenceUnit} /
+	 * {@code @PersistenceContext} annotation.
 	 * <p>This is mainly intended for lookups in the application context,
 	 * indicating the target persistence unit name (typically matching
 	 * the bean name), but also applies to lookups in the
@@ -414,7 +414,7 @@ public class PersistenceAnnotationBeanPostProcessor
 	 * as defined through the "persistenceUnits" map.
 	 * @param unitName the name of the persistence unit
 	 * @return the corresponding EntityManagerFactory,
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 * @see #setPersistenceUnits
 	 */
 	protected EntityManagerFactory getPersistenceUnit(String unitName) {
@@ -444,7 +444,7 @@ public class PersistenceAnnotationBeanPostProcessor
 	 * through the "persistenceContexts" (or "extendedPersistenceContexts") map.
 	 * @param unitName the name of the persistence unit
 	 * @param extended whether to obtain an extended persistence context
-	 * @return the corresponding EntityManager, or <code>null</code> if none found
+	 * @return the corresponding EntityManager, or {@code null} if none found
 	 * @see #setPersistenceContexts
 	 * @see #setExtendedPersistenceContexts
 	 */
@@ -475,7 +475,7 @@ public class PersistenceAnnotationBeanPostProcessor
 	 * Find an EntityManagerFactory with the given name in the current Spring
 	 * application context, falling back to a single default EntityManagerFactory
 	 * (if any) in case of no unit name specified.
-	 * @param unitName the name of the persistence unit (may be <code>null</code> or empty)
+	 * @param unitName the name of the persistence unit (may be {@code null} or empty)
 	 * @param requestingBeanName the name of the requesting bean
 	 * @return the EntityManagerFactory
 	 * @throws NoSuchBeanDefinitionException if there is no such EntityManagerFactory in the context
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
index 72e483997f..a203d4136a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
@@ -62,7 +62,7 @@ public class SharedEntityManagerBean extends EntityManagerFactoryAccessor
 	 * Specify the EntityManager interface to expose.
 	 * <p>Default is the EntityManager interface as defined by the
 	 * EntityManagerFactoryInfo, if available. Else, the standard
-	 * <code>javax.persistence.EntityManager</code> interface will be used.
+	 * {@code javax.persistence.EntityManager} interface will be used.
 	 * @see org.springframework.orm.jpa.EntityManagerFactoryInfo#getEntityManagerInterface()
 	 * @see javax.persistence.EntityManager
 	 */
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/package-info.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/package-info.java
index d85c3c7062..921428ee38 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/package-info.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/package-info.java
@@ -1,7 +1,6 @@
-
 /**
  *
- * Classes supporting the <code>org.springframework.orm.jpa</code> package.
+ * Classes supporting the {@code org.springframework.orm.jpa} package.
  * Contains a DAO base class for JpaTemplate usage.
  *
  */
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
index 400d9d5ffc..6f40effd05 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
@@ -43,7 +43,7 @@ public abstract class AbstractJpaVendorAdapter implements JpaVendorAdapter {
 
 
 	/**
-	 * Specify the target database to operate on, as a value of the <code>Database</code> enum:
+	 * Specify the target database to operate on, as a value of the {@code Database} enum:
 	 * DB2, DERBY, H2, HSQL, INFORMIX, MYSQL, ORACLE, POSTGRESQL, SQL_SERVER, SYBASE
 	 */
 	public void setDatabase(Database database) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java
index 7b7c4643d9..3bbd6b17df 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java
@@ -24,7 +24,7 @@ package org.springframework.orm.jpa.vendor;
  * the strategy class can still be specified using the fully-qualified class name.
  * This enumeration is merely a convenience. The database products listed here
  * are the same as those explicitly supported for Spring JDBC exception translation
- * in <code>sql-error-codes.xml</code>.
+ * in {@code sql-error-codes.xml}.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
index e985802007..d2cf726e27 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
@@ -90,7 +90,7 @@ public class EclipseLinkJpaVendorAdapter extends AbstractJpaVendorAdapter {
 	/**
 	 * Determine the EclipseLink target database name for the given database.
 	 * @param database the specified database
-	 * @return the EclipseLink target database name, or <code>null<code> if none found
+	 * @return the EclipseLink target database name, or {@code null} if none found
 	 */
 	protected String determineTargetDatabaseName(Database database) {
 		switch (database) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
index a1584090ab..8a3a5f5348 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
@@ -26,7 +26,7 @@ import org.springframework.orm.jpa.EntityManagerFactoryAccessor;
 import org.springframework.util.Assert;
 
 /**
- * Simple <code>FactoryBean</code> that exposes the underlying {@link SessionFactory}
+ * Simple {@code FactoryBean} that exposes the underlying {@link SessionFactory}
  * behind a Hibernate-backed JPA {@link EntityManagerFactory}.
  *
  * <p>Primarily available for resolving a SessionFactory by JPA persistence unit name
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
index e1e396ada2..0ba1a3ee54 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
@@ -95,7 +95,7 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter {
 	/**
 	 * Determine the Hibernate database dialect class for the given target database.
 	 * @param database the target database
-	 * @return the Hibernate database dialect class, or <code>null<code> if none found
+	 * @return the Hibernate database dialect class, or {@code null} if none found
 	 */
 	protected Class determineDatabaseDialectClass(Database database) {
 		switch (database) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
index c6ba980f12..ebcdae313d 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
@@ -64,9 +64,9 @@ public class OpenJpaDialect extends DefaultJpaDialect {
 	}
 
 	/**
-	 * Return the OpenJPA-specific interface of <code>EntityManager</code>.
-	 * @param em the generic <code>EntityManager</code> instance
-	 * @return the OpenJPA-specific interface of <code>EntityManager</code>
+	 * Return the OpenJPA-specific interface of {@code EntityManager}.
+	 * @param em the generic {@code EntityManager} instance
+	 * @return the OpenJPA-specific interface of {@code EntityManager}
 	 */
 	protected OpenJPAEntityManager getOpenJPAEntityManager(EntityManager em) {
 		return OpenJPAPersistence.cast(em);
@@ -74,7 +74,7 @@ public class OpenJpaDialect extends DefaultJpaDialect {
 
 
 	/**
-	 * Transaction data Object exposed from <code>beginTransaction</code>,
+	 * Transaction data Object exposed from {@code beginTransaction},
 	 * implementing the SavepointManager interface.
 	 */
 	private static class OpenJpaTransactionData implements SavepointManager {
@@ -106,8 +106,8 @@ public class OpenJpaDialect extends DefaultJpaDialect {
 
 	/**
 	 * ConnectionHandle implementation that fetches a new OpenJPA-provided Connection
-	 * for every <code>getConnection</code> call and closes the Connection on
-	 * <code>releaseConnection</code>. This is necessary because OpenJPA requires the
+	 * for every {@code getConnection} call and closes the Connection on
+	 * {@code releaseConnection}. This is necessary because OpenJPA requires the
 	 * fetched Connection to be closed before continuing EntityManager work.
 	 * @see org.apache.openjpa.persistence.OpenJPAEntityManager#getConnection()
 	 */
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java
index cc3a7d79d3..15b59356e6 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java
@@ -85,7 +85,7 @@ public class OpenJpaVendorAdapter extends AbstractJpaVendorAdapter {
 	/**
 	 * Determine the OpenJPA database dictionary name for the given database.
 	 * @param database the specified database
-	 * @return the OpenJPA database dictionary name, or <code>null<code> if none found
+	 * @return the OpenJPA database dictionary name, or {@code null} if none found
 	 */
 	protected String determineDatabaseDictionary(Database database) {
 		switch (database) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java
index 573b0a85bf..c10bb362ab 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java
@@ -90,7 +90,7 @@ public class TopLinkJpaVendorAdapter extends AbstractJpaVendorAdapter {
 	/**
 	 * Determine the TopLink target database name for the given database.
 	 * @param database the specified database
-	 * @return the TopLink target database name, or <code>null<code> if none found
+	 * @return the TopLink target database name, or {@code null} if none found
 	 */
 	protected String determineTargetDatabaseName(Database database) {
 		switch (database) {
diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index 28670fd438..f372307e58 100644
--- a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -38,7 +38,7 @@ public class ExpectedLookupTemplate extends JndiTemplate {
 
 	/**
 	 * Construct a new JndiTemplate that will always return given objects
-	 * for given names. To be populated through <code>addObject</code> calls.
+	 * for given names. To be populated through {@code addObject} calls.
 	 * @see #addObject(String, Object)
 	 */
 	public ExpectedLookupTemplate() {
diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
index b6489e4202..c71d6e8681 100644
--- a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
@@ -41,13 +41,13 @@ import org.springframework.util.StringUtils;
  * Mainly for test environments, but also usable for standalone applications.
  *
  * <p>This class is not intended for direct usage by applications, although it
- * can be used for example to override JndiTemplate's <code>createInitialContext</code>
+ * can be used for example to override JndiTemplate's {@code createInitialContext}
  * method in unit tests. Typically, SimpleNamingContextBuilder will be used to
  * set up a JVM-level JNDI environment.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
- * @see org.springframework.mock.jndi.SimpleNamingContextBuilder
+ * @see SimpleNamingContextBuilder
  * @see org.springframework.jndi.JndiTemplate#createInitialContext
  */
 public class SimpleNamingContext implements Context {
diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index f6c3f0a376..f21936897b 100644
--- a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -33,7 +33,7 @@ import org.springframework.util.ClassUtils;
  * Simple implementation of a JNDI naming context builder.
  *
  * <p>Mainly targeted at test environments, where each test case can
- * configure JNDI appropriately, so that <code>new InitialContext()</code>
+ * configure JNDI appropriately, so that {@code new InitialContext()}
  * will expose the required objects. Also usable for standalone applications,
  * e.g. for binding a JDBC DataSource to a well-known JNDI location, to be
  * able to use traditional J2EE data access code outside of a J2EE container.
@@ -63,7 +63,7 @@ import org.springframework.util.ClassUtils;
  * DataSource ds = new DriverManagerDataSource(...);
  * builder.bind("java:comp/env/jdbc/myds", ds);</pre>
  *
- * Note that you <i>should not</i> call <code>activate()</code> on a builder from
+ * Note that you <i>should not</i> call {@code activate()} on a builder from
  * this factory method, as there will already be an activated one in any case.
  *
  * <p>An instance of this class is only necessary at setup time.
@@ -74,7 +74,7 @@ import org.springframework.util.ClassUtils;
  * @see #emptyActivatedContextBuilder()
  * @see #bind(String, Object)
  * @see #activate()
- * @see org.springframework.mock.jndi.SimpleNamingContext
+ * @see SimpleNamingContext
  * @see org.springframework.jdbc.datasource.SingleConnectionDataSource
  * @see org.springframework.jdbc.datasource.DriverManagerDataSource
  * @see org.apache.commons.dbcp.BasicDataSource
@@ -92,7 +92,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 	/**
 	 * Checks if a SimpleNamingContextBuilder is active.
 	 * @return the current SimpleNamingContextBuilder instance,
-	 * or <code>null</code> if none
+	 * or {@code null} if none
 	 */
 	public static SimpleNamingContextBuilder getCurrentContextBuilder() {
 		return activated;
@@ -129,8 +129,8 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 
 	/**
 	 * Register the context builder by registering it with the JNDI NamingManager.
-	 * Note that once this has been done, <code>new InitialContext()</code> will always
-	 * return a context from this factory. Use the <code>emptyActivatedContextBuilder()</code>
+	 * Note that once this has been done, {@code new InitialContext()} will always
+	 * return a context from this factory. Use the {@code emptyActivatedContextBuilder()}
 	 * static method to get an empty context (for example, in test methods).
 	 * @throws IllegalStateException if there's already a naming context builder
 	 * registered with the JNDI NamingManager
@@ -156,7 +156,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 	 * Temporarily deactivate this context builder. It will remain registered with
 	 * the JNDI NamingManager but will delegate to the standard JNDI InitialContextFactory
 	 * (if configured) instead of exposing its own bound objects.
-	 * <p>Call <code>activate()</code> again in order to expose this context builder's own
+	 * <p>Call {@code activate()} again in order to expose this context builder's own
 	 * bound objects again. Such activate/deactivate sequences can be applied any number
 	 * of times (e.g. within a larger integration test suite running in the same VM).
 	 * @see #activate()
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
index 90d70e1cb6..5da624d1cb 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
@@ -46,7 +46,7 @@ import org.springframework.util.Assert;
  * which match named beans in the context. This is autowire by name, rather than
  * type. This approach is based on an approach originated by Ara Abrahmian.
  * Setter Dependency Injection is the default: set the
- * <code>populateProtectedVariables</code> property to <code>true</code> in
+ * {@code populateProtectedVariables} property to {@code true} in
  * the constructor to switch on Field Injection.
  * </ul>
  *
@@ -113,7 +113,7 @@ public abstract class AbstractDependencyInjectionSpringContextTests extends Abst
 
 	/**
 	 * Set whether to populate protected variables of this test case. Default is
-	 * <code>false</code>.
+	 * {@code false}.
 	 */
 	public final void setPopulateProtectedVariables(boolean populateFields) {
 		this.populateProtectedVariables = populateFields;
@@ -148,7 +148,7 @@ public abstract class AbstractDependencyInjectionSpringContextTests extends Abst
 	/**
 	 * Set whether or not dependency checking should be performed for test
 	 * properties set by Dependency Injection.
-	 * <p>The default is <code>true</code>, meaning that tests cannot be run
+	 * <p>The default is {@code true}, meaning that tests cannot be run
 	 * unless all properties are populated.
 	 */
 	public final void setDependencyCheck(final boolean dependencyCheck) {
@@ -167,7 +167,7 @@ public abstract class AbstractDependencyInjectionSpringContextTests extends Abst
 	 * Prepare this test instance, injecting dependencies into its protected
 	 * fields and its bean properties.
 	 * <p>Note: if the {@link ApplicationContext} for this test instance has not
-	 * been configured (e.g., is <code>null</code>), dependency injection
+	 * been configured (e.g., is {@code null}), dependency injection
 	 * will naturally <strong>not</strong> be performed, but an informational
 	 * message will be written to the log.
 	 * @see #injectDependencies()
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java
index b05f927d4a..e1365de448 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java
@@ -92,7 +92,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	}
 
 	/**
-	 * This implementation is final. Override <code>onSetUp</code> for custom behavior.
+	 * This implementation is final. Override {@code onSetUp} for custom behavior.
 	 * @see #onSetUp()
 	 */
 	protected final void setUp() throws Exception {
@@ -114,7 +114,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	}
 
 	/**
-	 * Subclasses can override this method in place of the <code>setUp()</code>
+	 * Subclasses can override this method in place of the {@code setUp()}
 	 * method, which is final in this class.
 	 * <p>The default implementation does nothing.
 	 * @throws Exception simply let any exception propagate
@@ -132,7 +132,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	}
 
 	/**
-	 * This implementation is final. Override <code>onTearDown</code> for
+	 * This implementation is final. Override {@code onTearDown} for
 	 * custom behavior.
 	 * @see #onTearDown()
 	 */
@@ -165,7 +165,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	 * context from the given locations.
 	 * <p>If you override {@link #contextKey()}, you will typically have to
 	 * override this method as well, being able to handle the key type that
-	 * <code>contextKey()</code> returns.
+	 * {@code contextKey()} returns.
 	 * @see #getConfigLocations()
 	 */
 	protected ConfigurableApplicationContext loadContext(Object key) throws Exception {
@@ -198,7 +198,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	 * instance, calls the {@link #prepareApplicationContext} prepareApplicationContext}
 	 * method and the {@link #customizeBeanFactory customizeBeanFactory} method to allow
 	 * for customizing the context and its DefaultListableBeanFactory, populates the
-	 * context from the specified config <code>locations</code> through the configured
+	 * context from the specified config {@code locations} through the configured
 	 * {@link #createBeanDefinitionReader(GenericApplicationContext) BeanDefinitionReader},
 	 * and finally {@link ConfigurableApplicationContext#refresh() refreshes} the context.
 	 * @param locations the config locations (as Spring resource locations,
@@ -321,10 +321,10 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	 * from the same package that the concrete test class is defined in. A path
 	 * starting with a slash is treated as fully qualified class path location,
 	 * e.g.: "/org/springframework/whatever/foo.xml".
-	 * <p>The default implementation simply returns <code>null</code>.
+	 * <p>The default implementation simply returns {@code null}.
 	 * @return an array of config locations
 	 * @see #getConfigPath()
-	 * @see java.lang.Class#getResource(String)
+	 * @see Class#getResource(String)
 	 */
 	protected String getConfigPath() {
 		return null;
@@ -332,7 +332,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 
 	/**
 	 * Return the ApplicationContext that this base class manages; may be
-	 * <code>null</code>.
+	 * {@code null}.
 	 */
 	public final ConfigurableApplicationContext getApplicationContext() {
 		// lazy load, in case setUp() has not yet been called.
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java
index 0b4ae975ee..c775ae95d8 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java
@@ -106,11 +106,11 @@ public abstract class AbstractSpringContextTests extends ConditionalTestCase {
 	}
 
 	/**
-	 * Determine if the supplied context <code>key</code> is <em>empty</em>.
-	 * <p>By default, <code>null</code> values, empty strings, and zero-length
+	 * Determine if the supplied context {@code key} is <em>empty</em>.
+	 * <p>By default, {@code null} values, empty strings, and zero-length
 	 * arrays are considered <em>empty</em>.
 	 * @param key the context key to check
-	 * @return <code>true</code> if the supplied context key is empty
+	 * @return {@code true} if the supplied context key is empty
 	 */
 	protected boolean isContextKeyEmpty(Object key) {
 		return (key == null) || ((key instanceof String) && !StringUtils.hasText((String) key)) ||
@@ -119,9 +119,9 @@ public abstract class AbstractSpringContextTests extends ConditionalTestCase {
 
 	/**
 	 * Obtain an ApplicationContext for the given key, potentially cached.
-	 * @param key the context key; may be <code>null</code>.
+	 * @param key the context key; may be {@code null}.
 	 * @return the corresponding ApplicationContext instance (potentially cached),
-	 * or <code>null</code> if the provided <code>key</code> is <em>empty</em>
+	 * or {@code null} if the provided {@code key} is <em>empty</em>
 	 */
 	protected final ConfigurableApplicationContext getContext(Object key) throws Exception {
 		if (isContextKeyEmpty(key)) {
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
index 6641a9b213..b3bdb4d9aa 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
@@ -103,7 +103,7 @@ public abstract class AbstractTransactionalDataSourceSpringContextTests
 	/**
 	 * Convenient method to delete all rows from these tables.
 	 * Calling this method will make avoidance of rollback by calling
-	 * <code>setComplete()</code> impossible.
+	 * {@code setComplete()} impossible.
 	 * @see #setComplete
 	 */
 	protected void deleteFromTables(String[] names) {
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
index 7e32eabd33..b0030de783 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
@@ -182,7 +182,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe
 	 * <p>Override {@link #onSetUpBeforeTransaction()} and/or
 	 * {@link #onSetUpInTransaction()} to add custom set-up behavior for
 	 * transactional execution. Alternatively, override this method for general
-	 * set-up behavior, calling <code>super.onSetUp()</code> as part of your
+	 * set-up behavior, calling {@code super.onSetUp()} as part of your
 	 * method implementation.
 	 * @throws Exception simply let any exception propagate
 	 * @see #onTearDown()
@@ -241,7 +241,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe
 	 * <p>Override {@link #onTearDownInTransaction()} and/or
 	 * {@link #onTearDownAfterTransaction()} to add custom tear-down behavior
 	 * for transactional execution. Alternatively, override this method for
-	 * general tear-down behavior, calling <code>super.onTearDown()</code> as
+	 * general tear-down behavior, calling {@code super.onTearDown()} as
 	 * part of your method implementation.
 	 * <p>Note that {@link #onTearDownInTransaction()} will only be called if a
 	 * transaction is still active at the time of the test shutdown. In
@@ -305,7 +305,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe
 
 	/**
 	 * Immediately force a commit or rollback of the transaction, according to
-	 * the <code>complete</code> and {@link #isRollback() rollback} flags.
+	 * the {@code complete} and {@link #isRollback() rollback} flags.
 	 * <p>Can be used to explicitly let the transaction end early, for example to
 	 * check whether lazy associations of persistent objects work outside of a
 	 * transaction (that is, have been initialized properly).
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
index d0653e546c..4cad1e1d9e 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
@@ -97,7 +97,7 @@ public abstract class AbstractAnnotationAwareTransactionalTests extends
 
 	/**
 	 * Constructs a new AbstractAnnotationAwareTransactionalTests instance with
-	 * the specified JUnit <code>name</code> and retrieves the configured (or
+	 * the specified JUnit {@code name} and retrieves the configured (or
 	 * default) {@link ProfileValueSource}.
 	 * @param name the name of the current test
 	 * @see ProfileValueUtils#retrieveProfileValueSource(Class)
@@ -118,10 +118,10 @@ public abstract class AbstractAnnotationAwareTransactionalTests extends
 	/**
 	 * Search for a unique {@link ProfileValueSource} in the supplied
 	 * {@link ApplicationContext}. If found, the
-	 * <code>profileValueSource</code> for this test will be set to the unique
+	 * {@code profileValueSource} for this test will be set to the unique
 	 * {@link ProfileValueSource}.
 	 * @param applicationContext the ApplicationContext in which to search for
-	 * the ProfileValueSource; may not be <code>null</code>
+	 * the ProfileValueSource; may not be {@code null}
 	 * @deprecated Use {@link ProfileValueSourceConfiguration @ProfileValueSourceConfiguration} instead.
 	 */
 	@Deprecated
@@ -189,12 +189,12 @@ public abstract class AbstractAnnotationAwareTransactionalTests extends
 	}
 
 	/**
-	 * Determine if the test for the supplied <code>testMethod</code> should
+	 * Determine if the test for the supplied {@code testMethod} should
 	 * run in the current environment.
 	 * <p>The default implementation is based on
 	 * {@link IfProfileValue @IfProfileValue} semantics.
 	 * @param testMethod the test method
-	 * @return <code>true</code> if the test is <em>disabled</em> in the current environment
+	 * @return {@code true} if the test is <em>disabled</em> in the current environment
 	 * @see ProfileValueUtils#isTestEnabledInThisEnvironment
 	 */
 	protected boolean isDisabledInThisEnvironment(Method testMethod) {
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java b/spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java
index 288c5b0d42..b13160181e 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java
@@ -32,9 +32,9 @@ import java.lang.annotation.Target;
  * {@link AbstractAnnotationAwareTransactionalTests} is less error-prone than
  * calling
  * {@link org.springframework.test.AbstractSingleSpringContextTests#setDirty() setDirty()}
- * explicitly because the call to <code>setDirty()</code> is guaranteed to
+ * explicitly because the call to {@code setDirty()} is guaranteed to
  * occur, even if the test failed. If only a particular code path in the test
- * dirties the context, prefer calling <code>setDirty()</code> explicitly --
+ * dirties the context, prefer calling {@code setDirty()} explicitly --
  * and take care!
  * </p>
  *
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java b/spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java
index fc9050b255..825e134aac 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java
@@ -79,12 +79,12 @@ import java.lang.annotation.Target;
 public @interface IfProfileValue {
 
 	/**
-	 * The <code>name</code> of the <em>profile value</em> against which to test.
+	 * The {@code name} of the <em>profile value</em> against which to test.
 	 */
 	String name();
 
 	/**
-	 * A single, permissible <code>value</code> of the <em>profile value</em>
+	 * A single, permissible {@code value} of the <em>profile value</em>
 	 * for the given {@link #name() name}.
 	 * <p>Note: Assigning values to both {@link #value()} and {@link #values()}
 	 * will lead to a configuration conflict.
@@ -92,7 +92,7 @@ public @interface IfProfileValue {
 	String value() default "";
 
 	/**
-	 * A list of all permissible <code>values</code> of the
+	 * A list of all permissible {@code values} of the
 	 * <em>profile value</em> for the given {@link #name() name}.
 	 * <p>Note: Assigning values to both {@link #value()} and {@link #values()}
 	 * will lead to a configuration conflict.
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java
index 186e90321e..ee1c07f14c 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java
@@ -22,7 +22,7 @@ package org.springframework.test.annotation;
  * testing environment.
  * </p>
  * <p>
- * Concrete implementations must provide a <code>public</code> no-args
+ * Concrete implementations must provide a {@code public} no-args
  * constructor.
  * </p>
  * <p>
@@ -44,7 +44,7 @@ public interface ProfileValueSource {
 	/**
 	 * Get the <em>profile value</em> indicated by the specified key.
 	 * @param key the name of the <em>profile value</em>
-	 * @return the String value of the <em>profile value</em>, or <code>null</code>
+	 * @return the String value of the <em>profile value</em>, or {@code null}
 	 * if there is no <em>profile value</em> with that key
 	 */
 	String get(String key);
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java
index ea1a6797af..f6dbf80587 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java
@@ -103,15 +103,15 @@ public abstract class ProfileValueUtils {
 	}
 
 	/**
-	 * Determine if the supplied <code>testClass</code> is <em>enabled</em>
+	 * Determine if the supplied {@code testClass} is <em>enabled</em>
 	 * in the current environment, as specified by the
 	 * {@link IfProfileValue @IfProfileValue} annotation at the class level.
 	 * <p>
-	 * Defaults to <code>true</code> if no
+	 * Defaults to {@code true} if no
 	 * {@link IfProfileValue @IfProfileValue} annotation is declared.
 	 *
 	 * @param testClass the test class
-	 * @return <code>true</code> if the test is <em>enabled</em> in the
+	 * @return {@code true} if the test is <em>enabled</em> in the
 	 * current environment
 	 */
 	public static boolean isTestEnabledInThisEnvironment(Class<?> testClass) {
@@ -124,17 +124,17 @@ public abstract class ProfileValueUtils {
 	}
 
 	/**
-	 * Determine if the supplied <code>testMethod</code> is <em>enabled</em>
+	 * Determine if the supplied {@code testMethod} is <em>enabled</em>
 	 * in the current environment, as specified by the
 	 * {@link IfProfileValue @IfProfileValue} annotation, which may be declared
 	 * on the test method itself or at the class level.
 	 * <p>
-	 * Defaults to <code>true</code> if no
+	 * Defaults to {@code true} if no
 	 * {@link IfProfileValue @IfProfileValue} annotation is declared.
 	 *
 	 * @param testMethod the test method
 	 * @param testClass the test class
-	 * @return <code>true</code> if the test is <em>enabled</em> in the
+	 * @return {@code true} if the test is <em>enabled</em> in the
 	 * current environment
 	 */
 	public static boolean isTestEnabledInThisEnvironment(Method testMethod, Class<?> testClass) {
@@ -150,19 +150,19 @@ public abstract class ProfileValueUtils {
 	}
 
 	/**
-	 * Determine if the supplied <code>testMethod</code> is <em>enabled</em>
+	 * Determine if the supplied {@code testMethod} is <em>enabled</em>
 	 * in the current environment, as specified by the
 	 * {@link IfProfileValue @IfProfileValue} annotation, which may be declared
 	 * on the test method itself or at the class level.
 	 * <p>
-	 * Defaults to <code>true</code> if no
+	 * Defaults to {@code true} if no
 	 * {@link IfProfileValue @IfProfileValue} annotation is declared.
 	 *
 	 * @param profileValueSource the ProfileValueSource to use to determine if
 	 * the test is enabled
 	 * @param testMethod the test method
 	 * @param testClass the test class
-	 * @return <code>true</code> if the test is <em>enabled</em> in the
+	 * @return {@code true} if the test is <em>enabled</em> in the
 	 * current environment
 	 */
 	public static boolean isTestEnabledInThisEnvironment(ProfileValueSource profileValueSource, Method testMethod,
@@ -179,14 +179,14 @@ public abstract class ProfileValueUtils {
 	}
 
 	/**
-	 * Determine if the <code>value</code> (or one of the <code>values</code>)
+	 * Determine if the {@code value} (or one of the {@code values})
 	 * in the supplied {@link IfProfileValue @IfProfileValue} annotation is
 	 * <em>enabled</em> in the current environment.
 	 *
 	 * @param profileValueSource the ProfileValueSource to use to determine if
 	 * the test is enabled
 	 * @param ifProfileValue the annotation to introspect
-	 * @return <code>true</code> if the test is <em>enabled</em> in the
+	 * @return {@code true} if the test is <em>enabled</em> in the
 	 * current environment
 	 */
 	private static boolean isTestEnabledInThisEnvironment(ProfileValueSource profileValueSource,
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java b/spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java
index e4620f9a2e..f2df990bb4 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
 /**
  * Test annotation to indicate whether or not the transaction for the annotated
  * test method should be <em>rolled back</em> after the test method has
- * completed. If <code>true</code>, the transaction will be rolled back;
+ * completed. If {@code true}, the transaction will be rolled back;
  * otherwise, the transaction will be committed.
  *
  * @author Sam Brannen
diff --git a/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java b/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java
index a3b9784c23..c4ec73bc3f 100644
--- a/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java
+++ b/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java
@@ -33,8 +33,8 @@ public class JdbcTestUtils {
 
 	/**
 	 * Read a script from the LineNumberReaded and build a String containing the lines.
-	 * @param lineNumberReader the <code>LineNumberReader</> containing the script to be processed
-	 * @return <code>String</code> containing the script lines
+	 * @param lineNumberReader the {@code LineNumberReader} containing the script to be processed
+	 * @return {@code String} containing the script lines
 	 * @throws IOException
 	 */
 	public static String readScript(LineNumberReader lineNumberReader) throws IOException {
@@ -73,7 +73,7 @@ public class JdbcTestUtils {
 
 	/**
 	 * Split an SQL script into separate statements delimited with the provided delimiter character. Each
-	 * individual statement will be added to the provided <code>List</code>.
+	 * individual statement will be added to the provided {@code List}.
 	 * @param script the SQL script
 	 * @param delim charecter delimiting each statement - typically a ';' character
 	 * @param statements the List that will contain the individual statements
diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
index 9a52d6b5ba..973fbf30aa 100644
--- a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -121,8 +121,8 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 	/**
 	 * Create an EntityManager that will always automatically enlist itself in current
 	 * transactions, in contrast to an EntityManager returned by
-	 * <code>EntityManagerFactory.createEntityManager()</code>
-	 * (which requires an explicit <code>joinTransaction()</code> call).
+	 * {@code EntityManagerFactory.createEntityManager()}
+	 * (which requires an explicit {@code joinTransaction()} call).
 	 */
 	protected EntityManager createContainerManagedEntityManager() {
 		return ExtendedEntityManagerCreator.createContainerManagedEntityManager(this.entityManagerFactory);
diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java b/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
index 0f2180ebeb..8bb2d00acb 100644
--- a/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
+++ b/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
@@ -20,7 +20,7 @@ import org.springframework.instrument.classloading.ResourceOverridingShadowingCl
 
 /**
  * Subclass of ShadowingClassLoader that overrides attempts to
- * locate <code>orm.xml</code>.
+ * locate {@code orm.xml}.
  *
  * <p>This class must <b>not</b> be an inner class of AbstractJpaTests
  * to avoid it being loaded until first used.
@@ -33,7 +33,7 @@ import org.springframework.instrument.classloading.ResourceOverridingShadowingCl
 class OrmXmlOverridingShadowingClassLoader extends ResourceOverridingShadowingClassLoader {
 
 	/**
-	 * Default location of the <code>orm.xml</code> file in the class path:
+	 * Default location of the {@code orm.xml} file in the class path:
 	 * "META-INF/orm.xml"
 	 */
 	public static final String DEFAULT_ORM_XML_LOCATION = "META-INF/orm.xml";
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java
index 540b9795d1..ccc8039a8f 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java
@@ -29,8 +29,8 @@ public interface GenericMarshaller extends Marshaller {
 	/**
 	 * Indicates whether this marshaller can marshal instances of the supplied generic type.
 	 * @param genericType the type that this marshaller is being asked if it can marshal
-	 * @return <code>true</code> if this marshaller can indeed marshal instances of the supplied type;
-	 * <code>false</code> otherwise
+	 * @return {@code true} if this marshaller can indeed marshal instances of the supplied type;
+	 * {@code false} otherwise
 	 */
 	boolean supports(Type genericType);
 
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java
index 5b90d1f5a5..c66d642fdd 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java
@@ -29,8 +29,8 @@ public interface GenericUnmarshaller extends Unmarshaller {
 	/**
 	 * Indicates whether this marshaller can marshal instances of the supplied generic type.
 	 * @param genericType the type that this marshaller is being asked if it can marshal
-	 * @return <code>true</code> if this marshaller can indeed marshal instances of the supplied type;
-	 * <code>false</code> otherwise
+	 * @return {@code true} if this marshaller can indeed marshal instances of the supplied type;
+	 * {@code false} otherwise
 	 */
 	boolean supports(Type genericType);
 
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java
index aaa3198025..85253a810c 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java
@@ -23,9 +23,9 @@ import javax.xml.transform.Result;
  * Defines the contract for Object XML Mapping Marshallers. Implementations of this interface
  * can serialize a given Object to an XML Stream.
  *
- * <p>Although the <code>marshal</code> method accepts a <code>java.lang.Object</code> as its
- * first parameter, most <code>Marshaller</code> implementations cannot handle arbitrary
- * <code>Object</code>s. Instead, a object class must be registered with the marshaller,
+ * <p>Although the {@code marshal} method accepts a {@code java.lang.Object} as its
+ * first parameter, most {@code Marshaller} implementations cannot handle arbitrary
+ * {@code Object}s. Instead, a object class must be registered with the marshaller,
  * or have a common base class.
  *
  * @author Arjen Poutsma
@@ -37,8 +37,8 @@ public interface Marshaller {
 	/**
 	 * Indicates whether this marshaller can marshal instances of the supplied type.
 	 * @param clazz the class that this marshaller is being asked if it can marshal
-	 * @return <code>true</code> if this marshaller can indeed marshal instances of the supplied class;
-	 * <code>false</code> otherwise
+	 * @return {@code true} if this marshaller can indeed marshal instances of the supplied class;
+	 * {@code false} otherwise
 	 */
 	boolean supports(Class<?> clazz);
 
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java
index 799bf9b662..f7c35abc87 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java
@@ -28,7 +28,7 @@ package org.springframework.oxm;
 public abstract class MarshallingException extends XmlMappingException {
 
 	/**
-	 * Construct a <code>MarshallingException</code> with the specified detail message.
+	 * Construct a {@code MarshallingException} with the specified detail message.
 	 * @param msg the detail message
 	 */
 	protected MarshallingException(String msg) {
@@ -36,7 +36,7 @@ public abstract class MarshallingException extends XmlMappingException {
 	}
 
 	/**
-	 * Construct a <code>MarshallingException</code> with the specified detail message
+	 * Construct a {@code MarshallingException} with the specified detail message
 	 * and nested exception.
 	 * @param msg the detail message
 	 * @param cause the nested exception
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
index fb486b3daf..5a157834d9 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
@@ -25,7 +25,7 @@ package org.springframework.oxm;
 public class MarshallingFailureException extends MarshallingException {
 
 	/**
-	 * Construct a <code>MarshallingFailureException</code> with the specified detail message.
+	 * Construct a {@code MarshallingFailureException} with the specified detail message.
 	 * @param msg the detail message
 	 */
 	public MarshallingFailureException(String msg) {
@@ -33,7 +33,7 @@ public class MarshallingFailureException extends MarshallingException {
 	}
 
 	/**
-	 * Construct a <code>MarshallingFailureException</code> with the specified detail message
+	 * Construct a {@code MarshallingFailureException} with the specified detail message
 	 * and nested exception.
 	 * @param msg the detail message
 	 * @param cause the nested exception
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java
index 127c38b7ec..11100c6f46 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java
@@ -25,7 +25,7 @@ package org.springframework.oxm;
 public class UncategorizedMappingException extends XmlMappingException {
 
 	/**
-	 * Construct an <code>UncategorizedMappingException</code> with the specified detail message
+	 * Construct an {@code UncategorizedMappingException} with the specified detail message
 	 * and nested exception.
 	 * @param msg the detail message
 	 * @param cause the nested exception
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java
index e1534f3f2f..bdbebf2c8b 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java
@@ -32,8 +32,8 @@ public interface Unmarshaller {
 	/**
 	 * Indicates whether this unmarshaller can unmarshal instances of the supplied type.
 	 * @param clazz the class that this unmarshaller is being asked if it can marshal
-	 * @return <code>true</code> if this unmarshaller can indeed unmarshal to the supplied class;
-	 * <code>false</code> otherwise
+	 * @return {@code true} if this unmarshaller can indeed unmarshal to the supplied class;
+	 * {@code false} otherwise
 	 */
 	boolean supports(Class<?> clazz);
 
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
index 16b93de1df..0477f163de 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
@@ -25,7 +25,7 @@ package org.springframework.oxm;
 public class UnmarshallingFailureException extends MarshallingException {
 
 	/**
-	 * Construct a <code>MarshallingFailureException</code> with the specified detail message.
+	 * Construct a {@code MarshallingFailureException} with the specified detail message.
 	 * @param msg the detail message
 	 */
 	public UnmarshallingFailureException(String msg) {
@@ -33,7 +33,7 @@ public class UnmarshallingFailureException extends MarshallingException {
 	}
 
 	/**
-	 * Construct a <code>MarshallingFailureException</code> with the specified detail message
+	 * Construct a {@code MarshallingFailureException} with the specified detail message
 	 * and nested exception.
 	 * @param msg the detail message
 	 * @param cause the nested exception
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
index 6b2aadcbca..50f9947b47 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
@@ -25,7 +25,7 @@ package org.springframework.oxm;
 public class ValidationFailureException extends XmlMappingException {
 
 	/**
-	 * Construct a <code>ValidationFailureException</code> with the specified detail message.
+	 * Construct a {@code ValidationFailureException} with the specified detail message.
 	 * @param msg the detail message
 	 */
 	public ValidationFailureException(String msg) {
@@ -33,7 +33,7 @@ public class ValidationFailureException extends XmlMappingException {
 	}
 
 	/**
-	 * Construct a <code>ValidationFailureException</code> with the specified detail message
+	 * Construct a {@code ValidationFailureException} with the specified detail message
 	 * and nested exception.
 	 * @param msg the detail message
 	 * @param cause the nested exception
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
index 62f2c6ff46..9f40146bd8 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
@@ -27,7 +27,7 @@ import org.springframework.core.NestedRuntimeException;
 public abstract class XmlMappingException extends NestedRuntimeException {
 
 	/**
-	 * Construct an <code>XmlMappingException</code> with the specified detail message.
+	 * Construct an {@code XmlMappingException} with the specified detail message.
 	 * @param msg the detail message
 	 */
 	public XmlMappingException(String msg) {
@@ -35,7 +35,7 @@ public abstract class XmlMappingException extends NestedRuntimeException {
 	}
 
 	/**
-	 * Construct an <code>XmlMappingException</code> with the specified detail message
+	 * Construct an {@code XmlMappingException} with the specified detail message
 	 * and nested exception.
 	 * @param msg the detail message
 	 * @param cause the nested exception
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
index 4ecc63168b..0834991061 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
@@ -27,7 +27,7 @@ import org.springframework.oxm.XmlMappingException;
 public class CastorMappingException extends XmlMappingException {
 
 	/**
-	 * Construct a <code>CastorMappingException</code> with the specified detail message
+	 * Construct a {@code CastorMappingException} with the specified detail message
 	 * and nested exception.
 	 * @param msg the detail message
 	 * @param cause the nested exception
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 55e66f8d5e..0405e8272e 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
@@ -61,16 +61,16 @@ import org.springframework.util.xml.DomUtils;
 import org.springframework.util.xml.StaxUtils;
 
 /**
- * Implementation of the <code>Marshaller</code> interface for Castor. By default, Castor does not require any further
+ * Implementation of the {@code Marshaller} interface for Castor. By default, Castor does not require any further
  * configuration, though setting target classes, target packages or providing a mapping file can be used to have more
  * control over the behavior of Castor.
  *
- * <p>If a target class is specified using <code>setTargetClass</code>, the <code>CastorMarshaller</code> can only be
+ * <p>If a target class is specified using {@code setTargetClass}, the {@code CastorMarshaller} can only be
  * used to unmarshal XML that represents that specific class. If you want to unmarshal multiple classes, you have to
- * provide a mapping file using <code>setMappingLocations</code>.
+ * provide a mapping file using {@code setMappingLocations}.
  *
  * <p>Due to limitations of Castor's API, it is required to set the encoding used for writing to output streams. It
- * defaults to <code>UTF-8</code>.
+ * defaults to {@code UTF-8}.
  *
  * @author Arjen Poutsma
  * @author Jakub Narloch
@@ -160,7 +160,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
 	}
 
 	/**
-	 * Set the Castor target class. Alternative means of configuring <code>CastorMarshaller<code> for unmarshalling
+	 * 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.
 	 */
 	public void setTargetClass(Class targetClass) {
@@ -168,7 +168,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
 	}
 
 	/**
-	 * Set the Castor target classes. Alternative means of configuring <code>CastorMarshaller<code> for unmarshalling
+	 * 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.
 	 */
 	public void setTargetClasses(Class[] targetClasses) {
@@ -190,7 +190,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
 	}
 
 	/**
-	 * Set whether this marshaller should validate in- and outgoing documents. <p>Default is <code>false</code>.
+	 * Set whether this marshaller should validate in- and outgoing documents. <p>Default is {@code false}.
 	 *
 	 * @see Marshaller#setValidation(boolean)
 	 */
@@ -200,7 +200,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
 
 	/**
 	 * Set whether the Castor {@link Unmarshaller} should preserve "ignorable" whitespace. <p>Default is
-	 * <code>false</code>.
+	 * {@code false}.
 	 *
 	 * @see org.exolab.castor.xml.Unmarshaller#setWhitespacePreserve(boolean)
 	 */
@@ -210,7 +210,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
 
 	/**
 	 * Set whether the Castor {@link Unmarshaller} should ignore attributes that do not match a specific field. <p>Default
-	 * is <code>true</code>: extra attributes are ignored.
+	 * is {@code true}: extra attributes are ignored.
 	 *
 	 * @see org.exolab.castor.xml.Unmarshaller#setIgnoreExtraAttributes(boolean)
 	 */
@@ -221,7 +221,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
 	/**
 	 * Set whether the Castor {@link Unmarshaller} should ignore elements that do not match a specific field. <p>Default
 	 * is
-	 * <code>false</code>, extra attributes are flagged as an error.
+	 * {@code false}, extra attributes are flagged as an error.
 	 *
 	 * @see org.exolab.castor.xml.Unmarshaller#setIgnoreExtraElements(boolean)
 	 */
@@ -416,7 +416,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
 	}
 
 	/**
-	 * Create the Castor <code>XMLContext</code>. Subclasses can override this to create a custom context. <p> The default
+	 * Create the Castor {@code XMLContext}. Subclasses can override this to create a custom context. <p> The default
 	 * implementation loads mapping files if defined, or the target class or packages if defined.
 	 *
 	 * @return the created resolver
@@ -446,7 +446,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
 	}
 
 	/**
-	 * Returns <code>true</code> for all classes, i.e. Castor supports arbitrary classes.
+	 * Returns {@code true} for all classes, i.e. Castor supports arbitrary classes.
 	 */
 	public boolean supports(Class<?> clazz) {
 		return true;
@@ -653,15 +653,15 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
 	}
 
 	/**
-	 * Convert the given <code>XMLException</code> to an appropriate exception from the
-	 * <code>org.springframework.oxm</code> hierarchy. <p> A boolean flag is used to indicate whether this exception
+	 * Convert the given {@code XMLException} to an appropriate exception from the
+	 * {@code org.springframework.oxm} hierarchy. <p> A boolean flag is used to indicate whether this exception
 	 * occurs
 	 * during marshalling or unmarshalling, since Castor itself does not make this distinction in its exception hierarchy.
 	 *
-	 * @param ex Castor <code>XMLException</code> that occurred
-	 * @param marshalling indicates whether the exception occurs during marshalling (<code>true</code>), or unmarshalling
-	 * (<code>false</code>)
-	 * @return the corresponding <code>XmlMappingException</code>
+	 * @param ex Castor {@code XMLException} that occurred
+	 * @param marshalling indicates whether the exception occurs during marshalling ({@code true}), or unmarshalling
+	 * ({@code false})
+	 * @return the corresponding {@code XmlMappingException}
 	 */
 	protected XmlMappingException convertCastorException(XMLException ex, boolean marshalling) {
 		if (ex instanceof ValidationException) {
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
index 9d28892f9d..d3895ebccc 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
@@ -21,7 +21,7 @@ import org.w3c.dom.Element;
 import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
 
 /**
- * Parser for the <code>&lt;oxm:castor-marshaller/&gt;</code> element.
+ * Parser for the {@code &lt;oxm:castor-marshaller/&gt;} element.
  *
  * @author Jakub Narloch
  * @since 3.1
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java
index 3d60be51c1..447c425da8 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java
@@ -29,7 +29,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 
 /**
- * Parser for the <code>&lt;oxm:jaxb2-marshaller/&gt; element.
+ * Parser for the {@code <oxm:jaxb2-marshaller/>} element.
  *
  * @author Arjen Poutsma
  * @since 3.0
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java
index b3a0773f27..aa99d312e2 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java
@@ -21,7 +21,7 @@ import org.w3c.dom.Element;
 import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
 
 /**
- * Parser for the <code>&lt;oxm:jibx-marshaller/&gt; element.
+ * Parser for the {@code <oxm:jibx-marshaller/>} element.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -35,4 +35,4 @@ class JibxMarshallerBeanDefinitionParser extends AbstractSimpleBeanDefinitionPar
 		return JIBX_MARSHALLER_CLASS_NAME;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
index f4196b7001..6ff085146a 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
@@ -20,7 +20,7 @@ import org.springframework.beans.factory.xml.NamespaceHandler;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * {@link NamespaceHandler} for the '<code>oxm</code>' namespace.
+ * {@link NamespaceHandler} for the '{@code oxm}' namespace.
  *
  * @author Arjen Poutsma
  * @since 3.0
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java
index a27fec56bd..3fb94cddda 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java
@@ -24,7 +24,7 @@ import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.util.StringUtils;
 
 /**
- * Parser for the <code>&lt;oxm:xmlbeans-marshaller/&gt; element.
+ * Parser for the {@code <oxm:xmlbeans-marshaller/>} element.
  *
  * @author Arjen Poutsma
  * @since 3.0
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 65ec8cceed..956c003233 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
@@ -99,7 +99,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.util.xml.StaxUtils;
 
 /**
- * Implementation of the <code>Marshaller</code> interface for JAXB 2.0.
+ * Implementation of the {@code Marshaller} 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
@@ -235,18 +235,18 @@ public class Jaxb2Marshaller
 	}
 
 	/**
-	 * Set the <code>JAXBContext</code> properties. These implementation-specific
-	 * properties will be set on the underlying <code>JAXBContext</code>.
+	 * Set the {@code JAXBContext} properties. These implementation-specific
+	 * properties will be set on the underlying {@code JAXBContext}.
 	 */
 	public void setJaxbContextProperties(Map<String, ?> jaxbContextProperties) {
 		this.jaxbContextProperties = jaxbContextProperties;
 	}
 
 	/**
-	 * Set the JAXB <code>Marshaller</code> properties. These properties will be set on the
-	 * underlying JAXB <code>Marshaller</code>, and allow for features such as indentation.
+	 * Set the JAXB {@code Marshaller} properties. These properties will be set on the
+	 * underlying JAXB {@code Marshaller}, and allow for features such as indentation.
 	 * @param properties the properties
-	 * @see javax.xml.bind.Marshaller#setProperty(String,Object)
+	 * @see javax.xml.bind.Marshaller#setProperty(String, Object)
 	 * @see javax.xml.bind.Marshaller#JAXB_ENCODING
 	 * @see javax.xml.bind.Marshaller#JAXB_FORMATTED_OUTPUT
 	 * @see javax.xml.bind.Marshaller#JAXB_NO_NAMESPACE_SCHEMA_LOCATION
@@ -257,24 +257,24 @@ public class Jaxb2Marshaller
 	}
 
 	/**
-	 * Set the JAXB <code>Unmarshaller</code> properties. These properties will be set on the
-	 * underlying JAXB <code>Unmarshaller</code>.
+	 * Set the JAXB {@code Unmarshaller} properties. These properties will be set on the
+	 * underlying JAXB {@code Unmarshaller}.
 	 * @param properties the properties
-	 * @see javax.xml.bind.Unmarshaller#setProperty(String,Object)
+	 * @see javax.xml.bind.Unmarshaller#setProperty(String, Object)
 	 */
 	public void setUnmarshallerProperties(Map<String, ?> properties) {
 		this.unmarshallerProperties = properties;
 	}
 
 	/**
-	 * Specify the <code>Marshaller.Listener</code> to be registered with the JAXB <code>Marshaller</code>.
+	 * Specify the {@code Marshaller.Listener} to be registered with the JAXB {@code Marshaller}.
 	 */
 	public void setMarshallerListener(Marshaller.Listener marshallerListener) {
 		this.marshallerListener = marshallerListener;
 	}
 
 	/**
-	 * Set the <code>Unmarshaller.Listener</code> to be registered with the JAXB <code>Unmarshaller</code>.
+	 * Set the {@code Unmarshaller.Listener} to be registered with the JAXB {@code Unmarshaller}.
 	 */
 	public void setUnmarshallerListener(Unmarshaller.Listener unmarshallerListener) {
 		this.unmarshallerListener = unmarshallerListener;
@@ -289,8 +289,8 @@ public class Jaxb2Marshaller
 	}
 
 	/**
-	 * Specify the <code>XmlAdapter</code>s to be registered with the JAXB <code>Marshaller</code>
-	 * and <code>Unmarshaller</code>
+	 * Specify the {@code XmlAdapter}s to be registered with the JAXB {@code Marshaller}
+	 * and {@code Unmarshaller}
 	 */
 	public void setAdapters(XmlAdapter<?, ?>[] adapters) {
 		this.adapters = adapters;
@@ -311,7 +311,7 @@ public class Jaxb2Marshaller
 	}
 
 	/**
-	 * Set the schema language. Default is the W3C XML Schema: <code>http://www.w3.org/2001/XMLSchema"</code>.
+	 * Set the schema language. Default is the W3C XML Schema: {@code http://www.w3.org/2001/XMLSchema"}.
 	 * @see XMLConstants#W3C_XML_SCHEMA_NS_URI
 	 * @see XMLConstants#RELAXNG_NS_URI
 	 */
@@ -331,7 +331,7 @@ public class Jaxb2Marshaller
 
 	/**
 	 * Specify whether MTOM support should be enabled or not.
-	 * Default is <code>false</code>: marshalling using XOP/MTOM not being enabled.
+	 * Default is {@code false}: marshalling using XOP/MTOM not being enabled.
 	 */
 	public void setMtomEnabled(boolean mtomEnabled) {
 		this.mtomEnabled = mtomEnabled;
@@ -663,7 +663,7 @@ public class Jaxb2Marshaller
 
 	/**
 	 * Template method that can be overridden by concrete JAXB marshallers for custom initialization behavior.
-	 * Gets called after creation of JAXB <code>Marshaller</code>, and after the respective properties have been set.
+	 * Gets called after creation of JAXB {@code Marshaller}, and after the respective properties have been set.
 	 * <p>The default implementation sets the {@link #setMarshallerProperties(Map) defined properties}, the {@link
 	 * #setValidationEventHandler(ValidationEventHandler) validation event handler}, the {@link #setSchemas(Resource[])
 	 * schemas}, {@link #setMarshallerListener(javax.xml.bind.Marshaller.Listener) listener}, and
@@ -749,7 +749,7 @@ public class Jaxb2Marshaller
 
 	/**
 	 * Template method that can be overridden by concrete JAXB marshallers for custom initialization behavior.
-	 * Gets called after creation of JAXB <code>Marshaller</code>, and after the respective properties have been set.
+	 * Gets called after creation of JAXB {@code Marshaller}, and after the respective properties have been set.
 	 * <p>The default implementation sets the {@link #setUnmarshallerProperties(Map) defined properties}, the {@link
 	 * #setValidationEventHandler(ValidationEventHandler) validation event handler}, the {@link #setSchemas(Resource[])
 	 * schemas}, {@link #setUnmarshallerListener(javax.xml.bind.Unmarshaller.Listener) listener}, and
@@ -778,10 +778,10 @@ public class Jaxb2Marshaller
 	}
 
 	/**
-	 * Convert the given <code>JAXBException</code> to an appropriate exception from the
-	 * <code>org.springframework.oxm</code> hierarchy.
-	 * @param ex <code>JAXBException</code> that occured
-	 * @return the corresponding <code>XmlMappingException</code>
+	 * Convert the given {@code JAXBException} to an appropriate exception from the
+	 * {@code org.springframework.oxm} hierarchy.
+	 * @param ex {@code JAXBException} that occured
+	 * @return the corresponding {@code XmlMappingException}
 	 */
 	protected XmlMappingException convertJaxbException(JAXBException ex) {
 		if (ex instanceof ValidationException) {
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 813c89931e..2ded691c8b 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
@@ -70,10 +70,10 @@ import org.springframework.util.StringUtils;
 import org.springframework.util.xml.StaxUtils;
 
 /**
- * Implementation of the <code>Marshaller</code> and <code>Unmarshaller</code> interfaces for JiBX.
+ * Implementation of the {@code Marshaller} and {@code Unmarshaller} interfaces for JiBX.
  *
- * <p>The typical usage will be to set the <code>targetClass</code> and optionally the
- * <code>bindingName</code> property on this bean.
+ * <p>The typical usage will be to set the {@code targetClass} and optionally the
+ * {@code bindingName} property on this bean.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -136,7 +136,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe
 	}
 
 	/**
-	 * Set the number of nesting indent spaces. Default is <code>-1</code>, i.e. no indentation.
+	 * Set the number of nesting indent spaces. Default is {@code -1}, i.e. no indentation.
 	 */
 	public void setIndent(int indent) {
 		this.indent = indent;
@@ -426,7 +426,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe
 
 
 	/**
-	 * Create a new <code>IMarshallingContext</code>, configured with the correct indentation.
+	 * Create a new {@code IMarshallingContext}, configured with the correct indentation.
 	 * @return the created marshalling context
 	 * @throws JiBXException in case of errors
 	 */
@@ -437,7 +437,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe
 	}
 
 	/**
-	 * Create a new <code>IUnmarshallingContext</code>.
+	 * Create a new {@code IUnmarshallingContext}.
 	 * @return the created unmarshalling context
 	 * @throws JiBXException in case of errors
 	 */
@@ -446,14 +446,14 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe
 	}
 
 	/**
-	 * Convert the given <code>JiBXException</code> to an appropriate exception from the
-	 * <code>org.springframework.oxm</code> hierarchy.
+	 * Convert the given {@code JiBXException} to an appropriate exception from the
+	 * {@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</code> that occured
-	 * @param marshalling indicates whether the exception occurs during marshalling (<code>true</code>),
-	 * or unmarshalling (<code>false</code>)
-	 * @return the corresponding <code>XmlMappingException</code>
+	 * @param ex {@code JiBXException} that occured
+	 * @param marshalling indicates whether the exception occurs during marshalling ({@code true}),
+	 * or unmarshalling ({@code false})
+	 * @return the corresponding {@code XmlMappingException}
 	 */
 	public XmlMappingException convertJibxException(JiBXException ex, boolean marshalling) {
 		if (ex instanceof ValidationException) {
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
index 5d2ce35bb5..9acf232285 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
@@ -30,7 +30,7 @@ public interface MimeContainer {
 
 	/**
 	 * Indicate whether this container is a XOP package.
-	 * @return <code>true</code> when the constraints specified in
+	 * @return {@code true} when the constraints specified in
 	 * <a href="http://www.w3.org/TR/2005/REC-xop10-20050125/#identifying_xop_documents">Identifying XOP Documents</a>
 	 * are met
 	 * @see <a href="http://www.w3.org/TR/2005/REC-xop10-20050125/#xop_packages">XOP Packages</a>
@@ -39,7 +39,7 @@ public interface MimeContainer {
 
 	/**
 	 * Turn this message into a XOP package.
-	 * @return <code>true</code> when the message actually is a XOP package
+	 * @return {@code true} when the message actually is a XOP package
 	 * @see <a href="http://www.w3.org/TR/2005/REC-xop10-20050125/#xop_packages">XOP Packages</a>
 	 */
 	boolean convertToXopPackage();
@@ -52,7 +52,7 @@ public interface MimeContainer {
 	void addAttachment(String contentId, DataHandler dataHandler);
 
 	/**
-	 * Return the attachment with the given content id, or <code>null</code> if not found.
+	 * Return the attachment with the given content id, or {@code null} if not found.
 	 * @param contentId the content id
 	 * @return the attachment, as a data handler
 	 */
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 cee37bb9b4..983655abf0 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
@@ -56,8 +56,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.xml.StaxUtils;
 
 /**
- * Abstract implementation of the <code>Marshaller</code> and <code>Unmarshaller</code> interface.
- * This implementation inspects the given <code>Source</code> or <code>Result</code>, and defers
+ * 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.
  *
  * @author Arjen Poutsma
@@ -75,15 +75,15 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 
 
 	/**
-	 * Marshals the object graph with the given root into the provided <code>javax.xml.transform.Result</code>.
-	 * <p>This implementation inspects the given result, and calls <code>marshalDomResult</code>,
-	 * <code>marshalSaxResult</code>, or <code>marshalStreamResult</code>.
+	 * 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</code> if neither a <code>DOMResult</code>,
-	 * a <code>SAXResult</code>, nor a <code>StreamResult</code>
+	 * @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)
@@ -107,15 +107,15 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	}
 
 	/**
-	 * Unmarshals the given provided <code>javax.xml.transform.Source</code> into an object graph.
-	 * <p>This implementation inspects the given result, and calls <code>unmarshalDomSource</code>,
-	 * <code>unmarshalSaxSource</code>, or <code>unmarshalStreamSource</code>.
+	 * 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</code> is neither a <code>DOMSource</code>,
-	 * a <code>SAXSource</code>, nor a <code>StreamSource</code>
+	 * @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)
@@ -139,11 +139,11 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	}
 
 	/**
-	 * Create a <code>DocumentBuilder</code> that this marshaller will use for creating
-	 * DOM documents when passed an empty <code>DOMSource</code>.
+	 * 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</code> that the DocumentBuilder should be created with
-	 * @return the <code>DocumentBuilder</code>
+	 * @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)
@@ -153,9 +153,9 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	}
 
 	/**
-	 * Create a <code>DocumentBuilder</code> that this marshaller will use for creating
-	 * DOM documents when passed an empty <code>DOMSource</code>.
-	 * <p>The resulting <code>DocumentBuilderFactory</code> is cached, so this method
+	 * Create a {@code DocumentBuilder} that this marshaller will use for creating
+	 * DOM documents when passed an empty {@code DOMSource}.
+	 * <p>The resulting {@code DocumentBuilderFactory} is cached, so this method
 	 * will only be called once.
 	 * @return the DocumentBuilderFactory
 	 * @throws ParserConfigurationException if thrown by JAXP methods
@@ -168,7 +168,7 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	}
 
 	/**
-	 * Create a <code>XMLReader</code> that this marshaller will when passed an empty <code>SAXSource</code>.
+	 * Create a {@code XMLReader} that this marshaller will when passed an empty {@code SAXSource}.
 	 * @return the XMLReader
 	 * @throws SAXException if thrown by JAXP methods
 	 */
@@ -180,12 +180,12 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	// Marshalling
 
 	/**
-	 * Template method for handling <code>DOMResult</code>s.
-	 * <p>This implementation delegates to <code>marshalDomNode</code>.
-	 * @param graph	the root of the object graph to marshal
-	 * @param domResult the <code>DOMResult</code>
+	 * 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 domResult the {@code DOMResult}
 	 * @throws XmlMappingException if the given object cannot be marshalled to the result
-	 * @throws IllegalArgumentException if the <code>domResult</code> is empty
+	 * @throws IllegalArgumentException if the {@code domResult} is empty
 	 * @see #marshalDomNode(Object, org.w3c.dom.Node)
 	 */
 	protected void marshalDomResult(Object graph, DOMResult domResult) throws XmlMappingException {
@@ -208,15 +208,15 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	}
 
 	/**
-	 * Template method for handling <code>StaxResult</code>s.
-	 * <p>This implementation delegates to <code>marshalXMLSteamWriter</code> or
-	 * <code>marshalXMLEventConsumer</code>, depending on what is contained in the
-	 * <code>StaxResult</code>.
-	 * @param graph	the root of the object graph to marshal
+	 * Template method for handling {@code StaxResult}s.
+	 * <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}
 	 * @throws XmlMappingException if the given object cannot be marshalled to the result
-	 * @throws IllegalArgumentException if the <code>domResult</code> is empty
-	 * @see #marshalDomNode(Object,org.w3c.dom.Node)
+	 * @throws IllegalArgumentException if the {@code domResult} is empty
+	 * @see #marshalDomNode(Object, org.w3c.dom.Node)
 	 */
 	protected void marshalStaxResult(Object graph, Result staxResult) throws XmlMappingException {
 		XMLStreamWriter streamWriter = StaxUtils.getXMLStreamWriter(staxResult);
@@ -235,10 +235,10 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	}
 
 	/**
-	 * Template method for handling <code>SAXResult</code>s.
-	 * <p>This implementation delegates to <code>marshalSaxHandlers</code>.
-	 * @param graph	the root of the object graph to marshal
-	 * @param saxResult the <code>SAXResult</code>
+	 * 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 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)
 	 */
@@ -250,15 +250,15 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	}
 
 	/**
-	 * Template method for handling <code>StreamResult</code>s.
-	 * <p>This implementation delegates to <code>marshalOutputStream</code> or <code>marshalWriter</code>,
-	 * depending on what is contained in the <code>StreamResult</code>
+	 * Template method for handling {@code StreamResult}s.
+	 * <p>This implementation delegates to {@code marshalOutputStream} or {@code marshalWriter},
+	 * depending on what is contained in the {@code StreamResult}
 	 * @param graph the root of the object graph to marshal
-	 * @param streamResult the <code>StreamResult</code>
+	 * @param streamResult the {@code StreamResult}
 	 * @throws IOException if an I/O Exception occurs
 	 * @throws XmlMappingException if the given object cannot be marshalled to the result
-	 * @throws IllegalArgumentException if <code>streamResult</code> does neither
-	 * contain an <code>OutputStream</code> nor a <code>Writer</code>
+	 * @throws IllegalArgumentException if {@code streamResult} does neither
+	 * contain an {@code OutputStream} nor a {@code Writer}
 	 */
 	protected void marshalStreamResult(Object graph, StreamResult streamResult)
 			throws XmlMappingException, IOException {
@@ -278,14 +278,14 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	// Unmarshalling
 
 	/**
-	 * Template method for handling <code>DOMSource</code>s.
-	 * <p>This implementation delegates to <code>unmarshalDomNode</code>.
-	 * If the given source is empty, an empty source <code>Document</code>
+	 * Template method for handling {@code DOMSource}s.
+	 * <p>This implementation delegates to {@code unmarshalDomNode}.
+	 * If the given source is empty, an empty source {@code Document}
 	 * will be created as a placeholder.
-	 * @param domSource the <code>DOMSource</code>
+	 * @param domSource the {@code DOMSource}
 	 * @return the object graph
 	 * @throws XmlMappingException if the given source cannot be mapped to an object
-	 * @throws IllegalArgumentException if the <code>domSource</code> is empty
+	 * @throws IllegalArgumentException if the {@code domSource} is empty
 	 * @see #unmarshalDomNode(org.w3c.dom.Node)
 	 */
 	protected Object unmarshalDomSource(DOMSource domSource) throws XmlMappingException {
@@ -308,10 +308,10 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	}
 
 	/**
-	 * Template method for handling <code>StaxSource</code>s.
-	 * <p>This implementation delegates to <code>unmarshalXmlStreamReader</code> or
-	 * <code>unmarshalXmlEventReader</code>.
-	 * @param staxSource the <code>StaxSource</code>
+	 * Template method for handling {@code StaxSource}s.
+	 * <p>This implementation delegates to {@code unmarshalXmlStreamReader} or
+	 * {@code unmarshalXmlEventReader}.
+	 * @param staxSource the {@code StaxSource}
 	 * @return the object graph
 	 * @throws XmlMappingException if the given source cannot be mapped to an object
 	 */
@@ -332,9 +332,9 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	}
 
 	/**
-	 * Template method for handling <code>SAXSource</code>s.
-	 * <p>This implementation delegates to <code>unmarshalSaxReader</code>.
-	 * @param saxSource the <code>SAXSource</code>
+	 * Template method for handling {@code SAXSource}s.
+	 * <p>This implementation delegates to {@code unmarshalSaxReader}.
+	 * @param saxSource the {@code SAXSource}
 	 * @return the object graph
 	 * @throws XmlMappingException if the given source cannot be mapped to an object
 	 * @throws IOException if an I/O Exception occurs
@@ -356,9 +356,9 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	}
 
 	/**
-	 * Template method for handling <code>StreamSource</code>s.
-	 * <p>This implementation defers to <code>unmarshalInputStream</code> or <code>unmarshalReader</code>.
-	 * @param streamSource the <code>StreamSource</code>
+	 * Template method for handling {@code StreamSource}s.
+	 * <p>This implementation defers to {@code unmarshalInputStream} or {@code unmarshalReader}.
+	 * @param streamSource the {@code StreamSource}
 	 * @return the object graph
 	 * @throws IOException if an I/O exception occurs
 	 * @throws XmlMappingException if the given source cannot be mapped to an object
@@ -379,9 +379,9 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	// Abstract template methods
 
 	/**
-	 * Abstract template method for marshalling the given object graph to a DOM <code>Node</code>.
-	 * <p>In practice, node is be a <code>Document</code> node, a <code>DocumentFragment</code> node,
-	 * or a <code>Element</code> node. In other words, a node that accepts children.
+	 * Abstract template method for marshalling the given object graph to a DOM {@code Node}.
+	 * <p>In practice, node is be a {@code Document} node, a {@code DocumentFragment} node,
+	 * or a {@code Element} node. In other words, a node that accepts children.
 	 * @param graph the root of the object graph to marshal
 	 * @param node the DOM node that will contain the result tree
 	 * @throws XmlMappingException if the given object cannot be marshalled to the DOM node
@@ -393,27 +393,27 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 			throws XmlMappingException;
 
 	/**
-	 * Abstract template method for marshalling the given object to a StAX <code>XMLEventWriter</code>.
-	 * @param graph	the root of the object graph to marshal
-	 * @param eventWriter the <code>XMLEventWriter</code> to write to
+	 * Abstract template method for marshalling the given object to a StAX {@code XMLEventWriter}.
+	 * @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
 	 */
 	protected abstract void marshalXmlEventWriter(Object graph, XMLEventWriter eventWriter)
 			throws XmlMappingException;
 
 	/**
-	 * Abstract template method for marshalling the given object to a StAX <code>XMLStreamWriter</code>.
+	 * Abstract template method for marshalling the given object to a StAX {@code XMLStreamWriter}.
 	 * @param graph the root of the object graph to marshal
-	 * @param streamWriter the <code>XMLStreamWriter</code> to write to
+	 * @param streamWriter the {@code XMLStreamWriter} to write to
 	 * @throws XmlMappingException if the given object cannot be marshalled to the DOM node
 	 */
 	protected abstract void marshalXmlStreamWriter(Object graph, XMLStreamWriter streamWriter)
 			throws XmlMappingException;
 
 	/**
-	 * Abstract template method for marshalling the given object graph to a <code>OutputStream</code>.
+	 * 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</code> to write to
+	 * @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
 	 */
@@ -421,10 +421,10 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 			throws XmlMappingException, IOException;
 
 	/**
-	 * Abstract template method for marshalling the given object graph to a SAX <code>ContentHandler</code>.
+	 * Abstract template method for marshalling the given object graph to a SAX {@code ContentHandler}.
 	 * @param graph the root of the object graph to marshal
-	 * @param contentHandler the SAX <code>ContentHandler</code>
-	 * @param lexicalHandler the SAX2 <code>LexicalHandler</code>. Can be <code>null</code>.
+	 * @param contentHandler the SAX {@code ContentHandler}
+	 * @param lexicalHandler the SAX2 {@code LexicalHandler}. Can be {@code null}.
 	 * @throws XmlMappingException if the given object cannot be marshalled to the handlers
 	 */
 	protected abstract void marshalSaxHandlers(
@@ -432,9 +432,9 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 			throws XmlMappingException;
 
 	/**
-	 * Abstract template method for marshalling the given object graph to a <code>Writer</code>.
+	 * Abstract template method for marshalling the given object graph to a {@code Writer}.
 	 * @param graph the root of the object graph to marshal
-	 * @param writer the <code>Writer</code> to write to
+	 * @param writer the {@code Writer} to write to
 	 * @throws XmlMappingException if the given object cannot be marshalled to the writer
 	 * @throws IOException if an I/O exception occurs
 	 */
@@ -442,7 +442,7 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 			throws XmlMappingException, IOException;
 
 	/**
-	 * Abstract template method for unmarshalling from a given DOM <code>Node</code>.
+	 * Abstract template method for unmarshalling from a given DOM {@code Node}.
 	 * @param node the DOM node that contains the objects to be unmarshalled
 	 * @return the object graph
 	 * @throws XmlMappingException if the given DOM node cannot be mapped to an object
@@ -450,8 +450,8 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	protected abstract Object unmarshalDomNode(Node node) throws XmlMappingException;
 
 	/**
-	 * Abstract template method for unmarshalling from a given Stax <code>XMLEventReader</code>.
-	 * @param eventReader the <code>XMLEventReader</code> to read from
+	 * Abstract template method for unmarshalling from a given Stax {@code XMLEventReader}.
+	 * @param eventReader the {@code XMLEventReader} to read from
 	 * @return the object graph
 	 * @throws XmlMappingException if the given event reader cannot be converted to an object
 	 */
@@ -459,8 +459,8 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 			throws XmlMappingException;
 
 	/**
-	 * Abstract template method for unmarshalling from a given Stax <code>XMLStreamReader</code>.
-	 * @param streamReader the <code>XMLStreamReader</code> to read from
+	 * Abstract template method for unmarshalling from a given Stax {@code XMLStreamReader}.
+	 * @param streamReader the {@code XMLStreamReader} to read from
 	 * @return the object graph
 	 * @throws XmlMappingException if the given stream reader cannot be converted to an object
 	 */
@@ -468,8 +468,8 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 			throws XmlMappingException;
 
 	/**
-	 * Abstract template method for unmarshalling from a given <code>InputStream</code>.
-	 * @param inputStream the <code>InputStreamStream</code> to read from
+	 * Abstract template method for unmarshalling from a given {@code InputStream}.
+	 * @param inputStream the {@code InputStreamStream} to read from
 	 * @return the object graph
 	 * @throws XmlMappingException if the given stream cannot be converted to an object
 	 * @throws IOException if an I/O exception occurs
@@ -478,8 +478,8 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 			throws XmlMappingException, IOException;
 
 	/**
-	 * Abstract template method for unmarshalling from a given <code>Reader</code>.
-	 * @param reader the <code>Reader</code> to read from
+	 * Abstract template method for unmarshalling from a given {@code Reader}.
+	 * @param reader the {@code Reader} to read from
 	 * @return the object graph
 	 * @throws XmlMappingException if the given reader cannot be converted to an object
 	 * @throws IOException if an I/O exception occurs
@@ -488,9 +488,9 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 			throws XmlMappingException, IOException;
 
 	/**
-	 * Abstract template method for unmarshalling using a given SAX <code>XMLReader</code>
-	 * and <code>InputSource</code>.
-	 * @param xmlReader the SAX <code>XMLReader</code> to parse with
+	 * 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
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java b/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
index 9ebc45ba09..9c208afcfb 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
@@ -37,13 +37,13 @@ import org.springframework.util.Assert;
 
 /**
  * {@link Source} implementation that uses a {@link Marshaller}.Can be constructed with a
- * <code>Marshaller</code> and an object to be marshalled.
+ * {@code Marshaller} and an object to be marshalled.
  *
- * <p>Even though <code>MarshallingSource</code> extends from <code>SAXSource</code>, calling the methods of
- * <code>SAXSource</code> is <strong>not supported</strong>. In general, the only supported operation on this class is
- * to use the <code>XMLReader</code> obtained via {@link #getXMLReader()} to parse the input source obtained via {@link
+ * <p>Even though {@code MarshallingSource} extends from {@code SAXSource}, calling the methods of
+ * {@code SAXSource} is <strong>not supported</strong>. In general, the only supported operation on this class is
+ * to use the {@code XMLReader} obtained via {@link #getXMLReader()} to parse the input source obtained via {@link
  * #getInputSource()}. Calling {@link #setXMLReader(XMLReader)} or {@link #setInputSource(InputSource)} will result in
- * <code>UnsupportedOperationException</code>s.
+ * {@code UnsupportedOperationException}s.
  *
  * @author Arjen Poutsma
  * @since 3.0
@@ -57,7 +57,7 @@ public class MarshallingSource extends SAXSource {
 
 
 	/**
-	 * Create a new <code>MarshallingSource</code> with the given marshaller and content.
+	 * Create a new {@code MarshallingSource} with the given marshaller and content.
 	 * @param marshaller the marshaller to use
 	 * @param content the object to be marshalled
 	 */
@@ -71,7 +71,7 @@ public class MarshallingSource extends SAXSource {
 
 
 	/**
-	 * Return the <code>Marshaller</code> used by this <code>MarshallingSource</code>.
+	 * Return the {@code Marshaller} used by this {@code MarshallingSource}.
 	 */
 	public Marshaller getMarshaller() {
 		return this.marshaller;
@@ -85,7 +85,7 @@ public class MarshallingSource extends SAXSource {
 	}
 
 	/**
-	 * Throws a <code>UnsupportedOperationException</code>.
+	 * Throws a {@code UnsupportedOperationException}.
 	 */
 	@Override
 	public void setInputSource(InputSource inputSource) {
@@ -93,7 +93,7 @@ public class MarshallingSource extends SAXSource {
 	}
 
 	/**
-	 * Throws a <code>UnsupportedOperationException</code>.
+	 * Throws a {@code UnsupportedOperationException}.
 	 */
 	@Override
 	public void setXMLReader(XMLReader reader) {
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java b/spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java
index 6f653024d6..98dc0a248f 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java
@@ -32,8 +32,8 @@ import org.springframework.core.io.Resource;
 public abstract class SaxResourceUtils {
 
 	/**
-	 * Create a SAX <code>InputSource</code> from the given resource.
-	 * <p>Sets the system identifier to the resource's <code>URL</code>, if available.
+	 * Create a SAX {@code InputSource} from the given resource.
+	 * <p>Sets the system identifier to the resource's {@code URL}, if available.
 	 * @param resource the resource
 	 * @return the input source created from the resource
 	 * @throws IOException if an I/O exception occurs
@@ -48,7 +48,7 @@ public abstract class SaxResourceUtils {
 
 	/**
 	 * Retrieve the URL from the given resource as System ID.
-	 * <p>Returns <code>null</code> if it cannot be opened.
+	 * <p>Returns {@code null} if it cannot be opened.
 	 */
 	private static String getSystemId(Resource resource) {
 		try {
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 ae322b9036..2be053ad5f 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
@@ -63,10 +63,10 @@ import org.springframework.util.xml.StaxUtils;
 /**
  * Implementation of the {@link Marshaller} interface for Apache XMLBeans.
  *
- * <p>Options can be set by setting the <code>xmlOptions</code> property.
+ * <p>Options can be set by setting the {@code xmlOptions} property.
  * The {@link XmlOptionsFactoryBean} is provided to easily set up an {@link XmlOptions} instance.
  *
- * <p>Unmarshalled objects can be validated by setting the <code>validating</code> property,
+ * <p>Unmarshalled objects can be validated by setting the {@code validating} property,
  * or by calling the {@link #validate(XmlObject)} method directly. Invalid objects will
  * result in an {@link ValidationFailureException}.
  *
@@ -87,7 +87,7 @@ public class XmlBeansMarshaller extends AbstractMarshaller {
 
 
 	/**
-	 * Set the <code>XmlOptions</code>.
+	 * Set the {@code XmlOptions}.
 	 * @see XmlOptionsFactoryBean
 	 */
 	public void setXmlOptions(XmlOptions xmlOptions) {
@@ -95,7 +95,7 @@ public class XmlBeansMarshaller extends AbstractMarshaller {
 	}
 
 	/**
-	 * Return the <code>XmlOptions</code>.
+	 * Return the {@code XmlOptions}.
 	 */
 	public XmlOptions getXmlOptions() {
 		return this.xmlOptions;
@@ -103,7 +103,7 @@ public class XmlBeansMarshaller extends AbstractMarshaller {
 
 	/**
 	 * Set whether this marshaller should validate in- and outgoing documents.
-	 * Default is <code>false</code>.
+	 * Default is {@code false}.
 	 */
 	public void setValidating(boolean validating) {
 		this.validating = validating;
@@ -262,7 +262,7 @@ public class XmlBeansMarshaller extends AbstractMarshaller {
 
 
 	/**
-	 * Validate the given <code>XmlObject</code>.
+	 * Validate the given {@code XmlObject}.
 	 * @param object the xml object to validate
 	 * @throws ValidationFailureException if the given object is not valid
 	 */
@@ -288,13 +288,13 @@ public class XmlBeansMarshaller extends AbstractMarshaller {
 
 	/**
 	 * Convert the given XMLBeans exception to an appropriate exception from the
-	 * <code>org.springframework.oxm</code> hierarchy.
+	 * {@code org.springframework.oxm} hierarchy.
 	 * <p>A boolean flag is used to indicate whether this exception occurs during marshalling or
 	 * unmarshalling, since XMLBeans itself does not make this distinction in its exception hierarchy.
 	 * @param ex XMLBeans Exception that occured
-	 * @param marshalling indicates whether the exception occurs during marshalling (<code>true</code>),
-	 * or unmarshalling (<code>false</code>)
-	 * @return the corresponding <code>XmlMappingException</code>
+	 * @param marshalling indicates whether the exception occurs during marshalling ({@code true}),
+	 * or unmarshalling ({@code false})
+	 * @return the corresponding {@code XmlMappingException}
 	 */
 	protected XmlMappingException convertXmlBeansException(Exception ex, boolean marshalling) {
 		if (ex instanceof XMLStreamValidationException) {
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
index 2c90c53fd4..f3e75920be 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
@@ -23,7 +23,7 @@ import org.apache.xmlbeans.XmlOptions;
 import org.springframework.beans.factory.FactoryBean;
 
 /**
- * {@link FactoryBean} that configures an XMLBeans <code>XmlOptions</code> object
+ * {@link FactoryBean} that configures an XMLBeans {@code XmlOptions} object
  * and provides it as a bean reference.
  *
  * <p>Typical usage will be to set XMLBeans options on this bean, and refer to it
@@ -41,10 +41,10 @@ public class XmlOptionsFactoryBean implements FactoryBean<XmlOptions> {
 
 
 	/**
-	 * Set options on the underlying <code>XmlOptions</code> object.
+	 * Set options on the underlying {@code XmlOptions} object.
 	 * <p>The keys of the supplied map should be one of the String constants
-	 * defined in <code>XmlOptions</code>, the values vary per option.
-	 * @see XmlOptions#put(Object,Object)
+	 * defined in {@code XmlOptions}, the values vary per option.
+	 * @see XmlOptions#put(Object, Object)
 	 * @see XmlOptions#SAVE_PRETTY_PRINT
 	 * @see XmlOptions#LOAD_STRIP_COMMENTS
 	 */
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 a4bb7486c7..b53c20a5b9 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
@@ -73,13 +73,13 @@ import org.springframework.util.StringUtils;
 import org.springframework.util.xml.StaxUtils;
 
 /**
- * Implementation of the <code>Marshaller</code> interface for XStream.
+ * 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>Due to XStream's API, it is required to set the encoding used for writing to OutputStreams.
- * It defaults to <code>UTF-8</code>.
+ * 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
@@ -129,8 +129,8 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin
 	}
 
 	/**
-	 * Set the <code>Converters</code> or <code>SingleValueConverters</code> to be registered
-	 * with the <code>XStream</code> instance.
+	 * Set the {@code Converters} or {@code SingleValueConverters} to be registered
+	 * with the {@code XStream} instance.
 	 * @see Converter
 	 * @see SingleValueConverter
 	 */
@@ -278,7 +278,7 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin
 	}
 
 	/**
-	 * Specify implicit collection fields, as a Map consisting of <code>Class</code> instances
+	 * Specify implicit collection fields, as a Map consisting of {@code Class} instances
 	 * mapped to comma separated collection field names.
 	 *@see XStream#addImplicitCollection(Class, String)
 	 */
@@ -292,7 +292,7 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin
 	}
 
 	/**
-	 * Specify omitted fields, as a Map consisting of <code>Class</code> instances
+	 * Specify omitted fields, as a Map consisting of {@code Class} instances
 	 * mapped to comma separated field names.
 	 * @see XStream#omitField(Class, String)
 	 */
@@ -550,15 +550,15 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin
 
 
     /**
-	 * Convert the given XStream exception to an appropriate exception from the
-	 * <code>org.springframework.oxm</code> hierarchy.
-	 * <p>A boolean flag is used to indicate whether this exception occurs during marshalling or
-	 * unmarshalling, since XStream itself does not make this distinction in its exception hierarchy.
-	 * @param ex XStream exception that occured
-	 * @param marshalling indicates whether the exception occurs during marshalling (<code>true</code>),
-	 * or unmarshalling (<code>false</code>)
-	 * @return the corresponding <code>XmlMappingException</code>
-	 */
+     * Convert the given XStream exception to an appropriate exception from the
+     * {@code org.springframework.oxm} hierarchy.
+     * <p>A boolean flag is used to indicate whether this exception occurs during marshalling or
+     * unmarshalling, since XStream itself does not make this distinction in its exception hierarchy.
+     * @param ex XStream exception that occured
+     * @param marshalling indicates whether the exception occurs during marshalling ({@code true}),
+     * or unmarshalling ({@code false})
+     * @return the corresponding {@code XmlMappingException}
+     */
 	protected XmlMappingException convertXStreamException(Exception ex, boolean marshalling) {
 		if (ex instanceof StreamException || ex instanceof CannotResolveClassException ||
 				ex instanceof ConversionException) {
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java
index 1750cb5c75..c2c26b3d46 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java
@@ -36,13 +36,13 @@ abstract class XStreamUtils {
 
 	/**
 	 * Convert the given XStream exception to an appropriate exception from the
-	 * <code>org.springframework.oxm</code> hierarchy.
+	 * {@code org.springframework.oxm} hierarchy.
 	 * <p>A boolean flag is used to indicate whether this exception occurs during marshalling or
 	 * unmarshalling, since XStream itself does not make this distinction in its exception hierarchy.
 	 * @param ex XStream exception that occured
-	 * @param marshalling indicates whether the exception occurs during marshalling (<code>true</code>),
-	 * or unmarshalling (<code>false</code>)
-	 * @return the corresponding <code>XmlMappingException</code>
+	 * @param marshalling indicates whether the exception occurs during marshalling ({@code true}),
+	 * or unmarshalling ({@code false})
+	 * @return the corresponding {@code XmlMappingException}
 	 */
 	public static XmlMappingException convertXStreamException(Exception ex, boolean marshalling) {
 		if (ex instanceof StreamException || ex instanceof CannotResolveClassException ||
diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java
index 051e9a6394..d48113b6e1 100644
--- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java
+++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java
@@ -43,7 +43,7 @@ import org.springframework.web.util.WebUtils;
  * <p>Derives from the Tiles {@link ControllerSupport} class rather than
  * implementing the Tiles {@link org.apache.struts.tiles.Controller} interface
  * in order to be compatible with Struts 1.1 and 1.2. Implements both Struts 1.1's
- * <code>perform</code> and Struts 1.2's <code>execute</code> method accordingly.
+ * {@code perform} and Struts 1.2's {@code execute} method accordingly.
  *
  * @author Juergen Hoeller
  * @author Alef Arendsen
@@ -60,7 +60,7 @@ public abstract class ComponentControllerSupport extends ControllerSupport {
 
 
 	/**
-	 * This implementation delegates to <code>execute</code>,
+	 * This implementation delegates to {@code execute},
 	 * converting non-Servlet/IO Exceptions to ServletException.
 	 * <p>This is the only execution method available in Struts 1.1.
 	 * @see #execute
@@ -86,10 +86,10 @@ public abstract class ComponentControllerSupport extends ControllerSupport {
 	}
 
 	/**
-	 * This implementation delegates to <code>doPerform</code>,
+	 * This implementation delegates to {@code doPerform},
 	 * lazy-initializing the application context reference if necessary.
 	 * <p>This is the preferred execution method in Struts 1.2.
-	 * When running with Struts 1.1, it will be called by <code>perform</code>.
+	 * When running with Struts 1.1, it will be called by {@code perform}.
 	 * @see #perform
 	 * @see #doPerform
 	 */
@@ -162,7 +162,7 @@ public abstract class ComponentControllerSupport extends ControllerSupport {
 	 * The ServletContext can be retrieved via getServletContext, if necessary.
 	 * The Spring WebApplicationContext can be accessed via getWebApplicationContext.
 	 * <p>This method will be called both in the Struts 1.1 and Struts 1.2 case,
-	 * by <code>perform</code> or <code>execute</code>, respectively.
+	 * by {@code perform} or {@code execute}, respectively.
 	 * @param componentContext current Tiles component context
 	 * @param request current HTTP request
 	 * @param response current HTTP response
diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java
index 61f8d927bf..f46433e040 100644
--- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java
+++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java
@@ -167,7 +167,7 @@ public class TilesView extends InternalResourceView {
 	 * given Tiles definition, if any.
 	 * @param definition the Tiles definition to render
 	 * @param request current HTTP request
-	 * @return the component controller to execute, or <code>null</code> if none
+	 * @return the component controller to execute, or {@code null} if none
 	 * @throws Exception if preparations failed
 	 */
 	protected Controller getController(ComponentDefinition definition, HttpServletRequest request)
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java
index e49b12be6d..e2eb6e1fb6 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java
@@ -25,7 +25,7 @@ import org.springframework.beans.factory.config.DestructionAwareBeanPostProcesso
  * {@link org.springframework.beans.factory.config.BeanPostProcessor}
  * implementation that passes the ActionServlet to beans that extend
  * the Struts {@link org.apache.struts.action.Action} class.
- * Invokes <code>Action.setServlet</code> with <code>null</dode> on
+ * Invokes {@code Action.setServlet} with {@code null} on
  * bean destruction, providing the same lifecycle handling as the
  * native Struts ActionServlet.
  *
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
index 50919592b8..74214470d5 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
@@ -277,8 +277,8 @@ public class ContextLoaderPlugIn implements PlugIn {
 	/**
 	 * Initialize and publish the WebApplicationContext for the ActionServlet.
 	 * <p>Delegates to {@link #createWebApplicationContext} for actual creation.
-	 * <p>Can be overridden in subclasses. Call <code>getActionServlet()</code>
-	 * and/or <code>getModuleConfig()</code> to access the Struts configuration
+	 * <p>Can be overridden in subclasses. Call {@code getActionServlet()}
+	 * and/or {@code getModuleConfig()} to access the Struts configuration
 	 * that this PlugIn is associated with.
 	 * @throws org.springframework.beans.BeansException if the context couldn't be initialized
 	 * @throws IllegalStateException if there is already a context for the Struts ActionServlet
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
index 7070cf089f..0375792f22 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
@@ -30,20 +30,20 @@ import org.springframework.beans.BeansException;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
- * Proxy for a Spring-managed Struts <code>Action</code> that is defined in
+ * Proxy for a Spring-managed Struts {@code Action} that is defined in
  * {@link ContextLoaderPlugIn ContextLoaderPlugIn's}
  * {@link WebApplicationContext}.
  *
  * <p>The proxy is defined in the Struts config file, specifying this
  * class as the action class. This class will delegate to a Struts
- * <code>Action</code> bean in the <code>ContextLoaderPlugIn</code> context.
+ * {@code Action} bean in the {@code ContextLoaderPlugIn} context.
  *
  * <pre class="code">&lt;action path="/login" type="org.springframework.web.struts.DelegatingActionProxy"/&gt;</pre>
  *
- * The name of the <code>Action</code> bean in the
- * <code>WebApplicationContext</code> will be determined from the mapping
+ * The name of the {@code Action} bean in the
+ * {@code WebApplicationContext} will be determined from the mapping
  * path and module prefix. This can be customized by overriding the
- * <code>determineActionBeanName</code> method.
+ * {@code determineActionBeanName} method.
  *
  * <p>Example:
  * <ul>
@@ -52,8 +52,8 @@ import org.springframework.web.context.WebApplicationContext;
  * bean name "/mymodule/login"
  * </ul>
  *
- * <p>A corresponding bean definition in the <code>ContextLoaderPlugin</code>
- * context would look as follows; notice that the <code>Action</code> is now
+ * <p>A corresponding bean definition in the {@code ContextLoaderPlugin}
+ * context would look as follows; notice that the {@code Action} is now
  * able to leverage fully Spring's configuration facilities:
  *
  * <pre class="code">
@@ -61,28 +61,28 @@ import org.springframework.web.context.WebApplicationContext;
  *   &lt;property name="..."&gt;...&lt;/property&gt;
  * &lt;/bean&gt;</pre>
  *
- * Note that you can use a single <code>ContextLoaderPlugIn</code> for all
+ * Note that you can use a single {@code ContextLoaderPlugIn} for all
  * Struts modules. That context can in turn be loaded from multiple XML files,
  * for example split according to Struts modules. Alternatively, define one
- * <code>ContextLoaderPlugIn</code> per Struts module, specifying appropriate
+ * {@code ContextLoaderPlugIn} per Struts module, specifying appropriate
  * "contextConfigLocation" parameters. In both cases, the Spring bean name
  * has to include the module prefix.
  *
- * <p>If you want to avoid having to specify <code>DelegatingActionProxy</code>
- * as the <code>Action</code> type in your struts-config file (for example to
+ * <p>If you want to avoid having to specify {@code DelegatingActionProxy}
+ * as the {@code Action} type in your struts-config file (for example to
  * be able to generate your Struts config file with XDoclet) consider using the
  * {@link DelegatingRequestProcessor DelegatingRequestProcessor}.
  * The latter's disadvantage is that it might conflict with the need
- * for a different <code>RequestProcessor</code> subclass.
+ * for a different {@code RequestProcessor} subclass.
  *
  * <p>The default implementation delegates to the {@link DelegatingActionUtils}
  * class as much as possible, to reuse as much code as possible with
- * <code>DelegatingRequestProcessor</code> and
+ * {@code DelegatingRequestProcessor} and
  * {@link DelegatingTilesRequestProcessor}.
  *
  * <p>Note: The idea of delegating to Spring-managed Struts Actions originated in
  * Don Brown's <a href="http://struts.sourceforge.net/struts-spring">Spring Struts Plugin</a>.
- * <code>ContextLoaderPlugIn</code> and <code>DelegatingActionProxy</code>
+ * {@code ContextLoaderPlugIn} and {@code DelegatingActionProxy}
  * constitute a clean-room implementation of the same idea, essentially
  * superseding the original plugin. Many thanks to Don Brown and Matt Raible
  * for the original work and for the agreement to reimplement the idea in
@@ -101,7 +101,7 @@ import org.springframework.web.context.WebApplicationContext;
 public class DelegatingActionProxy extends Action {
 
 	/**
-	 * Pass the execute call on to the Spring-managed delegate <code>Action</code>.
+	 * Pass the execute call on to the Spring-managed delegate {@code Action}.
 	 * @see #getDelegateAction
 	 */
 	@Override
@@ -115,13 +115,13 @@ public class DelegatingActionProxy extends Action {
 
 
 	/**
-	 * Return the delegate <code>Action</code> for the given <code>mapping</code>.
+	 * Return the delegate {@code Action} for the given {@code mapping}.
 	 * <p>The default implementation determines a bean name from the
-	 * given <code>ActionMapping</code> and looks up the corresponding bean in
+	 * given {@code ActionMapping} and looks up the corresponding bean in
 	 * the {@link WebApplicationContext}.
-	 * @param mapping the Struts <code>ActionMapping</code>
-	 * @return the delegate <code>Action</code>
-	 * @throws BeansException if thrown by <code>WebApplicationContext</code> methods
+	 * @param mapping the Struts {@code ActionMapping}
+	 * @return the delegate {@code Action}
+	 * @throws BeansException if thrown by {@code WebApplicationContext} methods
 	 * @see #determineActionBeanName
 	 */
 	protected Action getDelegateAction(ActionMapping mapping) throws BeansException {
@@ -132,14 +132,14 @@ public class DelegatingActionProxy extends Action {
 
 	/**
 	 * Fetch ContextLoaderPlugIn's {@link WebApplicationContext} from the
-	 * <code>ServletContext</code>, falling back to the root
-	 * <code>WebApplicationContext</code>.
-	 * <p>This context is supposed to contain the Struts <code>Action</code>
+	 * {@code ServletContext}, falling back to the root
+	 * {@code WebApplicationContext}.
+	 * <p>This context is supposed to contain the Struts {@code Action}
 	 * beans to delegate to.
-	 * @param actionServlet the associated <code>ActionServlet</code>
-	 * @param moduleConfig the associated <code>ModuleConfig</code>
-	 * @return the <code>WebApplicationContext</code>
-	 * @throws IllegalStateException if no <code>WebApplicationContext</code> could be found
+	 * @param actionServlet the associated {@code ActionServlet}
+	 * @param moduleConfig the associated {@code ModuleConfig}
+	 * @return the {@code WebApplicationContext}
+	 * @throws IllegalStateException if no {@code WebApplicationContext} could be found
 	 * @see DelegatingActionUtils#findRequiredWebApplicationContext
 	 * @see ContextLoaderPlugIn#SERVLET_CONTEXT_PREFIX
 	 */
@@ -150,14 +150,14 @@ public class DelegatingActionProxy extends Action {
 	}
 
 	/**
-	 * Determine the name of the <code>Action</code> bean, to be looked up in
-	 * the <code>WebApplicationContext</code>.
+	 * Determine the name of the {@code Action} bean, to be looked up in
+	 * the {@code WebApplicationContext}.
 	 * <p>The default implementation takes the
 	 * {@link org.apache.struts.action.ActionMapping#getPath mapping path} and
 	 * prepends the
 	 * {@link org.apache.struts.config.ModuleConfig#getPrefix module prefix},
 	 * if any.
-	 * @param mapping the Struts <code>ActionMapping</code>
+	 * @param mapping the Struts {@code ActionMapping}
 	 * @return the name of the Action bean
 	 * @see DelegatingActionUtils#determineActionBeanName
 	 * @see org.apache.struts.action.ActionMapping#getPath
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java
index 0fc85b091f..32d08f5cf3 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java
@@ -79,8 +79,8 @@ public abstract class DelegatingActionUtils {
 	 * <p>Checks for a module-specific context first, falling back to the
 	 * context for the default module else.
 	 * @param actionServlet the associated ActionServlet
-	 * @param moduleConfig the associated ModuleConfig (can be <code>null</code>)
-	 * @return the WebApplicationContext, or <code>null</code> if none
+	 * @param moduleConfig the associated ModuleConfig (can be {@code null})
+	 * @return the WebApplicationContext, or {@code null} if none
 	 * @see ContextLoaderPlugIn#SERVLET_CONTEXT_PREFIX
 	 */
 	public static WebApplicationContext getWebApplicationContext(
@@ -110,7 +110,7 @@ public abstract class DelegatingActionUtils {
 	 * <p>Checks for a module-specific context first, falling back to the
 	 * context for the default module else.
 	 * @param actionServlet the associated ActionServlet
-	 * @param moduleConfig the associated ModuleConfig (can be <code>null</code>)
+	 * @param moduleConfig the associated ModuleConfig (can be {@code null})
 	 * @return the WebApplicationContext
 	 * @throws IllegalStateException if no WebApplicationContext could be found
 	 * @see ContextLoaderPlugIn#SERVLET_CONTEXT_PREFIX
@@ -135,7 +135,7 @@ public abstract class DelegatingActionUtils {
 	 * <p>When checking the ContextLoaderPlugIn context: checks for a module-specific
 	 * context first, falling back to the context for the default module else.
 	 * @param actionServlet the associated ActionServlet
-	 * @param moduleConfig the associated ModuleConfig (can be <code>null</code>)
+	 * @param moduleConfig the associated ModuleConfig (can be {@code null})
 	 * @return the WebApplicationContext
 	 * @throws IllegalStateException if no WebApplicationContext could be found
 	 * @see #getWebApplicationContext
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
index 4883625cfc..1a6506e05c 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
@@ -35,12 +35,12 @@ import org.springframework.web.context.WebApplicationContext;
  * Subclass of Struts's default {@link RequestProcessor} that looks up
  * Spring-managed Struts {@link Action Actions} defined in
  * {@link ContextLoaderPlugIn ContextLoaderPlugIn's} {@link WebApplicationContext}
- * (or, as a fallback, in the root <code>WebApplicationContext</code>).
+ * (or, as a fallback, in the root {@code WebApplicationContext}).
  *
  * <p>In the Struts config file, you can either specify the original
- * <code>Action</code> class (as when generated by XDoclet), or no
- * <code>Action</code> class at all. In any case, Struts will delegate to an
- * <code>Action</code> bean in the <code>ContextLoaderPlugIn</code> context.
+ * {@code Action} class (as when generated by XDoclet), or no
+ * {@code Action} class at all. In any case, Struts will delegate to an
+ * {@code Action} bean in the {@code ContextLoaderPlugIn} context.
  *
  * <pre class="code">&lt;action path="/login" type="myapp.MyAction"/&gt;</pre>
  *
@@ -48,8 +48,8 @@ import org.springframework.web.context.WebApplicationContext;
  *
  * <pre class="code">&lt;action path="/login"/&gt;</pre>
  *
- * The name of the <code>Action</code> bean in the
- * <code>WebApplicationContext</code> will be determined from the mapping path
+ * The name of the {@code Action} bean in the
+ * {@code WebApplicationContext} will be determined from the mapping path
  * and module prefix. This can be customized by overriding the
  * {@link #determineActionBeanName} method.
  *
@@ -60,8 +60,8 @@ import org.springframework.web.context.WebApplicationContext;
  * bean name "/mymodule/login"
  * </ul>
  *
- * <p>A corresponding bean definition in the <code>ContextLoaderPlugin</code>
- * context would look as follows; notice that the <code>Action</code> is now
+ * <p>A corresponding bean definition in the {@code ContextLoaderPlugin}
+ * context would look as follows; notice that the {@code Action} is now
  * able to leverage fully Spring's configuration facilities:
  *
  * <pre class="code">
@@ -69,31 +69,31 @@ import org.springframework.web.context.WebApplicationContext;
  *   &lt;property name="..."&gt;...&lt;/property&gt;
  * &lt;/bean&gt;</pre>
  *
- * Note that you can use a single <code>ContextLoaderPlugIn</code> for all
+ * Note that you can use a single {@code ContextLoaderPlugIn} for all
  * Struts modules. That context can in turn be loaded from multiple XML files,
  * for example split according to Struts modules. Alternatively, define one
- * <code>ContextLoaderPlugIn</code> per Struts module, specifying appropriate
+ * {@code ContextLoaderPlugIn} per Struts module, specifying appropriate
  * "contextConfigLocation" parameters. In both cases, the Spring bean name has
  * to include the module prefix.
  *
  * <p>If you also need the Tiles setup functionality of the original
- * <code>TilesRequestProcessor</code>, use
- * <code>DelegatingTilesRequestProcessor</code>. As there is just a
+ * {@code TilesRequestProcessor}, use
+ * {@code DelegatingTilesRequestProcessor}. As there is just a
  * single central class to customize in Struts, we have to provide another
  * subclass here, covering both the Tiles and the Spring delegation aspect.
  *
- * <p>If this <code>RequestProcessor</code> conflicts with the need for a
- * different <code>RequestProcessor</code> subclass (other than
- * <code>TilesRequestProcessor</code>), consider using
- * {@link DelegatingActionProxy} as the Struts <code>Action</code> type in
+ * <p>If this {@code RequestProcessor} conflicts with the need for a
+ * different {@code RequestProcessor} subclass (other than
+ * {@code TilesRequestProcessor}), consider using
+ * {@link DelegatingActionProxy} as the Struts {@code Action} type in
  * your struts-config file.
  *
  * <p>The default implementation delegates to the
- * <code>DelegatingActionUtils</code> class as much as possible, to reuse as
+ * {@code DelegatingActionUtils} class as much as possible, to reuse as
  * much code as possible despite the need to provide two
- * <code>RequestProcessor</code> subclasses. If you need to subclass yet
- * another <code>RequestProcessor</code>, take this class as a template,
- * delegating to <code>DelegatingActionUtils</code> just like it.
+ * {@code RequestProcessor} subclasses. If you need to subclass yet
+ * another {@code RequestProcessor}, take this class as a template,
+ * delegating to {@code DelegatingActionUtils} just like it.
  *
  * @author Juergen Hoeller
  * @since 1.0.2
@@ -120,14 +120,14 @@ public class DelegatingRequestProcessor extends RequestProcessor {
 
 	/**
 	 * Fetch ContextLoaderPlugIn's {@link WebApplicationContext} from the
-	 * <code>ServletContext</code>, falling back to the root
-	 * <code>WebApplicationContext</code>.
-	 * <p>This context is supposed to contain the Struts <code>Action</code>
+	 * {@code ServletContext}, falling back to the root
+	 * {@code WebApplicationContext}.
+	 * <p>This context is supposed to contain the Struts {@code Action}
 	 * beans to delegate to.
-	 * @param actionServlet the associated <code>ActionServlet</code>
-	 * @param moduleConfig the associated <code>ModuleConfig</code>
-	 * @return the <code>WebApplicationContext</code>
-	 * @throws IllegalStateException if no <code>WebApplicationContext</code> could be found
+	 * @param actionServlet the associated {@code ActionServlet}
+	 * @param moduleConfig the associated {@code ModuleConfig}
+	 * @return the {@code WebApplicationContext}
+	 * @throws IllegalStateException if no {@code WebApplicationContext} could be found
 	 * @see DelegatingActionUtils#findRequiredWebApplicationContext
 	 * @see ContextLoaderPlugIn#SERVLET_CONTEXT_PREFIX
 	 */
@@ -138,7 +138,7 @@ public class DelegatingRequestProcessor extends RequestProcessor {
 	}
 
 	/**
-	 * Return the <code>WebApplicationContext</code> that this processor
+	 * Return the {@code WebApplicationContext} that this processor
 	 * delegates to.
 	 */
 	protected final WebApplicationContext getWebApplicationContext() {
@@ -163,13 +163,13 @@ public class DelegatingRequestProcessor extends RequestProcessor {
 	}
 
 	/**
-	 * Return the delegate <code>Action</code> for the given mapping.
+	 * Return the delegate {@code Action} for the given mapping.
 	 * <p>The default implementation determines a bean name from the
-	 * given <code>ActionMapping</code> and looks up the corresponding
-	 * bean in the <code>WebApplicationContext</code>.
-	 * @param mapping the Struts <code>ActionMapping</code>
-	 * @return the delegate <code>Action</code>, or <code>null</code> if none found
-	 * @throws BeansException if thrown by <code>WebApplicationContext</code> methods
+	 * given {@code ActionMapping} and looks up the corresponding
+	 * bean in the {@code WebApplicationContext}.
+	 * @param mapping the Struts {@code ActionMapping}
+	 * @return the delegate {@code Action}, or {@code null} if none found
+	 * @throws BeansException if thrown by {@code WebApplicationContext} methods
 	 * @see #determineActionBeanName
 	 */
 	protected Action getDelegateAction(ActionMapping mapping) throws BeansException {
@@ -181,14 +181,14 @@ public class DelegatingRequestProcessor extends RequestProcessor {
 	}
 
 	/**
-	 * Determine the name of the <code>Action</code> bean, to be looked up in
-	 * the <code>WebApplicationContext</code>.
+	 * Determine the name of the {@code Action} bean, to be looked up in
+	 * the {@code WebApplicationContext}.
 	 * <p>The default implementation takes the
 	 * {@link org.apache.struts.action.ActionMapping#getPath mapping path} and
 	 * prepends the
 	 * {@link org.apache.struts.config.ModuleConfig#getPrefix module prefix},
 	 * if any.
-	 * @param mapping the Struts <code>ActionMapping</code>
+	 * @param mapping the Struts {@code ActionMapping}
 	 * @return the name of the Action bean
 	 * @see DelegatingActionUtils#determineActionBeanName
 	 * @see org.apache.struts.action.ActionMapping#getPath
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
index ee80f63720..1f765bd4c8 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
@@ -117,7 +117,7 @@ public class DelegatingTilesRequestProcessor extends TilesRequestProcessor {
 	 * given ActionMapping and looks up the corresponding bean in the
 	 * WebApplicationContext.
 	 * @param mapping the Struts ActionMapping
-	 * @return the delegate Action, or <code>null</code> if none found
+	 * @return the delegate Action, or {@code null} if none found
 	 * @throws BeansException if thrown by WebApplicationContext methods
 	 * @see #determineActionBeanName
 	 */
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java b/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
index 77dcb6d579..b2496b9d96 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
@@ -49,21 +49,21 @@ import org.springframework.validation.ObjectError;
  * rejected values (which Spring's binding keeps even for non-String fields).
  *
  * <p>Consequently, Struts views can be written in a completely traditional
- * fashion (with standard <code>html:form</code>, <code>html:errors</code>, etc),
+ * fashion (with standard {@code html:form}, {@code html:errors}, etc),
  * seamlessly accessing a Spring-bound POJO form object underneath.
  *
  * <p>Note this ActionForm is designed explicitly for use in <i>request scope</i>.
- * It expects to receive an <code>expose</code> call from the Action, passing
+ * It expects to receive an {@code expose} call from the Action, passing
  * in the Errors object to expose plus the current HttpServletRequest.
  *
- * <p>Example definition in <code>struts-config.xml</code>:
+ * <p>Example definition in {@code struts-config.xml}:
  *
  * <pre>
  * &lt;form-beans&gt;
  *   &lt;form-bean name="actionForm" type="org.springframework.web.struts.SpringBindingActionForm"/&gt;
  * &lt;/form-beans&gt;</pre>
  *
- * Example code in a custom Struts <code>Action</code>:
+ * Example code in a custom Struts {@code Action}:
  *
  * <pre>
  * public ActionForward execute(ActionMapping actionMapping, ActionForm actionForm, HttpServletRequest request, HttpServletResponse response) throws Exception {
diff --git a/spring-test/src/main/java/org/springframework/mock/http/client/package-info.java b/spring-test/src/main/java/org/springframework/mock/http/client/package-info.java
index 8461276681..927dd34e8d 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/client/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/client/package-info.java
@@ -16,8 +16,8 @@
 
 /**
  * Mock implementations of client-side HTTP abstractions.
- * This package contains the <code>MockClientHttpRequest</code> and
- * <code>MockClientHttpResponse</code>.
+ * This package contains the {@code MockClientHttpRequest} and
+ * {@code MockClientHttpResponse}.
  */
 package org.springframework.mock.http.client;
 
diff --git a/spring-test/src/main/java/org/springframework/mock/http/package-info.java b/spring-test/src/main/java/org/springframework/mock/http/package-info.java
index 60af7793f4..13cf49675c 100644
--- a/spring-test/src/main/java/org/springframework/mock/http/package-info.java
+++ b/spring-test/src/main/java/org/springframework/mock/http/package-info.java
@@ -16,8 +16,8 @@
 
 /**
  * Mock implementations of client/server-side HTTP abstractions.
- * This package contains <code>MockHttpInputMessage</code> and
- * <code>MockHttpOutputMessage</code>.
+ * This package contains {@code MockHttpInputMessage} and
+ * {@code MockHttpOutputMessage}.
  */
 package org.springframework.mock.http;
 
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index 2d23fd9cfa..b19aaf5c54 100644
--- a/spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -37,7 +37,7 @@ public class ExpectedLookupTemplate extends JndiTemplate {
 
 	/**
 	 * Construct a new JndiTemplate that will always return given objects for
-	 * given names. To be populated through <code>addObject</code> calls.
+	 * given names. To be populated through {@code addObject} calls.
 	 * @see #addObject(String, Object)
 	 */
 	public ExpectedLookupTemplate() {
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
index b6489e4202..c71d6e8681 100644
--- a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
@@ -41,13 +41,13 @@ import org.springframework.util.StringUtils;
  * Mainly for test environments, but also usable for standalone applications.
  *
  * <p>This class is not intended for direct usage by applications, although it
- * can be used for example to override JndiTemplate's <code>createInitialContext</code>
+ * can be used for example to override JndiTemplate's {@code createInitialContext}
  * method in unit tests. Typically, SimpleNamingContextBuilder will be used to
  * set up a JVM-level JNDI environment.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
- * @see org.springframework.mock.jndi.SimpleNamingContextBuilder
+ * @see SimpleNamingContextBuilder
  * @see org.springframework.jndi.JndiTemplate#createInitialContext
  */
 public class SimpleNamingContext implements Context {
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 f6c3f0a376..f21936897b 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
@@ -33,7 +33,7 @@ import org.springframework.util.ClassUtils;
  * Simple implementation of a JNDI naming context builder.
  *
  * <p>Mainly targeted at test environments, where each test case can
- * configure JNDI appropriately, so that <code>new InitialContext()</code>
+ * configure JNDI appropriately, so that {@code new InitialContext()}
  * will expose the required objects. Also usable for standalone applications,
  * e.g. for binding a JDBC DataSource to a well-known JNDI location, to be
  * able to use traditional J2EE data access code outside of a J2EE container.
@@ -63,7 +63,7 @@ import org.springframework.util.ClassUtils;
  * DataSource ds = new DriverManagerDataSource(...);
  * builder.bind("java:comp/env/jdbc/myds", ds);</pre>
  *
- * Note that you <i>should not</i> call <code>activate()</code> on a builder from
+ * Note that you <i>should not</i> call {@code activate()} on a builder from
  * this factory method, as there will already be an activated one in any case.
  *
  * <p>An instance of this class is only necessary at setup time.
@@ -74,7 +74,7 @@ import org.springframework.util.ClassUtils;
  * @see #emptyActivatedContextBuilder()
  * @see #bind(String, Object)
  * @see #activate()
- * @see org.springframework.mock.jndi.SimpleNamingContext
+ * @see SimpleNamingContext
  * @see org.springframework.jdbc.datasource.SingleConnectionDataSource
  * @see org.springframework.jdbc.datasource.DriverManagerDataSource
  * @see org.apache.commons.dbcp.BasicDataSource
@@ -92,7 +92,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 	/**
 	 * Checks if a SimpleNamingContextBuilder is active.
 	 * @return the current SimpleNamingContextBuilder instance,
-	 * or <code>null</code> if none
+	 * or {@code null} if none
 	 */
 	public static SimpleNamingContextBuilder getCurrentContextBuilder() {
 		return activated;
@@ -129,8 +129,8 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 
 	/**
 	 * Register the context builder by registering it with the JNDI NamingManager.
-	 * Note that once this has been done, <code>new InitialContext()</code> will always
-	 * return a context from this factory. Use the <code>emptyActivatedContextBuilder()</code>
+	 * Note that once this has been done, {@code new InitialContext()} will always
+	 * return a context from this factory. Use the {@code emptyActivatedContextBuilder()}
 	 * static method to get an empty context (for example, in test methods).
 	 * @throws IllegalStateException if there's already a naming context builder
 	 * registered with the JNDI NamingManager
@@ -156,7 +156,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 	 * Temporarily deactivate this context builder. It will remain registered with
 	 * the JNDI NamingManager but will delegate to the standard JNDI InitialContextFactory
 	 * (if configured) instead of exposing its own bound objects.
-	 * <p>Call <code>activate()</code> again in order to expose this context builder's own
+	 * <p>Call {@code activate()} again in order to expose this context builder's own
 	 * bound objects again. Such activate/deactivate sequences can be applied any number
 	 * of times (e.g. within a larger integration test suite running in the same VM).
 	 * @see #activate()
diff --git a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
index b083e95b27..66ce8a2b07 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
@@ -39,7 +39,7 @@ public class DelegatingServletInputStream extends ServletInputStream {
 
 	/**
 	 * Create a DelegatingServletInputStream for the given source stream.
-	 * @param sourceStream the source stream (never <code>null</code>)
+	 * @param sourceStream the source stream (never {@code null})
 	 */
 	public DelegatingServletInputStream(InputStream sourceStream) {
 		Assert.notNull(sourceStream, "Source InputStream must not be null");
@@ -47,7 +47,7 @@ public class DelegatingServletInputStream extends ServletInputStream {
 	}
 
 	/**
-	 * Return the underlying source stream (never <code>null</code>).
+	 * Return the underlying source stream (never {@code null}).
 	 */
 	public final InputStream getSourceStream() {
 		return this.sourceStream;
diff --git a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
index 66fca5df2f..784e160483 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
@@ -39,7 +39,7 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 
 	/**
 	 * Create a DelegatingServletOutputStream for the given target stream.
-	 * @param targetStream the target stream (never <code>null</code>)
+	 * @param targetStream the target stream (never {@code null})
 	 */
 	public DelegatingServletOutputStream(OutputStream targetStream) {
 		Assert.notNull(targetStream, "Target OutputStream must not be null");
@@ -47,7 +47,7 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 	}
 
 	/**
-	 * Return the underlying target stream (never <code>null</code>).
+	 * Return the underlying target stream (never {@code null}).
 	 */
 	public final OutputStream getTargetStream() {
 		return this.targetStream;
diff --git a/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java
index afe74ad8f0..a6381e92ba 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java
@@ -81,7 +81,7 @@ class HeaderValueHolder {
 	 * @param headers the Map of header names to HeaderValueHolders
 	 * @param name the name of the desired header
 	 * @return the corresponding HeaderValueHolder,
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 */
 	public static HeaderValueHolder getByName(Map<String, HeaderValueHolder> headers, String name) {
 		Assert.notNull(name, "Header name must not be null");
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 b1ca960b70..441a53e4ce 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
@@ -52,7 +52,7 @@ import org.springframework.util.LinkedCaseInsensitiveMap;
  * Mock implementation of the {@link javax.servlet.http.HttpServletRequest} interface.
  *
  * <p>Compatible with Servlet 2.5 and partially with Servlet 3.0 (notable exceptions:
- * the <code>getPart(s)</code> and <code>startAsync</code> families of methods).
+ * the {@code getPart(s)} and {@code startAsync} families of methods).
  *
  * @author Juergen Hoeller
  * @author Rod Johnson
@@ -195,8 +195,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	/**
 	 * Create a new {@code MockHttpServletRequest} with a default
 	 * {@link MockServletContext}.
-	 * @param method the request method (may be <code>null</code>)
-	 * @param requestURI the request URI (may be <code>null</code>)
+	 * @param method the request method (may be {@code null})
+	 * @param requestURI the request URI (may be {@code null})
 	 * @see #setMethod
 	 * @see #setRequestURI
 	 * @see #MockHttpServletRequest(ServletContext, String, String)
@@ -208,7 +208,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	/**
 	 * Create a new {@code MockHttpServletRequest} with the supplied {@link ServletContext}.
 	 * @param servletContext the ServletContext that the request runs in (may be
-	 * <code>null</code> to use a default {@link MockServletContext})
+	 * {@code null} to use a default {@link MockServletContext})
 	 * @see #MockHttpServletRequest(ServletContext, String, String)
 	 */
 	public MockHttpServletRequest(ServletContext servletContext) {
@@ -220,9 +220,9 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	 * {@code method}, and {@code requestURI}.
 	 * <p>The preferred locale will be set to {@link Locale#ENGLISH}.
 	 * @param servletContext the ServletContext that the request runs in (may be
-	 * <code>null</code> to use a default {@link MockServletContext})
-	 * @param method the request method (may be <code>null</code>)
-	 * @param requestURI the request URI (may be <code>null</code>)
+	 * {@code null} to use a default {@link MockServletContext})
+	 * @param method the request method (may be {@code null})
+	 * @param requestURI the request URI (may be {@code null})
 	 * @see #setMethod
 	 * @see #setRequestURI
 	 * @see #setPreferredLocales
@@ -662,8 +662,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	 * adding the given value (more specifically, its toString representation)
 	 * as further element.
 	 * <p>Multiple values can only be stored as list of Strings, following the
-	 * Servlet spec (see <code>getHeaders</code> accessor). As alternative to
-	 * repeated <code>addHeader</code> calls for individual elements, you can
+	 * Servlet spec (see {@code getHeaders} accessor). As alternative to
+	 * repeated {@code addHeader} calls for individual elements, you can
 	 * use a single call with an entire array or Collection of values as
 	 * parameter.
 	 * @see #getHeaderNames
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 88f3dbab08..c86e95a93a 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
@@ -108,7 +108,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	/**
 	 * Set whether {@link #getOutputStream()} access is allowed.
-	 * <p>Default is <code>true</code>.
+	 * <p>Default is {@code true}.
 	 */
 	public void setOutputStreamAccessAllowed(boolean outputStreamAccessAllowed) {
 		this.outputStreamAccessAllowed = outputStreamAccessAllowed;
@@ -123,7 +123,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	/**
 	 * Set whether {@link #getWriter()} access is allowed.
-	 * <p>Default is <code>true</code>.
+	 * <p>Default is {@code true}.
 	 */
 	public void setWriterAccessAllowed(boolean writerAccessAllowed) {
 		this.writerAccessAllowed = writerAccessAllowed;
@@ -297,7 +297,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	/**
 	 * Return the names of all specified headers as a Set of Strings.
 	 * <p>As of Servlet 3.0, this method is also defined HttpServletResponse.
-	 * @return the <code>Set</code> of header name <code>Strings</code>, or an empty <code>Set</code> if none
+	 * @return the {@code Set} of header name {@code Strings}, or an empty {@code Set} if none
 	 */
 	public Set<String> getHeaderNames() {
 		return this.headers.keySet();
@@ -310,7 +310,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * As of Spring 3.1, it returns a stringified value for Servlet 3.0 compatibility.
 	 * Consider using {@link #getHeaderValue(String)} for raw Object access.
 	 * @param name the name of the header
-	 * @return the associated header value, or <code>null<code> if none
+	 * @return the associated header value, or {@code null} if none
 	 */
 	public String getHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
@@ -339,7 +339,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * Return the primary value for the given header, if any.
 	 * <p>Will return the first value in case of multiple values.
 	 * @param name the name of the header
-	 * @return the associated header value, or <code>null<code> if none
+	 * @return the associated header value, or {@code null} if none
 	 */
 	public Object getHeaderValue(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
index 0bfccf326d..2ea463ce8d 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
@@ -46,8 +46,8 @@ import org.springframework.util.Assert;
  * applications when testing custom JSP tags.
  *
  * <p>Note: Expects initialization via the constructor rather than via the
- * <code>PageContext.initialize</code> method. Does not support writing to
- * a JspWriter, request dispatching, and <code>handlePageException</code> calls.
+ * {@code PageContext.initialize} method. Does not support writing to
+ * a JspWriter, request dispatching, and {@code handlePageException} calls.
  *
  * @author Juergen Hoeller
  * @since 1.0.2
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
index 812141cf6a..83096ddf9f 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
@@ -46,7 +46,7 @@ import org.springframework.util.Assert;
  * which match named beans in the context. This is autowire by name, rather than
  * type. This approach is based on an approach originated by Ara Abrahmian.
  * Setter Dependency Injection is the default: set the
- * <code>populateProtectedVariables</code> property to <code>true</code> in
+ * {@code populateProtectedVariables} property to {@code true} in
  * the constructor to switch on Field Injection.
  * </ul>
  *
@@ -114,7 +114,7 @@ public abstract class AbstractDependencyInjectionSpringContextTests extends Abst
 
 	/**
 	 * Set whether to populate protected variables of this test case. Default is
-	 * <code>false</code>.
+	 * {@code false}.
 	 */
 	public final void setPopulateProtectedVariables(boolean populateFields) {
 		this.populateProtectedVariables = populateFields;
@@ -149,7 +149,7 @@ public abstract class AbstractDependencyInjectionSpringContextTests extends Abst
 	/**
 	 * Set whether or not dependency checking should be performed for test
 	 * properties set by Dependency Injection.
-	 * <p>The default is <code>true</code>, meaning that tests cannot be run
+	 * <p>The default is {@code true}, meaning that tests cannot be run
 	 * unless all properties are populated.
 	 */
 	public final void setDependencyCheck(final boolean dependencyCheck) {
@@ -168,7 +168,7 @@ public abstract class AbstractDependencyInjectionSpringContextTests extends Abst
 	 * Prepare this test instance, injecting dependencies into its protected
 	 * fields and its bean properties.
 	 * <p>Note: if the {@link ApplicationContext} for this test instance has not
-	 * been configured (e.g., is <code>null</code>), dependency injection
+	 * been configured (e.g., is {@code null}), dependency injection
 	 * will naturally <strong>not</strong> be performed, but an informational
 	 * message will be written to the log.
 	 * @see #injectDependencies()
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
index 1fa2b4d9cb..bd83c9eaff 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
@@ -92,7 +92,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	}
 
 	/**
-	 * This implementation is final. Override <code>onSetUp</code> for custom behavior.
+	 * This implementation is final. Override {@code onSetUp} for custom behavior.
 	 * @see #onSetUp()
 	 */
 	protected final void setUp() throws Exception {
@@ -114,7 +114,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	}
 
 	/**
-	 * Subclasses can override this method in place of the <code>setUp()</code>
+	 * Subclasses can override this method in place of the {@code setUp()}
 	 * method, which is final in this class.
 	 * <p>The default implementation does nothing.
 	 * @throws Exception simply let any exception propagate
@@ -132,7 +132,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	}
 
 	/**
-	 * This implementation is final. Override <code>onTearDown</code> for
+	 * This implementation is final. Override {@code onTearDown} for
 	 * custom behavior.
 	 * @see #onTearDown()
 	 */
@@ -165,7 +165,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	 * context from the given locations.
 	 * <p>If you override {@link #contextKey()}, you will typically have to
 	 * override this method as well, being able to handle the key type that
-	 * <code>contextKey()</code> returns.
+	 * {@code contextKey()} returns.
 	 * @see #getConfigLocations()
 	 */
 	protected ConfigurableApplicationContext loadContext(Object key) throws Exception {
@@ -198,7 +198,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	 * instance, calls the {@link #prepareApplicationContext} prepareApplicationContext}
 	 * method and the {@link #customizeBeanFactory customizeBeanFactory} method to allow
 	 * for customizing the context and its DefaultListableBeanFactory, populates the
-	 * context from the specified config <code>locations</code> through the configured
+	 * context from the specified config {@code locations} through the configured
 	 * {@link #createBeanDefinitionReader(GenericApplicationContext) BeanDefinitionReader},
 	 * and finally {@link ConfigurableApplicationContext#refresh() refreshes} the context.
 	 * @param locations the config locations (as Spring resource locations,
@@ -321,10 +321,10 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	 * from the same package that the concrete test class is defined in. A path
 	 * starting with a slash is treated as fully qualified class path location,
 	 * e.g.: "/org/springframework/whatever/foo.xml".
-	 * <p>The default implementation simply returns <code>null</code>.
+	 * <p>The default implementation simply returns {@code null}.
 	 * @return an array of config locations
 	 * @see #getConfigPath()
-	 * @see java.lang.Class#getResource(String)
+	 * @see Class#getResource(String)
 	 */
 	protected String getConfigPath() {
 		return null;
@@ -332,7 +332,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 
 	/**
 	 * Return the ApplicationContext that this base class manages; may be
-	 * <code>null</code>.
+	 * {@code null}.
 	 */
 	public final ConfigurableApplicationContext getApplicationContext() {
 		// lazy load, in case setUp() has not yet been called.
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java
index ba6f6a6631..c420225a63 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java
@@ -106,11 +106,11 @@ public abstract class AbstractSpringContextTests extends ConditionalTestCase {
 	}
 
 	/**
-	 * Determine if the supplied context <code>key</code> is <em>empty</em>.
-	 * <p>By default, <code>null</code> values, empty strings, and zero-length
+	 * Determine if the supplied context {@code key} is <em>empty</em>.
+	 * <p>By default, {@code null} values, empty strings, and zero-length
 	 * arrays are considered <em>empty</em>.
 	 * @param key the context key to check
-	 * @return <code>true</code> if the supplied context key is empty
+	 * @return {@code true} if the supplied context key is empty
 	 */
 	protected boolean isContextKeyEmpty(Object key) {
 		return (key == null) || ((key instanceof String) && !StringUtils.hasText((String) key)) ||
@@ -119,9 +119,9 @@ public abstract class AbstractSpringContextTests extends ConditionalTestCase {
 
 	/**
 	 * Obtain an ApplicationContext for the given key, potentially cached.
-	 * @param key the context key; may be <code>null</code>.
+	 * @param key the context key; may be {@code null}.
 	 * @return the corresponding ApplicationContext instance (potentially cached),
-	 * or <code>null</code> if the provided <code>key</code> is <em>empty</em>
+	 * or {@code null} if the provided {@code key} is <em>empty</em>
 	 */
 	protected final ConfigurableApplicationContext getContext(Object key) throws Exception {
 		if (isContextKeyEmpty(key)) {
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
index 43d0fb2907..fae16151d2 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
@@ -103,7 +103,7 @@ public abstract class AbstractTransactionalDataSourceSpringContextTests
 	/**
 	 * Convenient method to delete all rows from these tables.
 	 * Calling this method will make avoidance of rollback by calling
-	 * <code>setComplete()</code> impossible.
+	 * {@code setComplete()} impossible.
 	 * @see #setComplete
 	 */
 	protected void deleteFromTables(String[] names) {
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
index 9fb4fae530..bae411345d 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
@@ -182,7 +182,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe
 	 * <p>Override {@link #onSetUpBeforeTransaction()} and/or
 	 * {@link #onSetUpInTransaction()} to add custom set-up behavior for
 	 * transactional execution. Alternatively, override this method for general
-	 * set-up behavior, calling <code>super.onSetUp()</code> as part of your
+	 * set-up behavior, calling {@code super.onSetUp()} as part of your
 	 * method implementation.
 	 * @throws Exception simply let any exception propagate
 	 * @see #onTearDown()
@@ -241,7 +241,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe
 	 * <p>Override {@link #onTearDownInTransaction()} and/or
 	 * {@link #onTearDownAfterTransaction()} to add custom tear-down behavior
 	 * for transactional execution. Alternatively, override this method for
-	 * general tear-down behavior, calling <code>super.onTearDown()</code> as
+	 * general tear-down behavior, calling {@code super.onTearDown()} as
 	 * part of your method implementation.
 	 * <p>Note that {@link #onTearDownInTransaction()} will only be called if a
 	 * transaction is still active at the time of the test shutdown. In
@@ -305,7 +305,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe
 
 	/**
 	 * Immediately force a commit or rollback of the transaction, according to
-	 * the <code>complete</code> and {@link #isRollback() rollback} flags.
+	 * the {@code complete} and {@link #isRollback() rollback} flags.
 	 * <p>Can be used to explicitly let the transaction end early, for example to
 	 * check whether lazy associations of persistent objects work outside of a
 	 * transaction (that is, have been initialized properly).
diff --git a/spring-test/src/main/java/org/springframework/test/AssertThrows.java b/spring-test/src/main/java/org/springframework/test/AssertThrows.java
index 35a275f2f9..b810d3381c 100644
--- a/spring-test/src/main/java/org/springframework/test/AssertThrows.java
+++ b/spring-test/src/main/java/org/springframework/test/AssertThrows.java
@@ -46,21 +46,21 @@ package org.springframework.test;
  *    }
  * }</pre>
  *
- * This will result in the test passing if the <code>Foo.someBusinessLogic(..)</code>
- * method threw an {@link java.lang.IllegalArgumentException}; if it did not, the
+ * This will result in the test passing if the {@code Foo.someBusinessLogic(..)}
+ * method threw an {@link IllegalArgumentException}; if it did not, the
  * test would fail with the following message:
  *
  * <pre class="code">
  * "Must have thrown a [class java.lang.IllegalArgumentException]"</pre>
  *
- * If the <b>wrong</b> type of {@link java.lang.Exception} was thrown, the
+ * If the <b>wrong</b> type of {@link Exception} was thrown, the
  * test will also fail, this time with a message similar to the following:
  *
  * <pre class="code">
  * "junit.framework.AssertionFailedError: Was expecting a [class java.lang.UnsupportedOperationException] to be thrown, but instead a [class java.lang.IllegalArgumentException] was thrown"</pre>
  *
- * The test for the correct {@link java.lang.Exception} respects polymorphism,
- * so you can test that any old {@link java.lang.Exception} is thrown like so:
+ * The test for the correct {@link Exception} respects polymorphism,
+ * so you can test that any old {@link Exception} is thrown like so:
  *
  * <pre class="code">
  * public class FooTest {
@@ -96,10 +96,10 @@ public abstract class AssertThrows {
 
 	/**
 	 * Create a new instance of the {@link AssertThrows} class.
-	 * @param expectedException the {@link java.lang.Exception} expected to be
+	 * @param expectedException the {@link Exception} expected to be
 	 * thrown during the execution of the surrounding test
-	 * @throws IllegalArgumentException if the supplied <code>expectedException</code> is
-	 * <code>null</code>; or if said argument is not an {@link java.lang.Exception}-derived class
+	 * @throws IllegalArgumentException if the supplied {@code expectedException} is
+	 * {@code null}; or if said argument is not an {@link Exception}-derived class
 	 */
 	public AssertThrows(Class expectedException) {
 		this(expectedException, null);
@@ -107,12 +107,12 @@ public abstract class AssertThrows {
 
 	/**
 	 * Create a new instance of the {@link AssertThrows} class.
-	 * @param expectedException the {@link java.lang.Exception} expected to be
+	 * @param expectedException the {@link Exception} expected to be
 	 * thrown during the execution of the surrounding test
 	 * @param failureMessage the extra, contextual failure message that will be
-	 * included in the failure text if the text fails (can be <code>null</code>)
-	 * @throws IllegalArgumentException if the supplied <code>expectedException</code> is
-	 * <code>null</code>; or if said argument is not an {@link java.lang.Exception}-derived class
+	 * included in the failure text if the text fails (can be {@code null})
+	 * @throws IllegalArgumentException if the supplied {@code expectedException} is
+	 * {@code null}; or if said argument is not an {@link Exception}-derived class
 	 */
 	public AssertThrows(Class expectedException, String failureMessage) {
 		if (expectedException == null) {
@@ -153,7 +153,7 @@ public abstract class AssertThrows {
 
 
 	/**
-	 * Subclass must override this <code>abstract</code> method and
+	 * Subclass must override this {@code abstract} method and
 	 * provide the test logic.
 	 * @throws Exception if an error occurs during the execution of the
 	 * aformentioned test logic
@@ -212,13 +212,13 @@ public abstract class AssertThrows {
 
 	/**
 	 * Does the donkey work of checking (verifying) that the
-	 * {@link java.lang.Exception} that was thrown in the body of a test is
+	 * {@link Exception} that was thrown in the body of a test is
 	 * an instance of the {@link #getExpectedException()} class (or an
 	 * instance of a subclass).
 	 * <p>If you want to customise the failure message, consider overriding
 	 * {@link #createMessageForWrongThrownExceptionType(Exception)}.
-	 * @param actualException the {@link java.lang.Exception} that has been thrown
-	 * in the body of a test method (will never be <code>null</code>)
+	 * @param actualException the {@link Exception} that has been thrown
+	 * in the body of a test method (will never be {@code null})
 	 */
 	protected void checkExceptionExpectations(Exception actualException) {
 		if (!getExpectedException().isAssignableFrom(actualException.getClass())) {
@@ -246,7 +246,7 @@ public abstract class AssertThrows {
 
 	/**
 	 * Expose the actual exception thrown from {@link #test}, if any.
-	 * @return the actual exception, or <code>null</code> if none
+	 * @return the actual exception, or {@code null} if none
 	 */
 	public final Exception getActualException() {
 		return this.actualException;
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
index ae98226a1b..7664b0f460 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
@@ -98,7 +98,7 @@ public abstract class AbstractAnnotationAwareTransactionalTests extends
 
 	/**
 	 * Constructs a new AbstractAnnotationAwareTransactionalTests instance with
-	 * the specified JUnit <code>name</code> and retrieves the configured (or
+	 * the specified JUnit {@code name} and retrieves the configured (or
 	 * default) {@link ProfileValueSource}.
 	 * @param name the name of the current test
 	 * @see ProfileValueUtils#retrieveProfileValueSource(Class)
@@ -119,10 +119,10 @@ public abstract class AbstractAnnotationAwareTransactionalTests extends
 	/**
 	 * Search for a unique {@link ProfileValueSource} in the supplied
 	 * {@link ApplicationContext}. If found, the
-	 * <code>profileValueSource</code> for this test will be set to the unique
+	 * {@code profileValueSource} for this test will be set to the unique
 	 * {@link ProfileValueSource}.
 	 * @param applicationContext the ApplicationContext in which to search for
-	 * the ProfileValueSource; may not be <code>null</code>
+	 * the ProfileValueSource; may not be {@code null}
 	 * @deprecated Use {@link ProfileValueSourceConfiguration @ProfileValueSourceConfiguration} instead.
 	 */
 	@Deprecated
@@ -191,12 +191,12 @@ public abstract class AbstractAnnotationAwareTransactionalTests extends
 	}
 
 	/**
-	 * Determine if the test for the supplied <code>testMethod</code> should
+	 * Determine if the test for the supplied {@code testMethod} should
 	 * run in the current environment.
 	 * <p>The default implementation is based on
 	 * {@link IfProfileValue @IfProfileValue} semantics.
 	 * @param testMethod the test method
-	 * @return <code>true</code> if the test is <em>disabled</em> in the current environment
+	 * @return {@code true} if the test is <em>disabled</em> in the current environment
 	 * @see ProfileValueUtils#isTestEnabledInThisEnvironment
 	 */
 	protected boolean isDisabledInThisEnvironment(Method testMethod) {
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java b/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
index c9e9921ba6..72ae28bb33 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
@@ -41,9 +41,9 @@ import java.lang.annotation.Target;
  * context.
  * </p>
  * <p>
- * <code>&#064;DirtiesContext</code> may be used as a class-level and
+ * {@code &#064;DirtiesContext} may be used as a class-level and
  * method-level annotation within the same class. In such scenarios, the
- * <code>ApplicationContext</code> will be marked as <em>dirty</em> after any
+ * {@code ApplicationContext} will be marked as <em>dirty</em> after any
  * such annotated method as well as after the entire class. If the
  * {@link ClassMode} is set to {@link ClassMode#AFTER_EACH_TEST_METHOD
  * AFTER_EACH_TEST_METHOD}, the context will be marked dirty after each test
@@ -61,19 +61,19 @@ import java.lang.annotation.Target;
 public @interface DirtiesContext {
 
 	/**
-	 * Defines <i>modes</i> which determine how <code>&#064;DirtiesContext</code>
+	 * Defines <i>modes</i> which determine how {@code &#064;DirtiesContext}
 	 * is interpreted when used to annotate a test class.
 	 */
 	static enum ClassMode {
 
 		/**
-		 * The associated <code>ApplicationContext</code> will be marked as
+		 * The associated {@code ApplicationContext} will be marked as
 		 * <em>dirty</em> after the test class.
 		 */
 		AFTER_CLASS,
 
 		/**
-		 * The associated <code>ApplicationContext</code> will be marked as
+		 * The associated {@code ApplicationContext} will be marked as
 		 * <em>dirty</em> after each test method in the class.
 		 */
 		AFTER_EACH_TEST_METHOD
@@ -82,10 +82,10 @@ public @interface DirtiesContext {
 
 	/**
 	 * The <i>mode</i> to use when a test class is annotated with
-	 * <code>&#064;DirtiesContext</code>.
+	 * {@code &#064;DirtiesContext}.
 	 * <p>Defaults to {@link ClassMode#AFTER_CLASS AFTER_CLASS}.
 	 * <p>Note: Setting the class mode on an annotated test method has no meaning,
-	 * since the mere presence of the <code>&#064;DirtiesContext</code>
+	 * since the mere presence of the {@code &#064;DirtiesContext}
 	 * annotation on a test method is sufficient.
 	 */
 	ClassMode classMode() default ClassMode.AFTER_CLASS;
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java b/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java
index 8eb649d291..322c7a7fd9 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java
@@ -31,9 +31,9 @@ import java.lang.annotation.Target;
  * test will be enabled.
  * </p>
  * <p>
- * Note: <code>&#064;IfProfileValue</code> can be applied at the class level,
- * the method level, or both. <code>&#064;IfProfileValue</code> at the class
- * level overrides method-level usage of <code>&#064;IfProfileValue</code> for
+ * Note: {@code &#064;IfProfileValue} can be applied at the class level,
+ * the method level, or both. {@code &#064;IfProfileValue} at the class
+ * level overrides method-level usage of {@code &#064;IfProfileValue} for
  * any methods within that class.
  * </p>
  * <p>
@@ -49,7 +49,7 @@ import java.lang.annotation.Target;
  * }
  * </pre>
  * <p>
- * You can alternatively configure <code>&#064;IfProfileValue</code> with
+ * You can alternatively configure {@code &#064;IfProfileValue} with
  * <em>OR</em> semantics for multiple {@link #values() values} as follows
  * (assuming a {@link ProfileValueSource} has been appropriately configured for
  * the &quot;test-groups&quot; name):
@@ -79,13 +79,13 @@ import java.lang.annotation.Target;
 public @interface IfProfileValue {
 
 	/**
-	 * The <code>name</code> of the <em>profile value</em> against which to
+	 * The {@code name} of the <em>profile value</em> against which to
 	 * test.
 	 */
 	String name();
 
 	/**
-	 * A single, permissible <code>value</code> of the <em>profile value</em>
+	 * A single, permissible {@code value} of the <em>profile value</em>
 	 * for the given {@link #name() name}.
 	 * <p>
 	 * Note: Assigning values to both {@link #value()} and {@link #values()}
@@ -94,7 +94,7 @@ public @interface IfProfileValue {
 	String value() default "";
 
 	/**
-	 * A list of all permissible <code>values</code> of the
+	 * A list of all permissible {@code values} of the
 	 * <em>profile value</em> for the given {@link #name() name}.
 	 * <p>
 	 * Note: Assigning values to both {@link #value()} and {@link #values()}
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java
index 186e90321e..ee1c07f14c 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java
@@ -22,7 +22,7 @@ package org.springframework.test.annotation;
  * testing environment.
  * </p>
  * <p>
- * Concrete implementations must provide a <code>public</code> no-args
+ * Concrete implementations must provide a {@code public} no-args
  * constructor.
  * </p>
  * <p>
@@ -44,7 +44,7 @@ public interface ProfileValueSource {
 	/**
 	 * Get the <em>profile value</em> indicated by the specified key.
 	 * @param key the name of the <em>profile value</em>
-	 * @return the String value of the <em>profile value</em>, or <code>null</code>
+	 * @return the String value of the <em>profile value</em>, or {@code null}
 	 * if there is no <em>profile value</em> with that key
 	 */
 	String get(String key);
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java
index fc912a798c..42fc03f1f4 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java
@@ -102,15 +102,15 @@ public abstract class ProfileValueUtils {
 	}
 
 	/**
-	 * Determine if the supplied <code>testClass</code> is <em>enabled</em> in
+	 * Determine if the supplied {@code testClass} is <em>enabled</em> in
 	 * the current environment, as specified by the {@link IfProfileValue
 	 * &#064;IfProfileValue} annotation at the class level.
 	 * <p>
-	 * Defaults to <code>true</code> if no {@link IfProfileValue
+	 * Defaults to {@code true} if no {@link IfProfileValue
 	 * &#064;IfProfileValue} annotation is declared.
 	 *
 	 * @param testClass the test class
-	 * @return <code>true</code> if the test is <em>enabled</em> in the current
+	 * @return {@code true} if the test is <em>enabled</em> in the current
 	 * environment
 	 */
 	public static boolean isTestEnabledInThisEnvironment(Class<?> testClass) {
@@ -119,18 +119,18 @@ public abstract class ProfileValueUtils {
 	}
 
 	/**
-	 * Determine if the supplied <code>testMethod</code> is <em>enabled</em> in
+	 * Determine if the supplied {@code testMethod} is <em>enabled</em> in
 	 * the current environment, as specified by the {@link IfProfileValue
 	 * &#064;IfProfileValue} annotation, which may be declared on the test
 	 * method itself or at the class level. Class-level usage overrides
 	 * method-level usage.
 	 * <p>
-	 * Defaults to <code>true</code> if no {@link IfProfileValue
+	 * Defaults to {@code true} if no {@link IfProfileValue
 	 * &#064;IfProfileValue} annotation is declared.
 	 *
 	 * @param testMethod the test method
 	 * @param testClass the test class
-	 * @return <code>true</code> if the test is <em>enabled</em> in the current
+	 * @return {@code true} if the test is <em>enabled</em> in the current
 	 * environment
 	 */
 	public static boolean isTestEnabledInThisEnvironment(Method testMethod, Class<?> testClass) {
@@ -138,20 +138,20 @@ public abstract class ProfileValueUtils {
 	}
 
 	/**
-	 * Determine if the supplied <code>testMethod</code> is <em>enabled</em> in
+	 * Determine if the supplied {@code testMethod} is <em>enabled</em> in
 	 * the current environment, as specified by the {@link IfProfileValue
 	 * &#064;IfProfileValue} annotation, which may be declared on the test
 	 * method itself or at the class level. Class-level usage overrides
 	 * method-level usage.
 	 * <p>
-	 * Defaults to <code>true</code> if no {@link IfProfileValue
+	 * Defaults to {@code true} if no {@link IfProfileValue
 	 * &#064;IfProfileValue} annotation is declared.
 	 *
 	 * @param profileValueSource the ProfileValueSource to use to determine if
 	 * the test is enabled
 	 * @param testMethod the test method
 	 * @param testClass the test class
-	 * @return <code>true</code> if the test is <em>enabled</em> in the current
+	 * @return {@code true} if the test is <em>enabled</em> in the current
 	 * environment
 	 */
 	public static boolean isTestEnabledInThisEnvironment(ProfileValueSource profileValueSource, Method testMethod,
@@ -169,17 +169,17 @@ public abstract class ProfileValueUtils {
 	}
 
 	/**
-	 * Determine if the <code>value</code> (or one of the <code>values</code>)
+	 * Determine if the {@code value} (or one of the {@code values})
 	 * in the supplied {@link IfProfileValue &#064;IfProfileValue} annotation is
 	 * <em>enabled</em> in the current environment.
 	 *
 	 * @param profileValueSource the ProfileValueSource to use to determine if
 	 * the test is enabled
 	 * @param ifProfileValue the annotation to introspect; may be
-	 * <code>null</code>
-	 * @return <code>true</code> if the test is <em>enabled</em> in the current
-	 * environment or if the supplied <code>ifProfileValue</code> is
-	 * <code>null</code>
+	 * {@code null}
+	 * @return {@code true} if the test is <em>enabled</em> in the current
+	 * environment or if the supplied {@code ifProfileValue} is
+	 * {@code null}
 	 */
 	private static boolean isTestEnabledInThisEnvironment(ProfileValueSource profileValueSource,
 			IfProfileValue ifProfileValue) {
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java b/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java
index 56c29482a0..3498074cb1 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
 /**
  * Test annotation to indicate whether or not the transaction for the annotated
  * test method should be <em>rolled back</em> after the test method has
- * completed. If <code>true</code>, the transaction will be rolled back;
+ * completed. If {@code true}, the transaction will be rolled back;
  * otherwise, the transaction will be committed.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java b/spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java
index 628e665745..39bfb5d3cd 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.java
@@ -65,14 +65,14 @@ public @interface ActiveProfiles {
 	 * Whether or not bean definition profiles from superclasses should be
 	 * <em>inherited</em>.
 	 *
-	 * <p>The default value is <code>true</code>, which means that a test
+	 * <p>The default value is {@code true}, which means that a test
 	 * class will <em>inherit</em> bean definition profiles defined by a
 	 * test superclass. Specifically, the bean definition profiles for a test
 	 * class will be appended to the list of bean definition profiles
 	 * defined by a test superclass. Thus, subclasses have the option of
 	 * <em>extending</em> the list of bean definition profiles.
 	 *
-	 * <p>If <code>inheritProfiles</code> is set to <code>false</code>, the bean
+	 * <p>If {@code inheritProfiles} is set to {@code false}, the bean
 	 * definition profiles for the test class will <em>shadow</em> and
 	 * effectively replace any bean definition profiles defined by a superclass.
 	 *
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 9185a796d3..32851cf5ed 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
@@ -70,7 +70,7 @@ class ContextCache {
 
 	/**
 	 * Return whether there is a cached context for the given key.
-	 * @param key the context key (never <code>null</code>)
+	 * @param key the context key (never {@code null})
 	 */
 	boolean contains(MergedContextConfiguration key) {
 		Assert.notNull(key, "Key must not be null");
@@ -81,9 +81,9 @@ class ContextCache {
 	 * Obtain a cached ApplicationContext for the given key.
 	 * <p>The {@link #getHitCount() hit} and {@link #getMissCount() miss}
 	 * counts will be updated accordingly.
-	 * @param key the context key (never <code>null</code>)
+	 * @param key the context key (never {@code null})
 	 * @return the corresponding ApplicationContext instance,
-	 * or <code>null</code> if not found in the cache.
+	 * or {@code null} if not found in the cache.
 	 * @see #remove
 	 */
 	ApplicationContext get(MergedContextConfiguration key) {
@@ -108,7 +108,7 @@ class ContextCache {
 
 	/**
 	 * Increment the miss count by one. A <em>miss</em> is an access to the
-	 * cache, which returned a <code>null</code> context for a queried key.
+	 * cache, which returned a {@code null} context for a queried key.
 	 */
 	private void incrementMissCount() {
 		this.missCount++;
@@ -124,7 +124,7 @@ class ContextCache {
 
 	/**
 	 * Get the overall miss count for this cache. A <em>miss</em> is an
-	 * access to the cache, which returned a <code>null</code> context for a
+	 * access to the cache, which returned a {@code null} context for a
 	 * queried key.
 	 */
 	int getMissCount() {
@@ -133,8 +133,8 @@ class ContextCache {
 
 	/**
 	 * Explicitly add an ApplicationContext instance to the cache under the given key.
-	 * @param key the context key (never <code>null</code>)
-	 * @param context the ApplicationContext instance (never <code>null</code>)
+	 * @param key the context key (never {@code null})
+	 * @param context the ApplicationContext instance (never {@code null})
 	 */
 	void put(MergedContextConfiguration key, ApplicationContext context) {
 		Assert.notNull(key, "Key must not be null");
@@ -144,8 +144,8 @@ class ContextCache {
 
 	/**
 	 * Remove the context with the given key.
-	 * @param key the context key (never <code>null</code>)
-	 * @return the corresponding ApplicationContext instance, or <code>null</code>
+	 * @param key the context key (never {@code null})
+	 * @return the corresponding ApplicationContext instance, or {@code null}
 	 * if not found in the cache.
 	 * @see #setDirty
 	 */
@@ -161,7 +161,7 @@ class ContextCache {
 	 * <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.
-	 * @param key the context key (never <code>null</code>)
+	 * @param key the context key (never {@code null})
 	 * @see #remove
 	 */
 	void setDirty(MergedContextConfiguration key) {
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
index 7dfd2db721..a23aed849c 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
@@ -108,7 +108,7 @@ public @interface ContextConfiguration {
 	 * AbstractContextLoader} subclass such as
 	 * {@link org.springframework.test.context.support.GenericXmlContextLoader
 	 * GenericXmlContextLoader} which is the effective default implementation
-	 * used at runtime if <code>locations</code> are configured. See the
+	 * used at runtime if {@code locations} are configured. See the
 	 * documentation for {@link #loader} for further details regarding default
 	 * loaders.
 	 *
@@ -166,7 +166,7 @@ public @interface ContextConfiguration {
 	 * Whether or not {@link #locations resource locations} or <em>annotated
 	 * classes</em> from test superclasses should be <em>inherited</em>.
 	 *
-	 * <p>The default value is <code>true</code>. This means that an annotated
+	 * <p>The default value is {@code true}. This means that an annotated
 	 * class will <em>inherit</em> the resource locations or annotated classes
 	 * defined by test superclasses. Specifically, the resource locations or
 	 * annotated classes for a given test class will be appended to the list of
@@ -174,7 +174,7 @@ public @interface ContextConfiguration {
 	 * Thus, subclasses have the option of <em>extending</em> the list of resource
 	 * locations or annotated classes.
 	 *
-	 * <p>If <code>inheritLocations</code> is set to <code>false</code>, the
+	 * <p>If {@code inheritLocations} is set to {@code false}, the
 	 * resource locations or annotated classes for the annotated class
 	 * will <em>shadow</em> and effectively replace any resource locations
 	 * or annotated classes defined by superclasses.
@@ -225,14 +225,14 @@ public @interface ContextConfiguration {
 	 * Whether or not {@linkplain #initializers context initializers} from test
 	 * superclasses should be <em>inherited</em>.
 	 *
-	 * <p>The default value is <code>true</code>. This means that an annotated
+	 * <p>The default value is {@code true}. This means that an annotated
 	 * class will <em>inherit</em> the application context initializers defined
 	 * by test superclasses. Specifically, the initializers for a given test
 	 * class will be added to the set of initializers defined by test
 	 * superclasses. Thus, subclasses have the option of <em>extending</em> the
 	 * set of initializers.
 	 *
-	 * <p>If <code>inheritInitializers</code> is set to <code>false</code>, the
+	 * <p>If {@code inheritInitializers} is set to {@code false}, the
 	 * initializers for the annotated class will <em>shadow</em> and effectively
 	 * replace any initializers defined by superclasses.
 	 *
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java
index 2db039ad32..71faf5e522 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextLoader.java
@@ -27,13 +27,13 @@ import org.springframework.context.ApplicationContext;
  * bean definition profiles, and application context initializers.
  *
  * <p>Clients of a ContextLoader should call
- * {@link #processLocations(Class,String...) processLocations()} prior to
+ * {@link #processLocations(Class, String...) processLocations()} prior to
  * calling {@link #loadContext(String...) loadContext()} in case the
  * ContextLoader provides custom support for modifying or generating locations.
- * The results of {@link #processLocations(Class,String...) processLocations()}
+ * The results of {@link #processLocations(Class, String...) processLocations()}
  * should then be supplied to {@link #loadContext(String...) loadContext()}.
  *
- * <p>Concrete implementations must provide a <code>public</code> no-args
+ * <p>Concrete implementations must provide a {@code public} no-args
  * constructor.
  *
  * <p>Spring provides the following out-of-the-box implementations:
@@ -59,14 +59,14 @@ public interface ContextLoader {
 	 * @param clazz the class with which the locations are associated: used to
 	 * determine how to process the supplied locations
 	 * @param locations the unmodified locations to use for loading the
-	 * application context (can be <code>null</code> or empty)
+	 * application context (can be {@code null} or empty)
 	 * @return an array of application context resource locations
 	 */
 	String[] processLocations(Class<?> clazz, String... locations);
 
 	/**
 	 * Loads a new {@link ApplicationContext context} based on the supplied
-	 * <code>locations</code>, configures the context, and finally returns
+	 * {@code locations}, configures the context, and finally returns
 	 * the context in fully <em>refreshed</em> state.
 	 *
 	 * <p>Configuration locations are generally considered to be classpath
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 a4e911cbd6..47ee0c78cf 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
@@ -72,7 +72,7 @@ abstract class ContextLoaderUtils {
 	 * supplied list of {@link ContextConfigurationAttributes} and then
 	 * instantiate and return that {@code ContextLoader}.
 	 *
-	 * <p>If the supplied <code>defaultContextLoaderClassName</code> is
+	 * <p>If the supplied {@code defaultContextLoaderClassName} is
 	 * {@code null} or <em>empty</em>, depending on the absence or presence
 	 * of {@link org.springframework.test.context.web.WebAppConfiguration @WebAppConfiguration}
 	 * either {@value #DEFAULT_CONTEXT_LOADER_CLASS_NAME}
@@ -88,7 +88,7 @@ abstract class ContextLoaderUtils {
 	 * @param defaultContextLoaderClassName the name of the default
 	 * {@code ContextLoader} class to use; may be {@code null} or <em>empty</em>
 	 * @return the resolved {@code ContextLoader} for the supplied
-	 * <code>testClass</code> (never {@code null})
+	 * {@code testClass} (never {@code null})
 	 * @see #resolveContextLoaderClass()
 	 */
 	static ContextLoader resolveContextLoader(Class<?> testClass,
@@ -125,7 +125,7 @@ abstract class ContextLoaderUtils {
 	 * and return to step #1.</li>
 	 * <li>If no explicit {@code ContextLoader} class is found after traversing
 	 * the hierarchy, an attempt will be made to load and return the class
-	 * with the supplied <code>defaultContextLoaderClassName</code>.</li>
+	 * with the supplied {@code defaultContextLoaderClassName}.</li>
 	 * </ol>
 	 *
 	 * @param testClass the class for which to resolve the {@code ContextLoader}
@@ -236,8 +236,8 @@ abstract class ContextLoaderUtils {
 	 *
 	 * <p>Note that the {@link ContextConfiguration#inheritInitializers inheritInitializers}
 	 * flag of {@link ContextConfiguration @ContextConfiguration} will be taken into
-	 * consideration. Specifically, if the <code>inheritInitializers</code> flag is
-	 * set to <code>true</code> for a given level in the class hierarchy represented by
+	 * consideration. Specifically, if the {@code inheritInitializers} flag is
+	 * set to {@code true} for a given level in the class hierarchy represented by
 	 * the provided configuration attributes, context initializer classes defined
 	 * at the given level will be merged with those defined in higher levels
 	 * of the class hierarchy.
@@ -277,15 +277,15 @@ abstract class ContextLoaderUtils {
 	 *
 	 * <p>Note that the {@link ActiveProfiles#inheritProfiles inheritProfiles}
 	 * flag of {@link ActiveProfiles &#064;ActiveProfiles} will be taken into
-	 * consideration. Specifically, if the <code>inheritProfiles</code> flag is
-	 * set to <code>true</code>, profiles defined in the test class will be
+	 * consideration. Specifically, if the {@code inheritProfiles} flag is
+	 * set to {@code true}, profiles defined in the test class will be
 	 * merged with those defined in superclasses.
 	 *
 	 * @param testClass the class for which to resolve the active profiles (must
 	 * not be {@code null})
 	 * @return the set of active profiles for the specified class, including
 	 * active profiles from superclasses if appropriate (never {@code null})
-	 * @see org.springframework.test.context.ActiveProfiles
+	 * @see ActiveProfiles
 	 * @see org.springframework.context.annotation.Profile
 	 */
 	static String[] resolveActiveProfiles(Class<?> testClass) {
@@ -341,7 +341,7 @@ abstract class ContextLoaderUtils {
 	/**
 	 * Build the {@link MergedContextConfiguration merged context configuration}
 	 * for the supplied {@link Class testClass} and
-	 * <code>defaultContextLoaderClassName</code>.
+	 * {@code defaultContextLoaderClassName}.
 	 *
 	 * @param testClass the test class for which the {@code MergedContextConfiguration}
 	 * should be built (must not be {@code null})
@@ -408,7 +408,7 @@ abstract class ContextLoaderUtils {
 	 * Load the {@link org.springframework.test.context.web.WebAppConfiguration @WebAppConfiguration}
 	 * class, using reflection in order to avoid package cycles.
 	 *
-	 * @return the {@code @WebAppConfiguration} class or <code>null</code> if it
+	 * @return the {@code @WebAppConfiguration} class or {@code null} if it
 	 * cannot be loaded
 	 * @since 3.2
 	 */
@@ -432,7 +432,7 @@ abstract class ContextLoaderUtils {
 	 * WebMergedContextConfiguration} from the supplied arguments, using reflection
 	 * in order to avoid package cycles.
 	 *
-	 * @return the {@code WebMergedContextConfiguration} or <code>null</code> if
+	 * @return the {@code WebMergedContextConfiguration} or {@code null} if
 	 * it could not be built
 	 * @since 3.2
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
index 3933067286..b4c1f683a2 100644
--- a/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
@@ -103,7 +103,7 @@ public class MergedContextConfiguration implements Serializable {
 	/**
 	 * Generate a null-safe {@link String} representation of the supplied
 	 * {@link ContextLoader} based solely on the fully qualified name of the
-	 * loader or &quot;null&quot; if the supplied loaded is <code>null</code>.
+	 * loader or &quot;null&quot; if the supplied loaded is {@code null}.
 	 */
 	protected static String nullSafeToString(ContextLoader contextLoader) {
 		return contextLoader == null ? "null" : contextLoader.getClass().getName();
@@ -114,8 +114,8 @@ public class MergedContextConfiguration implements Serializable {
 	 * supplied test class, resource locations, annotated classes, active
 	 * profiles, and {@code ContextLoader}.
 	 *
-	 * <p>If a <code>null</code> value is supplied for <code>locations</code>,
-	 * <code>classes</code>, or <code>activeProfiles</code> an empty array will
+	 * <p>If a {@code null} value is supplied for {@code locations},
+	 * {@code classes}, or {@code activeProfiles} an empty array will
 	 * be stored instead. Furthermore, active profiles will be sorted, and duplicate
 	 * profiles will be removed.
 	 *
@@ -123,7 +123,7 @@ public class MergedContextConfiguration implements Serializable {
 	 * @param locations the merged resource locations
 	 * @param classes the merged annotated classes
 	 * @param activeProfiles the merged active bean definition profiles
-	 * @param contextLoader the resolved <code>ContextLoader</code>
+	 * @param contextLoader the resolved {@code ContextLoader}
 	 * @see #MergedContextConfiguration(Class, String[], Class[], Set, String[], ContextLoader)
 	 */
 	public MergedContextConfiguration(Class<?> testClass, String[] locations, Class<?>[] classes,
@@ -136,10 +136,10 @@ public class MergedContextConfiguration implements Serializable {
 	 * supplied test class, resource locations, annotated classes, context
 	 * initializers, active profiles, and {@code ContextLoader}.
 	 *
-	 * <p>If a <code>null</code> value is supplied for <code>locations</code>,
-	 * <code>classes</code>, or <code>activeProfiles</code> an empty array will
-	 * be stored instead. If a <code>null</code> value is supplied for the
-	 * <code>contextInitializerClasses</code> an empty set will be stored instead.
+	 * <p>If a {@code null} value is supplied for {@code locations},
+	 * {@code classes}, or {@code activeProfiles} an empty array will
+	 * be stored instead. If a {@code null} value is supplied for the
+	 * {@code contextInitializerClasses} an empty set will be stored instead.
 	 * Furthermore, active profiles will be sorted, and duplicate profiles will
 	 * be removed.
 	 *
@@ -148,7 +148,7 @@ public class MergedContextConfiguration implements Serializable {
 	 * @param classes the merged annotated classes
 	 * @param contextInitializerClasses the merged context initializer classes
 	 * @param activeProfiles the merged active bean definition profiles
-	 * @param contextLoader the resolved <code>ContextLoader</code>
+	 * @param contextLoader the resolved {@code ContextLoader}
 	 */
 	public MergedContextConfiguration(
 			Class<?> testClass,
diff --git a/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
index 54a44174fe..8d069c85e9 100644
--- a/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/SmartContextLoader.java
@@ -30,7 +30,7 @@ import org.springframework.context.ApplicationContext;
  * and {@link #loadContext(MergedContextConfiguration)}).
  *
  * <p>See the Javadoc for
- * {@link org.springframework.test.context.ContextConfiguration @ContextConfiguration}
+ * {@link ContextConfiguration @ContextConfiguration}
  * for a definition of <em>annotated class</em>.
  *
  * <p>Clients of a {@code SmartContextLoader} should call
@@ -51,7 +51,7 @@ import org.springframework.context.ApplicationContext;
  * {@code SmartContextLoader} may choose not to support methods defined in
  * the {@code ContextLoader} SPI.
  *
- * <p>Concrete implementations must provide a <code>public</code> no-args constructor.
+ * <p>Concrete implementations must provide a {@code public} no-args constructor.
  *
  * <p>Spring provides the following out-of-the-box implementations:
  * <ul>
@@ -72,17 +72,17 @@ public interface SmartContextLoader extends ContextLoader {
 
 	/**
 	 * Processes the {@link ContextConfigurationAttributes} for a given test class.
-	 * <p>Concrete implementations may choose to <em>modify</em> the <code>locations</code>
-	 * or <code>classes</code> in the supplied {@link ContextConfigurationAttributes},
+	 * <p>Concrete implementations may choose to <em>modify</em> the {@code locations}
+	 * or {@code classes} in the supplied {@link ContextConfigurationAttributes},
 	 * <em>generate</em> default configuration locations, or <em>detect</em>
-	 * default configuration classes if the supplied values are <code>null</code>
+	 * default configuration classes if the supplied values are {@code null}
 	 * or empty.
 	 * <p><b>Note</b>: in contrast to a standard {@code ContextLoader}, a
 	 * {@code SmartContextLoader} <b>must</b> <em>preemptively</em> verify that
 	 * a generated or detected default actually exists before setting the corresponding
-	 * <code>locations</code> or <code>classes</code> property in the supplied
+	 * {@code locations} or {@code classes} property in the supplied
 	 * {@link ContextConfigurationAttributes}. Consequently, leaving the
-	 * <code>locations</code> or <code>classes</code> property empty signals that
+	 * {@code locations} or {@code classes} property empty signals that
 	 * this {@code SmartContextLoader} was not able to generate or detect defaults.
 	 * @param configAttributes the context configuration attributes to process
 	 */
@@ -103,7 +103,7 @@ public interface SmartContextLoader extends ContextLoader {
 	 * {@link javax.inject.Inject @Inject}. In addition, concrete implementations
 	 * should set the active bean definition profiles in the context's
 	 * {@link org.springframework.core.env.Environment Environment}.
-	 * <p>Any <code>ApplicationContext</code> loaded by a
+	 * <p>Any {@code ApplicationContext} loaded by a
 	 * {@code SmartContextLoader} <strong>must</strong> register a JVM
 	 * shutdown hook for itself. Unless the context gets closed early, all context
 	 * instances will be automatically closed on JVM shutdown. This allows for
@@ -116,7 +116,7 @@ public interface SmartContextLoader extends ContextLoader {
 	 * @see #processContextConfiguration(ContextConfigurationAttributes)
 	 * @see org.springframework.context.annotation.AnnotationConfigUtils
 	 * #registerAnnotationConfigProcessors(org.springframework.beans.factory.support.BeanDefinitionRegistry)
-	 * @see org.springframework.test.context.MergedContextConfiguration#getActiveProfiles()
+	 * @see MergedContextConfiguration#getActiveProfiles()
 	 * @see org.springframework.context.ConfigurableApplicationContext#getEnvironment()
 	 */
 	ApplicationContext loadContext(MergedContextConfiguration mergedConfig) throws Exception;
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 02ac2bfe56..fc64520476 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
@@ -26,7 +26,7 @@ import org.springframework.core.style.ToStringCreator;
 import org.springframework.util.Assert;
 
 /**
- * <code>TestContext</code> encapsulates the context in which a test is executed,
+ * {@code TestContext} encapsulates the context in which a test is executed,
  * agnostic of the actual testing framework in use.
  *
  * @author Sam Brannen
@@ -54,7 +54,7 @@ public class TestContext extends AttributeAccessorSupport {
 
 	/**
 	 * Delegates to {@link #TestContext(Class, ContextCache, String)} with a
-	 * value of <code>null</code> for the default {@code ContextLoader} class name.
+	 * value of {@code null} for the default {@code ContextLoader} class name.
 	 */
 	TestContext(Class<?> testClass, ContextCache contextCache) {
 		this(testClass, contextCache, null);
@@ -66,18 +66,18 @@ public class TestContext extends AttributeAccessorSupport {
 	 * {@link ContextConfiguration &#064;ContextConfiguration} annotation, if
 	 * present.
 	 * <p>If the supplied class name for the default {@code ContextLoader}
-	 * is <code>null</code> or <em>empty</em> and no concrete {@code ContextLoader}
+	 * is {@code null} or <em>empty</em> and no concrete {@code ContextLoader}
 	 * class is explicitly supplied via the {@code @ContextConfiguration}
 	 * annotation, a
 	 * {@link org.springframework.test.context.support.DelegatingSmartContextLoader
 	 * DelegatingSmartContextLoader} will be used instead.
 	 * @param testClass the test class for which the test context should be
-	 * constructed (must not be <code>null</code>)
+	 * 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</code>)
+	 * {@code null})
 	 * @param defaultContextLoaderClassName the name of the default
-	 * {@code ContextLoader} class to use (may be <code>null</code>)
+	 * {@code ContextLoader} class to use (may be {@code null})
 	 */
 	TestContext(Class<?> testClass, ContextCache contextCache, String defaultContextLoaderClassName) {
 		Assert.notNull(testClass, "Test class must not be null");
@@ -107,7 +107,7 @@ public class TestContext extends AttributeAccessorSupport {
 	}
 
 	/**
-	 * Load an <code>ApplicationContext</code> for this test context using the
+	 * Load an {@code ApplicationContext} for this test context using the
 	 * configured {@code ContextLoader} and merged context configuration. Supports
 	 * both the {@link SmartContextLoader} and {@link ContextLoader} SPIs.
 	 * @throws Exception if an error occurs while loading the application context
@@ -170,7 +170,7 @@ public class TestContext extends AttributeAccessorSupport {
 
 	/**
 	 * Get the {@link Class test class} for this test context.
-	 * @return the test class (never <code>null</code>)
+	 * @return the test class (never {@code null})
 	 */
 	public final Class<?> getTestClass() {
 		return testClass;
@@ -179,8 +179,8 @@ public class TestContext extends AttributeAccessorSupport {
 	/**
 	 * Get the current {@link Object test instance} for this test context.
 	 * <p>Note: this is a mutable property.
-	 * @return the current test instance (may be <code>null</code>)
-	 * @see #updateState(Object,Method,Throwable)
+	 * @return the current test instance (may be {@code null})
+	 * @see #updateState(Object, Method, Throwable)
 	 */
 	public final Object getTestInstance() {
 		return testInstance;
@@ -189,7 +189,7 @@ public class TestContext extends AttributeAccessorSupport {
 	/**
 	 * Get the current {@link Method test method} for this test context.
 	 * <p>Note: this is a mutable property.
-	 * @return the current test method (may be <code>null</code>)
+	 * @return the current test method (may be {@code null})
 	 * @see #updateState(Object, Method, Throwable)
 	 */
 	public final Method getTestMethod() {
@@ -200,7 +200,7 @@ public class TestContext extends AttributeAccessorSupport {
 	 * Get the {@link Throwable exception} that was thrown during execution of
 	 * the {@link #getTestMethod() test method}.
 	 * <p>Note: this is a mutable property.
-	 * @return the exception that was thrown, or <code>null</code> if no
+	 * @return the exception that was thrown, or {@code null} if no
 	 * exception was thrown
 	 * @see #updateState(Object, Method, Throwable)
 	 */
@@ -223,10 +223,10 @@ public class TestContext extends AttributeAccessorSupport {
 	/**
 	 * Update this test context to reflect the state of the currently executing
 	 * test.
-	 * @param testInstance the current test instance (may be <code>null</code>)
-	 * @param testMethod the current test method (may be <code>null</code>)
+	 * @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
-	 * <code>null</code> if no exception was thrown
+	 * {@code null} if no exception was thrown
 	 */
 	void updateState(Object testInstance, Method testMethod, Throwable testException) {
 		this.testInstance = testInstance;
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 409b8dc39d..d138484c8a 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
@@ -35,7 +35,7 @@ import org.springframework.util.ObjectUtils;
 
 /**
  * <p>
- * <code>TestContextManager</code> is the main entry point into the
+ * {@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,
@@ -43,7 +43,7 @@ import org.springframework.util.ObjectUtils;
  * transactional} execution of test methods, etc.
  * </p>
  * <p>
- * Specifically, a <code>TestContextManager</code> is responsible for managing a
+ * 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:
@@ -54,10 +54,10 @@ import org.springframework.util.ObjectUtils;
  * 4's {@link org.junit.BeforeClass &#064;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}:
+ * <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>
- * <li>{@link #afterTestMethod(Object,Method,Throwable) after test method
+ * <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>
  * <li>{@link #afterTestClass() after test class execution}: after any
@@ -97,20 +97,20 @@ public class TestContextManager {
 
 	/**
 	 * Delegates to {@link #TestContextManager(Class, String)} with a value of
-	 * <code>null</code> for the default <code>ContextLoader</code> class name.
+	 * {@code null} for the default {@code ContextLoader} class name.
 	 */
 	public TestContextManager(Class<?> testClass) {
 		this(testClass, null);
 	}
 
 	/**
-	 * Constructs a new <code>TestContextManager</code> for the specified {@link Class test class}
+	 * Constructs a new {@code TestContextManager} for the specified {@link Class test class}
 	 * and automatically {@link #registerTestExecutionListeners registers} 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</code> class to use (may be <code>null</code>)
+	 * {@code ContextLoader} class to use (may be {@code null})
 	 * @see #registerTestExecutionListeners(TestExecutionListener...)
 	 * @see #retrieveTestExecutionListeners(Class)
 	 */
@@ -121,7 +121,7 @@ public class TestContextManager {
 
 	/**
 	 * Returns the {@link TestContext} managed by this
-	 * <code>TestContextManager</code>.
+	 * {@code TestContextManager}.
 	 */
 	protected final TestContext getTestContext() {
 		return this.testContext;
@@ -129,7 +129,7 @@ public class TestContextManager {
 
 	/**
 	 * Register the supplied {@link TestExecutionListener TestExecutionListeners}
-	 * by appending them to the set of listeners used by this <code>TestContextManager</code>.
+	 * by appending them to the set of listeners used by this {@code TestContextManager}.
 	 */
 	public void registerTestExecutionListeners(TestExecutionListener... testExecutionListeners) {
 		for (TestExecutionListener listener : testExecutionListeners) {
@@ -142,7 +142,7 @@ public class TestContextManager {
 
 	/**
 	 * Get the current {@link TestExecutionListener TestExecutionListeners}
-	 * registered for this <code>TestContextManager</code>.
+	 * registered for this {@code TestContextManager}.
 	 * <p>Allows for modifications, e.g. adding a listener to the beginning of the list.
 	 * However, make sure to keep the list stable while actually executing tests.
 	 */
@@ -152,7 +152,7 @@ public class TestContextManager {
 
 	/**
 	 * Get a copy of the {@link TestExecutionListener TestExecutionListeners}
-	 * registered for this <code>TestContextManager</code> in reverse order.
+	 * registered for this {@code TestContextManager} in reverse order.
 	 */
 	private List<TestExecutionListener> getReversedTestExecutionListeners() {
 		List<TestExecutionListener> listenersReversed = new ArrayList<TestExecutionListener>(
@@ -167,7 +167,7 @@ public class TestContextManager {
 	 * 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.
-	 * Specifically, if the <code>inheritListeners</code> flag is set to <code>true</code>, listeners
+	 * 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
 	 * @return an array of TestExecutionListeners for the specified class
@@ -292,12 +292,12 @@ public class TestContextManager {
 	 * test methods, for example for injecting dependencies, etc. Should be
 	 * called immediately after instantiation of the test instance.
 	 * <p>The managed {@link TestContext} will be updated with the supplied
-	 * <code>testInstance</code>.
+	 * {@code testInstance}.
 	 * <p>An attempt will be made to give each registered
 	 * {@link TestExecutionListener} a chance to prepare the test instance. If a
 	 * listener throws an exception, however, the remaining registered listeners
 	 * will <strong>not</strong> be called.
-	 * @param testInstance the test instance to prepare (never <code>null</code>)
+	 * @param testInstance the test instance to prepare (never {@code null})
 	 * @throws Exception if a registered TestExecutionListener throws an exception
 	 * @see #getTestExecutionListeners()
 	 */
@@ -326,12 +326,12 @@ public class TestContextManager {
 	 * framework-specific <em>before methods</em> (e.g., methods annotated with
 	 * JUnit's {@link org.junit.Before &#064;Before}).
 	 * <p>The managed {@link TestContext} will be updated with the supplied
-	 * <code>testInstance</code> and <code>testMethod</code>.
+	 * {@code testInstance} and {@code testMethod}.
 	 * <p>An attempt will be made to give each registered
 	 * {@link TestExecutionListener} a chance to pre-process the test method
 	 * execution. If a listener throws an exception, however, the remaining
 	 * registered listeners will <strong>not</strong> be called.
-	 * @param testInstance the current test instance (never <code>null</code>)
+	 * @param testInstance the current test instance (never {@code null})
 	 * @param testMethod the test method which is about to be executed on the
 	 * test instance
 	 * @throws Exception if a registered TestExecutionListener throws an exception
@@ -363,19 +363,19 @@ public class TestContextManager {
 	 * <em>after methods</em> (e.g., methods annotated with JUnit's
 	 * {@link org.junit.After &#064;After}).
 	 * <p>The managed {@link TestContext} will be updated with the supplied
-	 * <code>testInstance</code>, <code>testMethod</code>, and
-	 * <code>exception</code>.
+	 * {@code testInstance}, {@code testMethod}, and
+	 * {@code exception}.
 	 * <p>Each registered {@link TestExecutionListener} will be given a chance to
 	 * post-process the test method execution. If a listener throws an
 	 * exception, the remaining registered listeners will still be called, but
 	 * the first exception thrown will be tracked and rethrown after all
 	 * listeners have executed. Note that registered listeners will be executed
 	 * in the opposite order in which they were registered.
-	 * @param testInstance the current test instance (never <code>null</code>)
+	 * @param testInstance the current test instance (never {@code null})
 	 * @param testMethod the test method which has just been executed on the
 	 * test instance
 	 * @param exception the exception that was thrown during execution of the
-	 * test method or by a TestExecutionListener, or <code>null</code> if none
+	 * test method or by a TestExecutionListener, or {@code null} if none
 	 * was thrown
 	 * @throws Exception if a registered TestExecutionListener throws an exception
 	 * @see #getTestExecutionListeners()
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
index a76134c23f..0b844447e9 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
@@ -18,12 +18,12 @@ package org.springframework.test.context;
 
 /**
  * <p>
- * <code>TestExecutionListener</code> defines a <em>listener</em> API for
+ * {@code TestExecutionListener} defines a <em>listener</em> API for
  * reacting to test execution events published by the {@link TestContextManager}
  * with which the listener is registered.
  * </p>
  * <p>
- * Concrete implementations must provide a <code>public</code> no-args
+ * Concrete implementations must provide a {@code public} no-args
  * constructor, so that listeners can be instantiated transparently by tools and
  * configuration mechanisms.
  * </p>
@@ -59,7 +59,7 @@ public interface TestExecutionListener {
 	 * <em>before class</em> lifecycle callbacks, this method will not be called
 	 * for that framework.
 	 *
-	 * @param testContext the test context for the test; never <code>null</code>
+	 * @param testContext the test context for the test; never {@code null}
 	 * @throws Exception allows any exception to propagate
 	 */
 	void beforeTestClass(TestContext testContext) throws Exception;
@@ -71,7 +71,7 @@ public interface TestExecutionListener {
 	 * This method should be called immediately after instantiation of the test
 	 * instance but prior to any framework-specific lifecycle callbacks.
 	 *
-	 * @param testContext the test context for the test; never <code>null</code>
+	 * @param testContext the test context for the test; never {@code null}
 	 * @throws Exception allows any exception to propagate
 	 */
 	void prepareTestInstance(TestContext testContext) throws Exception;
@@ -86,7 +86,7 @@ public interface TestExecutionListener {
 	 * <em>before</em> lifecycle callbacks.
 	 *
 	 * @param testContext the test context in which the test method will be
-	 * executed; never <code>null</code>
+	 * executed; never {@code null}
 	 * @throws Exception allows any exception to propagate
 	 */
 	void beforeTestMethod(TestContext testContext) throws Exception;
@@ -101,7 +101,7 @@ public interface TestExecutionListener {
 	 * <em>after</em> lifecycle callbacks.
 	 *
 	 * @param testContext the test context in which the test method was
-	 * executed; never <code>null</code>
+	 * executed; never {@code null}
 	 * @throws Exception allows any exception to propagate
 	 */
 	void afterTestMethod(TestContext testContext) throws Exception;
@@ -117,7 +117,7 @@ public interface TestExecutionListener {
 	 * <em>after class</em> lifecycle callbacks, this method will not be called
 	 * for that framework.
 	 *
-	 * @param testContext the test context for the test; never <code>null</code>
+	 * @param testContext the test context for the test; never {@code null}
 	 * @throws Exception allows any exception to propagate
 	 */
 	void afterTestClass(TestContext testContext) throws Exception;
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
index 86d1d8dc43..7a820b42cb 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
@@ -24,10 +24,10 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * <code>TestExecutionListeners</code> defines class-level metadata for
+ * {@code TestExecutionListeners} defines class-level metadata for
  * configuring which {@link TestExecutionListener TestExecutionListeners} should
  * be registered with a {@link TestContextManager}. Typically,
- * <code>&#064;TestExecutionListeners</code> will be used in conjunction with
+ * {@code &#064;TestExecutionListeners} will be used in conjunction with
  * {@link ContextConfiguration &#064;ContextConfiguration}.
  *
  * @author Sam Brannen
@@ -65,23 +65,23 @@ public @interface TestExecutionListeners {
 	 * should be <em>inherited</em>.
 	 * </p>
 	 * <p>
-	 * The default value is <code>true</code>, which means that an annotated
+	 * The default value is {@code true}, which means that an annotated
 	 * class will <em>inherit</em> the listeners defined by an annotated
 	 * superclass. Specifically, the listeners for an annotated class will be
 	 * appended to the list of listeners defined by an annotated superclass.
 	 * Thus, subclasses have the option of <em>extending</em> the list of
-	 * listeners. In the following example, <code>AbstractBaseTest</code> will
-	 * be configured with <code>DependencyInjectionTestExecutionListener</code>
-	 * and <code>DirtiesContextTestExecutionListener</code>; whereas,
-	 * <code>TransactionalTest</code> will be configured with
-	 * <code>DependencyInjectionTestExecutionListener</code>,
-	 * <code>DirtiesContextTestExecutionListener</code>, <strong>and</strong>
-	 * <code>TransactionalTestExecutionListener</code>, in that order.
+	 * listeners. In the following example, {@code AbstractBaseTest} will
+	 * be configured with {@code DependencyInjectionTestExecutionListener}
+	 * and {@code DirtiesContextTestExecutionListener}; whereas,
+	 * {@code TransactionalTest} will be configured with
+	 * {@code DependencyInjectionTestExecutionListener},
+	 * {@code DirtiesContextTestExecutionListener}, <strong>and</strong>
+	 * {@code TransactionalTestExecutionListener}, in that order.
 	 * </p>
 	 *
 	 * <pre class="code">
 	 * &#064;TestExecutionListeners({ DependencyInjectionTestExecutionListener.class,
-     *    DirtiesContextTestExecutionListener.class })
+	 *    DirtiesContextTestExecutionListener.class })
 	 * public abstract class AbstractBaseTest {
 	 * 	// ...
 	 * }
@@ -91,9 +91,9 @@ public @interface TestExecutionListeners {
 	 * 	// ...
 	 * }
 	 * </pre>
-     *
+	 *
 	 * <p>
-	 * If <code>inheritListeners</code> is set to <code>false</code>, the
+	 * If {@code inheritListeners} is set to {@code false}, the
 	 * listeners for the annotated class will <em>shadow</em> and effectively
 	 * replace any listeners defined by a superclass.
 	 * </p>
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
index 958904e2d0..81658f379d 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
@@ -63,11 +63,11 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe
  * AbstractJUnit38SpringContextTests()} and
  * {@link #AbstractJUnit38SpringContextTests(String)
  * AbstractJUnit38SpringContextTests(String)} and delegate to
- * <code>super();</code> and <code>super(name);</code> respectively.</li>
+ * {@code super();} and {@code super(name);} respectively.</li>
  * </ul>
  * <p>
  * The following list constitutes all annotations currently supported directly
- * by <code>AbstractJUnit38SpringContextTests</code>. <i>(Note that additional
+ * by {@code AbstractJUnit38SpringContextTests}. <i>(Note that additional
  * annotations may be supported by various
  * {@link org.springframework.test.context.TestExecutionListener
  * TestExecutionListeners})</i>
@@ -161,7 +161,7 @@ public abstract class AbstractJUnit38SpringContextTests extends TestCase impleme
 
 	/**
 	 * Constructs a new AbstractJUnit38SpringContextTests instance with the
-	 * supplied <code>name</code>; initializes the internal
+	 * supplied {@code name}; initializes the internal
 	 * {@link TestContextManager} for the current test; and retrieves the
 	 * configured (or default) {@link ProfileValueSource}.
 	 *
@@ -245,7 +245,7 @@ public abstract class AbstractJUnit38SpringContextTests extends TestCase impleme
 	 *
 	 * @param tec the test execution callback to run
 	 * @param testMethod the actual test method: used to retrieve the
-	 * <code>timeout</code>
+	 * {@code timeout}
 	 * @throws Throwable if any exception is thrown
 	 * @see Timed
 	 * @see #runTest
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java
index 8185eab0b0..91dc025aac 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java
@@ -91,7 +91,7 @@ public abstract class AbstractTransactionalJUnit38SpringContextTests extends Abs
 
 	/**
 	 * Constructs a new AbstractTransactionalJUnit38SpringContextTests instance
-	 * with the supplied <code>name</code>.
+	 * with the supplied {@code name}.
 	 * @param name the name of the current test to execute
 	 */
 	public AbstractTransactionalJUnit38SpringContextTests(String name) {
@@ -145,7 +145,7 @@ public abstract class AbstractTransactionalJUnit38SpringContextTests extends Abs
 	 * @param continueOnError whether or not to continue without throwing an
 	 * exception in the event of an error
 	 * @throws DataAccessException if there is an error executing a statement
-	 * and continueOnError was <code>false</code>
+	 * and continueOnError was {@code false}
 	 */
 	protected void executeSqlScript(String sqlResourcePath, boolean continueOnError)
 			throws DataAccessException {
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java
index 79546a256f..083b0faedf 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java
@@ -164,7 +164,7 @@ public abstract class AbstractTransactionalJUnit4SpringContextTests extends Abst
 	 * @param continueOnError whether or not to continue without throwing an
 	 * exception in the event of an error
 	 * @throws DataAccessException if there is an error executing a statement
-	 * and continueOnError was <code>false</code>
+	 * and continueOnError was {@code false}
 	 */
 	protected void executeSqlScript(String sqlResourcePath, boolean continueOnError) throws DataAccessException {
 		Resource resource = this.applicationContext.getResource(sqlResourcePath);
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java b/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
index 9351f2f908..a01f214f60 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
@@ -49,7 +49,7 @@ import org.springframework.util.ReflectionUtils;
 
 /**
  * <p>
- * <code>SpringJUnit4ClassRunner</code> is a custom extension of
+ * {@code SpringJUnit4ClassRunner} is a custom extension of
  * {@link BlockJUnit4ClassRunner} which provides functionality of the
  * <em>Spring TestContext Framework</em> to standard JUnit 4.5+ tests by means
  * of the {@link TestContextManager} and associated support classes and
@@ -57,7 +57,7 @@ import org.springframework.util.ReflectionUtils;
  * </p>
  * <p>
  * The following list constitutes all annotations currently supported directly
- * by <code>SpringJUnit4ClassRunner</code>.
+ * by {@code SpringJUnit4ClassRunner}.
  * <em>(Note that additional annotations may be supported by various
  * {@link org.springframework.test.context.TestExecutionListener
  * TestExecutionListeners})</em>
@@ -76,7 +76,7 @@ import org.springframework.util.ReflectionUtils;
  * &#064;IfProfileValue}</li>
  * </ul>
  * <p>
- * <b>NOTE:</b> As of Spring 3.0, <code>SpringJUnit4ClassRunner</code> requires
+ * <b>NOTE:</b> As of Spring 3.0, {@code SpringJUnit4ClassRunner} requires
  * JUnit 4.5+.
  * </p>
  *
@@ -94,7 +94,7 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 
 
 	/**
-	 * Constructs a new <code>SpringJUnit4ClassRunner</code> and initializes a
+	 * Constructs a new {@code SpringJUnit4ClassRunner} and initializes a
 	 * {@link TestContextManager} to provide Spring testing functionality to
 	 * standard JUnit tests.
 	 * @param clazz the test class to be run
@@ -110,7 +110,7 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 
 	/**
 	 * Creates a new {@link TestContextManager} for the supplied test class and
-	 * the configured <em>default <code>ContextLoader</code> class name</em>.
+	 * the configured <em>default {@code ContextLoader} class name</em>.
 	 * Can be overridden by subclasses.
 	 * @param clazz the test class to be managed
 	 * @see #getDefaultContextLoaderClassName(Class)
@@ -127,15 +127,15 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 	}
 
 	/**
-	 * Get the name of the default <code>ContextLoader</code> class to use for
+	 * Get the name of the default {@code ContextLoader} class to use for
 	 * the supplied test class. The named class will be used if the test class
-	 * does not explicitly declare a <code>ContextLoader</code> class via the
-	 * <code>&#064;ContextConfiguration</code> annotation.
-	 * <p>The default implementation returns <code>null</code>, thus implying use
-	 * of the <em>standard</em> default <code>ContextLoader</code> class name.
+	 * does not explicitly declare a {@code ContextLoader} class via the
+	 * {@code &#064;ContextConfiguration} annotation.
+	 * <p>The default implementation returns {@code null}, thus implying use
+	 * of the <em>standard</em> default {@code ContextLoader} class name.
 	 * Can be overridden by subclasses.
 	 * @param clazz the test class
-	 * @return <code>null</code>
+	 * @return {@code null}
 	 */
 	protected String getDefaultContextLoaderClassName(Class<?> clazz) {
 		return null;
@@ -143,7 +143,7 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 
 	/**
 	 * Returns a description suitable for an ignored test class if the test is
-	 * disabled via <code>&#064;IfProfileValue</code> at the class-level, and
+	 * disabled via {@code &#064;IfProfileValue} at the class-level, and
 	 * otherwise delegates to the parent implementation.
 	 * @see ProfileValueUtils#isTestEnabledInThisEnvironment(Class)
 	 */
@@ -157,9 +157,9 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 
 	/**
 	 * Check whether the test is enabled in the first place. This prevents
-	 * classes with a non-matching <code>&#064;IfProfileValue</code> annotation
+	 * classes with a non-matching {@code &#064;IfProfileValue} annotation
 	 * from running altogether, even skipping the execution of
-	 * <code>prepareTestInstance()</code> <code>TestExecutionListener</code>
+	 * {@code prepareTestInstance()} {@code TestExecutionListener}
 	 * methods.
 	 * @see ProfileValueUtils#isTestEnabledInThisEnvironment(Class)
 	 * @see org.springframework.test.annotation.IfProfileValue
@@ -242,10 +242,10 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 	}
 
 	/**
-	 * <code>springMakeNotifier()</code> is an exact copy of
+	 * {@code springMakeNotifier()} is an exact copy of
 	 * {@link BlockJUnit4ClassRunner BlockJUnit4ClassRunner's}
-	 * <code>makeNotifier()</code> method, but we have decided to prefix it with
-	 * "spring" and keep it <code>private</code> in order to avoid the
+	 * {@code makeNotifier()} method, but we have decided to prefix it with
+	 * "spring" and keep it {@code private} in order to avoid the
 	 * compatibility clashes that were introduced in JUnit between versions 4.5,
 	 * 4.6, and 4.7.
 	 */
@@ -262,10 +262,10 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 	 * in order to include execution of {@link org.junit.Before &#064;Before}
 	 * and {@link org.junit.After &#064;After} methods within the timed
 	 * execution. Note that this differs from the default JUnit behavior of
-	 * executing <code>&#064;Before</code> and <code>&#064;After</code> methods
+	 * executing {@code &#064;Before} and {@code &#064;After} methods
 	 * in the main thread while executing the actual test method in a separate
-	 * thread. Thus, the end effect is that <code>&#064;Before</code> and
-	 * <code>&#064;After</code> methods will be executed in the same thread as
+	 * thread. Thus, the end effect is that {@code &#064;Before} and
+	 * {@code &#064;After} methods will be executed in the same thread as
 	 * the test method. As a consequence, JUnit-specified timeouts will work
 	 * fine in combination with Spring transactions. Note that JUnit-specific
 	 * timeouts still differ from Spring-specific timeouts in that the former
@@ -305,7 +305,7 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 	}
 
 	/**
-	 * Invokes JUnit 4.7's private <code>withRules()</code> method using
+	 * Invokes JUnit 4.7's private {@code withRules()} method using
 	 * reflection. This is necessary for backwards compatibility with the JUnit
 	 * 4.5 and 4.6 implementations of {@link BlockJUnit4ClassRunner}.
 	 */
@@ -323,9 +323,9 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 	}
 
 	/**
-	 * Returns <code>true</code> if {@link Ignore &#064;Ignore} is present for
+	 * Returns {@code true} if {@link Ignore &#064;Ignore} is present for
 	 * the supplied {@link FrameworkMethod test method} or if the test method is
-	 * disabled via <code>&#064;IfProfileValue</code>.
+	 * disabled via {@code &#064;IfProfileValue}.
 	 * @see ProfileValueUtils#isTestEnabledInThisEnvironment(Method, Class)
 	 */
 	protected boolean isTestMethodIgnored(FrameworkMethod frameworkMethod) {
@@ -347,12 +347,12 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 	}
 
 	/**
-	 * Get the <code>exception</code> that the supplied {@link FrameworkMethod
+	 * Get the {@code exception} that the supplied {@link FrameworkMethod
 	 * test method} is expected to throw.
 	 * <p>Supports both Spring's {@link ExpectedException @ExpectedException(...)}
 	 * and JUnit's {@link Test#expected() @Test(expected=...)} annotations, but
 	 * not both simultaneously.
-	 * @return the expected exception, or <code>null</code> if none was specified
+	 * @return the expected exception, or {@code null} if none was specified
 	 */
 	protected Class<? extends Throwable> getExpectedException(FrameworkMethod frameworkMethod) {
 		Test testAnnotation = frameworkMethod.getAnnotation(Test.class);
@@ -411,9 +411,9 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 	}
 
 	/**
-	 * Retrieves the configured JUnit <code>timeout</code> from the {@link Test
+	 * Retrieves the configured JUnit {@code timeout} from the {@link Test
 	 * &#064;Test} annotation on the supplied {@link FrameworkMethod test method}.
-	 * @return the timeout, or <code>0</code> if none was specified.
+	 * @return the timeout, or {@code 0} if none was specified.
 	 */
 	protected long getJUnitTimeout(FrameworkMethod frameworkMethod) {
 		Test testAnnotation = frameworkMethod.getAnnotation(Test.class);
@@ -421,10 +421,10 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 	}
 
 	/**
-	 * Retrieves the configured Spring-specific <code>timeout</code> from the
+	 * Retrieves the configured Spring-specific {@code timeout} from the
 	 * {@link Timed &#064;Timed} annotation on the supplied
 	 * {@link FrameworkMethod test method}.
-	 * @return the timeout, or <code>0</code> if none was specified.
+	 * @return the timeout, or {@code 0} if none was specified.
 	 */
 	protected long getSpringTimeout(FrameworkMethod frameworkMethod) {
 		Timed timedAnnotation = frameworkMethod.getAnnotation(Timed.class);
@@ -462,7 +462,7 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 	/**
 	 * Supports Spring's {@link Repeat &#064;Repeat} annotation by returning a
 	 * {@link SpringRepeat} statement initialized with the configured repeat
-	 * count or <code>1</code> if no repeat count is configured.
+	 * count or {@code 1} if no repeat count is configured.
 	 * @see SpringRepeat
 	 */
 	protected Statement withPotentialRepeat(FrameworkMethod frameworkMethod, Object testInstance, Statement next) {
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java
index 61d721ebf9..f625c3fa5c 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java
@@ -24,7 +24,7 @@ import org.junit.runners.model.Statement;
 import org.springframework.test.context.TestContextManager;
 
 /**
- * <code>RunAfterTestClassCallbacks</code> is a custom JUnit 4.5+
+ * {@code RunAfterTestClassCallbacks} is a custom JUnit 4.5+
  * {@link Statement} which allows the <em>Spring TestContext Framework</em> to
  * be plugged into the JUnit execution chain by calling
  * {@link TestContextManager#afterTestClass() afterTestClass()} on the supplied
@@ -44,11 +44,11 @@ public class RunAfterTestClassCallbacks extends Statement {
 
 
 	/**
-	 * Constructs a new <code>RunAfterTestClassCallbacks</code> statement.
+	 * Constructs a new {@code RunAfterTestClassCallbacks} statement.
 	 *
-	 * @param next the next <code>Statement</code> in the execution chain
+	 * @param next the next {@code Statement} in the execution chain
 	 * @param testContextManager the TestContextManager upon which to call
-	 * <code>afterTestClass()</code>
+	 * {@code afterTestClass()}
 	 */
 	public RunAfterTestClassCallbacks(Statement next, TestContextManager testContextManager) {
 		this.next = next;
@@ -60,7 +60,7 @@ public class RunAfterTestClassCallbacks extends Statement {
 	 * instance of {@link org.junit.internal.runners.statements.RunAfters
 	 * RunAfters}), catching any exceptions thrown, and then calls
 	 * {@link TestContextManager#afterTestClass()}. If the call to
-	 * <code>afterTestClass()</code> throws an exception, it will also be
+	 * {@code afterTestClass()} throws an exception, it will also be
 	 * tracked. Multiple exceptions will be combined into a
 	 * {@link MultipleFailureException}.
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java
index 925e9f468a..0fa60566eb 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestMethodCallbacks.java
@@ -25,7 +25,7 @@ import org.junit.runners.model.Statement;
 import org.springframework.test.context.TestContextManager;
 
 /**
- * <code>RunAfterTestMethodCallbacks</code> is a custom JUnit 4.5+
+ * {@code RunAfterTestMethodCallbacks} is a custom JUnit 4.5+
  * {@link Statement} which allows the <em>Spring TestContext Framework</em> to
  * be plugged into the JUnit execution chain by calling
  * {@link TestContextManager#afterTestMethod(Object, Method, Throwable) afterTestMethod()}
@@ -49,14 +49,14 @@ public class RunAfterTestMethodCallbacks extends Statement {
 
 
 	/**
-	 * Constructs a new <code>RunAfterTestMethodCallbacks</code> statement.
+	 * Constructs a new {@code RunAfterTestMethodCallbacks} statement.
 	 *
-	 * @param next the next <code>Statement</code> in the execution chain
-	 * @param testInstance the current test instance (never <code>null</code>)
+	 * @param next the next {@code Statement} in the execution chain
+	 * @param testInstance the current test instance (never {@code null})
 	 * @param testMethod the test method which has just been executed on the
 	 * test instance
 	 * @param testContextManager the TestContextManager upon which to call
-	 * <code>afterTestMethod()</code>
+	 * {@code afterTestMethod()}
 	 */
 	public RunAfterTestMethodCallbacks(Statement next, Object testInstance, Method testMethod,
 			TestContextManager testContextManager) {
@@ -71,7 +71,7 @@ public class RunAfterTestMethodCallbacks extends Statement {
 	 * instance of {@link org.junit.internal.runners.statements.RunAfters
 	 * RunAfters}), catching any exceptions thrown, and then calls
 	 * {@link TestContextManager#afterTestMethod(Object, Method, Throwable)} with the first
-	 * caught exception (if any). If the call to <code>afterTestMethod()</code>
+	 * caught exception (if any). If the call to {@code afterTestMethod()}
 	 * throws an exception, it will also be tracked. Multiple exceptions will be
 	 * combined into a {@link MultipleFailureException}.
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java
index af2f1c23a0..3112cfcc5b 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java
@@ -20,7 +20,7 @@ import org.junit.runners.model.Statement;
 import org.springframework.test.context.TestContextManager;
 
 /**
- * <code>RunBeforeTestClassCallbacks</code> is a custom JUnit 4.5+
+ * {@code RunBeforeTestClassCallbacks} is a custom JUnit 4.5+
  * {@link Statement} which allows the <em>Spring TestContext Framework</em> to
  * be plugged into the JUnit execution chain by calling
  * {@link TestContextManager#beforeTestClass() beforeTestClass()} on the
@@ -39,11 +39,11 @@ public class RunBeforeTestClassCallbacks extends Statement {
 
 
 	/**
-	 * Constructs a new <code>RunBeforeTestClassCallbacks</code> statement.
+	 * Constructs a new {@code RunBeforeTestClassCallbacks} statement.
 	 *
-	 * @param next the next <code>Statement</code> in the execution chain
+	 * @param next the next {@code Statement} in the execution chain
 	 * @param testContextManager the TestContextManager upon which to call
-	 * <code>beforeTestClass()</code>
+	 * {@code beforeTestClass()}
 	 */
 	public RunBeforeTestClassCallbacks(Statement next, TestContextManager testContextManager) {
 		this.next = next;
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java
index 1c5e59be6f..c35ff65246 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java
@@ -22,7 +22,7 @@ import org.junit.runners.model.Statement;
 import org.springframework.test.context.TestContextManager;
 
 /**
- * <code>RunBeforeTestMethodCallbacks</code> is a custom JUnit 4.5+
+ * {@code RunBeforeTestMethodCallbacks} is a custom JUnit 4.5+
  * {@link Statement} which allows the <em>Spring TestContext Framework</em> to
  * be plugged into the JUnit execution chain by calling
  * {@link TestContextManager#beforeTestMethod(Object, Method)
@@ -45,14 +45,14 @@ public class RunBeforeTestMethodCallbacks extends Statement {
 
 
 	/**
-	 * Constructs a new <code>RunBeforeTestMethodCallbacks</code> statement.
+	 * Constructs a new {@code RunBeforeTestMethodCallbacks} statement.
 	 *
-	 * @param next the next <code>Statement</code> in the execution chain
-	 * @param testInstance the current test instance (never <code>null</code>)
+	 * @param next the next {@code Statement} in the execution chain
+	 * @param testInstance the current test instance (never {@code null})
 	 * @param testMethod the test method which is about to be executed on the
 	 * test instance
 	 * @param testContextManager the TestContextManager upon which to call
-	 * <code>beforeTestMethod()</code>
+	 * {@code beforeTestMethod()}
 	 */
 	public RunBeforeTestMethodCallbacks(Statement next, Object testInstance, Method testMethod,
 			TestContextManager testContextManager) {
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
index a9a10b8b80..51b04ce41f 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
@@ -22,7 +22,7 @@ import org.junit.runners.model.Statement;
 import org.springframework.test.annotation.Timed;
 
 /**
- * <code>SpringFailOnTimeout</code> is a custom JUnit 4.5+ {@link Statement}
+ * {@code SpringFailOnTimeout} is a custom JUnit 4.5+ {@link Statement}
  * which adds support for Spring's {@link Timed @Timed} annotation by throwing
  * an exception if the next statement in the execution chain takes more than the
  * specified number of milliseconds.
@@ -39,10 +39,10 @@ public class SpringFailOnTimeout extends Statement {
 
 
 	/**
-	 * Constructs a new <code>SpringFailOnTimeout</code> statement.
+	 * Constructs a new {@code SpringFailOnTimeout} statement.
 	 *
-	 * @param next the next <code>Statement</code> in the execution chain
-	 * @param timeout the configured <code>timeout</code> for the current test
+	 * @param next the next {@code Statement} in the execution chain
+	 * @param timeout the configured {@code timeout} for the current test
 	 * @see Timed#millis()
 	 */
 	public SpringFailOnTimeout(Statement next, long timeout) {
@@ -56,7 +56,7 @@ public class SpringFailOnTimeout extends Statement {
 	 * {@link org.junit.internal.runners.statements.InvokeMethod InvokeMethod}
 	 * or {@link org.junit.internal.runners.statements.ExpectException
 	 * ExpectException}) and throws an exception if the next
-	 * <code>statement</code> takes more than the specified <code>timeout</code>
+	 * {@code statement} takes more than the specified {@code timeout}
 	 * .
 	 */
 	@Override
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java
index 541b4ab6d6..e324262158 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java
@@ -25,7 +25,7 @@ import org.springframework.test.annotation.Repeat;
 import org.springframework.util.ClassUtils;
 
 /**
- * <code>SpringRepeat</code> is a custom JUnit 4.5+ {@link Statement} which adds
+ * {@code SpringRepeat} is a custom JUnit 4.5+ {@link Statement} which adds
  * support for Spring's {@link Repeat &#064;Repeat} annotation by repeating the
  * test for the specified number of times.
  *
@@ -45,9 +45,9 @@ public class SpringRepeat extends Statement {
 
 
 	/**
-	 * Constructs a new <code>SpringRepeat</code> statement.
+	 * Constructs a new {@code SpringRepeat} statement.
 	 *
-	 * @param next the next <code>Statement</code> in the execution chain
+	 * @param next the next {@code Statement} in the execution chain
 	 * @param testMethod the current test method
 	 * @param repeat the configured repeat count for the current test method
 	 * @see Repeat#value()
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/package-info.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/package-info.java
index 49ec8db156..116e5fe145 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/package-info.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/package-info.java
@@ -1,7 +1,6 @@
-
 /**
  *
- * <p>JUnit 4.5 based <code>statements</code> used in the <em>Spring TestContext Framework</em>.</p>
+ * <p>JUnit 4.5 based {@code statements} used in the <em>Spring TestContext Framework</em>.</p>
  *
  */
 package org.springframework.test.context.junit4.statements;
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 d4b6dc49bb..0928ff4c9e 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
@@ -47,7 +47,7 @@ import org.springframework.util.StringUtils;
  * <em>Template Method</em> based approach for {@link #processLocations processing}
  * resource locations.
  *
- * <p>As of Spring 3.1, <code>AbstractContextLoader</code> also provides a basis
+ * <p>As of Spring 3.1, {@code AbstractContextLoader} also provides a basis
  * for all concrete implementations of the {@link SmartContextLoader} SPI. For
  * backwards compatibility with the {@code ContextLoader} SPI,
  * {@link #processContextConfiguration(ContextConfigurationAttributes)} delegates
@@ -99,7 +99,7 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
 	 * <p>The default implementation:
 	 * <ul>
 	 * <li>Sets the <em>active bean definition profiles</em> from the supplied
-	 * <code>MergedContextConfiguration</code> in the
+	 * {@code MergedContextConfiguration} in the
 	 * {@link org.springframework.core.env.Environment Environment} of the context.</li>
 	 * <li>Determines what (if any) context initializer classes have been supplied
 	 * via the {@code MergedContextConfiguration} and
@@ -153,19 +153,19 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
 	// --- ContextLoader -------------------------------------------------------
 
 	/**
-	 * If the supplied <code>locations</code> are <code>null</code> or
+	 * If the supplied {@code locations} are {@code null} or
 	 * <em>empty</em> and {@link #isGenerateDefaultLocations()} returns
-	 * <code>true</code>, default locations will be
+	 * {@code true}, default locations will be
 	 * {@link #generateDefaultLocations(Class) generated} for the specified
 	 * {@link Class class} and the configured
 	 * {@link #getResourceSuffix() resource suffix}; otherwise, the supplied
-	 * <code>locations</code> will be {@link #modifyLocations modified} if
+	 * {@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
-	 * application context (can be <code>null</code> or empty)
+	 * application context (can be {@code null} or empty)
 	 * @return a processed array of application context resource locations
 	 * @since 2.5
 	 * @see #isGenerateDefaultLocations()
@@ -183,10 +183,10 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
 	 * Generate the default classpath resource locations array based on the
 	 * supplied class.
 	 *
-	 * <p>For example, if the supplied class is <code>com.example.MyTest</code>,
+	 * <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>&lt;suffix&gt;</code>&quot;,
-	 * where <code>&lt;suffix&gt;</code> is the value of the
+	 * &quot;classpath:/com/example/MyTest{@code &lt;suffix&gt;}&quot;,
+	 * where {@code &lt;suffix&gt;} is the value of the
 	 * {@link #getResourceSuffix() resource suffix} string.
 	 *
 	 * <p>As of Spring 3.1, the implementation of this method adheres to the
@@ -237,7 +237,7 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
 	 * &quot;/org/springframework/whatever/foo.xml&quot;. A path which
 	 * references a URL (e.g., a path prefixed with
 	 * {@link ResourceUtils#CLASSPATH_URL_PREFIX classpath:},
-	 * {@link ResourceUtils#FILE_URL_PREFIX file:}, <code>http:</code>,
+	 * {@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
@@ -266,21 +266,21 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
 
 	/**
 	 * Determine whether or not <em>default</em> resource locations should be
-	 * generated if the <code>locations</code> provided to
-	 * {@link #processLocations(Class, String...)} are <code>null</code> or empty.
+	 * 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
 	 * determine whether or not <em>default</em> configuration classes should be
-	 * detected if the <code>classes</code> present in the
+	 * detected if the {@code classes} present in the
 	 * {@link ContextConfigurationAttributes configuration attributes} supplied
 	 * to {@link #processContextConfiguration(ContextConfigurationAttributes)}
-	 * are <code>null</code> or empty.
+	 * are {@code null} or empty.
 	 *
 	 * <p>Can be overridden by subclasses to change the default behavior.
 	 *
-	 * @return always <code>true</code> by default
+	 * @return always {@code true} by default
 	 * @since 2.5
 	 */
 	protected boolean isGenerateDefaultLocations() {
@@ -293,7 +293,7 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
 	 *
 	 * <p>Must be implemented by subclasses.
 	 *
-	 * @return the resource suffix; should not be <code>null</code> or empty
+	 * @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 01b4102e53..284e80acf0 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
@@ -134,7 +134,7 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte
 	 *
 	 * @param configAttributes the context configuration attributes to process
 	 * @throws IllegalArgumentException if the supplied configuration attributes are
-	 * <code>null</code>, or if the supplied configuration attributes include both
+	 * {@code null}, or if the supplied configuration attributes include both
 	 * resource locations and annotated classes
 	 * @throws IllegalStateException if the XML-based loader detects default
 	 * configuration classes; if the annotation-based loader detects default
@@ -232,7 +232,7 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte
 	 * </ul>
 	 *
 	 * @param mergedConfig the merged context configuration to use to load the application context
-	 * @throws IllegalArgumentException if the supplied merged configuration is <code>null</code>
+	 * @throws IllegalArgumentException if the supplied merged configuration is {@code null}
 	 * @throws IllegalStateException if neither candidate loader is capable of loading an
 	 * {@code ApplicationContext} from the supplied merged context configuration
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
index 44240e7d53..c4b9b4dca7 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
@@ -39,7 +39,7 @@ import org.springframework.util.StringUtils;
  * {@link org.springframework.test.context.SmartContextLoader SmartContextLoader}
  * SPI, the context will be loaded from the {@link MergedContextConfiguration}
  * provided to {@link #loadContext(MergedContextConfiguration)}. In such cases, a
- * <code>SmartContextLoader</code> will decide whether to load the context from
+ * {@code SmartContextLoader} will decide whether to load the context from
  * <em>locations</em> or <em>annotated classes</em>.</li>
  * </ul>
  *
@@ -72,10 +72,10 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	 * <li>Calls {@link #prepareContext(ConfigurableApplicationContext, MergedContextConfiguration)}
 	 * to allow for customizing the context before bean definitions are loaded.</li>
 	 * <li>Calls {@link #customizeBeanFactory(DefaultListableBeanFactory)} to allow for customizing the
-	 * context's <code>DefaultListableBeanFactory</code>.</li>
+	 * context's {@code DefaultListableBeanFactory}.</li>
 	 * <li>Delegates to {@link #loadBeanDefinitions(GenericApplicationContext, MergedContextConfiguration)}
 	 * to populate the context from the locations or classes in the supplied
-	 * <code>MergedContextConfiguration</code>.</li>
+	 * {@code MergedContextConfiguration}.</li>
 	 * <li>Delegates to {@link AnnotationConfigUtils} for
 	 * {@link AnnotationConfigUtils#registerAnnotationConfigProcessors registering}
 	 * annotation configuration processors.</li>
@@ -109,7 +109,7 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	}
 
 	/**
-	 * Load a Spring ApplicationContext from the supplied <code>locations</code>.
+	 * Load a Spring ApplicationContext from the supplied {@code locations}.
 	 *
 	 * <p>Implementation details:
 	 *
@@ -118,7 +118,7 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	 * <li>Calls {@link #prepareContext(GenericApplicationContext)} to allow for customizing the context
 	 * before bean definitions are loaded.</li>
 	 * <li>Calls {@link #customizeBeanFactory(DefaultListableBeanFactory)} to allow for customizing the
-	 * context's <code>DefaultListableBeanFactory</code>.</li>
+	 * context's {@code DefaultListableBeanFactory}.</li>
 	 * <li>Delegates to {@link #createBeanDefinitionReader(GenericApplicationContext)} to create a
 	 * {@link BeanDefinitionReader} which is then used to populate the context
 	 * from the specified locations.</li>
@@ -159,11 +159,11 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	}
 
 	/**
-	 * Prepare the {@link GenericApplicationContext} created by this <code>ContextLoader</code>.
+	 * Prepare the {@link GenericApplicationContext} created by this {@code ContextLoader}.
 	 * Called <i>before</i> bean definitions are read.
 	 *
 	 * <p>The default implementation is empty. Can be overridden in subclasses to
-	 * customize <code>GenericApplicationContext</code>'s standard settings.
+	 * customize {@code GenericApplicationContext}'s standard settings.
 	 *
 	 * @param context the context that should be prepared
 	 * @see #loadContext(MergedContextConfiguration)
@@ -178,12 +178,12 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 
 	/**
 	 * Customize the internal bean factory of the ApplicationContext created by
-	 * this <code>ContextLoader</code>.
+	 * this {@code ContextLoader}.
 	 *
 	 * <p>The default implementation is empty but can be overridden in subclasses
-	 * to customize <code>DefaultListableBeanFactory</code>'s standard settings.
+	 * to customize {@code DefaultListableBeanFactory}'s standard settings.
 	 *
-	 * @param beanFactory the bean factory created by this <code>ContextLoader</code>
+	 * @param beanFactory the bean factory created by this {@code ContextLoader}
 	 * @see #loadContext(MergedContextConfiguration)
 	 * @see #loadContext(String...)
 	 * @see DefaultListableBeanFactory#setAllowBeanDefinitionOverriding
@@ -197,7 +197,7 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 
 	/**
 	 * Load bean definitions into the supplied {@link GenericApplicationContext context}
-	 * from the locations or classes in the supplied <code>MergedContextConfiguration</code>.
+	 * from the locations or classes in the supplied {@code MergedContextConfiguration}.
 	 *
 	 * <p>The default implementation delegates to the {@link BeanDefinitionReader}
 	 * returned by {@link #createBeanDefinitionReader(GenericApplicationContext)} to
@@ -223,9 +223,9 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	 * Factory method for creating a new {@link BeanDefinitionReader} for loading
 	 * bean definitions into the supplied {@link GenericApplicationContext context}.
 	 *
-	 * @param context the context for which the <code>BeanDefinitionReader</code>
+	 * @param context the context for which the {@code BeanDefinitionReader}
 	 * should be created
-	 * @return a <code>BeanDefinitionReader</code> for the supplied context
+	 * @return a {@code BeanDefinitionReader} for the supplied context
 	 * @see #loadContext(String...)
 	 * @see #loadBeanDefinitions
 	 * @see BeanDefinitionReader
@@ -235,7 +235,7 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 
 	/**
 	 * Customize the {@link GenericApplicationContext} created by this
-	 * <code>ContextLoader</code> <i>after</i> bean definitions have been
+	 * {@code ContextLoader} <i>after</i> bean definitions have been
 	 * loaded into the context but <i>before</i> the context is refreshed.
 	 *
 	 * <p>The default implementation is empty but can be overridden in subclasses
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
index c8ba660fbf..39e76f6e1a 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
@@ -33,14 +33,14 @@ import org.springframework.util.ObjectUtils;
  * {@link org.springframework.test.context.ContextConfiguration @ContextConfiguration}
  * for a definition of <em>annotated class</em>.
  *
- * <p>Note: <code>AnnotationConfigContextLoader</code> supports <em>annotated classes</em>
+ * <p>Note: {@code AnnotationConfigContextLoader} supports <em>annotated classes</em>
  * rather than the String-based resource locations defined by the legacy
  * {@link org.springframework.test.context.ContextLoader ContextLoader} API. Thus,
- * although <code>AnnotationConfigContextLoader</code> extends
- * <code>AbstractGenericContextLoader</code>, <code>AnnotationConfigContextLoader</code>
+ * although {@code AnnotationConfigContextLoader} extends
+ * {@code AbstractGenericContextLoader}, {@code AnnotationConfigContextLoader}
  * does <em>not</em> support any String-based methods defined by
- * <code>AbstractContextLoader</code> or <code>AbstractGenericContextLoader</code>.
- * Consequently, <code>AnnotationConfigContextLoader</code> should chiefly be
+ * {@code AbstractContextLoader} or {@code AbstractGenericContextLoader}.
+ * Consequently, {@code AnnotationConfigContextLoader} should chiefly be
  * considered a {@link org.springframework.test.context.SmartContextLoader SmartContextLoader}
  * rather than a {@link org.springframework.test.context.ContextLoader ContextLoader}.
  *
@@ -60,9 +60,9 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
 	/**
 	 * Process <em>annotated classes</em> in the supplied {@link ContextConfigurationAttributes}.
 	 *
-	 * <p>If the <em>annotated classes</em> are <code>null</code> or empty and
-	 * {@link #isGenerateDefaultLocations()} returns <code>true</code>, this
-	 * <code>SmartContextLoader</code> will attempt to {@link
+	 * <p>If the <em>annotated classes</em> are {@code null} or empty and
+	 * {@link #isGenerateDefaultLocations()} returns {@code true}, this
+	 * {@code SmartContextLoader} will attempt to {@link
 	 * #detectDefaultConfigurationClasses detect default configuration classes}.
 	 * If defaults are detected they will be
 	 * {@link ContextConfigurationAttributes#setClasses(Class[]) set} in the
@@ -91,7 +91,7 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
 	 *
 	 * @param declaringClass the test class that declared {@code @ContextConfiguration}
 	 * @return an array of default configuration classes, potentially empty but
-	 * never <code>null</code>
+	 * never {@code null}
 	 * @see AnnotationConfigContextLoaderUtils
 	 */
 	protected Class<?>[] detectDefaultConfigurationClasses(Class<?> declaringClass) {
@@ -101,7 +101,7 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
 	// --- AbstractContextLoader -----------------------------------------------
 
 	/**
-	 * <code>AnnotationConfigContextLoader</code> should be used as a
+	 * {@code AnnotationConfigContextLoader} should be used as a
 	 * {@link org.springframework.test.context.SmartContextLoader SmartContextLoader},
 	 * not as a legacy {@link org.springframework.test.context.ContextLoader ContextLoader}.
 	 * Consequently, this method is not supported.
@@ -116,7 +116,7 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
 	}
 
 	/**
-	 * <code>AnnotationConfigContextLoader</code> should be used as a
+	 * {@code AnnotationConfigContextLoader} should be used as a
 	 * {@link org.springframework.test.context.SmartContextLoader SmartContextLoader},
 	 * not as a legacy {@link org.springframework.test.context.ContextLoader ContextLoader}.
 	 * Consequently, this method is not supported.
@@ -131,7 +131,7 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
 	}
 
 	/**
-	 * <code>AnnotationConfigContextLoader</code> should be used as a
+	 * {@code AnnotationConfigContextLoader} should be used as a
 	 * {@link org.springframework.test.context.SmartContextLoader SmartContextLoader},
 	 * not as a legacy {@link org.springframework.test.context.ContextLoader ContextLoader}.
 	 * Consequently, this method is not supported.
@@ -156,7 +156,7 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
 	 * bean definitions.
 	 *
 	 * <p>Note that this method does not call {@link #createBeanDefinitionReader}
-	 * since <code>AnnotatedBeanDefinitionReader</code> is not an instance of
+	 * since {@code AnnotatedBeanDefinitionReader} is not an instance of
 	 * {@link BeanDefinitionReader}.
 	 *
 	 * @param context the context in which the annotated classes should be registered
@@ -174,7 +174,7 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
 	}
 
 	/**
-	 * <code>AnnotationConfigContextLoader</code> should be used as a
+	 * {@code AnnotationConfigContextLoader} should be used as a
 	 * {@link org.springframework.test.context.SmartContextLoader SmartContextLoader},
 	 * not as a legacy {@link org.springframework.test.context.ContextLoader ContextLoader}.
 	 * Consequently, this method is not supported.
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 1c46076587..f192a194ca 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
@@ -55,15 +55,15 @@ public abstract class AnnotationConfigContextLoaderUtils {
 	 * <p>Specifically, such candidates:
 	 *
 	 * <ul>
-	 * <li>must not be <code>null</code></li>
-	 * <li>must not be <code>private</code></li>
-	 * <li>must not be <code>final</code></li>
-	 * <li>must be <code>static</code></li>
+	 * <li>must not be {@code null}</li>
+	 * <li>must not be {@code private}</li>
+	 * <li>must not be {@code final}</li>
+	 * <li>must be {@code static}</li>
 	 * <li>must be annotated with {@code @Configuration}</li>
 	 * </ul>
 	 *
 	 * @param clazz the class to check
-	 * @return <code>true</code> if the supplied class meets the candidate criteria
+	 * @return {@code true} if the supplied class meets the candidate criteria
 	 */
 	private static boolean isDefaultConfigurationClassCandidate(Class<?> clazz) {
 		return clazz != null && isStaticNonPrivateAndNonFinal(clazz) && clazz.isAnnotationPresent(Configuration.class);
@@ -86,7 +86,7 @@ public abstract class AnnotationConfigContextLoaderUtils {
 	 * warning, 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</code>
+	 * never {@code null}
 	 */
 	public static Class<?>[] detectDefaultConfigurationClasses(Class<?> declaringClass) {
 		Assert.notNull(declaringClass, "Declaring class must not be null");
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java
index 36a9674322..ca380e68bd 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java
@@ -24,7 +24,7 @@ import org.springframework.core.Conventions;
 import org.springframework.test.context.TestContext;
 
 /**
- * <code>TestExecutionListener</code> which provides support for dependency
+ * {@code TestExecutionListener} which provides support for dependency
  * injection and initialization of test instances.
  *
  * @author Sam Brannen
@@ -99,7 +99,7 @@ public class DependencyInjectionTestExecutionListener extends AbstractTestExecut
 	 * <p>The {@link #REINJECT_DEPENDENCIES_ATTRIBUTE} will be subsequently removed
 	 * from the test context, regardless of its value.
 	 * @param testContext the test context for which dependency injection should
-	 * be performed (never <code>null</code>)
+	 * be performed (never {@code null})
 	 * @throws Exception allows any exception to propagate
 	 * @see #prepareTestInstance(TestContext)
 	 * @see #beforeTestMethod(TestContext)
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 b5665228ef..fef3aa74cc 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
@@ -27,8 +27,8 @@ import org.springframework.test.context.TestContext;
 import org.springframework.util.Assert;
 
 /**
- * <code>TestExecutionListener</code> which provides support for marking the
- * <code>ApplicationContext</code> associated with a test as <em>dirty</em> for
+ * {@code TestExecutionListener} which provides support for marking the
+ * {@code ApplicationContext} associated with a test as <em>dirty</em> for
  * both test classes and test methods configured with the {@link DirtiesContext
  * &#064;DirtiesContext} annotation.
  *
@@ -47,7 +47,7 @@ public class DirtiesContextTestExecutionListener extends AbstractTestExecutionLi
 	 * {@link TestContext test context} as
 	 * {@link TestContext#markApplicationContextDirty() dirty}, and sets the
 	 * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE
-	 * REINJECT_DEPENDENCIES_ATTRIBUTE} in the test context to <code>true</code>.
+	 * REINJECT_DEPENDENCIES_ATTRIBUTE} in the test context to {@code true}.
 	 */
 	protected void dirtyContext(TestContext testContext) {
 		testContext.markApplicationContextDirty();
@@ -65,7 +65,7 @@ public class DirtiesContextTestExecutionListener extends AbstractTestExecutionLi
 	 * {@link 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</code>.
+	 * {@code true}.
 	 */
 	@Override
 	public void afterTestMethod(TestContext testContext) throws Exception {
@@ -100,7 +100,7 @@ public class DirtiesContextTestExecutionListener extends AbstractTestExecutionLi
 	 * and the
 	 * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE
 	 * REINJECT_DEPENDENCIES_ATTRIBUTE} in the test context will be set to
-	 * <code>true</code>.
+	 * {@code true}.
 	 */
 	@Override
 	public void afterTestClass(TestContext testContext) throws Exception {
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java
index 94057c61f5..a4fa110e98 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java
@@ -42,7 +42,7 @@ public class GenericPropertiesContextLoader extends AbstractGenericContextLoader
 	}
 
 	/**
-	 * Returns &quot;<code>-context.properties</code>&quot;.
+	 * Returns &quot;{@code -context.properties}&quot;.
 	 */
 	@Override
 	public String getResourceSuffix() {
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java
index 8e066f32c0..1fffaebd96 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java
@@ -40,7 +40,7 @@ public class GenericXmlContextLoader extends AbstractGenericContextLoader {
 	}
 
 	/**
-	 * Returns &quot;<code>-context.xml</code>&quot;.
+	 * Returns &quot;{@code -context.xml}&quot;.
 	 */
 	@Override
 	public String getResourceSuffix() {
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 ee397d1655..e7964d1eaa 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
@@ -145,7 +145,7 @@ public abstract class AbstractTestNGSpringContextTests implements IHookable, App
 
 	/**
 	 * Delegates to the {@link IHookCallBack#runTestMethod(ITestResult) test
-	 * method} in the supplied <code>callback</code> to execute the actual test
+	 * method} in the supplied {@code callback} to execute the actual test
 	 * and then tracks the exception thrown during test execution, if any.
 	 *
 	 * @see org.testng.IHookable#run(org.testng.IHookCallBack,
diff --git a/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java
index e2c0d60d71..41e70a704f 100644
--- a/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java
@@ -155,7 +155,7 @@ public abstract class AbstractTransactionalTestNGSpringContextTests extends Abst
 	 * @param continueOnError whether or not to continue without throwing an
 	 * exception in the event of an error
 	 * @throws DataAccessException if there is an error executing a statement
-	 * and continueOnError was <code>false</code>
+	 * and continueOnError was {@code false}
 	 */
 	protected void executeSqlScript(String sqlResourcePath, boolean continueOnError) throws DataAccessException {
 		Resource resource = this.applicationContext.getResource(sqlResourcePath);
diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
index 6ecbc5d534..21be2d3da4 100644
--- a/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
+++ b/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
@@ -24,13 +24,13 @@ import java.lang.annotation.Target;
 
 /**
  * <p>
- * Test annotation to indicate that the annotated <code>public void</code>
+ * Test annotation to indicate that the annotated {@code public void}
  * method should be executed <em>after</em> a transaction is ended for test
  * methods configured to run within a transaction via the
- * <code>&#064;Transactional</code> annotation.
+ * {@code &#064;Transactional} annotation.
  * </p>
  * <p>
- * The <code>&#064;AfterTransaction</code> methods of superclasses will be
+ * The {@code &#064;AfterTransaction} methods of superclasses will be
  * executed after those of the current class.
  * </p>
  *
diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java
index ac7e1e62ba..f047b156d3 100644
--- a/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java
+++ b/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java
@@ -24,13 +24,13 @@ import java.lang.annotation.Target;
 
 /**
  * <p>
- * Test annotation to indicate that the annotated <code>public void</code>
+ * Test annotation to indicate that the annotated {@code public void}
  * method should be executed <em>before</em> a transaction is started for test
  * methods configured to run within a transaction via the
- * <code>&#064;Transactional</code> annotation.
+ * {@code &#064;Transactional} annotation.
  * </p>
  * <p>
- * The <code>&#064;BeforeTransaction</code> methods of superclasses will be
+ * The {@code &#064;BeforeTransaction} methods of superclasses will be
  * executed before those of the current class.
  * </p>
  *
diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
index 0dab576fa2..5535fa974f 100644
--- a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
@@ -305,12 +305,12 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis
 	 * Get the {@link PlatformTransactionManager transaction manager} to use
 	 * for the supplied {@link TestContext test context} and {@code qualifier}.
 	 * <p>Delegates to {@link #getTransactionManager(TestContext)} if the
-	 * supplied {@code qualifier} is <code>null</code> or empty.
+	 * supplied {@code qualifier} is {@code null} or empty.
 	 * @param testContext the test context for which the transaction manager
 	 * should be retrieved
 	 * @param qualifier the qualifier for selecting between multiple bean matches;
-	 * may be <code>null</code> or empty
-	 * @return the transaction manager to use, or <code>null</code> if not found
+	 * may be {@code null} or empty
+	 * @return the transaction manager to use, or {@code null} if not found
 	 * @throws BeansException if an error occurs while retrieving the transaction manager
 	 * @see #getTransactionManager(TestContext)
 	 */
@@ -342,7 +342,7 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis
 	 * for the supplied {@link TestContext test context}.
 	 * @param testContext the test context for which the transaction manager
 	 * should be retrieved
-	 * @return the transaction manager to use, or <code>null</code> if not found
+	 * @return the transaction manager to use, or {@code null} if not found
 	 * @throws BeansException if an error occurs while retrieving the transaction manager
 	 * @see #getTransactionManager(TestContext, String)
 	 */
@@ -453,7 +453,7 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis
 
 	/**
 	 * Gets all methods in the supplied {@link Class class} and its superclasses
-	 * which are annotated with the supplied <code>annotationType</code> but
+	 * which are annotated with the supplied {@code annotationType} but
 	 * which are not <em>shadowed</em> by methods overridden in subclasses.
 	 * <p>Note: This code has been borrowed from
 	 * {@link org.junit.internal.runners.TestClass#getAnnotatedMethods(Class)}
@@ -480,11 +480,11 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis
 	 * Determines if the supplied {@link Method method} is <em>shadowed</em>
 	 * by a method in supplied {@link List list} of previous methods.
 	 * <p>Note: This code has been borrowed from
-	 * {@link org.junit.internal.runners.TestClass#isShadowed(Method,List)}.
+	 * {@link org.junit.internal.runners.TestClass#isShadowed(Method, List)}.
 	 * @param method the method to check for shadowing
 	 * @param previousMethods the list of methods which have previously been processed
-	 * @return <code>true</code> if the supplied method is shadowed by a
-	 * method in the <code>previousMethods</code> list
+	 * @return {@code true} if the supplied method is shadowed by a
+	 * method in the {@code previousMethods} list
 	 */
 	private boolean isShadowed(Method method, List<Method> previousMethods) {
 		for (Method each : previousMethods) {
@@ -499,10 +499,10 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis
 	 * Determines if the supplied {@link Method current method} is
 	 * <em>shadowed</em> by a {@link Method previous method}.
 	 * <p>Note: This code has been borrowed from
-	 * {@link org.junit.internal.runners.TestClass#isShadowed(Method,Method)}.
+	 * {@link org.junit.internal.runners.TestClass#isShadowed(Method, Method)}.
 	 * @param current the current method
 	 * @param previous the previous method
-	 * @return <code>true</code> if the previous method shadows the current one
+	 * @return {@code true} if the previous method shadows the current one
 	 */
 	private boolean isShadowed(Method current, Method previous) {
 		if (!previous.getName().equals(current.getName())) {
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
index 06b9d54b1f..f344ae2eee 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
@@ -160,7 +160,7 @@ public abstract class AbstractGenericWebContextLoader extends AbstractContextLoa
 	 * created by this context loader.
 	 *
 	 * <p>The default implementation is empty but can be overridden in subclasses
-	 * to customize <code>DefaultListableBeanFactory</code>'s standard settings.
+	 * to customize {@code DefaultListableBeanFactory}'s standard settings.
 	 *
 	 * @param beanFactory the bean factory created by this context loader
 	 * @param webMergedConfig the merged context configuration to use to load the
@@ -177,7 +177,7 @@ public abstract class AbstractGenericWebContextLoader extends AbstractContextLoa
 
 	/**
 	 * Load bean definitions into the supplied {@link GenericWebApplicationContext context}
-	 * from the locations or classes in the supplied <code>WebMergedContextConfiguration</code>.
+	 * from the locations or classes in the supplied {@code WebMergedContextConfiguration}.
 	 *
 	 * <p>Concrete subclasses must provide an appropriate implementation.
 	 *
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java
index 4c89b59c70..05acb46366 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java
@@ -33,15 +33,15 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
  * {@link org.springframework.test.context.ContextConfiguration @ContextConfiguration}
  * for a definition of <em>annotated class</em>.
  *
- * <p>Note: <code>AnnotationConfigWebContextLoader</code> supports <em>annotated classes</em>
+ * <p>Note: {@code AnnotationConfigWebContextLoader} supports <em>annotated classes</em>
  * rather than the String-based resource locations defined by the legacy
  * {@link org.springframework.test.context.ContextLoader ContextLoader} API. Thus,
- * although <code>AnnotationConfigWebContextLoader</code> extends
- * <code>AbstractGenericWebContextLoader</code>, <code>AnnotationConfigWebContextLoader</code>
+ * although {@code AnnotationConfigWebContextLoader} extends
+ * {@code AbstractGenericWebContextLoader}, {@code AnnotationConfigWebContextLoader}
  * does <em>not</em> support any String-based methods defined by
  * {@link org.springframework.test.context.support.AbstractContextLoader
- * AbstractContextLoader} or <code>AbstractGenericWebContextLoader</code>.
- * Consequently, <code>AnnotationConfigWebContextLoader</code> should chiefly be
+ * AbstractContextLoader} or {@code AbstractGenericWebContextLoader}.
+ * Consequently, {@code AnnotationConfigWebContextLoader} should chiefly be
  * considered a {@link org.springframework.test.context.SmartContextLoader SmartContextLoader}
  * rather than a {@link org.springframework.test.context.ContextLoader ContextLoader}.
  *
@@ -61,9 +61,9 @@ public class AnnotationConfigWebContextLoader extends AbstractGenericWebContextL
 	/**
 	 * Process <em>annotated classes</em> in the supplied {@link ContextConfigurationAttributes}.
 	 *
-	 * <p>If the <em>annotated classes</em> are <code>null</code> or empty and
-	 * {@link #isGenerateDefaultLocations()} returns <code>true</code>, this
-	 * <code>SmartContextLoader</code> will attempt to {@linkplain
+	 * <p>If the <em>annotated classes</em> are {@code null} or empty and
+	 * {@link #isGenerateDefaultLocations()} returns {@code true}, this
+	 * {@code SmartContextLoader} will attempt to {@linkplain
 	 * #detectDefaultConfigurationClasses detect default configuration classes}.
 	 * If defaults are detected they will be
 	 * {@linkplain ContextConfigurationAttributes#setClasses(Class[]) set} in the
@@ -90,7 +90,7 @@ public class AnnotationConfigWebContextLoader extends AbstractGenericWebContextL
 	 *
 	 * @param declaringClass the test class that declared {@code @ContextConfiguration}
 	 * @return an array of default configuration classes, potentially empty but
-	 * never <code>null</code>
+	 * never {@code null}
 	 * @see AnnotationConfigContextLoaderUtils
 	 */
 	protected Class<?>[] detectDefaultConfigurationClasses(Class<?> declaringClass) {
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/GenericXmlWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/web/GenericXmlWebContextLoader.java
index d7a72795b0..0bf295e054 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/GenericXmlWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/GenericXmlWebContextLoader.java
@@ -39,7 +39,7 @@ public class GenericXmlWebContextLoader extends AbstractGenericWebContextLoader
 	}
 
 	/**
-	 * Returns &quot;<code>-context.xml</code>&quot;.
+	 * Returns &quot;{@code -context.xml}&quot;.
 	 */
 	protected String getResourceSuffix() {
 		return "-context.xml";
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java
index 4be20de0f3..8e0e0494ad 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/WebMergedContextConfiguration.java
@@ -62,11 +62,11 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
 	 * supplied test class, resource locations, annotated classes, context
 	 * initializers, active profiles, resource base path, and {@code ContextLoader}.
 	 *
-	 * <p>If a <code>null</code> value is supplied for <code>locations</code>,
-	 * <code>classes</code>, or <code>activeProfiles</code> an empty array will
-	 * be stored instead. If a <code>null</code> value is supplied for the
-	 * <code>contextInitializerClasses</code> an empty set will be stored instead.
-	 * If an <em>empty</em> value is supplied for the <code>resourceBasePath</code>
+	 * <p>If a {@code null} value is supplied for {@code locations},
+	 * {@code classes}, or {@code activeProfiles} an empty array will
+	 * be stored instead. If a {@code null} value is supplied for the
+	 * {@code contextInitializerClasses} an empty set will be stored instead.
+	 * If an <em>empty</em> value is supplied for the {@code resourceBasePath}
 	 * an empty string will be used. Furthermore, active profiles will be sorted,
 	 * and duplicate profiles will be removed.
 	 *
@@ -76,7 +76,7 @@ public class WebMergedContextConfiguration extends MergedContextConfiguration {
 	 * @param contextInitializerClasses the merged context initializer classes
 	 * @param activeProfiles the merged active bean definition profiles
 	 * @param resourceBasePath the resource path to the root directory of the web application
-	 * @param contextLoader the resolved <code>ContextLoader</code>
+	 * @param contextLoader the resolved {@code ContextLoader}
 	 */
 	public WebMergedContextConfiguration(
 			Class<?> testClass,
diff --git a/spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java b/spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
index a59043a948..532a82c01f 100644
--- a/spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
@@ -295,7 +295,7 @@ public class JdbcTestUtils {
 	/**
 	 * Split an SQL script into separate statements delimited by the provided
 	 * delimiter character. Each individual statement will be added to the
-	 * provided <code>List</code>.
+	 * provided {@code List}.
 	 * <p>Within a statement, "{@code --}" will be used as the comment prefix;
 	 * any text beginning with the comment prefix and extending to the end of
 	 * the line will be omitted from the statement. In addition, multiple adjacent
diff --git a/spring-test/src/main/java/org/springframework/test/jdbc/SimpleJdbcTestUtils.java b/spring-test/src/main/java/org/springframework/test/jdbc/SimpleJdbcTestUtils.java
index 348448894e..24cee9adb6 100644
--- a/spring-test/src/main/java/org/springframework/test/jdbc/SimpleJdbcTestUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/jdbc/SimpleJdbcTestUtils.java
@@ -86,7 +86,7 @@ public abstract class SimpleJdbcTestUtils {
 	 * @param continueOnError whether or not to continue without throwing an
 	 * exception in the event of an error
 	 * @throws DataAccessException if there is an error executing a statement
-	 * and continueOnError was <code>false</code>
+	 * and continueOnError was {@code false}
 	 */
 	public static void executeSqlScript(SimpleJdbcTemplate simpleJdbcTemplate, ResourceLoader resourceLoader,
 			String sqlResourcePath, boolean continueOnError) throws DataAccessException {
@@ -106,7 +106,7 @@ public abstract class SimpleJdbcTestUtils {
 	 * @param continueOnError whether or not to continue without throwing an
 	 * exception in the event of an error.
 	 * @throws DataAccessException if there is an error executing a statement
-	 * and continueOnError was <code>false</code>
+	 * and continueOnError was {@code false}
 	 */
 	public static void executeSqlScript(SimpleJdbcTemplate simpleJdbcTemplate, Resource resource,
 			boolean continueOnError) throws DataAccessException {
@@ -125,7 +125,7 @@ public abstract class SimpleJdbcTestUtils {
 	 * @param continueOnError whether or not to continue without throwing an
 	 * exception in the event of an error.
 	 * @throws DataAccessException if there is an error executing a statement
-	 * and continueOnError was <code>false</code>
+	 * and continueOnError was {@code false}
 	 */
 	public static void executeSqlScript(SimpleJdbcTemplate simpleJdbcTemplate, EncodedResource resource,
 			boolean continueOnError) throws DataAccessException {
diff --git a/spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java
index a47c8195eb..3ccb4000e6 100644
--- a/spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java
+++ b/spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java
@@ -22,7 +22,7 @@ import org.springframework.instrument.classloading.ResourceOverridingShadowingCl
 
 /**
  * Subclass of {@link AbstractJpaTests} that activates AspectJ load-time weaving and
- * allows for specifying a custom location for AspectJ's <code>aop.xml</code> file.
+ * allows for specifying a custom location for AspectJ's {@code aop.xml} file.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -34,7 +34,7 @@ import org.springframework.instrument.classloading.ResourceOverridingShadowingCl
 public abstract class AbstractAspectjJpaTests extends AbstractJpaTests {
 
 	/**
-	 * Default location of the <code>aop.xml</code> file in the class path:
+	 * Default location of the {@code aop.xml} file in the class path:
 	 * "META-INF/aop.xml"
 	 */
 	public static final String DEFAULT_AOP_XML_LOCATION = "META-INF/aop.xml";
@@ -48,9 +48,9 @@ public abstract class AbstractAspectjJpaTests extends AbstractJpaTests {
 	}
 
 	/**
-	 * Return the actual location of the <code>aop.xml</code> file
+	 * Return the actual location of the {@code aop.xml} file
 	 * in the class path. The default is "META-INF/aop.xml".
-	 * <p>Override this method to point to a specific <code>aop.xml</code>
+	 * <p>Override this method to point to a specific {@code aop.xml}
 	 * file within your test suite, allowing for different config files
 	 * to co-exist within the same class path.
 	 */
diff --git a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
index 5e1b003830..060d7880a3 100644
--- a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -122,8 +122,8 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 	/**
 	 * Create an EntityManager that will always automatically enlist itself in current
 	 * transactions, in contrast to an EntityManager returned by
-	 * <code>EntityManagerFactory.createEntityManager()</code>
-	 * (which requires an explicit <code>joinTransaction()</code> call).
+	 * {@code EntityManagerFactory.createEntityManager()}
+	 * (which requires an explicit {@code joinTransaction()} call).
 	 */
 	protected EntityManager createContainerManagedEntityManager() {
 		return ExtendedEntityManagerCreator.createContainerManagedEntityManager(this.entityManagerFactory);
diff --git a/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java b/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
index 0f2180ebeb..8bb2d00acb 100644
--- a/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
@@ -20,7 +20,7 @@ import org.springframework.instrument.classloading.ResourceOverridingShadowingCl
 
 /**
  * Subclass of ShadowingClassLoader that overrides attempts to
- * locate <code>orm.xml</code>.
+ * locate {@code orm.xml}.
  *
  * <p>This class must <b>not</b> be an inner class of AbstractJpaTests
  * to avoid it being loaded until first used.
@@ -33,7 +33,7 @@ import org.springframework.instrument.classloading.ResourceOverridingShadowingCl
 class OrmXmlOverridingShadowingClassLoader extends ResourceOverridingShadowingClassLoader {
 
 	/**
-	 * Default location of the <code>orm.xml</code> file in the class path:
+	 * Default location of the {@code orm.xml} file in the class path:
 	 * "META-INF/orm.xml"
 	 */
 	public static final String DEFAULT_ORM_XML_LOCATION = "META-INF/orm.xml";
diff --git a/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java b/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java
index c647bd41dc..887adccf10 100644
--- a/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java
+++ b/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java
@@ -29,7 +29,7 @@ import org.springframework.web.servlet.ModelAndView;
  * Convenient JUnit 3.8 base class for tests dealing with Spring Web MVC
  * {@link org.springframework.web.servlet.ModelAndView ModelAndView} objects.
  *
- * <p>All <code>assert*()</code> methods throw {@link AssertionFailedError}s.
+ * <p>All {@code assert*()} methods throw {@link AssertionFailedError}s.
  *
  * <p>Consider the use of {@link ModelAndViewAssert} with JUnit 4 and TestNG.
  *
@@ -47,12 +47,12 @@ import org.springframework.web.servlet.ModelAndView;
 public abstract class AbstractModelAndViewTests extends TestCase {
 
 	/**
-	 * Checks whether the model value under the given <code>modelName</code>
-	 * exists and checks it type, based on the <code>expectedType</code>. If
+	 * Checks whether the model value under the given {@code modelName}
+	 * exists and checks it type, based on the {@code expectedType}. If
 	 * the model entry exists and the type matches, the model value is returned.
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param modelName name of the object to add to the model (never
-	 * <code>null</code>)
+	 * {@code null})
 	 * @param expectedType expected type of the model value
 	 * @return the model value
 	 */
@@ -67,9 +67,9 @@ public abstract class AbstractModelAndViewTests extends TestCase {
 
 	/**
 	 * Compare each individual entry in a list, without first sorting the lists.
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param modelName name of the object to add to the model (never
-	 * <code>null</code>)
+	 * {@code null})
 	 * @param expectedList the expected list
 	 */
 	@SuppressWarnings("rawtypes")
@@ -84,9 +84,9 @@ public abstract class AbstractModelAndViewTests extends TestCase {
 
 	/**
 	 * Assert whether or not a model attribute is available.
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param modelName name of the object to add to the model (never
-	 * <code>null</code>)
+	 * {@code null})
 	 */
 	protected void assertModelAttributeAvailable(ModelAndView mav, String modelName) {
 		try {
@@ -98,11 +98,11 @@ public abstract class AbstractModelAndViewTests extends TestCase {
 	}
 
 	/**
-	 * Compare a given <code>expectedValue</code> to the value from the model
-	 * bound under the given <code>modelName</code>.
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * Compare a given {@code expectedValue} to the value from the model
+	 * bound under the given {@code modelName}.
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param modelName name of the object to add to the model (never
-	 * <code>null</code>)
+	 * {@code null})
 	 * @param expectedValue the model value
 	 */
 	protected void assertModelAttributeValue(ModelAndView mav, String modelName, Object expectedValue) {
@@ -115,9 +115,9 @@ public abstract class AbstractModelAndViewTests extends TestCase {
 	}
 
 	/**
-	 * Inspect the <code>expectedModel</code> to see if all elements in the
+	 * Inspect the {@code expectedModel} to see if all elements in the
 	 * model appear and are equal.
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param expectedModel the expected model
 	 */
 	protected void assertModelAttributeValues(ModelAndView mav, Map<String, Object> expectedModel) {
@@ -132,11 +132,11 @@ public abstract class AbstractModelAndViewTests extends TestCase {
 	/**
 	 * Compare each individual entry in a list after having sorted both lists
 	 * (optionally using a comparator).
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param modelName name of the object to add to the model (never
-	 * <code>null</code>)
+	 * {@code null})
 	 * @param expectedList the expected list
-	 * @param comparator the comparator to use (may be <code>null</code>). If
+	 * @param comparator the comparator to use (may be {@code null}). If
 	 * not specifying the comparator, both lists will be sorted not using
 	 * any comparator.
 	 */
@@ -153,8 +153,8 @@ public abstract class AbstractModelAndViewTests extends TestCase {
 
 	/**
 	 * Check to see if the view name in the ModelAndView matches the given
-	 * <code>expectedName</code>.
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * {@code expectedName}.
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param expectedName the name of the model value
 	 */
 	protected void assertViewName(ModelAndView mav, String expectedName) {
diff --git a/spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java b/spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java
index a15c67d323..62677fdbda 100644
--- a/spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java
+++ b/spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java
@@ -33,7 +33,7 @@ import org.springframework.web.servlet.ModelAndView;
  * with Spring Web MVC {@link org.springframework.web.servlet.ModelAndView
  * ModelAndView} objects.
  * <p>
- * Intended for use with JUnit 4 and TestNG. All <code>assert*()</code> methods
+ * Intended for use with JUnit 4 and TestNG. All {@code assert*()} methods
  * throw {@link AssertionError}s.
  *
  * @author Sam Brannen
@@ -45,13 +45,13 @@ import org.springframework.web.servlet.ModelAndView;
 public abstract class ModelAndViewAssert {
 
 	/**
-	 * Checks whether the model value under the given <code>modelName</code>
-	 * exists and checks it type, based on the <code>expectedType</code>. If the
+	 * Checks whether the model value under the given {@code modelName}
+	 * exists and checks it type, based on the {@code expectedType}. If the
 	 * model entry exists and the type matches, the model value is returned.
 	 *
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param modelName name of the object to add to the model (never
-	 * <code>null</code>)
+	 * {@code null})
 	 * @param expectedType expected type of the model value
 	 * @return the model value
 	 */
@@ -69,9 +69,9 @@ public abstract class ModelAndViewAssert {
 	/**
 	 * Compare each individual entry in a list, without first sorting the lists.
 	 *
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param modelName name of the object to add to the model (never
-	 * <code>null</code>)
+	 * {@code null})
 	 * @param expectedList the expected list
 	 */
 	@SuppressWarnings("rawtypes")
@@ -88,9 +88,9 @@ public abstract class ModelAndViewAssert {
 	/**
 	 * Assert whether or not a model attribute is available.
 	 *
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param modelName name of the object to add to the model (never
-	 * <code>null</code>)
+	 * {@code null})
 	 */
 	public static void assertModelAttributeAvailable(ModelAndView mav, String modelName) {
 		assertTrue("ModelAndView is null", mav != null);
@@ -100,12 +100,12 @@ public abstract class ModelAndViewAssert {
 	}
 
 	/**
-	 * Compare a given <code>expectedValue</code> to the value from the model
-	 * bound under the given <code>modelName</code>.
+	 * Compare a given {@code expectedValue} to the value from the model
+	 * bound under the given {@code modelName}.
 	 *
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param modelName name of the object to add to the model (never
-	 * <code>null</code>)
+	 * {@code null})
 	 * @param expectedValue the model value
 	 */
 	public static void assertModelAttributeValue(ModelAndView mav, String modelName, Object expectedValue) {
@@ -116,10 +116,10 @@ public abstract class ModelAndViewAssert {
 	}
 
 	/**
-	 * Inspect the <code>expectedModel</code> to see if all elements in the
+	 * Inspect the {@code expectedModel} to see if all elements in the
 	 * model appear and are equal.
 	 *
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param expectedModel the expected model
 	 */
 	public static void assertModelAttributeValues(ModelAndView mav, Map<String, Object> expectedModel) {
@@ -152,11 +152,11 @@ public abstract class ModelAndViewAssert {
 	 * Compare each individual entry in a list after having sorted both lists
 	 * (optionally using a comparator).
 	 *
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param modelName name of the object to add to the model (never
-	 * <code>null</code>)
+	 * {@code null})
 	 * @param expectedList the expected list
-	 * @param comparator the comparator to use (may be <code>null</code>). If
+	 * @param comparator the comparator to use (may be {@code null}). If
 	 * not specifying the comparator, both lists will be sorted not using any
 	 * comparator.
 	 */
@@ -186,9 +186,9 @@ public abstract class ModelAndViewAssert {
 
 	/**
 	 * Check to see if the view name in the ModelAndView matches the given
-	 * <code>expectedName</code>.
+	 * {@code expectedName}.
 	 *
-	 * @param mav ModelAndView to test against (never <code>null</code>)
+	 * @param mav ModelAndView to test against (never {@code null})
 	 * @param expectedName the name of the model value
 	 */
 	public static void assertViewName(ModelAndView mav, String expectedName) {
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java
index 33cde3e872..5a6c915365 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java
@@ -21,7 +21,7 @@ import junit.framework.TestCase;
 import javax.servlet.jsp.PageContext;
 
 /**
- * Unit tests for the <code>MockPageContext</code> class.
+ * Unit tests for the {@code MockPageContext} class.
  *
  * @author Rick Evans
  */
diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
index a6376dfdf9..869d41ab27 100644
--- a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
@@ -29,7 +29,7 @@ import org.springframework.test.context.junit4.PropertiesBasedSpringJUnit4ClassR
 /**
  * Integration tests which verify that the same custom {@link ContextLoader} can
  * be used at all levels within a test class hierarchy when the
- * <code>loader</code> is <i>inherited</i> (i.e., not explicitly declared) via
+ * {@code loader} is <i>inherited</i> (i.e., not explicitly declared) via
  * {@link ContextConfiguration &#064;ContextConfiguration}.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
index 8c635bdd6a..10f0e1ef41 100644
--- a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
@@ -30,7 +30,7 @@ import org.springframework.test.context.support.GenericPropertiesContextLoader;
 /**
  * Integration tests which verify that the same custom {@link ContextLoader} can
  * be used at all levels within a test class hierarchy when the
- * <code>loader</code> is explicitly declared via {@link ContextConfiguration
+ * {@code loader} is explicitly declared via {@link ContextConfiguration
  * &#064;ContextConfiguration}.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
index 9069dc59bd..78075bc3f3 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
@@ -52,7 +52,7 @@ import org.springframework.transaction.annotation.Transactional;
  * <li>{@link TransactionalTestExecutionListener}</li>
  * </ul>
  * <p>
- * This class specifically tests usage of <code>&#064;Transactional</code>
+ * This class specifically tests usage of {@code &#064;Transactional}
  * defined at the <strong>class level</strong>.
  * </p>
  *
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java
index 4e9ebb7496..a9284c78f0 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java
@@ -40,7 +40,7 @@ public class ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests extends SpringJ
 	/**
 	 * Classpath-based resource path for the application context configuration
 	 * for {@link SpringJUnit4ClassRunnerAppCtxTests}:
-	 * <code>&quot;classpath:/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml&quot;</code>
+	 * {@code &quot;classpath:/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml&quot;}
 	 *
 	 * @see SpringJUnit4ClassRunnerAppCtxTests#DEFAULT_CONTEXT_RESOURCE_PATH
 	 * @see ResourceUtils#CLASSPATH_URL_PREFIX
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java
index 546637f9d4..c51b95cb3f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java
@@ -35,7 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
  * <p>
  * JUnit 4 based integration test which verifies proper transactional behavior when the
  * {@link TransactionConfiguration#defaultRollback() defaultRollback} attribute
- * of the {@link TransactionConfiguration} annotation is set to <strong><code>false</code></strong>.
+ * of the {@link TransactionConfiguration} annotation is set to <strong>{@code false}</strong>.
  * Also tests configuration of the
  * {@link TransactionConfiguration#transactionManager() transaction manager name}.
  * </p>
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java
index 6242ca35b0..cc5ad01ff2 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java
@@ -34,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 /**
  * JUnit 4 based integration test which verifies proper transactional behavior when the
  * {@link TransactionConfiguration#defaultRollback() defaultRollback} attribute
- * of the {@link TransactionConfiguration} annotation is set to <strong><code>true</code></strong>.
+ * of the {@link TransactionConfiguration} annotation is set to <strong>{@code true}</strong>.
  *
  * @author Sam Brannen
  * @since 2.5
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
index f2664d8ec0..db69a60506 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
@@ -50,10 +50,10 @@ import org.springframework.transaction.annotation.Transactional;
  * <li>{@link TransactionalTestExecutionListener}</li>
  * </ul>
  * <p>
- * This class specifically tests usage of <code>&#064;Transactional</code>
+ * This class specifically tests usage of {@code &#064;Transactional}
  * defined at the <strong>method level</strong>. In contrast to
  * {@link ClassLevelTransactionalSpringRunnerTests}, this class omits usage of
- * <code>&#064;NotTransactional</code>.
+ * {@code &#064;NotTransactional}.
  * </p>
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
index 306eb98310..75a32cda3a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
@@ -26,9 +26,9 @@ import org.springframework.util.ResourceUtils;
  * configured differently.
  * <p>
  * As of Spring 3.0,
- * <code>MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests</code> is also used
- * to verify support for the new <code>value</code> attribute alias for
- * <code>&#064;ContextConfiguration</code>'s <code>locations</code> attribute.
+ * {@code MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests} is also used
+ * to verify support for the new {@code value} attribute alias for
+ * {@code &#064;ContextConfiguration}'s {@code locations} attribute.
  * </p>
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
index 45f1220063..5c2d39499c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
@@ -44,10 +44,10 @@ import org.springframework.test.context.support.GenericPropertiesContextLoader;
  * defined, the {@link ContextConfiguration#resourceSuffix() resourceSuffix} is
  * set to &quot;-context.properties&quot;, and
  * {@link ContextConfiguration#generateDefaultLocations() generateDefaultLocations}
- * is left set to its default value of <code>true</code>, this test class's
+ * is left set to its default value of {@code true}, this test class's
  * dependencies will be injected via
  * {@link Autowired annotation-based autowiring} from beans defined in the
- * {@link ApplicationContext} loaded from the default classpath resource: &quot;<code>/org/springframework/test/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties</code>&quot;.
+ * {@link ApplicationContext} loaded from the default classpath resource: &quot;{@code /org/springframework/test/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties}&quot;.
  * </p>
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
index 0b2993059f..85af698bd3 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
@@ -70,7 +70,7 @@ import org.springframework.test.context.support.GenericXmlContextLoader;
  * {@link Inject @Inject}, and {@link Resource @Resource} from beans defined in
  * the {@link ApplicationContext} loaded from the default classpath resource:
  *
- * <code>&quot;/org/springframework/test/context/junit/SpringJUnit4ClassRunnerAppCtxTests-context.xml&quot;</code>
+ * {@code &quot;/org/springframework/test/context/junit/SpringJUnit4ClassRunnerAppCtxTests-context.xml&quot;}
  * .
  * </p>
  *
@@ -89,7 +89,7 @@ public class SpringJUnit4ClassRunnerAppCtxTests implements ApplicationContextAwa
 	 * Default resource path for the application context configuration for
 	 * {@link SpringJUnit4ClassRunnerAppCtxTests}:
 	 *
-	 * <code>&quot;/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml&quot;</code>
+	 * {@code &quot;/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml&quot;}
 	 */
 	public static final String DEFAULT_CONTEXT_RESOURCE_PATH = "/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml";
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
index e8a92ab0ef..835398cb1b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
@@ -26,7 +26,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunnerAppCtxTest
  * <p>Furthermore, by extending {@link SpringJUnit4ClassRunnerAppCtxTests},
  * this class also verifies support for several basic features of the
  * Spring TestContext Framework. See JavaDoc in
- * <code>SpringJUnit4ClassRunnerAppCtxTests</code> for details.
+ * {@code SpringJUnit4ClassRunnerAppCtxTests} for details.
  *
  * <p>Configuration will be loaded from {@link PojoAndStringConfig}.
  *
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
index 6a169ebf2b..bd69ae15ff 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Configuration;
  * ApplicationContext configuration class for various integration tests.
  *
  * <p>The beans defined in this configuration class map directly to the
- * beans defined in <code>SpringJUnit4ClassRunnerAppCtxTests-context.xml</code>.
+ * beans defined in {@code SpringJUnit4ClassRunnerAppCtxTests-context.xml}.
  * Consequently, the application contexts loaded from these two sources
  * should be identical with regard to bean definitions.
  *
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
index a07d1d30aa..847dbd97e8 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
@@ -26,7 +26,7 @@ import org.springframework.context.support.GenericApplicationContext;
 /**
  * Unit test which verifies that extensions of
  * {@link AbstractGenericContextLoader} are able to <em>customize</em> the
- * newly created <code>ApplicationContext</code>. Specifically, this test
+ * newly created {@code ApplicationContext}. Specifically, this test
  * addresses the issues raised in <a
  * href="http://opensource.atlassian.com/projects/spring/browse/SPR-4008"
  * target="_blank">SPR-4008</a>: <em>Supply an opportunity to customize context
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
index b7947f5dc0..d8fc57b3f1 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
@@ -34,8 +34,8 @@ import org.springframework.util.ObjectUtils;
 
 /**
  * JUnit 4 based unit test which verifies proper
- * {@link ContextLoader#processLocations(Class,String...) processing} of
- * <code>resource locations</code> by a {@link GenericXmlContextLoader}
+ * {@link ContextLoader#processLocations(Class, String...) processing} of
+ * {@code resource locations} by a {@link GenericXmlContextLoader}
  * configured via {@link ContextConfiguration @ContextConfiguration}.
  * Specifically, this test addresses the issues raised in <a
  * href="http://opensource.atlassian.com/projects/spring/browse/SPR-3949"
diff --git a/spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java b/spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java
index fb7bd3bd62..3be9e53ca8 100644
--- a/spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java
+++ b/spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java
@@ -22,7 +22,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * Collection of JDK 1.4+ utilities for tests involving transactions. Intended
  * for internal use within the Spring testing suite.
  *
- * <p>All <code>assert*()</code> methods throw {@link AssertionError}s.
+ * <p>All {@code assert*()} methods throw {@link AssertionError}s.
  *
  * @author Sam Brannen
  * @since 2.5
@@ -32,7 +32,7 @@ public abstract class TransactionTestUtils {
 	/**
 	 * Convenience method for determining if a transaction is active for the
 	 * current {@link Thread}.
-	 * @return <code>true</code> if a transaction is currently active
+	 * @return {@code true} if a transaction is currently active
 	 */
 	public static boolean inTransaction() {
 		return TransactionSynchronizationManager.isActualTransactionActive();
@@ -55,22 +55,22 @@ public abstract class TransactionTestUtils {
 	}
 
 	/**
-	 * Fails by throwing an <code>AssertionError</code> with the supplied
-	 * <code>message</code>.
+	 * Fails by throwing an {@code AssertionError} with the supplied
+	 * {@code message}.
 	 * @param message the exception message to use
-	 * @see #assertCondition(boolean,String)
+	 * @see #assertCondition(boolean, String)
 	 */
 	private static void fail(String message) throws AssertionError {
 		throw new AssertionError(message);
 	}
 
 	/**
-	 * Assert the provided boolean <code>condition</code>, throwing
-	 * <code>AssertionError</code> with the supplied <code>message</code> if
-	 * the test result is <code>false</code>.
+	 * Assert the provided boolean {@code condition}, throwing
+	 * {@code AssertionError} with the supplied {@code message} if
+	 * the test result is {@code false}.
 	 * @param condition a boolean expression
 	 * @param message the exception message to use if the assertion fails
-	 * @throws AssertionError if condition is <code>false</code>
+	 * @throws AssertionError if condition is {@code false}
 	 * @see #fail(String)
 	 */
 	private static void assertCondition(boolean condition, String message) throws AssertionError {
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java b/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
index b5946c404e..4310c88371 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
 /**
  * Implementation of {@link PersistenceExceptionTranslator} that supports chaining,
  * allowing the addition of PersistenceExceptionTranslator instances in order.
- * Returns <code>non-null</code> on the first (if any) match.
+ * Returns {@code non-null} on the first (if any) match.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java b/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
index ab1f17d8ff..cc78d086e5 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
@@ -54,7 +54,7 @@ public abstract class DaoSupport implements InitializingBean {
 
 	/**
 	 * Abstract subclasses must override this to check their configuration.
-	 * <p>Implementors should be marked as <code>final</code if concrete subclasses
+	 * <p>Implementors should be marked as {@code final} if concrete subclasses
 	 * are not supposed to override this template method themselves.
 	 * @throws IllegalArgumentException in case of illegal configuration
 	 */
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 5dbf87b39c..cbfeceb996 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
@@ -37,10 +37,10 @@ public abstract class DataAccessUtils {
 
 	/**
 	 * Return a single result object from the given Collection.
-	 * <p>Returns <code>null</code> if 0 result objects found;
+	 * <p>Returns {@code null} if 0 result objects found;
 	 * throws an exception if more than 1 element found.
-	 * @param results the result Collection (can be <code>null</code>)
-	 * @return the single result object, or <code>null</code> if none
+	 * @param results the result Collection (can be {@code null})
+	 * @return the single result object, or {@code null} if none
 	 * @throws IncorrectResultSizeDataAccessException if more than one
 	 * element has been found in the given Collection
 	 */
@@ -58,7 +58,7 @@ public abstract class DataAccessUtils {
 	/**
 	 * Return a single result object from the given Collection.
 	 * <p>Throws an exception if 0 or more than 1 element found.
-	 * @param results the result Collection (can be <code>null</code>)
+	 * @param results the result Collection (can be {@code null})
 	 * @return the single result object
 	 * @throws IncorrectResultSizeDataAccessException if more than one
 	 * element has been found in the given Collection
@@ -78,10 +78,10 @@ public abstract class DataAccessUtils {
 
 	/**
 	 * Return a unique result object from the given Collection.
-	 * <p>Returns <code>null</code> if 0 result objects found;
+	 * <p>Returns {@code null} if 0 result objects found;
 	 * throws an exception if more than 1 instance found.
-	 * @param results the result Collection (can be <code>null</code>)
-	 * @return the unique result object, or <code>null</code> if none
+	 * @param results the result Collection (can be {@code null})
+	 * @return the unique result object, or {@code null} if none
 	 * @throws IncorrectResultSizeDataAccessException if more than one
 	 * result object has been found in the given Collection
 	 * @see org.springframework.util.CollectionUtils#hasUniqueObject
@@ -100,7 +100,7 @@ public abstract class DataAccessUtils {
 	/**
 	 * Return a unique result object from the given Collection.
 	 * <p>Throws an exception if 0 or more than 1 instance found.
-	 * @param results the result Collection (can be <code>null</code>)
+	 * @param results the result Collection (can be {@code null})
 	 * @return the unique result object
 	 * @throws IncorrectResultSizeDataAccessException if more than one
 	 * result object has been found in the given Collection
@@ -124,7 +124,7 @@ public abstract class DataAccessUtils {
 	 * Throws an exception if 0 or more than 1 result objects found,
 	 * of if the unique result object is not convertable to the
 	 * specified required type.
-	 * @param results the result Collection (can be <code>null</code>)
+	 * @param results the result Collection (can be {@code null})
 	 * @return the unique result object
 	 * @throws IncorrectResultSizeDataAccessException if more than one
 	 * result object has been found in the given Collection
@@ -163,7 +163,7 @@ public abstract class DataAccessUtils {
 	 * 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.
-	 * @param results the result Collection (can be <code>null</code>)
+	 * @param results the result Collection (can be {@code null})
 	 * @return the unique int result
 	 * @throws IncorrectResultSizeDataAccessException if more than one
 	 * result object has been found in the given Collection
@@ -182,7 +182,7 @@ public abstract class DataAccessUtils {
 	 * 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.
-	 * @param results the result Collection (can be <code>null</code>)
+	 * @param results the result Collection (can be {@code null})
 	 * @return the unique long result
 	 * @throws IncorrectResultSizeDataAccessException if more than one
 	 * result object has been found in the given Collection
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
index ea41668838..5cd145bb30 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
@@ -98,7 +98,7 @@ public class PersistenceExceptionTranslationInterceptor
 	 * <p>Default is "false". Switch this flag to "true" in order to always translate
 	 * applicable exceptions, independent from the originating method signature.
 	 * <p>Note that the originating method does not have to declare the specific exception.
-	 * Any base class will do as well, even <code>throws Exception</code>: As long as the
+	 * Any base class will do as well, even {@code throws Exception}: As long as the
 	 * originating method does explicitly declare compatible exceptions, the raw exception
 	 * will be rethrown. If you would like to avoid throwing raw exceptions in any case,
 	 * switch this flag to "true".
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java
index 21300ae57e..b86d256a62 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java
@@ -44,7 +44,7 @@ public interface PersistenceExceptionTranslator {
 	 * Implementations may use Spring JDBC's sophisticated exception translation
 	 * to provide further information in the event of SQLException as a root cause.
 	 * @param ex a RuntimeException thrown
-	 * @return the corresponding DataAccessException (or <code>null</code> if the
+	 * @return the corresponding DataAccessException (or {@code null} if the
 	 * exception could not be translated, as in this case it may result from
 	 * user code rather than an actual persistence problem)
 	 * @see org.springframework.dao.DataIntegrityViolationException
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
index b7959a6079..809812823c 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
@@ -22,7 +22,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
 
 /**
  * Exception thrown when a ResultSet has been accessed in an invalid fashion.
- * Such exceptions always have a <code>java.sql.SQLException</code> root cause.
+ * Such exceptions always have a {@code java.sql.SQLException} root cause.
  *
  * <p>This typically happens when an invalid ResultSet column index or name
  * has been specified.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
index 47d5743711..d9860a38ba 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
@@ -79,7 +79,7 @@ public abstract class ConnectionFactoryUtils {
 	 * when using {@link CciLocalTransactionManager}. Will bind a Connection to the thread
 	 * if transaction synchronization is active (e.g. if in a JTA transaction).
 	 * @param cf the ConnectionFactory to obtain Connection from
-	 * @param spec the ConnectionSpec for the desired Connection (may be <code>null</code>).
+	 * @param spec the ConnectionSpec for the desired Connection (may be {@code null}).
 	 * Note: If this is specified, a new Connection will be obtained for every call,
 	 * without participating in a shared transactional Connection.
 	 * @return a CCI Connection from the given ConnectionFactory
@@ -142,7 +142,7 @@ public abstract class ConnectionFactoryUtils {
 	 * bound to the current thread by Spring's transaction facilities.
 	 * @param con the Connection to check
 	 * @param cf the ConnectionFactory that the Connection was obtained from
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 * @return whether the Connection is transactional
 	 */
 	public static boolean isConnectionTransactional(Connection con, ConnectionFactory cf) {
@@ -157,9 +157,9 @@ public abstract class ConnectionFactoryUtils {
 	 * Close the given Connection, obtained from the given ConnectionFactory,
 	 * if it is not managed externally (that is, not bound to the thread).
 	 * @param con the Connection to close if necessary
-	 * (if this is <code>null</code>, the call will be ignored)
+	 * (if this is {@code null}, the call will be ignored)
 	 * @param cf the ConnectionFactory that the Connection was obtained from
-	 * (can be <code>null</code>)
+	 * (can be {@code null})
 	 * @see #getConnection
 	 */
 	public static void releaseConnection(Connection con, ConnectionFactory cf) {
@@ -180,9 +180,9 @@ public abstract class ConnectionFactoryUtils {
 	 * Same as {@link #releaseConnection}, but throwing the original ResourceException.
 	 * <p>Directly accessed by {@link TransactionAwareConnectionFactoryProxy}.
 	 * @param con the Connection to close if necessary
-	 * (if this is <code>null</code>, the call will be ignored)
+	 * (if this is {@code null}, the call will be ignored)
 	 * @param cf the ConnectionFactory that the Connection was obtained from
-	 * (can be <code>null</code>)
+	 * (can be {@code null})
 	 * @throws ResourceException if thrown by JCA CCI methods
 	 * @see #doGetConnection
 	 */
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
index f3baaf59bc..781a308db6 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
@@ -24,14 +24,14 @@ import org.springframework.core.NamedThreadLocal;
 
 /**
  * An adapter for a target CCI {@link javax.resource.cci.ConnectionFactory},
- * applying the given ConnectionSpec to every standard <code>getConnection()</code>
- * call, that is, implicitly invoking <code>getConnection(ConnectionSpec)</code>
+ * applying the given ConnectionSpec to every standard {@code getConnection()}
+ * call, that is, implicitly invoking {@code getConnection(ConnectionSpec)}
  * on the target. All other methods simply delegate to the corresponding methods
  * of the target ConnectionFactory.
  *
  * <p>Can be used to proxy a target JNDI ConnectionFactory that does not have a
  * ConnectionSpec configured. Client code can work with the ConnectionFactory
- * without passing in a ConnectionSpec on every <code>getConnection()</code> call.
+ * without passing in a ConnectionSpec on every {@code getConnection()} call.
  *
  * <p>In the following example, client code can simply transparently work with
  * the preconfigured "myConnectionFactory", implicitly accessing
@@ -53,7 +53,7 @@ import org.springframework.core.NamedThreadLocal;
  * &lt;/bean&gt;</pre>
  *
  * <p>If the "connectionSpec" is empty, this proxy will simply delegate to the
- * standard <code>getConnection()</code> method of the target ConnectionFactory.
+ * standard {@code getConnection()} method of the target ConnectionFactory.
  * This can be used to keep a UserCredentialsConnectionFactoryAdapter bean definition
  * just for the <i>option</i> of implicitly passing in a ConnectionSpec if the
  * particular target ConnectionFactory requires it.
@@ -81,7 +81,7 @@ public class ConnectionSpecConnectionFactoryAdapter extends DelegatingConnection
 	/**
 	 * Set a ConnectionSpec for this proxy and the current thread.
 	 * The given ConnectionSpec will be applied to all subsequent
-	 * <code>getConnection()</code> calls on this ConnectionFactory proxy.
+	 * {@code getConnection()} calls on this ConnectionFactory proxy.
 	 * <p>This will override any statically specified "connectionSpec" property.
 	 * @param spec the ConnectionSpec to apply
 	 * @see #removeConnectionSpecFromCurrentThread
@@ -118,10 +118,10 @@ public class ConnectionSpecConnectionFactoryAdapter extends DelegatingConnection
 	}
 
 	/**
-	 * This implementation delegates to the <code>getConnection(ConnectionSpec)</code>
+	 * This implementation delegates to the {@code getConnection(ConnectionSpec)}
 	 * method of the target ConnectionFactory, passing in the specified user credentials.
 	 * If the specified username is empty, it will simply delegate to the standard
-	 * <code>getConnection()</code> method of the target ConnectionFactory.
+	 * {@code getConnection()} method of the target ConnectionFactory.
 	 * @param spec the ConnectionSpec to apply
 	 * @return the Connection
 	 * @see javax.resource.cci.ConnectionFactory#getConnection(javax.resource.cci.ConnectionSpec)
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
index 8b45b99f3c..2fb9c1378e 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
@@ -28,7 +28,7 @@ import javax.resource.cci.RecordFactory;
  *
  * <p>Useful as a placeholder for a RecordFactory argument (for example as
  * defined by the RecordCreator callback), in particular when the connector's
- * <code>ConnectionFactory.getRecordFactory()</code> implementation happens to
+ * {@code ConnectionFactory.getRecordFactory()} implementation happens to
  * throw NotSupportedException early rather than throwing the exception from
  * RecordFactory's methods.
  *
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
index 69829646f4..2b8d0853a6 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
@@ -35,8 +35,8 @@ import org.springframework.util.Assert;
 
 /**
  * A CCI ConnectionFactory adapter that returns the same Connection on all
- * <code>getConnection</code> calls, and ignores calls to
- * <code>Connection.close()</code>.
+ * {@code getConnection} calls, and ignores calls to
+ * {@code Connection.close()}.
  *
  * <p>Useful for testing and standalone environments, to keep using the same
  * Connection for multiple CciTemplate calls, without having a pooling
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
index e0a058dc59..263fec4dba 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
@@ -43,7 +43,7 @@ import javax.resource.cci.ConnectionFactory;
  *
  * <p>Delegates to {@link ConnectionFactoryUtils} for automatically participating in
  * thread-bound transactions, for example managed by {@link CciLocalTransactionManager}.
- * <code>getConnection</code> calls and <code>close</code> calls on returned Connections
+ * {@code getConnection} calls and {@code close} calls on returned Connections
  * will behave properly within a transaction, i.e. always operate on the transactional
  * Connection. If not within a transaction, normal ConnectionFactory behavior applies.
  *
@@ -61,8 +61,8 @@ import javax.resource.cci.ConnectionFactory;
  * @since 1.2
  * @see javax.resource.cci.ConnectionFactory#getConnection
  * @see javax.resource.cci.Connection#close
- * @see org.springframework.jca.cci.connection.ConnectionFactoryUtils#doGetConnection
- * @see org.springframework.jca.cci.connection.ConnectionFactoryUtils#doReleaseConnection
+ * @see ConnectionFactoryUtils#doGetConnection
+ * @see ConnectionFactoryUtils#doReleaseConnection
  */
 public class TransactionAwareConnectionFactoryProxy extends DelegatingConnectionFactory {
 
@@ -97,12 +97,12 @@ public class TransactionAwareConnectionFactoryProxy extends DelegatingConnection
 
 	/**
 	 * Wrap the given Connection with a proxy that delegates every method call to it
-	 * but delegates <code>close</code> calls to ConnectionFactoryUtils.
+	 * but delegates {@code close} calls to ConnectionFactoryUtils.
 	 * @param target the original Connection to wrap
 	 * @param cf ConnectionFactory that the Connection came from
 	 * @return the wrapped Connection
 	 * @see javax.resource.cci.Connection#close()
-	 * @see org.springframework.jca.cci.connection.ConnectionFactoryUtils#doReleaseConnection
+	 * @see ConnectionFactoryUtils#doReleaseConnection
 	 */
 	protected Connection getTransactionAwareConnectionProxy(Connection target, ConnectionFactory cf) {
 		return (Connection) Proxy.newProxyInstance(
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
index c072dcb9ad..11a9c147c9 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
@@ -49,7 +49,7 @@ import org.springframework.util.Assert;
  * It executes core CCI workflow, leaving application code to provide parameters
  * to CCI and extract results. This class executes EIS queries or updates,
  * catching ResourceExceptions and translating them to the generic exception
- * hierarchy defined in the <code>org.springframework.dao</code> package.
+ * hierarchy defined in the {@code org.springframework.dao} package.
  *
  * <p>Code using this class can pass in and receive {@link javax.resource.cci.Record}
  * instances, or alternatively implement callback interfaces for creating input
@@ -101,7 +101,7 @@ public class CciTemplate implements CciOperations {
 	 * Note: This will trigger eager initialization of the exception translator.
 	 * @param connectionFactory JCA ConnectionFactory to obtain Connections from
 	 * @param connectionSpec the CCI ConnectionSpec to obtain Connections for
-	 * (may be <code>null</code>)
+	 * (may be {@code null})
 	 */
 	public CciTemplate(ConnectionFactory connectionFactory, ConnectionSpec connectionSpec) {
 		setConnectionFactory(connectionFactory);
@@ -142,10 +142,10 @@ public class CciTemplate implements CciOperations {
 	/**
 	 * Set a RecordCreator that should be used for creating default output Records.
 	 * <p>Default is none: When no explicit output Record gets passed into an
-	 * <code>execute</code> method, CCI's <code>Interaction.execute</code> variant
+	 * {@code execute} method, CCI's {@code Interaction.execute} variant
 	 * that returns an output Record will be called.
 	 * <p>Specify a RecordCreator here if you always need to call CCI's
-	 * <code>Interaction.execute</code> variant with a passed-in output Record.
+	 * {@code Interaction.execute} variant with a passed-in output Record.
 	 * Unless there is an explicitly specified output Record, CciTemplate will
 	 * then invoke this RecordCreator to create a default output Record instance.
 	 * @see javax.resource.cci.Interaction#execute(javax.resource.cci.InteractionSpec, Record)
@@ -253,7 +253,7 @@ public class CciTemplate implements CciOperations {
 	 * @param spec the CCI InteractionSpec instance that defines
 	 * the interaction (connector-specific)
 	 * @param inputRecord the input record
-	 * @param outputRecord output record (can be <code>null</code>)
+	 * @param outputRecord output record (can be {@code null})
 	 * @param outputExtractor object to convert the output record to a result object
 	 * @return the output data extracted with the RecordExtractor object
 	 * @throws DataAccessException if there is any problem
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
index 54a8a1f499..70ff9111e9 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
@@ -32,7 +32,7 @@ import org.springframework.dao.DataAccessException;
  * <p>This is particularly useful for delegating to existing data access code
  * that expects a Connection to work on and throws ResourceException. For newly
  * written code, it is strongly recommended to use CciTemplate's more specific
- * <code>execute</code> variants.
+ * {@code execute} variants.
  *
  * @author Thierry Templier
  * @author Juergen Hoeller
@@ -44,7 +44,7 @@ import org.springframework.dao.DataAccessException;
 public interface ConnectionCallback<T> {
 
 	/**
-	 * Gets called by <code>CciTemplate.execute</code> with an active CCI Connection.
+	 * Gets called by {@code CciTemplate.execute} with an active CCI Connection.
 	 * Does not need to care about activating or closing the Connection, or handling
 	 * transactions.
 	 *
@@ -56,14 +56,14 @@ public interface ConnectionCallback<T> {
 	 *
 	 * <p>Allows for returning a result object created within the callback, i.e.
 	 * a domain object or a collection of domain objects. Note that there's special
-	 * support for single step actions: see the <code>CciTemplate.execute</code>
+	 * support for single step actions: see the {@code CciTemplate.execute}
 	 * variants. A thrown RuntimeException is treated as application exception:
 	 * it gets propagated to the caller of the template.
 	 *
 	 * @param connection active CCI Connection
 	 * @param connectionFactory the CCI ConnectionFactory that the Connection was
 	 * created with (gives access to RecordFactory and ResourceAdapterMetaData)
-	 * @return a result object, or <code>null</code> if none
+	 * @return a result object, or {@code null} if none
 	 * @throws ResourceException if thrown by a CCI method, to be auto-converted
 	 * to a DataAccessException
 	 * @throws SQLException if thrown by a ResultSet method, to be auto-converted
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
index 5ed18fb361..969a90115d 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
@@ -33,7 +33,7 @@ import org.springframework.dao.DataAccessException;
  * <p>This is particularly useful for delegating to existing data access code
  * that expects an Interaction to work on and throws ResourceException. For newly
  * written code, it is strongly recommended to use CciTemplate's more specific
- * <code>execute</code> variants.
+ * {@code execute} variants.
  *
  * @author Thierry Templier
  * @author Juergen Hoeller
@@ -45,7 +45,7 @@ import org.springframework.dao.DataAccessException;
 public interface InteractionCallback<T> {
 
 	/**
-	 * Gets called by <code>CciTemplate.execute</code> with an active CCI Interaction.
+	 * Gets called by {@code CciTemplate.execute} with an active CCI Interaction.
 	 * Does not need to care about activating or closing the Interaction, or
 	 * handling transactions.
 	 *
@@ -57,14 +57,14 @@ public interface InteractionCallback<T> {
 	 *
 	 * <p>Allows for returning a result object created within the callback, i.e.
 	 * a domain object or a collection of domain objects. Note that there's special
-	 * support for single step actions: see the <code>CciTemplate.execute</code>
+	 * support for single step actions: see the {@code CciTemplate.execute}
 	 * variants. A thrown RuntimeException is treated as application exception:
 	 * it gets propagated to the caller of the template.
 	 *
 	 * @param interaction active CCI Interaction
 	 * @param connectionFactory the CCI ConnectionFactory that the Connection was
 	 * created with (gives access to RecordFactory and ResourceAdapterMetaData)
-	 * @return a result object, or <code>null</code> if none
+	 * @return a result object, or {@code null} if none
 	 * @throws ResourceException if thrown by a CCI method, to be auto-converted
 	 * to a DataAccessException
 	 * @throws SQLException if thrown by a ResultSet method, to be auto-converted
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
index 956403b511..fea0d11ac9 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
@@ -28,13 +28,13 @@ import org.springframework.dao.DataAccessException;
  *
  * <p>Used for input Record creation in CciTemplate. Alternatively,
  * Record instances can be passed into CciTemplate's corresponding
- * <code>execute</code> methods directly, either instantiated manually
+ * {@code execute} methods directly, either instantiated manually
  * or created through CciTemplate's Record factory methods.
  *
  * <P>Also used for creating default output Records in CciTemplate.
  * This is useful when the JCA connector needs an explicit output Record
  * instance, but no output Records should be passed into CciTemplate's
- * <code>execute</code> methods.
+ * {@code execute} methods.
  *
  * @author Thierry Templier
  * @author Juergen Hoeller
@@ -49,10 +49,10 @@ public interface RecordCreator {
 
 	/**
 	 * Create a CCI Record instance, usually based on the passed-in CCI RecordFactory.
-	 * <p>For use as <i>input</i> creator with CciTemplate's <code>execute</code> methods,
+	 * <p>For use as <i>input</i> creator with CciTemplate's {@code execute} methods,
 	 * this method should create a <i>populated</i> Record instance. For use as
 	 * <i>output</i> Record creator, it should return an <i>empty</i> Record instance.
-	 * @param recordFactory the CCI RecordFactory (never <code>null</code>, but not guaranteed to be
+	 * @param recordFactory the CCI RecordFactory (never {@code null}, but not guaranteed to be
 	 * supported by the connector: its create methods might throw NotSupportedException)
 	 * @return the Record instance
 	 * @throws ResourceException if thrown by a CCI method, to be auto-converted
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
index 539a7b9eaf..8dbfd91b21 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
@@ -49,7 +49,7 @@ public interface RecordExtractor<T> {
 	 * Process the data in the given Record, creating a corresponding result object.
 	 * @param record the Record to extract data from
 	 * (possibly a CCI ResultSet)
-	 * @return an arbitrary result object, or <code>null</code> if none
+	 * @return an arbitrary result object, or {@code null} if none
 	 * (the extractor will typically be stateful in the latter case)
 	 * @throws ResourceException if thrown by a CCI method, to be auto-converted
 	 * to a DataAccessException
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
index 0c7efdb230..107391e0a2 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
@@ -34,7 +34,7 @@ import org.springframework.jca.cci.core.CciTemplate;
  *
  * <p>This base class is mainly intended for CciTemplate usage but can
  * also be used when working with a Connection directly or when using
- * <code>org.springframework.jca.cci.object</code> classes.
+ * {@code org.springframework.jca.cci.object} classes.
  *
  * @author Thierry Templier
  * @author Juergen Hoeller
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java
index f6cac2a07e..6cbf1db5f5 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/package-info.java
@@ -1,7 +1,6 @@
-
 /**
  *
- * Classes supporting the <code>org.springframework.jca.cci.core</code> package.
+ * Classes supporting the {@code org.springframework.jca.cci.core} package.
  * Contains a DAO base class for CciTemplate usage.
  *
  */
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
index 3735e34d16..006ef3b8b3 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
@@ -33,8 +33,8 @@ import org.springframework.jca.cci.core.RecordExtractor;
  * converting to and from CCI Records.
  *
  * <p>Concrete subclasses must implement the abstract
- * <code>createInputRecord(RecordFactory, Object)</code> and
- * <code>extractOutputData(Record)</code> methods, to create an input
+ * {@code createInputRecord(RecordFactory, Object)} and
+ * {@code extractOutputData(Record)} methods, to create an input
  * Record from an object and to convert an output Record into an object,
  * respectively.
  *
@@ -64,10 +64,10 @@ public abstract class MappingRecordOperation extends EisOperation {
 
 	/**
 	 * Set a RecordCreator that should be used for creating default output Records.
-	 * <p>Default is none: CCI's <code>Interaction.execute</code> variant
+	 * <p>Default is none: CCI's {@code Interaction.execute} variant
 	 * that returns an output Record will be called.
 	 * <p>Specify a RecordCreator here if you always need to call CCI's
-	 * <code>Interaction.execute</code> variant with a passed-in output Record.
+	 * {@code Interaction.execute} variant with a passed-in output Record.
 	 * This RecordCreator will then be invoked to create a default output Record instance.
 	 * @see javax.resource.cci.Interaction#execute(javax.resource.cci.InteractionSpec, Record)
 	 * @see javax.resource.cci.Interaction#execute(javax.resource.cci.InteractionSpec, Record, Record)
@@ -80,8 +80,8 @@ public abstract class MappingRecordOperation extends EisOperation {
 	/**
 	 * Execute the interaction encapsulated by this operation object.
 	 * @param inputObject the input data, to be converted to a Record
-	 * by the <code>createInputRecord</code> method
-	 * @return the output data extracted with the <code>extractOutputData</code> method
+	 * by the {@code createInputRecord} method
+	 * @return the output data extracted with the {@code extractOutputData} method
 	 * @throws DataAccessException if there is any problem
 	 * @see #createInputRecord
 	 * @see #extractOutputData
@@ -94,7 +94,7 @@ public abstract class MappingRecordOperation extends EisOperation {
 
 	/**
 	 * Subclasses must implement this method to generate an input Record
-	 * from an input object passed into the <code>execute</code> method.
+	 * from an input object passed into the {@code execute} method.
 	 * @param inputObject the passed-in input object
 	 * @return the CCI input Record
 	 * @throws ResourceException if thrown by a CCI method, to be auto-converted
@@ -106,7 +106,7 @@ public abstract class MappingRecordOperation extends EisOperation {
 
 	/**
 	 * Subclasses must implement this method to convert the Record returned
-	 * by CCI execution into a result object for the <code>execute</code> method.
+	 * by CCI execution into a result object for the {@code execute} method.
 	 * @param outputRecord the Record returned by CCI execution
 	 * @return the result object
 	 * @throws ResourceException if thrown by a CCI method, to be auto-converted
@@ -119,7 +119,7 @@ public abstract class MappingRecordOperation extends EisOperation {
 
 	/**
 	 * Implementation of RecordCreator that calls the enclosing
-	 * class's <code>createInputRecord</code> method.
+	 * class's {@code createInputRecord} method.
 	 */
 	protected class RecordCreatorImpl implements RecordCreator {
 
@@ -137,7 +137,7 @@ public abstract class MappingRecordOperation extends EisOperation {
 
 	/**
 	 * Implementation of RecordExtractor that calls the enclosing
-	 * class's <code>extractOutputData</code> method.
+	 * class's {@code extractOutputData} method.
 	 */
 	protected class RecordExtractorImpl implements RecordExtractor {
 
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java
index e5a2f9cd0a..b7ad70d01c 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java
@@ -49,7 +49,7 @@ public class SimpleRecordOperation extends EisOperation {
 
 	/**
 	 * Execute the CCI interaction encapsulated by this operation object.
-	 * <p>This method will call CCI's <code>Interaction.execute</code> variant
+	 * <p>This method will call CCI's {@code Interaction.execute} variant
 	 * that returns an output Record.
 	 * @param inputRecord the input record
 	 * @return the output record
@@ -62,7 +62,7 @@ public class SimpleRecordOperation extends EisOperation {
 
 	/**
 	 * Execute the CCI interaction encapsulated by this operation object.
-	 * <p>This method will call CCI's <code>Interaction.execute</code> variant
+	 * <p>This method will call CCI's {@code Interaction.execute} variant
 	 * with a passed-in output Record.
 	 * @param inputRecord the input record
 	 * @param outputRecord the output record
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java
index dfc9783c4f..a70c792c8f 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/package-info.java
@@ -1,10 +1,9 @@
-
 /**
  *
  * The classes in this package represent EIS operations as threadsafe,
  * reusable objects. This higher level of CCI abstraction depends on the
- * lower-level abstraction in the <code>org.springframework.jca.cci.core</code> package.
- * Exceptions thrown are as in the <code>org.springframework.dao</code> package,
+ * lower-level abstraction in the {@code org.springframework.jca.cci.core} package.
+ * Exceptions thrown are as in the {@code org.springframework.dao} package,
  * meaning that code using this package does not need to worry about error handling.
  *
  */
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/package-info.java b/spring-tx/src/main/java/org/springframework/jca/cci/package-info.java
index dd9d986a48..4ad1d71989 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/package-info.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/package-info.java
@@ -1,9 +1,8 @@
-
 /**
  *
  * This package contains Spring's support for the Common Client Interface (CCI),
  * as defined by the J2EE Connector Architecture. It is conceptually similar
- * to the <code>org.springframework.jdbc</code> package, providing the same
+ * to the {@code org.springframework.jdbc} package, providing the same
  * levels of data access abstraction.
  *
  */
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java
index 843609f922..d256310dfe 100644
--- a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java
+++ b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java
@@ -35,9 +35,9 @@ public interface BootstrapContextAware extends Aware {
 	/**
 	 * Set the BootstrapContext that this object runs in.
 	 * <p>Invoked after population of normal bean properties but before an init
-	 * callback like InitializingBean's <code>afterPropertiesSet</code> or a
+	 * callback like InitializingBean's {@code afterPropertiesSet} or a
 	 * custom init-method. Invoked after ApplicationContextAware's
-	 * <code>setApplicationContext</code>.
+	 * {@code setApplicationContext}.
 	 * @param bootstrapContext BootstrapContext object to be used by this object
 	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
index 418bcc4cec..8e91d93394 100644
--- a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
@@ -87,7 +87,7 @@ import org.springframework.util.StringUtils;
  * Note that "META-INF/applicationContext.xml" is the default context config
  * location, so it doesn't have to specified unless you intend to specify
  * different/additional config files. So in the default case, you may remove
- * the entire <code>config-property</code> section above.
+ * the entire {@code config-property} section above.
  *
  * <p><b>For simple deployment needs, all you need to do is the following:</b>
  * Package all application classes into a RAR file (which is just a standard
@@ -129,7 +129,7 @@ public class SpringContextResourceAdapter implements ResourceAdapter {
 	 * String that consists of multiple resource location, separated
 	 * by commas, semicolons, whitespace, or line breaks.
 	 * <p>This can be specified as "ContextConfigLocation" config
-	 * property in the <code>ra.xml</code> deployment descriptor.
+	 * property in the {@code ra.xml} deployment descriptor.
 	 * <p>The default is "classpath:META-INF/applicationContext.xml".
 	 */
 	public void setContextConfigLocation(String contextConfigLocation) {
@@ -222,7 +222,7 @@ public class SpringContextResourceAdapter implements ResourceAdapter {
 	}
 
 	/**
-	 * This implementation always returns <code>null</code>.
+	 * This implementation always returns {@code null}.
 	 */
 	public XAResource[] getXAResources(ActivationSpec[] activationSpecs) throws ResourceException {
 		return null;
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
index 3fce257000..df965959bc 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
@@ -118,8 +118,8 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
 
 
 	/**
-	 * This implementation returns <code>true</code> if a transaction manager
-	 * has been specified; <code>false</code> otherwise.
+	 * This implementation returns {@code true} if a transaction manager
+	 * has been specified; {@code false} otherwise.
 	 * @see #setTransactionManager
 	 * @see #setTransactionFactory
 	 */
@@ -128,7 +128,7 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
 	}
 
 	/**
-	 * The standard JCA 1.5 version of <code>createEndpoint</code>.
+	 * The standard JCA 1.5 version of {@code createEndpoint}.
 	 * <p>This implementation delegates to {@link #createEndpointInternal()},
 	 * initializing the endpoint's XAResource before the endpoint gets invoked.
 	 */
@@ -139,7 +139,7 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
 	}
 
 	/**
-	 * The alternative JCA 1.6 version of <code>createEndpoint</code>.
+	 * The alternative JCA 1.6 version of {@code createEndpoint}.
 	 * <p>This implementation delegates to {@link #createEndpointInternal()},
 	 * ignoring the specified timeout. It is only here for JCA 1.6 compliance.
 	 */
@@ -152,7 +152,7 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
 	/**
 	 * Create the actual endpoint instance, as a subclass of the
 	 * {@link AbstractMessageEndpoint} inner class of this factory.
-	 * @return the actual endpoint instance (never <code>null</code>)
+	 * @return the actual endpoint instance (never {@code null})
 	 * @throws UnavailableException if no endpoint is available at present
 	 */
 	protected abstract AbstractMessageEndpoint createEndpointInternal()
@@ -180,13 +180,13 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
 		}
 
 		/**
-		 * This <code>beforeDelivery</code> implementation starts a transaction,
+		 * This {@code beforeDelivery} implementation starts a transaction,
 		 * if necessary, and exposes the endpoint ClassLoader as current
 		 * thread context ClassLoader.
 		 * <p>Note that the JCA 1.5 specification does not require a ResourceAdapter
 		 * to call this method before invoking the concrete endpoint. If this method
 		 * has not been called (check {@link #hasBeforeDeliveryBeenCalled()}), the
-		 * concrete endpoint method should call <code>beforeDelivery</code> and its
+		 * concrete endpoint method should call {@code beforeDelivery} and its
 		 * sibling {@link #afterDelivery()} explicitly, as part of its own processing.
 		 */
 		public void beforeDelivery(Method method) throws ResourceException {
@@ -206,7 +206,7 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
 		 * Template method for exposing the endpoint's ClassLoader
 		 * (typically the ClassLoader that the message listener class
 		 * has been loaded with).
-		 * @return the endpoint ClassLoader (never <code>null</code>)
+		 * @return the endpoint ClassLoader (never {@code null})
 		 */
 		protected abstract ClassLoader getEndpointClassLoader();
 
@@ -230,7 +230,7 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
 		}
 
 		/**
-		 * This <code>afterDelivery</code> implementation resets the thread context
+		 * This {@code afterDelivery} implementation resets the thread context
 		 * ClassLoader and completes the transaction, if any.
 		 * <p>Note that the JCA 1.5 specification does not require a ResourceAdapter
 		 * to call this method after invoking the concrete endpoint. See the
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
index eec90acca5..ffb56126f3 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
@@ -144,7 +144,7 @@ public class GenericMessageEndpointFactory extends AbstractMessageEndpointFactor
 	 * Internal exception thrown when a ResourceExeption has been encountered
 	 * during the endpoint invocation.
 	 * <p>Will only be used if the ResourceAdapter does not invoke the
-	 * endpoint's <code>beforeDelivery</code> and <code>afterDelivery</code>
+	 * endpoint's {@code beforeDelivery} and {@code afterDelivery}
 	 * directly, leavng it up to the concrete endpoint to apply those -
 	 * and to handle any ResourceExceptions thrown from them.
 	 */
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java b/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
index 82d6a23bb1..ac6ed06d32 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
@@ -28,7 +28,7 @@ import javax.resource.spi.work.WorkManager;
  * interface, used for bootstrapping a JCA ResourceAdapter in a local environment.
  *
  * <p>Delegates to the given WorkManager and XATerminator, if any. Creates simple
- * local instances of <code>java.util.Timer</code>.
+ * local instances of {@code java.util.Timer}.
  *
  * @author Juergen Hoeller
  * @since 2.0.3
@@ -45,7 +45,7 @@ public class SimpleBootstrapContext implements BootstrapContext {
 	/**
 	 * Create a new SimpleBootstrapContext for the given WorkManager,
 	 * with no XATerminator available.
-	 * @param workManager the JCA WorkManager to use (may be <code>null</code>)
+	 * @param workManager the JCA WorkManager to use (may be {@code null})
 	 */
 	public SimpleBootstrapContext(WorkManager workManager) {
 		this.workManager = workManager;
@@ -53,8 +53,8 @@ public class SimpleBootstrapContext implements BootstrapContext {
 
 	/**
 	 * Create a new SimpleBootstrapContext for the given WorkManager and XATerminator.
-	 * @param workManager the JCA WorkManager to use (may be <code>null</code>)
-	 * @param xaTerminator the JCA XATerminator to use (may be <code>null</code>)
+	 * @param workManager the JCA WorkManager to use (may be {@code null})
+	 * @param xaTerminator the JCA XATerminator to use (may be {@code null})
 	 */
 	public SimpleBootstrapContext(WorkManager workManager, XATerminator xaTerminator) {
 		this.workManager = workManager;
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java b/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
index ac03decd34..6f174ca717 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
@@ -56,7 +56,7 @@ import org.springframework.util.Assert;
  * This is for example appropriate on the Geronimo application server, where
  * WorkManager GBeans (e.g. Geronimo's default "DefaultWorkManager" GBean)
  * can be linked into the J2EE environment through "gbean-ref" entries
- * in the <code>geronimo-web.xml</code> deployment descriptor.
+ * in the {@code geronimo-web.xml} deployment descriptor.
  *
  * <p><b>On JBoss and GlassFish, obtaining the default JCA WorkManager
  * requires special lookup steps.</b> See the
@@ -131,8 +131,8 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 	/**
 	 * Set whether to let {@link #execute} block until the work
 	 * has been actually started.
-	 * <p>Uses the JCA <code>startWork</code> operation underneath,
-	 * instead of the default <code>scheduleWork</code>.
+	 * <p>Uses the JCA {@code startWork} operation underneath,
+	 * instead of the default {@code scheduleWork}.
 	 * @see javax.resource.spi.work.WorkManager#startWork
 	 * @see javax.resource.spi.work.WorkManager#scheduleWork
 	 */
@@ -143,8 +143,8 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 	/**
 	 * Set whether to let {@link #execute} block until the work
 	 * has been completed.
-	 * <p>Uses the JCA <code>doWork</code> operation underneath,
-	 * instead of the default <code>scheduleWork</code>.
+	 * <p>Uses the JCA {@code doWork} operation underneath,
+	 * instead of the default {@code scheduleWork}.
 	 * @see javax.resource.spi.work.WorkManager#doWork
 	 * @see javax.resource.spi.work.WorkManager#scheduleWork
 	 */
diff --git a/spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java
index 068a580bb2..406efe17ac 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java
@@ -54,7 +54,7 @@ public interface PlatformTransactionManager {
 	 * <p>An exception to the above rule is the read-only flag, which should be
 	 * ignored if no explicit read-only mode is supported. Essentially, the
 	 * read-only flag is just a hint for potential optimization.
-	 * @param definition TransactionDefinition instance (can be <code>null</code> for defaults),
+	 * @param definition TransactionDefinition instance (can be {@code null} for defaults),
 	 * describing propagation behavior, isolation level, timeout etc.
 	 * @return transaction status object representing the new or current transaction
 	 * @throws TransactionException in case of lookup, creation, or system errors
@@ -84,7 +84,7 @@ public interface PlatformTransactionManager {
 	 * database right before commit, with the resulting DataAccessException
 	 * causing the transaction to fail. The original exception will be
 	 * propagated to the caller of this commit method in such a case.
-	 * @param status object returned by the <code>getTransaction</code> method
+	 * @param status object returned by the {@code getTransaction} method
 	 * @throws UnexpectedRollbackException in case of an unexpected rollback
 	 * that the transaction coordinator initiated
 	 * @throws HeuristicCompletionException in case of a transaction failure
@@ -107,7 +107,7 @@ public interface PlatformTransactionManager {
 	 * The transaction will already have been completed and cleaned up when commit
 	 * returns, even in case of a commit exception. Consequently, a rollback call
 	 * after commit failure will lead to an IllegalTransactionStateException.
-	 * @param status object returned by the <code>getTransaction</code> method
+	 * @param status object returned by the {@code getTransaction} method
 	 * @throws TransactionSystemException in case of rollback or system errors
 	 * (typically caused by fundamental resource failures)
 	 * @throws IllegalTransactionStateException if the given transaction
diff --git a/spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java b/spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java
index f4f4f379e5..1d5a102d42 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java
@@ -38,8 +38,8 @@ public interface SavepointManager {
 
 	/**
 	 * Create a new savepoint. You can roll back to a specific savepoint
-	 * via <code>rollbackToSavepoint</code>, and explicitly release a
-	 * savepoint that you don't need anymore via <code>releaseSavepoint</code>.
+	 * via {@code rollbackToSavepoint}, and explicitly release a
+	 * savepoint that you don't need anymore via {@code releaseSavepoint}.
 	 * <p>Note that most transaction managers will automatically release
 	 * savepoints at transaction completion.
 	 * @return a savepoint object, to be passed into rollbackToSavepoint
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
index 5645c336a6..df7afdc1c8 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
@@ -33,7 +33,7 @@ import java.sql.Connection;
  * <p>The {@link #isReadOnly() read-only flag} applies to any transaction context,
  * whether backed by an actual resource transaction or operating non-transactionally
  * at the resource level. In the latter case, the flag will only apply to managed
- * resources within the application, such as a Hibernate <code>Session</code>.
+ * resources within the application, such as a Hibernate {@code Session}.
  *
  * @author Juergen Hoeller
  * @since 08.05.2003
@@ -55,15 +55,15 @@ public interface TransactionDefinition {
 	 * Support a current transaction; execute non-transactionally if none exists.
 	 * Analogous to the EJB transaction attribute of the same name.
 	 * <p><b>NOTE:</b> For transaction managers with transaction synchronization,
-	 * <code>PROPAGATION_SUPPORTS</code> is slightly different from no transaction
+	 * {@code PROPAGATION_SUPPORTS} is slightly different from no transaction
 	 * at all, as it defines a transaction scope that synchronization might apply to.
-	 * As a consequence, the same resources (a JDBC <code>Connection</code>, a
-	 * Hibernate <code>Session</code>, etc) will be shared for the entire specified
+	 * As a consequence, the same resources (a JDBC {@code Connection}, a
+	 * Hibernate {@code Session}, etc) will be shared for the entire specified
 	 * scope. Note that the exact behavior depends on the actual synchronization
 	 * configuration of the transaction manager!
-	 * <p>In general, use <code>PROPAGATION_SUPPORTS</code> with care! In particular, do
-	 * not rely on <code>PROPAGATION_REQUIRED</code> or <code>PROPAGATION_REQUIRES_NEW</code>
-	 * <i>within</i> a <code>PROPAGATION_SUPPORTS</code> scope (which may lead to
+	 * <p>In general, use {@code PROPAGATION_SUPPORTS} with care! In particular, do
+	 * not rely on {@code PROPAGATION_REQUIRED} or {@code PROPAGATION_REQUIRES_NEW}
+	 * <i>within</i> a {@code PROPAGATION_SUPPORTS} scope (which may lead to
 	 * synchronization conflicts at runtime). If such nesting is unavoidable, make sure
 	 * to configure your transaction manager appropriately (typically switching to
 	 * "synchronization on actual transaction").
@@ -75,7 +75,7 @@ public interface TransactionDefinition {
 	/**
 	 * Support a current transaction; throw an exception if no current transaction
 	 * exists. Analogous to the EJB transaction attribute of the same name.
-	 * <p>Note that transaction synchronization within a <code>PROPAGATION_MANDATORY</code>
+	 * <p>Note that transaction synchronization within a {@code PROPAGATION_MANDATORY}
 	 * scope will always be driven by the surrounding transaction.
 	 */
 	int PROPAGATION_MANDATORY = 2;
@@ -86,9 +86,9 @@ public interface TransactionDefinition {
 	 * <p><b>NOTE:</b> Actual transaction suspension will not work out-of-the-box
 	 * on all transaction managers. This in particular applies to
 	 * {@link org.springframework.transaction.jta.JtaTransactionManager},
-	 * which requires the <code>javax.transaction.TransactionManager</code>
+	 * which requires the {@code javax.transaction.TransactionManager}
 	 * to be made available it to it (which is server-specific in standard J2EE).
-	 * <p>A <code>PROPAGATION_REQUIRES_NEW</code> scope always defines its own
+	 * <p>A {@code PROPAGATION_REQUIRES_NEW} scope always defines its own
 	 * transaction synchronizations. Existing synchronizations will be suspended
 	 * and resumed appropriately.
 	 * @see org.springframework.transaction.jta.JtaTransactionManager#setTransactionManager
@@ -101,10 +101,10 @@ public interface TransactionDefinition {
 	 * <p><b>NOTE:</b> Actual transaction suspension will not work out-of-the-box
 	 * on all transaction managers. This in particular applies to
 	 * {@link org.springframework.transaction.jta.JtaTransactionManager},
-	 * which requires the <code>javax.transaction.TransactionManager</code>
+	 * which requires the {@code javax.transaction.TransactionManager}
 	 * to be made available it to it (which is server-specific in standard J2EE).
 	 * <p>Note that transaction synchronization is <i>not</i> available within a
-	 * <code>PROPAGATION_NOT_SUPPORTED</code> scope. Existing synchronizations
+	 * {@code PROPAGATION_NOT_SUPPORTED} scope. Existing synchronizations
 	 * will be suspended and resumed appropriately.
 	 * @see org.springframework.transaction.jta.JtaTransactionManager#setTransactionManager
 	 */
@@ -114,7 +114,7 @@ public interface TransactionDefinition {
 	 * Do not support a current transaction; throw an exception if a current transaction
 	 * exists. Analogous to the EJB transaction attribute of the same name.
 	 * <p>Note that transaction synchronization is <i>not</i> available within a
-	 * <code>PROPAGATION_NEVER</code> scope.
+	 * {@code PROPAGATION_NEVER} scope.
 	 */
 	int PROPAGATION_NEVER = 5;
 
@@ -175,8 +175,8 @@ public interface TransactionDefinition {
 	 * are prevented.
 	 * <p>This level includes the prohibitions in {@link #ISOLATION_REPEATABLE_READ}
 	 * and further prohibits the situation where one transaction reads all rows that
-	 * satisfy a <code>WHERE</code> condition, a second transaction inserts a row
-	 * that satisfies that <code>WHERE</code> condition, and the first transaction
+	 * satisfy a {@code WHERE} condition, a second transaction inserts a row
+	 * that satisfies that {@code WHERE} condition, and the first transaction
 	 * re-reads for the same condition, retrieving the additional "phantom" row
 	 * in the second read.
 	 * @see java.sql.Connection#TRANSACTION_SERIALIZABLE
@@ -193,7 +193,7 @@ public interface TransactionDefinition {
 
 	/**
 	 * Return the propagation behavior.
-	 * <p>Must return one of the <code>PROPAGATION_XXX</code> constants
+	 * <p>Must return one of the {@code PROPAGATION_XXX} constants
 	 * defined on {@link TransactionDefinition this interface}.
 	 * @return the propagation behavior
 	 * @see #PROPAGATION_REQUIRED
@@ -203,7 +203,7 @@ public interface TransactionDefinition {
 
 	/**
 	 * Return the isolation level.
-	 * <p>Must return one of the <code>ISOLATION_XXX</code> constants
+	 * <p>Must return one of the {@code ISOLATION_XXX} constants
 	 * defined on {@link TransactionDefinition this interface}.
 	 * <p>Only makes sense in combination with {@link #PROPAGATION_REQUIRED}
 	 * or {@link #PROPAGATION_REQUIRES_NEW}.
@@ -232,23 +232,23 @@ public interface TransactionDefinition {
 	 * operating non-transactionally at the resource level
 	 * ({@link #PROPAGATION_SUPPORTS}). In the latter case, the flag will
 	 * only apply to managed resources within the application, such as a
-	 * Hibernate <code>Session</code>.
-<<	 * <p>This just serves as a hint for the actual transaction subsystem;
+	 * Hibernate {@code Session}.
+	 <<	 * <p>This just serves as a hint for the actual transaction subsystem;
 	 * it will <i>not necessarily</i> cause failure of write access attempts.
 	 * A transaction manager which cannot interpret the read-only hint will
 	 * <i>not</i> throw an exception when asked for a read-only transaction.
-	 * @return <code>true</code> if the transaction is to be optimized as read-only
+	 * @return {@code true} if the transaction is to be optimized as read-only
 	 * @see org.springframework.transaction.support.TransactionSynchronization#beforeCommit(boolean)
 	 * @see org.springframework.transaction.support.TransactionSynchronizationManager#isCurrentTransactionReadOnly()
 	 */
 	boolean isReadOnly();
 
 	/**
-	 * Return the name of this transaction. Can be <code>null</code>.
+	 * Return the name of this transaction. Can be {@code null}.
 	 * <p>This will be used as the transaction name to be shown in a
 	 * transaction monitor, if applicable (for example, WebLogic's).
 	 * <p>In case of Spring's declarative transactions, the exposed name will be
-	 * the <code>fully-qualified class name + "." + method name</code> (by default).
+	 * the {@code fully-qualified class name + "." + method name} (by default).
 	 * @return the name of this transaction
 	 * @see org.springframework.transaction.interceptor.TransactionAspectSupport
 	 * @see org.springframework.transaction.support.TransactionSynchronizationManager#getCurrentTransactionName()
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 62b7780aba..63013c81aa 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java
@@ -66,7 +66,7 @@ public class TransactionSystemException extends TransactionException {
 	/**
 	 * Return the application exception that was thrown before this transaction exception,
 	 * if any.
-	 * @return the application exception, or <code>null</code> if none set
+	 * @return the application exception, or {@code null} if none set
 	 */
 	public final Throwable getApplicationException() {
 		return this.applicationException;
@@ -75,7 +75,7 @@ public class TransactionSystemException extends TransactionException {
 	/**
 	 * Return the exception that was the first to be thrown within the failed transaction:
 	 * i.e. the application exception, if any, or the TransactionSystemException's own cause.
-	 * @return the original exception, or <code>null</code> if there was none
+	 * @return the original exception, or {@code null} if there was none
 	 */
 	public Throwable getOriginalException() {
 		return (this.applicationException != null ? this.applicationException : getCause());
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
index 0a59904b55..d8dde88147 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
@@ -62,7 +62,7 @@ public class AnnotationTransactionAttributeSource extends AbstractFallbackTransa
 
 	/**
 	 * Create a default AnnotationTransactionAttributeSource, supporting
-	 * public methods that carry the <code>Transactional</code> annotation
+	 * public methods that carry the {@code Transactional} annotation
 	 * or the EJB3 {@link javax.ejb.TransactionAttribute} annotation.
 	 */
 	public AnnotationTransactionAttributeSource() {
@@ -71,10 +71,10 @@ public class AnnotationTransactionAttributeSource extends AbstractFallbackTransa
 
 	/**
 	 * Create a custom AnnotationTransactionAttributeSource, supporting
-	 * public methods that carry the <code>Transactional</code> annotation
+	 * public methods that carry the {@code Transactional} annotation
 	 * or the EJB3 {@link javax.ejb.TransactionAttribute} annotation.
 	 * @param publicMethodsOnly whether to support public methods that carry
-	 * the <code>Transactional</code> annotation only (typically for use
+	 * the {@code Transactional} annotation only (typically for use
 	 * with proxy-based AOP), or protected/private methods as well
 	 * (typically used with AspectJ class weaving)
 	 */
@@ -135,11 +135,11 @@ public class AnnotationTransactionAttributeSource extends AbstractFallbackTransa
 	 * <p>This implementation delegates to configured
 	 * {@link TransactionAnnotationParser TransactionAnnotationParsers}
 	 * for parsing known annotations into Spring's metadata attribute class.
-	 * Returns <code>null</code> if it's not transactional.
+	 * Returns {@code null} if it's not transactional.
 	 * <p>Can be overridden to support custom annotations that carry transaction metadata.
 	 * @param ae the annotated method or class
 	 * @return TransactionAttribute the configured transaction attribute,
-	 * or <code>null</code> if none was found
+	 * or {@code null} if none was found
 	 */
 	protected TransactionAttribute determineTransactionAttribute(AnnotatedElement ae) {
 		for (TransactionAnnotationParser annotationParser : this.annotationParsers) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java
index 597afcc58c..457eb87d47 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java
@@ -68,10 +68,10 @@ public enum Isolation {
 	/**
 	 * A constant indicating that dirty reads, non-repeatable reads and phantom
 	 * reads are prevented. This level includes the prohibitions in
-	 * <code>ISOLATION_REPEATABLE_READ</code> and further prohibits the situation
-	 * where one transaction reads all rows that satisfy a <code>WHERE</code>
+	 * {@code ISOLATION_REPEATABLE_READ} and further prohibits the situation
+	 * where one transaction reads all rows that satisfy a {@code WHERE}
 	 * condition, a second transaction inserts a row that satisfies that
-	 * <code>WHERE</code> condition, and the first transaction rereads for the
+	 * {@code WHERE} condition, and the first transaction rereads for the
 	 * same condition, retrieving the additional "phantom" row in the second read.
 	 * @see java.sql.Connection#TRANSACTION_SERIALIZABLE
 	 */
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
index 37e9e5c7ec..3a140590d5 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
@@ -60,7 +60,7 @@ public enum Propagation {
 	 * Analogous to EJB transaction attribute of the same name.
 	 * <p>Note: Actual transaction suspension will not work on out-of-the-box
 	 * on all transaction managers. This in particular applies to JtaTransactionManager,
-	 * which requires the <code>javax.transaction.TransactionManager</code> to be
+	 * which requires the {@code javax.transaction.TransactionManager} to be
 	 * made available it to it (which is server-specific in standard J2EE).
 	 * @see org.springframework.transaction.jta.JtaTransactionManager#setTransactionManager
 	 */
@@ -71,7 +71,7 @@ public enum Propagation {
 	 * Analogous to EJB transaction attribute of the same name.
 	 * <p>Note: Actual transaction suspension will not work on out-of-the-box
 	 * on all transaction managers. This in particular applies to JtaTransactionManager,
-	 * which requires the <code>javax.transaction.TransactionManager</code> to be
+	 * which requires the {@code javax.transaction.TransactionManager} to be
 	 * made available it to it (which is server-specific in standard J2EE).
 	 * @see org.springframework.transaction.jta.JtaTransactionManager#setTransactionManager
 	 */
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java
index c1517c4139..e6722d469c 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java
@@ -38,11 +38,11 @@ public interface TransactionAnnotationParser {
 	 * Parse the transaction attribute for the given method or class,
 	 * based on a known annotation type.
 	 * <p>This essentially parses a known transaction annotation into Spring's
-	 * metadata attribute class. Returns <code>null</code> if the method/class
+	 * metadata attribute class. Returns {@code null} if the method/class
 	 * is not transactional.
 	 * @param ae the annotated method or class
 	 * @return TransactionAttribute the configured transaction attribute,
-	 * or <code>null</code> if none was found
+	 * or {@code null} if none was found
 	 * @see AnnotationTransactionAttributeSource#determineTransactionAttribute
 	 */
 	TransactionAttribute parseTransactionAnnotation(AnnotatedElement ae);
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java
index c3fc85dcbc..312169b6fd 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java
@@ -85,8 +85,8 @@ public @interface Transactional {
 	int timeout() default TransactionDefinition.TIMEOUT_DEFAULT;
 
 	/**
-	 * <code>true</code> if the transaction is read-only.
-	 * Defaults to <code>false</code>.
+	 * {@code true} if the transaction is read-only.
+	 * Defaults to {@code false}.
 	 * <p>This just serves as a hint for the actual transaction subsystem;
 	 * it will <i>not necessarily</i> cause failure of write access attempts.
 	 * A transaction manager which cannot interpret the read-only hint will
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 8ba614d798..4c897e2fd6 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
@@ -39,7 +39,7 @@ import org.springframework.transaction.interceptor.TransactionInterceptor;
  * <p>By default, all proxies are created as JDK proxies. This may cause some
  * problems if you are injecting objects as concrete classes rather than
  * interfaces. To overcome this restriction you can set the
- * '<code>proxy-target-class</code>' attribute to '<code>true</code>', which
+ * '{@code proxy-target-class}' attribute to '{@code true}', which
  * will result in class-based proxies being created.
  *
  * @author Juergen Hoeller
diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java b/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java
index ac65789830..bf4647cb22 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java
@@ -21,7 +21,7 @@ import org.w3c.dom.Element;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * <code>NamespaceHandler</code> allowing for the configuration of
+ * {@code NamespaceHandler} allowing for the configuration of
  * declarative transaction management using either XML or using annotations.
  *
  * <p>This namespace handler is the central piece of functionality in the
@@ -29,8 +29,8 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  * to declaratively manage transactions.
  *
  * <p>One approach uses transaction semantics defined in XML using the
- * <code>&lt;tx:advice&gt;</code> elements, the other uses annotations
- * in combination with the <code>&lt;tx:annotation-driven&gt;</code> element.
+ * {@code &lt;tx:advice&gt;} elements, the other uses annotations
+ * in combination with the {@code &lt;tx:annotation-driven&gt;} element.
  * Both approached are detailed to great extent in the Spring reference manual.
  *
  * @author Rob Harrop
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 dd144cfcb2..a8762beeb5 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
@@ -75,9 +75,9 @@ public abstract class AbstractFallbackTransactionAttributeSource implements Tran
 	/**
 	 * Determine the transaction attribute for this method invocation.
 	 * <p>Defaults to the class's transaction attribute if no method attribute is found.
-	 * @param method the method for the current invocation (never <code>null</code>)
-	 * @param targetClass the target class for this invocation (may be <code>null</code>)
-	 * @return TransactionAttribute for this method, or <code>null</code> if the method
+	 * @param method the method for the current invocation (never {@code null})
+	 * @param targetClass the target class for this invocation (may be {@code null})
+	 * @return TransactionAttribute for this method, or {@code null} if the method
 	 * is not transactional
 	 */
 	public TransactionAttribute getTransactionAttribute(Method method, Class<?> targetClass) {
@@ -115,9 +115,9 @@ public abstract class AbstractFallbackTransactionAttributeSource implements Tran
 	 * Determine a cache key for the given method and target class.
 	 * <p>Must not produce same key for overloaded methods.
 	 * Must produce same key for different instances of the same method.
-	 * @param method the method (never <code>null</code>)
-	 * @param targetClass the target class (may be <code>null</code>)
-	 * @return the cache key (never <code>null</code>)
+	 * @param method the method (never {@code null})
+	 * @param targetClass the target class (may be {@code null})
+	 * @return the cache key (never {@code null})
 	 */
 	protected Object getCacheKey(Method method, Class<?> targetClass) {
 		return new DefaultCacheKey(method, targetClass);
@@ -172,7 +172,7 @@ public abstract class AbstractFallbackTransactionAttributeSource implements Tran
 	 * for the given method, if any.
 	 * @param method the method to retrieve the attribute for
 	 * @return all transaction attribute associated with this method
-	 * (or <code>null</code> if none)
+	 * (or {@code null} if none)
 	 */
 	protected abstract TransactionAttribute findTransactionAttribute(Method method);
 
@@ -181,14 +181,14 @@ public abstract class AbstractFallbackTransactionAttributeSource implements Tran
 	 * for the given class, if any.
 	 * @param clazz the class to retrieve the attribute for
 	 * @return all transaction attribute associated with this class
-	 * (or <code>null</code> if none)
+	 * (or {@code null} if none)
 	 */
 	protected abstract TransactionAttribute findTransactionAttribute(Class<?> clazz);
 
 
 	/**
 	 * Should only public methods be allowed to have transactional semantics?
-	 * <p>The default implementation returns <code>false</code>.
+	 * <p>The default implementation returns {@code false}.
 	 */
 	protected boolean allowPublicMethodsOnly() {
 		return false;
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 3bae2f663d..41edb94f57 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
@@ -97,7 +97,7 @@ public class DefaultTransactionAttribute extends DefaultTransactionDefinition im
 
 	/**
 	 * Return an identifying description for this transaction attribute.
-	 * <p>Available to subclasses, for inclusion in their <code>toString()</code> result.
+	 * <p>Available to subclasses, for inclusion in their {@code toString()} result.
 	 */
 	protected final StringBuilder getAttributeDescription() {
 		StringBuilder result = getDefinitionDescription();
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
index be037ba6f9..c6745d9d9b 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
@@ -69,7 +69,7 @@ public class MethodMapTransactionAttributeSource
 	 * Set a name/attribute map, consisting of "FQCN.method" method names
 	 * (e.g. "com.mycompany.mycode.MyClass.myMethod") and
 	 * {@link TransactionAttribute} instances (or Strings to be converted
-	 * to <code>TransactionAttribute</code> instances).
+	 * to {@code TransactionAttribute} instances).
 	 * <p>Intended for configuration via setter injection, typically within
 	 * a Spring bean factory. Relies on {@link #afterPropertiesSet()}
 	 * being called afterwards.
@@ -99,7 +99,7 @@ public class MethodMapTransactionAttributeSource
 
 	/**
 	 * Initialize the specified {@link #setMethodMap(java.util.Map) "methodMap"}, if any.
-	 * @param methodMap Map from method names to <code>TransactionAttribute</code> instances
+	 * @param methodMap Map from method names to {@code TransactionAttribute} instances
 	 * @see #setMethodMap
 	 */
 	protected void initMethodMap(Map<String, TransactionAttribute> methodMap) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
index 17dc29a531..92519c4de1 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
@@ -18,7 +18,7 @@ package org.springframework.transaction.interceptor;
 
 /**
  * Tag subclass of {@link RollbackRuleAttribute} that has the opposite behavior
- * to the <code>RollbackRuleAttribute</code> superclass.
+ * to the {@code RollbackRuleAttribute} superclass.
  *
  * @author Rod Johnson
  * @since 09.04.2003
@@ -26,9 +26,9 @@ package org.springframework.transaction.interceptor;
 public class NoRollbackRuleAttribute extends RollbackRuleAttribute {
 
 	/**
-	 * Create a new instance of the <code>NoRollbackRuleAttribute</code> class
+	 * Create a new instance of the {@code NoRollbackRuleAttribute} class
 	 * for the supplied {@link Throwable} class.
-	 * @param clazz the <code>Throwable</code> class
+	 * @param clazz the {@code Throwable} class
 	 * @see RollbackRuleAttribute#RollbackRuleAttribute(Class)
 	 */
 	public NoRollbackRuleAttribute(Class clazz) {
@@ -36,8 +36,8 @@ public class NoRollbackRuleAttribute extends RollbackRuleAttribute {
 	}
 
 	/**
-	 * Create a new instance of the <code>NoRollbackRuleAttribute</code> class
-	 * for the supplied <code>exceptionName</code>.
+	 * Create a new instance of the {@code NoRollbackRuleAttribute} class
+	 * for the supplied {@code exceptionName}.
 	 * @param exceptionName the exception name pattern
 	 * @see RollbackRuleAttribute#RollbackRuleAttribute(String)
 	 */
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 4c60fbf2f8..31920a2ca1 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
@@ -50,13 +50,13 @@ public class RollbackRuleAttribute implements Serializable{
 
 
 	/**
-	 * Create a new instance of the <code>RollbackRuleAttribute</code> class.
+	 * Create a new instance of the {@code RollbackRuleAttribute} class.
 	 * <p>This is the preferred way to construct a rollback rule that matches
 	 * the supplied {@link Exception} class (and subclasses).
 	 * @param clazz throwable class; must be {@link Throwable} or a subclass
-	 * of <code>Throwable</code>
-	 * @throws IllegalArgumentException if the supplied <code>clazz</code> is
-	 * not a <code>Throwable</code> type or is <code>null</code>
+	 * of {@code Throwable}
+	 * @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.");
@@ -68,11 +68,11 @@ public class RollbackRuleAttribute implements Serializable{
 	}
 
 	/**
-	 * Create a new instance of the <code>RollbackRuleAttribute</code> class
-	 * for the given <code>exceptionName</code>.
+	 * Create a new instance of the {@code RollbackRuleAttribute} class
+	 * for the given {@code exceptionName}.
 	 * <p>This can be a substring, with no wildcard support at present. A value
 	 * of "ServletException" would match
-	 * <code>javax.servlet.ServletException</code> and subclasses, for example.
+	 * {@code javax.servlet.ServletException} and subclasses, for example.
 	 * <p><b>NB:</b> Consider carefully how specific the pattern is, and
 	 * whether to include package information (which is not mandatory). For
 	 * example, "Exception" will match nearly anything, and will probably hide
@@ -83,7 +83,7 @@ public class RollbackRuleAttribute implements Serializable{
 	 * @param exceptionName the exception name pattern; can also be a fully
 	 * package-qualified class name
 	 * @throws IllegalArgumentException if the supplied
-	 * <code>exceptionName</code> is <code>null</code> or empty
+	 * {@code exceptionName} is {@code null} or empty
 	 */
 	public RollbackRuleAttribute(String exceptionName) {
 		Assert.hasText(exceptionName, "'exceptionName' cannot be null or empty.");
@@ -100,8 +100,8 @@ public class RollbackRuleAttribute implements Serializable{
 
 	/**
 	 * Return the depth of the superclass matching.
-	 * <p><code>0</code> means <code>ex</code> matches exactly. Returns
-	 * <code>-1</code> if there is no match. Otherwise, returns depth with the
+	 * <p>{@code 0} means {@code ex} matches exactly. Returns
+	 * {@code -1} if there is no match. Otherwise, returns depth with the
 	 * lowest depth winning.
 	 */
 	public int getDepth(Throwable ex) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
index d1f7b1665e..8740233271 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
@@ -97,8 +97,8 @@ public class RuleBasedTransactionAttribute extends DefaultTransactionAttribute i
 
 
 	/**
-	 * Set the list of <code>RollbackRuleAttribute</code> objects
-	 * (and/or <code>NoRollbackRuleAttribute</code> objects) to apply.
+	 * Set the list of {@code RollbackRuleAttribute} objects
+	 * (and/or {@code NoRollbackRuleAttribute} objects) to apply.
 	 * @see RollbackRuleAttribute
 	 * @see NoRollbackRuleAttribute
 	 */
@@ -107,8 +107,8 @@ public class RuleBasedTransactionAttribute extends DefaultTransactionAttribute i
 	}
 
 	/**
-	 * Return the list of <code>RollbackRuleAttribute</code> objects
-	 * (never <code>null</code>).
+	 * Return the list of {@code RollbackRuleAttribute} objects
+	 * (never {@code null}).
 	 */
 	public List<RollbackRuleAttribute> getRollbackRules() {
 		if (this.rollbackRules == null) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
index 995c4bcbd5..b9ca3c7c99 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
@@ -44,16 +44,16 @@ import org.springframework.util.StringUtils;
  *
  * <p>Subclasses are responsible for calling methods in this class in the correct order.
  *
- * <p>If no transaction name has been specified in the <code>TransactionAttribute</code>,
- * the exposed name will be the <code>fully-qualified class name + "." + method name</code>
+ * <p>If no transaction name has been specified in the {@code TransactionAttribute},
+ * the exposed name will be the {@code fully-qualified class name + "." + method name}
  * (by default).
  *
- * <p>Uses the <b>Strategy</b> design pattern. A <code>PlatformTransactionManager</code>
+ * <p>Uses the <b>Strategy</b> design pattern. A {@code PlatformTransactionManager}
  * implementation will perform the actual transaction management, and a
- * <code>TransactionAttributeSource</code> is used for determining transaction definitions.
+ * {@code TransactionAttributeSource} is used for determining transaction definitions.
  *
- * <p>A transaction aspect is serializable if its <code>PlatformTransactionManager</code>
- * and <code>TransactionAttributeSource</code> are serializable.
+ * <p>A transaction aspect is serializable if its {@code PlatformTransactionManager}
+ * and {@code TransactionAttributeSource} are serializable.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -68,7 +68,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init
 	// class for AspectJ aspects (which are not allowed to implement Serializable)!
 
 	/**
-	 * Holder to support the <code>currentTransactionStatus()</code> method,
+	 * Holder to support the {@code currentTransactionStatus()} method,
 	 * and to support communication between different cooperating advices
 	 * (e.g. before and after advice) if the aspect involves more than a
 	 * single method (as will be the case for around advice).
@@ -85,11 +85,11 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init
 	 * An around advice such as an AOP Alliance MethodInterceptor can hold a
 	 * reference to the TransactionInfo throughout the aspect method.
 	 * <p>A TransactionInfo will be returned even if no transaction was created.
-	 * The <code>TransactionInfo.hasTransaction()</code> method can be used to query this.
+	 * The {@code TransactionInfo.hasTransaction()} method can be used to query this.
 	 * <p>To find out about specific transaction characteristics, consider using
-	 * TransactionSynchronizationManager's <code>isSynchronizationActive()</code>
-	 * and/or <code>isActualTransactionActive()</code> methods.
-	 * @return TransactionInfo bound to this thread, or <code>null</code> if none
+	 * TransactionSynchronizationManager's {@code isSynchronizationActive()}
+	 * and/or {@code isActualTransactionActive()} methods.
+	 * @return TransactionInfo bound to this thread, or {@code null} if none
 	 * @see TransactionInfo#hasTransaction()
 	 * @see org.springframework.transaction.support.TransactionSynchronizationManager#isSynchronizationActive()
 	 * @see org.springframework.transaction.support.TransactionSynchronizationManager#isActualTransactionActive()
@@ -262,7 +262,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init
 	 * @param method the method about to execute
 	 * @param targetClass the class that the method is being invoked on
 	 * @return a TransactionInfo object, whether or not a transaction was created.
-	 * The <code>hasTransaction()</code> method on TransactionInfo can be used to
+	 * The {@code hasTransaction()} method on TransactionInfo can be used to
 	 * tell if there was a transaction created.
 	 * @see #getTransactionAttributeSource()
 	 */
@@ -307,11 +307,11 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init
 	 * Create a transaction if necessary based on the given TransactionAttribute.
 	 * <p>Allows callers to perform custom TransactionAttribute lookups through
 	 * the TransactionAttributeSource.
-	 * @param txAttr the TransactionAttribute (may be <code>null</code>)
+	 * @param txAttr the TransactionAttribute (may be {@code null})
 	 * @param joinpointIdentification the fully qualified method name
 	 * (used for monitoring and logging purposes)
 	 * @return a TransactionInfo object, whether or not a transaction was created.
-	 * The <code>hasTransaction()</code> method on TransactionInfo can be used to
+	 * The {@code hasTransaction()} method on TransactionInfo can be used to
 	 * tell if there was a transaction created.
 	 * @see #getTransactionAttributeSource()
 	 */
@@ -345,7 +345,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init
 
 	/**
 	 * Prepare a TransactionInfo for the given attribute and status object.
-	 * @param txAttr the TransactionAttribute (may be <code>null</code>)
+	 * @param txAttr the TransactionAttribute (may be {@code null})
 	 * @param joinpointIdentification the fully qualified method name
 	 * (used for monitoring and logging purposes)
 	 * @param status the TransactionStatus for the current transaction
@@ -449,7 +449,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init
 	/**
 	 * Reset the TransactionInfo ThreadLocal.
 	 * <p>Call this in all cases: exception or normal return!
-	 * @param txInfo information about the current transaction (may be <code>null</code>)
+	 * @param txInfo information about the current transaction (may be {@code null})
 	 */
 	protected void cleanupTransactionInfo(TransactionInfo txInfo) {
 		if (txInfo != null) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java
index 3e02fef6d5..9f6a0bddfd 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java
@@ -19,8 +19,8 @@ package org.springframework.transaction.interceptor;
 import org.springframework.transaction.TransactionDefinition;
 
 /**
- * This interface adds a <code>rollbackOn</code> specification to {@link TransactionDefinition}.
- * As custom <code>rollbackOn</code> is only possible with AOP, this class resides
+ * This interface adds a {@code rollbackOn} specification to {@link TransactionDefinition}.
+ * As custom {@code rollbackOn} is only possible with AOP, this class resides
  * in the AOP transaction package.
  *
  * @author Rod Johnson
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java
index c76be42f36..055d42c797 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java
@@ -22,9 +22,9 @@ import org.springframework.util.StringUtils;
 
 /**
  * PropertyEditor for {@link TransactionAttribute} objects. Accepts a String of form
- * <p><code>PROPAGATION_NAME,ISOLATION_NAME,readOnly,timeout_NNNN,+Exception1,-Exception2</code>
+ * <p>{@code PROPAGATION_NAME, ISOLATION_NAME, readOnly, timeout_NNNN,+Exception1,-Exception2}
  * <p>where only propagation code is required. For example:
- * <p><code>PROPAGATION_MANDATORY,ISOLATION_DEFAULT</code>
+ * <p>{@code PROPAGATION_MANDATORY, ISOLATION_DEFAULT}
  *
  * <p>The tokens can be in <strong>any</strong> order. Propagation and isolation codes
  * must use the names of the constants in the TransactionDefinition class. Timeout values
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSource.java
index 2073b47d6a..a6a9250fce 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSource.java
@@ -34,12 +34,12 @@ public interface TransactionAttributeSource {
 
 	/**
 	 * Return the transaction attribute for the given method,
-	 * or <code>null</code> if the method is non-transactional.
+	 * or {@code null} if the method is non-transactional.
 	 * @param method the method to introspect
-	 * @param targetClass the target class. May be <code>null</code>,
+	 * @param targetClass the target class. May be {@code null},
 	 * in which case the declaring class of the method must be used.
 	 * @return TransactionAttribute the matching transaction attribute,
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 */
 	TransactionAttribute getTransactionAttribute(Method method, Class<?> targetClass);
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java
index 5d6870718c..31c739cbd7 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java
@@ -29,10 +29,10 @@ import org.springframework.util.StringUtils;
  * {@link TransactionAttributeEditor} in this package.
  *
  * <p>Strings are in property syntax, with the form:<br>
- * <code>FQCN.methodName=&lt;transaction attribute string&gt;</code>
+ * {@code FQCN.methodName=&lt;transaction attribute string&gt;}
  *
  * <p>For example:<br>
- * <code>com.mycompany.mycode.MyClass.myMethod=PROPAGATION_MANDATORY,ISOLATION_DEFAULT</code>
+ * {@code com.mycompany.mycode.MyClass.myMethod=PROPAGATION_MANDATORY,ISOLATION_DEFAULT}
  *
  * <p><b>NOTE:</b> The specified class must be the one where the methods are
  * defined; in case of implementing an interface, the interface class name.
@@ -44,7 +44,7 @@ import org.springframework.util.StringUtils;
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @since 26.04.2003
- * @see org.springframework.transaction.interceptor.TransactionAttributeEditor
+ * @see TransactionAttributeEditor
  */
 public class TransactionAttributeSourceEditor extends PropertyEditorSupport {
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
index 6d4c3ff11a..64dea121a9 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
@@ -60,7 +60,7 @@ abstract class TransactionAttributeSourcePointcut extends StaticMethodMatcherPoi
 
 
 	/**
-	 * Obtain the underlying TransactionAttributeSource (may be <code>null</code>).
+	 * Obtain the underlying TransactionAttributeSource (may be {@code null}).
 	 * To be implemented by subclasses.
 	 */
 	protected abstract TransactionAttributeSource getTransactionAttributeSource();
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
index 6db3ef8169..75133366d9 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
@@ -89,7 +89,7 @@ public class TransactionInterceptor extends TransactionAspectSupport implements
 
 
 	public Object invoke(final MethodInvocation invocation) throws Throwable {
-		// Work out the target class: may be <code>null</code>.
+		// Work out the target class: may be {@code null}.
 		// The TransactionAttributeSource should be passed the target class
 		// as well as the method, which may be from an interface.
 		Class<?> targetClass = (invocation.getThis() != null ? AopUtils.getTargetClass(invocation.getThis()) : null);
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
index f2801c2b9c..d60cf2f8af 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
@@ -24,8 +24,8 @@ import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationUtils;
 
 /**
- * Adapter for a JTA Synchronization, invoking the <code>afterCommit</code> /
- * <code>afterCompletion</code> callbacks of Spring {@link TransactionSynchronization}
+ * Adapter for a JTA Synchronization, invoking the {@code afterCommit} /
+ * {@code afterCompletion} callbacks of Spring {@link TransactionSynchronization}
  * objects callbacks after the outer JTA transaction has completed.
  * Applied when participating in an existing (non-Spring) JTA 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 a771826932..9cb77789cd 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
@@ -92,7 +92,7 @@ import org.springframework.util.StringUtils;
  * 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</code> configuration
+ * <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>
  *
@@ -190,7 +190,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 
 	/**
 	 * Create a new JtaTransactionManager instance, to be configured as bean.
-	 * Invoke <code>afterPropertiesSet</code> to activate the configuration.
+	 * Invoke {@code afterPropertiesSet} to activate the configuration.
 	 * @see #setUserTransactionName
 	 * @see #setUserTransaction
 	 * @see #setTransactionManagerName
@@ -529,7 +529,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 
 	/**
 	 * Look up the JTA UserTransaction in JNDI via the configured name.
-	 * <p>Called by <code>afterPropertiesSet</code> if no direct UserTransaction reference was set.
+	 * <p>Called by {@code afterPropertiesSet} if no direct UserTransaction reference was set.
 	 * Can be overridden in subclasses to provide a different UserTransaction object.
 	 * @param userTransactionName the JNDI name of the UserTransaction
 	 * @return the UserTransaction object
@@ -553,7 +553,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 
 	/**
 	 * Look up the JTA TransactionManager in JNDI via the configured name.
-	 * <p>Called by <code>afterPropertiesSet</code> if no direct TransactionManager reference was set.
+	 * <p>Called by {@code afterPropertiesSet} if no direct TransactionManager reference was set.
 	 * Can be overridden in subclasses to provide a different TransactionManager object.
 	 * @param transactionManagerName the JNDI name of the TransactionManager
 	 * @return the UserTransaction object
@@ -605,8 +605,8 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 	/**
 	 * Allows subclasses to retrieve the JTA UserTransaction in a vendor-specific manner.
 	 * Only called if no "userTransaction" or "userTransactionName" specified.
-	 * <p>The default implementation simply returns <code>null</code>.
-	 * @return the JTA UserTransaction handle to use, or <code>null</code> if none found
+	 * <p>The default implementation simply returns {@code null}.
+	 * @return the JTA UserTransaction handle to use, or {@code null} if none found
 	 * @throws TransactionSystemException in case of errors
 	 * @see #setUserTransaction
 	 * @see #setUserTransactionName
@@ -618,8 +618,8 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 	/**
 	 * Allows subclasses to retrieve the JTA TransactionManager in a vendor-specific manner.
 	 * Only called if no "transactionManager" or "transactionManagerName" specified.
-	 * <p>The default implementation simply returns <code>null</code>.
-	 * @return the JTA TransactionManager handle to use, or <code>null</code> if none found
+	 * <p>The default implementation simply returns {@code null}.
+	 * @return the JTA TransactionManager handle to use, or {@code null} if none found
 	 * @throws TransactionSystemException in case of errors
 	 * @see #setTransactionManager
 	 * @see #setTransactionManagerName
@@ -631,9 +631,9 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 	/**
 	 * Allows subclasses to retrieve the JTA 1.1 TransactionSynchronizationRegistry
 	 * in a vendor-specific manner.
-	 * <p>The default implementation simply returns <code>null</code>.
+	 * <p>The default implementation simply returns {@code null}.
 	 * @return the JTA TransactionSynchronizationRegistry handle to use,
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 * @throws TransactionSystemException in case of errors
 	 */
 	protected Object retrieveTransactionSynchronizationRegistry() throws TransactionSystemException {
@@ -643,7 +643,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 	/**
 	 * Find the JTA UserTransaction through a default JNDI lookup:
 	 * "java:comp/UserTransaction".
-	 * @return the JTA UserTransaction reference, or <code>null</code> if not found
+	 * @return the JTA UserTransaction reference, or {@code null} if not found
 	 * @see #DEFAULT_USER_TRANSACTION_NAME
 	 */
 	protected UserTransaction findUserTransaction() {
@@ -669,7 +669,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 	 * UserTransaction object implements the TransactionManager, and checking the
 	 * fallback JNDI locations.
 	 * @param ut the JTA UserTransaction object
-	 * @return the JTA TransactionManager reference, or <code>null</code> if not found
+	 * @return the JTA TransactionManager reference, or {@code null} if not found
 	 * @see #FALLBACK_TRANSACTION_MANAGER_NAMES
 	 */
 	protected TransactionManager findTransactionManager(UserTransaction ut) {
@@ -704,11 +704,11 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 	 * Find the JTA 1.1 TransactionSynchronizationRegistry through autodetection:
 	 * checking whether the UserTransaction object or TransactionManager object
 	 * implements it, and checking Java EE 5's standard JNDI location.
-	 * <p>The default implementation simply returns <code>null</code>.
+	 * <p>The default implementation simply returns {@code null}.
 	 * @param ut the JTA UserTransaction object
 	 * @param tm the JTA TransactionManager object
 	 * @return the JTA TransactionSynchronizationRegistry handle to use,
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 * @throws TransactionSystemException in case of errors
 	 */
 	protected Object findTransactionSynchronizationRegistry(UserTransaction ut, TransactionManager tm)
@@ -804,7 +804,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 	 * This implementation returns false to cause a further invocation
 	 * of doBegin despite an already existing transaction.
 	 * <p>JTA implementations might support nested transactions via further
-	 * <code>UserTransaction.begin()</code> invocations, but never support savepoints.
+	 * {@code UserTransaction.begin()} invocations, but never support savepoints.
 	 * @see #doBegin
 	 * @see javax.transaction.UserTransaction#begin()
 	 */
@@ -840,8 +840,8 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 	 * <p>This implementation only supports standard JTA functionality:
 	 * that is, no per-transaction isolation levels and no transaction names.
 	 * Can be overridden in subclasses, for specific JTA implementations.
-	 * <p>Calls <code>applyIsolationLevel</code> and <code>applyTimeout</code>
-	 * before invoking the UserTransaction's <code>begin</code> method.
+	 * <p>Calls {@code applyIsolationLevel} and {@code applyTimeout}
+	 * before invoking the UserTransaction's {@code begin} method.
 	 * @param txObject the JtaTransactionObject containing the UserTransaction
 	 * @param definition TransactionDefinition instance, describing propagation
 	 * behavior, isolation level, read-only flag, timeout, and transaction name
@@ -890,7 +890,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 
 	/**
 	 * Apply the given transaction timeout. The default implementation will call
-	 * <code>UserTransaction.setTransactionTimeout</code> for a non-default timeout value.
+	 * {@code UserTransaction.setTransactionTimeout} for a non-default timeout value.
 	 * @param txObject the JtaTransactionObject containing the UserTransaction
 	 * @param timeout timeout value taken from transaction definition
 	 * @throws SystemException if thrown by the JTA implementation
@@ -1108,7 +1108,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 
 	/**
 	 * Register a JTA synchronization on the JTA TransactionManager, for calling
-	 * <code>afterCompletion</code> on the given Spring TransactionSynchronizations.
+	 * {@code afterCompletion} on the given Spring TransactionSynchronizations.
 	 * <p>The default implementation registers the synchronizations on the
 	 * JTA 1.1 TransactionSynchronizationRegistry, if available, or on the
 	 * JTA TransactionManager's current Transaction - again, if available.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java
index 64bffd7801..2c1ef8a0f8 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java
@@ -33,13 +33,13 @@ import org.springframework.util.ClassUtils;
  * transaction coordinator, <i>beyond standard JTA</i>: transaction names
  * and per-transaction isolation levels.
  *
- * <p>Uses OC4J's special <code>begin(name)</code> method to start a JTA transaction,
+ * <p>Uses OC4J's special {@code begin(name)} method to start a JTA transaction,
  * in orderto make <b>Spring-driven transactions visible in OC4J's transaction
  * monitor</b>. In case of Spring's declarative transactions, the exposed name will
  * (by default) be the fully-qualified class name + "." + method name.
  *
  * <p>Supports a <b>per-transaction isolation level</b> through OC4J's corresponding
- * <code>OC4JTransaction.setTransactionIsolation(int)</code> method. This will
+ * {@code OC4JTransaction.setTransactionIsolation(int)} method. This will
  * apply the specified isolation level (e.g. ISOLATION_SERIALIZABLE) to all
  * JDBC Connections that participate in the given transaction.
  *
@@ -48,7 +48,7 @@ import org.springframework.util.ClassUtils;
  * "oracle.j2ee.transaction" package in later OC4J versions.
  *
  * <p>By default, the JTA UserTransaction and TransactionManager handles are
- * fetched directly from OC4J's <code>TransactionUtility</code> in 10.1.3.2+.
+ * fetched directly from OC4J's {@code TransactionUtility} in 10.1.3.2+.
  * This can be overridden by specifying "userTransaction"/"userTransactionName"
  * and "transactionManager"/"transactionManagerName", passing in existing handles
  * or specifying corresponding JNDI locations to look up.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
index 44e1d5ad41..2026ada3ba 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
@@ -68,11 +68,11 @@ public class SpringJtaSynchronizationAdapter implements Synchronization {
 	 * TransactionSynchronization and JTA TransactionManager.
 	 * <p>Note that this adapter will never perform a rollback-only call on WebLogic,
 	 * since WebLogic Server is known to automatically mark the transaction as
-	 * rollback-only in case of a <code>beforeCompletion</code> exception. Hence,
+	 * rollback-only in case of a {@code beforeCompletion} exception. Hence,
 	 * on WLS, this constructor is equivalent to the single-arg constructor.
 	 * @param springSynchronization the Spring TransactionSynchronization to delegate to
 	 * @param jtaUserTransaction the JTA UserTransaction to use for rollback-only
-	 * setting in case of an exception thrown in <code>beforeCompletion</code>
+	 * setting in case of an exception thrown in {@code beforeCompletion}
 	 * (can be omitted if the JTA provider itself marks the transaction rollback-only
 	 * in such a scenario, which is required by the JTA specification as of JTA 1.1).
 	 */
@@ -90,11 +90,11 @@ public class SpringJtaSynchronizationAdapter implements Synchronization {
 	 * TransactionSynchronization and JTA TransactionManager.
 	 * <p>Note that this adapter will never perform a rollback-only call on WebLogic,
 	 * since WebLogic Server is known to automatically mark the transaction as
-	 * rollback-only in case of a <code>beforeCompletion</code> exception. Hence,
+	 * rollback-only in case of a {@code beforeCompletion} exception. Hence,
 	 * on WLS, this constructor is equivalent to the single-arg constructor.
 	 * @param springSynchronization the Spring TransactionSynchronization to delegate to
 	 * @param jtaTransactionManager the JTA TransactionManager to use for rollback-only
-	 * setting in case of an exception thrown in <code>beforeCompletion</code>
+	 * setting in case of an exception thrown in {@code beforeCompletion}
 	 * (can be omitted if the JTA provider itself marks the transaction rollback-only
 	 * in such a scenario, which is required by the JTA specification as of JTA 1.1)
 	 */
@@ -109,7 +109,7 @@ public class SpringJtaSynchronizationAdapter implements Synchronization {
 
 
 	/**
-	 * JTA <code>beforeCompletion</code> callback: just invoked before commit.
+	 * JTA {@code beforeCompletion} callback: just invoked before commit.
 	 * <p>In case of an exception, the JTA transaction will be marked as rollback-only.
 	 * @see org.springframework.transaction.support.TransactionSynchronization#beforeCommit
 	 */
@@ -161,8 +161,8 @@ public class SpringJtaSynchronizationAdapter implements Synchronization {
 	}
 
 	/**
-	 * JTA <code>afterCompletion</code> callback: invoked after commit/rollback.
-	 * <p>Needs to invoke the Spring synchronization's <code>beforeCompletion</code>
+	 * JTA {@code afterCompletion} callback: invoked after commit/rollback.
+	 * <p>Needs to invoke the Spring synchronization's {@code beforeCompletion}
 	 * at this late stage in case of a rollback, since there is no corresponding
 	 * callback with JTA.
 	 * @see org.springframework.transaction.support.TransactionSynchronization#beforeCompletion
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java b/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java
index 40c8ee4845..50d4cf7c38 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java
@@ -39,9 +39,9 @@ public interface TransactionFactory {
 
 	/**
 	 * Create an active Transaction object based on the given name and timeout.
-	 * @param name the transaction name (may be <code>null</code>)
+	 * @param name the transaction name (may be {@code null})
 	 * @param timeout the transaction timeout (may be -1 for the default timeout)
-	 * @return the active Transaction object (never <code>null</code>)
+	 * @return the active Transaction object (never {@code null})
 	 * @throws NotSupportedException if the transaction manager does not support
 	 * a transaction of the specified type
 	 * @throws SystemException if the transaction manager failed to create the
@@ -52,7 +52,7 @@ public interface TransactionFactory {
 	/**
 	 * Determine whether the underlying transaction manager supports XA transactions
 	 * managed by a resource adapter (i.e. without explicit XA resource enlistment).
-	 * <p>Typically <code>false</code>. Checked by
+	 * <p>Typically {@code false}. Checked by
 	 * {@link org.springframework.jca.endpoint.AbstractMessageEndpointFactory}
 	 * in order to differentiate between invalid configuration and valid
 	 * ResourceAdapter-managed transactions.
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 731978b693..0e0e67bd00 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
@@ -35,7 +35,7 @@ import org.springframework.transaction.TransactionSystemException;
  * transaction coordinator, <i>beyond standard JTA</i>: transaction names,
  * per-transaction isolation levels, and proper resuming of transactions in all cases.
  *
- * <p>Uses WebLogic's special <code>begin(name)</code> method to start a JTA transaction,
+ * <p>Uses WebLogic's special {@code begin(name)} method to start a JTA transaction,
  * in order to make <b>Spring-driven transactions visible in WebLogic's transaction
  * monitor</b>. In case of Spring's declarative transactions, the exposed name will
  * (by default) be the fully-qualified class name + "." + method name.
@@ -45,13 +45,13 @@ import org.springframework.transaction.TransactionSystemException;
  * level (e.g. ISOLATION_SERIALIZABLE) to all JDBC Connections that participate in the
  * given transaction.
  *
- * <p>Invokes WebLogic's special <code>forceResume</code> method if standard JTA resume
+ * <p>Invokes WebLogic's special {@code forceResume} method if standard JTA resume
  * failed, to <b>also resume if the target transaction was marked rollback-only</b>.
  * If you're not relying on this feature of transaction suspension in the first
  * place, Spring's standard JtaTransactionManager will behave properly too.
  *
  * <p>By default, the JTA UserTransaction and TransactionManager handles are
- * fetched directly from WebLogic's <code>TransactionHelper</code>. This can be
+ * fetched directly from WebLogic's {@code TransactionHelper}. This can be
  * overridden by specifying "userTransaction"/"userTransactionName" and
  * "transactionManager"/"transactionManagerName", passing in existing handles
  * or specifying corresponding JNDI locations to look up.
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 e2349a4f56..fbb4e6c15b 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
@@ -52,15 +52,15 @@ import org.springframework.util.ReflectionUtils;
  * a {@link TransactionCallback} through the {@link #execute} method, which
  * will be handled through the callback-based WebSphere UOWManager API instead
  * of through standard JTA API (UserTransaction / TransactionManager). This avoids
- * the use of the non-public <code>javax.transaction.TransactionManager</code>
+ * the use of the non-public {@code javax.transaction.TransactionManager}
  * API on WebSphere, staying within supported WebSphere API boundaries.
  *
  * <p>This transaction manager implementation derives from Spring's standard
  * {@link JtaTransactionManager}, inheriting the capability to support programmatic
- * transaction demarcation via <code>getTransaction</code> / <code>commit</code> /
- * <code>rollback</code> calls through a JTA UserTransaction handle, for callers
+ * transaction demarcation via {@code getTransaction} / {@code commit} /
+ * {@code rollback} calls through a JTA UserTransaction handle, for callers
  * that do not use the TransactionCallback-based {@link #execute} method. However,
- * transaction suspension is <i>not</i> supported in this <code>getTransaction</code>
+ * transaction suspension is <i>not</i> supported in this {@code getTransaction}
  * style (unless you explicitly specify a {@link #setTransactionManager} reference,
  * despite the official WebSphere recommendations). Use the {@link #execute} style
  * for any code that might require transaction suspension.
@@ -196,9 +196,9 @@ public class WebSphereUowTransactionManager extends JtaTransactionManager
 	}
 
 	/**
-	 * Returns <code>true</code> since WebSphere ResourceAdapters (as exposed in JNDI)
+	 * Returns {@code true} since WebSphere ResourceAdapters (as exposed in JNDI)
 	 * implicitly perform transaction enlistment if the MessageEndpointFactory's
-	 * <code>isDeliveryTransacted</code> method returns <code>true</code>.
+	 * {@code isDeliveryTransacted} method returns {@code true}.
 	 * In that case we'll simply skip the {@link #createTransaction} call.
 	 * @see javax.resource.spi.endpoint.MessageEndpointFactory#isDeliveryTransacted
 	 * @see org.springframework.jca.endpoint.AbstractMessageEndpointFactory
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 e79760ad39..33d1969d3c 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
@@ -68,8 +68,8 @@ import org.springframework.transaction.UnexpectedRollbackException;
  * <p>The state of this class is serializable, to allow for serializing the
  * transaction strategy along with proxies that carry a transaction interceptor.
  * It is up to subclasses if they wish to make their state to be serializable too.
- * They should implement the <code>java.io.Serializable</code> marker interface in
- * that case, and potentially a private <code>readObject()</code> method (according
+ * They should implement the {@code java.io.Serializable} marker interface in
+ * that case, and potentially a private {@code readObject()} method (according
  * to Java serialization rules) if they need to restore any transient state.
  *
  * @author Juergen Hoeller
@@ -165,7 +165,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	 * if there is no timeout specified at the transaction level, in seconds.
 	 * <p>Default is the underlying transaction infrastructure's default timeout,
 	 * e.g. typically 30 seconds in case of a JTA provider, indicated by the
-	 * <code>TransactionDefinition.TIMEOUT_DEFAULT</code> value.
+	 * {@code TransactionDefinition.TIMEOUT_DEFAULT} value.
 	 * @see org.springframework.transaction.TransactionDefinition#TIMEOUT_DEFAULT
 	 */
 	public final void setDefaultTimeout(int defaultTimeout) {
@@ -178,7 +178,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	/**
 	 * Return the default timeout that this transaction manager should apply
 	 * if there is no timeout specified at the transaction level, in seconds.
-	 * <p>Returns <code>TransactionDefinition.TIMEOUT_DEFAULT</code> to indicate
+	 * <p>Returns {@code TransactionDefinition.TIMEOUT_DEFAULT} to indicate
 	 * the underlying transaction infrastructure's default timeout.
 	 */
 	public final int getDefaultTimeout() {
@@ -243,11 +243,11 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	 * neither is it for a sequence of JDBC insert/update/delete operations.
 	 * <p><b>Note:</b>This flag only applies to an explicit rollback attempt for a
 	 * subtransaction, typically caused by an exception thrown by a data access operation
-	 * (where TransactionInterceptor will trigger a <code>PlatformTransactionManager.rollback()</code>
+	 * (where TransactionInterceptor will trigger a {@code PlatformTransactionManager.rollback()}
 	 * call according to a rollback rule). If the flag is off, the caller can handle the exception
 	 * and decide on a rollback, independent of the rollback rules of the subtransaction.
-	 * This flag does, however, <i>not</i> apply to explicit <code>setRollbackOnly</code>
-	 * calls on a <code>TransactionStatus</code>, which will always cause an eventual
+	 * This flag does, however, <i>not</i> apply to explicit {@code setRollbackOnly}
+	 * calls on a {@code TransactionStatus}, which will always cause an eventual
 	 * global rollback (as it might not throw an exception after the rollback-only call).
 	 * <p>The recommended solution for handling failure of a subtransaction
 	 * is a "nested transaction", where the global transaction can be rolled
@@ -298,8 +298,8 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	}
 
 	/**
-	 * Set whether <code>doRollback</code> should be performed on failure of the
-	 * <code>doCommit</code> call. Typically not necessary and thus to be avoided,
+	 * Set whether {@code doRollback} should be performed on failure of the
+	 * {@code doCommit} call. Typically not necessary and thus to be avoided,
 	 * as it can potentially override the commit exception with a subsequent
 	 * rollback exception.
 	 * <p>Default is "false".
@@ -311,8 +311,8 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	}
 
 	/**
-	 * Return whether <code>doRollback</code> should be performed on failure of the
-	 * <code>doCommit</code> call.
+	 * Return whether {@code doRollback} should be performed on failure of the
+	 * {@code doCommit} call.
 	 */
 	public final boolean isRollbackOnCommitFailure() {
 		return this.rollbackOnCommitFailure;
@@ -325,8 +325,8 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 
 	/**
 	 * This implementation handles propagation behavior. Delegates to
-	 * <code>doGetTransaction</code>, <code>isExistingTransaction</code>
-	 * and <code>doBegin</code>.
+	 * {@code doGetTransaction}, {@code isExistingTransaction}
+	 * and {@code doBegin}.
 	 * @see #doGetTransaction
 	 * @see #isExistingTransaction
 	 * @see #doBegin
@@ -556,11 +556,11 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 
 	/**
 	 * Suspend the given transaction. Suspends transaction synchronization first,
-	 * then delegates to the <code>doSuspend</code> template method.
+	 * then delegates to the {@code doSuspend} template method.
 	 * @param transaction the current transaction object
-	 * (or <code>null</code> to just suspend active synchronizations, if any)
+	 * (or {@code null} to just suspend active synchronizations, if any)
 	 * @return an object that holds suspended resources
-	 * (or <code>null</code> if neither transaction nor synchronization active)
+	 * (or {@code null} if neither transaction nor synchronization active)
 	 * @see #doSuspend
 	 * @see #resume
 	 */
@@ -606,11 +606,11 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	}
 
 	/**
-	 * Resume the given transaction. Delegates to the <code>doResume</code>
+	 * Resume the given transaction. Delegates to the {@code doResume}
 	 * template method first, then resuming transaction synchronization.
 	 * @param transaction the current transaction object
 	 * @param resourcesHolder the object that holds suspended resources,
-	 * as returned by <code>suspend</code> (or <code>null</code> to just
+	 * as returned by {@code suspend} (or {@code null} to just
 	 * resume synchronizations, if any)
 	 * @see #doResume
 	 * @see #suspend
@@ -686,8 +686,8 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	/**
 	 * This implementation of commit handles participating in existing
 	 * transactions and programmatic rollback requests.
-	 * Delegates to <code>isRollbackOnly</code>, <code>doCommit</code>
-	 * and <code>rollback</code>.
+	 * Delegates to {@code isRollbackOnly}, {@code doCommit}
+	 * and {@code rollback}.
 	 * @see org.springframework.transaction.TransactionStatus#isRollbackOnly()
 	 * @see #doCommit
 	 * @see #rollback
@@ -807,8 +807,8 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 
 	/**
 	 * This implementation of rollback handles participating in existing
-	 * transactions. Delegates to <code>doRollback</code> and
-	 * <code>doSetRollbackOnly</code>.
+	 * transactions. Delegates to {@code doRollback} and
+	 * {@code doSetRollbackOnly}.
 	 * @see #doRollback
 	 * @see #doSetRollbackOnly
 	 */
@@ -877,7 +877,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	}
 
 	/**
-	 * Invoke <code>doRollback</code>, handling rollback exceptions properly.
+	 * Invoke {@code doRollback}, handling rollback exceptions properly.
 	 * @param status object representing the transaction
 	 * @param ex the thrown application exception or error
 	 * @throws TransactionException in case of rollback failure
@@ -913,7 +913,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 
 
 	/**
-	 * Trigger <code>beforeCommit</code> callbacks.
+	 * Trigger {@code beforeCommit} callbacks.
 	 * @param status object representing the transaction
 	 */
 	protected final void triggerBeforeCommit(DefaultTransactionStatus status) {
@@ -926,7 +926,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	}
 
 	/**
-	 * Trigger <code>beforeCompletion</code> callbacks.
+	 * Trigger {@code beforeCompletion} callbacks.
 	 * @param status object representing the transaction
 	 */
 	protected final void triggerBeforeCompletion(DefaultTransactionStatus status) {
@@ -939,7 +939,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	}
 
 	/**
-	 * Trigger <code>afterCommit</code> callbacks.
+	 * Trigger {@code afterCommit} callbacks.
 	 * @param status object representing the transaction
 	 */
 	private void triggerAfterCommit(DefaultTransactionStatus status) {
@@ -952,7 +952,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	}
 
 	/**
-	 * Trigger <code>afterCompletion</code> callbacks.
+	 * Trigger {@code afterCompletion} callbacks.
 	 * @param status object representing the transaction
 	 * @param completionStatus completion status according to TransactionSynchronization constants
 	 */
@@ -977,10 +977,10 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	}
 
 	/**
-	 * Actually invoke the <code>afterCompletion</code> methods of the
+	 * Actually invoke the {@code afterCompletion} methods of the
 	 * given Spring TransactionSynchronization objects.
 	 * <p>To be called by this abstract manager itself, or by special implementations
-	 * of the <code>registerAfterCompletionWithExistingTransaction</code> callback.
+	 * of the {@code registerAfterCompletionWithExistingTransaction} callback.
 	 * @param synchronizations List of TransactionSynchronization objects
 	 * @param completionStatus the completion status according to the
 	 * constants in the TransactionSynchronization interface
@@ -1029,8 +1029,8 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	 * DefaultTransactionStatus instance.
 	 * <p>The returned object should contain information about any existing
 	 * transaction, that is, a transaction that has already started before the
-	 * current <code>getTransaction</code> call on the transaction manager.
-	 * Consequently, a <code>doGetTransaction</code> implementation will usually
+	 * current {@code getTransaction} call on the transaction manager.
+	 * Consequently, a {@code doGetTransaction} implementation will usually
 	 * look for an existing transaction and store corresponding state in the
 	 * returned transaction object.
 	 * @return the current transaction object
@@ -1051,7 +1051,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	 * behavior for the new transaction. An existing transaction might get
 	 * suspended (in case of PROPAGATION_REQUIRES_NEW), or the new transaction
 	 * might participate in the existing one (in case of PROPAGATION_REQUIRED).
-	 * <p>The default implementation returns <code>false</code>, assuming that
+	 * <p>The default implementation returns {@code false}, assuming that
 	 * participating in existing transactions is generally not supported.
 	 * Subclasses are of course encouraged to provide such support.
 	 * @param transaction transaction object returned by doGetTransaction
@@ -1065,14 +1065,14 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 
 	/**
 	 * Return whether to use a savepoint for a nested transaction.
-	 * <p>Default is <code>true</code>, which causes delegation to DefaultTransactionStatus
+	 * <p>Default is {@code true}, which causes delegation to DefaultTransactionStatus
 	 * for creating and holding a savepoint. If the transaction object does not implement
 	 * the SavepointManager interface, a NestedTransactionNotSupportedException will be
 	 * thrown. Else, the SavepointManager will be asked to create a new savepoint to
 	 * demarcate the start of the nested transaction.
-	 * <p>Subclasses can override this to return <code>false</code>, causing a further
-	 * call to <code>doBegin</code> - within the context of an already existing transaction.
-	 * The <code>doBegin</code> implementation needs to handle this accordingly in such
+	 * <p>Subclasses can override this to return {@code false}, causing a further
+	 * call to {@code doBegin} - within the context of an already existing transaction.
+	 * The {@code doBegin} implementation needs to handle this accordingly in such
 	 * a scenario. This is appropriate for JTA, for example.
 	 * @see DefaultTransactionStatus#createAndHoldSavepoint
 	 * @see DefaultTransactionStatus#rollbackToHeldSavepoint
@@ -1091,11 +1091,11 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	 * start a new transaction. Either there wasn't any transaction before, or the
 	 * previous transaction has been suspended.
 	 * <p>A special scenario is a nested transaction without savepoint: If
-	 * <code>useSavepointForNestedTransaction()</code> returns "false", this method
+	 * {@code useSavepointForNestedTransaction()} returns "false", this method
 	 * will be called to start a nested transaction when necessary. In such a context,
 	 * there will be an active transaction: The implementation of this method has
 	 * to detect this and start an appropriate nested transaction.
-	 * @param transaction transaction object returned by <code>doGetTransaction</code>
+	 * @param transaction transaction object returned by {@code doGetTransaction}
 	 * @param definition TransactionDefinition instance, describing propagation
 	 * behavior, isolation level, read-only flag, timeout, and transaction name
 	 * @throws TransactionException in case of creation or system errors
@@ -1108,7 +1108,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	 * Transaction synchronization will already have been suspended.
 	 * <p>The default implementation throws a TransactionSuspensionNotSupportedException,
 	 * assuming that transaction suspension is generally not supported.
-	 * @param transaction transaction object returned by <code>doGetTransaction</code>
+	 * @param transaction transaction object returned by {@code doGetTransaction}
 	 * @return an object that holds suspended resources
 	 * (will be kept unexamined for passing it into doResume)
 	 * @throws org.springframework.transaction.TransactionSuspensionNotSupportedException
@@ -1126,7 +1126,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	 * Transaction synchronization will be resumed afterwards.
 	 * <p>The default implementation throws a TransactionSuspensionNotSupportedException,
 	 * assuming that transaction suspension is generally not supported.
-	 * @param transaction transaction object returned by <code>doGetTransaction</code>
+	 * @param transaction transaction object returned by {@code doGetTransaction}
 	 * @param suspendedResources the object that holds suspended resources,
 	 * as returned by doSuspend
 	 * @throws org.springframework.transaction.TransactionSuspensionNotSupportedException
@@ -1140,7 +1140,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	}
 
 	/**
-	 * Return whether to call <code>doCommit</code> on a transaction that has been
+	 * Return whether to call {@code doCommit} on a transaction that has been
 	 * marked as rollback-only in a global fashion.
 	 * <p>Does not apply if an application locally sets the transaction to rollback-only
 	 * via the TransactionStatus, but only to the transaction itself being marked as
@@ -1150,12 +1150,12 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	 * as part of transaction commit. Hence, AbstractPlatformTransactionManager will trigger
 	 * a rollback in that case, throwing an UnexpectedRollbackException afterwards.
 	 * <p>Override this to return "true" if the concrete transaction manager expects a
-	 * <code>doCommit</code> call even for a rollback-only transaction, allowing for
+	 * {@code doCommit} call even for a rollback-only transaction, allowing for
 	 * special handling there. This will, for example, be the case for JTA, where
-	 * <code>UserTransaction.commit</code> will check the read-only flag itself and
+	 * {@code UserTransaction.commit} will check the read-only flag itself and
 	 * throw a corresponding RollbackException, which might include the specific reason
 	 * (such as a transaction timeout).
-	 * <p>If this method returns "true" but the <code>doCommit</code> implementation does not
+	 * <p>If this method returns "true" but the {@code doCommit} implementation does not
 	 * throw an exception, this transaction manager will throw an UnexpectedRollbackException
 	 * itself. This should not be the typical case; it is mainly checked to cover misbehaving
 	 * JTA providers that silently roll back even when the rollback has not been requested
@@ -1174,7 +1174,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 
 	/**
 	 * Make preparations for commit, to be performed before the
-	 * <code>beforeCommit</code> synchronization callbacks occur.
+	 * {@code beforeCommit} synchronization callbacks occur.
 	 * <p>Note that exceptions will get propagated to the commit caller
 	 * and cause a rollback of the transaction.
 	 * @param status the status representation of the transaction
@@ -1227,10 +1227,10 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	 * <p>Invoked when the control of the Spring transaction manager and thus all Spring
 	 * transaction synchronizations end, without the transaction being completed yet. This
 	 * is for example the case when participating in an existing JTA or EJB CMT transaction.
-	 * <p>The default implementation simply invokes the <code>afterCompletion</code> methods
+	 * <p>The default implementation simply invokes the {@code afterCompletion} methods
 	 * immediately, passing in "STATUS_UNKNOWN". This is the best we can do if there's no
 	 * chance to determine the actual outcome of the outer transaction.
-	 * @param transaction transaction object returned by <code>doGetTransaction</code>
+	 * @param transaction transaction object returned by {@code doGetTransaction}
 	 * @param synchronizations List of TransactionSynchronization objects
 	 * @throws TransactionException in case of system errors
 	 * @see #invokeAfterCompletion(java.util.List, int)
@@ -1247,10 +1247,10 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 
 	/**
 	 * Cleanup resources after transaction completion.
-	 * <p>Called after <code>doCommit</code> and <code>doRollback</code> execution,
+	 * <p>Called after {@code doCommit} and {@code doRollback} execution,
 	 * on any outcome. The default implementation does nothing.
 	 * <p>Should not throw any exceptions but just issue warnings on errors.
-	 * @param transaction transaction object returned by <code>doGetTransaction</code>
+	 * @param transaction transaction object returned by {@code doGetTransaction}
 	 */
 	protected void doCleanupAfterCompletion(Object transaction) {
 	}
@@ -1270,7 +1270,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 
 	/**
 	 * Holder for suspended resources.
-	 * Used internally by <code>suspend</code> and <code>resume</code>.
+	 * Used internally by {@code suspend} and {@code resume}.
 	 */
 	protected static class SuspendedResourcesHolder {
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java
index fad8fe3574..3b4a4c10da 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java
@@ -73,7 +73,7 @@ public abstract class AbstractTransactionStatus implements TransactionStatus {
 
 	/**
 	 * Determine the rollback-only flag via checking this TransactionStatus.
-	 * <p>Will only return "true" if the application called <code>setRollbackOnly</code>
+	 * <p>Will only return "true" if the application called {@code setRollbackOnly}
 	 * on this TransactionStatus object.
 	 */
 	public boolean isLocalRollbackOnly() {
@@ -83,7 +83,7 @@ public abstract class AbstractTransactionStatus implements TransactionStatus {
 	/**
 	 * Template method for determining the global rollback-only flag of the
 	 * underlying transaction, if any.
-	 * <p>This implementation always returns <code>false</code>.
+	 * <p>This implementation always returns {@code false}.
 	 */
 	public boolean isGlobalRollbackOnly() {
 		return false;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java
index 2b892aa3f2..f3d62a4b82 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java
@@ -25,8 +25,8 @@ import org.springframework.transaction.TransactionException;
  * interface, exposing a method for executing a given callback within a transaction.
  *
  * <p>Implementors of this interface automatically express a preference for
- * callbacks over programmatic <code>getTransaction</code>, <code>commit</code>
- * and <code>rollback</code> calls. Calling code may check whether a given
+ * callbacks over programmatic {@code getTransaction}, {@code commit}
+ * and {@code rollback} calls. Calling code may check whether a given
  * transaction manager implements this interface to choose to prepare a
  * callback instead of explicit transaction demarcation control.
  *
@@ -36,7 +36,7 @@ import org.springframework.transaction.TransactionException;
  *
  * @author Juergen Hoeller
  * @since 2.0
- * @see org.springframework.transaction.support.TransactionTemplate
+ * @see TransactionTemplate
  * @see org.springframework.transaction.interceptor.TransactionInterceptor
  */
 public interface CallbackPreferringPlatformTransactionManager extends PlatformTransactionManager {
@@ -49,7 +49,7 @@ public interface CallbackPreferringPlatformTransactionManager extends PlatformTr
 	 * Such an exception gets propagated to the caller of the template.
 	 * @param definition the definition for the transaction to wrap the callback in
 	 * @param callback the callback object that specifies the transactional action
-	 * @return a result object returned by the callback, or <code>null</code> if none
+	 * @return a result object returned by the callback, or {@code null} if none
 	 * @throws TransactionException in case of initialization, rollback, or system errors
 	 * @throws RuntimeException if thrown by the TransactionCallback
 	 */
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
index df3c7b3a7c..c844a24930 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
@@ -108,7 +108,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
 	 * TransactionDefinition, e.g. "PROPAGATION_REQUIRED".
 	 * @param constantName name of the constant
 	 * @exception IllegalArgumentException if the supplied value is not resolvable
-	 * to one of the <code>PROPAGATION_</code> constants or is <code>null</code>
+	 * to one of the {@code PROPAGATION_} constants or is {@code null}
 	 * @see #setPropagationBehavior
 	 * @see #PROPAGATION_REQUIRED
 	 */
@@ -123,7 +123,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
 	 * Set the propagation behavior. Must be one of the propagation constants
 	 * in the TransactionDefinition interface. Default is PROPAGATION_REQUIRED.
 	 * @exception IllegalArgumentException if the supplied value is not
-	 * one of the <code>PROPAGATION_</code> constants
+	 * one of the {@code PROPAGATION_} constants
 	 * @see #PROPAGATION_REQUIRED
 	 */
 	public final void setPropagationBehavior(int propagationBehavior) {
@@ -142,7 +142,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
 	 * TransactionDefinition, e.g. "ISOLATION_DEFAULT".
 	 * @param constantName name of the constant
 	 * @exception IllegalArgumentException if the supplied value is not resolvable
-	 * to one of the <code>ISOLATION_</code> constants or is <code>null</code>
+	 * to one of the {@code ISOLATION_} constants or is {@code null}
 	 * @see #setIsolationLevel
 	 * @see #ISOLATION_DEFAULT
 	 */
@@ -157,7 +157,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
 	 * Set the isolation level. Must be one of the isolation constants
 	 * in the TransactionDefinition interface. Default is ISOLATION_DEFAULT.
 	 * @exception IllegalArgumentException if the supplied value is not
-	 * one of the <code>ISOLATION_</code> constants
+	 * one of the {@code ISOLATION_} constants
 	 * @see #ISOLATION_DEFAULT
 	 */
 	public final void setIsolationLevel(int isolationLevel) {
@@ -214,7 +214,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
 
 
 	/**
-	 * This implementation compares the <code>toString()</code> results.
+	 * This implementation compares the {@code toString()} results.
 	 * @see #toString()
 	 */
 	@Override
@@ -223,7 +223,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
 	}
 
 	/**
-	 * This implementation returns <code>toString()</code>'s hash code.
+	 * This implementation returns {@code toString()}'s hash code.
 	 * @see #toString()
 	 */
 	@Override
@@ -235,10 +235,10 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
 	 * Return an identifying description for this transaction definition.
 	 * <p>The format matches the one used by
 	 * {@link org.springframework.transaction.interceptor.TransactionAttributeEditor},
-	 * to be able to feed <code>toString</code> results into bean properties of type
+	 * to be able to feed {@code toString} results into bean properties of type
 	 * {@link org.springframework.transaction.interceptor.TransactionAttribute}.
-	 * <p>Has to be overridden in subclasses for correct <code>equals</code>
-	 * and <code>hashCode</code> behavior. Alternatively, {@link #equals}
+	 * <p>Has to be overridden in subclasses for correct {@code equals}
+	 * and {@code hashCode} behavior. Alternatively, {@link #equals}
 	 * and {@link #hashCode} can be overridden themselves.
 	 * @see #getDefinitionDescription()
 	 * @see org.springframework.transaction.interceptor.TransactionAttributeEditor
@@ -250,7 +250,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
 
 	/**
 	 * Return an identifying description for this transaction definition.
-	 * <p>Available to subclasses, for inclusion in their <code>toString()</code> result.
+	 * <p>Available to subclasses, for inclusion in their {@code toString()} result.
 	 */
 	protected final StringBuilder getDefinitionDescription() {
 		StringBuilder result = new StringBuilder();
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java
index be46efbfa0..7dab8d5618 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java
@@ -109,7 +109,7 @@ public abstract class ResourceHolderSynchronization<H extends ResourceHolder, K>
 	/**
 	 * Return whether this holder should be unbound at completion
 	 * (or should rather be left bound to the thread after the transaction).
-	 * <p>The default implementation returns <code>true</code>.
+	 * <p>The default implementation returns {@code true}.
 	 */
 	protected boolean shouldUnbindAtCompletion() {
 		return true;
@@ -117,11 +117,11 @@ public abstract class ResourceHolderSynchronization<H extends ResourceHolder, K>
 
 	/**
 	 * Return whether this holder's resource should be released before
-	 * transaction completion (<code>true</code>) or rather after
-	 * transaction completion (<code>false</code>).
+	 * transaction completion ({@code true}) or rather after
+	 * transaction completion ({@code false}).
 	 * <p>Note that resources will only be released when they are
 	 * unbound from the thread ({@link #shouldUnbindAtCompletion()}).
-	 * <p>The default implementation returns <code>true</code>.
+	 * <p>The default implementation returns {@code true}.
 	 * @see #releaseResource
 	 */
 	protected boolean shouldReleaseBeforeCompletion() {
@@ -130,8 +130,8 @@ public abstract class ResourceHolderSynchronization<H extends ResourceHolder, K>
 
 	/**
 	 * Return whether this holder's resource should be released after
-	 * transaction completion (<code>true</code>).
-	 * <p>The default implementation returns <code>!shouldReleaseBeforeCompletion()</code>,
+	 * transaction completion ({@code true}).
+	 * <p>The default implementation returns {@code !shouldReleaseBeforeCompletion()},
 	 * releasing after completion if no attempt was made before completion.
 	 * @see #releaseResource
 	 */
@@ -167,8 +167,8 @@ public abstract class ResourceHolderSynchronization<H extends ResourceHolder, K>
 	 * Perform a cleanup on the given resource (which is left bound to the thread).
 	 * @param resourceHolder the resource holder to process
 	 * @param resourceKey the key that the ResourceHolder was bound for
-	 * @param committed whether the transaction has committed (<code>true</code>)
-	 * or rolled back (<code>false</code>)
+	 * @param committed whether the transaction has committed ({@code true})
+	 * or rolled back ({@code false})
 	 */
 	protected void cleanupResource(H resourceHolder, K resourceKey, boolean committed) {
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java
index 039650d396..c2188a108f 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java
@@ -40,7 +40,7 @@ public interface ResourceTransactionManager extends PlatformTransactionManager {
 	 * e.g. a JDBC DataSource or a JMS ConnectionFactory.
 	 * <p>This target resource factory is usually used as resource key for
 	 * {@link TransactionSynchronizationManager}'s resource bindings per thread.
-	 * @return the target resource factory (never <code>null</code>)
+	 * @return the target resource factory (never {@code null})
 	 * @see TransactionSynchronizationManager#bindResource
 	 * @see TransactionSynchronizationManager#getResource
 	 */
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
index 6ad3318a1d..85be9f8bca 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
@@ -27,7 +27,7 @@ package org.springframework.transaction.support;
  * {@link org.springframework.transaction.PlatformTransactionManager}
  * implementations. It is mainly provided as a start for custom transaction
  * manager implementations and as a static mock for testing transactional
- * code (either as part of a mock <code>PlatformTransactionManager</code> or
+ * code (either as part of a mock {@code PlatformTransactionManager} or
  * as argument passed into a {@link TransactionCallback} to be tested).
  *
  * @author Juergen Hoeller
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java
index 7b9ad5682f..0ba452e84f 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java
@@ -20,7 +20,7 @@ import org.springframework.transaction.TransactionStatus;
 
 /**
  * Callback interface for transactional code. Used with {@link TransactionTemplate}'s
- * <code>execute</code> method, often as anonymous class within a method implementation.
+ * {@code execute} method, often as anonymous class within a method implementation.
  *
  * <p>Typically used to assemble various calls to transaction-unaware data access
  * services into a higher-level service method with transaction demarcation. As an
@@ -48,7 +48,7 @@ public interface TransactionCallback<T> {
 	 * thrown.
 	 *
 	 * @param status associated transaction status
-	 * @return a result object, or <code>null</code>
+	 * @return a result object, or {@code null}
 	 * @see TransactionTemplate#execute
 	 * @see CallbackPreferringPlatformTransactionManager#execute
 	 */
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java
index 44075a0977..0083f2dd24 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java
@@ -35,7 +35,7 @@ public abstract class TransactionCallbackWithoutResult implements TransactionCal
 	}
 
 	/**
-	 * Gets called by <code>TransactionTemplate.execute</code> within a transactional
+	 * Gets called by {@code TransactionTemplate.execute} within a transactional
 	 * context. Does not need to care about transactions itself, although it can retrieve
 	 * and influence the status of the current transaction via the given status object,
 	 * e.g. setting rollback-only.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java
index 30abf4e4a5..1d576966b5 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java
@@ -36,7 +36,7 @@ public interface TransactionOperations {
 	 * by the callback is treated as a fatal exception that enforces a rollback.
 	 * Such an exception gets propagated to the caller of the template.
 	 * @param action the callback object that specifies the transactional action
-	 * @return a result object returned by the callback, or <code>null</code> if none
+	 * @return a result object returned by the callback, or {@code null} if none
 	 * @throws TransactionException in case of initialization, rollback, or system errors
 	 * @throws RuntimeException if thrown by the TransactionCallback
 	 */
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 ccf5109c58..c9600ca0a1 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
@@ -86,8 +86,8 @@ public interface TransactionSynchronization {
 	/**
 	 * Invoked before transaction commit/rollback.
 	 * Can perform resource cleanup <i>before</i> transaction completion.
-	 * <p>This method will be invoked after <code>beforeCommit</code>, even when
-	 * <code>beforeCommit</code> threw an exception. This callback allows for
+	 * <p>This method will be invoked after {@code beforeCommit}, even when
+	 * {@code beforeCommit} threw an exception. This callback allows for
 	 * closing resources before transaction completion, for any outcome.
 	 * @throws RuntimeException in case of errors; will be <b>logged but not propagated</b>
 	 * (note: do not throw TransactionException subclasses here!)
@@ -106,7 +106,7 @@ public interface TransactionSynchronization {
 	 * any data access code triggered at this point will still "participate" in the
 	 * original transaction, allowing to perform some cleanup (with no commit following
 	 * anymore!), unless it explicitly declares that it needs to run in a separate
-	 * transaction. Hence: <b>Use <code>PROPAGATION_REQUIRES_NEW</code> for any
+	 * transaction. Hence: <b>Use {@code PROPAGATION_REQUIRES_NEW} for any
 	 * transactional operation that is called from here.</b>
 	 * @throws RuntimeException in case of errors; will be <b>propagated to the caller</b>
 	 * (note: do not throw TransactionException subclasses here!)
@@ -121,9 +121,9 @@ public interface TransactionSynchronization {
 	 * consequence, any data access code triggered at this point will still "participate"
 	 * in the original transaction, allowing to perform some cleanup (with no commit
 	 * following anymore!), unless it explicitly declares that it needs to run in a
-	 * separate transaction. Hence: <b>Use <code>PROPAGATION_REQUIRES_NEW</code>
+	 * separate transaction. Hence: <b>Use {@code PROPAGATION_REQUIRES_NEW}
 	 * for any transactional operation that is called from here.</b>
-	 * @param status completion status according to the <code>STATUS_*</code> constants
+	 * @param status completion status according to the {@code STATUS_*} constants
 	 * @throws RuntimeException in case of errors; will be <b>logged but not propagated</b>
 	 * (note: do not throw TransactionException subclasses here!)
 	 * @see #STATUS_COMMITTED
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 712b1296d0..c18ee98515 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
@@ -40,7 +40,7 @@ import org.springframework.util.Assert;
  * Supports a list of transaction synchronizations if synchronization is active.
  *
  * <p>Resource management code should check for thread-bound resources, e.g. JDBC
- * Connections or Hibernate Sessions, via <code>getResource</code>. Such code is
+ * Connections or Hibernate Sessions, via {@code getResource}. Such code is
  * normally not supposed to bind resources to threads, as this is the responsibility
  * of transaction managers. A further option is to lazily bind on first use if
  * transaction synchronization is active, for performing transactions that span
@@ -103,7 +103,7 @@ public abstract class TransactionSynchronizationManager {
 	/**
 	 * Return all resources that are bound to the current thread.
 	 * <p>Mainly for debugging purposes. Resource managers should always invoke
-	 * <code>hasResource</code> for a specific resource key that they are interested in.
+	 * {@code hasResource} for a specific resource key that they are interested in.
 	 * @return a Map with resource keys (usually the resource factory) and resource
 	 * values (usually the active resource object), or an empty Map if there are
 	 * currently no resources bound
@@ -130,7 +130,7 @@ public abstract class TransactionSynchronizationManager {
 	 * Retrieve a resource for the given key that is bound to the current thread.
 	 * @param key the key to check (usually the resource factory)
 	 * @return a value bound to the current thread (usually the active
-	 * resource object), or <code>null</code> if none
+	 * resource object), or {@code null} if none
 	 * @see ResourceTransactionManager#getResourceFactory()
 	 */
 	public static Object getResource(Object key) {
@@ -215,7 +215,7 @@ public abstract class TransactionSynchronizationManager {
 	/**
 	 * Unbind a resource for the given key from the current thread.
 	 * @param key the key to unbind (usually the resource factory)
-	 * @return the previously bound value, or <code>null</code> if none bound
+	 * @return the previously bound value, or {@code null} if none bound
 	 */
 	public static Object unbindResourceIfPossible(Object key) {
 		Object actualKey = TransactionSynchronizationUtils.unwrapResourceIfNecessary(key);
@@ -340,7 +340,7 @@ public abstract class TransactionSynchronizationManager {
 	/**
 	 * Expose the name of the current transaction, if any.
 	 * Called by the transaction manager on transaction begin and on cleanup.
-	 * @param name the name of the transaction, or <code>null</code> to reset it
+	 * @param name the name of the transaction, or {@code null} to reset it
 	 * @see org.springframework.transaction.TransactionDefinition#getName()
 	 */
 	public static void setCurrentTransactionName(String name) {
@@ -348,7 +348,7 @@ public abstract class TransactionSynchronizationManager {
 	}
 
 	/**
-	 * Return the name of the current transaction, or <code>null</code> if none set.
+	 * Return the name of the current transaction, or {@code null} if none set.
 	 * To be called by resource management code for optimizations per use case,
 	 * for example to optimize fetch strategies for specific named transactions.
 	 * @see org.springframework.transaction.TransactionDefinition#getName()
@@ -360,8 +360,8 @@ public abstract class TransactionSynchronizationManager {
 	/**
 	 * Expose a read-only flag for the current transaction.
 	 * Called by the transaction manager on transaction begin and on cleanup.
-	 * @param readOnly <code>true</code> to mark the current transaction
-	 * as read-only; <code>false</code> to reset such a read-only marker
+	 * @param readOnly {@code true} to mark the current transaction
+	 * as read-only; {@code false} to reset such a read-only marker
 	 * @see org.springframework.transaction.TransactionDefinition#isReadOnly()
 	 */
 	public static void setCurrentTransactionReadOnly(boolean readOnly) {
@@ -373,7 +373,7 @@ public abstract class TransactionSynchronizationManager {
 	 * To be called by resource management code when preparing a newly
 	 * created resource (for example, a Hibernate Session).
 	 * <p>Note that transaction synchronizations receive the read-only flag
-	 * as argument for the <code>beforeCommit</code> callback, to be able
+	 * as argument for the {@code beforeCommit} callback, to be able
 	 * to suppress change detection on commit. The present method is meant
 	 * to be used for earlier read-only checks, for example to set the
 	 * flush mode of a Hibernate Session to "FlushMode.NEVER" upfront.
@@ -389,7 +389,7 @@ public abstract class TransactionSynchronizationManager {
 	 * Called by the transaction manager on transaction begin and on cleanup.
 	 * @param isolationLevel the isolation level to expose, according to the
 	 * JDBC Connection constants (equivalent to the corresponding Spring
-	 * TransactionDefinition constants), or <code>null</code> to reset it
+	 * TransactionDefinition constants), or {@code null} to reset it
 	 * @see java.sql.Connection#TRANSACTION_READ_UNCOMMITTED
 	 * @see java.sql.Connection#TRANSACTION_READ_COMMITTED
 	 * @see java.sql.Connection#TRANSACTION_REPEATABLE_READ
@@ -410,7 +410,7 @@ public abstract class TransactionSynchronizationManager {
 	 * created resource (for example, a JDBC Connection).
 	 * @return the currently exposed isolation level, according to the
 	 * JDBC Connection constants (equivalent to the corresponding Spring
-	 * TransactionDefinition constants), or <code>null</code> if none
+	 * TransactionDefinition constants), or {@code null} if none
 	 * @see java.sql.Connection#TRANSACTION_READ_UNCOMMITTED
 	 * @see java.sql.Connection#TRANSACTION_READ_COMMITTED
 	 * @see java.sql.Connection#TRANSACTION_REPEATABLE_READ
@@ -428,8 +428,8 @@ public abstract class TransactionSynchronizationManager {
 	/**
 	 * Expose whether there currently is an actual transaction active.
 	 * Called by the transaction manager on transaction begin and on cleanup.
-	 * @param active <code>true</code> to mark the current thread as being associated
-	 * with an actual transaction; <code>false</code> to reset that marker
+	 * @param active {@code true} to mark the current thread as being associated
+	 * with an actual transaction; {@code false} to reset that marker
 	 */
 	public static void setActualTransactionActive(boolean active) {
 		actualTransactionActive.set(active ? Boolean.TRUE : null);
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java
index 3e174132d5..f7f429a798 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java
@@ -74,8 +74,8 @@ public abstract class TransactionSynchronizationUtils {
 
 
 	/**
-	 * Trigger <code>flush</code> callbacks on all currently registered synchronizations.
-	 * @throws RuntimeException if thrown by a <code>flush</code> callback
+	 * Trigger {@code flush} callbacks on all currently registered synchronizations.
+	 * @throws RuntimeException if thrown by a {@code flush} callback
 	 * @see TransactionSynchronization#flush()
 	 */
 	public static void triggerFlush() {
@@ -85,9 +85,9 @@ public abstract class TransactionSynchronizationUtils {
 	}
 
 	/**
-	 * Trigger <code>beforeCommit</code> callbacks on all currently registered synchronizations.
+	 * Trigger {@code beforeCommit} callbacks on all currently registered synchronizations.
 	 * @param readOnly whether the transaction is defined as read-only transaction
-	 * @throws RuntimeException if thrown by a <code>beforeCommit</code> callback
+	 * @throws RuntimeException if thrown by a {@code beforeCommit} callback
 	 * @see TransactionSynchronization#beforeCommit(boolean)
 	 */
 	public static void triggerBeforeCommit(boolean readOnly) {
@@ -97,7 +97,7 @@ public abstract class TransactionSynchronizationUtils {
 	}
 
 	/**
-	 * Trigger <code>beforeCompletion</code> callbacks on all currently registered synchronizations.
+	 * Trigger {@code beforeCompletion} callbacks on all currently registered synchronizations.
 	 * @see TransactionSynchronization#beforeCompletion()
 	 */
 	public static void triggerBeforeCompletion() {
@@ -112,8 +112,8 @@ public abstract class TransactionSynchronizationUtils {
 	}
 
 	/**
-	 * Trigger <code>afterCommit</code> callbacks on all currently registered synchronizations.
-	 * @throws RuntimeException if thrown by a <code>afterCommit</code> callback
+	 * Trigger {@code afterCommit} callbacks on all currently registered synchronizations.
+	 * @throws RuntimeException if thrown by a {@code afterCommit} callback
 	 * @see TransactionSynchronizationManager#getSynchronizations()
 	 * @see TransactionSynchronization#afterCommit()
 	 */
@@ -122,7 +122,7 @@ public abstract class TransactionSynchronizationUtils {
 	}
 
 	/**
-	 * Actually invoke the <code>afterCommit</code> methods of the
+	 * Actually invoke the {@code afterCommit} methods of the
 	 * given Spring TransactionSynchronization objects.
 	 * @param synchronizations List of TransactionSynchronization objects
 	 * @see TransactionSynchronization#afterCommit()
@@ -136,7 +136,7 @@ public abstract class TransactionSynchronizationUtils {
 	}
 
 	/**
-	 * Trigger <code>afterCompletion</code> callbacks on all currently registered synchronizations.
+	 * Trigger {@code afterCompletion} callbacks on all currently registered synchronizations.
 	 * @see TransactionSynchronizationManager#getSynchronizations()
 	 * @param completionStatus the completion status according to the
 	 * constants in the TransactionSynchronization interface
@@ -151,7 +151,7 @@ public abstract class TransactionSynchronizationUtils {
 	}
 
 	/**
-	 * Actually invoke the <code>afterCompletion</code> methods of the
+	 * Actually invoke the {@code afterCompletion} methods of the
 	 * given Spring TransactionSynchronization objects.
 	 * @param synchronizations List of TransactionSynchronization objects
 	 * @param completionStatus the completion status according to the
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
index 18097552cf..12d285a94c 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
@@ -71,7 +71,7 @@ public class TransactionTemplate extends DefaultTransactionDefinition
 	/**
 	 * Construct a new TransactionTemplate for bean usage.
 	 * <p>Note: The PlatformTransactionManager needs to be set before
-	 * any <code>execute</code> calls.
+	 * any {@code execute} calls.
 	 * @see #setTransactionManager
 	 */
 	public TransactionTemplate() {
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index 28670fd438..f372307e58 100644
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -38,7 +38,7 @@ public class ExpectedLookupTemplate extends JndiTemplate {
 
 	/**
 	 * Construct a new JndiTemplate that will always return given objects
-	 * for given names. To be populated through <code>addObject</code> calls.
+	 * for given names. To be populated through {@code addObject} calls.
 	 * @see #addObject(String, Object)
 	 */
 	public ExpectedLookupTemplate() {
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
index b6489e4202..c71d6e8681 100644
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
@@ -41,13 +41,13 @@ import org.springframework.util.StringUtils;
  * Mainly for test environments, but also usable for standalone applications.
  *
  * <p>This class is not intended for direct usage by applications, although it
- * can be used for example to override JndiTemplate's <code>createInitialContext</code>
+ * can be used for example to override JndiTemplate's {@code createInitialContext}
  * method in unit tests. Typically, SimpleNamingContextBuilder will be used to
  * set up a JVM-level JNDI environment.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
- * @see org.springframework.mock.jndi.SimpleNamingContextBuilder
+ * @see SimpleNamingContextBuilder
  * @see org.springframework.jndi.JndiTemplate#createInitialContext
  */
 public class SimpleNamingContext implements Context {
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index f6c3f0a376..f21936897b 100644
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -33,7 +33,7 @@ import org.springframework.util.ClassUtils;
  * Simple implementation of a JNDI naming context builder.
  *
  * <p>Mainly targeted at test environments, where each test case can
- * configure JNDI appropriately, so that <code>new InitialContext()</code>
+ * configure JNDI appropriately, so that {@code new InitialContext()}
  * will expose the required objects. Also usable for standalone applications,
  * e.g. for binding a JDBC DataSource to a well-known JNDI location, to be
  * able to use traditional J2EE data access code outside of a J2EE container.
@@ -63,7 +63,7 @@ import org.springframework.util.ClassUtils;
  * DataSource ds = new DriverManagerDataSource(...);
  * builder.bind("java:comp/env/jdbc/myds", ds);</pre>
  *
- * Note that you <i>should not</i> call <code>activate()</code> on a builder from
+ * Note that you <i>should not</i> call {@code activate()} on a builder from
  * this factory method, as there will already be an activated one in any case.
  *
  * <p>An instance of this class is only necessary at setup time.
@@ -74,7 +74,7 @@ import org.springframework.util.ClassUtils;
  * @see #emptyActivatedContextBuilder()
  * @see #bind(String, Object)
  * @see #activate()
- * @see org.springframework.mock.jndi.SimpleNamingContext
+ * @see SimpleNamingContext
  * @see org.springframework.jdbc.datasource.SingleConnectionDataSource
  * @see org.springframework.jdbc.datasource.DriverManagerDataSource
  * @see org.apache.commons.dbcp.BasicDataSource
@@ -92,7 +92,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 	/**
 	 * Checks if a SimpleNamingContextBuilder is active.
 	 * @return the current SimpleNamingContextBuilder instance,
-	 * or <code>null</code> if none
+	 * or {@code null} if none
 	 */
 	public static SimpleNamingContextBuilder getCurrentContextBuilder() {
 		return activated;
@@ -129,8 +129,8 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 
 	/**
 	 * Register the context builder by registering it with the JNDI NamingManager.
-	 * Note that once this has been done, <code>new InitialContext()</code> will always
-	 * return a context from this factory. Use the <code>emptyActivatedContextBuilder()</code>
+	 * Note that once this has been done, {@code new InitialContext()} will always
+	 * return a context from this factory. Use the {@code emptyActivatedContextBuilder()}
 	 * static method to get an empty context (for example, in test methods).
 	 * @throws IllegalStateException if there's already a naming context builder
 	 * registered with the JNDI NamingManager
@@ -156,7 +156,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 	 * Temporarily deactivate this context builder. It will remain registered with
 	 * the JNDI NamingManager but will delegate to the standard JNDI InitialContextFactory
 	 * (if configured) instead of exposing its own bound objects.
-	 * <p>Call <code>activate()</code> again in order to expose this context builder's own
+	 * <p>Call {@code activate()} again in order to expose this context builder's own
 	 * bound objects again. Such activate/deactivate sequences can be applied any number
 	 * of times (e.g. within a larger integration test suite running in the same VM).
 	 * @see #activate()
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
index 6c6da1c15e..ff21ee0a8b 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
@@ -24,7 +24,7 @@ import org.springframework.transaction.TransactionDefinition;
 
 /**
  * Format is
- * <code>FQN.Method=tx attribute representation</code>
+ * {@code FQN.Method=tx attribute representation}
  *
  * @author Rod Johnson
  * @since 26.04.2003
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 e50c58f445..99e1b2d124 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -51,7 +51,7 @@ import org.springframework.util.comparator.CompoundComparator;
 public class MediaType implements Comparable<MediaType> {
 
 	/**
-	 * Public constant media type that includes all media ranges (i.e. <code>&#42;/&#42;</code>).
+	 * Public constant media type that includes all media ranges (i.e. {@code &#42;/&#42;}).
 	 */
 	public static final MediaType ALL;
 
@@ -260,7 +260,7 @@ public class MediaType implements Comparable<MediaType> {
 
 	/**
 	 * Create a new {@code MediaType} for the given primary type.
-	 * <p>The {@linkplain #getSubtype() subtype} is set to <code>&#42;</code>, parameters empty.
+	 * <p>The {@linkplain #getSubtype() subtype} is set to {@code &#42;}, parameters empty.
 	 * @param type the primary type
 	 * @throws IllegalArgumentException if any of the parameters contain illegal characters
 	 */
@@ -306,7 +306,7 @@ public class MediaType implements Comparable<MediaType> {
 	 * Copy-constructor that copies the type and subtype of the given {@code MediaType},
 	 * and allows for different parameter.
 	 * @param other the other media type
-	 * @param parameters the parameters, may be <code>null</code>
+	 * @param parameters the parameters, may be {@code null}
 	 * @throws IllegalArgumentException if any of the parameters contain illegal characters
 	 */
 	public MediaType(MediaType other, Map<String, String> parameters) {
@@ -317,7 +317,7 @@ public class MediaType implements Comparable<MediaType> {
 	 * Create a new {@code MediaType} for the given type, subtype, and parameters.
 	 * @param type the primary type
 	 * @param subtype the subtype
-	 * @param parameters the parameters, may be <code>null</code>
+	 * @param parameters the parameters, may be {@code null}
 	 * @throws IllegalArgumentException if any of the parameters contain illegal characters
 	 */
 	public MediaType(String type, String subtype, Map<String, String> parameters) {
@@ -399,7 +399,7 @@ public class MediaType implements Comparable<MediaType> {
 	}
 
 	/**
-	 * Indicates whether the {@linkplain #getType() type} is the wildcard character <code>&#42;</code> or not.
+	 * Indicates whether the {@linkplain #getType() type} is the wildcard character {@code &#42;} or not.
 	 */
 	public boolean isWildcardType() {
 		return WILDCARD_TYPE.equals(type);
@@ -413,9 +413,9 @@ public class MediaType implements Comparable<MediaType> {
 	}
 
 	/**
-	 * Indicates whether the {@linkplain #getSubtype() subtype} is the wildcard character <code>&#42;</code>
-	 * or the wildcard character followed by a sufiix (e.g. <code>&#42;+xml</code>), or not.
-	 * @return whether the subtype is <code>&#42;</code>
+	 * Indicates whether the {@linkplain #getSubtype() subtype} is the wildcard character {@code &#42;}
+	 * or the wildcard character followed by a sufiix (e.g. {@code &#42;+xml}), or not.
+	 * @return whether the subtype is {@code &#42;}
 	 */
 	public boolean isWildcardSubtype() {
 		return WILDCARD_TYPE.equals(subtype) || subtype.startsWith("*+");
@@ -423,7 +423,7 @@ public class MediaType implements Comparable<MediaType> {
 
 	/**
 	 * Indicates whether this media type is concrete, i.e. whether neither the type or subtype is a wildcard
-	 * character <code>&#42;</code>.
+	 * character {@code &#42;}.
 	 * @return whether this media type is concrete
 	 */
 	public boolean isConcrete() {
@@ -431,8 +431,8 @@ public class MediaType implements Comparable<MediaType> {
 	}
 
 	/**
-	 * Return the character set, as indicated by a <code>charset</code> parameter, if any.
-	 * @return the character set; or <code>null</code> if not available
+	 * Return the character set, as indicated by a {@code charset} parameter, if any.
+	 * @return the character set; or {@code null} if not available
 	 */
 	public Charset getCharSet() {
 		String charSet = getParameter(PARAM_CHARSET);
@@ -440,8 +440,8 @@ public class MediaType implements Comparable<MediaType> {
 	}
 
 	/**
-	 * Return the quality value, as indicated by a <code>q</code> parameter, if any.
-	 * Defaults to <code>1.0</code>.
+	 * Return the quality value, as indicated by a {@code q} parameter, if any.
+	 * Defaults to {@code 1.0}.
 	 * @return the quality factory
 	 */
 	public double getQualityValue() {
@@ -452,7 +452,7 @@ public class MediaType implements Comparable<MediaType> {
 	/**
 	 * Return a generic parameter value, given a parameter name.
 	 * @param name the parameter name
-	 * @return the parameter value; or <code>null</code> if not present
+	 * @return the parameter value; or {@code null} if not present
 	 */
 	public String getParameter(String name) {
 		return this.parameters.get(name);
@@ -460,7 +460,7 @@ public class MediaType implements Comparable<MediaType> {
 
 	/**
 	 * Return all generic parameter values.
-	 * @return a read-only map, possibly empty, never <code>null</code>
+	 * @return a read-only map, possibly empty, never {@code null}
 	 */
 	public Map<String, String> getParameters() {
 			return parameters;
@@ -471,7 +471,7 @@ public class MediaType implements Comparable<MediaType> {
 	 * <p>For instance, {@code text/*} includes {@code text/plain} and {@code text/html}, and {@code application/*+xml}
 	 * includes {@code application/soap+xml}, etc. This method is <b>not</b> symmetric.
 	 * @param other the reference media type with which to compare
-	 * @return <code>true</code> if this media type includes the given media type; <code>false</code> otherwise
+	 * @return {@code true} if this media type includes the given media type; {@code false} otherwise
 	 */
 	public boolean includes(MediaType other) {
 		if (other == null) {
@@ -513,7 +513,7 @@ public class MediaType implements Comparable<MediaType> {
 	 * <p>For instance, {@code text/*} is compatible with {@code text/plain}, {@code text/html}, and vice versa.
 	 * In effect, this method is similar to {@link #includes(MediaType)}, except that it <b>is</b> symmetric.
 	 * @param other the reference media type with which to compare
-	 * @return <code>true</code> if this media type is compatible with the given media type; <code>false</code> otherwise
+	 * @return {@code true} if this media type is compatible with the given media type; {@code false} otherwise
 	 */
 	public boolean isCompatibleWith(MediaType other) {
 		if (other == null) {
diff --git a/spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java b/spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java
index be3f73c37a..7c1bfcfdc8 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java
@@ -22,8 +22,8 @@ import org.springframework.util.StringUtils;
 
 /**
  * {@link java.beans.PropertyEditor Editor} for {@link MediaType}
- * descriptors, to automatically convert <code>String</code> specifications
- * (e.g. <code>"text/html"</code>) to <code>MediaType</code> properties.
+ * descriptors, to automatically convert {@code String} specifications
+ * (e.g. {@code "text/html"}) to {@code MediaType} properties.
  *
  * @author Juergen Hoeller
  * @since 3.0
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 e8681d5041..55a3f5188d 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
@@ -25,7 +25,7 @@ import org.springframework.http.HttpRequest;
 /**
  * Represents a client-side HTTP request. Created via an implementation of the {@link ClientHttpRequestFactory}.
  *
- * <p>A <code>HttpRequest</code> can be {@linkplain #execute() executed}, getting a {@link ClientHttpResponse}
+ * <p>A {@code HttpRequest} can be {@linkplain #execute() executed}, getting a {@link ClientHttpResponse}
  * which can be read from.
  *
  * @author Arjen Poutsma
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 301e4645d9..438f8035bd 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
@@ -25,8 +25,8 @@ import org.springframework.http.HttpStatus;
 /**
  * Represents a client-side HTTP response. Obtained via an calling of the {@link ClientHttpRequest#execute()}.
  *
- * <p>A <code>ClientHttpResponse</code> must be {@linkplain #close() closed}, typically in a
- * <code>finally</code> block.
+ * <p>A {@code ClientHttpResponse} must be {@linkplain #close() closed}, typically in a
+ * {@code finally} block.
  *
  * @author Arjen Poutsma
  * @since 3.0
diff --git a/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
index afd7bdb3cc..429b383442 100644
--- a/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
@@ -56,7 +56,7 @@ public class CommonsClientHttpRequestFactory implements ClientHttpRequestFactory
 
 
 	/**
-	 * Create a new instance of the <code>CommonsHttpRequestFactory</code> with a default
+	 * Create a new instance of the {@code CommonsHttpRequestFactory} with a default
 	 * {@link HttpClient} that uses a default {@link MultiThreadedHttpConnectionManager}.
 	 */
 	public CommonsClientHttpRequestFactory() {
@@ -65,7 +65,7 @@ public class CommonsClientHttpRequestFactory implements ClientHttpRequestFactory
 	}
 
 	/**
-	 * Create a new instance of the <code>CommonsHttpRequestFactory</code> with the given
+	 * Create a new instance of the {@code CommonsHttpRequestFactory} with the given
 	 * {@link HttpClient} instance.
 	 * @param httpClient the HttpClient instance to use for this factory
 	 */
@@ -76,14 +76,14 @@ public class CommonsClientHttpRequestFactory implements ClientHttpRequestFactory
 
 
 	/**
-	 * Set the <code>HttpClient</code> used by this factory.
+	 * Set the {@code HttpClient} used by this factory.
 	 */
 	public void setHttpClient(HttpClient httpClient) {
 		this.httpClient = httpClient;
 	}
 
 	/**
-	 * Return the <code>HttpClient</code> used by this factory.
+	 * Return the {@code HttpClient} used by this factory.
 	 */
 	public HttpClient getHttpClient() {
 		return this.httpClient;
diff --git a/spring-web/src/main/java/org/springframework/http/client/package-info.java b/spring-web/src/main/java/org/springframework/http/client/package-info.java
index 3cfac88bbc..50c6bfa29a 100644
--- a/spring-web/src/main/java/org/springframework/http/client/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/client/package-info.java
@@ -1,9 +1,8 @@
-
 /**
  *
  * Contains an abstraction over client-side HTTP. This package
- * contains the <code>ClientHttpRequest</code> and
- * <code>ClientHttpResponse</code>, as well as a basic implementation of these
+ * contains the {@code ClientHttpRequest} and
+ * {@code ClientHttpResponse}, as well as a basic implementation of these
  * interfaces.
  *
  */
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 c81935be60..c95a20c430 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
@@ -187,7 +187,7 @@ public abstract class AbstractHttpMessageConverter<T> implements HttpMessageConv
 	 * {@link #setSupportedMediaTypes(List) supportedMediaTypes} property, if any.
 	 * Can be overridden in subclasses.
 	 * @param t the type to return the content type for
-	 * @return the content type, or <code>null</code> if not known
+	 * @return the content type, or {@code null} if not known
 	 */
 	protected MediaType getDefaultContentType(T t) throws IOException {
 		List<MediaType> mediaTypes = getSupportedMediaTypes();
@@ -209,7 +209,7 @@ public abstract class AbstractHttpMessageConverter<T> implements HttpMessageConv
 	/**
 	 * Indicates whether the given class is supported by this converter.
 	 * @param clazz the class to test for support
-	 * @return <code>true</code> if supported; <code>false</code> otherwise
+	 * @return {@code true} if supported; {@code false} otherwise
 	 */
 	protected abstract boolean supports(Class<?> clazz);
 
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 93517ea81e..23543c384f 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
@@ -27,7 +27,7 @@ import org.springframework.util.FileCopyUtils;
 /**
  * Implementation of {@link HttpMessageConverter} that can read and write byte arrays.
  *
- * <p>By default, this converter supports all media types (<code>&#42;&#47;&#42;</code>), and writes with a {@code
+ * <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.
  *
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 c037c1fcc9..e995713d45 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
@@ -32,7 +32,7 @@ import org.springframework.util.FileCopyUtils;
 /**
  * Implementation of {@link HttpMessageConverter} that can read and write strings.
  *
- * <p>By default, this converter supports all media types (<code>&#42;&#47;&#42;</code>),
+ * <p>By default, this converter supports all media types ({@code &#42;&#47;&#42;}),
  * and writes with a {@code Content-Type} of {@code text/plain}. This can be overridden
  * by setting the {@link #setSupportedMediaTypes supportedMediaTypes} property.
  *
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 c36c8c1958..a04b3e44f9 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
@@ -228,7 +228,7 @@ public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConv
 	/**
 	 * Determine the JSON encoding to use for the given content type.
 	 * @param contentType the media type as requested by the caller
-	 * @return the JSON encoding to use (never <code>null</code>)
+	 * @return the JSON encoding to use (never {@code null})
 	 */
 	protected JsonEncoding getJsonEncoding(MediaType contentType) {
 		if (contentType != null && contentType.getCharSet() != null) {
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 3b8566e337..dee7fe7869 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
@@ -224,7 +224,7 @@ public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConve
 	/**
 	 * Determine the JSON encoding to use for the given content type.
 	 * @param contentType the media type as requested by the caller
-	 * @return the JSON encoding to use (never <code>null</code>)
+	 * @return the JSON encoding to use (never {@code null})
 	 */
 	protected JsonEncoding getJsonEncoding(MediaType contentType) {
 		if (contentType != null && contentType.getCharSet() != null) {
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java
index efb6944ae5..ae0c080131 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java
@@ -76,7 +76,7 @@ public class MarshallingHttpMessageConverter extends AbstractXmlHttpMessageConve
 	}
 
 	/**
-	 * Construct a new <code>MarshallingMessageConverter</code> with the given
+	 * Construct a new {@code MarshallingMessageConverter} with the given
 	 * {@code Marshaller} and {@code Unmarshaller}.
 	 * @param marshaller the Marshaller to use
 	 * @param unmarshaller the Unmarshaller to use
diff --git a/spring-web/src/main/java/org/springframework/http/package-info.java b/spring-web/src/main/java/org/springframework/http/package-info.java
index baa15e881d..753bafd0cc 100644
--- a/spring-web/src/main/java/org/springframework/http/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/package-info.java
@@ -1,8 +1,7 @@
-
 /**
  *
  * Contains a basic abstraction over client/server-side HTTP. This package contains
- * the <code>HttpInputMessage</code> and <code>HttpOutputMessage</code> interfaces.
+ * the {@code HttpInputMessage} and {@code HttpOutputMessage} interfaces.
  *
  */
 package org.springframework.http;
diff --git a/spring-web/src/main/java/org/springframework/http/server/package-info.java b/spring-web/src/main/java/org/springframework/http/server/package-info.java
index 1e49b115a3..1c8d600682 100644
--- a/spring-web/src/main/java/org/springframework/http/server/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/server/package-info.java
@@ -1,9 +1,8 @@
-
 /**
  *
  * Contains an abstraction over server-side HTTP. This package
- * contains the <code>ServerHttpRequest</code> and
- * <code>ServerHttpResponse</code>, as well as a Servlet-based implementation of these
+ * contains the {@code ServerHttpRequest} and
+ * {@code ServerHttpResponse}, as well as a Servlet-based implementation of these
  * interfaces.
  *
  */
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
index 57418a6747..e02fb1e230 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
@@ -81,7 +81,7 @@ public class HessianClientInterceptor extends UrlBasedRemoteAccessor implements
 	/**
 	 * Specify the Hessian SerializerFactory to use.
 	 * <p>This will typically be passed in as an inner bean definition
-	 * of type <code>com.caucho.hessian.io.SerializerFactory</code>,
+	 * of type {@code com.caucho.hessian.io.SerializerFactory},
 	 * with custom bean property values applied.
 	 */
 	public void setSerializerFactory(SerializerFactory serializerFactory) {
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
index a3a3aeca6c..55ffc30c63 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
@@ -68,7 +68,7 @@ public class HessianExporter extends RemoteExporter implements InitializingBean
 	/**
 	 * Specify the Hessian SerializerFactory to use.
 	 * <p>This will typically be passed in as an inner bean definition
-	 * of type <code>com.caucho.hessian.io.SerializerFactory</code>,
+	 * of type {@code com.caucho.hessian.io.SerializerFactory},
 	 * with custom bean property values applied.
 	 */
 	public void setSerializerFactory(SerializerFactory serializerFactory) {
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
index 257d4a306f..7dd174260b 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
@@ -150,10 +150,10 @@ public abstract class AbstractHttpInvokerRequestExecutor
 
 	/**
 	 * Serialize the given RemoteInvocation to the given OutputStream.
-	 * <p>The default implementation gives <code>decorateOutputStream</code> a chance
+	 * <p>The default implementation gives {@code decorateOutputStream} a chance
 	 * to decorate the stream first (for example, for custom encryption or compression).
-	 * Creates an <code>ObjectOutputStream</code> for the final stream and calls
-	 * <code>doWriteRemoteInvocation</code> to actually write the object.
+	 * Creates an {@code ObjectOutputStream} for the final stream and calls
+	 * {@code doWriteRemoteInvocation} to actually write the object.
 	 * <p>Can be overridden for custom serialization of the invocation.
 	 * @param invocation the RemoteInvocation object
 	 * @param os the OutputStream to write to
@@ -186,7 +186,7 @@ public abstract class AbstractHttpInvokerRequestExecutor
 	/**
 	 * Perform the actual writing of the given invocation object to the
 	 * given ObjectOutputStream.
-	 * <p>The default implementation simply calls <code>writeObject</code>.
+	 * <p>The default implementation simply calls {@code writeObject}.
 	 * Can be overridden for serialization of a custom wrapper object rather
 	 * than the plain invocation, for example an encryption-aware holder.
 	 * @param invocation the RemoteInvocation object
@@ -201,7 +201,7 @@ public abstract class AbstractHttpInvokerRequestExecutor
 
 	/**
 	 * Execute a request to send the given serialized remote invocation.
-	 * <p>Implementations will usually call <code>readRemoteInvocationResult</code>
+	 * <p>Implementations will usually call {@code readRemoteInvocationResult}
 	 * to deserialize a returned RemoteInvocationResult object.
 	 * @param config the HTTP invoker configuration that specifies the
 	 * target service
@@ -219,10 +219,10 @@ public abstract class AbstractHttpInvokerRequestExecutor
 
 	/**
 	 * Deserialize a RemoteInvocationResult object from the given InputStream.
-	 * <p>Gives <code>decorateInputStream</code> a chance to decorate the stream
+	 * <p>Gives {@code decorateInputStream} a chance to decorate the stream
 	 * first (for example, for custom encryption or compression). Creates an
-	 * <code>ObjectInputStream</code> via <code>createObjectInputStream</code> and
-	 * calls <code>doReadRemoteInvocationResult</code> to actually read the object.
+	 * {@code ObjectInputStream} via {@code createObjectInputStream} and
+	 * calls {@code doReadRemoteInvocationResult} to actually read the object.
 	 * <p>Can be overridden for custom serialization of the invocation.
 	 * @param is the InputStream to read from
 	 * @param codebaseUrl the codebase URL to load classes from if not found locally
@@ -262,7 +262,7 @@ public abstract class AbstractHttpInvokerRequestExecutor
 	 * The default implementation creates a CodebaseAwareObjectInputStream.
 	 * @param is the InputStream to read from
 	 * @param codebaseUrl the codebase URL to load classes from if not found locally
-	 * (can be <code>null</code>)
+	 * (can be {@code null})
 	 * @return the new ObjectInputStream instance to use
 	 * @throws IOException if creation of the ObjectInputStream failed
 	 * @see org.springframework.remoting.rmi.CodebaseAwareObjectInputStream
@@ -274,7 +274,7 @@ public abstract class AbstractHttpInvokerRequestExecutor
 	/**
 	 * Perform the actual reading of an invocation object from the
 	 * given ObjectInputStream.
-	 * <p>The default implementation simply calls <code>readObject</code>.
+	 * <p>The default implementation simply calls {@code readObject}.
 	 * Can be overridden for deserialization of a custom wrapper object rather
 	 * than the plain invocation, for example an encryption-aware holder.
 	 * @param ois the ObjectInputStream to read from
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java
index db048e24e3..2177d0d297 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java
@@ -34,7 +34,7 @@ public interface HttpInvokerClientConfiguration {
 	/**
 	 * Return the codebase URL to download classes from if not found locally.
 	 * Can consist of multiple URLs, separated by spaces.
-	 * @return the codebase URL, or <code>null</code> if none
+	 * @return the codebase URL, or {@code null} if none
 	 * @see java.rmi.server.RMIClassLoader
 	 */
 	String getCodebaseUrl();
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java
index 4fd4047ae7..7a754e198b 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java
@@ -73,7 +73,7 @@ import org.springframework.util.ReflectionUtils;
  * @see javax.xml.rpc.Service#getPort
  * @see org.springframework.remoting.RemoteAccessException
  * @see org.springframework.jndi.JndiObjectFactoryBean
- * @deprecated in favor of JAX-WS support in <code>org.springframework.remoting.jaxws</code>
+ * @deprecated in favor of JAX-WS support in {@code org.springframework.remoting.jaxws}
  */
 @Deprecated
 public class JaxRpcPortClientInterceptor extends LocalJaxRpcServiceFactory
@@ -292,7 +292,7 @@ public class JaxRpcPortClientInterceptor extends LocalJaxRpcServiceFactory
 	 * port stub should be used instead of the dynamic call mechanism.
 	 * See the javadoc of the "serviceInterface" property for more details.
 	 * <p>The interface must be suitable for a JAX-RPC port, that is, it must be
-	 * an RMI service interface (that extends <code>java.rmi.Remote</code>).
+	 * an RMI service interface (that extends {@code java.rmi.Remote}).
 	 * <p><b>NOTE:</b> Check whether your JAX-RPC provider returns thread-safe
 	 * port stubs. If not, use the dynamic call mechanism instead, which will
 	 * always be thread-safe. In particular, do not use JAX-RPC port stubs
@@ -354,7 +354,7 @@ public class JaxRpcPortClientInterceptor extends LocalJaxRpcServiceFactory
 	 * Create and initialize the JAX-RPC service for the specified port.
 	 * <p>Prepares a JAX-RPC stub if possible (if an RMI interface is available);
 	 * falls back to JAX-RPC dynamic calls else. Using dynamic calls can be enforced
-	 * through overriding {@link #alwaysUseJaxRpcCall} to return <code>true</code>.
+	 * through overriding {@link #alwaysUseJaxRpcCall} to return {@code true}.
 	 * <p>{@link #postProcessJaxRpcService} and {@link #postProcessPortStub}
 	 * hooks are available for customization in subclasses. When using dynamic calls,
 	 * each can be post-processed via {@link #postProcessJaxRpcCall}.
@@ -432,7 +432,7 @@ public class JaxRpcPortClientInterceptor extends LocalJaxRpcServiceFactory
 
 	/**
 	 * Return whether to always use JAX-RPC dynamic calls.
-	 * Called by <code>afterPropertiesSet</code>.
+	 * Called by {@code afterPropertiesSet}.
 	 * <p>Default is "false"; if an RMI interface is specified as "portInterface"
 	 * or "serviceInterface", it will be used to create a JAX-RPC port stub.
 	 * <p>Can be overridden to enforce the use of the JAX-RPC Call API,
@@ -708,7 +708,7 @@ public class JaxRpcPortClientInterceptor extends LocalJaxRpcServiceFactory
 	 * @param method the service interface method that we invoked
 	 * @param ex the original RemoteException
 	 * @return the exception to rethrow (may be the original RemoteException
-	 * or an extracted/wrapped exception, but never <code>null</code>)
+	 * or an extracted/wrapped exception, but never {@code null})
 	 */
 	protected Throwable handleRemoteException(Method method, RemoteException ex) {
 		boolean isConnectFailure = isConnectFailure(ex);
@@ -733,7 +733,7 @@ public class JaxRpcPortClientInterceptor extends LocalJaxRpcServiceFactory
 
 	/**
 	 * Determine whether the given RMI exception indicates a connect failure.
-	 * <p>The default implementation returns <code>true</code> unless the
+	 * <p>The default implementation returns {@code true} unless the
 	 * exception class name (or exception superclass name) contains the term
 	 * "Fault" (e.g. "AxisFault"), assuming that the JAX-RPC provider only
 	 * throws RemoteException in case of WSDL faults and connect failures.
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java
index 45c5e8d9fe..9f6a53ef8b 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java
@@ -43,7 +43,7 @@ import org.springframework.util.ClassUtils;
  * @see #setServiceInterface
  * @see #setPortInterface
  * @see LocalJaxRpcServiceFactoryBean
- * @deprecated in favor of JAX-WS support in <code>org.springframework.remoting.jaxws</code>
+ * @deprecated in favor of JAX-WS support in {@code org.springframework.remoting.jaxws}
  */
 @Deprecated
 public class JaxRpcPortProxyFactoryBean extends JaxRpcPortClientInterceptor
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcServicePostProcessor.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcServicePostProcessor.java
index 3ca579d9f9..f41ccc6508 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcServicePostProcessor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcServicePostProcessor.java
@@ -32,14 +32,14 @@ import javax.xml.rpc.Service;
  * @see JaxRpcPortClientInterceptor#setServicePostProcessors
  * @see JaxRpcPortProxyFactoryBean#setServicePostProcessors
  * @see javax.xml.rpc.Service#getTypeMappingRegistry
- * @deprecated in favor of JAX-WS support in <code>org.springframework.remoting.jaxws</code>
+ * @deprecated in favor of JAX-WS support in {@code org.springframework.remoting.jaxws}
  */
 @Deprecated
 public interface JaxRpcServicePostProcessor {
 
 	/**
 	 * Post-process the given JAX-RPC {@link Service}.
-	 * @param service the current JAX-RPC <code>Service</code>
+	 * @param service the current JAX-RPC {@code Service}
 	 * (can be cast to an implementation-specific class if necessary)
 	 */
 	void postProcessJaxRpcService(Service service);
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java
index acd91b6663..dd625ec931 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java
@@ -27,7 +27,7 @@ import org.springframework.remoting.soap.SoapFaultException;
  *
  * @author Juergen Hoeller
  * @since 2.5
- * @deprecated in favor of JAX-WS support in <code>org.springframework.remoting.jaxws</code>
+ * @deprecated in favor of JAX-WS support in {@code org.springframework.remoting.jaxws}
  */
 @Deprecated
 public class JaxRpcSoapFaultException extends SoapFaultException {
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java
index bdedae20f3..f6ef74740f 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java
@@ -43,7 +43,7 @@ import org.springframework.beans.BeanUtils;
  * @see LocalJaxRpcServiceFactoryBean
  * @see JaxRpcPortClientInterceptor
  * @see JaxRpcPortProxyFactoryBean
- * @deprecated in favor of JAX-WS support in <code>org.springframework.remoting.jaxws</code>
+ * @deprecated in favor of JAX-WS support in {@code org.springframework.remoting.jaxws}
  */
 @Deprecated
 public class LocalJaxRpcServiceFactory {
@@ -100,7 +100,7 @@ public class LocalJaxRpcServiceFactory {
 	}
 
 	/**
-	 * Return the ServiceFactory class to use, or <code>null</code> if default.
+	 * Return the ServiceFactory class to use, or {@code null} if default.
 	 */
 	public Class getServiceFactoryClass() {
 		return this.serviceFactoryClass;
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java
index c5dfe43c9c..4a27d8b7a4 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java
@@ -35,7 +35,7 @@ import org.springframework.beans.factory.InitializingBean;
  * @see javax.xml.rpc.Service
  * @see org.springframework.jndi.JndiObjectFactoryBean
  * @see JaxRpcPortProxyFactoryBean
- * @deprecated in favor of JAX-WS support in <code>org.springframework.remoting.jaxws</code>
+ * @deprecated in favor of JAX-WS support in {@code org.springframework.remoting.jaxws}
  */
 @Deprecated
 public class LocalJaxRpcServiceFactoryBean extends LocalJaxRpcServiceFactory
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
index ab206aad4b..1e642e3755 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
@@ -56,7 +56,7 @@ import org.springframework.web.util.WebUtils;
  * @since 16.12.2003
  * @see #init
  * @see #getWebApplicationContext
- * @deprecated in favor of JAX-WS support in <code>org.springframework.remoting.jaxws</code>
+ * @deprecated in favor of JAX-WS support in {@code org.springframework.remoting.jaxws}
  */
 @Deprecated
 public abstract class ServletEndpointSupport implements ServiceLifecycle {
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java
index 47e8bd0290..9efd206e5f 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java
@@ -403,7 +403,7 @@ public class JaxWsPortClientInterceptor extends LocalJaxWsServiceFactory
 	 * @param service the Service object to obtain the port from
 	 * @param portQName the name of the desired port, if specified
 	 * @return the corresponding port object as returned from
-	 * <code>Service.getPort(...)</code>
+	 * {@code Service.getPort(...)}
 	 */
 	protected Object getPortStub(Service service, QName portQName) {
 		if (this.webServiceFeatures != null) {
diff --git a/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java b/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
index bef03d15fa..1f76983228 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
@@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletResponse;
  * <p>The easiest way to expose an HttpRequestHandler bean in Spring style
  * is to define it in Spring's root web application context and define
  * an {@link org.springframework.web.context.support.HttpRequestHandlerServlet}
- * in <code>web.xml</code>, pointing at the target HttpRequestHandler bean
- * through its <code>servlet-name</code> which needs to match the target bean name.
+ * in {@code web.xml}, pointing at the target HttpRequestHandler bean
+ * through its {@code servlet-name} which needs to match the target bean name.
  *
  * <p>Supported as a handler type within Spring's
  * {@link org.springframework.web.servlet.DispatcherServlet}, being able
@@ -61,7 +61,7 @@ import javax.servlet.http.HttpServletResponse;
  * DispatcherServlet</i>. However, this is usually not necessary, since
  * HttpRequestHandlers typically only support POST requests to begin with.
  * Alternatively, a handler may implement the "If-Modified-Since" HTTP
- * header processing manually within its <code>handle</code> method.
+ * header processing manually within its {@code handle} method.
  *
  * @author Juergen Hoeller
  * @since 2.0
diff --git a/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java b/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
index 03230048e9..10863f82fc 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
@@ -27,7 +27,7 @@ import org.springframework.web.util.HtmlUtils;
 /**
  * Errors wrapper that adds automatic HTML escaping to the wrapped instance,
  * for convenient usage in HTML views. Can be retrieved easily via
- * RequestContext's <code>getErrors</code> method.
+ * RequestContext's {@code getErrors} method.
  *
  * <p>Note that BindTag does <i>not</i> use this class to avoid unnecessary
  * creation of ObjectError instances. It just escapes the messages and values
diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
index 6ff75e8b09..83c0660e5a 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
@@ -33,12 +33,12 @@ import org.springframework.web.util.WebUtils;
  *
  * <p>Used by Spring Web MVC's BaseCommandController and MultiActionController.
  * Note that BaseCommandController and its subclasses allow for easy customization
- * of the binder instances that they use through overriding <code>initBinder</code>.
+ * of the binder instances that they use through overriding {@code initBinder}.
  *
  * <p>Can also be used for manual data binding in custom web controllers:
  * for example, in a plain Controller implementation or in a MultiActionController
  * handler method. Simply instantiate a ServletRequestDataBinder for each binding
- * process, and invoke <code>bind</code> with the current ServletRequest as argument:
+ * process, and invoke {@code bind} with the current ServletRequest as argument:
  *
  * <pre class="code">
  * MyBean myBean = new MyBean();
@@ -65,7 +65,7 @@ public class ServletRequestDataBinder extends WebDataBinder {
 
 	/**
 	 * Create a new ServletRequestDataBinder instance, with default object name.
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @see #DEFAULT_OBJECT_NAME
 	 */
@@ -75,7 +75,7 @@ public class ServletRequestDataBinder extends WebDataBinder {
 
 	/**
 	 * Create a new ServletRequestDataBinder instance.
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @param objectName the name of the target object
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java
index 28e4e34228..1bb0351ea6 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java
@@ -45,11 +45,11 @@ public abstract class ServletRequestUtils {
 
 
 	/**
-	 * Get an Integer parameter, or <code>null</code> if not present.
+	 * Get an Integer parameter, or {@code null} if not present.
 	 * Throws an exception if it the parameter value isn't a number.
 	 * @param request current HTTP request
 	 * @param name the name of the parameter
-	 * @return the Integer value, or <code>null</code> if not present
+	 * @return the Integer value, or {@code null} if not present
 	 * @throws ServletRequestBindingException a subclass of ServletException,
 	 * so it doesn't need to be caught
 	 */
@@ -123,11 +123,11 @@ public abstract class ServletRequestUtils {
 
 
 	/**
-	 * Get a Long parameter, or <code>null</code> if not present.
+	 * Get a Long parameter, or {@code null} if not present.
 	 * Throws an exception if it the parameter value isn't a number.
 	 * @param request current HTTP request
 	 * @param name the name of the parameter
-	 * @return the Long value, or <code>null</code> if not present
+	 * @return the Long value, or {@code null} if not present
 	 * @throws ServletRequestBindingException a subclass of ServletException,
 	 * so it doesn't need to be caught
 	 */
@@ -201,11 +201,11 @@ public abstract class ServletRequestUtils {
 
 
 	/**
-	 * Get a Float parameter, or <code>null</code> if not present.
+	 * Get a Float parameter, or {@code null} if not present.
 	 * Throws an exception if it the parameter value isn't a number.
 	 * @param request current HTTP request
 	 * @param name the name of the parameter
-	 * @return the Float value, or <code>null</code> if not present
+	 * @return the Float value, or {@code null} if not present
 	 * @throws ServletRequestBindingException a subclass of ServletException,
 	 * so it doesn't need to be caught
 	 */
@@ -279,11 +279,11 @@ public abstract class ServletRequestUtils {
 
 
 	/**
-	 * Get a Double parameter, or <code>null</code> if not present.
+	 * Get a Double parameter, or {@code null} if not present.
 	 * Throws an exception if it the parameter value isn't a number.
 	 * @param request current HTTP request
 	 * @param name the name of the parameter
-	 * @return the Double value, or <code>null</code> if not present
+	 * @return the Double value, or {@code null} if not present
 	 * @throws ServletRequestBindingException a subclass of ServletException,
 	 * so it doesn't need to be caught
 	 */
@@ -357,13 +357,13 @@ public abstract class ServletRequestUtils {
 
 
 	/**
-	 * Get a Boolean parameter, or <code>null</code> if not present.
+	 * Get a Boolean parameter, or {@code null} if not present.
 	 * Throws an exception if it the parameter value isn't a boolean.
 	 * <p>Accepts "true", "on", "yes" (any case) and "1" as values for true;
 	 * treats every other non-empty value as false (i.e. parses leniently).
 	 * @param request current HTTP request
 	 * @param name the name of the parameter
-	 * @return the Boolean value, or <code>null</code> if not present
+	 * @return the Boolean value, or {@code null} if not present
 	 * @throws ServletRequestBindingException a subclass of ServletException,
 	 * so it doesn't need to be caught
 	 */
@@ -447,10 +447,10 @@ public abstract class ServletRequestUtils {
 
 
 	/**
-	 * Get a String parameter, or <code>null</code> if not present.
+	 * Get a String parameter, or {@code null} if not present.
 	 * @param request current HTTP request
 	 * @param name the name of the parameter
-	 * @return the String value, or <code>null</code> if not present
+	 * @return the String value, or {@code null} if not present
 	 * @throws ServletRequestBindingException a subclass of ServletException,
 	 * so it doesn't need to be caught
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
index c067b432ee..e6d8491283 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
@@ -24,8 +24,8 @@ import org.springframework.util.StringUtils;
 
 /**
  * {@link ServletRequestBindingException} subclass that indicates an unsatisfied
- * parameter condition, as typically expressed using an <code>@RequestMapping</code>
- * annotation at the <code>@Controller</code> type level.
+ * parameter condition, as typically expressed using an {@code @RequestMapping}
+ * annotation at the {@code @Controller} type level.
  *
  * @author Juergen Hoeller
  * @since 3.0
diff --git a/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java
index 6c365e1783..d48e3d611d 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java
@@ -80,7 +80,7 @@ public class WebDataBinder extends DataBinder {
 
 	/**
 	 * Create a new WebDataBinder instance, with default object name.
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @see #DEFAULT_OBJECT_NAME
 	 */
@@ -90,7 +90,7 @@ public class WebDataBinder extends DataBinder {
 
 	/**
 	 * Create a new WebDataBinder instance.
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @param objectName the name of the target object
 	 */
@@ -112,7 +112,7 @@ public class WebDataBinder extends DataBinder {
 	 * <p>One way to address this is to look for a checkbox parameter value if
 	 * you know that the checkbox has been visible in the form, resetting the
 	 * checkbox if no value found. In Spring web MVC, this typically happens
-	 * in a custom <code>onBind</code> implementation.
+	 * in a custom {@code onBind} implementation.
 	 * <p>This auto-reset mechanism addresses this deficiency, provided
 	 * that a marker parameter is sent for each checkbox field, like
 	 * "_subscribeToNewsletter" for a "subscribeToNewsletter" field.
@@ -245,9 +245,9 @@ public class WebDataBinder extends DataBinder {
 
 	/**
 	 * Determine an empty value for the specified field.
-	 * <p>Default implementation returns <code>Boolean.FALSE</code>
+	 * <p>Default implementation returns {@code Boolean.FALSE}
 	 * for boolean fields and an empty array of array types.
-	 * Else, <code>null</code> is used as default.
+	 * Else, {@code null} is used as default.
 	 * @param field the name of the field
 	 * @param fieldType the type of the field
 	 * @return the empty value (for most fields: null)
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
index 1bc57b7f90..a071859af9 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
@@ -51,12 +51,12 @@ public @interface CookieValue {
 
 	/**
 	 * Whether the header is required.
-	 * <p>Default is <code>true</code>, leading to an exception being thrown
+	 * <p>Default is {@code true}, leading to an exception being thrown
 	 * in case the header is missing in the request. Switch this to
-	 * <code>false</code> if you prefer a <code>null</value> in case of the
+	 * {@code false} if you prefer a {@code null} in case of the
 	 * missing header.
 	 * <p>Alternatively, provide a {@link #defaultValue() defaultValue},
-	 * which implicitly sets this flag to <code>false</code>.
+	 * which implicitly sets this flag to {@code false}.
 	 */
 	boolean required() default true;
 
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java
index 806e452bb5..760fd840ff 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java
@@ -45,7 +45,7 @@ import java.lang.annotation.Target;
  * <li>Session object (Servlet API or Portlet API): either
  * {@link javax.servlet.http.HttpSession} or {@link javax.portlet.PortletSession}.
  * An argument of this type will enforce the presence of a corresponding session.
- * As a consequence, such an argument will never be <code>null</code>.
+ * As a consequence, such an argument will never be {@code null}.
  * <i>Note that session access may not be thread-safe, in particular in a
  * Servlet environment: Consider switching the
  * {@link org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter#setSynchronizeOnSession "synchronizeOnSession"}
@@ -68,14 +68,14 @@ import java.lang.annotation.Target;
  *
  * <p>The following return types are supported for handler methods:
  * <ul>
- * <li>A <code>ModelAndView</code> object (Servlet MVC or Portlet MVC).
+ * <li>A {@code ModelAndView} object (Servlet MVC or Portlet MVC).
  * <li>A {@link org.springframework.ui.Model Model} object, with the view name
  * implicitly determined through a {@link org.springframework.web.servlet.RequestToViewNameTranslator}.
  * <li>A {@link java.util.Map} object for exposing a model,
  * with the view name implicitly determined through a
  * {@link org.springframework.web.servlet.RequestToViewNameTranslator}.
  * <li>A {@link org.springframework.web.servlet.View} object.
- * <li>A {@link java.lang.String} value which is interpreted as view name.
+ * <li>A {@link String} value which is interpreted as view name.
  * <li>{@link ResponseBody @ResponseBody} annotated methods (Servlet-only)
  * to set the response content. The return value will be converted to the
  * response stream using
@@ -85,7 +85,7 @@ import java.lang.annotation.Target;
  * (Servlet-only) to set response headers and content. The ResponseEntity body
  * will be converted and written to the response stream using
  * {@linkplain org.springframework.http.converter.HttpMessageConverter message converters}.
- * <li><code>void</code> if the method handles the response itself (by
+ * <li>{@code void} if the method handles the response itself (by
  * writing the response content directly, declaring an argument of type
  * {@link javax.servlet.ServletResponse} / {@link javax.servlet.http.HttpServletResponse}
  * / {@link javax.portlet.RenderResponse} for that purpose)
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java
index 9b22b261c4..3608d9c7e4 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java
@@ -31,7 +31,7 @@ import java.lang.annotation.Target;
  * <p>Such init-binder methods support all arguments that {@link RequestMapping}
  * supports, except for command/form objects and corresponding validation result
  * objects. Init-binder methods must not have a return value; they are usually
- * declared as <code>void</code>.
+ * declared as {@code void}.
  *
  * <p>Typical arguments are {@link org.springframework.web.bind.WebDataBinder}
  * in combination with {@link org.springframework.web.context.request.WebRequest}
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/MatrixVariable.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/MatrixVariable.java
index 22d5f36ccb..73b1ab5682 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/MatrixVariable.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/MatrixVariable.java
@@ -49,11 +49,11 @@ public @interface MatrixVariable {
 
 	/**
 	 * Whether the matrix variable is required.
-	 * <p>Default is <code>true</code>, leading to an exception thrown in case
-	 * of the variable missing in the request. Switch this to <code>false</code>
-	 * if you prefer a <code>null</value> in case of the variable missing.
+	 * <p>Default is {@code true}, leading to an exception thrown in case
+	 * of the variable missing in the request. Switch this to {@code false}
+	 * if you prefer a {@code null} in case of the variable missing.
 	 * <p>Alternatively, provide a {@link #defaultValue() defaultValue},
-	 * which implicitly sets this flag to <code>false</code>.
+	 * which implicitly sets this flag to {@code false}.
 	 */
 	boolean required() default true;
 
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 33bb41b849..b04bb01567 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
@@ -46,9 +46,9 @@ public @interface RequestBody {
 
 	/**
 	 * Whether body content is required.
-	 * <p>Default is <code>true</code>, leading to an exception thrown in case
-	 * there is no body content. Switch this to <code>false</code> if you prefer
-	 * <code>null</value> to be passed when the body content is <code>null</code>.
+	 * <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}.
 	 */
 	boolean required() default true;
 
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java
index 2841462e4c..24ade7d0fd 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java
@@ -46,11 +46,11 @@ public @interface RequestHeader {
 
 	/**
 	 * Whether the header is required.
-	 * <p>Default is <code>true</code>, leading to an exception thrown in case
-	 * of the header missing in the request. Switch this to <code>false</code>
-	 * if you prefer a <code>null</value> in case of the header missing.
+	 * <p>Default is {@code true}, leading to an exception thrown in case
+	 * of the header missing in the request. Switch this to {@code false}
+	 * if you prefer a {@code null} in case of the header missing.
 	 * <p>Alternatively, provide a {@link #defaultValue() defaultValue},
-	 * which implicitely sets this flag to <code>false</code>.
+	 * which implicitely sets this flag to {@code false}.
 	 */
 	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 d660dae656..ff4849e35e 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
@@ -54,7 +54,7 @@ import java.util.concurrent.Callable;
  * <li>Session object (Servlet API or Portlet API): either
  * {@link javax.servlet.http.HttpSession} or {@link javax.portlet.PortletSession}.
  * An argument of this type will enforce the presence of a corresponding session.
- * As a consequence, such an argument will never be <code>null</code>.
+ * As a consequence, such an argument will never be {@code null}.
  * <i>Note that session access may not be thread-safe, in particular in a
  * Servlet environment: Consider switching the
  * {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter#setSynchronizeOnSession "synchronizeOnSession"}
@@ -161,7 +161,7 @@ import java.util.concurrent.Callable;
  *
  * <p>The following return types are supported for handler methods:
  * <ul>
- * <li>A <code>ModelAndView</code> object (Servlet MVC or Portlet MVC),
+ * <li>A {@code ModelAndView} object (Servlet MVC or Portlet MVC),
  * with the model implicitly enriched with command objects and the results
  * of {@link ModelAttribute} annotated reference data accessor methods.
  * <li>A {@link org.springframework.ui.Model Model} object, with the view name
@@ -178,7 +178,7 @@ import java.util.concurrent.Callable;
  * {@link ModelAttribute} annotated reference data accessor methods.
  * The handler method may also programmatically enrich the model by
  * declaring a {@link org.springframework.ui.Model} argument (see above).
- * <li>A {@link java.lang.String} value which is interpreted as view name,
+ * <li>A {@link String} value which is interpreted as view name,
  * with the model implicitly determined through command objects and
  * {@link ModelAttribute} annotated reference data accessor methods.
  * The handler method may also programmatically enrich the model by
@@ -201,7 +201,7 @@ import java.util.concurrent.Callable;
  * <li>A {@code org.springframework.web.context.request.async.DeferredResult}
  * which the application uses to produce a return value in a separate
  * thread of its own choosing, as an alternative to returning a Callable.
- * <li><code>void</code> if the method handles the response itself (by
+ * <li>{@code void} if the method handles the response itself (by
  * writing the response content directly, declaring an argument of type
  * {@link javax.servlet.ServletResponse} / {@link javax.servlet.http.HttpServletResponse}
  * / {@link javax.portlet.RenderResponse} for that purpose)
@@ -217,28 +217,28 @@ import java.util.concurrent.Callable;
  * {@link ModelAttribute} annotated reference data accessor methods.
  * </ul>
  *
- * <p><b>NOTE:</b> <code>@RequestMapping</code> will only be processed if an
- * an appropriate <code>HandlerMapping</code>-<code>HandlerAdapter</code> pair
+ * <p><b>NOTE:</b> {@code @RequestMapping} will only be processed if an
+ * an appropriate {@code HandlerMapping}-{@code HandlerAdapter} pair
  * is configured. This is the case by default in both the
- * <code>DispatcherServlet</code> and the <code>DispatcherPortlet</code>.
- * However, if you are defining custom <code>HandlerMappings</code> or
- * <code>HandlerAdapters</code>, then you need to add
- * <code>DefaultAnnotationHandlerMapping</code> and
- * <code>AnnotationMethodHandlerAdapter</code> to your configuration.</code>.
+ * {@code DispatcherServlet} and the {@code DispatcherPortlet}.
+ * However, if you are defining custom {@code HandlerMappings} or
+ * {@code HandlerAdapters}, then you need to add
+ * {@code DefaultAnnotationHandlerMapping} and
+ * {@code AnnotationMethodHandlerAdapter} to your configuration.</code>.
  *
  * <p><b>NOTE:</b> Spring 3.1 introduced a new set of support classes for
- * <code>@RequestMapping</code> methods in Servlet environments called
- * <code>RequestMappingHandlerMapping</code> and
- * <code>RequestMappingHandlerAdapter</code>. They are recommended for use and
+ * {@code @RequestMapping} methods in Servlet environments called
+ * {@code RequestMappingHandlerMapping} and
+ * {@code RequestMappingHandlerAdapter}. They are recommended for use and
  * even required to take advantage of new features in Spring MVC 3.1 (search
  * {@literal "@MVC 3.1-only"} in this source file) and going forward.
  * The new support classes are enabled by default from the MVC namespace and
- * with use of the MVC Java config (<code>@EnableWebMvc</code>) but must be
+ * with use of the MVC Java config ({@code @EnableWebMvc}) but must be
  * configured explicitly if using neither.
  *
  * <p><b>NOTE:</b> When using controller interfaces (e.g. for AOP proxying),
  * make sure to consistently put <i>all</i> your mapping annotations - such as
- * <code>@RequestMapping</code> and <code>@SessionAttributes</code> - on
+ * {@code @RequestMapping} and {@code @SessionAttributes} - on
  * the controller <i>interface</i> rather than on the implementation class.
  *
  * @author Juergen Hoeller
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java
index 2c3d7ecec2..0782b22a67 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java
@@ -59,11 +59,11 @@ public @interface RequestParam {
 
 	/**
 	 * Whether the parameter is required.
-	 * <p>Default is <code>true</code>, leading to an exception thrown in case
-	 * of the parameter missing in the request. Switch this to <code>false</code>
-	 * if you prefer a <code>null</value> in case of the parameter missing.
+	 * <p>Default is {@code true}, leading to an exception thrown in case
+	 * of the parameter missing in the request. Switch this to {@code false}
+	 * if you prefer a {@code null} in case of the parameter missing.
 	 * <p>Alternatively, provide a {@link #defaultValue() defaultValue},
-	 * which implicitly sets this flag to <code>false</code>.
+	 * which implicitly sets this flag to {@code false}.
 	 */
 	boolean required() default true;
 
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
index 47a5fe8a62..a6e90fb981 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
@@ -67,9 +67,9 @@ public @interface RequestPart {
 
 	/**
 	 * Whether the part is required.
-	 * <p>Default is <code>true</code>, leading to an exception thrown in case
-	 * of the part missing in the request. Switch this to <code>false</code>
-	 * if you prefer a <code>null</value> in case of the part missing.
+	 * <p>Default is {@code true}, leading to an exception thrown in case
+	 * of the part missing in the request. Switch this to {@code false}
+	 * if you prefer a {@code null} in case of the part missing.
 	 */
 	boolean required() default true;
 
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java
index ec9138f0ac..6ea979dea5 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java
@@ -39,13 +39,13 @@ import java.lang.annotation.Target;
  * specific handler's conversation.
  *
  * <p>For permanent session attributes, e.g. a user authentication object,
- * use the traditional <code>session.setAttribute</code> method instead.
+ * use the traditional {@code session.setAttribute} method instead.
  * Alternatively, consider using the attribute management capabilities of the
  * generic {@link org.springframework.web.context.request.WebRequest} interface.
  *
  * <p><b>NOTE:</b> When using controller interfaces (e.g. for AOP proxying),
  * make sure to consistently put <i>all</i> your mapping annotations - such as
- * <code>@RequestMapping</code> and <code>@SessionAttributes</code> - on
+ * {@code @RequestMapping} and {@code @SessionAttributes} - on
  * the controller <i>interface</i> rather than on the implementation class.
  *
  * @author Juergen Hoeller
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java
index a5095f296e..3d2717c4c1 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java
@@ -26,7 +26,7 @@ public interface ValueConstants {
 
 	/**
 	 * Constant defining a value for no default - as a replacement for
-	 * <code>null</code> which we cannot use in annotation attributes.
+	 * {@code null} which we cannot use in annotation attributes.
 	 * <p>This is an artificial arrangement of 16 unicode characters,
 	 * with its sole purpose being to never match user-declared values.
 	 * @see RequestParam#defaultValue()
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java
index 3595a88893..699f2aa8a2 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java
@@ -36,8 +36,8 @@ import org.springframework.web.bind.annotation.SessionAttributes;
 
 /**
  * Support class for resolving web method annotations in a handler type.
- * Processes <code>@RequestMapping</code>, <code>@InitBinder</code>,
- * <code>@ModelAttribute</code> and <code>@SessionAttributes</code>.
+ * Processes {@code @RequestMapping}, {@code @InitBinder},
+ * {@code @ModelAttribute} and {@code @SessionAttributes}.
  *
  * <p>Used by {@link org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter}
  * and {@link org.springframework.web.portlet.mvc.annotation.AnnotationMethodHandlerAdapter}.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java b/spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java
index 68a251d832..8b0d4ffb27 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java
@@ -78,8 +78,8 @@ public class ConfigurableWebBindingInitializer implements WebBindingInitializer
 
 	/**
 	 * Set whether to use direct field access instead of bean property access.
-	 * <p>Default is <code>false</code>, using bean property access.
-	 * Switch this to <code>true</code> in order to enforce direct field access.
+	 * <p>Default is {@code false}, using bean property access.
+	 * Switch this to {@code true} in order to enforce direct field access.
 	 * @see org.springframework.validation.DataBinder#initDirectFieldAccess()
 	 * @see org.springframework.validation.DataBinder#initBeanPropertyAccess()
 	 */
@@ -97,7 +97,7 @@ public class ConfigurableWebBindingInitializer implements WebBindingInitializer
 	/**
 	 * Set the strategy to use for resolving errors into message codes.
 	 * Applies the given strategy to all data binders used by this controller.
-	 * <p>Default is <code>null</code>, i.e. using the default strategy of
+	 * <p>Default is {@code null}, i.e. using the default strategy of
 	 * the data binder.
 	 * @see org.springframework.validation.DataBinder#setMessageCodesResolver
 	 */
@@ -114,8 +114,8 @@ public class ConfigurableWebBindingInitializer implements WebBindingInitializer
 
 	/**
 	 * Set the strategy to use for processing binding errors, that is,
-	 * required field errors and <code>PropertyAccessException</code>s.
-	 * <p>Default is <code>null</code>, that is, using the default strategy
+	 * required field errors and {@code PropertyAccessException}s.
+	 * <p>Default is {@code null}, that is, using the default strategy
 	 * of the data binder.
 	 * @see org.springframework.validation.DataBinder#setBindingErrorProcessor
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java b/spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java
index e428074dad..db5ce0aef9 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java
@@ -41,10 +41,10 @@ public interface SessionAttributeStore {
 	 * Retrieve the specified attribute from the backend session.
 	 * <p>This will typically be called with the expectation that the
 	 * attribute is already present, with an exception to be thrown
-	 * if this method returns <code>null</code>.
+	 * if this method returns {@code null}.
 	 * @param request the current request
 	 * @param attributeName the name of the attribute
-	 * @return the current attribute value, or <code>null</code> if none
+	 * @return the current attribute value, or {@code null} if none
 	 */
 	Object retrieveAttribute(WebRequest request, String attributeName);
 
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java b/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java
index 1839316574..7eac9e58e9 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java
@@ -18,7 +18,7 @@ package org.springframework.web.bind.support;
 
 /**
  * Simple implementation of the {@link SessionStatus} interface,
- * keeping the <code>complete</code> flag as an instance variable.
+ * keeping the {@code complete} flag as an instance variable.
  *
  * @author Juergen Hoeller
  * @since 2.5
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java
index d151266be9..6faa10fddc 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java
@@ -55,7 +55,7 @@ public interface WebArgumentResolver {
 	 * Resolve an argument for the given handler method parameter within the given web request.
 	 * @param methodParameter the handler method parameter to resolve
 	 * @param webRequest the current web request, allowing access to the native request as well
-	 * @return the argument value, or <code>UNRESOLVED</code> if not resolvable
+	 * @return the argument value, or {@code UNRESOLVED} if not resolvable
 	 * @throws Exception in case of resolution failure
 	 */
 	Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) throws Exception;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
index dd7d69ac48..3b14991df2 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
@@ -35,7 +35,7 @@ import org.springframework.web.multipart.MultipartRequest;
  * that build on Spring's {@link org.springframework.web.context.request.WebRequest}
  * abstraction: e.g. in a {@link org.springframework.web.context.request.WebRequestInterceptor}
  * implementation. Simply instantiate a WebRequestDataBinder for each binding
- * process, and invoke <code>bind</code> with the current WebRequest as argument:
+ * process, and invoke {@code bind} with the current WebRequest as argument:
  *
  * <pre class="code">
  * MyBean myBean = new MyBean();
@@ -61,7 +61,7 @@ public class WebRequestDataBinder extends WebDataBinder {
 
 	/**
 	 * Create a new WebRequestDataBinder instance, with default object name.
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @see #DEFAULT_OBJECT_NAME
 	 */
@@ -71,7 +71,7 @@ public class WebRequestDataBinder extends WebDataBinder {
 
 	/**
 	 * Create a new WebRequestDataBinder instance.
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @param objectName the name of the target object
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
index 24a2db681f..bdb8e616d6 100644
--- a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
@@ -68,7 +68,7 @@ public class DefaultResponseErrorHandler implements ResponseErrorHandler {
 	 * or {@link org.springframework.http.HttpStatus.Series#SERVER_ERROR SERVER_ERROR}.
 	 * Can be overridden in subclasses.
 	 * @param statusCode the HTTP status code
-	 * @return <code>true</code> if the response has an error; <code>false</code> otherwise
+	 * @return {@code true} if the response has an error; {@code false} otherwise
 	 */
 	protected boolean hasError(HttpStatus statusCode) {
 		return (statusCode.series() == HttpStatus.Series.CLIENT_ERROR ||
diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
index 53f83bf085..31bc57888c 100644
--- a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
+++ b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
 
 /**
  * Response extractor that uses the given {@linkplain HttpMessageConverter entity
- * converters} to convert the response into a type <code>T</code>.
+ * converters} to convert the response into a type {@code T}.
  *
  * @author Arjen Poutsma
  * @see RestTemplate
diff --git a/spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java
index d4f6147481..de03dc3669 100644
--- a/spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java
@@ -33,14 +33,14 @@ public interface ResponseErrorHandler {
 	 * Implementations will typically inspect the {@link ClientHttpResponse#getStatusCode() HttpStatus}
 	 * of the response.
 	 * @param response the response to inspect
-	 * @return <code>true</code> if the response has an error; <code>false</code> otherwise
+	 * @return {@code true} if the response has an error; {@code false} otherwise
 	 * @throws IOException in case of I/O errors
 	 */
 	boolean hasError(ClientHttpResponse response) throws IOException;
 
 	/**
 	 * Handles the error in the given response.
-	 * This method is only called when {@link #hasError(ClientHttpResponse)} has returned <code>true</code>.
+	 * This method is only called when {@link #hasError(ClientHttpResponse)} has returned {@code true}.
 	 * @param response the response with the error
 	 * @throws IOException in case of I/O errors
 	 */
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 1528643e76..62ea452dd3 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
@@ -136,40 +136,40 @@ public interface RestOperations {
 
 	/**
 	 * Create a new resource by POSTing the given object to the URI template, and returns the value of the
-	 * <code>Location</code> header. This header typically indicates where the new resource is stored.
+	 * {@code Location} header. This header typically indicates where the new resource is stored.
 	 * <p>URI Template variables are expanded using the given URI variables, if any.
 	 * <p>The {@code request} parameter can be a {@link HttpEntity} in order to
 	 * add additional HTTP headers to the request.
 	 * @param url the URL
-	 * @param request the Object to be POSTed, may be <code>null</code>
+	 * @param request the Object to be POSTed, may be {@code null}
 	 * @param uriVariables the variables to expand the template
-	 * @return the value for the <code>Location</code> header
+	 * @return the value for the {@code Location} header
 	 * @see HttpEntity
 	 */
 	URI postForLocation(String url, Object request, Object... uriVariables) throws RestClientException;
 
 	/**
 	 * Create a new resource by POSTing the given object to the URI template, and returns the value of the
-	 * <code>Location</code> header. This header typically indicates where the new resource is stored.
+	 * {@code Location} header. This header typically indicates where the new resource is stored.
 	 * <p>URI Template variables are expanded using the given map.
 	 * <p>The {@code request} parameter can be a {@link HttpEntity} in order to
 	 * add additional HTTP headers to the request.
 	 * @param url the URL
-	 * @param request the Object to be POSTed, may be <code>null</code>
+	 * @param request the Object to be POSTed, may be {@code null}
 	 * @param uriVariables the variables to expand the template
-	 * @return the value for the <code>Location</code> header
+	 * @return the value for the {@code Location} header
 	 * @see HttpEntity
 	 */
 	URI postForLocation(String url, Object request, Map<String, ?> uriVariables) throws RestClientException;
 
 	/**
 	 * Create a new resource by POSTing the given object to the URL, and returns the value of the
-	 * <code>Location</code> header. This header typically indicates where the new resource is stored.
+	 * {@code Location} header. This header typically indicates where the new resource is stored.
 	 * <p>The {@code request} parameter can be a {@link HttpEntity} in order to
 	 * add additional HTTP headers to the request.
 	 * @param url the URL
-	 * @param request the Object to be POSTed, may be <code>null</code>
-	 * @return the value for the <code>Location</code> header
+	 * @param request the Object to be POSTed, may be {@code null}
+	 * @return the value for the {@code Location} header
 	 * @see HttpEntity
 	 */
 	URI postForLocation(URI url, Object request) throws RestClientException;
@@ -181,7 +181,7 @@ public interface RestOperations {
 	 * <p>The {@code request} parameter can be a {@link HttpEntity} in order to
 	 * add additional HTTP headers to the request.
 	 * @param url the URL
-	 * @param request the Object to be POSTed, may be <code>null</code>
+	 * @param request the Object to be POSTed, may be {@code null}
 	 * @param responseType the type of the return value
 	 * @param uriVariables the variables to expand the template
 	 * @return the converted object
@@ -197,7 +197,7 @@ public interface RestOperations {
 	 * <p>The {@code request} parameter can be a {@link HttpEntity} in order to
 	 * add additional HTTP headers to the request.
 	 * @param url the URL
-	 * @param request the Object to be POSTed, may be <code>null</code>
+	 * @param request the Object to be POSTed, may be {@code null}
 	 * @param responseType the type of the return value
 	 * @param uriVariables the variables to expand the template
 	 * @return the converted object
@@ -212,7 +212,7 @@ public interface RestOperations {
 	 * <p>The {@code request} parameter can be a {@link HttpEntity} in order to
 	 * add additional HTTP headers to the request.
 	 * @param url the URL
-	 * @param request the Object to be POSTed, may be <code>null</code>
+	 * @param request the Object to be POSTed, may be {@code null}
 	 * @param responseType the type of the return value
 	 * @return the converted object
 	 * @see HttpEntity
@@ -226,7 +226,7 @@ public interface RestOperations {
 	 * <p>The {@code request} parameter can be a {@link HttpEntity} in order to
 	 * add additional HTTP headers to the request.
 	 * @param url the URL
-	 * @param request the Object to be POSTed, may be <code>null</code>
+	 * @param request the Object to be POSTed, may be {@code null}
 	 * @param uriVariables the variables to expand the template
 	 * @return the converted object
 	 * @see HttpEntity
@@ -242,7 +242,7 @@ public interface RestOperations {
 	 * <p>The {@code request} parameter can be a {@link HttpEntity} in order to
 	 * add additional HTTP headers to the request.
 	 * @param url the URL
-	 * @param request the Object to be POSTed, may be <code>null</code>
+	 * @param request the Object to be POSTed, may be {@code null}
 	 * @param uriVariables the variables to expand the template
 	 * @return the converted object
 	 * @see HttpEntity
@@ -257,7 +257,7 @@ public interface RestOperations {
 	 * <p>The {@code request} parameter can be a {@link HttpEntity} in order to
 	 * add additional HTTP headers to the request.
 	 * @param url the URL
-	 * @param request the Object to be POSTed, may be <code>null</code>
+	 * @param request the Object to be POSTed, may be {@code null}
 	 * @return the converted object
 	 * @see HttpEntity
 	 * @since 3.0.2
@@ -272,7 +272,7 @@ public interface RestOperations {
 	 * <p>The {@code request} parameter can be a {@link HttpEntity} in order to
 	 * add additional HTTP headers to the request.
 	 * @param url the URL
-	 * @param request the Object to be PUT, may be <code>null</code>
+	 * @param request the Object to be PUT, may be {@code null}
 	 * @param uriVariables the variables to expand the template
 	 * @see HttpEntity
 	 */
@@ -284,7 +284,7 @@ public interface RestOperations {
 	 * <p>The {@code request} parameter can be a {@link HttpEntity} in order to
 	 * add additional HTTP headers to the request.
 	 * @param url the URL
-	 * @param request the Object to be PUT, may be <code>null</code>
+	 * @param request the Object to be PUT, may be {@code null}
 	 * @param uriVariables the variables to expand the template
 	 * @see HttpEntity
 	 */
@@ -295,7 +295,7 @@ public interface RestOperations {
 	 * <p>The {@code request} parameter can be a {@link HttpEntity} in order to
 	 * add additional HTTP headers to the request.
 	 * @param url the URL
-	 * @param request the Object to be PUT, may be <code>null</code>
+	 * @param request the Object to be PUT, may be {@code null}
 	 * @see HttpEntity
 	 */
 	void put(URI url, Object request) throws RestClientException;
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 ac061f89f4..a7f0350f38 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
@@ -466,8 +466,8 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 	 * 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</code>)
-	 * @param responseExtractor object that extracts the return value from the response (can be <code>null</code>)
+	 * @param requestCallback object that prepares the request (can be {@code null})
+	 * @param responseExtractor object that extracts the return value from the response (can be {@code null})
 	 * @return an arbitrary object, as returned by the {@link ResponseExtractor}
 	 */
 	protected <T> T doExecute(URI url, HttpMethod method, RequestCallback requestCallback,
diff --git a/spring-web/src/main/java/org/springframework/web/client/support/package-info.java b/spring-web/src/main/java/org/springframework/web/client/support/package-info.java
index afbb80083e..863ae1184e 100644
--- a/spring-web/src/main/java/org/springframework/web/client/support/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/client/support/package-info.java
@@ -1,7 +1,6 @@
-
 /**
  *
- * Classes supporting the <code>org.springframework.web.client</code> package.
+ * Classes supporting the {@code org.springframework.web.client} package.
  * Contains a base class for RestTemplate usage.
  *
  */
diff --git a/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java
index 1ce36b4a29..a6185a81e8 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java
@@ -105,7 +105,7 @@ public interface ConfigurableWebApplicationContext extends WebApplicationContext
 
 	/**
 	 * Return the config locations for this web application context,
-	 * or <code>null</code> if none specified.
+	 * or {@code null} if none specified.
 	 */
 	String[] getConfigLocations();
 
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 1bed723d77..6afd42b16c 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
@@ -50,7 +50,7 @@ import org.springframework.util.StringUtils;
  * Called by {@link ContextLoaderListener}.
  *
  * <p>Looks for a {@link #CONTEXT_CLASS_PARAM "contextClass"} parameter
- * at the <code>web.xml</code> context-param level to specify the context
+ * at the {@code web.xml} context-param level to specify the context
  * class type, falling back to the default of
  * {@link org.springframework.web.context.support.XmlWebApplicationContext}
  * if not found. With the default ContextLoader implementation, any context class
@@ -119,14 +119,14 @@ public class ContextLoader {
 	public static final String CONFIG_LOCATION_PARAM = "contextConfigLocation";
 
 	/**
-	 * Optional servlet context parameter (i.e., "<code>locatorFactorySelector</code>")
+	 * Optional servlet context parameter (i.e., "{@code locatorFactorySelector}")
 	 * used only when obtaining a parent context using the default implementation
 	 * of {@link #loadParentContext(ServletContext servletContext)}.
 	 * Specifies the 'selector' used in the
 	 * {@link ContextSingletonBeanFactoryLocator#getInstance(String selector)}
 	 * method call, which is used to obtain the BeanFactoryLocator instance from
 	 * which the parent context is obtained.
-	 * <p>The default is <code>classpath*:beanRefContext.xml</code>,
+	 * <p>The default is {@code classpath*:beanRefContext.xml},
 	 * matching the default applied for the
 	 * {@link ContextSingletonBeanFactoryLocator#getInstance()} method.
 	 * Supplying the "parentContextKey" parameter is sufficient in this case.
@@ -134,14 +134,14 @@ public class ContextLoader {
 	public static final String LOCATOR_FACTORY_SELECTOR_PARAM = "locatorFactorySelector";
 
 	/**
-	 * Optional servlet context parameter (i.e., "<code>parentContextKey</code>")
+	 * Optional servlet context parameter (i.e., "{@code parentContextKey}")
 	 * used only when obtaining a parent context using the default implementation
 	 * of {@link #loadParentContext(ServletContext servletContext)}.
 	 * Specifies the 'factoryKey' used in the
 	 * {@link BeanFactoryLocator#useBeanFactory(String factoryKey)} method call,
 	 * obtaining the parent application context from the BeanFactoryLocator instance.
 	 * <p>Supplying this "parentContextKey" parameter is sufficient when relying
-	 * on the default <code>classpath*:beanRefContext.xml</code> selector for
+	 * on the default {@code classpath*:beanRefContext.xml} selector for
 	 * candidate factory references.
 	 */
 	public static final String LOCATOR_FACTORY_KEY_PARAM = "parentContextKey";
@@ -510,7 +510,7 @@ public class ContextLoader {
 	 * which will be shared by all other users of ContextsingletonBeanFactoryLocator
 	 * which also use the same configuration parameters.
 	 * @param servletContext current servlet context
-	 * @return the parent application context, or <code>null</code> if none
+	 * @return the parent application context, or {@code null} if none
 	 * @see org.springframework.context.access.ContextSingletonBeanFactoryLocator
 	 */
 	protected ApplicationContext loadParentContext(ServletContext servletContext) {
@@ -569,7 +569,7 @@ public class ContextLoader {
 	 * Obtain the Spring root web application context for the current thread
 	 * (i.e. for the current thread's context ClassLoader, which needs to be
 	 * the web application's ClassLoader).
-	 * @return the current root web application context, or <code>null</code>
+	 * @return the current root web application context, or {@code null}
 	 * if none found
 	 * @see org.springframework.web.context.support.SpringBeanAutowiringSupport
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
index d378ffdfac..279fd71636 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
@@ -25,7 +25,7 @@ import javax.servlet.ServletContextListener;
  *
  * <p>This listener should be registered after
  * {@link org.springframework.web.util.Log4jConfigListener}
- * in <code>web.xml</code>, if the latter is used.
+ * in {@code web.xml}, if the latter is used.
  *
  * <p>As of Spring 3.1, {@code ContextLoaderListener} supports injecting the root web
  * application context via the {@link #ContextLoaderListener(WebApplicationContext)}
diff --git a/spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java b/spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java
index 80df5308ef..47d9763e32 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ServletConfigAware.java
@@ -38,9 +38,9 @@ public interface ServletConfigAware extends Aware {
 	/**
 	 * Set the {@link ServletConfig} that this object runs in.
 	 * <p>Invoked after population of normal bean properties but before an init
-	 * callback like InitializingBean's <code>afterPropertiesSet</code> or a
+	 * callback like InitializingBean's {@code afterPropertiesSet} or a
 	 * custom init-method. Invoked after ApplicationContextAware's
-	 * <code>setApplicationContext</code>.
+	 * {@code setApplicationContext}.
 	 * @param servletConfig ServletConfig object to be used by this object
 	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext
diff --git a/spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java b/spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java
index f8cc701441..6f04234916 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ServletContextAware.java
@@ -35,9 +35,9 @@ public interface ServletContextAware extends Aware {
 	/**
 	 * Set the {@link ServletContext} that this object runs in.
 	 * <p>Invoked after population of normal bean properties but before an init
-	 * callback like InitializingBean's <code>afterPropertiesSet</code> or a
+	 * callback like InitializingBean's {@code afterPropertiesSet} or a
 	 * custom init-method. Invoked after ApplicationContextAware's
-	 * <code>setApplicationContext</code>.
+	 * {@code setApplicationContext}.
 	 * @param servletContext ServletContext object to be used by this object
 	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet
 	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext
diff --git a/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
index 167c4db876..5529a0dbb0 100644
--- a/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
@@ -24,7 +24,7 @@ import org.springframework.context.ApplicationContext;
  * Interface to provide configuration for a web application. This is read-only while
  * the application is running, but may be reloaded if the implementation supports this.
  *
- * <p>This interface adds a <code>getServletContext()</code> method to the generic
+ * <p>This interface adds a {@code getServletContext()} method to the generic
  * ApplicationContext interface, and defines a well-known application attribute name
  * that the root context must be bound to in the bootstrap process.
  *
@@ -34,7 +34,7 @@ import org.springframework.context.ApplicationContext;
  *
  * <p>In addition to standard application context lifecycle capabilities,
  * WebApplicationContext implementations need to detect {@link ServletContextAware}
- * beans and invoke the <code>setServletContext</code> method accordingly.
+ * beans and invoke the {@code setServletContext} method accordingly.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
index 632d0d7f80..42615d3401 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
@@ -41,7 +41,7 @@ import org.springframework.web.util.WebUtils;
  * <i>not</i> support destruction callbacks for scoped attributes, neither for the
  * request scope nor for the session scope. If you rely on such implicit destruction
  * callbacks, consider defining a Spring {@link RequestContextListener} in your
- * <code>web.xml</code>.
+ * {@code web.xml}.
  *
  * @author Juergen Hoeller
  * @since 2.5.2
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/Log4jNestedDiagnosticContextInterceptor.java b/spring-web/src/main/java/org/springframework/web/context/request/Log4jNestedDiagnosticContextInterceptor.java
index 207d57d26d..c369abbcaa 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/Log4jNestedDiagnosticContextInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/Log4jNestedDiagnosticContextInterceptor.java
@@ -64,7 +64,7 @@ public class Log4jNestedDiagnosticContextInterceptor implements AsyncWebRequestI
 
 	/**
 	 * Determine the message to be pushed onto the Log4J nested diagnostic context.
-	 * <p>Default is the request object's <code>getDescription</code> result.
+	 * <p>Default is the request object's {@code getDescription} result.
 	 * @param request current HTTP request
 	 * @return the message to be pushed onto the Log4J NDC
 	 * @see WebRequest#getDescription
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java
index d147fa9ad3..820f57a2a1 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java
@@ -47,7 +47,7 @@ public interface NativeWebRequest extends WebRequest {
 	/**
 	 * Return the underlying native request object, if available.
 	 * @param requiredType the desired type of request object
-	 * @return the matching request object, or <code>null</code> if none
+	 * @return the matching request object, or {@code null} if none
 	 * of that type is available
 	 * @see javax.servlet.http.HttpServletRequest
 	 * @see javax.portlet.ActionRequest
@@ -58,7 +58,7 @@ public interface NativeWebRequest extends WebRequest {
 	/**
 	 * Return the underlying native request object, if available.
 	 * @param requiredType the desired type of response object
-	 * @return the matching response object, or <code>null</code> if none
+	 * @return the matching response object, or {@code null} if none
 	 * of that type is available
 	 * @see javax.servlet.http.HttpServletRequest
 	 * @see javax.portlet.ActionRequest
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java
index 736e1eda58..b7c201f7fc 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java
@@ -70,7 +70,7 @@ public interface RequestAttributes {
 	 * Return the value for the scoped attribute of the given name, if any.
 	 * @param name the name of the attribute
 	 * @param scope the scope identifier
-	 * @return the current attribute value, or <code>null</code> if not found
+	 * @return the current attribute value, or {@code null} if not found
 	 */
 	Object getAttribute(String name, int scope);
 
@@ -129,20 +129,20 @@ public interface RequestAttributes {
 	 * <p>At a minimum: the HttpServletRequest/PortletRequest reference for key
 	 * "request", and the HttpSession/PortletSession reference for key "session".
 	 * @param key the contextual key
-	 * @return the corresponding object, or <code>null</code> if none found
+	 * @return the corresponding object, or {@code null} if none found
 	 */
 	Object resolveReference(String key);
 
 	/**
 	 * Return an id for the current underlying session.
-	 * @return the session id as String (never <code>null</code>
+	 * @return the session id as String (never {@code null}
 	 */
 	String getSessionId();
 
 	/**
 	 * Expose the best available mutex for the underlying session:
 	 * that is, an object to synchronize on for the underlying session.
-	 * @return the session mutex to use (never <code>null</code>
+	 * @return the session mutex to use (never {@code null}
 	 */
 	Object getSessionMutex();
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
index 2377145bc0..20fe615e23 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
@@ -26,7 +26,7 @@ import org.springframework.util.ClassUtils;
  * Holder class to expose the web request in the form of a thread-bound
  * {@link RequestAttributes} object. The request will be inherited
  * by any child threads spawned by the current thread if the
- * <code>inheritable<code> flag is set to <code>true</code>.
+ * {@code inheritable} flag is set to {@code true}.
  *
  * <p>Use {@link RequestContextListener} or
  * {@link org.springframework.web.filter.RequestContextFilter} to expose
@@ -76,9 +76,9 @@ public abstract class RequestContextHolder  {
 	/**
 	 * Bind the given RequestAttributes to the current thread.
 	 * @param attributes the RequestAttributes to expose,
-	 * or <code>null</code> to reset the thread-bound context
+	 * or {@code null} to reset the thread-bound context
 	 * @param inheritable whether to expose the RequestAttributes as inheritable
-	 * for child threads (using an {@link java.lang.InheritableThreadLocal})
+	 * for child threads (using an {@link InheritableThreadLocal})
 	 */
 	public static void setRequestAttributes(RequestAttributes attributes, boolean inheritable) {
 		if (attributes == null) {
@@ -99,7 +99,7 @@ public abstract class RequestContextHolder  {
 	/**
 	 * Return the RequestAttributes currently bound to the thread.
 	 * @return the RequestAttributes currently bound to the thread,
-	 * or <code>null</code> if none bound
+	 * or {@code null} if none bound
 	 */
 	public static RequestAttributes getRequestAttributes() {
 		RequestAttributes attributes = requestAttributesHolder.get();
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 6dadb4d858..207e6a6c26 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
@@ -25,7 +25,7 @@ import org.springframework.context.i18n.LocaleContextHolder;
 /**
  * Servlet 2.4+ listener that exposes the request to the current thread,
  * through both {@link org.springframework.context.i18n.LocaleContextHolder} and
- * {@link RequestContextHolder}. To be registered as listener in <code>web.xml</code>.
+ * {@link RequestContextHolder}. To be registered as listener in {@code web.xml}.
  *
  * <p>Alternatively, Spring's {@link org.springframework.web.filter.RequestContextFilter}
  * and Spring's {@link org.springframework.web.servlet.DispatcherServlet} also expose
@@ -39,7 +39,7 @@ import org.springframework.context.i18n.LocaleContextHolder;
  * @since 2.0
  * @see javax.servlet.ServletRequestListener
  * @see org.springframework.context.i18n.LocaleContextHolder
- * @see org.springframework.web.context.request.RequestContextHolder
+ * @see RequestContextHolder
  * @see org.springframework.web.filter.RequestContextFilter
  * @see org.springframework.web.servlet.DispatcherServlet
  */
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java
index 4a557add55..a92085dfb7 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java
@@ -25,8 +25,8 @@ package org.springframework.web.context.request;
  * {@link org.springframework.web.filter.RequestContextFilter} or
  * {@link org.springframework.web.servlet.DispatcherServlet}.
  *
- * <p>This <code>Scope</code> will also work for Portlet environments,
- * through an alternate <code>RequestAttributes</code> implementation
+ * <p>This {@code Scope} will also work for Portlet environments,
+ * through an alternate {@code RequestAttributes} implementation
  * (as exposed out-of-the-box by Spring's
  * {@link org.springframework.web.portlet.DispatcherPortlet}.
  *
@@ -50,7 +50,7 @@ public class RequestScope extends AbstractRequestAttributesScope {
 
 	/**
 	 * There is no conversation id concept for a request, so this method
-	 * returns <code>null</code>.
+	 * returns {@code null}.
 	 */
 	public String getConversationId() {
 		return null;
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 5791c7f1dc..6f8331f05f 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
@@ -212,7 +212,7 @@ public class ServletRequestAttributes extends AbstractRequestAttributes {
 
 
 	/**
-	 * Update all accessed session attributes through <code>session.setAttribute</code>
+	 * Update all accessed session attributes through {@code session.setAttribute}
 	 * calls, explicitly indicating to the container that they might have been modified.
 	 */
 	@Override
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java b/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java
index 88d5d1fe56..dedc298753 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java
@@ -27,8 +27,8 @@ import org.springframework.beans.factory.ObjectFactory;
  * {@link org.springframework.web.filter.RequestContextFilter} or
  * {@link org.springframework.web.servlet.DispatcherServlet}.
  *
- * <p>This <code>Scope</code> will also work for Portlet environments,
- * through an alternate <code>RequestAttributes</code> implementation
+ * <p>This {@code Scope} will also work for Portlet environments,
+ * through an alternate {@code RequestAttributes} implementation
  * (as exposed out-of-the-box by Spring's
  * {@link org.springframework.web.portlet.DispatcherPortlet}.
  *
@@ -66,10 +66,10 @@ public class SessionScope extends AbstractRequestAttributesScope {
 	 * If this flag is on, objects will be put into the "application scope" session;
 	 * else they will end up in the "portlet scope" session (the typical default).
 	 * <p>In a Servlet environment, this flag is effectively ignored.
-	 * @param globalSession <code>true</code> in case of the global session as target;
-	 * <code>false</code> in case of a component-specific session as target
+	 * @param globalSession {@code true} in case of the global session as target;
+	 * {@code false} in case of a component-specific session as target
 	 * @see org.springframework.web.portlet.context.PortletRequestAttributes
-	 * @see org.springframework.web.context.request.ServletRequestAttributes
+	 * @see ServletRequestAttributes
 	 */
 	public SessionScope(boolean globalSession) {
 		this.scope = (globalSession ? RequestAttributes.SCOPE_GLOBAL_SESSION : RequestAttributes.SCOPE_SESSION);
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 620708266e..f45ef255aa 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
@@ -33,7 +33,7 @@ import java.util.Map;
 public interface WebRequest extends RequestAttributes {
 
 	/**
-	 * Return the request header of the given name, or <code>null</code> if none.
+	 * Return the request header of the given name, or {@code null} if none.
 	 * <p>Retrieves the first header value in case of a multi-value header.
 	 * @since 3.0
 	 * @see javax.servlet.http.HttpServletRequest#getHeader(String)
@@ -42,7 +42,7 @@ public interface WebRequest extends RequestAttributes {
 
 	/**
 	 * Return the request header values for the given header name,
-	 * or <code>null</code> if none.
+	 * or {@code null} if none.
 	 * <p>A single-value header will be exposed as an array with a single element.
 	 * @since 3.0
 	 * @see javax.servlet.http.HttpServletRequest#getHeaders(String)
@@ -57,7 +57,7 @@ public interface WebRequest extends RequestAttributes {
 	Iterator<String> getHeaderNames();
 
 	/**
-	 * Return the request parameter of the given name, or <code>null</code> if none.
+	 * Return the request parameter of the given name, or {@code null} if none.
 	 * <p>Retrieves the first parameter value in case of a multi-value parameter.
 	 * @see javax.servlet.http.HttpServletRequest#getParameter(String)
 	 */
@@ -65,7 +65,7 @@ public interface WebRequest extends RequestAttributes {
 
 	/**
 	 * Return the request parameter values for the given parameter name,
-	 * or <code>null</code> if none.
+	 * or {@code null} if none.
 	 * <p>A single-value parameter will be exposed as an array with a single element.
 	 * @see javax.servlet.http.HttpServletRequest#getParameterValues(String)
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java b/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java
index bad61d5dac..2ffa1e99fe 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java
@@ -76,7 +76,7 @@ public interface WebRequestInterceptor {
 	 * execution (for example, flushing a Hibernate Session).
 	 * @param request the current web request
 	 * @param model the map of model objects that will be exposed to the view
-	 * (may be <code>null</code>). Can be used to analyze the exposed model
+	 * (may be {@code null}). Can be used to analyze the exposed model
 	 * and/or to add further model attributes, if desired.
 	 * @throws Exception in case of errors
 	 */
@@ -86,7 +86,7 @@ public interface WebRequestInterceptor {
 	 * Callback after completion of request processing, that is, after rendering
 	 * the view. Will be called on any outcome of handler execution, thus allows
 	 * for proper resource cleanup.
-	 * <p>Note: Will only be called if this interceptor's <code>preHandle</code>
+	 * <p>Note: Will only be called if this interceptor's {@code preHandle}
 	 * method has successfully completed!
 	 * @param request the current web request
 	 * @param ex exception thrown on handler execution, if any
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 7f099ac849..f36bddc316 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
@@ -86,7 +86,7 @@ public abstract class AbstractRefreshableWebApplicationContext extends AbstractR
 	/** Servlet config that this context runs in, if any */
 	private ServletConfig servletConfig;
 
-	/** Namespace of this context, or <code>null</code> if root */
+	/** Namespace of this context, or {@code null} if root */
 	private String namespace;
 
 	/** the ThemeSource for this ApplicationContext */
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 2ddb0466a0..ac87960cd0 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
@@ -40,13 +40,13 @@ import org.springframework.web.context.ServletContextAware;
  *
  * <p>Implements the
  * {@link org.springframework.web.context.ConfigurableWebApplicationContext},
- * but is not intended for declarative setup in <code>web.xml</code>. Instead,
+ * but is not intended for declarative setup in {@code web.xml}. Instead,
  * it is designed for programmatic setup, for example for building nested contexts or
  * for use within Spring 3.1 {@link org.springframework.web.WebApplicationInitializer}s.
  *
  * <p><b>If you intend to implement a WebApplicationContext that reads bean definitions
  * from configuration files, consider deriving from AbstractRefreshableWebApplicationContext,
- * reading the bean definitions in an implementation of the <code>loadBeanDefinitions</code>
+ * reading the bean definitions in an implementation of the {@code loadBeanDefinitions}
  * method.</b>
  *
  * <p>Interprets resource paths as servlet context resources, i.e. as paths beneath
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
index 46e798956e..eed5597a3d 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
@@ -32,7 +32,7 @@ import org.springframework.web.context.WebApplicationContext;
 /**
  * Simple HttpServlet that delegates to an {@link HttpRequestHandler} bean defined
  * in Spring's root web application context. The target bean name must match the
- * HttpRequestHandlerServlet servlet-name as defined in <code>web.xml</code>.
+ * HttpRequestHandlerServlet servlet-name as defined in {@code web.xml}.
  *
  * <p>This can for example be used to expose a single Spring remote exporter,
  * such as {@link org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter}
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
index 5107229b46..fec95de6ff 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
@@ -23,7 +23,7 @@ import org.springframework.web.context.ServletContextAware;
 
 /**
  * {@link FactoryBean} that retrieves a specific ServletContext init parameter
- * (that is, a "context-param" defined in <code>web.xml</code>).
+ * (that is, a "context-param" defined in {@code web.xml}).
  * Exposes that ServletContext init parameter when used as bean reference,
  * effectively making it available as named Spring bean instance.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java
index 31b17a07b5..97a9e86073 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java
@@ -26,12 +26,12 @@ import org.springframework.web.context.ServletContextAware;
 
 /**
  * Subclass of {@link PropertyPlaceholderConfigurer} that resolves placeholders as
- * ServletContext init parameters (that is, <code>web.xml</code> context-param
+ * ServletContext init parameters (that is, {@code web.xml} context-param
  * entries).
  *
  * <p>Can be combined with "locations" and/or "properties" values in addition
  * to web.xml context-params. Alternatively, can be defined without local
- * properties, to resolve all placeholders as <code>web.xml</code> context-params
+ * properties, to resolve all placeholders as {@code web.xml} context-params
  * (or JVM system properties).
  *
  * <p>If a placeholder could not be resolved against the provided local
@@ -59,7 +59,7 @@ import org.springframework.web.context.ServletContextAware;
  * @see javax.servlet.ServletContext#getInitParameter(String)
  * @see javax.servlet.ServletContext#getAttribute(String)
  * @deprecated in Spring 3.1 in favor of {@link org.springframework.context.support.PropertySourcesPlaceholderConfigurer}
- * in conjunction with {@link org.springframework.web.context.support.StandardServletEnvironment}.
+ * in conjunction with {@link StandardServletEnvironment}.
  */
 @Deprecated
 public class ServletContextPropertyPlaceholderConfigurer extends PropertyPlaceholderConfigurer
@@ -93,7 +93,7 @@ public class ServletContextPropertyPlaceholderConfigurer extends PropertyPlaceho
 	 * <p>If turned on, the configurer will look for a ServletContext attribute with
 	 * the same name as the placeholder, and use its stringified value if found.
 	 * Exposure of such ServletContext attributes can be used to dynamically override
-	 * init parameters defined in <code>web.xml</code>, for example in a custom
+	 * init parameters defined in {@code web.xml}, for example in a custom
 	 * context listener.
 	 * @see javax.servlet.ServletContext#getInitParameter(String)
 	 * @see javax.servlet.ServletContext#getAttribute(String)
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
index 4a729e9267..673c39c9a1 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
@@ -38,7 +38,7 @@ import org.springframework.web.util.WebUtils;
  * relative paths within the web application root directory.
  *
  * <p>Always supports stream access and URL access, but only allows
- * <code>java.io.File</code> access when the web application archive
+ * {@code java.io.File} access when the web application archive
  * is expanded.
  *
  * @author Juergen Hoeller
@@ -93,7 +93,7 @@ public class ServletContextResource extends AbstractFileResolvingResource implem
 
 
 	/**
-	 * This implementation checks <code>ServletContext.getResource</code>.
+	 * This implementation checks {@code ServletContext.getResource}.
 	 * @see javax.servlet.ServletContext#getResource(String)
 	 */
 	@Override
@@ -108,8 +108,8 @@ public class ServletContextResource extends AbstractFileResolvingResource implem
 	}
 
 	/**
-	 * This implementation delegates to <code>ServletContext.getResourceAsStream</code>,
-	 * which returns <code>null</code> in case of a non-readable resource (e.g. a directory).
+	 * This implementation delegates to {@code ServletContext.getResourceAsStream},
+	 * which returns {@code null} in case of a non-readable resource (e.g. a directory).
 	 * @see javax.servlet.ServletContext#getResourceAsStream(String)
 	 */
 	@Override
@@ -130,7 +130,7 @@ public class ServletContextResource extends AbstractFileResolvingResource implem
 	}
 
 	/**
-	 * This implementation delegates to <code>ServletContext.getResourceAsStream</code>,
+	 * This implementation delegates to {@code ServletContext.getResourceAsStream},
 	 * but throws a FileNotFoundException if no resource found.
 	 * @see javax.servlet.ServletContext#getResourceAsStream(String)
 	 */
@@ -143,7 +143,7 @@ public class ServletContextResource extends AbstractFileResolvingResource implem
 	}
 
 	/**
-	 * This implementation delegates to <code>ServletContext.getResource</code>,
+	 * This implementation delegates to {@code ServletContext.getResource},
 	 * but throws a FileNotFoundException if no resource found.
 	 * @see javax.servlet.ServletContext#getResource(String)
 	 */
@@ -159,7 +159,7 @@ public class ServletContextResource extends AbstractFileResolvingResource implem
 
 	/**
 	 * This implementation resolves "file:" URLs or alternatively delegates to
-	 * <code>ServletContext.getRealPath</code>, throwing a FileNotFoundException
+	 * {@code ServletContext.getRealPath}, throwing a FileNotFoundException
 	 * if not found or not resolvable.
 	 * @see javax.servlet.ServletContext#getResource(String)
 	 * @see javax.servlet.ServletContext#getRealPath(String)
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 b40f7dbecb..ec2fbecb8b 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
@@ -37,7 +37,7 @@ import org.springframework.util.StringUtils;
 /**
  * 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</code>.
+ * via Servlet 2.3's {@code ServletContext.getResourcePaths}.
  * Falls back to the superclass' file system checking for other resources.
  *
  * @author Juergen Hoeller
@@ -69,7 +69,7 @@ public class ServletContextResourcePatternResolver extends PathMatchingResourceP
 
 	/**
 	 * Overridden version which checks for ServletContextResource
-	 * and uses <code>ServletContext.getResourcePaths</code> to find
+	 * and uses {@code ServletContext.getResourcePaths} to find
 	 * matching resources below the web application root directory.
 	 * In case of other resources, delegates to the superclass version.
 	 * @see #doRetrieveMatchingServletContextResources
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
index 90301719e4..59b043910f 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
  *
  * <p>The associated destruction mechanism relies on a
  * {@link org.springframework.web.context.ContextCleanupListener} being registered in
- * <code>web.xml</code>. Note that {@link org.springframework.web.context.ContextLoaderListener}
+ * {@code web.xml}. Note that {@link org.springframework.web.context.ContextLoaderListener}
  * includes ContextCleanupListener's functionality.
  *
  * <p>This scope is registered as default scope with key
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java b/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java
index 93c00b96d4..7a64224ce0 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java
@@ -29,7 +29,7 @@ import org.springframework.web.context.WebApplicationContext;
 
 /**
  * Convenient base class for self-autowiring classes that gets constructed
- * within a Spring-based web application. Resolves <code>@Autowired</code>
+ * within a Spring-based web application. Resolves {@code @Autowired}
  * annotations in the endpoint class against beans in the current Spring
  * root web application context (as determined by the current thread's
  * context ClassLoader, which needs to be the web application's ClassLoader).
@@ -39,10 +39,10 @@ import org.springframework.web.context.WebApplicationContext;
  * Such a Spring-based JAX-WS endpoint implementation will follow the
  * standard JAX-WS contract for endpoint classes but will be 'thin'
  * in that it delegates the actual work to one or more Spring-managed
- * service beans - typically obtained using <code>@Autowired</code>.
+ * service beans - typically obtained using {@code @Autowired}.
  * The lifecycle of such an endpoint instance will be managed by the
  * JAX-WS runtime, hence the need for this base class to provide
- * <code>@Autowired</code> processing based on the current Spring context.
+ * {@code @Autowired} processing based on the current Spring context.
  *
  * <p><b>NOTE:</b> If there is an explicit way to access the ServletContext,
  * prefer such a way over using this class. The {@link WebApplicationContextUtils}
@@ -70,7 +70,7 @@ public abstract class SpringBeanAutowiringSupport {
 
 
 	/**
-	 * Process <code>@Autowired</code> injection for the given target object,
+	 * Process {@code @Autowired} injection for the given target object,
 	 * based on the current web application context.
 	 * <p>Intended for use as a delegate.
 	 * @param target the target object to process
@@ -95,7 +95,7 @@ public abstract class SpringBeanAutowiringSupport {
 
 
 	/**
-	 * Process <code>@Autowired</code> injection for the given target object,
+	 * Process {@code @Autowired} injection for the given target object,
 	 * based on the current root web application context as stored in the ServletContext.
 	 * <p>Intended for use as a delegate.
 	 * @param target the target object to process
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 33bd031014..9091e337a4 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
@@ -51,7 +51,7 @@ import org.springframework.web.context.request.WebRequest;
 /**
  * Convenience methods for retrieving the root
  * {@link org.springframework.web.context.WebApplicationContext} for a given
- * <code>ServletContext</code>. This is e.g. useful for accessing a Spring
+ * {@code ServletContext}. This is e.g. useful for accessing a Spring
  * context from within custom web views or Struts actions.
  *
  * <p>Note that there are more convenient ways of accessing the root context for
@@ -98,7 +98,7 @@ public abstract class WebApplicationContextUtils {
 	 * <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
-	 * @return the root WebApplicationContext for this web app, or <code>null</code> if none
+	 * @return the root WebApplicationContext for this web app, or {@code null} if none
 	 * @see org.springframework.web.context.WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE
 	 */
 	public static WebApplicationContext getWebApplicationContext(ServletContext sc) {
@@ -109,7 +109,7 @@ public abstract class WebApplicationContextUtils {
 	 * Find a custom WebApplicationContext for this web application.
 	 * @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</code> if none
+	 * @return the desired WebApplicationContext for this web app, or {@code null} if none
 	 */
 	public static WebApplicationContext getWebApplicationContext(ServletContext sc, String attrName) {
 		Assert.notNull(sc, "ServletContext must not be null");
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 0a69d90d6a..a0ef9e29fc 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
@@ -27,8 +27,8 @@ import org.springframework.web.util.WebUtils;
 
 /**
  * Convenient superclass for application objects running in a WebApplicationContext.
- * Provides <code>getWebApplicationContext()</code>, <code>getServletContext()</code>,
- * and <code>getTempDir()</code> methods.
+ * Provides {@code getWebApplicationContext()}, {@code getServletContext()},
+ * and {@code getTempDir()} methods.
  *
  * @author Juergen Hoeller
  * @since 28.08.2003
@@ -85,7 +85,7 @@ public abstract class WebApplicationObjectSupport extends ApplicationObjectSuppo
 	 * {@link #initApplicationContext(org.springframework.context.ApplicationContext)}
 	 * as well as {@link #setServletContext(javax.servlet.ServletContext)}.
 	 * @param servletContext the ServletContext that this application object runs in
-	 * (never <code>null</code>)
+	 * (never {@code null})
 	 */
 	protected void initServletContext(ServletContext servletContext) {
 	}
@@ -94,7 +94,7 @@ public abstract class WebApplicationObjectSupport extends ApplicationObjectSuppo
 	 * Return the current application context as WebApplicationContext.
 	 * <p><b>NOTE:</b> Only use this if you actually need to access
 	 * WebApplicationContext-specific functionality. Preferably use
-	 * <code>getApplicationContext()</code> or <code>getServletContext()</code>
+	 * {@code getApplicationContext()} or {@code getServletContext()}
 	 * else, to be able to run in non-WebApplicationContext environments as well.
 	 * @throws IllegalStateException if not running in a WebApplicationContext
 	 * @see #getApplicationContext()
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/package-info.java b/spring-web/src/main/java/org/springframework/web/context/support/package-info.java
index b43b297b5c..4110070925 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/package-info.java
@@ -1,7 +1,6 @@
-
 /**
  *
- * Classes supporting the <code>org.springframework.web.context</code> package,
+ * Classes supporting the {@code org.springframework.web.context} package,
  * such as WebApplicationContext implementations and various utility classes.
  *
  */
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 875490abf8..03c15891d7 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
@@ -35,20 +35,20 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.util.WebUtils;
 
 /**
- * Base class for <code>Filter</code>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)</code> and
- * <code>afterRequest(HttpServletRequest, String)</code> methods to perform the actual logging around the request.
+ * <p>Subclasses should override the {@code beforeRequest(HttpServletRequest, String)} and
+ * {@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</code> and
- * <code>afterRequest</code> methods. By default, only the URI of the request is logged. However, setting the
- * <code>includeQueryString</code> property to <code>true</code> 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</code> flag. Note that
+ * <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.
  *
  * <p>Prefixes and suffixes for the before and after messages can be configured using the
- * <code>beforeMessagePrefix</code>, <code>afterMessagePrefix</code>, <code>beforeMessageSuffix</code> and
- * <code>afterMessageSuffix</code> properties,
+ * {@code beforeMessagePrefix}, {@code afterMessagePrefix}, {@code beforeMessageSuffix} and
+ * {@code afterMessageSuffix} properties,
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -87,8 +87,8 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter
 
 	/**
 	 * 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;</code> for parameter name "includeQueryString" in the filter definition in
-	 * <code>web.xml</code>.
+	 * {@code &lt;init-param&gt;} for parameter name "includeQueryString" in the filter definition in
+	 * {@code web.xml}.
 	 */
 	public void setIncludeQueryString(boolean includeQueryString) {
 		this.includeQueryString = includeQueryString;
@@ -103,8 +103,8 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter
 
 	/**
 	 * 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;</code> for parameter name "includeClientInfo" in the filter definition in
-	 * <code>web.xml</code>.
+	 * using an {@code &lt;init-param&gt;} for parameter name "includeClientInfo" in the filter definition in
+	 * {@code web.xml}.
 	 */
 	public void setIncludeClientInfo(boolean includeClientInfo) {
 		this.includeClientInfo = includeClientInfo;
@@ -119,8 +119,8 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter
 
 	/**
 	 * 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;</code> for parameter name "includePayload" in the filter definition in
-	 * <code>web.xml</code>.
+	 * an {@code &lt;init-param&gt;} for parameter name "includePayload" in the filter definition in
+	 * {@code web.xml}.
 	 */
 
 	public void setIncludePayload(boolean includePayload) {
@@ -238,9 +238,9 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter
 	}
 
 	/**
-	 * Create a log message for the given request, prefix and suffix. <p>If <code>includeQueryString</code> is
-	 * <code>true</code> then the inner part of the log message will take the form <code>request_uri?query_string</code>
-	 * otherwise the message will simply be of the form <code>request_uri</code>. <p>The final message is composed of the
+	 * 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) {
diff --git a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
index 1ffd4ec611..9864566193 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
@@ -50,8 +50,8 @@ import org.springframework.web.util.NestedServletException;
 
 /**
  * Simple base implementation of {@link javax.servlet.Filter} which treats
- * its config parameters (<code>init-param</code> entries within the
- * <code>filter</code> tag in <code>web.xml</code>) as bean properties.
+ * its config parameters ({@code init-param} entries within the
+ * {@code filter} tag in {@code web.xml}) as bean properties.
  *
  * <p>A handy superclass for any type of filter. Type conversion of config
  * parameters is automatic, with the corresponding setter method getting
@@ -132,10 +132,10 @@ public abstract class GenericFilterBean implements
 	}
 
 	/**
-	 * Calls the <code>initFilterBean()</code> method that might
+	 * Calls the {@code initFilterBean()} method that might
 	 * contain custom initialization of a subclass.
 	 * <p>Only relevant in case of initialization as bean, where the
-	 * standard <code>init(FilterConfig)</code> method won't be called.
+	 * standard {@code init(FilterConfig)} method won't be called.
 	 * @see #initFilterBean()
 	 * @see #init(javax.servlet.FilterConfig)
 	 */
@@ -212,10 +212,10 @@ public abstract class GenericFilterBean implements
 
 	/**
 	 * Make the FilterConfig of this filter available, if any.
-	 * Analogous to GenericServlet's <code>getServletConfig()</code>.
-	 * <p>Public to resemble the <code>getFilterConfig()</code> method
+	 * Analogous to GenericServlet's {@code getServletConfig()}.
+	 * <p>Public to resemble the {@code getFilterConfig()} method
 	 * of the Servlet Filter version that shipped with WebLogic 6.1.
-	 * @return the FilterConfig instance, or <code>null</code> if none available
+	 * @return the FilterConfig instance, or {@code null} if none available
 	 * @see javax.servlet.GenericServlet#getServletConfig()
 	 */
 	public final FilterConfig getFilterConfig() {
@@ -224,11 +224,11 @@ public abstract class GenericFilterBean implements
 
 	/**
 	 * Make the name of this filter available to subclasses.
-	 * Analogous to GenericServlet's <code>getServletName()</code>.
+	 * Analogous to GenericServlet's {@code getServletName()}.
 	 * <p>Takes the FilterConfig's filter name by default.
 	 * If initialized as bean in a Spring application context,
 	 * it falls back to the bean name as defined in the bean factory.
-	 * @return the filter name, or <code>null</code> if none available
+	 * @return the filter name, or {@code null} if none available
 	 * @see javax.servlet.GenericServlet#getServletName()
 	 * @see javax.servlet.FilterConfig#getFilterName()
 	 * @see #setBeanName
@@ -239,11 +239,11 @@ public abstract class GenericFilterBean implements
 
 	/**
 	 * Make the ServletContext of this filter available to subclasses.
-	 * Analogous to GenericServlet's <code>getServletContext()</code>.
+	 * Analogous to GenericServlet's {@code getServletContext()}.
 	 * <p>Takes the FilterConfig's ServletContext by default.
 	 * If initialized as bean in a Spring application context,
 	 * it falls back to the ServletContext that the bean factory runs in.
-	 * @return the ServletContext instance, or <code>null</code> if none available
+	 * @return the ServletContext instance, or {@code null} if none available
 	 * @see javax.servlet.GenericServlet#getServletContext()
 	 * @see javax.servlet.FilterConfig#getServletContext()
 	 * @see #setServletContext
diff --git a/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java b/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
index 9c1778ca47..45a76d97a0 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
@@ -31,24 +31,24 @@ import org.springframework.util.StringUtils;
  * {@link javax.servlet.Filter} that converts posted method parameters into HTTP methods,
  * retrievable via {@link HttpServletRequest#getMethod()}. Since browsers currently only
  * support GET and POST, a common technique - used by the Prototype library, for instance -
- * is to use a normal POST with an additional hidden form field (<code>_method</code>)
+ * is to use a normal POST with an additional hidden form field ({@code _method})
  * to pass the "real" HTTP method along. This filter reads that parameter and changes
  * the {@link HttpServletRequestWrapper#getMethod()} return value accordingly.
  *
- * <p>The name of the request parameter defaults to <code>_method</code>, but can be
+ * <p>The name of the request parameter defaults to {@code _method}, but can be
  * adapted via the {@link #setMethodParam(String) methodParam} property.
  *
  * <p><b>NOTE: This filter needs to run after multipart processing in case of a multipart
  * POST request, due to its inherent need for checking a POST body parameter.</b>
  * So typically, put a Spring {@link org.springframework.web.multipart.support.MultipartFilter}
- * <i>before</i> this HiddenHttpMethodFilter in your <code>web.xml</code> filter chain.
+ * <i>before</i> this HiddenHttpMethodFilter in your {@code web.xml} filter chain.
  *
  * @author Arjen Poutsma
  * @since 3.0
  */
 public class HiddenHttpMethodFilter extends OncePerRequestFilter {
 
-	/** Default method parameter: <code>_method</code> */
+	/** Default method parameter: {@code _method} */
 	public static final String DEFAULT_METHOD_PARAM = "_method";
 
 	private String methodParam = DEFAULT_METHOD_PARAM;
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 e8a9384717..d422184207 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
@@ -76,7 +76,7 @@ public abstract class OncePerRequestFilter extends GenericFilterBean {
 
 
 	/**
-	 * This <code>doFilter</code> implementation stores a request attribute for
+	 * This {@code doFilter} implementation stores a request attribute for
 	 * "already filtered", proceeding without filtering again if the
 	 * attribute is already there.
 	 * @see #getAlreadyFilteredAttributeName
@@ -166,8 +166,8 @@ public abstract class OncePerRequestFilter extends GenericFilterBean {
 
 	/**
 	 * Can be overridden in subclasses for custom filtering control,
-	 * returning <code>true</code> to avoid filtering of the given request.
-	 * <p>The default implementation always returns <code>false</code>.
+	 * returning {@code true} to avoid filtering of the given request.
+	 * <p>The default implementation always returns {@code false}.
 	 * @param request current HTTP request
 	 * @return whether the given request should <i>not</i> be filtered
 	 * @throws ServletException in case of errors
@@ -208,7 +208,7 @@ public abstract class OncePerRequestFilter extends GenericFilterBean {
 	}
 
 	/**
-	 * Same contract as for <code>doFilter</code>, but guaranteed to be
+	 * Same contract as for {@code doFilter}, but guaranteed to be
 	 * just invoked once per request within a single request thread.
 	 * See {@link #shouldNotFilterAsyncDispatch()} for details.
 	 * <p>Provides HttpServletRequest and HttpServletResponse arguments instead of the
diff --git a/spring-web/src/main/java/org/springframework/web/filter/RequestContextFilter.java b/spring-web/src/main/java/org/springframework/web/filter/RequestContextFilter.java
index f5fc914dac..5a1f3b5dd2 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/RequestContextFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/RequestContextFilter.java
@@ -30,7 +30,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 /**
  * Servlet 2.3 Filter that exposes the request to the current thread,
  * through both {@link org.springframework.context.i18n.LocaleContextHolder} and
- * {@link RequestContextHolder}. To be registered as filter in <code>web.xml</code>.
+ * {@link RequestContextHolder}. To be registered as filter in {@code web.xml}.
  *
  * <p>Alternatively, Spring's {@link org.springframework.web.context.request.RequestContextListener}
  * and Spring's {@link org.springframework.web.servlet.DispatcherServlet} also expose
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 ca00387c96..37d21f1aab 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
@@ -37,9 +37,9 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
 import org.springframework.web.util.WebUtils;
 
 /**
- * {@link javax.servlet.Filter} that generates an <code>ETag</code> value based on the content on the response.
- * This ETag is compared to the <code>If-None-Match</code> header of the request. If these headers are equal,
- * the response content is not sent, but rather a <code>304 "Not Modified"</code> 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.
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java b/spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java
index 9821d0f8db..9ffac6ccff 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/DecoratingNavigationHandler.java
@@ -24,9 +24,9 @@ import javax.faces.context.FacesContext;
  * to be capable of decorating an original NavigationHandler.
  *
  * <p>Supports the standard JSF style of decoration (through a constructor argument)
- * as well as an overloaded <code>handleNavigation</code> method with explicit
+ * as well as an overloaded {@code handleNavigation} method with explicit
  * NavigationHandler argument (passing in the original NavigationHandler). Subclasses
- * are forced to implement this overloaded <code>handleNavigation</code> method.
+ * are forced to implement this overloaded {@code handleNavigation} method.
  * Standard JSF invocations will automatically delegate to the overloaded method,
  * with the constructor-injected NavigationHandler as argument.
  *
@@ -64,7 +64,7 @@ public abstract class DecoratingNavigationHandler extends NavigationHandler {
 
 
 	/**
-	 * This implementation of the standard JSF <code>handleNavigation</code> method
+	 * This implementation of the standard JSF {@code handleNavigation} method
 	 * delegates to the overloaded variant, passing in constructor-injected
 	 * NavigationHandler as argument.
 	 * @see #handleNavigation(javax.faces.context.FacesContext, String, String, javax.faces.application.NavigationHandler)
@@ -75,23 +75,23 @@ public abstract class DecoratingNavigationHandler extends NavigationHandler {
 	}
 
 	/**
-	 * Special <code>handleNavigation</code> variant with explicit NavigationHandler
+	 * Special {@code handleNavigation} variant with explicit NavigationHandler
 	 * argument. Either called directly, by code with an explicit original handler,
-	 * or called from the standard <code>handleNavigation</code> method, as
+	 * or called from the standard {@code handleNavigation} method, as
 	 * plain JSF-defined NavigationHandler.
-	 * <p>Implementations should invoke <code>callNextHandlerInChain</code> to
+	 * <p>Implementations should invoke {@code callNextHandlerInChain} to
 	 * delegate to the next handler in the chain. This will always call the most
-	 * appropriate next handler (see <code>callNextHandlerInChain</code> javadoc).
+	 * appropriate next handler (see {@code callNextHandlerInChain} javadoc).
 	 * Alternatively, the decorated NavigationHandler or the passed-in original
 	 * NavigationHandler can also be called directly; however, this is not as
 	 * flexible in terms of reacting to potential positions in the chain.
 	 * @param facesContext the current JSF context
 	 * @param fromAction the action binding expression that was evaluated to retrieve the
-	 * specified outcome, or <code>null</code> if the outcome was acquired by some other means
+	 * specified outcome, or {@code null} if the outcome was acquired by some other means
 	 * @param outcome the logical outcome returned by a previous invoked application action
-	 * (which may be <code>null</code>)
+	 * (which may be {@code null})
 	 * @param originalNavigationHandler the original NavigationHandler,
-	 * or <code>null</code> if none
+	 * or {@code null} if none
 	 * @see #callNextHandlerInChain
 	 */
 	public abstract void handleNavigation(
@@ -120,11 +120,11 @@ public abstract class DecoratingNavigationHandler extends NavigationHandler {
 	 * as earlier elements), this method corresponds to a no-op.
 	 * @param facesContext the current JSF context
 	 * @param fromAction the action binding expression that was evaluated to retrieve the
-	 * specified outcome, or <code>null</code> if the outcome was acquired by some other means
+	 * specified outcome, or {@code null} if the outcome was acquired by some other means
 	 * @param outcome the logical outcome returned by a previous invoked application action
-	 * (which may be <code>null</code>)
+	 * (which may be {@code null})
 	 * @param originalNavigationHandler the original NavigationHandler,
-	 * or <code>null</code> if none
+	 * or {@code null} if none
 	 */
 	protected final void callNextHandlerInChain(
 			FacesContext facesContext, String fromAction, String outcome, NavigationHandler originalNavigationHandler) {
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java
index a363af75b2..e479057927 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingNavigationHandlerProxy.java
@@ -26,7 +26,7 @@ import org.springframework.web.context.WebApplicationContext;
  * JSF NavigationHandler implementation that delegates to a NavigationHandler
  * bean obtained from the Spring root WebApplicationContext.
  *
- * <p>Configure this handler proxy in your <code>faces-config.xml</code> file
+ * <p>Configure this handler proxy in your {@code faces-config.xml} file
  * as follows:
  *
  * <pre>
@@ -101,8 +101,8 @@ public class DelegatingNavigationHandlerProxy extends NavigationHandler {
 	 * through delegating to the target bean in the Spring application context.
 	 * <p>The target bean needs to extend the JSF NavigationHandler class.
 	 * If it extends Spring's DecoratingNavigationHandler, the overloaded
-	 * <code>handleNavigation</code> method with the original NavigationHandler
-	 * as argument will be used. Else, the standard <code>handleNavigation</code>
+	 * {@code handleNavigation} method with the original NavigationHandler
+	 * as argument will be used. Else, the standard {@code handleNavigation}
 	 * method will be called.
 	 */
 	@Override
@@ -143,11 +143,11 @@ public class DelegatingNavigationHandlerProxy extends NavigationHandler {
 
 	/**
 	 * Retrieve the Spring BeanFactory to delegate bean name resolution to.
-	 * <p>Default implementation delegates to <code>getWebApplicationContext</code>.
+	 * <p>Default implementation delegates to {@code getWebApplicationContext}.
 	 * Can be overridden to provide an arbitrary BeanFactory reference to resolve
 	 * against; usually, this will be a full Spring ApplicationContext.
 	 * @param facesContext the current JSF context
-	 * @return the Spring BeanFactory (never <code>null</code>)
+	 * @return the Spring BeanFactory (never {@code null})
 	 * @see #getWebApplicationContext
 	 */
 	protected BeanFactory getBeanFactory(FacesContext facesContext) {
@@ -158,7 +158,7 @@ public class DelegatingNavigationHandlerProxy extends NavigationHandler {
 	 * Retrieve the web application context to delegate bean name resolution to.
 	 * <p>Default implementation delegates to FacesContextUtils.
 	 * @param facesContext the current JSF context
-	 * @return the Spring web application context (never <code>null</code>)
+	 * @return the Spring web application context (never {@code null})
 	 * @see FacesContextUtils#getRequiredWebApplicationContext
 	 */
 	protected WebApplicationContext getWebApplicationContext(FacesContext facesContext) {
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
index 36b54f11f2..19f524233c 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
@@ -30,7 +30,7 @@ import org.springframework.web.context.WebApplicationContext;
  * JSF PhaseListener implementation that delegates to one or more Spring-managed
  * PhaseListener beans coming from the Spring root WebApplicationContext.
  *
- * <p>Configure this listener multicaster in your <code>faces-config.xml</code> file
+ * <p>Configure this listener multicaster in your {@code faces-config.xml} file
  * as follows:
  *
  * <pre class="code">
@@ -42,13 +42,13 @@ import org.springframework.web.context.WebApplicationContext;
  *   ...
  * &lt;/application&gt;</pre>
  *
- * The multicaster will delegate all <code>beforePhase</code> and <code>afterPhase</code>
+ * The multicaster will delegate all {@code beforePhase} and {@code afterPhase}
  * events to all target PhaseListener beans. By default, those will simply be obtained
  * by type: All beans in the Spring root WebApplicationContext that implement the
  * PhaseListener interface will be fetched and invoked.
  *
- * <p>Note: This multicaster's <code>getPhaseId()</code> method will always return
- * <code>ANY_PHASE</code>. <b>The phase id exposed by the target listener beans
+ * <p>Note: This multicaster's {@code getPhaseId()} method will always return
+ * {@code ANY_PHASE}. <b>The phase id exposed by the target listener beans
  * will be ignored; all events will be propagated to all listeners.</b>
  *
  * <p>This multicaster may be subclassed to change the strategy used to obtain
@@ -92,11 +92,11 @@ public class DelegatingPhaseListenerMulticaster implements PhaseListener {
 
 	/**
 	 * Retrieve the Spring BeanFactory to delegate bean name resolution to.
-	 * <p>The default implementation delegates to <code>getWebApplicationContext</code>.
+	 * <p>The default implementation delegates to {@code getWebApplicationContext}.
 	 * Can be overridden to provide an arbitrary ListableBeanFactory reference to
 	 * resolve against; usually, this will be a full Spring ApplicationContext.
 	 * @param facesContext the current JSF context
-	 * @return the Spring ListableBeanFactory (never <code>null</code>)
+	 * @return the Spring ListableBeanFactory (never {@code null})
 	 * @see #getWebApplicationContext
 	 */
 	protected ListableBeanFactory getBeanFactory(FacesContext facesContext) {
@@ -107,7 +107,7 @@ public class DelegatingPhaseListenerMulticaster implements PhaseListener {
 	 * Retrieve the web application context to delegate bean name resolution to.
 	 * <p>The default implementation delegates to FacesContextUtils.
 	 * @param facesContext the current JSF context
-	 * @return the Spring web application context (never <code>null</code>)
+	 * @return the Spring web application context (never {@code null})
 	 * @see FacesContextUtils#getRequiredWebApplicationContext
 	 */
 	protected WebApplicationContext getWebApplicationContext(FacesContext facesContext) {
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java
index cfc987dfdf..f044157f48 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java
@@ -28,13 +28,13 @@ import org.springframework.util.Assert;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
- * JSF 1.1 <code>VariableResolver</code> that first delegates to the
+ * JSF 1.1 {@code VariableResolver} that first delegates to the
  * original resolver of the underlying JSF implementation (for resolving
- * managed-bean objects as defined in <code>faces-config.xml</code>
+ * managed-bean objects as defined in {@code faces-config.xml}
  * as well as well-known implicit EL attributes), then to the Spring
- * root <code>WebApplicationContext</code> (for resolving Spring beans).
+ * root {@code WebApplicationContext} (for resolving Spring beans).
  *
- * <p>Configure this resolver in your <code>faces-config.xml</code> file as follows:
+ * <p>Configure this resolver in your {@code faces-config.xml} file as follows:
  *
  * <pre>
  * &lt;application>
@@ -148,11 +148,11 @@ public class DelegatingVariableResolver extends VariableResolver {
 
 	/**
 	 * Retrieve the Spring BeanFactory to delegate bean name resolution to.
-	 * <p>The default implementation delegates to <code>getWebApplicationContext</code>.
+	 * <p>The default implementation delegates to {@code getWebApplicationContext}.
 	 * Can be overridden to provide an arbitrary BeanFactory reference to resolve
 	 * against; usually, this will be a full Spring ApplicationContext.
 	 * @param facesContext the current JSF context
-	 * @return the Spring BeanFactory (never <code>null</code>)
+	 * @return the Spring BeanFactory (never {@code null})
 	 * @see #getWebApplicationContext
 	 */
 	protected BeanFactory getBeanFactory(FacesContext facesContext) {
@@ -163,7 +163,7 @@ public class DelegatingVariableResolver extends VariableResolver {
 	 * Retrieve the web application context to delegate bean name resolution to.
 	 * <p>The default implementation delegates to FacesContextUtils.
 	 * @param facesContext the current JSF context
-	 * @return the Spring web application context (never <code>null</code>)
+	 * @return the Spring web application context (never {@code null})
 	 * @see FacesContextUtils#getRequiredWebApplicationContext
 	 */
 	protected WebApplicationContext getWebApplicationContext(FacesContext facesContext) {
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 e4b929d6fc..eb9edbaf16 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
@@ -43,7 +43,7 @@ public abstract class FacesContextUtils {
 	 * <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
-	 * @return the root WebApplicationContext for this web app, or <code>null</code> if none
+	 * @return the root WebApplicationContext for this web app, or {@code null} if none
 	 * @see org.springframework.web.context.WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE
 	 */
 	public static WebApplicationContext getWebApplicationContext(FacesContext fc) {
@@ -90,18 +90,18 @@ public abstract class FacesContextUtils {
 	 * that is, an object to synchronize on for the given session.
 	 * <p>Returns the session mutex attribute if available; usually,
 	 * this means that the HttpSessionMutexListener needs to be defined
-	 * in <code>web.xml</code>. Falls back to the Session reference itself
+	 * in {@code web.xml}. Falls back to the Session reference itself
 	 * if no mutex attribute found.
 	 * <p>The session mutex is guaranteed to be the same object during
 	 * the entire lifetime of the session, available under the key defined
-	 * by the <code>SESSION_MUTEX_ATTRIBUTE</code> constant. It serves as a
+	 * by the {@code SESSION_MUTEX_ATTRIBUTE} constant. It serves as a
 	 * safe reference to synchronize on for locking on the current session.
 	 * <p>In many cases, the Session reference itself is a safe mutex
 	 * as well, since it will always be the same object reference for the
 	 * same active logical session. However, this is not guaranteed across
 	 * different servlet containers; the only 100% safe way is a session mutex.
 	 * @param fc the FacesContext to find the session mutex for
-	 * @return the mutex object (never <code>null</code>)
+	 * @return the mutex object (never {@code null})
 	 * @see org.springframework.web.util.WebUtils#SESSION_MUTEX_ATTRIBUTE
 	 * @see org.springframework.web.util.HttpSessionMutexListener
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java
index f66c4a56ee..7dcaf3ebfc 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java
@@ -24,8 +24,8 @@ import org.springframework.util.Assert;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
- * Special JSF 1.1 <code>VariableResolver</code> that exposes the Spring
- * <code>WebApplicationContext</code> instance under a variable named
+ * Special JSF 1.1 {@code VariableResolver} that exposes the Spring
+ * {@code WebApplicationContext} instance under a variable named
  * "webApplicationContext".
  *
  * <p>In contrast to {@link DelegatingVariableResolver}, this VariableResolver
@@ -34,7 +34,7 @@ import org.springframework.web.context.WebApplicationContext;
  * JSF-managed beans can then use Spring's WebApplicationContext API to retrieve
  * Spring-managed beans, access resources, etc.
  *
- * <p>Configure this resolver in your <code>faces-config.xml</code> file as follows:
+ * <p>Configure this resolver in your {@code faces-config.xml} file as follows:
  *
  * <pre>
  * &lt;application>
@@ -105,7 +105,7 @@ public class WebApplicationContextVariableResolver extends VariableResolver {
 	/**
 	 * Retrieve the WebApplicationContext reference to expose.
 	 * <p>The default implementation delegates to FacesContextUtils,
-	 * returning <code>null</code> if no WebApplicationContext found.
+	 * returning {@code null} if no WebApplicationContext found.
 	 * @param facesContext the current JSF context
 	 * @return the Spring web application context
 	 * @see FacesContextUtils#getWebApplicationContext
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
index 7fa88a5a6d..cb4af40c70 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
@@ -25,11 +25,11 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.jsf.FacesContextUtils;
 
 /**
- * JSF 1.2 <code>ELResolver</code> that delegates to the Spring root
- * <code>WebApplicationContext</code>, resolving name references to
+ * JSF 1.2 {@code ELResolver} that delegates to the Spring root
+ * {@code WebApplicationContext}, resolving name references to
  * Spring-defined beans.
  *
- * <p>Configure this resolver in your <code>faces-config.xml</code> file as follows:
+ * <p>Configure this resolver in your {@code faces-config.xml} file as follows:
  *
  * <pre>
  * &lt;application>
@@ -72,7 +72,7 @@ public class SpringBeanFacesELResolver extends SpringBeanELResolver {
 	 * Can be overridden to provide an arbitrary BeanFactory reference to resolve
 	 * against; usually, this will be a full Spring ApplicationContext.
 	 * @param elContext the current JSF ELContext
-	 * @return the Spring BeanFactory (never <code>null</code>)
+	 * @return the Spring BeanFactory (never {@code null})
 	 */
 	@Override
 	protected BeanFactory getBeanFactory(ELContext elContext) {
@@ -83,7 +83,7 @@ public class SpringBeanFacesELResolver extends SpringBeanELResolver {
 	 * Retrieve the web application context to delegate bean name resolution to.
 	 * <p>The default implementation delegates to FacesContextUtils.
 	 * @param elContext the current JSF ELContext
-	 * @return the Spring web application context (never <code>null</code>)
+	 * @return the Spring web application context (never {@code null})
 	 * @see org.springframework.web.jsf.FacesContextUtils#getRequiredWebApplicationContext
 	 */
 	protected WebApplicationContext getWebApplicationContext(ELContext elContext) {
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
index bf87a088f1..f1ae54882d 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
@@ -32,8 +32,8 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.jsf.FacesContextUtils;
 
 /**
- * Special JSF 1.2 <code>ELResolver</code> that exposes the Spring
- * <code>WebApplicationContext</code> instance under a variable named
+ * Special JSF 1.2 {@code ELResolver} that exposes the Spring
+ * {@code WebApplicationContext} instance under a variable named
  * "webApplicationContext".
  *
  * <p>In contrast to {@link SpringBeanFacesELResolver}, this ELResolver variant
@@ -42,7 +42,7 @@ import org.springframework.web.jsf.FacesContextUtils;
  * and is able to resolve "webApplicationContext.mySpringManagedBusinessObject"
  * dereferences to Spring-defined beans in that application context.
  *
- * <p>Configure this resolver in your <code>faces-config.xml</code> file as follows:
+ * <p>Configure this resolver in your {@code faces-config.xml} file as follows:
  *
  * <pre>
  * &lt;application>
@@ -168,7 +168,7 @@ public class WebApplicationContextFacesELResolver extends ELResolver {
 	/**
 	 * Retrieve the WebApplicationContext reference to expose.
 	 * <p>The default implementation delegates to FacesContextUtils,
-	 * returning <code>null</code> if no WebApplicationContext found.
+	 * returning {@code null} if no WebApplicationContext found.
 	 * @param elContext the current JSF ELContext
 	 * @return the Spring web application context
 	 * @see org.springframework.web.jsf.FacesContextUtils#getWebApplicationContext
diff --git a/spring-web/src/main/java/org/springframework/web/method/package-info.java b/spring-web/src/main/java/org/springframework/web/method/package-info.java
index 55225b41f0..343a2c8449 100644
--- a/spring-web/src/main/java/org/springframework/web/method/package-info.java
+++ b/spring-web/src/main/java/org/springframework/web/method/package-info.java
@@ -1,8 +1,7 @@
-
 /**
  *
  * Common infrastructure for handler method processing, as used by
- * Spring MVC's <code>org.springframework.web.servlet.mvc.method</code> package.
+ * Spring MVC's {@code org.springframework.web.servlet.mvc.method} package.
  *
  */
 package org.springframework.web.method;
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 e8036f7d4a..721ccf0bf6 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
@@ -214,7 +214,7 @@ public class ModelAndViewContainer {
 	}
 
 	/**
-	 * Copy attributes in the supplied <code>Map</code> with existing objects of
+	 * Copy attributes in the supplied {@code Map} with existing objects of
 	 * the same name taking precedence (i.e. not getting replaced).
 	 * A shortcut for {@code getModel().mergeAttributes(Map<String, ?>)}.
 	 */
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 b9979083e3..632e9fb472 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
@@ -38,7 +38,7 @@ public interface MultipartFile {
 
 	/**
 	 * Return the name of the parameter in the multipart form.
-	 * @return the name of the parameter (never <code>null</code> or empty)
+	 * @return the name of the parameter (never {@code null} or empty)
 	 */
 	String getName();
 
@@ -47,14 +47,14 @@ public interface MultipartFile {
 	 * <p>This may contain path information depending on the browser used,
 	 * but it typically will not with any other than Opera.
 	 * @return the original filename, or the empty String if no file
-	 * has been chosen in the multipart form, or <code>null</code>
+	 * has been chosen in the multipart form, or {@code null}
 	 * if not defined or not available
 	 */
 	String getOriginalFilename();
 
 	/**
 	 * Return the content type of the file.
-	 * @return the content type, or <code>null</code> if not defined
+	 * @return the content type, or {@code null} if not defined
 	 * (or no file has been chosen in the multipart form)
 	 */
 	String getContentType();
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java
index b0ff733da5..ed1ce75a97 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java
@@ -45,7 +45,7 @@ public interface MultipartRequest {
 
 	/**
 	 * Return the contents plus description of an uploaded file in this request,
-	 * or <code>null</code> if it does not exist.
+	 * or {@code null} if it does not exist.
 	 * @param name a String specifying the parameter name of the multipart file
 	 * @return the uploaded content in the form of a {@link MultipartFile} object
 	 */
@@ -78,7 +78,7 @@ public interface MultipartRequest {
 	/**
 	 * Determine the content type of the specified request part.
 	 * @param paramOrFileName the name of the part
-	 * @return the associated content type, or <code>null</code> if not defined
+	 * @return the associated content type, or {@code null} if not defined
 	 * @since 3.1
 	 */
 	String getMultipartContentType(String paramOrFileName);
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 3a74463530..93e0ee5b65 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
@@ -40,12 +40,12 @@ import javax.servlet.http.HttpServletRequest;
  *
  * <p>If a {@link org.springframework.web.servlet.DispatcherServlet} detects
  * a multipart request, it will resolve it via the configured
- * {@link org.springframework.web.multipart.MultipartResolver} and pass on a
+ * {@link MultipartResolver} and pass on a
  * wrapped {@link javax.servlet.http.HttpServletRequest}.
  * Controllers can then cast their given request to the
- * {@link org.springframework.web.multipart.MultipartHttpServletRequest}
+ * {@link MultipartHttpServletRequest}
  * interface, which permits access to any
- * {@link org.springframework.web.multipart.MultipartFile MultipartFiles}.
+ * {@link MultipartFile MultipartFiles}.
  * Note that this cast is only supported in case of an actual multipart request.
  *
  * <pre class="code">
@@ -62,19 +62,19 @@ import javax.servlet.http.HttpServletRequest;
  * bean properties.
  *
  * <p>As an alternative to using a
- * {@link org.springframework.web.multipart.MultipartResolver} with 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</code>. It will delegate to a corresponding
- * {@link org.springframework.web.multipart.MultipartResolver} bean in the root
+ * 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.
  *
  * <p>Note: There is hardly ever a need to access the
- * {@link org.springframework.web.multipart.MultipartResolver} itself
+ * {@link MultipartResolver} itself
  * from application code. It will simply do its work behind the scenes,
  * making
- * {@link org.springframework.web.multipart.MultipartHttpServletRequest MultipartHttpServletRequests}
+ * {@link MultipartHttpServletRequest MultipartHttpServletRequests}
  * available to controllers.
  *
  * @author Juergen Hoeller
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 d2e5938d29..c50df92d4b 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
@@ -82,7 +82,7 @@ public abstract class CommonsFileUploadSupport {
 
 
 	/**
-	 * Return the underlying <code>org.apache.commons.fileupload.disk.DiskFileItemFactory</code>
+	 * Return the underlying {@code org.apache.commons.fileupload.disk.DiskFileItemFactory}
 	 * instance. There is hardly any need to access this.
 	 * @return the underlying DiskFileItemFactory instance
 	 */
@@ -91,7 +91,7 @@ public abstract class CommonsFileUploadSupport {
 	}
 
 	/**
-	 * Return the underlying <code>org.apache.commons.fileupload.FileUpload</code>
+	 * Return the underlying {@code org.apache.commons.fileupload.FileUpload}
 	 * instance. There is hardly any need to access this.
 	 * @return the underlying FileUpload instance
 	 */
@@ -127,7 +127,7 @@ public abstract class CommonsFileUploadSupport {
 	 * <p>If the request specifies a character encoding itself, the request
 	 * encoding will override this setting. This also allows for generically
 	 * overriding the character encoding in a filter that invokes the
-	 * <code>ServletRequest.setCharacterEncoding</code> method.
+	 * {@code ServletRequest.setCharacterEncoding} method.
 	 * @param defaultEncoding the character encoding to use
 	 * @see javax.servlet.ServletRequest#getCharacterEncoding
 	 * @see javax.servlet.ServletRequest#setCharacterEncoding
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 9c2d45113b..91c26212fa 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
@@ -59,7 +59,7 @@ public class CommonsMultipartFile implements MultipartFile, Serializable {
 	}
 
 	/**
-	 * Return the underlying <code>org.apache.commons.fileupload.FileItem</code>
+	 * Return the underlying {@code org.apache.commons.fileupload.FileItem}
 	 * instance. There is hardly any need to access this.
 	 */
 	public final FileItem getFileItem() {
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 3ea1edc79d..92e20f3044 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
@@ -101,7 +101,7 @@ public class CommonsMultipartResolver extends CommonsFileUploadSupport
 	}
 
 	/**
-	 * Initialize the underlying <code>org.apache.commons.fileupload.servlet.ServletFileUpload</code>
+	 * Initialize the underlying {@code org.apache.commons.fileupload.servlet.ServletFileUpload}
 	 * instance. Can be overridden to use a custom subclass, e.g. for testing purposes.
 	 * @param fileItemFactory the Commons FileItemFactory to use
 	 * @return the new ServletFileUpload instance
@@ -170,7 +170,7 @@ public class CommonsMultipartResolver extends CommonsFileUploadSupport
 	 * <p>The default implementation checks the request encoding,
 	 * falling back to the default encoding specified for this resolver.
 	 * @param request current HTTP request
-	 * @return the encoding for the request (never <code>null</code>)
+	 * @return the encoding for the request (never {@code null})
 	 * @see javax.servlet.ServletRequest#getCharacterEncoding
 	 * @see #setDefaultEncoding
 	 */
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 b22ba7af1c..ad002782ae 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
@@ -33,17 +33,17 @@ import org.springframework.web.multipart.MultipartResolver;
  * in the root web application context.
  *
  * <p>Looks up the MultipartResolver in Spring's root web application context.
- * Supports a "multipartResolverBeanName" filter init-param in <code>web.xml</code>;
+ * 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).
  *
  * <p>If no MultipartResolver bean is found, this filter falls back to a default
  * MultipartResolver: {@link StandardServletMultipartResolver} for Servlet 3.0,
- * based on a multipart-config section in <code>web.xml</code>.
+ * based on a multipart-config section in {@code web.xml}.
  *
  * <p>MultipartResolver lookup is customizable: Override this filter's
- * <code>lookupMultipartResolver</code> method to use a custom MultipartResolver
+ * {@code lookupMultipartResolver} method to use a custom MultipartResolver
  * instance, for example if not using a Spring web application context.
  * Note that the lookup method should not create a new MultipartResolver instance
  * for each call but rather return a reference to a pre-built instance.
@@ -128,7 +128,7 @@ public class MultipartFilter extends OncePerRequestFilter {
 	/**
 	 * Look up the MultipartResolver that this filter should use,
 	 * taking the current HTTP request as argument.
-	 * <p>The default implementation delegates to the <code>lookupMultipartResolver</code>
+	 * <p>The default implementation delegates to the {@code lookupMultipartResolver}
 	 * without arguments.
 	 * @return the MultipartResolver to use
 	 * @see #lookupMultipartResolver()
@@ -143,7 +143,7 @@ public class MultipartFilter extends OncePerRequestFilter {
 	 * bean name is "filterMultipartResolver".
 	 * <p>This can be overridden to use a custom MultipartResolver instance,
 	 * for example if not using a Spring web application context.
-	 * @return the MultipartResolver instance, or <code>null</code> if none found
+	 * @return the MultipartResolver instance, or {@code null} if none found
 	 */
 	protected MultipartResolver lookupMultipartResolver() {
 		WebApplicationContext wac = WebApplicationContextUtils.getWebApplicationContext(getServletContext());
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 bbbf63b5b1..f2b564e1c6 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
@@ -33,7 +33,7 @@ import org.springframework.web.multipart.MultipartResolver;
  *
  * <p><b>Note:</b> In order to use Servlet 3.0 based multipart parsing,
  * you need to mark the affected servlet with a "multipart-config" section in
- * <code>web.xml</code>, or with a {@link javax.servlet.MultipartConfigElement}
+ * {@code web.xml}, or with a {@link javax.servlet.MultipartConfigElement}
  * in programmatic servlet registration, or (in case of a custom servlet class)
  * possibly with a {@link javax.servlet.annotation.MultipartConfig} annotation
  * on your servlet class. Configuration settings such as maximum sizes or
diff --git a/spring-web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java b/spring-web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java
index 46f78f1075..aaf93ba988 100644
--- a/spring-web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java
@@ -47,7 +47,7 @@ public abstract class ExpressionEvaluationUtils {
 
 	/**
 	 * Expression support parameter at the servlet context level
-	 * (i.e. a context-param in <code>web.xml</code>): "springJspExpressionSupport".
+	 * (i.e. a context-param in {@code web.xml}): "springJspExpressionSupport".
 	 */
 	public static final String EXPRESSION_SUPPORT_CONTEXT_PARAM = "springJspExpressionSupport";
 
@@ -60,19 +60,19 @@ public abstract class ExpressionEvaluationUtils {
 	 * Check whether Spring's JSP expression support is actually active.
 	 * <p>Note that JSP 2.0+ containers come with expression support themselves:
 	 * However, it will only be active for web applications declaring Servlet 2.4
-	 * or higher in their <code>web.xml</code> deployment descriptor.
-	 * <p>If a <code>web.xml</code> context-param named "springJspExpressionSupport" is
+	 * or higher in their {@code web.xml} deployment descriptor.
+	 * <p>If a {@code web.xml} context-param named "springJspExpressionSupport" is
 	 * found, its boolean value will be taken to decide whether this support is active.
 	 * If not found, the default is for expression support to be inactive on Servlet 3.0
 	 * containers with web applications declaring Servlet 2.4 or higher in their
-	 * <code>web.xml</code>. For backwards compatibility, Spring's expression support
+	 * {@code web.xml}. For backwards compatibility, Spring's expression support
 	 * will remain active for applications declaring Servlet 2.3 or earlier. However,
 	 * on Servlet 2.4/2.5 containers, we can't find out what the application has declared;
 	 * as of Spring 3.2, we won't activate Spring's expression support at all then since
 	 * it got deprecated and will be removed in the next iteration of the framework.
 	 * @param pageContext current JSP PageContext
-	 * @return <code>true</code> if active (ExpressionEvaluationUtils will actually evaluate expressions);
-	 * <code>false</code> if not active (ExpressionEvaluationUtils will return given values as-is,
+	 * @return {@code true} if active (ExpressionEvaluationUtils will actually evaluate expressions);
+	 * {@code false} if not active (ExpressionEvaluationUtils will return given values as-is,
 	 * relying on the JSP container pre-evaluating values before passing them to JSP tag attributes)
 	 */
 	public static boolean isSpringJspExpressionSupportActive(PageContext pageContext) {
@@ -95,8 +95,8 @@ public abstract class ExpressionEvaluationUtils {
 	/**
 	 * Check if the given expression value is an EL expression.
 	 * @param value the expression to check
-	 * @return <code>true</code> if the expression is an EL expression,
-	 * <code>false</code> otherwise
+	 * @return {@code true} if the expression is an EL expression,
+	 * {@code false} otherwise
 	 */
 	public static boolean isExpressionLanguage(String value) {
 		return (value != null && value.contains(EXPRESSION_PREFIX));
diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
index 4f91a68ebf..3d7c91cee0 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
@@ -111,7 +111,7 @@ class HtmlCharacterEntityReferences {
 	}
 
 	/**
-	 * Return the reference mapped to the given character or <code>null</code>.
+	 * Return the reference mapped to the given character or {@code null}.
 	 */
 	public String convertToReference(char character) {
 		if (character < 1000 || (character >= 8000 && character < 10000)) {
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 e28d503c8e..b97d64e654 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
@@ -48,7 +48,7 @@ public abstract class HtmlUtils {
 	 * Turn special characters into HTML character references.
 	 * Handles complete character set defined in HTML 4.01 recommendation.
 	 * <p>Escapes all special characters to their corresponding
-	 * entity reference (e.g. <code>&lt;</code>).
+	 * entity reference (e.g. {@code &lt;}).
 	 * <p>Reference:
 	 * <a href="http://www.w3.org/TR/html4/sgml/entities.html">
 	 * http://www.w3.org/TR/html4/sgml/entities.html
diff --git a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
index 40143639a6..32147df7d6 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
@@ -24,11 +24,11 @@ import javax.servlet.http.HttpSessionListener;
 /**
  * Servlet 2.3 HttpSessionListener that automatically exposes the
  * session mutex when an HttpSession gets created.
- * To be registered as a listener in <code>web.xml</code>.
+ * To be registered as a listener in {@code web.xml}.
  *
  * <p>The session mutex is guaranteed to be the same object during
  * the entire lifetime of the session, available under the key defined
- * by the <code>SESSION_MUTEX_ATTRIBUTE</code> constant. It serves as a
+ * by the {@code SESSION_MUTEX_ATTRIBUTE} constant. It serves as a
  * safe reference to synchronize on for locking on the current session.
  *
  * <p>In many cases, the HttpSession reference itself is a safe mutex
diff --git a/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java b/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
index 4ccb0f8b1e..0d0e7de648 100644
--- a/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
@@ -25,7 +25,7 @@ import org.springframework.beans.CachedIntrospectionResults;
 
 /**
  * Listener that flushes the JDK's {@link java.beans.Introspector JavaBeans Introspector}
- * cache on web app shutdown. Register this listener in your <code>web.xml</code> to
+ * cache on web app shutdown. Register this listener in your {@code web.xml} to
  * guarantee proper release of the web application class loader and its loaded classes.
  *
  * <p><b>If the JavaBeans Introspector has been used to analyze application classes,
@@ -59,7 +59,7 @@ import org.springframework.beans.CachedIntrospectionResults;
  * you will see all the application's static class resources (like singletons)
  * around after web app shutdown, which is not the fault of those classes!
  *
- * <p><b>This listener should be registered as the first one in <code>web.xml</code>,
+ * <p><b>This listener should be registered as the first one in {@code web.xml},
  * before any application listeners such as Spring's ContextLoaderListener.</b>
  * This allows the listener to take full effect at the right time of the lifecycle.
  *
diff --git a/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java b/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java
index 40c5010674..6ee0c08626 100644
--- a/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java
@@ -28,9 +28,9 @@ import javax.servlet.ServletContextListener;
  * don't need application-specific log files within the WAR directory, don't use
  * log4j setup within the application (thus, don't use Log4jConfigListener or
  * Log4jConfigServlet). Instead, use a global, VM-wide log4j setup (for example,
- * in JBoss) or JDK 1.4's <code>java.util.logging</code> (which is global too).
+ * in JBoss) or JDK 1.4's {@code java.util.logging} (which is global too).
  *
- * <p>This listener should be registered before ContextLoaderListener in <code>web.xml</code>
+ * <p>This listener should be registered before ContextLoaderListener in {@code web.xml}
  * when using custom log4j initialization.
  *
  * @author Juergen Hoeller
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 550a4a079c..63211beaf5 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
@@ -34,7 +34,7 @@ import org.springframework.util.SystemPropertyUtils;
  * don't need application-specific log files within the WAR directory, don't use
  * log4j setup within the application (thus, don't use Log4jConfigListener or
  * Log4jConfigServlet). Instead, use a global, VM-wide log4j setup (for example,
- * in JBoss) or JDK 1.4's <code>java.util.logging</code> (which is global too).
+ * in JBoss) or JDK 1.4's {@code java.util.logging} (which is global too).
  *
  * <p>Supports three init parameters at the servlet context level (that is,
  * context-param entries in web.xml):
@@ -57,7 +57,7 @@ import org.springframework.util.SystemPropertyUtils;
  * below for details on how to use this system property in log file locations.
  * </ul>
  *
- * <p>Note: <code>initLogging</code> should be called before any other Spring activity
+ * <p>Note: {@code initLogging} should be called before any other Spring activity
  * (when using log4j), for proper initialization before any Spring logging attempts.
  *
  * <p>Log4j's watchdog thread will asynchronously check whether the timestamp
@@ -76,12 +76,12 @@ import org.springframework.util.SystemPropertyUtils;
  * The default system property key is "webapp.root", to be used in a log4j config
  * file like as follows:
  *
- * <p><code>log4j.appender.myfile.File=${webapp.root}/WEB-INF/demo.log</code>
+ * <p>{@code log4j.appender.myfile.File=${webapp.root}/WEB-INF/demo.log}
  *
  * <p>Alternatively, specify a unique context-param "webAppRootKey" per web application.
  * For example, with "webAppRootKey = "demo.root":
  *
- * <p><code>log4j.appender.myfile.File=${demo.root}/WEB-INF/demo.log</code>
+ * <p>{@code log4j.appender.myfile.File=${demo.root}/WEB-INF/demo.log}
  *
  * <p><b>WARNING:</b> Some containers (like Tomcat) do <i>not</i> keep system properties
  * separate per web app. You have to use unique "webAppRootKey" context-params per web
diff --git a/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java b/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java
index d19f1331e0..81d3e0f597 100644
--- a/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java
+++ b/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java
@@ -53,7 +53,7 @@ public class NestedServletException extends ServletException {
 
 
 	/**
-	 * Construct a <code>NestedServletException</code> with the specified detail message.
+	 * Construct a {@code NestedServletException} with the specified detail message.
 	 * @param msg the detail message
 	 */
 	public NestedServletException(String msg) {
@@ -61,7 +61,7 @@ public class NestedServletException extends ServletException {
 	}
 
 	/**
-	 * Construct a <code>NestedServletException</code> with the specified detail message
+	 * Construct a {@code NestedServletException} with the specified detail message
 	 * and nested exception.
 	 * @param msg the detail message
 	 * @param cause the nested exception
diff --git a/spring-web/src/main/java/org/springframework/web/util/TagUtils.java b/spring-web/src/main/java/org/springframework/web/util/TagUtils.java
index 298262392b..cf8d45148c 100644
--- a/spring-web/src/main/java/org/springframework/web/util/TagUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/TagUtils.java
@@ -27,13 +27,13 @@ import org.springframework.util.Assert;
  *
  * <p>
  * <ul>
- * <li><code>page</code> will be transformed to
+ * <li>{@code page} will be transformed to
  * {@link javax.servlet.jsp.PageContext#PAGE_SCOPE PageContext.PAGE_SCOPE}
- * <li><code>request</code> will be transformed to
+ * <li>{@code request} will be transformed to
  * {@link javax.servlet.jsp.PageContext#REQUEST_SCOPE PageContext.REQUEST_SCOPE}
- * <li><code>session</code> will be transformed to
+ * <li>{@code session} will be transformed to
  * {@link javax.servlet.jsp.PageContext#SESSION_SCOPE PageContext.SESSION_SCOPE}
- * <li><code>application</code> will be transformed to
+ * <li>{@code application} will be transformed to
  * {@link javax.servlet.jsp.PageContext#APPLICATION_SCOPE PageContext.APPLICATION_SCOPE}
  * </ul>
  *
@@ -58,12 +58,12 @@ public abstract class TagUtils {
 
 
 	/**
-	 * Determines the scope for a given input <code>String</code>.
-	 * <p>If the <code>String</code> does not match 'request', 'session',
+	 * Determines the scope for a given input {@code String}.
+	 * <p>If the {@code String} does not match 'request', 'session',
 	 * 'page' or 'application', the method will return {@link PageContext#PAGE_SCOPE}.
-	 * @param scope the <code>String</code> to inspect
+	 * @param scope the {@code String} to inspect
 	 * @return the scope found, or {@link PageContext#PAGE_SCOPE} if no scope matched
-	 * @throws IllegalArgumentException if the supplied <code>scope</code> is <code>null</code>
+	 * @throws IllegalArgumentException if the supplied {@code scope} is {@code null}
 	 */
 	public static int getScope(String scope) {
 		Assert.notNull(scope, "Scope to search for cannot be null");
@@ -86,10 +86,10 @@ public abstract class TagUtils {
 	 * of the supplied type.
 	 * @param tag the tag whose ancestors are to be checked
 	 * @param ancestorTagClass the ancestor {@link Class} being searched for
-	 * @return <code>true</code> if the supplied {@link Tag} has any ancestor tag
+	 * @return {@code true} if the supplied {@link Tag} has any ancestor tag
 	 * of the supplied type
-	 * @throws IllegalArgumentException if either of the supplied arguments is <code>null</code>;
-	 * or if the supplied <code>ancestorTagClass</code> is not type-assignable to
+	 * @throws IllegalArgumentException if either of the supplied arguments is {@code null};
+	 * or if the supplied {@code ancestorTagClass} is not type-assignable to
 	 * the {@link Tag} class
 	 */
 	public static boolean hasAncestorOfType(Tag tag, Class ancestorTagClass) {
@@ -115,13 +115,13 @@ public abstract class TagUtils {
 	 * if not.
 	 * @param tag the tag whose ancestors are to be checked
 	 * @param ancestorTagClass the ancestor {@link Class} being searched for
-	 * @param tagName the name of the <code>tag</code>; for example '<code>option</code>'
-	 * @param ancestorTagName the name of the ancestor <code>tag</code>; for example '<code>select</code>'
-	 * @throws IllegalStateException if the supplied <code>tag</code> does not
-	 * have a tag of the supplied <code>parentTagClass</code> as an ancestor
-	 * @throws IllegalArgumentException if any of the supplied arguments is <code>null</code>,
+	 * @param tagName the name of the {@code tag}; for example '{@code option}'
+	 * @param ancestorTagName the name of the ancestor {@code tag}; for example '{@code select}'
+	 * @throws IllegalStateException if the supplied {@code tag} does not
+	 * have a tag of the supplied {@code parentTagClass} as an ancestor
+	 * @throws IllegalArgumentException if any of the supplied arguments is {@code null},
 	 * or in the case of the {@link String}-typed arguments, is composed wholly
-	 * of whitespace; or if the supplied <code>ancestorTagClass</code> is not
+	 * of whitespace; or if the supplied {@code ancestorTagClass} is not
 	 * type-assignable to the {@link Tag} class
 	 * @see #hasAncestorOfType(javax.servlet.jsp.tagext.Tag, Class)
 	 */
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 92070f08ac..a2b00dded6 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
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
 
 /**
  * Represents a URI template. A URI template is a URI-like String that contains variables enclosed
- * by braces (<code>{</code>, <code>}</code>), which can be expanded to produce an actual URI.
+ * by braces ({@code {}, {@code }}), which can be expanded to produce an actual URI.
  *
  * <p>See {@link #expand(Map)}, {@link #expand(Object[])}, and {@link #match(String)} for example usages.
  *
@@ -91,10 +91,10 @@ public class UriTemplate implements Serializable {
 	 * uriVariables.put("hotel", "1");
 	 * System.out.println(template.expand(uriVariables));
 	 * </pre>
-	 * will print: <blockquote><code>http://example.com/hotels/1/bookings/42</code></blockquote>
+	 * will print: <blockquote>{@code http://example.com/hotels/1/bookings/42}</blockquote>
 	 * @param uriVariables the map of URI variables
 	 * @return the expanded URI
-	 * @throws IllegalArgumentException if <code>uriVariables</code> is <code>null</code>;
+	 * @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) {
@@ -103,20 +103,20 @@ public class UriTemplate implements Serializable {
 		return encodedComponents.toUri();
 	}
 
-	/**
-	 * Given an array of variables, expand this template into a full URI. The array represent variable values.
-	 * The order of variables is significant.
-	 * <p>Example:
-	 * <pre class="code">
-	 * UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
-	 * System.out.println(template.expand("1", "42));
-	 * </pre>
-	 * will print: <blockquote><code>http://example.com/hotels/1/bookings/42</code></blockquote>
-	 * @param uriVariableValues the array of URI variables
-	 * @return the expanded URI
-	 * @throws IllegalArgumentException if <code>uriVariables</code> is <code>null</code>
-	 * or if it does not contain sufficient variables
-	 */
+    /**
+     * Given an array of variables, expand this template into a full URI. The array represent variable values.
+     * The order of variables is significant.
+     * <p>Example:
+     * <pre class="code">
+     * UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
+     * System.out.println(template.expand("1", "42));
+     * </pre>
+     * will print: <blockquote>{@code http://example.com/hotels/1/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 encodedComponents = expandedComponents.encode();
@@ -128,7 +128,7 @@ public class UriTemplate implements Serializable {
 	/**
 	 * Indicate whether the given URI matches this template.
 	 * @param uri the URI to match to
-	 * @return <code>true</code> if it matches; <code>false</code> otherwise
+	 * @return {@code true} if it matches; {@code false} otherwise
 	 */
 	public boolean matches(String uri) {
 		if (uri == null) {
@@ -146,7 +146,7 @@ public class UriTemplate implements Serializable {
 	 * UriTemplate template = new UriTemplate("http://example.com/hotels/{hotel}/bookings/{booking}");
 	 * System.out.println(template.match("http://example.com/hotels/1/bookings/42"));
 	 * </pre>
-	 * will print: <blockquote><code>{hotel=1, booking=42}</code></blockquote>
+	 * will print: <blockquote>{@code {hotel=1, booking=42}}</blockquote>
 	 * @param uri the URI to match to
 	 * @return a map of variable values
 	 */
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 c86b5a613e..79951a64c7 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
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
  * <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></code>" format.</li>
+ * resulting bytes is written as a hexadecimal string in the "{@code %<i>xy</i>}" format.</li>
  * </ul>
  *
  * @author Arjen Poutsma
@@ -338,7 +338,7 @@ public abstract class UriUtils {
 	 * <li>Alphanumeric characters {@code "a"} through {@code "z"}, {@code "A"} through {@code "Z"}, and
 	 * {@code "0"} through {@code "9"} stay the same.</li>
 	 * <li>Special characters {@code "-"}, {@code "_"}, {@code "."}, and {@code "*"} stay the same.</li>
-	 * <li>A sequence "<code>%<i>xy</i></code>" is interpreted as a hexadecimal representation of the character.</li>
+	 * <li>A sequence "{@code %<i>xy</i>}" is interpreted as a hexadecimal representation of the character.</li>
 	 * </ul>
 	 * @param source the source string
 	 * @param encoding the encoding
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 7a8ce598d0..6d6ef4b44a 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
@@ -116,7 +116,7 @@ public class UrlPathHelper {
 	 * <p>If the request specifies a character encoding itself, the request
 	 * encoding will override this setting. This also allows for generically
 	 * overriding the character encoding in a filter that invokes the
-	 * <code>ServletRequest.setCharacterEncoding</code> method.
+	 * {@code ServletRequest.setCharacterEncoding} method.
 	 * @param defaultEncoding the character encoding to use
 	 * @see #determineEncoding
 	 * @see javax.servlet.ServletRequest#getCharacterEncoding()
@@ -249,7 +249,7 @@ public class UrlPathHelper {
 	/**
 	 * Return the request URI for the given request, detecting an include request
 	 * URL if called within a RequestDispatcher include.
-	 * <p>As the value returned by <code>request.getRequestURI()</code> is <i>not</i>
+	 * <p>As the value returned by {@code request.getRequestURI()} is <i>not</i>
 	 * decoded by the servlet container, this method will decode it.
 	 * <p>The URI that the web container resolves <i>should</i> be correct, but some
 	 * containers like JBoss/Jetty incorrectly include ";" strings like ";jsessionid"
@@ -268,7 +268,7 @@ public class UrlPathHelper {
 	/**
 	 * Return the context path for the given request, detecting an include request
 	 * URL if called within a RequestDispatcher include.
-	 * <p>As the value returned by <code>request.getContextPath()</code> is <i>not</i>
+	 * <p>As the value returned by {@code request.getContextPath()} is <i>not</i>
 	 * decoded by the servlet container, this method will decode it.
 	 * @param request current HTTP request
 	 * @return the context path
@@ -288,7 +288,7 @@ public class UrlPathHelper {
 	/**
 	 * Return the servlet path for the given request, regarding an include request
 	 * URL if called within a RequestDispatcher include.
-	 * <p>As the value returned by <code>request.getServletPath()</code> is already
+	 * <p>As the value returned by {@code request.getServletPath()} is already
 	 * decoded by the servlet container, this method will not attempt to decode it.
 	 * @param request current HTTP request
 	 * @return the servlet path
@@ -327,7 +327,7 @@ public class UrlPathHelper {
 	/**
 	 * Return the context path for the given request, detecting an include request
 	 * URL if called within a RequestDispatcher include.
-	 * <p>As the value returned by <code>request.getContextPath()</code> is <i>not</i>
+	 * <p>As the value returned by {@code request.getContextPath()} is <i>not</i>
 	 * decoded by the servlet container, this method will decode it.
 	 * @param request current HTTP request
 	 * @return the context path
@@ -382,7 +382,7 @@ public class UrlPathHelper {
 	/**
 	 * Decode the given source string with a URLDecoder. The encoding will be taken
 	 * from the request, falling back to the default "ISO-8859-1".
-	 * <p>The default implementation uses <code>URLDecoder.decode(input, enc)</code>.
+	 * <p>The default implementation uses {@code URLDecoder.decode(input, enc)}.
 	 * @param request current HTTP request
 	 * @param source the String to decode
 	 * @return the decoded String
@@ -418,7 +418,7 @@ public class UrlPathHelper {
 	 * <p>The default implementation checks the request encoding,
 	 * falling back to the default encoding specified for this resolver.
 	 * @param request current HTTP request
-	 * @return the encoding for the request (never <code>null</code>)
+	 * @return the encoding for the request (never {@code null})
 	 * @see javax.servlet.ServletRequest#getCharacterEncoding()
 	 * @see #setDefaultEncoding
 	 */
diff --git a/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java b/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
index a352f8e9cd..437216a969 100644
--- a/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
@@ -29,7 +29,7 @@ import javax.servlet.ServletContextListener;
  * (i.e. System.getProperty values), like log4j's "${key}" syntax within log
  * file locations.
  *
- * <p>Note: This listener should be placed before ContextLoaderListener in <code>web.xml</code>,
+ * <p>Note: This listener should be placed before ContextLoaderListener in {@code web.xml},
  * at least when used for log4j. Log4jConfigListener sets the system property
  * implicitly, so there's no need for this listener in addition to it.
  *
@@ -48,7 +48,7 @@ import javax.servlet.ServletContextListener;
  * @since 18.04.2003
  * @see WebUtils#setWebAppRootSystemProperty
  * @see Log4jConfigListener
- * @see java.lang.System#getProperty
+ * @see System#getProperty
  */
 public class WebAppRootListener implements ServletContextListener {
 
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 d8d3ce2446..d35ed57273 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
@@ -89,27 +89,27 @@ public abstract class WebUtils {
 	public static final String CONTENT_TYPE_CHARSET_PREFIX = ";charset=";
 
 	/**
-	 * Default character encoding to use when <code>request.getCharacterEncoding</code>
-	 * returns <code>null</code>, according to the Servlet spec.
+	 * Default character encoding to use when {@code request.getCharacterEncoding}
+	 * returns {@code null}, according to the Servlet spec.
 	 * @see ServletRequest#getCharacterEncoding
 	 */
 	public static final String DEFAULT_CHARACTER_ENCODING = "ISO-8859-1";
 
 	/**
 	 * Standard Servlet spec context attribute that specifies a temporary
-	 * directory for the current web application, of type <code>java.io.File</code>.
+	 * directory for the current web application, of type {@code java.io.File}.
 	 */
 	public static final String TEMP_DIR_CONTEXT_ATTRIBUTE = "javax.servlet.context.tempdir";
 
 	/**
 	 * HTML escape parameter at the servlet context level
-	 * (i.e. a context-param in <code>web.xml</code>): "defaultHtmlEscape".
+	 * (i.e. a context-param in {@code web.xml}): "defaultHtmlEscape".
 	 */
 	public static final String HTML_ESCAPE_CONTEXT_PARAM = "defaultHtmlEscape";
 
 	/**
 	 * Web app root key parameter at the servlet context level
-	 * (i.e. a context-param in <code>web.xml</code>): "webAppRootKey".
+	 * (i.e. a context-param in {@code web.xml}): "webAppRootKey".
 	 */
 	public static final String WEB_APP_ROOT_KEY_PARAM = "webAppRootKey";
 
@@ -126,8 +126,8 @@ public abstract class WebUtils {
 	/**
 	 * Set a system property to the web application root directory.
 	 * The key of the system property can be defined with the "webAppRootKey"
-	 * context-param in <code>web.xml</code>. Default is "webapp.root".
-	 * <p>Can be used for tools that support substition with <code>System.getProperty</code>
+	 * context-param in {@code web.xml}. Default is "webapp.root".
+	 * <p>Can be used for tools that support substition with {@code System.getProperty}
 	 * values, like log4j's "${key}" syntax within log file locations.
 	 * @param servletContext the servlet context of the web application
 	 * @throws IllegalStateException if the system property is already set,
@@ -172,8 +172,8 @@ public abstract class WebUtils {
 
 	/**
 	 * Return whether default HTML escaping is enabled for the web application,
-	 * i.e. the value of the "defaultHtmlEscape" context-param in <code>web.xml</code>
-	 * (if any). Falls back to <code>false</code> in case of no explicit default given.
+	 * 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)
 	 */
@@ -187,7 +187,7 @@ public abstract class WebUtils {
 
 	/**
 	 * Return whether default HTML escaping is enabled for the web application,
-	 * i.e. the value of the "defaultHtmlEscape" context-param in <code>web.xml</code>
+	 * i.e. the value of the "defaultHtmlEscape" context-param in {@code web.xml}
 	 * (if any).
 	 * <p>This method differentiates between no param specified at all and
 	 * an actual boolean value specified, allowing to have a context-specific
@@ -220,7 +220,7 @@ public abstract class WebUtils {
 	 * as provided by the servlet container.
 	 * <p>Prepends a slash if the path does not already start with a slash,
 	 * and throws a FileNotFoundException if the path cannot be resolved to
-	 * a resource (in contrast to ServletContext's <code>getRealPath</code>,
+	 * a resource (in contrast to ServletContext's {@code getRealPath},
 	 * which returns null).
 	 * @param servletContext the servlet context of the web application
 	 * @param path the path within the web application
@@ -247,7 +247,7 @@ public abstract class WebUtils {
 	/**
 	 * Determine the session id of the given request, if any.
 	 * @param request current HTTP request
-	 * @return the session id, or <code>null</code> if none
+	 * @return the session id, or {@code null} if none
 	 */
 	public static String getSessionId(HttpServletRequest request) {
 		Assert.notNull(request, "Request must not be null");
@@ -261,7 +261,7 @@ public abstract class WebUtils {
 	 * Does not create a new session if none has existed before!
 	 * @param request current HTTP request
 	 * @param name the name of the session attribute
-	 * @return the value of the session attribute, or <code>null</code> if not found
+	 * @return the value of the session attribute, or {@code null} if not found
 	 */
 	public static Object getSessionAttribute(HttpServletRequest request, String name) {
 		Assert.notNull(request, "Request must not be null");
@@ -275,7 +275,7 @@ public abstract class WebUtils {
 	 * attribute. Does not create a new session if none has existed before!
 	 * @param request current HTTP request
 	 * @param name the name of the session attribute
-	 * @return the value of the session attribute, or <code>null</code> if not found
+	 * @return the value of the session attribute, or {@code null} if not found
 	 * @throws IllegalStateException if the session attribute could not be found
 	 */
 	public static Object getRequiredSessionAttribute(HttpServletRequest request, String name)
@@ -348,18 +348,18 @@ public abstract class WebUtils {
 	 * that is, an object to synchronize on for the given session.
 	 * <p>Returns the session mutex attribute if available; usually,
 	 * this means that the HttpSessionMutexListener needs to be defined
-	 * in <code>web.xml</code>. Falls back to the HttpSession itself
+	 * in {@code web.xml}. Falls back to the HttpSession itself
 	 * if no mutex attribute found.
 	 * <p>The session mutex is guaranteed to be the same object during
 	 * the entire lifetime of the session, available under the key defined
-	 * by the <code>SESSION_MUTEX_ATTRIBUTE</code> constant. It serves as a
+	 * by the {@code SESSION_MUTEX_ATTRIBUTE} constant. It serves as a
 	 * safe reference to synchronize on for locking on the current session.
 	 * <p>In many cases, the HttpSession reference itself is a safe mutex
 	 * as well, since it will always be the same object reference for the
 	 * same active logical session. However, this is not guaranteed across
 	 * different servlet containers; the only 100% safe way is a session mutex.
 	 * @param session the HttpSession to find a mutex for
-	 * @return the mutex object (never <code>null</code>)
+	 * @return the mutex object (never {@code null})
 	 * @see #SESSION_MUTEX_ATTRIBUTE
 	 * @see HttpSessionMutexListener
 	 */
@@ -378,7 +378,7 @@ public abstract class WebUtils {
 	 * unwrapping the given request as far as necessary.
 	 * @param request the servlet request to introspect
 	 * @param requiredType the desired type of request object
-	 * @return the matching request object, or <code>null</code> if none
+	 * @return the matching request object, or {@code null} if none
 	 * of that type is available
 	 */
 	@SuppressWarnings("unchecked")
@@ -399,7 +399,7 @@ public abstract class WebUtils {
 	 * unwrapping the given response as far as necessary.
 	 * @param response the servlet response to introspect
 	 * @param requiredType the desired type of response object
-	 * @return the matching response object, or <code>null</code> if none
+	 * @return the matching response object, or {@code null} if none
 	 * of that type is available
 	 */
 	@SuppressWarnings("unchecked")
@@ -432,11 +432,11 @@ public abstract class WebUtils {
 	 * Expose the current request URI and paths as {@link javax.servlet.http.HttpServletRequest}
 	 * attributes under the keys defined in the Servlet 2.4 specification,
 	 * for containers that implement 2.3 or an earlier version of the Servlet API:
-	 * <code>javax.servlet.forward.request_uri</code>,
-	 * <code>javax.servlet.forward.context_path</code>,
-	 * <code>javax.servlet.forward.servlet_path</code>,
-	 * <code>javax.servlet.forward.path_info</code>,
-	 * <code>javax.servlet.forward.query_string</code>.
+	 * {@code javax.servlet.forward.request_uri},
+	 * {@code javax.servlet.forward.context_path},
+	 * {@code javax.servlet.forward.servlet_path},
+	 * {@code javax.servlet.forward.path_info},
+	 * {@code javax.servlet.forward.query_string}.
 	 * <p>Does not override values if already present, to not cause conflicts
 	 * with the attributes exposed by Servlet 2.4+ containers themselves.
 	 * @param request current servlet request
@@ -453,12 +453,12 @@ public abstract class WebUtils {
 	 * Expose the Servlet spec's error attributes as {@link javax.servlet.http.HttpServletRequest}
 	 * attributes under the keys defined in the Servlet 2.3 specification, for error pages that
 	 * are rendered directly rather than through the Servlet container's error page resolution:
-	 * <code>javax.servlet.error.status_code</code>,
-	 * <code>javax.servlet.error.exception_type</code>,
-	 * <code>javax.servlet.error.message</code>,
-	 * <code>javax.servlet.error.exception</code>,
-	 * <code>javax.servlet.error.request_uri</code>,
-	 * <code>javax.servlet.error.servlet_name</code>.
+	 * {@code javax.servlet.error.status_code},
+	 * {@code javax.servlet.error.exception_type},
+	 * {@code javax.servlet.error.message},
+	 * {@code javax.servlet.error.exception},
+	 * {@code javax.servlet.error.request_uri},
+	 * {@code javax.servlet.error.servlet_name}.
 	 * <p>Does not override values if already present, to respect attribute values
 	 * that have been exposed explicitly before.
 	 * <p>Exposes status code 200 by default. Set the "javax.servlet.error.status_code"
@@ -491,12 +491,12 @@ public abstract class WebUtils {
 	/**
 	 * Clear the Servlet spec's error attributes as {@link javax.servlet.http.HttpServletRequest}
 	 * attributes under the keys defined in the Servlet 2.3 specification:
-	 * <code>javax.servlet.error.status_code</code>,
-	 * <code>javax.servlet.error.exception_type</code>,
-	 * <code>javax.servlet.error.message</code>,
-	 * <code>javax.servlet.error.exception</code>,
-	 * <code>javax.servlet.error.request_uri</code>,
-	 * <code>javax.servlet.error.servlet_name</code>.
+	 * {@code javax.servlet.error.status_code},
+	 * {@code javax.servlet.error.exception_type},
+	 * {@code javax.servlet.error.message},
+	 * {@code javax.servlet.error.exception},
+	 * {@code javax.servlet.error.request_uri},
+	 * {@code javax.servlet.error.servlet_name}.
 	 * @param request current servlet request
 	 */
 	public static void clearErrorRequestAttributes(HttpServletRequest request) {
@@ -527,7 +527,7 @@ public abstract class WebUtils {
 	 * cookies can have the same name but different paths or domains.
 	 * @param request current servlet request
 	 * @param name cookie name
-	 * @return the first cookie with the given name, or <code>null</code> if none is found
+	 * @return the first cookie with the given name, or {@code null} if none is found
 	 */
 	public static Cookie getCookie(HttpServletRequest request, String name) {
 		Assert.notNull(request, "Request must not be null");
@@ -570,7 +570,7 @@ public abstract class WebUtils {
 	 * for a description of the lookup algorithm.
 	 * @param request current HTTP request
 	 * @param name the <i>logical</i> name of the request parameter
-	 * @return the value of the parameter, or <code>null</code>
+	 * @return the value of the parameter, or {@code null}
 	 * if the parameter does not exist in given request
 	 */
 	@SuppressWarnings("unchecked")
@@ -598,7 +598,7 @@ public abstract class WebUtils {
 	 * </ol>
 	 * @param parameters the available parameter map
 	 * @param name the <i>logical</i> name of the request parameter
-	 * @return the value of the parameter, or <code>null</code>
+	 * @return the value of the parameter, or {@code null}
 	 * if the parameter does not exist in given request
 	 */
 	public static String findParameterValue(Map<String, ?> parameters, String name) {
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java
index c98846c5b4..d3e3ff6785 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java
@@ -39,7 +39,7 @@ public class DelegatingServletInputStream extends ServletInputStream {
 
 	/**
 	 * Create a DelegatingServletInputStream for the given source stream.
-	 * @param sourceStream the source stream (never <code>null</code>)
+	 * @param sourceStream the source stream (never {@code null})
 	 */
 	public DelegatingServletInputStream(InputStream sourceStream) {
 		Assert.notNull(sourceStream, "Source InputStream must not be null");
@@ -47,7 +47,7 @@ public class DelegatingServletInputStream extends ServletInputStream {
 	}
 
 	/**
-	 * Return the underlying source stream (never <code>null</code>).
+	 * Return the underlying source stream (never {@code null}).
 	 */
 	public final InputStream getSourceStream() {
 		return this.sourceStream;
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java
index 6d34d5d48f..5f32208ecb 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java
@@ -39,7 +39,7 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 
 	/**
 	 * Create a DelegatingServletOutputStream for the given target stream.
-	 * @param targetStream the target stream (never <code>null</code>)
+	 * @param targetStream the target stream (never {@code null})
 	 */
 	public DelegatingServletOutputStream(OutputStream targetStream) {
 		Assert.notNull(targetStream, "Target OutputStream must not be null");
@@ -47,7 +47,7 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 	}
 
 	/**
-	 * Return the underlying target stream (never <code>null</code>).
+	 * Return the underlying target stream (never {@code null}).
 	 */
 	public final OutputStream getTargetStream() {
 		return this.targetStream;
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/HeaderValueHolder.java b/spring-web/src/test/java/org/springframework/mock/web/test/HeaderValueHolder.java
index bec095945c..35731b02c3 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/HeaderValueHolder.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/HeaderValueHolder.java
@@ -81,7 +81,7 @@ class HeaderValueHolder {
 	 * @param headers the Map of header names to HeaderValueHolders
 	 * @param name the name of the desired header
 	 * @return the corresponding HeaderValueHolder,
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 */
 	public static HeaderValueHolder getByName(Map<String, HeaderValueHolder> headers, String name) {
 		Assert.notNull(name, "Header name must not be null");
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 1c80d72a69..4544448afa 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
@@ -216,8 +216,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	/**
 	 * Create a new {@code MockHttpServletRequest} with a default
 	 * {@link MockServletContext}.
-	 * @param method the request method (may be <code>null</code>)
-	 * @param requestURI the request URI (may be <code>null</code>)
+	 * @param method the request method (may be {@code null})
+	 * @param requestURI the request URI (may be {@code null})
 	 * @see #setMethod
 	 * @see #setRequestURI
 	 * @see #MockHttpServletRequest(ServletContext, String, String)
@@ -229,7 +229,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	/**
 	 * Create a new {@code MockHttpServletRequest} with the supplied {@link ServletContext}.
 	 * @param servletContext the ServletContext that the request runs in (may be
-	 * <code>null</code> to use a default {@link MockServletContext})
+	 * {@code null} to use a default {@link MockServletContext})
 	 * @see #MockHttpServletRequest(ServletContext, String, String)
 	 */
 	public MockHttpServletRequest(ServletContext servletContext) {
@@ -241,9 +241,9 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	 * {@code method}, and {@code requestURI}.
 	 * <p>The preferred locale will be set to {@link Locale#ENGLISH}.
 	 * @param servletContext the ServletContext that the request runs in (may be
-	 * <code>null</code> to use a default {@link MockServletContext})
-	 * @param method the request method (may be <code>null</code>)
-	 * @param requestURI the request URI (may be <code>null</code>)
+	 * {@code null} to use a default {@link MockServletContext})
+	 * @param method the request method (may be {@code null})
+	 * @param requestURI the request URI (may be {@code null})
 	 * @see #setMethod
 	 * @see #setRequestURI
 	 * @see #setPreferredLocales
@@ -688,8 +688,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	 * a String array will be created, adding the given value (more
 	 * specifically, its toString representation) as further element.
 	 * <p>Multiple values can only be stored as list of Strings,
-	 * following the Servlet spec (see <code>getHeaders</code> accessor).
-	 * As alternative to repeated <code>addHeader</code> calls for
+	 * following the Servlet spec (see {@code getHeaders} accessor).
+	 * As alternative to repeated {@code addHeader} calls for
 	 * individual elements, you can use a single call with an entire
 	 * array or Collection of values as parameter.
 	 * @see #getHeaderNames
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
index 55d21e56a9..ce6ef7fa9b 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
@@ -110,7 +110,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	/**
 	 * Set whether {@link #getOutputStream()} access is allowed.
-	 * <p>Default is <code>true</code>.
+	 * <p>Default is {@code true}.
 	 */
 	public void setOutputStreamAccessAllowed(boolean outputStreamAccessAllowed) {
 		this.outputStreamAccessAllowed = outputStreamAccessAllowed;
@@ -125,7 +125,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	/**
 	 * Set whether {@link #getWriter()} access is allowed.
-	 * <p>Default is <code>true</code>.
+	 * <p>Default is {@code true}.
 	 */
 	public void setWriterAccessAllowed(boolean writerAccessAllowed) {
 		this.writerAccessAllowed = writerAccessAllowed;
@@ -299,7 +299,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	/**
 	 * Return the names of all specified headers as a Set of Strings.
 	 * <p>As of Servlet 3.0, this method is also defined HttpServletResponse.
-	 * @return the <code>Set</code> of header name <code>Strings</code>, or an empty <code>Set</code> if none
+	 * @return the {@code Set} of header name {@code Strings}, or an empty {@code Set} if none
 	 */
 	public Set<String> getHeaderNames() {
 		return this.headers.keySet();
@@ -312,7 +312,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * As of Spring 3.1, it returns a stringified value for Servlet 3.0 compatibility.
 	 * Consider using {@link #getHeaderValue(String)} for raw Object access.
 	 * @param name the name of the header
-	 * @return the associated header value, or <code>null<code> if none
+	 * @return the associated header value, or {@code null} if none
 	 */
 	public String getHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
@@ -341,7 +341,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * Return the primary value for the given header, if any.
 	 * <p>Will return the first value in case of multiple values.
 	 * @param name the name of the header
-	 * @return the associated header value, or <code>null<code> if none
+	 * @return the associated header value, or {@code null} if none
 	 */
 	public Object getHeaderValue(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java
index 82a198d48e..efa1319b92 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java
@@ -46,8 +46,8 @@ import org.springframework.util.Assert;
  * applications when testing custom JSP tags.
  *
  * <p>Note: Expects initialization via the constructor rather than via the
- * <code>PageContext.initialize</code> method. Does not support writing to
- * a JspWriter, request dispatching, and <code>handlePageException</code> calls.
+ * {@code PageContext.initialize} method. Does not support writing to
+ * a JspWriter, request dispatching, and {@code handlePageException} calls.
  *
  * @author Juergen Hoeller
  * @since 1.0.2
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
index 7963c88b5a..1e6c9d3f9f 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
@@ -29,7 +29,7 @@ import javax.faces.context.ResponseWriter;
 import javax.faces.render.RenderKit;
 
 /**
- * Mock implementation of the <code>FacesContext</code> class to facilitate
+ * Mock implementation of the {@code FacesContext} class to facilitate
  * standalone Action unit tests.
  *
  * @author Ulrik Sandberg
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 bb3e0e85b7..0fb220f435 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
@@ -108,15 +108,15 @@ import org.springframework.web.servlet.ViewResolver;
  * The MultipartResolver bean name is "portletMultipartResolver"; default is none.
  * </ul>
  *
- * <p><b>NOTE: The <code>@RequestMapping</code> annotation will only be processed
- * if a corresponding <code>HandlerMapping</code> (for type level annotations)
- * and/or <code>HandlerAdapter</code> (for method level annotations)
+ * <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</code> or
- * <code>HandlerAdapters</code>, then you need to make sure that a
- * corresponding custom <code>DefaultAnnotationHandlerMapping</code>
- * and/or <code>AnnotationMethodHandlerAdapter</code> is defined as well
- * - provided that you intend to use <code>@RequestMapping</code>.
+ * 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 DispatcherPortlets.</b>
  * Each portlet will operate in its own namespace, loading its own application
@@ -170,7 +170,7 @@ public class DispatcherPortlet extends FrameworkPortlet {
 	/**
 	 * Default URL to ViewRendererServlet. This bridge servlet is used to convert
 	 * portlet render requests to servlet requests in order to leverage the view support
-	 * in the <code>org.springframework.web.view</code> package.
+	 * in the {@code org.springframework.web.view} package.
 	 */
 	public static final String DEFAULT_VIEW_RENDERER_URL = "/WEB-INF/servlet/view";
 
@@ -615,7 +615,7 @@ public class DispatcherPortlet extends FrameworkPortlet {
 
 	/**
 	 * Obtain this portlet's PortletMultipartResolver, if any.
-	 * @return the PortletMultipartResolver used by this portlet, or <code>null</code>
+	 * @return the PortletMultipartResolver used by this portlet, or {@code null}
 	 * if none (indicating that no multipart support is available)
 	 */
 	public PortletMultipartResolver getMultipartResolver() {
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 29b0c091c5..b876da36b7 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
@@ -362,7 +362,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean
 	/**
 	 * Post-process the given Portlet ApplicationContext before it is refreshed
 	 * and activated as context for this portlet.
-	 * <p>The default implementation is empty. <code>refresh()</code> will
+	 * <p>The default implementation is empty. {@code refresh()} will
 	 * be called automatically after this method returns.
 	 * @param pac the configured Portlet ApplicationContext (not refreshed yet)
 	 * @see #createPortletApplicationContext
@@ -488,7 +488,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean
 	/**
 	 * Process this request, publishing an event regardless of the outcome.
 	 * The actual event handling is performed by the abstract
-	 * <code>doActionService()</code> and <code>doRenderService()</code> template methods.
+	 * {@code doActionService()} and {@code doRenderService()} template methods.
 	 * @see #doActionService
 	 * @see #doRenderService
 	 */
@@ -591,7 +591,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean
 	 * If that does not exist, then it checks the USER_INFO map.
 	 * Can be overridden in subclasses.
 	 * @param request current portlet request
-	 * @return the username, or <code>null</code> if none found
+	 * @return the username, or {@code null} if none found
 	 * @see javax.portlet.PortletRequest#getUserPrincipal()
 	 * @see javax.portlet.PortletRequest#getRemoteUser()
 	 * @see javax.portlet.PortletRequest#USER_INFO
@@ -628,7 +628,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean
 
 	/**
 	 * Subclasses must implement this method to do the work of action request handling.
-	 * <p>The contract is essentially the same as that for the <code>processAction</code>
+	 * <p>The contract is essentially the same as that for the {@code processAction}
 	 * method of GenericPortlet.
 	 * <p>This class intercepts calls to ensure that exception handling and
 	 * event publication takes place.
@@ -642,7 +642,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean
 
 	/**
 	 * Subclasses must implement this method to do the work of render request handling.
-	 * <p>The contract is essentially the same as that for the <code>doDispatch</code>
+	 * <p>The contract is essentially the same as that for the {@code doDispatch}
 	 * method of GenericPortlet.
 	 * <p>This class intercepts calls to ensure that exception handling and
 	 * event publication takes place.
@@ -656,7 +656,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean
 
 	/**
 	 * Subclasses must implement this method to do the work of resource request handling.
-	 * <p>The contract is essentially the same as that for the <code>serveResource</code>
+	 * <p>The contract is essentially the same as that for the {@code serveResource}
 	 * method of GenericPortlet.
 	 * <p>This class intercepts calls to ensure that exception handling and
 	 * event publication takes place.
@@ -670,7 +670,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean
 
 	/**
 	 * Subclasses must implement this method to do the work of event request handling.
-	 * <p>The contract is essentially the same as that for the <code>processEvent</code>
+	 * <p>The contract is essentially the same as that for the {@code processEvent}
 	 * method of GenericPortlet.
 	 * <p>This class intercepts calls to ensure that exception handling and
 	 * event publication takes place.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
index dcc6f3260a..a7763c7a35 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
@@ -46,14 +46,14 @@ import org.springframework.web.portlet.context.PortletContextResourceLoader;
 import org.springframework.web.portlet.context.StandardPortletEnvironment;
 
 /**
- * Simple extension of <code>javax.portlet.GenericPortlet</code> that treats
+ * Simple extension of {@code javax.portlet.GenericPortlet} that treats
  * its config parameters as bean properties.
  *
  * <p>A very handy superclass for any type of portlet. Type conversion is automatic.
  * It is also possible for subclasses to specify required properties.
  *
  * <p>This portlet leaves request handling to subclasses, inheriting the default
- * behaviour of GenericPortlet (<code>doDispatch</code>, <code>processAction</code>, etc).
+ * behaviour of GenericPortlet ({@code doDispatch}, {@code processAction}, etc).
  *
  * <p>This portlet superclass has no dependency on a Spring application context,
  * in contrast to the FrameworkPortlet class which loads its own context.
@@ -140,7 +140,7 @@ public abstract class GenericPortletBean extends GenericPortlet
 
 
 	/**
-	 * Overridden method that simply returns <code>null</code> when no
+	 * Overridden method that simply returns {@code null} when no
 	 * PortletConfig set yet.
 	 * @see #getPortletConfig()
 	 */
@@ -150,7 +150,7 @@ public abstract class GenericPortletBean extends GenericPortlet
 	}
 
 	/**
-	 * Overridden method that simply returns <code>null</code> when no
+	 * Overridden method that simply returns {@code null} when no
 	 * PortletConfig set yet.
 	 * @see #getPortletConfig()
 	 */
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
index ae952850f1..e1aa117b1c 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
@@ -54,9 +54,9 @@ public interface HandlerAdapter {
 	 * support it. Typical HandlerAdapters will base the decision on the handler
 	 * type. HandlerAdapters will usually only support one handler type each.
 	 * <p>A typical implementation:
-	 * <p><code>
+	 * <p>{@code
 	 * return (handler instanceof MyHandler);
-	 * </code>
+	 * }
 	 * @param handler handler object to check
 	 * @return whether or not this object can use the given handler
 	 */
@@ -68,7 +68,7 @@ public interface HandlerAdapter {
 	 * @param request current action request
 	 * @param response current action response
 	 * @param handler handler to use. This object must have previously been passed
-	 * to the <code>supports</code> method of this interface, which must have
+	 * to the {@code supports} method of this interface, which must have
 	 * returned true.
 	 * @throws Exception in case of errors
 	 * @see javax.portlet.Portlet#processAction
@@ -81,11 +81,11 @@ public interface HandlerAdapter {
 	 * @param request current render request
 	 * @param response current render response
 	 * @param handler handler to use. This object must have previously been passed
-	 * to the <code>supports</code> method of this interface, which must have
-	 * returned <code>true</code>.
+	 * to the {@code supports} method of this interface, which must have
+	 * returned {@code true}.
 	 * @throws Exception in case of errors
 	 * @return ModelAndView object with the name of the view and the required
-	 * model data, or <code>null</code> if the request has been handled directly
+	 * model data, or {@code null} if the request has been handled directly
 	 * @see javax.portlet.Portlet#render
 	 */
 	ModelAndView handleRender(RenderRequest request, RenderResponse response, Object handler) throws Exception;
@@ -96,11 +96,11 @@ public interface HandlerAdapter {
 	 * @param request current render request
 	 * @param response current render response
 	 * @param handler handler to use. This object must have previously been passed
-	 * to the <code>supports</code> method of this interface, which must have
-	 * returned <code>true</code>.
+	 * to the {@code supports} method of this interface, which must have
+	 * returned {@code true}.
 	 * @throws Exception in case of errors
 	 * @return ModelAndView object with the name of the view and the required
-	 * model data, or <code>null</code> if the request has been handled directly
+	 * model data, or {@code null} if the request has been handled directly
 	 * @see javax.portlet.ResourceServingPortlet#serveResource
 	 */
 	ModelAndView handleResource(ResourceRequest request, ResourceResponse response, Object handler) throws Exception;
@@ -111,7 +111,7 @@ public interface HandlerAdapter {
 	 * @param request current action request
 	 * @param response current action response
 	 * @param handler handler to use. This object must have previously been passed
-	 * to the <code>supports</code> method of this interface, which must have
+	 * to the {@code supports} method of this interface, which must have
 	 * returned true.
 	 * @throws Exception in case of errors
 	 * @see javax.portlet.EventPortlet#processEvent
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java
index c5d820aca0..b3a1a4ecc1 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java
@@ -45,7 +45,7 @@ public interface HandlerExceptionResolver {
 	 * 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</code> for default processing
+	 * or {@code null} for default processing
 	 */
 	ModelAndView resolveException(
 			RenderRequest request, RenderResponse response, Object handler, Exception ex);
@@ -59,7 +59,7 @@ public interface HandlerExceptionResolver {
 	 * 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</code> for default processing
+	 * or {@code null} for default processing
 	 */
 	ModelAndView resolveException(
 			ResourceRequest request, ResourceResponse response, Object handler, Exception ex);
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 e36a622a01..74e7157d45 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
@@ -101,7 +101,7 @@ public class HandlerExecutionChain {
 
 	/**
 	 * Return the array of interceptors to apply (in the given order).
-	 * @return the array of HandlerInterceptors instances (may be <code>null</code>)
+	 * @return the array of HandlerInterceptors instances (may be {@code null})
 	 */
 	public HandlerInterceptor[] getInterceptors() {
 		if (this.interceptors == null && this.interceptorList != null) {
@@ -112,7 +112,7 @@ public class HandlerExecutionChain {
 
 
 	/**
-	 * Delegates to the handler's <code>toString()</code>.
+	 * Delegates to the handler's {@code toString()}.
 	 */
 	@Override
 	public String toString() {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java
index a09d13d5b7..ee051a334e 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java
@@ -31,35 +31,35 @@ import javax.portlet.ResourceRequest;
  * for certain groups of handlers, to add common pre-processing behavior
  * without needing to modify each handler implementation.
  *
- * <p>A <code>HandlerInterceptor</code> gets called before the appropriate
- * {@link org.springframework.web.portlet.HandlerAdapter} triggers the
+ * <p>A {@code HandlerInterceptor} gets called before the appropriate
+ * {@link HandlerAdapter} triggers the
  * execution of the handler itself. This mechanism can be used for a large
  * field of preprocessing aspects, e.g. for authorization checks,
  * or common handler behavior like locale or theme changes. Its main purpose
  * is to permit the factoring out of otherwise repetitive handler code.
  *
  * <p>Typically an interceptor chain is defined per
- * {@link org.springframework.web.portlet.HandlerMapping} bean, sharing its
+ * {@link HandlerMapping} bean, sharing its
  * granularity. To be able to apply a certain interceptor chain to a group of
  * handlers, one needs to map the desired handlers via one
- * <code>HandlerMapping</code> bean. The interceptors themselves are defined as
+ * {@code HandlerMapping} bean. The interceptors themselves are defined as
  * beans in the application context, referenced by the mapping bean definition
  * via its
  * {@link org.springframework.web.portlet.handler.AbstractHandlerMapping#setInterceptors "interceptors"}
  * property (in XML: a &lt;list&gt; of &lt;ref&gt; elements).
  *
- * <p>A <code>HandlerInterceptor</code> is basically similar to a Servlet
+ * <p>A {@code HandlerInterceptor} is basically similar to a Servlet
  * {@link javax.servlet.Filter}, but in contrast to the latter it allows
  * custom pre-processing with the option to prohibit the execution of the handler
- * itself, and custom post-processing. <code>Filters</code> are more powerful;
+ * itself, and custom post-processing. {@code Filters} are more powerful;
  * for example they allow for exchanging the request and response objects that
  * are handed down the chain. Note that a filter gets configured in
- * <code>web.xml</code>, a <code>HandlerInterceptor</code> in the application context.
+ * {@code web.xml}, a {@code HandlerInterceptor} in the application context.
  *
  * <p>As a basic guideline, fine-grained handler-related pre-processing tasks are
- * candidates for <code>HandlerInterceptor</code> implementations, especially
+ * candidates for {@code HandlerInterceptor} implementations, especially
  * factored-out common handler code and authorization checks. On the other hand,
- * a <code>Filter</code> is well-suited for request content and view content
+ * a {@code Filter} is well-suited for request content and view content
  * handling, like multipart forms and GZIP compression. This typically shows when
  * one needs to map the filter to certain content types (e.g. images), or to all
  * requests.
@@ -69,40 +69,40 @@ import javax.portlet.ResourceRequest;
  * essential.
  *
  * <p>If we assume a "sunny day" request cycle (i.e. a request where nothing goes wrong
- * and all is well), the workflow of a <code>HandlerInterceptor</code> will be as
+ * and all is well), the workflow of a {@code HandlerInterceptor} will be as
  * follows:
  *
  * <p><b>Action Request:</b><p>
  * <ol>
- *   <li><code>DispatcherPortlet</code> maps the action request to a particular handler
+ *   <li>{@code DispatcherPortlet} maps the action request to a particular handler
  * 		 and assembles a handler execution chain consisting of the handler that
- * 		 is to be invoked and all of the <code>HandlerInterceptor</code>
+ * 		 is to be invoked and all of the {@code HandlerInterceptor}
  * 		 instances that apply to the request.</li>
- *   <li>{@link org.springframework.web.portlet.HandlerInterceptor#preHandleAction(javax.portlet.ActionRequest, javax.portlet.ActionResponse, Object) preHandleAction(..)}
- * 		 is called; if the invocation of this method returns <code>true</code> then
+ *   <li>{@link HandlerInterceptor#preHandleAction(javax.portlet.ActionRequest, javax.portlet.ActionResponse, Object) preHandleAction(..)}
+ * 		 is called; if the invocation of this method returns {@code true} then
  *		 this workflow continues</li>
  *   <li>The target handler handles the action request (via
- * 		 {@link org.springframework.web.portlet.HandlerAdapter#handleAction(javax.portlet.ActionRequest, javax.portlet.ActionResponse, Object) HandlerAdapter.handleAction(..)})</li>
- *   <li>{@link org.springframework.web.portlet.HandlerInterceptor#afterActionCompletion(javax.portlet.ActionRequest, javax.portlet.ActionResponse, Object, Exception) afterActionCompletion(..)}
+ *          {@link HandlerAdapter#handleAction(javax.portlet.ActionRequest, javax.portlet.ActionResponse, Object) HandlerAdapter.handleAction(..)})</li>
+ *   <li>{@link HandlerInterceptor#afterActionCompletion(javax.portlet.ActionRequest, javax.portlet.ActionResponse, Object, Exception) afterActionCompletion(..)}
  * 		 is called</li>
  * </ol>
  *
  * <p><b>Render Request:</b><p>
  * <ol>
- *   <li><code>DispatcherPortlet</code> maps the render request to a particular handler
+ *   <li>{@code DispatcherPortlet} maps the render request to a particular handler
  * 		 and assembles a handler execution chain consisting of the handler that
- * 		 is to be invoked and all of the <code>HandlerInterceptor</code>
+ * 		 is to be invoked and all of the {@code HandlerInterceptor}
  * 		 instances that apply to the request.</li>
- *   <li>{@link org.springframework.web.portlet.HandlerInterceptor#preHandleRender(javax.portlet.RenderRequest, javax.portlet.RenderResponse, Object) preHandleRender(..)}
- * 		 is called; if the invocation of this method returns <code>true</code> then
+ *   <li>{@link HandlerInterceptor#preHandleRender(javax.portlet.RenderRequest, javax.portlet.RenderResponse, Object) preHandleRender(..)}
+ * 		 is called; if the invocation of this method returns {@code true} then
  *		 this workflow continues</li>
  *   <li>The target handler handles the render request (via
- * 		 {@link org.springframework.web.portlet.HandlerAdapter#handleRender(javax.portlet.RenderRequest, javax.portlet.RenderResponse, Object) HandlerAdapter.handleRender(..)})</li>
- *   <li>{@link org.springframework.web.portlet.HandlerInterceptor#postHandleRender(javax.portlet.RenderRequest, javax.portlet.RenderResponse, Object, ModelAndView) postHandleRender(..)}
+ *          {@link HandlerAdapter#handleRender(javax.portlet.RenderRequest, javax.portlet.RenderResponse, Object) HandlerAdapter.handleRender(..)})</li>
+ *   <li>{@link HandlerInterceptor#postHandleRender(javax.portlet.RenderRequest, javax.portlet.RenderResponse, Object, ModelAndView) postHandleRender(..)}
  * 		 is called</li>
- *   <li>If the <code>HandlerAdapter</code> returned a <code>ModelAndView</code>,
- *       then <code>DispatcherPortlet</code> renders the view accordingly
- *   <li>{@link org.springframework.web.portlet.HandlerInterceptor#afterRenderCompletion(javax.portlet.RenderRequest, javax.portlet.RenderResponse, Object, Exception) afterRenderCompletion(..)}
+ *   <li>If the {@code HandlerAdapter} returned a {@code ModelAndView},
+ *       then {@code DispatcherPortlet} renders the view accordingly
+ *   <li>{@link HandlerInterceptor#afterRenderCompletion(javax.portlet.RenderRequest, javax.portlet.RenderResponse, Object, Exception) afterRenderCompletion(..)}
  * 		 is called</li>
  * </ol>
  *
@@ -110,9 +110,9 @@ import javax.portlet.ResourceRequest;
  * @author John A. Lewis
  * @since 2.0
  * @see HandlerExecutionChain#getInterceptors
- * @see org.springframework.web.portlet.HandlerMapping
+ * @see HandlerMapping
  * @see org.springframework.web.portlet.handler.AbstractHandlerMapping#setInterceptors
- * @see org.springframework.web.portlet.HandlerExecutionChain
+ * @see HandlerExecutionChain
  */
 public interface HandlerInterceptor {
 
@@ -128,8 +128,8 @@ public interface HandlerInterceptor {
 	 * @param request current portlet action request
 	 * @param response current portlet action response
 	 * @param handler chosen handler to execute, for type and/or instance evaluation
-	 * @return <code>true</code> if the execution chain should proceed with the
-	 * next interceptor or the handler itself. Else, <code>DispatcherPortlet</code>
+	 * @return {@code true} if the execution chain should proceed with the
+	 * next interceptor or the handler itself. Else, {@code DispatcherPortlet}
 	 * assumes that this interceptor has already dealt with the response itself
 	 * @throws Exception in case of errors
 	 */
@@ -142,13 +142,13 @@ public interface HandlerInterceptor {
 	 * thus allowing for proper resource cleanup.
 	 * <p>Note: Will only be called if this interceptor's
 	 * {@link #preHandleAction(javax.portlet.ActionRequest, javax.portlet.ActionResponse, Object)}
-	 * method has successfully completed and returned <code>true</code>!
+	 * method has successfully completed and returned {@code true}!
 	 * @param request current portlet action request
 	 * @param response current portlet action response
 	 * @param handler chosen handler to execute, for type and/or instance examination
 	 * @param ex exception thrown on handler execution, if any (only included as
 	 * additional context information for the case where a handler threw an exception;
-	 * request execution may have failed even when this argument is <code>null</code>)
+	 * request execution may have failed even when this argument is {@code null})
 	 * @throws Exception in case of errors
 	 */
 	void afterActionCompletion(
@@ -167,8 +167,8 @@ public interface HandlerInterceptor {
 	 * @param request current portlet render request
 	 * @param response current portlet render response
 	 * @param handler chosen handler to execute, for type and/or instance evaluation
-	 * @return <code>true</code> if the execution chain should proceed with the
-	 * next interceptor or the handler itself. Else, <code>DispatcherPortlet</code>
+	 * @return {@code true} if the execution chain should proceed with the
+	 * next interceptor or the handler itself. Else, {@code DispatcherPortlet}
 	 * assumes that this interceptor has already dealt with the response itself
 	 * @throws Exception in case of errors
 	 */
@@ -178,17 +178,17 @@ public interface HandlerInterceptor {
 	/**
 	 * Intercept the execution of a handler in the render phase.
 	 * <p>Called after a {@link HandlerAdapter} actually invoked the handler, but
-	 * before the <code>DispatcherPortlet</code> renders the view. Can thus expose
+	 * before the {@code DispatcherPortlet} renders the view. Can thus expose
 	 * additional model objects to the view via the given {@link ModelAndView}.
-	 * <p><code>DispatcherPortlet</code> processes a handler in an execution chain,
+	 * <p>{@code DispatcherPortlet} processes a handler in an execution chain,
 	 * consisting 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.
 	 * @param request current portlet render request
 	 * @param response current portlet render response
 	 * @param handler chosen handler to execute, for type and/or instance examination
-	 * @param modelAndView the <code>ModelAndView</code> that the handler returned
-	 * (can also be <code>null</code>)
+	 * @param modelAndView the {@code ModelAndView} that the handler returned
+	 * (can also be {@code null})
 	 * @throws Exception in case of errors
 	 */
 	void postHandleRender(
@@ -201,7 +201,7 @@ public interface HandlerInterceptor {
 	 * for proper resource cleanup.
 	 * <p>Note: Will only be called if this interceptor's
 	 * {@link #preHandleRender(javax.portlet.RenderRequest, javax.portlet.RenderResponse, Object)}
-	 * method has successfully completed and returned <code>true</code>!
+	 * method has successfully completed and returned {@code true}!
 	 * @param request current portlet render request
 	 * @param response current portlet render response
 	 * @param handler chosen handler to execute, for type and/or instance examination
@@ -224,8 +224,8 @@ public interface HandlerInterceptor {
 	 * @param request current portlet render request
 	 * @param response current portlet render response
 	 * @param handler chosen handler to execute, for type and/or instance evaluation
-	 * @return <code>true</code> if the execution chain should proceed with the
-	 * next interceptor or the handler itself. Else, <code>DispatcherPortlet</code>
+	 * @return {@code true} if the execution chain should proceed with the
+	 * next interceptor or the handler itself. Else, {@code DispatcherPortlet}
 	 * assumes that this interceptor has already dealt with the response itself
 	 * @throws Exception in case of errors
 	 */
@@ -235,17 +235,17 @@ public interface HandlerInterceptor {
 	/**
 	 * Intercept the execution of a handler in the render phase.
 	 * <p>Called after a {@link HandlerAdapter} actually invoked the handler, but
-	 * before the <code>DispatcherPortlet</code> renders the view. Can thus expose
+	 * before the {@code DispatcherPortlet} renders the view. Can thus expose
 	 * additional model objects to the view via the given {@link ModelAndView}.
-	 * <p><code>DispatcherPortlet</code> processes a handler in an execution chain,
+	 * <p>{@code DispatcherPortlet} processes a handler in an execution chain,
 	 * consisting 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.
 	 * @param request current portlet render request
 	 * @param response current portlet render response
 	 * @param handler chosen handler to execute, for type and/or instance examination
-	 * @param modelAndView the <code>ModelAndView</code> that the handler returned
-	 * (can also be <code>null</code>)
+	 * @param modelAndView the {@code ModelAndView} that the handler returned
+	 * (can also be {@code null})
 	 * @throws Exception in case of errors
 	 */
 	void postHandleResource(
@@ -258,7 +258,7 @@ public interface HandlerInterceptor {
 	 * for proper resource cleanup.
 	 * <p>Note: Will only be called if this interceptor's
 	 * {@link #preHandleRender(javax.portlet.RenderRequest, javax.portlet.RenderResponse, Object)}
-	 * method has successfully completed and returned <code>true</code>!
+	 * method has successfully completed and returned {@code true}!
 	 * @param request current portlet render request
 	 * @param response current portlet render response
 	 * @param handler chosen handler to execute, for type and/or instance examination
@@ -282,8 +282,8 @@ public interface HandlerInterceptor {
 	 * @param request current portlet action request
 	 * @param response current portlet action response
 	 * @param handler chosen handler to execute, for type and/or instance evaluation
-	 * @return <code>true</code> if the execution chain should proceed with the
-	 * next interceptor or the handler itself. Else, <code>DispatcherPortlet</code>
+	 * @return {@code true} if the execution chain should proceed with the
+	 * next interceptor or the handler itself. Else, {@code DispatcherPortlet}
 	 * assumes that this interceptor has already dealt with the response itself
 	 * @throws Exception in case of errors
 	 */
@@ -296,13 +296,13 @@ public interface HandlerInterceptor {
 	 * thus allowing for proper resource cleanup.
 	 * <p>Note: Will only be called if this interceptor's
 	 * {@link #preHandleAction(javax.portlet.ActionRequest, javax.portlet.ActionResponse, Object)}
-	 * method has successfully completed and returned <code>true</code>!
+	 * method has successfully completed and returned {@code true}!
 	 * @param request current portlet action request
 	 * @param response current portlet action response
 	 * @param handler chosen handler to execute, for type and/or instance examination
 	 * @param ex exception thrown on handler execution, if any (only included as
 	 * additional context information for the case where a handler threw an exception;
-	 * request execution may have failed even when this argument is <code>null</code>)
+	 * request execution may have failed even when this argument is {@code null})
 	 * @throws Exception in case of errors
 	 */
 	void afterEventCompletion(
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
index cc0913e943..e41af64b5c 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
@@ -33,8 +33,8 @@ import javax.portlet.PortletRequest;
  * have to. A handler will always be wrapped in a {@link HandlerExecutionChain}
  * instance, optionally accompanied by some {@link HandlerInterceptor} instances.
  * The DispatcherPortlet will first call each HandlerInterceptor's
- * <code>preHandle</code> method in the given order, finally invoking the handler
- * itself if all <code>preHandle</code> methods have returned <code>true</code>.
+ * {@code preHandle} method in the given order, finally invoking the handler
+ * itself if all {@code preHandle} methods have returned {@code true}.
  *
  * <p>The ability to parameterize this mapping is a powerful and unusual
  * capability of this Portlet MVC framework. For example, it is possible to
@@ -62,7 +62,7 @@ public interface HandlerMapping {
 	 * even a tag interface, so that handlers are not constrained in any way.
 	 * For example, a HandlerAdapter could be written to allow another framework's
 	 * handler objects to be used.
-	 * <p>Returns <code>null</code> if no match was found. This is not an error.
+	 * <p>Returns {@code null} if no match was found. This is not an error.
 	 * The DispatcherPortlet will query all registered HandlerMapping beans to find
 	 * a match, and only decide there is an error if none can find a handler.
 	 * @param request current portlet request
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java
index 8d46a58c89..74478d3376 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java
@@ -65,7 +65,7 @@ public class ModelAndView {
 
 	/**
 	 * Convenient constructor when there is no model data to expose.
-	 * Can also be used in conjunction with <code>addObject</code>.
+	 * Can also be used in conjunction with {@code addObject}.
 	 * @param viewName name of the View to render, to be resolved
 	 * by the DispatcherPortlet's ViewResolver
 	 * @see #addObject
@@ -76,7 +76,7 @@ public class ModelAndView {
 
 	/**
 	 * Convenient constructor when there is no model data to expose.
-	 * Can also be used in conjunction with <code>addObject</code>.
+	 * Can also be used in conjunction with {@code addObject}.
 	 * @param view View object to render (usually a Servlet MVC View object)
 	 * @see #addObject
 	 */
@@ -89,8 +89,8 @@ public class ModelAndView {
 	 * @param viewName name of the View to render, to be resolved
 	 * by the DispatcherPortlet's ViewResolver
 	 * @param model Map of model names (Strings) to model objects
-	 * (Objects). Model entries may not be <code>null</code>, but the
-	 * model Map may be <code>null</code> if there is no model data.
+	 * (Objects). Model entries may not be {@code null}, but the
+	 * model Map may be {@code null} if there is no model data.
 	 */
 	public ModelAndView(String viewName, Map<String, ?> model) {
 		this.view = viewName;
@@ -103,8 +103,8 @@ public class ModelAndView {
 	 * Create a new ModelAndView given a View object and a model.
 	 * @param view View object to render (usually a Servlet MVC View object)
 	 * @param model Map of model names (Strings) to model objects
-	 * (Objects). Model entries may not be <code>null</code>, but the
-	 * model Map may be <code>null</code> if there is no model data.
+	 * (Objects). Model entries may not be {@code null}, but the
+	 * model Map may be {@code null} if there is no model data.
 	 */
 	public ModelAndView(Object view, Map<String, ?> model) {
 		this.view = view;
@@ -148,7 +148,7 @@ public class ModelAndView {
 
 	/**
 	 * Return the view name to be resolved by the DispatcherPortlet
-	 * via a ViewResolver, or <code>null</code> if we are using a view object.
+	 * via a ViewResolver, or {@code null} if we are using a view object.
 	 */
 	public String getViewName() {
 		return (this.view instanceof String ? (String) this.view : null);
@@ -166,7 +166,7 @@ public class ModelAndView {
 	}
 
 	/**
-	 * Return the View object, or <code>null</code> if we are using a view name
+	 * Return the View object, or {@code null} if we are using a view name
 	 * to be resolved by the DispatcherPortlet via a ViewResolver.
 	 */
 	public Object getView() {
@@ -174,7 +174,7 @@ public class ModelAndView {
 	}
 
 	/**
-	 * Indicate whether or not this <code>ModelAndView</code> has a view, either
+	 * Indicate whether or not this {@code ModelAndView} has a view, either
 	 * as a view name or as a direct view instance.
 	 */
 	public boolean hasView() {
@@ -182,7 +182,7 @@ public class ModelAndView {
 	}
 
 	/**
-	 * Return whether we use a view reference, i.e. <code>true</code>
+	 * Return whether we use a view reference, i.e. {@code true}
 	 * if the view has been specified via a name to be resolved by the
 	 * DispatcherPortlet via a ViewResolver.
 	 */
@@ -191,7 +191,7 @@ public class ModelAndView {
 	}
 
 	/**
-	 * Return the model map. May return <code>null</code>.
+	 * Return the model map. May return {@code null}.
 	 * Called by DispatcherPortlet for evaluation of the model.
 	 */
 	protected Map<String, Object> getModelInternal() {
@@ -199,7 +199,7 @@ public class ModelAndView {
 	}
 
 	/**
-	 * Return the underlying <code>ModelMap</code> instance (never <code>null</code>).
+	 * Return the underlying {@code ModelMap} instance (never {@code null}).
 	 */
 	public ModelMap getModelMap() {
 		if (this.model == null) {
@@ -209,7 +209,7 @@ public class ModelAndView {
 	}
 
 	/**
-	 * Return the model map. Never returns <code>null</code>.
+	 * Return the model map. Never returns {@code null}.
 	 * To be called by application code for modifying the model.
 	 */
 	public Map<String, Object> getModel() {
@@ -220,7 +220,7 @@ public class ModelAndView {
 	/**
 	 * Add an attribute to the model.
 	 * @param attributeName name of the object to add to the model
-	 * @param attributeValue object to add to the model (never <code>null</code>)
+	 * @param attributeValue object to add to the model (never {@code null})
 	 * @see ModelMap#addAttribute(String, Object)
 	 * @see #getModelMap()
 	 */
@@ -231,7 +231,7 @@ public class ModelAndView {
 
 	/**
 	 * Add an attribute to the model using parameter name generation.
-	 * @param attributeValue the object to add to the model (never <code>null</code>)
+	 * @param attributeValue the object to add to the model (never {@code null})
 	 * @see ModelMap#addAttribute(Object)
 	 * @see #getModelMap()
 	 */
@@ -256,7 +256,7 @@ public class ModelAndView {
 	 * Clear the state of this ModelAndView object.
 	 * The object will be empty afterwards.
 	 * <p>Can be used to suppress rendering of a given ModelAndView object
-	 * in the <code>postHandleRender</code> method of a HandlerInterceptor.
+	 * in the {@code postHandleRender} method of a HandlerInterceptor.
 	 * @see #isEmpty()
 	 * @see HandlerInterceptor#postHandleRender
 	 */
@@ -277,7 +277,7 @@ public class ModelAndView {
 	/**
 	 * Return whether this ModelAndView object is empty as a result of a call to {@link #clear}
 	 * i.e. whether it does not hold any view and does not contain a model.
-	 * Returns <code>false</code> if any additional state was added to the instance
+	 * Returns {@code false} if any additional state was added to the instance
 	 * <strong>after</strong> the call to {@link #clear}.
 	 * @see #clear()
 	 */
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java
index a63b894d17..776731753d 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java
@@ -34,11 +34,11 @@ import org.springframework.web.portlet.util.PortletUtils;
  *
  * <p>Used by Spring Portlet MVC's BaseCommandController.
  * Note that BaseCommandController and its subclasses allow for easy customization
- * of the binder instances that they use through overriding <code>initBinder</code>.
+ * of the binder instances that they use through overriding {@code initBinder}.
  *
  * <p>Can also be used for manual data binding in custom web controllers:
  * for example, in a plain Portlet Controller implementation. Simply instantiate
- * a PortletRequestDataBinder for each binding process, and invoke <code>bind</code>
+ * a PortletRequestDataBinder for each binding process, and invoke {@code bind}
  * with the current PortletRequest as argument:
  *
  * <pre class="code">
@@ -67,7 +67,7 @@ public class PortletRequestDataBinder extends WebDataBinder {
 
 	/**
 	 * Create a new PortletRequestDataBinder instance, with default object name.
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @see #DEFAULT_OBJECT_NAME
 	 */
@@ -77,7 +77,7 @@ public class PortletRequestDataBinder extends WebDataBinder {
 
 	/**
 	 * Create a new PortletRequestDataBinder instance.
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @param objectName the name of the target object
 	 */
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java
index 49d17af25b..269b7ce045 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java
@@ -46,11 +46,11 @@ public abstract class PortletRequestUtils {
 
 
 	/**
-	 * Get an Integer parameter, or <code>null</code> if not present.
+	 * Get an Integer parameter, or {@code null} if not present.
 	 * Throws an exception if it the parameter value isn't a number.
 	 * @param request current portlet request
 	 * @param name the name of the parameter
-	 * @return the Integer value, or <code>null</code> if not present
+	 * @return the Integer value, or {@code null} if not present
 	 * @throws PortletRequestBindingException a subclass of PortletException,
 	 * so it doesn't need to be caught
 	 */
@@ -124,11 +124,11 @@ public abstract class PortletRequestUtils {
 
 
 	/**
-	 * Get a Long parameter, or <code>null</code> if not present.
+	 * Get a Long parameter, or {@code null} if not present.
 	 * Throws an exception if it the parameter value isn't a number.
 	 * @param request current portlet request
 	 * @param name the name of the parameter
-	 * @return the Long value, or <code>null</code> if not present
+	 * @return the Long value, or {@code null} if not present
 	 * @throws PortletRequestBindingException a subclass of PortletException,
 	 * so it doesn't need to be caught
 	 */
@@ -202,11 +202,11 @@ public abstract class PortletRequestUtils {
 
 
 	/**
-	 * Get a Float parameter, or <code>null</code> if not present.
+	 * Get a Float parameter, or {@code null} if not present.
 	 * Throws an exception if it the parameter value isn't a number.
 	 * @param request current portlet request
 	 * @param name the name of the parameter
-	 * @return the Float value, or <code>null</code> if not present
+	 * @return the Float value, or {@code null} if not present
 	 * @throws PortletRequestBindingException a subclass of PortletException,
 	 * so it doesn't need to be caught
 	 */
@@ -280,11 +280,11 @@ public abstract class PortletRequestUtils {
 
 
 	/**
-	 * Get a Double parameter, or <code>null</code> if not present.
+	 * Get a Double parameter, or {@code null} if not present.
 	 * Throws an exception if it the parameter value isn't a number.
 	 * @param request current portlet request
 	 * @param name the name of the parameter
-	 * @return the Double value, or <code>null</code> if not present
+	 * @return the Double value, or {@code null} if not present
 	 * @throws PortletRequestBindingException a subclass of PortletException,
 	 * so it doesn't need to be caught
 	 */
@@ -358,13 +358,13 @@ public abstract class PortletRequestUtils {
 
 
 	/**
-	 * Get a Boolean parameter, or <code>null</code> if not present.
+	 * Get a Boolean parameter, or {@code null} if not present.
 	 * Throws an exception if it the parameter value isn't a boolean.
 	 * <p>Accepts "true", "on", "yes" (any case) and "1" as values for true;
 	 * treats every other non-empty value as false (i.e. parses leniently).
 	 * @param request current portlet request
 	 * @param name the name of the parameter
-	 * @return the Boolean value, or <code>null</code> if not present
+	 * @return the Boolean value, or {@code null} if not present
 	 * @throws PortletRequestBindingException a subclass of PortletException,
 	 * so it doesn't need to be caught
 	 */
@@ -448,11 +448,11 @@ public abstract class PortletRequestUtils {
 
 
 	/**
-	 * Get a String parameter, or <code>null</code> if not present.
+	 * Get a String parameter, or {@code null} if not present.
 	 * Throws an exception if it the parameter value is empty.
 	 * @param request current portlet request
 	 * @param name the name of the parameter
-	 * @return the String value, or <code>null</code> if not present
+	 * @return the String value, or {@code null} if not present
 	 * @throws PortletRequestBindingException a subclass of PortletException,
 	 * so it doesn't need to be caught
 	 */
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java
index 28716a9810..f8dbdbdc3e 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java
@@ -43,7 +43,7 @@ public @interface ActionMapping {
 	 * <p>If not specified, the method will be used as default handler:
 	 * i.e. for action requests where no specific action mapping was found.
 	 * <p>Note that all such annotated action methods only apply within the
-	 * <code>@RequestMapping</code> constraints of the containing handler class.
+	 * {@code @RequestMapping} constraints of the containing handler class.
 	 * @see javax.portlet.ActionRequest#ACTION_NAME
 	 */
 	String value() default "";
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java
index 02d0bff87d..bd56e6bda2 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java
@@ -113,7 +113,7 @@ public interface ConfigurablePortletApplicationContext
 
 	/**
 	 * Return the config locations for this web application context,
-	 * or <code>null</code> if none specified.
+	 * or {@code null} if none specified.
 	 */
 	String[] getConfigLocations();
 
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 5382523989..c1db0fa1c3 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
@@ -62,7 +62,7 @@ public abstract class PortletApplicationContextUtils {
 	 * <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
-	 * @return the root WebApplicationContext for this web app, or <code>null</code> if none
+	 * @return the root WebApplicationContext for this web app, or {@code null} if none
 	 * (typed to ApplicationContext to avoid a Servlet API dependency; can usually
 	 * be casted to WebApplicationContext, but there shouldn't be a need to)
 	 * @see org.springframework.web.context.WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java
index 86f5794b28..22fe3c7dd8 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java
@@ -38,7 +38,7 @@ import org.springframework.web.portlet.util.PortletUtils;
  * relative paths within the portlet application root directory.
  *
  * <p>Always supports stream access and URL access, but only allows
- * <code>java.io.File</code> access when the portlet application archive
+ * {@code java.io.File} access when the portlet application archive
  * is expanded.
  *
  * @author Juergen Hoeller
@@ -93,7 +93,7 @@ public class PortletContextResource extends AbstractFileResolvingResource implem
 
 
 	/**
-	 * This implementation checks <code>PortletContext.getResource</code>.
+	 * This implementation checks {@code PortletContext.getResource}.
 	 * @see javax.portlet.PortletContext#getResource(String)
 	 */
 	@Override
@@ -108,8 +108,8 @@ public class PortletContextResource extends AbstractFileResolvingResource implem
 	}
 
 	/**
-	 * This implementation delegates to <code>PortletContext.getResourceAsStream</code>,
-	 * which returns <code>null</code> in case of a non-readable resource (e.g. a directory).
+	 * This implementation delegates to {@code PortletContext.getResourceAsStream},
+	 * which returns {@code null} in case of a non-readable resource (e.g. a directory).
 	 * @see javax.portlet.PortletContext#getResourceAsStream(String)
 	 */
 	@Override
@@ -130,7 +130,7 @@ public class PortletContextResource extends AbstractFileResolvingResource implem
 	}
 
 	/**
-	 * This implementation delegates to <code>PortletContext.getResourceAsStream</code>,
+	 * This implementation delegates to {@code PortletContext.getResourceAsStream},
 	 * but throws a FileNotFoundException if not found.
 	 * @see javax.portlet.PortletContext#getResourceAsStream(String)
 	 */
@@ -143,7 +143,7 @@ public class PortletContextResource extends AbstractFileResolvingResource implem
 	}
 
 	/**
-	 * This implementation delegates to <code>PortletContext.getResource</code>,
+	 * This implementation delegates to {@code PortletContext.getResource},
 	 * but throws a FileNotFoundException if no resource found.
 	 * @see javax.portlet.PortletContext#getResource(String)
 	 */
@@ -159,7 +159,7 @@ public class PortletContextResource extends AbstractFileResolvingResource implem
 
 	/**
 	 * This implementation resolves "file:" URLs or alternatively delegates to
-	 * <code>PortletContext.getRealPath</code>, throwing a FileNotFoundException
+	 * {@code PortletContext.getRealPath}, throwing a FileNotFoundException
 	 * if not found or not resolvable.
 	 * @see javax.portlet.PortletContext#getResource(String)
 	 * @see javax.portlet.PortletContext#getRealPath(String)
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java
index a62ddb1292..100b3fb0a7 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java
@@ -31,10 +31,10 @@ import org.springframework.util.StringUtils;
 /**
  * PortletContext-aware subclass of {@link PathMatchingResourcePatternResolver},
  * able to find matching resources below the web application root directory
- * via Portlet API's <code>PortletContext.getResourcePaths</code>.
+ * via Portlet API's {@code PortletContext.getResourcePaths}.
  * Falls back to the superclass' file system checking for other resources.
  *
- * <p>The advantage of using <code>PortletContext.getResourcePaths</code> to
+ * <p>The advantage of using {@code PortletContext.getResourcePaths} to
  * find matching files is that it will work in a WAR file which has not been
  * expanded too.
  *
@@ -65,11 +65,11 @@ public class PortletContextResourcePatternResolver extends PathMatchingResourceP
 
 	/**
 	 * Overridden version which checks for PortletContextResource
-	 * and uses <code>PortletContext.getResourcePaths</code> to find
+	 * and uses {@code PortletContext.getResourcePaths} to find
 	 * matching resources below the web application root directory.
 	 * In case of other resources, delegates to the superclass version.
 	 * @see #doRetrieveMatchingPortletContextResources
-	 * @see org.springframework.web.portlet.context.PortletContextResource
+	 * @see PortletContextResource
 	 * @see javax.portlet.PortletContext#getResourcePaths
 	 */
 	@Override
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
index 4f3e0178b9..6564db90d1 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
  *
  * <p>The associated destruction mechanism relies on a
  * {@link org.springframework.web.context.ContextCleanupListener} being registered in
- * <code>web.xml</code>. Note that {@link org.springframework.web.context.ContextLoaderListener}
+ * {@code web.xml}. Note that {@link org.springframework.web.context.ContextLoaderListener}
  * includes ContextCleanupListener's functionality.
  *
  * <p>This scope is registered as default scope with key
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 b6217269b6..e0a6eb783d 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
@@ -242,7 +242,7 @@ public class PortletRequestAttributes extends AbstractRequestAttributes {
 
 
 	/**
-	 * Update all accessed session attributes through <code>session.setAttribute</code>
+	 * Update all accessed session attributes through {@code session.setAttribute}
 	 * calls, explicitly indicating to the container that they might have been modified.
 	 */
 	@Override
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
index ee0c5ffee1..e1dfa25f9a 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
@@ -142,7 +142,7 @@ public class PortletWebRequest extends PortletRequestAttributes implements Nativ
 
 	/**
 	 * Last-modified handling not supported for portlet requests:
-	 * As a consequence, this method always returns <code>false</code>.
+	 * As a consequence, this method always returns {@code false}.
 	 */
 	public boolean checkNotModified(long lastModifiedTimestamp) {
 		return false;
@@ -150,7 +150,7 @@ public class PortletWebRequest extends PortletRequestAttributes implements Nativ
 
 	/**
 	 * Last-modified handling not supported for portlet requests:
-	 * As a consequence, this method always returns <code>false</code>.
+	 * As a consequence, this method always returns {@code false}.
 	 */
 	public boolean checkNotModified(String eTag) {
 		return false;
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 c03ab5c507..db031e1717 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
@@ -148,7 +148,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
 	 * and handler classes, if any, and alspo checks the window state (according
 	 * to the "renderWhenMinimize" property).
 	 * @param request current portlet request
-	 * @param handler the executed handler, or <code>null</code> if none chosen at the
+	 * @param handler the executed handler, or {@code null} if none chosen at the
 	 * time of the exception (for example, if multipart resolution failed)
 	 * @return whether this resolved should proceed with resolving the exception
 	 * for the given request and handler
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 f30d5655fd..8e3cb90f3f 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
@@ -56,7 +56,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im
 
 	/**
 	 * Specify the order value for this HandlerMapping bean.
-	 * <p>Default value is <code>Integer.MAX_VALUE</code>, meaning that it's non-ordered.
+	 * <p>Default value is {@code Integer.MAX_VALUE}, meaning that it's non-ordered.
 	 * @see org.springframework.core.Ordered#getOrder()
 	 */
 	public final void setOrder(int order) {
@@ -70,7 +70,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im
 	/**
 	 * Set the default handler for this handler mapping.
 	 * This handler will be returned if no specific mapping was found.
-	 * <p>Default is <code>null</code>, indicating no default handler.
+	 * <p>Default is {@code null}, indicating no default handler.
 	 */
 	public void setDefaultHandler(Object defaultHandler) {
 		this.defaultHandler = defaultHandler;
@@ -78,7 +78,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im
 
 	/**
 	 * Return the default handler for this handler mapping,
-	 * or <code>null</code> if none.
+	 * or {@code null} if none.
 	 */
 	public Object getDefaultHandler() {
 		return this.defaultHandler;
@@ -88,7 +88,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im
 	 * Set the interceptors to apply for all handlers mapped by this handler mapping.
 	 * <p>Supported interceptor types are HandlerInterceptor and WebRequestInterceptor.
 	 * Each given WebRequestInterceptor will be wrapped in a WebRequestHandlerInterceptorAdapter.
-	 * @param interceptors array of handler interceptors, or <code>null</code> if none
+	 * @param interceptors array of handler interceptors, or {@code null} if none
 	 * @see #adaptInterceptor
 	 * @see org.springframework.web.portlet.HandlerInterceptor
 	 * @see org.springframework.web.context.request.WebRequestInterceptor
@@ -135,7 +135,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im
 	 * <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</code>),
+	 * @param interceptors the configured interceptor List (never {@code null}),
 	 * allowing to add further interceptors before as well as after the existing
 	 * interceptors
 	 */
@@ -187,7 +187,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im
 
 	/**
 	 * Return the adapted interceptors as HandlerInterceptor array.
-	 * @return the array of HandlerInterceptors, or <code>null</code> if none
+	 * @return the array of HandlerInterceptors, or {@code null} if none
 	 */
 	protected final HandlerInterceptor[] getAdaptedInterceptors() {
 		return this.adaptedInterceptors;
@@ -218,14 +218,14 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im
 	}
 
 	/**
-	 * Look up a handler for the given request, returning <code>null</code> if no
+	 * Look up a handler for the given request, returning {@code null} if no
 	 * specific one is found. This method is called by {@link #getHandler};
-	 * a <code>null</code> return value will lead to the default handler, if one is set.
+	 * a {@code null} return value will lead to the default handler, if one is set.
 	 * <p>Note: This method may also return a pre-built {@link HandlerExecutionChain},
 	 * combining a handler object with dynamically determined interceptors.
 	 * Statically specified interceptors will get merged into such an existing chain.
 	 * @param request current portlet request
-	 * @return the corresponding handler instance, or <code>null</code> if none found
+	 * @return the corresponding handler instance, or {@code null} if none found
 	 * @throws Exception if there is an internal error
 	 * @see #getHandler
 	 */
@@ -239,11 +239,11 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im
 	 * <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</code>
+	 * <p>For simply adding an interceptor, consider calling {@code super.getHandlerExecutionChain}
 	 * and invoking {@link HandlerExecutionChain#addInterceptor} on the returned chain object.
-	 * @param handler the resolved handler instance (never <code>null</code>)
+	 * @param handler the resolved handler instance (never {@code null})
 	 * @param request current portlet request
-	 * @return the HandlerExecutionChain (never <code>null</code>)
+	 * @return the HandlerExecutionChain (never {@code null})
 	 * @see #getAdaptedInterceptors()
 	 */
 	protected HandlerExecutionChain getHandlerExecutionChain(Object handler, PortletRequest request) {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java
index 8a803a5038..56be35e506 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractMapBasedHandlerMapping.java
@@ -96,7 +96,7 @@ public abstract class AbstractMapBasedHandlerMapping<K> extends AbstractHandlerM
 	/**
 	 * Build a lookup key for the given request.
 	 * @param request current portlet request
-	 * @return the lookup key (never <code>null</code>)
+	 * @return the lookup key (never {@code null})
 	 * @throws Exception if key computation failed
 	 */
 	protected abstract K getLookupKey(PortletRequest request) throws Exception;
@@ -131,7 +131,7 @@ public abstract class AbstractMapBasedHandlerMapping<K> extends AbstractHandlerM
 	 * @param lookupKey the key to map the handler onto
 	 * @param handler the handler instance or handler bean name String
 	 * (a bean name will automatically be resolved into the corresponding handler bean)
-	 * @param predicate a predicate object for this handler (may be <code>null</code>),
+	 * @param predicate a predicate object for this handler (may be {@code null}),
 	 * determining a match with the primary lookup key
 	 * @throws BeansException if the handler couldn't be registered
 	 * @throws IllegalStateException if there is a conflicting handler registered
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
index 4920da4f68..e5ae5a0095 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
@@ -138,7 +138,7 @@ public abstract class HandlerInterceptorAdapter implements HandlerInterceptor {
 
 	/**
 	 * Default callback that all "pre*" methods delegate to.
-	 * <p>This implementation always returns <code>true</code>.
+	 * <p>This implementation always returns {@code true}.
 	 */
 	protected boolean preHandle(PortletRequest request, PortletResponse response, Object handler)
 			throws Exception {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java
index c8f712050f..235a25f8fb 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java
@@ -82,7 +82,7 @@ public class ParameterHandlerMapping extends AbstractMapBasedHandlerMapping<Stri
 
 
 	/**
-	 * Calls the <code>registerHandlers</code> method in addition
+	 * Calls the {@code registerHandlers} method in addition
 	 * to the superclass's initialization.
 	 * @see #registerHandlers
 	 */
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
index 700ef95078..5d9f1c4b15 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
@@ -20,20 +20,20 @@ import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 
 /**
- * Interceptor to forward a request parameter from the <code>ActionRequest</code> to the
- * <code>RenderRequest</code>.
+ * Interceptor to forward a request parameter from the {@code ActionRequest} to the
+ * {@code RenderRequest}.
  *
  * <p>This can be useful when using {@link ParameterHandlerMapping ParameterHandlerMapping}
  * or {@link PortletModeParameterHandlerMapping PortletModeParameterHandlerMapping}.
- * It will ensure that the parameter that was used to map the <code>ActionRequest</code>
- * to a handler will be forwarded to the <code>RenderRequest</code> so that it will also be
+ * It will ensure that the parameter that was used to map the {@code ActionRequest}
+ * to a handler will be forwarded to the {@code RenderRequest} so that it will also be
  * mapped the same way.
  *
  * <p>When using this Interceptor, you can still change the value of the mapping parameter
  * in your handler in order to change where the render request will get mapped.
  *
- * <p>Be aware that this Interceptor does call <code>ActionResponse.setRenderParameter</code>,
- * which means that you will not be able to call <code>ActionResponse.sendRedirect</code> in
+ * <p>Be aware that this Interceptor does call {@code ActionResponse.setRenderParameter},
+ * which means that you will not be able to call {@code ActionResponse.sendRedirect} in
  * your handler.  If you may need to issue a redirect, then you should avoid this Interceptor
  * and either write a different one that does this in a different way, or manually forward
  * the parameter from within your handler(s).
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
index 0bcdcc8b41..9c9391c498 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
@@ -71,7 +71,7 @@ public class PortletModeHandlerMapping extends AbstractMapBasedHandlerMapping<Po
 
 
 	/**
-	 * Calls the <code>registerHandlers</code> method in addition
+	 * Calls the {@code registerHandlers} method in addition
 	 * to the superclass's initialization.
 	 * @see #registerHandlers
 	 */
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java
index cde1399fe8..5b2f7745d0 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java
@@ -129,7 +129,7 @@ public class PortletModeParameterHandlerMapping extends AbstractMapBasedHandlerM
 
 
 	/**
-	 * Calls the <code>registerHandlers</code> method in addition
+	 * Calls the {@code registerHandlers} method in addition
 	 * to the superclass's initialization.
 	 * @see #registerHandlers
 	 */
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 accdd3adfc..2be0716c96 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
@@ -54,7 +54,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 	 * Set the mappings between exception class names and error view names.
 	 * The exception class name can be a substring, with no wildcard support
 	 * at present. A value of "PortletException" would match
-	 * <code>javax.portet.PortletException</code> and subclasses, for example.
+	 * {@code javax.portet.PortletException} and subclasses, for example.
 	 * <p><b>NB:</b> Consider carefully how specific the pattern is, and whether
 	 * to include package information (which isn't mandatory). For example,
 	 * "Exception" will match nearly anything, and will probably hide other rules.
@@ -126,7 +126,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 	 * {@link #setDefaultErrorView "defaultErrorView"} as fallback.
 	 * @param ex the exception that got thrown during handler execution
 	 * @param request current portlet request (useful for obtaining metadata)
-	 * @return the resolved view name, or <code>null</code> if none found
+	 * @return the resolved view name, or {@code null} if none found
 	 */
 	protected String determineViewName(Exception ex, PortletRequest request) {
 		String viewName = null;
@@ -149,7 +149,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 	 * Find a matching view name in the given exception mappings
 	 * @param exceptionMappings mappings between exception class names and error view names
 	 * @param ex the exception that got thrown during handler execution
-	 * @return the view name, or <code>null</code> if none found
+	 * @return the view name, or {@code null} if none found
 	 * @see #setExceptionMappings
 	 */
 	protected String findMatchingViewName(Properties exceptionMappings, Exception ex) {
@@ -198,7 +198,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 
 	/**
 	 * Return a ModelAndView for the given request, view name and exception.
-	 * Default implementation delegates to <code>getModelAndView(viewName, ex)</code>.
+	 * Default implementation delegates to {@code getModelAndView(viewName, ex)}.
 	 * @param viewName the name of the error view
 	 * @param ex the exception that got thrown during handler execution
 	 * @param request current portlet request (useful for obtaining metadata)
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
index 7d1eacd87f..f727716bb3 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
@@ -36,7 +36,7 @@ import org.springframework.web.portlet.util.PortletUtils;
 
 /**
  * Adapter to use the Portlet interface with the generic DispatcherPortlet.
- * Calls the Portlet's <code>render</code> and <code>processAction</code>
+ * Calls the Portlet's {@code render} and {@code processAction}
  * methods to handle a request.
  *
  * <p>This adapter is not activated by default; it needs to be defined as a
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
index b5687fd6e7..bdab9c3380 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
@@ -39,11 +39,11 @@ import org.springframework.web.portlet.context.PortletContextAware;
  * Bean post-processor that applies initialization and destruction callbacks
  * to beans that implement the Portlet interface.
  *
- * <p>After initialization of the bean instance, the Portlet <code>init</code>
+ * <p>After initialization of the bean instance, the Portlet {@code init}
  * method will be called with a PortletConfig that contains the bean name
  * of the Portlet and the PortletContext that it is running in.
  *
- * <p>Before destruction of the bean instance, the Portlet <code>destroy</code>
+ * <p>Before destruction of the bean instance, the Portlet {@code destroy}
  * will be called.
  *
  * <p><b>Note that this post-processor does not support Portlet initialization
@@ -82,7 +82,7 @@ public class SimplePortletPostProcessor
 
 	/**
 	 * Set whether to use the shared PortletConfig object passed in
-	 * through <code>setPortletConfig</code>, if available.
+	 * through {@code setPortletConfig}, if available.
 	 * <p>Default is "true". Turn this setting to "false" to pass in
 	 * a mock PortletConfig object with the bean name as portlet name,
 	 * holding the current PortletContext.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
index 23155e8707..9fb40675df 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
@@ -38,7 +38,7 @@ import org.springframework.web.portlet.context.PortletWebRequest;
  * <p><b>NOTE:</b> The WebRequestInterceptor is by default only applied to the Portlet
  * <b>render</b> phase, which is dealing with preparing and rendering a Portlet view.
  * The Portlet action phase will only be intercepted with WebRequestInterceptor calls
- * if the <code>renderPhaseOnly</code> flag is explicitly set to <code>false</code>.
+ * if the {@code renderPhaseOnly} flag is explicitly set to {@code false}.
  * In general, it is recommended to use the Portlet-specific HandlerInterceptor
  * mechanism for differentiating between action and render interception.
  *
@@ -66,8 +66,8 @@ public class WebRequestHandlerInterceptorAdapter implements HandlerInterceptor {
 	/**
 	 * Create a new WebRequestHandlerInterceptorAdapter for the given WebRequestInterceptor.
 	 * @param requestInterceptor the WebRequestInterceptor to wrap
-	 * @param renderPhaseOnly whether to apply to the render phase only (<code>true</code>)
-	 * or to the action phase as well (<code>false</code>)
+	 * @param renderPhaseOnly whether to apply to the render phase only ({@code true})
+	 * or to the action phase as well ({@code false})
 	 */
 	public WebRequestHandlerInterceptorAdapter(WebRequestInterceptor requestInterceptor, boolean renderPhaseOnly) {
 		Assert.notNull(requestInterceptor, "WebRequestInterceptor must not be null");
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
index c480ac731c..c8b8b268f7 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
@@ -97,7 +97,7 @@ public class CommonsPortletMultipartResolver extends CommonsFileUploadSupport
 	}
 
 	/**
-	 * Initialize the underlying <code>org.apache.commons.fileupload.portlet.PortletFileUpload</code>
+	 * Initialize the underlying {@code org.apache.commons.fileupload.portlet.PortletFileUpload}
 	 * instance. Can be overridden to use a custom subclass, e.g. for testing purposes.
 	 * @return the new PortletFileUpload instance
 	 */
@@ -165,7 +165,7 @@ public class CommonsPortletMultipartResolver extends CommonsFileUploadSupport
 	 * <p>The default implementation checks the request encoding,
 	 * falling back to the default encoding specified for this resolver.
 	 * @param request current portlet request
-	 * @return the encoding for the request (never <code>null</code>)
+	 * @return the encoding for the request (never {@code null})
 	 * @see javax.portlet.ActionRequest#getCharacterEncoding
 	 * @see #setDefaultEncoding
 	 */
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
index 4add8c5cc8..b2a607f4e2 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
@@ -38,16 +38,16 @@ import org.springframework.web.multipart.MultipartException;
  * as an application might choose to parse its multipart requests itself. To
  * define an implementation, create a bean with the id
  * {@link org.springframework.web.portlet.DispatcherPortlet#MULTIPART_RESOLVER_BEAN_NAME "portletMultipartResolver"}
- * in a <code>DispatcherPortlet's</code> application context. Such a resolver
- * gets applied to all requests handled by that <code>DispatcherPortlet</code>.
+ * in a {@code DispatcherPortlet's} application context. Such a resolver
+ * gets applied to all requests handled by that {@code DispatcherPortlet}.
  *
- * <p>If a <code>DispatcherPortlet</code> detects a multipart request, it will
+ * <p>If a {@code DispatcherPortlet} detects a multipart request, it will
  * resolve it via the configured
  * {@link org.springframework.web.multipart.MultipartResolver} and pass on a
  * wrapped Portlet {@link ActionRequest}.
  * {@link org.springframework.web.portlet.mvc.Controller Controllers} can then
  * cast their given request to the {@link MultipartActionRequest} interface,
- * being able to access <code>MultipartFiles</code>. Note that this cast is
+ * being able to access {@code MultipartFiles}. Note that this cast is
  * only supported in case of an actual multipart request.
  *
  * <pre class="code"> public void handleActionRequest(ActionRequest request, ActionResponse response) {
@@ -63,8 +63,8 @@ import org.springframework.web.multipart.MultipartException;
  * bean properties.
  *
  * <p>Note: There is hardly ever a need to access the
- * <code>MultipartResolver</code> itself from application code. It will simply
- * do its work behind the scenes, making <code>MultipartActionRequests</code>
+ * {@code MultipartResolver} itself from application code. It will simply
+ * do its work behind the scenes, making {@code MultipartActionRequests}
  * available to controllers.
  *
  * @author Juergen Hoeller
@@ -81,7 +81,7 @@ public interface PortletMultipartResolver {
 	/**
 	 * Determine if the given request contains multipart content.
 	 * <p>Will typically check for content type
-	 * "<code>multipart/form-data</code>", but the actually accepted requests
+	 * "{@code multipart/form-data}", but the actually accepted requests
 	 * might depend on the capabilities of the resolver implementation.
 	 * @param request the portlet request to be evaluated
 	 * @return whether the request contains multipart content
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java
index acfe87e30e..233ba4fb86 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java
@@ -134,7 +134,7 @@ public abstract class AbstractCommandController extends BaseCommandController {
 	/**
 	 * Template method for request handling, providing a populated and validated instance
 	 * of the command class, and an Errors object containing binding and validation errors.
-	 * <p>Call <code>errors.getModel()</code> to populate the ModelAndView model
+	 * <p>Call {@code errors.getModel()} to populate the ModelAndView model
 	 * with the command and the Errors instance, under the specified command name,
 	 * as expected by the "spring:bind" tag.
 	 * @param request current action request
@@ -151,7 +151,7 @@ public abstract class AbstractCommandController extends BaseCommandController {
 	/**
 	 * Template method for render request handling, providing a populated and validated instance
 	 * of the command class, and an Errors object containing binding and validation errors.
-	 * <p>Call <code>errors.getModel()</code> to populate the ModelAndView model
+	 * <p>Call {@code errors.getModel()} to populate the ModelAndView model
 	 * with the command and the Errors instance, under the specified command name,
 	 * as expected by the "spring:bind" tag.
 	 * @param request current render request
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
index f8721abb76..dc4b3c2288 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
@@ -82,8 +82,8 @@ import org.springframework.web.portlet.util.PortletUtils;
  *  <tr>
  *      <td>synchronizeOnSession</td>
  *      <td>false</td>
- *      <td>whether the calls to <code>handleRenderRequestInternal</code> and
- *          <code>handleRenderRequestInternal</code> should be
+ *      <td>whether the calls to {@code handleRenderRequestInternal} and
+ *          {@code handleRenderRequestInternal} should be
  *          synchronized around the PortletSession, to serialize invocations
  *          from the same client. No effect if there is no PortletSession.
  *      </td>
@@ -112,10 +112,10 @@ import org.springframework.web.portlet.util.PortletUtils;
  * criteria your mapping is using, such as portlet mode or a request parameter, during the
  * action phase of your controller.  This is very handy since redirects within the portlet
  * are apparently impossible.  Before doing this, it is usually wise to call
- * <code>clearAllRenderParameters</code> and then explicitly set all the parameters that
+ * {@code clearAllRenderParameters} and then explicitly set all the parameters that
  * you want the new controller to see.  This avoids unexpected parameters from being passed
  * to the render phase of the second controller, such as the parameter indicating a form
- * submit ocurred in an <code>AbstractFormController</code>.
+ * submit ocurred in an {@code AbstractFormController}.
  *
  * <p>Thanks to Rainer Schmitz and Nick Lothian for their suggestions!
  *
@@ -135,13 +135,13 @@ public abstract class AbstractController extends PortletContentGenerator impleme
 	/**
 	 * Set if controller execution should be synchronized on the session,
 	 * to serialize parallel invocations from the same client.
-	 * <p>More specifically, the execution of the <code>handleActionRequestInternal</code>
+	 * <p>More specifically, the execution of the {@code handleActionRequestInternal}
 	 * method will get synchronized if this flag is "true". The best available
 	 * session mutex will be used for the synchronization; ideally, this will
 	 * be a mutex exposed by HttpSessionMutexListener.
 	 * <p>The session mutex is guaranteed to be the same object during
 	 * the entire lifetime of the session, available under the key defined
-	 * by the <code>SESSION_MUTEX_ATTRIBUTE</code> constant. It serves as a
+	 * by the {@code SESSION_MUTEX_ATTRIBUTE} constant. It serves as a
 	 * safe reference to synchronize on for locking on the current session.
 	 * <p>In many cases, the PortletSession reference itself is a safe mutex
 	 * as well, since it will always be the same object reference for the
@@ -226,7 +226,7 @@ public abstract class AbstractController extends PortletContentGenerator impleme
 	/**
 	 * Subclasses are meant to override this method if the controller
 	 * is expected to handle action requests. The contract is the same as
-	 * for <code>handleActionRequest</code>.
+	 * for {@code handleActionRequest}.
 	 * <p>The default implementation throws a PortletException.
 	 * @see #handleActionRequest
 	 * @see #handleRenderRequestInternal
@@ -240,7 +240,7 @@ public abstract class AbstractController extends PortletContentGenerator impleme
 	/**
 	 * Subclasses are meant to override this method if the controller
 	 * is expected to handle render requests. The contract is the same as
-	 * for <code>handleRenderRequest</code>.
+	 * for {@code handleRenderRequest}.
 	 * <p>The default implementation throws a PortletException.
 	 * @see #handleRenderRequest
 	 * @see #handleActionRequestInternal
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
index 56c0b3a4b3..edf58821fc 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
@@ -36,8 +36,8 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
 /**
  * <p>Form controller that auto-populates a form bean from the request.
  * This, either using a new bean instance per request, or using the same bean
- * when the <code>sessionForm</code> property has been set to
- * <code>true</code>.</p>
+ * when the {@code sessionForm} property has been set to
+ * {@code true}.</p>
  *
  * <p>This class is the base class for both framework subclasses such as
  * {@link SimpleFormController} and {@link AbstractWizardFormController}
@@ -47,21 +47,21 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
  * programmatically. To provide those views using configuration properties,
  * use the {@link SimpleFormController}.</p>
  *
- * <p>Subclasses need to override <code>showForm</code> to prepare the form view,
- * <code>processFormSubmission</code> to handle submit requests, and
- * <code>renderFormSubmission</code> to display the results of the submit.
+ * <p>Subclasses need to override {@code showForm} to prepare the form view,
+ * {@code processFormSubmission} to handle submit requests, and
+ * {@code renderFormSubmission} to display the results of the submit.
  * For the latter two methods, binding errors like type mismatches will be
  * reported via the given "errors" holder. For additional custom form validation,
  * a validator (property inherited from BaseCommandController) can be used,
  * reporting via the same "errors" instance.</p>
  *
- * <p>Comparing this Controller to the Struts notion of the <code>Action</code>
+ * <p>Comparing this Controller to the Struts notion of the {@code Action}
  * shows us that with Spring, you can use any ordinary JavaBeans or database-
  * backed JavaBeans without having to implement a framework-specific class
- * (like Struts' <code>ActionForm</code>). More complex properties of JavaBeans
+ * (like Struts' {@code ActionForm}). More complex properties of JavaBeans
  * (Dates, Locales, but also your own application-specific or compound types)
  * can be represented and submitted to the controller, by using the notion of
- * a <code>java.beans.PropertyEditors</code>. For more information on that
+ * a {@code java.beans.PropertyEditors}. For more information on that
  * subject, see the workflow of this controller and the explanation of the
  * {@link BaseCommandController BaseCommandController}.</p>
  *
@@ -93,11 +93,11 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
  * <li>The {@link PortletRequestDataBinder PortletRequestDataBinder}
  * gets applied to populate the new form object with initial request parameters and the
  * {@link #onBindOnNewForm(RenderRequest, Object, BindException)} callback method is invoked.
- * (<i>only if <code>bindOnNewForm</code> is set to <code>true</code></i>)
+ * (<i>only if {@code bindOnNewForm} is set to {@code true}</i>)
  * Make sure that the initial parameters do not include the parameter that indicates a
  * form submission has occurred.</li>
  * <li>Call to {@link #showForm(RenderRequest, RenderResponse,
-		* BindException) showForm} to return a View that should be rendered
+ * BindException) showForm} to return a View that should be rendered
  * (typically the view that renders the form). This method has to be
  * implemented in subclasses. </li>
  * <li>The showForm() implementation will call {@link #referenceData referenceData},
@@ -110,7 +110,7 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
  * Request).</b> To use a different way of detecting a form submission,
  * override the {@link #isFormSubmission isFormSubmission} method.
  * The action phase will proceed to process the form submission as follows.</li>
- * <li>If <code>sessionForm</code> is not set, {@link #formBackingObject
+ * <li>If {@code sessionForm} is not set, {@link #formBackingObject
  * formBackingObject} is called to retrieve a form object. Otherwise,
  * the controller tries to find the command object which is already bound
  * in the session. If it cannot find the object, the action phase does a
@@ -125,7 +125,7 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
  * which allows you to do custom processing after binding but before
  * validation (e.g. to manually bind request parameters to bean
  * properties, to be seen by the Validator).</li>
- * <li>If <code>validateOnBinding</code> is set, a registered Validator
+ * <li>If {@code validateOnBinding} is set, a registered Validator
  * will be invoked. The Validator will check the form object properties,
  * and register corresponding errors via the given {@link Errors Errors}
  * object.</li>
@@ -145,8 +145,8 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
  * <li>If the action phase indicated this is an invalid submit, the render
  * phase calls {@link #renderInvalidSubmit renderInvalidSubmit} which &ndash;
  * also by default &ndash; will render the results of the resubmitted
- * form.  Be sure to override both <code>handleInvalidSubmit</code> and
- * <code>renderInvalidSubmit</code> if you want to change this overall
+ * form.  Be sure to override both {@code handleInvalidSubmit} and
+ * {@code renderInvalidSubmit} if you want to change this overall
  * behavior.</li>
  * <li>Finally, call {@link #renderFormSubmission renderFormSubmission} to
  * render the results of the submission, with or without binding errors.
@@ -202,15 +202,15 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
  * <tr>
  * <td>redirectAction</td>
  * <td>false</td>
- * <td>Specifies whether <code>processFormSubmission</code> is expected to call
+ * <td>Specifies whether {@code processFormSubmission} is expected to call
  * {@link ActionResponse#sendRedirect ActionResponse.sendRedirect}.
  * This is important because some methods may not be called before
  * {@link ActionResponse#sendRedirect ActionResponse.sendRedirect} (e.g.
  * {@link ActionResponse#setRenderParameter ActionResponse.setRenderParameter}).
  * Setting this flag will prevent AbstractFormController from setting render
  * parameters that it normally needs for the render phase.
- * If this is set true and <code>sendRedirect</code> is not called, then
- * <code>processFormSubmission</code> must call
+ * If this is set true and {@code sendRedirect} is not called, then
+ * {@code processFormSubmission} must call
  * {@link #setFormSubmit setFormSubmit}.
  * Otherwise, the render phase will not realize the form was submitted
  * and will simply display a new blank form.</td>
@@ -221,11 +221,11 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
  * <td>An array of parameters that will be passed forward from the action
  * phase to the render phase if the form needs to be displayed
  * again.  These can also be passed forward explicitly by calling
- * the <code>passRenderParameters</code> method from any action
+ * the {@code passRenderParameters} method from any action
  * phase method.  Abstract descendants of this controller should follow
  * similar behavior.  If there are parameters you need in
- * <code>renderFormSubmission</code>, then you need to pass those
- * forward from <code>processFormSubmission</code>.  If you override the
+ * {@code renderFormSubmission}, then you need to pass those
+ * forward from {@code processFormSubmission}.  If you override the
  * default behavior of invalid submits and you set sessionForm to true,
  * then you probably will not need to set this because your parameters
  * are only going to be needed on the first request.</td>
@@ -273,7 +273,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * <p>Subclasses should set the following properties, either in the constructor
 	 * or via a BeanFactory: commandName, commandClass, bindOnNewForm, sessionForm.
 	 * Note that commandClass doesn't need to be set when overriding
-	 * <code>formBackingObject</code>, as the latter determines the class anyway.
+	 * {@code formBackingObject}, as the latter determines the class anyway.
 	 * <p>"cacheSeconds" is by default set to 0 (-> no caching for all form controllers).
 	 * @see #setCommandName
 	 * @see #setCommandClass
@@ -366,7 +366,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 
 	/**
 	 * Handles action phase of two cases: form submissions and showing a new form.
-	 * Delegates the decision between the two to <code>isFormSubmission</code>,
+	 * Delegates the decision between the two to {@code isFormSubmission},
 	 * always treating requests without existing form session attribute
 	 * as new form when using session form mode.
 	 * @see #isFormSubmission
@@ -415,7 +415,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 
 	/**
 	 * Handles render phase of two cases: form submissions and showing a new form.
-	 * Delegates the decision between the two to <code>isFormSubmission</code>,
+	 * Delegates the decision between the two to {@code isFormSubmission},
 	 * always treating requests without existing form session attribute
 	 * as new form when using session form mode.
 	 * @see #isFormSubmission
@@ -532,10 +532,10 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * Return the name of the PortletSession attribute that holds the form object
 	 * for this form controller.
 	 * <p>The default implementation delegates to the
-	 * <code>getFormSessionAttributeName</code> version without arguments.
+	 * {@code getFormSessionAttributeName} version without arguments.
 	 * @param request current HTTP request
 	 * @return the name of the form session attribute,
-	 * or <code>null</code> if not in session form mode
+	 * or {@code null} if not in session form mode
 	 * @see #getFormSessionAttributeName()
 	 * @see javax.portlet.PortletSession#getAttribute
 	 */
@@ -607,11 +607,11 @@ public abstract class AbstractFormController extends BaseCommandController {
 
 	/**
 	 * Create a BindException instance for a new form.
-	 * Called by <code>showNewForm</code>.
+	 * Called by {@code showNewForm}.
 	 * <p>Can be used directly when intending to show a new form but with
 	 * special errors registered on it (for example, on invalid submit).
 	 * Usually, the resulting BindException will be passed to
-	 * <code>showForm</code>, after registering the errors on it.
+	 * {@code showForm}, after registering the errors on it.
 	 * @param request current render request
 	 * @return the BindException instance
 	 * @throws Exception in case of an invalid new form object
@@ -645,8 +645,8 @@ public abstract class AbstractFormController extends BaseCommandController {
 
 	/**
 	 * Callback for custom post-processing in terms of binding for a new form.
-	 * Called when preparing a new form if <code>bindOnNewForm</code> is <code>true</code>.
-	 * <p>Default implementation delegates to <code>onBindOnNewForm(request, command)</code>.
+	 * Called when preparing a new form if {@code bindOnNewForm} is {@code true}.
+	 * <p>Default implementation delegates to {@code onBindOnNewForm(request, command)}.
 	 * @param request current render request
 	 * @param command the command object to perform further binding on
 	 * @param errors validation errors holder, allowing for additional
@@ -663,9 +663,9 @@ public abstract class AbstractFormController extends BaseCommandController {
 
 	/**
 	 * Callback for custom post-processing in terms of binding for a new form.
-	 * Called by the default implementation of the <code>onBindOnNewForm</code> version
+	 * Called by the default implementation of the {@code onBindOnNewForm} version
 	 * with all parameters, after standard binding when displaying the form view.
-	 * Only called if <code>bindOnNewForm</code> is set to <code>true</code>.
+	 * Only called if {@code bindOnNewForm} is set to {@code true}.
 	 * <p>The default implementation is empty.
 	 * @param request current render request
 	 * @param command the command object to perform further binding on
@@ -679,7 +679,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 
 	/**
 	 * Return the form object for the given request.
-	 * <p>Calls <code>formBackingObject</code> if the object is not in the session
+	 * <p>Calls {@code formBackingObject} if the object is not in the session
 	 * @param request current request
 	 * @return object form to bind onto
 	 * @see #formBackingObject
@@ -728,7 +728,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * object across the entire form workflow. Else, a new instance of the command
 	 * class will be created for each submission attempt, just using this backing
 	 * object as template for the initial form.
-	 * <p>The default implementation calls <code>BaseCommandController.createCommand</code>,
+	 * <p>The default implementation calls {@code BaseCommandController.createCommand},
 	 * creating a new empty instance of the command class.
 	 * Subclasses can override this to provide a preinitialized backing object.
 	 * @param request current portlet request
@@ -747,13 +747,13 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * Prepare the form model and view, including reference and error data.
 	 * Can show a configured form page, or generate a form view programmatically.
 	 * <p>A typical implementation will call
-	 * <code>showForm(request, errors, "myView")</code>
+	 * {@code showForm(request, errors, "myView")}
 	 * to prepare the form view for a specific view name, returning the
 	 * ModelAndView provided there.
-	 * <p>For building a custom ModelAndView, call <code>errors.getModel()</code>
+	 * <p>For building a custom ModelAndView, call {@code errors.getModel()}
 	 * to populate the ModelAndView model with the command and the Errors instance,
 	 * under the specified command name, as expected by the "spring:bind" tag.
-	 * You also need to include the model returned by <code>referenceData</code>.
+	 * You also need to include the model returned by {@code referenceData}.
 	 * <p>Note: If you decide to have a "formView" property specifying the
 	 * view name, consider using SimpleFormController.
 	 * @param request current render request
@@ -840,7 +840,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 	/**
 	 * Create a reference data map for the given request, consisting of
 	 * bean name/bean instance pairs as expected by ModelAndView.
-	 * <p>The default implementation returns <code>null</code>.
+	 * <p>The default implementation returns {@code null}.
 	 * Subclasses can override this to set reference data used in the view.
 	 * @param request current render request
 	 * @param command form object with request parameters bound onto it
@@ -855,14 +855,14 @@ public abstract class AbstractFormController extends BaseCommandController {
 
 
 	/**
-	 * Process render phase of form submission request. Called by <code>handleRequestInternal</code>
+	 * Process render phase of form submission request. Called by {@code handleRequestInternal}
 	 * in case of a form submission, with or without binding errors. Implementations
 	 * need to proceed properly, typically showing a form view in case of binding
 	 * errors or rendering the result of a submit action else.
-	 * <p>For a success view, call <code>errors.getModel()</code> to populate the
+	 * <p>For a success view, call {@code errors.getModel()} to populate the
 	 * ModelAndView model with the command and the Errors instance, under the
 	 * specified command name, as expected by the "spring:bind" tag. For a form view,
-	 * simply return the ModelAndView object privded by <code>showForm</code>.
+	 * simply return the ModelAndView object privded by {@code showForm}.
 	 * @param request current render request
 	 * @param response current render response
 	 * @param command form object with request parameters bound onto it
@@ -880,7 +880,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 			throws Exception;
 
 	/**
-	 * Process action phase of form submission request. Called by <code>handleRequestInternal</code>
+	 * Process action phase of form submission request. Called by {@code handleRequestInternal}
 	 * in case of a form submission, with or without binding errors. Implementations
 	 * need to proceed properly, typically performing a submit action if there are no binding errors.
 	 * <p>Subclasses can implement this to provide custom submission handling
@@ -906,7 +906,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * This should also work if the user hit the back button, changed some form data,
 	 * and resubmitted the form.
 	 * <p>Note: To avoid duplicate submissions, you need to override this method.
-	 * Either show some "invalid submit" message, or call <code>showNewForm</code> for
+	 * Either show some "invalid submit" message, or call {@code showNewForm} for
 	 * resetting the form (prepopulating it with the current values if "bindOnNewForm"
 	 * is true). In this case, the form object in the session serves as transaction token.
 	 * <pre class="code">
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
index 5183bfaa5b..bd7971d5bb 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
@@ -61,18 +61,18 @@ import org.springframework.web.portlet.util.PortletUtils;
  * validated again to guarantee a consistent state.
  *
  * <p>Note that a validator's default validate method is not executed when using
- * this class! Rather, the <code>validatePage</code> implementation should call
- * special <code>validateXXX</code> methods that the validator needs to provide,
+ * this class! Rather, the {@code validatePage} implementation should call
+ * special {@code validateXXX} methods that the validator needs to provide,
  * validating certain pieces of the object. These can be combined to validate
  * the elements of individual pages.
  *
  * <p>Note: Page numbering starts with 0, to be able to pass an array
  * consisting of the corresponding view names to the "pages" bean property.
  *
- * <p>Parameters indicated with <code>setPassRenderParameters</code> will be present
- * for each page.  If there are render parameters you need in <code>renderFinish</code>
- * or <code>renderCancel</code>, then you need to pass those forward from the
- * <code>processFinish</code> or <code>processCancel</code> methods, respectively.
+ * <p>Parameters indicated with {@code setPassRenderParameters} will be present
+ * for each page.  If there are render parameters you need in {@code renderFinish}
+ * or {@code renderCancel}, then you need to pass those forward from the
+ * {@code processFinish} or {@code processCancel} methods, respectively.
 
  * @author Juergen Hoeller
  * @author John A. Lewis
@@ -155,7 +155,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * Return the wizard pages, i.e. the view names for the pages.
 	 * The array index corresponds to the page number.
 	 * <p>Note that a concrete wizard form controller might override
-	 * <code>getViewName(PortletRequest, Object, int)</code> to
+	 * {@code getViewName(PortletRequest, Object, int)} to
 	 * determine the view name for each page dynamically.
 	 * @see #getViewName(PortletRequest, Object, int)
 	 */
@@ -167,7 +167,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * Return the number of wizard pages.
 	 * Useful to check whether the last page has been reached.
 	 * <p>Note that a concrete wizard form controller might override
-	 * <code>getPageCount(PortletRequest, Object)</code> to determine
+	 * {@code getPageCount(PortletRequest, Object)} to determine
 	 * the page count dynamically.
 	 * @see #getPageCount(PortletRequest, Object)
 	 */
@@ -300,7 +300,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	/**
 	 * Create a reference data map for the given request, consisting of
 	 * bean name/bean instance pairs as expected by ModelAndView.
-	 * <p>The default implementation returns <code>null</code>.
+	 * <p>The default implementation returns {@code null}.
 	 * Subclasses can override this to set reference data used in the view.
 	 * @param request current portlet request
 	 * @param page current wizard page
@@ -327,7 +327,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 
 	/**
 	 * Prepare the form model and view, including reference and error data,
-	 * for the given page. Can be used in <code>processFinish</code> implementations,
+	 * for the given page. Can be used in {@code processFinish} implementations,
 	 * to show the corresponding page in case of validation errors.
 	 * @param request current portlet render request
 	 * @param errors validation errors holder
@@ -387,7 +387,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * Can be overridden to dynamically switch the page view or to return view names
 	 * for dynamically defined pages.
 	 * @param request current portlet request
-	 * @param command the command object as returned by <code>formBackingObject</code>
+	 * @param command the command object as returned by {@code formBackingObject}
 	 * @return the current page count
 	 * @see #getPageCount
 	 */
@@ -399,7 +399,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * Return the initial page of the wizard, i.e. the page shown at wizard startup.
 	 * <p>The default implementation delegates to {@link #getInitialPage(PortletRequest)}.
 	 * @param request current portlet request
-	 * @param command the command object as returned by <code>formBackingObject</code>
+	 * @param command the command object as returned by {@code formBackingObject}
 	 * @return the initial page number
 	 * @see #getInitialPage(PortletRequest)
 	 * @see #formBackingObject
@@ -421,7 +421,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	/**
 	 * Return the name of the PortletSession attribute that holds the page object
 	 * for this wizard form controller.
-	 * <p>The default implementation delegates to the <code>getPageSessionAttributeName</code>
+	 * <p>The default implementation delegates to the {@code getPageSessionAttributeName}
 	 * version without arguments.
 	 * @param request current portlet request
 	 * @return the name of the form session attribute, or null if not in session form mode
@@ -469,7 +469,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 
 	/**
 	 * Pass the the parameter that indicates the target page of the request
-	 * forward to the render phase. If the <code>getTargetPage<code> method
+	 * forward to the render phase. If the {@code getTargetPage} method
 	 * was overridden, this may need to be overriden as well.
 	 * @param request the current action request
 	 * @param response the current action response
@@ -502,7 +502,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 
 	/**
 	 * Pass the the parameter that indicates a finish request forward to the
-	 * render phase. If the <code>isFinishRequest</code> method
+	 * render phase. If the {@code isFinishRequest} method
 	 * was overridden, this may need to be overriden as well.
 	 * @param request the current action request
 	 * @param response the current action response
@@ -525,7 +525,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 
 	/**
 	 * Pass the the parameter that indicates a cancel request forward to the
-	 * render phase. If the <code>isCancelRequest</code> method
+	 * render phase. If the {@code isCancelRequest} method
 	 * was overridden, this may need to be overriden as well.
 	 * @param request the current action request
 	 * @param response the current action response
@@ -723,9 +723,9 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	/**
 	 * Determine whether the incoming request is a request to finish the
 	 * processing of the current form.
-	 * <p>By default, this method returns <code>true</code> if a parameter
+	 * <p>By default, this method returns {@code true} if a parameter
 	 * matching the "_finish" key is present in the request, otherwise it
-	 * returns <code>false</code>. Subclasses may override this method
+	 * returns {@code false}. Subclasses may override this method
 	 * to provide custom logic to detect a finish request.
 	 * <p>The parameter is recognized both when sent as a plain parameter
 	 * ("_finish") or when triggered by an image button ("_finish.x").
@@ -740,9 +740,9 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	/**
 	 * Determine whether the incoming request is a request to cancel the
 	 * processing of the current form.
-	 * <p>By default, this method returns <code>true</code> if a parameter
+	 * <p>By default, this method returns {@code true} if a parameter
 	 * matching the "_cancel" key is present in the request, otherwise it
-	 * returns <code>false</code>. Subclasses may override this method
+	 * returns {@code false}. Subclasses may override this method
 	 * to provide custom logic to detect a cancel request.
 	 * <p>The parameter is recognized both when sent as a plain parameter
 	 * ("_cancel") or when triggered by an image button ("_cancel.x").
@@ -838,10 +838,10 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 
 	/**
 	 * Template method for custom validation logic for individual pages.
-	 * The default implementation calls <code>validatePage(command, errors, page)</code>.
-	 * <p>Implementations will typically call fine-granular <code>validateXXX</code>
+	 * The default implementation calls {@code validatePage(command, errors, page)}.
+	 * <p>Implementations will typically call fine-granular {@code validateXXX}
 	 * methods of this instance's Validator, combining them to validation of the
-	 * corresponding pages. The Validator's default <code>validate</code> method
+	 * corresponding pages. The Validator's default {@code validate} method
 	 * will not be called by a wizard form controller!
 	 * @param command form object with the current wizard state
 	 * @param errors validation errors holder
@@ -860,7 +860,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * The default implementation is empty.
 	 * <p>Implementations will typically call fine-granular validateXXX methods of this
 	 * instance's validator, combining them to validation of the corresponding pages.
-	 * The validator's default <code>validate</code> method will not be called by a
+	 * The validator's default {@code validate} method will not be called by a
 	 * wizard form controller!
 	 * @param command form object with the current wizard state
 	 * @param errors validation errors holder
@@ -891,7 +891,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * <p>The default implementation throws a PortletException, saying that a finish
 	 * render request is not supported by this controller. Thus, you do not need to
 	 * implement this template method if you do not need to render after a finish.
-	 * <p>Call <code>errors.getModel()</code> to populate the ModelAndView model
+	 * <p>Call {@code errors.getModel()} to populate the ModelAndView model
 	 * with the command and the Errors instance, under the specified command name,
 	 * as expected by the "spring:bind" tag.
 	 * @param request current portlet render request
@@ -937,7 +937,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * <p>The default implementation throws a PortletException, saying that a cancel
 	 * render request is not supported by this controller. Thus, you do not need to
 	 * implement this template method if you do not support a cancel operation.
-	 * <p>Call <code>errors.getModel()</code> to populate the ModelAndView model
+	 * <p>Call {@code errors.getModel()} to populate the ModelAndView model
 	 * with the command and the Errors instance, under the specified command name,
 	 * as expected by the "spring:bind" tag.
 	 * @param request current portlet render request
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
index f90ef73029..ebb1bcc83f 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
@@ -54,18 +54,18 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
  * Upon receiving a request, any BaseCommandController will attempt to fill the
  * command object using the request parameters. This is done using the typical
  * and well-known JavaBeans property notation. When a request parameter named
- * <code>'firstName'</code> exists, the framework will attempt to call
- * <code>setFirstName([value])</code> passing the value of the parameter. Nested properties
- * are of course supported. For instance a parameter named <code>'address.city'</code>
- * will result in a <code>getAddress().setCity([value])</code> call on the
+ * {@code 'firstName'} exists, the framework will attempt to call
+ * {@code setFirstName([value])} passing the value of the parameter. Nested properties
+ * are of course supported. For instance a parameter named {@code 'address.city'}
+ * will result in a {@code getAddress().setCity([value])} call on the
  * command class.</p>
  *
  * <p>It's important to realize that you are not limited to String arguments in
  * your JavaBeans. Using the PropertyEditor-notion as supplied by the
  * java.beans package, you will be able to transform Strings to Objects and
- * the other way around. For instance <code>setLocale(Locale loc)</code> is
- * perfectly possible for a request parameter named <code>locale</code> having
- * a value of <code>en</code>, as long as you register the appropriate
+ * the other way around. For instance {@code setLocale(Locale loc)} is
+ * perfectly possible for a request parameter named {@code locale} having
+ * a value of {@code en}, as long as you register the appropriate
  * PropertyEditor in the Controller (see {@link #initBinder initBinder()}
  * for more information on that matter).</p>
  *
@@ -79,7 +79,7 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
  * <p><b><a name="workflow">Workflow
  * (<a href="AbstractController.html#workflow">and that defined by superclass</a>):</b><br>
  * Since this class is an abstract base class for more specific implementation,
- * it does not override the <code>handleRequestInternal()</code> methods and also has no
+ * it does not override the {@code handleRequestInternal()} methods and also has no
  * actual workflow. Implementing classes like
  * {@link AbstractFormController AbstractFormController},
  * {@link AbstractCommandController AbstractCommandController},
@@ -268,7 +268,7 @@ public abstract class BaseCommandController extends AbstractController {
 	/**
 	 * Set the strategy to use for resolving errors into message codes.
 	 * Applies the given strategy to all data binders used by this controller.
-	 * <p>Default is <code>null</code>, i.e. using the default strategy of the data binder.
+	 * <p>Default is {@code null}, i.e. using the default strategy of the data binder.
 	 * @see #createBinder
 	 * @see org.springframework.validation.DataBinder#setMessageCodesResolver
 	 */
@@ -285,8 +285,8 @@ public abstract class BaseCommandController extends AbstractController {
 
 	/**
 	 * Set the strategy to use for processing binding errors, that is,
-	 * required field errors and <code>PropertyAccessException</code>s.
-	 * <p>Default is <code>null</code>, i.e. using the default strategy of
+	 * required field errors and {@code PropertyAccessException}s.
+	 * <p>Default is {@code null}, i.e. using the default strategy of
 	 * the data binder.
 	 * @see #createBinder
 	 * @see org.springframework.validation.DataBinder#setBindingErrorProcessor
@@ -306,7 +306,7 @@ public abstract class BaseCommandController extends AbstractController {
 	 * Specify a single PropertyEditorRegistrar to be applied
 	 * to every DataBinder that this controller uses.
 	 * <p>Allows for factoring out the registration of PropertyEditors
-	 * to separate objects, as an alternative to <code>initBinder</code>.
+	 * to separate objects, as an alternative to {@code initBinder}.
 	 * @see #initBinder
 	 */
 	public final void setPropertyEditorRegistrar(PropertyEditorRegistrar propertyEditorRegistrar) {
@@ -317,7 +317,7 @@ public abstract class BaseCommandController extends AbstractController {
 	 * Specify one or more PropertyEditorRegistrars to be applied
 	 * to every DataBinder that this controller uses.
 	 * <p>Allows for factoring out the registration of PropertyEditors
-	 * to separate objects, as alternative to <code>initBinder</code>.
+	 * to separate objects, as alternative to {@code initBinder}.
 	 * @see #initBinder
 	 */
 	public final void setPropertyEditorRegistrars(PropertyEditorRegistrar[] propertyEditorRegistrars) {
@@ -378,7 +378,7 @@ public abstract class BaseCommandController extends AbstractController {
 
 	/**
 	 * Create a new command instance for the command class of this controller.
-	 * <p>This implementation uses <code>BeanUtils.instantiateClass</code>,
+	 * <p>This implementation uses {@code BeanUtils.instantiateClass},
 	 * so the command needs to have a no-arg constructor (supposed to be
 	 * public, but not required to).
 	 * @return the new command instance
@@ -434,7 +434,7 @@ public abstract class BaseCommandController extends AbstractController {
 
 	/**
 	 * Return whether to suppress binding for the given request.
-	 * <p>The default implementation always returns <code>false</code>.
+	 * <p>The default implementation always returns {@code false}.
 	 * Can be overridden in subclasses to suppress validation:
 	 * for example, if a special request parameter is set.
 	 * @param request current portlet request
@@ -447,11 +447,11 @@ public abstract class BaseCommandController extends AbstractController {
 
 	/**
 	 * Create a new binder instance for the given command and request.
-	 * <p>Called by <code>bindAndValidate</code>. Can be overridden to plug in
+	 * <p>Called by {@code bindAndValidate}. Can be overridden to plug in
 	 * custom PortletRequestDataBinder instances.
 	 * <p>The default implementation creates a standard PortletRequestDataBinder and
-	 * invokes <code>prepareBinder</code> and <code>initBinder</code>.
-	 * <p>Note that neither <code>prepareBinder</code> nor <code>initBinder</code>
+	 * invokes {@code prepareBinder} and {@code initBinder}.
+	 * <p>Note that neither {@code prepareBinder} nor {@code initBinder}
 	 * will be invoked automatically if you override this method! Call those methods
 	 * at appropriate points of your overridden method.
 	 * @param request current portlet request
@@ -474,7 +474,7 @@ public abstract class BaseCommandController extends AbstractController {
 	/**
 	 * Prepare the given binder, applying the specified MessageCodesResolver,
 	 * BindingErrorProcessor and PropertyEditorRegistrars (if any).
-	 * Called by <code>createBinder</code>.
+	 * Called by {@code createBinder}.
 	 * @param binder the new binder instance
 	 * @see #createBinder
 	 * @see #setMessageCodesResolver
@@ -499,8 +499,8 @@ public abstract class BaseCommandController extends AbstractController {
 
 	/**
 	 * Determine whether to use direct field access instead of bean property access.
-	 * Applied by <code>prepareBinder</code>.
-	 * <p>The default is <code>false</code>. Can be overridden in subclasses.
+	 * Applied by {@code prepareBinder}.
+	 * <p>The default is {@code false}. Can be overridden in subclasses.
 	 * @see #prepareBinder
 	 * @see org.springframework.validation.DataBinder#initDirectFieldAccess()
 	 */
@@ -510,7 +510,7 @@ public abstract class BaseCommandController extends AbstractController {
 
 	/**
 	 * Initialize the given binder instance, for example with custom editors.
-	 * Called by <code>createBinder</code>.
+	 * Called by {@code createBinder}.
 	 * <p>This method allows you to register custom editors for certain fields of your
 	 * command class. For instance, you will be able to transform Date objects into a
 	 * String pattern and back, in order to allow your JavaBeans to have Date properties
@@ -532,7 +532,7 @@ public abstract class BaseCommandController extends AbstractController {
 	/**
 	 * Callback for custom post-processing in terms of binding.
 	 * Called on each submit, after standard binding but before validation.
-	 * <p>The default implementation delegates to <code>onBind(request, command)</code>.
+	 * <p>The default implementation delegates to {@code onBind(request, command)}.
 	 * @param request current portlet request
 	 * @param command the command object to perform further binding on
 	 * @param errors validation errors holder, allowing for additional
@@ -547,7 +547,7 @@ public abstract class BaseCommandController extends AbstractController {
 
 	/**
 	 * Callback for custom post-processing in terms of binding.
-	 * Called by the default implementation of the <code>onBind</code> version with
+	 * Called by the default implementation of the {@code onBind} version with
 	 * all parameters, after standard binding but before validation.
 	 * <p>The default implementation is empty.
 	 * @param request current portlet request
@@ -560,7 +560,7 @@ public abstract class BaseCommandController extends AbstractController {
 
 	/**
 	 * Return whether to suppress validation for the given request.
-	 * <p>The default implementation always returns <code>false</code>.
+	 * <p>The default implementation always returns {@code false}.
 	 * Can be overridden in subclasses to suppress validation:
 	 * for example, if a special request parameter is set.
 	 * @param request current portlet request
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
index c8f3096eb8..8f93ba48af 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
@@ -26,7 +26,7 @@ import org.springframework.web.portlet.ModelAndView;
 /**
  * Base portlet Controller interface, representing a component that receives
  * RenderRequest/RenderResponse and ActionRequest/ActionResponse like a
- * <code>Portlet</code> but is able to participate in an MVC workflow.
+ * {@code Portlet} but is able to participate in an MVC workflow.
  *
  * <p>Any implementation of the portlet Controller interface should be a
  * <i>reusable, threadsafe</i> class, capable of handling multiple
@@ -74,7 +74,7 @@ public interface Controller {
 
 	/**
 	 * Process the render request and return a ModelAndView object which the DispatcherPortlet
-	 * will render. A <code>null</code> return value is not an error: It indicates that this
+	 * will render. A {@code null} return value is not an error: It indicates that this
 	 * object completed request processing itself, thus there is no ModelAndView to render.
 	 * @param request current portlet render request
 	 * @param response current portlet render response
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
index 0a39a2fd0c..fa2dcb2606 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
@@ -35,7 +35,7 @@ import org.springframework.web.portlet.ModelAndView;
  *  <li>Render request is received by the controller</li>
  *  <li>call to {@link #handleRenderRequestInternal handleRenderRequestInternal} which
  *      just returns the view, named by the configuration property
- *      <code>viewName</code>. Nothing more, nothing less</li>
+ *      {@code viewName}. Nothing more, nothing less</li>
  * </ol>
  * </p>
  *
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
index ad8d452ee3..db95e9edea 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
@@ -102,7 +102,7 @@ public class PortletWrappingController extends AbstractController
 
 	/**
 	 * Set whether to use the shared PortletConfig object passed in
-	 * through <code>setPortletConfig</code>, if available.
+	 * through {@code setPortletConfig}, if available.
 	 * <p>Default is "true". Turn this setting to "false" to pass in
 	 * a mock PortletConfig object with the bean name as portlet name,
 	 * holding the current PortletContext.
@@ -123,7 +123,7 @@ public class PortletWrappingController extends AbstractController
 
 	/**
 	 * Set the class of the Portlet to wrap.
-	 * Needs to implement <code>javax.portlet.Portlet</code>.
+	 * Needs to implement {@code javax.portlet.Portlet}.
 	 * @see javax.portlet.Portlet
 	 */
 	public void setPortletClass(Class portletClass) {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java
index dc35b897be..2839a209c3 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java
@@ -36,7 +36,7 @@ public interface ResourceAwareController {
 
 	/**
 	 * Process the resource request and return a ModelAndView object which the DispatcherPortlet
-	 * will render. A <code>null</code> return value is not an error: It indicates that this
+	 * will render. A {@code null} return value is not an error: It indicates that this
 	 * object completed request processing itself, thus there is no ModelAndView to render.
 	 * @param request current portlet resource request
 	 * @param response current portlet resource response
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java
index 97e622bef4..47e5f5e345 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java
@@ -49,8 +49,8 @@ import org.springframework.web.portlet.ModelAndView;
  * render phase will be called repeatedly by the portal -- it does this every time
  * the page containing the portlet is updated, even if the activity is in some other
  * portlet.  The main difference in the methods in this class is that the
- * <code>onSubmit</code> methods have all been split into <code>onSubmitAction</code>
- * and <code>onSubmitRender</code> to account for the two phases.</p>
+ * {@code onSubmit} methods have all been split into {@code onSubmitAction}
+ * and {@code onSubmitRender} to account for the two phases.</p>
  *
  * <p><b><a name="workflow">Workflow
  * (<a href="AbstractFormController.html#workflow">in addition to the superclass</a>):</b><br>
@@ -70,12 +70,12 @@ import org.springframework.web.portlet.ModelAndView;
  * <li>If no errors occurred, the controller will call
  * {@link #onSubmitAction(ActionRequest, ActionResponse, Object, BindException) onSubmitAction}
  * during the action phase and then {@link #onSubmitRender(RenderRequest, RenderResponse,
-		* Object, BindException) onSubmitRender} during the render phase, which in case of the
+ * Object, BindException) onSubmitRender} during the render phase, which in case of the
  * default implementation delegate to {@link #onSubmitAction(Object, BindException)
  * onSubmitAction} and {@link #onSubmitRender(Object, BindException) onSubmitRender}
  * with just the command object.
  * The default implementation of the latter method will return the configured
- * <code>successView</code>. Consider just implementing {@link #doSubmitAction doSubmitAction}
+ * {@code successView}. Consider just implementing {@link #doSubmitAction doSubmitAction}
  * for simply performing a submit action during the action phase and then rendering
  * the success view during the render phase.</li>
  * </ol>
@@ -85,9 +85,9 @@ import org.springframework.web.portlet.ModelAndView;
  * {@link #onSubmitAction onSubmitAction} or {@link #onSubmitRender onSubmitRender}
  * methods. Submit actions can also perform custom validation if necessary
  * (typically database-driven checks), calling {@link #showForm(RenderRequest,
-		* RenderResponse, BindException) showForm} in case of validation errors to show
- * the form view again.  You do not have to override both the <code>onSubmitAction</code> and
- * <code>onSubmitRender</code> methods at a given level unless you truly have custom logic to
+ * RenderResponse, BindException) showForm} in case of validation errors to show
+ * the form view again.  You do not have to override both the {@code onSubmitAction} and
+ * {@code onSubmitRender} methods at a given level unless you truly have custom logic to
  * perform in both.<p>
  *
  * <p><b>WARNING:</b> Make sure that any one-time system updates (such as database
@@ -121,10 +121,10 @@ import org.springframework.web.portlet.ModelAndView;
  * <table>
  * </p>
  *
- * <p>Parameters indicated with <code>setPassRenderParameters</code> will be
+ * <p>Parameters indicated with {@code setPassRenderParameters} will be
  * preserved if the form has errors or if a form change request occurs.
- * If there are render parameters you need in <code>onSubmitRender</code>,
- * then you need to pass those forward from <code>onSubmitAction</code>.
+ * If there are render parameters you need in {@code onSubmitRender},
+ * then you need to pass those forward from {@code onSubmitAction}.
  *
  * <p>Thanks to Rainer Schmitz and Nick Lothian for their suggestions!
  *
@@ -147,7 +147,7 @@ public class SimpleFormController extends AbstractFormController {
 	 * <p>Subclasses should set the following properties, either in the constructor
 	 * or via a BeanFactory: commandName, commandClass, sessionForm, formView,
 	 * successView. Note that commandClass doesn't need to be set when overriding
-	 * <code>formBackingObject</code>, as this determines the class anyway.
+	 * {@code formBackingObject}, as this determines the class anyway.
 	 * @see #setCommandClass(Class)
 	 * @see #setCommandName(String)
 	 * @see #setSessionForm(boolean)
@@ -249,7 +249,7 @@ public class SimpleFormController extends AbstractFormController {
 	/**
 	 * Create a reference data map for the given request.
 	 * Called by referenceData version with all parameters.
-	 * <p>The default implementation returns <code>null</code>.
+	 * <p>The default implementation returns {@code null}.
 	 * Subclasses can override this to set reference data used in the view.
 	 * @param request current portlet request
 	 * @return a Map with reference data entries, or null if none
@@ -263,11 +263,11 @@ public class SimpleFormController extends AbstractFormController {
 
 
 	/**
-	 * This implementation calls <code>showForm</code> in case of errors,
-	 * and delegates to <code>onSubmitRender<code>'s full version else.
+	 * This implementation calls {@code showForm} in case of errors,
+	 * and delegates to {@code onSubmitRender}'s full version else.
 	 * <p>This can only be overridden to check for an action that should be executed
 	 * without respect to binding errors, like a cancel action. To just handle successful
-	 * submissions without binding errors, override one of the <code>onSubmitRender</code>
+	 * submissions without binding errors, override one of the {@code onSubmitRender}
 	 * methods.
 	 * @see #showForm(RenderRequest, RenderResponse, BindException)
 	 * @see #onSubmitRender(RenderRequest, RenderResponse, Object, BindException)
@@ -289,11 +289,11 @@ public class SimpleFormController extends AbstractFormController {
 
 	/**
 	 * This implementation does nothing in case of errors,
-	 * and delegates to <code>onSubmitAction</code>'s full version else.
+	 * and delegates to {@code onSubmitAction}'s full version else.
 	 * <p>This can only be overridden to check for an action that should be executed
 	 * without respect to binding errors, like a cancel action. To just handle successful
-	 * submissions without binding errors, override one of the <code>onSubmitAction</code>
-	 * methods or <code>doSubmitAction</code>.
+	 * submissions without binding errors, override one of the {@code onSubmitAction}
+	 * methods or {@code doSubmitAction}.
 	 * @see #showForm
 	 * @see #onSubmitAction(ActionRequest, ActionResponse, Object, BindException)
 	 * @see #onSubmitAction(Object, BindException)
@@ -347,7 +347,7 @@ public class SimpleFormController extends AbstractFormController {
 	 * <p>Gets called by {@link #suppressValidation} and {@link #processFormSubmission}.
 	 * Consequently, this single method determines to suppress validation
 	 * <i>and</i> to show the form view in any case.
-	 * <p>The default implementation returns <code>false</code.
+	 * <p>The default implementation returns {@code false}.
 	 * @param request current portlet request
 	 * @return whether the given request is a form change request
 	 * @see #suppressValidation
@@ -359,10 +359,10 @@ public class SimpleFormController extends AbstractFormController {
 
 	/**
 	 * Called during form submission if {@link #isFormChangeRequest(PortletRequest)}
-	 * returns <code>true</code>. Allows subclasses to implement custom logic
+	 * returns {@code true}. Allows subclasses to implement custom logic
 	 * to modify the command object to directly modify data in the form.
 	 * <p>The default implementation delegates to
-	 * <code>onFormChange(request, response, command)</code>.
+	 * {@code onFormChange(request, response, command)}.
 	 * @param request current action request
 	 * @param response current action response
 	 * @param command form object with request parameters bound onto it
@@ -379,8 +379,8 @@ public class SimpleFormController extends AbstractFormController {
 	}
 
 	/**
-	 * Simpler <code>onFormChange</code> variant, called by the full version
-	 * <code>onFormChange(request, response, command, errors)</code>.
+	 * Simpler {@code onFormChange} variant, called by the full version
+	 * {@code onFormChange(request, response, command, errors)}.
 	 * <p>The default implementation is empty.
 	 * @param request current action request
 	 * @param response current action response
@@ -398,13 +398,13 @@ public class SimpleFormController extends AbstractFormController {
 	 * reported by the registered validator, or on every submit if no validator.
 	 * <p>The default implementation delegates to {@link #onSubmitRender(Object, BindException)}.
 	 * For simply performing a submit action and rendering the specified success view,
-	 * do not implement an <code>onSubmitRender</code> at all.
+	 * do not implement an {@code onSubmitRender} at all.
 	 * <p>Subclasses can override this to provide custom rendering to display results of
-	 * the action phase. Implementations can also call <code>showForm</code> to return to the form
-	 * if the <code>onSubmitAction</code> failed custom validation. Do <i>not</i> implement multiple
-	 * <code>onSubmitRender</code> methods: In that case,
+	 * the action phase. Implementations can also call {@code showForm} to return to the form
+	 * if the {@code onSubmitAction} failed custom validation. Do <i>not</i> implement multiple
+	 * {@code onSubmitRender} methods: In that case,
 	 * just this method will be called by the controller.
-	 * <p>Call <code>errors.getModel()</code> to populate the ModelAndView model
+	 * <p>Call {@code errors.getModel()} to populate the ModelAndView model
 	 * with the command and the Errors instance, under the specified command name,
 	 * as expected by the "spring:bind" tag.
 	 * @param request current render request
@@ -430,12 +430,12 @@ public class SimpleFormController extends AbstractFormController {
 	 * Submit action phase callback with all parameters. Called in case of submit without errors
 	 * reported by the registered validator respectively on every submit if no validator.
 	 * <p>The default implementation delegates to {@link #onSubmitAction(Object, BindException)}.
-	 * For simply performing a submit action consider implementing <code>doSubmitAction</code>
-	 * rather than an <code>onSubmitAction</code> version.
+	 * For simply performing a submit action consider implementing {@code doSubmitAction}
+	 * rather than an {@code onSubmitAction} version.
 	 * <p>Subclasses can override this to provide custom submission handling like storing
 	 * the object to the database. Implementations can also perform custom validation and
-	 * signal the render phase to call <code>showForm</code> to return to the form. Do <i>not</i>
-	 * implement multiple <code>onSubmitAction</code> methods: In that case,
+	 * signal the render phase to call {@code showForm} to return to the form. Do <i>not</i>
+	 * implement multiple {@code onSubmitAction} methods: In that case,
 	 * just this method will be called by the controller.
 	 * @param request current action request
 	 * @param response current action response
@@ -454,15 +454,15 @@ public class SimpleFormController extends AbstractFormController {
 	}
 
 	/**
-	 * Simpler <code>onSubmitRender</code> version. Called by the default implementation
-	 * of the <code>onSubmitRender</code> version with all parameters.
+	 * Simpler {@code onSubmitRender} version. Called by the default implementation
+	 * of the {@code onSubmitRender} version with all parameters.
 	 * <p>The default implementation calls {@link #onSubmitRender(Object)}, using the
 	 * returned ModelAndView if actually implemented in a subclass. Else, the
 	 * default behavior will apply: rendering the success view with the command
 	 * and Errors instance as model.
 	 * <p>Subclasses can override this to provide custom submission handling that
 	 * does not need request and response.
-	 * <p>Call <code>errors.getModel()</code> to populate the ModelAndView model
+	 * <p>Call {@code errors.getModel()} to populate the ModelAndView model
 	 * with the command and the Errors instance, under the specified command name,
 	 * as expected by the "spring:bind" tag.
 	 * @param command form object with request parameters bound onto it
@@ -492,8 +492,8 @@ public class SimpleFormController extends AbstractFormController {
 	}
 
 	/**
-	 * Simpler <code>onSubmitAction</code> version. Called by the default implementation
-	 * of the <code>onSubmitAction</code> version with all parameters.
+	 * Simpler {@code onSubmitAction} version. Called by the default implementation
+	 * of the {@code onSubmitAction} version with all parameters.
 	 * <p>The default implementation calls {@link #onSubmitAction(Object)}.
 	 * <p>Subclasses can override this to provide custom submission handling that
 	 * does not need request and response.
@@ -510,10 +510,10 @@ public class SimpleFormController extends AbstractFormController {
 	}
 
 	/**
-	 * Simplest <code>onSubmitRender</code> version. Called by the default implementation
-	 * of the <code>onSubmitRender</code> version with command and BindException parameters.
+	 * Simplest {@code onSubmitRender} version. Called by the default implementation
+	 * of the {@code onSubmitRender} version with command and BindException parameters.
 	 * <p>This implementation returns null as ModelAndView, making the calling
-	 * <code>onSubmitRender</code> method perform its default rendering of the success view.
+	 * {@code onSubmitRender} method perform its default rendering of the success view.
 	 * <p>Subclasses can override this to provide custom submission handling
 	 * that just depends on the command object.
 	 * @param command form object with request parameters bound onto it
@@ -529,9 +529,9 @@ public class SimpleFormController extends AbstractFormController {
 	}
 
 	/**
-	 * Simplest <code>onSubmitAction</code> version. Called by the default implementation
-	 * of the <code>onSubmitAction</code> version with command and BindException parameters.
-	 * <p>This implementation calls <code>doSubmitAction</code>.
+	 * Simplest {@code onSubmitAction} version. Called by the default implementation
+	 * of the {@code onSubmitAction} version with command and BindException parameters.
+	 * <p>This implementation calls {@code doSubmitAction}.
 	 * <p>Subclasses can override this to provide custom submission handling
 	 * that just depends on the command object.
 	 * @param command form object with request parameters bound onto it
@@ -546,7 +546,7 @@ public class SimpleFormController extends AbstractFormController {
 
 	/**
 	 * Template method for submit actions. Called by the default implementation
-	 * of the simplest <code>onSubmitAction</code> version.
+	 * of the simplest {@code onSubmitAction} version.
 	 * <p><b>This is the preferred submit callback to implement if you want to
 	 * perform an action (like storing changes to the database) and then render
 	 * the success view with the command and Errors instance as model.</b>
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
index da4991220e..3fa889d8b4 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
@@ -174,11 +174,11 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 	}
 
 	/**
-	 * Cache content produced by <code>@SessionAttributes</code> annotated handlers
+	 * Cache content produced by {@code @SessionAttributes} annotated handlers
 	 * for the given number of seconds. Default is 0, preventing caching completely.
 	 * <p>In contrast to the "cacheSeconds" property which will apply to all general
-	 * handlers (but not to <code>@SessionAttributes</code> annotated handlers), this
-	 * setting will apply to <code>@SessionAttributes</code> annotated handlers only.
+	 * handlers (but not to {@code @SessionAttributes} annotated handlers), this
+	 * setting will apply to {@code @SessionAttributes} annotated handlers only.
 	 * @see #setCacheSeconds
 	 * @see org.springframework.web.bind.annotation.SessionAttributes
 	 */
@@ -195,7 +195,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 	 * exposed by HttpSessionMutexListener.
 	 * <p>The session mutex is guaranteed to be the same object during
 	 * the entire lifetime of the session, available under the key defined
-	 * by the <code>SESSION_MUTEX_ATTRIBUTE</code> constant. It serves as a
+	 * by the {@code SESSION_MUTEX_ATTRIBUTE} constant. It serves as a
 	 * safe reference to synchronize on for locking on the current session.
 	 * <p>In many cases, the PortletSession reference itself is a safe mutex
 	 * as well, since it will always be the same object reference for the
@@ -256,7 +256,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 
 	/**
 	 * Specify the order value for this HandlerAdapter bean.
-	 * <p>Default value is <code>Integer.MAX_VALUE</code>, meaning that it's non-ordered.
+	 * <p>Default value is {@code Integer.MAX_VALUE}, meaning that it's non-ordered.
 	 * @see org.springframework.core.Ordered#getOrder()
 	 */
 	public void setOrder(int order) {
@@ -413,7 +413,7 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 	 * <p>The default implementation creates a standard PortletRequestDataBinder.
 	 * This can be overridden for custom PortletRequestDataBinder subclasses.
 	 * @param request current portlet request
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @param objectName the objectName of the target object
 	 * @return the PortletRequestDataBinder instance to use
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
index 0f763828c3..37125cde89 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
@@ -131,7 +131,7 @@ public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExc
 	 * Finds the handler method that matches the thrown exception best.
 	 * @param handler the handler object
 	 * @param thrownException the exception to be handled
-	 * @return the best matching method; or <code>null</code> if none is found
+	 * @return the best matching method; or {@code null} if none is found
 	 */
 	private Method findBestExceptionHandlerMethod(Object handler, final Exception thrownException) {
 		final Class<?> handlerType = handler.getClass();
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
index d1dc0c2663..1d0d32d3f2 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
@@ -93,7 +93,7 @@ import org.springframework.web.portlet.handler.PortletRequestMethodNotSupportedE
 public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapping<PortletMode> {
 
 	/**
-	 * Calls the <code>registerHandlers</code> method in addition
+	 * Calls the {@code registerHandlers} method in addition
 	 * to the superclass's initialization.
 	 * @see #detectHandlers
 	 */
@@ -140,8 +140,8 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
 	 * @param handlerType the handler type to introspect
 	 * @param beanName the name of the bean introspected
 	 * @param typeMapping the type level mapping (if any)
-	 * @return <code>true</code> if at least 1 handler method has been registered;
-	 * <code>false</code> otherwise
+	 * @return {@code true} if at least 1 handler method has been registered;
+	 * {@code false} otherwise
 	 */
 	protected boolean detectHandlerMethods(Class<?> handlerType, final String beanName, final RequestMapping typeMapping) {
 		final Set<Boolean> handlersRegistered = new HashSet<Boolean>(1);
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/package-info.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/package-info.java
index e4fa02fd20..17938bf83c 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/package-info.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/package-info.java
@@ -1,4 +1,3 @@
-
 /**
  *
  * <p>
@@ -8,9 +7,9 @@
  * </p>
  *
  * <p>
- *     A <code>Controller</code> - as defined in this package - is analogous to a Struts
- *     <code>Action</code>. Usually <code>Controllers</code> are JavaBeans
- *     to allow easy configuration. Controllers define the <code>C</code> from so-called
+ *     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.portlet.ModelAndView ModelAndView} to achieve interactive
  *     applications. The view might be represented by a HTML interface, but, because of
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
index 34ef4b64ca..6195038690 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
@@ -69,8 +69,8 @@ public abstract class PortletUtils {
 	 * <p>Prepends a slash if the path does not already start with a slash,
 	 * and throws a {@link java.io.FileNotFoundException} if the path cannot
 	 * be resolved to a resource (in contrast to
-	 * {@link javax.portlet.PortletContext#getRealPath PortletContext's <code>getRealPath</code>},
-	 * which simply returns <code>null</code>).
+	 * {@link javax.portlet.PortletContext#getRealPath PortletContext's {@code getRealPath}},
+	 * which simply returns {@code null}).
 	 * @param portletContext the portlet context of the web application
 	 * @param path the relative path within the web application
 	 * @return the corresponding real path
@@ -96,11 +96,11 @@ public abstract class PortletUtils {
 	/**
 	 * Check the given request for a session attribute of the given name under the
 	 * {@link javax.portlet.PortletSession#PORTLET_SCOPE}.
-	 * Returns <code>null</code> if there is no session or if the session has no such attribute in that scope.
+	 * Returns {@code null} if there is no session or if the session has no such attribute in that scope.
 	 * Does not create a new session if none has existed before!
 	 * @param request current portlet request
 	 * @param name the name of the session attribute
-	 * @return the value of the session attribute, or <code>null</code> if not found
+	 * @return the value of the session attribute, or {@code null} if not found
 	 */
 	public static Object getSessionAttribute(PortletRequest request, String name) {
 		return getSessionAttribute(request, name, PortletSession.PORTLET_SCOPE);
@@ -108,12 +108,12 @@ public abstract class PortletUtils {
 
 	/**
 	 * Check the given request for a session attribute of the given name in the given scope.
-	 * Returns <code>null</code> if there is no session or if the session has no such attribute in that scope.
+	 * Returns {@code null} if there is no session or if the session has no such attribute in that scope.
 	 * Does not create a new session if none has existed before!
 	 * @param request current portlet request
 	 * @param name the name of the session attribute
 	 * @param scope session scope of this attribute
-	 * @return the value of the session attribute, or <code>null</code> if not found
+	 * @return the value of the session attribute, or {@code null} if not found
 	 */
 	public static Object getSessionAttribute(PortletRequest request, String name, int scope) {
 		Assert.notNull(request, "Request must not be null");
@@ -160,7 +160,7 @@ public abstract class PortletUtils {
 
 	/**
 	 * Set the session attribute with the given name to the given value under the {@link javax.portlet.PortletSession#PORTLET_SCOPE}.
-	 * Removes the session attribute if value is <code>null</code>, if a session existed at all.
+	 * Removes the session attribute if value is {@code null}, if a session existed at all.
 	 * Does not create a new session if not necessary!
 	 * @param request current portlet request
 	 * @param name the name of the session attribute
@@ -172,7 +172,7 @@ public abstract class PortletUtils {
 
 	/**
 	 * Set the session attribute with the given name to the given value in the given scope.
-	 * Removes the session attribute if value is <code>null</code>, if a session existed at all.
+	 * Removes the session attribute if value is {@code null}, if a session existed at all.
 	 * Does not create a new session if not necessary!
 	 * @param request current portlet request
 	 * @param name the name of the session attribute
@@ -252,7 +252,7 @@ public abstract class PortletUtils {
 	 * <p>Returns the session mutex attribute if available; usually,
 	 * this means that the
 	 * {@link org.springframework.web.util.HttpSessionMutexListener}
-	 * needs to be defined in <code>web.xml</code>. Falls back to the
+	 * needs to be defined in {@code web.xml}. Falls back to the
 	 * {@link javax.portlet.PortletSession} itself if no mutex attribute found.
 	 * <p>The session mutex is guaranteed to be the same object during
 	 * the entire lifetime of the session, available under the key defined
@@ -265,7 +265,7 @@ public abstract class PortletUtils {
 	 * not guaranteed across different servlet containers; the only 100% safe
 	 * way is a session mutex.
 	 * @param session the HttpSession to find a mutex for
-	 * @return the mutex object (never <code>null</code>)
+	 * @return the mutex object (never {@code null})
 	 * @see org.springframework.web.util.WebUtils#SESSION_MUTEX_ATTRIBUTE
 	 * @see org.springframework.web.util.HttpSessionMutexListener
 	 */
@@ -284,7 +284,7 @@ public abstract class PortletUtils {
 	 * unwrapping the given request as far as necessary.
 	 * @param request the portlet request to introspect
 	 * @param requiredType the desired type of request object
-	 * @return the matching request object, or <code>null</code> if none
+	 * @return the matching request object, or {@code null} if none
 	 * of that type is available
 	 */
 	@SuppressWarnings("unchecked")
@@ -305,7 +305,7 @@ public abstract class PortletUtils {
 	 * unwrapping the given response as far as necessary.
 	 * @param response the portlet response to introspect
 	 * @param requiredType the desired type of response object
-	 * @return the matching response object, or <code>null</code> if none
+	 * @return the matching response object, or {@code null} if none
 	 * of that type is available
 	 */
 	@SuppressWarnings("unchecked")
@@ -340,7 +340,7 @@ public abstract class PortletUtils {
 	 * cookies can have the same name but different paths or domains.
 	 * @param request current portlet request
 	 * @param name cookie name
-	 * @return the first cookie with the given name, or <code>null</code> if none is found
+	 * @return the first cookie with the given name, or {@code null} if none is found
 	 */
 	public static Cookie getCookie(PortletRequest request, String name) {
 		Assert.notNull(request, "Request must not be null");
@@ -402,7 +402,7 @@ public abstract class PortletUtils {
 	 * but more flexible.
 	 * @param request portlet request in which to look for parameters
 	 * @param prefix the beginning of parameter names
-	 * (if this is <code>null</code> or the empty string, all parameters will match)
+	 * (if this is {@code null} or the empty string, all parameters will match)
 	 * @return map containing request parameters <b>without the prefix</b>,
 	 * containing either a String or a String array as values
 	 * @see javax.portlet.PortletRequest#getParameterNames
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
index 66fca5df2f..784e160483 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
@@ -39,7 +39,7 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 
 	/**
 	 * Create a DelegatingServletOutputStream for the given target stream.
-	 * @param targetStream the target stream (never <code>null</code>)
+	 * @param targetStream the target stream (never {@code null})
 	 */
 	public DelegatingServletOutputStream(OutputStream targetStream) {
 		Assert.notNull(targetStream, "Target OutputStream must not be null");
@@ -47,7 +47,7 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 	}
 
 	/**
-	 * Return the underlying target stream (never <code>null</code>).
+	 * Return the underlying target stream (never {@code null}).
 	 */
 	public final OutputStream getTargetStream() {
 		return this.targetStream;
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
index afe74ad8f0..a6381e92ba 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
@@ -81,7 +81,7 @@ class HeaderValueHolder {
 	 * @param headers the Map of header names to HeaderValueHolders
 	 * @param name the name of the desired header
 	 * @return the corresponding HeaderValueHolder,
-	 * or <code>null</code> if none found
+	 * or {@code null} if none found
 	 */
 	public static HeaderValueHolder getByName(Map<String, HeaderValueHolder> headers, String name) {
 		Assert.notNull(name, "Header name must not be null");
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
index 88f3dbab08..c86e95a93a 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -108,7 +108,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	/**
 	 * Set whether {@link #getOutputStream()} access is allowed.
-	 * <p>Default is <code>true</code>.
+	 * <p>Default is {@code true}.
 	 */
 	public void setOutputStreamAccessAllowed(boolean outputStreamAccessAllowed) {
 		this.outputStreamAccessAllowed = outputStreamAccessAllowed;
@@ -123,7 +123,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 
 	/**
 	 * Set whether {@link #getWriter()} access is allowed.
-	 * <p>Default is <code>true</code>.
+	 * <p>Default is {@code true}.
 	 */
 	public void setWriterAccessAllowed(boolean writerAccessAllowed) {
 		this.writerAccessAllowed = writerAccessAllowed;
@@ -297,7 +297,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	/**
 	 * Return the names of all specified headers as a Set of Strings.
 	 * <p>As of Servlet 3.0, this method is also defined HttpServletResponse.
-	 * @return the <code>Set</code> of header name <code>Strings</code>, or an empty <code>Set</code> if none
+	 * @return the {@code Set} of header name {@code Strings}, or an empty {@code Set} if none
 	 */
 	public Set<String> getHeaderNames() {
 		return this.headers.keySet();
@@ -310,7 +310,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * As of Spring 3.1, it returns a stringified value for Servlet 3.0 compatibility.
 	 * Consider using {@link #getHeaderValue(String)} for raw Object access.
 	 * @param name the name of the header
-	 * @return the associated header value, or <code>null<code> if none
+	 * @return the associated header value, or {@code null} if none
 	 */
 	public String getHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
@@ -339,7 +339,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * Return the primary value for the given header, if any.
 	 * <p>Will return the first value in case of multiple values.
 	 * @param name the name of the header
-	 * @return the associated header value, or <code>null<code> if none
+	 * @return the associated header value, or {@code null} if none
 	 */
 	public Object getHeaderValue(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
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 71ff5bbf17..f01f25dd1a 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
@@ -72,7 +72,7 @@ import org.springframework.web.context.ServletContextAware;
  * <p>The TilesConfigurer simply configures a TilesContainer using a set of files
  * containing definitions, to be accessed by {@link TilesView} instances. This is a
  * Spring-based alternative (for usage in Spring configuration) to the Tiles-provided
- * {@link org.apache.tiles.web.startup.TilesListener} (for usage in <code>web.xml</code>).
+ * {@link org.apache.tiles.web.startup.TilesListener} (for usage in {@code web.xml}).
  *
  * <p>TilesViews can be managed by any {@link org.springframework.web.servlet.ViewResolver}.
  * For simple convention-based view resolution, consider using {@link TilesViewResolver}.
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 f090bfd365..6483616edb 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
@@ -112,12 +112,12 @@ import org.springframework.web.util.WebUtils;
  * 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</code> annotation will only be processed if a corresponding
- * <code>HandlerMapping</code> (for type level annotations) and/or <code>HandlerAdapter</code> (for method level
+ * <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</code> or <code>HandlerAdapters</code>, then you need to make sure that a corresponding custom
- * <code>DefaultAnnotationHandlerMapping</code> and/or <code>AnnotationMethodHandlerAdapter</code> is defined as well -
- * provided that you intend to use <code>@RequestMapping</code>.
+ * {@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
@@ -715,7 +715,7 @@ public class DispatcherServlet extends FrameworkServlet {
 	}
 
 	/**
-	 * Return this servlet's ThemeSource, if any; else return <code>null</code>.
+	 * Return this servlet's ThemeSource, if any; else return {@code null}.
 	 * <p>Default is to return the WebApplicationContext as ThemeSource,
 	 * provided that it implements the ThemeSource interface.
 	 * @return the ThemeSource, if any
@@ -732,7 +732,7 @@ public class DispatcherServlet extends FrameworkServlet {
 
 	/**
 	 * Obtain this servlet's MultipartResolver, if any.
-	 * @return the MultipartResolver used by this servlet, or <code>null</code> if none
+	 * @return the MultipartResolver used by this servlet, or {@code null} if none
 	 * (indicating that no multipart support is available)
 	 */
 	public final MultipartResolver getMultipartResolver() {
@@ -1067,7 +1067,7 @@ public class DispatcherServlet extends FrameworkServlet {
 	 * Return the HandlerExecutionChain for this request. Try all handler mappings in order.
 	 * @param request current HTTP request
 	 * @param cache whether to cache the HandlerExecutionChain in a request attribute
-	 * @return the HandlerExecutionChain, or <code>null</code> if no handler could be found
+	 * @return the HandlerExecutionChain, or {@code null} if no handler could be found
 	 * @deprecated as of Spring 3.0.4, in favor of {@link #getHandler(javax.servlet.http.HttpServletRequest)},
 	 * with this method's cache attribute now effectively getting ignored
 	 */
@@ -1080,7 +1080,7 @@ public class DispatcherServlet extends FrameworkServlet {
 	 * Return the HandlerExecutionChain for this request.
 	 * <p>Tries all handler mappings in order.
 	 * @param request current HTTP request
-	 * @return the HandlerExecutionChain, or <code>null</code> if no handler could be found
+	 * @return the HandlerExecutionChain, or {@code null} if no handler could be found
 	 */
 	protected HandlerExecutionChain getHandler(HttpServletRequest request) throws Exception {
 		for (HandlerMapping hm : this.handlerMappings) {
@@ -1133,7 +1133,7 @@ public class DispatcherServlet extends FrameworkServlet {
 	 * Determine an error ModelAndView via the registered HandlerExceptionResolvers.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @param handler the executed handler, or <code>null</code> if none chosen at the time of the exception
+	 * @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
@@ -1211,7 +1211,7 @@ public class DispatcherServlet extends FrameworkServlet {
 	/**
 	 * Translate the supplied request into a default view name.
 	 * @param request current HTTP servlet request
-	 * @return the view name (or <code>null</code> if no default found)
+	 * @return the view name (or {@code null} if no default found)
 	 * @throws Exception if view name translation failed
 	 */
 	protected String getDefaultViewName(HttpServletRequest request) throws Exception {
@@ -1227,7 +1227,7 @@ public class DispatcherServlet extends FrameworkServlet {
 	 * @param model the model to be passed to the view
 	 * @param locale the current locale
 	 * @param request current HTTP servlet request
-	 * @return the View object, or <code>null</code> if none found
+	 * @return the View object, or {@code null} if none found
 	 * @throws Exception if the view cannot be resolved
 	 * (typically in case of problems creating an actual View object)
 	 * @see ViewResolver#resolveViewName
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 1866e7ca11..ca2a919043 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
@@ -538,13 +538,13 @@ public abstract class FrameworkServlet extends HttpServletBean {
 	}
 
 	/**
-	 * Retrieve a <code>WebApplicationContext</code> from the <code>ServletContext</code>
+	 * Retrieve a {@code WebApplicationContext} from the {@code ServletContext}
 	 * attribute with the {@link #setContextAttribute configured name}. The
-	 * <code>WebApplicationContext</code> must have already been loaded and stored in the
-	 * <code>ServletContext</code> before this servlet gets initialized (or invoked).
+	 * {@code WebApplicationContext} must have already been loaded and stored in the
+	 * {@code ServletContext} before this servlet gets initialized (or invoked).
 	 * <p>Subclasses may override this method to provide a different
-	 * <code>WebApplicationContext</code> retrieval strategy.
-	 * @return the WebApplicationContext for this servlet, or <code>null</code> if not found
+	 * {@code WebApplicationContext} retrieval strategy.
+	 * @return the WebApplicationContext for this servlet, or {@code null} if not found
 	 * @see #getContextAttribute()
 	 */
 	protected WebApplicationContext findWebApplicationContext() {
@@ -571,7 +571,7 @@ public abstract class FrameworkServlet extends HttpServletBean {
 	 * created context (for triggering its {@link #onRefresh callback}, and to call
 	 * {@link org.springframework.context.ConfigurableApplicationContext#refresh()}
 	 * before returning the context instance.
-	 * @param parent the parent ApplicationContext to use, or <code>null</code> if none
+	 * @param parent the parent ApplicationContext to use, or {@code null} if none
 	 * @return the WebApplicationContext for this servlet
 	 * @see org.springframework.web.context.support.XmlWebApplicationContext
 	 */
@@ -652,7 +652,7 @@ public abstract class FrameworkServlet extends HttpServletBean {
 	 * {@link org.springframework.web.context.support.XmlWebApplicationContext}
 	 * or a {@link #setContextClass custom context class}, if set.
 	 * Delegates to #createWebApplicationContext(ApplicationContext).
-	 * @param parent the parent WebApplicationContext to use, or <code>null</code> if none
+	 * @param parent the parent WebApplicationContext to use, or {@code null} if none
 	 * @return the WebApplicationContext for this servlet
 	 * @see org.springframework.web.context.support.XmlWebApplicationContext
 	 * @see #createWebApplicationContext(ApplicationContext)
@@ -701,7 +701,7 @@ public abstract class FrameworkServlet extends HttpServletBean {
 	/**
 	 * Post-process the given WebApplicationContext before it is refreshed
 	 * and activated as context for this servlet.
-	 * <p>The default implementation is empty. <code>refresh()</code> will
+	 * <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
@@ -718,7 +718,7 @@ public abstract class FrameworkServlet extends HttpServletBean {
 	/**
 	 * Return the ServletContext attribute name for this servlet's WebApplicationContext.
 	 * <p>The default implementation returns
-	 * <code>SERVLET_CONTEXT_PREFIX + servlet name</code>.
+	 * {@code SERVLET_CONTEXT_PREFIX + servlet name}.
 	 * @see #SERVLET_CONTEXT_PREFIX
 	 * @see #getServletName
 	 */
@@ -799,8 +799,8 @@ public abstract class FrameworkServlet extends HttpServletBean {
 
 	/**
 	 * Delegate GET requests to processRequest/doService.
-	 * <p>Will also be invoked by HttpServlet's default implementation of <code>doHead</code>,
-	 * with a <code>NoBodyResponse</code> that just captures the content length.
+	 * <p>Will also be invoked by HttpServlet's default implementation of {@code doHead},
+	 * with a {@code NoBodyResponse} that just captures the content length.
 	 * @see #doService
 	 * @see #doHead
 	 */
@@ -1010,7 +1010,7 @@ public abstract class FrameworkServlet extends HttpServletBean {
 	 * <p>The default implementation takes the name of the UserPrincipal, if any.
 	 * Can be overridden in subclasses.
 	 * @param request current HTTP request
-	 * @return the username, or <code>null</code> if none found
+	 * @return the username, or {@code null} if none found
 	 * @see javax.servlet.http.HttpServletRequest#getUserPrincipal()
 	 */
 	protected String getUsernameForRequest(HttpServletRequest request) {
@@ -1022,7 +1022,7 @@ public abstract class FrameworkServlet extends HttpServletBean {
 	 * Subclasses must implement this method to do the work of request handling,
 	 * receiving a centralized callback for GET, POST, PUT and DELETE.
 	 * <p>The contract is essentially the same as that for the commonly overridden
-	 * <code>doGet</code> or <code>doPost</code> methods of HttpServlet.
+	 * {@code doGet} or {@code doPost} methods of HttpServlet.
 	 * <p>This class intercepts calls to ensure that exception handling and
 	 * event publication takes place.
 	 * @param request current HTTP request
@@ -1050,7 +1050,7 @@ public abstract class FrameworkServlet extends HttpServletBean {
 
 	/**
 	 * ApplicationListener endpoint that receives events from this servlet's WebApplicationContext
-	 * only, delegating to <code>onApplicationEvent</code> on the FrameworkServlet instance.
+	 * only, delegating to {@code onApplicationEvent} on the FrameworkServlet instance.
 	 */
 	private class ContextRefreshListener implements ApplicationListener<ContextRefreshedEvent> {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
index 27d392e7cd..056fa247bc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
  * extensible. The DispatcherServlet accesses all installed handlers through this
  * interface, meaning that it does not contain code specific to any handler type.
  *
- * <p>Note that a handler can be of type <code>Object</code>. This is to enable
+ * <p>Note that a handler can be of type {@code Object}. This is to enable
  * handlers from other frameworks to be integrated with this framework without
  * custom coding, as well as to allow for annotation handler objects that do
  * not obey any specific Java interface.
@@ -52,9 +52,9 @@ public interface HandlerAdapter {
 	 * support it. Typical HandlerAdapters will base the decision on the handler
 	 * type. HandlerAdapters will usually only support one handler type each.
 	 * <p>A typical implementation:
-	 * <p><code>
+	 * <p>{@code
 	 * return (handler instanceof MyHandler);
-	 * </code>
+	 * }
 	 * @param handler handler object to check
 	 * @return whether or not this object can use the given handler
 	 */
@@ -66,16 +66,16 @@ public interface HandlerAdapter {
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @param handler handler to use. This object must have previously been passed
-	 * to the <code>supports</code> method of this interface, which must have
-	 * returned <code>true</code>.
+	 * to the {@code supports} method of this interface, which must have
+	 * returned {@code true}.
 	 * @throws Exception in case of errors
 	 * @return ModelAndView object with the name of the view and the required
-	 * model data, or <code>null</code> if the request has been handled directly
+	 * model data, or {@code null} if the request has been handled directly
 	 */
 	ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception;
 
 	/**
-	 * Same contract as for HttpServlet's <code>getLastModified</code> method.
+	 * Same contract as for HttpServlet's {@code getLastModified} method.
 	 * Can simply return -1 if there's no support in the handler class.
 	 * @param request current HTTP request
 	 * @param handler handler to use
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java
index dbdefe26f7..f200ccb119 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java
@@ -41,11 +41,11 @@ public interface HandlerExceptionResolver {
 	 * should be rendered, for instance by setting a status code.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @param handler the executed handler, or <code>null</code> if none chosen at the
+	 * @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</code> for default processing
+	 * or {@code null} for default processing
 	 */
 	ModelAndView resolveException(
 			HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex);
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 b1b3134bef..dbbe8946ba 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
@@ -108,7 +108,7 @@ public class HandlerExecutionChain {
 
 	/**
 	 * Return the array of interceptors to apply (in the given order).
-	 * @return the array of HandlerInterceptors instances (may be <code>null</code>)
+	 * @return the array of HandlerInterceptors instances (may be {@code null})
 	 */
 	public HandlerInterceptor[] getInterceptors() {
 		if (this.interceptors == null && this.interceptorList != null) {
@@ -119,7 +119,7 @@ public class HandlerExecutionChain {
 
 	/**
 	 * Apply preHandle methods of registered interceptors.
-	 * @return <code>true</code> if the execution chain should proceed with the
+	 * @return {@code true} if the execution chain should proceed with the
 	 * next interceptor or the handler itself. Else, DispatcherServlet assumes
 	 * that this interceptor has already dealt with the response itself.
 	 */
@@ -193,7 +193,7 @@ public class HandlerExecutionChain {
 	}
 
 	/**
-	 * Delegates to the handler's <code>toString()</code>.
+	 * Delegates to the handler's {@code toString()}.
 	 */
 	@Override
 	public String 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 ebaafd9211..0b59d5f6d3 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
@@ -84,7 +84,7 @@ public interface HandlerInterceptor {
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @param handler chosen handler to execute, for type and/or instance evaluation
-	 * @return <code>true</code> if the execution chain should proceed with the
+	 * @return {@code true} if the execution chain should proceed with the
 	 * next interceptor or the handler itself. Else, DispatcherServlet assumes
 	 * that this interceptor has already dealt with the response itself.
 	 * @throws Exception in case of errors
@@ -104,8 +104,8 @@ public interface HandlerInterceptor {
 	 * @param response current HTTP response
 	 * @param handler handler (or {@link HandlerMethod}) that started async
 	 * execution, for type and/or instance examination
-	 * @param modelAndView the <code>ModelAndView</code> that the handler returned
-	 * (can also be <code>null</code>)
+	 * @param modelAndView the {@code ModelAndView} that the handler returned
+	 * (can also be {@code null})
 	 * @throws Exception in case of errors
 	 */
 	void postHandle(
@@ -116,8 +116,8 @@ public interface HandlerInterceptor {
 	 * Callback after completion of request processing, that is, after rendering
 	 * the view. Will be called on any outcome of handler execution, thus allows
 	 * for proper resource cleanup.
-	 * <p>Note: Will only be called if this interceptor's <code>preHandle</code>
-	 * method has successfully completed and returned <code>true</code>!
+	 * <p>Note: Will only be called if this interceptor's {@code preHandle}
+	 * method has successfully completed and returned {@code true}!
 	 * <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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
index 684f54a71a..daf05bcf7e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
@@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletRequest;
  * have to. A handler will always be wrapped in a {@link HandlerExecutionChain}
  * instance, optionally accompanied by some {@link HandlerInterceptor} instances.
  * The DispatcherServlet will first call each HandlerInterceptor's
- * <code>preHandle</code> method in the given order, finally invoking the handler
- * itself if all <code>preHandle</code> methods have returned <code>true</code>.
+ * {@code preHandle} method in the given order, finally invoking the handler
+ * itself if all {@code preHandle} methods have returned {@code true}.
  *
  * <p>The ability to parameterize this mapping is a powerful and unusual
  * capability of this MVC framework. For example, it is possible to write
@@ -118,12 +118,12 @@ public interface HandlerMapping {
 	 * even a tag interface, so that handlers are not constrained in any way.
 	 * For example, a HandlerAdapter could be written to allow another framework's
 	 * handler objects to be used.
-	 * <p>Returns <code>null</code> if no match was found. This is not an error.
+	 * <p>Returns {@code null} if no match was found. This is not an error.
 	 * The DispatcherServlet will query all registered HandlerMapping beans to find
 	 * a match, and only decide there is an error if none can find a handler.
 	 * @param request current HTTP request
 	 * @return a HandlerExecutionChain instance containing handler object and
-	 * any interceptors, or <code>null</code> if no mapping found
+	 * any interceptors, or {@code null} if no mapping found
 	 * @throws Exception if there is an internal error
 	 */
 	HandlerExecutionChain getHandler(HttpServletRequest request) throws Exception;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
index 5d86f05988..eadec87022 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
@@ -49,8 +49,8 @@ import org.springframework.web.context.support.ServletContextResourceLoader;
 
 /**
  * Simple extension of {@link javax.servlet.http.HttpServlet} which treats
- * its config parameters (<code>init-param</code> entries within the
- * <code>servlet</code> tag in <code>web.xml</code>) as bean properties.
+ * its config parameters ({@code init-param} entries within the
+ * {@code servlet} tag in {@code web.xml}) as bean properties.
  *
  * <p>A handy superclass for any type of servlet. Type conversion of config
  * parameters is automatic, with the corresponding setter method getting
@@ -59,7 +59,7 @@ import org.springframework.web.context.support.ServletContextResourceLoader;
  * setter will simply be ignored.
  *
  * <p>This servlet leaves request handling to subclasses, inheriting the default
- * behavior of HttpServlet (<code>doGet</code>, <code>doPost</code>, etc).
+ * behavior of HttpServlet ({@code doGet}, {@code doPost}, etc).
  *
  * <p>This generic servlet base class has no dependency on the Spring
  * {@link org.springframework.context.ApplicationContext} concept. Simple
@@ -155,7 +155,7 @@ public abstract class HttpServletBean extends HttpServlet
 
 
 	/**
-	 * Overridden method that simply returns <code>null</code> when no
+	 * Overridden method that simply returns {@code null} when no
 	 * ServletConfig set yet.
 	 * @see #getServletConfig()
 	 */
@@ -165,7 +165,7 @@ public abstract class HttpServletBean extends HttpServlet
 	}
 
 	/**
-	 * Overridden method that simply returns <code>null</code> when no
+	 * Overridden method that simply returns {@code null} when no
 	 * ServletConfig set yet.
 	 * @see #getServletConfig()
 	 */
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 7a953e6e88..bed0733813 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
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletResponse;
  * cookies, etc. The default implementation is AcceptHeaderLocaleResolver,
  * simply using the request's locale provided by the respective HTTP header.
  *
- * <p>Use <code>RequestContext.getLocale()</code> to retrieve the current locale
+ * <p>Use {@code RequestContext.getLocale()} to retrieve the current locale
  * in controllers or views, independent of the actual resolution strategy.
  *
  * @author Juergen Hoeller
@@ -44,7 +44,7 @@ public interface LocaleResolver {
    * Resolve the current locale via the given request.
    * Should 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</code>)
+   * @return the current locale (never {@code null})
    */
 	Locale resolveLocale(HttpServletRequest request);
 
@@ -52,9 +52,9 @@ public interface LocaleResolver {
    * Set the current locale to the given one.
    * @param request the request to be used for locale modification
    * @param response the response to be used for locale modification
-   * @param locale the new locale, or <code>null</code> to clear the locale
-	 * @throws UnsupportedOperationException if the LocaleResolver implementation
-	 * does not support dynamic changing of the theme
+   * @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
    */
 	void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale);
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
index e044b4bc21..b07d4d5082 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
@@ -64,7 +64,7 @@ public class ModelAndView {
 
 	/**
 	 * Convenient constructor when there is no model data to expose.
-	 * Can also be used in conjunction with <code>addObject</code>.
+	 * Can also be used in conjunction with {@code addObject}.
 	 * @param viewName name of the View to render, to be resolved
 	 * by the DispatcherServlet's ViewResolver
 	 * @see #addObject
@@ -75,7 +75,7 @@ public class ModelAndView {
 
 	/**
 	 * Convenient constructor when there is no model data to expose.
-	 * Can also be used in conjunction with <code>addObject</code>.
+	 * Can also be used in conjunction with {@code addObject}.
 	 * @param view View object to render
 	 * @see #addObject
 	 */
@@ -88,8 +88,8 @@ public class ModelAndView {
 	 * @param viewName name of the View to render, to be resolved
 	 * by the DispatcherServlet's ViewResolver
 	 * @param model Map of model names (Strings) to model objects
-	 * (Objects). Model entries may not be <code>null</code>, but the
-	 * model Map may be <code>null</code> if there is no model data.
+	 * (Objects). Model entries may not be {@code null}, but the
+	 * model Map may be {@code null} if there is no model data.
 	 */
 	public ModelAndView(String viewName, Map<String, ?> model) {
 		this.view = viewName;
@@ -105,8 +105,8 @@ public class ModelAndView {
 	 * Map after supplying it to this class</emphasis>
 	 * @param view View object to render
 	 * @param model Map of model names (Strings) to model objects
-	 * (Objects). Model entries may not be <code>null</code>, but the
-	 * model Map may be <code>null</code> if there is no model data.
+	 * (Objects). Model entries may not be {@code null}, but the
+	 * model Map may be {@code null} if there is no model data.
 	 */
 	public ModelAndView(View view, Map<String, ?> model) {
 		this.view = view;
@@ -150,7 +150,7 @@ public class ModelAndView {
 
 	/**
 	 * Return the view name to be resolved by the DispatcherServlet
-	 * via a ViewResolver, or <code>null</code> if we are using a View object.
+	 * via a ViewResolver, or {@code null} if we are using a View object.
 	 */
 	public String getViewName() {
 		return (this.view instanceof String ? (String) this.view : null);
@@ -165,7 +165,7 @@ public class ModelAndView {
 	}
 
 	/**
-	 * Return the View object, or <code>null</code> if we are using a view name
+	 * Return the View object, or {@code null} if we are using a view name
 	 * to be resolved by the DispatcherServlet via a ViewResolver.
 	 */
 	public View getView() {
@@ -173,7 +173,7 @@ public class ModelAndView {
 	}
 
 	/**
-	 * Indicate whether or not this <code>ModelAndView</code> has a view, either
+	 * Indicate whether or not this {@code ModelAndView} has a view, either
 	 * as a view name or as a direct {@link View} instance.
 	 */
 	public boolean hasView() {
@@ -181,7 +181,7 @@ public class ModelAndView {
 	}
 
 	/**
-	 * Return whether we use a view reference, i.e. <code>true</code>
+	 * Return whether we use a view reference, i.e. {@code true}
 	 * if the view has been specified via a name to be resolved by the
 	 * DispatcherServlet via a ViewResolver.
 	 */
@@ -190,7 +190,7 @@ public class ModelAndView {
 	}
 
 	/**
-	 * Return the model map. May return <code>null</code>.
+	 * Return the model map. May return {@code null}.
 	 * Called by DispatcherServlet for evaluation of the model.
 	 */
 	protected Map<String, Object> getModelInternal() {
@@ -198,7 +198,7 @@ public class ModelAndView {
 	}
 
 	/**
-	 * Return the underlying <code>ModelMap</code> instance (never <code>null</code>).
+	 * Return the underlying {@code ModelMap} instance (never {@code null}).
 	 */
 	public ModelMap getModelMap() {
 		if (this.model == null) {
@@ -208,7 +208,7 @@ public class ModelAndView {
 	}
 
 	/**
-	 * Return the model map. Never returns <code>null</code>.
+	 * Return the model map. Never returns {@code null}.
 	 * To be called by application code for modifying the model.
 	 */
 	public Map<String, Object> getModel() {
@@ -219,7 +219,7 @@ public class ModelAndView {
 	/**
 	 * Add an attribute to the model.
 	 * @param attributeName name of the object to add to the model
-	 * @param attributeValue object to add to the model (never <code>null</code>)
+	 * @param attributeValue object to add to the model (never {@code null})
 	 * @see ModelMap#addAttribute(String, Object)
 	 * @see #getModelMap()
 	 */
@@ -230,7 +230,7 @@ public class ModelAndView {
 
 	/**
 	 * Add an attribute to the model using parameter name generation.
-	 * @param attributeValue the object to add to the model (never <code>null</code>)
+	 * @param attributeValue the object to add to the model (never {@code null})
 	 * @see ModelMap#addAttribute(Object)
 	 * @see #getModelMap()
 	 */
@@ -255,7 +255,7 @@ public class ModelAndView {
 	 * Clear the state of this ModelAndView object.
 	 * The object will be empty afterwards.
 	 * <p>Can be used to suppress rendering of a given ModelAndView object
-	 * in the <code>postHandle</code> method of a HandlerInterceptor.
+	 * in the {@code postHandle} method of a HandlerInterceptor.
 	 * @see #isEmpty()
 	 * @see HandlerInterceptor#postHandle
 	 */
@@ -276,7 +276,7 @@ public class ModelAndView {
 	/**
 	 * Return whether this ModelAndView object is empty as a result of a call to {@link #clear}
 	 * i.e. whether it does not hold any view and does not contain a model.
-	 * <p>Returns <code>false</code> if any additional state was added to the instance
+	 * <p>Returns {@code false} if any additional state was added to the instance
 	 * <strong>after</strong> the call to {@link #clear}.
 	 * @see #clear()
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java
index dc53459961..d0a503ca37 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java
@@ -33,7 +33,7 @@ public interface RequestToViewNameTranslator {
 	 * Translate the given {@link HttpServletRequest} into a view name.
 	 * @param request the incoming {@link HttpServletRequest} providing
 	 * the context from which a view name is to be resolved
-	 * @return the view name (or <code>null</code> if no default found)
+	 * @return the view name (or {@code null} if no default found)
 	 * @throws Exception if view name translation fails
 	 */
 	String getViewName(HttpServletRequest request) throws Exception;
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 4251077f27..272edb45b0 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
@@ -42,27 +42,27 @@ import org.springframework.web.context.support.ServletContextResource;
  * of this servlet, and use the "JSP include" action to include this URL,
  * with the "resource" parameter indicating the actual target path in the WAR.
  *
- * <p>The <code>defaultUrl</code> property can be set to the internal
+ * <p>The {@code defaultUrl} property can be set to the internal
  * resource path of a default URL, to be rendered when the target resource
  * is not found or not specified in the first place.
  *
- * <p>The "resource" parameter and the <code>defaultUrl</code> property can
+ * <p>The "resource" parameter and the {@code defaultUrl} property can
  * also specify a list of target resources to combine. Those resources will be
  * included one by one to build the response. If last-modified determination
  * is active, the newest timestamp among those files will be used.
  *
- * <p>The <code>allowedResources</code> property can be set to a URL
+ * <p>The {@code allowedResources} property can be set to a URL
  * pattern of resources that should be available via this servlet.
  * If not set, any target resource can be requested, including resources
  * in the WEB-INF directory!
  *
  * <p>If using this servlet for direct access rather than via includes,
- * the <code>contentType</code> property should be specified to apply a
+ * the {@code contentType} property should be specified to apply a
  * proper content type. Note that a content type header in the target JSP will
  * be ignored when including the resource via a RequestDispatcher include.
  *
  * <p>To apply last-modified timestamps for the target resource, set the
- * <code>applyLastModified</code> property to true. This servlet will then
+ * {@code applyLastModified} property to true. This servlet will then
  * return the file timestamp of the target resource as last-modified value,
  * falling back to the startup time of this servlet if not retrievable.
  *
@@ -231,7 +231,7 @@ public class ResourceServlet extends HttpServletBean {
 	 * <p>Default implementation returns the value of the "resource" parameter.
 	 * Can be overridden in subclasses.
 	 * @param request current HTTP request
-	 * @return the URL of the target resource, or <code>null</code> if none found
+	 * @return the URL of the target resource, or {@code null} if none found
 	 * @see #RESOURCE_PARAM_NAME
 	 */
 	protected String determineResourceUrl(HttpServletRequest request) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
index 07c5a6e17e..16ea139bec 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/View.java
@@ -72,7 +72,7 @@ public interface View {
 	 * <p>Can be used to check the content type upfront,
 	 * before the actual rendering process.
 	 * @return the content type String (optionally including a character set),
-	 * or <code>null</code> if not predetermined.
+	 * or {@code null} if not predetermined.
 	 */
 	String getContentType();
 
@@ -83,7 +83,7 @@ public interface View {
 	 * The second step will be the actual rendering of the view,
 	 * for example including the JSP via a RequestDispatcher.
 	 * @param model Map with name Strings as keys and corresponding model
-	 * objects as values (Map can also be <code>null</code> in case of empty model)
+	 * objects as values (Map can also be {@code null} in case of empty model)
 	 * @param request current HTTP request
 	 * @param response HTTP response we are building
 	 * @throws Exception if rendering failed
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java
index 3fe25a7c7a..137f727aff 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java
@@ -76,7 +76,7 @@ public class ViewRendererServlet extends HttpServlet {
 	/**
 	 * Process this request, handling exceptions.
 	 * The actually event handling is performed by the abstract
-	 * <code>renderView()</code> template method.
+	 * {@code renderView()} template method.
 	 * @see #renderView
 	 */
 	protected final void processRequest(HttpServletRequest request, HttpServletResponse response)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java
index 12868f403e..8e2429af86 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java
@@ -38,14 +38,14 @@ public interface ViewResolver {
 	/**
 	 * Resolve the given view by name.
 	 * <p>Note: To allow for ViewResolver chaining, a ViewResolver should
-	 * return <code>null</code> if a view with the given name is not defined in it.
+	 * return {@code null} if a view with the given name is not defined in it.
 	 * However, this is not required: Some ViewResolvers will always attempt
-	 * to build View objects with the given name, unable to return <code>null</code>
+	 * to build View objects with the given name, unable to return {@code null}
 	 * (rather throwing an exception when View creation failed).
 	 * @param viewName name of the view to resolve
 	 * @param locale Locale in which to resolve the view.
 	 * ViewResolvers that support internationalization should respect this.
-	 * @return the View object, or <code>null</code> if not found
+	 * @return the View object, or {@code null} if not found
 	 * (optional, to allow for ViewResolver chaining)
 	 * @throws Exception if the view cannot be resolved
 	 * (typically in case of problems creating an actual View object)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java
index 041d0ead17..9cbc2c1489 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java
@@ -94,7 +94,7 @@ public abstract class AbstractDetectingUrlHandlerMapping extends AbstractUrlHand
 	 * Determine the URLs for the given handler bean.
 	 * @param beanName the name of the candidate bean
 	 * @return the URLs determined for the bean,
-	 * or <code>null</code> or an empty array if none
+	 * or {@code null} or an empty array if none
 	 */
 	protected abstract String[] determineUrlsForHandler(String beanName);
 
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 856d0b62db..a86ed1ddb7 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
@@ -145,7 +145,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
 	 * <p>The default implementation checks against the specified mapped handlers
 	 * and handler classes, if any.
 	 * @param request current HTTP request
-	 * @param handler the executed handler, or <code>null</code> if none chosen
+	 * @param handler the executed handler, or {@code null} if none chosen
 	 * at the time of the exception (for example, if multipart resolution failed)
 	 * @return whether this resolved should proceed with resolving the exception
 	 * for the given request and handler
@@ -213,7 +213,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
 
 	/**
 	 * Prevents the response from being cached, through setting corresponding
-	 * HTTP headers. See <code>http://www.mnot.net/cache_docs</code>.
+	 * HTTP headers. See {@code http://www.mnot.net/cache_docs}.
 	 * @param response current HTTP response
 	 */
 	protected void preventCaching(HttpServletResponse response) {
@@ -233,10 +233,10 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
 	 * with its actual exception handling.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @param handler the executed handler, or <code>null</code> if none chosen at the time
+	 * @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</code> for default processing
+	 * @return a corresponding ModelAndView to forward to, or {@code null} for default processing
 	 */
 	protected abstract ModelAndView doResolveException(HttpServletRequest request,
 			HttpServletResponse response, Object handler, Exception ex);
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 a0376ae06f..0e74e57384 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
@@ -75,7 +75,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 
 	/**
 	 * Specify the order value for this HandlerMapping bean.
-	 * <p>Default value is <code>Integer.MAX_VALUE</code>, meaning that it's non-ordered.
+	 * <p>Default value is {@code Integer.MAX_VALUE}, meaning that it's non-ordered.
 	 * @see org.springframework.core.Ordered#getOrder()
 	 */
 	public final void setOrder(int order) {
@@ -89,7 +89,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 	/**
 	 * Set the default handler for this handler mapping.
 	 * This handler will be returned if no specific mapping was found.
-	 * <p>Default is <code>null</code>, indicating no default handler.
+	 * <p>Default is {@code null}, indicating no default handler.
 	 */
 	public void setDefaultHandler(Object defaultHandler) {
 		this.defaultHandler = defaultHandler;
@@ -97,7 +97,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 
 	/**
 	 * Return the default handler for this handler mapping,
-	 * or <code>null</code> if none.
+	 * or {@code null} if none.
 	 */
 	public Object getDefaultHandler() {
 		return this.defaultHandler;
@@ -174,7 +174,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 	 * <p>Supported interceptor types are HandlerInterceptor, WebRequestInterceptor, and MappedInterceptor.
 	 * Mapped interceptors apply only to request URLs that match its path patterns.
 	 * Mapped interceptor beans are also detected by type during initialization.
-	 * @param interceptors array of handler interceptors, or <code>null</code> if none
+	 * @param interceptors array of handler interceptors, or {@code null} if none
 	 * @see #adaptInterceptor
 	 * @see org.springframework.web.servlet.HandlerInterceptor
 	 * @see org.springframework.web.context.request.WebRequestInterceptor
@@ -202,7 +202,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 	 * <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</code>),
+	 * @param interceptors the configured interceptor List (never {@code null}),
 	 * allowing to add further interceptors before as well as after the existing
 	 * interceptors
 	 */
@@ -270,7 +270,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 
 	/**
 	 * Return the adapted interceptors as HandlerInterceptor array.
-	 * @return the array of HandlerInterceptors, or <code>null</code> if none
+	 * @return the array of HandlerInterceptors, or {@code null} if none
 	 */
 	protected final HandlerInterceptor[] getAdaptedInterceptors() {
 		int count = adaptedInterceptors.size();
@@ -279,7 +279,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 
 	/**
 	 * Return all configured {@link MappedInterceptor}s as an array.
-	 * @return the array of {@link MappedInterceptor}s, or <code>null</code> if none
+	 * @return the array of {@link MappedInterceptor}s, or {@code null} if none
 	 */
 	protected final MappedInterceptor[] getMappedInterceptors() {
 		int count = mappedInterceptors.size();
@@ -310,14 +310,14 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 	}
 
 	/**
-	 * Look up a handler for the given request, returning <code>null</code> if no
+	 * Look up a handler for the given request, returning {@code null} if no
 	 * specific one is found. This method is called by {@link #getHandler};
-	 * a <code>null</code> return value will lead to the default handler, if one is set.
+	 * a {@code null} return value will lead to the default handler, if one is set.
 	 * <p>Note: This method may also return a pre-built {@link HandlerExecutionChain},
 	 * combining a handler object with dynamically determined interceptors.
 	 * Statically specified interceptors will get merged into such an existing chain.
 	 * @param request current HTTP request
-	 * @return the corresponding handler instance, or <code>null</code> if none found
+	 * @return the corresponding handler instance, or {@code null} if none found
 	 * @throws Exception if there is an internal error
 	 */
 	protected abstract Object getHandlerInternal(HttpServletRequest request) throws Exception;
@@ -331,11 +331,11 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 	 * <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</code>
+	 * <p>For simply adding an interceptor, consider calling {@code super.getHandlerExecutionChain}
 	 * and invoking {@link HandlerExecutionChain#addInterceptor} on the returned chain object.
-	 * @param handler the resolved handler instance (never <code>null</code>)
+	 * @param handler the resolved handler instance (never {@code null})
 	 * @param request current HTTP request
-	 * @return the HandlerExecutionChain (never <code>null</code>)
+	 * @return the HandlerExecutionChain (never {@code null})
 	 * @see #getAdaptedInterceptors()
 	 */
 	protected HandlerExecutionChain getHandlerExecutionChain(Object handler, HttpServletRequest request) {
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 1f31c9f172..4501a8fe37 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
@@ -69,10 +69,10 @@ public abstract class AbstractHandlerMethodExceptionResolver extends AbstractHan
 	 * with its actual exception handling.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @param handlerMethod the executed handler method, or <code>null</code> if none chosen at the time
+	 * @param handlerMethod the executed handler method, 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</code> for default processing
+	 * @return a corresponding ModelAndView to forward to, or {@code null} for default processing
 	 */
 	protected abstract ModelAndView doResolveHandlerMethodException(
 			HttpServletRequest request, HttpServletResponse response,
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
index 53af31127f..df23203fe7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
@@ -63,7 +63,7 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping {
 	/**
 	 * Set the root handler for this handler mapping, that is,
 	 * the handler to be registered for the root path ("/").
-	 * <p>Default is <code>null</code>, indicating no root handler.
+	 * <p>Default is {@code null}, indicating no root handler.
 	 */
 	public void setRootHandler(Object rootHandler) {
 		this.rootHandler = rootHandler;
@@ -71,7 +71,7 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping {
 
 	/**
 	 * Return the root handler for this handler mapping (registered for "/"),
-	 * or <code>null</code> if none.
+	 * or {@code null} if none.
 	 */
 	public Object getRootHandler() {
 		return this.rootHandler;
@@ -94,7 +94,7 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping {
 	/**
 	 * Look up a handler for the URL path of the given request.
 	 * @param request current HTTP request
-	 * @return the handler instance, or <code>null</code> if none found
+	 * @return the handler instance, or {@code null} if none found
 	 */
 	@Override
 	protected Object getHandlerInternal(HttpServletRequest request) throws Exception {
@@ -138,7 +138,7 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping {
 	 * the longest path pattern.
 	 * @param urlPath URL the bean is mapped to
 	 * @param request current HTTP request (to expose the path within the mapping to)
-	 * @return the associated handler instance, or <code>null</code> if not found
+	 * @return the associated handler instance, or {@code null} if not found
 	 * @see #exposePathWithinMapping
 	 * @see org.springframework.util.AntPathMatcher
 	 */
@@ -218,7 +218,7 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping {
 	 * with a special interceptor that exposes the path attribute and uri template variables
 	 * @param rawHandler the raw handler to expose
 	 * @param pathWithinMapping the path to expose before executing the handler
-	 * @param uriTemplateVariables the URI template variables, can be <code>null</code> if no variables found
+	 * @param uriTemplateVariables the URI template variables, can be {@code null} if no variables found
 	 * @return the final handler object
 	 */
 	protected Object buildPathExposingHandler(Object rawHandler, String bestMatchingPattern,
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
index 203a25c206..f9b8cbc344 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
  * Interceptor that places the configured {@link ConversionService} in request scope
  * so it's available during request processing. The request attribute name is
  * "org.springframework.core.convert.ConversionService", the value of
- * <code>ConversionService.class.getName()</code>.
+ * {@code ConversionService.class.getName()}.
  *
  * <p>Mainly for use within JSP tags such as the spring:eval tag.
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
index 7e1754192c..c721327101 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
@@ -32,7 +32,7 @@ import org.springframework.web.servlet.ModelAndView;
 public abstract class HandlerInterceptorAdapter implements AsyncHandlerInterceptor {
 
 	/**
-	 * This implementation always returns <code>true</code>.
+	 * This implementation always returns {@code true}.
 	 */
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
 		throws Exception {
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 662f8c77c3..82f1979856 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
@@ -61,7 +61,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 	/**
 	 * Set the mappings between exception class names and error view names.
 	 * The exception class name can be a substring, with no wildcard support at present.
-	 * A value of "ServletException" would match <code>javax.servlet.ServletException</code>
+	 * A value of "ServletException" would match {@code javax.servlet.ServletException}
 	 * and subclasses, for example.
 	 * <p><b>NB:</b> Consider carefully how
 	 * specific the pattern is, and whether to include package information (which isn't mandatory).
@@ -143,7 +143,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 
 	/**
 	 * 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</code> for not exposing an exception attribute at all.
+	 * 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) {
@@ -157,10 +157,10 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 	 * ("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</code> if none chosen at the time of the exception (for example,
+	 * @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</code> for default processing
+	 * @return a corresponding ModelAndView to forward to, or {@code null} for default processing
 	 */
 	@Override
 	protected ModelAndView doResolveException(HttpServletRequest request,
@@ -191,7 +191,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 	 * {@link #setDefaultErrorView "defaultErrorView"} as a fallback.
 	 * @param ex the exception that got thrown during handler execution
 	 * @param request current HTTP request (useful for obtaining metadata)
-	 * @return the resolved view name, or <code>null</code> if excluded or none found
+	 * @return the resolved view name, or {@code null} if excluded or none found
 	 */
 	protected String determineViewName(Exception ex, HttpServletRequest request) {
 		String viewName = null;
@@ -221,7 +221,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 	 * Find a matching view name in the given exception mappings.
 	 * @param exceptionMappings mappings between exception class names and error view names
 	 * @param ex the exception that got thrown during handler execution
-	 * @return the view name, or <code>null</code> if none found
+	 * @return the view name, or {@code null} if none found
 	 * @see #setExceptionMappings
 	 */
 	protected String findMatchingViewName(Properties exceptionMappings, Exception ex) {
@@ -273,7 +273,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 	 * <p>Override this in a custom subclass to customize this behavior.
 	 * @param request current HTTP request
 	 * @param viewName the name of the error view
-	 * @return the HTTP status code to use, or <code>null</code> for the servlet container's default
+	 * @return the HTTP status code to use, or {@code null} for the servlet container's default
 	 * (200 in case of a standard error view)
 	 * @see #setDefaultStatusCode
 	 * @see #applyStatusCodeIfPossible
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
index a0ce3299fb..9f149b1949 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
@@ -25,7 +25,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 /**
  * Adapter to use the Servlet interface with the generic DispatcherServlet.
- * Calls the Servlet's <code>service</code> method to handle a request.
+ * Calls the Servlet's {@code service} method to handle a request.
  *
  * <p>Last-modified checking is not explicitly supported: This is typically
  * handled by the Servlet implementation itself (usually deriving from
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
index a6dccad590..e3ca75d02d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
@@ -35,11 +35,11 @@ import org.springframework.web.context.ServletContextAware;
  * that applies initialization and destruction callbacks to beans that
  * implement the {@link javax.servlet.Servlet} interface.
  *
- * <p>After initialization of the bean instance, the Servlet <code>init</code>
+ * <p>After initialization of the bean instance, the Servlet {@code init}
  * method will be called with a ServletConfig that contains the bean name
  * of the Servlet and the ServletContext that it is running in.
  *
- * <p>Before destruction of the bean instance, the Servlet <code>destroy</code>
+ * <p>Before destruction of the bean instance, the Servlet {@code destroy}
  * will be called.
  *
  * <p><b>Note that this post-processor does not support Servlet initialization
@@ -76,7 +76,7 @@ public class SimpleServletPostProcessor implements
 
 	/**
 	 * Set whether to use the shared ServletConfig object passed in
-	 * through <code>setServletConfig</code>, if available.
+	 * through {@code setServletConfig}, if available.
 	 * <p>Default is "true". Turn this setting to "false" to pass in
 	 * a mock ServletConfig object with the bean name as servlet name,
 	 * holding the current ServletContext.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java
index 9d798afc33..b581ca2b38 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java
@@ -32,12 +32,12 @@ import org.springframework.util.CollectionUtils;
  * bean references, e.g. via the map element in XML bean definitions.
  *
  * <p>Mappings to bean names can be set via the "mappings" property, in a form
- * accepted by the <code>java.util.Properties</code> class, like as follows:<br>
- * <code>
+ * accepted by the {@code java.util.Properties} class, like as follows:<br>
+ * {@code
  * /welcome.html=ticketController
  * /show.html=ticketController
- * </code><br>
- * The syntax is <code>PATH=HANDLER_BEAN_NAME</code>.
+ * }<br>
+ * The syntax is {@code PATH=HANDLER_BEAN_NAME}.
  * If the path doesn't begin with a slash, one is prepended.
  *
  * <p>Supports direct matches (given "/test" -> registered "/test") and "*"
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 56a7b29f3e..551c790d53 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
@@ -28,7 +28,7 @@ import org.springframework.web.servlet.LocaleResolver;
  * 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).
  *
- * <p>Note: Does not support <code>setLocale</code>, since the accept header
+ * <p>Note: Does not support {@code setLocale}, since the accept header
  * can only be changed through changing the client's locale settings.
  *
  * @author Juergen Hoeller
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
index 5cc25460f2..66f5bcae6a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
@@ -131,7 +131,7 @@ public class CookieLocaleResolver extends CookieGenerator implements LocaleResol
 	 * <p>The default implementation returns the specified default locale,
 	 * if any, else falls back to the request's accept-header locale.
 	 * @param request the request to resolve the locale for
-	 * @return the default locale (never <code>null</code>)
+	 * @return the default locale (never {@code null})
 	 * @see #setDefaultLocale
 	 * @see javax.servlet.http.HttpServletRequest#getLocale()
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
index 295a1f779f..a2abd43715 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse;
  * that always returns a fixed default locale. Default is the current
  * JVM's default locale.
  *
- * <p>Note: Does not support <code>setLocale</code>, as the fixed locale
+ * <p>Note: Does not support {@code setLocale}, as the fixed locale
  * cannot be changed.
  *
  * @author Juergen Hoeller
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 230e1cc7b6..66f7b3990f 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
@@ -32,7 +32,7 @@ import org.springframework.web.util.WebUtils;
  * that is, when the HttpSession does not have to be created for the locale.
  *
  * <p>Custom controllers can override the user's locale by calling
- * <code>setLocale</code>, e.g. responding to a locale change request.
+ * {@code setLocale}, e.g. responding to a locale change request.
  *
  * @author Juergen Hoeller
  * @since 27.02.2003
@@ -44,7 +44,7 @@ public class SessionLocaleResolver extends AbstractLocaleResolver {
 	/**
 	 * Name of the session attribute that holds the locale.
 	 * Only used internally by this implementation.
-	 * Use <code>RequestContext(Utils).getLocale()</code>
+	 * Use {@code RequestContext(Utils).getLocale()}
 	 * to retrieve the current locale in controllers or views.
 	 * @see org.springframework.web.servlet.support.RequestContext#getLocale
 	 * @see org.springframework.web.servlet.support.RequestContextUtils#getLocale
@@ -66,7 +66,7 @@ public class SessionLocaleResolver extends AbstractLocaleResolver {
 	 * <p>The default implementation returns the specified default locale,
 	 * if any, else falls back to the request's accept-header locale.
 	 * @param request the request to resolve the locale for
-	 * @return the default locale (never <code>null</code>)
+	 * @return the default locale (never {@code null})
 	 * @see #setDefaultLocale
 	 * @see javax.servlet.http.HttpServletRequest#getLocale()
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java
index 81df88d308..fad6bb9dc9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java
@@ -90,14 +90,14 @@ public abstract class AbstractCommandController extends BaseCommandController {
 	/**
 	 * Template method for request handling, providing a populated and validated instance
 	 * of the command class, and an Errors object containing binding and validation errors.
-	 * <p>Call <code>errors.getModel()</code> to populate the ModelAndView model
+	 * <p>Call {@code errors.getModel()} to populate the ModelAndView model
 	 * with the command and the Errors instance, under the specified command name,
 	 * as expected by the "spring:bind" tag.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @param command the populated command object
 	 * @param errors validation errors holder
-	 * @return a ModelAndView to render, or <code>null</code> if handled directly
+	 * @return a ModelAndView to render, or {@code null} if handled directly
 	 * @see org.springframework.validation.Errors
 	 * @see org.springframework.validation.BindException#getModel
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
index ab85c87aa9..a6d5775463 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
@@ -28,7 +28,7 @@ import org.springframework.web.util.WebUtils;
  * <p>Convenient superclass for controller implementations, using the Template
  * Method design pattern.</p>
  *
- * <p>As stated in the {@link org.springframework.web.servlet.mvc.Controller Controller}
+ * <p>As stated in the {@link Controller Controller}
  * interface, a lot of functionality is already provided by certain abstract
  * base controllers. The AbstractController is one of the most important
  * abstract base controller providing basic features such as the generation
@@ -38,13 +38,13 @@ import org.springframework.web.util.WebUtils;
  * <p><b><a name="workflow">Workflow
  * (<a href="Controller.html#workflow">and that defined by interface</a>):</b><br>
  * <ol>
- *  <li>{@link #handleRequest(HttpServletRequest,HttpServletResponse) handleRequest()}
+ *  <li>{@link #handleRequest(HttpServletRequest, HttpServletResponse) handleRequest()}
  *      will be called by the DispatcherServlet</li>
  *  <li>Inspection of supported methods (ServletException if request method
  *      is not support)</li>
  *  <li>If session is required, try to get it (ServletException if not found)</li>
  *  <li>Set caching headers if needed according to the cacheSeconds property</li>
- *  <li>Call abstract method {@link #handleRequestInternal(HttpServletRequest,HttpServletResponse) handleRequestInternal()}
+ *  <li>Call abstract method {@link #handleRequestInternal(HttpServletRequest, HttpServletResponse) handleRequestInternal()}
  *      (optionally synchronizing around the call on the HttpSession),
  *      which should be implemented by extending classes to provide actual
  *      functionality to return {@link org.springframework.web.servlet.ModelAndView ModelAndView} objects.</li>
@@ -86,7 +86,7 @@ import org.springframework.web.util.WebUtils;
  *  <tr>
  *      <td>synchronizeOnSession</td>
  *      <td>false</td>
- *      <td>whether the call to <code>handleRequestInternal</code> should be
+ *      <td>whether the call to {@code handleRequestInternal} should be
  *          synchronized around the HttpSession, to serialize invocations
  *          from the same client. No effect if there is no HttpSession.
  *      </td>
@@ -105,19 +105,19 @@ public abstract class AbstractController extends WebContentGenerator implements
 	/**
 	 * Set if controller execution should be synchronized on the session,
 	 * to serialize parallel invocations from the same client.
-	 * <p>More specifically, the execution of the <code>handleRequestInternal</code>
+	 * <p>More specifically, the execution of the {@code handleRequestInternal}
 	 * method will get synchronized if this flag is "true". The best available
 	 * session mutex will be used for the synchronization; ideally, this will
 	 * be a mutex exposed by HttpSessionMutexListener.
 	 * <p>The session mutex is guaranteed to be the same object during
 	 * the entire lifetime of the session, available under the key defined
-	 * by the <code>SESSION_MUTEX_ATTRIBUTE</code> constant. It serves as a
+	 * by the {@code SESSION_MUTEX_ATTRIBUTE} constant. It serves as a
 	 * safe reference to synchronize on for locking on the current session.
 	 * <p>In many cases, the HttpSession reference itself is a safe mutex
 	 * as well, since it will always be the same object reference for the
 	 * same active logical session. However, this is not guaranteed across
 	 * different servlet containers; the only 100% safe way is a session mutex.
-	 * @see org.springframework.web.servlet.mvc.AbstractController#handleRequestInternal
+	 * @see AbstractController#handleRequestInternal
 	 * @see org.springframework.web.util.HttpSessionMutexListener
 	 * @see org.springframework.web.util.WebUtils#getSessionMutex(javax.servlet.http.HttpSession)
 	 */
@@ -155,7 +155,7 @@ public abstract class AbstractController extends WebContentGenerator implements
 
 	/**
 	 * Template method. Subclasses must implement this.
-	 * The contract is the same as for <code>handleRequest</code>.
+	 * The contract is the same as for {@code handleRequest}.
 	 * @see #handleRequest
 	 */
 	protected abstract ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
index 44f0ac4769..f3a3939a10 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
@@ -32,7 +32,7 @@ import org.springframework.web.servlet.ModelAndView;
 /**
  * <p>Form controller that auto-populates a form bean from the request.
  * This, either using a new bean instance per request, or using the same bean
- * when the <code>sessionForm</code> property has been set to <code>true</code>.</p>
+ * when the {@code sessionForm} property has been set to {@code true}.</p>
  *
  * <p>This class is the base class for both framework subclasses such as
  * {@link SimpleFormController} and {@link AbstractWizardFormController}
@@ -42,19 +42,19 @@ import org.springframework.web.servlet.ModelAndView;
  * programmatically. To provide those views using configuration properties,
  * use the {@link SimpleFormController}.</p>
  *
- * <p>Subclasses need to override <code>showForm</code> to prepare the form view,
- * and <code>processFormSubmission</code> to handle submit requests. For the latter,
+ * <p>Subclasses need to override {@code showForm} to prepare the form view,
+ * and {@code processFormSubmission} to handle submit requests. For the latter,
  * binding errors like type mismatches will be reported via the given "errors" holder.
  * For additional custom form validation, a validator (property inherited from
  * BaseCommandController) can be used, reporting via the same "errors" instance.</p>
  *
- * <p>Comparing this Controller to the Struts notion of the <code>Action</code>
+ * <p>Comparing this Controller to the Struts notion of the {@code Action}
  * shows us that with Spring, you can use any ordinary JavaBeans or database-
  * backed JavaBeans without having to implement a framework-specific class
- * (like Struts' <code>ActionForm</code>). More complex properties of JavaBeans
+ * (like Struts' {@code ActionForm}). More complex properties of JavaBeans
  * (Dates, Locales, but also your own application-specific or compound types)
  * can be represented and submitted to the controller, by using the notion of
- * a <code>java.beans.PropertyEditor</code>. For more information on that
+ * a {@code java.beans.PropertyEditor}. For more information on that
  * subject, see the workflow of this controller and the explanation of the
  * {@link BaseCommandController}.</p>
  *
@@ -71,7 +71,7 @@ import org.springframework.web.servlet.ModelAndView;
  *      custom editors for certain fields (often properties of non-primitive
  *      or non-String types) of the command class. This will render appropriate
  *      Strings for those property values, e.g. locale-specific date strings.</li>
- *  <li><em>Only if <code>bindOnNewForm</code> is set to <code>true</code></em>, then
+ *  <li><em>Only if {@code bindOnNewForm} is set to {@code true}</em>, then
  *      {@link org.springframework.web.bind.ServletRequestDataBinder ServletRequestDataBinder}
  *      gets applied to populate the new form object with initial request parameters and the
  *      {@link #onBindOnNewForm(HttpServletRequest, Object, BindException)} callback method is
@@ -97,7 +97,7 @@ import org.springframework.web.servlet.ModelAndView;
  *      To use a different way of detecting a form submission, override the
  *      {@link #isFormSubmission isFormSubmission} method.
  *      </li>
- *  <li>If <code>sessionForm</code> is not set, {@link #formBackingObject formBackingObject()}
+ *  <li>If {@code sessionForm} is not set, {@link #formBackingObject formBackingObject()}
  *      is called to retrieve a form object. Otherwise, the controller tries to
  *      find the command object which is already bound in the session. If it cannot
  *      find the object, it does a call to {@link #handleInvalidSubmit handleInvalidSubmit}
@@ -107,7 +107,7 @@ import org.springframework.web.servlet.ModelAndView;
  *  <li>Call to {@link #onBind onBind(HttpServletRequest, Object, Errors)} which allows
  *      you to do custom processing after binding but before validation (e.g. to manually
  *      bind request parameters to bean properties, to be seen by the Validator).</li>
- *  <li>If <code>validateOnBinding</code> is set, a registered Validator will be invoked.
+ *  <li>If {@code validateOnBinding} is set, a registered Validator will be invoked.
  *      The Validator will check the form object properties, and register corresponding
  *      errors via the given {@link org.springframework.validation.Errors Errors}</li> object.
  *  <li>Call to {@link #onBindAndValidate onBindAndValidate()} which allows you
@@ -203,7 +203,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 	}
 
 	/**
-	 * Return <code>true</code> if request parameters should be bound in case of a new form.
+	 * Return {@code true} if request parameters should be bound in case of a new form.
 	 */
 	public final boolean isBindOnNewForm() {
 		return this.bindOnNewForm;
@@ -231,14 +231,14 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * <a href="http://www.springframework.org/webflow">Spring WebFlow</a>,
 	 * which has full support for conversations and has a much more flexible
 	 * usage model overall.
-	 * @param sessionForm <code>true</code> if session form mode is to be activated
+	 * @param sessionForm {@code true} if session form mode is to be activated
 	 */
 	public final void setSessionForm(boolean sessionForm) {
 		this.sessionForm = sessionForm;
 	}
 
 	/**
-	 * Return <code>true</code> if session form mode is activated.
+	 * Return {@code true} if session form mode is activated.
 	 */
 	public final boolean isSessionForm() {
 		return this.sessionForm;
@@ -302,7 +302,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * <p>The default implementation delegates to the {@link #getFormSessionAttributeName()}
 	 * variant without arguments.
 	 * @param request current HTTP request
-	 * @return the name of the form session attribute, or <code>null</code> if not in session form mode
+	 * @return the name of the form session attribute, or {@code null} if not in session form mode
 	 * @see #getFormSessionAttributeName
 	 * @see javax.servlet.http.HttpSession#getAttribute
 	 */
@@ -382,8 +382,8 @@ public abstract class AbstractFormController extends BaseCommandController {
 
 	/**
 	 * Callback for custom post-processing in terms of binding for a new form.
-	 * Called when preparing a new form if <code>bindOnNewForm</code> is <code>true</code>.
-	 * <p>The default implementation delegates to <code>onBindOnNewForm(request, command)</code>.
+	 * Called when preparing a new form if {@code bindOnNewForm} is {@code true}.
+	 * <p>The default implementation delegates to {@code onBindOnNewForm(request, command)}.
 	 * @param request current HTTP request
 	 * @param command the command object to perform further binding on
 	 * @param errors validation errors holder, allowing for additional
@@ -403,7 +403,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * <p>Called by the default implementation of the
 	 * {@link #onBindOnNewForm(HttpServletRequest, Object, BindException)} variant
 	 * with all parameters, after standard binding when displaying the form view.
-	 * Only called if <code>bindOnNewForm</code> is set to <code>true</code>.
+	 * Only called if {@code bindOnNewForm} is set to {@code true}.
 	 * <p>The default implementation is empty.
 	 * @param request current HTTP request
 	 * @param command the command object to perform further binding on
@@ -500,10 +500,10 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * Prepare the form model and view, including reference and error data.
 	 * Can show a configured form page, or generate a form view programmatically.
 	 * <p>A typical implementation will call
-	 * <code>showForm(request, errors, "myView")</code>
+	 * {@code showForm(request, errors, "myView")}
 	 * to prepare the form view for a specific view name, returning the
 	 * ModelAndView provided there.
-	 * <p>For building a custom ModelAndView, call <code>errors.getModel()</code>
+	 * <p>For building a custom ModelAndView, call {@code errors.getModel()}
 	 * to populate the ModelAndView model with the command and the Errors instance,
 	 * under the specified command name, as expected by the "spring:bind" tag.
 	 * You also need to include the model returned by {@link #referenceData}.
@@ -512,7 +512,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * @param request current HTTP request
 	 * @param response current HTTP response
 	 * @param errors validation errors holder
-	 * @return the prepared form view, or <code>null</code> if handled directly
+	 * @return the prepared form view, or {@code null} if handled directly
 	 * @throws Exception in case of invalid state or arguments
 	 * @see #showForm(HttpServletRequest, BindException, String)
 	 * @see org.springframework.validation.Errors
@@ -592,12 +592,12 @@ public abstract class AbstractFormController extends BaseCommandController {
 	/**
 	 * Create a reference data map for the given request, consisting of
 	 * bean name/bean instance pairs as expected by ModelAndView.
-	 * <p>The default implementation returns <code>null</code>.
+	 * <p>The default implementation returns {@code null}.
 	 * Subclasses can override this to set reference data used in the view.
 	 * @param request current HTTP request
 	 * @param command form object with request parameters bound onto it
 	 * @param errors validation errors holder
-	 * @return a Map with reference data entries, or <code>null</code> if none
+	 * @return a Map with reference data entries, or {@code null} if none
 	 * @throws Exception in case of invalid state or arguments
 	 * @see ModelAndView
 	 */
@@ -615,7 +615,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * triggering a custom action. They can also provide custom validation and call
 	 * {@link #showForm(HttpServletRequest, HttpServletResponse, BindException)}
 	 * or proceed with the submission accordingly.
-	 * <p>For a success view, call <code>errors.getModel()</code> to populate the
+	 * <p>For a success view, call {@code errors.getModel()} to populate the
 	 * ModelAndView model with the command and the Errors instance, under the
 	 * specified command name, as expected by the "spring:bind" tag. For a form view,
 	 * simply return the ModelAndView object provided by
@@ -624,7 +624,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * @param response current servlet response
 	 * @param command form object with request parameters bound onto it
 	 * @param errors holder without errors (subclass can add errors if it wants to)
-	 * @return the prepared model and view, or <code>null</code>
+	 * @return the prepared model and view, or {@code null}
 	 * @throws Exception in case of errors
 	 * @see #handleRequestInternal
 	 * @see #isFormSubmission
@@ -659,7 +659,7 @@ public abstract class AbstractFormController extends BaseCommandController {
 	 * }</pre>
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @return a prepared view, or <code>null</code> if handled directly
+	 * @return a prepared view, or {@code null} if handled directly
 	 * @throws Exception in case of errors
 	 * @see #showNewForm
 	 * @see #getErrorsForNewForm
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java
index 915ba6da70..8033b21fe8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java
@@ -25,12 +25,12 @@ import org.springframework.web.servlet.support.RequestContextUtils;
 import org.springframework.web.util.UrlPathHelper;
 
 /**
- * Abstract base class for <code>Controllers</code> that return a view name
+ * Abstract base class for {@code Controllers} that return a view name
  * based on the request URL.
  *
  * <p>Provides infrastructure for determining view names from URLs and configurable
- * URL lookup. For information on the latter, see <code>alwaysUseFullPath</code>
- * and <code>urlDecode</code> properties.
+ * URL lookup. For information on the latter, see {@code alwaysUseFullPath}
+ * and {@code urlDecode} properties.
  *
  * @author Juergen Hoeller
  * @since 1.2.6
@@ -112,7 +112,7 @@ public abstract class AbstractUrlViewController extends AbstractController {
 	 * Return the name of the view to render for this request, based on the
 	 * given lookup path. Called by {@link #handleRequestInternal}.
 	 * @param request current HTTP request
-	 * @return a view name for this request (never <code>null</code>)
+	 * @return a view name for this request (never {@code null})
 	 * @see #handleRequestInternal
 	 * @see #setAlwaysUseFullPath
 	 * @see #setUrlDecode
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java
index 8773e47a36..0b40a12d04 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java
@@ -60,7 +60,7 @@ import org.springframework.web.util.WebUtils;
  *
  * <p>Note that a validator's default validate method is not executed when using
  * this class! Rather, the {@link #validatePage} implementation should call
- * special <code>validateXXX</code> methods that the validator needs to provide,
+ * special {@code validateXXX} methods that the validator needs to provide,
  * validating certain pieces of the object. These can be combined to validate
  * the elements of individual pages.
  *
@@ -161,8 +161,8 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * <p>Note that a concrete wizard form controller might override
 	 * {@link #getPageCount(HttpServletRequest, Object)} to determine
 	 * the page count dynamically. The default implementation of that extended
-	 * <code>getPageCount</code> variant returns the static page count as
-	 * determined by this <code>getPageCount()</code> method.
+	 * {@code getPageCount} variant returns the static page count as
+	 * determined by this {@code getPageCount()} method.
 	 * @see #getPageCount(javax.servlet.http.HttpServletRequest, Object)
 	 */
 	protected final int getPageCount() {
@@ -280,7 +280,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * @param command form object with request parameters bound onto it
 	 * @param errors validation errors holder
 	 * @param page current wizard page
-	 * @return a Map with reference data entries, or <code>null</code> if none
+	 * @return a Map with reference data entries, or {@code null} if none
 	 * @throws Exception in case of invalid state or arguments
 	 * @see #referenceData(HttpServletRequest, int)
 	 * @see ModelAndView
@@ -294,11 +294,11 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	/**
 	 * Create a reference data map for the given request, consisting of
 	 * bean name/bean instance pairs as expected by ModelAndView.
-	 * <p>The default implementation returns <code>null</code>.
+	 * <p>The default implementation returns {@code null}.
 	 * Subclasses can override this to set reference data used in the view.
 	 * @param request current HTTP request
 	 * @param page current wizard page
-	 * @return a Map with reference data entries, or <code>null</code> if none
+	 * @return a Map with reference data entries, or {@code null} if none
 	 * @throws Exception in case of invalid state or arguments
 	 * @see ModelAndView
 	 */
@@ -420,7 +420,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * <p>The default implementation delegates to the {@link #getPageSessionAttributeName()}
 	 * variant without arguments.
 	 * @param request current HTTP request
-	 * @return the name of the form session attribute, or <code>null</code> if not in session form mode
+	 * @return the name of the form session attribute, or {@code null} if not in session form mode
 	 * @see #getPageSessionAttributeName
 	 * @see #getFormSessionAttributeName(javax.servlet.http.HttpServletRequest)
 	 * @see javax.servlet.http.HttpSession#getAttribute
@@ -452,7 +452,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * to override this method.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @return a prepared view, or <code>null</code> if handled directly
+	 * @return a prepared view, or {@code null} if handled directly
 	 * @throws Exception in case of errors
 	 * @see #showNewForm
 	 * @see #setBindOnNewForm
@@ -562,9 +562,9 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	/**
 	 * Determine whether the incoming request is a request to finish the
 	 * processing of the current form.
-	 * <p>By default, this method returns <code>true</code> if a parameter
+	 * <p>By default, this method returns {@code true} if a parameter
 	 * matching the "_finish" key is present in the request, otherwise it
-	 * returns <code>false</code>. Subclasses may override this method
+	 * returns {@code false}. Subclasses may override this method
 	 * to provide custom logic to detect a finish request.
 	 * <p>The parameter is recognized both when sent as a plain parameter
 	 * ("_finish") or when triggered by an image button ("_finish.x").
@@ -579,9 +579,9 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	/**
 	 * Determine whether the incoming request is a request to cancel the
 	 * processing of the current form.
-	 * <p>By default, this method returns <code>true</code> if a parameter
+	 * <p>By default, this method returns {@code true} if a parameter
 	 * matching the "_cancel" key is present in the request, otherwise it
-	 * returns <code>false</code>. Subclasses may override this method
+	 * returns {@code false}. Subclasses may override this method
 	 * to provide custom logic to detect a cancel request.
 	 * <p>The parameter is recognized both when sent as a plain parameter
 	 * ("_cancel") or when triggered by an image button ("_cancel.x").
@@ -654,9 +654,9 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	/**
 	 * Template method for custom validation logic for individual pages.
 	 * The default implementation calls {@link #validatePage(Object, Errors, int)}.
-	 * <p>Implementations will typically call fine-granular <code>validateXXX</code>
+	 * <p>Implementations will typically call fine-granular {@code validateXXX}
 	 * methods of this instance's Validator, combining them to validation of the
-	 * corresponding pages. The Validator's default <code>validate</code> method
+	 * corresponding pages. The Validator's default {@code validate} method
 	 * will not be called by a wizard form controller!
 	 * @param command form object with the current wizard state
 	 * @param errors validation errors holder
@@ -675,7 +675,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * The default implementation is empty.
 	 * <p>Implementations will typically call fine-granular validateXXX methods of this
 	 * instance's validator, combining them to validation of the corresponding pages.
-	 * The validator's default <code>validate</code> method will not be called by a
+	 * The validator's default {@code validate} method will not be called by a
 	 * wizard form controller!
 	 * @param command form object with the current wizard state
 	 * @param errors validation errors holder
@@ -703,7 +703,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 
 	/**
 	 * Template method for processing the final action of this wizard.
-	 * <p>Call <code>errors.getModel()</code> to populate the ModelAndView model
+	 * <p>Call {@code errors.getModel()} to populate the ModelAndView model
 	 * with the command and the Errors instance, under the specified command name,
 	 * as expected by the "spring:bind" tag.
 	 * <p>You can call the {@link #showPage} method to return back to the wizard,
@@ -728,7 +728,7 @@ public abstract class AbstractWizardFormController extends AbstractFormControlle
 	 * <p>The default implementation throws a ServletException, saying that a cancel
 	 * operation is not supported by this controller. Thus, you do not need to
 	 * implement this template method if you do not support a cancel operation.
-	 * <p>Call <code>errors.getModel()</code> to populate the ModelAndView model
+	 * <p>Call {@code errors.getModel()} to populate the ModelAndView model
 	 * with the command and the Errors instance, under the specified command name,
 	 * as expected by the "spring:bind" tag.
 	 * @param request current HTTP request
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
index 74587e1ecd..b34b7f9923 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
@@ -50,18 +50,18 @@ import org.springframework.web.context.request.ServletWebRequest;
  * Upon receiving a request, any BaseCommandController will attempt to fill the
  * command object using the request parameters. This is done using the typical
  * and well-known JavaBeans property notation. When a request parameter named
- * <code>'firstName'</code> exists, the framework will attempt to call
- * <code>setFirstName([value])</code> passing the value of the parameter. Nested properties
- * are of course supported. For instance a parameter named <code>'address.city'</code>
- * will result in a <code>getAddress().setCity([value])</code> call on the
+ * {@code 'firstName'} exists, the framework will attempt to call
+ * {@code setFirstName([value])} passing the value of the parameter. Nested properties
+ * are of course supported. For instance a parameter named {@code 'address.city'}
+ * will result in a {@code getAddress().setCity([value])} call on the
  * command class.</p>
  *
  * <p>It's important to realise that you are not limited to String arguments in
  * your JavaBeans. Using the PropertyEditor-notion as supplied by the
  * java.beans package, you will be able to transform Strings to Objects and
- * the other way around. For instance <code>setLocale(Locale loc)</code> is
- * perfectly possible for a request parameter named <code>locale</code> having
- * a value of <code>en</code>, as long as you register the appropriate
+ * the other way around. For instance {@code setLocale(Locale loc)} is
+ * perfectly possible for a request parameter named {@code locale} having
+ * a value of {@code en}, as long as you register the appropriate
  * PropertyEditor in the Controller (see {@link #initBinder initBinder()}
  * for more information on that matter.</p>
  *
@@ -237,7 +237,7 @@ public abstract class BaseCommandController extends AbstractController {
 	/**
 	 * Set the strategy to use for resolving errors into message codes.
 	 * Applies the given strategy to all data binders used by this controller.
-	 * <p>Default is <code>null</code>, i.e. using the default strategy of
+	 * <p>Default is {@code null}, i.e. using the default strategy of
 	 * the data binder.
 	 * @see #createBinder
 	 * @see org.springframework.validation.DataBinder#setMessageCodesResolver
@@ -255,8 +255,8 @@ public abstract class BaseCommandController extends AbstractController {
 
 	/**
 	 * Set the strategy to use for processing binding errors, that is,
-	 * required field errors and <code>PropertyAccessException</code>s.
-	 * <p>Default is <code>null</code>, that is, using the default strategy
+	 * required field errors and {@code PropertyAccessException}s.
+	 * <p>Default is {@code null}, that is, using the default strategy
 	 * of the data binder.
 	 * @see #createBinder
 	 * @see org.springframework.validation.DataBinder#setBindingErrorProcessor
@@ -349,7 +349,7 @@ public abstract class BaseCommandController extends AbstractController {
 
 	/**
 	 * Create a new command instance for the command class of this controller.
-	 * <p>This implementation uses <code>BeanUtils.instantiateClass</code>,
+	 * <p>This implementation uses {@code BeanUtils.instantiateClass},
 	 * so the command needs to have a no-arg constructor (supposed to be
 	 * public, but not required to).
 	 * @return the new command instance
@@ -472,8 +472,8 @@ public abstract class BaseCommandController extends AbstractController {
 	 * Determine whether to use direct field access instead of bean property access.
 	 * Applied by {@link #prepareBinder}.
 	 * <p>Default is "false". Can be overridden in subclasses.
-	 * @return whether to use direct field access (<code>true</code>)
-	 * or bean property access (<code>false</code>)
+	 * @return whether to use direct field access ({@code true})
+	 * or bean property access ({@code false})
 	 * @see #prepareBinder
 	 * @see org.springframework.validation.DataBinder#initDirectFieldAccess()
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java
index 888dce14e2..87d6a01901 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java
@@ -24,10 +24,10 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.util.WebUtils;
 
 /**
- * <p>Extension of <code>SimpleFormController</code> that supports "cancellation"
+ * <p>Extension of {@code SimpleFormController} that supports "cancellation"
  * of form processing. By default, this controller looks for a given parameter in the
- * request, identified by the <code>cancelParamKey<code>. If this parameter is present,
- * then the controller will return the configured <code>cancelView</code>, otherwise
+ * request, identified by the {@code cancelParamKey}. If this parameter is present,
+ * then the controller will return the configured {@code cancelView}, otherwise
  * processing is passed back to the superclass.</p>
  *
  * <p><b><a name="workflow">Workflow
@@ -35,15 +35,15 @@ import org.springframework.web.util.WebUtils;
  *  <ol>
  *   <li>Call to {@link #processFormSubmission processFormSubmission} which calls
  *       {@link #isCancelRequest} to see if the incoming request is to cancel the
- *       current form entry. By default, {@link #isCancelRequest} returns <code>true</code>
- *       if the configured <code>cancelParamKey</code> exists in the request.
+ *       current form entry. By default, {@link #isCancelRequest} returns {@code true}
+ *       if the configured {@code cancelParamKey} exists in the request.
  *       This behavior can be overridden in subclasses.</li>
- *   <li>If {@link #isCancelRequest} returns <code>false</code>, then the controller
+ *   <li>If {@link #isCancelRequest} returns {@code false}, then the controller
  *       will delegate all processing back to {@link SimpleFormController SimpleFormController},
  *       otherwise it will call the {@link #onCancel} version with all parameters.
  *       By default, that method will delegate to the {@link #onCancel} version with just
  *       the command object, which will in turn simply return the configured
- *       <code>cancelView</code>. This behavior can be overridden in subclasses.</li>
+ *       {@code cancelView}. This behavior can be overridden in subclasses.</li>
  *  </ol>
  * </p>
  *
@@ -149,9 +149,9 @@ public class CancellableFormController extends SimpleFormController {
 	/**
 	 * Determine whether the incoming request is a request to cancel the
 	 * processing of the current form.
-	 * <p>By default, this method returns <code>true</code> if a parameter
-	 * matching the configured <code>cancelParamKey</code> is present in
-	 * the request, otherwise it returns <code>false</code>. Subclasses may
+	 * <p>By default, this method returns {@code true} if a parameter
+	 * matching the configured {@code cancelParamKey} is present in
+	 * the request, otherwise it returns {@code false}. Subclasses may
 	 * override this method to provide custom logic to detect a cancel request.
 	 * <p>The parameter is recognized both when sent as a plain parameter
 	 * ("_cancel") or when triggered by an image button ("_cancel.x").
@@ -165,18 +165,18 @@ public class CancellableFormController extends SimpleFormController {
 
 	/**
 	 * Callback method for handling a cancel request. Called if {@link #isCancelRequest}
-	 * returns <code>true</code>.
-	 * <p>Default implementation delegates to <code>onCancel(Object)</code> to return
-	 * the configured <code>cancelView</code>. Subclasses may override either of the two
+	 * returns {@code true}.
+	 * <p>Default implementation delegates to {@code onCancel(Object)} to return
+	 * the configured {@code cancelView}. Subclasses may override either of the two
 	 * methods to build a custom {@link ModelAndView ModelAndView} that may contain model
 	 * parameters used in the cancel view.
 	 * <p>If you simply want to move the user to a new view and you don't want to add
 	 * additional model parameters, use {@link #setCancelView(String)} rather than
-	 * overriding an <code>onCancel</code> method.
+	 * overriding an {@code onCancel} method.
 	 * @param request current servlet request
 	 * @param response current servlet response
 	 * @param command form object with request parameters bound onto it
-	 * @return the prepared model and view, or <code>null</code>
+	 * @return the prepared model and view, or {@code null}
 	 * @throws Exception in case of errors
 	 * @see #isCancelRequest(javax.servlet.http.HttpServletRequest)
 	 * @see #onCancel(Object)
@@ -189,16 +189,16 @@ public class CancellableFormController extends SimpleFormController {
 	}
 
 	/**
-	 * Simple <code>onCancel</code> version. Called by the default implementation
-	 * of the <code>onCancel</code> version with all parameters.
-	 * <p>Default implementation returns eturns the configured <code>cancelView</code>.
+	 * Simple {@code onCancel} version. Called by the default implementation
+	 * of the {@code onCancel} version with all parameters.
+	 * <p>Default implementation returns eturns the configured {@code cancelView}.
 	 * Subclasses may override this method to build a custom {@link ModelAndView ModelAndView}
 	 * that may contain model parameters used in the cancel view.
 	 * <p>If you simply want to move the user to a new view and you don't want to add
 	 * additional model parameters, use {@link #setCancelView(String)} rather than
-	 * overriding an <code>onCancel</code> method.
+	 * overriding an {@code onCancel} method.
 	 * @param command form object with request parameters bound onto it
-	 * @return the prepared model and view, or <code>null</code>
+	 * @return the prepared model and view, or {@code null}
 	 * @throws Exception in case of errors
 	 * @see #onCancel(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, Object)
 	 * @see #setCancelView
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java
index ab452fb277..b02d72d3cd 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java
@@ -23,10 +23,10 @@ import org.springframework.web.servlet.ModelAndView;
 
 /**
  * Base Controller interface, representing a component that receives
- * <code>HttpServletRequest</code> and <code>HttpServletResponse</code>
- * instances just like a <code>HttpServlet</code> but is able to
+ * {@code HttpServletRequest} and {@code HttpServletResponse}
+ * instances just like a {@code HttpServlet} but is able to
  * participate in an MVC workflow. Controllers are comparable to the
- * notion of a Struts <code>Action</code>.
+ * notion of a Struts {@code Action}.
  *
  * <p>Any implementation of the Controller interface should be a
  * <i>reusable, thread-safe</i> class, capable of handling multiple
@@ -80,9 +80,9 @@ import org.springframework.web.servlet.ModelAndView;
  * choose to implement specific awareness interfaces, just like any other bean in a
  * Spring (web) application context can do, for example:</p>
  * <ul>
- * <li><code>org.springframework.context.ApplicationContextAware</code></li>
- * <li><code>org.springframework.context.ResourceLoaderAware</code></li>
- * <li><code>org.springframework.web.context.ServletContextAware</code></li>
+ * <li>{@code org.springframework.context.ApplicationContextAware}</li>
+ * <li>{@code org.springframework.context.ResourceLoaderAware}</li>
+ * <li>{@code org.springframework.web.context.ServletContextAware}</li>
  * </ul>
  *
  * <p>Such environment references can easily be passed in testing environments,
@@ -111,12 +111,12 @@ public interface Controller {
 
 	/**
 	 * Process the request and return a ModelAndView object which the DispatcherServlet
-	 * will render. A <code>null</code> return value is not an error: It indicates that
+	 * will render. A {@code null} return value is not an error: It indicates that
 	 * this object completed request processing itself, thus there is no ModelAndView
 	 * to render.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @return a ModelAndView to render, or <code>null</code> if handled directly
+	 * @return a ModelAndView to render, or {@code null} if handled directly
 	 * @throws Exception in case of errors
 	 */
 	ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
index 7d4ed6dfb8..6ed540dcdd 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
@@ -20,7 +20,7 @@ import javax.servlet.http.HttpServletRequest;
 
 /**
  * Supports last-modified HTTP requests to facilitate content caching.
- * Same contract as for the Servlet API's <code>getLastModified</code> method.
+ * Same contract as for the Servlet API's {@code getLastModified} method.
  *
  * <p>Delegated to by a {@link org.springframework.web.servlet.HandlerAdapter#getLastModified}
  * implementation. By default, any Controller or HttpRequestHandler within Spring's
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest;
  *
  * <p><b>Note:</b> Alternative handler implementation approaches have different
  * last-modified handling styles. For example, Spring 2.5's annotated controller
- * approach (using <code>@RequestMapping</code>) provides last-modified support
+ * approach (using {@code @RequestMapping}) provides last-modified support
  * through the {@link org.springframework.web.context.request.WebRequest#checkNotModified}
  * method, allowing for last-modified checking within the main handler method.
  *
@@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletRequest;
 public interface LastModified {
 
 	/**
-	 * Same contract as for HttpServlet's <code>getLastModified</code> method.
+	 * Same contract as for HttpServlet's {@code getLastModified} method.
 	 * Invoked <b>before</b> request processing.
 	 * <p>The return value will be sent to the HTTP client as Last-Modified header,
 	 * and compared with If-Modified-Since headers that the client sends back.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
index 657d5fb059..f8365a1470 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
@@ -41,7 +41,7 @@ import org.springframework.web.servlet.support.RequestContextUtils;
  *  <li>Request is received by the controller</li>
  *  <li>call to {@link #handleRequestInternal handleRequestInternal} which
  *      just returns the view, named by the configuration property
- *      <code>viewName</code>. Nothing more, nothing less</li>
+ *      {@code viewName}. Nothing more, nothing less</li>
  * </ol>
  * </p>
  *
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 5322957ce5..c96e356e60 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
@@ -136,14 +136,14 @@ public class ServletForwardingController extends AbstractController implements B
 	}
 
 	/**
-	 * Determine whether to use RequestDispatcher's <code>include</code> or
-	 * <code>forward</code> method.
+	 * Determine whether to use RequestDispatcher's {@code include} or
+	 * {@code forward} method.
 	 * <p>Performs a check whether an include URI attribute is found in the request,
 	 * indicating an include request, and whether the response has already been committed.
 	 * In both cases, an include will be performed, as a forward is not possible anymore.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @return <code>true</code> for include, <code>false</code> for forward
+	 * @return {@code true} for include, {@code false} for forward
 	 * @see javax.servlet.RequestDispatcher#forward
 	 * @see javax.servlet.RequestDispatcher#include
 	 * @see javax.servlet.ServletResponse#isCommitted
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 f258c9652e..79c8bf3851 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
@@ -38,7 +38,7 @@ import org.springframework.web.servlet.ModelAndView;
  * <p>Useful to invoke an existing servlet via Spring's dispatching infrastructure,
  * for example to apply Spring HandlerInterceptors to its requests.
  *
- * <p>Note that Struts has a special requirement in that it parses <code>web.xml</code>
+ * <p>Note that Struts has a special requirement in that it parses {@code web.xml}
  * to find its servlet mapping. Therefore, you need to specify the DispatcherServlet's
  * servlet name as "servletName" on this controller, so that Struts finds the
  * DispatcherServlet's mapping (thinking that it refers to the ActionServlet).
@@ -100,7 +100,7 @@ public class ServletWrappingController extends AbstractController
 
 	/**
 	 * Set the class of the servlet to wrap.
-	 * Needs to implement <code>javax.servlet.Servlet</code>.
+	 * Needs to implement {@code javax.servlet.Servlet}.
 	 * @see javax.servlet.Servlet
 	 */
 	public void setServletClass(Class servletClass) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java
index dda32c093a..c589641dde 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java
@@ -58,7 +58,7 @@ import org.springframework.web.servlet.ModelAndView;
  *      using all parameters, which in case of the default implementation delegates to
  *      {@link #onSubmit(Object, BindException) onSubmit} with just the command object.
  *      The default implementation of the latter method will return the configured
- *      <code>successView</code>. Consider implementing {@link #doSubmitAction} doSubmitAction
+ *      {@code successView}. Consider implementing {@link #doSubmitAction} doSubmitAction
  *      for simply performing a submit action and rendering the success view.</li>
  *  </ol>
  * </p>
@@ -112,7 +112,7 @@ public class SimpleFormController extends AbstractFormController {
 	 * <p>Subclasses should set the following properties, either in the constructor
 	 * or via a BeanFactory: commandName, commandClass, sessionForm, formView,
 	 * successView. Note that commandClass doesn't need to be set when overriding
-	 * <code>formBackingObject</code>, as this determines the class anyway.
+	 * {@code formBackingObject}, as this determines the class anyway.
 	 * @see #setCommandClass
 	 * @see #setCommandName
 	 * @see #setSessionForm
@@ -209,7 +209,7 @@ public class SimpleFormController extends AbstractFormController {
 	 * @param request current HTTP request
 	 * @param command form object with request parameters bound onto it
 	 * @param errors validation errors holder
-	 * @return a Map with reference data entries, or <code>null</code> if none
+	 * @return a Map with reference data entries, or {@code null} if none
 	 * @throws Exception in case of invalid state or arguments
 	 * @see ModelAndView
 	 */
@@ -222,10 +222,10 @@ public class SimpleFormController extends AbstractFormController {
 	 * Create a reference data map for the given request.
 	 * Called by the {@link #referenceData(HttpServletRequest, Object, Errors)}
 	 * variant with all parameters.
-	 * <p>The default implementation returns <code>null</code>.
+	 * <p>The default implementation returns {@code null}.
 	 * Subclasses can override this to set reference data used in the view.
 	 * @param request current HTTP request
-	 * @return a Map with reference data entries, or <code>null</code> if none
+	 * @return a Map with reference data entries, or {@code null} if none
 	 * @throws Exception in case of invalid state or arguments
 	 * @see #referenceData(HttpServletRequest, Object, Errors)
 	 * @see ModelAndView
@@ -243,7 +243,7 @@ public class SimpleFormController extends AbstractFormController {
 	 * variant else.
 	 * <p>This can only be overridden to check for an action that should be executed
 	 * without respect to binding errors, like a cancel action. To just handle successful
-	 * submissions without binding errors, override one of the <code>onSubmit</code>
+	 * submissions without binding errors, override one of the {@code onSubmit}
 	 * methods or {@link #doSubmitAction}.
 	 * @see #showForm(HttpServletRequest, HttpServletResponse, BindException)
 	 * @see #onSubmit(HttpServletRequest, HttpServletResponse, Object, BindException)
@@ -304,9 +304,9 @@ public class SimpleFormController extends AbstractFormController {
 	}
 
 	/**
-	 * Simpler <code>isFormChangeRequest</code> variant, called by the full
+	 * Simpler {@code isFormChangeRequest} variant, called by the full
 	 * variant {@link #isFormChangeRequest(HttpServletRequest, Object)}.
-	 * <p>The default implementation returns <code>false</code.
+	 * <p>The default implementation returns {@code false}.
 	 * @param request current HTTP request
 	 * @return whether the given request is a form change request
 	 * @see #suppressValidation
@@ -319,7 +319,7 @@ public class SimpleFormController extends AbstractFormController {
 	/**
 	 * Called during form submission if
 	 * {@link #isFormChangeRequest(javax.servlet.http.HttpServletRequest)}
-	 * returns <code>true</code>. Allows subclasses to implement custom logic
+	 * returns {@code true}. Allows subclasses to implement custom logic
 	 * to modify the command object to directly modify data in the form.
 	 * <p>The default implementation delegates to
 	 * {@link #onFormChange(HttpServletRequest, HttpServletResponse, Object, BindException)}.
@@ -340,7 +340,7 @@ public class SimpleFormController extends AbstractFormController {
 	}
 
 	/**
-	 * Simpler <code>onFormChange</code> variant, called by the full variant
+	 * Simpler {@code onFormChange} variant, called by the full variant
 	 * {@link #onFormChange(HttpServletRequest, HttpServletResponse, Object, BindException)}.
 	 * <p>The default implementation is empty.
 	 * @param request current servlet request
@@ -360,19 +360,19 @@ public class SimpleFormController extends AbstractFormController {
 	 * <p>The default implementation delegates to {@link #onSubmit(Object, BindException)}.
 	 * For simply performing a submit action and rendering the specified success
 	 * view, consider implementing {@link #doSubmitAction} rather than an
-	 * <code>onSubmit</code> variant.
+	 * {@code onSubmit} variant.
 	 * <p>Subclasses can override this to provide custom submission handling like storing
 	 * the object to the database. Implementations can also perform custom validation and
 	 * call showForm to return to the form. Do <i>not</i> implement multiple onSubmit
 	 * methods: In that case, just this method will be called by the controller.
-	 * <p>Call <code>errors.getModel()</code> to populate the ModelAndView model
+	 * <p>Call {@code errors.getModel()} to populate the ModelAndView model
 	 * with the command and the Errors instance, under the specified command name,
 	 * as expected by the "spring:bind" tag.
 	 * @param request current servlet request
 	 * @param response current servlet response
 	 * @param command form object with request parameters bound onto it
 	 * @param errors Errors instance without errors (subclass can add errors if it wants to)
-	 * @return the prepared model and view, or <code>null</code>
+	 * @return the prepared model and view, or {@code null}
 	 * @throws Exception in case of errors
 	 * @see #onSubmit(Object, BindException)
 	 * @see #doSubmitAction
@@ -388,7 +388,7 @@ public class SimpleFormController extends AbstractFormController {
 	}
 
 	/**
-	 * Simpler <code>onSubmit</code> variant.
+	 * Simpler {@code onSubmit} variant.
 	 * Called by the default implementation of the
 	 * {@link #onSubmit(HttpServletRequest, HttpServletResponse, Object, BindException)}
 	 * variant with all parameters.
@@ -398,7 +398,7 @@ public class SimpleFormController extends AbstractFormController {
 	 * and Errors instance as model.
 	 * <p>Subclasses can override this to provide custom submission handling that
 	 * does not need request and response.
-	 * <p>Call <code>errors.getModel()</code> to populate the ModelAndView model
+	 * <p>Call {@code errors.getModel()} to populate the ModelAndView model
 	 * with the command and the Errors instance, under the specified command name,
 	 * as expected by the "spring:bind" tag.
 	 * @param command form object with request parameters bound onto it
@@ -427,10 +427,10 @@ public class SimpleFormController extends AbstractFormController {
 	}
 
 	/**
-	 * Simplest <code>onSubmit</code> variant. Called by the default implementation
+	 * Simplest {@code onSubmit} variant. Called by the default implementation
 	 * of the {@link #onSubmit(Object, BindException)} variant.
 	 * <p>This implementation calls {@link #doSubmitAction(Object)} and returns
-	 * <code>null</code> as ModelAndView, making the calling <code>onSubmit</code>
+	 * {@code null} as ModelAndView, making the calling {@code onSubmit}
 	 * method perform its default rendering of the success view.
 	 * <p>Subclasses can override this to provide custom submission handling
 	 * that just depends on the command object. It's preferable to use either
@@ -438,7 +438,7 @@ public class SimpleFormController extends AbstractFormController {
 	 * though: Use the former when you want to build your own ModelAndView; use the
 	 * latter when you want to perform an action and forward to the successView.
 	 * @param command form object with request parameters bound onto it
-	 * @return the prepared model and view, or <code>null</code> for default
+	 * @return the prepared model and view, or {@code null} for default
 	 * (that is, rendering the configured "successView")
 	 * @throws Exception in case of errors
 	 * @see #onSubmit(Object, BindException)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java
index faff41fb9f..cdf0a54e91 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java
@@ -24,7 +24,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.HandlerMapping;
 
 /**
- * Simple <code>Controller</code> implementation that transforms the virtual
+ * Simple {@code Controller} implementation that transforms the virtual
  * path of a URL into a view name and returns that view.
  *
  * <p>Can optionally prepend a {@link #setPrefix prefix} and/or append a
@@ -33,10 +33,10 @@ import org.springframework.web.servlet.HandlerMapping;
  * <p>Find below some examples:
  *
  * <ol>
- *   <li><code>"/index" -> "index"</code></li>
- *   <li><code>"/index.html" -> "index"</code></li>
- *   <li><code>"/index.html"</code> + prefix <code>"pre_"</code> and suffix <code>"_suf" -> "pre_index_suf"</code></li>
- *   <li><code>"/products/view.html" -> "products/view"</code></li>
+ *   <li>{@code "/index" -> "index"}</li>
+ *   <li>{@code "/index.html" -> "index"}</li>
+ *   <li>{@code "/index.html"} + prefix {@code "pre_"} and suffix {@code "_suf" -> "pre_index_suf"}</li>
+ *   <li>{@code "/products/view.html" -> "products/view"}</li>
  * </ol>
  *
  * <p>Thanks to David Barri for suggesting prefix/suffix support!
@@ -118,8 +118,8 @@ public class UrlFilenameViewController extends AbstractUrlViewController {
 	/**
 	 * Returns view name based on the URL filename,
 	 * with prefix/suffix applied when appropriate.
-	 * @param uri the request URI; for example <code>"/index.html"</code>
-	 * @return the extracted URI filename; for example <code>"index"</code>
+	 * @param uri the request URI; for example {@code "/index.html"}
+	 * @return the extracted URI filename; for example {@code "index"}
 	 * @see #extractViewNameFromUrlPath
 	 * @see #postProcessViewName
 	 */
@@ -135,8 +135,8 @@ public class UrlFilenameViewController extends AbstractUrlViewController {
 
 	/**
 	 * Extract the URL filename from the given request URI.
-	 * @param uri the request URI; for example <code>"/index.html"</code>
-	 * @return the extracted URI filename; for example <code>"index"</code>
+	 * @param uri the request URI; for example {@code "/index.html"}
+	 * @return the extracted URI filename; for example {@code "index"}
 	 */
 	protected String extractViewNameFromUrlPath(String uri) {
 		int start = (uri.charAt(0) == '/' ? 1 : 0);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
index f7aef89a17..604bea9b6c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
@@ -168,7 +168,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle
 	 * and various Ant-style pattern matches, e.g. a registered "/t*" matches
 	 * both "/test" and "/team". For details, see the AntPathMatcher class.
 	 * @param urlPath URL the bean is mapped to
-	 * @return the associated cache seconds, or <code>null</code> if not found
+	 * @return the associated cache seconds, or {@code null} if not found
 	 * @see org.springframework.util.AntPathMatcher
 	 */
 	protected Integer lookupCacheSeconds(String urlPath) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
index 5ed48aee95..f531044c08 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
@@ -247,7 +247,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 
 	/**
 	 * Set the MethodNameResolver to use for resolving default handler methods
-	 * (carrying an empty <code>@RequestMapping</code> annotation).
+	 * (carrying an empty {@code @RequestMapping} annotation).
 	 * <p>Will only kick in when the handler method cannot be resolved uniquely
 	 * through the annotation metadata already.
 	 */
@@ -274,11 +274,11 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 	}
 
 	/**
-	 * Cache content produced by <code>@SessionAttributes</code> annotated handlers
+	 * Cache content produced by {@code @SessionAttributes} annotated handlers
 	 * for the given number of seconds. Default is 0, preventing caching completely.
 	 * <p>In contrast to the "cacheSeconds" property which will apply to all general handlers
-	 * (but not to <code>@SessionAttributes</code> annotated handlers), this setting will
-	 * apply to <code>@SessionAttributes</code> annotated handlers only.
+	 * (but not to {@code @SessionAttributes} annotated handlers), this setting will
+	 * apply to {@code @SessionAttributes} annotated handlers only.
 	 * @see #setCacheSeconds
 	 * @see org.springframework.web.bind.annotation.SessionAttributes
 	 */
@@ -289,13 +289,13 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 	/**
 	 * Set if controller execution should be synchronized on the session,
 	 * to serialize parallel invocations from the same client.
-	 * <p>More specifically, the execution of the <code>handleRequestInternal</code>
+	 * <p>More specifically, the execution of the {@code handleRequestInternal}
 	 * method will get synchronized if this flag is "true". The best available
 	 * session mutex will be used for the synchronization; ideally, this will
 	 * be a mutex exposed by HttpSessionMutexListener.
 	 * <p>The session mutex is guaranteed to be the same object during
 	 * the entire lifetime of the session, available under the key defined
-	 * by the <code>SESSION_MUTEX_ATTRIBUTE</code> constant. It serves as a
+	 * by the {@code SESSION_MUTEX_ATTRIBUTE} constant. It serves as a
 	 * safe reference to synchronize on for locking on the current session.
 	 * <p>In many cases, the HttpSession reference itself is a safe mutex
 	 * as well, since it will always be the same object reference for the
@@ -370,7 +370,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 
 	/**
 	 * Specify the order value for this HandlerAdapter bean.
-	 * <p>Default value is <code>Integer.MAX_VALUE</code>, meaning that it's non-ordered.
+	 * <p>Default value is {@code Integer.MAX_VALUE}, meaning that it's non-ordered.
 	 * @see org.springframework.core.Ordered#getOrder()
 	 */
 	public void setOrder(int order) {
@@ -480,7 +480,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 	 * <p>The default implementation creates a standard ServletRequestDataBinder.
 	 * This can be overridden for custom ServletRequestDataBinder subclasses.
 	 * @param request current HTTP request
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @param objectName the objectName of the target object
 	 * @return the ServletRequestDataBinder instance to use
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
index 58b7401069..3683d67392 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
@@ -154,7 +154,7 @@ public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExc
 	 * Finds the handler method that matches the thrown exception best.
 	 * @param handler the handler object
 	 * @param thrownException the exception to be handled
-	 * @return the best matching method; or <code>null</code> if none is found
+	 * @return the best matching method; or {@code null} if none is found
 	 */
 	private Method findBestExceptionHandlerMethod(Object handler, final Exception thrownException) {
 		final Class<?> handlerType = ClassUtils.getUserClass(handler);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
index 2e3bfe49f7..34027fbfe3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
@@ -96,7 +96,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractDetectingUrlHandler
 	 * Set whether to register paths using the default suffix pattern as well:
 	 * i.e. whether "/users" should be registered as "/users.*" and "/users/" too.
 	 * <p>Default is "true". Turn this convention off if you intend to interpret
-	 * your <code>@RequestMapping</code> paths strictly.
+	 * your {@code @RequestMapping} paths strictly.
 	 * <p>Note that paths which include a ".xxx" suffix or end with "/" already will not be
 	 * transformed using the default suffix pattern in any case.
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java
index 3c0a43f211..a7580c500a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java
@@ -59,10 +59,10 @@ public class ResponseStatusExceptionResolver extends AbstractHandlerExceptionRes
 	 * @param responseStatus the annotation
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @param handler the executed handler, or <code>null</code> if none chosen at the time of the exception
+	 * @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</code> for default processing
+	 * @return a corresponding ModelAndView to forward to, or {@code null} for default processing
 	 */
 	protected ModelAndView resolveResponseStatus(ResponseStatus responseStatus, HttpServletRequest request,
 			HttpServletResponse response, Object handler, Exception ex) throws Exception {
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 b6028a667e..d6bce0d482 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
@@ -43,7 +43,7 @@ public abstract class AbstractHandlerMethodAdapter extends WebContentGenerator i
 
 	/**
 	 * Specify the order value for this HandlerAdapter bean.
-	 * <p>Default value is <code>Integer.MAX_VALUE</code>, meaning that it's non-ordered.
+	 * <p>Default value is {@code Integer.MAX_VALUE}, meaning that it's non-ordered.
 	 * @see org.springframework.core.Ordered#getOrder()
 	 */
 	public void setOrder(int order) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java
index 51c021abd7..061aa1437f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java
@@ -36,7 +36,7 @@ public class ExtendedServletRequestDataBinder extends ServletRequestDataBinder {
 
 	/**
 	 * Create a new instance, with default object name.
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @see #DEFAULT_OBJECT_NAME
 	 */
@@ -46,7 +46,7 @@ public class ExtendedServletRequestDataBinder extends ServletRequestDataBinder {
 
 	/**
 	 * Create a new instance.
-	 * @param target the target object to bind onto (or <code>null</code>
+	 * @param target the target object to bind onto (or {@code null}
 	 * if the binder is just used to convert a plain parameter value)
 	 * @param objectName the name of the target object
 	 * @see #DEFAULT_OBJECT_NAME
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 1b8da1a5ee..f4bb235b09 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
@@ -418,11 +418,11 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter i
 	}
 
 	/**
-	 * Cache content produced by <code>@SessionAttributes</code> annotated handlers
+	 * Cache content produced by {@code @SessionAttributes} annotated handlers
 	 * for the given number of seconds. Default is 0, preventing caching completely.
 	 * <p>In contrast to the "cacheSeconds" property which will apply to all general
-	 * handlers (but not to <code>@SessionAttributes</code> annotated handlers),
-	 * this setting will apply to <code>@SessionAttributes</code> handlers only.
+	 * handlers (but not to {@code @SessionAttributes} annotated handlers),
+	 * this setting will apply to {@code @SessionAttributes} handlers only.
 	 * @see #setCacheSeconds
 	 * @see org.springframework.web.bind.annotation.SessionAttributes
 	 */
@@ -433,13 +433,13 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter i
 	/**
 	 * Set if controller execution should be synchronized on the session,
 	 * to serialize parallel invocations from the same client.
-	 * <p>More specifically, the execution of the <code>handleRequestInternal</code>
+	 * <p>More specifically, the execution of the {@code handleRequestInternal}
 	 * method will get synchronized if this flag is "true". The best available
 	 * session mutex will be used for the synchronization; ideally, this will
 	 * be a mutex exposed by HttpSessionMutexListener.
 	 * <p>The session mutex is guaranteed to be the same object during
 	 * the entire lifetime of the session, available under the key defined
-	 * by the <code>SESSION_MUTEX_ATTRIBUTE</code> constant. It serves as a
+	 * by the {@code SESSION_MUTEX_ATTRIBUTE} constant. It serves as a
 	 * safe reference to synchronize on for locking on the current session.
 	 * <p>In many cases, the HttpSession reference itself is a safe mutex
 	 * as well, since it will always be the same object reference for the
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java
index 039fcb7b35..605d57a552 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java
@@ -1,8 +1,7 @@
-
 /**
  *
  * Servlet-based infrastructure for handler method processing,
- * building on the <code>org.springframework.web.method</code> package.
+ * building on the {@code org.springframework.web.method} package.
  *
  */
 package org.springframework.web.servlet.mvc.method;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java
index a43cece2df..444b45dce5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java
@@ -81,8 +81,8 @@ public abstract class AbstractUrlMethodNameResolver implements MethodNameResolve
 
 	/**
 	 * Retrieves the URL path to use for lookup and delegates to
-	 * <code>getHandlerMethodNameForUrlPath</code>.
-	 * Converts <code>null</code> values to NoSuchRequestHandlingMethodExceptions.
+	 * {@code getHandlerMethodNameForUrlPath}.
+	 * Converts {@code null} values to NoSuchRequestHandlingMethodExceptions.
 	 * @see #getHandlerMethodNameForUrlPath
 	 */
 	public final String getHandlerMethodName(HttpServletRequest request)
@@ -101,7 +101,7 @@ public abstract class AbstractUrlMethodNameResolver implements MethodNameResolve
 
 	/**
 	 * Return a method name that can handle this request, based on the
-	 * given lookup path. Called by <code>getHandlerMethodName</code>.
+	 * given lookup path. Called by {@code getHandlerMethodName}.
 	 * @param urlPath the URL path to use for lookup,
 	 * according to the settings in this class
 	 * @return a method name that can handle this request.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/InternalPathMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/InternalPathMethodNameResolver.java
index 9b69f39466..f81e806b07 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/InternalPathMethodNameResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/InternalPathMethodNameResolver.java
@@ -97,7 +97,7 @@ public class InternalPathMethodNameResolver extends AbstractUrlMethodNameResolve
 
 	/**
 	 * Extract the handler method name from the given request URI.
-	 * Delegates to <code>WebUtils.extractViewNameFromUrlPath(String)</code>.
+	 * Delegates to {@code WebUtils.extractViewNameFromUrlPath(String)}.
 	 * @param uri the request URI (e.g. "/index.html")
 	 * @return the extracted URI filename (e.g. "index")
 	 * @see org.springframework.web.util.WebUtils#extractFilenameFromUrlPath
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java
index 53740ed959..4df1b6acff 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java
@@ -36,7 +36,7 @@ public interface MethodNameResolver {
 	 * mappings are typically, but not necessarily, based on URL.
 	 * @param request current HTTP request
 	 * @return a method name that can handle this request.
-	 * Never returns <code>null</code>; throws exception if not resolvable.
+	 * Never returns {@code null}; throws exception if not resolvable.
 	 * @throws NoSuchRequestHandlingMethodException if no handler method
 	 * can be found for the given request
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java
index f88c921c91..77fc742104 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java
@@ -68,21 +68,21 @@ import org.springframework.web.servlet.mvc.LastModified;
  * {@link org.springframework.web.servlet.RequestToViewNameTranslator} will be
  * used to determine the view name.
  *
- * <p>When returning <code>void</code> a return value of <code>null</code> is
+ * <p>When returning {@code void} a return value of {@code null} is
  * assumed meaning that the handler method is responsible for writing the
  * response directly to the supplied {@link HttpServletResponse}.
  *
  * <p>This model allows for rapid coding, but loses the advantage of
- * compile-time checking. It is similar to a Struts <code>DispatchAction</code>,
+ * compile-time checking. It is similar to a Struts {@code DispatchAction},
  * but more sophisticated. Also supports delegation to another object.
  *
  * <p>An implementation of the {@link MethodNameResolver} interface defined in
  * this package should return a method name for a given request, based on any
  * aspect of the request, such as its URL or an "action" parameter. The actual
  * strategy can be configured via the "methodNameResolver" bean property, for
- * each <code>MultiActionController</code>.
+ * each {@code MultiActionController}.
  *
- * <p>The default <code>MethodNameResolver</code> is
+ * <p>The default {@code MethodNameResolver} is
  * {@link InternalPathMethodNameResolver}; further included strategies are
  * {@link PropertiesMethodNameResolver} and {@link ParameterMethodNameResolver}.
  *
@@ -94,13 +94,13 @@ import org.springframework.web.servlet.mvc.LastModified;
  * The third parameter can be any subclass or {@link Exception} or
  * {@link RuntimeException}.
  *
- * <p>There can also be an optional <code>xxxLastModified</code> method for
+ * <p>There can also be an optional {@code xxxLastModified} method for
  * handlers, of signature:
  *
  * <pre class="code">public long anyMeaningfulNameLastModified(HttpServletRequest request)</pre>
  *
  * If such a method is present, it will be invoked. Default return from
- * <code>getLastModified</code> is -1, meaning that the content must always be
+ * {@code getLastModified} is -1, meaning that the content must always be
  * regenerated.
  *
  * <p><b>Note that all handler methods need to be public and that
@@ -172,7 +172,7 @@ public class MultiActionController extends AbstractController implements LastMod
 
 
 	/**
-	 * Constructor for <code>MultiActionController</code> that looks for
+	 * Constructor for {@code MultiActionController} that looks for
 	 * handler methods in the present subclass.
 	 */
 	public MultiActionController() {
@@ -182,7 +182,7 @@ public class MultiActionController extends AbstractController implements LastMod
 	}
 
 	/**
-	 * Constructor for <code>MultiActionController</code> that looks for
+	 * Constructor for {@code MultiActionController} that looks for
 	 * handler methods in delegate, rather than a subclass of this class.
 	 * @param delegate handler object. This does not need to implement any
 	 * particular interface, as everything is done using reflection.
@@ -193,7 +193,7 @@ public class MultiActionController extends AbstractController implements LastMod
 
 
 	/**
-	 * Set the delegate used by this class; the default is <code>this</code>,
+	 * Set the delegate used by this class; the default is {@code this},
 	 * assuming that handler methods have been added by a subclass.
 	 * <p>This method does not get invoked once the class is configured.
 	 * @param delegate an object containing handler methods
@@ -226,7 +226,7 @@ public class MultiActionController extends AbstractController implements LastMod
 
 	/**
 	 * Set the {@link Validator Validators} for this controller.
-	 * <p>The <code>Validators</code> must support the specified command class.
+	 * <p>The {@code Validators} must support the specified command class.
 	 */
 	public final void setValidators(Validator[] validators) {
 		this.validators = validators;
@@ -283,7 +283,7 @@ public class MultiActionController extends AbstractController implements LastMod
 
 	/**
 	 * Is the supplied method a valid handler method?
-	 * <p>Does not consider <code>Controller.handleRequest</code> itself
+	 * <p>Does not consider {@code Controller.handleRequest} itself
 	 * as handler method (to avoid potential stack overflow).
 	 */
 	private boolean isHandlerMethod(Method method) {
@@ -420,7 +420,7 @@ public class MultiActionController extends AbstractController implements LastMod
 	 * @param ex the NoSuchRequestHandlingMethodException to be handled
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @return a ModelAndView to render, or <code>null</code> if handled directly
+	 * @return a ModelAndView to render, or {@code null} if handled directly
 	 * @throws Exception an Exception that should be thrown as result of the servlet request
 	 */
 	protected ModelAndView handleNoSuchRequestHandlingMethod(
@@ -483,7 +483,7 @@ public class MultiActionController extends AbstractController implements LastMod
 
 	/**
 	 * Processes the return value of a handler method to ensure that it either returns
-	 * <code>null</code> or an instance of {@link ModelAndView}. When returning a {@link Map},
+	 * {@code null} or an instance of {@link ModelAndView}. When returning a {@link Map},
 	 * the {@link Map} instance is wrapped in a new {@link ModelAndView} instance.
 	 */
 	@SuppressWarnings("unchecked")
@@ -507,7 +507,7 @@ public class MultiActionController extends AbstractController implements LastMod
 
 	/**
 	 * Create a new command object of the given class.
-	 * <p>This implementation uses <code>BeanUtils.instantiateClass</code>,
+	 * <p>This implementation uses {@code BeanUtils.instantiateClass},
 	 * so commands need to have public no-arg constructors.
 	 * Subclasses can override this implementation if desired.
 	 * @throws Exception if the command object could not be instantiated
@@ -542,10 +542,10 @@ public class MultiActionController extends AbstractController implements LastMod
 
 	/**
 	 * Create a new binder instance for the given command and request.
-	 * <p>Called by <code>bind</code>. Can be overridden to plug in custom
+	 * <p>Called by {@code bind}. Can be overridden to plug in custom
 	 * ServletRequestDataBinder subclasses.
 	 * <p>The default implementation creates a standard ServletRequestDataBinder,
-	 * and invokes <code>initBinder</code>. Note that <code>initBinder</code>
+	 * and invokes {@code initBinder}. Note that {@code initBinder}
 	 * will not be invoked if you override this method!
 	 * @param request current HTTP request
 	 * @param command the command to bind onto
@@ -573,7 +573,7 @@ public class MultiActionController extends AbstractController implements LastMod
 
 	/**
 	 * Initialize the given binder instance, for example with custom editors.
-	 * Called by <code>createBinder</code>.
+	 * Called by {@code createBinder}.
 	 * <p>This method allows you to register custom editors for certain fields of your
 	 * command class. For instance, you will be able to transform Date objects into a
 	 * String pattern and back, in order to allow your JavaBeans to have Date properties
@@ -597,8 +597,8 @@ public class MultiActionController extends AbstractController implements LastMod
 
 	/**
 	 * Determine the exception handler method for the given exception.
-	 * <p>Can return <code>null</code> if not found.
-	 * @return a handler for the given exception type, or <code>null</code>
+	 * <p>Can return {@code null} if not found.
+	 * @return a handler for the given exception type, or {@code null}
 	 * @param exception the exception to handle
 	 */
 	protected Method getExceptionHandler(Throwable exception) {
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 003ab61ef8..8c5d93844d 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
@@ -33,14 +33,14 @@ import org.springframework.web.util.WebUtils;
  *
  * <p>The simplest strategy looks for a specific named parameter, whose value is
  * considered the name of the method to invoke. The name of the parameter may be
- * specified as a JavaBean property, if the default <code>action</code> is not
+ * specified as a JavaBean property, if the default {@code action} is not
  * acceptable.
  *
  * <p>The alternative strategy uses the very existence of a request parameter (
  * i.e. a request parameter with a certain name is found) as an indication that a
  * method with the same name should be dispatched to. In this case, the actual
  * request parameter value is ignored. The list of parameter/method names may
- * be set via the <code>methodParamNames<code> JavaBean property.
+ * be set via the {@code methodParamNames} JavaBean property.
  *
  * <p>The second resolution strategy is primarily expected to be used with web
  * pages containing multiple submit buttons. The 'name' attribute of each
@@ -52,7 +52,7 @@ import org.springframework.web.util.WebUtils;
  * type 'image'. That is, an image submit button named 'reset' will normally be
  * submitted by the browser as two request paramters called 'reset.x', and
  * 'reset.y'. When checking for the existence of a paramter from the
- * <code>methodParamNames</code> list, to indicate that a specific method should
+ * {@code methodParamNames} list, to indicate that a specific method should
  * be called, the code will look for request parameter in the "reset" form
  * (exactly as spcified in the list), and in the "reset.x" form ('.x' appended to
  * the name in the list). In this way it can handle both normal and image submit
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
index 96bdac9c30..ed43904a3f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
@@ -26,14 +26,14 @@ import org.springframework.util.PathMatcher;
 
 /**
  * The most flexible out-of-the-box implementation of the {@link MethodNameResolver}
- * interface. Uses <code>java.util.Properties</code> to define the mapping
+ * interface. Uses {@code java.util.Properties} to define the mapping
  * between the URL of incoming requests and the corresponding method name.
  * Such properties can be held in an XML document.
  *
  * <p>Properties format is
- * <code>
+ * {@code
  * /welcome.html=displayGenresPage
- * </code>
+ * }
  * Note that method overloading isn't allowed, so there's no need to
  * specify arguments.
  *
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 3f8948780b..55998febda 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,4 +1,3 @@
-
 /**
  *
  * <p>
@@ -8,9 +7,9 @@
  * </p>
  *
  * <p>
- *     A <code>Controller</code> - as defined in this package - is analogous to a Struts
- *     <code>Action</code>. Usually <code>Controllers</code> are JavaBeans
- *     to allow easy configuration. Controllers define the <code>C</code> from so-called
+ *     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
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 478752851c..40f7aa68d5 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
@@ -77,7 +77,7 @@ public abstract class AbstractControllerUrlHandlerMapping extends AbstractDetect
 
 	/**
 	 * This implementation delegates to {@link #buildUrlsForHandler},
-	 * provided that {@link #isEligibleForMapping} returns <code>true</code>.
+	 * provided that {@link #isEligibleForMapping} returns {@code true}.
 	 */
 	@Override
 	protected String[] determineUrlsForHandler(String beanName) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java
index 7be0a9e65f..c824754eb1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Controller;
 
 /**
  * Extension of {@link ControllerTypePredicate} that detects
- * annotated <code>@Controller</code/> beans as well.
+ * annotated {@code @Controller} beans as well.
  *
  * @author Juergen Hoeller
  * @since 2.5.3
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java
index 357834ca29..6977c4e559 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java
@@ -25,7 +25,7 @@ import org.springframework.util.StringUtils;
  * Implementation of {@link org.springframework.web.servlet.HandlerMapping} that
  * follows a simple convention for generating URL path mappings from the <i>bean names</i>
  * of registered {@link org.springframework.web.servlet.mvc.Controller} beans
- * as well as <code>@Controller</code> annotated beans.
+ * as well as {@code @Controller} annotated beans.
  *
  * <p>This is similar to {@link org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping}
  * but doesn't expect bean names to follow the URL convention: It turns plain bean names
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java
index 119f9e953d..34a3e0a2e8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java
@@ -24,24 +24,24 @@ import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
  * Implementation of {@link org.springframework.web.servlet.HandlerMapping} that
  * follows a simple convention for generating URL path mappings from the <i>class names</i>
  * of registered {@link org.springframework.web.servlet.mvc.Controller} beans
- * as well as <code>@Controller</code> annotated beans.
+ * as well as {@code @Controller} annotated beans.
  *
  * <p>For simple {@link org.springframework.web.servlet.mvc.Controller} implementations
  * (those that handle a single request type), the convention is to take the
- * {@link ClassUtils#getShortName short name} of the <code>Class</code>,
+ * {@link ClassUtils#getShortName short name} of the {@code Class},
  * remove the 'Controller' suffix if it exists and return the remaining text, lower-cased,
- * as the mapping, with a leading <code>/</code>. For example:
+ * as the mapping, with a leading {@code /}. For example:
  * <ul>
- * <li><code>WelcomeController</code> -> <code>/welcome*</code></li>
- * <li><code>HomeController</code> -> <code>/home*</code></li>
+ * <li>{@code WelcomeController} -> {@code /welcome*}</li>
+ * <li>{@code HomeController} -> {@code /home*}</li>
  * </ul>
  *
- * <p>For {@link MultiActionController MultiActionControllers} and <code>@Controller</code>
+ * <p>For {@link MultiActionController MultiActionControllers} and {@code @Controller}
  * beans, a similar mapping is registered, except that all sub-paths are registered
- * using the trailing wildcard pattern <code>/*</code>. For example:
+ * using the trailing wildcard pattern {@code /*}. For example:
  * <ul>
- * <li><code>WelcomeController</code> -> <code>/welcome</code>, <code>/welcome/*</code></li>
- * <li><code>CatalogController</code> -> <code>/catalog</code>, <code>/catalog/*</code></li>
+ * <li>{@code WelcomeController} -> {@code /welcome}, {@code /welcome/*}</li>
+ * <li>{@code CatalogController} -> {@code /catalog}, {@code /catalog/*}</li>
  * </ul>
  *
  * <p>For {@link MultiActionController} it is often useful to use
@@ -104,7 +104,7 @@ public class ControllerClassNameHandlerMapping extends AbstractControllerUrlHand
 	/**
 	 * Set the base package to be used for generating path mappings,
 	 * including all subpackages underneath this packages as path elements.
-	 * <p>Default is <code>null</code>, using the short class name for the
+	 * <p>Default is {@code null}, using the short class name for the
 	 * generated path, with the controller's package not represented in the path.
 	 * Specify a base package like "com.mycompany.myapp" to include subpackages
 	 * within that base package as path elements, e.g. generating the path
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
index ccd9aa03f0..3b88b5400d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java
@@ -162,7 +162,7 @@ public class DefaultHandlerExceptionResolver extends AbstractHandlerExceptionRes
 	 * @param ex the NoSuchRequestHandlingMethodException to be handled
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @param handler the executed handler, or <code>null</code> if none chosen
+	 * @param handler the executed handler, or {@code null} if none chosen
 	 * at the time of the exception (for example, if multipart resolution failed)
 	 * @return an empty ModelAndView indicating the exception was handled
 	 * @throws IOException potentially thrown from response.sendError()
@@ -183,7 +183,7 @@ public class DefaultHandlerExceptionResolver extends AbstractHandlerExceptionRes
 	 * @param ex the HttpRequestMethodNotSupportedException to be handled
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @param handler the executed handler, or <code>null</code> if none chosen
+	 * @param handler the executed handler, or {@code null} if none chosen
 	 * at the time of the exception (for example, if multipart resolution failed)
 	 * @return an empty ModelAndView indicating the exception was handled
 	 * @throws IOException potentially thrown from response.sendError()
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 a4cc6669a5..4c1ca19ef1 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
@@ -196,7 +196,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator implements H
 	/**
 	 * Determine an appropriate media type for the given resource.
 	 * @param resource the resource to check
-	 * @return the corresponding media type, or <code>null</code> if none found
+	 * @return the corresponding media type, or {@code null} if none found
 	 */
 	protected MediaType getMediaType(Resource resource) {
 		MediaType mediaType = null;
@@ -217,8 +217,8 @@ public class ResourceHttpRequestHandler extends WebContentGenerator implements H
 	 * Set headers on the given servlet response.
 	 * Called for GET requests as well as HEAD requests.
 	 * @param response current servlet response
-	 * @param resource the identified resource (never <code>null</code>)
-	 * @param mediaType the resource's media type (never <code>null</code>)
+	 * @param resource the identified resource (never {@code null})
+	 * @param mediaType the resource's media type (never {@code null})
 	 * @throws IOException in case of errors while setting the headers
 	 */
 	protected void setHeaders(HttpServletResponse response, Resource resource, MediaType mediaType) throws IOException {
@@ -237,7 +237,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator implements H
 	 * Write the actual content out to the given servlet response,
 	 * streaming the resource's content.
 	 * @param response current servlet response
-	 * @param resource the identified resource (never <code>null</code>)
+	 * @param resource the identified resource (never {@code null})
 	 * @throws IOException in case of errors while writing the content
 	 */
 	protected void writeContent(HttpServletResponse response, Resource resource) throws IOException {
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 123632c6b3..e78a6ac549 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
@@ -190,7 +190,7 @@ public class BindStatus {
 
 	/**
 	 * Return a bind expression that can be used in HTML forms as input name
-	 * for the respective field, or <code>null</code> if not field-specific.
+	 * for the respective field, or {@code null} if not field-specific.
 	 * <p>Returns a bind path appropriate for resubmission, e.g. "address.street".
 	 * Note that the complete bind path as required by the bind tag is
 	 * "customer.address.street", if bound to a "customer" bean.
@@ -201,7 +201,7 @@ public class BindStatus {
 
 	/**
 	 * Return the current value of the field, i.e. either the property value
-	 * or a rejected update, or <code>null</code> if not field-specific.
+	 * or a rejected update, or {@code null} if not field-specific.
 	 * <p>This value will be an HTML-escaped String if the original value
 	 * already was a String.
 	 */
@@ -210,9 +210,9 @@ public class BindStatus {
 	}
 
 	/**
-	 * Get the '<code>Class</code>' type of the field. Favor this instead of
-	 * '<code>getValue().getClass()</code>' since '<code>getValue()</code>' may
-	 * return '<code>null</code>'.
+	 * Get the '{@code Class}' type of the field. Favor this instead of
+	 * '{@code getValue().getClass()}' since '{@code getValue()}' may
+	 * return '{@code null}'.
 	 */
 	public Class getValueType() {
 		return this.valueType;
@@ -220,7 +220,7 @@ public class BindStatus {
 
 	/**
 	 * Return the actual value of the field, i.e. the raw property value,
-	 * or <code>null</code> if not available.
+	 * or {@code null} if not available.
 	 */
 	public Object getActualValue() {
 		return this.actualValue;
@@ -230,7 +230,7 @@ public class BindStatus {
 	 * Return a suitable display value for the field, i.e. the stringified
 	 * value if not null, and an empty string in case of a null value.
 	 * <p>This value will be an HTML-escaped String if the original value
-	 * was non-null: the <code>toString</code> result of the original value
+	 * was non-null: the {@code toString} result of the original value
 	 * will get HTML-escaped.
 	 */
 	public String getDisplayValue() {
@@ -296,7 +296,7 @@ public class BindStatus {
 	/**
 	 * Return the Errors instance (typically a BindingResult) that this
 	 * bind status is currently associated with.
-	 * @return the current Errors instance, or <code>null</code> if none
+	 * @return the current Errors instance, or {@code null} if none
 	 * @see org.springframework.validation.BindingResult
 	 */
 	public Errors getErrors() {
@@ -306,7 +306,7 @@ public class BindStatus {
 	/**
 	 * Return the PropertyEditor for the property that this bind status
 	 * is currently bound to.
-	 * @return the current PropertyEditor, or <code>null</code> if none
+	 * @return the current PropertyEditor, or {@code null} if none
 	 */
 	public PropertyEditor getEditor() {
 		return this.editor;
@@ -316,7 +316,7 @@ public class BindStatus {
 	 * Find a PropertyEditor for the given value class, associated with
 	 * the property that this bound status is currently bound to.
 	 * @param valueClass the value class that an editor is needed for
-	 * @return the associated PropertyEditor, or <code>null</code> if none
+	 * @return the associated PropertyEditor, or {@code null} if none
 	 */
 	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/JspAwareRequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
index 0db0668ab5..4b44bd9832 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
@@ -25,7 +25,7 @@ import javax.servlet.jsp.jstl.core.Config;
 
 /**
  * JSP-aware (and JSTL-aware) subclass of RequestContext, allowing for
- * population of the context from a <code>javax.servlet.jsp.PageContext</code>.
+ * population of the context from a {@code javax.servlet.jsp.PageContext}.
  *
  * <p>This context will detect a JSTL locale attribute in page/request/session/application
  * scope, in addition to the fallback locale strategy provided by the base class.
@@ -53,7 +53,7 @@ public class JspAwareRequestContext extends RequestContext {
 	 * using the given model attributes for Errors retrieval.
 	 * @param pageContext current JSP page context
 	 * @param model the model attributes for the current view
-	 * (can be <code>null</code>, using the request attributes for Errors retrieval)
+	 * (can be {@code null}, using the request attributes for Errors retrieval)
 	 */
 	public JspAwareRequestContext(PageContext pageContext, Map<String, Object> model) {
 		initContext(pageContext, model);
@@ -64,7 +64,7 @@ public class JspAwareRequestContext extends RequestContext {
 	 * using the given model attributes for Errors retrieval.
 	 * @param pageContext current JSP page context
 	 * @param model the model attributes for the current view
-	 * (can be <code>null</code>, using the request attributes for Errors retrieval)
+	 * (can be {@code null}, using the request attributes for Errors retrieval)
 	 */
 	protected void initContext(PageContext pageContext, Map<String, Object> model) {
 		if (!(pageContext.getRequest() instanceof HttpServletRequest)) {
@@ -87,7 +87,7 @@ public class JspAwareRequestContext extends RequestContext {
 	/**
 	 * This implementation checks for a JSTL locale attribute
 	 * in page, request, session or application scope; if not found,
-	 * returns the <code>HttpServletRequest.getLocale()</code>.
+	 * returns the {@code HttpServletRequest.getLocale()}.
 	 */
 	@Override
 	protected Locale getFallbackLocale() {
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 46525caae9..34d44b5c72 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
@@ -43,7 +43,7 @@ public abstract class JstlUtils {
 	 * context-param and creates a corresponding child message source,
 	 * with the provided Spring-defined MessageSource as parent.
 	 * @param servletContext the ServletContext we're running in
-	 * (to check JSTL-related context-params in <code>web.xml</code>)
+	 * (to check JSTL-related context-params in {@code web.xml})
 	 * @param messageSource the MessageSource to expose, typically
 	 * the ApplicationContext of the current DispatcherServlet
 	 * @return the MessageSource to expose to JSTL; first checking the
@@ -74,7 +74,7 @@ public abstract class JstlUtils {
 	 * using Spring's locale and MessageSource.
 	 * @param request the current HTTP request
 	 * @param messageSource the MessageSource to expose,
-	 * typically the current ApplicationContext (may be <code>null</code>)
+	 * typically the current ApplicationContext (may be {@code null})
 	 * @see #exposeLocalizationContext(RequestContext)
 	 */
 	public static void exposeLocalizationContext(HttpServletRequest request, MessageSource messageSource) {
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 9d10b61b26..e5a7464621 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
@@ -130,7 +130,7 @@ public class RequestContext {
 	 * request attributes. It will typically be used within JSPs or custom tags. <p>If a ServletContext is specified,
 	 * the RequestContext will also work with the root WebApplicationContext (outside a DispatcherServlet).
 	 * @param request current HTTP request
-	 * @param servletContext the servlet context of the web application (can be <code>null</code>; necessary for
+	 * @param servletContext the servlet context of the web application (can be {@code null}; necessary for
 	 * fallback to root WebApplicationContext)
 	 * @see org.springframework.web.context.WebApplicationContext
 	 * @see org.springframework.web.servlet.DispatcherServlet
@@ -145,7 +145,7 @@ public class RequestContext {
 	 * within a DispatcherServlet request.</b> Pass in a ServletContext to be able to fallback to the root
 	 * WebApplicationContext.
 	 * @param request current HTTP request
-	 * @param model the model attributes for the current view (can be <code>null</code>, using the request attributes
+	 * @param model the model attributes for the current view (can be {@code null}, using the request attributes
 	 * for Errors retrieval)
 	 * @see org.springframework.web.servlet.DispatcherServlet
 	 * @see #RequestContext(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.ServletContext, Map)
@@ -160,9 +160,9 @@ public class RequestContext {
 	 * specified, the RequestContext will also work with a root WebApplicationContext (outside a DispatcherServlet).
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @param servletContext the servlet context of the web application (can be <code>null</code>; necessary for
+	 * @param servletContext the servlet context of the web application (can be {@code null}; necessary for
 	 * fallback to root WebApplicationContext)
-	 * @param model the model attributes for the current view (can be <code>null</code>, using the request attributes
+	 * @param model the model attributes for the current view (can be {@code null}, using the request attributes
 	 * for Errors retrieval)
 	 * @see org.springframework.web.context.WebApplicationContext
 	 * @see org.springframework.web.servlet.DispatcherServlet
@@ -181,12 +181,12 @@ public class RequestContext {
 
 	/**
 	 * Initialize this context with the given request, using the given model attributes for Errors retrieval.
-	 * <p>Delegates to <code>getFallbackLocale</code> and <code>getFallbackTheme</code> for determining the fallback
+	 * <p>Delegates to {@code getFallbackLocale} and {@code getFallbackTheme} for determining the fallback
 	 * locale and theme, respectively, if no LocaleResolver and/or ThemeResolver can be found in the request.
 	 * @param request current HTTP request
-	 * @param servletContext the servlet context of the web application (can be <code>null</code>; necessary for
+	 * @param servletContext the servlet context of the web application (can be {@code null}; necessary for
 	 * fallback to root WebApplicationContext)
-	 * @param model the model attributes for the current view (can be <code>null</code>, using the request attributes
+	 * @param model the model attributes for the current view (can be {@code null}, using the request attributes
 	 * for Errors retrieval)
 	 * @see #getFallbackLocale
 	 * @see #getFallbackTheme
@@ -234,8 +234,8 @@ public class RequestContext {
 
 	/**
 	 * Determine the fallback locale for this context. <p>The default implementation checks for a JSTL locale attribute
-	 * in request, session or application scope; if not found, returns the <code>HttpServletRequest.getLocale()</code>.
-	 * @return the fallback locale (never <code>null</code>)
+	 * in request, session or application scope; if not found, returns the {@code HttpServletRequest.getLocale()}.
+	 * @return the fallback locale (never {@code null})
 	 * @see javax.servlet.http.HttpServletRequest#getLocale()
 	 */
 	protected Locale getFallbackLocale() {
@@ -251,7 +251,7 @@ public class RequestContext {
 	/**
 	 * Determine the fallback theme for this context. <p>The default implementation returns the default theme (with name
 	 * "theme").
-	 * @return the fallback theme (never <code>null</code>)
+	 * @return the fallback theme (never {@code null})
 	 */
 	protected Theme getFallbackTheme() {
 		ThemeSource themeSource = RequestContextUtils.getThemeSource(getRequest());
@@ -295,21 +295,21 @@ public class RequestContext {
 
 	/**
 	 * Return the model Map that this RequestContext encapsulates, if any.
-	 * @return the populated model Map, or <code>null</code> if none available
+	 * @return the populated model Map, or {@code null} if none available
 	 */
 	public final Map<String, Object> getModel() {
 		return this.model;
 	}
 
 	/**
-	 * Return the current Locale (never <code>null</code>).
+	 * Return the current Locale (never {@code null}).
 	 */
 	public final Locale getLocale() {
 		return this.locale;
 	}
 
 	/**
-	 * Return the current theme (never <code>null</code>). <p>Resolved lazily for more efficiency when theme support is
+	 * Return the current theme (never {@code null}). <p>Resolved lazily for more efficiency when theme support is
 	 * not being used.
 	 */
 	public final Theme getTheme() {
@@ -334,7 +334,7 @@ public class RequestContext {
 	}
 
 	/**
-	 * Is default HTML escaping active? Falls back to <code>false</code> in case of no explicit default given.
+	 * Is default HTML escaping active? Falls back to {@code false} in case of no explicit default given.
 	 */
 	public boolean isDefaultHtmlEscape() {
 		return (this.defaultHtmlEscape != null && this.defaultHtmlEscape.booleanValue());
@@ -399,9 +399,9 @@ public class RequestContext {
 	}
 
 	/**
-	 * Return a context-aware URl for the given relative URL with placeholders (named keys with braces <code>{}</code>).
-	 * For example, send in a relative URL <code>foo/{bar}?spam={spam}</code> and a parameter map
-	 * <code>{bar=baz,spam=nuts}</code> and the result will be <code>[contextpath]/foo/baz?spam=nuts</code>.
+	 * Return a context-aware URl for the given relative URL with placeholders (named keys with braces {@code {}}).
+	 * For example, send in a relative URL {@code foo/{bar}?spam={spam}} and a parameter map
+	 * {@code {bar=baz,spam=nuts}} and the result will be {@code [contextpath]/foo/baz?spam=nuts}.
 	 *
 	 * @param relativeUrl the relative URL part
 	 * @param params a map of parameters to insert as placeholders in the url
@@ -473,7 +473,7 @@ public class RequestContext {
 	/**
 	 * Retrieve the message for the given code, using the "defaultHtmlEscape" setting.
 	 * @param code code of the message
-	 * @param args arguments for the message, or <code>null</code> if none
+	 * @param args arguments for the message, or {@code null} if none
 	 * @param defaultMessage String to return if the lookup fails
 	 * @return the message
 	 */
@@ -484,7 +484,7 @@ public class RequestContext {
 	/**
 	 * Retrieve the message for the given code, using the "defaultHtmlEscape" setting.
 	 * @param code code of the message
-	 * @param args arguments for the message as a List, or <code>null</code> if none
+	 * @param args arguments for the message as a List, or {@code null} if none
 	 * @param defaultMessage String to return if the lookup fails
 	 * @return the message
 	 */
@@ -495,7 +495,7 @@ public class RequestContext {
 	/**
 	 * Retrieve the message for the given code.
 	 * @param code code of the message
-	 * @param args arguments for the message, or <code>null</code> if none
+	 * @param args arguments for the message, or {@code null} if none
 	 * @param defaultMessage String to return if the lookup fails
 	 * @param htmlEscape HTML escape the message?
 	 * @return the message
@@ -518,7 +518,7 @@ public class RequestContext {
 	/**
 	 * Retrieve the message for the given code, using the "defaultHtmlEscape" setting.
 	 * @param code code of the message
-	 * @param args arguments for the message, or <code>null</code> if none
+	 * @param args arguments for the message, or {@code null} if none
 	 * @return the message
 	 * @throws org.springframework.context.NoSuchMessageException if not found
 	 */
@@ -529,7 +529,7 @@ public class RequestContext {
 	/**
 	 * Retrieve the message for the given code, using the "defaultHtmlEscape" setting.
 	 * @param code code of the message
-	 * @param args arguments for the message as a List, or <code>null</code> if none
+	 * @param args arguments for the message as a List, or {@code null} if none
 	 * @return the message
 	 * @throws org.springframework.context.NoSuchMessageException if not found
 	 */
@@ -540,7 +540,7 @@ public class RequestContext {
 	/**
 	 * Retrieve the message for the given code.
 	 * @param code code of the message
-	 * @param args arguments for the message, or <code>null</code> if none
+	 * @param args arguments for the message, or {@code null} if none
 	 * @param htmlEscape HTML escape the message?
 	 * @return the message
 	 * @throws org.springframework.context.NoSuchMessageException if not found
@@ -587,7 +587,7 @@ public class RequestContext {
 	 * Retrieve the theme message for the given code. <p>Note that theme messages are never HTML-escaped, as they
 	 * typically denote theme-specific resource paths and not client-visible messages.
 	 * @param code code of the message
-	 * @param args arguments for the message, or <code>null</code> if none
+	 * @param args arguments for the message, or {@code null} if none
 	 * @param defaultMessage String to return if the lookup fails
 	 * @return the message
 	 */
@@ -599,7 +599,7 @@ public class RequestContext {
 	 * Retrieve the theme message for the given code. <p>Note that theme messages are never HTML-escaped, as they
 	 * typically denote theme-specific resource paths and not client-visible messages.
 	 * @param code code of the message
-	 * @param args arguments for the message as a List, or <code>null</code> if none
+	 * @param args arguments for the message as a List, or {@code null} if none
 	 * @param defaultMessage String to return if the lookup fails
 	 * @return the message
 	 */
@@ -623,7 +623,7 @@ public class RequestContext {
 	 * Retrieve the theme message for the given code. <p>Note that theme messages are never HTML-escaped, as they
 	 * typically denote theme-specific resource paths and not client-visible messages.
 	 * @param code code of the message
-	 * @param args arguments for the message, or <code>null</code> if none
+	 * @param args arguments for the message, or {@code null} if none
 	 * @return the message
 	 * @throws org.springframework.context.NoSuchMessageException if not found
 	 */
@@ -635,7 +635,7 @@ public class RequestContext {
 	 * Retrieve the theme message for the given code. <p>Note that theme messages are never HTML-escaped, as they
 	 * typically denote theme-specific resource paths and not client-visible messages.
 	 * @param code code of the message
-	 * @param args arguments for the message as a List, or <code>null</code> if none
+	 * @param args arguments for the message as a List, or {@code null} if none
 	 * @return the message
 	 * @throws org.springframework.context.NoSuchMessageException if not found
 	 */
@@ -657,7 +657,7 @@ public class RequestContext {
 	/**
 	 * Retrieve the Errors instance for the given bind object, using the "defaultHtmlEscape" setting.
 	 * @param name name of the bind object
-	 * @return the Errors instance, or <code>null</code> if not found
+	 * @return the Errors instance, or {@code null} if not found
 	 */
 	public Errors getErrors(String name) {
 		return getErrors(name, isDefaultHtmlEscape());
@@ -667,7 +667,7 @@ public class RequestContext {
 	 * Retrieve the Errors instance for the given bind object.
 	 * @param name name of the bind object
 	 * @param htmlEscape create an Errors instance with automatic HTML escaping?
-	 * @return the Errors instance, or <code>null</code> if not found
+	 * @return the Errors instance, or {@code null} if not found
 	 */
 	public Errors getErrors(String name, boolean htmlEscape) {
 		if (this.errorsMap == null) {
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 1ddd0064cc..f992839046 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
@@ -91,7 +91,7 @@ public abstract class RequestContextUtils {
 	 * Return the LocaleResolver that has been bound to the request by the
 	 * DispatcherServlet.
 	 * @param request current HTTP request
-	 * @return the current LocaleResolver, or <code>null</code> if not found
+	 * @return the current LocaleResolver, or {@code null} if not found
 	 */
 	public static LocaleResolver getLocaleResolver(HttpServletRequest request) {
 		return (LocaleResolver) request.getAttribute(DispatcherServlet.LOCALE_RESOLVER_ATTRIBUTE);
@@ -121,7 +121,7 @@ public abstract class RequestContextUtils {
 	 * Return the ThemeResolver that has been bound to the request by the
 	 * DispatcherServlet.
 	 * @param request current HTTP request
-	 * @return the current ThemeResolver, or <code>null</code> if not found
+	 * @return the current ThemeResolver, or {@code null} if not found
 	 */
 	public static ThemeResolver getThemeResolver(HttpServletRequest request) {
 		return (ThemeResolver) request.getAttribute(DispatcherServlet.THEME_RESOLVER_ATTRIBUTE);
@@ -141,7 +141,7 @@ public abstract class RequestContextUtils {
 	 * Retrieves the current theme from the given request, using the ThemeResolver
 	 * and ThemeSource bound to the request by the DispatcherServlet.
 	 * @param request current HTTP request
-	 * @return the current theme, or <code>null</code> if not found
+	 * @return the current theme, or {@code null} if not found
 	 * @see #getThemeResolver
 	 */
 	public static Theme getTheme(HttpServletRequest request) {
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 1a3755e4e0..3cc1b41fca 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
@@ -90,9 +90,9 @@ public abstract class WebContentGenerator extends WebApplicationObjectSupport {
 
 	/**
 	 * Create a new WebContentGenerator.
-	 * @param restrictDefaultSupportedMethods <code>true</code> if this
+	 * @param restrictDefaultSupportedMethods {@code true} if this
 	 * generator should support HTTP methods GET, HEAD and POST by default,
-	 * or <code>false</code> if it should be unrestricted
+	 * or {@code false} if it should be unrestricted
 	 */
 	public WebContentGenerator(boolean restrictDefaultSupportedMethods) {
 		if (restrictDefaultSupportedMethods) {
@@ -265,7 +265,7 @@ public abstract class WebContentGenerator extends WebApplicationObjectSupport {
 
 	/**
 	 * Prevent the response from being cached.
-	 * See <code>http://www.mnot.net/cache_docs</code>.
+	 * See {@code http://www.mnot.net/cache_docs}.
 	 */
 	protected final void preventCaching(HttpServletResponse response) {
 		response.setHeader(HEADER_PRAGMA, "no-cache");
@@ -298,7 +298,7 @@ public abstract class WebContentGenerator extends WebApplicationObjectSupport {
 	/**
 	 * Set HTTP headers to allow caching for the given number of seconds.
 	 * Tells the browser to revalidate the resource if mustRevalidate is
-	 * <code>true</code>.
+	 * {@code true}.
 	 * @param response the current HTTP response
 	 * @param seconds number of seconds into the future that the response
 	 * should be cacheable for
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
index d10b01753d..004882b42f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
@@ -152,10 +152,10 @@ public class BindTag extends HtmlEscapingAwareTag implements EditorAwareTag {
 
 	/**
 	 * Retrieve the property that this tag is currently bound to,
-	 * or <code>null</code> if bound to an object rather than a specific property.
+	 * or {@code null} if bound to an object rather than a specific property.
 	 * Intended for cooperating nesting tags.
 	 * @return the property that this tag is currently bound to,
-	 * or <code>null</code> if none
+	 * or {@code null} if none
 	 */
 	public final String getProperty() {
 		return this.status.getExpression();
@@ -164,7 +164,7 @@ public class BindTag extends HtmlEscapingAwareTag implements EditorAwareTag {
 	/**
 	 * Retrieve the Errors instance that this tag is currently bound to.
 	 * Intended for cooperating nesting tags.
-	 * @return the current Errors instance, or <code>null</code> if none
+	 * @return the current Errors instance, or {@code null} if none
 	 */
 	public final Errors getErrors() {
 		return this.status.getErrors();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java
index 60be14261b..05fd7845a3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java
@@ -34,7 +34,7 @@ public interface EditorAwareTag {
 	/**
 	 * Retrieve the PropertyEditor for the property that this tag is
 	 * currently bound to. Intended for cooperating nesting tags.
-	 * @return the current PropertyEditor, or <code>null</code> if none
+	 * @return the current PropertyEditor, or {@code null} if none
 	 * @throws JspException if resolving the editor failed
 	 */
 	PropertyEditor getEditor() throws JspException;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
index c18c59fd34..8bf8ddf4ea 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
@@ -26,7 +26,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils;
  * <p>Provides a "htmlEscape" property for explicitly specifying whether to
  * apply HTML escaping. If not set, a page-level default (e.g. from the
  * HtmlEscapeTag) or an application-wide default (the "defaultHtmlEscape"
- * context-param in <code>web.xml</code>) is used.
+ * context-param in {@code web.xml}) is used.
  *
  * @author Juergen Hoeller
  * @since 1.1
@@ -66,7 +66,7 @@ public abstract class HtmlEscapingAwareTag extends RequestContextAwareTag {
 	/**
 	 * Return the applicable default HTML escape setting for this tag.
 	 * <p>The default implementation checks the RequestContext's setting,
-	 * falling back to <code>false</code> in case of no explicit default given.
+	 * falling back to {@code false} in case of no explicit default given.
 	 * @see #getRequestContext()
 	 */
 	protected boolean isDefaultHtmlEscape() {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
index ae093bc04c..1455313572 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
@@ -37,7 +37,7 @@ import org.springframework.web.util.TagUtils;
  * resolved using the ApplicationContext and thus support internationalization.
  *
  * <p>Detects an HTML escaping setting, either on this tag instance, the page level,
- * or the <code>web.xml</code> level. Can also apply JavaScript escaping.
+ * or the {@code web.xml} level. Can also apply JavaScript escaping.
  *
  * <p>If "code" isn't set or cannot be resolved, "text" will be used as default
  * message. Thus, this tag can also be used for HTML escaping of any texts.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java
index 58a6b8c86c..32df5d7412 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java
@@ -17,7 +17,7 @@
 package org.springframework.web.servlet.tags;
 
 /**
- * Allows implementing tag to utilize nested <code>spring:param</code> tags.
+ * Allows implementing tag to utilize nested {@code spring:param} tags.
  *
  * @author Scott Andrews
  * @since 3.0
@@ -28,7 +28,7 @@ public interface ParamAware {
 	/**
 	 * Callback hook for nested spring:param tags to pass their value
 	 * to the parent tag.
-	 * @param param the result of the nested <code>spring:param</code> tag
+	 * @param param the result of the nested {@code spring:param} tag
 	 */
 	void addParam(Param param);
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
index 21be4a4fd9..4b5f6e49ef 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
@@ -30,7 +30,7 @@ import org.springframework.web.servlet.support.RequestContext;
 /**
  * Superclass for all tags that require a {@link RequestContext}.
  *
- * <p>The <code>RequestContext</code> instance provides easy access
+ * <p>The {@code RequestContext} instance provides easy access
  * to current state like the
  * {@link org.springframework.web.context.WebApplicationContext},
  * the {@link java.util.Locale}, the
@@ -38,7 +38,7 @@ import org.springframework.web.servlet.support.RequestContext;
  *
  * <p>Mainly intended for
  * {@link org.springframework.web.servlet.DispatcherServlet} requests;
- * will use fallbacks when used outside <code>DispatcherServlet</code>.
+ * will use fallbacks when used outside {@code DispatcherServlet}.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
index 5535a02437..63136e220d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
@@ -28,7 +28,7 @@ import org.springframework.web.util.TagUtils;
 
 /**
  * Tag for transforming reference data values from form controllers and
- * other objects inside a <code>spring:bind</code> tag (or a data-bound
+ * other objects inside a {@code spring:bind} tag (or a data-bound
  * form element tag from Spring's form tag library).
  *
  * <p>The BindTag has a PropertyEditor that it uses to transform properties of
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
index 18c58d91a6..1f8ed098f8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
@@ -61,7 +61,7 @@ import org.springframework.web.util.UriUtils;
  *
  * <p>URLs can be HTML/XML escaped by setting the {@link #setHtmlEscape(String)
  * 'htmlEscape'} attribute to 'true'.  Detects an HTML escaping setting, either on
- * this tag instance, the page level, or the <code>web.xml</code> level. The default
+ * this tag instance, the page level, or the {@code web.xml} level. The default
  * is 'false'.  When setting the URL value into a variable, escaping is not recommended.
  *
  * <p>Example usage:
@@ -69,7 +69,7 @@ import org.springframework.web.util.UriUtils;
  *   &lt;spring:param name="variableName" value="more than JSTL c:url" /&gt;
  * &lt;/spring:url&gt;</pre>
  * Results in:
- * <code>/currentApplicationContext/url/path/more%20than%20JSTL%20c%3Aurl</code>
+ * {@code /currentApplicationContext/url/path/more%20than%20JSTL%20c%3Aurl}
  *
  * @author Scott Andrews
  * @since 3.0
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
index 10a31b974d..78e4362bcb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
@@ -20,8 +20,8 @@ import javax.servlet.jsp.JspException;
 
 /**
  * Abstract base class to provide common methods for
- * implementing databinding-aware JSP tags for rendering an HTML '<code>input</code>'
- * element with a '<code>type</code>' of '<code>checkbox</code>' or '<code>radio</code>'.
+ * implementing databinding-aware JSP tags for rendering an HTML '{@code input}'
+ * element with a '{@code type}' of '{@code checkbox}' or '{@code radio}'.
  *
  * @author Thomas Risberg
  * @author Juergen Hoeller
@@ -31,8 +31,8 @@ import javax.servlet.jsp.JspException;
 public abstract class AbstractCheckedElementTag extends AbstractHtmlInputElementTag {
 
 	/**
-	 * Render the '<code>input(checkbox)</code>' with the supplied value, marking the
-	 * '<code>input</code>' element as 'checked' if the supplied value matches the
+	 * Render the '{@code input(checkbox)}' with the supplied value, marking the
+	 * '{@code input}' element as 'checked' if the supplied value matches the
 	 * bound value.
 	 */
 	protected void renderFromValue(Object value, TagWriter tagWriter) throws JspException {
@@ -40,8 +40,8 @@ public abstract class AbstractCheckedElementTag extends AbstractHtmlInputElement
 	}
 
 	/**
-	 * Render the '<code>input(checkbox)</code>' with the supplied value, marking the
-	 * '<code>input</code>' element as 'checked' if the supplied value matches the
+	 * Render the '{@code input(checkbox)}' with the supplied value, marking the
+	 * '{@code input}' element as 'checked' if the supplied value matches the
 	 * bound value.
 	 */
 	protected void renderFromValue(Object item, Object value, TagWriter tagWriter) throws JspException {
@@ -61,9 +61,9 @@ public abstract class AbstractCheckedElementTag extends AbstractHtmlInputElement
 	}
 
 	/**
-	 * Render the '<code>input(checkbox)</code>' with the supplied value, marking
-	 * the '<code>input</code>' element as 'checked' if the supplied Boolean is
-	 * <code>true</code>.
+	 * Render the '{@code input(checkbox)}' with the supplied value, marking
+	 * the '{@code input}' element as 'checked' if the supplied Boolean is
+	 * {@code true}.
 	 */
 	protected void renderFromBoolean(Boolean boundValue, TagWriter tagWriter) throws JspException {
 		tagWriter.writeAttribute("value", processFieldValue(getName(), "true", getInputType()));
@@ -82,8 +82,8 @@ public abstract class AbstractCheckedElementTag extends AbstractHtmlInputElement
 
 
 	/**
-	 * Writes the '<code>input</code>' element to the supplied
-	 * {@link org.springframework.web.servlet.tags.form.TagWriter},
+	 * Writes the '{@code input}' element to the supplied
+	 * {@link TagWriter},
 	 * marking it as 'checked' if appropriate.
 	 */
 	@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
index aaa6add7ed..c601e9d221 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
@@ -67,7 +67,7 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im
 	private String path;
 
 	/**
-	 * The value of the '<code>id</code>' attribute.
+	 * The value of the '{@code id}' attribute.
 	 */
 	private String id;
 
@@ -95,7 +95,7 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im
 	}
 
 	/**
-	 * Set the value of the '<code>id</code>' attribute.
+	 * Set the value of the '{@code id}' attribute.
 	 * <p>May be a runtime expression; defaults to the value of {@link #getName()}.
 	 * Note that the default value may not be valid for certain tags.
 	 */
@@ -105,7 +105,7 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im
 	}
 
 	/**
-	 * Get the value of the '<code>id</code>' attribute.
+	 * Get the value of the '{@code id}' attribute.
 	 */
 	@Override
 	public String getId() {
@@ -117,7 +117,7 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im
 	 * Writes the default set of attributes to the supplied {@link TagWriter}.
 	 * Further abstract sub-classes should override this method to add in
 	 * any additional default attributes but <strong>must</strong> remember
-	 * to call the <code>super</code> method.
+	 * to call the {@code super} method.
 	 * <p>Concrete sub-classes should call this method when/if they want
 	 * to render default attributes.
 	 * @param tagWriter the {@link TagWriter} to which any attributes are to be written
@@ -128,7 +128,7 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im
 	}
 
 	/**
-	 * Determine the '<code>id</code>' attribute value for this tag,
+	 * Determine the '{@code id}' attribute value for this tag,
 	 * autogenerating one if none specified.
 	 * @see #getId()
 	 * @see #autogenerateId()
@@ -143,7 +143,7 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im
 	}
 
 	/**
-	 * Autogenerate the '<code>id</code>' attribute value for this tag.
+	 * Autogenerate the '{@code id}' attribute value for this tag.
 	 * <p>The default implementation simply delegates to {@link #getName()},
 	 * deleting invalid characters (such as "[" or "]").
 	 */
@@ -152,13 +152,13 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im
 	}
 
 	/**
-	 * Get the value for the HTML '<code>name</code>' attribute.
+	 * Get the value for the HTML '{@code name}' attribute.
 	 * <p>The default implementation simply delegates to
 	 * {@link #getPropertyPath()} to use the property path as the name.
 	 * For the most part this is desirable as it links with the server-side
 	 * expectation for data binding. However, some subclasses may wish to change
-	 * the value of the '<code>name</code>' attribute without changing the bind path.
-	 * @return the value for the HTML '<code>name</code>' attribute
+	 * the value of the '{@code name}' attribute without changing the bind path.
+	 * @return the value for the HTML '{@code name}' attribute
 	 */
 	protected String getName() throws JspException {
 		return getPropertyPath();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
index 7e898f8be9..3de558dbe4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
@@ -42,7 +42,7 @@ public abstract class AbstractFormTag extends HtmlEscapingAwareTag {
 
 	/**
 	 * Evaluate the supplied value for the supplied attribute name. If the supplied value
-	 * is <code>null</code> then <code>null</code> is returned, otherwise evaluation is
+	 * is {@code null} then {@code null} is returned, otherwise evaluation is
 	 * handled using {@link ExpressionEvaluationUtils#evaluate(String, String, javax.servlet.jsp.PageContext)}.
 	 */
 	protected Object evaluate(String attributeName, Object value) throws JspException {
@@ -56,9 +56,9 @@ public abstract class AbstractFormTag extends HtmlEscapingAwareTag {
 
 	/**
 	 * Evaluate the supplied value for the supplied attribute name. If the supplied value
-	 * is <code>null</code> then <code>false</code> is returned, otherwise evaluation is
+	 * is {@code null} then {@code false} is returned, otherwise evaluation is
 	 * handled using {@link ExpressionEvaluationUtils#evaluate(String, String, javax.servlet.jsp.PageContext)},
-	 * with subsequent matching against <code>Boolean.TRUE</code> and <code>Boolean.valueOf</code>.
+	 * with subsequent matching against {@code Boolean.TRUE} and {@code Boolean.valueOf}.
 	 */
 	protected boolean evaluateBoolean(String attributeName, String value) throws JspException {
 		Object evaluated = ExpressionEvaluationUtils.evaluate(attributeName, value, this.pageContext);
@@ -70,7 +70,7 @@ public abstract class AbstractFormTag extends HtmlEscapingAwareTag {
 	 * Optionally writes the supplied value under the supplied attribute name into the supplied
 	 * {@link TagWriter}. In this case, the supplied value is {@link #evaluate evaluated} first
 	 * and then the {@link ObjectUtils#getDisplayString String representation} is written as the
-	 * attribute value. If the resultant <code>String</code> representation is <code>null</code>
+	 * attribute value. If the resultant {@code String} representation is {@code null}
 	 * or empty, no attribute is written.
 	 * @see TagWriter#writeOptionalAttributeValue(String, String)
 	 */
@@ -103,7 +103,7 @@ public abstract class AbstractFormTag extends HtmlEscapingAwareTag {
 	}
 
 	/**
-	 * Get the display value of the supplied <code>Object</code>, HTML escaped
+	 * Get the display value of the supplied {@code Object}, HTML escaped
 	 * as required. This version is <strong>not</strong> {@link PropertyEditor}-aware.
 	 */
 	protected String getDisplayString(Object value) {
@@ -111,7 +111,7 @@ public abstract class AbstractFormTag extends HtmlEscapingAwareTag {
 	}
 
 	/**
-	 * Get the display value of the supplied <code>Object</code>, HTML escaped
+	 * Get the display value of the supplied {@code Object}, HTML escaped
 	 * as required. If the supplied value is not a {@link String} and the supplied
 	 * {@link PropertyEditor} is not null then the {@link PropertyEditor} is used
 	 * to obtain the display value.
@@ -121,7 +121,7 @@ public abstract class AbstractFormTag extends HtmlEscapingAwareTag {
 	}
 
 	/**
-	 * Overridden to default to <code>true</code> in case of no explicit default given.
+	 * Overridden to default to {@code true} in case of no explicit default given.
 	 */
 	@Override
 	protected boolean isDefaultHtmlEscape() {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
index 438fab4468..1d98c4cb86 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
@@ -106,7 +106,7 @@ public abstract class AbstractHtmlElementBodyTag extends AbstractHtmlElementTag
 	}
 
 	/**
-	 * Should rendering of this tag proceed at all. Returns '<code>true</code>' by default
+	 * Should rendering of this tag proceed at all. Returns '{@code true}' by default
 	 * causing rendering to occur always, Subclasses can override this if they
 	 * provide conditional rendering.
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
index b497d01067..90e441c006 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
@@ -114,7 +114,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 
 
 	/**
-	 * Set the value of the '<code>class</code>' attribute.
+	 * Set the value of the '{@code class}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setCssClass(String cssClass) {
@@ -122,7 +122,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>class</code>' attribute.
+	 * Get the value of the '{@code class}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getCssClass() {
@@ -146,7 +146,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>style</code>' attribute.
+	 * Set the value of the '{@code style}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setCssStyle(String cssStyle) {
@@ -154,7 +154,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>style</code>' attribute.
+	 * Get the value of the '{@code style}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getCssStyle() {
@@ -162,7 +162,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>lang</code>' attribute.
+	 * Set the value of the '{@code lang}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setLang(String lang) {
@@ -170,7 +170,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>lang</code>' attribute.
+	 * Get the value of the '{@code lang}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getLang() {
@@ -178,7 +178,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>title</code>' attribute.
+	 * Set the value of the '{@code title}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setTitle(String title) {
@@ -186,7 +186,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>title</code>' attribute.
+	 * Get the value of the '{@code title}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getTitle() {
@@ -194,7 +194,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>dir</code>' attribute.
+	 * Set the value of the '{@code dir}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setDir(String dir) {
@@ -202,7 +202,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>dir</code>' attribute.
+	 * Get the value of the '{@code dir}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getDir() {
@@ -210,7 +210,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>tabindex</code>' attribute.
+	 * Set the value of the '{@code tabindex}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setTabindex(String tabindex) {
@@ -218,7 +218,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>tabindex</code>' attribute.
+	 * Get the value of the '{@code tabindex}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getTabindex() {
@@ -226,7 +226,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>onclick</code>' attribute.
+	 * Set the value of the '{@code onclick}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnclick(String onclick) {
@@ -234,7 +234,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>onclick</code>' attribute.
+	 * Get the value of the '{@code onclick}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getOnclick() {
@@ -242,7 +242,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>ondblclick</code>' attribute.
+	 * Set the value of the '{@code ondblclick}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOndblclick(String ondblclick) {
@@ -250,7 +250,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>ondblclick</code>' attribute.
+	 * Get the value of the '{@code ondblclick}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getOndblclick() {
@@ -258,7 +258,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>onmousedown</code>' attribute.
+	 * Set the value of the '{@code onmousedown}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnmousedown(String onmousedown) {
@@ -266,7 +266,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>onmousedown</code>' attribute.
+	 * Get the value of the '{@code onmousedown}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getOnmousedown() {
@@ -274,7 +274,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>onmouseup</code>' attribute.
+	 * Set the value of the '{@code onmouseup}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnmouseup(String onmouseup) {
@@ -282,7 +282,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>onmouseup</code>' attribute.
+	 * Get the value of the '{@code onmouseup}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getOnmouseup() {
@@ -290,7 +290,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>onmouseover</code>' attribute.
+	 * Set the value of the '{@code onmouseover}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnmouseover(String onmouseover) {
@@ -298,7 +298,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>onmouseover</code>' attribute.
+	 * Get the value of the '{@code onmouseover}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getOnmouseover() {
@@ -306,7 +306,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>onmousemove</code>' attribute.
+	 * Set the value of the '{@code onmousemove}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnmousemove(String onmousemove) {
@@ -314,7 +314,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>onmousemove</code>' attribute.
+	 * Get the value of the '{@code onmousemove}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getOnmousemove() {
@@ -322,14 +322,14 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>onmouseout</code>' attribute.
+	 * Set the value of the '{@code onmouseout}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnmouseout(String onmouseout) {
 		this.onmouseout = onmouseout;
 	}
 	/**
-	 * Get the value of the '<code>onmouseout</code>' attribute.
+	 * Get the value of the '{@code onmouseout}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getOnmouseout() {
@@ -337,7 +337,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>onkeypress</code>' attribute.
+	 * Set the value of the '{@code onkeypress}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnkeypress(String onkeypress) {
@@ -345,7 +345,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>onkeypress</code>' attribute.
+	 * Get the value of the '{@code onkeypress}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getOnkeypress() {
@@ -353,7 +353,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>onkeyup</code>' attribute.
+	 * Set the value of the '{@code onkeyup}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnkeyup(String onkeyup) {
@@ -361,7 +361,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>onkeyup</code>' attribute.
+	 * Get the value of the '{@code onkeyup}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getOnkeyup() {
@@ -369,7 +369,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Set the value of the '<code>onkeydown</code>' attribute.
+	 * Set the value of the '{@code onkeydown}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnkeydown(String onkeydown) {
@@ -377,7 +377,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	}
 
 	/**
-	 * Get the value of the '<code>onkeydown</code>' attribute.
+	 * Get the value of the '{@code onkeydown}' attribute.
 	 * May be a runtime expression.
 	 */
 	protected String getOnkeydown() {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
index 4d9ca3fb01..9075be04d9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
@@ -32,32 +32,32 @@ import javax.servlet.jsp.JspException;
 public abstract class AbstractHtmlInputElementTag extends AbstractHtmlElementTag {
 
 	/**
-	 * The name of the '<code>onfocus</code>' attribute.
+	 * The name of the '{@code onfocus}' attribute.
 	 */
 	public static final String ONFOCUS_ATTRIBUTE = "onfocus";
 
 	/**
-	 * The name of the '<code>onblur</code>' attribute.
+	 * The name of the '{@code onblur}' attribute.
 	 */
 	public static final String ONBLUR_ATTRIBUTE = "onblur";
 
 	/**
-	 * The name of the '<code>onchange</code>' attribute.
+	 * The name of the '{@code onchange}' attribute.
 	 */
 	public static final String ONCHANGE_ATTRIBUTE = "onchange";
 
 	/**
-	 * The name of the '<code>accesskey</code>' attribute.
+	 * The name of the '{@code accesskey}' attribute.
 	 */
 	public static final String ACCESSKEY_ATTRIBUTE = "accesskey";
 
 	/**
-	 * The name of the '<code>disabled</code>' attribute.
+	 * The name of the '{@code disabled}' attribute.
 	 */
 	public static final String DISABLED_ATTRIBUTE = "disabled";
 
 	/**
-	 * The name of the '<code>readonly</code>' attribute.
+	 * The name of the '{@code readonly}' attribute.
 	 */
 	public static final String READONLY_ATTRIBUTE = "readonly";
 
@@ -76,7 +76,7 @@ public abstract class AbstractHtmlInputElementTag extends AbstractHtmlElementTag
 
 
 	/**
-	 * Set the value of the '<code>onfocus</code>' attribute.
+	 * Set the value of the '{@code onfocus}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnfocus(String onfocus) {
@@ -84,14 +84,14 @@ public abstract class AbstractHtmlInputElementTag extends AbstractHtmlElementTag
 	}
 
 	/**
-	 * Get the value of the '<code>onfocus</code>' attribute.
+	 * Get the value of the '{@code onfocus}' attribute.
 	 */
 	protected String getOnfocus() {
 		return this.onfocus;
 	}
 
 	/**
-	 * Set the value of the '<code>onblur</code>' attribute.
+	 * Set the value of the '{@code onblur}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnblur(String onblur) {
@@ -99,14 +99,14 @@ public abstract class AbstractHtmlInputElementTag extends AbstractHtmlElementTag
 	}
 
 	/**
-	 * Get the value of the '<code>onblur</code>' attribute.
+	 * Get the value of the '{@code onblur}' attribute.
 	 */
 	protected String getOnblur() {
 		return this.onblur;
 	}
 
 	/**
-	 * Set the value of the '<code>onchange</code>' attribute.
+	 * Set the value of the '{@code onchange}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnchange(String onchange) {
@@ -114,14 +114,14 @@ public abstract class AbstractHtmlInputElementTag extends AbstractHtmlElementTag
 	}
 
 	/**
-	 * Get the value of the '<code>onchange</code>' attribute.
+	 * Get the value of the '{@code onchange}' attribute.
 	 */
 	protected String getOnchange() {
 		return this.onchange;
 	}
 
 	/**
-	 * Set the value of the '<code>accesskey</code>' attribute.
+	 * Set the value of the '{@code accesskey}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setAccesskey(String accesskey) {
@@ -129,14 +129,14 @@ public abstract class AbstractHtmlInputElementTag extends AbstractHtmlElementTag
 	}
 
 	/**
-	 * Get the value of the '<code>accesskey</code>' attribute.
+	 * Get the value of the '{@code accesskey}' attribute.
 	 */
 	protected String getAccesskey() {
 		return this.accesskey;
 	}
 
 	/**
-	 * Set the value of the '<code>disabled</code>' attribute.
+	 * Set the value of the '{@code disabled}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setDisabled(String disabled) {
@@ -144,14 +144,14 @@ public abstract class AbstractHtmlInputElementTag extends AbstractHtmlElementTag
 	}
 
 	/**
-	 * Get the value of the '<code>disabled</code>' attribute.
+	 * Get the value of the '{@code disabled}' attribute.
 	 */
 	protected String getDisabled() {
 		return this.disabled;
 	}
 
 	/**
-	 * Sets the value of the '<code>readonly</code>' attribute.
+	 * Sets the value of the '{@code readonly}' attribute.
 	 * May be a runtime expression.
 	 * @see #isReadonly()
 	 */
@@ -160,7 +160,7 @@ public abstract class AbstractHtmlInputElementTag extends AbstractHtmlElementTag
 	}
 
 	/**
-	 * Gets the value of the '<code>readonly</code>' attribute.
+	 * Gets the value of the '{@code readonly}' attribute.
 	 * May be a runtime expression.
 	 * @see #isReadonly()
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
index 2aec3de705..b6bc93f96f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
@@ -30,8 +30,8 @@ import org.springframework.util.StringUtils;
 /**
  * Abstract base class to provide common methods for implementing
  * databinding-aware JSP tags for rendering <i>multiple</i>
- * HTML '<code>input</code>' elements with a '<code>type</code>'
- * of '<code>checkbox</code>' or '<code>radio</code>'.
+ * HTML '{@code input}' elements with a '{@code type}'
+ * of '{@code checkbox}' or '{@code radio}'.
  *
  * @author Juergen Hoeller
  * @author Scott Andrews
@@ -40,42 +40,42 @@ import org.springframework.util.StringUtils;
 public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElementTag {
 
 	/**
-	 * The HTML '<code>span</code>' tag.
+	 * The HTML '{@code span}' tag.
 	 */
 	private static final String SPAN_TAG = "span";
 
 
 	/**
 	 * The {@link java.util.Collection}, {@link java.util.Map} or array of objects
-	 * used to generate the '<code>input type="checkbox/radio"</code>' tags.
+	 * used to generate the '{@code input type="checkbox/radio"}' tags.
 	 */
 	private Object items;
 
 	/**
-	 * The name of the property mapped to the '<code>value</code>' attribute
-	 * of the '<code>input type="checkbox/radio"</code>' tag.
+	 * The name of the property mapped to the '{@code value}' attribute
+	 * of the '{@code input type="checkbox/radio"}' tag.
 	 */
 	private String itemValue;
 
 	/**
-	 * The value to be displayed as part of the '<code>input type="checkbox/radio"</code>' tag.
+	 * The value to be displayed as part of the '{@code input type="checkbox/radio"}' tag.
 	 */
 	private String itemLabel;
 
 	/**
-	 * The HTML element used to enclose the '<code>input type="checkbox/radio"</code>' tag.
+	 * The HTML element used to enclose the '{@code input type="checkbox/radio"}' tag.
 	 */
 	private String element = SPAN_TAG;
 
 	/**
-	 * Delimiter to use between each '<code>input type="checkbox/radio"</code>' tags.
+	 * Delimiter to use between each '{@code input type="checkbox/radio"}' tags.
 	 */
 	private String delimiter;
 
 
 	/**
 	 * Set the {@link java.util.Collection}, {@link java.util.Map} or array of objects
-	 * used to generate the '<code>input type="checkbox/radio"</code>' tags.
+	 * used to generate the '{@code input type="checkbox/radio"}' tags.
 	 * <p>Typically a runtime expression.
 	 * @param items said items
 	 */
@@ -86,15 +86,15 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem
 
 	/**
 	 * Get the {@link java.util.Collection}, {@link java.util.Map} or array of objects
-	 * used to generate the '<code>input type="checkbox/radio"</code>' tags.
+	 * used to generate the '{@code input type="checkbox/radio"}' tags.
 	 */
 	protected Object getItems() {
 		return this.items;
 	}
 
 	/**
-	 * Set the name of the property mapped to the '<code>value</code>' attribute
-	 * of the '<code>input type="checkbox/radio"</code>' tag.
+	 * Set the name of the property mapped to the '{@code value}' attribute
+	 * of the '{@code input type="checkbox/radio"}' tag.
 	 * <p>May be a runtime expression.
 	 */
 	public void setItemValue(String itemValue) {
@@ -103,8 +103,8 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem
 	}
 
 	/**
-	 * Get the name of the property mapped to the '<code>value</code>' attribute
-	 * of the '<code>input type="checkbox/radio"</code>' tag.
+	 * Get the name of the property mapped to the '{@code value}' attribute
+	 * of the '{@code input type="checkbox/radio"}' tag.
 	 */
 	protected String getItemValue() {
 		return this.itemValue;
@@ -112,7 +112,7 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem
 
 	/**
 	 * Set the value to be displayed as part of the
-	 * '<code>input type="checkbox/radio"</code>' tag.
+	 * '{@code input type="checkbox/radio"}' tag.
 	 * <p>May be a runtime expression.
 	 */
 	public void setItemLabel(String itemLabel) {
@@ -122,7 +122,7 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem
 
 	/**
 	 * Get the value to be displayed as part of the
-	 * '<code>input type="checkbox/radio"</code>' tag.
+	 * '{@code input type="checkbox/radio"}' tag.
 	 */
 	protected String getItemLabel() {
 		return this.itemLabel;
@@ -130,7 +130,7 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem
 
 	/**
 	 * Set the delimiter to be used between each
-	 * '<code>input type="checkbox/radio"</code>' tag.
+	 * '{@code input type="checkbox/radio"}' tag.
 	 * <p>By default, there is <em>no</em> delimiter.
 	 */
 	public void setDelimiter(String delimiter) {
@@ -139,7 +139,7 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem
 
 	/**
 	 * Return the delimiter to be used between each
-	 * '<code>input type="radio"</code>' tag.
+	 * '{@code input type="radio"}' tag.
 	 */
 	public String getDelimiter() {
 		return this.delimiter;
@@ -147,8 +147,8 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem
 
 	/**
 	 * Set the HTML element used to enclose the
-	 * '<code>input type="checkbox/radio"</code>' tag.
-	 * <p>Defaults to an HTML '<code>&lt;span/&gt;</code>' tag.
+	 * '{@code input type="checkbox/radio"}' tag.
+	 * <p>Defaults to an HTML '{@code &lt;span/&gt;}' tag.
 	 */
 	public void setElement(String element) {
 		Assert.hasText(element, "'element' cannot be null or blank");
@@ -157,7 +157,7 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem
 
 	/**
 	 * Get the HTML element used to enclose
-	 * '<code>input type="checkbox/radio"</code>' tag.
+	 * '{@code input type="checkbox/radio"}' tag.
 	 */
 	public String getElement() {
 		return this.element;
@@ -179,7 +179,7 @@ public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElem
 	}
 
 	/**
-	 * Renders the '<code>input type="radio"</code>' element with the configured
+	 * Renders the '{@code input type="radio"}' element with the configured
 	 * {@link #setItems(Object)} values. Marks the element as checked if the
 	 * value matches the bound value.
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
index 44a705dd9b..b2b6e869f7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
@@ -21,8 +21,8 @@ import javax.servlet.jsp.JspException;
 /**
  * Abstract base class to provide common methods for implementing
  * databinding-aware JSP tags for rendering a <i>single</i>
- * HTML '<code>input</code>' element with a '<code>type</code>'
- * of '<code>checkbox</code>' or '<code>radio</code>'.
+ * HTML '{@code input}' element with a '{@code type}'
+ * of '{@code checkbox}' or '{@code radio}'.
  *
  * @author Juergen Hoeller
  * @since 2.5.2
@@ -30,18 +30,18 @@ import javax.servlet.jsp.JspException;
 public abstract class AbstractSingleCheckedElementTag extends AbstractCheckedElementTag {
 
 	/**
-	 * The value of the '<code>value</code>' attribute.
+	 * The value of the '{@code value}' attribute.
 	 */
 	private Object value;
 
 	/**
-	 * The value of the '<code>label</code>' attribute.
+	 * The value of the '{@code label}' attribute.
 	 */
 	private Object label;
 
 
 	/**
-	 * Set the value of the '<code>value</code>' attribute.
+	 * Set the value of the '{@code value}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setValue(Object value) {
@@ -49,14 +49,14 @@ public abstract class AbstractSingleCheckedElementTag extends AbstractCheckedEle
 	}
 
 	/**
-	 * Get the value of the '<code>value</code>' attribute.
+	 * Get the value of the '{@code value}' attribute.
 	 */
 	protected Object getValue() {
 		return this.value;
 	}
 
 	/**
-	 * Set the value of the '<code>label</code>' attribute.
+	 * Set the value of the '{@code label}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setLabel(Object label) {
@@ -64,7 +64,7 @@ public abstract class AbstractSingleCheckedElementTag extends AbstractCheckedEle
 	}
 
 	/**
-	 * Get the value of the '<code>label</code>' attribute.
+	 * Get the value of the '{@code label}' attribute.
 	 */
 	protected Object getLabel() {
 		return this.label;
@@ -72,7 +72,7 @@ public abstract class AbstractSingleCheckedElementTag extends AbstractCheckedEle
 
 
 	/**
-	 * Renders the '<code>input(radio)</code>' element with the configured
+	 * Renders the '{@code input(radio)}' element with the configured
 	 * {@link #setValue(Object) value}. Marks the element as checked if the
 	 * value matches the {@link #getValue bound value}.
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
index a99d7e38a3..db85b752d2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
@@ -31,7 +31,7 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
 public class ButtonTag extends AbstractHtmlElementTag {
 
 	/**
-	 * The name of the '<code>disabled</code>' attribute.
+	 * The name of the '{@code disabled}' attribute.
 	 */
 	public static final String DISABLED_ATTRIBUTE = "disabled";
 
@@ -44,42 +44,42 @@ public class ButtonTag extends AbstractHtmlElementTag {
 	private String disabled;
 
 	/**
-	 * Set the value of the '<code>name</code>' attribute.
+	 * Set the value of the '{@code name}' attribute.
 	 */
 	public String getName() {
 		return name;
 	}
 
 	/**
-	 * Get the value of the '<code>name</code>' attribute.
+	 * Get the value of the '{@code name}' attribute.
 	 */
 	public void setName(String name) {
 		this.name = name;
 	}
 
 	/**
-	 * Get the value of the '<code>value</code>' attribute.
+	 * Get the value of the '{@code value}' attribute.
 	 */
 	public String getValue() {
 		return this.value;
 	}
 
 	/**
-	 * Set the value of the '<code>value</code>' attribute.
+	 * Set the value of the '{@code value}' attribute.
 	 */
 	public void setValue(String value) {
 		this.value = value;
 	}
 
 	/**
-	 * Get the value of the '<code>disabled</code>' attribute.
+	 * Get the value of the '{@code disabled}' attribute.
 	 */
 	public String getDisabled() {
 		return this.disabled;
 	}
 
 	/**
-	 * Set the value of the '<code>disabled</code>' attribute.
+	 * Set the value of the '{@code disabled}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setDisabled(String disabled) {
@@ -108,7 +108,7 @@ public class ButtonTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Writes the '<code>value</code>' attribute to the supplied {@link TagWriter}.
+	 * Writes the '{@code value}' attribute to the supplied {@link TagWriter}.
 	 * Subclasses may choose to override this implementation to control exactly
 	 * when the value is written.
 	 */
@@ -127,16 +127,16 @@ public class ButtonTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>type</code>' attribute. Subclasses
-	 * can override this to change the type of '<code>input</code>' element
-	 * rendered. Default value is '<code>submit</code>'.
+	 * Get the value of the '{@code type}' attribute. Subclasses
+	 * can override this to change the type of '{@code input}' element
+	 * rendered. Default value is '{@code submit}'.
 	 */
 	protected String getType() {
 		return "submit";
 	}
 
 	/**
-	 * Closes the '<code>button</code>' block tag.
+	 * Closes the '{@code button}' block tag.
 	 */
 	@Override
 	public int doEndTag() throws JspException {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
index cd4ff0e515..07006084c6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
@@ -23,22 +23,22 @@ import javax.servlet.jsp.JspException;
 import org.springframework.web.bind.WebDataBinder;
 
 /**
- * Databinding-aware JSP tag for rendering an HTML '<code>input</code>'
- * element with a '<code>type</code>' of '<code>checkbox</code>'.
+ * Databinding-aware JSP tag for rendering an HTML '{@code input}'
+ * element with a '{@code type}' of '{@code checkbox}'.
  *
  * <p>May be used in one of three different approaches depending on the
  * type of the {@link #getValue bound value}.
  *
  * <h3>Approach One</h3>
- * When the bound value is of type {@link Boolean} then the '<code>input(checkbox)</code>'
- * is marked as 'checked' if the bound value is <code>true</code>. The '<code>value</code>'
+ * When the bound value is of type {@link Boolean} then the '{@code input(checkbox)}'
+ * is marked as 'checked' if the bound value is {@code true}. The '{@code value}'
  * attribute corresponds to the resolved value of the {@link #setValue(Object) value} property.
  * <h3>Approach Two</h3>
- * When the bound value is of type {@link Collection} then the '<code>input(checkbox)</code>'
+ * When the bound value is of type {@link Collection} then the '{@code input(checkbox)}'
  * is marked as 'checked' if the configured {@link #setValue(Object) value} is present in
  * the bound {@link Collection}.
  * <h3>Approach Three</h3>
- * For any other bound value type, the '<code>input(checkbox)</code>' is marked as 'checked'
+ * For any other bound value type, the '{@code input(checkbox)}' is marked as 'checked'
  * if the the configured {@link #setValue(Object) value} is equal to the bound value.
  *
  * @author Rob Harrop
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
index 579ab99aa5..2e2ecec7f3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
@@ -21,8 +21,8 @@ import javax.servlet.jsp.JspException;
 import org.springframework.web.bind.WebDataBinder;
 
 /**
- * Databinding-aware JSP tag for rendering multiple HTML '<code>input</code>'
- * elements with a '<code>type</code>' of '<code>checkbox</code>'.
+ * Databinding-aware JSP tag for rendering multiple HTML '{@code input}'
+ * elements with a '{@code type}' of '{@code checkbox}'.
  *
  * <p>Intended to be used with a Collection as the {@link #getItems()} bound value}.
  *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
index 2a8d0f5ba5..30a98455d3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
@@ -33,9 +33,9 @@ import org.springframework.util.StringUtils;
  * <p>This tag supports three main usage patterns:
  *
  * <ol>
- *	<li>Field only - set '<code>path</code>' to the field name (or path)</li>
- *	<li>Object errors only - omit '<code>path</code>'</li>
- *	<li>All errors - set '<code>path</code>' to '<code>*</code>'</li>
+ *	<li>Field only - set '{@code path}' to the field name (or path)</li>
+ *	<li>Object errors only - omit '{@code path}'</li>
+ *	<li>All errors - set '{@code path}' to '{@code *}'</li>
  * </ol>
  *
  * @author Rob Harrop
@@ -52,7 +52,7 @@ public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	public static final String MESSAGES_ATTRIBUTE = "messages";
 
 	/**
-	 * The HTML '<code>span</code>' tag.
+	 * The HTML '{@code span}' tag.
 	 */
 	public static final String SPAN_TAG = "span";
 
@@ -71,7 +71,7 @@ public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag {
 
 	/**
 	 * Set the HTML element must be used to render the error messages.
-	 * <p>Defaults to an HTML '<code>&lt;span/&gt;</code>' tag.
+	 * <p>Defaults to an HTML '{@code &lt;span/&gt;}' tag.
 	 */
 	public void setElement(String element) {
 		Assert.hasText(element, "'element' cannot be null or blank");
@@ -87,7 +87,7 @@ public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag {
 
 	/**
 	 * Set the delimiter to be used between error messages.
-	 * <p>Defaults to an HTML '<code>&lt;br/&gt;</code>' tag.
+	 * <p>Defaults to an HTML '{@code &lt;br/&gt;}' tag.
 	 */
 	public void setDelimiter(String delimiter) {
 		this.delimiter = delimiter;
@@ -102,11 +102,11 @@ public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag {
 
 
 	/**
-	 * Get the value for the HTML '<code>id</code>' attribute.
-	 * <p>Appends '<code>.errors</code>' to the value returned by {@link #getPropertyPath()}
-	 * or to the model attribute name if the <code>&lt;form:errors/&gt;</code> tag's
-	 * '<code>path</code>' attribute has been omitted.
-	 * @return the value for the HTML '<code>id</code>' attribute
+	 * Get the value for the HTML '{@code id}' attribute.
+	 * <p>Appends '{@code .errors}' to the value returned by {@link #getPropertyPath()}
+	 * or to the model attribute name if the {@code &lt;form:errors/&gt;} tag's
+	 * '{@code path}' attribute has been omitted.
+	 * @return the value for the HTML '{@code id}' attribute
 	 * @see #getPropertyPath()
 	 */
 	@Override
@@ -120,9 +120,9 @@ public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	}
 
 	/**
-	 * Get the value for the HTML '<code>name</code>' attribute.
-	 * <p>Simply returns <code>null</code> because the '<code>name</code>' attribute
-	 * is not a validate attribute for the '<code>span</code>' element.
+	 * Get the value for the HTML '{@code name}' attribute.
+	 * <p>Simply returns {@code null} because the '{@code name}' attribute
+	 * is not a validate attribute for the '{@code span}' element.
 	 */
 	@Override
 	protected String getName() throws JspException {
@@ -132,7 +132,7 @@ public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	/**
 	 * Should rendering of this tag proceed at all?
 	 * <p>Only renders output when there are errors for the configured {@link #setPath path}.
-	 * @return <code>true</code> only when there are errors for the configured {@link #setPath path}
+	 * @return {@code true} only when there are errors for the configured {@link #setPath path}
 	 */
 	@Override
 	protected boolean shouldRender() throws JspException {
@@ -164,7 +164,7 @@ public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	/**
 	 * Exposes any bind status error messages under {@link #MESSAGES_ATTRIBUTE this key}
 	 * in the {@link PageContext#PAGE_SCOPE}.
-	 * <p>Only called if {@link #shouldRender()} returns <code>true</code>.
+	 * <p>Only called if {@link #shouldRender()} returns {@code true}.
 	 * @see #removeAttributes()
 	 */
 	@Override
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 365afd1268..b51609d7f9 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
@@ -34,7 +34,7 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
 import org.springframework.web.util.HtmlUtils;
 
 /**
- * Databinding-aware JSP tag for rendering an HTML '<code>form</code>' whose
+ * Databinding-aware JSP tag for rendering an HTML '{@code form}' whose
  * inner elements are bound to properties on a <em>form object</em>.
  *
  * <p>Users should place the form object into the
@@ -43,7 +43,7 @@ import org.springframework.web.util.HtmlUtils;
  * configured using the {@link #setModelAttribute "modelAttribute"} property.
  *
  * <p>The default value for the {@link #setModelAttribute "modelAttribute"}
- * property is '<code>command</code>' which corresponds to the default name
+ * property is '{@code command}' which corresponds to the default name
  * when using the
  * {@link org.springframework.web.servlet.mvc.SimpleFormController SimpleFormController}.
  *
@@ -61,7 +61,7 @@ public class FormTag extends AbstractHtmlElementTag {
 	/** The default attribute name: &quot;command&quot; */
 	public static final String DEFAULT_COMMAND_NAME = "command";
 
-	/** The name of the '<code>modelAttribute</code>' setting */
+	/** The name of the '{@code modelAttribute}' setting */
 	private static final String MODEL_ATTRIBUTE = "modelAttribute";
 
 	/**
@@ -71,7 +71,7 @@ public class FormTag extends AbstractHtmlElementTag {
 	public static final String MODEL_ATTRIBUTE_VARIABLE_NAME =
 			Conventions.getQualifiedAttributeName(AbstractFormTag.class, MODEL_ATTRIBUTE);
 
-	/** Default method parameter, i.e. <code>_method</code>. */
+	/** Default method parameter, i.e. {@code _method}. */
 	private static final String DEFAULT_METHOD_PARAM = "_method";
 
 	private static final String FORM_TAG = "form";
@@ -162,7 +162,7 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Set the value of the '<code>name</code>' attribute.
+	 * Set the value of the '{@code name}' attribute.
 	 * <p>May be a runtime expression.
 	 * <p>Name is not a valid attribute for form on XHTML 1.0. However,
 	 * it is sometimes needed for backward compatibility.
@@ -172,7 +172,7 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>name</code>' attribute.
+	 * Get the value of the '{@code name}' attribute.
 	 */
 	@Override
 	protected String getName() throws JspException {
@@ -180,7 +180,7 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Set the value of the '<code>action</code>' attribute.
+	 * Set the value of the '{@code action}' attribute.
 	 * <p>May be a runtime expression.
 	 */
 	public void setAction(String action) {
@@ -188,14 +188,14 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>action</code>' attribute.
+	 * Get the value of the '{@code action}' attribute.
 	 */
 	protected String getAction() {
 		return this.action;
 	}
 
 	/**
-	 * Set the value of the '<code>method</code>' attribute.
+	 * Set the value of the '{@code method}' attribute.
 	 * <p>May be a runtime expression.
 	 */
 	public void setMethod(String method) {
@@ -203,14 +203,14 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>method</code>' attribute.
+	 * Get the value of the '{@code method}' attribute.
 	 */
 	protected String getMethod() {
 		return this.method;
 	}
 
 	/**
-	 * Set the value of the '<code>target</code>' attribute.
+	 * Set the value of the '{@code target}' attribute.
 	 * <p>May be a runtime expression.
 	 */
 	public void setTarget(String target) {
@@ -218,14 +218,14 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>target</code>' attribute.
+	 * Get the value of the '{@code target}' attribute.
 	 */
 	public String getTarget() {
 		return this.target;
 	}
 
 	/**
-	 * Set the value of the '<code>enctype</code>' attribute.
+	 * Set the value of the '{@code enctype}' attribute.
 	 * <p>May be a runtime expression.
 	 */
 	public void setEnctype(String enctype) {
@@ -233,14 +233,14 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>enctype</code>' attribute.
+	 * Get the value of the '{@code enctype}' attribute.
 	 */
 	protected String getEnctype() {
 		return this.enctype;
 	}
 
 	/**
-	 * Set the value of the '<code>acceptCharset</code>' attribute.
+	 * Set the value of the '{@code acceptCharset}' attribute.
 	 * <p>May be a runtime expression.
 	 */
 	public void setAcceptCharset(String acceptCharset) {
@@ -248,14 +248,14 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>acceptCharset</code>' attribute.
+	 * Get the value of the '{@code acceptCharset}' attribute.
 	 */
 	protected String getAcceptCharset() {
 		return this.acceptCharset;
 	}
 
 	/**
-	 * Set the value of the '<code>onsubmit</code>' attribute.
+	 * Set the value of the '{@code onsubmit}' attribute.
 	 * <p>May be a runtime expression.
 	 */
 	public void setOnsubmit(String onsubmit) {
@@ -263,14 +263,14 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>onsubmit</code>' attribute.
+	 * Get the value of the '{@code onsubmit}' attribute.
 	 */
 	protected String getOnsubmit() {
 		return this.onsubmit;
 	}
 
 	/**
-	 * Set the value of the '<code>onreset</code>' attribute.
+	 * Set the value of the '{@code onreset}' attribute.
 	 * <p>May be a runtime expression.
 	 */
 	public void setOnreset(String onreset) {
@@ -278,14 +278,14 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>onreset</code>' attribute.
+	 * Get the value of the '{@code onreset}' attribute.
 	 */
 	protected String getOnreset() {
 		return this.onreset;
 	}
 
 	/**
-	 * Set the value of the '<code>autocomplete</code>' attribute.
+	 * Set the value of the '{@code autocomplete}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setAutocomplete(String autocomplete) {
@@ -293,7 +293,7 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>autocomplete</code>' attribute.
+	 * Get the value of the '{@code autocomplete}' attribute.
 	 */
 	protected String getAutocomplete() {
 		return this.autocomplete;
@@ -321,7 +321,7 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Writes the opening part of the block	'<code>form</code>' tag and exposes
+	 * Writes the opening part of the block	'{@code form}' tag and exposes
 	 * the form object name in the {@link javax.servlet.jsp.PageContext}.
 	 * @param tagWriter the {@link TagWriter} to which the form content is to be written
 	 * @return {@link javax.servlet.jsp.tagext.Tag#EVAL_BODY_INCLUDE}
@@ -389,7 +389,7 @@ public class FormTag extends AbstractHtmlElementTag {
 
 	/**
 	 * {@link #evaluate Resolves} and returns the name of the form object.
-	 * @throws IllegalArgumentException if the form object resolves to <code>null</code>
+	 * @throws IllegalArgumentException if the form object resolves to {@code null}
 	 */
 	protected String resolveModelAttribute() throws JspException {
 		Object resolvedModelAttribute = evaluate(MODEL_ATTRIBUTE, getModelAttribute());
@@ -400,12 +400,12 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Resolve the value of the '<code>action</code>' attribute.
-	 * <p>If the user configured an '<code>action</code>' value then
+	 * 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.
-	 * @return the value that is to be used for the '<code>action</code>' attribute
+	 * @return the value that is to be used for the '{@code action}' attribute
 	 */
 	protected String resolveAction() throws JspException {
 		String action = getAction();
@@ -447,7 +447,7 @@ public class FormTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Closes the '<code>form</code>' block tag and removes the form object name
+	 * Closes the '{@code form}' block tag and removes the form object name
 	 * from the {@link javax.servlet.jsp.PageContext}.
 	 */
 	@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
index 70ccd7d347..b1d32e4b86 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
@@ -19,7 +19,7 @@ package org.springframework.web.servlet.tags.form;
 import javax.servlet.jsp.JspException;
 
 /**
- * Data-binding aware JSP tag for rendering a hidden HTML '<code>input</code>' field
+ * Data-binding aware JSP tag for rendering a hidden HTML '{@code input}' field
  * containing the databound value.
  *
  * <p>Example (binding to 'name' property of form backing object):
@@ -36,21 +36,21 @@ import javax.servlet.jsp.JspException;
 public class HiddenInputTag extends AbstractHtmlElementTag {
 
 	/**
-	 * The name of the '<code>disabled</code>' attribute.
+	 * The name of the '{@code disabled}' attribute.
 	 */
 	public static final String DISABLED_ATTRIBUTE = "disabled";
 
 	private String disabled;
 
 	/**
-	 * Get the value of the '<code>disabled</code>' attribute.
+	 * Get the value of the '{@code disabled}' attribute.
 	 */
 	public String getDisabled() {
 		return this.disabled;
 	}
 
 	/**
-	 * Set the value of the '<code>disabled</code>' attribute.
+	 * Set the value of the '{@code disabled}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setDisabled(String disabled) {
@@ -66,7 +66,7 @@ public class HiddenInputTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Writes the HTML '<code>input</code>' tag to the supplied {@link TagWriter} including the
+	 * Writes the HTML '{@code input}' tag to the supplied {@link TagWriter} including the
 	 * databound value.
 	 * @see #writeDefaultAttributes(TagWriter)
 	 * @see #getBoundValue()
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
index 0306aac636..a451f8840e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
@@ -19,8 +19,8 @@ package org.springframework.web.servlet.tags.form;
 import javax.servlet.jsp.JspException;
 
 /**
- * Data-binding-aware JSP tag for rendering an HTML '<code>input</code>'
- * element with a '<code>type</code>' of '<code>text</code>'.
+ * Data-binding-aware JSP tag for rendering an HTML '{@code input}'
+ * element with a '{@code type}' of '{@code text}'.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -55,7 +55,7 @@ public class InputTag extends AbstractHtmlInputElementTag {
 
 
 	/**
-	 * Set the value of the '<code>size</code>' attribute.
+	 * Set the value of the '{@code size}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setSize(String size) {
@@ -63,14 +63,14 @@ public class InputTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>size</code>' attribute.
+	 * Get the value of the '{@code size}' attribute.
 	 */
 	protected String getSize() {
 		return this.size;
 	}
 
 	/**
-	 * Set the value of the '<code>maxlength</code>' attribute.
+	 * Set the value of the '{@code maxlength}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setMaxlength(String maxlength) {
@@ -78,14 +78,14 @@ public class InputTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>maxlength</code>' attribute.
+	 * Get the value of the '{@code maxlength}' attribute.
 	 */
 	protected String getMaxlength() {
 		return this.maxlength;
 	}
 
 	/**
-	 * Set the value of the '<code>alt</code>' attribute.
+	 * Set the value of the '{@code alt}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setAlt(String alt) {
@@ -93,14 +93,14 @@ public class InputTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>alt</code>' attribute.
+	 * Get the value of the '{@code alt}' attribute.
 	 */
 	protected String getAlt() {
 		return this.alt;
 	}
 
 	/**
-	 * Set the value of the '<code>onselect</code>' attribute.
+	 * Set the value of the '{@code onselect}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnselect(String onselect) {
@@ -108,14 +108,14 @@ public class InputTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>onselect</code>' attribute.
+	 * Get the value of the '{@code onselect}' attribute.
 	 */
 	protected String getOnselect() {
 		return this.onselect;
 	}
 
 	/**
-	 * Set the value of the '<code>autocomplete</code>' attribute.
+	 * Set the value of the '{@code autocomplete}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setAutocomplete(String autocomplete) {
@@ -123,7 +123,7 @@ public class InputTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>autocomplete</code>' attribute.
+	 * Get the value of the '{@code autocomplete}' attribute.
 	 */
 	protected String getAutocomplete() {
 		return this.autocomplete;
@@ -131,9 +131,9 @@ public class InputTag extends AbstractHtmlInputElementTag {
 
 
 	/**
-	 * Writes the '<code>input</code>' tag to the supplied {@link TagWriter}.
+	 * Writes the '{@code input}' tag to the supplied {@link TagWriter}.
 	 * Uses the value returned by {@link #getType()} to determine which
-	 * type of '<code>input</code>' element to render.
+	 * type of '{@code input}' element to render.
 	 */
 	@Override
 	protected int writeTagContent(TagWriter tagWriter) throws JspException {
@@ -161,7 +161,7 @@ public class InputTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Writes the '<code>value</code>' attribute to the supplied {@link TagWriter}.
+	 * Writes the '{@code value}' attribute to the supplied {@link TagWriter}.
 	 * Subclasses may choose to override this implementation to control exactly
 	 * when the value is written.
 	 */
@@ -186,9 +186,9 @@ public class InputTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>type</code>' attribute. Subclasses
-	 * can override this to change the type of '<code>input</code>' element
-	 * rendered. Default value is '<code>text</code>'.
+	 * Get the value of the '{@code type}' attribute. Subclasses
+	 * can override this to change the type of '{@code input}' element
+	 * rendered. Default value is '{@code text}'.
 	 */
 	protected String getType() {
 		return "text";
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 2dcf87a747..ee4002dfb5 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
@@ -22,7 +22,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Databinding-aware JSP tag for rendering an HTML '<code>label</code>' element
+ * 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.
@@ -37,12 +37,12 @@ import org.springframework.util.StringUtils;
 public class LabelTag extends AbstractHtmlElementTag {
 
 	/**
-	 * The HTML '<code>label</code>' tag.
+	 * The HTML '{@code label}' tag.
 	 */
 	private static final String LABEL_TAG = "label";
 
 	/**
-	 * The name of the '<code>for</code>' attribute.
+	 * The name of the '{@code for}' attribute.
 	 */
 	private static final String FOR_ATTRIBUTE = "for";
 
@@ -54,15 +54,15 @@ public class LabelTag extends AbstractHtmlElementTag {
 	private TagWriter tagWriter;
 
 	/**
-	 * The value of the '<code>for</code>' attribute.
+	 * The value of the '{@code for}' attribute.
 	 */
 	private String forId;
 
 
 	/**
-	 * Set the value of the '<code>for</code>' attribute.
+	 * Set the value of the '{@code for}' attribute.
 	 * <p>Defaults to the value of {@link #getPath}; may be a runtime expression.
-	 * @throws IllegalArgumentException if the supplied value is <code>null</code>
+	 * @throws IllegalArgumentException if the supplied value is {@code null}
 	 */
 	public void setFor(String forId) {
 		Assert.notNull(forId, "'forId' must not be null");
@@ -70,7 +70,7 @@ public class LabelTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>id</code>' attribute.
+	 * Get the value of the '{@code id}' attribute.
 	 * <p>May be a runtime expression.
 	 */
 	public String getFor() {
@@ -79,7 +79,7 @@ public class LabelTag extends AbstractHtmlElementTag {
 
 
 	/**
-	 * Writes the opening '<code>label</code>' tag and forces a block tag so
+	 * Writes the opening '{@code label}' tag and forces a block tag so
 	 * that body content is written correctly.
 	 * @return {@link javax.servlet.jsp.tagext.Tag#EVAL_BODY_INCLUDE}
 	 */
@@ -94,10 +94,10 @@ public class LabelTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Overrides {@link #getName()} to always return <code>null</code>,
-	 * because the '<code>name</code>' attribute is not supported by the
-	 * '<code>label</code>' tag.
-	 * @return the value for the HTML '<code>name</code>' attribute
+	 * Overrides {@link #getName()} to always return {@code null},
+	 * because the '{@code name}' attribute is not supported by the
+	 * '{@code label}' tag.
+	 * @return the value for the HTML '{@code name}' attribute
 	 */
 	@Override
 	protected String getName() throws JspException {
@@ -106,7 +106,7 @@ public class LabelTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Determine the '<code>for</code>' attribute value for this tag,
+	 * Determine the '{@code for}' attribute value for this tag,
 	 * autogenerating one if none specified.
 	 * @see #getFor()
 	 * @see #autogenerateFor()
@@ -121,7 +121,7 @@ public class LabelTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Autogenerate the '<code>for</code>' attribute value for this tag.
+	 * Autogenerate the '{@code for}' attribute value for this tag.
 	 * <p>The default implementation delegates to {@link #getPropertyPath()},
 	 * deleting invalid characters (such as "[" or "]").
 	 */
@@ -130,7 +130,7 @@ public class LabelTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Close the '<code>label</code>' tag.
+	 * Close the '{@code label}' tag.
 	 */
 	@Override
 	public int doEndTag() throws JspException {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
index 57d2d75cef..55ebc647ac 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
@@ -25,20 +25,20 @@ import org.springframework.web.servlet.support.BindStatus;
 import org.springframework.web.util.TagUtils;
 
 /**
- * JSP tag for rendering an HTML '<code>option</code>' tag.
+ * JSP tag for rendering an HTML '{@code option}' tag.
  *
  * <p><b>Must be used nested inside a {@link SelectTag}.</b>
  *
  * <p>Provides full support for databinding by marking an
- * '<code>option</code>' as 'selected' if the {@link #setValue value}
+ * '{@code option}' as 'selected' if the {@link #setValue value}
  * matches the value bound to the out {@link SelectTag}.
  *
  * <p>The {@link #setValue value} property is required and corresponds to
- * the '<code>value</code>' attribute of the rendered '<code>option</code>'.
+ * the '{@code value}' attribute of the rendered '{@code option}'.
  *
  * <p>An optional {@link #setLabel label} property can be specified, the
  * value of which corresponds to inner text of the rendered
- * '<code>option</code>' tag. If no {@link #setLabel label} is specified
+ * '{@code option}' tag. If no {@link #setLabel label} is specified
  * then the {@link #setValue value} property will be used when rendering
  * the inner text.
  *
@@ -59,28 +59,28 @@ public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	public static final String DISPLAY_VALUE_VARIABLE_NAME = "displayValue";
 
 	/**
-	 * The name of the '<code>selected</code>' attribute.
+	 * The name of the '{@code selected}' attribute.
 	 */
 	private static final String SELECTED_ATTRIBUTE = "selected";
 
 	/**
-	 * The name of the '<code>value</code>' attribute.
+	 * The name of the '{@code value}' attribute.
 	 */
 	private static final String VALUE_ATTRIBUTE = VALUE_VARIABLE_NAME;
 
 	/**
-	 * The name of the '<code>disabled</code>' attribute.
+	 * The name of the '{@code disabled}' attribute.
 	 */
 	private static final String DISABLED_ATTRIBUTE = "disabled";
 
 
 	/**
-	 * The 'value' attribute of the rendered HTML <code>&lt;option&gt;</code> tag.
+	 * The 'value' attribute of the rendered HTML {@code &lt;option&gt;} tag.
 	 */
 	private Object value;
 
 	/**
-	 * The text body of the rendered HTML <code>&lt;option&gt;</code> tag.
+	 * The text body of the rendered HTML {@code &lt;option&gt;} tag.
 	 */
 	private String label;
 
@@ -92,7 +92,7 @@ public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
 
 
 	/**
-	 * Set the 'value' attribute of the rendered HTML <code>&lt;option&gt;</code> tag.
+	 * Set the 'value' attribute of the rendered HTML {@code &lt;option&gt;} tag.
 	 * <p>May be a runtime expression.
 	 */
 	public void setValue(Object value) {
@@ -100,23 +100,23 @@ public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	}
 
 	/**
-	 * Get the 'value' attribute of the rendered HTML <code>&lt;option&gt;</code> tag.
+	 * Get the 'value' attribute of the rendered HTML {@code &lt;option&gt;} tag.
 	 */
 	protected Object getValue() {
 		return this.value;
 	}
 
 	/**
-	 * Set the value of the '<code>disabled</code>' attribute.
+	 * Set the value of the '{@code disabled}' attribute.
 	 * <p>May be a runtime expression.
-	 * @param disabled the value of the '<code>disabled</code>' attribute
+	 * @param disabled the value of the '{@code disabled}' attribute
 	 */
 	public void setDisabled(String disabled) {
 		this.disabled = disabled;
 	}
 
 	/**
-	 * Get the value of the '<code>disabled</code>' attribute.
+	 * Get the value of the '{@code disabled}' attribute.
 	 */
 	protected String getDisabled() {
 		return this.disabled;
@@ -124,14 +124,14 @@ public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
 
 	/**
 	 * Is the current HTML tag disabled?
-	 * @return <code>true</code> if this tag is disabled
+	 * @return {@code true} if this tag is disabled
 	 */
 	protected boolean isDisabled() throws JspException {
 		return evaluateBoolean(DISABLED_ATTRIBUTE, getDisabled());
 	}
 
 	/**
-	 * Set the text body of the rendered HTML <code>&lt;option&gt;</code> tag.
+	 * Set the text body of the rendered HTML {@code &lt;option&gt;} tag.
 	 * <p>May be a runtime expression.
 	 */
 	public void setLabel(String label) {
@@ -140,7 +140,7 @@ public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	}
 
 	/**
-	 * Get the text body of the rendered HTML <code>&lt;option&gt;</code> tag.
+	 * Get the text body of the rendered HTML {@code &lt;option&gt;} tag.
 	 */
 	protected String getLabel() {
 		return this.label;
@@ -162,7 +162,7 @@ public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	}
 
 	/**
-	 * Make sure we are under a '<code>select</code>' tag before proceeding.
+	 * Make sure we are under a '{@code select}' tag before proceeding.
 	 */
 	@Override
 	protected void onWriteTagContent() {
@@ -225,9 +225,9 @@ public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
 	}
 
 	/**
-	 * Returns the value of the label for this '<code>option</code>' element.
+	 * Returns the value of the label for this '{@code option}' element.
 	 * If the {@link #setLabel label} property is set then the resolved value
-	 * of that property is used, otherwise the value of the <code>resolvedValue</code>
+	 * of that property is used, otherwise the value of the {@code resolvedValue}
 	 * argument is used.
 	 */
 	private String getLabelValue(Object resolvedValue) throws JspException {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
index cc1cb878c1..3f7c6a8614 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
@@ -34,25 +34,25 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
 import org.springframework.web.servlet.support.RequestContext;
 
 /**
- * Provides supporting functionality to render a list of '<code>option</code>'
+ * Provides supporting functionality to render a list of '{@code option}'
  * tags based on some source object. This object can be either an array, a
  * {@link Collection}, or a {@link Map}.
  * <h3>Using an array or a {@link Collection}:</h3>
  * <p>
  * If you supply an array or {@link Collection} source object to render the
- * inner '<code>option</code>' tags, you may optionally specify the name of
+ * inner '{@code option}' tags, you may optionally specify the name of
  * the property on the objects which corresponds to the <em>value</em> of the
- * rendered '<code>option</code>' (i.e., the <code>valueProperty</code>)
+ * rendered '{@code option}' (i.e., the {@code valueProperty})
  * and the name of the property that corresponds to the <em>label</em> (i.e.,
- * the <code>labelProperty</code>). These properties are then used when
- * rendering each element of the array/{@link Collection} as an '<code>option</code>'.
+ * the {@code labelProperty}). These properties are then used when
+ * rendering each element of the array/{@link Collection} as an '{@code option}'.
  * If either property name is omitted, the value of {@link Object#toString()} of
  * the corresponding array/{@link Collection} element is used instead.  However,
  * if the item is an enum, {@link Enum#name()} is used as the default value.
  * </p>
  * <h3>Using a {@link Map}:</h3>
  * <p>
- * You can alternatively choose to render '<code>option</code>' tags by
+ * You can alternatively choose to render '{@code option}' tags by
  * supplying a {@link Map} as the source object.
  * </p>
  * <p>
@@ -60,29 +60,29 @@ import org.springframework.web.servlet.support.RequestContext;
  * <em>label</em>:
  * </p>
  * <ul>
- * <li>the <code>key</code> of each {@link Map} entry will correspond to the
- * <em>value</em> of the rendered '<code>option</code>', and</li>
- * <li>the <code>value</code> of each {@link Map} entry will correspond to
- * the <em>label</em> of the rendered '<code>option</code>'.</li>
+ * <li>the {@code key} of each {@link Map} entry will correspond to the
+ * <em>value</em> of the rendered '{@code option}', and</li>
+ * <li>the {@code value} of each {@link Map} entry will correspond to
+ * the <em>label</em> of the rendered '{@code option}'.</li>
  * </ul>
  * <p>
  * If you <strong>supply</strong> property names for the <em>value</em> and
  * <em>label</em>:
  * </p>
  * <ul>
- * <li>the <em>value</em> of the rendered '<code>option</code>' will be
- * retrieved from the <code>valueProperty</code> on the object
- * corresponding to the <code>key</code> of each {@link Map} entry, and</li>
- * <li>the <em>label</em> of the rendered '<code>option</code>' will be
- * retrieved from the <code>labelProperty</code> on the object
- * corresponding to the <code>value</code> of each {@link Map} entry.
+ * <li>the <em>value</em> of the rendered '{@code option}' will be
+ * retrieved from the {@code valueProperty} on the object
+ * corresponding to the {@code key} of each {@link Map} entry, and</li>
+ * <li>the <em>label</em> of the rendered '{@code option}' will be
+ * retrieved from the {@code labelProperty} on the object
+ * corresponding to the {@code value} of each {@link Map} entry.
  * </ul>
  * <h3>When using either of these approaches:</h3>
  * <ul>
  * <li>Property names for the <em>value</em> and <em>label</em> are
  * specified as arguments to the
  * {@link #OptionWriter(Object, BindStatus, String, String, boolean) constructor}.</li>
- * <li>An '<code>option</code>' is marked as 'selected' if its key
+ * <li>An '{@code option}' is marked as 'selected' if its key
  * {@link #isOptionSelected matches} the value that is bound to the tag instance.</li>
  * </ul>
  *
@@ -106,12 +106,12 @@ class OptionWriter {
 
 
 	/**
-	 * Creates a new <code>OptionWriter</code> for the supplied <code>objectSource</code>.
-	 * @param optionSource the source of the <code>options</code> (never <code>null</code>)
-	 * @param bindStatus the {@link BindStatus} for the bound value (never <code>null</code>)
-	 * @param valueProperty the name of the property used to render <code>option</code> values
+	 * Creates a new {@code OptionWriter} for the supplied {@code objectSource}.
+	 * @param optionSource the source of the {@code options} (never {@code null})
+	 * @param bindStatus the {@link BindStatus} for the bound value (never {@code null})
+	 * @param valueProperty the name of the property used to render {@code option} values
 	 * (optional)
-	 * @param labelProperty the name of the property used to render <code>option</code> labels
+	 * @param labelProperty the name of the property used to render {@code option} labels
 	 * (optional)
 	 */
 	public OptionWriter(
@@ -128,7 +128,7 @@ class OptionWriter {
 
 
 	/**
-	 * Write the '<code>option</code>' tags for the configured {@link #optionSource} to
+	 * Write the '{@code option}' tags for the configured {@link #optionSource} to
 	 * the supplied {@link TagWriter}.
 	 */
 	public void writeOptions(TagWriter tagWriter) throws JspException {
@@ -151,7 +151,7 @@ class OptionWriter {
 	}
 
 	/**
-	 * Renders the inner '<code>option</code>' tags using the {@link #optionSource}.
+	 * Renders the inner '{@code option}' tags using the {@link #optionSource}.
 	 * @see #doRenderFromCollection(java.util.Collection, TagWriter)
 	 */
 	private void renderFromArray(TagWriter tagWriter) throws JspException {
@@ -159,7 +159,7 @@ class OptionWriter {
 	}
 
 	/**
-	 * Renders the inner '<code>option</code>' tags using the supplied
+	 * Renders the inner '{@code option}' tags using the supplied
 	 * {@link Map} as the source.
 	 * @see #renderOption(TagWriter, Object, Object, Object)
 	 */
@@ -179,7 +179,7 @@ class OptionWriter {
 	}
 
 	/**
-	 * Renders the inner '<code>option</code>' tags using the {@link #optionSource}.
+	 * Renders the inner '{@code option}' tags using the {@link #optionSource}.
 	 * @see #doRenderFromCollection(java.util.Collection, TagWriter)
 	 */
 	private void renderFromCollection(TagWriter tagWriter) throws JspException {
@@ -187,7 +187,7 @@ class OptionWriter {
 	}
 
 	/**
-	 * Renders the inner '<code>option</code>' tags using the {@link #optionSource}.
+	 * Renders the inner '{@code option}' tags using the {@link #optionSource}.
 	 * @see #doRenderFromCollection(java.util.Collection, TagWriter)
 	 */
 	private void renderFromEnum(TagWriter tagWriter) throws JspException {
@@ -195,9 +195,9 @@ class OptionWriter {
 	}
 
 	/**
-	 * Renders the inner '<code>option</code>' tags using the supplied {@link Collection} of
+	 * Renders the inner '{@code option}' tags using the supplied {@link Collection} of
 	 * objects as the source. The value of the {@link #valueProperty} field is used
-	 * when rendering the '<code>value</code>' of the '<code>option</code>' and the value of the
+	 * when rendering the '{@code value}' of the '{@code option}' and the value of the
 	 * {@link #labelProperty} property is used when rendering the label.
 	 */
 	private void doRenderFromCollection(Collection optionCollection, TagWriter tagWriter) throws JspException {
@@ -219,7 +219,7 @@ class OptionWriter {
 	}
 
 	/**
-	 * Renders an HTML '<code>option</code>' with the supplied value and label. Marks the
+	 * Renders an HTML '{@code option}' with the supplied value and label. Marks the
 	 * value as 'selected' if either the item itself or its value match the bound value.
 	 */
 	private void renderOption(TagWriter tagWriter, Object item, Object value, Object label) throws JspException {
@@ -245,7 +245,7 @@ class OptionWriter {
 	}
 
 	/**
-	 * Determines the display value of the supplied <code>Object</code>,
+	 * Determines the display value of the supplied {@code Object},
 	 * HTML-escaped as required.
 	 */
 	private String getDisplayString(Object value) {
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 7c016a431c..e57b0ea677 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
@@ -27,8 +27,8 @@ import org.springframework.web.util.TagUtils;
 
 /**
  * Convenient tag that allows one to supply a collection of objects
- * that are to be rendered as '<code>option</code>' tags within a
- * '<code>select</code>' tag.
+ * that are to be rendered as '{@code option}' tags within a
+ * '{@code select}' tag.
  *
  * <p><i>Must</i> be used within a {@link SelectTag 'select' tag}.
  *
@@ -41,19 +41,19 @@ public class OptionsTag extends AbstractHtmlElementTag {
 
 	/**
 	 * The {@link java.util.Collection}, {@link java.util.Map} or array of
-	 * objects used to generate the inner '<code>option</code>' tags.
+	 * objects used to generate the inner '{@code option}' tags.
 	 */
 	private Object items;
 
 	/**
-	 * The name of the property mapped to the '<code>value</code>' attribute
-	 * of the '<code>option</code>' tag.
+	 * The name of the property mapped to the '{@code value}' attribute
+	 * of the '{@code option}' tag.
 	 */
 	private String itemValue;
 
 	/**
 	 * The name of the property mapped to the inner text of the
-	 * '<code>option</code>' tag.
+	 * '{@code option}' tag.
 	 */
 	private String itemLabel;
 
@@ -62,8 +62,8 @@ public class OptionsTag extends AbstractHtmlElementTag {
 
 	/**
 	 * Set the {@link java.util.Collection}, {@link java.util.Map} or array
-	 * of objects used to generate the inner '<code>option</code>' tags.
-	 * <p>Required when wishing to render '<code>option</code>' tags from an
+	 * of objects used to generate the inner '{@code option}' tags.
+	 * <p>Required when wishing to render '{@code option}' tags from an
 	 * array, {@link java.util.Collection} or {@link java.util.Map}.
 	 * <p>Typically a runtime expression.
 	 */
@@ -73,7 +73,7 @@ public class OptionsTag extends AbstractHtmlElementTag {
 
 	/**
 	 * Get the {@link java.util.Collection}, {@link java.util.Map} or array
-	 * of objects used to generate the inner '<code>option</code>' tags.
+	 * of objects used to generate the inner '{@code option}' tags.
 	 * <p>Typically a runtime expression.
 	 */
 	protected Object getItems() {
@@ -81,9 +81,9 @@ public class OptionsTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Set the name of the property mapped to the '<code>value</code>'
-	 * attribute of the '<code>option</code>' tag.
-	 * <p>Required when wishing to render '<code>option</code>' tags from
+	 * Set the name of the property mapped to the '{@code value}'
+	 * attribute of the '{@code option}' tag.
+	 * <p>Required when wishing to render '{@code option}' tags from
 	 * an array or {@link java.util.Collection}.
 	 * <p>May be a runtime expression.
 	 */
@@ -93,8 +93,8 @@ public class OptionsTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Return the name of the property mapped to the '<code>value</code>'
-	 * attribute of the '<code>option</code>' tag.
+	 * Return the name of the property mapped to the '{@code value}'
+	 * attribute of the '{@code option}' tag.
 	 */
 	protected String getItemValue() {
 		return this.itemValue;
@@ -102,7 +102,7 @@ public class OptionsTag extends AbstractHtmlElementTag {
 
 	/**
 	 * Set the name of the property mapped to the label (inner text) of the
-	 * '<code>option</code>' tag.
+	 * '{@code option}' tag.
 	 * <p>May be a runtime expression.
 	 */
 	public void setItemLabel(String itemLabel) {
@@ -112,7 +112,7 @@ public class OptionsTag extends AbstractHtmlElementTag {
 
 	/**
 	 * Get the name of the property mapped to the label (inner text) of the
-	 * '<code>option</code>' tag.
+	 * '{@code option}' tag.
 	 * <p>May be a runtime expression.
 	 */
 	protected String getItemLabel() {
@@ -120,16 +120,16 @@ public class OptionsTag extends AbstractHtmlElementTag {
 	}
 
 	/**
-	 * Set the value of the '<code>disabled</code>' attribute.
+	 * Set the value of the '{@code disabled}' attribute.
 	 * <p>May be a runtime expression.
-	 * @param disabled the value of the '<code>disabled</code>' attribute
+	 * @param disabled the value of the '{@code disabled}' attribute
 	 */
 	public void setDisabled(String disabled) {
 		this.disabled = disabled;
 	}
 
 	/**
-	 * Get the value of the '<code>disabled</code>' attribute.
+	 * Get the value of the '{@code disabled}' attribute.
 	 */
 	protected String getDisabled() {
 		return this.disabled;
@@ -137,7 +137,7 @@ public class OptionsTag extends AbstractHtmlElementTag {
 
 	/**
 	 * Is the current HTML tag disabled?
-	 * @return <code>true</code> if this tag is disabled
+	 * @return {@code true} if this tag is disabled
 	 */
 	protected boolean isDisabled() throws JspException {
 		return evaluateBoolean("disabled", getDisabled());
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 a8116aab69..5ffe563cac 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
@@ -19,8 +19,8 @@ package org.springframework.web.servlet.tags.form;
 import javax.servlet.jsp.JspException;
 
 /**
- * Databinding-aware JSP tag for rendering an HTML '<code>input</code>'
- * element with a '<code>type</code>' of '<code>password</code>'.
+ * Databinding-aware JSP tag for rendering an HTML '{@code input}'
+ * element with a '{@code type}' of '{@code password}'.
  *
  * @author Rob Harrop
  * @author Rick Evans
@@ -34,7 +34,7 @@ public class PasswordInputTag extends InputTag {
 
 	/**
 	 * Is the password value to be rendered?
-	 * @return <code>true</code> if the password value to be rendered.
+	 * @return {@code true} if the password value to be rendered.
 	 */
 	public boolean isShowPassword() {
 		return this.showPassword;
@@ -42,7 +42,7 @@ public class PasswordInputTag extends InputTag {
 
 	/**
 	 * Is the password value to be rendered?
-	 * @param showPassword <code>true</code> if the password value is to be rendered.
+	 * @param showPassword {@code true} if the password value is to be rendered.
 	 */
 	public void setShowPassword(boolean showPassword) {
 		this.showPassword = showPassword;
@@ -57,8 +57,8 @@ public class PasswordInputTag extends InputTag {
 	}
 
 	/**
-	 * Return '<code>password</code>' causing the rendered HTML '<code>input</code>'
-	 * element to have a '<code>type</code>' of '<code>password</code>'.
+	 * Return '{@code password}' causing the rendered HTML '{@code input}'
+	 * element to have a '{@code type}' of '{@code password}'.
 	 */
 	@Override
 	protected String getType() {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
index 44c650ab10..2eb3e4f194 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
@@ -19,8 +19,8 @@ package org.springframework.web.servlet.tags.form;
 import javax.servlet.jsp.JspException;
 
 /**
- * Databinding-aware JSP tag for rendering an HTML '<code>input</code>'
- * element with a '<code>type</code>' of '<code>radio</code>'.
+ * Databinding-aware JSP tag for rendering an HTML '{@code input}'
+ * element with a '{@code type}' of '{@code radio}'.
  *
  * <p>Rendered elements are marked as 'checked' if the configured
  * {@link #setValue(Object) value} matches the {@link #getValue bound value}.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java
index 359771e132..1d0ee7057e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java
@@ -17,8 +17,8 @@
 package org.springframework.web.servlet.tags.form;
 
 /**
- * Databinding-aware JSP tag for rendering multiple HTML '<code>input</code>'
- * elements with a '<code>type</code>' of '<code>radio</code>'.
+ * Databinding-aware JSP tag for rendering multiple HTML '{@code input}'
+ * elements with a '{@code type}' of '{@code radio}'.
  *
  * <p>Rendered elements are marked as 'checked' if the configured
  * {@link #setItems(Object) value} matches the bound value.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
index 446e6dcba2..10abcf87d0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
@@ -26,10 +26,10 @@ import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.servlet.support.BindStatus;
 
 /**
- * Databinding-aware JSP tag that renders an HTML '<code>select</code>'
+ * Databinding-aware JSP tag that renders an HTML '{@code select}'
  * element.
  *
- * <p>Inner '<code>option</code>' tags can be rendered using one of the
+ * <p>Inner '{@code option}' tags can be rendered using one of the
  * approaches supported by the OptionWriter class.
  *
  * <p>Also supports the use of nested {@link OptionTag OptionTags} or
@@ -58,30 +58,30 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 
 	/**
 	 * The {@link Collection}, {@link Map} or array of objects used to generate the inner
-	 * '<code>option</code>' tags.
+	 * '{@code option}' tags.
 	 */
 	private Object items;
 
 	/**
-	 * The name of the property mapped to the '<code>value</code>' attribute
-	 * of the '<code>option</code>' tag.
+	 * The name of the property mapped to the '{@code value}' attribute
+	 * of the '{@code option}' tag.
 	 */
 	private String itemValue;
 
 	/**
 	 * The name of the property mapped to the inner text of the
-	 * '<code>option</code>' tag.
+	 * '{@code option}' tag.
 	 */
 	private String itemLabel;
 
 	/**
-	 * The value of the HTML '<code>size</code>' attribute rendered
-	 * on the final '<code>select</code>' element.
+	 * The value of the HTML '{@code size}' attribute rendered
+	 * on the final '{@code select}' element.
 	 */
 	private String size;
 
 	/**
-	 * Indicates whether or not the '<code>select</code>' tag allows
+	 * Indicates whether or not the '{@code select}' tag allows
 	 * multiple-selections.
 	 */
 	private Object multiple = Boolean.FALSE;
@@ -95,8 +95,8 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 
 	/**
 	 * Set the {@link Collection}, {@link Map} or array of objects used to
-	 * generate the inner '<code>option</code>' tags.
-	 * <p>Required when wishing to render '<code>option</code>' tags from
+	 * generate the inner '{@code option}' tags.
+	 * <p>Required when wishing to render '{@code option}' tags from
 	 * an array, {@link Collection} or {@link Map}.
 	 * <p>Typically a runtime expression.
 	 * @param items the items that comprise the options of this selection
@@ -106,7 +106,7 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>items</code>' attribute.
+	 * Get the value of the '{@code items}' attribute.
 	 * <p>May be a runtime expression.
 	 */
 	protected Object getItems() {
@@ -114,9 +114,9 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Set the name of the property mapped to the '<code>value</code>'
-	 * attribute of the '<code>option</code>' tag.
-	 * <p>Required when wishing to render '<code>option</code>' tags from
+	 * Set the name of the property mapped to the '{@code value}'
+	 * attribute of the '{@code option}' tag.
+	 * <p>Required when wishing to render '{@code option}' tags from
 	 * an array or {@link Collection}.
 	 * <p>May be a runtime expression.
 	 */
@@ -125,7 +125,7 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>itemValue</code>' attribute.
+	 * Get the value of the '{@code itemValue}' attribute.
 	 * <p>May be a runtime expression.
 	 */
 	protected String getItemValue() {
@@ -134,7 +134,7 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 
 	/**
 	 * Set the name of the property mapped to the label (inner text) of the
-	 * '<code>option</code>' tag.
+	 * '{@code option}' tag.
 	 * <p>May be a runtime expression.
 	 */
 	public void setItemLabel(String itemLabel) {
@@ -142,7 +142,7 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>itemLabel</code>' attribute.
+	 * Get the value of the '{@code itemLabel}' attribute.
 	 * <p>May be a runtime expression.
 	 */
 	protected String getItemLabel() {
@@ -150,17 +150,17 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Set the value of the HTML '<code>size</code>' attribute rendered
-	 * on the final '<code>select</code>' element.
+	 * Set the value of the HTML '{@code size}' attribute rendered
+	 * on the final '{@code select}' element.
 	 * <p>May be a runtime expression.
-	 * @param size the desired value of the '<code>size</code>' attribute
+	 * @param size the desired value of the '{@code size}' attribute
 	 */
 	public void setSize(String size) {
 		this.size = size;
 	}
 
 	/**
-	 * Get the value of the '<code>size</code>' attribute.
+	 * Get the value of the '{@code size}' attribute.
 	 * <p>May be a runtime expression.
 	 */
 	protected String getSize() {
@@ -168,8 +168,8 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Set the value of the HTML '<code>multiple</code>' attribute rendered
-	 * on the final '<code>select</code>' element.
+	 * Set the value of the HTML '{@code multiple}' attribute rendered
+	 * on the final '{@code select}' element.
 	 * <p>May be a runtime expression.
 	 */
 	public void setMultiple(Object multiple) {
@@ -177,8 +177,8 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Get the value of the HTML '<code>multiple</code>' attribute rendered
-	 * on the final '<code>select</code>' element.
+	 * Get the value of the HTML '{@code multiple}' attribute rendered
+	 * on the final '{@code select}' element.
 	 * <p>May be a runtime expression.
 	 */
 	protected Object getMultiple() {
@@ -187,9 +187,9 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 
 
 	/**
-	 * Renders the HTML '<code>select</code>' tag to the supplied
+	 * Renders the HTML '{@code select}' tag to the supplied
 	 * {@link TagWriter}.
-	 * <p>Renders nested '<code>option</code>' tags if the
+	 * <p>Renders nested '{@code option}' tags if the
 	 * {@link #setItems items} property is set, otherwise exposes the
 	 * bound value for the nested {@link OptionTag OptionTags}.
 	 */
@@ -238,7 +238,7 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 	/**
 	 * If using a multi-select, a hidden element is needed to make sure all
 	 * items are correctly unselected on the server-side in response to a
-	 * <code>null</code> post.
+	 * {@code null} post.
 	 */
 	private void writeHiddenTagIfNecessary(TagWriter tagWriter) throws JspException {
 		if (isMultiple()) {
@@ -263,8 +263,8 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Returns '<code>true</code>' if the bound value requires the
-	 * resultant '<code>select</code>' tag to be multi-select.
+	 * Returns '{@code true}' if the bound value requires the
+	 * resultant '{@code select}' tag to be multi-select.
 	 */
 	private boolean forceMultiple() throws JspException {
 		BindStatus bindStatus = getBindStatus();
@@ -282,7 +282,7 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Returns '<code>true</code>' for arrays, {@link Collection Collections}
+	 * Returns '{@code true}' for arrays, {@link Collection Collections}
 	 * and {@link Map Maps}.
 	 */
 	private static boolean typeRequiresMultiple(Class type) {
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 490a0f0a2c..63c41341ee 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
@@ -36,22 +36,22 @@ import org.springframework.web.servlet.support.BindStatus;
  * <p><h1><a name="equality-contract">Equality Contract</a></h1>
  * For single-valued objects equality is first tested using standard {@link Object#equals Java equality}. As
  * such, user code should endeavour to implement {@link Object#equals} to speed up the comparison process. If
- * {@link Object#equals} returns <code>false</code> then an attempt is made at an
+ * {@link Object#equals} returns {@code false} then an attempt is made at an
  * {@link #exhaustiveCompare exhaustive comparison} with the aim being to <strong>prove</strong> equality rather
  * than disprove it.
  *
- * <p>Special support is given for instances of {@link LabeledEnum} with a <code>String</code>-based
+ * <p>Special support is given for instances of {@link LabeledEnum} with a {@code String}-based
  * comparison of the candidate value against the code of the {@link LabeledEnum}. This can be useful when a
- * {@link LabeledEnum} is used to define a list of '<code>&lt;option&gt;</code>' elements in HTML.
+ * {@link LabeledEnum} is used to define a list of '{@code &lt;option&gt;}' elements in HTML.
  *
- * <p>Next, an attempt is made to compare the <code>String</code> representations of both the candidate and bound
- * values. This may result in <code>true</code> in a number of cases due to the fact both values will be represented
- * as <code>Strings</code> when shown to the user.
+ * <p>Next, an attempt is made to compare the {@code String} representations of both the candidate and bound
+ * values. This may result in {@code true} in a number of cases due to the fact both values will be represented
+ * as {@code Strings} when shown to the user.
  *
- * <p>Next, if the candidate value is a <code>String</code>, an attempt is made to compare the bound value to
+ * <p>Next, if the candidate value is a {@code String}, an attempt is made to compare the bound value to
  * result of applying the corresponding {@link PropertyEditor} to the candidate. This comparison may be
- * executed twice, once against the direct <code>String</code> instances, and then against the <code>String</code>
- * representations if the first comparison results in <code>false</code>.
+ * executed twice, once against the direct {@code String} instances, and then against the {@code String}
+ * representations if the first comparison results in {@code false}.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -60,7 +60,7 @@ import org.springframework.web.servlet.support.BindStatus;
 abstract class SelectedValueComparator {
 
 	/**
-	 * Returns <code>true</code> if the supplied candidate value is equal to the value bound to
+	 * Returns {@code true} if the supplied candidate value is equal to the value bound to
 	 * the supplied {@link BindStatus}. Equality in this case differs from standard Java equality and
 	 * is described in more detail <a href="#equality-contract">here</a>.
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java
index bcdc0452c7..8062d17c57 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java
@@ -19,12 +19,12 @@ package org.springframework.web.servlet.tags.form;
 import javax.servlet.jsp.PageContext;
 
 /**
- * Utility class for generating '<code>id</code>' attributes values for JSP tags. Given the
+ * Utility class for generating '{@code id}' attributes values for JSP tags. Given the
  * name of a tag (the data bound path in most cases) returns a unique ID for that name within
  * the current {@link PageContext}. Each request for an ID for a given name will append an
- * ever increasing counter to the name itself. For instance, given the name '<code>person.name</code>',
- * the first request will give '<code>person.name1</code>' and the second will give
- * '<code>person.name2</code>'. This supports the common use case where a set of radio or check buttons
+ * ever increasing counter to the name itself. For instance, given the name '{@code person.name}',
+ * the first request will give '{@code person.name1}' and the second will give
+ * '{@code person.name2}'. This supports the common use case where a set of radio or check buttons
  * are generated for the same data field, with each button being a distinct tag instance.
  *
  * @author Rob Harrop
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
index 0c5dfa5e9b..a316367172 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
@@ -97,7 +97,7 @@ public class TagWriter {
 	}
 
 	/**
-	 * Write an HTML attribute if the supplied value is not <code>null</code>
+	 * Write an HTML attribute if the supplied value is not {@code null}
 	 * or zero length.
 	 * @see #writeAttribute(String, String)
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
index c0a6fa1ba2..37940fa940 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
@@ -19,7 +19,7 @@ package org.springframework.web.servlet.tags.form;
 import javax.servlet.jsp.JspException;
 
 /**
- * Databinding-aware JSP tag for rendering an HTML '<code>textarea</code>'.
+ * Databinding-aware JSP tag for rendering an HTML '{@code textarea}'.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -44,7 +44,7 @@ public class TextareaTag extends AbstractHtmlInputElementTag {
 
 
 	/**
-	 * Set the value of the '<code>rows</code>' attribute.
+	 * Set the value of the '{@code rows}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setRows(String rows) {
@@ -52,14 +52,14 @@ public class TextareaTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>rows</code>' attribute.
+	 * Get the value of the '{@code rows}' attribute.
 	 */
 	protected String getRows() {
 		return this.rows;
 	}
 
 	/**
-	 * Set the value of the '<code>cols</code>' attribute.
+	 * Set the value of the '{@code cols}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setCols(String cols) {
@@ -67,14 +67,14 @@ public class TextareaTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>cols</code>' attribute.
+	 * Get the value of the '{@code cols}' attribute.
 	 */
 	protected String getCols() {
 		return this.cols;
 	}
 
 	/**
-	 * Set the value of the '<code>onselect</code>' attribute.
+	 * Set the value of the '{@code onselect}' attribute.
 	 * May be a runtime expression.
 	 */
 	public void setOnselect(String onselect) {
@@ -82,7 +82,7 @@ public class TextareaTag extends AbstractHtmlInputElementTag {
 	}
 
 	/**
-	 * Get the value of the '<code>onselect</code>' attribute.
+	 * Get the value of the '{@code onselect}' attribute.
 	 */
 	protected String getOnselect() {
 		return this.onselect;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java
index b3c23fea70..c10ac1ee02 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java
@@ -25,7 +25,7 @@ import org.springframework.web.util.HtmlUtils;
  * Package-visible helper class for formatting values for rendering via a form tag.
  * Supports two styles of formatting: plain and {@link PropertyEditor}-aware.
  *
- * <p>Plain formatting simply prevents the string '<code>null</code>' from appearing,
+ * <p>Plain formatting simply prevents the string '{@code null}' from appearing,
  * replacing it with an empty String, and adds HTML escaping as required.
  *
  * <p>{@link PropertyEditor}-aware formatting will attempt to use the supplied
@@ -39,7 +39,7 @@ import org.springframework.web.util.HtmlUtils;
 abstract class ValueFormatter {
 
 	/**
-	 * Build the display value of the supplied <code>Object</code>, HTML escaped
+	 * Build the display value of the supplied {@code Object}, HTML escaped
 	 * as required. This version is <strong>not</strong> {@link PropertyEditor}-aware.
 	 * @see #getDisplayString(Object, java.beans.PropertyEditor, boolean)
 	 */
@@ -49,7 +49,7 @@ abstract class ValueFormatter {
 	}
 
 	/**
-	 * Build the display value of the supplied <code>Object</code>, HTML escaped
+	 * Build the display value of the supplied {@code Object}, HTML escaped
 	 * as required. If the supplied value is not a {@link String} and the supplied
 	 * {@link PropertyEditor} is not null then the {@link PropertyEditor} is used
 	 * to obtain the display value.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/package-info.java
index 65f88f41df..9f8a942274 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/package-info.java
@@ -1,9 +1,8 @@
-
 /**
  *
  * Spring's form tag library for JSP 2.0+.
  * Supports JSP view implementations for Spring's web MVC framework.
- * See <code>spring-form.tld</code> for descriptions of the various tags.
+ * See {@code spring-form.tld} for descriptions of the various tags.
  *
  */
 package org.springframework.web.servlet.tags.form;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/package-info.java
index b0e495b1df..56d5853cc0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/package-info.java
@@ -1,9 +1,8 @@
-
 /**
  *
  * Spring's JSP standard tag library for JSP 2.0+.
  * Supports JSP view implementations within Spring's web MVC framework.
- * See <code>spring.tld</code> for descriptions of the various tags.
+ * See {@code spring.tld} for descriptions of the various tags.
  *
  */
 package org.springframework.web.servlet.tags;
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 c01fde5f51..12ab0f5fea 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
@@ -30,7 +30,7 @@ import org.springframework.web.util.WebUtils;
  * This is particularly useful for stateless applications without user sessions.
  *
  * <p>Custom controllers can thus override the user's theme by calling
- * <code>setThemeName</code>, e.g. responding to a certain theme change request.
+ * {@code setThemeName}, e.g. responding to a certain theme change request.
  *
  * @author Jean-Pierre Pawlak
  * @author Juergen Hoeller
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 ec81c50c6d..2c6bdee435 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
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse;
  * Implementation of ThemeResolver that simply uses a fixed theme.
  * The fixed name can be defined via the "defaultThemeName" property.
  *
- * <p>Note: Does not support <code>setThemeName</code>, as the fixed theme
+ * <p>Note: Does not support {@code setThemeName}, as the fixed theme
  * cannot be changed.
  *
  * @author Jean-Pierre Pawlak
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 b810a51f67..766058f463 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
@@ -27,7 +27,7 @@ import org.springframework.web.util.WebUtils;
  * This is most appropriate if the application needs user sessions anyway.
  *
  * <p>Custom controllers can override the user's theme by calling
- * <code>setThemeName</code>, e.g. responding to a theme change request.
+ * {@code setThemeName}, e.g. responding to a theme change request.
  *
  * @author Jean-Pierre Pawlak
  * @author Juergen Hoeller
@@ -39,7 +39,7 @@ public class SessionThemeResolver extends AbstractThemeResolver {
 	/**
 	 * Name of the session attribute that holds the theme name.
 	 * Only used internally by this implementation.
-	 * Use <code>RequestContext(Utils).getTheme()</code>
+	 * Use {@code RequestContext(Utils).getTheme()}
 	 * to retrieve the current theme in controllers or views.
 	 * @see org.springframework.web.servlet.support.RequestContext#getTheme
 	 * @see org.springframework.web.servlet.support.RequestContextUtils#getTheme
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java
index a29b6a0304..c9735e5c75 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/package-info.java
@@ -1,4 +1,3 @@
-
 /**
  *
  * Theme support classes for Spring's web MVC framework.
@@ -7,16 +6,16 @@
  *
  * <p>
  * <ul>
- *   <li>If you don't provide a bean of one of these classes as <code>themeResolver</code>,
- * a <code>FixedThemeResolver</code> will be provided with the default theme name 'theme'.</li>
- *   <li>If you use a defined <code>FixedThemeResolver</code>, you will able to use another theme
+ *   <li>If you don't provide a bean of one of these classes as {@code themeResolver},
+ * a {@code FixedThemeResolver} will be provided with the default theme name 'theme'.</li>
+ *   <li>If you use a defined {@code FixedThemeResolver}, you will able to use another theme
  * name for default, but the users will stick on this theme.</li>
- *   <li>With a <code>CookieThemeResolver</code> or <code>SessionThemeResolver</code>, you can allow
+ *   <li>With a {@code CookieThemeResolver} or {@code SessionThemeResolver}, you can allow
  * the user to change his current theme.</li>
  *   <li>Generally, you will put in the themes resource bundles the paths of CSS files, images and HTML constructs.</li>
  *   <li>For retrieving themes data, you can either use the spring:theme tag in JSP or access via the
- * <code>RequestContext</code> for other view technologies.</li>
- *   <li>The <code>pagedlist</code> demo application uses themes</li>
+ * {@code RequestContext} for other view technologies.</li>
+ *   <li>The {@code pagedlist} demo application uses themes</li>
  * </ul>
  *
  */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
index 70498baa6a..5d82e56bb3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
@@ -198,11 +198,11 @@ public abstract class AbstractCachingViewResolver extends WebApplicationObjectSu
 	 * Create the actual View object.
 	 * <p>The default implementation delegates to {@link #loadView}.
 	 * This can be overridden to resolve certain view names in a special fashion,
-	 * before delegating to the actual <code>loadView</code> implementation
+	 * before delegating to the actual {@code loadView} implementation
 	 * provided by the subclass.
 	 * @param viewName the name of the view to retrieve
 	 * @param locale the Locale to retrieve the view for
-	 * @return the View instance, or <code>null</code> if not found
+	 * @return the View instance, or {@code null} if not found
 	 * (optional, to allow for ViewResolver chaining)
 	 * @throws Exception if the view couldn't be resolved
 	 * @see #loadView
@@ -219,7 +219,7 @@ public abstract class AbstractCachingViewResolver extends WebApplicationObjectSu
 	 * A subclass that does not may simply ignore the locale parameter.
 	 * @param viewName the name of the view to retrieve
 	 * @param locale the Locale to retrieve the view for
-	 * @return the View instance, or <code>null</code> if not found
+	 * @return the View instance, or {@code null} if not found
 	 * (optional, to allow for ViewResolver chaining)
 	 * @throws Exception if the view couldn't be resolved
 	 * @see #resolveViewName
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java
index c6be1fc9fb..757a42aadf 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java
@@ -70,7 +70,7 @@ public abstract class AbstractUrlBasedView extends AbstractView implements Initi
 
 	/**
 	 * Return whether the 'url' property is required.
-	 * <p>The default implementation returns <code>true</code.
+	 * <p>The default implementation returns {@code true}.
 	 * This can be overridden in subclasses.
 	 */
 	protected boolean isUrlRequired() {
@@ -81,8 +81,8 @@ public abstract class AbstractUrlBasedView extends AbstractView implements Initi
 	 * Check whether the underlying resource that the configured URL points to
 	 * actually exists.
 	 * @param locale the desired Locale that we're looking for
-	 * @return <code>true</code> if the resource exists (or is assumed to exist);
-	 * <code>false</code> if we know that it does not exist
+	 * @return {@code true} if the resource exists (or is assumed to exist);
+	 * {@code false} if we know that it does not exist
 	 * @throws Exception if the resource exists but is invalid (e.g. could not be parsed)
 	 */
 	public boolean checkResource(Locale locale) throws Exception {
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 5df0792f24..5ec4806647 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
@@ -84,7 +84,7 @@ public abstract class AbstractView extends WebApplicationObjectSupport implement
 	}
 
 	/**
-	 * Return the view's name. Should never be <code>null</code>,
+	 * Return the view's name. Should never be {@code null},
 	 * if the view was correctly configured.
 	 */
 	public String getBeanName() {
@@ -157,7 +157,7 @@ public abstract class AbstractView extends WebApplicationObjectSupport implement
 
 	/**
 	 * Set static attributes for this view from a
-	 * <code>java.util.Properties</code> object.
+	 * {@code java.util.Properties} object.
 	 * <p>"Static" attributes are fixed attributes that are specified in
 	 * the View instance configuration. "Dynamic" attributes, on the other hand,
 	 * are values passed in as part of the model.
@@ -205,7 +205,7 @@ public abstract class AbstractView extends WebApplicationObjectSupport implement
 	 * <p>"Static" attributes are fixed attributes that are specified in
 	 * the View instance configuration. "Dynamic" attributes, on the other hand,
 	 * are values passed in as part of the model.
-	 * <p>Must be invoked before any calls to <code>render</code>.
+	 * <p>Must be invoked before any calls to {@code render}.
 	 * @param name the name of the attribute to expose
 	 * @param value the attribute value to expose
 	 * @see #render
@@ -265,7 +265,7 @@ public abstract class AbstractView extends WebApplicationObjectSupport implement
 	}
 
 	/**
-	 * Creates a combined output Map (never <code>null</code>) that includes dynamic values and static attributes.
+	 * Creates a combined output Map (never {@code null}) that includes dynamic values and static attributes.
 	 * Dynamic values take precedence over static attributes.
 	 */
 	protected Map<String, Object> createMergedOutputModel(Map<String, ?> model, HttpServletRequest request,
@@ -300,7 +300,7 @@ public abstract class AbstractView extends WebApplicationObjectSupport implement
 	 * <p>Default implementation creates a standard RequestContext instance for the
 	 * given request and model. Can be overridden in subclasses for custom instances.
 	 * @param request current HTTP request
-	 * @param model combined output Map (never <code>null</code>),
+	 * @param model combined output Map (never {@code null}),
 	 * with dynamic values taking precedence over static attributes
 	 * @return the RequestContext instance
 	 * @see #setRequestContextAttribute
@@ -329,8 +329,8 @@ public abstract class AbstractView extends WebApplicationObjectSupport implement
 	/**
 	 * Return whether this view generates download content
 	 * (typically binary content like PDF or Excel files).
-	 * <p>The default implementation returns <code>false</code>. Subclasses are
-	 * encouraged to return <code>true</code> here if they know that they are
+	 * <p>The default implementation returns {@code false}. Subclasses are
+	 * encouraged to return {@code true} here if they know that they are
 	 * generating download content that requires temporary caching on the
 	 * client side, typically via the response OutputStream.
 	 * @see #prepareResponse
@@ -346,7 +346,7 @@ public abstract class AbstractView extends WebApplicationObjectSupport implement
 	 * this would mean setting model objects as request attributes.
 	 * The second step will be the actual rendering of the view,
 	 * for example including the JSP via a RequestDispatcher.
-	 * @param model combined output Map (never <code>null</code>),
+	 * @param model combined output Map (never {@code null}),
 	 * with dynamic values taking precedence over static attributes
 	 * @param request current HTTP request
 	 * @param response current HTTP response
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 ee100f2336..fa2f02d66f 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
@@ -126,7 +126,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 	/**
 	 * Indicate whether the extension of the request path should be used to determine the requested media type,
 	 * in favor of looking at the {@code Accept} header. The default value is {@code true}.
-	 * <p>For instance, when this flag is <code>true</code> (the default), a request for {@code /hotels.pdf}
+	 * <p>For instance, when this flag is {@code true} (the default), a request for {@code /hotels.pdf}
 	 * will result in an {@code AbstractPdfView} being resolved, while the {@code Accept} header can be the
 	 * browser-defined {@code text/html,application/xhtml+xml}.
 	 *
@@ -149,7 +149,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 	/**
 	 * Indicate whether a request parameter should be used to determine the requested media type,
 	 * in favor of looking at the {@code Accept} header. The default value is {@code false}.
-	 * <p>For instance, when this flag is <code>true</code>, a request for {@code /hotels?format=pdf} will result
+	 * <p>For instance, when this flag is {@code true}, a request for {@code /hotels?format=pdf} will result
 	 * in an {@code AbstractPdfView} being resolved, while the {@code Accept} header can be the browser-defined
 	 * {@code text/html,application/xhtml+xml}.
 	 *
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
index bcea6d584d..c73b81cc18 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
@@ -90,8 +90,8 @@ public class DefaultRequestToViewNameTranslator implements RequestToViewNameTran
 	}
 
 	/**
-	 * Set the value that will replace '<code>/</code>' as the separator
-	 * in the view name. The default behavior simply leaves '<code>/</code>'
+	 * Set the value that will replace '{@code /}' as the separator
+	 * in the view name. The default behavior simply leaves '{@code /}'
 	 * as the separator.
 	 */
 	public void setSeparator(String separator) {
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 36f0af33ae..b19385c107 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
@@ -36,12 +36,12 @@ import org.springframework.web.util.WebUtils;
  * the specified resource URL using a {@link javax.servlet.RequestDispatcher}.
  *
  * <p>A URL for this view is supposed to specify a resource within the web
- * application, suitable for RequestDispatcher's <code>forward</code> or
- * <code>include</code> method.
+ * application, suitable for RequestDispatcher's {@code forward} or
+ * {@code include} method.
  *
  * <p>If operating within an already included request or within a response that
  * has already been committed, this view will fall back to an include instead of
- * a forward. This can be enforced by calling <code>response.flushBuffer()</code>
+ * a forward. This can be enforced by calling {@code response.flushBuffer()}
  * (which will commit the response) before rendering the view.
  *
  * <p>Typical usage with {@link InternalResourceViewResolver} looks as follows,
@@ -133,8 +133,8 @@ public class InternalResourceView extends AbstractUrlBasedView {
 	/**
 	 * Set whether to make all Spring beans in the application context accessible
 	 * as request attributes, through lazy checking once an attribute gets accessed.
-	 * <p>This will make all such beans accessible in plain <code>${...}</code>
-	 * expressions in a JSP 2.0 page, as well as in JSTL's <code>c:out</code>
+	 * <p>This will make all such beans accessible in plain {@code ${...}}
+	 * expressions in a JSP 2.0 page, as well as in JSTL's {@code c:out}
 	 * value expressions.
 	 * <p>Default is "false". Switch this flag on to transparently expose all
 	 * Spring beans in the request attribute namespace.
@@ -311,14 +311,14 @@ public class InternalResourceView extends AbstractUrlBasedView {
 	}
 
 	/**
-	 * Determine whether to use RequestDispatcher's <code>include</code> or
-	 * <code>forward</code> method.
+	 * Determine whether to use RequestDispatcher's {@code include} or
+	 * {@code forward} method.
 	 * <p>Performs a check whether an include URI attribute is found in the request,
 	 * indicating an include request, and whether the response has already been committed.
 	 * In both cases, an include will be performed, as a forward is not possible anymore.
 	 * @param request current HTTP request
 	 * @param response current HTTP response
-	 * @return <code>true</code> for include, <code>false</code> for forward
+	 * @return {@code true} for include, {@code false} for forward
 	 * @see javax.servlet.RequestDispatcher#forward
 	 * @see javax.servlet.RequestDispatcher#include
 	 * @see javax.servlet.ServletResponse#isCommitted
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 d558507651..9b50d346d6 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
@@ -92,8 +92,8 @@ public class InternalResourceViewResolver extends UrlBasedViewResolver {
 	/**
 	 * Set whether to make all Spring beans in the application context accessible
 	 * as request attributes, through lazy checking once an attribute gets accessed.
-	 * <p>This will make all such beans accessible in plain <code>${...}</code>
-	 * expressions in a JSP 2.0 page, as well as in JSTL's <code>c:out</code>
+	 * <p>This will make all such beans accessible in plain {@code ${...}}
+	 * expressions in a JSP 2.0 page, as well as in JSTL's {@code c:out}
 	 * value expressions.
 	 * <p>Default is "false".
 	 * @see InternalResourceView#setExposeContextBeansAsAttributes
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
index 84e908c7fb..164f51b2b5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
@@ -63,8 +63,8 @@ import org.springframework.web.servlet.support.RequestContext;
  *
  * <p>Hint: Set the {@link #setExposeContextBeansAsAttributes} flag to "true"
  * in order to make all Spring beans in the application context accessible
- * within JSTL expressions (e.g. in a <code>c:out</code> value expression).
- * This will also make all such beans accessible in plain <code>${...}</code>
+ * within JSTL expressions (e.g. in a {@code c:out} value expression).
+ * This will also make all such beans accessible in plain {@code ${...}}
  * expressions in a JSP 2.0 page.
  *
  * @author Juergen Hoeller
@@ -99,7 +99,7 @@ public class JstlView extends InternalResourceView {
 	 * @param url the URL to forward to
 	 * @param messageSource the MessageSource to expose to JSTL tags
 	 * (will be wrapped with a JSTL-aware MessageSource that is aware of JSTL's
-	 * <code>javax.servlet.jsp.jstl.fmt.localizationContext</code> context-param)
+	 * {@code javax.servlet.jsp.jstl.fmt.localizationContext} context-param)
 	 * @see JstlUtils#getJstlAwareMessageSource
 	 */
 	public JstlView(String url, MessageSource messageSource) {
@@ -110,7 +110,7 @@ public class JstlView extends InternalResourceView {
 
 	/**
 	 * Wraps the MessageSource with a JSTL-aware MessageSource that is aware
-	 * of JSTL's <code>javax.servlet.jsp.jstl.fmt.localizationContext</code>
+	 * of JSTL's {@code javax.servlet.jsp.jstl.fmt.localizationContext}
 	 * context-param.
 	 * @see JstlUtils#getJstlAwareMessageSource
 	 */
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 673dc6db44..0f96d4832a 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
@@ -62,7 +62,7 @@ import org.springframework.web.util.WebUtils;
  * {@link #isEligibleProperty(String, Object)} method.
  *
  * <p>A URL for this view is supposed to be a HTTP redirect URL, i.e.
- * suitable for HttpServletResponse's <code>sendRedirect</code> method, which
+ * suitable for HttpServletResponse's {@code sendRedirect} method, which
  * is what actually does the redirect if the HTTP 1.0 flag is on, or via sending
  * back an HTTP 303 code - if the HTTP 1.0 compatibility flag is off.
  *
@@ -75,7 +75,7 @@ import org.springframework.web.util.WebUtils;
  * paths which are to be considered relative to the web application root.
  *
  * <p><b>NOTE when using this redirect view in a Portlet environment:</b> Make sure
- * that your controller respects the Portlet <code>sendRedirect</code> constraints.
+ * that your controller respects the Portlet {@code sendRedirect} constraints.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -185,7 +185,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 	/**
 	 * Set whether to stay compatible with HTTP 1.0 clients.
 	 * <p>In the default implementation, this will enforce HTTP status code 302
-	 * in any case, i.e. delegate to <code>HttpServletResponse.sendRedirect</code>.
+	 * in any case, i.e. delegate to {@code HttpServletResponse.sendRedirect}.
 	 * Turning this off will send HTTP status code 303, which is the correct
 	 * code for HTTP 1.1 clients, but not understood by HTTP 1.0 clients.
 	 * <p>Many HTTP 1.1 clients treat 302 just like 303, not making any
@@ -198,9 +198,9 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 	}
 
 	/**
-	 * Set the <code>exposeModelAttributes</code> flag which denotes whether
+	 * Set the {@code exposeModelAttributes} flag which denotes whether
 	 * or not model attributes should be exposed as HTTP query parameters.
-	 * <p>Defaults to <code>true</code>.
+	 * <p>Defaults to {@code true}.
 	 */
 	public void setExposeModelAttributes(final boolean exposeModelAttributes) {
 		this.exposeModelAttributes = exposeModelAttributes;
@@ -226,10 +226,10 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 
 	/**
 	 * Whether to treat the redirect URL as a URI template.
-	 * Set this flag to <code>false</code> if the redirect URL contains open
+	 * Set this flag to {@code false} if the redirect URL contains open
 	 * and close curly braces "{", "}" and you don't want them interpreted
 	 * as URI variables.
-	 * <p>Defaults to <code>true</code>.
+	 * <p>Defaults to {@code true}.
 	 */
 	public void setExpandUriTemplateVariables(boolean expandUriTemplateVariables) {
 		this.expandUriTemplateVariables = expandUriTemplateVariables;
@@ -486,7 +486,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 
 	/**
 	 * URL-encode the given input String with the given encoding scheme.
-	 * <p>The default implementation uses <code>URLEncoder.encode(input, enc)</code>.
+	 * <p>The default implementation uses {@code URLEncoder.encode(input, enc)}.
 	 * @param input the unencoded input String
 	 * @param encodingScheme the encoding scheme
 	 * @return the encoded output String
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 ff5315a4a3..22e6a1fafc 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
@@ -43,16 +43,16 @@ import org.springframework.web.servlet.View;
  * <p>The bundle is typically defined in a properties file, located in
  * the class path. The default bundle basename is "views".
  *
- * <p>This <code>ViewResolver</code> supports localized view definitions,
+ * <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</code> implements the {@link Ordered}
- * interface to allow for flexible participation in <code>ViewResolver</code>
+ * <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</code> (giving it 0 as "order" value), while all
+ * {@code ViewResolver} (giving it 0 as "order" value), while all
  * remaining views could be resolved by a {@link UrlBasedViewResolver}.
  *
  * @author Rod Johnson
@@ -98,13 +98,13 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver
 	/**
 	 * Set a single basename, following {@link java.util.ResourceBundle} conventions.
 	 * The default is "views".
-	 * <p><code>ResourceBundle</code> supports different suffixes. For example,
-	 * a base name of "views" might map to <code>ResourceBundle</code> files
+	 * <p>{@code ResourceBundle} supports different suffixes. For example,
+	 * a base name of "views" might map to {@code ResourceBundle} files
 	 * "views", "views_en_au" and "views_de".
 	 * <p>Note that ResourceBundle names are effectively classpath locations: As a
 	 * consequence, the JDK's standard ResourceBundle treats dots as package separators.
 	 * This means that "test.theme" is effectively equivalent to "test/theme",
-	 * just like it is for programmatic <code>java.util.ResourceBundle</code> usage.
+	 * just like it is for programmatic {@code java.util.ResourceBundle} usage.
 	 * @see #setBasenames
 	 * @see java.util.ResourceBundle#getBundle(String)
 	 */
@@ -115,8 +115,8 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver
 	/**
 	 * Set an array of basenames, each following {@link java.util.ResourceBundle}
 	 * conventions. The default is a single basename "views".
-	 * <p><code>ResourceBundle</code> supports different suffixes. For example,
-	 * a base name of "views" might map to <code>ResourceBundle</code> files
+	 * <p>{@code ResourceBundle} supports different suffixes. For example,
+	 * a base name of "views" might map to {@code ResourceBundle} files
 	 * "views", "views_en_au" and "views_de".
 	 * <p>The associated resource bundles will be checked sequentially
 	 * when resolving a message code. Note that message definitions in a
@@ -125,7 +125,7 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver
 	 * <p>Note that ResourceBundle names are effectively classpath locations: As a
 	 * consequence, the JDK's standard ResourceBundle treats dots as package separators.
 	 * This means that "test.theme" is effectively equivalent to "test/theme",
-	 * just like it is for programmatic <code>java.util.ResourceBundle</code> usage.
+	 * just like it is for programmatic {@code java.util.ResourceBundle} usage.
 	 * @see #setBasename
 	 * @see java.util.ResourceBundle#getBundle(String)
 	 */
@@ -135,7 +135,7 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver
 
 	/**
 	 * Set the {@link ClassLoader} to load resource bundles with.
-	 * Default is the thread context <code>ClassLoader</code>.
+	 * Default is the thread context {@code ClassLoader}.
 	 */
 	public void setBundleClassLoader(ClassLoader classLoader) {
 		this.bundleClassLoader = classLoader;
@@ -143,15 +143,15 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver
 
 	/**
 	 * Return the {@link ClassLoader} to load resource bundles with.
-	 * <p>Default is the specified bundle <code>ClassLoader</code>,
-	 * usually the thread context <code>ClassLoader</code>.
+	 * <p>Default is the specified bundle {@code ClassLoader},
+	 * usually the thread context {@code ClassLoader}.
 	 */
 	protected ClassLoader getBundleClassLoader() {
 		return this.bundleClassLoader;
 	}
 
 	/**
-	 * Set the default parent for views defined in the <code>ResourceBundle</code>.
+	 * Set the default parent for views defined in the {@code ResourceBundle}.
 	 * <p>This avoids repeated "yyy1.(parent)=xxx", "yyy2.(parent)=xxx" definitions
 	 * in the bundle, especially if all defined views share the same parent.
 	 * <p>The parent will typically define the view class and common attributes.
@@ -202,10 +202,10 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver
 	}
 
 	/**
-	 * Initialize the View {@link BeanFactory} from the <code>ResourceBundle</code>,
+	 * Initialize the View {@link BeanFactory} from the {@code ResourceBundle},
 	 * for the given {@link Locale locale}.
 	 * <p>Synchronized because of access by parallel threads.
-	 * @param locale the target <code>Locale</code>
+	 * @param locale the target {@code Locale}
 	 * @return the View factory for the given Locale
 	 * @throws BeansException in case of initialization errors
 	 */
@@ -262,8 +262,8 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver
 	/**
 	 * Obtain the resource bundle for the given basename and {@link Locale}.
 	 * @param basename the basename to look for
-	 * @param locale the <code>Locale</code> to look for
-	 * @return the corresponding <code>ResourceBundle</code>
+	 * @param locale the {@code Locale} to look for
+	 * @return the corresponding {@code ResourceBundle}
 	 * @throws MissingResourceException if no matching bundle could be found
 	 * @see java.util.ResourceBundle#getBundle(String, java.util.Locale, ClassLoader)
 	 */
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 e150e4e3a7..f9b4a77e31 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
@@ -226,7 +226,7 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements
 	/**
 	 * Set whether redirects should stay compatible with HTTP 1.0 clients.
 	 * <p>In the default implementation, this will enforce HTTP status code 302
-	 * in any case, i.e. delegate to <code>HttpServletResponse.sendRedirect</code>.
+	 * in any case, i.e. delegate to {@code HttpServletResponse.sendRedirect}.
 	 * Turning this off will send HTTP status code 303, which is the correct
 	 * code for HTTP 1.1 clients, but not understood by HTTP 1.0 clients.
 	 * <p>Many HTTP 1.1 clients treat 302 just like 303, not making any
@@ -265,7 +265,7 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements
 	}
 
 	/**
-	 * Set static attributes from a <code>java.util.Properties</code> object,
+	 * Set static attributes from a {@code java.util.Properties} object,
 	 * for all views returned by this resolver.
 	 * <p>This is the most convenient way to set static attributes. Note that
 	 * static attributes can be overridden by dynamic attributes, if a value
@@ -373,8 +373,8 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements
 
 	/**
 	 * Overridden to implement check for "redirect:" prefix.
-	 * <p>Not possible in <code>loadView</code>, since overridden
-	 * <code>loadView</code> versions in subclasses might rely on the
+	 * <p>Not possible in {@code loadView}, since overridden
+	 * {@code loadView} versions in subclasses might rely on the
 	 * superclass always creating instances of the required view class.
 	 * @see #loadView
 	 * @see #requiredViewClass
@@ -404,7 +404,7 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements
 	/**
 	 * Indicates whether or not this {@link org.springframework.web.servlet.ViewResolver} can
 	 * handle the supplied view name. If not, {@link #createView(String, java.util.Locale)} will
-	 * return <code>null</code>. The default implementation checks against the configured
+	 * return {@code null}. The default implementation checks against the configured
 	 * {@link #setViewNames view names}.
 	 * @param viewName the name of the view to retrieve
 	 * @param locale the Locale to retrieve the view for
@@ -417,12 +417,12 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements
 	}
 
 	/**
-	 * Delegates to <code>buildView</code> for creating a new instance of the
+	 * Delegates to {@code buildView} for creating a new instance of the
 	 * specified view class, and applies the following Spring lifecycle methods
 	 * (as supported by the generic Spring bean factory):
 	 * <ul>
-	 * <li>ApplicationContextAware's <code>setApplicationContext</code>
-	 * <li>InitializingBean's <code>afterPropertiesSet</code>
+	 * <li>ApplicationContextAware's {@code setApplicationContext}
+	 * <li>InitializingBean's {@code afterPropertiesSet}
 	 * </ul>
 	 * @param viewName the name of the view to retrieve
 	 * @return the View instance
@@ -446,10 +446,10 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements
 	 * Creates a new View instance of the specified view class and configures it.
 	 * Does <i>not</i> perform any lookup for pre-defined View instances.
 	 * <p>Spring lifecycle methods as defined by the bean container do not have to
-	 * be called here; those will be applied by the <code>loadView</code> method
+	 * be called here; those will be applied by the {@code loadView} method
 	 * after this method returns.
-	 * <p>Subclasses will typically call <code>super.buildView(viewName)</code>
-	 * first, before setting further properties themselves. <code>loadView</code>
+	 * <p>Subclasses will typically call {@code super.buildView(viewName)}
+	 * first, before setting further properties themselves. {@code loadView}
 	 * will then apply Spring lifecycle methods at the end of this process.
 	 * @param viewName the name of the view to build
 	 * @return the View instance
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
index 30416bdc0e..34bc3071cf 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
@@ -106,10 +106,10 @@ public abstract class AbstractPdfView extends AbstractView {
 
 	/**
 	 * Prepare the given PdfWriter. Called before building the PDF document,
-	 * that is, before the call to <code>Document.open()</code>.
+	 * that is, before the call to {@code Document.open()}.
 	 * <p>Useful for registering a page event listener, for example.
 	 * The default implementation sets the viewer preferences as returned
-	 * by this class's <code>getViewerPreferences()</code> method.
+	 * by this class's {@code getViewerPreferences()} method.
 	 * @param model the model, in case meta information must be populated from it
 	 * @param writer the PdfWriter to prepare
 	 * @param request in case we need locale etc. Shouldn't look at attributes.
@@ -127,8 +127,8 @@ public abstract class AbstractPdfView extends AbstractView {
 
 	/**
 	 * Return the viewer preferences for the PDF file.
-	 * <p>By default returns <code>AllowPrinting</code> and
-	 * <code>PageLayoutSinglePage</code>, but can be subclassed.
+	 * <p>By default returns {@code AllowPrinting} and
+	 * {@code PageLayoutSinglePage}, but can be subclassed.
 	 * The subclass can either have fixed preferences or retrieve
 	 * them from bean properties defined on the View.
 	 * @return an int containing the bits information against PdfWriter definitions
@@ -144,7 +144,7 @@ public abstract class AbstractPdfView extends AbstractView {
 	 * <br>Default is an empty implementation. Subclasses may override this method
 	 * to add meta fields such as title, subject, author, creator, keywords, etc.
 	 * This method is called after assigning a PdfWriter to the Document and
-	 * before calling <code>document.open()</code>.
+	 * before calling {@code document.open()}.
 	 * @param model the model, in case meta information must be populated from it
 	 * @param document the iText document being populated
 	 * @param request in case we need locale etc. Shouldn't look at attributes.
@@ -156,14 +156,14 @@ public abstract class AbstractPdfView extends AbstractView {
 	 * @see com.lowagie.text.Document#addProducer
 	 * @see com.lowagie.text.Document#addCreationDate
 	 * @see com.lowagie.text.Document#addHeader
-	*/
+	 */
 	protected void buildPdfMetadata(Map<String, Object> model, Document document, HttpServletRequest request) {
 	}
 
 	/**
 	 * Subclasses must implement this method to build an iText PDF document,
-	 * given the model. Called between <code>Document.open()</code> and
-	 * <code>Document.close()</code> calls.
+	 * given the model. Called between {@code Document.open()} and
+	 * {@code Document.close()} calls.
 	 * <p>Note that the passed-in HTTP response is just supposed to be used
 	 * for setting cookies or other HTTP headers. The built PDF document itself
 	 * will automatically get written to the response after this method returns.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
index 8f492adfda..a6f2581324 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
@@ -236,7 +236,7 @@ public class FreeMarkerView extends AbstractTemplateView {
 	/**
 	 * Expose helpers unique to each rendering operation. This is necessary so that
 	 * different rendering operations can't overwrite each other's formats etc.
-	 * <p>Called by <code>renderMergedTemplateModel</code>. The default implementation
+	 * <p>Called by {@code renderMergedTemplateModel}. The default implementation
 	 * is empty. This method can be overridden to add custom helpers to the model.
 	 * @param model The model that will be passed to the template at merge time
 	 * @param request current HTTP request
@@ -250,8 +250,8 @@ public class FreeMarkerView extends AbstractTemplateView {
 	 * Render the FreeMarker view to the given response, using the given model
 	 * map which contains the complete template model to use.
 	 * <p>The default implementation renders the template specified by the "url"
-	 * bean property, retrieved via <code>getTemplate</code>. It delegates to the
-	 * <code>processTemplate</code> method to merge the template instance with
+	 * bean property, retrieved via {@code getTemplate}. It delegates to the
+	 * {@code processTemplate} method to merge the template instance with
 	 * the given template model.
 	 * <p>Adds the standard Freemarker hash models to the model: request parameters,
 	 * request, session and application (ServletContext), as well as the JSP tag
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsSingleFormatView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsSingleFormatView.java
index d0acfeae99..29ad71afcc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsSingleFormatView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsSingleFormatView.java
@@ -29,12 +29,12 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.util.WebUtils;
 
 /**
- * Extends <code>AbstractJasperReportsView</code> to provide basic rendering logic
+ * Extends {@code AbstractJasperReportsView} to provide basic rendering logic
  * for views that use a fixed format, e.g. always PDF or always HTML.
  *
- * <p>Subclasses need to implement two template methods: <code>createExporter</code>
+ * <p>Subclasses need to implement two template methods: {@code createExporter}
  * to create a JasperReports exporter for a specific output format, and
- * <code>useWriter</code> to determine whether to write text or binary content.
+ * {@code useWriter} to determine whether to write text or binary content.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -75,7 +75,7 @@ public abstract class AbstractJasperReportsSingleFormatView extends AbstractJasp
 	/**
 	 * We need to write text to the response Writer.
 	 * @param exporter the JasperReports exporter to use
-	 * @param populatedReport the populated <code>JasperPrint</code> to render
+	 * @param populatedReport the populated {@code JasperPrint} to render
 	 * @param response the HTTP response the report should be rendered to
 	 * @throws Exception if rendering failed
 	 */
@@ -100,7 +100,7 @@ public abstract class AbstractJasperReportsSingleFormatView extends AbstractJasp
 	/**
 	 * We need to write binary output to the response OutputStream.
 	 * @param exporter the JasperReports exporter to use
-	 * @param populatedReport the populated <code>JasperPrint</code> to render
+	 * @param populatedReport the populated {@code JasperPrint} to render
 	 * @param response the HTTP response the report should be rendered to
 	 * @throws Exception if rendering failed
 	 */
@@ -117,15 +117,15 @@ public abstract class AbstractJasperReportsSingleFormatView extends AbstractJasp
 	/**
 	 * Create a JasperReports exporter for a specific output format,
 	 * which will be used to render the report to the HTTP response.
-	 * <p>The <code>useWriter</code> method determines whether the
+	 * <p>The {@code useWriter} method determines whether the
 	 * output will be written as text or as binary content.
 	 * @see #useWriter()
 	 */
 	protected abstract JRExporter createExporter();
 
 	/**
-	 * Return whether to use a <code>java.io.Writer</code> to write text content
-	 * to the HTTP response. Else, a <code>java.io.OutputStream</code> will be used,
+	 * Return whether to use a {@code java.io.Writer} to write text content
+	 * to the HTTP response. Else, a {@code java.io.OutputStream} will be used,
 	 * to write binary content to the response.
 	 * @see javax.servlet.ServletResponse#getWriter()
 	 * @see javax.servlet.ServletResponse#getOutputStream()
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 865b9f3855..93c62e5159 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
@@ -55,49 +55,49 @@ import org.springframework.web.servlet.view.AbstractUrlBasedView;
 /**
  * Base class for all JasperReports views. Applies on-the-fly compilation
  * of report designs as required and coordinates the rendering process.
- * The resource path of the main report needs to be specified as <code>url</code>.
+ * The resource path of the main report needs to be specified as {@code url}.
  *
  * <p>This class is responsible for getting report data from the model that has
  * been provided to the view. The default implementation checks for a model object
- * under the specified <code>reportDataKey</code> first, then falls back to looking
- * for a value of type <code>JRDataSource</code>, <code>java.util.Collection</code>,
+ * under the specified {@code reportDataKey} first, then falls back to looking
+ * for a value of type {@code JRDataSource}, {@code java.util.Collection},
  * object array (in that order).
  *
- * <p>If no <code>JRDataSource</code> can be found in the model, then reports will
- * be filled using the configured <code>javax.sql.DataSource</code> if any. If neither
- * a <code>JRDataSource</code> or <code>javax.sql.DataSource</code> is available then
- * an <code>IllegalArgumentException</code> is raised.
+ * <p>If no {@code JRDataSource} can be found in the model, then reports will
+ * be filled using the configured {@code javax.sql.DataSource} if any. If neither
+ * a {@code JRDataSource} or {@code javax.sql.DataSource} is available then
+ * an {@code IllegalArgumentException} is raised.
  *
- * <p>Provides support for sub-reports through the <code>subReportUrls</code> and
- * <code>subReportDataKeys</code> properties.
+ * <p>Provides support for sub-reports through the {@code subReportUrls} and
+ * {@code subReportDataKeys} properties.
  *
  * <p>When using sub-reports, the master report should be configured using the
- * <code>url</code> property and the sub-reports files should be configured using
- * the <code>subReportUrls</code> property. Each entry in the <code>subReportUrls</code>
+ * {@code url} property and the sub-reports files should be configured using
+ * the {@code subReportUrls} property. Each entry in the {@code subReportUrls}
  * Map corresponds to an individual sub-report. The key of an entry must match up
  * to a sub-report parameter in your report file of type
- * <code>net.sf.jasperreports.engine.JasperReport</code>,
+ * {@code net.sf.jasperreports.engine.JasperReport},
  * and the value of an entry must be the URL for the sub-report file.
  *
- * <p>For sub-reports that require an instance of <code>JRDataSource</code>, that is,
+ * <p>For sub-reports that require an instance of {@code JRDataSource}, that is,
  * they don't have a hard-coded query for data retrieval, you can include the
  * appropriate data in your model as would with the data source for the parent report.
  * However, you must provide a List of parameter names that need to be converted to
- * <code>JRDataSource</code> instances for the sub-report via the
- * <code>subReportDataKeys</code> property. When using <code>JRDataSource</code>
+ * {@code JRDataSource} instances for the sub-report via the
+ * {@code subReportDataKeys} property. When using {@code JRDataSource}
  * instances for sub-reports, you <i>must</i> specify a value for the
- * <code>reportDataKey</code> property, indicating the data to use for the main report.
+ * {@code reportDataKey} property, indicating the data to use for the main report.
  *
  * <p>Allows for exporter parameters to be configured declatively using the
- * <code>exporterParameters</code> property. This is a <code>Map</code> typed
+ * {@code exporterParameters} property. This is a {@code Map} typed
  * property where the key of an entry corresponds to the fully-qualified name
- * of the static field for the <code>JRExporterParameter</code> and the value
+ * of the static field for the {@code JRExporterParameter} and the value
  * of an entry is the value you want to assign to the exporter parameter.
  *
- * <p>Response headers can be controlled via the <code>headers</code> property. Spring
- * will attempt to set the correct value for the <code>Content-Diposition</code> header
+ * <p>Response headers can be controlled via the {@code headers} property. Spring
+ * will attempt to set the correct value for the {@code Content-Diposition} header
  * so that reports render correctly in Internet Explorer. However, you can override this
- * setting through the <code>headers</code> property.
+ * setting through the {@code headers} property.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -124,7 +124,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 
 
 	/**
-	 * A String key used to lookup the <code>JRDataSource</code> in the model.
+	 * A String key used to lookup the {@code JRDataSource} in the model.
 	 */
 	private String reportDataKey;
 
@@ -136,7 +136,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 
 	/**
 	 * Stores the names of any data source objects that need to be converted to
-	 * <code>JRDataSource</code> instances and included in the report parameters
+	 * {@code JRDataSource} instances and included in the report parameters
 	 * to be passed on to a sub-report.
 	 */
 	private String[] subReportDataKeys;
@@ -148,27 +148,27 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 
 	/**
 	 * Stores the exporter parameters passed in by the user as passed in by the user. May be keyed as
-	 * <code>String</code>s with the fully qualified name of the exporter parameter field.
+	 * {@code String}s with the fully qualified name of the exporter parameter field.
 	 */
 	private Map<?, ?> exporterParameters = new HashMap<Object, Object>();
 
 	/**
-	 * Stores the converted exporter parameters - keyed by <code>JRExporterParameter</code>.
+	 * Stores the converted exporter parameters - keyed by {@code JRExporterParameter}.
 	 */
 	private Map<JRExporterParameter, Object> convertedExporterParameters;
 
 	/**
-	 * Stores the <code>DataSource</code>, if any, used as the report data source.
+	 * Stores the {@code DataSource}, if any, used as the report data source.
 	 */
 	private DataSource jdbcDataSource;
 
 	/**
-	 * The <code>JasperReport</code> that is used to render the view.
+	 * The {@code JasperReport} that is used to render the view.
 	 */
 	private JasperReport report;
 
 	/**
-	 * Holds mappings between sub-report keys and <code>JasperReport</code> objects.
+	 * Holds mappings between sub-report keys and {@code JasperReport} objects.
 	 */
 	private Map<String, JasperReport> subReports;
 
@@ -176,10 +176,10 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	/**
 	 * Set the name of the model attribute that represents the report data.
 	 * If not specified, the model map will be searched for a matching value type.
-	 * <p>A <code>JRDataSource</code> will be taken as-is. For other types, conversion
-	 * will apply: By default, a <code>java.util.Collection</code> will be converted
-	 * to <code>JRBeanCollectionDataSource</code>, and an object array to
-	 * <code>JRBeanArrayDataSource</code>.
+	 * <p>A {@code JRDataSource} will be taken as-is. For other types, conversion
+	 * will apply: By default, a {@code java.util.Collection} will be converted
+	 * to {@code JRBeanCollectionDataSource}, and an object array to
+	 * {@code JRBeanArrayDataSource}.
 	 * <p><b>Note:</b> If you pass in a Collection or object array in the model map
 	 * for use as plain report parameter, rather than as report data to extract fields
 	 * from, you need to specify the key for the actual report data to use, to avoid
@@ -195,7 +195,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 
 	/**
 	 * Specify resource paths which must be loaded as instances of
-	 * <code>JasperReport</code> and passed to the JasperReports engine for
+	 * {@code JasperReport} and passed to the JasperReports engine for
 	 * rendering as sub-reports, under the same keys as in this mapping.
 	 * @param subReports mapping between model keys and resource paths
 	 * (Spring resource locations)
@@ -209,15 +209,15 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	/**
 	 * Set the list of names corresponding to the model parameters that will contain
 	 * data source objects for use in sub-reports. Spring will convert these objects
-	 * to instances of <code>JRDataSource</code> where applicable and will then
-	 * include the resulting <code>JRDataSource</code> in the parameters passed into
+	 * to instances of {@code JRDataSource} where applicable and will then
+	 * include the resulting {@code JRDataSource} in the parameters passed into
 	 * the JasperReports engine.
 	 * <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</code> objects as model attributes,
+	 * If you pass in {@code JRDataSource} objects as model attributes,
 	 * specifing 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</code> for the main report, to avoid confusion
+	 * specify a {@code reportDataKey} for the main report, to avoid confusion
 	 * between the data source objects for the various reports involved.
 	 * @param subReportDataKeys list of names for sub-report data source objects
 	 * @see #setReportDataKey
@@ -240,8 +240,8 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 
 	/**
 	 * Set the exporter parameters that should be used when rendering a view.
-	 * @param parameters <code>Map</code> with the fully qualified field name
-	 * of the <code>JRExporterParameter</code> instance as key
+	 * @param parameters {@code Map} with the fully qualified field name
+	 * of the {@code JRExporterParameter} instance as key
 	 * (e.g. "net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI")
 	 * and the value you wish to assign to the parameter as value
 	 */
@@ -271,7 +271,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	}
 
 	/**
-	 * Specify the <code>javax.sql.DataSource</code> to use for reports with
+	 * Specify the {@code javax.sql.DataSource} to use for reports with
 	 * embedded SQL statements.
 	 */
 	public void setJdbcDataSource(DataSource jdbcDataSource) {
@@ -279,7 +279,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	}
 
 	/**
-	 * Return the <code>javax.sql.DataSource</code> that this view uses, if any.
+	 * Return the {@code javax.sql.DataSource} that this view uses, if any.
 	 */
 	protected DataSource getJdbcDataSource() {
 		return this.jdbcDataSource;
@@ -344,9 +344,9 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 
 	/**
 	 * Converts the exporter parameters passed in by the user which may be keyed
-	 * by <code>String</code>s corresponding to the fully qualified name of the
-	 * <code>JRExporterParameter</code> into parameters which are keyed by
-	 * <code>JRExporterParameter</code>.
+	 * by {@code String}s corresponding to the fully qualified name of the
+	 * {@code JRExporterParameter} into parameters which are keyed by
+	 * {@code JRExporterParameter}.
 	 * @see #getExporterParameter(Object)
 	 */
 	protected final void convertExporterParameters() {
@@ -364,8 +364,8 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	 * Convert the supplied parameter value into the actual type required by the
 	 * corresponding {@link JRExporterParameter}.
 	 * <p>The default implementation simply converts the String values "true" and
-	 * "false" into corresponding <code>Boolean</code> objects, and tries to convert
-	 * String values that start with a digit into <code>Integer</code> objects
+	 * "false" into corresponding {@code Boolean} objects, and tries to convert
+	 * String values that start with a digit into {@code Integer} objects
 	 * (simply keeping them as String if number conversion fails).
 	 * @param parameter the parameter key
 	 * @param value the parameter value
@@ -395,7 +395,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	}
 
 	/**
-	 * Return a <code>JRExporterParameter</code> for the given parameter object,
+	 * Return a {@code JRExporterParameter} for the given parameter object,
 	 * converting it from a String if necessary.
 	 * @param parameter the parameter object, either a String or a JRExporterParameter
 	 * @return a JRExporterParameter for the given parameter object
@@ -461,10 +461,10 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	}
 
 	/**
-	 * Load the main <code>JasperReport</code> from the specified <code>Resource</code>.
-	 * If the <code>Resource</code> points to an uncompiled report design file then the
+	 * Load the main {@code JasperReport} from the specified {@code Resource}.
+	 * If the {@code Resource} points to an uncompiled report design file then the
 	 * report file is compiled dynamically and loaded into memory.
-	 * @return a <code>JasperReport</code> instance, or <code>null</code> if no main
+	 * @return a {@code JasperReport} instance, or {@code null} if no main
 	 * report has been statically defined
 	 */
 	protected JasperReport loadReport() {
@@ -477,11 +477,11 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	}
 
 	/**
-	 * Loads a <code>JasperReport</code> from the specified <code>Resource</code>.
-	 * If the <code>Resource</code> points to an uncompiled report design file then
+	 * Loads a {@code JasperReport} from the specified {@code Resource}.
+	 * If the {@code Resource} points to an uncompiled report design file then
 	 * the report file is compiled dynamically and loaded into memory.
-	 * @param resource the <code>Resource</code> containing the report definition or design
-	 * @return a <code>JasperReport</code> instance
+	 * @param resource the {@code Resource} containing the report definition or design
+	 * @return a {@code JasperReport} instance
 	 */
 	protected final JasperReport loadReport(Resource resource) {
 		try {
@@ -533,7 +533,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	 * Finds the report data to use for rendering the report and then invokes the
 	 * {@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</code>,
+	 * a report data value that can be converted to a {@code JRDataSource},
 	 * acccording to the rules of the {@link #fillReport} method.
 	 */
 	@Override
@@ -570,7 +570,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	 * resource bundle if no such bundle is defined in the report itself.
 	 * <p>The default implementation exposes the Spring RequestContext Locale and a
 	 * MessageSourceResourceBundle adapter for the Spring ApplicationContext,
-	 * analogous to the <code>JstlUtils.exposeLocalizationContext</code> method.
+	 * analogous to the {@code JstlUtils.exposeLocalizationContext} method.
 	 * @see org.springframework.web.servlet.support.RequestContextUtils#getLocale
 	 * @see org.springframework.context.support.MessageSourceResourceBundle
 	 * @see #getApplicationContext()
@@ -592,26 +592,26 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	}
 
 	/**
-	 * Create a populated <code>JasperPrint</code> instance from the configured
-	 * <code>JasperReport</code> instance.
-	 * <p>By default, this method will use any <code>JRDataSource</code> instance
-	 * (or wrappable <code>Object</code>) that can be located using {@link #setReportDataKey},
-	 * a lookup for type <code>JRDataSource</code> in the model Map, or a special value
+	 * Create a populated {@code JasperPrint} instance from the configured
+	 * {@code JasperReport} instance.
+	 * <p>By default, this method will use any {@code JRDataSource} instance
+	 * (or wrappable {@code Object}) that can be located using {@link #setReportDataKey},
+	 * a lookup for type {@code JRDataSource} in the model Map, or a special value
 	 * retrieved via {@link #getReportData}.
-	 * <p>If no <code>JRDataSource</code> can be found, this method will use a JDBC
-	 * <code>Connection</code> obtained from the configured <code>javax.sql.DataSource</code>
+	 * <p>If no {@code JRDataSource} can be found, this method will use a JDBC
+	 * {@code Connection} obtained from the configured {@code javax.sql.DataSource}
 	 * (or a DataSource attribute in the model). If no JDBC DataSource can be found
 	 * either, the JasperReports engine will be invoked with plain model Map,
 	 * assuming that the model contains parameters that identify the source
 	 * for report data (e.g. Hibernate or JPA queries).
 	 * @param model the model for this request
-	 * @throws IllegalArgumentException if no <code>JRDataSource</code> can be found
-	 * and no <code>javax.sql.DataSource</code> is supplied
+	 * @throws IllegalArgumentException if no {@code JRDataSource} can be found
+	 * and no {@code javax.sql.DataSource} is supplied
 	 * @throws SQLException if there is an error when populating the report using
-	 * the <code>javax.sql.DataSource</code>
+	 * the {@code javax.sql.DataSource}
 	 * @throws JRException if there is an error when populating the report using
-	 * a <code>JRDataSource</code>
-	 * @return the populated <code>JasperPrint</code> instance
+	 * a {@code JRDataSource}
+	 * @return the populated {@code JasperPrint} instance
 	 * @see #getReportData
 	 * @see #setJdbcDataSource
 	 */
@@ -700,7 +700,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	}
 
 	/**
-	 * Populates the headers in the <code>HttpServletResponse</code> with the
+	 * Populates the headers in the {@code HttpServletResponse} with the
 	 * headers supplied by the user.
 	 */
 	private void populateHeaders(HttpServletResponse response) {
@@ -712,26 +712,26 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	}
 
 	/**
-	 * Determine the <code>JasperReport</code> to fill.
+	 * Determine the {@code JasperReport} to fill.
 	 * Called by {@link #fillReport}.
 	 * <p>The default implementation returns the report as statically configured
 	 * through the 'url' property (and loaded by {@link #loadReport()}).
 	 * Can be overridden in subclasses in order to dynamically obtain a
-	 * <code>JasperReport</code> instance. As an alternative, consider
+	 * {@code JasperReport} instance. As an alternative, consider
 	 * overriding the {@link #fillReport} template method itself.
-	 * @return an instance of <code>JasperReport</code>
+	 * @return an instance of {@code JasperReport}
 	 */
 	protected JasperReport getReport() {
 		return this.report;
 	}
 
 	/**
-	 * Create an appropriate <code>JRDataSource</code> for passed-in report data.
+	 * Create an appropriate {@code JRDataSource} for passed-in report data.
 	 * Called by {@link #fillReport} when its own lookup steps were not successful.
-	 * <p>The default implementation looks for a value of type <code>java.util.Collection</code>
+	 * <p>The default implementation looks for a value of type {@code java.util.Collection}
 	 * or object array (in that order). Can be overridden in subclasses.
 	 * @param model the model map, as passed in for view rendering
-	 * @return the <code>JRDataSource</code> or <code>null</code> if the data source is not found
+	 * @return the {@code JRDataSource} or {@code null} if the data source is not found
 	 * @see #getReportDataTypes
 	 * @see #convertReportData
 	 */
@@ -742,15 +742,15 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	}
 
 	/**
-	 * Convert the given report data value to a <code>JRDataSource</code>.
-	 * <p>The default implementation delegates to <code>JasperReportUtils</code> unless
-	 * the report data value is an instance of <code>JRDataSourceProvider</code>.
-	 * A <code>JRDataSource</code>, <code>JRDataSourceProvider</code>,
-	 * <code>java.util.Collection</code> or object array is detected.
-	 * <code>JRDataSource</code>s are returned as is, whilst <code>JRDataSourceProvider</code>s
-	 * are used to create an instance of <code>JRDataSource</code> which is then returned.
-	 * The latter two are converted to <code>JRBeanCollectionDataSource</code> or
-	 * <code>JRBeanArrayDataSource</code>, respectively.
+	 * Convert the given report data value to a {@code JRDataSource}.
+	 * <p>The default implementation delegates to {@code JasperReportUtils} unless
+	 * the report data value is an instance of {@code JRDataSourceProvider}.
+	 * A {@code JRDataSource}, {@code JRDataSourceProvider},
+	 * {@code java.util.Collection} or object array is detected.
+	 * {@code JRDataSource}s are returned as is, whilst {@code JRDataSourceProvider}s
+	 * are used to create an instance of {@code JRDataSource} which is then returned.
+	 * The latter two are converted to {@code JRBeanCollectionDataSource} or
+	 * {@code JRBeanArrayDataSource}, respectively.
 	 * @param value the report data value to convert
 	 * @return the JRDataSource
 	 * @throws IllegalArgumentException if the value could not be converted
@@ -789,10 +789,10 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	}
 
 	/**
-	 * Return the value types that can be converted to a <code>JRDataSource</code>,
+	 * Return the value types that can be converted to a {@code JRDataSource},
 	 * in prioritized order. Should only return types that the
 	 * {@link #convertReportData} method is actually able to convert.
-	 * <p>Default value types are: <code>java.util.Collection</code> and <code>Object</code> array.
+	 * <p>Default value types are: {@code java.util.Collection} and {@code Object} array.
 	 * @return the value types in prioritized order
 	 */
 	protected Class[] getReportDataTypes() {
@@ -804,7 +804,7 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	 * Template method to be overridden for custom post-processing of the
 	 * populated report. Invoked after filling but before rendering.
 	 * <p>The default implementation is empty.
-	 * @param populatedReport the populated <code>JasperPrint</code>
+	 * @param populatedReport the populated {@code JasperPrint}
 	 * @param model the map containing report parameters
 	 * @throws Exception if post-processing failed
 	 */
@@ -814,14 +814,14 @@ public abstract class AbstractJasperReportsView extends AbstractUrlBasedView {
 	/**
 	 * 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
-	 * a content type String and set it via <code>response.setContentType</code>.
+	 * 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</code>
+	 * <p><b>WARNING:</b> Implementors 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</code> to render
+	 * @param populatedReport the populated {@code JasperPrint} to render
 	 * @param model the map containing report parameters
 	 * @param response the HTTP response the report should be rendered to
 	 * @throws Exception if rendering failed
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java
index 50cc6f8bd1..6ace4da3fe 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java
@@ -40,8 +40,8 @@ public class ConfigurableJasperReportsView extends AbstractJasperReportsSingleFo
 
 
 	/**
-	 * Set the {@link JRExporter} implementation <code>Class</code> to use. Throws
-	 * {@link IllegalArgumentException} if the <code>Class</code> doesn't implement
+	 * Set the {@link JRExporter} implementation {@code Class} to use. Throws
+	 * {@link IllegalArgumentException} if the {@code Class} doesn't implement
 	 * {@link JRExporter}. Required setting, as it does not have a default.
 	 */
 	public void setExporterClass(Class<? extends JRExporter> exporterClass) {
@@ -51,8 +51,8 @@ public class ConfigurableJasperReportsView extends AbstractJasperReportsSingleFo
 
 	/**
 	 * Specifies whether or not the {@link JRExporter} writes to the {@link java.io.PrintWriter}
-	 * of the associated with the request (<code>true</code>) or whether it writes directly to the
-	 * {@link java.io.InputStream} of the request (<code>false</code>). Default is <code>true</code>.
+	 * of the associated with the request ({@code true}) or whether it writes directly to the
+	 * {@link java.io.InputStream} of the request ({@code false}). Default is {@code true}.
 	 */
 	public void setUseWriter(boolean useWriter) {
 		this.useWriter = useWriter;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java
index 3ae0db1826..61ba6142ef 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java
@@ -20,7 +20,7 @@ import net.sf.jasperreports.engine.JRExporter;
 import net.sf.jasperreports.engine.export.JRCsvExporter;
 
 /**
- * Implementation of <code>AbstractJasperReportsSingleFormatView</code>
+ * Implementation of {@code AbstractJasperReportsSingleFormatView}
  * that renders report results in CSV format.
  *
  * @author Rob Harrop
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java
index 86a6b64934..b6bc188d17 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java
@@ -20,7 +20,7 @@ import net.sf.jasperreports.engine.JRExporter;
 import net.sf.jasperreports.engine.export.JRHtmlExporter;
 
 /**
- * Implementation of <code>AbstractJasperReportsSingleFormatView</code>
+ * Implementation of {@code AbstractJasperReportsSingleFormatView}
  * that renders report results in HTML format.
  *
  * @author Rob Harrop
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 8f28671ccf..54cbae7e85 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
@@ -32,32 +32,32 @@ import org.springframework.util.CollectionUtils;
  *
  * <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</code> to Spring through as part of the model and the
+ * {@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</code>:
+ * {@code Controller}:
  *
  * <pre>
  * Map<String, Object> model = new HashMap<String, Object>();
  * model.put("format", "pdf");</pre>
  *
- * Here <code>format</code> is the format key and <code>pdf</code> is
+ * 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</code>. It then uses the value of this parameter to lookup
- * the actual <code>View</code> class to use. The default mappings for this
+ * {@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:
  *
  * <p><ul>
- * <li><code>csv</code> - <code>JasperReportsCsvView</code></li>
- * <li><code>html</code> - <code>JasperReportsHtmlView</code></li>
- * <li><code>pdf</code> - <code>JasperReportsPdfView</code></li>
- * <li><code>xls</code> - <code>JasperReportsXlsView</code></li>
+ * <li>{@code csv} - {@code JasperReportsCsvView}</li>
+ * <li>{@code html} - {@code JasperReportsHtmlView}</li>
+ * <li>{@code pdf} - {@code JasperReportsPdfView}</li>
+ * <li>{@code xls} - {@code JasperReportsXlsView}</li>
  * </ul>
  *
- * <p>The format key can be changed using the <code>formatKey</code>
+ * <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
- * <code>formatMappings</code> property.
+ * {@code formatMappings} property.
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -91,9 +91,9 @@ public class JasperReportsMultiFormatView extends AbstractJasperReportsView {
 
 
   /**
-	 * Creates a new <code>JasperReportsMultiFormatView</code> instance
-	 * with a default set of mappings.
-	 */
+   * Creates a new {@code JasperReportsMultiFormatView} instance
+   * with a default set of mappings.
+   */
 	public JasperReportsMultiFormatView() {
 		this.formatMappings = new HashMap<String, Class<? extends AbstractJasperReportsView>>(4);
 		this.formatMappings.put("csv", JasperReportsCsvView.class);
@@ -114,10 +114,10 @@ public class JasperReportsMultiFormatView extends AbstractJasperReportsView {
 	 * Set the mappings of format discriminators to view class names.
 	 * The default mappings are:
 	 * <p><ul>
-	 * <li><code>csv</code> - <code>JasperReportsCsvView</code></li>
-	 * <li><code>html</code> - <code>JasperReportsHtmlView</code></li>
-	 * <li><code>pdf</code> - <code>JasperReportsPdfView</code></li>
-	 * <li><code>xls</code> - <code>JasperReportsXlsView</code></li>
+	 * <li>{@code csv} - {@code JasperReportsCsvView}</li>
+	 * <li>{@code html} - {@code JasperReportsHtmlView}</li>
+	 * <li>{@code pdf} - {@code JasperReportsPdfView}</li>
+	 * <li>{@code xls} - {@code JasperReportsXlsView}</li>
 	 * </ul>
 	 */
 	public void setFormatMappings(Map<String, Class<? extends AbstractJasperReportsView>> formatMappings) {
@@ -128,9 +128,9 @@ public class JasperReportsMultiFormatView extends AbstractJasperReportsView {
 	}
 
 	/**
-	 * Set the mappings of <code>Content-Disposition</code> header values to
+	 * Set the mappings of {@code Content-Disposition} header values to
 	 * mapping keys. If specified, Spring will look at these mappings to determine
-	 * the value of the <code>Content-Disposition</code> header for a given
+	 * the value of the {@code Content-Disposition} header for a given
 	 * format mapping.
 	 */
 	public void setContentDispositionMappings(Properties mappings) {
@@ -138,7 +138,7 @@ public class JasperReportsMultiFormatView extends AbstractJasperReportsView {
 	}
 
 	/**
-	 * Return the mappings of <code>Content-Disposition</code> header values to
+	 * Return the mappings of {@code Content-Disposition} header values to
 	 * mapping keys. Mainly available for configuration through property paths
 	 * that specify individual keys.
 	 */
@@ -194,9 +194,9 @@ public class JasperReportsMultiFormatView extends AbstractJasperReportsView {
 	}
 
 	/**
-	 * Adds/overwrites the <code>Content-Disposition</code> header value with the format-specific
+	 * Adds/overwrites the {@code Content-Disposition} header value with the format-specific
 	 * value if the mappings have been specified and a valid one exists for the given format.
-	 * @param response the <code>HttpServletResponse</code> to set the header in
+	 * @param response the {@code HttpServletResponse} to set the header in
 	 * @param format the format key of the mapping
 	 * @see #setContentDispositionMappings
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java
index bc6966a5fa..4d7199e71e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java
@@ -20,7 +20,7 @@ import net.sf.jasperreports.engine.JRExporter;
 import net.sf.jasperreports.engine.export.JRPdfExporter;
 
 /**
- * Implementation of <code>AbstractJasperReportsSingleFormatView</code>
+ * Implementation of {@code AbstractJasperReportsSingleFormatView}
  * that renders report results in PDF format.
  *
  * @author Rob Harrop
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 7fc3a86d3e..d496d56fd0 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
@@ -56,7 +56,7 @@ public class JasperReportsViewResolver extends UrlBasedViewResolver {
 	}
 
 	/**
-	 * Set the <code>reportDataKey</code> the view class should use.
+	 * Set the {@code reportDataKey} the view class should use.
 	 * @see AbstractJasperReportsView#setReportDataKey
 	 */
 	public void setReportDataKey(String reportDataKey) {
@@ -64,7 +64,7 @@ public class JasperReportsViewResolver extends UrlBasedViewResolver {
 	}
 
 	/**
-	 * Set the <code>subReportUrls</code> the view class should use.
+	 * Set the {@code subReportUrls} the view class should use.
 	 * @see AbstractJasperReportsView#setSubReportUrls
 	 */
 	public void setSubReportUrls(Properties subReportUrls) {
@@ -72,7 +72,7 @@ public class JasperReportsViewResolver extends UrlBasedViewResolver {
 	}
 
 	/**
-	 * Set the <code>subReportDataKeys</code> the view class should use.
+	 * Set the {@code subReportDataKeys} the view class should use.
 	 * @see AbstractJasperReportsView#setSubReportDataKeys
 	 */
 	public void setSubReportDataKeys(String[] subReportDataKeys) {
@@ -80,7 +80,7 @@ public class JasperReportsViewResolver extends UrlBasedViewResolver {
 	}
 
 	/**
-	 * Set the <code>headers</code> the view class should use.
+	 * Set the {@code headers} the view class should use.
 	 * @see AbstractJasperReportsView#setHeaders
 	 */
 	public void setHeaders(Properties headers) {
@@ -88,7 +88,7 @@ public class JasperReportsViewResolver extends UrlBasedViewResolver {
 	}
 
 	/**
-	 * Set the <code>exporterParameters</code> the view class should use.
+	 * Set the {@code exporterParameters} the view class should use.
 	 * @see AbstractJasperReportsView#setExporterParameters
 	 */
 	public void setExporterParameters(Map<String, Object> exporterParameters) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java
index 60751b89d0..712b7ca740 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java
@@ -20,7 +20,7 @@ import net.sf.jasperreports.engine.JRExporter;
 import net.sf.jasperreports.engine.export.JRXlsExporter;
 
 /**
- * Implementation of <code>AbstractJasperReportsSingleFormatView</code>
+ * Implementation of {@code AbstractJasperReportsSingleFormatView}
  * that renders report results in XLS format.
  *
  * @author Rob Harrop
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 ef3dcdcab0..6f1e2b9b0c 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
@@ -84,7 +84,7 @@ import org.springframework.web.context.ServletContextAware;
  * <p>The TilesConfigurer simply configures a TilesContainer using a set of files
  * containing definitions, to be accessed by {@link TilesView} instances. This is a
  * Spring-based alternative (for usage in Spring configuration) to the Tiles-provided
- * {@link org.apache.tiles.web.startup.TilesListener} (for usage in <code>web.xml</code>).
+ * {@link org.apache.tiles.web.startup.TilesListener} (for usage in {@code web.xml}).
  *
  * <p>TilesViews can be managed by any {@link org.springframework.web.servlet.ViewResolver}.
  * For simple convention-based view resolution, consider using {@link TilesViewResolver}.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java
index c476eb4546..1eaf045c1f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java
@@ -54,7 +54,7 @@ import org.springframework.web.context.ServletContextAware;
  * This allows to share a VelocityEngine for web and email usage, for example.
  *
  * <p>This configurer registers the "spring.vm" Velocimacro library for web views
- * (contained in this package and thus in <code>spring.jar</code>), which makes
+ * (contained in this package and thus in {@code spring.jar}), which makes
  * all of Spring's default Velocity macros available to the views.
  * This allows for using the Spring-provided macros such as follows:
  *
@@ -95,7 +95,7 @@ public class VelocityConfigurer extends VelocityEngineFactory
 	 * {@link org.springframework.ui.velocity.VelocityEngineFactoryBean}.
 	 * <p>Note that the Spring macros will <i>not</i> be enabled automatically in
 	 * case of an external VelocityEngine passed in here. Make sure to include
-	 * <code>spring.vm</code> in your template loader path in such a scenario
+	 * {@code spring.vm} in your template loader path in such a scenario
 	 * (if there is an actual need to use those macros).
 	 * <p>If this is not set, VelocityEngineFactory's properties
 	 * (inherited by this class) have to be specified.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java
index 3e8ac3d4fa..0933aeb57c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java
@@ -30,14 +30,14 @@ import org.springframework.core.NestedIOException;
  * VelocityLayoutView emulates the functionality offered by Velocity's
  * VelocityLayoutServlet to ease page composition from different templates.
  *
- * <p>The <code>url</code> property should be set to the content template
+ * <p>The {@code url} property should be set to the content template
  * for the view, and the layout template location should be specified as
- * <code>layoutUrl</code> property. A view can override the configured
+ * {@code layoutUrl} property. A view can override the configured
  * layout template location by setting the appropriate key (the default
  * is "layout") in the content template.
  *
  * <p>When the view is rendered, the VelocityContext is first merged with
- * the content template (specified by the <code>url</code> property) and
+ * the content template (specified by the {@code url} property) and
  * then merged with the layout template to produce the final output.
  *
  * <p>The layout template can include the screen content through a
@@ -90,7 +90,7 @@ public class VelocityLayoutView extends VelocityToolboxView {
 	 * of the default layout. Screen content templates can override the layout
 	 * template that they wish to be wrapped with by setting this value in the
 	 * template, for example:<br>
-	 * <code>#set( $layout = "MyLayout.vm" )</code>
+	 * {@code #set($layout = "MyLayout.vm" )}
 	 * <p>Default key is {@link #DEFAULT_LAYOUT_KEY "layout"}, as illustrated above.
 	 * @param layoutKey the name of the key you wish to use in your
 	 * screen content templates to override the layout template
@@ -104,7 +104,7 @@ public class VelocityLayoutView extends VelocityToolboxView {
 	 * the screen within the layout template. This key must be present
 	 * in the layout template for the current screen to be rendered.
 	 * <p>Default is {@link #DEFAULT_SCREEN_CONTENT_KEY "screen_content"}:
-	 * accessed in VTL as <code>$screen_content</code>.
+	 * accessed in VTL as {@code $screen_content}.
 	 * @param screenContentKey the name of the screen content key to use
 	 */
 	public void setScreenContentKey(String screenContentKey) {
@@ -113,7 +113,7 @@ public class VelocityLayoutView extends VelocityToolboxView {
 
 
 	/**
-	 * Overrides <code>VelocityView.checkTemplate()</code> to additionally check
+	 * Overrides {@code VelocityView.checkTemplate()} to additionally check
 	 * that both the layout template and the screen content template can be loaded.
 	 * Note that during rendering of the screen content, the layout template
 	 * can be changed which may invalidate any early checking done here.
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 fb358e1631..8678b62e58 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
@@ -65,7 +65,7 @@ public class VelocityLayoutViewResolver extends VelocityViewResolver {
 	 * of the default layout. Screen content templates can override the layout
 	 * template that they wish to be wrapped with by setting this value in the
 	 * template, for example:<br>
-	 * <code>#set( $layout = "MyLayout.vm" )</code>
+	 * {@code #set($layout = "MyLayout.vm" )}
 	 * <p>The default key is "layout", as illustrated above.
 	 * @param layoutKey the name of the key you wish to use in your
 	 * screen content templates to override the layout template
@@ -80,7 +80,7 @@ public class VelocityLayoutViewResolver extends VelocityViewResolver {
 	 * the screen within the layout template. This key must be present
 	 * in the layout template for the current screen to be rendered.
 	 * <p>Default is "screen_content": accessed in VTL as
-	 * <code>$screen_content</code>.
+	 * {@code $screen_content}.
 	 * @param screenContentKey the name of the screen content key to use
 	 * @see VelocityLayoutView#setScreenContentKey
 	 */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java
index 3637c8799f..5a8081c30b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java
@@ -50,13 +50,13 @@ import org.springframework.web.util.NestedServletException;
  * the encoding of the Velocity template file
  * <li><b>velocityFormatterAttribute</b> (optional, default=null): the name of
  * the VelocityFormatter helper object to expose in the Velocity context of this
- * view, or <code>null</code> if not needed. VelocityFormatter is part of standard Velocity.
+ * view, or {@code null} if not needed. VelocityFormatter is part of standard Velocity.
  * <li><b>dateToolAttribute</b> (optional, default=null): the name of the
  * DateTool helper object to expose in the Velocity context of this view,
- * or <code>null</code> if not needed. DateTool is part of Velocity Tools.
+ * or {@code null} if not needed. DateTool is part of Velocity Tools.
  * <li><b>numberToolAttribute</b> (optional, default=null): the name of the
  * NumberTool helper object to expose in the Velocity context of this view,
- * or <code>null</code> if not needed. NumberTool is part of Velocity Tools.
+ * or {@code null} if not needed. NumberTool is part of Velocity Tools.
  * <li><b>cacheTemplate</b> (optional, default=false): whether or not the Velocity
  * template should be cached. It should normally be true in production, but setting
  * this to false enables us to modify Velocity templates without restarting the
@@ -113,8 +113,8 @@ public class VelocityView extends AbstractTemplateView {
 	 * on a specific tools package.
 	 * <p>For tools that are part of the view package of Velocity Tools, a special
 	 * Velocity context and a special init callback are needed. Use VelocityToolboxView
-	 * in such a case, or override <code>createVelocityContext</code> and
-	 * <code>initTool</code> accordingly.
+	 * in such a case, or override {@code createVelocityContext} and
+	 * {@code initTool} accordingly.
 	 * <p>For a simple VelocityFormatter instance or special locale-aware instances
 	 * of DateTool/NumberTool, which are part of the generic package of Velocity Tools,
 	 * specify the "velocityFormatterAttribute", "dateToolAttribute" or
@@ -133,7 +133,7 @@ public class VelocityView extends AbstractTemplateView {
 
 	/**
 	 * Set the name of the DateTool helper object to expose in the Velocity context
-	 * of this view, or <code>null</code> if not needed. The exposed DateTool will be aware of
+	 * of this view, or {@code null} if not needed. The exposed DateTool will be aware of
 	 * the current locale, as determined by Spring's LocaleResolver.
 	 * <p>DateTool is part of the generic package of Velocity Tools 1.0.
 	 * Spring uses a special locale-aware subclass of DateTool.
@@ -147,7 +147,7 @@ public class VelocityView extends AbstractTemplateView {
 
 	/**
 	 * Set the name of the NumberTool helper object to expose in the Velocity context
-	 * of this view, or <code>null</code> if not needed. The exposed NumberTool will be aware of
+	 * of this view, or {@code null} if not needed. The exposed NumberTool will be aware of
 	 * the current locale, as determined by Spring's LocaleResolver.
 	 * <p>NumberTool is part of the generic package of Velocity Tools 1.1.
 	 * Spring uses a special locale-aware subclass of NumberTool.
@@ -294,7 +294,7 @@ public class VelocityView extends AbstractTemplateView {
 	/**
 	 * Expose helpers unique to each rendering operation. This is necessary so that
 	 * different rendering operations can't overwrite each other's formats etc.
-	 * <p>Called by <code>renderMergedTemplateModel</code>. The default implementation
+	 * <p>Called by {@code renderMergedTemplateModel}. The default implementation
 	 * is empty. This method can be overridden to add custom helpers to the model.
 	 * @param model the model that will be passed to the template for merging
 	 * @param request current HTTP request
@@ -348,8 +348,8 @@ public class VelocityView extends AbstractTemplateView {
 	/**
 	 * Expose helpers unique to each rendering operation. This is necessary so that
 	 * different rendering operations can't overwrite each other's formats etc.
-	 * <p>Called by <code>renderMergedTemplateModel</code>. Default implementation
-	 * delegates to <code>exposeHelpers(velocityContext, request)</code>. This method
+	 * <p>Called by {@code renderMergedTemplateModel}. Default implementation
+	 * delegates to {@code exposeHelpers(velocityContext, request)}. This method
 	 * can be overridden to add special tools to the context, needing the servlet response
 	 * to initialize (see Velocity Tools, for example LinkTool and ViewTool/ChainedContext).
 	 * @param velocityContext Velocity context that will be passed to the template
@@ -380,7 +380,7 @@ public class VelocityView extends AbstractTemplateView {
 	/**
 	 * Expose the tool attributes, according to corresponding bean property settings.
 	 * <p>Do not override this method unless for further tools driven by bean properties.
-	 * Override one of the <code>exposeHelpers</code> methods to add custom helpers.
+	 * Override one of the {@code exposeHelpers} methods to add custom helpers.
 	 * @param velocityContext Velocity context that will be passed to the template
 	 * @param request current HTTP request
 	 * @throws Exception if there's a fatal error while we're adding model attributes
@@ -443,8 +443,8 @@ public class VelocityView extends AbstractTemplateView {
 	 * Render the Velocity view to the given response, using the given Velocity
 	 * context which contains the complete template model to use.
 	 * <p>The default implementation renders the template specified by the "url"
-	 * bean property, retrieved via <code>getTemplate</code>. It delegates to the
-	 * <code>mergeTemplate</code> method to merge the template instance with the
+	 * bean property, retrieved via {@code getTemplate}. It delegates to the
+	 * {@code mergeTemplate} method to merge the template instance with the
 	 * given Velocity context.
 	 * <p>Can be overridden to customize the behavior, for example to render
 	 * multiple templates into a single view.
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 41f50bd3b4..d0eec2ea82 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
@@ -65,7 +65,7 @@ public class VelocityViewResolver extends AbstractTemplateViewResolver {
 
 	/**
 	 * Set the name of the DateTool helper object to expose in the Velocity context
-	 * of this view, or <code>null</code> if not needed. DateTool is part of Velocity Tools 1.0.
+	 * of this view, or {@code null} if not needed. DateTool is part of Velocity Tools 1.0.
 	 * @see org.apache.velocity.tools.generic.DateTool
 	 * @see VelocityView#setDateToolAttribute
 	 */
@@ -75,7 +75,7 @@ public class VelocityViewResolver extends AbstractTemplateViewResolver {
 
 	/**
 	 * Set the name of the NumberTool helper object to expose in the Velocity context
-	 * of this view, or <code>null</code> if not needed. NumberTool is part of Velocity Tools 1.1.
+	 * of this view, or {@code null} if not needed. NumberTool is part of Velocity Tools 1.1.
 	 * @see org.apache.velocity.tools.generic.NumberTool
 	 * @see VelocityView#setNumberToolAttribute
 	 */
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 15b9b50aae..dd68939008 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
@@ -54,7 +54,7 @@ public class MarshallingView extends AbstractView {
 	private String modelKey;
 
 	/**
-	 * Constructs a new <code>MarshallingView</code> with no {@link Marshaller} set. The marshaller must be set after
+	 * Constructs a new {@code MarshallingView} with no {@link Marshaller} set. The marshaller must be set after
 	 * construction by invoking {@link #setMarshaller(Marshaller)}.
 	 */
 	public MarshallingView() {
@@ -63,7 +63,7 @@ public class MarshallingView extends AbstractView {
 	}
 
 	/**
-	 * Constructs a new <code>MarshallingView</code> with the given {@link Marshaller} set.
+	 * Constructs a new {@code MarshallingView} with the given {@link Marshaller} set.
 	 */
 	public MarshallingView(Marshaller marshaller) {
 		Assert.notNull(marshaller, "'marshaller' must not be null");
@@ -118,7 +118,7 @@ public class MarshallingView extends AbstractView {
 	 * Marshaller#supports(Class) supported type}.
 	 *
 	 * @param model the model Map
-	 * @return the Object to be marshalled (or <code>null</code> if none found)
+	 * @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
 	 * @see #setModelKey(String)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java
index 5d23e33959..1db1ef7da7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java
@@ -66,11 +66,11 @@ import org.springframework.web.util.NestedServletException;
  * <li>{@link #setErrorListener(javax.xml.transform.ErrorListener) errorListener} (optional):
  * the {@link ErrorListener} implementation instance for custom handling of warnings and errors during TransformerFactory operations
  * <li>{@link #setIndent(boolean) indent} (optional): whether additional whitespace
- * may be added when outputting the result; defaults to <code>true</code>
- * <li>{@link #setCache(boolean) cache} (optional): are templates to be cached; debug setting only; defaults to <code>true</code>
+ * may be added when outputting the result; defaults to {@code true}
+ * <li>{@link #setCache(boolean) cache} (optional): are templates to be cached; debug setting only; defaults to {@code true}
  * </ul>
  *
- * <p>Note that setting {@link #setCache(boolean) "cache"} to <code>false</code>
+ * <p>Note that setting {@link #setCache(boolean) "cache"} to {@code false}
  * will cause the template objects to be reloaded for each rendering. This is
  * useful during development, but will seriously affect performance in production
  * and is not thread-safe.
@@ -179,12 +179,12 @@ public abstract class AbstractXsltView extends AbstractView {
 	/**
 	 * Set whether to use the name of a given single model object as the
 	 * document root element name.
-	 * <p>Default is <code>true</code> : If you pass in a model with a single object
+	 * <p>Default is {@code true} : If you pass in a model with a single object
 	 * named "myElement", then the document root will be named "myElement"
-	 * as well. Set this flag to <code>false</code> if you want to pass in a single
+	 * as well. Set this flag to {@code false} if you want to pass in a single
 	 * model object while still using the root element name configured
 	 * through the {@link #setRoot(String) "root" property}.
-	 * @param useSingleModelNameAsRoot <code>true</code> if the name of a given single
+	 * @param useSingleModelNameAsRoot {@code true} if the name of a given single
 	 * model object is to be used as the document root element name
 	 * @see #setRoot
 	 */
@@ -194,7 +194,7 @@ public abstract class AbstractXsltView extends AbstractView {
 
 	/**
 	 * Set the URIResolver used in the transform.
-	 * <p>The URIResolver handles calls to the XSLT <code>document()</code> function.
+	 * <p>The URIResolver handles calls to the XSLT {@code document()} function.
 	 */
 	public void setUriResolver(URIResolver uriResolver) {
 		this.uriResolver = uriResolver;
@@ -216,7 +216,7 @@ public abstract class AbstractXsltView extends AbstractView {
 	/**
 	 * Set whether the XSLT transformer may add additional whitespace when
 	 * outputting the result tree.
-	 * <p>Default is <code>true</code> (on); set this to <code>false</code> (off)
+	 * <p>Default is {@code true} (on); set this to {@code false} (off)
 	 * to not specify an "indent" key, leaving the choice up to the stylesheet.
 	 * @see javax.xml.transform.OutputKeys#INDENT
 	 */
@@ -236,7 +236,7 @@ public abstract class AbstractXsltView extends AbstractView {
 
 	/**
 	 * Set whether to activate the template cache for this view.
-	 * <p>Default is <code>true</code>. Turn this off to refresh
+	 * <p>Default is {@code true}. Turn this off to refresh
 	 * the Templates object on every access, e.g. during development.
 	 * @see #resetCachedTemplates()
 	 */
@@ -421,7 +421,7 @@ public abstract class AbstractXsltView extends AbstractView {
 	 * Return a Map of transformer parameters to be applied to the stylesheet.
 	 * <p>Subclasses can override this method in order to apply one or more
 	 * parameters to the transformation process.
-	 * <p>The default implementation simply returns <code>null</code>.
+	 * <p>The default implementation simply returns {@code null}.
 	 * @param request current HTTP request
 	 * @return a Map of parameters to apply to the transformation process
 	 * @see #getParameters(Map, HttpServletRequest)
@@ -432,13 +432,13 @@ public abstract class AbstractXsltView extends AbstractView {
 	}
 
 	/**
-	 * Return whether to use a <code>java.io.Writer</code> to write text content
-	 * to the HTTP response. Else, a <code>java.io.OutputStream</code> will be used,
+	 * Return whether to use a {@code java.io.Writer} to write text content
+	 * to the HTTP response. Else, a {@code java.io.OutputStream} will be used,
 	 * to write binary content to the response.
-	 * <p>The default implementation returns <code>false</code>, indicating a
-	 * a <code>java.io.OutputStream</code>.
-	 * @return whether to use a Writer (<code>true</code>) or an OutputStream
-	 * (<code>false</code>)
+	 * <p>The default implementation returns {@code false}, indicating a
+	 * a {@code java.io.OutputStream}.
+	 * @return whether to use a Writer ({@code true}) or an OutputStream
+	 * ({@code false})
 	 * @see javax.servlet.ServletResponse#getWriter()
 	 * @see javax.servlet.ServletResponse#getOutputStream()
 	 */
@@ -500,7 +500,7 @@ public abstract class AbstractXsltView extends AbstractView {
 	 * given parameters.
 	 * @param parameters a Map of parameters to be applied to the stylesheet
 	 * (as determined by {@link #getParameters(Map, HttpServletRequest)})
-	 * @return the Transformer object (never <code>null</code>)
+	 * @return the Transformer object (never {@code null})
 	 * @throws TransformerConfigurationException if the Transformer object
 	 * could not be built
 	 */
@@ -517,8 +517,8 @@ public abstract class AbstractXsltView extends AbstractView {
 	 * stylesheet, either a cached one or a freshly built one.
 	 * <p>Subclasses may override this method e.g. in order to refresh
 	 * the Templates instance, calling {@link #resetCachedTemplates()}
-	 * before delegating to this <code>getTemplates()</code> implementation.
-	 * @return the Templates object (or <code>null</code> if there is
+	 * before delegating to this {@code getTemplates()} implementation.
+	 * @return the Templates object (or {@code null} if there is
 	 * no stylesheet specified)
 	 * @throws TransformerConfigurationException if the Templates object
 	 * could not be built
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
index 0dbb27b025..7fad0bf329 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
@@ -117,7 +117,7 @@ public class XsltView extends AbstractUrlBasedView {
 
 	/**
 	 * Set the URIResolver used in the transform.
-	 * <p>The URIResolver handles calls to the XSLT <code>document()</code> function.
+	 * <p>The URIResolver handles calls to the XSLT {@code document()} function.
 	 */
 	public void setUriResolver(URIResolver uriResolver) {
 		this.uriResolver = uriResolver;
@@ -139,7 +139,7 @@ public class XsltView extends AbstractUrlBasedView {
 	/**
 	 * Set whether the XSLT transformer may add additional whitespace when
 	 * outputting the result tree.
-	 * <p>Default is <code>true</code> (on); set this to <code>false</code> (off)
+	 * <p>Default is {@code true} (on); set this to {@code false} (off)
 	 * to not specify an "indent" key, leaving the choice up to the stylesheet.
 	 * @see javax.xml.transform.OutputKeys#INDENT
 	 */
@@ -211,7 +211,7 @@ public class XsltView extends AbstractUrlBasedView {
 
 	/**
 	 * Return the TransformerFactory that this XsltView uses.
-	 * @return the TransformerFactory (never <code>null</code>)
+	 * @return the TransformerFactory (never {@code null})
 	 */
 	protected final TransformerFactory getTransformerFactory() {
 		return this.transformerFactory;
@@ -263,7 +263,7 @@ public class XsltView extends AbstractUrlBasedView {
 	 * {@link #setSourceKey source key}, if any, before attempting to locate
 	 * an object of {@link #getSourceTypes() supported type}.
 	 * @param model the merged model Map
-	 * @return the XSLT Source object (or <code>null</code> if none found)
+	 * @return the XSLT Source object (or {@code null} if none found)
 	 * @throws Exception if an error occured during locating the source
 	 * @see #setSourceKey
 	 * @see #convertSource
@@ -326,7 +326,7 @@ public class XsltView extends AbstractUrlBasedView {
 	 * This implementation also copies the {@link #setOutputProperties output properties}
 	 * into the {@link Transformer} {@link Transformer#setOutputProperty output properties}.
 	 * Indentation properties are set as well.
-	 * @param model merged output Map (never <code>null</code>)
+	 * @param model merged output Map (never {@code null})
 	 * @param response current HTTP response
 	 * @param transformer the target transformer
 	 * @see #copyModelParameters(Map, Transformer)
@@ -374,7 +374,7 @@ public class XsltView extends AbstractUrlBasedView {
 	 * Copy all entries from the supplied Map into the
 	 * {@link Transformer#setParameter(String, Object) parameter set}
 	 * of the supplied {@link Transformer}.
-	 * @param model merged output Map (never <code>null</code>)
+	 * @param model merged output Map (never {@code null})
 	 * @param transformer the target transformer
 	 */
 	protected final void copyModelParameters(Map<String, Object> model, Transformer transformer) {
@@ -390,7 +390,7 @@ public class XsltView extends AbstractUrlBasedView {
 	 * {@link HttpServletResponse#setCharacterEncoding encoding}
 	 * from the "media-type" and "encoding" output properties
 	 * specified in the {@link Transformer}.
-	 * @param model merged output Map (never <code>null</code>)
+	 * @param model merged output Map (never {@code null})
 	 * @param response current HTTP response
 	 * @param transformer the target transformer
 	 */
@@ -467,7 +467,7 @@ public class XsltView extends AbstractUrlBasedView {
 	/**
 	 * Close the underlying resource managed by the supplied {@link Source} if applicable.
 	 * <p>Only works for {@link StreamSource StreamSources}.
-	 * @param source the XSLT Source to close (may be <code>null</code>)
+	 * @param source the XSLT Source to close (may be {@code null})
 	 */
 	private void closeSourceIfNecessary(Source source) {
 		if (source instanceof StreamSource) {
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 3943e53472..cb731e19de 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
@@ -67,7 +67,7 @@ public class XsltViewResolver extends UrlBasedViewResolver {
 
 	/**
 	 * Set the URIResolver used in the transform.
-	 * <p>The URIResolver handles calls to the XSLT <code>document()</code> function.
+	 * <p>The URIResolver handles calls to the XSLT {@code document()} function.
 	 */
 	public void setUriResolver(URIResolver uriResolver) {
 		this.uriResolver = uriResolver;
@@ -89,7 +89,7 @@ public class XsltViewResolver extends UrlBasedViewResolver {
 	/**
 	 * Set whether the XSLT transformer may add additional whitespace when
 	 * outputting the result tree.
-	 * <p>Default is <code>true</code> (on); set this to <code>false</code> (off)
+	 * <p>Default is {@code true} (on); set this to {@code false} (off)
 	 * to not specify an "indent" key, leaving the choice up to the stylesheet.
 	 * @see javax.xml.transform.OutputKeys#INDENT
 	 */
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
index 893f7e6293..f602a2917d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
@@ -635,14 +635,14 @@ public class SelectTagTests extends AbstractFormTagTests {
 	 * href="http://opensource.atlassian.com/projects/spring/browse/SPR-2660"
 	 * target="_blank">SPR-2660</a>.
 	 * <p>
-	 * Specifically, if the <code>items</code> attribute is supplied a
-	 * {@link Map}, and <code>itemValue</code> and <code>itemLabel</code>
+	 * Specifically, if the {@code items} attribute is supplied a
+	 * {@link Map}, and {@code itemValue} and {@code itemLabel}
 	 * are supplied non-null values, then:
 	 * </p>
 	 * <ul>
-	 * <li><code>itemValue</code> will be used as the property name of the
+	 * <li>{@code itemValue} will be used as the property name of the
 	 * map's <em>key</em>, and</li>
-	 * <li><code>itemLabel</code> will be used as the property name of the
+	 * <li>{@code itemLabel} will be used as the property name of the
 	 * map's <em>value</em>.</li>
 	 * </ul>
 	 */
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java
index 860fffb567..555111266c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestTypes.java
@@ -1,7 +1,7 @@
 package org.springframework.web.servlet.tags.form;
 
 /**
- * Test related data types for <code>org.springframework.web.servlet.tags.form</code> package.
+ * Test related data types for {@code org.springframework.web.servlet.tags.form} package.
  *
  * @author Scott Andrews
  */

From 731d5be6440a400aca2fb92c5c6d6b17d252879e Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Tue, 18 Dec 2012 18:13:46 -0800
Subject: [PATCH 19/36] Fix warnings due to unused import statements

---
 .../java/org/springframework/beans/BeanWrapperImpl.java  | 2 --
 .../org/springframework/beans/DirectFieldAccessor.java   | 1 -
 .../beans/factory/xml/DelegatingEntityResolverTests.java | 2 --
 .../xml/SimpleConstructorNamespaceHandlerTests.java      | 1 -
 .../beans/support/PagedListHolderTests.java              | 8 --------
 .../context/annotation/AutoProxyRegistrar.java           | 1 -
 .../springframework/context/annotation/DependsOn.java    | 1 -
 .../support/AbstractRefreshableApplicationContext.java   | 1 -
 .../context/support/GenericApplicationContext.java       | 1 -
 .../remoting/support/RemoteInvocationUtils.java          | 2 --
 .../scheduling/concurrent/ConcurrentTaskExecutor.java    | 4 ----
 .../aop/config/MethodLocatingFactoryBeanTests.java       | 2 +-
 .../annotation/AnnotationScopeMetadataResolverTests.java | 1 -
 .../configuration/BeanMethodQualificationTests.java      | 2 --
 .../springframework/context/annotation5/OtherFooDao.java | 4 ----
 .../context/event/EventPublicationInterceptorTests.java  | 1 -
 .../export/assembler/AbstractMetadataAssemblerTests.java | 1 -
 .../InterfaceBasedMBeanInfoAssemblerCustomTests.java     | 2 --
 .../InterfaceBasedMBeanInfoAssemblerMappedTests.java     | 2 --
 .../mock/jndi/ExpectedLookupTemplate.java                | 1 -
 .../concurrent/ScheduledExecutorFactoryBeanTests.java    | 3 +++
 .../scripting/support/ResourceScriptSourceTests.java     | 3 +--
 .../core/PrioritizedParameterNameDiscoverer.java         | 1 -
 .../main/java/org/springframework/core/io/Resource.java  | 1 -
 .../LocalVariableTableParameterNameDiscovererTests.java  | 3 +--
 .../core/type/CachingMetadataReaderLeakTest.java         | 1 -
 .../util/xml/AbstractStaxXMLReaderTestCase.java          | 1 -
 .../springframework/expression/spel/ast/AstUtils.java    | 1 -
 .../org/springframework/jdbc/core/JdbcTemplateTests.java | 1 -
 .../CustomSQLExceptionTranslatorRegistrarTests.java      | 3 ---
 .../AbstractPollingMessageListenerContainer.java         | 1 -
 .../listener/adapter/MessageListenerAdapterTests.java    | 1 -
 ...ResponsiveJmsTextMessageReturningMessageDelegate.java | 6 ------
 .../orm/hibernate3/support/AbstractLobType.java          | 5 -----
 .../orm/ibatis/SqlMapClientOperations.java               | 1 -
 .../mock/jndi/ExpectedLookupTemplate.java                | 1 -
 .../orm/hibernate3/HibernateJtaTransactionTests.java     | 1 -
 .../orm/hibernate3/support/OpenSessionInViewTests.java   | 6 ------
 .../ApplicationManagedEntityManagerIntegrationTests.java | 1 -
 .../ContainerManagedEntityManagerIntegrationTests.java   | 1 -
 .../java/org/springframework/orm/jpa/domain/Person.java  | 1 -
 ...bstractTransactionalDataSourceSpringContextTests.java | 1 -
 .../springframework/oxm/xmlbeans/XmlBeansMarshaller.java | 3 ---
 .../oxm/castor/CastorMarshallerTests.java                | 1 -
 .../springframework/oxm/jaxb/Jaxb2MarshallerTests.java   | 1 -
 .../jca/work/WorkManagerTaskExecutor.java                | 1 -
 .../mock/jndi/ExpectedLookupTemplate.java                | 1 -
 .../org/springframework/web/client/RestTemplate.java     | 1 -
 .../web/filter/HttpPutFormContentFilter.java             | 1 -
 .../web/filter/ShallowEtagHeaderFilter.java              | 2 --
 .../web/multipart/commons/CommonsMultipartFile.java      | 3 ---
 .../java/org/springframework/web/util/UrlPathHelper.java | 1 -
 .../http/converter/FormHttpMessageConverterTests.java    | 1 -
 .../http/converter/HttpMessageConverterTests.java        | 9 ---------
 .../springframework/mock/web/test/MockMultipartFile.java | 3 ---
 .../mvc/annotation/DefaultAnnotationHandlerMapping.java  | 2 --
 .../org/springframework/mock/web/MockMultipartFile.java  | 3 ---
 .../context/AbstractXmlWebApplicationContextTests.java   | 3 ---
 .../web/portlet/context/PortletWebRequestTests.java      | 1 -
 .../org/springframework/web/servlet/HttpServletBean.java | 1 -
 .../config/AnnotationDrivenBeanDefinitionParser.java     | 1 -
 .../config/annotation/WebMvcConfigurationSupport.java    | 1 -
 .../AbstractMessageConverterMethodArgumentResolver.java  | 5 +----
 .../method/annotation/RequestMappingHandlerAdapter.java  | 1 -
 .../web/servlet/tags/form/AbstractHtmlElementTag.java    | 1 -
 .../web/servlet/tags/form/OptionWriter.java              | 6 ------
 .../web/servlet/tags/form/OptionsTag.java                | 2 --
 .../view/tiles2/AbstractSpringPreparerFactory.java       | 3 ---
 .../web/servlet/config/MvcNamespaceTests.java            | 2 --
 .../WebMvcConfigurationSupportExtensionTests.java        | 2 --
 .../handler/PathMatchingUrlHandlerMappingTests.java      | 2 --
 .../servlet/handler/SimpleUrlHandlerMappingTests.java    | 2 --
 .../web/servlet/mvc/WebContentInterceptorTests.java      | 6 ------
 .../condition/RequestMethodsRequestConditionTests.java   | 5 -----
 .../PathVariableMapMethodArgumentResolverTests.java      | 1 -
 .../method/annotation/RequestPartIntegrationTests.java   | 1 -
 .../RequestResponseBodyMethodProcessorMockTests.java     | 5 -----
 .../RequestResponseBodyMethodProcessorTests.java         | 1 -
 .../springframework/web/servlet/tags/EvalTagTests.java   | 1 -
 .../springframework/web/servlet/tags/UrlTagTests.java    | 2 --
 .../web/servlet/tags/form/FormTagTests.java              | 3 ---
 81 files changed, 7 insertions(+), 168 deletions(-)

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 85d7fb0093..bac8df4ce6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
@@ -19,7 +19,6 @@ package org.springframework.beans;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Array;
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -41,7 +40,6 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.core.CollectionFactory;
 import org.springframework.core.GenericCollectionTypeResolver;
-import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.ConversionException;
 import org.springframework.core.convert.ConverterNotFoundException;
 import org.springframework.core.convert.Property;
diff --git a/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java b/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java
index 4aafd43356..d7913aa906 100644
--- a/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java
@@ -16,7 +16,6 @@
 
 package org.springframework.beans;
 
-import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.ConversionException;
 import org.springframework.core.convert.ConverterNotFoundException;
 import org.springframework.core.convert.TypeDescriptor;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java
index 5975365161..ec52dfaa8c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java
@@ -16,8 +16,6 @@
 
 package org.springframework.beans.factory.xml;
 
-import junit.framework.TestCase;
-
 import org.junit.Test;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
index 8cc4596a33..173fe92642 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.io.ClassPathResource;
 
 import test.beans.DummyBean;
diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
index 4e478abb6d..7050c656b9 100644
--- a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
@@ -17,17 +17,9 @@
 package org.springframework.beans.support;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
 import junit.framework.TestCase;
 
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.BeanWrapperImpl;
-
 import test.beans.TestBean;
 
 /**
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 804dbca526..f166faac35 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
@@ -18,7 +18,6 @@ package org.springframework.context.annotation;
 
 import static org.springframework.context.annotation.MetadataUtils.attributesFor;
 
-import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.logging.Log;
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/DependsOn.java b/spring-context/src/main/java/org/springframework/context/annotation/DependsOn.java
index 4b05e14b28..88d06dc6c0 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/DependsOn.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/DependsOn.java
@@ -20,7 +20,6 @@ import java.lang.annotation.Target;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Documented;
 
 /**
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
index 9cbfcdddb0..547f7519ee 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
@@ -24,7 +24,6 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextException;
-import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 
 /**
  * Base class for {@link org.springframework.context.ApplicationContext}
diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
index 83c6db1b52..a1e4fdabab 100644
--- a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
@@ -27,7 +27,6 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
-import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.ResourcePatternResolver;
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
index 9649c2f99c..7ed9e72b6e 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
@@ -19,8 +19,6 @@ package org.springframework.remoting.support;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.springframework.core.JdkVersion;
-
 /**
  * General utilities for handling remote invocations.
  *
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
index 10bb80bae6..bc9cf37b9f 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
@@ -18,13 +18,9 @@ package org.springframework.scheduling.concurrent;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.RejectedExecutionException;
 
-import org.springframework.core.task.TaskRejectedException;
 import org.springframework.core.task.support.TaskExecutorAdapter;
 import org.springframework.scheduling.SchedulingTaskExecutor;
 
diff --git a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
index 26c0f0cd3f..7f5d93833f 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
@@ -19,8 +19,8 @@ package org.springframework.aop.config;
 import java.lang.reflect.Method;
 
 import static org.easymock.EasyMock.*;
-import org.junit.After;
 import static org.junit.Assert.*;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java
index 7d31e003d0..8e8cf87095 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java
@@ -16,7 +16,6 @@
 
 package org.springframework.context.annotation;
 
-import java.lang.annotation.Documented;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Retention;
 import java.lang.annotation.ElementType;
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 5e6fc1b125..0db15b1d7f 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
@@ -24,12 +24,10 @@ import test.beans.TestBean;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.ApplicationContext;
 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.stereotype.Component;
 
 import static org.hamcrest.CoreMatchers.*;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java
index 5434c4f4b5..67f0760177 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java
@@ -18,10 +18,6 @@ package org.springframework.context.annotation5;
 
 import example.scannable.FooDao;
 
-import org.springframework.context.annotation.Lazy;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Repository;
-
 /**
  * @author Juergen Hoeller
  */
diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
index 2d8d8f4bd0..b87a8c3ff7 100644
--- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
@@ -19,7 +19,6 @@ package org.springframework.context.event;
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.framework.ProxyFactory;
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
index bfbd928382..9100215b83 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
@@ -18,7 +18,6 @@ package org.springframework.jmx.export.assembler;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Arrays;
 
 import javax.management.Descriptor;
 import javax.management.MBeanInfo;
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
index bb9dc93912..2e48d50610 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
@@ -19,8 +19,6 @@ package org.springframework.jmx.export.assembler;
 import javax.management.modelmbean.ModelMBeanAttributeInfo;
 import javax.management.modelmbean.ModelMBeanInfo;
 
-import org.junit.Ignore;
-
 /**
  * @author Rob Harrop
  */
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
index d7db96a961..666f877b80 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
@@ -22,8 +22,6 @@ import javax.management.MBeanAttributeInfo;
 import javax.management.modelmbean.ModelMBeanAttributeInfo;
 import javax.management.modelmbean.ModelMBeanInfo;
 
-import org.junit.Ignore;
-
 /**
  * @author Rob Harrop
  */
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index f372307e58..10ae6d4283 100644
--- a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import javax.naming.NamingException;
 
-import org.springframework.core.CollectionFactory;
 import org.springframework.jndi.JndiTemplate;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
index 5619cf1367..b09bae9980 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
@@ -31,6 +31,9 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.core.task.NoOpRunnable;
 
+import static org.mockito.Mockito.*;
+
+
 /**
  * @author Rick Evans
  * @author Juergen Hoeller
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
index 1bcb119b09..d77ff16084 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
@@ -17,12 +17,11 @@
 package org.springframework.scripting.support;
 
 import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 
 import junit.framework.TestCase;
-import org.easymock.MockControl;
 
+import org.easymock.MockControl;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 
diff --git a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
index 0e522dacc8..de3da1b540 100644
--- a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
+++ b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
@@ -18,7 +18,6 @@ package org.springframework.core;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
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 ecd739fa98..cc6eef308f 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
@@ -18,7 +18,6 @@ package org.springframework.core.io;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
 
diff --git a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
index 4239e38e29..b346e6176b 100644
--- a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
+++ b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
@@ -20,7 +20,6 @@ import java.awt.Component;
 import java.io.PrintStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.Date;
 
 import junit.framework.TestCase;
@@ -317,4 +316,4 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 			return date;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
index c3cc1a806f..63a7b9e694 100644
--- a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
+++ b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
@@ -27,7 +27,6 @@ import org.springframework.core.io.UrlResource;
 import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
-import org.springframework.core.type.classreading.SimpleMetadataReaderFactory;
 
 /**
  * Unit test checking the behaviour of {@link CachingMetadataReaderFactory under load.
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 c4fe7632b5..e2fec15d1b 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
@@ -25,7 +25,6 @@ import javax.xml.stream.XMLStreamException;
 import org.easymock.AbstractMatcher;
 import org.easymock.MockControl;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java
index 900270b62e..7f5bdd6d6a 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.expression.PropertyAccessor;
-import org.springframework.expression.spel.ExpressionState;
 
 /**
  * Utilities methods for use in the Ast classes.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
index 636a234859..62d3c66cf4 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
@@ -26,7 +26,6 @@ import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.sql.Types;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrarTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrarTests.java
index 21ed920479..1b3bbd75ea 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrarTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrarTests.java
@@ -17,9 +17,6 @@
 package org.springframework.jdbc.support;
 
 import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
index d1d6ab289a..e899ca12cd 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
@@ -24,7 +24,6 @@ import javax.jms.MessageConsumer;
 import javax.jms.Session;
 import javax.jms.Topic;
 
-import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.jms.connection.ConnectionFactoryUtils;
 import org.springframework.jms.connection.JmsResourceHolder;
 import org.springframework.jms.connection.SingleConnectionFactory;
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
index 59838f8136..a1e6e3dc71 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
@@ -33,7 +33,6 @@ import javax.jms.QueueSession;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import junit.framework.TestCase;
 import org.easymock.MockControl;
 import org.junit.Test;
 
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java
index ffa07f4f29..3bd333d3b3 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java
@@ -17,12 +17,6 @@
 package org.springframework.jms.listener.adapter;
 
 import javax.jms.TextMessage;
-import javax.jms.MapMessage;
-import javax.jms.BytesMessage;
-import javax.jms.ObjectMessage;
-
-import java.util.Map;
-import java.io.Serializable;
 
 /**
  * See the MessageListenerAdapterTests class for usage.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
index 2cf7e05a0a..93620c30af 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
@@ -22,7 +22,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import javax.transaction.Status;
 import javax.transaction.TransactionManager;
 
 import org.apache.commons.logging.Log;
@@ -31,14 +30,10 @@ import org.hibernate.HibernateException;
 import org.hibernate.usertype.UserType;
 import org.hibernate.util.EqualsHelper;
 
-import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.jdbc.support.lob.JtaLobCreatorSynchronization;
 import org.springframework.jdbc.support.lob.LobCreator;
 import org.springframework.jdbc.support.lob.LobHandler;
-import org.springframework.jdbc.support.lob.SpringLobCreatorSynchronization;
 import org.springframework.jdbc.support.lob.LobCreatorUtils;
 import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
  * Abstract base class for Hibernate UserType implementations that map to LOBs.
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
index 91ac466c5b..5dd0b4c607 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
@@ -19,7 +19,6 @@ package org.springframework.orm.ibatis;
 import java.util.List;
 import java.util.Map;
 
-import com.ibatis.common.util.PaginatedList;
 import com.ibatis.sqlmap.client.event.RowHandler;
 
 import org.springframework.dao.DataAccessException;
diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index f372307e58..10ae6d4283 100644
--- a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import javax.naming.NamingException;
 
-import org.springframework.core.CollectionFactory;
 import org.springframework.jndi.JndiTemplate;
 
 /**
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java
index 76f05bbf68..5b84f9a6f0 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java
@@ -40,7 +40,6 @@ import org.hibernate.SessionFactory;
 import org.hibernate.classic.Session;
 import org.hibernate.engine.SessionFactoryImplementor;
 import org.hibernate.engine.SessionImplementor;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.dao.DataAccessException;
 import org.springframework.transaction.MockJtaTransaction;
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
index 2c7c2d4f8a..e0273f1074 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
@@ -17,12 +17,6 @@
 package org.springframework.orm.hibernate3.support;
 
 import static org.easymock.EasyMock.*;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.createStrictMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.reset;
-import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
index fb5b06616e..e82060c9a0 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
@@ -23,7 +23,6 @@ import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TransactionRequiredException;
 
-import org.springframework.aop.support.AopUtils;
 import org.springframework.orm.jpa.domain.Person;
 import org.springframework.orm.jpa.AbstractEntityManagerFactoryIntegrationTests;
 import org.springframework.test.annotation.NotTransactional;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
index eeb89a614d..9d9ac1bb80 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
@@ -24,7 +24,6 @@ import javax.persistence.PersistenceException;
 import javax.persistence.Query;
 import javax.persistence.TransactionRequiredException;
 
-import org.springframework.aop.support.AopUtils;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.orm.jpa.domain.Person;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
index 5e5e7f917f..4c5ba65c63 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
@@ -25,7 +25,6 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
-import javax.persistence.Table;
 
 import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.annotation.Configurable;
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
index b3bdb4d9aa..f159866bc0 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
@@ -29,7 +29,6 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.jdbc.JdbcTestUtils;
-import org.springframework.util.StringUtils;
 
 /**
  * Subclass of AbstractTransactionalSpringContextTests that adds some convenience
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 2be053ad5f..6d9604dde8 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
@@ -21,7 +21,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.Writer;
-import java.io.FilterInputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.lang.ref.WeakReference;
@@ -38,8 +37,6 @@ import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
 import org.apache.xmlbeans.XmlSaxHandler;
 import org.apache.xmlbeans.XmlValidationError;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
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 ea3b9e3c8c..0c574a4df1 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
@@ -28,7 +28,6 @@ import org.custommonkey.xmlunit.SimpleNamespaceContext;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.custommonkey.xmlunit.XpathEngine;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
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 1471b5fd41..a550a4daed 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
@@ -52,7 +52,6 @@ import org.springframework.util.ReflectionUtils;
 
 import static org.custommonkey.xmlunit.XMLAssert.assertFalse;
 import static org.custommonkey.xmlunit.XMLAssert.*;
-import static org.custommonkey.xmlunit.XMLAssert.fail;
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertTrue;
 
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java b/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
index 6f174ca717..c6f4cb4c4e 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
@@ -29,7 +29,6 @@ import javax.resource.spi.work.WorkManager;
 import javax.resource.spi.work.WorkRejectedException;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.core.task.TaskRejectedException;
 import org.springframework.core.task.TaskTimeoutException;
 import org.springframework.jca.context.BootstrapContextAware;
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index f372307e58..10ae6d4283 100644
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import javax.naming.NamingException;
 
-import org.springframework.core.CollectionFactory;
 import org.springframework.jndi.JndiTemplate;
 
 /**
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 a7f0350f38..1ddf80fa5f 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
@@ -48,7 +48,6 @@ import org.springframework.http.converter.json.MappingJacksonHttpMessageConverte
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter;
 import org.springframework.http.converter.xml.SourceHttpMessageConverter;
-import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.web.util.UriTemplate;
diff --git a/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java b/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
index 51d2b60fe7..efeab78ce1 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java
@@ -39,7 +39,6 @@ import org.springframework.http.HttpInputMessage;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.FormHttpMessageConverter;
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
-import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
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 37d21f1aab..700e524a9f 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
@@ -32,8 +32,6 @@ import javax.servlet.http.HttpServletResponseWrapper;
 import org.springframework.util.Assert;
 import org.springframework.util.DigestUtils;
 import org.springframework.util.FileCopyUtils;
-import org.springframework.web.context.request.async.WebAsyncManager;
-import org.springframework.web.context.request.async.WebAsyncUtils;
 import org.springframework.web.util.WebUtils;
 
 /**
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 91c26212fa..28efebe6c8 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
@@ -21,9 +21,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
-import java.util.Collections;
-import java.util.Iterator;
-
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.fileupload.disk.DiskFileItem;
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 6d6ef4b44a..ea8382ee01 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
@@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
index 7293a4690c..0771b1f4c7 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
@@ -41,7 +41,6 @@ import org.springframework.http.MediaType;
 import org.springframework.http.MockHttpInputMessage;
 import org.springframework.http.MockHttpOutputMessage;
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
-import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
diff --git a/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java
index e3c5072f1b..803bd80d24 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java
@@ -17,15 +17,6 @@
 package org.springframework.http.converter;
 
 import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.namespace.QName;
-
 import static org.junit.Assert.*;
 import org.junit.Test;
 
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java
index 5a556d145a..c9bf074296 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java
@@ -20,9 +20,6 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Collections;
-import java.util.Iterator;
-
 import org.springframework.util.Assert;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
index 1d0d32d3f2..7558a92bec 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
@@ -18,10 +18,8 @@ package org.springframework.web.portlet.mvc.annotation;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
-import java.util.Map;
 import java.util.Set;
 import javax.portlet.ActionRequest;
 import javax.portlet.ClientDataRequest;
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
index 24518968c3..f71992aed7 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
@@ -20,9 +20,6 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Collections;
-import java.util.Iterator;
-
 import org.springframework.util.Assert;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;
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 4c9447b34b..98f3b17858 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
@@ -16,7 +16,6 @@
 
 package org.springframework.web.portlet.context;
 
-import java.util.Locale;
 import javax.servlet.ServletException;
 
 import org.springframework.beans.TestBean;
@@ -24,10 +23,8 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.AbstractApplicationContextTests;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.NoSuchMessageException;
 import org.springframework.context.TestListener;
 import org.springframework.web.context.ConfigurableWebApplicationContext;
-import org.springframework.web.context.support.XmlWebApplicationContext;
 
 /**
  * Should ideally be eliminated.  Copied when splitting .testsuite up into individual bundles.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java
index f1a92dd170..5ae9880292 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java
@@ -30,7 +30,6 @@ import static org.junit.Assert.*;
 import org.junit.Test;
 
 import org.springframework.mock.web.portlet.MockPortletRequest;
-import org.springframework.mock.web.portlet.MockPortletResponse;
 import org.springframework.mock.web.portlet.MockRenderRequest;
 import org.springframework.mock.web.portlet.MockRenderResponse;
 import org.springframework.web.multipart.MultipartRequest;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
index eadec87022..044b56d2ae 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
@@ -35,7 +35,6 @@ import org.springframework.beans.PropertyAccessorFactory;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.PropertyValues;
 import org.springframework.context.EnvironmentAware;
-import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.EnvironmentCapable;
 import org.springframework.core.io.Resource;
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 a13aeacf4d..9d409a3fec 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
@@ -42,7 +42,6 @@ import org.springframework.http.converter.json.MappingJacksonHttpMessageConverte
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter;
 import org.springframework.http.converter.xml.SourceHttpMessageConverter;
-import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.xml.DomUtils;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
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 8e45b4dcf1..e85f189126 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
@@ -49,7 +49,6 @@ import org.springframework.http.converter.json.MappingJacksonHttpMessageConverte
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter;
 import org.springframework.http.converter.xml.SourceHttpMessageConverter;
-import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter;
 import org.springframework.util.ClassUtils;
 import org.springframework.validation.Errors;
 import org.springframework.validation.MessageCodesResolver;
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 b462214e02..48d2d30788 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
@@ -17,9 +17,6 @@
 package org.springframework.web.servlet.mvc.method.annotation;
 
 import java.io.IOException;
-import java.lang.reflect.Array;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.util.ArrayList;
@@ -163,4 +160,4 @@ public abstract class AbstractMessageConverterMethodArgumentResolver implements
 		return new ServletServerHttpRequest(servletRequest);
 	}
 
-}
\ No newline at end of file
+}
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 f4bb235b09..d79a9ef5db 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
@@ -47,7 +47,6 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 import org.springframework.http.converter.xml.SourceHttpMessageConverter;
-import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
index 90e441c006..658ea25b7e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
@@ -21,7 +21,6 @@ import java.util.Map;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.DynamicAttributes;
 
-import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
index 3f7c6a8614..1c47096591 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
@@ -20,18 +20,12 @@ import java.beans.PropertyEditor;
 import java.util.Collection;
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.PropertyAccessorFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.servlet.support.BindStatus;
-import org.springframework.web.servlet.support.RequestDataValueProcessor;
-import org.springframework.web.servlet.support.RequestContext;
 
 /**
  * Provides supporting functionality to render a list of '{@code option}'
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 e57b0ea677..ac75e9998e 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
@@ -17,8 +17,6 @@
 package org.springframework.web.servlet.tags.form;
 
 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
index 776032c42b..84fe7d1d03 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
@@ -20,10 +20,7 @@ import org.apache.tiles.TilesException;
 import org.apache.tiles.context.TilesRequestContext;
 import org.apache.tiles.preparer.PreparerFactory;
 import org.apache.tiles.preparer.ViewPreparer;
-import org.apache.tiles.servlet.context.ServletTilesRequestContext;
-
 import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.servlet.DispatcherServlet;
 
 /**
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 639d503d0e..9ced7b5ddd 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
@@ -30,8 +30,6 @@ import java.util.Arrays;
 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;
 
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 b5a4ca51a7..c14ad7735c 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
@@ -21,8 +21,6 @@ import static org.junit.Assert.assertNotNull;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.DirectFieldAccessor;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
index 3be63ed6bc..25b8d4a7de 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/PathMatchingUrlHandlerMappingTests.java
@@ -16,8 +16,6 @@
 
 package org.springframework.web.servlet.handler;
 
-import junit.framework.TestCase;
-
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockServletContext;
 import org.springframework.web.context.ConfigurableWebApplicationContext;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java
index e2d017609d..e2d2e695a3 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMappingTests.java
@@ -19,8 +19,6 @@ package org.springframework.web.servlet.handler;
 import java.util.Map;
 import java.util.LinkedHashMap;
 
-import junit.framework.TestCase;
-
 import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.mock.web.test.MockHttpServletRequest;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java
index 73528894df..61321e11f2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WebContentInterceptorTests.java
@@ -19,21 +19,15 @@ package org.springframework.web.servlet.mvc;
 import java.util.List;
 import java.util.Properties;
 
-import junit.framework.TestCase;
-
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.web.servlet.support.WebContentGenerator;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.Assert;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.*;
-import static org.junit.Assert.*;
-import static org.junit.Assert.*;
-import static org.junit.Assert.*;
 
 /**
  * @author Rick Evans
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java
index 97f7768dff..d198523e85 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestConditionTests.java
@@ -17,11 +17,6 @@
 package org.springframework.web.servlet.mvc.condition;
 
 import static org.junit.Assert.*;
-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 org.junit.Test;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolverTests.java
index f991d2859c..9a5bc84a6e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolverTests.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 import org.springframework.core.MethodParameter;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
-import org.springframework.web.bind.ServletRequestBindingException;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.context.request.ServletWebRequest;
 import org.springframework.web.method.support.ModelAndViewContainer;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
index 315bfec3fc..43c8c22dd6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
@@ -42,7 +42,6 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.ResourceHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
-import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
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 f26fa8bb28..85ab677a0a 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
@@ -32,7 +32,6 @@ import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -46,11 +45,7 @@ import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.MediaType;
-import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.HttpMessageNotReadableException;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
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 4e99948e4f..e42a2aa967 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
@@ -33,7 +33,6 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
-import org.springframework.http.converter.xml.XmlAwareFormHttpMessageConverter;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.util.MultiValueMap;
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 a8a3167c56..9dbbf6416f 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
@@ -24,7 +24,6 @@ import javax.servlet.jsp.tagext.Tag;
 
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.env.MapPropertySource;
-import org.springframework.core.env.PropertySource;
 import org.springframework.format.annotation.NumberFormat;
 import org.springframework.format.annotation.NumberFormat.Style;
 import org.springframework.format.support.FormattingConversionServiceFactoryBean;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
index 85839b405f..3937e95dc1 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
@@ -16,9 +16,7 @@
 
 package org.springframework.web.servlet.tags;
 
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
-import java.net.URLDecoder;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
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 81710ed789..70cb210e80 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
@@ -16,7 +16,6 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
@@ -27,8 +26,6 @@ import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.Tag;
 
 import org.springframework.mock.web.test.MockHttpServletRequest;
-import org.springframework.web.context.support.StaticWebApplicationContext;
-import org.springframework.web.servlet.support.RequestContextUtils;
 import org.springframework.web.servlet.support.RequestDataValueProcessor;
 
 /**

From 7f0aa5cfb2f4e332ac821d3d25a7fc8dd8618c3a Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Wed, 19 Dec 2012 14:40:17 -0800
Subject: [PATCH 20/36] Fix [varargs] compiler warnings

Remove unnecessary 'null' argument from calls to vararg supported
methods and fix cast in ValidationUtils.invokeValidator().
---
 .../support/security/CallbacksSecurityTests.java   |  4 ++--
 .../validation/ValidationUtils.java                |  2 +-
 .../MethodExclusionMBeanInfoAssemblerTests.java    |  2 +-
 ...lVariableTableParameterNameDiscovererTests.java |  4 ++--
 .../core/style/ToStringCreatorTests.java           |  2 +-
 .../org/springframework/util/ClassUtilsTests.java  | 14 +++++++-------
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
index ea14f4c875..cac02472ca 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
@@ -314,14 +314,14 @@ public class CallbacksSecurityTests {
 		}
 
 		final CustomCallbackBean bean = new CustomCallbackBean();
-		final Method method = bean.getClass().getMethod("destroy", null);
+		final Method method = bean.getClass().getMethod("destroy");
 		method.setAccessible(true);
 
 		try {
 			AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
 
 				public Object run() throws Exception {
-					method.invoke(bean, null);
+					method.invoke(bean);
 					return null;
 				}
 			}, acc);
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 07d14c681f..0e5004e5bd 100644
--- a/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java
+++ b/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java
@@ -52,7 +52,7 @@ public abstract class ValidationUtils {
 	 * the validation of the supplied object's type
 	 */
 	public static void invokeValidator(Validator validator, Object obj, Errors errors) {
-		invokeValidator(validator, obj, errors, (Class[]) null);
+		invokeValidator(validator, obj, errors, (Object[]) null);
 	}
 
 	/**
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
index 3363f4f585..2370488f80 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
@@ -72,7 +72,7 @@ public class MethodExclusionMBeanInfoAssemblerTests extends AbstractJmxAssembler
 		Properties ignored = new Properties();
 		ignored.setProperty(beanKey, "dontExposeMe,setSuperman");
 		assembler.setIgnoredMethodMappings(ignored);
-		Method method = JmxTestBean.class.getMethod("dontExposeMe", null);
+		Method method = JmxTestBean.class.getMethod("dontExposeMe");
 		assertFalse(assembler.isNotIgnored(method, beanKey));
 		// this bean does not have any ignored methods on it, so must obviously not be ignored...
 		assertTrue(assembler.isNotIgnored(method, "someOtherBeanKey"));
diff --git a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
index b346e6176b..da27d69e71 100644
--- a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
+++ b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
@@ -185,7 +185,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 		assertEquals("x", names[1]);
 		assertEquals("i", names[2]);
 
-		m = clazz.getMethod("getDate", null);
+		m = clazz.getMethod("getDate");
 		names = discoverer.getParameterNames(m);
 		assertEquals(0, names.length);
 
@@ -202,7 +202,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 		Class clazz = Component.class;
 		String methodName = "list";
 
-		Method m = clazz.getMethod(methodName, null);
+		Method m = clazz.getMethod(methodName);
 		String[] names = discoverer.getParameterNames(m);
 		assertNull(names);
 
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 928486b396..f8db4e7fd9 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
@@ -111,7 +111,7 @@ public class ToStringCreatorTests extends TestCase {
 	}
 
 	public void testMethod() throws Exception {
-		String str = new ToStringCreator(this).append("myMethod", this.getClass().getMethod("testMethod", null))
+		String str = new ToStringCreator(this).append("myMethod", this.getClass().getMethod("testMethod"))
 				.toString();
 		assertEquals("[ToStringCreatorTests@" + ObjectUtils.getIdentityHexString(this)
 				+ " myMethod = testMethod@ToStringCreatorTests]", str);
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 64a24084ba..8b7fdff79a 100644
--- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
@@ -171,14 +171,14 @@ public class ClassUtilsTests extends TestCase {
 	}
 
 	public void testHasMethod() throws Exception {
-		assertTrue(ClassUtils.hasMethod(Collection.class, "size", null));
-		assertTrue(ClassUtils.hasMethod(Collection.class, "remove", new Class[] {Object.class}));
-		assertFalse(ClassUtils.hasMethod(Collection.class, "remove", null));
-		assertFalse(ClassUtils.hasMethod(Collection.class, "someOtherMethod", null));
+		assertTrue(ClassUtils.hasMethod(Collection.class, "size"));
+		assertTrue(ClassUtils.hasMethod(Collection.class, "remove", Object.class));
+		assertFalse(ClassUtils.hasMethod(Collection.class, "remove"));
+		assertFalse(ClassUtils.hasMethod(Collection.class, "someOtherMethod"));
 	}
 
 	public void testGetMethodIfAvailable() throws Exception {
-		Method method = ClassUtils.getMethodIfAvailable(Collection.class, "size", null);
+		Method method = ClassUtils.getMethodIfAvailable(Collection.class, "size");
 		assertNotNull(method);
 		assertEquals("size", method.getName());
 
@@ -186,8 +186,8 @@ public class ClassUtilsTests extends TestCase {
 		assertNotNull(method);
 		assertEquals("remove", method.getName());
 
-		assertNull(ClassUtils.getMethodIfAvailable(Collection.class, "remove", null));
-		assertNull(ClassUtils.getMethodIfAvailable(Collection.class, "someOtherMethod", null));
+		assertNull(ClassUtils.getMethodIfAvailable(Collection.class, "remove"));
+		assertNull(ClassUtils.getMethodIfAvailable(Collection.class, "someOtherMethod"));
 	}
 
 	public void testGetMethodCountForName() {

From b0986049a3ef78b9901fd37a42b9d481a899d72f Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Wed, 19 Dec 2012 14:35:57 -0800
Subject: [PATCH 21/36] Fix [serial] compiler warnings

Fix serialization warnings by applying @SuppressWarnings("serial")
when appropriate.

In certain cases and for unknown reasons, a correctly-placed
@SuppressWarnings("serial") annotation will fix the warning at the
javac level (i.e. the Gradle command-line), but will produce an
"unnecessary @SuppressWarnings" warning within Eclipse. In these
cases, a private static final serialVersionUID field has been added
with the default value of 1L.
---
 .../aop/AopInvocationException.java           |  1 +
 .../springframework/aop/TrueClassFilter.java  |  1 +
 .../aop/TrueMethodMatcher.java                |  1 +
 .../org/springframework/aop/TruePointcut.java |  1 +
 .../AspectJAdviceParameterNameDiscoverer.java |  1 +
 .../aspectj/AspectJExpressionPointcut.java    |  1 +
 .../AspectJExpressionPointcutAdvisor.java     |  1 +
 ...nnotationAwareAspectJAutoProxyCreator.java |  1 +
 .../annotation/AspectJProxyFactory.java       |  1 +
 .../annotation/NotAnAtAspectException.java    |  1 +
 .../AspectJAwareAdvisorAutoProxyCreator.java  |  1 +
 .../AbstractAdvisingBeanPostProcessor.java    |  1 +
 .../aop/framework/AopConfigException.java     |  1 +
 .../framework/DefaultAdvisorChainFactory.java |  1 +
 .../aop/framework/DefaultAopProxyFactory.java |  1 +
 .../aop/framework/ProxyCreatorSupport.java    |  1 +
 .../aop/framework/ProxyFactory.java           |  1 +
 .../aop/framework/ProxyFactoryBean.java       |  1 +
 .../adapter/AfterReturningAdviceAdapter.java  |  1 +
 .../AfterReturningAdviceInterceptor.java      |  1 +
 .../DefaultAdvisorAdapterRegistry.java        |  1 +
 .../adapter/MethodBeforeAdviceAdapter.java    |  1 +
 .../MethodBeforeAdviceInterceptor.java        |  1 +
 .../adapter/ThrowsAdviceAdapter.java          |  1 +
 .../adapter/UnknownAdviceTypeException.java   |  1 +
 .../AbstractAdvisorAutoProxyCreator.java      |  1 +
 .../autoproxy/AbstractAutoProxyCreator.java   |  1 +
 .../autoproxy/BeanNameAutoProxyCreator.java   |  1 +
 .../DefaultAdvisorAutoProxyCreator.java       |  1 +
 ...InfrastructureAdvisorAutoProxyCreator.java |  1 +
 .../AbstractMonitoringInterceptor.java        |  1 +
 .../interceptor/AbstractTraceInterceptor.java |  1 +
 .../ConcurrencyThrottleInterceptor.java       |  1 +
 .../CustomizableTraceInterceptor.java         |  1 +
 .../aop/interceptor/DebugInterceptor.java     |  1 +
 .../interceptor/ExposeBeanNameAdvisors.java   |  1 +
 .../ExposeInvocationInterceptor.java          |  1 +
 .../JamonPerformanceMonitorInterceptor.java   |  1 +
 .../PerformanceMonitorInterceptor.java        |  1 +
 .../interceptor/SimpleTraceInterceptor.java   |  1 +
 .../aop/scope/DefaultScopedObject.java        |  1 +
 .../aop/scope/ScopedProxyFactoryBean.java     |  1 +
 .../AbstractBeanFactoryPointcutAdvisor.java   |  1 +
 .../support/AbstractExpressionPointcut.java   |  1 +
 .../AbstractGenericPointcutAdvisor.java       |  1 +
 .../aop/support/AbstractPointcutAdvisor.java  |  1 +
 .../support/AbstractRegexpMethodPointcut.java |  1 +
 .../aop/support/ClassFilters.java             |  2 ++
 .../aop/support/ControlFlowPointcut.java      |  1 +
 .../DefaultBeanFactoryPointcutAdvisor.java    |  1 +
 .../aop/support/DefaultPointcutAdvisor.java   |  1 +
 ...erTargetObjectIntroductionInterceptor.java |  1 +
 .../DelegatingIntroductionInterceptor.java    |  1 +
 .../aop/support/IntroductionInfoSupport.java  |  1 +
 .../aop/support/JdkRegexpMethodPointcut.java  |  1 +
 .../aop/support/MethodMatchers.java           |  3 +++
 .../aop/support/NameMatchMethodPointcut.java  |  1 +
 .../NameMatchMethodPointcutAdvisor.java       |  1 +
 .../aop/support/Pointcuts.java                |  2 ++
 .../support/RegexpMethodPointcutAdvisor.java  |  1 +
 .../aop/support/RootClassFilter.java          |  1 +
 .../aop/target/CommonsPoolTargetSource.java   |  2 ++
 .../aop/target/LazyInitTargetSource.java      |  1 +
 .../aop/target/PrototypeTargetSource.java     |  2 ++
 .../aop/target/SimpleBeanTargetSource.java    |  1 +
 .../aop/target/ThreadLocalTargetSource.java   |  2 ++
 .../TrickyAspectJPointcutExpressionTests.java |  1 +
 .../aop/target/LazyInitTargetSourceTests.java |  1 +
 .../PrototypeBasedTargetSourceTests.java      |  4 +++-
 .../org/springframework/beans/Colour.java     |  3 ++-
 .../beans/DerivedTestBean.java                |  3 ++-
 .../aspectj/AbstractBeanConfigurerTests.java  |  9 +++++++++
 .../CallCountingTransactionManager.java       |  1 +
 .../beans/BeanInstantiationException.java     |  1 +
 .../beans/BeanMetadataAttributeAccessor.java  |  1 +
 .../springframework/beans/BeansException.java |  1 +
 .../ConversionNotSupportedException.java      |  1 +
 .../beans/FatalBeanException.java             |  1 +
 .../beans/InvalidPropertyException.java       |  1 +
 .../beans/MethodInvocationException.java      |  1 +
 .../beans/MutablePropertyValues.java          |  1 +
 .../beans/NotReadablePropertyException.java   |  1 +
 .../beans/NotWritablePropertyException.java   |  1 +
 .../beans/NullValueInNestedPathException.java |  1 +
 .../beans/PropertyAccessException.java        |  1 +
 .../beans/PropertyBatchUpdateException.java   |  1 +
 .../springframework/beans/PropertyValue.java  |  1 +
 .../beans/TypeMismatchException.java          |  1 +
 .../beans/factory/BeanCreationException.java  |  1 +
 .../BeanCreationNotAllowedException.java      |  1 +
 .../BeanCurrentlyInCreationException.java     |  1 +
 .../factory/BeanDefinitionStoreException.java |  1 +
 .../factory/BeanExpressionException.java      |  3 ++-
 .../factory/BeanInitializationException.java  |  1 +
 .../factory/BeanIsAbstractException.java      |  1 +
 .../factory/BeanIsNotAFactoryException.java   |  1 +
 .../BeanNotOfRequiredTypeException.java       |  1 +
 .../factory/CannotLoadBeanClassException.java |  1 +
 .../FactoryBeanNotInitializedException.java   |  1 +
 .../UnsatisfiedDependencyException.java       |  1 +
 .../factory/access/BootstrapException.java    |  1 +
 .../factory/config/DependencyDescriptor.java  |  1 +
 .../ObjectFactoryCreatingFactoryBean.java     |  1 +
 .../config/ProviderCreatingFactoryBean.java   |  1 +
 .../BeanDefinitionParsingException.java       |  1 +
 .../AbstractAutowireCapableBeanFactory.java   |  1 +
 .../support/AbstractBeanDefinition.java       |  1 +
 .../support/AutowireCandidateQualifier.java   |  1 +
 .../beans/factory/support/AutowireUtils.java  |  1 +
 .../BeanDefinitionValidationException.java    |  1 +
 .../factory/support/ChildBeanDefinition.java  |  1 +
 .../support/DefaultListableBeanFactory.java   |  4 +---
 .../support/GenericBeanDefinition.java        |  1 +
 .../beans/factory/support/ManagedArray.java   |  1 +
 .../beans/factory/support/ManagedList.java    |  1 +
 .../beans/factory/support/ManagedMap.java     |  1 +
 .../factory/support/ManagedProperties.java    |  1 +
 .../beans/factory/support/ManagedSet.java     |  1 +
 .../factory/support/RootBeanDefinition.java   |  1 +
 .../xml/XmlBeanDefinitionStoreException.java  |  1 +
 .../beans/factory/xml/XmlBeanFactory.java     |  1 +
 .../beans/support/MutableSortDefinition.java  |  1 +
 .../beans/support/PagedListHolder.java        |  1 +
 .../beans/BeanWrapperTests.java               |  1 +
 ...wiredAnnotationBeanPostProcessorTests.java |  1 +
 ...njectAnnotationBeanPostProcessorTests.java |  6 ++++++
 ...DefinitionMetadataEqualsHashCodeTests.java |  2 ++
 .../xml/ConstructorDependenciesBean.java      |  1 +
 .../src/test/java/test/beans/Colour.java      |  3 ++-
 .../test/java/test/beans/DerivedTestBean.java |  1 +
 .../mail/MailAuthenticationException.java     |  1 +
 .../springframework/mail/MailException.java   |  1 +
 .../mail/MailParseException.java              |  1 +
 .../mail/MailPreparationException.java        |  1 +
 .../mail/MailSendException.java               |  1 +
 .../mail/SimpleMailMessage.java               |  1 +
 .../scheduling/quartz/CronTriggerBean.java    |  1 +
 .../scheduling/quartz/JobDetailBean.java      |  1 +
 .../JobMethodInvocationFailedException.java   |  1 +
 .../scheduling/quartz/SimpleTriggerBean.java  |  1 +
 .../org/springframework/beans/Colour.java     |  3 ++-
 .../cache/concurrent/ConcurrentMapCache.java  |  1 +
 .../context/ApplicationContextException.java  |  1 +
 .../context/NoSuchMessageException.java       |  1 +
 .../event/ApplicationContextEvent.java        |  1 +
 .../context/event/ContextClosedEvent.java     |  1 +
 .../context/event/ContextRefreshedEvent.java  |  1 +
 .../context/event/ContextStartedEvent.java    |  1 +
 .../context/event/ContextStoppedEvent.java    |  1 +
 .../context/expression/MapAccessor.java       |  1 +
 .../DefaultMessageSourceResolvable.java       |  1 +
 .../ejb/access/EjbAccessException.java        |  1 +
 .../ejb/support/AbstractEnterpriseBean.java   |  1 +
 .../support/AbstractJmsMessageDrivenBean.java |  1 +
 .../support/AbstractMessageDrivenBean.java    |  1 +
 .../ejb/support/AbstractSessionBean.java      |  1 +
 .../support/AbstractStatefulSessionBean.java  |  1 +
 .../support/AbstractStatelessSessionBean.java |  1 +
 .../org/springframework/jmx/JmxException.java |  1 +
 .../jmx/MBeanServerNotFoundException.java     |  1 +
 .../access/InvalidInvocationException.java    |  1 +
 .../access/InvocationFailureException.java    |  1 +
 .../access/MBeanConnectFailureException.java  |  1 +
 .../access/MBeanInfoRetrievalException.java   |  1 +
 .../jmx/export/MBeanExportException.java      |  1 +
 .../jmx/export/MBeanExporter.java             |  1 +
 .../UnableToRegisterMBeanException.java       |  1 +
 .../metadata/InvalidMetadataException.java    |  1 +
 .../UnableToSendNotificationException.java    |  1 +
 .../jndi/JndiLookupFailureException.java      |  1 +
 .../jndi/TypeMismatchNamingException.java     |  1 +
 .../RemoteConnectFailureException.java        |  1 +
 .../RemoteInvocationFailureException.java     |  1 +
 .../RemoteLookupFailureException.java         |  1 +
 .../remoting/RemoteProxyFailureException.java |  1 +
 .../remoting/soap/SoapFaultException.java     |  1 +
 .../scheduling/SchedulingException.java       |  1 +
 .../CustomizableThreadFactory.java            |  1 +
 .../ThreadPoolTaskExecutor.java               |  1 +
 .../concurrent/CustomizableThreadFactory.java |  1 +
 .../ExecutorConfigurationSupport.java         |  1 +
 .../ScheduledExecutorFactoryBean.java         |  1 +
 .../ThreadPoolExecutorFactoryBean.java        |  1 +
 .../concurrent/ThreadPoolTaskExecutor.java    |  1 +
 .../concurrent/ThreadPoolTaskScheduler.java   |  1 +
 .../scripting/ScriptCompilationException.java |  1 +
 .../scripting/bsh/BshScriptUtils.java         |  1 +
 .../scripting/jruby/JRubyScriptUtils.java     |  1 +
 .../java/org/springframework/ui/ModelMap.java |  1 +
 .../support/BindingAwareModelMap.java         |  1 +
 .../org/springframework/beans/Colour.java     |  3 ++-
 .../beans/DerivedTestBean.java                |  3 ++-
 .../beans/SerializablePerson.java             |  3 ++-
 .../beans/factory/config/SimpleMapScope.java  |  1 +
 .../AbstractApplicationContextTests.java      |  1 +
 .../event/ApplicationContextEventTests.java   |  2 ++
 .../EventPublicationInterceptorTests.java     |  2 ++
 .../ApplicationContextExpressionTests.java    |  1 +
 .../ScheduledExecutorFactoryBeanTests.java    |  4 ++++
 .../scripting/bsh/BshScriptFactoryTests.java  |  1 +
 .../scripting/groovy/TestException.java       |  1 +
 .../advice/TimestampIntroductionAdvisor.java  |  1 +
 .../SerializableNopInterceptor.java           |  3 ++-
 .../TimestampIntroductionInterceptor.java     |  1 +
 .../src/test/java/test/mixin/LockMixin.java   |  3 ++-
 .../java/test/mixin/LockMixinAdvisor.java     |  1 +
 .../test/java/test/mixin/LockedException.java |  3 ++-
 .../core/AttributeAccessorSupport.java        |  1 +
 .../core/CollectionFactory.java               |  1 +
 .../core/ConstantException.java               |  1 +
 .../core/NestedIOException.java               |  1 +
 .../AbstractCachingLabeledEnumResolver.java   |  1 +
 .../enums/AbstractGenericLabeledEnum.java     |  1 +
 .../core/enums/AbstractLabeledEnum.java       |  1 +
 .../core/enums/LetterCodedLabeledEnum.java    |  1 +
 .../core/enums/ShortCodedLabeledEnum.java     |  2 ++
 .../core/enums/StaticLabeledEnum.java         |  1 +
 .../core/enums/StringCodedLabeledEnum.java    |  1 +
 .../support/SerializationFailedException.java |  1 +
 .../core/task/SimpleAsyncTaskExecutor.java    |  1 +
 .../core/task/SyncTaskExecutor.java           |  1 +
 .../core/task/TaskRejectedException.java      |  1 +
 .../core/task/TaskTimeoutException.java       |  1 +
 .../CachingMetadataReaderFactory.java         |  1 +
 .../util/AutoPopulatingList.java              |  1 +
 .../util/CachingMapDecorator.java             |  1 +
 .../springframework/util/CollectionUtils.java |  1 +
 .../util/ConcurrencyThrottleSupport.java      |  1 +
 .../util/CustomizableThreadCreator.java       |  1 +
 .../util/LinkedCaseInsensitiveMap.java        |  1 +
 .../util/comparator/BooleanComparator.java    |  1 +
 .../org/springframework/beans/Colour.java     |  3 ++-
 .../beans/DerivedTestBean.java                |  3 ++-
 .../core/AttributeAccessorSupportTests.java   |  1 +
 .../core/ExceptionDepthComparatorTests.java   |  5 +++++
 .../core/NestedExceptionTests.java            |  4 ++++
 .../support/DefaultConversionTests.java       |  1 +
 .../support/MapToMapConverterTests.java       |  1 +
 .../core/enums/LabeledEnumTests.java          |  3 +++
 .../util/CachingMapDecoratorTests.java        |  1 +
 .../xml/AbstractStaxXMLReaderTestCase.java    |  1 +
 .../expression/AccessException.java           |  1 +
 .../expression/EvaluationException.java       |  3 ++-
 .../expression/ExpressionException.java       |  1 +
 .../ExpressionInvocationTargetException.java  |  1 +
 .../expression/ParseException.java            |  1 +
 .../spel/InternalParseException.java          |  1 +
 .../spel/SpelEvaluationException.java         |  1 +
 .../expression/spel/SpelParseException.java   |  1 +
 .../spel/ConstructorInvocationTests.java      |  1 +
 .../spel/testresources/Inventor.java          |  1 +
 .../jdbc/BadSqlGrammarException.java          |  1 +
 .../CannotGetJdbcConnectionException.java     |  1 +
 ...ncorrectResultSetColumnCountException.java |  1 +
 .../jdbc/InvalidResultSetAccessException.java |  1 +
 ...ffectedIncorrectNumberOfRowsException.java |  1 +
 .../jdbc/LobRetrievalFailureException.java    |  1 +
 .../jdbc/SQLWarningException.java             |  1 +
 .../jdbc/UncategorizedSQLException.java       |  1 +
 .../NamedParameterJdbcTemplate.java           |  1 +
 .../DataSourceTransactionManager.java         |  1 +
 .../DataSourceLookupFailureException.java     |  1 +
 .../jdbc/support/MetaDataAccessException.java |  1 +
 .../SqlXmlFeatureNotImplementedException.java |  1 +
 .../org/springframework/beans/Colour.java     |  3 ++-
 .../DataSourceJtaTransactionTests.java        |  1 +
 .../jdbc/object/StoredProcedureTests.java     |  1 +
 ...LErrorCodeSQLExceptionTranslatorTests.java |  1 +
 .../jms/IllegalStateException.java            |  1 +
 .../jms/InvalidClientIDException.java         |  1 +
 .../jms/InvalidDestinationException.java      |  1 +
 .../jms/InvalidSelectorException.java         |  1 +
 .../org/springframework/jms/JmsException.java |  1 +
 .../jms/JmsSecurityException.java             |  1 +
 .../jms/MessageEOFException.java              |  1 +
 .../jms/MessageFormatException.java           |  1 +
 .../jms/MessageNotReadableException.java      |  1 +
 .../jms/MessageNotWriteableException.java     |  1 +
 .../jms/ResourceAllocationException.java      |  1 +
 .../jms/TransactionInProgressException.java   |  1 +
 .../jms/TransactionRolledBackException.java   |  1 +
 .../jms/UncategorizedJmsException.java        |  1 +
 .../connection/JmsTransactionManager102.java  |  1 +
 ...ynchedLocalTransactionFailedException.java |  1 +
 .../ListenerExecutionFailedException.java     |  1 +
 .../endpoint/JmsMessageEndpointFactory.java   |  1 +
 .../converter/MessageConversionException.java |  1 +
 .../DestinationResolutionException.java       |  1 +
 .../org/springframework/beans/Colour.java     |  3 ++-
 .../adapter/MessageListenerAdapterTests.java  |  1 +
 .../MappingJackson2MessageConverterTests.java |  1 +
 .../MappingJacksonMessageConverterTests.java  |  1 +
 .../CallCountingTransactionManager.java       |  1 +
 .../hibernate4/ConfigurableJtaPlatform.java   |  1 +
 .../hibernate4/HibernateJdbcException.java    |  1 +
 ...ernateObjectRetrievalFailureException.java |  1 +
 ...nateOptimisticLockingFailureException.java |  1 +
 .../hibernate4/HibernateQueryException.java   |  1 +
 .../hibernate4/HibernateSystemException.java  |  1 +
 .../hibernate4/SpringJtaSessionContext.java   |  1 +
 ...jectOptimisticLockingFailureException.java |  1 +
 .../orm/ObjectRetrievalFailureException.java  |  1 +
 .../hibernate3/HibernateJdbcException.java    |  1 +
 ...ernateObjectRetrievalFailureException.java |  1 +
 ...nateOptimisticLockingFailureException.java |  1 +
 .../hibernate3/HibernateQueryException.java   |  1 +
 .../hibernate3/HibernateSystemException.java  |  1 +
 .../HibernateTransactionManager.java          |  1 +
 .../orm/hibernate3/SpringSessionContext.java  |  1 +
 .../IdTransferringMergeEventListener.java     |  1 +
 .../support/ScopedBeanInterceptor.java        |  1 +
 .../JdoObjectRetrievalFailureException.java   |  1 +
 .../JdoOptimisticLockingFailureException.java |  1 +
 .../orm/jdo/JdoResourceFailureException.java  |  1 +
 .../orm/jdo/JdoSystemException.java           |  1 +
 .../orm/jdo/JdoTransactionManager.java        |  1 +
 .../orm/jdo/JdoUsageException.java            |  1 +
 .../jpa/AbstractEntityManagerFactoryBean.java |  2 ++
 .../orm/jpa/DefaultJpaDialect.java            |  1 +
 .../orm/jpa/ExtendedEntityManagerCreator.java |  1 +
 .../JpaObjectRetrievalFailureException.java   |  1 +
 .../JpaOptimisticLockingFailureException.java |  1 +
 .../orm/jpa/JpaSystemException.java           |  1 +
 .../orm/jpa/JpaTransactionManager.java        |  1 +
 ...ocalContainerEntityManagerFactoryBean.java |  2 ++
 .../jpa/LocalEntityManagerFactoryBean.java    |  2 ++
 .../orm/jpa/SharedEntityManagerCreator.java   |  1 +
 .../orm/jpa/vendor/EclipseLinkJpaDialect.java |  1 +
 .../orm/jpa/vendor/HibernateJpaDialect.java   |  1 +
 .../orm/jpa/vendor/OpenJpaDialect.java        |  1 +
 .../orm/jpa/vendor/TopLinkJpaDialect.java     |  1 +
 .../org/springframework/beans/Colour.java     |  3 ++-
 .../beans/factory/config/SimpleMapScope.java  |  1 +
 .../LocalSessionFactoryBeanTests.java         | 15 ++++++++++++++
 ...AbstractEntityManagerFactoryBeanTests.java |  2 ++
 .../jpa/EntityManagerFactoryUtilsTests.java   |  1 +
 .../support/PersistenceInjectionTests.java    |  4 ++++
 .../oxm/MarshallingException.java             |  1 +
 .../oxm/MarshallingFailureException.java      |  1 +
 .../oxm/UncategorizedMappingException.java    |  1 +
 .../oxm/UnmarshallingFailureException.java    |  1 +
 .../oxm/ValidationFailureException.java       |  1 +
 .../oxm/XmlMappingException.java              |  1 +
 .../oxm/castor/CastorMappingException.java    |  1 +
 .../web/struts/SpringBindingActionForm.java   |  1 +
 .../web/struts/StrutsSupportTests.java        |  9 +++++++++
 .../dao/CannotAcquireLockException.java       |  1 +
 .../CannotSerializeTransactionException.java  |  1 +
 .../CleanupFailureDataAccessException.java    |  1 +
 .../dao/ConcurrencyFailureException.java      |  1 +
 .../dao/DataAccessException.java              |  1 +
 .../DataAccessResourceFailureException.java   |  1 +
 .../dao/DataIntegrityViolationException.java  |  1 +
 .../dao/DataRetrievalFailureException.java    |  1 +
 .../dao/DeadlockLoserDataAccessException.java |  1 +
 .../dao/DuplicateKeyException.java            |  3 ++-
 .../dao/EmptyResultDataAccessException.java   |  1 +
 ...ectUpdateSemanticsDataAccessException.java |  1 +
 .../InvalidDataAccessApiUsageException.java   |  1 +
 ...validDataAccessResourceUsageException.java |  1 +
 .../dao/NonTransientDataAccessException.java  |  1 +
 ...nTransientDataAccessResourceException.java |  1 +
 .../OptimisticLockingFailureException.java    |  1 +
 .../PermissionDeniedDataAccessException.java  |  1 +
 .../PessimisticLockingFailureException.java   |  1 +
 .../dao/QueryTimeoutException.java            |  1 +
 .../dao/RecoverableDataAccessException.java   |  1 +
 .../dao/TransientDataAccessException.java     |  1 +
 .../TransientDataAccessResourceException.java |  1 +
 .../dao/TypeMismatchDataAccessException.java  |  1 +
 .../dao/UncategorizedDataAccessException.java |  1 +
 ...ersistenceExceptionTranslationAdvisor.java |  1 +
 .../jca/cci/CannotCreateRecordException.java  |  1 +
 .../cci/CannotGetCciConnectionException.java  |  1 +
 .../CciOperationNotSupportedException.java    |  1 +
 .../cci/InvalidResultSetAccessException.java  |  1 +
 .../cci/RecordTypeNotSupportedException.java  |  1 +
 .../CciLocalTransactionManager.java           |  1 +
 ...onnectionSpecConnectionFactoryAdapter.java |  1 +
 .../DelegatingConnectionFactory.java          |  1 +
 .../connection/SingleConnectionFactory.java   |  1 +
 ...ransactionAwareConnectionFactoryProxy.java |  1 +
 .../jca/cci/core/support/CommAreaRecord.java  |  1 +
 .../GenericMessageEndpointFactory.java        |  1 +
 .../CannotCreateTransactionException.java     |  1 +
 .../HeuristicCompletionException.java         |  1 +
 .../IllegalTransactionStateException.java     |  1 +
 .../InvalidIsolationLevelException.java       |  1 +
 .../transaction/InvalidTimeoutException.java  |  1 +
 ...estedTransactionNotSupportedException.java |  1 +
 .../transaction/NoTransactionException.java   |  1 +
 .../transaction/TransactionException.java     |  1 +
 ...actionSuspensionNotSupportedException.java |  1 +
 .../TransactionSystemException.java           |  1 +
 .../TransactionTimedOutException.java         |  1 +
 .../TransactionUsageException.java            |  1 +
 .../UnexpectedRollbackException.java          |  1 +
 .../AnnotationTransactionAttributeSource.java |  1 +
 .../Ejb3TransactionAnnotationParser.java      |  1 +
 .../SpringTransactionAnnotationParser.java    |  1 +
 ...toryTransactionAttributeSourceAdvisor.java |  1 +
 .../CompositeTransactionAttributeSource.java  |  1 +
 .../DefaultTransactionAttribute.java          |  1 +
 .../DelegatingTransactionAttribute.java       |  1 +
 ...MatchAlwaysTransactionAttributeSource.java |  1 +
 .../NameMatchTransactionAttributeSource.java  |  1 +
 .../interceptor/NoRollbackRuleAttribute.java  |  1 +
 .../interceptor/RollbackRuleAttribute.java    |  1 +
 .../RuleBasedTransactionAttribute.java        |  1 +
 .../interceptor/TransactionAspectSupport.java |  1 +
 .../TransactionAttributeSourceAdvisor.java    |  1 +
 .../TransactionAttributeSourcePointcut.java   |  1 +
 .../jta/JtaTransactionManager.java            |  1 +
 .../jta/OC4JJtaTransactionManager.java        |  1 +
 .../jta/WebLogicJtaTransactionManager.java    |  1 +
 .../jta/WebSphereUowTransactionManager.java   |  1 +
 .../AbstractPlatformTransactionManager.java   |  1 +
 .../support/DefaultTransactionDefinition.java |  1 +
 .../DelegatingTransactionDefinition.java      |  1 +
 .../support/TransactionTemplate.java          |  1 +
 .../org/springframework/beans/Colour.java     |  3 ++-
 .../beans/DerivedTestBean.java                |  3 ++-
 .../CallCountingTransactionManager.java       |  1 +
 .../transaction/TestTransactionManager.java   |  1 +
 .../transaction/TransactionSupportTests.java  |  1 +
 ...tationTransactionAttributeSourceTests.java |  1 +
 .../config/AnnotationDrivenTests.java         |  1 +
 .../config/TransactionalService.java          |  1 +
 .../AbstractTransactionAspectTests.java       |  1 +
 .../TransactionInterceptorTests.java          |  1 +
 .../HttpMessageConversionException.java       |  1 +
 .../HttpMessageNotReadableException.java      |  1 +
 .../HttpMessageNotWritableException.java      |  3 ++-
 .../jaxrpc/JaxRpcSoapFaultException.java      |  1 +
 .../jaxws/JaxWsSoapFaultException.java        |  1 +
 .../web/HttpMediaTypeException.java           |  1 +
 .../HttpMediaTypeNotAcceptableException.java  |  1 +
 .../HttpMediaTypeNotSupportedException.java   |  1 +
 ...ttpRequestMethodNotSupportedException.java |  1 +
 .../web/HttpSessionRequiredException.java     |  1 +
 .../bind/MethodArgumentNotValidException.java |  1 +
 ...ssingServletRequestParameterException.java |  1 +
 .../bind/ServletRequestBindingException.java  |  1 +
 ...ServletRequestParameterPropertyValues.java |  1 +
 ...sfiedServletRequestParameterException.java |  1 +
 .../HandlerMethodInvocationException.java     |  1 +
 .../web/client/RestTemplate.java              |  1 +
 .../DestructionCallbackBindingListener.java   |  1 +
 .../support/HttpRequestHandlerServlet.java    |  1 +
 .../context/support/RequestHandledEvent.java  |  1 +
 .../support/ServletRequestHandledEvent.java   |  1 +
 .../DelegatingPhaseListenerMulticaster.java   |  1 +
 .../MaxUploadSizeExceededException.java       |  1 +
 .../web/multipart/MultipartException.java     |  1 +
 .../commons/CommonsMultipartFile.java         |  1 +
 .../web/util/HttpSessionMutexListener.java    |  1 +
 .../springframework/web/util/UriTemplate.java |  1 +
 .../org/springframework/beans/Colour.java     |  3 ++-
 .../beans/DerivedTestBean.java                |  3 ++-
 .../beans/SerializablePerson.java             |  3 ++-
 .../httpinvoker/HttpInvokerTests.java         |  3 +++
 .../jaxws/OrderNotFoundException.java         |  1 +
 .../client/RestTemplateIntegrationTests.java  |  6 ++++++
 .../ServletRequestAttributesTests.java        |  1 +
 .../context/request/SessionScopeTests.java    |  1 +
 .../web/jsf/DelegatingPhaseListenerTests.java |  2 ++
 .../CommonsMultipartResolverTests.java        |  1 +
 .../web/util/TagUtilsTests.java               |  3 +++
 .../ModelAndViewDefiningException.java        |  1 +
 .../web/portlet/NoHandlerFoundException.java  |  1 +
 ...ssingPortletRequestParameterException.java |  1 +
 .../bind/PortletRequestBindingException.java  |  1 +
 ...PortletRequestParameterPropertyValues.java |  1 +
 .../PortletApplicationContextUtils.java       |  3 +++
 .../context/PortletRequestHandledEvent.java   |  1 +
 ...letRequestMethodNotSupportedException.java |  3 ++-
 .../PortletSessionRequiredException.java      |  1 +
 .../org/springframework/beans/Colour.java     |  3 ++-
 .../beans/DerivedTestBean.java                |  3 ++-
 .../AbstractApplicationContextTests.java      |  1 +
 .../SimpleMappingExceptionResolverTests.java  |  4 ++++
 .../PortletAnnotationControllerTests.java     |  2 +-
 .../ModelAndViewDefiningException.java        |  1 +
 .../web/servlet/ResourceServlet.java          |  1 +
 .../web/servlet/ViewRendererServlet.java      |  1 +
 .../NoSuchRequestHandlingMethodException.java |  1 +
 .../web/servlet/tags/BindErrorsTag.java       |  1 +
 .../web/servlet/tags/BindTag.java             |  1 +
 .../web/servlet/tags/EscapeBodyTag.java       |  1 +
 .../web/servlet/tags/EvalTag.java             |  1 +
 .../web/servlet/tags/HtmlEscapeTag.java       |  1 +
 .../servlet/tags/HtmlEscapingAwareTag.java    |  1 +
 .../web/servlet/tags/MessageTag.java          |  1 +
 .../web/servlet/tags/NestedPathTag.java       |  1 +
 .../web/servlet/tags/ParamTag.java            |  1 +
 .../servlet/tags/RequestContextAwareTag.java  |  1 +
 .../web/servlet/tags/ThemeTag.java            |  1 +
 .../web/servlet/tags/TransformTag.java        |  1 +
 .../web/servlet/tags/UrlTag.java              |  1 +
 .../tags/form/AbstractCheckedElementTag.java  |  1 +
 .../form/AbstractDataBoundFormElementTag.java |  1 +
 .../servlet/tags/form/AbstractFormTag.java    |  1 +
 .../tags/form/AbstractHtmlElementBodyTag.java |  1 +
 .../tags/form/AbstractHtmlElementTag.java     |  1 +
 .../form/AbstractHtmlInputElementTag.java     |  1 +
 .../form/AbstractMultiCheckedElementTag.java  |  1 +
 .../form/AbstractSingleCheckedElementTag.java |  1 +
 .../web/servlet/tags/form/CheckboxTag.java    |  1 +
 .../web/servlet/tags/form/CheckboxesTag.java  |  1 +
 .../web/servlet/tags/form/ErrorsTag.java      |  1 +
 .../web/servlet/tags/form/FormTag.java        |  1 +
 .../web/servlet/tags/form/LabelTag.java       |  1 +
 .../web/servlet/tags/form/OptionTag.java      |  1 +
 .../web/servlet/tags/form/OptionsTag.java     |  1 +
 .../servlet/tags/form/PasswordInputTag.java   |  1 +
 .../web/servlet/tags/form/RadioButtonTag.java |  1 +
 .../servlet/tags/form/RadioButtonsTag.java    |  1 +
 .../web/servlet/tags/form/SelectTag.java      |  1 +
 .../web/servlet/tags/form/TextareaTag.java    |  1 +
 .../view/AbstractCachingViewResolver.java     |  1 +
 .../view/freemarker/FreeMarkerView.java       |  1 +
 .../org/springframework/beans/Colour.java     |  3 ++-
 .../beans/DerivedTestBean.java                |  3 ++-
 .../beans/SerializablePerson.java             |  3 ++-
 .../SimpleMappingExceptionResolverTests.java  |  2 ++
 .../CgLibProxyServletAnnotationTests.java     |  3 ++-
 .../JdkProxyServletAnnotationTests.java       |  1 +
 .../ResponseStatusExceptionResolverTests.java |  2 ++
 .../ServletAnnotationControllerTests.java     | 14 +++++++++++++
 ...plateServletAnnotationControllerTests.java |  4 ++++
 .../web/servlet/tags/BindTagTests.java        |  1 +
 .../web/servlet/tags/HtmlEscapeTagTests.java  |  5 +++++
 .../web/servlet/tags/MessageTagTests.java     | 20 +++++++++++++++++++
 .../web/servlet/tags/ParamTagTests.java       |  1 +
 .../web/servlet/tags/ThemeTagTests.java       |  1 +
 .../servlet/tags/form/CheckboxTagTests.java   |  1 +
 .../servlet/tags/form/CheckboxesTagTests.java |  1 +
 .../web/servlet/tags/form/ErrorsTagTests.java |  1 +
 .../web/servlet/tags/form/FormTagTests.java   |  1 +
 .../web/servlet/tags/form/InputTagTests.java  |  1 +
 .../web/servlet/tags/form/LabelTagTests.java  |  1 +
 .../servlet/tags/form/OptionTagEnumTests.java |  1 +
 .../web/servlet/tags/form/OptionTagTests.java |  2 ++
 .../servlet/tags/form/OptionsTagTests.java    |  1 +
 .../tags/form/PasswordInputTagTests.java      |  1 +
 .../tags/form/RadioButtonTagTests.java        |  1 +
 .../tags/form/RadioButtonsTagTests.java       |  1 +
 .../web/servlet/tags/form/SelectTagTests.java |  1 +
 .../servlet/tags/form/TextareaTagTests.java   |  1 +
 .../CallCountingTransactionManager.java       |  1 +
 550 files changed, 705 insertions(+), 36 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java b/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java
index fa23500793..404a1d0845 100644
--- a/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java
+++ b/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java
@@ -25,6 +25,7 @@ import org.springframework.core.NestedRuntimeException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class AopInvocationException extends NestedRuntimeException {
 
 	/**
diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
index b510df206f..2d09d4f690 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
@@ -23,6 +23,7 @@ import java.io.Serializable;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 class TrueClassFilter implements ClassFilter, Serializable {
 
 	public static final TrueClassFilter INSTANCE = new TrueClassFilter();
diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
index d6d67efc72..a97872ab32 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
@@ -24,6 +24,7 @@ import java.lang.reflect.Method;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 class TrueMethodMatcher implements MethodMatcher, Serializable {
 
 	public static final TrueMethodMatcher INSTANCE = new TrueMethodMatcher();
diff --git a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
index c286cb1809..4416fe866d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
@@ -23,6 +23,7 @@ import java.io.Serializable;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 class TruePointcut implements Pointcut, Serializable {
 
 	public static final TruePointcut INSTANCE = new TruePointcut();
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
index 66a04dc022..1eab7c8520 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
@@ -790,6 +790,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	 * Thrown in response to an ambiguous binding being detected when
 	 * trying to resolve a method's parameter names.
 	 */
+	@SuppressWarnings("serial")
 	public static class AmbiguousBindingException extends RuntimeException {
 
 		/**
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 470ed686f3..c4ddcaab9a 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
@@ -76,6 +76,7 @@ import org.springframework.util.StringUtils;
  * @author Dave Syer
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		implements ClassFilter, IntroductionAwareMethodMatcher, BeanFactoryAware {
 
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 d17bbce30b..49fa6da5eb 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
@@ -25,6 +25,7 @@ import org.springframework.aop.support.AbstractGenericPointcutAdvisor;
  * @author Rob Harrop
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class AspectJExpressionPointcutAdvisor extends AbstractGenericPointcutAdvisor {
 
 	private final AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
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 a871be26d3..62d1414717 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
@@ -45,6 +45,7 @@ import org.springframework.util.Assert;
  * @since 2.0
  * @see org.springframework.aop.aspectj.annotation.AspectJAdvisorFactory
  */
+@SuppressWarnings("serial")
 public class AnnotationAwareAspectJAutoProxyCreator extends AspectJAwareAdvisorAutoProxyCreator {
 
 	private List<Pattern> includePatterns;
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java
index f7a264eb37..b160ded0b8 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJProxyFactory.java
@@ -46,6 +46,7 @@ import org.springframework.util.ClassUtils;
  * @see #getProxy(ClassLoader)
  * @see org.springframework.aop.framework.ProxyFactory
  */
+@SuppressWarnings("serial")
 public class AspectJProxyFactory extends ProxyCreatorSupport {
 
 	/** Cache for singleton aspect instances */
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java
index 297286cbf4..c4401b17cc 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java
@@ -26,6 +26,7 @@ import org.springframework.aop.framework.AopConfigException;
  * @author Rod Johnson
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class NotAnAtAspectException extends AopConfigException {
 
 	private Class<?> nonAspectClass;
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
index 1a64c9610a..20765ec960 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
@@ -43,6 +43,7 @@ import org.springframework.util.ClassUtils;
  * @author Ramnivas Laddad
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProxyCreator {
 
 	private static final Comparator DEFAULT_PRECEDENCE_COMPARATOR = new AspectJPrecedenceComparator();
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 a78e33daf2..9e6baee932 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
@@ -33,6 +33,7 @@ import org.springframework.util.ClassUtils;
  * @author Juergen Hoeller
  * @since 3.2
  */
+@SuppressWarnings("serial")
 public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig
 		implements BeanPostProcessor, BeanClassLoaderAware, Ordered {
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java
index 46cd1075ac..33e09ae1d6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java
@@ -24,6 +24,7 @@ import org.springframework.core.NestedRuntimeException;
  * @author Rod Johnson
  * @since 13.03.2003
  */
+@SuppressWarnings("serial")
 public class AopConfigException extends NestedRuntimeException {
 
 	/**
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
index 806e3602bc..defb0bada9 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
@@ -43,6 +43,7 @@ import org.springframework.aop.support.MethodMatchers;
  * @author Adrian Colyer
  * @since 2.0.3
  */
+@SuppressWarnings("serial")
 public class DefaultAdvisorChainFactory implements AdvisorChainFactory, Serializable {
 
 	public List<Object> getInterceptorsAndDynamicInterceptionAdvice(
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
index 43293527e6..8b95e3303b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
@@ -45,6 +45,7 @@ import org.springframework.aop.SpringProxy;
  * @see AdvisedSupport#setProxyTargetClass
  * @see AdvisedSupport#setInterfaces
  */
+@SuppressWarnings("serial")
 public class DefaultAopProxyFactory implements AopProxyFactory, Serializable {
 
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java
index c34bb113ab..4adef07407 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java
@@ -29,6 +29,7 @@ import org.springframework.util.Assert;
  * @since 2.0.3
  * @see #createAopProxy()
  */
+@SuppressWarnings("serial")
 public class ProxyCreatorSupport extends AdvisedSupport {
 
 	private AopProxyFactory aopProxyFactory;
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 acc4b69054..67e89eeefd 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
@@ -32,6 +32,7 @@ import org.springframework.util.ClassUtils;
  * @author Rob Harrop
  * @since 14.03.2003
  */
+@SuppressWarnings("serial")
 public class ProxyFactory extends ProxyCreatorSupport {
 
 	/**
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 6cd0d15155..257f2f2190 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
@@ -88,6 +88,7 @@ import org.springframework.util.ObjectUtils;
  * @see org.springframework.aop.Advisor
  * @see Advised
  */
+@SuppressWarnings("serial")
 public class ProxyFactoryBean extends ProxyCreatorSupport
 		implements FactoryBean<Object>, BeanClassLoaderAware, BeanFactoryAware {
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java
index 10f8613300..07257fecb7 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java
@@ -31,6 +31,7 @@ import org.springframework.aop.AfterReturningAdvice;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 class AfterReturningAdviceAdapter implements AdvisorAdapter, Serializable {
 
 	public boolean supportsAdvice(Advice advice) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java
index 1e0b0b6417..9b6dfa3fd9 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java
@@ -32,6 +32,7 @@ import org.springframework.util.Assert;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class AfterReturningAdviceInterceptor implements MethodInterceptor, AfterAdvice, Serializable {
 
 	private final AfterReturningAdvice advice;
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
index 8ac6e5c3e8..da5f7025ed 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
@@ -37,6 +37,7 @@ import org.springframework.aop.support.DefaultPointcutAdvisor;
  * @author Rob Harrop
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class DefaultAdvisorAdapterRegistry implements AdvisorAdapterRegistry, Serializable {
 
 	private final List<AdvisorAdapter> adapters = new ArrayList<AdvisorAdapter>(3);
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java
index 6757ab65f5..222a63129d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java
@@ -31,6 +31,7 @@ import org.springframework.aop.MethodBeforeAdvice;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 class MethodBeforeAdviceAdapter implements AdvisorAdapter, Serializable {
 
 	public boolean supportsAdvice(Advice advice) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java
index 82f339b3f6..3aebd50484 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java
@@ -31,6 +31,7 @@ import org.springframework.util.Assert;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class MethodBeforeAdviceInterceptor implements MethodInterceptor, Serializable {
 
 	private MethodBeforeAdvice advice;
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
index 0803088e8b..386d3a75df 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
@@ -31,6 +31,7 @@ import org.springframework.aop.ThrowsAdvice;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 class ThrowsAdviceAdapter implements AdvisorAdapter, Serializable {
 
 	public boolean supportsAdvice(Advice advice) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java
index a479fbc868..c0e840b055 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java
@@ -25,6 +25,7 @@ package org.springframework.aop.framework.adapter;
  * @see org.aopalliance.aop.Advice
  * @see org.springframework.aop.Advisor
  */
+@SuppressWarnings("serial")
 public class UnknownAdviceTypeException extends IllegalArgumentException {
 
 	/**
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java
index dba5d066d5..c9aae651d5 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java
@@ -44,6 +44,7 @@ import org.springframework.core.OrderComparator;
  * @author Juergen Hoeller
  * @see #findCandidateAdvisors
  */
+@SuppressWarnings("serial")
 public abstract class AbstractAdvisorAutoProxyCreator extends AbstractAutoProxyCreator {
 
 	private BeanFactoryAdvisorRetrievalHelper advisorRetrievalHelper;
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 bcef35918f..06010d6710 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
@@ -87,6 +87,7 @@ import org.springframework.util.ClassUtils;
  * @see BeanNameAutoProxyCreator
  * @see DefaultAdvisorAutoProxyCreator
  */
+@SuppressWarnings("serial")
 public abstract class AbstractAutoProxyCreator extends ProxyConfig
 		implements SmartInstantiationAwareBeanPostProcessor, BeanClassLoaderAware, BeanFactoryAware,
 		Ordered, AopInfrastructureBean {
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 a7b01b573c..7b517282c8 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
@@ -42,6 +42,7 @@ import org.springframework.util.StringUtils;
  * @see #setInterceptorNames
  * @see AbstractAutoProxyCreator
  */
+@SuppressWarnings("serial")
 public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator {
 
 	private List<String> beanNames;
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
index 741cd1ae1a..f84bf4f55d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
@@ -33,6 +33,7 @@ import org.springframework.beans.factory.BeanNameAware;
  * @author Rod Johnson
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class DefaultAdvisorAutoProxyCreator extends AbstractAdvisorAutoProxyCreator implements BeanNameAware {
 
 	/** Separator between prefix and remainder of bean name */
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java
index 35ad24e1c7..d48716f9d0 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java
@@ -26,6 +26,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
  * @author Juergen Hoeller
  * @since 2.0.7
  */
+@SuppressWarnings("serial")
 public class InfrastructureAdvisorAutoProxyCreator extends AbstractAdvisorAutoProxyCreator {
 
 	private ConfigurableListableBeanFactory beanFactory;
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
index 2f5bf13495..82db223aa3 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
@@ -36,6 +36,7 @@ import org.aopalliance.intercept.MethodInvocation;
  * @see #setSuffix
  * @see #createInvocationTraceName
  */
+@SuppressWarnings("serial")
 public abstract class AbstractMonitoringInterceptor extends AbstractTraceInterceptor {
 
 	private String prefix = "";
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
index 0defe95a51..438fa3cff7 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
@@ -43,6 +43,7 @@ import org.springframework.aop.support.AopUtils;
  * @see #setUseDynamicLogger
  * @see #invokeUnderTrace(org.aopalliance.intercept.MethodInvocation, org.apache.commons.logging.Log)
  */
+@SuppressWarnings("serial")
 public abstract class AbstractTraceInterceptor implements MethodInterceptor, Serializable {
 
 	/**
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
index b8f5e89833..4298008d9b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
@@ -39,6 +39,7 @@ import org.springframework.util.ConcurrencyThrottleSupport;
  * @since 11.02.2004
  * @see #setConcurrencyLimit
  */
+@SuppressWarnings("serial")
 public class ConcurrencyThrottleInterceptor extends ConcurrencyThrottleSupport
 		implements MethodInterceptor, Serializable {
 
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 63e7c8d5b1..93228b1af7 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
@@ -67,6 +67,7 @@ import org.springframework.util.StringUtils;
  * @see #setExceptionMessage
  * @see SimpleTraceInterceptor
  */
+@SuppressWarnings("serial")
 public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 
 	/**
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java
index e027d9a13b..4f9b95a919 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java
@@ -32,6 +32,7 @@ import org.aopalliance.intercept.MethodInvocation;
  * @see SimpleTraceInterceptor
  * @see CustomizableTraceInterceptor
  */
+@SuppressWarnings("serial")
 public class DebugInterceptor extends SimpleTraceInterceptor {
 
 	private volatile long count;
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
index 42750137ac..bffad2c4d1 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
@@ -123,6 +123,7 @@ public abstract class ExposeBeanNameAdvisors {
 	/**
 	 * Introduction that exposes the specified bean name as invocation attribute.
 	 */
+	@SuppressWarnings("serial")
 	private static class ExposeBeanNameIntroduction extends DelegatingIntroductionInterceptor implements NamedBean {
 
 		private final String beanName;
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
index 51de80ec0f..9d25008e91 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
@@ -40,6 +40,7 @@ import org.springframework.core.Ordered;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class ExposeInvocationInterceptor implements MethodInterceptor, Ordered, Serializable {
 
 	/** Singleton instance of this class */
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
index 29b9f4620a..8f14116ac8 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
@@ -35,6 +35,7 @@ import org.apache.commons.logging.Log;
  * @see com.jamonapi.MonitorFactory
  * @see PerformanceMonitorInterceptor
  */
+@SuppressWarnings("serial")
 public class JamonPerformanceMonitorInterceptor extends AbstractMonitoringInterceptor {
 
 	private boolean trackAllInvocations = false;
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
index 7db0a7ed3d..fd3f537560 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
@@ -33,6 +33,7 @@ import org.springframework.util.StopWatch;
  * @see org.springframework.util.StopWatch
  * @see JamonPerformanceMonitorInterceptor
  */
+@SuppressWarnings("serial")
 public class PerformanceMonitorInterceptor extends AbstractMonitoringInterceptor {
 
 	/**
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java
index 6a7fb5c171..ec794cb5fd 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java
@@ -32,6 +32,7 @@ import org.apache.commons.logging.Log;
  * @since 1.2
  * @see CustomizableTraceInterceptor
  */
+@SuppressWarnings("serial")
 public class SimpleTraceInterceptor extends AbstractTraceInterceptor {
 
 	/**
diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java b/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
index 05a041aeec..cc07afc997 100644
--- a/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
+++ b/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
@@ -34,6 +34,7 @@ import org.springframework.util.Assert;
  * @see org.springframework.beans.factory.BeanFactory#getBean
  * @see org.springframework.beans.factory.config.ConfigurableBeanFactory#destroyScopedBean
  */
+@SuppressWarnings("serial")
 public class DefaultScopedObject implements ScopedObject, Serializable {
 
 	private final ConfigurableBeanFactory beanFactory;
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 a1cf5db4a8..2193d8b674 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
@@ -49,6 +49,7 @@ import org.springframework.util.ClassUtils;
  * @since 2.0
  * @see #setProxyTargetClass
  */
+@SuppressWarnings("serial")
 public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean<Object>, BeanFactoryAware {
 
 	/** The TargetSource that manages scoping */
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 0d11ab36a7..938a7cb742 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
@@ -38,6 +38,7 @@ import org.springframework.util.Assert;
  * @see #setAdviceBeanName
  * @see DefaultBeanFactoryPointcutAdvisor
  */
+@SuppressWarnings("serial")
 public abstract class AbstractBeanFactoryPointcutAdvisor extends AbstractPointcutAdvisor implements BeanFactoryAware {
 
 	private String adviceBeanName;
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
index db654b56a0..dc48762686 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
@@ -28,6 +28,7 @@ import java.io.Serializable;
  * @see #setLocation
  * @see #setExpression
  */
+@SuppressWarnings("serial")
 public abstract class AbstractExpressionPointcut implements ExpressionPointcut, Serializable {
 
 	private String location;
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java
index 66ed6ff0ca..c0fcb7c791 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java
@@ -26,6 +26,7 @@ import org.aopalliance.aop.Advice;
  * @see #setAdvice
  * @see DefaultPointcutAdvisor
  */
+@SuppressWarnings("serial")
 public abstract class AbstractGenericPointcutAdvisor extends AbstractPointcutAdvisor {
 
 	private Advice advice;
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
index a9031bcc3c..4b362c8407 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
@@ -34,6 +34,7 @@ import org.springframework.util.ObjectUtils;
  * @since 1.1.2
  * @see AbstractGenericPointcutAdvisor
  */
+@SuppressWarnings("serial")
 public abstract class AbstractPointcutAdvisor implements PointcutAdvisor, Ordered, Serializable {
 
 	private Integer order;
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 3967691556..b7527ca6af 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
@@ -47,6 +47,7 @@ import org.springframework.util.StringUtils;
  * @since 1.1
  * @see JdkRegexpMethodPointcut
  */
+@SuppressWarnings("serial")
 public abstract class AbstractRegexpMethodPointcut extends StaticMethodMatcherPointcut
 		implements Serializable {
 
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 e8fd0213ea..4abb43c8f2 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
@@ -87,6 +87,7 @@ public abstract class ClassFilters {
 	/**
 	 * ClassFilter implementation for a union of the given ClassFilters.
 	 */
+	@SuppressWarnings("serial")
 	private static class UnionClassFilter implements ClassFilter, Serializable {
 
 		private ClassFilter[] filters;
@@ -120,6 +121,7 @@ public abstract class ClassFilters {
 	/**
 	 * ClassFilter implementation for an intersection of the given ClassFilters.
 	 */
+	@SuppressWarnings("serial")
 	private static class IntersectionClassFilter implements ClassFilter, Serializable {
 
 		private ClassFilter[] filters;
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
index e0d0b6dc33..008e9105c9 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
@@ -36,6 +36,7 @@ import org.springframework.util.ObjectUtils;
  * @author Rob Harrop
  * @see org.springframework.core.ControlFlow
  */
+@SuppressWarnings("serial")
 public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher, Serializable {
 
 	private Class clazz;
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
index 9059a86669..1324847e12 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
@@ -32,6 +32,7 @@ import org.springframework.aop.Pointcut;
  * @see #setPointcut
  * @see #setAdviceBeanName
  */
+@SuppressWarnings("serial")
 public class DefaultBeanFactoryPointcutAdvisor extends AbstractBeanFactoryPointcutAdvisor {
 
 	private Pointcut pointcut = Pointcut.TRUE;
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
index 7cb9ffb44e..64d6651af5 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
@@ -34,6 +34,7 @@ import org.springframework.aop.Pointcut;
  * @see #setPointcut
  * @see #setAdvice
  */
+@SuppressWarnings("serial")
 public class DefaultPointcutAdvisor extends AbstractGenericPointcutAdvisor implements Serializable {
 
 	private Pointcut pointcut = Pointcut.TRUE;
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
index 7e0747ab86..ac0199a69e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
@@ -50,6 +50,7 @@ import org.springframework.aop.ProxyMethodInvocation;
  * @see #suppressInterface
  * @see DelegatingIntroductionInterceptor
  */
+@SuppressWarnings("serial")
 public class DelegatePerTargetObjectIntroductionInterceptor extends IntroductionInfoSupport
 		implements IntroductionInterceptor {
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
index 738c336643..53211519e3 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
@@ -48,6 +48,7 @@ import org.springframework.util.Assert;
  * @see #suppressInterface
  * @see DelegatePerTargetObjectIntroductionInterceptor
  */
+@SuppressWarnings("serial")
 public class DelegatingIntroductionInterceptor extends IntroductionInfoSupport
 		implements IntroductionInterceptor {
 
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 c04c049163..1279087de1 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
@@ -40,6 +40,7 @@ import org.springframework.util.ClassUtils;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class IntroductionInfoSupport implements IntroductionInfo, Serializable {
 
 	protected final Set<Class> publishedInterfaces = new HashSet<Class>();
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
index af1b41c711..82409fc009 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
@@ -37,6 +37,7 @@ import java.util.regex.PatternSyntaxException;
  * @author Rob Harrop
  * @since 1.1
  */
+@SuppressWarnings("serial")
 public class JdkRegexpMethodPointcut extends AbstractRegexpMethodPointcut {
 
 	/**
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 54c612d4cb..75d56678ad 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
@@ -99,6 +99,7 @@ public abstract class MethodMatchers {
 	/**
 	 * MethodMatcher implementation for a union of two given MethodMatchers.
 	 */
+	@SuppressWarnings("serial")
 	private static class UnionMethodMatcher implements IntroductionAwareMethodMatcher, Serializable {
 
 		private MethodMatcher mm1;
@@ -163,6 +164,7 @@ public abstract class MethodMatchers {
 	 * MethodMatcher implementation for a union of two given MethodMatchers,
 	 * supporting an associated ClassFilter per MethodMatcher.
 	 */
+	@SuppressWarnings("serial")
 	private static class ClassFilterAwareUnionMethodMatcher extends UnionMethodMatcher {
 
 		private final ClassFilter cf1;
@@ -201,6 +203,7 @@ public abstract class MethodMatchers {
 	/**
 	 * MethodMatcher implementation for an intersection of two given MethodMatchers.
 	 */
+	@SuppressWarnings("serial")
 	private static class IntersectionMethodMatcher implements IntroductionAwareMethodMatcher, Serializable {
 
 		private MethodMatcher mm1;
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 0cb2e94d5c..ddbec48ffe 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
@@ -35,6 +35,7 @@ import org.springframework.util.PatternMatchUtils;
  * @since 11.02.2004
  * @see #isMatch
  */
+@SuppressWarnings("serial")
 public class NameMatchMethodPointcut extends StaticMethodMatcherPointcut implements Serializable {
 
 	private List<String> mappedNames = new LinkedList<String>();
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 46e4f9b876..ef939cfb55 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
@@ -29,6 +29,7 @@ import org.springframework.aop.Pointcut;
  * @author Rob Harrop
  * @see NameMatchMethodPointcut
  */
+@SuppressWarnings("serial")
 public class NameMatchMethodPointcutAdvisor extends AbstractGenericPointcutAdvisor {
 
 	private final NameMatchMethodPointcut pointcut = new NameMatchMethodPointcut();
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java
index cdeb21e8b9..267083cc70 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java
@@ -91,6 +91,7 @@ public abstract class Pointcuts {
 	/**
 	 * Pointcut implementation that matches bean property setters.
 	 */
+	@SuppressWarnings("serial")
 	private static class SetterPointcut extends StaticMethodMatcherPointcut implements Serializable {
 
 		public static SetterPointcut INSTANCE = new SetterPointcut();
@@ -110,6 +111,7 @@ public abstract class Pointcuts {
 	/**
 	 * Pointcut implementation that matches bean property getters.
 	 */
+	@SuppressWarnings("serial")
 	private static class GetterPointcut extends StaticMethodMatcherPointcut implements Serializable {
 
 		public static GetterPointcut INSTANCE = new GetterPointcut();
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 74a71b6937..5cc14d909b 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
@@ -41,6 +41,7 @@ import org.springframework.util.ObjectUtils;
  * @see #setPatterns
  * @see JdkRegexpMethodPointcut
  */
+@SuppressWarnings("serial")
 public class RegexpMethodPointcutAdvisor extends AbstractGenericPointcutAdvisor {
 
 	private String[] patterns;
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
index 83866afb50..955f92ef03 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
@@ -24,6 +24,7 @@ import org.springframework.aop.ClassFilter;
  * Simple ClassFilter implementation that passes classes (and optionally subclasses)
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class RootClassFilter implements ClassFilter, Serializable {
 
 	private Class clazz;
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 24920b3987..096fd2f46f 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
@@ -58,6 +58,8 @@ import org.springframework.core.Constants;
 public class CommonsPoolTargetSource extends AbstractPoolingTargetSource
 		implements PoolableObjectFactory {
 
+	private static final long serialVersionUID = 1L;
+
 	private static final Constants constants = new Constants(GenericObjectPool.class);
 
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
index a87f92092a..37f5b99d46 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
@@ -56,6 +56,7 @@ import org.springframework.beans.BeansException;
  * @see org.springframework.beans.factory.BeanFactory#getBean
  * @see #postProcessTargetObject
  */
+@SuppressWarnings("serial")
 public class LazyInitTargetSource extends AbstractBeanFactoryBasedTargetSource {
 
 	private Object target;
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 14f2f28501..ed372d085e 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
@@ -31,6 +31,8 @@ import org.springframework.beans.BeansException;
  */
 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/SimpleBeanTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java
index 656a88088d..911eb837f1 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java
@@ -27,6 +27,7 @@ package org.springframework.aop.target;
  * @author Juergen Hoeller
  * @since 2.0.3
  */
+@SuppressWarnings("serial")
 public class SimpleBeanTargetSource extends AbstractBeanFactoryBasedTargetSource {
 
 	public Object getTarget() throws Exception {
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 ca20b2ceea..7b100fe0da 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
@@ -50,6 +50,8 @@ import org.springframework.core.NamedThreadLocal;
 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
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
index 18e0bd56ad..c10c50ddf8 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
@@ -115,6 +115,7 @@ public class TrickyAspectJPointcutExpressionTests {
 
 	}
 
+	@SuppressWarnings("serial")
 	public static class TestException extends RuntimeException {
 
 		public TestException(String string) {
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
index 52919dc063..d08d6f5357 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
@@ -80,6 +80,7 @@ public final class LazyInitTargetSourceTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class CustomLazyInitTargetSource extends LazyInitTargetSource {
 
 		protected void postProcessTargetObject(Object targetObject) {
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
index daecd1b5e8..3fe1c3ca70 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
@@ -62,6 +62,8 @@ public final class PrototypeBasedTargetSourceTests {
 
 	private static class TestTargetSource extends AbstractPrototypeBasedTargetSource {
 
+		private static final long serialVersionUID = 1L;
+
 		/**
 		 * Nonserializable test field to check that subclass
 		 * state can't prevent serialization from working
@@ -77,4 +79,4 @@ public final class PrototypeBasedTargetSourceTests {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-aspects/src/test/java/org/springframework/beans/Colour.java b/spring-aspects/src/test/java/org/springframework/beans/Colour.java
index 60dc333e0b..17fd24fec7 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/Colour.java
@@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum;
 /**
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");
@@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum {
 		super(code, label);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java
index 2bb41a9d5b..0940539f54 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean;
  * @author Juergen Hoeller
  * @since 21.08.2003
  */
+@SuppressWarnings("serial")
 public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
 
 	private String beanName;
@@ -82,4 +83,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 		return destroyed;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java
index c3f6386fe6..b92077767b 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java
@@ -248,6 +248,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase {
 
 
 	@Configurable("beanOne")
+	@SuppressWarnings("serial")
 	protected static class ShouldBeConfiguredBySpring implements Serializable {
 
 		private String name;
@@ -263,6 +264,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase {
 
 
 	@Configurable("beanOne")
+	@SuppressWarnings("serial")
 	private static class ShouldBeConfiguredBySpringContainsPublicReadResolve implements Serializable {
 
 		private String name;
@@ -317,6 +319,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class SerializableThatShouldNotBeConfiguredBySpring implements Serializable {
 
 		private String name;
@@ -444,6 +447,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase {
 	}
 
 	@Configurable
+	@SuppressWarnings("serial")
 	private static class BaseSerializableBean implements Serializable {
 
 		public int setterCount;
@@ -457,6 +461,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class SubSerializableBean extends BaseSerializableBean {
 	}
 
@@ -551,6 +556,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase {
 		}
 	}
 
+	@SuppressWarnings("serial")
 	public static class Order implements MailSenderClient, Serializable {
 		private transient MailSender mailSender;
 
@@ -577,6 +583,7 @@ public abstract class AbstractBeanConfigurerTests extends TestCase {
 	}
 
 	@Configurable
+	@SuppressWarnings("serial")
 	private static class PreOrPostConstructionConfiguredBean implements Serializable {
 		private transient String name;
 		protected transient boolean preConstructionConfigured;
@@ -597,11 +604,13 @@ public abstract class AbstractBeanConfigurerTests extends TestCase {
 
 
 	@Configurable(preConstruction=true)
+	@SuppressWarnings("serial")
 	public static class PreConstructionConfiguredBean extends PreOrPostConstructionConfiguredBean {
 	}
 
 
 	@Configurable(preConstruction=false)
+	@SuppressWarnings("serial")
 	private static class PostConstructionConfiguredBean extends PreOrPostConstructionConfiguredBean {
 	}
 
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index 563d610714..0c0b3cb81c 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -23,6 +23,7 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class CallCountingTransactionManager extends AbstractPlatformTransactionManager {
 
 	public TransactionDefinition lastDefinition;
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java b/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java
index 46e45ba1ef..9fbac3fef8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java
@@ -23,6 +23,7 @@ package org.springframework.beans;
  * @author Juergen Hoeller
  * @since 1.2.8
  */
+@SuppressWarnings("serial")
 public class BeanInstantiationException extends FatalBeanException {
 
 	private Class beanClass;
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
index d059f8e2fa..ca62f6fa3c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
@@ -26,6 +26,7 @@ import org.springframework.core.AttributeAccessorSupport;
  * @author Juergen Hoeller
  * @since 2.5
  */
+@SuppressWarnings("serial")
 public class BeanMetadataAttributeAccessor extends AttributeAccessorSupport implements BeanMetadataElement {
 
 	private Object source;
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeansException.java b/spring-beans/src/main/java/org/springframework/beans/BeansException.java
index a2c0834d36..2aae901c72 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeansException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeansException.java
@@ -29,6 +29,7 @@ import org.springframework.util.ObjectUtils;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public abstract class BeansException extends NestedRuntimeException {
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java b/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java
index 7ea4ed901a..fc44cd572d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java
@@ -25,6 +25,7 @@ import java.beans.PropertyChangeEvent;
  * @author Juergen Hoeller
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class ConversionNotSupportedException extends TypeMismatchException {
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java b/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java
index 43feaa766c..d1d30a5e2f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java
@@ -22,6 +22,7 @@ package org.springframework.beans;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class FatalBeanException extends BeansException {
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java b/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java
index d1c976a5a2..51ff5161f1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java
@@ -23,6 +23,7 @@ package org.springframework.beans;
  * @author Juergen Hoeller
  * @since 1.0.2
  */
+@SuppressWarnings("serial")
 public class InvalidPropertyException extends FatalBeanException {
 
 	private Class beanClass;
diff --git a/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java b/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
index 49d1398d7b..467c595ed6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
@@ -24,6 +24,7 @@ import java.beans.PropertyChangeEvent;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class MethodInvocationException extends PropertyAccessException {
 
 	/**
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 94ba9a1af6..7a21fbf0e1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
+++ b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
@@ -35,6 +35,7 @@ import org.springframework.util.StringUtils;
  * @author Rob Harrop
  * @since 13 May 2001
  */
+@SuppressWarnings("serial")
 public class MutablePropertyValues implements PropertyValues, Serializable {
 
 	private final List<PropertyValue> propertyValueList;
diff --git a/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java b/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java
index 49ba7d795a..cba93573fe 100644
--- a/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java
@@ -23,6 +23,7 @@ package org.springframework.beans;
  * @author Juergen Hoeller
  * @since 1.0.2
  */
+@SuppressWarnings("serial")
 public class NotReadablePropertyException extends InvalidPropertyException {
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java b/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java
index 73b607edb1..2a5042c94f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java
@@ -24,6 +24,7 @@ package org.springframework.beans;
  * @author Alef Arendsen
  * @author Arjen Poutsma
  */
+@SuppressWarnings("serial")
 public class NotWritablePropertyException extends InvalidPropertyException {
 
 	private String[] possibleMatches = null;
diff --git a/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java b/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java
index 40c593c444..6ed4d3c578 100644
--- a/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java
@@ -25,6 +25,7 @@ package org.springframework.beans;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class NullValueInNestedPathException extends InvalidPropertyException {
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
index 004310ac8d..b2eafd4433 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
@@ -27,6 +27,7 @@ import org.springframework.core.ErrorCoded;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public abstract class PropertyAccessException extends BeansException implements ErrorCoded {
 
 	private transient PropertyChangeEvent propertyChangeEvent;
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 378315bea7..9768d25a26 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java
@@ -35,6 +35,7 @@ import org.springframework.util.ObjectUtils;
  * @author Juergen Hoeller
  * @since 18 April 2001
  */
+@SuppressWarnings("serial")
 public class PropertyBatchUpdateException extends BeansException {
 
 	/** List of PropertyAccessException objects */
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 426476b89b..f08d029108 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java
@@ -39,6 +39,7 @@ import org.springframework.util.ObjectUtils;
  * @see PropertyValues
  * @see BeanWrapper
  */
+@SuppressWarnings("serial")
 public class PropertyValue extends BeanMetadataAttributeAccessor implements Serializable {
 
 	private final String name;
diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
index 0e1930bbb2..bac7fc93ba 100644
--- a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
@@ -26,6 +26,7 @@ import org.springframework.util.ClassUtils;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class TypeMismatchException extends PropertyAccessException {
 
 	/**
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 15235f2106..bd5998cc7f 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
@@ -30,6 +30,7 @@ import org.springframework.core.NestedRuntimeException;
  *
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class BeanCreationException extends FatalBeanException {
 
 	private String beanName;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java
index 2a078c5fb1..cb270e619c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java
@@ -24,6 +24,7 @@ package org.springframework.beans.factory;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class BeanCreationNotAllowedException extends BeanCreationException {
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java
index 1e014c8563..9e3d1a5906 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java
@@ -23,6 +23,7 @@ package org.springframework.beans.factory;
  * @author Juergen Hoeller
  * @since 1.1
  */
+@SuppressWarnings("serial")
 public class BeanCurrentlyInCreationException extends BeanCreationException {
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java
index 9536dec6df..1ba73bbde0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java
@@ -26,6 +26,7 @@ import org.springframework.beans.FatalBeanException;
  * @author Juergen Hoeller
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class BeanDefinitionStoreException extends FatalBeanException {
 
 	private String resourceDescription;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java
index ab2f2531b0..f4b5be3df2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java
@@ -24,6 +24,7 @@ import org.springframework.beans.FatalBeanException;
  * @author Juergen Hoeller
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class BeanExpressionException extends FatalBeanException {
 
 	/**
@@ -44,4 +45,4 @@ public class BeanExpressionException extends FatalBeanException {
 		super(msg, cause);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java
index 297e9be094..aaace2cf34 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java
@@ -31,6 +31,7 @@ import org.springframework.beans.FatalBeanException;
  * @see BeanFactoryAware#setBeanFactory
  * @see InitializingBean#afterPropertiesSet
  */
+@SuppressWarnings("serial")
 public class BeanInitializationException extends FatalBeanException {
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java
index 26a5e8f3f3..46a99fc5a2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java
@@ -24,6 +24,7 @@ package org.springframework.beans.factory;
  * @since 1.1
  * @see org.springframework.beans.factory.support.AbstractBeanDefinition#setAbstract
  */
+@SuppressWarnings("serial")
 public class BeanIsAbstractException extends BeanCreationException {
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java
index a741715a3b..43b2bddc75 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java
@@ -25,6 +25,7 @@ package org.springframework.beans.factory;
  * @since 10.03.2003
  * @see org.springframework.beans.factory.FactoryBean
  */
+@SuppressWarnings("serial")
 public class BeanIsNotAFactoryException extends BeanNotOfRequiredTypeException {
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java
index efdea3ab3d..b853cec073 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java
@@ -24,6 +24,7 @@ import org.springframework.beans.BeansException;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class BeanNotOfRequiredTypeException extends BeansException {
 
 	/** The name of the instance that was of the wrong type */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java b/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java
index 3b15815ea6..e620437b53 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java
@@ -25,6 +25,7 @@ import org.springframework.beans.FatalBeanException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class CannotLoadBeanClassException extends FatalBeanException {
 
 	private String resourceDescription;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java
index 66b317222f..791b30557e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java
@@ -34,6 +34,7 @@ import org.springframework.beans.FatalBeanException;
  * @since 30.10.2003
  * @see FactoryBean#getObject()
  */
+@SuppressWarnings("serial")
 public class FactoryBeanNotInitializedException extends FatalBeanException {
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java b/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java
index ae2cc0de0a..f700515bec 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java
@@ -28,6 +28,7 @@ import org.springframework.util.ClassUtils;
  * @author Juergen Hoeller
  * @since 03.09.2003
  */
+@SuppressWarnings("serial")
 public class UnsatisfiedDependencyException extends BeanCreationException {
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java
index 9a607de3ef..2fb454543e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java
@@ -24,6 +24,7 @@ import org.springframework.beans.FatalBeanException;
  * @author Rod Johnson
  * @since 02.12.2002
  */
+@SuppressWarnings("serial")
 public class BootstrapException extends FatalBeanException {
 
 	/**
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 67559bea8e..2693f8246c 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
@@ -37,6 +37,7 @@ import org.springframework.util.Assert;
  * @author Juergen Hoeller
  * @since 2.5
  */
+@SuppressWarnings("serial")
 public class DependencyDescriptor implements Serializable {
 
 	private transient MethodParameter methodParameter;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java
index c9bf53b3ba..710eeddae6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java
@@ -131,6 +131,7 @@ public class ObjectFactoryCreatingFactoryBean extends AbstractFactoryBean<Object
 	/**
 	 * Independent inner class - for serialization purposes.
 	 */
+	@SuppressWarnings("serial")
 	private static class TargetBeanObjectFactory implements ObjectFactory, Serializable {
 
 		private final BeanFactory beanFactory;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
index 0ce9e083cd..b64f38ffe2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
@@ -76,6 +76,7 @@ public class ProviderCreatingFactoryBean extends AbstractFactoryBean<Provider> {
 	/**
 	 * Independent inner class - for serialization purposes.
 	 */
+	@SuppressWarnings("serial")
 	private static class TargetBeanProvider implements Provider, Serializable {
 
 		private final BeanFactory beanFactory;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java
index 43b537dd05..7e3d6b68a2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java
@@ -26,6 +26,7 @@ import org.springframework.beans.factory.BeanDefinitionStoreException;
  * @author Rob Harrop
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class BeanDefinitionParsingException extends BeanDefinitionStoreException {
 
 	/**
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 92c74dde60..c112676ea1 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
@@ -1643,6 +1643,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	 * Special DependencyDescriptor variant for autowire="byType".
 	 * Always optional; never considering the parameter name for choosing a primary candidate.
 	 */
+	@SuppressWarnings("serial")
 	private static class AutowireByTypeDependencyDescriptor extends DependencyDescriptor {
 
 		public AutowireByTypeDependencyDescriptor(MethodParameter methodParameter, boolean eager) {
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 db41eb0002..f93ea1b408 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
@@ -52,6 +52,7 @@ import org.springframework.util.StringUtils;
  * @see RootBeanDefinition
  * @see ChildBeanDefinition
  */
+@SuppressWarnings("serial")
 public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccessor
 		implements BeanDefinition, Cloneable {
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java
index 6723fed6c6..964f7d83e6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java
@@ -29,6 +29,7 @@ import org.springframework.util.Assert;
  * @since 2.5
  * @see org.springframework.beans.factory.annotation.Qualifier
  */
+@SuppressWarnings("serial")
 public class AutowireCandidateQualifier extends BeanMetadataAttributeAccessor {
 
 	public static String VALUE_KEY = "value";
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 cb1bce28ee..6ea25abcc6 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
@@ -153,6 +153,7 @@ abstract class AutowireUtils {
 	/**
 	 * Reflective InvocationHandler for lazy access to the current target object.
 	 */
+	@SuppressWarnings("serial")
 	private static class ObjectFactoryDelegatingInvocationHandler implements InvocationHandler, Serializable {
 
 		private final ObjectFactory objectFactory;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java
index 79d0d1e005..57f4ddbb80 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java
@@ -25,6 +25,7 @@ import org.springframework.beans.FatalBeanException;
  * @since 21.11.2003
  * @see AbstractBeanDefinition#validate()
  */
+@SuppressWarnings("serial")
 public class BeanDefinitionValidationException extends FatalBeanException {
 
 	/**
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 6effd4031e..a09d69dded 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
@@ -43,6 +43,7 @@ import org.springframework.util.ObjectUtils;
  * @see GenericBeanDefinition
  * @see RootBeanDefinition
  */
+@SuppressWarnings("serial")
 public class ChildBeanDefinition extends AbstractBeanDefinition {
 
 	private String parentName;
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 ced19e9326..824caaaec5 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
@@ -94,6 +94,7 @@ import org.springframework.util.StringUtils;
  * @see PropertiesBeanDefinitionReader
  * @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader
  */
+@SuppressWarnings("serial")
 public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFactory
 		implements ConfigurableListableBeanFactory, BeanDefinitionRegistry, Serializable {
 
@@ -992,7 +993,6 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	 * Minimal id reference to the factory.
 	 * Resolved to the actual factory instance on deserialization.
 	 */
-	@SuppressWarnings("serial")
 	private static class SerializedBeanFactoryReference implements Serializable {
 
 		private final String id;
@@ -1020,7 +1020,6 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	/**
 	 * Serializable ObjectFactory for lazy resolution of a dependency.
 	 */
-	@SuppressWarnings("serial")
 	private class DependencyObjectFactory implements ObjectFactory<Object>, Serializable {
 
 		private final DependencyDescriptor descriptor;
@@ -1042,7 +1041,6 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	/**
 	 * Serializable ObjectFactory for lazy resolution of a dependency.
 	 */
-	@SuppressWarnings("serial")
 	private class DependencyProvider extends DependencyObjectFactory implements Provider<Object> {
 
 		public DependencyProvider(DependencyDescriptor descriptor, String beanName) {
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 9ebb74b632..d3206fdc99 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
@@ -35,6 +35,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
  * @see RootBeanDefinition
  * @see ChildBeanDefinition
  */
+@SuppressWarnings("serial")
 public class GenericBeanDefinition extends AbstractBeanDefinition {
 
 	private String parentName;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java
index 2be0e4152d..bac4697f18 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java
@@ -25,6 +25,7 @@ import org.springframework.util.Assert;
  * @author Juergen Hoeller
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class ManagedArray extends ManagedList<Object> {
 
 	/** Resolved element type for runtime creation of the target array */
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
index 353538c991..bac7a2a4fc 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
@@ -31,6 +31,7 @@ import org.springframework.beans.Mergeable;
  * @author Juergen Hoeller
  * @since 27.05.2003
  */
+@SuppressWarnings("serial")
 public class ManagedList<E> extends ArrayList<E> implements Mergeable, BeanMetadataElement {
 
 	private Object source;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
index 0a0bd10a15..e4459d0296 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
@@ -30,6 +30,7 @@ import org.springframework.beans.Mergeable;
  * @author Rob Harrop
  * @since 27.05.2003
  */
+@SuppressWarnings("serial")
 public class ManagedMap<K, V> extends LinkedHashMap<K, V> implements Mergeable, BeanMetadataElement {
 
 	private Object source;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
index a90f86dce9..b947affe43 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
@@ -29,6 +29,7 @@ import org.springframework.beans.Mergeable;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class ManagedProperties extends Properties implements Mergeable, BeanMetadataElement {
 
 	private Object source;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
index a60272d12e..7efcba3204 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
@@ -30,6 +30,7 @@ import org.springframework.beans.Mergeable;
  * @author Rob Harrop
  * @since 21.01.2004
  */
+@SuppressWarnings("serial")
 public class ManagedSet<E> extends LinkedHashSet<E> implements Mergeable, BeanMetadataElement {
 
 	private Object source;
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 2e5e49ac94..7eaba17a54 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
@@ -45,6 +45,7 @@ import org.springframework.util.Assert;
  * @see GenericBeanDefinition
  * @see ChildBeanDefinition
  */
+@SuppressWarnings("serial")
 public class RootBeanDefinition extends AbstractBeanDefinition {
 
 	// using a ConcurrentHashMap as a Set
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java
index 87c4617c4d..cba28b0641 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java
@@ -31,6 +31,7 @@ import org.springframework.beans.factory.BeanDefinitionStoreException;
  * @see #getLineNumber()
  * @see org.xml.sax.SAXParseException
  */
+@SuppressWarnings("serial")
 public class XmlBeanDefinitionStoreException extends BeanDefinitionStoreException {
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java
index 077d76cdae..2ff16bbbae 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java
@@ -51,6 +51,7 @@ import org.springframework.core.io.Resource;
  * {@link XmlBeanDefinitionReader}
  */
 @Deprecated
+@SuppressWarnings({"serial", "all"})
 public class XmlBeanFactory extends DefaultListableBeanFactory {
 
 	private final XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this);
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
index 2f7892a963..89490a664a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
@@ -29,6 +29,7 @@ import org.springframework.util.StringUtils;
  * @since 26.05.2003
  * @see #setToggleAscendingOnProperty
  */
+@SuppressWarnings("serial")
 public class MutableSortDefinition implements SortDefinition, Serializable {
 
 	private String property = "";
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java b/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java
index 9d09ca22a2..13a81da809 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java
@@ -47,6 +47,7 @@ import org.springframework.util.Assert;
  * @see #getPageList()
  * @see org.springframework.beans.support.MutableSortDefinition
  */
+@SuppressWarnings("serial")
 public class PagedListHolder<E> implements Serializable {
 
 	public static final int DEFAULT_PAGE_SIZE = 10;
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 b584e4a51e..f97a686dfb 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
@@ -1851,6 +1851,7 @@ public final class BeanWrapperTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class TypedReadOnlyMap extends ReadOnlyMap<String, TestBean> {
 
 		public TypedReadOnlyMap() {
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 37fc30a4ee..a24c78d989 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
@@ -1346,6 +1346,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class ObjectFactoryInjectionBean implements Serializable {
 
 		@Autowired
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
index 7ef18579bf..fdaa110f36 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
@@ -938,6 +938,7 @@ public class InjectAnnotationBeanPostProcessorTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class ObjectFactoryFieldInjectionBean implements Serializable {
 
 		@Inject
@@ -949,6 +950,7 @@ public class InjectAnnotationBeanPostProcessorTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class ObjectFactoryMethodInjectionBean implements Serializable {
 
 		private Provider<TestBean> testBeanFactory;
@@ -992,6 +994,7 @@ public class InjectAnnotationBeanPostProcessorTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class ObjectFactoryListFieldInjectionBean implements Serializable {
 
 		@Inject
@@ -1007,6 +1010,7 @@ public class InjectAnnotationBeanPostProcessorTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class ObjectFactoryListMethodInjectionBean implements Serializable {
 
 		private Provider<List<TestBean>> testBeanFactory;
@@ -1022,6 +1026,7 @@ public class InjectAnnotationBeanPostProcessorTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class ObjectFactoryMapFieldInjectionBean implements Serializable {
 
 		@Inject
@@ -1037,6 +1042,7 @@ public class InjectAnnotationBeanPostProcessorTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class ObjectFactoryMapMethodInjectionBean implements Serializable {
 
 		private Provider<Map<String, TestBean>> testBeanFactory;
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 884b2bc232..e0f0875403 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
@@ -28,6 +28,7 @@ import test.beans.TestBean;
  */
 public class DefinitionMetadataEqualsHashCodeTests extends TestCase {
 
+	@SuppressWarnings("serial")
 	public void testRootBeanDefinitionEqualsAndHashCode() throws Exception {
 		RootBeanDefinition master = new RootBeanDefinition(TestBean.class);
 		RootBeanDefinition equal = new RootBeanDefinition(TestBean.class);
@@ -42,6 +43,7 @@ public class DefinitionMetadataEqualsHashCodeTests extends TestCase {
 		assertEquals("Hash code for equal instances should match", master.hashCode(), equal.hashCode());
 	}
 
+	@SuppressWarnings("serial")
 	public void testChildBeanDefinitionEqualsAndHashCode() throws Exception {
 		ChildBeanDefinition master = new ChildBeanDefinition("foo");
 		ChildBeanDefinition equal = new ChildBeanDefinition("foo");
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
index d16ff925c5..8b7d179e9e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
@@ -27,6 +27,7 @@ import test.beans.TestBean;
  * @author Juergen Hoeller
  * @since 09.11.2003
  */
+@SuppressWarnings("serial")
 public class ConstructorDependenciesBean implements Serializable {
 
 	private int age;
diff --git a/spring-beans/src/test/java/test/beans/Colour.java b/spring-beans/src/test/java/test/beans/Colour.java
index f67b96cc0a..5be4dfa761 100644
--- a/spring-beans/src/test/java/test/beans/Colour.java
+++ b/spring-beans/src/test/java/test/beans/Colour.java
@@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum;
 /**
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");
@@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum {
 		super(code, label);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-beans/src/test/java/test/beans/DerivedTestBean.java b/spring-beans/src/test/java/test/beans/DerivedTestBean.java
index 74aebf7515..fbc9fb5090 100644
--- a/spring-beans/src/test/java/test/beans/DerivedTestBean.java
+++ b/spring-beans/src/test/java/test/beans/DerivedTestBean.java
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean;
  * @author Juergen Hoeller
  * @since 21.08.2003
  */
+@SuppressWarnings("serial")
 public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
 
 	private String beanName;
diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java b/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java
index 6a54761ebc..f7474155f8 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java
@@ -22,6 +22,7 @@ package org.springframework.mail;
  * @author Dmitriy Kopylenko
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class MailAuthenticationException extends MailException {
 
 	/**
diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailException.java b/spring-context-support/src/main/java/org/springframework/mail/MailException.java
index 407a42a838..bcbdd3cfb1 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/MailException.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/MailException.java
@@ -23,6 +23,7 @@ import org.springframework.core.NestedRuntimeException;
  *
  * @author Dmitriy Kopylenko
  */
+@SuppressWarnings("serial")
 public abstract class MailException extends NestedRuntimeException {
 
 	/**
diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java b/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java
index b09676e22c..de58b7613a 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java
@@ -22,6 +22,7 @@ package org.springframework.mail;
  * @author Dmitriy Kopylenko
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class MailParseException extends MailException {
 
 	/**
diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java b/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java
index 7068c0f94c..5b77c3825e 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java
@@ -25,6 +25,7 @@ package org.springframework.mail;
  * @see org.springframework.ui.velocity.VelocityEngineUtils#mergeTemplateIntoString
  * @see org.springframework.ui.freemarker.FreeMarkerTemplateUtils#processTemplateIntoString
  */
+@SuppressWarnings("serial")
 public class MailPreparationException extends MailException {
 
 	/**
diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java b/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java
index faefe64982..d86944fc16 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java
@@ -30,6 +30,7 @@ import org.springframework.util.ObjectUtils;
  * @author Dmitriy Kopylenko
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class MailSendException extends MailException {
 
 	private transient final Map<Object, Exception> failedMessages;
diff --git a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
index 4691c85e0b..1abeaa6a4f 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
@@ -39,6 +39,7 @@ import org.springframework.util.Assert;
  * @see org.springframework.mail.javamail.MimeMessageHelper
  * @see org.springframework.mail.javamail.MimeMailMessage
  */
+@SuppressWarnings("serial")
 public class SimpleMailMessage implements MailMessage, Serializable {
 
 	private String from;
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 a8beff8eba..eb1d1b6087 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
@@ -61,6 +61,7 @@ import org.springframework.util.Assert;
  * @see SchedulerFactoryBean#setJobDetails
  * @see SimpleTriggerBean
  */
+@SuppressWarnings("serial")
 public class CronTriggerBean extends CronTrigger
 		implements JobDetailAwareTrigger, BeanNameAware, InitializingBean {
 
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 44830fea5d..1da0bb9b10 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
@@ -48,6 +48,7 @@ import org.springframework.context.ApplicationContextAware;
  * @see org.springframework.beans.factory.BeanNameAware
  * @see org.quartz.Scheduler#DEFAULT_GROUP
  */
+@SuppressWarnings("serial")
 public class JobDetailBean extends JobDetail
 		implements BeanNameAware, ApplicationContextAware, InitializingBean {
 
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java
index 2b04f76d8d..701b5c6ca0 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java
@@ -28,6 +28,7 @@ import org.springframework.util.MethodInvoker;
  * @since 2.5.3
  * @see MethodInvokingJobDetailFactoryBean
  */
+@SuppressWarnings("serial")
 public class JobMethodInvocationFailedException extends NestedRuntimeException {
 
 	/**
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 045478804f..06b273eb24 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
@@ -60,6 +60,7 @@ import org.springframework.core.Constants;
  * @see SchedulerFactoryBean#setJobDetails
  * @see CronTriggerBean
  */
+@SuppressWarnings("serial")
 public class SimpleTriggerBean extends SimpleTrigger
 		implements JobDetailAwareTrigger, BeanNameAware, InitializingBean {
 
diff --git a/spring-context-support/src/test/java/org/springframework/beans/Colour.java b/spring-context-support/src/test/java/org/springframework/beans/Colour.java
index 60dc333e0b..17fd24fec7 100644
--- a/spring-context-support/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-context-support/src/test/java/org/springframework/beans/Colour.java
@@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum;
 /**
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");
@@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum {
 		super(code, label);
 	}
 
-}
\ No newline at end of file
+}
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 11891d48bb..54b9b6ef14 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
@@ -140,6 +140,7 @@ public class ConcurrentMapCache implements Cache {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class NullHolder implements Serializable {
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java b/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java
index 9956972b12..1068bb9126 100644
--- a/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java
+++ b/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java
@@ -23,6 +23,7 @@ import org.springframework.beans.FatalBeanException;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class ApplicationContextException extends FatalBeanException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java b/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java
index 38bb09b935..980464d36f 100644
--- a/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java
+++ b/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java
@@ -23,6 +23,7 @@ import java.util.Locale;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class NoSuchMessageException extends RuntimeException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java b/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java
index 9e79349feb..822f3667f5 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java
@@ -25,6 +25,7 @@ import org.springframework.context.ApplicationEvent;
  * @author Juergen Hoeller
  * @since 2.5
  */
+@SuppressWarnings("serial")
 public abstract class ApplicationContextEvent extends ApplicationEvent {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java
index 82a5b47eba..abd6823838 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java
@@ -25,6 +25,7 @@ import org.springframework.context.ApplicationContext;
  * @since 12.08.2003
  * @see ContextRefreshedEvent
  */
+@SuppressWarnings("serial")
 public class ContextClosedEvent extends ApplicationContextEvent {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java
index bc6d2255b7..b8f97520a4 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java
@@ -25,6 +25,7 @@ import org.springframework.context.ApplicationContext;
  * @since 04.03.2003
  * @see ContextClosedEvent
  */
+@SuppressWarnings("serial")
 public class ContextRefreshedEvent extends ApplicationContextEvent {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java
index edef2350db..d314430eed 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java
@@ -26,6 +26,7 @@ import org.springframework.context.ApplicationContext;
  * @since 2.5
  * @see ContextStoppedEvent
  */
+@SuppressWarnings("serial")
 public class ContextStartedEvent extends ApplicationContextEvent {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java
index 5e995ab6c3..4e089149c5 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java
@@ -26,6 +26,7 @@ import org.springframework.context.ApplicationContext;
  * @since 2.5
  * @see ContextStartedEvent
  */
+@SuppressWarnings("serial")
 public class ContextStoppedEvent extends ApplicationContextEvent {
 
 	/**
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 efd11eb77d..ac51785295 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
@@ -66,6 +66,7 @@ public class MapAccessor implements PropertyAccessor {
 	 * Exception thrown from {@code read} in order to reset a cached
 	 * PropertyAccessor, allowing other accessors to have a try.
 	 */
+	@SuppressWarnings("serial")
 	private static class MapAccessException extends AccessException {
 
 		private final String key;
diff --git a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
index 67c9bc99c6..b05eeaa4e7 100644
--- a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
+++ b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
@@ -31,6 +31,7 @@ import org.springframework.util.StringUtils;
  * @since 13.02.2004
  * @see org.springframework.context.MessageSource#getMessage(MessageSourceResolvable, java.util.Locale)
  */
+@SuppressWarnings("serial")
 public class DefaultMessageSourceResolvable implements MessageSourceResolvable, Serializable {
 
 	private final String[] codes;
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java b/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java
index 26d0a174ad..e3332791d5 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java
@@ -24,6 +24,7 @@ import org.springframework.core.NestedRuntimeException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class EjbAccessException extends NestedRuntimeException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
index 897ffd3023..801ffcd042 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
@@ -54,6 +54,7 @@ import org.springframework.util.WeakReferenceMonitor;
  * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style
  */
 @Deprecated
+@SuppressWarnings("serial")
 public abstract class AbstractEnterpriseBean implements EnterpriseBean {
 
 	public static final String BEAN_FACTORY_PATH_ENVIRONMENT_KEY = "java:comp/env/ejb/BeanFactoryPath";
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
index cf7240d90b..26bdd8b79b 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
@@ -26,6 +26,7 @@ import javax.jms.MessageListener;
  * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style
  */
 @Deprecated
+@SuppressWarnings("serial")
 public abstract class AbstractJmsMessageDrivenBean extends AbstractMessageDrivenBean implements MessageListener {
 
 	// Empty: The purpose of this class is to ensure
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
index b17f95f7e6..e87447b648 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
@@ -43,6 +43,7 @@ import org.apache.commons.logging.LogFactory;
  * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style
  */
 @Deprecated
+@SuppressWarnings("serial")
 public abstract class AbstractMessageDrivenBean extends AbstractEnterpriseBean
 	implements MessageDrivenBean {
 
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java
index 80343310fc..edf66f329c 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java
@@ -31,6 +31,7 @@ import javax.ejb.SessionContext;
  * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style
  */
 @Deprecated
+@SuppressWarnings("serial")
 public abstract class AbstractSessionBean extends AbstractEnterpriseBean implements SmartSessionBean {
 
 	/** The SessionContext passed to this EJB */
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
index 1a708e4f8b..bbd9079b26 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
@@ -44,6 +44,7 @@ import org.springframework.beans.FatalBeanException;
  * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style
  */
 @Deprecated
+@SuppressWarnings("serial")
 public abstract class AbstractStatefulSessionBean extends AbstractSessionBean {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
index 187965bea5..2f91d248a4 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
@@ -48,6 +48,7 @@ import org.apache.commons.logging.LogFactory;
  * @deprecated as of Spring 3.2, in favor of implementing EJBs in EJB 3 style
  */
 @Deprecated
+@SuppressWarnings("serial")
 public abstract class AbstractStatelessSessionBean extends AbstractSessionBean {
 
 	/** Logger available to subclasses */
diff --git a/spring-context/src/main/java/org/springframework/jmx/JmxException.java b/spring-context/src/main/java/org/springframework/jmx/JmxException.java
index b431ca9f62..bbddbc3ec2 100644
--- a/spring-context/src/main/java/org/springframework/jmx/JmxException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/JmxException.java
@@ -25,6 +25,7 @@ import org.springframework.core.NestedRuntimeException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class JmxException extends NestedRuntimeException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java b/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java
index 002f59a2cd..231fcfec8d 100644
--- a/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java
@@ -25,6 +25,7 @@ package org.springframework.jmx;
  * @since 1.2
  * @see org.springframework.jmx.support.JmxUtils#locateMBeanServer
  */
+@SuppressWarnings("serial")
 public class MBeanServerNotFoundException extends JmxException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java b/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java
index dc802df679..fb1f10b411 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java
@@ -27,6 +27,7 @@ import javax.management.JMRuntimeException;
  * @since 1.2
  * @see MBeanClientInterceptor
  */
+@SuppressWarnings("serial")
 public class InvalidInvocationException extends JMRuntimeException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java b/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java
index b1a65e4c75..a52413179b 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java
@@ -26,6 +26,7 @@ import org.springframework.jmx.JmxException;
  * @since 1.2
  * @see MBeanClientInterceptor
  */
+@SuppressWarnings("serial")
 public class InvocationFailureException extends JmxException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java
index 3591725b06..2e2a9588d2 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java
@@ -26,6 +26,7 @@ import org.springframework.jmx.JmxException;
  * @since 2.5.6
  * @see MBeanClientInterceptor
  */
+@SuppressWarnings("serial")
 public class MBeanConnectFailureException extends JmxException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java
index 8a6fa34b8e..b14e4d98d1 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java
@@ -28,6 +28,7 @@ import org.springframework.jmx.JmxException;
  * @see MBeanClientInterceptor
  * @see MBeanProxyFactoryBean
  */
+@SuppressWarnings("serial")
 public class MBeanInfoRetrievalException extends JmxException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java
index ab8cf1676c..2d31820e7b 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java
@@ -25,6 +25,7 @@ import org.springframework.jmx.JmxException;
  * @since 2.0
  * @see MBeanExportOperations
  */
+@SuppressWarnings("serial")
 public class MBeanExportException extends JmxException {
 
 	/**
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 d26d1de70c..9969b74383 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
@@ -1069,6 +1069,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	 * {@link org.springframework.jmx.export.notification.NotificationPublisher}
 	 * into the lazy resource as it is created if required.
 	 */
+	@SuppressWarnings("serial")
 	private class NotificationPublisherAwareLazyTargetSource extends LazyInitTargetSource {
 
 		private ModelMBean modelMBean;
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java b/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java
index 45cbac17ba..821d0cafb4 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java
@@ -23,6 +23,7 @@ package org.springframework.jmx.export;
  * @author Rob Harrop
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class UnableToRegisterMBeanException extends MBeanExportException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java
index e3e5d3616e..7c6c59c006 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java
@@ -27,6 +27,7 @@ import org.springframework.jmx.JmxException;
  * @see JmxAttributeSource
  * @see org.springframework.jmx.export.assembler.MetadataMBeanInfoAssembler
  */
+@SuppressWarnings("serial")
 public class InvalidMetadataException extends JmxException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java
index 251904c3d4..7c2c98f0f4 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java
@@ -28,6 +28,7 @@ import org.springframework.jmx.JmxException;
  * @since 2.0
  * @see NotificationPublisher
  */
+@SuppressWarnings("serial")
 public class UnableToSendNotificationException extends JmxException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java b/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java
index e4299b0a26..9eb73086ab 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java
@@ -29,6 +29,7 @@ import org.springframework.core.NestedRuntimeException;
  * @author Juergen Hoeller
  * @since 2.0.3
  */
+@SuppressWarnings("serial")
 public class JndiLookupFailureException extends NestedRuntimeException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java b/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java
index 6303b62a13..16e1d15cc4 100644
--- a/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java
+++ b/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java
@@ -26,6 +26,7 @@ import javax.naming.NamingException;
  * @since 1.2.8
  * @see JndiTemplate#lookup(String, Class)
  */
+@SuppressWarnings("serial")
 public class TypeMismatchNamingException extends NamingException {
 
 	private Class requiredType;
diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java
index cb0b5cb983..063c94826a 100644
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java
+++ b/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java
@@ -23,6 +23,7 @@ package org.springframework.remoting;
  * @author Juergen Hoeller
  * @since 1.1
  */
+@SuppressWarnings("serial")
 public class RemoteConnectFailureException extends RemoteAccessException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java
index f7e8afb0a4..027ca75078 100644
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java
+++ b/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java
@@ -25,6 +25,7 @@ package org.springframework.remoting;
  * @since 2.5
  * @see RemoteProxyFailureException
  */
+@SuppressWarnings("serial")
 public class RemoteInvocationFailureException extends RemoteAccessException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java
index 0d1b69e26b..48ba3ccab3 100644
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java
+++ b/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java
@@ -23,6 +23,7 @@ package org.springframework.remoting;
  * @author Juergen Hoeller
  * @since 1.1
  */
+@SuppressWarnings("serial")
 public class RemoteLookupFailureException extends RemoteAccessException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java
index c6d92fac80..c1bd8f080f 100644
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java
+++ b/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java
@@ -25,6 +25,7 @@ package org.springframework.remoting;
  * @since 1.2.8
  * @see RemoteInvocationFailureException
  */
+@SuppressWarnings("serial")
 public class RemoteProxyFailureException extends RemoteAccessException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java b/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
index 2a6da0b4fc..7a3dc51aa4 100644
--- a/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
+++ b/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
@@ -29,6 +29,7 @@ import org.springframework.remoting.RemoteInvocationFailureException;
  * @see javax.xml.rpc.soap.SOAPFaultException
  * @see javax.xml.ws.soap.SOAPFaultException
  */
+@SuppressWarnings("serial")
 public abstract class SoapFaultException extends RemoteInvocationFailureException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java
index f5a198952f..4d59efa390 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java
@@ -26,6 +26,7 @@ import org.springframework.core.NestedRuntimeException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class SchedulingException extends NestedRuntimeException {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java
index 43f86ee55d..8fe217f52b 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java
@@ -34,6 +34,7 @@ import org.springframework.util.CustomizableThreadCreator;
  * @see #setThreadPriority
  * @deprecated as of Spring 3.2, in favor of using the native JDK 6 concurrent support
  */
+@SuppressWarnings("serial")
 @Deprecated
 public class CustomizableThreadFactory extends CustomizableThreadCreator implements ThreadFactory {
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
index 9015d05489..b24b0935e7 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
@@ -75,6 +75,7 @@ import org.springframework.util.Assert;
  * @deprecated as of Spring 3.2, in favor of using the native JDK 6 concurrent support
  */
 @Deprecated
+@SuppressWarnings("serial")
 public class ThreadPoolTaskExecutor extends CustomizableThreadFactory
 		implements SchedulingTaskExecutor, Executor, BeanNameAware, InitializingBean, DisposableBean {
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java
index 83eb452190..6665e3836e 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java
@@ -32,6 +32,7 @@ import org.springframework.util.CustomizableThreadCreator;
  * @see #setThreadNamePrefix
  * @see #setThreadPriority
  */
+@SuppressWarnings("serial")
 public class CustomizableThreadFactory extends CustomizableThreadCreator implements ThreadFactory {
 
 	/**
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 d29dc2d90d..92d7d2007d 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
@@ -40,6 +40,7 @@ import org.springframework.beans.factory.InitializingBean;
  * @see java.util.concurrent.Executors
  * @see java.util.concurrent.ThreadPoolExecutor
  */
+@SuppressWarnings("serial")
 public abstract class ExecutorConfigurationSupport extends CustomizableThreadFactory
 		implements BeanNameAware, InitializingBean, DisposableBean {
 
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 61915d2c76..911ecd9922 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
@@ -60,6 +60,7 @@ import org.springframework.util.ObjectUtils;
  * @see java.util.concurrent.ScheduledExecutorService
  * @see java.util.concurrent.ScheduledThreadPoolExecutor
  */
+@SuppressWarnings("serial")
 public class ScheduledExecutorFactoryBean extends ExecutorConfigurationSupport
 		implements FactoryBean<ScheduledExecutorService> {
 
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 a289179733..ae9a96ec74 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
@@ -49,6 +49,7 @@ import org.springframework.beans.factory.InitializingBean;
  * @see java.util.concurrent.Executors
  * @see java.util.concurrent.ThreadPoolExecutor
  */
+@SuppressWarnings("serial")
 public class ThreadPoolExecutorFactoryBean extends ExecutorConfigurationSupport
 		implements FactoryBean<ExecutorService>, InitializingBean, DisposableBean {
 
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
index 9ce2bc6b0d..1a7da1d616 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
@@ -63,6 +63,7 @@ import org.springframework.util.Assert;
  * @see java.util.concurrent.ThreadPoolExecutor
  * @see ConcurrentTaskExecutor
  */
+@SuppressWarnings("serial")
 public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport implements SchedulingTaskExecutor {
 
 	private final Object poolSizeMonitor = new Object();
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 b346ec2adf..4d03d5c57c 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
@@ -48,6 +48,7 @@ import org.springframework.util.ErrorHandler;
  * @see #setThreadFactory
  * @see #setErrorHandler
  */
+@SuppressWarnings("serial")
 public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 		implements TaskScheduler, SchedulingTaskExecutor {
 
diff --git a/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java b/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java
index 58586c3e38..e6a5cf238f 100644
--- a/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java
+++ b/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java
@@ -24,6 +24,7 @@ import org.springframework.core.NestedRuntimeException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class ScriptCompilationException extends NestedRuntimeException {
 
 	private ScriptSource scriptSource;
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 b473a4eb35..6c8f6ea616 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
@@ -212,6 +212,7 @@ public abstract class BshScriptUtils {
 	/**
 	 * Exception to be thrown on script execution failure.
 	 */
+	@SuppressWarnings("serial")
 	public static class BshExecutionException extends NestedRuntimeException {
 
 		private BshExecutionException(EvalError ex) {
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 644bd9f64d..318b83e1a5 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
@@ -233,6 +233,7 @@ public abstract class JRubyScriptUtils {
 	 * have useful {@link Object#toString()}, {@link Throwable#getMessage()},
 	 * and {@link Throwable#printStackTrace} implementations.
 	 */
+	@SuppressWarnings("serial")
 	public static class JRubyExecutionException extends NestedRuntimeException {
 
 		/**
diff --git a/spring-context/src/main/java/org/springframework/ui/ModelMap.java b/spring-context/src/main/java/org/springframework/ui/ModelMap.java
index 60c89c7bb4..28a6a687b5 100644
--- a/spring-context/src/main/java/org/springframework/ui/ModelMap.java
+++ b/spring-context/src/main/java/org/springframework/ui/ModelMap.java
@@ -38,6 +38,7 @@ import org.springframework.util.Assert;
  * @see org.springframework.web.servlet.ModelAndView
  * @see org.springframework.web.portlet.ModelAndView
  */
+@SuppressWarnings("serial")
 public class ModelMap extends LinkedHashMap<String, Object> {
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java b/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java
index 4f6e20e318..452867a8b2 100644
--- a/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java
+++ b/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java
@@ -33,6 +33,7 @@ import org.springframework.validation.BindingResult;
  * @since 2.5.6
  * @see org.springframework.validation.BindingResult
  */
+@SuppressWarnings("serial")
 public class BindingAwareModelMap extends ExtendedModelMap {
 
 	@Override
diff --git a/spring-context/src/test/java/org/springframework/beans/Colour.java b/spring-context/src/test/java/org/springframework/beans/Colour.java
index 60dc333e0b..17fd24fec7 100644
--- a/spring-context/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-context/src/test/java/org/springframework/beans/Colour.java
@@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum;
 /**
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");
@@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum {
 		super(code, label);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
index 2bb41a9d5b..0940539f54 100644
--- a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean;
  * @author Juergen Hoeller
  * @since 21.08.2003
  */
+@SuppressWarnings("serial")
 public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
 
 	private String beanName;
@@ -82,4 +83,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 		return destroyed;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
index 34d05120aa..13c2c5447a 100644
--- a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
+++ b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
@@ -25,6 +25,7 @@ import org.springframework.util.ObjectUtils;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class SerializablePerson implements Person, Serializable {
 
 	private String name;
@@ -61,4 +62,4 @@ public class SerializablePerson implements Person, Serializable {
 		return p.age == age && ObjectUtils.nullSafeEquals(name, p.name);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
index 42fb9fd89d..b149254bfd 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
@@ -28,6 +28,7 @@ import org.springframework.beans.factory.ObjectFactory;
 /**
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class SimpleMapScope implements Scope, Serializable {
 
 	private final Map map = new HashMap();
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 619bfba6fb..84ade3b7dd 100644
--- a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
@@ -147,6 +147,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class MyEvent extends ApplicationEvent {
 
 		public MyEvent(Object source) {
diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
index 9baa31dc2f..789fb09def 100644
--- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
@@ -190,6 +190,7 @@ public class ApplicationContextEventTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class MyEvent extends ApplicationEvent {
 
 		public MyEvent(Object source) {
@@ -198,6 +199,7 @@ public class ApplicationContextEventTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class MyOtherEvent extends ApplicationEvent {
 
 		public MyOtherEvent(Object source) {
diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
index b87a8c3ff7..d8bc82ee11 100644
--- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
@@ -120,6 +120,7 @@ public class EventPublicationInterceptorTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class TestEvent extends ApplicationEvent {
 
 		public TestEvent(Object source) {
@@ -128,6 +129,7 @@ public class EventPublicationInterceptorTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static final class TestEventWithNoValidOneArgObjectCtor extends ApplicationEvent {
 
 		public TestEventWithNoValidOneArgObjectCtor() {
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 5eac00f54e..393e71d5d5 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
@@ -296,6 +296,7 @@ public class ApplicationContextExpressionTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class ValueTestBean implements Serializable {
 
 		@Autowired @Value("XXX#{tb0.name}YYY#{mySpecialAttr}ZZZ")
diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
index b09bae9980..0b0f791cc5 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
@@ -56,6 +56,7 @@ public class ScheduledExecutorFactoryBeanTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void testShutdownNowIsPropagatedToTheExecutorOnDestroy() throws Exception {
 		MockControl mockScheduledExecutorService = MockControl.createNiceControl(ScheduledExecutorService.class);
 		final ScheduledExecutorService executor = (ScheduledExecutorService) mockScheduledExecutorService.getMock();
@@ -78,6 +79,7 @@ public class ScheduledExecutorFactoryBeanTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void testShutdownIsPropagatedToTheExecutorOnDestroy() throws Exception {
 		MockControl mockScheduledExecutorService = MockControl.createNiceControl(ScheduledExecutorService.class);
 		final ScheduledExecutorService executor = (ScheduledExecutorService) mockScheduledExecutorService.getMock();
@@ -228,6 +230,7 @@ public class ScheduledExecutorFactoryBeanTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void testSettingThreadFactoryToNullForcesUseOfDefaultButIsOtherwiseCool() throws Exception {
 		ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() {
 			protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) {
@@ -244,6 +247,7 @@ public class ScheduledExecutorFactoryBeanTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void testSettingRejectedExecutionHandlerToNullForcesUseOfDefaultButIsOtherwiseCool() throws Exception {
 		ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() {
 			protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) {
diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
index d3ecec1760..9dfbf55a77 100644
--- a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
@@ -312,6 +312,7 @@ public class BshScriptFactoryTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class MyEvent extends ApplicationEvent {
 
 		public MyEvent(Object source) {
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java b/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java
index d5b47efb9f..95b21bcda2 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java
@@ -20,6 +20,7 @@ package org.springframework.scripting.groovy;
  * @author Dave Syer
  *
  */
+@SuppressWarnings("serial")
 public class TestException extends RuntimeException {
 
 	public TestException(String string) {
diff --git a/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java b/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
index fc0794c17f..284cfc5193 100644
--- a/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
+++ b/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
@@ -25,6 +25,7 @@ import test.interceptor.TimestampIntroductionInterceptor;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class TimestampIntroductionAdvisor extends DefaultIntroductionAdvisor {
 
 	/**
diff --git a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
index b706cc4795..3b8350e4c8 100644
--- a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
+++ b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
@@ -25,6 +25,7 @@ import java.io.Serializable;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class SerializableNopInterceptor extends NopInterceptor implements Serializable {
 
 	/**
@@ -42,4 +43,4 @@ public class SerializableNopInterceptor extends NopInterceptor implements Serial
 		++count;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
index 4039d22839..83761c2d3c 100644
--- a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
+++ b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
@@ -20,6 +20,7 @@ import org.springframework.aop.support.DelegatingIntroductionInterceptor;
 
 import test.util.TimeStamped;
 
+@SuppressWarnings("serial")
 public class TimestampIntroductionInterceptor extends DelegatingIntroductionInterceptor
 	implements TimeStamped {
 
diff --git a/spring-context/src/test/java/test/mixin/LockMixin.java b/spring-context/src/test/java/test/mixin/LockMixin.java
index bdfafc45e5..b038bff1fd 100644
--- a/spring-context/src/test/java/test/mixin/LockMixin.java
+++ b/spring-context/src/test/java/test/mixin/LockMixin.java
@@ -28,6 +28,7 @@ import org.springframework.aop.support.DelegatingIntroductionInterceptor;
  * @author Rod Johnson
  * @since 10.07.2003
  */
+@SuppressWarnings("serial")
 public class LockMixin extends DelegatingIntroductionInterceptor implements Lockable {
 
 	/** This field demonstrates additional state in the mixin */
@@ -61,4 +62,4 @@ public class LockMixin extends DelegatingIntroductionInterceptor implements Lock
 		return super.invoke(invocation);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java b/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java
index f82eef3294..7ee37ed684 100644
--- a/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java
+++ b/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java
@@ -23,6 +23,7 @@ import org.springframework.aop.support.DefaultIntroductionAdvisor;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class LockMixinAdvisor extends DefaultIntroductionAdvisor {
 
 	public LockMixinAdvisor() {
diff --git a/spring-context/src/test/java/test/mixin/LockedException.java b/spring-context/src/test/java/test/mixin/LockedException.java
index 68d428fece..1ca010f164 100644
--- a/spring-context/src/test/java/test/mixin/LockedException.java
+++ b/spring-context/src/test/java/test/mixin/LockedException.java
@@ -17,8 +17,9 @@
 package test.mixin;
 
 
+@SuppressWarnings("serial")
 public class LockedException extends RuntimeException {
 
 	public LockedException() {
 	}
-}
\ No newline at end of file
+}
diff --git a/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java b/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java
index bd598c2f8a..a170bb10d7 100644
--- a/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java
+++ b/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java
@@ -32,6 +32,7 @@ import org.springframework.util.Assert;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public abstract class AttributeAccessorSupport implements AttributeAccessor, Serializable {
 
 	/** Map with String keys and Object values */
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 4c1daf0f5f..5e5cddf49d 100644
--- a/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/CollectionFactory.java
@@ -334,6 +334,7 @@ public abstract class CollectionFactory {
 	 * ConcurrentMap adapter for the JDK ConcurrentHashMap class.
 	 */
 	@Deprecated
+	@SuppressWarnings("serial")
 	private static class JdkConcurrentHashMap extends ConcurrentHashMap implements ConcurrentMap {
 
 		private JdkConcurrentHashMap(int initialCapacity) {
diff --git a/spring-core/src/main/java/org/springframework/core/ConstantException.java b/spring-core/src/main/java/org/springframework/core/ConstantException.java
index 454a8abb5a..577464fe29 100644
--- a/spring-core/src/main/java/org/springframework/core/ConstantException.java
+++ b/spring-core/src/main/java/org/springframework/core/ConstantException.java
@@ -24,6 +24,7 @@ package org.springframework.core;
  * @since 28.04.2003
  * @see org.springframework.core.Constants
  */
+@SuppressWarnings("serial")
 public class ConstantException extends IllegalArgumentException {
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/NestedIOException.java b/spring-core/src/main/java/org/springframework/core/NestedIOException.java
index df9be8c0db..536d5c299a 100644
--- a/spring-core/src/main/java/org/springframework/core/NestedIOException.java
+++ b/spring-core/src/main/java/org/springframework/core/NestedIOException.java
@@ -35,6 +35,7 @@ import java.io.IOException;
  * @see org.springframework.core.NestedCheckedException
  * @see org.springframework.core.NestedRuntimeException
  */
+@SuppressWarnings("serial")
 public class NestedIOException extends IOException {
 
 	static {
diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java
index 72df710897..2cb57adc3a 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java
@@ -99,6 +99,7 @@ public abstract class AbstractCachingLabeledEnumResolver implements LabeledEnumR
 	/**
 	 * Inner cache class that implements lazy building of LabeledEnum Maps.
 	 */
+	@SuppressWarnings("serial")
 	private class LabeledEnumCache extends CachingMapDecorator<Class, Map<Comparable, LabeledEnum>> {
 
 		public LabeledEnumCache() {
diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
index d8679525b9..f63f0126c1 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
@@ -23,6 +23,7 @@ package org.springframework.core.enums;
  * @since 1.2.6
  * @deprecated as of Spring 3.0, in favor of Java 5 enums.
  */
+@SuppressWarnings("serial")
 public abstract class AbstractGenericLabeledEnum extends AbstractLabeledEnum {
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java
index 8f04acd89f..6bcdb72ec0 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java
@@ -26,6 +26,7 @@ package org.springframework.core.enums;
  * @deprecated as of Spring 3.0, in favor of Java 5 enums.
  */
 @Deprecated
+@SuppressWarnings("serial")
 public abstract class AbstractLabeledEnum implements LabeledEnum {
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
index e78a7eab99..0cf2413091 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
@@ -30,6 +30,7 @@ import org.springframework.util.Assert;
  * @deprecated as of Spring 3.0, in favor of Java 5 enums.
  */
 @Deprecated
+@SuppressWarnings("serial")
 public class LetterCodedLabeledEnum extends AbstractGenericLabeledEnum {
 
 	/**
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 eeb4022b74..ca74beac92 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
@@ -30,6 +30,8 @@ package org.springframework.core.enums;
 @Deprecated
 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/enums/StaticLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
index 26dd2df6e0..1fd9da9f03 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
@@ -44,6 +44,7 @@ package org.springframework.core.enums;
  * @deprecated as of Spring 3.0, in favor of Java 5 enums.
  */
 @Deprecated
+@SuppressWarnings("serial")
 public abstract class StaticLabeledEnum extends AbstractLabeledEnum {
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
index 7dfc3b2364..3eff20f4d2 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
@@ -32,6 +32,7 @@ import org.springframework.util.Assert;
  * @deprecated as of Spring 3.0, in favor of Java 5 enums.
  */
 @Deprecated
+@SuppressWarnings("serial")
 public class StringCodedLabeledEnum extends AbstractGenericLabeledEnum {
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java
index a13007fb8d..60de9d1e3f 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java
@@ -28,6 +28,7 @@ import org.springframework.core.NestedRuntimeException;
  * @author Juergen Hoeller
  * @since 3.0.5
  */
+@SuppressWarnings("serial")
 public class SerializationFailedException extends NestedRuntimeException {
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
index 92c37bc758..36c9b04ce7 100644
--- a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
@@ -44,6 +44,7 @@ import org.springframework.util.CustomizableThreadCreator;
  * @see org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
  * @see org.springframework.scheduling.commonj.WorkManagerTaskExecutor
  */
+@SuppressWarnings("serial")
 public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator implements AsyncTaskExecutor, Serializable {
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
index 4b12d67dd8..054e921ccf 100644
--- a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
@@ -36,6 +36,7 @@ import org.springframework.util.Assert;
  * @since 2.0
  * @see SimpleAsyncTaskExecutor
  */
+@SuppressWarnings("serial")
 public class SyncTaskExecutor implements TaskExecutor, Serializable {
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
index 4429d0ca9f..d1067fb113 100644
--- a/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
+++ b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
@@ -27,6 +27,7 @@ import java.util.concurrent.RejectedExecutionException;
  * @see TaskExecutor#execute(Runnable)
  * @see TaskTimeoutException
  */
+@SuppressWarnings("serial")
 public class TaskRejectedException extends RejectedExecutionException {
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
index 49a218d354..4cda4266be 100644
--- a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
+++ b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
@@ -25,6 +25,7 @@ package org.springframework.core.task;
  * @see AsyncTaskExecutor#execute(Runnable, long)
  * @see TaskRejectedException
  */
+@SuppressWarnings("serial")
 public class TaskTimeoutException extends TaskRejectedException {
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java b/spring-core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java
index 5f9bd68ee6..ef8201d6b5 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/CachingMetadataReaderFactory.java
@@ -40,6 +40,7 @@ public class CachingMetadataReaderFactory extends SimpleMetadataReaderFactory {
 
 	private volatile int cacheLimit = DEFAULT_CACHE_LIMIT;
 
+	@SuppressWarnings("serial")
 	private final Map<Resource, MetadataReader> metadataReaderCache =
 			new LinkedHashMap<Resource, MetadataReader>(DEFAULT_CACHE_LIMIT, 0.75f, true) {
 				@Override
diff --git a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
index 7aec04a032..f51c6c8ad3 100644
--- a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
+++ b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
@@ -39,6 +39,7 @@ import java.util.ListIterator;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class AutoPopulatingList<E> implements List<E>, Serializable {
 
 	/**
diff --git a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
index 6fa38ca7bb..bd6e7dfc1c 100644
--- a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
+++ b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
@@ -44,6 +44,7 @@ import java.util.WeakHashMap;
  * @deprecated as of Spring 3.2, to be removed along with LabeledEnum support
  */
 @Deprecated
+@SuppressWarnings("serial")
 public abstract class CachingMapDecorator<K, V> implements Map<K, V>, Serializable {
 
 	private static Object NULL_VALUE = new Object();
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 8f74a05c48..5ce5e847f9 100644
--- a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
@@ -386,6 +386,7 @@ public abstract class CollectionUtils {
 	/**
 	 * Adapts a Map to the MultiValueMap contract.
 	 */
+	@SuppressWarnings("serial")
 	private static class MultiValueMapAdapter<K, V> implements MultiValueMap<K, V>, Serializable {
 
 		private final Map<K, List<V>> map;
diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java b/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
index 11c844ffd7..a961f0ff64 100644
--- a/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
+++ b/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
@@ -43,6 +43,7 @@ import org.apache.commons.logging.LogFactory;
  * @see org.springframework.aop.interceptor.ConcurrencyThrottleInterceptor
  * @see java.io.Serializable
  */
+@SuppressWarnings("serial")
 public abstract class ConcurrencyThrottleSupport implements Serializable {
 
 	/**
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 e21dbd3fca..97d277208f 100644
--- a/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java
+++ b/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java
@@ -29,6 +29,7 @@ import java.io.Serializable;
  * @since 2.0.3
  * @see org.springframework.scheduling.concurrent.CustomizableThreadFactory
  */
+@SuppressWarnings("serial")
 public class CustomizableThreadCreator implements Serializable {
 
 	private String threadNamePrefix;
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 3d5f47da6f..62921593a1 100644
--- a/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
+++ b/spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
@@ -33,6 +33,7 @@ import java.util.Map;
  * @author Juergen Hoeller
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class LinkedCaseInsensitiveMap<V> extends LinkedHashMap<String, V> {
 
 	private final Map<String, String> caseInsensitiveKeys;
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
index 9b5417c38c..82fa3f7aa6 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
@@ -25,6 +25,7 @@ import java.util.Comparator;
  * @author Keith Donald
  * @since 1.2.2
  */
+@SuppressWarnings("serial")
 public final class BooleanComparator implements Comparator<Boolean>, Serializable {
 
 	/**
diff --git a/spring-core/src/test/java/org/springframework/beans/Colour.java b/spring-core/src/test/java/org/springframework/beans/Colour.java
index 60dc333e0b..17fd24fec7 100644
--- a/spring-core/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-core/src/test/java/org/springframework/beans/Colour.java
@@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum;
 /**
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");
@@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum {
 		super(code, label);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
index 8e309e0b41..c4681d4f4c 100644
--- a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -22,6 +22,7 @@ import java.io.Serializable;
  * @author Juergen Hoeller
  * @since 21.08.2003
  */
+@SuppressWarnings("serial")
 public class DerivedTestBean extends TestBean implements Serializable {
 
 	private String beanName;
@@ -79,4 +80,4 @@ public class DerivedTestBean extends TestBean implements Serializable {
 		return destroyed;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
index d35b1b34fd..03a192119d 100644
--- a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
+++ b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
@@ -32,6 +32,7 @@ public class AttributeAccessorSupportTests extends TestCase {
 
 	private AttributeAccessor attributeAccessor;
 
+	@SuppressWarnings("serial")
 	protected void setUp() throws Exception {
 		this.attributeAccessor = new AttributeAccessorSupport() {
 		};
diff --git a/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
index 196f2e6577..bb3c798904 100644
--- a/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
@@ -87,18 +87,23 @@ public class ExceptionDepthComparatorTests {
 		return ExceptionDepthComparator.findClosestMatch(Arrays.asList(classes), new TargetException());
 	}
 
+	@SuppressWarnings("serial")
 	public class HighestDepthException extends Throwable {
 	}
 
+	@SuppressWarnings("serial")
 	public class LowestDepthException extends HighestDepthException {
 	}
 
+	@SuppressWarnings("serial")
 	public class TargetException extends LowestDepthException {
 	}
 
+	@SuppressWarnings("serial")
 	public class SameDepthException extends LowestDepthException {
 	}
 
+	@SuppressWarnings("serial")
 	public class NoDepthException extends TargetException {
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java b/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
index 4873105ce2..ddcc26e705 100644
--- a/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
+++ b/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
@@ -28,6 +28,7 @@ import junit.framework.Assert;
  */
 public class NestedExceptionTests extends TestCase {
 
+	@SuppressWarnings("serial")
 	public void testNestedRuntimeExceptionWithNoRootCause() {
 		String mesg = "mesg of mine";
 		// Making a class abstract doesn't _really_ prevent instantiation :-)
@@ -44,6 +45,7 @@ public class NestedExceptionTests extends TestCase {
 		assertFalse(stackTrace.indexOf(mesg) == -1);
 	}
 
+	@SuppressWarnings("serial")
 	public void testNestedRuntimeExceptionWithRootCause() {
 		String myMessage = "mesg for this exception";
 		String rootCauseMesg = "this is the obscure message of the root cause";
@@ -64,6 +66,7 @@ public class NestedExceptionTests extends TestCase {
 		assertFalse(stackTrace.indexOf(rootCauseMesg) == -1);
 	}
 
+	@SuppressWarnings("serial")
 	public void testNestedCheckedExceptionWithNoRootCause() {
 		String mesg = "mesg of mine";
 		// Making a class abstract doesn't _really_ prevent instantiation :-)
@@ -80,6 +83,7 @@ public class NestedExceptionTests extends TestCase {
 		assertFalse(stackTrace.indexOf(mesg) == -1);
 	}
 
+	@SuppressWarnings("serial")
 	public void testNestedCheckedExceptionWithRootCause() {
 		String myMessage = "mesg for this exception";
 		String rootCauseMesg = "this is the obscure message of the root cause";
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 e1fdb3dee0..c9c936af90 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
@@ -240,6 +240,7 @@ public class DefaultConversionTests {
 		conversionService.convert(Integer.valueOf(1), CustomNumber.class);
 	}
 
+	@SuppressWarnings("serial")
 	public static class CustomNumber extends Number {
 
 		@Override
diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java
index 635382e7c7..9f3ca159cc 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java
@@ -217,6 +217,7 @@ public class MapToMapConverterTests {
 		assertEquals(NoDefaultConstructorMap.class, result.getClass());
 	}
 
+	@SuppressWarnings("serial")
 	public static class NoDefaultConstructorMap<K, V> extends HashMap<K, V> {
 		public NoDefaultConstructorMap(Map<? extends K, ? extends V> m) {
 			super(m);
diff --git a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
index 0e57814ac5..f3d6258fbb 100644
--- a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
+++ b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
@@ -118,6 +118,7 @@ public class LabeledEnumTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class Other extends StaticLabeledEnum {
 
 		public static final Other THING1 = new Other(1, "Thing1");
@@ -130,6 +131,7 @@ public class LabeledEnumTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class Dog extends StaticLabeledEnum {
 
 		public static final Dog GOLDEN_RETRIEVER = new Dog(11, null) {
@@ -159,6 +161,7 @@ public class LabeledEnumTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static abstract class ValuedEnum extends StaticLabeledEnum {
 
 		public static final ValuedEnum ONE = new ValuedEnum(1, "one") {
diff --git a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
index 1a1a7ef85d..57a2998e0b 100644
--- a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
+++ b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
@@ -94,6 +94,7 @@ public class CachingMapDecoratorTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class MyCachingMap extends CachingMapDecorator<String, String> {
 
 		private boolean createCalled;
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 e2fec15d1b..3ab6a1655b 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
@@ -144,6 +144,7 @@ public abstract class AbstractStaxXMLReaderTestCase {
 	protected abstract AbstractStaxXMLReader createStaxXmlReader(InputStream inputStream) throws XMLStreamException;
 
 	/** Easymock {@code AbstractMatcher} implementation that matches SAX arguments. */
+	@SuppressWarnings("serial")
 	protected static class SaxArgumentMatcher extends AbstractMatcher {
 
 		@Override
diff --git a/spring-expression/src/main/java/org/springframework/expression/AccessException.java b/spring-expression/src/main/java/org/springframework/expression/AccessException.java
index 09efbbe45d..996a4f1c8b 100644
--- a/spring-expression/src/main/java/org/springframework/expression/AccessException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/AccessException.java
@@ -22,6 +22,7 @@ package org.springframework.expression;
  * @author Andy Clement
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class AccessException extends Exception {
 
 	/**
diff --git a/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java b/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java
index e082baec66..5d6761acd5 100644
--- a/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java
@@ -22,6 +22,7 @@ package org.springframework.expression;
  * @author Andy Clement
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class EvaluationException extends ExpressionException {
 
 	/**
@@ -64,4 +65,4 @@ public class EvaluationException extends ExpressionException {
 		super(message,cause);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
index c04d03ae28..93144dc355 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
@@ -23,6 +23,7 @@ package org.springframework.expression;
  * @author Andy Clement
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class ExpressionException extends RuntimeException {
 
 	protected String expressionString;
diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java
index 00caf12c4f..c531fa139e 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java
@@ -24,6 +24,7 @@ package org.springframework.expression;
  * @author Andy Clement
  * @since 3.0.3
  */
+@SuppressWarnings("serial")
 public class ExpressionInvocationTargetException extends EvaluationException {
 
 	public ExpressionInvocationTargetException(int position, String message, Throwable cause) {
diff --git a/spring-expression/src/main/java/org/springframework/expression/ParseException.java b/spring-expression/src/main/java/org/springframework/expression/ParseException.java
index 722eb4d88e..b142121516 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ParseException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ParseException.java
@@ -22,6 +22,7 @@ package org.springframework.expression;
  * @author Andy Clement
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class ParseException extends ExpressionException {
 
 	/**
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
index 7af1d21c8c..2f34515b3a 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
@@ -25,6 +25,7 @@ import org.springframework.expression.spel.SpelParseException;
  * @author Andy Clement
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class InternalParseException extends RuntimeException {
 
 	public InternalParseException(SpelParseException cause) {
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java
index e5bb78e995..6fbe1c12f9 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java
@@ -25,6 +25,7 @@ import org.springframework.expression.EvaluationException;
  * @author Andy Clement
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class SpelEvaluationException extends EvaluationException {
 
 	private SpelMessage message;
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
index 86499273f8..82231d775a 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
@@ -26,6 +26,7 @@ import org.springframework.expression.ParseException;
  * @author Andy Clement
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class SpelParseException extends ParseException {
 
 	private SpelMessage message;
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
index aa3f27509f..bbf14c1227 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
@@ -49,6 +49,7 @@ public class ConstructorInvocationTests extends ExpressionTestCase {
 		evaluateAndCheckError("new FooBar()",SpelMessage.CONSTRUCTOR_INVOCATION_PROBLEM);
 	}
 
+	@SuppressWarnings("serial")
 	static class TestException extends Exception {
 
 	}
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 2869a366bf..87f63a3914 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
@@ -111,6 +111,7 @@ public class Inventor {
 		return valueIn;
 	}
 
+	@SuppressWarnings("serial")
 	static class TestException extends Exception {}
 
 	public String throwException(PlaceOfBirth pob) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
index e63d65216c..e7b55177a9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
@@ -31,6 +31,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
  * @author Rod Johnson
  * @see InvalidResultSetAccessException
  */
+@SuppressWarnings("serial")
 public class BadSqlGrammarException extends InvalidDataAccessResourceUsageException {
 
 	private String sql;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java
index 518c4d881b..324030032d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java
@@ -25,6 +25,7 @@ import org.springframework.dao.DataAccessResourceFailureException;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class CannotGetJdbcConnectionException extends DataAccessResourceFailureException {
 
 	/**
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java
index a11eee5b7c..95a45a79ab 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java
@@ -26,6 +26,7 @@ import org.springframework.dao.DataRetrievalFailureException;
  * @since 2.0
  * @see org.springframework.dao.IncorrectResultSizeDataAccessException
  */
+@SuppressWarnings("serial")
 public class IncorrectResultSetColumnCountException extends DataRetrievalFailureException {
 
 	private int expectedCount;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java
index 637886a5e2..29e615413b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java
@@ -32,6 +32,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
  * @see BadSqlGrammarException
  * @see org.springframework.jdbc.support.rowset.SqlRowSet
  */
+@SuppressWarnings("serial")
 public class InvalidResultSetAccessException extends InvalidDataAccessResourceUsageException {
 
 	private String sql;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java
index 9a613cc0fe..d8bb30d76f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java
@@ -26,6 +26,7 @@ import org.springframework.dao.IncorrectUpdateSemanticsDataAccessException;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class JdbcUpdateAffectedIncorrectNumberOfRowsException extends IncorrectUpdateSemanticsDataAccessException {
 
 	/** Number of rows that should have been affected */
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java
index f80ab4fbef..ddd3e26632 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java
@@ -26,6 +26,7 @@ import org.springframework.dao.DataRetrievalFailureException;
  * @author Juergen Hoeller
  * @since 1.0.2
  */
+@SuppressWarnings("serial")
 public class LobRetrievalFailureException extends DataRetrievalFailureException {
 
 	/**
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java
index 68a8d25c39..1dc4f511d3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java
@@ -32,6 +32,7 @@ import org.springframework.dao.UncategorizedDataAccessException;
  * @author Juergen Hoeller
  * @see org.springframework.jdbc.core.JdbcTemplate#setIgnoreWarnings
  */
+@SuppressWarnings("serial")
 public class SQLWarningException extends UncategorizedDataAccessException {
 
 	/**
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java
index 658ec04b32..8d26855fb2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java
@@ -27,6 +27,7 @@ import org.springframework.dao.UncategorizedDataAccessException;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class UncategorizedSQLException extends UncategorizedDataAccessException {
 
 	/** SQL that led to the problem */
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 66131de8a7..48b252098c 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
@@ -70,6 +70,7 @@ public class NamedParameterJdbcTemplate implements NamedParameterJdbcOperations
 	private volatile int cacheLimit = DEFAULT_CACHE_LIMIT;
 
 	/** Cache of original SQL String to ParsedSql representation */
+	@SuppressWarnings("serial")
 	private final Map<String, ParsedSql> parsedSqlCache =
 			new LinkedHashMap<String, ParsedSql>(DEFAULT_CACHE_LIMIT, 0.75f, true) {
 				@Override
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 83aa4c4445..aa3d5c9e71 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
@@ -99,6 +99,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @see LazyConnectionDataSourceProxy
  * @see org.springframework.jdbc.core.JdbcTemplate
  */
+@SuppressWarnings("serial")
 public class DataSourceTransactionManager extends AbstractPlatformTransactionManager
 		implements ResourceTransactionManager, InitializingBean {
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java
index cc62b9b999..48afad16aa 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java
@@ -25,6 +25,7 @@ import org.springframework.dao.NonTransientDataAccessException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class DataSourceLookupFailureException extends NonTransientDataAccessException {
 
 	/**
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java
index e4870e97c7..1637b89d29 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java
@@ -28,6 +28,7 @@ import org.springframework.core.NestedCheckedException;
  * @author Thomas Risberg
  * @since 1.0.1
  */
+@SuppressWarnings("serial")
 public class MetaDataAccessException extends NestedCheckedException {
 
 	/**
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java
index 9281373924..c32ecfa99e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java
@@ -25,6 +25,7 @@ import org.springframework.dao.InvalidDataAccessApiUsageException;
  * @author Thomas Risberg
  * @since 2.5.5
  */
+@SuppressWarnings("serial")
 public class SqlXmlFeatureNotImplementedException extends InvalidDataAccessApiUsageException {
 
 	/**
diff --git a/spring-jdbc/src/test/java/org/springframework/beans/Colour.java b/spring-jdbc/src/test/java/org/springframework/beans/Colour.java
index 60dc333e0b..17fd24fec7 100644
--- a/spring-jdbc/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-jdbc/src/test/java/org/springframework/beans/Colour.java
@@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum;
 /**
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");
@@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum {
 		super(code, label);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
index 3dcee9661c..8acf5aa045 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
@@ -651,6 +651,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 		MockControl conControl = MockControl.createControl(Connection.class);
 		Connection con = (Connection) conControl.getMock();
 
+		@SuppressWarnings("serial")
 		JtaTransactionManager ptm = new JtaTransactionManager(ut) {
 			protected void doRegisterAfterCompletionWithJtaTransaction(
 					JtaTransactionObject txObject, final List synchronizations) {
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
index 13ceba3fed..48ec7f2b12 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
@@ -1047,6 +1047,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class CustomDataException extends DataAccessException {
 
 		public CustomDataException(String s) {
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
index 8293d5c98d..2a016ef6e6 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
@@ -100,6 +100,7 @@ public class SQLErrorCodeSQLExceptionTranslatorTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	public void testCustomTranslateMethodTranslation() {
 		final String TASK = "TASK";
 		final String SQL = "SQL SELECT *";
diff --git a/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java b/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java
index 20dde5d45e..1a01a993da 100644
--- a/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java
@@ -23,6 +23,7 @@ package org.springframework.jms;
  * @since 1.1
  * @see javax.jms.IllegalStateException
  */
+@SuppressWarnings("serial")
 public class IllegalStateException extends JmsException {
 
 	public IllegalStateException(javax.jms.IllegalStateException cause) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java
index 07607f7381..b3901d4dc4 100644
--- a/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java
@@ -23,6 +23,7 @@ package org.springframework.jms;
  * @since 1.1
  * @see javax.jms.InvalidClientIDException
  */
+@SuppressWarnings("serial")
 public class InvalidClientIDException extends JmsException {
 
 	public InvalidClientIDException(javax.jms.InvalidClientIDException cause) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java
index 6d794927ce..94bbc43471 100644
--- a/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java
@@ -23,6 +23,7 @@ package org.springframework.jms;
  * @since 1.1
  * @see javax.jms.InvalidDestinationException
  */
+@SuppressWarnings("serial")
 public class InvalidDestinationException extends JmsException {
 
 	public InvalidDestinationException(javax.jms.InvalidDestinationException cause) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java
index 797dee10a3..4c05894eb1 100644
--- a/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java
@@ -23,6 +23,7 @@ package org.springframework.jms;
  * @since 1.1
  * @see javax.jms.InvalidSelectorException
  */
+@SuppressWarnings("serial")
 public class InvalidSelectorException extends JmsException {
 
 	public InvalidSelectorException(javax.jms.InvalidSelectorException cause) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/JmsException.java b/spring-jms/src/main/java/org/springframework/jms/JmsException.java
index 702b5cb09a..5572cb415b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/JmsException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/JmsException.java
@@ -28,6 +28,7 @@ import org.springframework.core.NestedRuntimeException;
  * @author Juergen Hoeller
  * @since 1.1
  */
+@SuppressWarnings("serial")
 public abstract class JmsException extends NestedRuntimeException {
 
 	/**
diff --git a/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java b/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java
index 123a42d4e5..bbc6f3041e 100644
--- a/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java
@@ -23,6 +23,7 @@ package org.springframework.jms;
  * @since 1.1
  * @see javax.jms.JMSSecurityException
  */
+@SuppressWarnings("serial")
 public class JmsSecurityException extends JmsException {
 
 	public JmsSecurityException(javax.jms.JMSSecurityException cause) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java b/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java
index cc3aaf1b5d..221cce2bae 100644
--- a/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java
@@ -23,6 +23,7 @@ package org.springframework.jms;
  * @since 1.1
  * @see javax.jms.MessageEOFException
  */
+@SuppressWarnings("serial")
 public class MessageEOFException extends JmsException {
 
 	public MessageEOFException(javax.jms.MessageEOFException cause) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java b/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java
index 4366d5376e..b0fc75475c 100644
--- a/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java
@@ -23,6 +23,7 @@ package org.springframework.jms;
  * @since 1.1
  * @see javax.jms.MessageFormatException
  */
+@SuppressWarnings("serial")
 public class MessageFormatException extends JmsException {
 
 	public MessageFormatException(javax.jms.MessageFormatException cause) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java b/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java
index 307e6adb49..1acb0a05ed 100644
--- a/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java
@@ -23,6 +23,7 @@ package org.springframework.jms;
  * @since 1.1
  * @see javax.jms.MessageNotReadableException
  */
+@SuppressWarnings("serial")
 public class MessageNotReadableException extends JmsException {
 
 	public MessageNotReadableException(javax.jms.MessageNotReadableException cause) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java b/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java
index 6cf3b464db..dcf41400b8 100644
--- a/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java
@@ -23,6 +23,7 @@ package org.springframework.jms;
  * @since 1.1
  * @see javax.jms.MessageNotWriteableException
  */
+@SuppressWarnings("serial")
 public class MessageNotWriteableException extends JmsException {
 
 	public MessageNotWriteableException(javax.jms.MessageNotWriteableException cause) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java b/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java
index f143aa93f0..fff7028c67 100644
--- a/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java
@@ -23,6 +23,7 @@ package org.springframework.jms;
  * @since 1.1
  * @see javax.jms.ResourceAllocationException
  */
+@SuppressWarnings("serial")
 public class ResourceAllocationException extends JmsException {
 
 	public ResourceAllocationException(javax.jms.ResourceAllocationException cause) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java b/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java
index 77afc21153..191a74d551 100644
--- a/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java
@@ -23,6 +23,7 @@ package org.springframework.jms;
  * @since 1.1
  * @see javax.jms.TransactionInProgressException
  */
+@SuppressWarnings("serial")
 public class TransactionInProgressException extends JmsException {
 
 	public TransactionInProgressException(javax.jms.TransactionInProgressException cause) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java b/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java
index e493d3d754..a49029e463 100644
--- a/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java
@@ -23,6 +23,7 @@ package org.springframework.jms;
  * @since 1.1
  * @see javax.jms.TransactionRolledBackException
  */
+@SuppressWarnings("serial")
 public class TransactionRolledBackException extends JmsException {
 
 	public TransactionRolledBackException(javax.jms.TransactionRolledBackException cause) {
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 6dd076bb5a..fbc4bbd969 100644
--- a/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java
@@ -22,6 +22,7 @@ package org.springframework.jms;
  * @author Juergen Hoeller
  * @since 1.1
  */
+@SuppressWarnings("serial")
 public class UncategorizedJmsException extends JmsException {
 
 	/**
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
index dd3bb77342..53ee2c0956 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
@@ -42,6 +42,7 @@ import javax.jms.TopicConnectionFactory;
  * @deprecated as of Spring 3.0, in favor of the JMS 1.1 based {@link JmsTransactionManager}
  */
 @Deprecated
+@SuppressWarnings("serial")
 public class JmsTransactionManager102 extends JmsTransactionManager {
 
 	private boolean pubSubDomain = false;
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java b/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java
index 16a30f3ca1..06e060daca 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java
@@ -28,6 +28,7 @@ import org.springframework.jms.JmsException;
  * @since 2.0
  * @see ConnectionFactoryUtils
  */
+@SuppressWarnings("serial")
 public class SynchedLocalTransactionFailedException extends JmsException {
 
 	/**
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java
index 4cdfdb8f20..5b64b616f3 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java
@@ -25,6 +25,7 @@ import org.springframework.jms.JmsException;
  * @since 2.0
  * @see MessageListenerAdapter
  */
+@SuppressWarnings("serial")
 public class ListenerExecutionFailedException extends JmsException {
 
 	/**
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
index e2cec097a1..dace0d10a2 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
@@ -116,6 +116,7 @@ public class JmsMessageEndpointFactory extends AbstractMessageEndpointFactory  {
 	 * directly, leavng it up to the concrete endpoint to apply those -
 	 * and to handle any ResourceExceptions thrown from them.
 	 */
+	@SuppressWarnings("serial")
 	public static class JmsResourceException extends RuntimeException {
 
 		public JmsResourceException(ResourceException cause) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java
index 29af514957..9eb8d813a6 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java
@@ -26,6 +26,7 @@ import org.springframework.jms.JmsException;
  * @since 1.1
  * @see MessageConverter
  */
+@SuppressWarnings("serial")
 public class MessageConversionException extends JmsException {
 
 	/**
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java
index 3372151333..3fa407b737 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java
@@ -25,6 +25,7 @@ import org.springframework.jms.JmsException;
  * @since 1.1
  * @see DestinationResolver
  */
+@SuppressWarnings("serial")
 public class DestinationResolutionException extends JmsException {
 
 	/**
diff --git a/spring-jms/src/test/java/org/springframework/beans/Colour.java b/spring-jms/src/test/java/org/springframework/beans/Colour.java
index 60dc333e0b..17fd24fec7 100644
--- a/spring-jms/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-jms/src/test/java/org/springframework/beans/Colour.java
@@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum;
 /**
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");
@@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum {
 		super(code, label);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
index a1e6e3dc71..2afee39fef 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
@@ -670,6 +670,7 @@ public class MessageListenerAdapterTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class SerializableObject implements Serializable {
 	}
 
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
index 48bc55913d..025ba22fc7 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJackson2MessageConverterTests.java
@@ -74,6 +74,7 @@ public class MappingJackson2MessageConverterTests {
 				"bar");
 
 		final byte[] bytes = "{\"foo\":\"bar\"}".getBytes();
+		@SuppressWarnings("serial")
 		Capture<byte[]> captured = new Capture<byte[]>() {
 			@Override
 			public void setValue(byte[] value) {
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 bf682af413..63ea2aa3fc 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
@@ -67,6 +67,7 @@ public class MappingJacksonMessageConverterTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void fromBytesMessage() throws Exception {
 		BytesMessage bytesMessageMock = createMock(BytesMessage.class);
 		Map<String, String> unmarshalled = Collections.singletonMap("foo",
diff --git a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index 563d610714..0c0b3cb81c 100644
--- a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -23,6 +23,7 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class CallCountingTransactionManager extends AbstractPlatformTransactionManager {
 
 	public TransactionDefinition lastDefinition;
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/ConfigurableJtaPlatform.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/ConfigurableJtaPlatform.java
index 76d1fc63b8..4eaa935fc1 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/ConfigurableJtaPlatform.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/ConfigurableJtaPlatform.java
@@ -31,6 +31,7 @@ import org.springframework.util.Assert;
  * @author Juergen Hoeller
  * @since 3.1.2
  */
+@SuppressWarnings("serial")
 class ConfigurableJtaPlatform extends AbstractJtaPlatform {
 
 	private final TransactionManager transactionManager;
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateJdbcException.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateJdbcException.java
index a7888faf07..96c1a5f4b2 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateJdbcException.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateJdbcException.java
@@ -30,6 +30,7 @@ import org.springframework.dao.UncategorizedDataAccessException;
  * @since 3.1
  * @see SessionFactoryUtils#convertHibernateAccessException
  */
+@SuppressWarnings("serial")
 public class HibernateJdbcException extends UncategorizedDataAccessException {
 
 	public HibernateJdbcException(JDBCException ex) {
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateObjectRetrievalFailureException.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateObjectRetrievalFailureException.java
index b74453cc42..ce496de76d 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateObjectRetrievalFailureException.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateObjectRetrievalFailureException.java
@@ -29,6 +29,7 @@ import org.springframework.orm.ObjectRetrievalFailureException;
  * @since 3.1
  * @see SessionFactoryUtils#convertHibernateAccessException
  */
+@SuppressWarnings("serial")
 public class HibernateObjectRetrievalFailureException extends ObjectRetrievalFailureException {
 
 	public HibernateObjectRetrievalFailureException(UnresolvableObjectException ex) {
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateOptimisticLockingFailureException.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateOptimisticLockingFailureException.java
index ae97b30733..a58b98fda3 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateOptimisticLockingFailureException.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateOptimisticLockingFailureException.java
@@ -29,6 +29,7 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException;
  * @since 3.1
  * @see SessionFactoryUtils#convertHibernateAccessException
  */
+@SuppressWarnings("serial")
 public class HibernateOptimisticLockingFailureException extends ObjectOptimisticLockingFailureException {
 
 	public HibernateOptimisticLockingFailureException(StaleObjectStateException ex) {
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateQueryException.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateQueryException.java
index 171465089f..b9d6516127 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateQueryException.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateQueryException.java
@@ -28,6 +28,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
  * @since 3.1
  * @see SessionFactoryUtils#convertHibernateAccessException
  */
+@SuppressWarnings("serial")
 public class HibernateQueryException extends InvalidDataAccessResourceUsageException {
 
 	public HibernateQueryException(QueryException ex) {
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java
index 9fbc1574e7..358aa72a2c 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateSystemException.java
@@ -29,6 +29,7 @@ import org.springframework.dao.UncategorizedDataAccessException;
  * @since 3.1
  * @see SessionFactoryUtils#convertHibernateAccessException
  */
+@SuppressWarnings("serial")
 public class HibernateSystemException extends UncategorizedDataAccessException {
 
 	/**
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java
index 92850dbe96..2b2ad05893 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringJtaSessionContext.java
@@ -30,6 +30,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @author Juergen Hoeller
  * @since 3.1
  */
+@SuppressWarnings("serial")
 public class SpringJtaSessionContext extends JTASessionContext {
 
 	public SpringJtaSessionContext(SessionFactoryImplementor factory) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java
index 4cd1dc8da7..92d78f342c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java
@@ -25,6 +25,7 @@ import org.springframework.dao.OptimisticLockingFailureException;
  * @author Juergen Hoeller
  * @since 13.10.2003
  */
+@SuppressWarnings("serial")
 public class ObjectOptimisticLockingFailureException extends OptimisticLockingFailureException {
 
 	private Object persistentClass;
diff --git a/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java
index b9151890fc..806eda51a5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java
@@ -25,6 +25,7 @@ import org.springframework.dao.DataRetrievalFailureException;
  * @author Juergen Hoeller
  * @since 13.10.2003
  */
+@SuppressWarnings("serial")
 public class ObjectRetrievalFailureException extends DataRetrievalFailureException {
 
 	private Object persistentClass;
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java
index c6cf41537f..871d8a4af4 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java
@@ -30,6 +30,7 @@ import org.springframework.dao.UncategorizedDataAccessException;
  * @since 1.2
  * @see SessionFactoryUtils#convertHibernateAccessException
  */
+@SuppressWarnings("serial")
 public class HibernateJdbcException extends UncategorizedDataAccessException {
 
 	public HibernateJdbcException(JDBCException ex) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java
index 726430889c..bab18adca8 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java
@@ -29,6 +29,7 @@ import org.springframework.orm.ObjectRetrievalFailureException;
  * @since 1.2
  * @see SessionFactoryUtils#convertHibernateAccessException
  */
+@SuppressWarnings("serial")
 public class HibernateObjectRetrievalFailureException extends ObjectRetrievalFailureException {
 
 	public HibernateObjectRetrievalFailureException(UnresolvableObjectException ex) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java
index fb58c8efcc..a63b93f4db 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java
@@ -29,6 +29,7 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException;
  * @since 1.2
  * @see SessionFactoryUtils#convertHibernateAccessException
  */
+@SuppressWarnings("serial")
 public class HibernateOptimisticLockingFailureException extends ObjectOptimisticLockingFailureException {
 
 	public HibernateOptimisticLockingFailureException(StaleObjectStateException ex) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java
index a1e72bcc3c..cdbdd49ec8 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java
@@ -28,6 +28,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
  * @since 1.2
  * @see SessionFactoryUtils#convertHibernateAccessException
  */
+@SuppressWarnings("serial")
 public class HibernateQueryException extends InvalidDataAccessResourceUsageException {
 
 	public HibernateQueryException(QueryException ex) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
index 6497a12ed3..e4987e2206 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
@@ -29,6 +29,7 @@ import org.springframework.dao.UncategorizedDataAccessException;
  * @since 1.2
  * @see SessionFactoryUtils#convertHibernateAccessException
  */
+@SuppressWarnings("serial")
 public class HibernateSystemException extends UncategorizedDataAccessException {
 
 	/**
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 94fd197e00..208c88f60d 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
@@ -129,6 +129,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @see org.springframework.jdbc.datasource.DataSourceTransactionManager
  * @see org.springframework.transaction.jta.JtaTransactionManager
  */
+@SuppressWarnings("serial")
 public class HibernateTransactionManager extends AbstractPlatformTransactionManager
 		implements ResourceTransactionManager, BeanFactoryAware, InitializingBean {
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java
index e914c19fe4..1953a84326 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java
@@ -38,6 +38,7 @@ import org.hibernate.engine.SessionFactoryImplementor;
  * @see SessionFactoryUtils#doGetSession
  * @see LocalSessionFactoryBean#setExposeTransactionAwareSessionFactory
  */
+@SuppressWarnings("serial")
 public class SpringSessionContext implements CurrentSessionContext {
 
 	private final SessionFactoryImplementor sessionFactory;
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
index d4a31646f3..2328205a9e 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
@@ -49,6 +49,7 @@ import org.hibernate.persister.entity.EntityPersister;
  * @since 1.2
  * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setEventListeners(java.util.Map)
  */
+@SuppressWarnings("serial")
 public class IdTransferringMergeEventListener extends DefaultMergeEventListener {
 
 	/**
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java
index e2bc17731f..d48200c270 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java
@@ -42,6 +42,7 @@ import org.springframework.aop.support.AopUtils;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class ScopedBeanInterceptor extends EmptyInterceptor {
 
 	@Override
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java
index 76b040d7e2..c2e5b8b2e9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java
@@ -29,6 +29,7 @@ import org.springframework.orm.ObjectRetrievalFailureException;
  * @since 1.1
  * @see PersistenceManagerFactoryUtils#convertJdoAccessException
  */
+@SuppressWarnings("serial")
 public class JdoObjectRetrievalFailureException extends ObjectRetrievalFailureException {
 
 	public JdoObjectRetrievalFailureException(JDOObjectNotFoundException ex) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java
index 721ccd2256..1b7e752999 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java
@@ -29,6 +29,7 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException;
  * @since 1.1
  * @see PersistenceManagerFactoryUtils#convertJdoAccessException
  */
+@SuppressWarnings("serial")
 public class JdoOptimisticLockingFailureException extends ObjectOptimisticLockingFailureException {
 
 	public JdoOptimisticLockingFailureException(JDOOptimisticVerificationException ex) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java
index c34591573f..30a3f2bdee 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java
@@ -29,6 +29,7 @@ import org.springframework.dao.DataAccessResourceFailureException;
  * @since 1.1
  * @see PersistenceManagerFactoryUtils#convertJdoAccessException
  */
+@SuppressWarnings("serial")
 public class JdoResourceFailureException extends DataAccessResourceFailureException {
 
 	public JdoResourceFailureException(JDODataStoreException ex) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
index bd293b51a7..868ad6050f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
@@ -29,6 +29,7 @@ import org.springframework.dao.UncategorizedDataAccessException;
  * @since 03.06.2003
  * @see PersistenceManagerFactoryUtils#convertJdoAccessException
  */
+@SuppressWarnings("serial")
 public class JdoSystemException extends UncategorizedDataAccessException {
 
 	public JdoSystemException(JDOException ex) {
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 2bd4b8b79f..62a1670ff1 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
@@ -99,6 +99,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @see org.springframework.jdbc.datasource.DataSourceTransactionManager
  * @see org.springframework.transaction.jta.JtaTransactionManager
  */
+@SuppressWarnings("serial")
 public class JdoTransactionManager extends AbstractPlatformTransactionManager
 		implements ResourceTransactionManager, InitializingBean {
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java
index c7114178f6..918007b6a7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java
@@ -29,6 +29,7 @@ import org.springframework.dao.InvalidDataAccessApiUsageException;
  * @since 03.06.2003
  * @see PersistenceManagerFactoryUtils#convertJdoAccessException
  */
+@SuppressWarnings("serial")
 public class JdoUsageException extends InvalidDataAccessApiUsageException {
 
 	public JdoUsageException(JDOUserException ex) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
index bf49c8aa40..cdd4f42330 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
@@ -467,6 +467,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 	 * Minimal bean reference to the surrounding AbstractEntityManagerFactoryBean.
 	 * Resolved to the actual AbstractEntityManagerFactoryBean instance on deserialization.
 	 */
+	@SuppressWarnings("serial")
 	private static class SerializedEntityManagerFactoryBeanReference implements Serializable {
 
 		private final BeanFactory beanFactory;
@@ -489,6 +490,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 	 * return a proxy EntityManager if necessary from createEntityManager()
 	 * methods.
 	 */
+	@SuppressWarnings("serial")
 	private static class ManagedEntityManagerFactoryInvocationHandler implements InvocationHandler, Serializable {
 
 		private final AbstractEntityManagerFactoryBean entityManagerFactoryBean;
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 ecf62bb232..c71b63f214 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
@@ -41,6 +41,7 @@ import org.springframework.transaction.TransactionException;
  * @see JpaAccessor#setJpaDialect
  * @see JpaTransactionManager#setJpaDialect
  */
+@SuppressWarnings("serial")
 public class DefaultJpaDialect implements JpaDialect, Serializable {
 
 	//-------------------------------------------------------------------------
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
index 21a844ed4a..0dfd3c9b51 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
@@ -272,6 +272,7 @@ public abstract class ExtendedEntityManagerCreator {
 	/**
 	 * InvocationHandler for extended EntityManagers as defined in the JPA spec.
 	 */
+	@SuppressWarnings("serial")
 	private static class ExtendedEntityManagerInvocationHandler implements InvocationHandler, Serializable {
 
 		private static final Log logger = LogFactory.getLog(ExtendedEntityManagerInvocationHandler.class);
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java
index ef5a04f151..1f0d8db5a0 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java
@@ -28,6 +28,7 @@ import org.springframework.orm.ObjectRetrievalFailureException;
  * @since 2.0
  * @see EntityManagerFactoryUtils#convertJpaAccessExceptionIfPossible
  */
+@SuppressWarnings("serial")
 public class JpaObjectRetrievalFailureException extends ObjectRetrievalFailureException {
 
 	public JpaObjectRetrievalFailureException(EntityNotFoundException ex) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java
index eb77c4154b..b69740301c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java
@@ -28,6 +28,7 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException;
  * @since 2.0
  * @see EntityManagerFactoryUtils#convertJpaAccessExceptionIfPossible
  */
+@SuppressWarnings("serial")
 public class JpaOptimisticLockingFailureException extends ObjectOptimisticLockingFailureException {
 
 	public JpaOptimisticLockingFailureException(OptimisticLockException ex) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
index a1742e2d3f..be71b0153d 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
@@ -29,6 +29,7 @@ import org.springframework.dao.UncategorizedDataAccessException;
  * @since 2.0
  * @see EntityManagerFactoryUtils#convertJpaAccessExceptionIfPossible
  */
+@SuppressWarnings("serial")
 public class JpaSystemException extends UncategorizedDataAccessException {
 
 	public JpaSystemException(PersistenceException ex) {
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 1fc5051713..714a28fdb9 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
@@ -108,6 +108,7 @@ import org.springframework.util.CollectionUtils;
  * @see org.springframework.jdbc.datasource.DataSourceTransactionManager
  * @see org.springframework.transaction.jta.JtaTransactionManager
  */
+@SuppressWarnings("serial")
 public class JpaTransactionManager extends AbstractPlatformTransactionManager
 		implements ResourceTransactionManager, BeanFactoryAware, InitializingBean {
 
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 2779211fed..7cef875f28 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
@@ -81,6 +81,8 @@ import org.springframework.util.ClassUtils;
 public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean
 		implements ResourceLoaderAware, LoadTimeWeaverAware {
 
+	private static final long serialVersionUID = 1L;
+
 	private PersistenceUnitManager persistenceUnitManager;
 
 	private final DefaultPersistenceUnitManager internalPersistenceUnitManager =
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 7896175a2a..065431b7ea 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
@@ -67,6 +67,8 @@ import javax.persistence.spi.PersistenceProvider;
  */
 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/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
index 6b2dac821a..32133baa82 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
@@ -126,6 +126,7 @@ public abstract class SharedEntityManagerCreator {
 	 * transactional EntityManager, if any; else, it will fall back
 	 * to a newly created EntityManager per operation.
 	 */
+	@SuppressWarnings("serial")
 	private static class SharedEntityManagerInvocationHandler implements InvocationHandler, Serializable {
 
 		private final Log logger = LogFactory.getLog(getClass());
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
index bbc9526e0a..9d0160f436 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
@@ -55,6 +55,7 @@ import org.springframework.transaction.TransactionException;
  * @see #setLazyDatabaseTransaction
  * @see org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy
  */
+@SuppressWarnings("serial")
 public class EclipseLinkJpaDialect extends DefaultJpaDialect {
 
 	private boolean lazyDatabaseTransaction = false;
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 c3cda31f44..e7faa52d24 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
@@ -47,6 +47,7 @@ import org.springframework.util.ReflectionUtils;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class HibernateJpaDialect extends DefaultJpaDialect {
 
 	@Override
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
index ebcdae313d..1ab02f213e 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
@@ -40,6 +40,7 @@ import org.springframework.transaction.TransactionException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class OpenJpaDialect extends DefaultJpaDialect {
 
 	@Override
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java
index bbaef3c3d0..16c789efb5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaDialect.java
@@ -53,6 +53,7 @@ import org.springframework.transaction.TransactionException;
  * Spring's corresponding {@link EclipseLinkJpaDialect}
  */
 @Deprecated
+@SuppressWarnings("serial")
 public class TopLinkJpaDialect extends DefaultJpaDialect {
 
 	private boolean lazyDatabaseTransaction = false;
diff --git a/spring-orm/src/test/java/org/springframework/beans/Colour.java b/spring-orm/src/test/java/org/springframework/beans/Colour.java
index 60dc333e0b..17fd24fec7 100644
--- a/spring-orm/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-orm/src/test/java/org/springframework/beans/Colour.java
@@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum;
 /**
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");
@@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum {
 		super(code, label);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
index 42fb9fd89d..b149254bfd 100644
--- a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
+++ b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
@@ -28,6 +28,7 @@ import org.springframework.beans.factory.ObjectFactory;
 /**
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class SimpleMapScope implements Scope, Serializable {
 
 	private final Map map = new HashMap();
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
index 25ba32f690..95fb2af930 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
@@ -62,6 +62,7 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource;
  */
 public class LocalSessionFactoryBeanTests extends TestCase {
 
+	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithDataSource() throws Exception {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
 		final List invocations = new ArrayList();
@@ -93,6 +94,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals("newSessionFactory", invocations.get(0));
 	}
 
+	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithCacheRegionFactory() throws Exception {
 		final RegionFactory regionFactory = new NoCachingRegionFactory(null);
 		final List invocations = new ArrayList();
@@ -124,6 +126,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals("newSessionFactory", invocations.get(0));
 	}
 
+	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithCacheProvider() throws Exception {
 		final CacheProvider cacheProvider = new NoCacheProvider();
 		final List invocations = new ArrayList();
@@ -156,6 +159,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals("newSessionFactory", invocations.get(0));
 	}
 
+	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithTransactionAwareDataSource() throws Exception {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
 		final List invocations = new ArrayList();
@@ -189,6 +193,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals("newSessionFactory", invocations.get(0));
 	}
 
+	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithDataSourceAndMappingResources() throws Exception {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
 		MockControl tmControl = MockControl.createControl(TransactionManager.class);
@@ -232,6 +237,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals("newSessionFactory", invocations.get(2));
 	}
 
+	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithDataSourceAndMappingJarLocations() throws Exception {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
 		final Set invocations = new HashSet();
@@ -263,6 +269,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertTrue(invocations.contains("newSessionFactory"));
 	}
 
+	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithDataSourceAndProperties() throws Exception {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
 		final Set invocations = new HashSet();
@@ -368,6 +375,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		factoryControl.verify();
 	}
 
+	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithEntityInterceptor() throws Exception {
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
 			protected Configuration newConfiguration() {
@@ -394,6 +402,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		}
 	}
 
+	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithNamingStrategy() throws Exception {
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
 			protected Configuration newConfiguration() {
@@ -417,6 +426,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		}
 	}
 
+	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithCacheStrategies() throws Exception {
 		final Properties registeredClassCache = new Properties();
 		final Properties registeredCollectionCache = new Properties();
@@ -452,6 +462,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals(collectionCache, registeredCollectionCache);
 	}
 
+	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithCacheStrategiesAndRegions() throws Exception {
 		final Properties registeredClassCache = new Properties();
 		final Properties registeredCollectionCache = new Properties();
@@ -486,6 +497,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals(collectionCache, registeredCollectionCache);
 	}
 
+	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithEventListeners() throws Exception {
 		final Map registeredListeners = new HashMap();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
@@ -510,6 +522,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		assertEquals(listeners, registeredListeners);
 	}
 
+	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithEventListenerSet() throws Exception {
 		final Map registeredListeners = new HashMap();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
@@ -576,6 +589,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class FilterTestLocalSessionFactoryBean extends LocalSessionFactoryBean {
 
 		public List registeredFilterDefinitions = new LinkedList();
@@ -605,6 +619,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class DummyMergeEventListener implements MergeEventListener {
 
 		public void onMerge(MergeEvent event) throws HibernateException {
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
index 52e7ac53d1..177734aee6 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
@@ -67,6 +67,8 @@ public abstract class AbstractEntityManagerFactoryBeanTests extends TestCase {
 
 	protected static class DummyEntityManagerFactoryBean extends AbstractEntityManagerFactoryBean {
 
+		private static final long serialVersionUID = 1L;
+
 		private final EntityManagerFactory emf;
 
 		public DummyEntityManagerFactoryBean(EntityManagerFactory emf) {
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
index 9197860414..c9ba5d1d46 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
@@ -120,6 +120,7 @@ public class EntityManagerFactoryUtilsTests extends TestCase {
 	 * Test method for
 	 * 'org.springframework.orm.jpa.EntityManagerFactoryUtils.convertJpaAccessException(PersistenceException)'
 	 */
+	@SuppressWarnings("serial")
 	public void testConvertJpaPersistenceException() {
 		EntityNotFoundException entityNotFound = new EntityNotFoundException();
 		assertSame(JpaObjectRetrievalFailureException.class,
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 51d1ff93b1..3c5fbe2d49 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
@@ -705,6 +705,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class MockPersistenceAnnotationBeanPostProcessor extends PersistenceAnnotationBeanPostProcessor {
 
 		@Override
@@ -762,6 +763,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 
 
 	@Repository
+	@SuppressWarnings("serial")
 	public static class DefaultPublicPersistenceContextSetter implements Serializable {
 
 		private EntityManager em;
@@ -780,6 +782,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class SpecificPublicPersistenceContextSetter extends DefaultPublicPersistenceContextSetter {
 
 		@PersistenceContext(unitName="unit2", type = PersistenceContextType.EXTENDED)
@@ -872,6 +875,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class DummyInvocationHandler implements InvocationHandler, Serializable {
 
 		public static boolean closed;
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java
index f7c35abc87..925558f7ae 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java
@@ -25,6 +25,7 @@ package org.springframework.oxm;
  * @see MarshallingFailureException
  * @see UnmarshallingFailureException
  */
+@SuppressWarnings("serial")
 public abstract class MarshallingException extends XmlMappingException {
 
 	/**
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
index 5a157834d9..f7eba5c93b 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
@@ -22,6 +22,7 @@ package org.springframework.oxm;
  * @author Arjen Poutsma
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class MarshallingFailureException extends MarshallingException {
 
 	/**
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java
index 11100c6f46..9986ad58b2 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java
@@ -22,6 +22,7 @@ package org.springframework.oxm;
  * @author Arjen Poutsma
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class UncategorizedMappingException extends XmlMappingException {
 
 	/**
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
index 0477f163de..350cdb2b0e 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
@@ -22,6 +22,7 @@ package org.springframework.oxm;
  * @author Arjen Poutsma
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class UnmarshallingFailureException extends MarshallingException {
 
 	/**
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
index 50f9947b47..f39ddfd6d3 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
@@ -22,6 +22,7 @@ package org.springframework.oxm;
  * @author Arjen Poutsma
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class ValidationFailureException extends XmlMappingException {
 
 	/**
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
index 9f40146bd8..dff92dd309 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
@@ -24,6 +24,7 @@ import org.springframework.core.NestedRuntimeException;
  * @author Arjen Poutsma
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public abstract class XmlMappingException extends NestedRuntimeException {
 
 	/**
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
index 0834991061..6139df1f2a 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
@@ -24,6 +24,7 @@ import org.springframework.oxm.XmlMappingException;
  * @author Juergen Hoeller
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class CastorMappingException extends XmlMappingException {
 
 	/**
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java b/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
index b2496b9d96..65bcd408b7 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
@@ -88,6 +88,7 @@ import org.springframework.validation.ObjectError;
  * @deprecated as of Spring 3.0
  */
 @Deprecated
+@SuppressWarnings("serial")
 public class SpringBindingActionForm extends ActionForm {
 
 	private static final Log logger = LogFactory.getLog(SpringBindingActionForm.class);
diff --git a/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java b/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java
index 9339470702..5e77137f53 100644
--- a/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java
+++ b/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java
@@ -43,6 +43,7 @@ import org.springframework.web.context.support.StaticWebApplicationContext;
 public class StrutsSupportTests {
 
 	@Test
+	@SuppressWarnings("serial")
 	public void actionSupportWithContextLoaderPlugIn() throws ServletException {
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.addMessage("test", Locale.getDefault(), "testmessage");
@@ -69,6 +70,7 @@ public class StrutsSupportTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void actionSupportWithRootContext() throws ServletException {
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.addMessage("test", Locale.getDefault(), "testmessage");
@@ -95,6 +97,7 @@ public class StrutsSupportTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void dispatchActionSupportWithContextLoaderPlugIn() throws ServletException {
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.addMessage("test", Locale.getDefault(), "testmessage");
@@ -121,6 +124,7 @@ public class StrutsSupportTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void dispatchActionSupportWithRootContext() throws ServletException {
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.addMessage("test", Locale.getDefault(), "testmessage");
@@ -147,6 +151,7 @@ public class StrutsSupportTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void lookupDispatchActionSupportWithContextLoaderPlugIn() throws ServletException {
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.addMessage("test", Locale.getDefault(), "testmessage");
@@ -177,6 +182,7 @@ public class StrutsSupportTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void lookupDispatchActionSupportWithRootContext() throws ServletException {
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.addMessage("test", Locale.getDefault(), "testmessage");
@@ -207,6 +213,7 @@ public class StrutsSupportTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void testDelegatingActionProxy() throws Exception {
 		final MockServletContext servletContext = new MockServletContext("/org/springframework/web/struts/");
 		ContextLoaderPlugIn plugin = new ContextLoaderPlugIn();
@@ -247,6 +254,7 @@ public class StrutsSupportTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void delegatingActionProxyWithModule() throws Exception {
 		final MockServletContext servletContext = new MockServletContext("/org/springframework/web/struts/WEB-INF");
 		ContextLoaderPlugIn plugin = new ContextLoaderPlugIn();
@@ -289,6 +297,7 @@ public class StrutsSupportTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void delegatingActionProxyWithModuleAndDefaultContext() throws Exception {
 		final MockServletContext servletContext = new MockServletContext("/org/springframework/web/struts/WEB-INF");
 		ContextLoaderPlugIn plugin = new ContextLoaderPlugIn();
diff --git a/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java b/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java
index 5307973318..b9c8aa80e9 100644
--- a/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java
@@ -22,6 +22,7 @@ package org.springframework.dao;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class CannotAcquireLockException extends PessimisticLockingFailureException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java b/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java
index fcfd3ebc28..b75a74281e 100644
--- a/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java
@@ -22,6 +22,7 @@ package org.springframework.dao;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class CannotSerializeTransactionException extends PessimisticLockingFailureException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java
index bff2b23978..4e77ce5a16 100644
--- a/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java
@@ -29,6 +29,7 @@ package org.springframework.dao;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class CleanupFailureDataAccessException extends NonTransientDataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java b/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java
index f2cbb67030..4840493054 100644
--- a/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java
@@ -29,6 +29,7 @@ package org.springframework.dao;
  * @see CannotAcquireLockException
  * @see DeadlockLoserDataAccessException
  */
+@SuppressWarnings("serial")
 public class ConcurrencyFailureException extends TransientDataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
index 5c04df5d63..4ee94c17ae 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
@@ -35,6 +35,7 @@ import org.springframework.core.NestedRuntimeException;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public abstract class DataAccessException extends NestedRuntimeException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java b/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java
index 87c1f75929..c1af3068a7 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java
@@ -23,6 +23,7 @@ package org.springframework.dao;
  * @author Rod Johnson
  * @author Thomas Risberg
  */
+@SuppressWarnings("serial")
 public class DataAccessResourceFailureException extends NonTransientDataAccessResourceException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java b/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java
index ce99a6980c..445e7e5171 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java
@@ -24,6 +24,7 @@ package org.springframework.dao;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class DataIntegrityViolationException extends NonTransientDataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java b/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java
index c9d7a93f60..c28811f4cc 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java
@@ -24,6 +24,7 @@ package org.springframework.dao;
  * @author Juergen Hoeller
  * @since 13.10.2003
  */
+@SuppressWarnings("serial")
 public class DataRetrievalFailureException extends NonTransientDataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java
index 6ba9b55362..17592afe47 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java
@@ -22,6 +22,7 @@ package org.springframework.dao;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class DeadlockLoserDataAccessException extends PessimisticLockingFailureException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java b/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java
index 5267f2ec3c..08de0dbaca 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java
@@ -24,6 +24,7 @@ package org.springframework.dao;
  *
  * @author Thomas Risberg
  */
+@SuppressWarnings("serial")
 public class DuplicateKeyException extends DataIntegrityViolationException {
 
 	/**
@@ -43,4 +44,4 @@ public class DuplicateKeyException extends DataIntegrityViolationException {
 		super(msg, cause);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-tx/src/main/java/org/springframework/dao/EmptyResultDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/EmptyResultDataAccessException.java
index dfbb86d54b..625a376532 100644
--- a/spring-tx/src/main/java/org/springframework/dao/EmptyResultDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/EmptyResultDataAccessException.java
@@ -24,6 +24,7 @@ package org.springframework.dao;
  * @since 2.0
  * @see IncorrectResultSizeDataAccessException
  */
+@SuppressWarnings("serial")
 public class EmptyResultDataAccessException extends IncorrectResultSizeDataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java
index 57ddae5379..cec38dc16b 100644
--- a/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java
@@ -24,6 +24,7 @@ package org.springframework.dao;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class IncorrectUpdateSemanticsDataAccessException extends InvalidDataAccessResourceUsageException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java
index 9a442632cf..7a401c24d3 100644
--- a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java
@@ -25,6 +25,7 @@ package org.springframework.dao;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class InvalidDataAccessApiUsageException extends NonTransientDataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java
index 735acdc348..fc29c8a0c1 100644
--- a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java
@@ -23,6 +23,7 @@ package org.springframework.dao;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class InvalidDataAccessResourceUsageException extends NonTransientDataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java
index 480b7701fa..7970724c43 100644
--- a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java
@@ -25,6 +25,7 @@ package org.springframework.dao;
  * @since 2.5
  * @see java.sql.SQLNonTransientException
  */
+@SuppressWarnings("serial")
 public abstract class NonTransientDataAccessException extends DataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java
index 45eb06f9e2..5bf9e38878 100644
--- a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java
@@ -23,6 +23,7 @@ package org.springframework.dao;
  * @since 2.5
  * @see java.sql.SQLNonTransientConnectionException
  */
+@SuppressWarnings("serial")
 public class NonTransientDataAccessResourceException extends NonTransientDataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java b/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java
index ae036293dd..f42faa26a3 100644
--- a/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java
@@ -26,6 +26,7 @@ package org.springframework.dao;
  * @author Rod Johnson
  * @see PessimisticLockingFailureException
  */
+@SuppressWarnings("serial")
 public class OptimisticLockingFailureException extends ConcurrencyFailureException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java
index 71529ae477..ce08465ae4 100644
--- a/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java
@@ -23,6 +23,7 @@ package org.springframework.dao;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class PermissionDeniedDataAccessException extends NonTransientDataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java b/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java
index f022b3dc2e..698e3d07d0 100644
--- a/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java
@@ -30,6 +30,7 @@ package org.springframework.dao;
  * @see DeadlockLoserDataAccessException
  * @see OptimisticLockingFailureException
  */
+@SuppressWarnings("serial")
 public class PessimisticLockingFailureException extends ConcurrencyFailureException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/QueryTimeoutException.java b/spring-tx/src/main/java/org/springframework/dao/QueryTimeoutException.java
index 5df9cb3c3f..5268b80e93 100644
--- a/spring-tx/src/main/java/org/springframework/dao/QueryTimeoutException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/QueryTimeoutException.java
@@ -27,6 +27,7 @@ package org.springframework.dao;
  * @author Thomas Risberg
  * @since 3.1
  */
+@SuppressWarnings("serial")
 public class QueryTimeoutException extends TransientDataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java
index 973feb2fd4..5c30bd6baf 100644
--- a/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java
@@ -27,6 +27,7 @@ package org.springframework.dao;
  * @since 2.5
  * @see java.sql.SQLRecoverableException
  */
+@SuppressWarnings("serial")
 public class RecoverableDataAccessException extends DataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java
index 9c3b2397ee..94f31e0bfb 100644
--- a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java
@@ -25,6 +25,7 @@ package org.springframework.dao;
  * @since 2.5
  * @see java.sql.SQLTransientException
  */
+@SuppressWarnings("serial")
 public abstract class TransientDataAccessException extends DataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java
index c2c37d004f..032abe67f4 100644
--- a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java
@@ -24,6 +24,7 @@ package org.springframework.dao;
  * @since 2.5
  * @see java.sql.SQLTransientConnectionException
  */
+@SuppressWarnings("serial")
 public class TransientDataAccessResourceException extends TransientDataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java
index 073bf188a7..875db8c319 100644
--- a/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java
@@ -23,6 +23,7 @@ package org.springframework.dao;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class TypeMismatchDataAccessException extends InvalidDataAccessResourceUsageException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java
index 9ae9674ca6..0b5d532c33 100644
--- a/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java
@@ -23,6 +23,7 @@ package org.springframework.dao;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public abstract class UncategorizedDataAccessException extends NonTransientDataAccessException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java
index 90c35fc6cc..19b5cba0a1 100644
--- a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java
+++ b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java
@@ -38,6 +38,7 @@ import org.springframework.dao.support.PersistenceExceptionTranslator;
  * @see org.springframework.dao.DataAccessException
  * @see org.springframework.dao.support.PersistenceExceptionTranslator
  */
+@SuppressWarnings("serial")
 public class PersistenceExceptionTranslationAdvisor extends AbstractPointcutAdvisor {
 
 	private final PersistenceExceptionTranslationInterceptor advice;
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java
index 7ddd2b03f8..71025dbf6f 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java
@@ -27,6 +27,7 @@ import org.springframework.dao.DataAccessResourceFailureException;
  * @author Juergen Hoeller
  * @since 1.2
  */
+@SuppressWarnings("serial")
 public class CannotCreateRecordException extends DataAccessResourceFailureException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
index f35273b627..d977f44576 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
@@ -27,6 +27,7 @@ import org.springframework.dao.DataAccessResourceFailureException;
  * @author Juergen Hoeller
  * @since 1.2
  */
+@SuppressWarnings("serial")
 public class CannotGetCciConnectionException extends DataAccessResourceFailureException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java
index b9e668d414..8ecf30261d 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java
@@ -26,6 +26,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
  * @author Juergen Hoeller
  * @since 1.2
  */
+@SuppressWarnings("serial")
 public class CciOperationNotSupportedException extends InvalidDataAccessResourceUsageException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
index 809812823c..14185f7920 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
@@ -31,6 +31,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
  * @since 1.2
  * @see javax.resource.cci.ResultSet
  */
+@SuppressWarnings("serial")
 public class InvalidResultSetAccessException extends InvalidDataAccessResourceUsageException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java b/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java
index 19dd0fc660..8eefbd7cc8 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java
@@ -27,6 +27,7 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException;
  * @author Juergen Hoeller
  * @since 1.2
  */
+@SuppressWarnings("serial")
 public class RecordTypeNotSupportedException extends InvalidDataAccessResourceUsageException {
 
 	/**
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 f5e54bb50f..e2061896c8 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
@@ -60,6 +60,7 @@ import org.springframework.transaction.support.ResourceTransactionManager;
  * @see TransactionAwareConnectionFactoryProxy
  * @see org.springframework.jca.cci.core.CciTemplate
  */
+@SuppressWarnings("serial")
 public class CciLocalTransactionManager extends AbstractPlatformTransactionManager
 		implements ResourceTransactionManager, InitializingBean {
 
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
index 781a308db6..532f12c007 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
@@ -62,6 +62,7 @@ import org.springframework.core.NamedThreadLocal;
  * @since 1.2
  * @see #getConnection
  */
+@SuppressWarnings("serial")
 public class ConnectionSpecConnectionFactoryAdapter extends DelegatingConnectionFactory {
 
 	private ConnectionSpec connectionSpec;
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
index b202f82902..24337ad0c0 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
@@ -39,6 +39,7 @@ import org.springframework.beans.factory.InitializingBean;
  * @since 1.2
  * @see #getConnection
  */
+@SuppressWarnings("serial")
 public class DelegatingConnectionFactory implements ConnectionFactory, InitializingBean {
 
 	private ConnectionFactory targetConnectionFactory;
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
index 2b8d0853a6..e9d43f4094 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
@@ -51,6 +51,7 @@ import org.springframework.util.Assert;
  * @see javax.resource.cci.Connection#close()
  * @see org.springframework.jca.cci.core.CciTemplate
  */
+@SuppressWarnings("serial")
 public class SingleConnectionFactory extends DelegatingConnectionFactory implements DisposableBean {
 
 	protected final Log logger = LogFactory.getLog(getClass());
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
index 263fec4dba..fed1e44a99 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
@@ -64,6 +64,7 @@ import javax.resource.cci.ConnectionFactory;
  * @see ConnectionFactoryUtils#doGetConnection
  * @see ConnectionFactoryUtils#doReleaseConnection
  */
+@SuppressWarnings("serial")
 public class TransactionAwareConnectionFactoryProxy extends DelegatingConnectionFactory {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
index 223f5daf5f..f69c1137ac 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
@@ -33,6 +33,7 @@ import org.springframework.util.FileCopyUtils;
  * @since 1.2
  * @see org.springframework.jca.cci.object.MappingCommAreaOperation
  */
+@SuppressWarnings("serial")
 public class CommAreaRecord implements Record, Streamable {
 
 	private byte[] bytes;
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
index ffb56126f3..731467a77c 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
@@ -148,6 +148,7 @@ public class GenericMessageEndpointFactory extends AbstractMessageEndpointFactor
 	 * directly, leavng it up to the concrete endpoint to apply those -
 	 * and to handle any ResourceExceptions thrown from them.
 	 */
+	@SuppressWarnings("serial")
 	public static class InternalResourceException extends RuntimeException {
 
 		protected InternalResourceException(ResourceException cause) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java
index b926733c8a..76a84a5341 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java
@@ -23,6 +23,7 @@ package org.springframework.transaction;
  * @author Rod Johnson
  * @since 17.03.2003
  */
+@SuppressWarnings("serial")
 public class CannotCreateTransactionException extends TransactionException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
index d640d9b401..bd4910f1ae 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
@@ -24,6 +24,7 @@ package org.springframework.transaction;
  * @author Juergen Hoeller
  * @since 17.03.2003
  */
+@SuppressWarnings("serial")
 public class HeuristicCompletionException extends TransactionException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java b/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java
index 087fe98e75..c234ec1a18 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java
@@ -24,6 +24,7 @@ package org.springframework.transaction;
  * @author Juergen Hoeller
  * @since 21.01.2004
  */
+@SuppressWarnings("serial")
 public class IllegalTransactionStateException extends TransactionUsageException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java b/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java
index 27eb9ce3c4..5db61b3740 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java
@@ -24,6 +24,7 @@ package org.springframework.transaction;
  * @author Juergen Hoeller
  * @since 12.05.2003
  */
+@SuppressWarnings("serial")
 public class InvalidIsolationLevelException extends TransactionUsageException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java b/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java
index 705990732f..2e48388152 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java
@@ -24,6 +24,7 @@ package org.springframework.transaction;
  * @author Juergen Hoeller
  * @since 12.05.2003
  */
+@SuppressWarnings("serial")
 public class InvalidTimeoutException extends TransactionUsageException {
 
 	private int timeout;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java b/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java
index ba23bc119f..a237550a01 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java
@@ -23,6 +23,7 @@ package org.springframework.transaction;
  * @author Juergen Hoeller
  * @since 1.1
  */
+@SuppressWarnings("serial")
 public class NestedTransactionNotSupportedException extends CannotCreateTransactionException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java
index 193bdda3b5..57ebb3804b 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java
@@ -25,6 +25,7 @@ package org.springframework.transaction;
  * @author Rod Johnson
  * @since 17.03.2003
  */
+@SuppressWarnings("serial")
 public class NoTransactionException extends TransactionUsageException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java
index 3040eea3e1..8facfc5a6c 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java
@@ -24,6 +24,7 @@ import org.springframework.core.NestedRuntimeException;
  * @author Rod Johnson
  * @since 17.03.2003
  */
+@SuppressWarnings("serial")
 public abstract class TransactionException extends NestedRuntimeException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java
index 297b695ce9..f3274c2e92 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java
@@ -23,6 +23,7 @@ package org.springframework.transaction;
  * @author Juergen Hoeller
  * @since 1.1
  */
+@SuppressWarnings("serial")
 public class TransactionSuspensionNotSupportedException extends CannotCreateTransactionException {
 
 	/**
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 63013c81aa..8871368899 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java
@@ -25,6 +25,7 @@ import org.springframework.util.Assert;
  * @author Juergen Hoeller
  * @since 24.03.2003
  */
+@SuppressWarnings("serial")
 public class TransactionSystemException extends TransactionException {
 
 	private Throwable applicationException;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java
index 2228af4bff..e98eb1c4f4 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java
@@ -42,6 +42,7 @@ package org.springframework.transaction;
  * @see java.sql.Statement#setQueryTimeout
  * @see java.sql.SQLException
  */
+@SuppressWarnings("serial")
 public class TransactionTimedOutException extends TransactionException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java
index ef28675b74..5c757474a0 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java
@@ -23,6 +23,7 @@ package org.springframework.transaction;
  * @author Rod Johnson
  * @since 22.03.2003
  */
+@SuppressWarnings("serial")
 public class TransactionUsageException extends TransactionException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java b/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java
index 6201cb11ab..1a48ca044e 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java
@@ -23,6 +23,7 @@ package org.springframework.transaction;
  * @author Rod Johnson
  * @since 17.03.2003
  */
+@SuppressWarnings("serial")
 public class UnexpectedRollbackException extends TransactionException {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
index d8dde88147..461dbe4e06 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
@@ -49,6 +49,7 @@ import org.springframework.util.ClassUtils;
  * @see org.springframework.transaction.interceptor.TransactionInterceptor#setTransactionAttributeSource
  * @see org.springframework.transaction.interceptor.TransactionProxyFactoryBean#setTransactionAttributeSource
  */
+@SuppressWarnings("serial")
 public class AnnotationTransactionAttributeSource extends AbstractFallbackTransactionAttributeSource
 		implements Serializable {
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java
index 7171b5318b..f7122b3742 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java
@@ -31,6 +31,7 @@ import org.springframework.transaction.interceptor.TransactionAttribute;
  * @author Juergen Hoeller
  * @since 2.5
  */
+@SuppressWarnings("serial")
 public class Ejb3TransactionAnnotationParser implements TransactionAnnotationParser, Serializable {
 
 	public TransactionAttribute parseTransactionAnnotation(AnnotatedElement ae) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java
index 4e9db4f3f7..d9024f1a1f 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java
@@ -32,6 +32,7 @@ import org.springframework.transaction.interceptor.TransactionAttribute;
  * @author Juergen Hoeller
  * @since 2.5
  */
+@SuppressWarnings("serial")
 public class SpringTransactionAnnotationParser implements TransactionAnnotationParser, Serializable {
 
 	public TransactionAttribute parseTransactionAnnotation(AnnotatedElement ae) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java
index cae5ca7aa7..514dd625e6 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java
@@ -30,6 +30,7 @@ import org.springframework.aop.support.AbstractBeanFactoryPointcutAdvisor;
  * @see TransactionInterceptor
  * @see TransactionAttributeSourceAdvisor
  */
+@SuppressWarnings("serial")
 public class BeanFactoryTransactionAttributeSourceAdvisor extends AbstractBeanFactoryPointcutAdvisor {
 
 	private TransactionAttributeSource transactionAttributeSource;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java
index 6b5d017318..8837a05eb4 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java
@@ -28,6 +28,7 @@ import org.springframework.util.Assert;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class CompositeTransactionAttributeSource implements TransactionAttributeSource, Serializable {
 
 	private final TransactionAttributeSource[] transactionAttributeSources;
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 41edb94f57..eea06e2706 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
@@ -25,6 +25,7 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
  * @author Rod Johnson
  * @since 16.03.2003
  */
+@SuppressWarnings("serial")
 public class DefaultTransactionAttribute extends DefaultTransactionDefinition implements TransactionAttribute {
 
 	private String qualifier;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java
index 9fd02d5a9e..c4ef1953f5 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java
@@ -29,6 +29,7 @@ import org.springframework.transaction.support.DelegatingTransactionDefinition;
  * @author Juergen Hoeller
  * @since 1.2
  */
+@SuppressWarnings("serial")
 public abstract class DelegatingTransactionAttribute extends DelegatingTransactionDefinition
 		implements TransactionAttribute, Serializable {
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
index c807119f76..fbf824f5c5 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
@@ -33,6 +33,7 @@ import org.springframework.util.ObjectUtils;
  * @see org.springframework.transaction.interceptor.TransactionProxyFactoryBean
  * @see org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator
  */
+@SuppressWarnings("serial")
 public class MatchAlwaysTransactionAttributeSource implements TransactionAttributeSource, Serializable {
 
 	private TransactionAttribute transactionAttribute = new DefaultTransactionAttribute();
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
index 8a69517e0b..9d52c141b5 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
@@ -38,6 +38,7 @@ import org.springframework.util.PatternMatchUtils;
  * @see #isMatch
  * @see MethodMapTransactionAttributeSource
  */
+@SuppressWarnings("serial")
 public class NameMatchTransactionAttributeSource implements TransactionAttributeSource, Serializable {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
index 92519c4de1..2588187ddd 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
@@ -23,6 +23,7 @@ package org.springframework.transaction.interceptor;
  * @author Rod Johnson
  * @since 09.04.2003
  */
+@SuppressWarnings("serial")
 public class NoRollbackRuleAttribute extends RollbackRuleAttribute {
 
 	/**
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 31920a2ca1..5e7021b0f2 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
@@ -31,6 +31,7 @@ import java.io.Serializable;
  * @since 09.04.2003
  * @see NoRollbackRuleAttribute
  */
+@SuppressWarnings("serial")
 public class RollbackRuleAttribute implements Serializable{
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
index 8740233271..eeb0046bab 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
@@ -37,6 +37,7 @@ import org.apache.commons.logging.LogFactory;
  * @since 09.04.2003
  * @see TransactionAttributeEditor
  */
+@SuppressWarnings("serial")
 public class RuleBasedTransactionAttribute extends DefaultTransactionAttribute implements Serializable {
 
 	/** Prefix for rollback-on-exception rules in description strings */
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
index b9ca3c7c99..8d15342c02 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
@@ -315,6 +315,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init
 	 * tell if there was a transaction created.
 	 * @see #getTransactionAttributeSource()
 	 */
+	@SuppressWarnings("serial")
 	protected TransactionInfo createTransactionIfNecessary(
 			PlatformTransactionManager tm, TransactionAttribute txAttr, final String joinpointIdentification) {
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
index 1aaee3b393..f253c2a8b5 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
@@ -35,6 +35,7 @@ import org.springframework.aop.support.AbstractPointcutAdvisor;
  * @see #setTransactionInterceptor
  * @see TransactionProxyFactoryBean
  */
+@SuppressWarnings("serial")
 public class TransactionAttributeSourceAdvisor extends AbstractPointcutAdvisor {
 
 	private TransactionInterceptor transactionInterceptor;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
index 64dea121a9..53f78b9a53 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
@@ -29,6 +29,7 @@ import org.springframework.util.ObjectUtils;
  * @author Juergen Hoeller
  * @since 2.5.5
  */
+@SuppressWarnings("serial")
 abstract class TransactionAttributeSourcePointcut extends StaticMethodMatcherPointcut implements Serializable {
 
 	public boolean matches(Method method, Class targetClass) {
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 9cb77789cd..47e6773bd4 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
@@ -117,6 +117,7 @@ import org.springframework.util.StringUtils;
  * @see #setTransactionManager
  * @see WebLogicJtaTransactionManager
  */
+@SuppressWarnings("serial")
 public class JtaTransactionManager extends AbstractPlatformTransactionManager
 		implements TransactionFactory, InitializingBean, Serializable {
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java
index 2c1ef8a0f8..738dcec8ab 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/OC4JJtaTransactionManager.java
@@ -65,6 +65,7 @@ import org.springframework.util.ClassUtils;
  * since Oracle end-of-lifed OC4J in favor of WebLogic
  */
 @Deprecated
+@SuppressWarnings("serial")
 public class OC4JJtaTransactionManager extends JtaTransactionManager {
 
 	private static final String TRANSACTION_UTILITY_CLASS_NAME =
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 0e0e67bd00..6381bea66d 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
@@ -65,6 +65,7 @@ import org.springframework.transaction.TransactionSystemException;
  * @see weblogic.transaction.TransactionManager#forceResume
  * @see weblogic.transaction.TransactionHelper
  */
+@SuppressWarnings("serial")
 public class WebLogicJtaTransactionManager extends JtaTransactionManager {
 
 	private static final String USER_TRANSACTION_CLASS_NAME = "weblogic.transaction.UserTransaction";
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 fbb4e6c15b..d622ff9799 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
@@ -77,6 +77,7 @@ import org.springframework.util.ReflectionUtils;
  * @see #setUowManagerName
  * @see com.ibm.wsspi.uow.UOWManager
  */
+@SuppressWarnings("serial")
 public class WebSphereUowTransactionManager extends JtaTransactionManager
 		implements CallbackPreferringPlatformTransactionManager {
 
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 33d1969d3c..6d0f16f8ed 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
@@ -78,6 +78,7 @@ import org.springframework.transaction.UnexpectedRollbackException;
  * @see TransactionSynchronizationManager
  * @see org.springframework.transaction.jta.JtaTransactionManager
  */
+@SuppressWarnings("serial")
 public abstract class AbstractPlatformTransactionManager implements PlatformTransactionManager, Serializable {
 
 	/**
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
index c844a24930..b7e77b6f60 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
@@ -32,6 +32,7 @@ import org.springframework.transaction.TransactionDefinition;
  * @author Juergen Hoeller
  * @since 08.05.2003
  */
+@SuppressWarnings("serial")
 public class DefaultTransactionDefinition implements TransactionDefinition, Serializable {
 
 	/** Prefix for the propagation constants defined in TransactionDefinition */
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
index d3e111f5bd..30bfd66a02 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
@@ -30,6 +30,7 @@ import org.springframework.util.Assert;
  * @author Juergen Hoeller
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public abstract class DelegatingTransactionDefinition implements TransactionDefinition, Serializable {
 
 	private final TransactionDefinition targetDefinition;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
index 12d285a94c..8d7df115f9 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
@@ -59,6 +59,7 @@ import org.springframework.transaction.TransactionSystemException;
  * @see #setTransactionManager
  * @see org.springframework.transaction.PlatformTransactionManager
  */
+@SuppressWarnings("serial")
 public class TransactionTemplate extends DefaultTransactionDefinition
 		implements TransactionOperations, InitializingBean {
 
diff --git a/spring-tx/src/test/java/org/springframework/beans/Colour.java b/spring-tx/src/test/java/org/springframework/beans/Colour.java
index 60dc333e0b..17fd24fec7 100644
--- a/spring-tx/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-tx/src/test/java/org/springframework/beans/Colour.java
@@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum;
 /**
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");
@@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum {
 		super(code, label);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
index 2bb41a9d5b..0940539f54 100644
--- a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean;
  * @author Juergen Hoeller
  * @since 21.08.2003
  */
+@SuppressWarnings("serial")
 public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
 
 	private String beanName;
@@ -82,4 +83,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 		return destroyed;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index 563d610714..0c0b3cb81c 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -23,6 +23,7 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class CallCountingTransactionManager extends AbstractPlatformTransactionManager {
 
 	public TransactionDefinition lastDefinition;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
index 1cd39725b0..1fdd0659eb 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
@@ -23,6 +23,7 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
  * @author Juergen Hoeller
  * @since 29.04.2003
  */
+@SuppressWarnings("serial")
 class TestTransactionManager extends AbstractPlatformTransactionManager {
 
 	private static final Object TRANSACTION = "transaction";
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
index a2ec8a3b7c..1364632258 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
@@ -181,6 +181,7 @@ public class TransactionSupportTests extends TestCase {
 		}
 	}
 
+	@SuppressWarnings("serial")
 	public void testTransactionTemplateWithRollbackException() {
 		final TransactionSystemException tex = new TransactionSystemException("system exception");
 		TestTransactionManager tm = new TestTransactionManager(false, true) {
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
index 6d61e66360..1dfd6a1bb1 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
@@ -329,6 +329,7 @@ public class AnnotationTransactionAttributeSourceTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class TestBean1 implements ITestBean, Serializable {
 
 		private String name;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
index f72e3bd4ab..ec6f49fe14 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
@@ -84,6 +84,7 @@ public class AnnotationDrivenTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class TransactionCheckingInterceptor implements MethodInterceptor, Serializable {
 
 		public Object invoke(MethodInvocation methodInvocation) throws Throwable {
diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java b/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java
index e5d0572815..4ae36b3c1d 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java
@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Rob Harrop
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class TransactionalService implements Serializable {
 
 	@Transactional("synch")
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
index 5d787bec1e..59947292cf 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
@@ -381,6 +381,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 	 * @param ex exception to be thrown by the target
 	 * @param shouldRollback whether this should cause a transaction rollback
 	 */
+	@SuppressWarnings("serial")
 	protected void doTestRollbackOnException(
 			final Exception ex, final boolean shouldRollback, boolean rollbackException) throws Exception {
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
index 5447995f5f..5255b972ac 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
@@ -108,6 +108,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
 	/**
 	 * We won't use this: we just want to know it's serializable.
 	 */
+	@SuppressWarnings("serial")
 	public static class SerializableTransactionManager implements PlatformTransactionManager, Serializable {
 
 		public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
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 8f0cedc125..600082bfe4 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
@@ -24,6 +24,7 @@ import org.springframework.core.NestedRuntimeException;
  * @author Arjen Poutsma
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class HttpMessageConversionException extends NestedRuntimeException {
 
 	/**
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 cba5bbe909..4b7b747d2f 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
@@ -23,6 +23,7 @@ package org.springframework.http.converter;
  * @author Arjen Poutsma
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class HttpMessageNotReadableException extends HttpMessageConversionException {
 
 	/**
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 29f8dc4fe9..5c2cebb357 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
@@ -24,6 +24,7 @@ package org.springframework.http.converter;
  * @author Arjen Poutsma
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class HttpMessageNotWritableException extends HttpMessageConversionException {
 
 	/**
@@ -44,4 +45,4 @@ public class HttpMessageNotWritableException extends HttpMessageConversionExcept
 	public HttpMessageNotWritableException(String msg, Throwable cause) {
 		super(msg, cause);
 	}
-}
\ No newline at end of file
+}
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java
index dd625ec931..1242cad121 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java
@@ -30,6 +30,7 @@ import org.springframework.remoting.soap.SoapFaultException;
  * @deprecated in favor of JAX-WS support in {@code org.springframework.remoting.jaxws}
  */
 @Deprecated
+@SuppressWarnings("serial")
 public class JaxRpcSoapFaultException extends SoapFaultException {
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java
index 0dcc3e6837..cf2cb7d221 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java
@@ -29,6 +29,7 @@ import org.springframework.remoting.soap.SoapFaultException;
  * @author Juergen Hoeller
  * @since 2.5
  */
+@SuppressWarnings("serial")
 public class JaxWsSoapFaultException extends SoapFaultException {
 
 	/**
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 9ed8c13134..b9f2357dca 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java
@@ -28,6 +28,7 @@ import org.springframework.http.MediaType;
  * @author Arjen Poutsma
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public abstract class HttpMediaTypeException extends ServletException {
 
 	private final List<MediaType> supportedMediaTypes;
diff --git a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java
index 3d2a4362da..2c015834c3 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java
@@ -26,6 +26,7 @@ import org.springframework.http.MediaType;
  * @author Arjen Poutsma
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class HttpMediaTypeNotAcceptableException extends HttpMediaTypeException {
 
 	/**
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 731c64ac30..ed820c7043 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java
@@ -27,6 +27,7 @@ import org.springframework.http.MediaType;
  * @author Arjen Poutsma
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class HttpMediaTypeNotSupportedException extends HttpMediaTypeException {
 
 	private final MediaType 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 34134c16c5..97be285920 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java
@@ -31,6 +31,7 @@ import org.springframework.http.HttpMethod;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class HttpRequestMethodNotSupportedException extends ServletException {
 
 	private String method;
diff --git a/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java b/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java
index 1f056a21ab..84880225b5 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java
@@ -24,6 +24,7 @@ import javax.servlet.ServletException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class HttpSessionRequiredException extends ServletException {
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
index ed19bc9cd2..7161989057 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
@@ -26,6 +26,7 @@ import org.springframework.validation.ObjectError;
  * @author Rossen Stoyanchev
  * @since 3.1
  */
+@SuppressWarnings("serial")
 public class MethodArgumentNotValidException extends Exception {
 
 	private final MethodParameter parameter;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java
index fdd22f9754..d27a5dd628 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java
@@ -22,6 +22,7 @@ package org.springframework.web.bind;
  * @author Juergen Hoeller
  * @since 2.0.2
  */
+@SuppressWarnings("serial")
 public class MissingServletRequestParameterException extends ServletRequestBindingException {
 
 	private final String parameterName;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java
index 8165950107..2c28431a4c 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java
@@ -29,6 +29,7 @@ import org.springframework.web.util.NestedServletException;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class ServletRequestBindingException extends NestedServletException {
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java
index 2ced6ea847..febc333f2b 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java
@@ -36,6 +36,7 @@ import org.springframework.web.util.WebUtils;
  * @author Juergen Hoeller
  * @see org.springframework.web.util.WebUtils#getParametersStartingWith
  */
+@SuppressWarnings("serial")
 public class ServletRequestParameterPropertyValues extends MutablePropertyValues {
 
 	/** Default prefix separator */
diff --git a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
index e6d8491283..c74a8584b5 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
@@ -31,6 +31,7 @@ import org.springframework.util.StringUtils;
  * @since 3.0
  * @see org.springframework.web.bind.annotation.RequestMapping#params()
  */
+@SuppressWarnings("serial")
 public class UnsatisfiedServletRequestParameterException extends ServletRequestBindingException {
 
 	private final String[] paramConditions;
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java
index bfbb1ac530..b6c07ee59a 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java
@@ -27,6 +27,7 @@ import org.springframework.core.NestedRuntimeException;
  * @since 2.5.6
  * @see HandlerMethodInvoker#invokeHandlerMethod
  */
+@SuppressWarnings("serial")
 public class HandlerMethodInvocationException extends NestedRuntimeException {
 
 	/**
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 1ddf80fa5f..cd729964f4 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
@@ -707,6 +707,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 	/**
 	 * HTTP-specific subclass of UriTemplate, overriding the encode method.
 	 */
+	@SuppressWarnings("serial")
 	private static class HttpUrlTemplate extends UriTemplate {
 
 		public HttpUrlTemplate(String uriTemplate) {
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java b/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
index 04789512aa..46dc423438 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpSessionBindingListener;
  * @see RequestAttributes#registerDestructionCallback
  * @see ServletRequestAttributes#registerSessionDestructionCallback
  */
+@SuppressWarnings("serial")
 public class DestructionCallbackBindingListener implements HttpSessionBindingListener, Serializable {
 
 	private final Runnable destructionCallback;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
index eed5597a3d..a34c838195 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
@@ -46,6 +46,7 @@ import org.springframework.web.context.WebApplicationContext;
  * @see org.springframework.web.HttpRequestHandler
  * @see org.springframework.web.servlet.DispatcherServlet
  */
+@SuppressWarnings("serial")
 public class HttpRequestHandlerServlet extends HttpServlet {
 
 	private HttpRequestHandler target;
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java b/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
index cf1d045536..685a057142 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
@@ -33,6 +33,7 @@ import org.springframework.context.ApplicationEvent;
  * @see org.springframework.web.servlet.FrameworkServlet
  * @see org.springframework.context.ApplicationContext#publishEvent
  */
+@SuppressWarnings("serial")
 public class RequestHandledEvent extends ApplicationEvent {
 
 	/** Session id that applied to the request, if any */
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java
index 8e6e21747b..37e5d2519d 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java
@@ -25,6 +25,7 @@ package org.springframework.web.context.support;
  * @see org.springframework.web.servlet.FrameworkServlet
  * @see org.springframework.context.ApplicationContext#publishEvent
  */
+@SuppressWarnings("serial")
 public class ServletRequestHandledEvent extends RequestHandledEvent {
 
 	/** URL that the triggered the request */
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
index 19f524233c..84c41caa59 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
@@ -59,6 +59,7 @@ import org.springframework.web.context.WebApplicationContext;
  * @author Colin Sampaleanu
  * @since 1.2.7
  */
+@SuppressWarnings("serial")
 public class DelegatingPhaseListenerMulticaster implements PhaseListener {
 
 	public PhaseId getPhaseId() {
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 fe9892dcfc..94aa67671e 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
@@ -23,6 +23,7 @@ package org.springframework.web.multipart;
  * @author Juergen Hoeller
  * @since 1.0.1
  */
+@SuppressWarnings("serial")
 public class MaxUploadSizeExceededException extends MultipartException {
 
 	private final long maxUploadSize;
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java
index 64360f4d8d..6aec889ab6 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java
@@ -27,6 +27,7 @@ import org.springframework.core.NestedRuntimeException;
  * @see MultipartResolver#resolveMultipart
  * @see org.springframework.web.multipart.support.MultipartFilter
  */
+@SuppressWarnings("serial")
 public class MultipartException extends NestedRuntimeException {
 
 	/**
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 28efebe6c8..677613a61a 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
@@ -37,6 +37,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @since 29.09.2003
  * @see CommonsMultipartResolver
  */
+@SuppressWarnings("serial")
 public class CommonsMultipartFile implements MultipartFile, Serializable {
 
 	protected static final Log logger = LogFactory.getLog(CommonsMultipartFile.class);
diff --git a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
index 32147df7d6..cb0367c2e2 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
@@ -58,6 +58,7 @@ public class HttpSessionMutexListener implements HttpSessionListener {
 	 * Doesn't need to be anything but a plain Object to synchronize on.
 	 * Should be serializable to allow for HttpSession persistence.
 	 */
+	@SuppressWarnings("serial")
 	private static class Mutex implements Serializable {
 	}
 
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 a2b00dded6..6682a0a009 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
@@ -41,6 +41,7 @@ import org.springframework.util.Assert;
  * @since 3.0
  * @see <a href="http://bitworking.org/projects/URI-Templates/">URI Templates</a>
  */
+@SuppressWarnings("serial")
 public class UriTemplate implements Serializable {
 
 	/** Captures URI template variable names. */
diff --git a/spring-web/src/test/java/org/springframework/beans/Colour.java b/spring-web/src/test/java/org/springframework/beans/Colour.java
index 60dc333e0b..17fd24fec7 100644
--- a/spring-web/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-web/src/test/java/org/springframework/beans/Colour.java
@@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum;
 /**
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");
@@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum {
 		super(code, label);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
index 2bb41a9d5b..0940539f54 100644
--- a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean;
  * @author Juergen Hoeller
  * @since 21.08.2003
  */
+@SuppressWarnings("serial")
 public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
 
 	private String beanName;
@@ -82,4 +83,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 		return destroyed;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
index 34d05120aa..13c2c5447a 100644
--- a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
+++ b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
@@ -25,6 +25,7 @@ import org.springframework.util.ObjectUtils;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class SerializablePerson implements Person, Serializable {
 
 	private String name;
@@ -61,4 +62,4 @@ public class SerializablePerson implements Person, Serializable {
 		return p.age == age && ObjectUtils.nullSafeEquals(name, p.name);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
index 262580b2f8..56569a8e04 100644
--- a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
+++ b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
@@ -450,6 +450,7 @@ public class HttpInvokerTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class TestRemoteInvocation extends RemoteInvocation {
 
 		public TestRemoteInvocation(MethodInvocation methodInvocation) {
@@ -458,6 +459,7 @@ public class HttpInvokerTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class TestRemoteInvocationWrapper implements Serializable {
 
 		private final RemoteInvocation remoteInvocation;
@@ -468,6 +470,7 @@ public class HttpInvokerTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class TestRemoteInvocationResultWrapper implements Serializable {
 
 		private final RemoteInvocationResult remoteInvocationResult;
diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
index 3a43306153..6fec403c7e 100644
--- a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
+++ b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
@@ -22,6 +22,7 @@ import javax.xml.ws.WebFault;
  * @author Juergen Hoeller
  */
 @WebFault
+@SuppressWarnings("serial")
 public class OrderNotFoundException extends Exception {
 
 	private String faultInfo;
diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
index 00306c0531..8c8686df69 100644
--- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
@@ -264,6 +264,7 @@ public class RestTemplateIntegrationTests {
 	}
 
 	/** Servlet that sets the given status code. */
+	@SuppressWarnings("serial")
 	private static class StatusCodeServlet extends GenericServlet {
 
 		private final int sc;
@@ -279,6 +280,7 @@ public class RestTemplateIntegrationTests {
 	}
 
 	/** Servlet that returns an error message for a given status code. */
+	@SuppressWarnings("serial")
 	private static class ErrorServlet extends GenericServlet {
 
 		private final int sc;
@@ -293,6 +295,7 @@ public class RestTemplateIntegrationTests {
 		}
 	}
 
+	@SuppressWarnings("serial")
 	private static class GetServlet extends HttpServlet {
 
 		private final byte[] buf;
@@ -315,6 +318,7 @@ public class RestTemplateIntegrationTests {
 		}
 	}
 
+	@SuppressWarnings("serial")
 	private static class PostServlet extends HttpServlet {
 
 		private final String s;
@@ -347,6 +351,7 @@ public class RestTemplateIntegrationTests {
 		}
 	}
 
+	@SuppressWarnings("serial")
 	private static class UriServlet extends HttpServlet {
 
 		@Override
@@ -357,6 +362,7 @@ public class RestTemplateIntegrationTests {
 		}
 	}
 
+	@SuppressWarnings("serial")
 	private static class MultipartServlet extends HttpServlet {
 
 		@Override
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 11e9c2cc97..dc6ea05410 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
@@ -34,6 +34,7 @@ public class ServletRequestAttributesTests {
 
 	private static final String KEY = "ThatThingThatThing";
 
+	@SuppressWarnings("serial")
 	private static final Serializable VALUE = new Serializable() {
 	};
 
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
index b0b44135ca..cb45ad363a 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
@@ -175,6 +175,7 @@ public class SessionScopeTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class CustomSerializableDestructionAwareBeanPostProcessor
 			implements DestructionAwareBeanPostProcessor, Serializable {
 
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
index 48af11100d..e106045cf9 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
@@ -36,6 +36,7 @@ public class DelegatingPhaseListenerTests extends TestCase {
 	private StaticListableBeanFactory beanFactory;
 	private DelegatingPhaseListenerMulticaster delPhaseListener;
 
+	@SuppressWarnings("serial")
 	protected void setUp() {
 		facesContext = new MockFacesContext();
 		beanFactory = new StaticListableBeanFactory();
@@ -80,6 +81,7 @@ public class DelegatingPhaseListenerTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class TestListener implements PhaseListener {
 
 		boolean beforeCalled = false;
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 6352a49758..ae2f318b4c 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
@@ -397,6 +397,7 @@ public class CommonsMultipartResolverTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class MockFileItem implements FileItem {
 
 		private String fieldName;
diff --git a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
index e93aa884fa..3803551a63 100644
--- a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
@@ -133,14 +133,17 @@ public final class TagUtilsTests {
 		TagUtils.assertHasAncestorOfType(a, TagC.class, "a", "c");
 	}
 
+	@SuppressWarnings("serial")
 	private static final class TagA extends TagSupport {
 
 	}
 
+	@SuppressWarnings("serial")
 	private static final class TagB extends TagSupport {
 
 	}
 
+	@SuppressWarnings("serial")
 	private static final class TagC extends TagSupport {
 
 	}
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
index ce35bb669f..0893d4be7f 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
@@ -30,6 +30,7 @@ import javax.portlet.PortletException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class ModelAndViewDefiningException extends PortletException {
 
 	private ModelAndView modelAndView;
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java
index 8c24356729..64fefc1f73 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java
@@ -28,6 +28,7 @@ import org.springframework.core.style.StylerUtils;
  * @author Juergen Hoeller
  * @since 3.0.5
  */
+@SuppressWarnings("serial")
 public class NoHandlerFoundException extends PortletException {
 
 	/**
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java
index 34a1510dd1..693c33643b 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java
@@ -22,6 +22,7 @@ package org.springframework.web.portlet.bind;
  * @author Juergen Hoeller
  * @since 2.0.2
  */
+@SuppressWarnings("serial")
 public class MissingPortletRequestParameterException extends PortletRequestBindingException {
 
 	private final String parameterName;
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java
index e460ce577c..3ac235dcaf 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java
@@ -26,6 +26,7 @@ import javax.portlet.PortletException;
  * @author John A. Lewis
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class PortletRequestBindingException extends PortletException {
 
 	/**
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java
index 5e4234e0b7..32420d02e4 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java
@@ -37,6 +37,7 @@ import org.springframework.web.portlet.util.PortletUtils;
  * @since 2.0
  * @see org.springframework.web.portlet.util.PortletUtils#getParametersStartingWith
  */
+@SuppressWarnings("serial")
 public class PortletRequestParameterPropertyValues extends MutablePropertyValues {
 
 	/** Default prefix separator */
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 c1db0fa1c3..40d39905e1 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
@@ -241,6 +241,7 @@ public abstract class PortletApplicationContextUtils {
 	/**
 	 * Factory that exposes the current request object on demand.
 	 */
+	@SuppressWarnings("serial")
 	private static class RequestObjectFactory implements ObjectFactory<PortletRequest>, Serializable {
 
 		public PortletRequest getObject() {
@@ -257,6 +258,7 @@ public abstract class PortletApplicationContextUtils {
 	/**
 	 * Factory that exposes the current session object on demand.
 	 */
+	@SuppressWarnings("serial")
 	private static class SessionObjectFactory implements ObjectFactory<PortletSession>, Serializable {
 
 		public PortletSession getObject() {
@@ -273,6 +275,7 @@ public abstract class PortletApplicationContextUtils {
 	/**
 	 * Factory that exposes the current WebRequest object on demand.
 	 */
+	@SuppressWarnings("serial")
 	private static class WebRequestObjectFactory implements ObjectFactory<WebRequest>, Serializable {
 
 		public WebRequest getObject() {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java
index 3bb0eb787f..4d3c6e5277 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java
@@ -28,6 +28,7 @@ import org.springframework.web.context.support.RequestHandledEvent;
  * @see org.springframework.web.portlet.FrameworkPortlet
  * @see org.springframework.context.ApplicationContext#publishEvent
  */
+@SuppressWarnings("serial")
 public class PortletRequestHandledEvent extends RequestHandledEvent {
 
 	/** Name of the portlet that handled the request */
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java
index b9c9718a6e..53ead92e54 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java
@@ -27,6 +27,7 @@ import org.springframework.util.StringUtils;
  * @author Juergen Hoeller
  * @since 3.0
  */
+@SuppressWarnings("serial")
 public class PortletRequestMethodNotSupportedException extends PortletException {
 
 	private String method;
@@ -78,4 +79,4 @@ public class PortletRequestMethodNotSupportedException extends PortletException
 		return this.supportedMethods;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java
index 0b0b5bab47..7c4b8687e3 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java
@@ -25,6 +25,7 @@ import javax.portlet.PortletException;
  * @since 2.0
  * @see org.springframework.web.portlet.handler.PortletContentGenerator
  */
+@SuppressWarnings("serial")
 public class PortletSessionRequiredException extends PortletException {
 
 	/**
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java
index 60dc333e0b..17fd24fec7 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java
@@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum;
 /**
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");
@@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum {
 		super(code, label);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
index 2bb41a9d5b..0940539f54 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean;
  * @author Juergen Hoeller
  * @since 21.08.2003
  */
+@SuppressWarnings("serial")
 public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
 
 	private String beanName;
@@ -82,4 +83,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 		return destroyed;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
index 619bfba6fb..84ade3b7dd 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
@@ -147,6 +147,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class MyEvent extends ApplicationEvent {
 
 		public MyEvent(Object source) {
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 5539c8eb93..aecf7ef773 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
@@ -255,21 +255,25 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class SomeOddException extends Exception {
 
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class SomeOddExceptionChild extends SomeOddException {
 
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class NoSubstringMatchesThisException extends SomeOddException {
 
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class AnotherOddException extends Exception {
 
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
index 6225c2cf70..88cec55802 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
@@ -440,7 +440,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 	}
 
 	public void testMavResolver() throws Exception {
-		@SuppressWarnings("serial") DispatcherPortlet portlet = new DispatcherPortlet() {
+		DispatcherPortlet portlet = new DispatcherPortlet() {
 			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
index 52f3d7c29e..08bd4f6abd 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
@@ -32,6 +32,7 @@ import org.springframework.util.Assert;
  * @author Juergen Hoeller
  * @since 22.11.2003
  */
+@SuppressWarnings("serial")
 public class ModelAndViewDefiningException extends ServletException {
 
 	private ModelAndView modelAndView;
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 272edb45b0..d280c8229c 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
@@ -88,6 +88,7 @@ import org.springframework.web.context.support.ServletContextResource;
  * @see #setAllowedResources
  * @see #setApplyLastModified
  */
+@SuppressWarnings("serial")
 public class ResourceServlet extends HttpServletBean {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java
index 137f727aff..db6f31186c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java
@@ -43,6 +43,7 @@ import org.springframework.web.util.NestedServletException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class ViewRendererServlet extends HttpServlet {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java
index 2e110ed9df..5dc2d264fa 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java
@@ -32,6 +32,7 @@ import org.springframework.web.util.UrlPathHelper;
  * @author Juergen Hoeller
  * @see MethodNameResolver#getHandlerMethodName(javax.servlet.http.HttpServletRequest)
  */
+@SuppressWarnings("serial")
 public class NoSuchRequestHandlingMethodException extends ServletException {
 
 	private String methodName;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java
index bdace3fcb5..28e5aa5722 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java
@@ -33,6 +33,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils;
  * @see BindTag
  * @see org.springframework.validation.Errors
  */
+@SuppressWarnings("serial")
 public class BindErrorsTag extends HtmlEscapingAwareTag {
 
 	public static final String ERRORS_VARIABLE_NAME = "errors";
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
index 004882b42f..0b6e91eb02 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
@@ -46,6 +46,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils;
  * @author Juergen Hoeller
  * @see #setPath
  */
+@SuppressWarnings("serial")
 public class BindTag extends HtmlEscapingAwareTag implements EditorAwareTag {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
index bf76754db3..73cf45267f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
@@ -43,6 +43,7 @@ import org.springframework.web.util.JavaScriptUtils;
  * @see org.springframework.web.util.HtmlUtils
  * @see org.springframework.web.util.JavaScriptUtils
  */
+@SuppressWarnings("serial")
 public class EscapeBodyTag extends HtmlEscapingAwareTag implements BodyTag {
 
 	private boolean javaScriptEscape = false;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
index 4c45550689..dbf878f047 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
@@ -49,6 +49,7 @@ import org.springframework.web.util.TagUtils;
  * @author Juergen Hoeller
  * @since 3.0.1
  */
+@SuppressWarnings("serial")
 public class EvalTag extends HtmlEscapingAwareTag {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
index 9107a16d0b..578c9e69ce 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
@@ -31,6 +31,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils;
  * @since 04.03.2003
  * @see HtmlEscapingAwareTag#setHtmlEscape
  */
+@SuppressWarnings("serial")
 public class HtmlEscapeTag extends RequestContextAwareTag {
 
 	private String defaultHtmlEscape;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
index 8bf8ddf4ea..6e72f1f91d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
@@ -35,6 +35,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils;
  * @see org.springframework.web.servlet.support.RequestContext#isDefaultHtmlEscape
  * @see org.springframework.web.util.WebUtils#isDefaultHtmlEscape
  */
+@SuppressWarnings("serial")
 public abstract class HtmlEscapingAwareTag extends RequestContextAwareTag {
 
 	private Boolean htmlEscape;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
index 1455313572..c195208d98 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
@@ -51,6 +51,7 @@ import org.springframework.web.util.TagUtils;
  * @see HtmlEscapeTag#setDefaultHtmlEscape
  * @see org.springframework.web.util.WebUtils#HTML_ESCAPE_CONTEXT_PARAM
  */
+@SuppressWarnings("serial")
 public class MessageTag extends HtmlEscapingAwareTag {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
index c4ccaddbe9..bc3ee3b24f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
@@ -40,6 +40,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils;
  * @author Juergen Hoeller
  * @since 1.1
  */
+@SuppressWarnings("serial")
 public class NestedPathTag extends TagSupport implements TryCatchFinally {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
index b502de7fe3..8b222e3d3a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
@@ -30,6 +30,7 @@ import javax.servlet.jsp.tagext.BodyTagSupport;
  * @see Param
  * @see UrlTag
  */
+@SuppressWarnings("serial")
 public class ParamTag extends BodyTagSupport {
 
 	private String name;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
index 4b5f6e49ef..8e8091f5ff 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
@@ -45,6 +45,7 @@ import org.springframework.web.servlet.support.RequestContext;
  * @see org.springframework.web.servlet.support.RequestContext
  * @see org.springframework.web.servlet.DispatcherServlet
  */
+@SuppressWarnings("serial")
 public abstract class RequestContextAwareTag extends TagSupport implements TryCatchFinally {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java
index 4b9098acda..370a842360 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java
@@ -40,6 +40,7 @@ import org.springframework.context.NoSuchMessageException;
  * @see HtmlEscapeTag#setDefaultHtmlEscape
  * @see org.springframework.web.util.WebUtils#HTML_ESCAPE_CONTEXT_PARAM
  */
+@SuppressWarnings("serial")
 public class ThemeTag extends MessageTag {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
index 63136e220d..90f8b3ae56 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
@@ -40,6 +40,7 @@ import org.springframework.web.util.TagUtils;
  * @since 20.09.2003
  * @see BindTag
  */
+@SuppressWarnings("serial")
 public class TransformTag extends HtmlEscapingAwareTag {
 
 	/** the value to transform using the appropriate property editor */
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
index 1f8ed098f8..0bdaef89ce 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
@@ -75,6 +75,7 @@ import org.springframework.web.util.UriUtils;
  * @since 3.0
  * @see ParamTag
  */
+@SuppressWarnings("serial")
 public class UrlTag extends HtmlEscapingAwareTag implements ParamAware {
 
 	private static final String URL_TEMPLATE_DELIMITER_PREFIX = "{";
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
index 78e4362bcb..cebf23c64f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
@@ -28,6 +28,7 @@ import javax.servlet.jsp.JspException;
  * @author Rossen Stoyanchev
  * @since 2.5
  */
+@SuppressWarnings("serial")
 public abstract class AbstractCheckedElementTag extends AbstractHtmlInputElementTag {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
index c601e9d221..b526096c23 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
@@ -43,6 +43,7 @@ import org.springframework.web.servlet.tags.NestedPathTag;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag implements EditorAwareTag {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
index 3de558dbe4..08200ab8d9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
@@ -38,6 +38,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public abstract class AbstractFormTag extends HtmlEscapingAwareTag {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
index 1d98c4cb86..f0e48baaae 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
@@ -33,6 +33,7 @@ import org.springframework.util.StringUtils;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public abstract class AbstractHtmlElementBodyTag extends AbstractHtmlElementTag implements BodyTag {
 
 	private BodyContent bodyContent;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
index 658ea25b7e..5b70045309 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
@@ -40,6 +40,7 @@ import org.springframework.util.StringUtils;
  * @author Rossen Stoyanchev
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElementTag implements DynamicAttributes {
 
 	public static final String CLASS_ATTRIBUTE = "class";
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
index 9075be04d9..d1d3dcf9ed 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
@@ -29,6 +29,7 @@ import javax.servlet.jsp.JspException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public abstract class AbstractHtmlInputElementTag extends AbstractHtmlElementTag {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
index b6bc93f96f..be41b85a6e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
@@ -37,6 +37,7 @@ import org.springframework.util.StringUtils;
  * @author Scott Andrews
  * @since 2.5.2
  */
+@SuppressWarnings("serial")
 public abstract class AbstractMultiCheckedElementTag extends AbstractCheckedElementTag {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
index b2b6e869f7..71ca75cd65 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
@@ -27,6 +27,7 @@ import javax.servlet.jsp.JspException;
  * @author Juergen Hoeller
  * @since 2.5.2
  */
+@SuppressWarnings("serial")
 public abstract class AbstractSingleCheckedElementTag extends AbstractCheckedElementTag {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
index 07006084c6..8b9f21c2cf 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
@@ -45,6 +45,7 @@ import org.springframework.web.bind.WebDataBinder;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class CheckboxTag extends AbstractSingleCheckedElementTag {
 
 	@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
index 2e2ecec7f3..29d6e93376 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
@@ -31,6 +31,7 @@ import org.springframework.web.bind.WebDataBinder;
  * @author Mark Fisher
  * @since 2.5
  */
+@SuppressWarnings("serial")
 public class CheckboxesTag extends AbstractMultiCheckedElementTag {
 
 	@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
index 30a98455d3..60a00ffe32 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
@@ -43,6 +43,7 @@ import org.springframework.util.StringUtils;
  * @author Rick Evans
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class ErrorsTag extends AbstractHtmlElementBodyTag implements BodyTag {
 
 	/**
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 b51609d7f9..4b776488ad 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
@@ -53,6 +53,7 @@ import org.springframework.web.util.HtmlUtils;
  * @since 2.0
  * @see org.springframework.web.servlet.mvc.SimpleFormController
  */
+@SuppressWarnings("serial")
 public class FormTag extends AbstractHtmlElementTag {
 
 	/** The default HTTP method using which form values are sent to the server: "post" */
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 ee4002dfb5..474f9c913a 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
@@ -34,6 +34,7 @@ import org.springframework.util.StringUtils;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class LabelTag extends AbstractHtmlElementTag {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
index 55ebc647ac..278887344a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
@@ -46,6 +46,7 @@ import org.springframework.web.util.TagUtils;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class OptionTag extends AbstractHtmlElementBodyTag implements BodyTag {
 
 	/**
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 ac75e9998e..02712da246 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
@@ -35,6 +35,7 @@ import org.springframework.web.util.TagUtils;
  * @author Scott Andrews
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class OptionsTag extends AbstractHtmlElementTag {
 
 	/**
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 5ffe563cac..6ee579519a 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
@@ -27,6 +27,7 @@ import javax.servlet.jsp.JspException;
  * @author Rossen Stoyanchev
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class PasswordInputTag extends InputTag {
 
 	private boolean showPassword = false;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
index 2eb3e4f194..facbde6d24 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
@@ -32,6 +32,7 @@ import javax.servlet.jsp.JspException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class RadioButtonTag extends AbstractSingleCheckedElementTag {
 
 	@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java
index 1d0ee7057e..90033186c9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java
@@ -27,6 +27,7 @@ package org.springframework.web.servlet.tags.form;
  * @author Juergen Hoeller
  * @since 2.5
  */
+@SuppressWarnings("serial")
 public class RadioButtonsTag extends AbstractMultiCheckedElementTag {
 
 	@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
index 10abcf87d0..c840f3e847 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
@@ -40,6 +40,7 @@ import org.springframework.web.servlet.support.BindStatus;
  * @since 2.0
  * @see OptionTag
  */
+@SuppressWarnings("serial")
 public class SelectTag extends AbstractHtmlInputElementTag {
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
index 37940fa940..c2ac715ca8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
@@ -25,6 +25,7 @@ import javax.servlet.jsp.JspException;
  * @author Juergen Hoeller
  * @since 2.0
  */
+@SuppressWarnings("serial")
 public class TextareaTag extends AbstractHtmlInputElementTag {
 
 	public static final String ROWS_ATTRIBUTE = "rows";
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
index 5d82e56bb3..c0a66c5216 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
@@ -49,6 +49,7 @@ public abstract class AbstractCachingViewResolver extends WebApplicationObjectSu
 	private boolean cacheUnresolved = true;
 
 	/** Map from view key to View instance */
+	@SuppressWarnings("serial")
 	private final Map<Object, View> viewCache =
 			new LinkedHashMap<Object, View>(DEFAULT_CACHE_LIMIT, 0.75f, true) {
 				@Override
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
index a6f2581324..6773d689c8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
@@ -371,6 +371,7 @@ public class FreeMarkerView extends AbstractTemplateView {
 	 * Simple adapter class that extends {@link GenericServlet}.
 	 * Needed for JSP access in FreeMarker.
 	 */
+	@SuppressWarnings("serial")
 	private static class GenericServletAdapter extends GenericServlet {
 
 		@Override
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/Colour.java b/spring-webmvc/src/test/java/org/springframework/beans/Colour.java
index 60dc333e0b..17fd24fec7 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/Colour.java
@@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum;
 /**
  * @author Rob Harrop
  */
+@SuppressWarnings("serial")
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");
@@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum {
 		super(code, label);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
index 2bb41a9d5b..0940539f54 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean;
  * @author Juergen Hoeller
  * @since 21.08.2003
  */
+@SuppressWarnings("serial")
 public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
 
 	private String beanName;
@@ -82,4 +83,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 		return destroyed;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
index 34d05120aa..13c2c5447a 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
@@ -25,6 +25,7 @@ import org.springframework.util.ObjectUtils;
  *
  * @author Rod Johnson
  */
+@SuppressWarnings("serial")
 public class SerializablePerson implements Person, Serializable {
 
 	private String name;
@@ -61,4 +62,4 @@ public class SerializablePerson implements Person, Serializable {
 		return p.age == age && ObjectUtils.nullSafeEquals(name, p.name);
 	}
 
-}
\ No newline at end of file
+}
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 3db32eb3b5..b673752ecf 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
@@ -278,11 +278,13 @@ public class SimpleMappingExceptionResolverTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class SomeOddException extends Exception {
 
 	}
 
 
+	@SuppressWarnings("serial")
 	private static class AnotherOddException extends Exception {
 
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CgLibProxyServletAnnotationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CgLibProxyServletAnnotationTests.java
index 6735d3d0cf..3b1b46c6b4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CgLibProxyServletAnnotationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CgLibProxyServletAnnotationTests.java
@@ -76,6 +76,7 @@ public class CgLibProxyServletAnnotationTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	private void initServlet(final Class<?> controllerclass) throws ServletException {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -128,4 +129,4 @@ public class CgLibProxyServletAnnotationTests {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java
index c583751c65..bac4f505bb 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java
@@ -76,6 +76,7 @@ public class JdkProxyServletAnnotationTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	private void initServlet(final Class<?> controllerclass) throws ServletException {
 		servlet = new DispatcherServlet() {
 			@Override
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java
index f1f724c402..684550e18d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java
@@ -55,11 +55,13 @@ public class ResponseStatusExceptionResolverTests {
 	}
 
 	@ResponseStatus(HttpStatus.BAD_REQUEST)
+	@SuppressWarnings("serial")
 	private static class StatusCodeException extends Exception {
 
 	}
 
 	@ResponseStatus(value = HttpStatus.GONE, reason = "You suck!")
+	@SuppressWarnings("serial")
 	private static class StatusCodeAndReasonException extends Exception {
 
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
index 6ca9722166..8b34815e38 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
@@ -161,6 +161,7 @@ public class ServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void emptyRequestMapping() throws Exception {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -185,6 +186,7 @@ public class ServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void emptyValueMapping() throws Exception {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -271,6 +273,7 @@ public class ServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void defaultExpressionParameters() throws Exception {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -300,6 +303,7 @@ public class ServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void typeNestedSetBinding() throws Exception {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -348,6 +352,7 @@ public class ServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void proxiedStandardHandleMethod() throws Exception {
 		DispatcherServlet servlet = new DispatcherServlet() {
 			@Override
@@ -560,6 +565,7 @@ public class ServletAnnotationControllerTests {
 		doTestAdaptedHandleMethods(MyAdaptedController3.class);
 	}
 
+	@SuppressWarnings("serial")
 	private void initServlet(final Class<?> controllerClass) throws ServletException {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -656,6 +662,7 @@ public class ServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void proxiedFormController() throws Exception {
 		DispatcherServlet servlet = new DispatcherServlet() {
 			@Override
@@ -1583,6 +1590,7 @@ public class ServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void controllerClassNameNoTypeLevelAnn() throws Exception {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -1617,6 +1625,7 @@ public class ServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void simpleUrlHandlerMapping() throws Exception {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -1667,6 +1676,7 @@ public class ServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void requestMappingInterfaceWithProxy() throws Exception {
 		DispatcherServlet servlet = new DispatcherServlet() {
 			@Override
@@ -1865,6 +1875,7 @@ public class ServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void parameterCsvAsIntegerArray() throws Exception {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -1893,6 +1904,7 @@ public class ServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void parameterCsvAsIntegerSet() throws Exception {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -1921,6 +1933,7 @@ public class ServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void parameterCsvAsIntegerSetWithCustomSeparator() throws Exception {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -2436,6 +2449,7 @@ public class ServletAnnotationControllerTests {
 		}
 	}
 
+	@SuppressWarnings("serial")
 	@Controller
 	@RequestMapping("/myPath.do")
 	private static class MyParameterDispatchingController implements Serializable {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java
index 208a88957a..d13a82607b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java
@@ -94,6 +94,7 @@ public class UriTemplateServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void doubles() throws Exception {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -266,6 +267,7 @@ public class UriTemplateServletAnnotationControllerTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	private void initServlet(final Class<?> controllerclass) throws ServletException {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -281,6 +283,7 @@ public class UriTemplateServletAnnotationControllerTests {
 	}
 
 	@Test
+	@SuppressWarnings("serial")
 	public void noDefaultSuffixPattern() throws Exception {
 		servlet = new DispatcherServlet() {
 			@Override
@@ -378,6 +381,7 @@ public class UriTemplateServletAnnotationControllerTests {
 
 	// SPR-6906
 	@Test
+	@SuppressWarnings("serial")
 	public void controllerClassName() throws Exception {
 		servlet = new DispatcherServlet() {
 			@Override
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
index 747ee0e9a1..03c39fa8de 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
@@ -976,6 +976,7 @@ public class BindTagTests extends AbstractTagTests {
 	/**
 	 * SPR-4022
 	 */
+	@SuppressWarnings("serial")
 	public void testNestingInFormTag() throws JspException {
 		PageContext pc = createPageContext();
 		TestBean tb = new TestBean();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
index 95ebe4961a..51820dc839 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
@@ -30,6 +30,7 @@ import org.springframework.web.util.WebUtils;
  */
 public class HtmlEscapeTagTests extends AbstractTagTests {
 
+	@SuppressWarnings("serial")
 	public void testHtmlEscapeTag() throws JspException {
 		PageContext pc = createPageContext();
 		HtmlEscapeTag tag = new HtmlEscapeTag();
@@ -107,6 +108,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests {
 		assertTrue("Correctly disabled", !tag.getRequestContext().isDefaultHtmlEscape());
 	}
 
+	@SuppressWarnings("serial")
 	public void testEscapeBody() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer result = new StringBuffer();
@@ -124,6 +126,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests {
 		assertEquals("test text", result.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testEscapeBodyWithHtmlEscape() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer result = new StringBuffer();
@@ -142,6 +145,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests {
 		assertEquals("test &amp; text", result.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testEscapeBodyWithJavaScriptEscape() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer result = new StringBuffer();
@@ -160,6 +164,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests {
 		assertEquals("Correct content", "\\' test & text \\\\", result.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testEscapeBodyWithHtmlEscapeAndJavaScriptEscape() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer result = new StringBuffer();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
index 3d33e75a04..8e737c2257 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
@@ -38,6 +38,7 @@ import org.springframework.web.servlet.support.RequestContextUtils;
  */
 public class MessageTagTests extends AbstractTagTests {
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithMessageSourceResolvable1() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -52,6 +53,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test message", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithMessageSourceResolvable2() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -67,6 +69,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test message", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithCode1() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -81,6 +84,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test message", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithCode2() throws JspException {
 		PageContext pc = createPageContext();
 		MockHttpServletRequest request = (MockHttpServletRequest) pc.getRequest();
@@ -99,6 +103,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "Canadian &amp; test message", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithNullCode() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -113,6 +118,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "null", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithCodeAndArgument() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -128,6 +134,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test arg1 message {1}", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithCodeAndArguments() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -143,6 +150,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test arg1 message arg2", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithCodeAndStringArgumentWithCustomSeparator() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -159,6 +167,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test arg1,1 message arg2,2", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithCodeAndArrayArgument() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -174,6 +183,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test arg1 message 5", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithCodeAndObjectArgument() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -189,6 +199,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test 5 message {1}", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithCodeAndExpressionArgument() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -205,6 +216,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test my,value message {1}", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithCodeAndExpressionArguments() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -222,6 +234,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test my,value message 5", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithCodeAndExpressionArgumentArray() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -238,6 +251,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test my,value message 5", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithCodeAndExpressionArgumentFormat() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -255,6 +269,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test my,value message 5.14 X", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithCodeAndText1() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -270,6 +285,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test message", (message.toString()));
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithCodeAndText2() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -286,6 +302,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test & text", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithText() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -301,6 +318,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test &amp; text", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithTextAndExpressionArgumentFormat() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -318,6 +336,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "test my,value message 5.14 X", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithTextAndJavaScriptEscape() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
@@ -333,6 +352,7 @@ public class MessageTagTests extends AbstractTagTests {
 		assertEquals("Correct message", "\\' test & text \\\\", message.toString());
 	}
 
+	@SuppressWarnings("serial")
 	public void testMessageTagWithTextAndHtmlEscapeAndJavaScriptEscape() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
index 943ebcbd12..cbd498112e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
@@ -92,6 +92,7 @@ public class ParamTagTests extends AbstractTagTests {
 		}
 	}
 
+	@SuppressWarnings("serial")
 	private class MockParamSupportTag extends TagSupport implements ParamAware {
 
 		private Param param;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
index be9f385a84..fc92aeaa46 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
@@ -35,6 +35,7 @@ import org.springframework.web.servlet.support.RequestContext;
  */
 public class ThemeTagTests extends AbstractTagTests {
 
+	@SuppressWarnings("serial")
 	public void testThemeTag() throws JspException {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
index bcca71760c..1ac1ea619e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
@@ -50,6 +50,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 	private TestBean bean;
 
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new CheckboxTag() {
 			protected TagWriter createTagWriter() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
index 41cf9aa72b..96bae8946c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
@@ -59,6 +59,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 
 	private TestBean bean;
 
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new CheckboxesTag() {
 			protected TagWriter createTagWriter() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
index 7cb49c8e25..90cdd281d2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
@@ -48,6 +48,7 @@ public class ErrorsTagTests extends AbstractFormTagTests {
 	private ErrorsTag tag;
 
 
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new ErrorsTag() {
 			protected TagWriter createTagWriter() {
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 70cb210e80..f8023dffb2 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
@@ -47,6 +47,7 @@ public class FormTagTests extends AbstractHtmlElementTagTests {
 	private MockHttpServletRequest request;
 
 
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new FormTag() {
 			protected TagWriter createTagWriter() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
index 82c233b4f9..fc9101e384 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
@@ -385,6 +385,7 @@ public class InputTagTests extends AbstractFormTagTests {
 		assertTrue("Tag not opened properly", output.startsWith("<input "));
 	}
 
+	@SuppressWarnings("serial")
 	protected InputTag createTag(final Writer writer) {
 		return new InputTag() {
 			protected TagWriter createTagWriter() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
index a53ca2e193..3264512017 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
@@ -34,6 +34,7 @@ public class LabelTagTests extends AbstractFormTagTests {
 	private LabelTag tag;
 
 
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new LabelTag() {
 			protected TagWriter createTagWriter() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
index e4b956177b..0d4035c981 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
@@ -32,6 +32,7 @@ public class OptionTagEnumTests extends AbstractHtmlElementTagTests {
 
 	private SelectTag parentTag;
 
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new OptionTag() {
 			protected TagWriter createTagWriter() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
index 062d7ed270..a8872851aa 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
@@ -51,6 +51,7 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 
 	private SelectTag parentTag;
 
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new OptionTag() {
 			protected TagWriter createTagWriter() {
@@ -529,6 +530,7 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class RulesVariant implements Serializable {
 
 		private String rules;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
index de33846e77..accbc09cf4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
@@ -54,6 +54,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
 	private SelectTag selectTag;
 	private OptionsTag tag;
 
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new OptionsTag() {
 			protected TagWriter createTagWriter() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
index d3bda115ed..242135cb76 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
@@ -100,6 +100,7 @@ public class PasswordInputTagTests extends InputTagTests {
 		return "password";
 	}
 
+	@SuppressWarnings("serial")
 	protected InputTag createTag(final Writer writer) {
 		return new PasswordInputTag() {
 			protected TagWriter createTagWriter() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
index ba1a340019..8ff6f889b5 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
@@ -43,6 +43,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests {
 
 	private TestBean bean;
 
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new RadioButtonTag() {
 			protected TagWriter createTagWriter() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
index a780aa02d1..8ac6039771 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
@@ -53,6 +53,7 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests {
 
 	private TestBean bean;
 
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new RadioButtonsTag() {
 			protected TagWriter createTagWriter() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
index f602a2917d..69a916bcd8 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
@@ -64,6 +64,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 	private TestBeanWithRealCountry bean;
 
 
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new SelectTag() {
 			protected TagWriter createTagWriter() {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
index d391092717..44521f112d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
@@ -33,6 +33,7 @@ public class TextareaTagTests extends AbstractFormTagTests {
 
 	private TestBean rob;
 
+	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new TextareaTag() {
 			protected TagWriter createTagWriter() {
diff --git a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index d5f25ddd70..4b5aaa39de 100644
--- a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -24,6 +24,7 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@SuppressWarnings("serial")
 public class CallCountingTransactionManager extends AbstractPlatformTransactionManager {
 
 	public TransactionDefinition lastDefinition;

From 6c14eaad61cfd1e7ef1e9f4125f1ba1754e17cfc Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Tue, 18 Dec 2012 18:06:44 -0800
Subject: [PATCH 22/36] Fix [cast] compiler warnings

---
 .../AspectJAdviceParameterNameDiscoverer.java |  2 +-
 .../AspectJAwareAdvisorAutoProxyCreator.java  |  2 +-
 .../AbstractAspectJAdvisorFactoryTests.java   |  2 +-
 .../AbstractMethodMockingControl.aj           |  2 +-
 .../beans/ExtendedBeanInfo.java               |  2 +-
 .../config/CustomEditorConfigurer.java        |  2 +-
 .../beans/BeanWrapperTests.java               | 18 +++++++--------
 .../DefaultListableBeanFactoryTests.java      |  4 ++--
 ...ObjectFactoryCreatingFactoryBeanTests.java |  2 +-
 .../config/PropertiesFactoryBeanTests.java    | 16 +++++++-------
 .../factory/support/ManagedListTests.java     |  6 ++---
 .../factory/support/ManagedSetTests.java      |  6 ++---
 .../scheduling/quartz/QuartzSupportTests.java | 14 ++++++------
 .../WebSphereClassLoaderAdapter.java          |  2 +-
 .../validation/AbstractErrors.java            |  2 +-
 .../AfterReturningAdviceBindingTests.java     |  2 +-
 .../AbstractApplicationContextTests.java      |  2 +-
 .../assembler/AbstractJmxAssemblerTests.java  |  4 ++--
 ...MBeanServerConnectionFactoryBeanTests.java |  6 ++---
 ...heduledTasksBeanDefinitionParserTests.java |  2 +-
 .../scheduling/timer/TimerSupportTests.java   |  2 +-
 .../core/GenericCollectionTypeResolver.java   |  4 ++--
 .../core/annotation/AnnotationAttributes.java |  2 +-
 .../CollectionToCollectionConverterTests.java |  4 ++--
 .../support/DefaultConversionTests.java       |  2 +-
 .../core/type/AnnotationMetadataTests.java    |  2 +-
 .../expression/spel/EvaluationTests.java      |  2 +-
 .../expression/spel/ParsingTests.java         |  2 +-
 .../lookup/BeanFactoryDataSourceLookup.java   |  2 +-
 .../jdbc/object/SqlQueryTests.java            |  6 ++---
 .../support/SQLErrorCodesFactoryTests.java    |  2 +-
 .../BeanFactoryDestinationResolver.java       |  2 +-
 .../orm/hibernate3/HibernateAccessor.java     |  2 +-
 .../support/OpenEntityManagerInViewTests.java |  8 +++----
 .../support/PersistenceInjectionTests.java    | 22 +++++++++----------
 .../SharedEntityManagerFactoryTests.java      |  2 +-
 .../oxm/castor/CastorUnmarshallerTests.java   |  6 ++---
 .../web/struts/DelegatingActionProxy.java     |  2 +-
 .../struts/DelegatingRequestProcessor.java    |  2 +-
 .../DelegatingTilesRequestProcessor.java      |  2 +-
 .../result/FlashAttributeResultMatchers.java  |  2 +-
 .../mock/web/portlet/MockPortletRequest.java  |  2 +-
 .../jca/cci/CciTemplateTests.java             |  2 +-
 .../MappingJackson2HttpMessageConverter.java  |  2 +-
 .../MappingJacksonHttpMessageConverter.java   |  2 +-
 ...sfiedServletRequestParameterException.java |  2 +-
 .../support/HttpRequestHandlerServlet.java    |  4 ++--
 .../springframework/web/util/HtmlUtils.java   |  2 +-
 ...b2RootElementHttpMessageConverterTest.java |  6 ++---
 .../AbstractApplicationContextTests.java      |  2 +-
 ...essageConverterMethodArgumentResolver.java |  2 +-
 .../web/servlet/tags/form/CheckboxTag.java    |  2 +-
 .../servlet/view/BeanNameViewResolver.java    |  2 +-
 .../web/servlet/view/XmlViewResolver.java     |  2 +-
 .../AbstractApplicationContextTests.java      |  2 +-
 .../ServletAnnotationControllerTests.java     |  2 +-
 ...nnotationControllerHandlerMethodTests.java |  2 +-
 .../tags/form/RadioButtonTagTests.java        |  2 +-
 .../web/servlet/tags/form/SelectTagTests.java |  4 ++--
 .../web/servlet/view/BaseViewTests.java       |  2 +-
 .../view/InternalResourceViewTests.java       | 10 ++++-----
 .../freemarker/FreeMarkerConfigurerTests.java |  4 ++--
 .../velocity/VelocityConfigurerTests.java     |  6 ++---
 63 files changed, 122 insertions(+), 122 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
index 1eab7c8520..0ef76eba69 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
@@ -700,7 +700,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 				// 1 primitive arg, and one candidate...
 				for (int i = 0; i < this.argumentTypes.length; i++) {
 					if (isUnbound(i) && this.argumentTypes[i].isPrimitive()) {
-						bindParameterName(i, (String) varNames.get(0));
+						bindParameterName(i, varNames.get(0));
 						break;
 					}
 				}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
index 20765ec960..9f70ed53a0 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
@@ -77,7 +77,7 @@ public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProx
 
 		// sort it
 		List<PartiallyComparableAdvisorHolder> sorted =
-				(List<PartiallyComparableAdvisorHolder>) PartialOrder.sort(partiallyComparableAdvisors);
+				PartialOrder.sort(partiallyComparableAdvisors);
 		if (sorted == null) {
 			// TODO: work harder to give a better error message here.
 			throw new IllegalArgumentException("Advice precedence circularity error");
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
index 0a485087c3..f6f82fb412 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
@@ -386,7 +386,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 				),
 				CannotBeUnlocked.class);
 		assertTrue(proxy instanceof Lockable);
-		Lockable lockable = (Lockable) proxy;
+		Lockable lockable = proxy;
 		assertTrue("Already locked", lockable.locked());
 		lockable.lock();
 		assertTrue("Real target ignores locking", lockable.locked());
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 ccc3aa2c69..aa6ad3a9cb 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
@@ -114,7 +114,7 @@ public abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMeth
 			if (responseType == CallResponse.return_) {
 				return call.returnValue(lastSig, args);
 			} else if(responseType == CallResponse.throw_) {
-				return (RuntimeException)call.throwException(lastSig, args);
+				return call.throwException(lastSig, args);
 			} else if(responseType == CallResponse.nothing) {
 				// do nothing
 			}
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 c383a52b5b..76c295490e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
+++ b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
@@ -495,7 +495,7 @@ class PropertyDescriptorUtils {
 		// copy all attributes (emulating behavior of private FeatureDescriptor#addTable)
 		Enumeration<String> keys = source.attributeNames();
 		while (keys.hasMoreElements()) {
-			String key = (String)keys.nextElement();
+			String key = keys.nextElement();
 			target.setValue(key, source.getValue(key));
 		}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
index d3e6796a7d..9eff79944c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
@@ -197,7 +197,7 @@ public class CustomEditorConfigurer implements BeanFactoryPostProcessor, BeanCla
 					else if (value instanceof String) {
 						Class editorClass = ClassUtils.forName((String) value, this.beanClassLoader);
 						Assert.isAssignable(PropertyEditor.class, editorClass);
-						beanFactory.registerCustomEditor(requiredType, (Class<? extends PropertyEditor>) editorClass);
+						beanFactory.registerCustomEditor(requiredType, editorClass);
 					}
 					else {
 						throw new IllegalArgumentException("Mapped value [" + value + "] for custom editor 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 f97a686dfb..d420e860c5 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
@@ -995,15 +995,15 @@ public final class BeanWrapperTests {
 		bw.setPropertyValues(pvs);
 		assertEquals(tb5, bean.getArray()[0]);
 		assertEquals(tb4, bean.getArray()[1]);
-		assertEquals(tb3, ((TestBean) bean.getList().get(0)));
-		assertEquals(tb2, ((TestBean) bean.getList().get(1)));
-		assertEquals(tb0, ((TestBean) bean.getList().get(2)));
-		assertEquals(null, ((TestBean) bean.getList().get(3)));
-		assertEquals(tb1, ((TestBean) bean.getList().get(4)));
-		assertEquals(tb1, ((TestBean) bean.getMap().get("key1")));
-		assertEquals(tb0, ((TestBean) bean.getMap().get("key2")));
-		assertEquals(tb4, ((TestBean) bean.getMap().get("key5")));
-		assertEquals(tb5, ((TestBean) bean.getMap().get("key9")));
+		assertEquals(tb3, (bean.getList().get(0)));
+		assertEquals(tb2, (bean.getList().get(1)));
+		assertEquals(tb0, (bean.getList().get(2)));
+		assertEquals(null, (bean.getList().get(3)));
+		assertEquals(tb1, (bean.getList().get(4)));
+		assertEquals(tb1, (bean.getMap().get("key1")));
+		assertEquals(tb0, (bean.getMap().get("key2")));
+		assertEquals(tb4, (bean.getMap().get("key5")));
+		assertEquals(tb5, (bean.getMap().get("key9")));
 		assertEquals(tb5, bw.getPropertyValue("array[0]"));
 		assertEquals(tb4, bw.getPropertyValue("array[1]"));
 		assertEquals(tb3, bw.getPropertyValue("list[0]"));
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 24d271c47b..d52f73e510 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
@@ -497,7 +497,7 @@ public class DefaultListableBeanFactoryTests {
 		int count = (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p, PREFIX);
 		assertTrue("2 beans registered, not " + count, count == 2);
 
-		TestBean kerry = (TestBean) lbf.getBean("kerry", TestBean.class);
+		TestBean kerry = lbf.getBean("kerry", TestBean.class);
 		assertTrue("Kerry name is Kerry", "Kerry".equals(kerry.getName()));
 		ITestBean spouse = kerry.getSpouse();
 		assertTrue("Kerry spouse is non null", spouse != null);
@@ -516,7 +516,7 @@ public class DefaultListableBeanFactoryTests {
 		assertTrue("1 beans registered, not " + count, count == 1);
 		assertEquals(1, lbf.getBeanDefinitionCount());
 
-		TestBean tb = (TestBean) lbf.getBean("tb", TestBean.class);
+		TestBean tb = lbf.getBean("tb", TestBean.class);
 		assertEquals("my.value", tb.getSomeMap().get("my.key"));
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
index b67861cc28..e02b77f2a1 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
@@ -113,7 +113,7 @@ public class ObjectFactoryCreatingFactoryBeanTests {
 		factory.setTargetBeanName(targetBeanName);
 		factory.setBeanFactory(beanFactory);
 		factory.afterPropertiesSet();
-		ObjectFactory<?> objectFactory = (ObjectFactory<?>) factory.getObject();
+		ObjectFactory<?> objectFactory = factory.getObject();
 		Object actualSingleton = objectFactory.getObject();
 		assertSame(expectedSingleton, actualSingleton);
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
index 18fd8bd421..e4446440b8 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
@@ -42,7 +42,7 @@ public final class PropertiesFactoryBeanTests {
 		PropertiesFactoryBean pfb = new PropertiesFactoryBean();
 		pfb.setLocation(TEST_PROPS);
 		pfb.afterPropertiesSet();
-		Properties props = (Properties) pfb.getObject();
+		Properties props = pfb.getObject();
 		assertEquals("99", props.getProperty("tb.array[0].age"));
 	}
 
@@ -51,7 +51,7 @@ public final class PropertiesFactoryBeanTests {
 		PropertiesFactoryBean pfb = new PropertiesFactoryBean();
 		pfb.setLocation(TEST_PROPS_XML);
 		pfb.afterPropertiesSet();
-		Properties props = (Properties) pfb.getObject();
+		Properties props = pfb.getObject();
 		assertEquals("99", props.getProperty("tb.array[0].age"));
 	}
 
@@ -62,7 +62,7 @@ public final class PropertiesFactoryBeanTests {
 		localProps.setProperty("key2", "value2");
 		pfb.setProperties(localProps);
 		pfb.afterPropertiesSet();
-		Properties props = (Properties) pfb.getObject();
+		Properties props = pfb.getObject();
 		assertEquals("value2", props.getProperty("key2"));
 	}
 
@@ -75,7 +75,7 @@ public final class PropertiesFactoryBeanTests {
 		localProps.setProperty("tb.array[0].age", "0");
 		pfb.setProperties(localProps);
 		pfb.afterPropertiesSet();
-		Properties props = (Properties) pfb.getObject();
+		Properties props = pfb.getObject();
 		assertEquals("99", props.getProperty("tb.array[0].age"));
 		assertEquals("value2", props.getProperty("key2"));
 	}
@@ -100,7 +100,7 @@ public final class PropertiesFactoryBeanTests {
 		pfb.setPropertiesArray(new Properties[] {props1, props2, props3});
 		pfb.afterPropertiesSet();
 
-		Properties props = (Properties) pfb.getObject();
+		Properties props = pfb.getObject();
 		assertEquals("99", props.getProperty("tb.array[0].age"));
 		assertEquals("value2", props.getProperty("key2"));
 		assertEquals("framework", props.getProperty("spring"));
@@ -119,7 +119,7 @@ public final class PropertiesFactoryBeanTests {
 		pfb.setProperties(localProps);
 		pfb.setLocalOverride(true);
 		pfb.afterPropertiesSet();
-		Properties props = (Properties) pfb.getObject();
+		Properties props = pfb.getObject();
 		assertEquals("0", props.getProperty("tb.array[0].age"));
 		assertEquals("value2", props.getProperty("key2"));
 	}
@@ -133,10 +133,10 @@ public final class PropertiesFactoryBeanTests {
 		localProps.setProperty("key2", "value2");
 		pfb.setProperties(localProps);
 		pfb.afterPropertiesSet();
-		Properties props = (Properties) pfb.getObject();
+		Properties props = pfb.getObject();
 		assertEquals("99", props.getProperty("tb.array[0].age"));
 		assertEquals("value2", props.getProperty("key2"));
-		Properties newProps = (Properties) pfb.getObject();
+		Properties newProps = pfb.getObject();
 		assertTrue(props != newProps);
 		assertEquals("99", newProps.getProperty("tb.array[0].age"));
 		assertEquals("value2", newProps.getProperty("key2"));
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
index 9dc27c7f37..36745a65c0 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
@@ -33,7 +33,7 @@ public class ManagedListTests extends TestCase {
 		ManagedList child = new ManagedList();
 		child.add("three");
 		child.setMergeEnabled(true);
-		List mergedList = (List) child.merge(parent);
+		List mergedList = child.merge(parent);
 		assertEquals("merge() obviously did not work.", 3, mergedList.size());
 	}
 
@@ -72,7 +72,7 @@ public class ManagedListTests extends TestCase {
 		parent.add("two");
 		ManagedList child = new ManagedList();
 		child.setMergeEnabled(true);
-		List mergedList = (List) child.merge(parent);
+		List mergedList = child.merge(parent);
 		assertEquals("merge() obviously did not work.", 2, mergedList.size());
 	}
 
@@ -84,7 +84,7 @@ public class ManagedListTests extends TestCase {
 		ManagedList child = new ManagedList();
 		child.add("one");
 		child.setMergeEnabled(true);
-		List mergedList = (List) child.merge(parent);
+		List mergedList = child.merge(parent);
 		assertEquals("merge() obviously did not work.", 3, mergedList.size());
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
index 0eea409ab8..22dbf41ba3 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
@@ -33,7 +33,7 @@ public class ManagedSetTests extends TestCase {
 		ManagedSet child = new ManagedSet();
 		child.add("three");
 		child.setMergeEnabled(true);
-		Set mergedSet = (Set) child.merge(parent);
+		Set mergedSet = child.merge(parent);
 		assertEquals("merge() obviously did not work.", 3, mergedSet.size());
 	}
 
@@ -72,7 +72,7 @@ public class ManagedSetTests extends TestCase {
 		parent.add("two");
 		ManagedSet child = new ManagedSet();
 		child.setMergeEnabled(true);
-		Set mergedSet = (Set) child.merge(parent);
+		Set mergedSet = child.merge(parent);
 		assertEquals("merge() obviously did not work.", 2, mergedSet.size());
 	}
 
@@ -84,7 +84,7 @@ public class ManagedSetTests extends TestCase {
 		ManagedSet child = new ManagedSet();
 		child.add("one");
 		child.setMergeEnabled(true);
-		Set mergedSet = (Set) child.merge(parent);
+		Set mergedSet = child.merge(parent);
 		assertEquals("merge() obviously did not work.", 2, mergedSet.size());
 	}
 
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
index e1bd9a8c63..0607947d6c 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
@@ -118,7 +118,7 @@ public class QuartzSupportTests {
 		}
 		mijdfb.setTargetMethod("doSomething");
 		mijdfb.afterPropertiesSet();
-		JobDetail jobDetail1 = (JobDetail) mijdfb.getObject();
+		JobDetail jobDetail1 = mijdfb.getObject();
 
 		SimpleTriggerBean trigger1 = new SimpleTriggerBean();
 		trigger1.setBeanName("myTrigger1");
@@ -210,7 +210,7 @@ public class QuartzSupportTests {
 		mijdfb.setTargetObject(task1);
 		mijdfb.setTargetMethod("doSomething");
 		mijdfb.afterPropertiesSet();
-		JobDetail jobDetail1 = (JobDetail) mijdfb.getObject();
+		JobDetail jobDetail1 = mijdfb.getObject();
 
 		SimpleTriggerBean trigger1 = new SimpleTriggerBean();
 		trigger1.setBeanName("myTrigger1");
@@ -304,7 +304,7 @@ public class QuartzSupportTests {
 		mijdfb.setTargetObject(task1);
 		mijdfb.setTargetMethod("doSomething");
 		mijdfb.afterPropertiesSet();
-		JobDetail jobDetail1 = (JobDetail) mijdfb.getObject();
+		JobDetail jobDetail1 = mijdfb.getObject();
 
 		SimpleTriggerBean trigger1 = new SimpleTriggerBean();
 		trigger1.setBeanName("myTrigger1");
@@ -446,7 +446,7 @@ public class QuartzSupportTests {
 		mijdfb.setTargetObject(task1);
 		mijdfb.setTargetMethod("doWait");
 		mijdfb.afterPropertiesSet();
-		JobDetail jobDetail1 = (JobDetail) mijdfb.getObject();
+		JobDetail jobDetail1 = mijdfb.getObject();
 
 		SimpleTriggerBean trigger0 = new SimpleTriggerBean();
 		trigger0.setBeanName("myTrigger1");
@@ -532,7 +532,7 @@ public class QuartzSupportTests {
 		mijdfb.setTargetObject(task1);
 		mijdfb.setTargetMethod("doSomething");
 		mijdfb.afterPropertiesSet();
-		JobDetail jobDetail1 = (JobDetail) mijdfb.getObject();
+		JobDetail jobDetail1 = mijdfb.getObject();
 
 		SimpleTrigger trigger1 = new SimpleTrigger();
 		trigger1.setName("myTrigger1");
@@ -618,7 +618,7 @@ public class QuartzSupportTests {
 		try {
 			schedulerFactoryBean.afterPropertiesSet();
 			schedulerFactoryBean.start();
-			Scheduler returnedScheduler = (Scheduler) schedulerFactoryBean.getObject();
+			Scheduler returnedScheduler = schedulerFactoryBean.getObject();
 			assertEquals(tb, returnedScheduler.getContext().get("testBean"));
 			assertEquals(ac, returnedScheduler.getContext().get("appCtx"));
 		}
@@ -659,7 +659,7 @@ public class QuartzSupportTests {
 		mijdfb.setTargetMethod("doSomething");
 		mijdfb.setJobListenerNames(names);
 		mijdfb.afterPropertiesSet();
-		JobDetail jobDetail = (JobDetail) mijdfb.getObject();
+		JobDetail jobDetail = mijdfb.getObject();
 		List result = Arrays.asList(jobDetail.getJobListenerNames());
 		assertEquals(Arrays.asList(names), result);
 	}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
index 26a7b4ec47..b0004bb1a7 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
@@ -93,7 +93,7 @@ class WebSphereClassLoaderAdapter {
 
 	public ClassLoader getThrowawayClassLoader() {
 		try {
-			ClassLoader loader = (ClassLoader) cloneConstructor.newInstance(getClassLoader());
+			ClassLoader loader = cloneConstructor.newInstance(getClassLoader());
 			// clear out the transformers (copied as well)
 			List<?> list = (List<?>) transformerList.get(loader);
 			list.clear();
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 8e8198a6fa..60d1364888 100644
--- a/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java
+++ b/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java
@@ -186,7 +186,7 @@ public abstract class AbstractErrors implements Errors, Serializable {
 
 	public FieldError getFieldError(String field) {
 		List<FieldError> fieldErrors = getFieldErrors(field);
-		return (!fieldErrors.isEmpty() ? (FieldError) fieldErrors.get(0) : null);
+		return (!fieldErrors.isEmpty() ? fieldErrors.get(0) : null);
 	}
 
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
index 690e0355a7..2c8e8a714b 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
@@ -137,7 +137,7 @@ public final class AfterReturningAdviceBindingTests {
 	@Test
 	public void testReturningBeanArray() {
 		this.testBeanTarget.setSpouse(new TestBean());
-		ITestBean[] spouses = (ITestBean[]) this.testBeanTarget.getSpouses();
+		ITestBean[] spouses = this.testBeanTarget.getSpouses();
 		mockCollaborator.testBeanArrayArg(spouses);
 		replay(mockCollaborator);
 		testBeanProxy.getSpouses();
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 84ade3b7dd..a0493b62ec 100644
--- a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
@@ -94,7 +94,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe
 	}
 
 	public void testGrandparentTypedDefinitionFound() throws Exception {
-		TestBean dad = (TestBean) applicationContext.getBean("father", TestBean.class);
+		TestBean dad = applicationContext.getBean("father", TestBean.class);
 		assertTrue("Dad has correct name", dad.getName().equals("Albert"));
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
index e104e7b466..79da547c13 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
@@ -145,14 +145,14 @@ public abstract class AbstractJmxAssemblerTests extends AbstractJmxTests {
 		ModelMBeanOperationInfo get = info.getOperation("getName");
 		assertNotNull("get operation should not be null", get);
 		assertEquals("get operation should have visibility of four",
-				(Integer) get.getDescriptor().getFieldValue("visibility"),
+				get.getDescriptor().getFieldValue("visibility"),
 				new Integer(4));
 		assertEquals("get operation should have role \"getter\"", "getter", get.getDescriptor().getFieldValue("role"));
 
 		ModelMBeanOperationInfo set = info.getOperation("setName");
 		assertNotNull("set operation should not be null", set);
 		assertEquals("set operation should have visibility of four",
-				(Integer) set.getDescriptor().getFieldValue("visibility"),
+				set.getDescriptor().getFieldValue("visibility"),
 				new Integer(4));
 		assertEquals("set operation should have role \"setter\"", "setter", set.getDescriptor().getFieldValue("role"));
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
index 56244c74a4..d53d8366fe 100644
--- a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
@@ -62,7 +62,7 @@ public class MBeanServerConnectionFactoryBeanTests extends AbstractMBeanServerTe
 			bean.afterPropertiesSet();
 
 			try {
-				MBeanServerConnection connection = (MBeanServerConnection) bean.getObject();
+				MBeanServerConnection connection = bean.getObject();
 				assertNotNull("Connection should not be null", connection);
 
 				// perform simple MBean count test
@@ -100,7 +100,7 @@ public class MBeanServerConnectionFactoryBeanTests extends AbstractMBeanServerTe
 		bean.setConnectOnStartup(false);
 		bean.afterPropertiesSet();
 
-		MBeanServerConnection connection = (MBeanServerConnection) bean.getObject();
+		MBeanServerConnection connection = bean.getObject();
 		assertTrue(AopUtils.isAopProxy(connection));
 
 		JMXConnectorServer connector = null;
@@ -122,7 +122,7 @@ public class MBeanServerConnectionFactoryBeanTests extends AbstractMBeanServerTe
 		bean.setConnectOnStartup(false);
 		bean.afterPropertiesSet();
 
-		MBeanServerConnection connection = (MBeanServerConnection) bean.getObject();
+		MBeanServerConnection connection = bean.getObject();
 		assertTrue(AopUtils.isAopProxy(connection));
 		bean.destroy();
 	}
diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java
index 5e8f75a358..921a5c4e11 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java
@@ -52,7 +52,7 @@ public class ScheduledTasksBeanDefinitionParserTests {
 	public void setup() {
 		this.context = new ClassPathXmlApplicationContext(
 				"scheduledTasksContext.xml", ScheduledTasksBeanDefinitionParserTests.class);
-		this.registrar = (ScheduledTaskRegistrar) this.context.getBeansOfType(
+		this.registrar = this.context.getBeansOfType(
 				ScheduledTaskRegistrar.class).values().iterator().next();
 		this.testBean = this.context.getBean("testBean");
 	}
diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
index 620c737c86..5886a912ea 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
@@ -39,7 +39,7 @@ public class TimerSupportTests extends TestCase {
 		mittfb.setTargetObject(task1);
 		mittfb.setTargetMethod("doSomething");
 		mittfb.afterPropertiesSet();
-		final TimerTask timerTask1 = (TimerTask) mittfb.getObject();
+		final TimerTask timerTask1 = mittfb.getObject();
 
 		final TestRunnable timerTask2 = new TestRunnable();
 
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 4782e44bf4..7a243abad7 100644
--- a/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java
@@ -322,7 +322,7 @@ public abstract class GenericCollectionTypeResolver {
 
 		Type resolvedType = type;
 		if (type instanceof TypeVariable && typeVariableMap != null) {
-			Type mappedType = typeVariableMap.get((TypeVariable) type);
+			Type mappedType = typeVariableMap.get(type);
 			if (mappedType != null) {
 				resolvedType = mappedType;
 			}
@@ -383,7 +383,7 @@ public abstract class GenericCollectionTypeResolver {
 		}
 		Type paramType = paramTypes[typeIndex];
 		if (paramType instanceof TypeVariable && typeVariableMap != null) {
-			Type mappedType = typeVariableMap.get((TypeVariable) paramType);
+			Type mappedType = typeVariableMap.get(paramType);
 			if (mappedType != null) {
 				paramType = mappedType;
 			}
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java
index 50e13dac06..40041e8de4 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotationAttributes.java
@@ -106,7 +106,7 @@ public class AnnotationAttributes extends LinkedHashMap<String, Object> {
 
 	@SuppressWarnings("unchecked")
 	public <T> Class<? extends T> getClass(String attributeName) {
-		return (Class<T>)doGet(attributeName, Class.class);
+		return doGet(attributeName, Class.class);
 	}
 
 	public Class<?>[] getClassArray(String attributeName) {
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 67f5bcf616..6c16ee75a3 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
@@ -71,8 +71,8 @@ public class CollectionToCollectionConverterTests {
 		@SuppressWarnings("unchecked")
 		List<String> result = (List<String>) conversionService.convert(list, sourceType, targetType);
 		assertFalse(list.equals(result));
-		assertEquals((Integer) 9, result.get(0));
-		assertEquals((Integer) 37, result.get(1));
+		assertEquals(9, result.get(0));
+		assertEquals(37, result.get(1));
 	}
 
 	public ArrayList<Integer> scalarListTarget;
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 c9c936af90..c0495b5213 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
@@ -298,7 +298,7 @@ public class DefaultConversionTests {
 
 	@Test
 	public void testSpr7766() throws Exception {
-		ConverterRegistry registry = ((ConverterRegistry) conversionService);
+		ConverterRegistry registry = (conversionService);
 		registry.addConverter(new ColorConverter());
 		List<Color> colors = (List<Color>) conversionService.convert(new String[] { "ffffff", "#000000" }, TypeDescriptor.valueOf(String[].class), new TypeDescriptor(new MethodParameter(getClass().getMethod("handlerMethod", List.class), 0)));
 		assertEquals(2, colors.size());
diff --git a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
index ca52e93e38..fe1d6c9eed 100644
--- a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
+++ b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java
@@ -147,7 +147,7 @@ public class AnnotationMetadataTests {
 			assertThat(specialAttrs.getString("clazz"), is(String.class.getName()));
 
 			AnnotationAttributes nestedAnno = specialAttrs.getAnnotation("nestedAnno");
-			assertArrayEquals(new String[]{String.class.getName()}, (String[])nestedAnno.getStringArray("classArray"));
+			assertArrayEquals(new String[]{String.class.getName()}, nestedAnno.getStringArray("classArray"));
 			assertArrayEquals(new String[]{String.class.getName()}, nestedAnno.getStringArray("classArray"));
 
 			AnnotationAttributes[] nestedAnnoArray = specialAttrs.getAnnotationArray("nestedAnnoArray");
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
index 696c68831d..56e26f30da 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
@@ -1312,7 +1312,7 @@ public class EvaluationTests extends ExpressionTestCase {
 		e = parser.parseExpression("#wibble=#wibble+#wibble");
 		String s = e.getValue(ctx,String.class);
 		assertEquals("hello worldhello world",s);
-		assertEquals("hello worldhello world",(String)ctx.lookupVariable("wibble"));
+		assertEquals("hello worldhello world",ctx.lookupVariable("wibble"));
 
 		ctx.setVariable("wobble", 3);
 		e = parser.parseExpression("#wobble++");
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
index 3c0a3024f5..b5ca0a2da5 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
@@ -457,7 +457,7 @@ public class ParsingTests {
 	 */
 	public void parseCheck(String expression, String expectedStringFormOfAST) {
 		try {
-			SpelExpression e = (SpelExpression) parser.parseRaw(expression);
+			SpelExpression e = parser.parseRaw(expression);
 			if (e != null && !e.toStringAST().equals(expectedStringFormOfAST)) {
 				SpelUtilities.printAbstractSyntaxTree(System.err, e);
 			}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
index c460b90663..e40ddac2a4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
@@ -70,7 +70,7 @@ public class BeanFactoryDataSourceLookup implements DataSourceLookup, BeanFactor
 	public DataSource getDataSource(String dataSourceName) throws DataSourceLookupFailureException {
 		Assert.state(this.beanFactory != null, "BeanFactory is required");
 		try {
-			return (DataSource) this.beanFactory.getBean(dataSourceName, DataSource.class);
+			return this.beanFactory.getBean(dataSourceName, DataSource.class);
 		}
 		catch (BeansException ex) {
 			throw new DataSourceLookupFailureException(
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
index 1f548759ea..08b71e6fcb 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
@@ -953,7 +953,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			public List findCustomers(List ids) {
 				Map params = new HashMap();
 				params.put("ids", ids);
-				return (List) executeByNamedParam(params);
+				return executeByNamedParam(params);
 			}
 		}
 
@@ -1026,7 +1026,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			public List findCustomers(Integer id) {
 				Map params = new HashMap();
 				params.put("id1", id);
-				return (List) executeByNamedParam(params);
+				return executeByNamedParam(params);
 			}
 		}
 
@@ -1067,7 +1067,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			public List findCustomers(Integer id1) {
 				Map params = new HashMap();
 				params.put("id1", id1);
-				return (List) executeByNamedParam(params);
+				return executeByNamedParam(params);
 			}
 		}
 
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
index 6062ab5eb8..67e9cdc47f 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
@@ -198,7 +198,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 		TestSQLErrorCodesFactory sf = new TestSQLErrorCodesFactory();
 		assertEquals(1, sf.getErrorCodes("Oracle").getCustomTranslations().length);
 		CustomSQLErrorCodesTranslation translation =
-				(CustomSQLErrorCodesTranslation) sf.getErrorCodes("Oracle").getCustomTranslations()[0];
+				sf.getErrorCodes("Oracle").getCustomTranslations()[0];
 		assertEquals(CustomErrorCodeException.class, translation.getExceptionClass());
 		assertEquals(1, translation.getErrorCodes().length);
 	}
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
index f28ae3a115..9da3ed1d6b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
@@ -73,7 +73,7 @@ public class BeanFactoryDestinationResolver implements DestinationResolver, Bean
 
 		Assert.state(this.beanFactory != null, "BeanFactory is required");
 		try {
-			return (Destination) this.beanFactory.getBean(destinationName, Destination.class);
+			return this.beanFactory.getBean(destinationName, Destination.class);
 		}
 		catch (BeansException ex) {
 			throw new DestinationResolutionException(
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 79403bcf45..ddc08aed8b 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
@@ -208,7 +208,7 @@ public abstract class HibernateAccessor implements InitializingBean, BeanFactory
 			if (this.beanFactory == null) {
 				throw new IllegalStateException("Cannot get entity interceptor via bean name if no bean factory set");
 			}
-			return (Interceptor) this.beanFactory.getBean((String) this.entityInterceptor, Interceptor.class);
+			return this.beanFactory.getBean((String) this.entityInterceptor, Interceptor.class);
 		}
 		return (Interceptor) this.entityInterceptor;
 	}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
index 5fe4923a67..06fdf97311 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
@@ -228,8 +228,8 @@ public class OpenEntityManagerInViewTests extends TestCase {
 
 		replay(manager, factory);
 
-		final EntityManagerFactory factory2 = (EntityManagerFactory) createMock(EntityManagerFactory.class);
-		final EntityManager manager2 = (EntityManager) createMock(EntityManager.class);
+		final EntityManagerFactory factory2 = createMock(EntityManagerFactory.class);
+		final EntityManager manager2 = createMock(EntityManager.class);
 
 		expect(factory2.createEntityManager()).andReturn(manager2);
 		expect(manager2.isOpen()).andReturn(true);
@@ -292,8 +292,8 @@ public class OpenEntityManagerInViewTests extends TestCase {
 
 		replay(manager, factory);
 
-		final EntityManagerFactory factory2 = (EntityManagerFactory) createMock(EntityManagerFactory.class);
-		final EntityManager manager2 = (EntityManager) createMock(EntityManager.class);
+		final EntityManagerFactory factory2 = createMock(EntityManagerFactory.class);
+		final EntityManager manager2 = createMock(EntityManager.class);
 
 		expect(factory2.createEntityManager()).andReturn(manager2);
 		expect(manager2.isOpen()).andReturn(true);
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 3c5fbe2d49..f8af85a584 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
@@ -256,7 +256,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 
 	public void testPublicPersistenceUnitSetterWithOverriding() {
 		EntityManagerFactory mockEmf2 =
-				(EntityManagerFactory) MockControl.createControl(EntityManagerFactory.class).getMock();
+				MockControl.createControl(EntityManagerFactory.class).getMock();
 
 		GenericApplicationContext gac = new GenericApplicationContext();
 		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -274,7 +274,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 
 	public void testPublicPersistenceUnitSetterWithUnitIdentifiedThroughBeanName() {
 		EntityManagerFactory mockEmf2 =
-				(EntityManagerFactory) MockControl.createControl(EntityManagerFactory.class).getMock();
+				MockControl.createControl(EntityManagerFactory.class).getMock();
 
 		GenericApplicationContext gac = new GenericApplicationContext();
 		gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -329,7 +329,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 	@Ignore
 	public void ignoreTestPersistenceUnitsFromJndi() {
 		mockEmf.createEntityManager();
-		Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
+		Object mockEm = MockControl.createControl(EntityManager.class).getMock();
 		emfMc.setReturnValue(mockEm, 1);
 		emfMc.replay();
 
@@ -428,9 +428,9 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 	}
 
 	public void testPersistenceContextsFromJndi() {
-		Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
-		Object mockEm2 = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
-		Object mockEm3 = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
+		Object mockEm = MockControl.createControl(EntityManager.class).getMock();
+		Object mockEm2 = MockControl.createControl(EntityManager.class).getMock();
+		Object mockEm3 = MockControl.createControl(EntityManager.class).getMock();
 
 		Map<String, String> persistenceContexts = new HashMap<String, String>();
 		persistenceContexts.put("", "pc1");
@@ -467,9 +467,9 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 	}
 
 	public void testPersistenceContextsFromJndiWithDefaultUnit() {
-		Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
-		Object mockEm2 = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
-		Object mockEm3 = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
+		Object mockEm = MockControl.createControl(EntityManager.class).getMock();
+		Object mockEm2 = MockControl.createControl(EntityManager.class).getMock();
+		Object mockEm3 = MockControl.createControl(EntityManager.class).getMock();
 
 		Map<String, String> persistenceContexts = new HashMap<String, String>();
 		persistenceContexts.put("System", "pc1");
@@ -507,8 +507,8 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 	}
 
 	public void testSinglePersistenceContextFromJndi() {
-		Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
-		Object mockEm2 = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
+		Object mockEm = MockControl.createControl(EntityManager.class).getMock();
+		Object mockEm2 = MockControl.createControl(EntityManager.class).getMock();
 
 		Map<String, String> persistenceContexts = new HashMap<String, String>();
 		persistenceContexts.put("System", "pc1");
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java
index b22527cdab..93072c225f 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java
@@ -61,7 +61,7 @@ public class SharedEntityManagerFactoryTests {
 		assertTrue(EntityManager.class.isAssignableFrom(proxyFactoryBean.getObjectType()));
 		assertTrue(proxyFactoryBean.isSingleton());
 
-		EntityManager proxy = (EntityManager) proxyFactoryBean.getObject();
+		EntityManager proxy = proxyFactoryBean.getObject();
 		assertSame(proxy, proxyFactoryBean.getObject());
 		assertFalse(proxy.contains(o));
 
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 4cd57b33be..4c5387aaa3 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
@@ -66,7 +66,7 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests {
 	protected void testFlight(Object o) {
 		Flight flight = (Flight) o;
 		assertNotNull("Flight is null", flight);
-		assertEquals("Number is invalid", 42L, (long) flight.getNumber());
+		assertEquals("Number is invalid", 42L, flight.getNumber());
 	}
 
 	@Override
@@ -104,10 +104,10 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests {
 		assertEquals("Invalid amount of items", 2, order.getOrderItemCount());
 		OrderItem item = order.getOrderItem(0);
 		assertEquals("Invalid items", "1", item.getId());
-		assertEquals("Invalid items", 15, (int)item.getQuantity());
+		assertEquals("Invalid items", 15, item.getQuantity());
 		item = order.getOrderItem(1);
 		assertEquals("Invalid items", "3", item.getId());
-		assertEquals("Invalid items", 20, (int)item.getQuantity());
+		assertEquals("Invalid items", 20, item.getQuantity());
 	}
 
 	@Test
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
index 0375792f22..b43d3f5152 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
@@ -127,7 +127,7 @@ public class DelegatingActionProxy extends Action {
 	protected Action getDelegateAction(ActionMapping mapping) throws BeansException {
 		WebApplicationContext wac = getWebApplicationContext(getServlet(), mapping.getModuleConfig());
 		String beanName = determineActionBeanName(mapping);
-		return (Action) wac.getBean(beanName, Action.class);
+		return wac.getBean(beanName, Action.class);
 	}
 
 	/**
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
index 1a6506e05c..063ad2f9a7 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
@@ -177,7 +177,7 @@ public class DelegatingRequestProcessor extends RequestProcessor {
 		if (!getWebApplicationContext().containsBean(beanName)) {
 			return null;
 		}
-		return (Action) getWebApplicationContext().getBean(beanName, Action.class);
+		return getWebApplicationContext().getBean(beanName, Action.class);
 	}
 
 	/**
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
index 1f765bd4c8..b614dd30b0 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
@@ -126,7 +126,7 @@ public class DelegatingTilesRequestProcessor extends TilesRequestProcessor {
 		if (!getWebApplicationContext().containsBean(beanName)) {
 			return null;
 		}
-		return (Action) getWebApplicationContext().getBean(beanName, Action.class);
+		return getWebApplicationContext().getBean(beanName, Action.class);
 	}
 
 	/**
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
index 65d2dc4644..61c2f37df6 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
@@ -59,7 +59,7 @@ public class FlashAttributeResultMatchers {
 		return new ResultMatcher() {
 			@SuppressWarnings("unchecked")
 			public void match(MvcResult result) throws Exception {
-				assertEquals("Flash attribute", value, (T) result.getFlashMap().get(name));
+				assertEquals("Flash attribute", value, result.getFlashMap().get(name));
 			}
 		};
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
index 7281894d51..d6ba452f23 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
@@ -269,7 +269,7 @@ public class MockPortletRequest implements PortletRequest {
 	public String getProperty(String key) {
 		Assert.notNull(key, "Property key must not be null");
 		List<String> list = this.properties.get(key);
-		return (list != null && list.size() > 0 ? (String) list.get(0) : null);
+		return (list != null && list.size() > 0 ? list.get(0) : null);
 	}
 
 	public Enumeration<String> getProperties(String key) {
diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
index c8f43b9625..50bdd4c2de 100644
--- a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
+++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
@@ -699,7 +699,7 @@ public class CciTemplateTests {
 		replay(connectionFactory, connection, interaction);
 
 		CciTemplate ct = new CciTemplate(connectionFactory);
-		Record tmpOutputRecord = (Record) ct.execute(interactionSpec,
+		Record tmpOutputRecord = ct.execute(interactionSpec,
 				inputOutputRecord);
 		assertNull(tmpOutputRecord);
 
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 a04b3e44f9..a0b0a2a5b5 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
@@ -129,7 +129,7 @@ public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConv
 
 	@Override
 	public boolean canRead(Class<?> clazz, MediaType mediaType) {
-		return canRead((Type) clazz, null, mediaType);
+		return canRead(clazz, null, mediaType);
 	}
 
 	public boolean canRead(Type type, Class<?> contextClass, MediaType mediaType) {
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 dee7fe7869..448b3be8e8 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
@@ -127,7 +127,7 @@ public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConve
 
 	@Override
 	public boolean canRead(Class<?> clazz, MediaType mediaType) {
-		return canRead((Type) clazz, null, mediaType);
+		return canRead(clazz, null, mediaType);
 	}
 
 	public boolean canRead(Type type, Class<?> contextClass, MediaType mediaType) {
diff --git a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
index c74a8584b5..8adf208b32 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
@@ -48,7 +48,7 @@ public class UnsatisfiedServletRequestParameterException extends ServletRequestB
 	public UnsatisfiedServletRequestParameterException(String[] paramConditions, Map actualParams) {
 		super("");
 		this.paramConditions = paramConditions;
-		this.actualParams = (Map<String, String[]>) actualParams;
+		this.actualParams = actualParams;
 	}
 
 
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
index a34c838195..c01de6e6fc 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
@@ -55,7 +55,7 @@ public class HttpRequestHandlerServlet extends HttpServlet {
 	@Override
 	public void init() throws ServletException {
 		WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
-		this.target = (HttpRequestHandler) wac.getBean(getServletName(), HttpRequestHandler.class);
+		this.target = wac.getBean(getServletName(), HttpRequestHandler.class);
 	}
 
 
@@ -68,7 +68,7 @@ public class HttpRequestHandlerServlet extends HttpServlet {
 			this.target.handleRequest(request, response);
 		}
 		catch (HttpRequestMethodNotSupportedException ex) {
-			String[] supportedMethods = ((HttpRequestMethodNotSupportedException) ex).getSupportedMethods();
+			String[] supportedMethods = ex.getSupportedMethods();
 			if (supportedMethods != null) {
 				response.setHeader("Allow", StringUtils.arrayToDelimitedString(supportedMethods, ", "));
 			}
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 b97d64e654..23e9a81f66 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
@@ -126,7 +126,7 @@ public abstract class HtmlUtils {
 			char character = input.charAt(i);
 			if (characterEntityReferences.isMappedToReference(character)) {
 				escaped.append(HtmlCharacterEntityReferences.HEX_REFERENCE_START);
-				escaped.append(Integer.toString((int) character, 16));
+				escaped.append(Integer.toString(character, 16));
 				escaped.append(HtmlCharacterEntityReferences.REFERENCE_END);
 			}
 			else {
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/Jaxb2RootElementHttpMessageConverterTest.java
index 89cbe30df7..5763411e8e 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/Jaxb2RootElementHttpMessageConverterTest.java
@@ -76,7 +76,7 @@ public class Jaxb2RootElementHttpMessageConverterTest {
 	public void readXmlRootElement() throws Exception {
 		byte[] body = "<rootElement><type s=\"Hello World\"/></rootElement>".getBytes("UTF-8");
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
-		RootElement result = (RootElement) converter.read((Class) RootElement.class, inputMessage);
+		RootElement result = (RootElement) converter.read(RootElement.class, inputMessage);
 		assertEquals("Invalid result", "Hello World", result.type.s);
 	}
 
@@ -85,7 +85,7 @@ public class Jaxb2RootElementHttpMessageConverterTest {
 	public void readXmlRootElementSubclass() throws Exception {
 		byte[] body = "<rootElement><type s=\"Hello World\"/></rootElement>".getBytes("UTF-8");
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
-		RootElementSubclass result = (RootElementSubclass) converter.read((Class) RootElementSubclass.class, inputMessage);
+		RootElementSubclass result = (RootElementSubclass) converter.read(RootElementSubclass.class, inputMessage);
 		assertEquals("Invalid result", "Hello World", result.type.s);
 	}
 
@@ -94,7 +94,7 @@ public class Jaxb2RootElementHttpMessageConverterTest {
 	public void readXmlType() throws Exception {
 		byte[] body = "<foo s=\"Hello World\"/>".getBytes("UTF-8");
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
-		Type result = (Type) converter.read((Class) Type.class, inputMessage);
+		Type result = (Type) converter.read(Type.class, inputMessage);
 		assertEquals("Invalid result", "Hello World", result.s);
 	}
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
index 84ade3b7dd..a0493b62ec 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
@@ -94,7 +94,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe
 	}
 
 	public void testGrandparentTypedDefinitionFound() throws Exception {
-		TestBean dad = (TestBean) applicationContext.getBean("father", TestBean.class);
+		TestBean dad = applicationContext.getBean("father", TestBean.class);
 		assertTrue("Dad has correct name", dad.getName().equals("Albert"));
 	}
 
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 48d2d30788..f271cfe479 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
@@ -132,7 +132,7 @@ public abstract class AbstractMessageConverterMethodArgumentResolver implements
 								logger.debug("Reading [" + targetType + "] as \"" +
 										contentType + "\" using [" + converter + "]");
 							}
-							return (T) genericConverter.read(targetType, contextClass, inputMessage);
+							return genericConverter.read(targetType, contextClass, inputMessage);
 						}
 					}
 					if (targetClass != null) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
index 8b9f21c2cf..51a846808f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
@@ -86,7 +86,7 @@ public class CheckboxTag extends AbstractSingleCheckedElementTag {
 			if (value == null) {
 				throw new IllegalArgumentException("Attribute 'value' is required when binding to non-boolean values");
 			}
-			Object resolvedValue = (value instanceof String ? evaluate("value", (String) value) : value);
+			Object resolvedValue = (value instanceof String ? evaluate("value", value) : value);
 			renderFromValue(resolvedValue, tagWriter);
 		}
 	}
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 94595d54b9..066242271d 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
@@ -72,7 +72,7 @@ public class BeanNameViewResolver extends WebApplicationObjectSupport implements
 			// Allow for ViewResolver chaining.
 			return null;
 		}
-		return (View) context.getBean(viewName, View.class);
+		return context.getBean(viewName, View.class);
 	}
 
 }
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 35dc231f50..68ecc69edb 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
@@ -106,7 +106,7 @@ public class XmlViewResolver extends AbstractCachingViewResolver
 	protected View loadView(String viewName, Locale locale) throws BeansException {
 		BeanFactory factory = initFactory();
 		try {
-			return (View) factory.getBean(viewName, View.class);
+			return factory.getBean(viewName, View.class);
 		}
 		catch (NoSuchBeanDefinitionException ex) {
 			// to allow for ViewResolver chaining
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java
index 2541dfe052..ce3c45d2e7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java
@@ -100,7 +100,7 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe
 	}
 
 	public void testGrandparentTypedDefinitionFound() throws Exception {
-		TestBean dad = (TestBean) applicationContext.getBean("father", TestBean.class);
+		TestBean dad = applicationContext.getBean("father", TestBean.class);
 		assertTrue("Dad has correct name", dad.getName().equals("Albert"));
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
index 8b34815e38..cd36fa2508 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
@@ -338,7 +338,7 @@ public class ServletAnnotationControllerTests {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		servlet.service(request, response);
 		assertEquals("Invalid response status", HttpServletResponse.SC_METHOD_NOT_ALLOWED, response.getStatus());
-		String allowHeader = (String) response.getHeader("Allow");
+		String allowHeader = response.getHeader("Allow");
 		assertNotNull("No Allow header", allowHeader);
 		Set<String> allowedMethods = new HashSet<String>();
 		allowedMethods.addAll(Arrays.asList(StringUtils.delimitedListToStringArray(allowHeader, ", ")));
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 ccc2028efa..d1872128cb 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
@@ -292,7 +292,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		getServlet().service(request, response);
 		assertEquals("Invalid response status", HttpServletResponse.SC_METHOD_NOT_ALLOWED, response.getStatus());
-		String allowHeader = (String) response.getHeader("Allow");
+		String allowHeader = response.getHeader("Allow");
 		assertNotNull("No Allow header", allowHeader);
 		Set<String> allowedMethods = new HashSet<String>();
 		allowedMethods.addAll(Arrays.asList(StringUtils.delimitedListToStringArray(allowHeader, ", ")));
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
index 8ff6f889b5..2c372aa6da 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
@@ -267,7 +267,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests {
 		}
 
 		public String getAsText() {
-			return "F" + (Float) getValue();
+			return "F" + getValue();
 		}
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
index 69a916bcd8..dc9b9404e2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
@@ -242,7 +242,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 				if (value==null) {
 					return null;
 				}
-				return ((Country) value).getName();
+				return value.getName();
 			}
 		});
 		getPageContext().getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "testBean", bindingResult);
@@ -295,7 +295,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 				if (value==null) {
 					return "";
 				}
-				return ((Country) value).getName();
+				return value.getName();
 			}
 		});
 		getPageContext().getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "testBean", bindingResult);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
index 873e98e8e0..d3e02cc7c2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
@@ -297,7 +297,7 @@ public class BaseViewTests extends TestCase {
 	private void checkContainsAll(Map expected, Map<String, Object> actual) {
 		Set<String> keys = expected.keySet();
 		for (Iterator<String> iter = keys.iterator(); iter.hasNext();) {
-			String key = (String) iter.next();
+			String key = iter.next();
 			//System.out.println("Checking model key " + key);
 			assertTrue("Value for model key '" + key + "' must match", actual.get(key) == expected.get(key));
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
index be564fee2d..46d34e7b33 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
@@ -84,7 +84,7 @@ public class InternalResourceViewTests extends TestCase {
 
 		Set<String> keys = model.keySet();
 		for (Iterator<String> it = keys.iterator(); it.hasNext();) {
-			String key = (String) it.next();
+			String key = it.next();
 			assertEquals(model.get(key), request.getAttribute(key));
 		}
 
@@ -129,7 +129,7 @@ public class InternalResourceViewTests extends TestCase {
 
 		Set<String> keys = model.keySet();
 		for (Iterator<String> it = keys.iterator(); it.hasNext();) {
-			String key = (String) it.next();
+			String key = it.next();
 			assertEquals(model.get(key), request.getAttribute(key));
 		}
 
@@ -153,7 +153,7 @@ public class InternalResourceViewTests extends TestCase {
 		expectLastCall().andReturn(null);
 		Set<String> keys = model.keySet();
 		for (Iterator<String> iter = keys.iterator(); iter.hasNext();) {
-			String key = (String) iter.next();
+			String key = iter.next();
 			request.setAttribute(key, model.get(key));
 			expectLastCall().times(1);
 		}
@@ -186,7 +186,7 @@ public class InternalResourceViewTests extends TestCase {
 		expectLastCall().andReturn(null);
 		Set<String> keys = model.keySet();
 		for (Iterator<String> iter = keys.iterator(); iter.hasNext();) {
-			String key = (String) iter.next();
+			String key = iter.next();
 			request.setAttribute(key, model.get(key));
 			expectLastCall().times(1);
 		}
@@ -220,7 +220,7 @@ public class InternalResourceViewTests extends TestCase {
 		expectLastCall().andReturn(null);
 		Set<String> keys = model.keySet();
 		for (Iterator<String> iter = keys.iterator(); iter.hasNext();) {
-			String key = (String) iter.next();
+			String key = iter.next();
 			request.setAttribute(key, model.get(key));
 			expectLastCall().times(1);
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java
index dd94064a9e..8da83022c4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java
@@ -73,7 +73,7 @@ public class FreeMarkerConfigurerTests extends TestCase {
 		FreeMarkerConfigurationFactoryBean fcfb = new FreeMarkerConfigurationFactoryBean();
 		fcfb.setTemplateLoaderPath("file:/mydir");
 		fcfb.afterPropertiesSet();
-		Configuration cfg = (Configuration) fcfb.getObject();
+		Configuration cfg = fcfb.getObject();
 		assertTrue(cfg.getTemplateLoader() instanceof SpringTemplateLoader);
 	}
 
@@ -97,7 +97,7 @@ public class FreeMarkerConfigurerTests extends TestCase {
 		});
 		fcfb.afterPropertiesSet();
 		assertTrue(fcfb.getObject() instanceof Configuration);
-		Configuration fc = (Configuration) fcfb.getObject();
+		Configuration fc = fcfb.getObject();
 		Template ft = fc.getTemplate("test");
 		assertEquals("test", FreeMarkerTemplateUtils.processTemplateIntoString(ft, new HashMap()));
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java
index 08547efa2b..af090a253b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java
@@ -69,7 +69,7 @@ public class VelocityConfigurerTests extends TestCase {
 		vefb.setVelocityPropertiesMap(map);
 		vefb.afterPropertiesSet();
 		assertTrue(vefb.getObject() instanceof VelocityEngine);
-		VelocityEngine ve = (VelocityEngine) vefb.getObject();
+		VelocityEngine ve = vefb.getObject();
 		assertEquals("/mydir", ve.getProperty("myprop"));
 		assertEquals(value, ve.getProperty("myentry"));
 	}
@@ -79,7 +79,7 @@ public class VelocityConfigurerTests extends TestCase {
 		vefb.setResourceLoaderPath("file:/mydir");
 		vefb.afterPropertiesSet();
 		assertTrue(vefb.getObject() instanceof VelocityEngine);
-		VelocityEngine ve = (VelocityEngine) vefb.getObject();
+		VelocityEngine ve = vefb.getObject();
 		assertEquals(new File("/mydir").getAbsolutePath(), ve.getProperty(VelocityEngine.FILE_RESOURCE_LOADER_PATH));
 	}
 
@@ -104,7 +104,7 @@ public class VelocityConfigurerTests extends TestCase {
 		});
 		vefb.afterPropertiesSet();
 		assertTrue(vefb.getObject() instanceof VelocityEngine);
-		VelocityEngine ve = (VelocityEngine) vefb.getObject();
+		VelocityEngine ve = vefb.getObject();
 		assertEquals("test", VelocityEngineUtils.mergeTemplateIntoString(ve, "test", new HashMap()));
 	}
 

From 4d97ff24799e3f6b015d7391790b4ccfdcdcc7a3 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 19 Dec 2012 11:58:15 +0100
Subject: [PATCH 23/36] Fix [dep-ann] warnings with @Deprecated

---
 .../beans/factory/xml/BeanDefinitionParserDelegate.java    | 2 ++
 .../core/convert/support/ConversionServiceFactory.java     | 2 ++
 .../core/enums/AbstractGenericLabeledEnum.java             | 1 +
 .../AbstractAnnotationAwareTransactionalTests.java         | 1 +
 .../org/springframework/test/jpa/AbstractJpaTests.java     | 1 +
 .../test/web/servlet/result/StatusResultMatchers.java      | 3 +++
 .../transaction/interceptor/TransactionAspectUtils.java    | 2 ++
 .../src/main/java/org/springframework/http/HttpStatus.java | 6 +++---
 .../converter/xml/XmlAwareFormHttpMessageConverter.java    | 1 +
 .../mvc/annotation/AnnotationMethodHandlerAdapter.java     | 1 +
 .../AnnotationMethodHandlerExceptionResolver.java          | 1 +
 .../mvc/annotation/DefaultAnnotationHandlerMapping.java    | 1 +
 .../mvc/annotation/ServletAnnotationMappingUtils.java      | 1 +
 .../web/servlet/view/ContentNegotiatingViewResolver.java   | 7 +++++++
 14 files changed, 27 insertions(+), 3 deletions(-)

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 7041e4753b..359975c1ce 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
@@ -90,6 +90,7 @@ public class BeanDefinitionParserDelegate {
 	public static final String MULTI_VALUE_ATTRIBUTE_DELIMITERS = ",; ";
 
 	/** @deprecated as of Spring 3.1 in favor of {@link #MULTI_VALUE_ATTRIBUTE_DELIMITERS} */
+	@Deprecated
 	public static final String BEAN_NAME_DELIMITERS = MULTI_VALUE_ATTRIBUTE_DELIMITERS;
 
 	/**
@@ -343,6 +344,7 @@ public class BeanDefinitionParserDelegate {
 	 * @deprecated in Spring 3.1 in favor of
 	 * {@link #initDefaults(Element, BeanDefinitionParserDelegate)}
 	 */
+	@Deprecated
 	public void initDefaults(Element root) {
 		initDefaults(root, null);
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
index 3772d52996..56d0f2178d 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
@@ -64,6 +64,7 @@ public abstract class ConversionServiceFactory {
 	 * Create a new default GenericConversionService instance that can be safely modified.
 	 * @deprecated in Spring 3.1 in favor of {@link DefaultConversionService#DefaultConversionService()}
 	 */
+	@Deprecated
 	public static GenericConversionService createDefaultConversionService() {
 		return new DefaultConversionService();
 	}
@@ -72,6 +73,7 @@ public abstract class ConversionServiceFactory {
 	 * Populate the given GenericConversionService instance with the set of default converters.
 	 * @deprecated in Spring 3.1 in favor of {@link DefaultConversionService#addDefaultConverters(ConverterRegistry)}
 	 */
+	@Deprecated
 	public static void addDefaultConverters(GenericConversionService conversionService) {
 		DefaultConversionService.addDefaultConverters(conversionService);
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
index f63f0126c1..d027948718 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
@@ -23,6 +23,7 @@ package org.springframework.core.enums;
  * @since 1.2.6
  * @deprecated as of Spring 3.0, in favor of Java 5 enums.
  */
+@Deprecated
 @SuppressWarnings("serial")
 public abstract class AbstractGenericLabeledEnum extends AbstractLabeledEnum {
 
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
index 4cad1e1d9e..93b25efcc5 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
@@ -70,6 +70,7 @@ import org.springframework.util.Assert;
  * @deprecated as of Spring 3.0, in favor of using the listener-based test context framework
  * ({@link org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests})
  */
+@Deprecated
 public abstract class AbstractAnnotationAwareTransactionalTests extends
 		AbstractTransactionalDataSourceSpringContextTests {
 
diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
index 973fbf30aa..f351a00dfa 100644
--- a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -80,6 +80,7 @@ import org.springframework.util.StringUtils;
  * @deprecated as of Spring 3.0, in favor of using the listener-based test context framework
  * ({@link org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests})
  */
+@Deprecated
 public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactionalTests {
 
 	private static final String DEFAULT_ORM_XML_LOCATION = "META-INF/orm.xml";
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
index 93534aae6f..88c4083b6c 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
@@ -384,6 +384,7 @@ public class StatusResultMatchers {
 	  * Assert the response status code is {@code HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE} (419).
 	  * @deprecated matching the deprecation of HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE
 	  */
+	 @Deprecated
 	 public ResultMatcher isInsufficientSpaceOnResource() {
 		 return matcher(HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE);
 	 }
@@ -392,6 +393,7 @@ public class StatusResultMatchers {
 	  * Assert the response status code is {@code HttpStatus.METHOD_FAILURE} (420).
 	  * @deprecated matching the deprecation of HttpStatus.METHOD_FAILURE
 	  */
+	 @Deprecated
 	 public ResultMatcher isMethodFailure() {
 		 return matcher(HttpStatus.METHOD_FAILURE);
 	 }
@@ -400,6 +402,7 @@ public class StatusResultMatchers {
 	  * Assert the response status code is {@code HttpStatus.DESTINATION_LOCKED} (421).
 	  * @deprecated matching the deprecation of HttpStatus.DESTINATION_LOCKED
 	  */
+	 @Deprecated
 	 public ResultMatcher isDestinationLocked() {
 		 return matcher(HttpStatus.DESTINATION_LOCKED);
 	 }
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java
index e6cdebadd8..f8f8c83d47 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java
@@ -43,6 +43,7 @@ public abstract class TransactionAspectUtils {
 	 * @deprecated as of Spring 3.1.2 in favor of
 	 * {@link BeanFactoryAnnotationUtils#qualifiedBeanOfType(BeanFactory, Class, String)}
 	 */
+	@Deprecated
 	public static PlatformTransactionManager getTransactionManager(BeanFactory beanFactory, String qualifier) {
 		return BeanFactoryAnnotationUtils.qualifiedBeanOfType(beanFactory, PlatformTransactionManager.class, qualifier);
 	}
@@ -56,6 +57,7 @@ public abstract class TransactionAspectUtils {
 	 * @deprecated as of Spring 3.1.2 in favor of
 	 * {@link BeanFactoryAnnotationUtils#qualifiedBeanOfType(BeanFactory, Class, String)}
 	 */
+	@Deprecated
 	public static PlatformTransactionManager getTransactionManager(ConfigurableListableBeanFactory bf, String qualifier) {
 		return BeanFactoryAnnotationUtils.qualifiedBeanOfType(bf, PlatformTransactionManager.class, qualifier);
 	}
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 9dbe3ff70e..74dc2af2c2 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpStatus.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
@@ -254,15 +254,15 @@ public enum HttpStatus {
 	/**
 	 * @deprecated See <a href="http://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-webdav-protocol-06.txt">WebDAV Draft Changes</a>
 	 */
-	INSUFFICIENT_SPACE_ON_RESOURCE(419, "Insufficient Space On Resource"),
+	@Deprecated INSUFFICIENT_SPACE_ON_RESOURCE(419, "Insufficient Space On Resource"),
 	/**
 	 * @deprecated See <a href="http://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-webdav-protocol-06.txt">WebDAV Draft Changes</a>
 	 */
-	METHOD_FAILURE(420, "Method Failure"),
+	@Deprecated METHOD_FAILURE(420, "Method Failure"),
 	/**
 	 * @deprecated See <a href="http://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-webdav-protocol-06.txt">WebDAV Draft Changes</a>
 	 */
-	DESTINATION_LOCKED(421, "Destination Locked"),
+	@Deprecated DESTINATION_LOCKED(421, "Destination Locked"),
 	/**
 	 * {@code 422 Unprocessable Entity}.
 	 * @see <a href="http://tools.ietf.org/html/rfc4918#section-11.2">WebDAV</a>
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 83027eabf6..1aee1d6a05 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
@@ -27,6 +27,7 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage
  * @since 3.0.3
  * @deprecated in favor of {@link AllEncompassingFormHttpMessageConverter}
  */
+@Deprecated
 public class XmlAwareFormHttpMessageConverter extends FormHttpMessageConverter {
 
 	public XmlAwareFormHttpMessageConverter() {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
index f531044c08..f62226435d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
@@ -142,6 +142,7 @@ import org.springframework.web.util.WebUtils;
  * @deprecated in Spring 3.2 in favor of
  * {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter RequestMappingHandlerAdapter}
  */
+@Deprecated
 public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 		implements HandlerAdapter, Ordered, BeanFactoryAware {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
index 3683d67392..d4c6cccab3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
@@ -84,6 +84,7 @@ import org.springframework.web.servlet.support.RequestContextUtils;
  * @deprecated as of Spring 3.2, in favor of
  * {@link org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver ExceptionHandlerExceptionResolver}
  */
+@Deprecated
 public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExceptionResolver {
 
 	// dummy method placeholder
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
index 34027fbfe3..f7f1c163d8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
@@ -83,6 +83,7 @@ import org.springframework.web.servlet.handler.AbstractDetectingUrlHandlerMappin
  * @deprecated in Spring 3.2 in favor of
  * {@link org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping RequestMappingHandlerMapping}
  */
+@Deprecated
 public class DefaultAnnotationHandlerMapping extends AbstractDetectingUrlHandlerMapping {
 
 	static final String USE_DEFAULT_SUFFIX_PATTERN = DefaultAnnotationHandlerMapping.class.getName() + ".useDefaultSuffixPattern";
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
index c898e413cf..62bbc4ebc7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
@@ -35,6 +35,7 @@ import org.springframework.web.util.WebUtils;
  * @deprecated in 3.2 together with {@link DefaultAnnotationHandlerMapping},
  * {@link AnnotationMethodHandlerAdapter}, and {@link AnnotationMethodHandlerExceptionResolver}.
  */
+@Deprecated
 abstract class ServletAnnotationMappingUtils {
 
 	/**
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 fa2f02d66f..cc49726297 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
@@ -132,6 +132,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 	 *
 	 * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)}
 	 */
+	@Deprecated
 	public void setFavorPathExtension(boolean favorPathExtension) {
 		this.cnManagerFactoryBean.setFavorParameter(favorPathExtension);
 	}
@@ -142,6 +143,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 	 *
 	 * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)}
 	 */
+	@Deprecated
 	public void setUseJaf(boolean useJaf) {
 		this.cnManagerFactoryBean.setUseJaf(useJaf);
 	}
@@ -155,6 +157,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 	 *
 	 * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)}
 	 */
+	@Deprecated
 	public void setFavorParameter(boolean favorParameter) {
 		this.cnManagerFactoryBean.setFavorParameter(favorParameter);
 	}
@@ -165,6 +168,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 	 *
 	 * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)}
 	 */
+	@Deprecated
 	public void setParameterName(String parameterName) {
 		this.cnManagerFactoryBean.setParameterName(parameterName);
 	}
@@ -177,6 +181,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 	 *
 	 * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)}
 	 */
+	@Deprecated
 	public void setIgnoreAcceptHeader(boolean ignoreAcceptHeader) {
 		this.cnManagerFactoryBean.setIgnoreAcceptHeader(ignoreAcceptHeader);
 	}
@@ -188,6 +193,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 	 *
 	 * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)}
 	 */
+	@Deprecated
 	public void setMediaTypes(Map<String, String> mediaTypes) {
 		if (mediaTypes != null) {
 			this.cnManagerFactoryBean.getMediaTypes().putAll(mediaTypes);
@@ -201,6 +207,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 	 *
 	 * @deprecated use {@link #setContentNegotiationManager(ContentNegotiationManager)}
 	 */
+	@Deprecated
 	public void setDefaultContentType(MediaType defaultContentType) {
 		this.cnManagerFactoryBean.setDefaultContentType(defaultContentType);
 	}

From 8d2e125e7b5557ec3a2c76380a4ec0019dbf1b32 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 19 Dec 2012 15:26:57 +0100
Subject: [PATCH 24/36] Fix [rawtypes] compiler warnings

 - Suppress rawtypes warnings for src/main
 - Enable rawtypes warnings for src/test

This commit attempts to to resolve all rawtypes problems across tests as
aggressively as possible, i.e. without regard for binary compatibility,
whereas main sources must be treated much more cautiously with an eye
toward compatibility.
---
 .../MethodLocatingFactoryBeanTests.java       |  2 +
 .../aop/framework/AbstractAopProxyTests.java  | 34 +++++------
 .../aop/framework/CglibProxyTests.java        | 26 ++++-----
 .../aop/framework/JdkDynamicProxyTests.java   | 10 ++--
 .../aop/framework/ProxyFactoryBeanTests.java  |  4 +-
 .../aop/scope/ScopedProxyTests.java           |  2 +-
 .../beans/IndexedTestBean.java                | 43 +++++++-------
 .../org/springframework/beans/TestBean.java   | 44 +++++++-------
 .../beans/factory/DummyFactory.java           |  4 +-
 .../springframework/beans/factory/HasMap.java | 18 +++---
 .../beans/factory/access/TestBean.java        |  6 +-
 .../beans/factory/config/SimpleMapScope.java  |  8 +--
 .../CollectingReaderEventListener.java        | 26 ++++-----
 .../context/BeanThatListens.java              |  4 +-
 .../springframework/context/TestListener.java |  2 +-
 ...ommonAnnotationBeanPostProcessorTests.java |  2 +-
 .../context/annotation/SimpleConfigTests.java |  2 +-
 .../ConfigurationClassProcessingTests.java    |  2 +-
 .../event/ApplicationContextEventTests.java   | 12 ++--
 .../EventPublicationInterceptorTests.java     |  4 +-
 .../context/event/LifecycleEventTests.java    |  2 +-
 .../ApplicationContextExpressionTests.java    |  2 +-
 .../ConversionServiceFactoryBeanTests.java    |  5 +-
 .../DefaultLifecycleProcessorTests.java       |  4 +-
 .../FactoryBeanAndApplicationListener.java    |  6 +-
 .../ResourceBundleMessageSourceTests.java     |  4 +-
 .../context/support/Spr7283Tests.java         |  2 +-
 ...ticApplicationContextMulticasterTests.java |  2 +-
 .../StaticApplicationContextTests.java        |  2 +-
 .../support/StaticMessageSourceTests.java     |  4 +-
 .../LocalSlsbInvokerInterceptorTests.java     |  6 +-
 ...mpleRemoteSlsbInvokerInterceptorTests.java |  2 +-
 .../jmx/export/MBeanExporterTests.java        |  2 +-
 .../AbstractMetadataAssemblerTests.java       |  2 +-
 ...aceBasedMBeanInfoAssemblerCustomTests.java |  2 +-
 ...aceBasedMBeanInfoAssemblerMappedTests.java |  2 +-
 .../remoting/rmi/RmiSupportTests.java         | 18 +++---
 .../scheduling/timer/TimerSupportTests.java   |  2 +-
 .../scripting/bsh/BshScriptFactoryTests.java  | 14 ++---
 .../groovy/GroovyClassLoadingTests.java       |  8 +--
 .../groovy/GroovyScriptFactoryTests.java      |  6 +-
 .../jruby/JRubyScriptFactoryTests.java        | 12 ++--
 .../scripting/jruby/WrapperAdder.java         |  2 +-
 .../org/springframework/ui/ModelMapTests.java |  2 +-
 .../DataBinderFieldAccessTests.java           |  6 +-
 .../validation/DataBinderTests.java           | 22 +++----
 .../validation/ValidationUtilsTests.java      |  4 +-
 .../beanvalidation/ValidatorFactoryTests.java |  2 +-
 .../core/ConventionsTests.java                |  8 +--
 ...ableTableParameterNameDiscovererTests.java | 23 +++-----
 .../org/springframework/util/AssertTests.java | 10 ++--
 .../util/AutoPopulatingListTests.java         | 14 ++---
 .../util/CollectionUtilsTests.java            | 58 +++++++++----------
 .../util/MethodInvokerTests.java              | 16 ++---
 54 files changed, 266 insertions(+), 265 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
index 7f5d93833f..e06876b430 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
@@ -106,6 +106,7 @@ public final class MethodLocatingFactoryBeanTests {
 	}
 
 	@Test
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void testSunnyDayPath() throws Exception {
 		expect((Class) beanFactory.getType(BEAN_NAME)).andReturn(String.class);
 		replay(beanFactory);
@@ -121,6 +122,7 @@ public final class MethodLocatingFactoryBeanTests {
 	}
 
 	@Test(expected=IllegalArgumentException.class)
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void testWhereMethodCannotBeResolved() {
 		expect((Class) beanFactory.getType(BEAN_NAME)).andReturn(String.class);
 		replay(beanFactory);
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
index 79fcd4e225..5af410a894 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
@@ -120,7 +120,7 @@ public abstract class AbstractAopProxyTests {
 
 	@Test
 	public void testNoInterceptorsAndNoTarget() {
-		AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class});
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] {ITestBean.class});
 		// Add no interceptors
 		try {
 			AopProxy aop = createAopProxy(pc);
@@ -418,7 +418,7 @@ public abstract class AbstractAopProxyTests {
 				return s;
 			}
 		};
-		AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class});
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] {ITestBean.class});
 		if (context) {
 			pc.addAdvice(ExposeInvocationInterceptor.INSTANCE);
 		}
@@ -445,7 +445,7 @@ public abstract class AbstractAopProxyTests {
 		TestBean raw = new OwnSpouse();
 
 		ProxyCreatorSupport pc = new ProxyCreatorSupport();
-		pc.setInterfaces(new Class[] {ITestBean.class});
+		pc.setInterfaces(new Class<?>[] {ITestBean.class});
 		pc.setTarget(raw);
 
 		ITestBean tb = (ITestBean) createProxy(pc);
@@ -461,7 +461,7 @@ public abstract class AbstractAopProxyTests {
 				throw expectedException;
 			}
 		};
-		AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class});
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] {ITestBean.class});
 		pc.addAdvice(ExposeInvocationInterceptor.INSTANCE);
 		pc.addAdvice(mi);
 
@@ -495,7 +495,7 @@ public abstract class AbstractAopProxyTests {
 				throw unexpectedException;
 			}
 		};
-		AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class});
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] {ITestBean.class});
 		pc.addAdvice(ExposeInvocationInterceptor.INSTANCE);
 		pc.addAdvice(mi);
 
@@ -527,7 +527,7 @@ public abstract class AbstractAopProxyTests {
 				throw unexpectedException;
 			}
 		};
-		AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class});
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] {ITestBean.class});
 		pc.addAdvice(ExposeInvocationInterceptor.INSTANCE);
 		pc.addAdvice(mi);
 
@@ -555,7 +555,7 @@ public abstract class AbstractAopProxyTests {
 	@Test
 	public void testTargetCanGetInvocationEvenIfNoAdviceChain() throws Throwable {
 		NeedsToSeeProxy target = new NeedsToSeeProxy();
-		AdvisedSupport pc = new AdvisedSupport(new Class[] {INeedsToSeeProxy.class});
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] {INeedsToSeeProxy.class});
 		pc.setTarget(target);
 		pc.setExposeProxy(true);
 
@@ -570,7 +570,7 @@ public abstract class AbstractAopProxyTests {
 	public void testTargetCanGetInvocation() throws Throwable {
 		final InvocationCheckExposedInvocationTestBean expectedTarget = new InvocationCheckExposedInvocationTestBean();
 
-		AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class, IOther.class});
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] {ITestBean.class, IOther.class});
 		pc.addAdvice(ExposeInvocationInterceptor.INSTANCE);
 		TrapTargetInterceptor tii = new TrapTargetInterceptor() {
 			public Object invoke(MethodInvocation invocation) throws Throwable {
@@ -615,7 +615,7 @@ public abstract class AbstractAopProxyTests {
 	@Test
 	public void testMixinWithIntroductionAdvisor() throws Throwable {
 		TestBean tb = new TestBean();
-		ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class});
+		ProxyFactory pc = new ProxyFactory(new Class<?>[] {ITestBean.class});
 		pc.addAdvisor(new LockMixinAdvisor());
 		pc.setTarget(tb);
 
@@ -625,7 +625,7 @@ public abstract class AbstractAopProxyTests {
 	@Test
 	public void testMixinWithIntroductionInfo() throws Throwable {
 		TestBean tb = new TestBean();
-		ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class});
+		ProxyFactory pc = new ProxyFactory(new Class<?>[] {ITestBean.class});
 		// We don't use an IntroductionAdvisor, we can just add an advice that implements IntroductionInfo
 		pc.addAdvice(new LockMixin());
 		pc.setTarget(tb);
@@ -664,7 +664,7 @@ public abstract class AbstractAopProxyTests {
 	@Test
 	public void testReplaceArgument() throws Throwable {
 		TestBean tb = new TestBean();
-		ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class});
+		ProxyFactory pc = new ProxyFactory(new Class<?>[] {ITestBean.class});
 		pc.setTarget(tb);
 		pc.addAdvisor(new StringSetterNullReplacementAdvice());
 
@@ -952,7 +952,7 @@ public abstract class AbstractAopProxyTests {
 	public void testProxyConfigString() {
 		TestBean target = new TestBean();
 		ProxyFactory pc = new ProxyFactory(target);
-		pc.setInterfaces(new Class[] {ITestBean.class});
+		pc.setInterfaces(new Class<?>[] {ITestBean.class});
 		pc.addAdvice(new NopInterceptor());
 		MethodBeforeAdvice mba = new CountingBeforeAdvice();
 		Advisor advisor = new DefaultPointcutAdvisor(new NameMatchMethodPointcut(), mba);
@@ -968,7 +968,7 @@ public abstract class AbstractAopProxyTests {
 	public void testCanPreventCastToAdvisedUsingOpaque() {
 		TestBean target = new TestBean();
 		ProxyFactory pc = new ProxyFactory(target);
-		pc.setInterfaces(new Class[] {ITestBean.class});
+		pc.setInterfaces(new Class<?>[] {ITestBean.class});
 		pc.addAdvice(new NopInterceptor());
 		CountingBeforeAdvice mba = new CountingBeforeAdvice();
 		Advisor advisor = new DefaultPointcutAdvisor(new NameMatchMethodPointcut().addMethodName("setAge"), mba);
@@ -1069,7 +1069,7 @@ public abstract class AbstractAopProxyTests {
 	@Test
 	public void testDynamicMethodPointcutThatAlwaysAppliesStatically() throws Throwable {
 		TestBean tb = new TestBean();
-		ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class});
+		ProxyFactory pc = new ProxyFactory(new Class<?>[] {ITestBean.class});
 		TestDynamicPointcutAdvice dp = new TestDynamicPointcutAdvice(new NopInterceptor(), "getAge");
 		pc.addAdvisor(dp);
 		pc.setTarget(tb);
@@ -1085,7 +1085,7 @@ public abstract class AbstractAopProxyTests {
 	@Test
 	public void testDynamicMethodPointcutThatAppliesStaticallyOnlyToSetters() throws Throwable {
 		TestBean tb = new TestBean();
-		ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class});
+		ProxyFactory pc = new ProxyFactory(new Class<?>[] {ITestBean.class});
 		// Could apply dynamically to getAge/setAge but not to getName
 		TestDynamicPointcutForSettersOnly dp = new TestDynamicPointcutForSettersOnly(new NopInterceptor(), "Age");
 		pc.addAdvisor(dp);
@@ -1107,7 +1107,7 @@ public abstract class AbstractAopProxyTests {
 	@Test
 	public void testStaticMethodPointcut() throws Throwable {
 		TestBean tb = new TestBean();
-		ProxyFactory pc = new ProxyFactory(new Class[] {ITestBean.class});
+		ProxyFactory pc = new ProxyFactory(new Class<?>[] {ITestBean.class});
 		NopInterceptor di = new NopInterceptor();
 		TestStaticPointcutAdvice sp = new TestStaticPointcutAdvice(di, "getAge");
 		pc.addAdvisor(sp);
@@ -1353,7 +1353,7 @@ public abstract class AbstractAopProxyTests {
 				return invocation.proceed();
 			}
 		};
-		AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class});
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] {ITestBean.class});
 		MapAwareMethodInterceptor mami1 = new MapAwareMethodInterceptor(new HashMap<String, String>(), new HashMap<String, String>());
 		Map<String, String> firstValuesToAdd = new HashMap<String, String>();
 		firstValuesToAdd.put("test", "");
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 a1abd8e2fe..a52cbe3cc0 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
@@ -87,7 +87,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 
 	@Test
 	public void testNoTarget() {
-		AdvisedSupport pc = new AdvisedSupport(new Class[]{ITestBean.class});
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[]{ITestBean.class});
 		pc.addAdvice(new NopInterceptor());
 		try {
 			AopProxy aop = createAopProxy(pc);
@@ -104,7 +104,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 		ProtectedMethodTestBean bean = new ProtectedMethodTestBean();
 		mockTargetSource.setTarget(bean);
 
-		AdvisedSupport as = new AdvisedSupport(new Class[]{});
+		AdvisedSupport as = new AdvisedSupport(new Class<?>[]{});
 		as.setTargetSource(mockTargetSource);
 		as.addAdvice(new NopInterceptor());
 		AopProxy aop = new CglibAopProxy(as);
@@ -158,7 +158,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 		CglibTestBean bean = new CglibTestBean();
 		bean.setName("Rob Harrop");
 
-		AdvisedSupport as = new AdvisedSupport(new Class[]{});
+		AdvisedSupport as = new AdvisedSupport(new Class<?>[]{});
 		as.setTarget(bean);
 		as.addAdvice(new NopInterceptor());
 		AopProxy aop = new CglibAopProxy(as);
@@ -174,7 +174,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 		CglibTestBean target = new CglibTestBean();
 		target.setName("Rob Harrop");
 
-		AdvisedSupport pc = new AdvisedSupport(new Class[]{});
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[]{});
 		pc.setFrozen(true);
 		pc.setTarget(target);
 
@@ -202,7 +202,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 	}
 
 	private ITestBean getAdvisedProxy(TestBean target) {
-		ProxyFactory pf = new ProxyFactory(new Class[]{ITestBean.class});
+		ProxyFactory pf = new ProxyFactory(new Class<?>[]{ITestBean.class});
 		pf.setProxyTargetClass(true);
 
 		MethodInterceptor advice = new NopInterceptor();
@@ -241,7 +241,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 	}
 
 	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());
@@ -258,11 +258,11 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 		target.reset();
 
 		mockTargetSource.setTarget(target);
-		AdvisedSupport pc = new AdvisedSupport(new Class[]{});
+		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});
+				new Class<?>[] {String.class, int.class});
 
 		NoArgCtorTestBean proxy = (NoArgCtorTestBean) aop.getProxy();
 		proxy = (NoArgCtorTestBean) aop.getProxy();
@@ -275,7 +275,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 		ITestBean target = new TestBean();
 
 		mockTargetSource.setTarget(target);
-		AdvisedSupport as = new AdvisedSupport(new Class[]{});
+		AdvisedSupport as = new AdvisedSupport(new Class<?>[]{});
 		as.setTargetSource(mockTargetSource);
 		as.addAdvice(new NopInterceptor());
 		CglibAopProxy cglib = new CglibAopProxy(as);
@@ -283,7 +283,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 		ITestBean proxy1 = (ITestBean) cglib.getProxy();
 
 		mockTargetSource.setTarget(proxy1);
-		as = new AdvisedSupport(new Class[]{});
+		as = new AdvisedSupport(new Class<?>[]{});
 		as.setTargetSource(mockTargetSource);
 		as.addAdvice(new NopInterceptor());
 		cglib = new CglibAopProxy(as);
@@ -296,7 +296,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 		ITestBean target = new TestBean();
 		mockTargetSource.setTarget(target);
 
-		AdvisedSupport as = new AdvisedSupport(new Class[]{});
+		AdvisedSupport as = new AdvisedSupport(new Class<?>[]{});
 		as.setTargetSource(mockTargetSource);
 		as.addAdvice(new NopInterceptor());
 		as.addInterface(Serializable.class);
@@ -305,7 +305,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 		ITestBean proxy1 = (ITestBean) cglib.getProxy();
 
 		mockTargetSource.setTarget(proxy1);
-		as = new AdvisedSupport(new Class[]{});
+		as = new AdvisedSupport(new Class<?>[]{});
 		as.setTargetSource(mockTargetSource);
 		as.addAdvice(new NopInterceptor());
 		cglib = new CglibAopProxy(as);
@@ -319,7 +319,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 		ExceptionThrower bean = new ExceptionThrower();
 		mockTargetSource.setTarget(bean);
 
-		AdvisedSupport as = new AdvisedSupport(new Class[]{});
+		AdvisedSupport as = new AdvisedSupport(new Class<?>[]{});
 		as.setTargetSource(mockTargetSource);
 		as.addAdvice(new NopInterceptor());
 		AopProxy aop = new CglibAopProxy(as);
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
index 422517273f..b845070078 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
@@ -66,7 +66,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 	public void testProxyIsJustInterface() throws Throwable {
 		TestBean raw = new TestBean();
 		raw.setAge(32);
-		AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class});
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] {ITestBean.class});
 		pc.setTarget(raw);
 		JdkDynamicAopProxy aop = new JdkDynamicAopProxy(pc);
 
@@ -80,7 +80,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 		int age = 25;
 		MethodInterceptor mi = createMock(MethodInterceptor.class);
 
-		AdvisedSupport pc = new AdvisedSupport(new Class[] { ITestBean.class });
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] { ITestBean.class });
 		pc.addAdvice(mi);
 		AopProxy aop = createAopProxy(pc);
 
@@ -101,7 +101,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 			}
 		};
 
-		AdvisedSupport pc = new AdvisedSupport(new Class[] { ITestBean.class, IOther.class });
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] { ITestBean.class, IOther.class });
 		pc.addAdvice(ExposeInvocationInterceptor.INSTANCE);
 		TrapTargetInterceptor tii = new TrapTargetInterceptor() {
 			public Object invoke(MethodInvocation invocation) throws Throwable {
@@ -130,7 +130,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 	public void testProxyNotWrappedIfIncompatible() {
 		FooBar bean = new FooBar();
 		ProxyCreatorSupport as = new ProxyCreatorSupport();
-		as.setInterfaces(new Class[] {Foo.class});
+		as.setInterfaces(new Class<?>[] {Foo.class});
 		as.setTarget(bean);
 
 		Foo proxy = (Foo) createProxy(as);
@@ -140,7 +140,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 	}
 
 	public void testEqualsAndHashCodeDefined() throws Exception {
-		AdvisedSupport as = new AdvisedSupport(new Class[]{Named.class});
+		AdvisedSupport as = new AdvisedSupport(new Class<?>[]{Named.class});
 		as.setTarget(new Person());
 		JdkDynamicAopProxy aopProxy = new JdkDynamicAopProxy(as);
 		Named proxy = (Named) aopProxy.getProxy();
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
index eb5f420b03..6c255751b4 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
@@ -539,7 +539,7 @@ public final class ProxyFactoryBeanTests {
 		// 2 globals + 2 explicit
 		assertEquals("Have 2 globals and 2 explicit advisors", 3, pfb.getAdvisors().length);
 
-		ApplicationListener l = (ApplicationListener) factory.getBean("validGlobals");
+		ApplicationListener<?> l = (ApplicationListener<?>) factory.getBean("validGlobals");
 		agi = (AddedGlobalInterface) l;
 		assertTrue(agi.globalsAdded() == -1);
 
@@ -760,7 +760,7 @@ public final class ProxyFactoryBeanTests {
 		}
 
 		public Class<?>[] getInterfaces() {
-			return new Class[] { AddedGlobalInterface.class };
+			return new Class<?>[] { AddedGlobalInterface.class };
 		}
 
 		public boolean isPerInstance() {
diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
index 6448a2d82b..56b6067394 100644
--- a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
@@ -126,7 +126,7 @@ public class ScopedProxyTests {
 		assertTrue(scope.getMap().containsKey("scopedTarget.scopedList"));
 		assertEquals(ArrayList.class, scope.getMap().get("scopedTarget.scopedList").getClass());
 
-		ArrayList deserialized = (ArrayList) SerializationTestUtils.serializeAndDeserialize(tb.getFriends());
+		ArrayList<?> deserialized = (ArrayList<?>) SerializationTestUtils.serializeAndDeserialize(tb.getFriends());
 		assertNotNull(deserialized);
 		assertTrue(AopUtils.isCglibProxy(deserialized));
 		assertTrue(deserialized.contains("myFriend"));
diff --git a/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java
index ddb091770e..e44bac1740 100644
--- a/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java
@@ -34,17 +34,17 @@ public class IndexedTestBean {
 
 	private TestBean[] array;
 
-	private Collection collection;
+	private Collection<?> collection;
 
-	private List list;
+	private List<TestBean> list;
 
-	private Set set;
+	private Set<TestBean> set;
 
-	private SortedSet sortedSet;
+	private SortedSet<?> sortedSet;
 
-	private Map map;
+	private Map<String, Object> map;
 
-	private SortedMap sortedMap;
+	private SortedMap<?, ?> sortedMap;
 
 
 	public IndexedTestBean() {
@@ -69,17 +69,17 @@ public class IndexedTestBean {
 		TestBean tbX = new TestBean("nameX", 0);
 		TestBean tbY = new TestBean("nameY", 0);
 		this.array = new TestBean[] {tb0, tb1};
-		this.list = new ArrayList();
+		this.list = new ArrayList<>();
 		this.list.add(tb2);
 		this.list.add(tb3);
-		this.set = new TreeSet();
+		this.set = new TreeSet<>();
 		this.set.add(tb6);
 		this.set.add(tb7);
-		this.map = new HashMap();
+		this.map = new HashMap<>();
 		this.map.put("key1", tb4);
 		this.map.put("key2", tb5);
 		this.map.put("key.3", tb5);
-		List list = new ArrayList();
+		List<Object> list = new ArrayList<>();
 		list.add(tbX);
 		list.add(tbY);
 		this.map.put("key4", list);
@@ -94,51 +94,52 @@ public class IndexedTestBean {
 		this.array = array;
 	}
 
-	public Collection getCollection() {
+	public Collection<?> getCollection() {
 		return collection;
 	}
 
-	public void setCollection(Collection collection) {
+	public void setCollection(Collection<?> collection) {
 		this.collection = collection;
 	}
 
-	public List getList() {
+	public List<TestBean> getList() {
 		return list;
 	}
 
-	public void setList(List list) {
+	public void setList(List<TestBean> list) {
 		this.list = list;
 	}
 
-	public Set getSet() {
+	public Set<TestBean> getSet() {
 		return set;
 	}
 
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public void setSet(Set set) {
 		this.set = set;
 	}
 
-	public SortedSet getSortedSet() {
+	public SortedSet<?> getSortedSet() {
 		return sortedSet;
 	}
 
-	public void setSortedSet(SortedSet sortedSet) {
+	public void setSortedSet(SortedSet<?> sortedSet) {
 		this.sortedSet = sortedSet;
 	}
 
-	public Map getMap() {
+	public Map<String, Object> getMap() {
 		return map;
 	}
 
-	public void setMap(Map map) {
+	public void setMap(Map<String, Object> map) {
 		this.map = map;
 	}
 
-	public SortedMap getSortedMap() {
+	public SortedMap<?, ?> getSortedMap() {
 		return sortedMap;
 	}
 
-	public void setSortedMap(SortedMap sortedMap) {
+	public void setSortedMap(SortedMap<?, ?> sortedMap) {
 		this.sortedMap = sortedMap;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/beans/TestBean.java b/spring-context/src/test/java/org/springframework/beans/TestBean.java
index 7842bbfeac..b93bf96be3 100644
--- a/spring-context/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/TestBean.java
@@ -40,7 +40,7 @@ import org.springframework.util.ObjectUtils;
  * @author Juergen Hoeller
  * @since 15 April 2001
  */
-public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable {
+public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable<Object> {
 
 	private String beanName;
 
@@ -70,13 +70,13 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 
 	private Float myFloat = new Float(0.0);
 
-	private Collection friends = new LinkedList();
+	private Collection<? super Object> friends = new LinkedList<>();
 
-	private Set someSet = new HashSet();
+	private Set<?> someSet = new HashSet<>();
 
-	private Map someMap = new HashMap();
+	private Map<?, ?> someMap = new HashMap<>();
 
-	private List someList = new ArrayList();
+	private List<?> someList = new ArrayList<>();
 
 	private Properties someProperties = new Properties();
 
@@ -94,9 +94,9 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 
 	private Boolean someBoolean;
 
-	private List otherColours;
+	private List<?> otherColours;
 
-	private List pets;
+	private List<?> pets;
 
 
 	public TestBean() {
@@ -120,15 +120,15 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
-	public TestBean(List someList) {
+	public TestBean(List<?> someList) {
 		this.someList = someList;
 	}
 
-	public TestBean(Set someSet) {
+	public TestBean(Set<?> someSet) {
 		this.someSet = someSet;
 	}
 
-	public TestBean(Map someMap) {
+	public TestBean(Map<?, ?> someMap) {
 		this.someMap = someMap;
 	}
 
@@ -262,35 +262,35 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.myFloat = myFloat;
 	}
 
-	public Collection getFriends() {
+	public Collection<? super Object> getFriends() {
 		return friends;
 	}
 
-	public void setFriends(Collection friends) {
+	public void setFriends(Collection<? super Object> friends) {
 		this.friends = friends;
 	}
 
-	public Set getSomeSet() {
+	public Set<?> getSomeSet() {
 		return someSet;
 	}
 
-	public void setSomeSet(Set someSet) {
+	public void setSomeSet(Set<?> someSet) {
 		this.someSet = someSet;
 	}
 
-	public Map getSomeMap() {
+	public Map<?, ?> getSomeMap() {
 		return someMap;
 	}
 
-	public void setSomeMap(Map someMap) {
+	public void setSomeMap(Map<?, ?> someMap) {
 		this.someMap = someMap;
 	}
 
-	public List getSomeList() {
+	public List<?> getSomeList() {
 		return someList;
 	}
 
-	public void setSomeList(List someList) {
+	public void setSomeList(List<?> someList) {
 		this.someList = someList;
 	}
 
@@ -350,19 +350,19 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.nestedIndexedBean = nestedIndexedBean;
 	}
 
-	public List getOtherColours() {
+	public List<?> getOtherColours() {
 		return otherColours;
 	}
 
-	public void setOtherColours(List otherColours) {
+	public void setOtherColours(List<?> otherColours) {
 		this.otherColours = otherColours;
 	}
 
-	public List getPets() {
+	public List<?> getPets() {
 		return pets;
 	}
 
-	public void setPets(List pets) {
+	public void setPets(List<?> pets) {
 		this.pets = pets;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
index c5ee4d060b..b9999baa5e 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
@@ -32,7 +32,7 @@ import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
  * @since 10.03.2003
  */
 public class DummyFactory
-		implements FactoryBean, BeanNameAware, BeanFactoryAware, InitializingBean, DisposableBean {
+		implements FactoryBean<Object>, BeanNameAware, BeanFactoryAware, InitializingBean, DisposableBean {
 
 	public static final String SINGLETON_NAME = "Factory singleton";
 
@@ -158,7 +158,7 @@ public class DummyFactory
 		}
 	}
 
-	public Class getObjectType() {
+	public Class<TestBean> getObjectType() {
 		return TestBean.class;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java b/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java
index 361746b32a..1c1708eca5 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java
@@ -28,34 +28,34 @@ import java.util.Set;
  */
 public class HasMap {
 
-	private Map map;
+	private Map<?, ?> map;
 
-	private Set set;
+	private Set<?> set;
 
 	private Properties props;
 
 	private Object[] objectArray;
 
-	private Class[] classArray;
+	private Class<?>[] classArray;
 
 	private Integer[] intArray;
 
 	private HasMap() {
 	}
 
-	public Map getMap() {
+	public Map<?, ?> getMap() {
 		return map;
 	}
 
-	public void setMap(Map map) {
+	public void setMap(Map<?, ?> map) {
 		this.map = map;
 	}
 
-	public Set getSet() {
+	public Set<?> getSet() {
 		return set;
 	}
 
-	public void setSet(Set set) {
+	public void setSet(Set<?> set) {
 		this.set = set;
 	}
 
@@ -75,11 +75,11 @@ public class HasMap {
 		this.objectArray = objectArray;
 	}
 
-	public Class[] getClassArray() {
+	public Class<?>[] getClassArray() {
 		return classArray;
 	}
 
-	public void setClassArray(Class[] classArray) {
+	public void setClassArray(Class<?>[] classArray) {
 		this.classArray = classArray;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java b/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
index 3a77af2f71..39fdf5be5b 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
@@ -27,7 +27,7 @@ public class TestBean {
 
 	private String name;
 
-	private List list;
+	private List<?> list;
 
 	private Object objRef;
 
@@ -48,14 +48,14 @@ public class TestBean {
 	/**
 	 * @return Returns the list.
 	 */
-	public List getList() {
+	public List<?> getList() {
 		return list;
 	}
 
 	/**
 	 * @param list The list to set.
 	 */
-	public void setList(List list) {
+	public void setList(List<?> list) {
 		this.list = list;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
index b149254bfd..9ae909d7b7 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
@@ -31,20 +31,20 @@ import org.springframework.beans.factory.ObjectFactory;
 @SuppressWarnings("serial")
 public class SimpleMapScope implements Scope, Serializable {
 
-	private final Map map = new HashMap();
+	private final Map<String, Object> map = new HashMap<String, Object>();
 
-	private final List callbacks = new LinkedList();
+	private final List<Runnable> callbacks = new LinkedList<Runnable>();
 
 
 	public SimpleMapScope() {
 	}
 
-	public final Map getMap() {
+	public final Map<String, Object> getMap() {
 		return this.map;
 	}
 
 
-	public Object get(String name, ObjectFactory objectFactory) {
+	public Object get(String name, ObjectFactory<?> objectFactory) {
 		synchronized (this.map) {
 			Object scopedObject = this.map.get(name);
 			if (scopedObject == null) {
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
index 74d6b48540..8da9a81a6f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
@@ -31,20 +31,20 @@ import org.springframework.core.CollectionFactory;
  */
 public class CollectingReaderEventListener implements ReaderEventListener {
 
-	private final List defaults = new LinkedList();
+	private final List<DefaultsDefinition> defaults = new LinkedList<DefaultsDefinition>();
 
-	private final Map componentDefinitions = CollectionFactory.createLinkedMapIfPossible(8);
+	private final Map<String, ComponentDefinition> componentDefinitions = CollectionFactory.createLinkedMapIfPossible(8);
 
-	private final Map aliasMap = CollectionFactory.createLinkedMapIfPossible(8);
+	private final Map<String, List<AliasDefinition>> aliasMap = CollectionFactory.createLinkedMapIfPossible(8);
 
-	private final List imports = new LinkedList();
+	private final List<ImportDefinition> imports = new LinkedList<ImportDefinition>();
 
 
 	public void defaultsRegistered(DefaultsDefinition defaultsDefinition) {
 		this.defaults.add(defaultsDefinition);
 	}
 
-	public List getDefaults() {
+	public List<DefaultsDefinition> getDefaults() {
 		return Collections.unmodifiableList(this.defaults);
 	}
 
@@ -53,25 +53,25 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 	}
 
 	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()]);
 	}
 
 	public void aliasRegistered(AliasDefinition aliasDefinition) {
-		List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName());
+		List<AliasDefinition> aliases = this.aliasMap.get(aliasDefinition.getBeanName());
 		if(aliases == null) {
-			aliases = new ArrayList();
+			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);
+	public List<?> getAliases(String beanName) {
+		List<?> aliases = this.aliasMap.get(beanName);
 		return aliases == null ? null : Collections.unmodifiableList(aliases);
 	}
 
@@ -79,7 +79,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		this.imports.add(importDefinition);
 	}
 
-	public List getImports() {
+	public List<ImportDefinition> getImports() {
 		return Collections.unmodifiableList(this.imports);
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java
index 9ab3f8ea40..3bda3d3723 100644
--- a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java
+++ b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java
@@ -24,7 +24,7 @@ import java.util.Map;
  * @author Thomas Risberg
  * @author Juergen Hoeller
  */
-public class BeanThatListens implements ApplicationListener {
+public class BeanThatListens implements ApplicationListener<ApplicationEvent> {
 
 	private BeanThatBroadcasts beanThatBroadcasts;
 
@@ -36,7 +36,7 @@ public class BeanThatListens implements ApplicationListener {
 
 	public BeanThatListens(BeanThatBroadcasts beanThatBroadcasts) {
 		this.beanThatBroadcasts = beanThatBroadcasts;
-		Map beans = beanThatBroadcasts.applicationContext.getBeansOfType(BeanThatListens.class);
+		Map<?, BeanThatListens> beans = beanThatBroadcasts.applicationContext.getBeansOfType(BeanThatListens.class);
 		if (!beans.isEmpty()) {
 			throw new IllegalStateException("Shouldn't have found any BeanThatListens instances");
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/TestListener.java b/spring-context/src/test/java/org/springframework/context/TestListener.java
index b9f57f7308..834439484c 100644
--- a/spring-context/src/test/java/org/springframework/context/TestListener.java
+++ b/spring-context/src/test/java/org/springframework/context/TestListener.java
@@ -22,7 +22,7 @@ package org.springframework.context;
  * @author Rod Johnson
  * @since January 21, 2001
  */
-public class TestListener implements ApplicationListener {
+public class TestListener implements ApplicationListener<ApplicationEvent> {
 
 	private int eventCount;
 
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 daacc42cd5..b4135bf646 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
@@ -206,7 +206,7 @@ public class CommonAnnotationBeanPostProcessorTests {
 		bf.registerBeanDefinition("testBean4", new RootBeanDefinition(TestBean.class, false));
 
 		bf.registerResolvableDependency(BeanFactory.class, bf);
-		bf.registerResolvableDependency(INestedTestBean.class, new ObjectFactory() {
+		bf.registerResolvableDependency(INestedTestBean.class, new ObjectFactory<Object>() {
 			public Object getObject() throws BeansException {
 				return new NestedTestBean();
 			}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
index c07ded4154..176aee5c32 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
@@ -42,7 +42,7 @@ public class SimpleConfigTests {
 		String value = fooService.foo(1);
 		assertEquals("bar", value);
 
-		Future future = fooService.asyncFoo(1);
+		Future<?> future = fooService.asyncFoo(1);
 		assertTrue(future instanceof FutureTask);
 		assertEquals("bar", future.get());
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
index 11004182c8..8073f92b83 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
@@ -230,7 +230,7 @@ public class ConfigurationClassProcessingTests {
 		public @Bean Object stringBean() {
 			return "foo";
 		}
-		public @Bean FactoryBean factoryBean() {
+		public @Bean FactoryBean<?> factoryBean() {
 			ListFactoryBean fb = new ListFactoryBean();
 			fb.setSourceList(Arrays.asList("element1", "element2"));
 			return fb;
diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
index 789fb09def..24dec9ad54 100644
--- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
@@ -47,7 +47,8 @@ public class ApplicationContextEventTests {
 
 	@Test
 	public void simpleApplicationEventMulticaster() {
-		ApplicationListener listener = EasyMock.createMock(ApplicationListener.class);
+		@SuppressWarnings("unchecked")
+		ApplicationListener<ApplicationEvent> listener = mock(ApplicationListener.class);
 		ApplicationEvent evt = new ContextClosedEvent(new StaticApplicationContext());
 		listener.onApplicationEvent(evt);
 
@@ -73,11 +74,12 @@ public class ApplicationContextEventTests {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void proxiedListeners() {
 		MyOrderedListener1 listener1 = new MyOrderedListener1();
 		MyOrderedListener2 listener2 = new MyOrderedListener2(listener1);
-		ApplicationListener proxy1 = (ApplicationListener) new ProxyFactory(listener1).getProxy();
-		ApplicationListener proxy2 = (ApplicationListener) new ProxyFactory(listener2).getProxy();
+		ApplicationListener<ApplicationEvent> proxy1 = (ApplicationListener<ApplicationEvent>) new ProxyFactory(listener1).getProxy();
+		ApplicationListener<ApplicationEvent> proxy2 = (ApplicationListener<ApplicationEvent>) new ProxyFactory(listener2).getProxy();
 
 		SimpleApplicationEventMulticaster smc = new SimpleApplicationEventMulticaster();
 		smc.addApplicationListener(proxy1);
@@ -208,7 +210,7 @@ public class ApplicationContextEventTests {
 	}
 
 
-	public static class MyOrderedListener1 implements ApplicationListener, Ordered {
+	public static class MyOrderedListener1 implements ApplicationListener<ApplicationEvent>, Ordered {
 
 		public final Set<ApplicationEvent> seenEvents = new HashSet<ApplicationEvent>();
 
@@ -248,7 +250,7 @@ public class ApplicationContextEventTests {
 	}
 
 
-	public static class MyNonSingletonListener implements ApplicationListener {
+	public static class MyNonSingletonListener implements ApplicationListener<ApplicationEvent> {
 
 		public static final Set<ApplicationEvent> seenEvents = new HashSet<ApplicationEvent>();
 
diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
index d8bc82ee11..4e1f90468c 100644
--- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
@@ -138,13 +138,13 @@ public class EventPublicationInterceptorTests {
 	}
 
 
-	public static class FactoryBeanTestListener extends TestListener implements FactoryBean {
+	public static class FactoryBeanTestListener extends TestListener implements FactoryBean<Object> {
 
 		public Object getObject() throws Exception {
 			return "test";
 		}
 
-		public Class getObjectType() {
+		public Class<String> getObjectType() {
 			return String.class;
 		}
 
diff --git a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
index d5cc8f790f..b1bbb815ac 100644
--- a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
@@ -63,7 +63,7 @@ public class LifecycleEventTests extends TestCase {
 	}
 
 
-	private static class LifecycleListener implements ApplicationListener {
+	private static class LifecycleListener implements ApplicationListener<ApplicationEvent> {
 
 		private ApplicationContext context;
 
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 393e71d5d5..cfd70979e9 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
@@ -57,7 +57,7 @@ public class ApplicationContextExpressionTests {
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(ac);
 
 		ac.getBeanFactory().registerScope("myScope", new Scope() {
-			public Object get(String name, ObjectFactory objectFactory) {
+			public Object get(String name, ObjectFactory<?> objectFactory) {
 				return objectFactory.getObject();
 			}
 			public Object remove(String name) {
diff --git a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
index 5a779f0d3a..34588e19a7 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
@@ -61,6 +61,7 @@ public class ConversionServiceFactoryBeanTests {
 		converters.add(new ConverterFactory<String, Bar>() {
 			public <T extends Bar> Converter<String, T> getConverter(Class<T> targetType) {
 				return new Converter<String, T> () {
+					@SuppressWarnings("unchecked")
 					public T convert(String source) {
 						return (T) new Bar();
 					}
@@ -103,7 +104,7 @@ public class ConversionServiceFactoryBeanTests {
 		doTestConversionServiceInApplicationContext("conversionServiceWithResourceOverriding.xml", FileSystemResource.class);
 	}
 
-	private void doTestConversionServiceInApplicationContext(String fileName, Class resourceClass) {
+	private void doTestConversionServiceInApplicationContext(String fileName, Class<?> resourceClass) {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext(fileName, getClass());
 		ResourceTestBean tb = ctx.getBean("resourceTestBean", ResourceTestBean.class);
 		assertTrue(resourceClass.isInstance(tb.getResource()));
@@ -128,7 +129,7 @@ public class ConversionServiceFactoryBeanTests {
 
 	public static class ComplexConstructorArgument {
 
-		public ComplexConstructorArgument(Map<String, Class> map) {
+		public ComplexConstructorArgument(Map<String, Class<?>> map) {
 			assertTrue(!map.isEmpty());
 			assertTrue(map.keySet().iterator().next() instanceof String);
 			assertTrue(map.values().iterator().next() instanceof Class);
diff --git a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
index 61615a2b59..a561e2cbf3 100644
--- a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
@@ -692,7 +692,7 @@ public class DefaultLifecycleProcessorTests {
 	}
 
 
-	public static class DummySmartLifecycleFactoryBean implements FactoryBean, SmartLifecycle {
+	public static class DummySmartLifecycleFactoryBean implements FactoryBean<Object>, SmartLifecycle {
 
 		public boolean running = false;
 
@@ -702,7 +702,7 @@ public class DefaultLifecycleProcessorTests {
 			return this.bean;
 		}
 
-		public Class getObjectType() {
+		public Class<?> getObjectType() {
 			return DummySmartLifecycleBean.class;
 		}
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java b/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java
index b0a90824d4..a545e69e68 100644
--- a/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java
+++ b/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java
@@ -8,13 +8,13 @@ import org.springframework.context.ApplicationListener;
  * @author Juergen Hoeller
  * @since 06.10.2004
  */
-public class FactoryBeanAndApplicationListener implements FactoryBean, ApplicationListener {
+public class FactoryBeanAndApplicationListener implements FactoryBean<String>, ApplicationListener<ApplicationEvent> {
 
-	public Object getObject() throws Exception {
+	public String getObject() throws Exception {
 		return "";
 	}
 
-	public Class getObjectType() {
+	public Class<String> getObjectType() {
 		return String.class;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java
index 8a462c0425..7e45ce9898 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java
@@ -115,8 +115,8 @@ public class ResourceBundleMessageSourceTests extends TestCase {
 		if (alwaysUseMessageFormat) {
 			pvs.add("alwaysUseMessageFormat", Boolean.TRUE);
 		}
-		Class clazz = reloadable ?
-				(Class) ReloadableResourceBundleMessageSource.class : ResourceBundleMessageSource.class;
+		Class<?> clazz = reloadable ?
+				(Class<?>) ReloadableResourceBundleMessageSource.class : ResourceBundleMessageSource.class;
 		ac.registerSingleton("messageSource", clazz, pvs);
 		ac.refresh();
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
index d734c34f0a..73c189e36e 100644
--- a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
@@ -30,7 +30,7 @@ public class Spr7283Tests {
 	@Test
 	public void testListWithInconsistentElementType() {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("spr7283.xml", getClass());
-		List list = ctx.getBean("list", List.class);
+		List<?> list = ctx.getBean("list", List.class);
 		assertEquals(2, list.size());
 		assertTrue(list.get(0) instanceof A);
 		assertTrue(list.get(1) instanceof B);
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
index 089072fb3c..9ac7433589 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
@@ -45,7 +45,7 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio
 	/** Run for each test */
 	protected ConfigurableApplicationContext createContext() throws Exception {
 		StaticApplicationContext parent = new StaticApplicationContext();
-		Map m = new HashMap();
+		Map<String, String> m = new HashMap<String, String>();
 		m.put("name", "Roderick");
 		parent.registerPrototype("rod", TestBean.class, new MutablePropertyValues(m));
 		m.put("name", "Albert");
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
index 431325062e..2dba7fc9ea 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
@@ -41,7 +41,7 @@ public class StaticApplicationContextTests extends AbstractApplicationContextTes
 	/** Run for each test */
 	protected ConfigurableApplicationContext createContext() throws Exception {
 		StaticApplicationContext parent = new StaticApplicationContext();
-		Map m = new HashMap();
+		Map<String, String> m = new HashMap<String, String>();
 		m.put("name", "Roderick");
 		parent.registerPrototype("rod", TestBean.class, new MutablePropertyValues(m));
 		m.put("name", "Albert");
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
index 47e72fb911..73d0cab651 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
@@ -198,7 +198,7 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests {
 	protected ConfigurableApplicationContext createContext() throws Exception {
 		StaticApplicationContext parent = new StaticApplicationContext();
 
-		Map m = new HashMap();
+		Map<String, String> m = new HashMap<String, String>();
 		m.put("name", "Roderick");
 		parent.registerPrototype("rod", org.springframework.beans.TestBean.class, new MutablePropertyValues(m));
 		m.put("name", "Albert");
@@ -221,7 +221,7 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests {
 		sac.addListener(listener);
 
 		StaticMessageSource messageSource = sac.getStaticMessageSource();
-		Map usMessages = new HashMap(3);
+		Map<String, String> usMessages = new HashMap<String, String>(3);
 		usMessages.put("message.format.example1", MSG_TXT1_US);
 		usMessages.put("message.format.example2", MSG_TXT2_US);
 		usMessages.put("message.format.example3", MSG_TXT3_US);
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
index 11a20f3cd6..bcfc34c71b 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
@@ -90,7 +90,7 @@ public class LocalSlsbInvokerInterceptorTests {
 
 		LocalSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
 
-		ProxyFactory pf = new ProxyFactory(new Class[] { BusinessMethods.class } );
+		ProxyFactory pf = new ProxyFactory(new Class<?>[] { BusinessMethods.class } );
 		pf.addAdvice(si);
 		BusinessMethods target = (BusinessMethods) pf.getProxy();
 
@@ -113,7 +113,7 @@ public class LocalSlsbInvokerInterceptorTests {
 
 		LocalSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
 
-		ProxyFactory pf = new ProxyFactory(new Class[] { BusinessMethods.class } );
+		ProxyFactory pf = new ProxyFactory(new Class<?>[] { BusinessMethods.class } );
 		pf.addAdvice(si);
 		BusinessMethods target = (BusinessMethods) pf.getProxy();
 
@@ -133,7 +133,7 @@ public class LocalSlsbInvokerInterceptorTests {
 
 		LocalSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
 
-		ProxyFactory pf = new ProxyFactory(new Class[] { LocalInterfaceWithBusinessMethods.class } );
+		ProxyFactory pf = new ProxyFactory(new Class<?>[] { LocalInterfaceWithBusinessMethods.class } );
 		pf.addAdvice(si);
 		LocalInterfaceWithBusinessMethods target = (LocalInterfaceWithBusinessMethods) pf.getProxy();
 
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
index 4d921eafcb..a48935c47c 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
@@ -79,7 +79,7 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 
 	protected Object configuredProxy(SimpleRemoteSlsbInvokerInterceptor si, Class<?> ifc) throws NamingException {
 		si.afterPropertiesSet();
-		ProxyFactory pf = new ProxyFactory(new Class[] {ifc});
+		ProxyFactory pf = new ProxyFactory(new Class<?>[] {ifc});
 		pf.addAdvice(si);
 		return pf.getProxy();
 	}
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 95c610e11f..85865af76f 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
@@ -238,7 +238,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests {
 		ProxyFactory factory = new ProxyFactory();
 		factory.setTarget(bean);
 		factory.addAdvice(new NopInterceptor());
-		factory.setInterfaces(new Class[] { IJmxTestBean.class });
+		factory.setInterfaces(new Class<?>[] { IJmxTestBean.class });
 
 		IJmxTestBean proxy = (IJmxTestBean) factory.getProxy();
 		String name = "bean:mmm=whatever";
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
index 9100215b83..93735097c6 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
@@ -158,7 +158,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble
 
 		String objectName = "spring:bean=test,proxy=true";
 
-		Map beans = new HashMap();
+		Map<String, Object> beans = new HashMap<String, Object>();
 		beans.put(objectName, proxy);
 		exporter.setBeans(beans);
 		exporter.afterPropertiesSet();
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
index 2e48d50610..4be8a6cc92 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
@@ -40,7 +40,7 @@ public class InterfaceBasedMBeanInfoAssemblerCustomTests extends AbstractJmxAsse
 
 	protected MBeanInfoAssembler getAssembler() {
 		InterfaceBasedMBeanInfoAssembler assembler = new InterfaceBasedMBeanInfoAssembler();
-		assembler.setManagedInterfaces(new Class[] {ICustomJmxBean.class});
+		assembler.setManagedInterfaces(new Class<?>[] {ICustomJmxBean.class});
 		return assembler;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
index 666f877b80..a0681cc398 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
@@ -60,7 +60,7 @@ public class InterfaceBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAsse
 	public void ignoreTestWithFallThrough() throws Exception {
 		InterfaceBasedMBeanInfoAssembler assembler =
 				getWithMapping("foobar", "org.springframework.jmx.export.assembler.ICustomJmxBean");
-		assembler.setManagedInterfaces(new Class[] {IAdditionalTestMethods.class});
+		assembler.setManagedInterfaces(new Class<?>[] {IAdditionalTestMethods.class});
 
 		ModelMBeanInfo inf = assembler.getMBeanInfo(getBean(), getObjectName());
 		MBeanAttributeInfo attr = inf.getAttribute("NickName");
diff --git a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
index aebf7d8e41..dbb46d5385 100644
--- a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
+++ b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
@@ -88,7 +88,7 @@ public class RmiSupportTests extends TestCase {
 		doTestRmiProxyFactoryBeanWithException(UnmarshalException.class);
 	}
 
-	private void doTestRmiProxyFactoryBeanWithException(Class exceptionClass) throws Exception {
+	private void doTestRmiProxyFactoryBeanWithException(Class<?> exceptionClass) throws Exception {
 		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
 		factory.setServiceInterface(IRemoteBean.class);
 		factory.setServiceUrl("rmi://localhost:1090/test");
@@ -130,7 +130,7 @@ public class RmiSupportTests extends TestCase {
 		doTestRmiProxyFactoryBeanWithExceptionAndRefresh(StubNotFoundException.class);
 	}
 
-	private void doTestRmiProxyFactoryBeanWithExceptionAndRefresh(Class exceptionClass) throws Exception {
+	private void doTestRmiProxyFactoryBeanWithExceptionAndRefresh(Class<?> exceptionClass) throws Exception {
 		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
 		factory.setServiceInterface(IRemoteBean.class);
 		factory.setServiceUrl("rmi://localhost:1090/test");
@@ -217,7 +217,7 @@ public class RmiSupportTests extends TestCase {
 	}
 
 	private void doTestRmiProxyFactoryBeanWithBusinessInterfaceAndException(
-			Class rmiExceptionClass, Class springExceptionClass) throws Exception {
+			Class<?> rmiExceptionClass, Class<?> springExceptionClass) throws Exception {
 
 		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
 		factory.setServiceInterface(IBusinessBean.class);
@@ -272,7 +272,7 @@ public class RmiSupportTests extends TestCase {
 	}
 
 	private void doTestRmiProxyFactoryBeanWithBusinessInterfaceAndExceptionAndRefresh(
-			Class rmiExceptionClass, Class springExceptionClass) throws Exception {
+			Class<?> rmiExceptionClass, Class<?> springExceptionClass) throws Exception {
 
 		CountingRmiProxyFactoryBean factory = new CountingRmiProxyFactoryBean();
 		factory.setServiceInterface(IBusinessBean.class);
@@ -319,7 +319,7 @@ public class RmiSupportTests extends TestCase {
 		// let's see if the remote invocation object works
 
 		final RemoteBean rb = new RemoteBean();
-		final Method setNameMethod = rb.getClass().getDeclaredMethod("setName", new Class[] {String.class});
+		final Method setNameMethod = rb.getClass().getDeclaredMethod("setName", new Class<?>[] {String.class});
 
 		MethodInvocation mi = new MethodInvocation() {
 			public Method getMethod() {
@@ -351,10 +351,10 @@ public class RmiSupportTests extends TestCase {
 		assertEquals("bla", inv.getArguments()[0]);
 		inv.setMethodName("setName");
 		assertEquals("setName", inv.getMethodName());
-		inv.setParameterTypes(new Class[] {String.class});
+		inv.setParameterTypes(new Class<?>[] {String.class});
 		assertEquals(String.class, inv.getParameterTypes()[0]);
 
-		inv = new RemoteInvocation("setName", new Class[] {String.class}, new Object[] {"bla"});
+		inv = new RemoteInvocation("setName", new Class<?>[] {String.class}, new Object[] {"bla"});
 		assertEquals("bla", inv.getArguments()[0]);
 		assertEquals("setName", inv.getMethodName());
 		assertEquals(String.class, inv.getParameterTypes()[0]);
@@ -436,8 +436,8 @@ public class RmiSupportTests extends TestCase {
 			if (nam != null && nam.endsWith("Exception")) {
 				RemoteException rex = null;
 				try {
-					Class exClass = Class.forName(nam);
-					Constructor ctor = exClass.getConstructor(new Class[] {String.class});
+					Class<?> exClass = Class.forName(nam);
+					Constructor<?> ctor = exClass.getConstructor(new Class<?>[] {String.class});
 					rex = (RemoteException) ctor.newInstance(new Object[] {"myMessage"});
 				}
 				catch (Exception ex) {
diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
index 5886a912ea..2659b23576 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
@@ -48,7 +48,7 @@ public class TimerSupportTests extends TestCase {
 		tasks[1] = new ScheduledTimerTask(timerTask1, 10, 20, true);
 		tasks[2] = new ScheduledTimerTask(timerTask2, 20);
 
-		final List success = new ArrayList(3);
+		final List<Boolean> success = new ArrayList<Boolean>(3);
 		final Timer timer = new Timer(true) {
 			public void schedule(TimerTask task, long delay, long period) {
 				if (task == timerTask0 && delay == 0 && period == 10) {
diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
index 9dfbf55a77..90582292d4 100644
--- a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
@@ -199,9 +199,9 @@ public class BshScriptFactoryTests extends TestCase {
 		mock.replay();
 		BshScriptFactory factory = new BshScriptFactory(
 				ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX + badScript,
-				new Class[] {Messenger.class});
+				new Class<?>[] {Messenger.class});
 		try {
-			Messenger messenger = (Messenger) factory.getScriptedObject(script, new Class[]{Messenger.class});
+			Messenger messenger = (Messenger) factory.getScriptedObject(script, new Class<?>[]{Messenger.class});
 			messenger.getMessage();
 			fail("Must have thrown a BshScriptUtils.BshExecutionException.");
 		}
@@ -212,7 +212,7 @@ public class BshScriptFactoryTests extends TestCase {
 
 	public void testCtorWithNullScriptSourceLocator() throws Exception {
 		try {
-			new BshScriptFactory(null, new Class[] {Messenger.class});
+			new BshScriptFactory(null, new Class<?>[] {Messenger.class});
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalArgumentException expected) {
@@ -221,7 +221,7 @@ public class BshScriptFactoryTests extends TestCase {
 
 	public void testCtorWithEmptyScriptSourceLocator() throws Exception {
 		try {
-			new BshScriptFactory("", new Class[] {Messenger.class});
+			new BshScriptFactory("", new Class<?>[] {Messenger.class});
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalArgumentException expected) {
@@ -230,7 +230,7 @@ public class BshScriptFactoryTests extends TestCase {
 
 	public void testCtorWithWhitespacedScriptSourceLocator() throws Exception {
 		try {
-			new BshScriptFactory("\n   ", new Class[] {Messenger.class});
+			new BshScriptFactory("\n   ", new Class<?>[] {Messenger.class});
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalArgumentException expected) {
@@ -241,7 +241,7 @@ public class BshScriptFactoryTests extends TestCase {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("bsh-with-xsd.xml", getClass());
 		TestBean testBean = (TestBean) ctx.getBean("testBean");
 
-		Collection beanNames = Arrays.asList(ctx.getBeanNamesForType(Messenger.class));
+		Collection<String> beanNames = Arrays.asList(ctx.getBeanNamesForType(Messenger.class));
 		assertTrue(beanNames.contains("messenger"));
 		assertTrue(beanNames.contains("messengerImpl"));
 		assertTrue(beanNames.contains("messengerInstance"));
@@ -262,7 +262,7 @@ public class BshScriptFactoryTests extends TestCase {
 		TestBeanAwareMessenger messengerByName = (TestBeanAwareMessenger) ctx.getBean("messengerByName");
 		assertEquals(testBean, messengerByName.getTestBean());
 
-		Collection beans = ctx.getBeansOfType(Messenger.class).values();
+		Collection<Messenger> beans = ctx.getBeansOfType(Messenger.class).values();
 		assertTrue(beans.contains(messenger));
 		assertTrue(beans.contains(messengerImpl));
 		assertTrue(beans.contains(messengerInstance));
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java
index 530559a6b4..132d9211c0 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java
@@ -34,12 +34,12 @@ public class GroovyClassLoadingTests extends TestCase {
 		StaticApplicationContext context = new StaticApplicationContext();
 
 		GroovyClassLoader gcl = new GroovyClassLoader();
-		Class class1 = gcl.parseClass("class TestBean { def myMethod() { \"foo\" } }");
-		Class class2 = gcl.parseClass("class TestBean { def myMethod() { \"bar\" } }");
+		Class<?> class1 = gcl.parseClass("class TestBean { def myMethod() { \"foo\" } }");
+		Class<?> class2 = gcl.parseClass("class TestBean { def myMethod() { \"bar\" } }");
 
 		context.registerBeanDefinition("testBean", new RootBeanDefinition(class1));
 		Object testBean1 = context.getBean("testBean");
-		Method method1 = class1.getDeclaredMethod("myMethod", new Class[0]);
+		Method method1 = class1.getDeclaredMethod("myMethod", new Class<?>[0]);
 		Object result1 = ReflectionUtils.invokeMethod(method1, testBean1);
 		assertEquals("foo", (String) result1);
 
@@ -48,7 +48,7 @@ public class GroovyClassLoadingTests extends TestCase {
 
 		context.registerBeanDefinition("testBean", new RootBeanDefinition(class2));
 		Object testBean2 = context.getBean("testBean");
-		Method method2 = class2.getDeclaredMethod("myMethod", new Class[0]);
+		Method method2 = class2.getDeclaredMethod("myMethod", new Class<?>[0]);
 		Object result2 = ReflectionUtils.invokeMethod(method2, testBean2);
 		assertEquals("bar", (String) result2);
 	}
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 d43f90950b..763827a05a 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
@@ -201,7 +201,7 @@ public class GroovyScriptFactoryTests {
 		GroovyScriptFactory factory = new GroovyScriptFactory(ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX
 				+ badScript);
 		try {
-			factory.getScriptedObject(script, new Class[] {});
+			factory.getScriptedObject(script, new Class<?>[] {});
 			fail("Must have thrown a ScriptCompilationException (no public no-arg ctor in scripted class).");
 		} catch (ScriptCompilationException expected) {
 			assertTrue(expected.contains(InstantiationException.class));
@@ -219,7 +219,7 @@ public class GroovyScriptFactoryTests {
 		GroovyScriptFactory factory = new GroovyScriptFactory(ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX
 				+ badScript);
 		try {
-			factory.getScriptedObject(script, new Class[] {});
+			factory.getScriptedObject(script, new Class<?>[] {});
 			fail("Must have thrown a ScriptCompilationException (no oublic no-arg ctor in scripted class).");
 		} catch (ScriptCompilationException expected) {
 			assertTrue(expected.contains(IllegalAccessException.class));
@@ -402,7 +402,7 @@ public class GroovyScriptFactoryTests {
 	@Test
 	public void testAnonymousScriptDetected() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
-		Map beans = ctx.getBeansOfType(Messenger.class);
+		Map<?, Messenger> beans = ctx.getBeansOfType(Messenger.class);
 		assertEquals(4, beans.size());
 	}
 
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 63de6c4207..cc7e1ce392 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
@@ -94,7 +94,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 
 	public void testCtorWithNullScriptSourceLocator() throws Exception {
 		try {
-			new JRubyScriptFactory(null, new Class[]{Messenger.class});
+			new JRubyScriptFactory(null, new Class<?>[]{Messenger.class});
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalArgumentException expected) {
@@ -103,7 +103,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 
 	public void testCtorWithEmptyScriptSourceLocator() throws Exception {
 		try {
-			new JRubyScriptFactory("", new Class[]{Messenger.class});
+			new JRubyScriptFactory("", new Class<?>[]{Messenger.class});
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalArgumentException expected) {
@@ -112,7 +112,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 
 	public void testCtorWithWhitespacedScriptSourceLocator() throws Exception {
 		try {
-			new JRubyScriptFactory("\n   ", new Class[]{Messenger.class});
+			new JRubyScriptFactory("\n   ", new Class<?>[]{Messenger.class});
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalArgumentException expected) {
@@ -130,7 +130,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 
 	public void testCtorWithEmptyScriptInterfacesArray() throws Exception {
 		try {
-			new JRubyScriptFactory(RUBY_SCRIPT_SOURCE_LOCATOR, new Class[]{});
+			new JRubyScriptFactory(RUBY_SCRIPT_SOURCE_LOCATOR, new Class<?>[]{});
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalArgumentException expected) {
@@ -250,14 +250,14 @@ public class JRubyScriptFactoryTests extends TestCase {
 		assertEquals("2", lol[1][0]);
 		assertEquals("3", lol[2][0]);
 
-		Map singleValueMap = adder.toMap("key", "value");
+		Map<?, ?> singleValueMap = adder.toMap("key", "value");
 		assertNotNull(singleValueMap);
 		assertEquals(1, singleValueMap.size());
 		assertEquals("key", singleValueMap.keySet().iterator().next());
 		assertEquals("value", singleValueMap.values().iterator().next());
 
 		String[] expectedStrings = new String[]{"1", "2", "3"};
-		Map map = adder.toMap("key", expectedStrings);
+		Map<?, ?> map = adder.toMap("key", expectedStrings);
 		assertNotNull(map);
 		assertEquals(1, map.size());
 		assertEquals("key", map.keySet().iterator().next());
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java b/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
index 2656c8a60e..3e0589c7b3 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
@@ -47,6 +47,6 @@ public interface WrapperAdder {
 
 	String[][] createListOfLists(String one, String second, String third);
 
-	Map toMap(String key, Object value);
+	Map<?, ?> toMap(String key, Object value);
 
 }
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 0478ed2909..336fe78e67 100644
--- a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
+++ b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
@@ -276,7 +276,7 @@ public final class ModelMapTests {
 		ModelMap map = new ModelMap();
 		Object proxy = Proxy.newProxyInstance(
 				getClass().getClassLoader(),
-				new Class[] {Map.class},
+				new Class<?>[] {Map.class},
 				new InvocationHandler() {
 					public Object invoke(Object proxy, Method method, Object[] args) {
 						return "proxy";
diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
index 96d4b6fb0c..b1ba9804d2 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
@@ -50,7 +50,7 @@ public class DataBinderFieldAccessTests extends TestCase {
 		assertTrue("changed name correctly", rod.getName().equals("Rod"));
 		assertTrue("changed age correctly", rod.getAge() == 32);
 
-		Map m = binder.getBindingResult().getModel();
+		Map<?, ?> m = binder.getBindingResult().getModel();
 		assertTrue("There is one element in map", m.size() == 2);
 		FieldAccessBean tb = (FieldAccessBean) m.get("person");
 		assertTrue("Same object", tb.equals(rod));
@@ -92,7 +92,7 @@ public class DataBinderFieldAccessTests extends TestCase {
 			assertTrue("changed name correctly", rod.getName().equals("Rod"));
 			//assertTrue("changed age correctly", rod.getAge() == 32);
 
-			Map map = binder.getBindingResult().getModel();
+			Map<?, ?> map = binder.getBindingResult().getModel();
 			//assertTrue("There are 3 element in map", m.size() == 1);
 			FieldAccessBean tb = (FieldAccessBean) map.get("person");
 			assertTrue("Same object", tb.equals(rod));
@@ -136,7 +136,7 @@ public class DataBinderFieldAccessTests extends TestCase {
 			assertTrue("changed name correctly", rod.getName().equals("Rod"));
 			//assertTrue("changed age correctly", rod.getAge() == 32);
 
-			Map model = binder.getBindingResult().getModel();
+			Map<?, ?> model = binder.getBindingResult().getModel();
 			//assertTrue("There are 3 element in map", m.size() == 1);
 			FieldAccessBean tb = (FieldAccessBean) model.get("person");
 			assertTrue("Same object", tb.equals(rod));
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 ea9fd94b11..c9f12660a1 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
@@ -80,7 +80,7 @@ public class DataBinderTests extends TestCase {
 		assertTrue("changed name correctly", rod.getName().equals("Rod"));
 		assertTrue("changed age correctly", rod.getAge() == 32);
 
-		Map map = binder.getBindingResult().getModel();
+		Map<?, ?> map = binder.getBindingResult().getModel();
 		assertTrue("There is one element in map", map.size() == 2);
 		TestBean tb = (TestBean) map.get("person");
 		assertTrue("Same object", tb.equals(rod));
@@ -190,7 +190,7 @@ public class DataBinderTests extends TestCase {
 			assertTrue("changed name correctly", rod.getName().equals("Rod"));
 			//assertTrue("changed age correctly", rod.getAge() == 32);
 
-			Map map = binder.getBindingResult().getModel();
+			Map<?, ?> map = binder.getBindingResult().getModel();
 			//assertTrue("There are 3 element in map", m.size() == 1);
 			TestBean tb = (TestBean) map.get("person");
 			assertTrue("Same object", tb.equals(rod));
@@ -284,7 +284,7 @@ public class DataBinderTests extends TestCase {
 			assertTrue("changed name correctly", rod.getName().equals("Rod"));
 			//assertTrue("changed age correctly", rod.getAge() == 32);
 
-			Map model = binder.getBindingResult().getModel();
+			Map<?, ?> model = binder.getBindingResult().getModel();
 			//assertTrue("There are 3 element in map", m.size() == 1);
 			TestBean tb = (TestBean) model.get("person");
 			assertTrue("Same object", tb.equals(rod));
@@ -1177,8 +1177,8 @@ public class DataBinderTests extends TestCase {
 		pvs.add("array[0].nestedIndexedBean.list[0].name", "test1");
 		pvs.add("array[1].nestedIndexedBean.list[1].name", "test2");
 		binder.bind(pvs);
-		assertEquals("listtest1", ((TestBean) tb.getArray()[0].getNestedIndexedBean().getList().get(0)).getName());
-		assertEquals("listtest2", ((TestBean) tb.getArray()[1].getNestedIndexedBean().getList().get(1)).getName());
+		assertEquals("listtest1", tb.getArray()[0].getNestedIndexedBean().getList().get(0).getName());
+		assertEquals("listtest2", tb.getArray()[1].getNestedIndexedBean().getList().get(1).getName());
 		assertEquals("test1", binder.getBindingResult().getFieldValue("array[0].nestedIndexedBean.list[0].name"));
 		assertEquals("test2", binder.getBindingResult().getFieldValue("array[1].nestedIndexedBean.list[1].name"));
 	}
@@ -1200,8 +1200,8 @@ public class DataBinderTests extends TestCase {
 		pvs.add("array[0].nestedIndexedBean.list[0].name", "test1");
 		pvs.add("array[1].nestedIndexedBean.list[1].name", "test2");
 		binder.bind(pvs);
-		assertEquals("listtest1", ((TestBean) tb.getArray()[0].getNestedIndexedBean().getList().get(0)).getName());
-		assertEquals("test2", ((TestBean) tb.getArray()[1].getNestedIndexedBean().getList().get(1)).getName());
+		assertEquals("listtest1", tb.getArray()[0].getNestedIndexedBean().getList().get(0).getName());
+		assertEquals("test2", tb.getArray()[1].getNestedIndexedBean().getList().get(1).getName());
 		assertEquals("test1", binder.getBindingResult().getFieldValue("array[0].nestedIndexedBean.list[0].name"));
 		assertEquals("test2", binder.getBindingResult().getFieldValue("array[1].nestedIndexedBean.list[1].name"));
 	}
@@ -1223,8 +1223,8 @@ public class DataBinderTests extends TestCase {
 		pvs.add("array[0].nestedIndexedBean.list[0].name", "test1");
 		pvs.add("array[1].nestedIndexedBean.list[1].name", "test2");
 		binder.bind(pvs);
-		assertEquals("listtest1", ((TestBean) tb.getArray()[0].getNestedIndexedBean().getList().get(0)).getName());
-		assertEquals("test2", ((TestBean) tb.getArray()[1].getNestedIndexedBean().getList().get(1)).getName());
+		assertEquals("listtest1", tb.getArray()[0].getNestedIndexedBean().getList().get(0).getName());
+		assertEquals("test2", tb.getArray()[1].getNestedIndexedBean().getList().get(1).getName());
 		assertEquals("test1", binder.getBindingResult().getFieldValue("array[0].nestedIndexedBean.list[0].name"));
 		assertEquals("test2", binder.getBindingResult().getFieldValue("array[1].nestedIndexedBean.list[1].name"));
 	}
@@ -1647,7 +1647,7 @@ public class DataBinderTests extends TestCase {
 
 	private static class TestBeanValidator implements Validator {
 
-		public boolean supports(Class clazz) {
+		public boolean supports(Class<?> clazz) {
 			return TestBean.class.isAssignableFrom(clazz);
 		}
 
@@ -1674,7 +1674,7 @@ public class DataBinderTests extends TestCase {
 
 	private static class SpouseValidator implements Validator {
 
-		public boolean supports(Class clazz) {
+		public boolean supports(Class<?> clazz) {
 			return TestBean.class.isAssignableFrom(clazz);
 		}
 
diff --git a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
index 11235906e3..4ab4f448f4 100644
--- a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
@@ -161,7 +161,7 @@ public class ValidationUtilsTests {
 
 	private static class EmptyValidator implements Validator {
 
-		public boolean supports(Class clazz) {
+		public boolean supports(Class<?> clazz) {
 			return TestBean.class.isAssignableFrom(clazz);
 		}
 
@@ -173,7 +173,7 @@ public class ValidationUtilsTests {
 
 	private static class EmptyOrWhitespaceValidator implements Validator {
 
-		public boolean supports(Class clazz) {
+		public boolean supports(Class<?> clazz) {
 			return TestBean.class.isAssignableFrom(clazz);
 		}
 
diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
index dbfe0b7d1a..41f500d93e 100644
--- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
@@ -95,7 +95,7 @@ public class ValidatorFactoryTests {
 		Set<ConstraintViolation<ValidPerson>> result = validator.validate(person);
 		assertEquals(1, result.size());
 		Iterator<ConstraintViolation<ValidPerson>> iterator = result.iterator();
-		ConstraintViolation cv = iterator.next();
+		ConstraintViolation<?> cv = iterator.next();
 		assertEquals("", cv.getPropertyPath().toString());
 		assertTrue(cv.getConstraintDescriptor().getAnnotation() instanceof NameAddressValid);
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/ConventionsTests.java b/spring-core/src/test/java/org/springframework/core/ConventionsTests.java
index ce42c75d7c..a9fb6e6a5f 100644
--- a/spring-core/src/test/java/org/springframework/core/ConventionsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ConventionsTests.java
@@ -41,15 +41,15 @@ public class ConventionsTests extends TestCase {
 	}
 
 	public void testCollections() {
-		List list = new ArrayList();
+		List<TestBean> list = new ArrayList<TestBean>();
 		list.add(new TestBean());
 		assertEquals("Incorrect plural List form", "testBeanList", Conventions.getVariableName(list));
 
-		Set set = new HashSet();
+		Set<TestBean> set = new HashSet<TestBean>();
 		set.add(new TestBean());
 		assertEquals("Incorrect plural Set form", "testBeanList", Conventions.getVariableName(set));
 
-		List emptyList = new ArrayList();
+		List<?> emptyList = new ArrayList<Object>();
 		try {
 			Conventions.getVariableName(emptyList);
 			fail("Should not be able to generate name for empty collection");
@@ -67,7 +67,7 @@ public class ConventionsTests extends TestCase {
 
 	public void testGetQualifiedAttributeName() throws Exception {
 		String baseName = "foo";
-		Class cls = String.class;
+		Class<String> cls = String.class;
 		String desiredResult = "java.lang.String.foo";
 		assertEquals(desiredResult, Conventions.getQualifiedAttributeName(cls, baseName));
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
index da27d69e71..8a6ba96d62 100644
--- a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
+++ b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
@@ -50,14 +50,14 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 	}
 
 	public void testConsParameterNameDiscoveryNoArgs() throws NoSuchMethodException {
-		Constructor noArgsCons = TestBean.class.getConstructor(new Class[0]);
+		Constructor<TestBean> noArgsCons = TestBean.class.getConstructor(new Class[0]);
 		String[] names = discoverer.getParameterNames(noArgsCons);
 		assertNotNull("should find cons info", names);
 		assertEquals("no argument names", 0, names.length);
 	}
 
 	public void testConsParameterNameDiscoveryArgs() throws NoSuchMethodException {
-		Constructor twoArgCons = TestBean.class.getConstructor(new Class[] { String.class, int.class });
+		Constructor<TestBean> twoArgCons = TestBean.class.getConstructor(new Class[] { String.class, int.class });
 		String[] names = discoverer.getParameterNames(twoArgCons);
 		assertNotNull("should find cons info", names);
 		assertEquals("one argument", 2, names.length);
@@ -73,7 +73,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 	}
 
 	public void testOverloadedStaticMethod() throws Exception {
-		Class clazz = this.getClass();
+		Class<? extends LocalVariableTableParameterNameDiscovererTests> clazz = this.getClass();
 
 		Method m1 = clazz.getMethod("staticMethod", new Class[] { Long.TYPE, Long.TYPE });
 		String[] names = discoverer.getParameterNames(m1);
@@ -92,7 +92,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 	}
 
 	public void testOverloadedStaticMethodInInnerClass() throws Exception {
-		Class clazz = InnerClass.class;
+		Class<InnerClass> clazz = InnerClass.class;
 
 		Method m1 = clazz.getMethod("staticMethod", new Class[] { Long.TYPE });
 		String[] names = discoverer.getParameterNames(m1);
@@ -109,7 +109,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 	}
 
 	public void testOverloadedMethod() throws Exception {
-		Class clazz = this.getClass();
+		Class<? extends LocalVariableTableParameterNameDiscovererTests> clazz = this.getClass();
 
 		Method m1 = clazz.getMethod("instanceMethod", new Class[] { Double.TYPE, Double.TYPE });
 		String[] names = discoverer.getParameterNames(m1);
@@ -128,7 +128,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 	}
 
 	public void testOverloadedMethodInInnerClass() throws Exception {
-		Class clazz = InnerClass.class;
+		Class<InnerClass> clazz = InnerClass.class;
 
 		Method m1 = clazz.getMethod("instanceMethod", new Class[] { String.class });
 		String[] names = discoverer.getParameterNames(m1);
@@ -145,9 +145,9 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 	}
 
 	public void testGenerifiedClass() throws Exception {
-		Class clazz = GenerifiedClass.class;
+		Class<?> clazz = (Class<?>)GenerifiedClass.class;
 
-		Constructor ctor = clazz.getDeclaredConstructor(Object.class);
+		Constructor<?> ctor = clazz.getDeclaredConstructor(Object.class);
 		String[] names = discoverer.getParameterNames(ctor);
 		assertEquals(1, names.length);
 		assertEquals("key", names[0]);
@@ -199,7 +199,7 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 	@Ignore
 	public void ignore_testClassesWithoutDebugSymbols() throws Exception {
 		// JDK classes don't have debug information (usually)
-		Class clazz = Component.class;
+		Class<Component> clazz = Component.class;
 		String methodName = "list";
 
 		Method m = clazz.getMethod(methodName);
@@ -275,9 +275,6 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 	public static class GenerifiedClass<K, V> {
 		private static long date;
 
-		private K key;
-		private V value;
-
 		static {
 			// some custom static bloc or <clinit>
 			date = new Date().getTime();
@@ -292,8 +289,6 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 		}
 
 		public GenerifiedClass(K key, V value) {
-			this.key = key;
-			this.value = value;
 		}
 
 		public static <P> long generifiedStaticMethod(P param) {
diff --git a/spring-core/src/test/java/org/springframework/util/AssertTests.java b/spring-core/src/test/java/org/springframework/util/AssertTests.java
index 2fe76022f0..59cf2a9261 100644
--- a/spring-core/src/test/java/org/springframework/util/AssertTests.java
+++ b/spring-core/src/test/java/org/springframework/util/AssertTests.java
@@ -38,7 +38,7 @@ public class AssertTests {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void instanceOf() {
-		final Set set = new HashSet();
+		final Set<?> set = new HashSet<Object>();
 		Assert.isInstanceOf(HashSet.class, set);
 		Assert.isInstanceOf(HashMap.class, set);
 	}
@@ -105,12 +105,12 @@ public class AssertTests {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void assertNotEmptyWithNullCollectionThrowsException() throws Exception {
-		Assert.notEmpty((Collection) null);
+		Assert.notEmpty((Collection<?>) null);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void assertNotEmptyWithEmptyCollectionThrowsException() throws Exception {
-		Assert.notEmpty(new ArrayList());
+		Assert.notEmpty(new ArrayList<Object>());
 	}
 
 	@Test
@@ -122,12 +122,12 @@ public class AssertTests {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void assertNotEmptyWithNullMapThrowsException() throws Exception {
-		Assert.notEmpty((Map) null);
+		Assert.notEmpty((Map<?, ?>) null);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void assertNotEmptyWithEmptyMapThrowsException() throws Exception {
-		Assert.notEmpty(new HashMap());
+		Assert.notEmpty(new HashMap<Object, Object>());
 	}
 
 	@Test
diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
index cca9da12e6..d7bdd36e41 100644
--- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
+++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
@@ -30,22 +30,22 @@ import org.springframework.beans.TestBean;
 public class AutoPopulatingListTests extends TestCase {
 
 	public void testWithClass() throws Exception {
-		doTestWithClass(new AutoPopulatingList(TestBean.class));
+		doTestWithClass(new AutoPopulatingList<Object>(TestBean.class));
 	}
 
 	public void testWithClassAndUserSuppliedBackingList() throws Exception {
-		doTestWithClass(new AutoPopulatingList(new LinkedList(), TestBean.class));
+		doTestWithClass(new AutoPopulatingList<Object>(new LinkedList<Object>(), TestBean.class));
 	}
 
 	public void testWithElementFactory() throws Exception {
-		doTestWithElementFactory(new AutoPopulatingList(new MockElementFactory()));
+		doTestWithElementFactory(new AutoPopulatingList<Object>(new MockElementFactory()));
 	}
 
 	public void testWithElementFactoryAndUserSuppliedBackingList() throws Exception {
-		doTestWithElementFactory(new AutoPopulatingList(new LinkedList(), new MockElementFactory()));
+		doTestWithElementFactory(new AutoPopulatingList<Object>(new LinkedList<Object>(), new MockElementFactory()));
 	}
 
-	private void doTestWithClass(AutoPopulatingList list) {
+	private void doTestWithClass(AutoPopulatingList<Object> list) {
 		Object lastElement = null;
 		for (int x = 0; x < 10; x++) {
 			Object element = list.get(x);
@@ -66,7 +66,7 @@ public class AutoPopulatingListTests extends TestCase {
 		assertTrue(list.get(20) instanceof TestBean);
 	}
 
-	private void doTestWithElementFactory(AutoPopulatingList list) {
+	private void doTestWithElementFactory(AutoPopulatingList<Object> list) {
 		doTestWithClass(list);
 
 		for(int x = 0; x < list.size(); x++) {
@@ -78,7 +78,7 @@ public class AutoPopulatingListTests extends TestCase {
 	}
 
 	public void testSerialization() throws Exception {
-		AutoPopulatingList list = new AutoPopulatingList(TestBean.class);
+		AutoPopulatingList<?> list = new AutoPopulatingList<Object>(TestBean.class);
 		Assert.assertEquals(list, SerializationTestUtils.serializeAndDeserialize(list));
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java
index 820755a091..fea68d8ed2 100644
--- a/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java
@@ -40,16 +40,16 @@ public class CollectionUtilsTests {
 
 	@Test
 	public void testIsEmpty() {
-		assertTrue(CollectionUtils.isEmpty((Set) null));
-		assertTrue(CollectionUtils.isEmpty((Map) null));
-		assertTrue(CollectionUtils.isEmpty(new HashMap()));
-		assertTrue(CollectionUtils.isEmpty(new HashSet()));
+		assertTrue(CollectionUtils.isEmpty((Set<Object>) null));
+		assertTrue(CollectionUtils.isEmpty((Map<String, String>) null));
+		assertTrue(CollectionUtils.isEmpty(new HashMap<String, String>()));
+		assertTrue(CollectionUtils.isEmpty(new HashSet<Object>()));
 
-		List list = new LinkedList();
+		List<Object> list = new LinkedList<Object>();
 		list.add(new Object());
 		assertFalse(CollectionUtils.isEmpty(list));
 
-		Map map = new HashMap();
+		Map<String, String> map = new HashMap<String, String>();
 		map.put("foo", "bar");
 		assertFalse(CollectionUtils.isEmpty(map));
 	}
@@ -57,7 +57,7 @@ public class CollectionUtilsTests {
 	@Test
 	public void testMergeArrayIntoCollection() {
 		Object[] arr = new Object[] {"value1", "value2"};
-		List list = new LinkedList();
+		List<Comparable<?>> list = new LinkedList<Comparable<?>>();
 		list.add("value3");
 
 		CollectionUtils.mergeArrayIntoCollection(arr, list);
@@ -69,7 +69,7 @@ public class CollectionUtilsTests {
 	@Test
 	public void testMergePrimitiveArrayIntoCollection() {
 		int[] arr = new int[] {1, 2};
-		List list = new LinkedList();
+		List<Comparable<?>> list = new LinkedList<Comparable<?>>();
 		list.add(new Integer(3));
 
 		CollectionUtils.mergeArrayIntoCollection(arr, list);
@@ -86,7 +86,7 @@ public class CollectionUtilsTests {
 		props.setProperty("prop2", "value2");
 		props.put("prop3", new Integer(3));
 
-		Map map = new HashMap();
+		Map<String, String> map = new HashMap<String, String>();
 		map.put("prop4", "value4");
 
 		CollectionUtils.mergePropertiesIntoMap(props, map);
@@ -98,28 +98,28 @@ public class CollectionUtilsTests {
 
 	@Test
 	public void testContains() {
-		assertFalse(CollectionUtils.contains((Iterator) null, "myElement"));
-		assertFalse(CollectionUtils.contains((Enumeration) null, "myElement"));
-		assertFalse(CollectionUtils.contains(new LinkedList().iterator(), "myElement"));
-		assertFalse(CollectionUtils.contains(new Hashtable().keys(), "myElement"));
+		assertFalse(CollectionUtils.contains((Iterator<String>) null, "myElement"));
+		assertFalse(CollectionUtils.contains((Enumeration<String>) null, "myElement"));
+		assertFalse(CollectionUtils.contains(new LinkedList<String>().iterator(), "myElement"));
+		assertFalse(CollectionUtils.contains(new Hashtable<String, Object>().keys(), "myElement"));
 
-		List list = new LinkedList();
+		List<String> list = new LinkedList<String>();
 		list.add("myElement");
 		assertTrue(CollectionUtils.contains(list.iterator(), "myElement"));
 
-		Hashtable ht = new Hashtable();
+		Hashtable<String, String> ht = new Hashtable<String, String>();
 		ht.put("myElement", "myValue");
 		assertTrue(CollectionUtils.contains(ht.keys(), "myElement"));
 	}
 
 	@Test
 	public void testContainsAny() throws Exception {
-		List source = new ArrayList();
+		List<String> source = new ArrayList<String>();
 		source.add("abc");
 		source.add("def");
 		source.add("ghi");
 
-		List candidates = new ArrayList();
+		List<String> candidates = new ArrayList<String>();
 		candidates.add("xyz");
 		candidates.add("def");
 		candidates.add("abc");
@@ -139,7 +139,7 @@ public class CollectionUtilsTests {
 
 	@Test
 	public void testContainsInstanceWithInstancesThatAreEqualButDistinct() throws Exception {
-		List list = new ArrayList();
+		List<Instance> list = new ArrayList<Instance>();
 		list.add(new Instance("fiona"));
 		assertFalse("Must return false if instance is not in the supplied Collection argument",
 				CollectionUtils.containsInstance(list, new Instance("fiona")));
@@ -147,7 +147,7 @@ public class CollectionUtilsTests {
 
 	@Test
 	public void testContainsInstanceWithSameInstance() throws Exception {
-		List list = new ArrayList();
+		List<Instance> list = new ArrayList<Instance>();
 		list.add(new Instance("apple"));
 		Instance instance = new Instance("fiona");
 		list.add(instance);
@@ -157,7 +157,7 @@ public class CollectionUtilsTests {
 
 	@Test
 	public void testContainsInstanceWithNullInstance() throws Exception {
-		List list = new ArrayList();
+		List<Instance> list = new ArrayList<Instance>();
 		list.add(new Instance("apple"));
 		list.add(new Instance("fiona"));
 		assertFalse("Must return false if null instance is supplied",
@@ -166,12 +166,12 @@ public class CollectionUtilsTests {
 
 	@Test
 	public void testFindFirstMatch() throws Exception {
-		List source = new ArrayList();
+		List<String> source = new ArrayList<String>();
 		source.add("abc");
 		source.add("def");
 		source.add("ghi");
 
-		List candidates = new ArrayList();
+		List<String> candidates = new ArrayList<String>();
 		candidates.add("xyz");
 		candidates.add("def");
 		candidates.add("abc");
@@ -181,35 +181,35 @@ public class CollectionUtilsTests {
 
 	@Test
 	public void testHasUniqueObject() {
-		List list = new LinkedList();
+		List<String> list = new LinkedList<String>();
 		list.add("myElement");
 		list.add("myOtherElement");
 		assertFalse(CollectionUtils.hasUniqueObject(list));
 
-		list = new LinkedList();
+		list = new LinkedList<String>();
 		list.add("myElement");
 		assertTrue(CollectionUtils.hasUniqueObject(list));
 
-		list = new LinkedList();
+		list = new LinkedList<String>();
 		list.add("myElement");
 		list.add(null);
 		assertFalse(CollectionUtils.hasUniqueObject(list));
 
-		list = new LinkedList();
+		list = new LinkedList<String>();
 		list.add(null);
 		list.add("myElement");
 		assertFalse(CollectionUtils.hasUniqueObject(list));
 
-		list = new LinkedList();
+		list = new LinkedList<String>();
 		list.add(null);
 		list.add(null);
 		assertTrue(CollectionUtils.hasUniqueObject(list));
 
-		list = new LinkedList();
+		list = new LinkedList<String>();
 		list.add(null);
 		assertTrue(CollectionUtils.hasUniqueObject(list));
 
-		list = new LinkedList();
+		list = new LinkedList<String>();
 		assertFalse(CollectionUtils.hasUniqueObject(list));
 	}
 
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 955d788c74..bb9e5700fe 100644
--- a/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java
+++ b/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java
@@ -43,14 +43,14 @@ public class MethodInvokerTests extends TestCase {
 		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<>(), new ArrayList<>(), "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<>(), new ArrayList<>(), "hello", "bogus"});
 		mi.prepare();
 		assertEquals("hello", mi.invoke());
 
@@ -58,7 +58,7 @@ public class MethodInvokerTests extends TestCase {
 		mi = new MethodInvoker();
 		mi.setTargetClass(TestClass1.class);
 		mi.setTargetMethod("supertypes2");
-		mi.setArguments(new Object[] {new ArrayList(), new ArrayList(), "hello", Boolean.TRUE});
+		mi.setArguments(new Object[] {new ArrayList<>(), new ArrayList<>(), "hello", Boolean.TRUE});
 		try {
 			mi.prepare();
 			fail("Shouldn't have matched without argument conversion");
@@ -169,23 +169,23 @@ public class MethodInvokerTests extends TestCase {
 		public static void intArguments(int[] arg) {
 		}
 
-		public static String supertypes(Collection c, Integer i) {
+		public static String supertypes(Collection<?> c, Integer i) {
 			return i.toString();
 		}
 
-		public static String supertypes(Collection c, List l, String s) {
+		public static String supertypes(Collection<?> c, List<?> l, String s) {
 			return s;
 		}
 
-		public static String supertypes2(Collection c, List l, Integer i) {
+		public static String supertypes2(Collection<?> c, List<?> l, Integer i) {
 			return i.toString();
 		}
 
-		public static String supertypes2(Collection c, List l, String s, Integer i) {
+		public static String supertypes2(Collection<?> c, List<?> l, String s, Integer i) {
 			return s;
 		}
 
-		public static String supertypes2(Collection c, List l, String s, String s2) {
+		public static String supertypes2(Collection<?> c, List<?> l, String s, String s2) {
 			return s;
 		}
 	}

From 4c7cafbde63548b3538ee90921d5c393f0bbf367 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 28 Dec 2012 19:16:22 +0100
Subject: [PATCH 25/36] Fix "unnecessary @SuppressWarnings" warnings

---
 .../aop/support/DefaultIntroductionAdvisor.java           | 2 +-
 .../io/support/PathMatchingResourcePatternResolver.java   | 1 -
 .../main/java/org/springframework/util/ClassUtils.java    | 8 +++++---
 .../util/comparator/NullSafeComparator.java               | 2 +-
 .../jdbc/core/metadata/GenericTableMetaDataProvider.java  | 1 -
 .../orm/jpa/persistenceunit/PersistenceUnitReader.java    | 4 ----
 .../test/context/web/ServletTestExecutionListener.java    | 1 -
 .../org/springframework/test/jpa/AbstractJpaTests.java    | 2 --
 .../web/context/request/async/WebAsyncManager.java        | 2 +-
 .../support/ServletContextResourcePatternResolver.java    | 1 -
 .../support/DefaultMultipartHttpServletRequest.java       | 1 -
 .../main/java/org/springframework/web/util/WebUtils.java  | 1 -
 .../xml/Jaxb2RootElementHttpMessageConverterTest.java     | 3 ---
 .../portlet/multipart/DefaultMultipartActionRequest.java  | 1 -
 14 files changed, 8 insertions(+), 22 deletions(-)

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 36c81c130b..f9a7e33e5d 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
@@ -38,7 +38,7 @@ import org.springframework.util.ClassUtils;
  * @author Juergen Hoeller
  * @since 11.11.2003
  */
-@SuppressWarnings({ "unchecked", "serial" })
+@SuppressWarnings({"serial" })
 public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFilter, Ordered, Serializable {
 
 	private final Advice advice;
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 128465c964..9b2f8493b6 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
@@ -714,7 +714,6 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 			return this.resources;
 		}
 
-		@SuppressWarnings("unused")
 		public int size() {
 			return this.resources.size();
 		}
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 26f1fafe03..467b0f7cb6 100644
--- a/spring-core/src/main/java/org/springframework/util/ClassUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ClassUtils.java
@@ -17,12 +17,15 @@
 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;
@@ -47,7 +50,6 @@ import java.util.Set;
  * @see TypeUtils
  * @see ReflectionUtils
  */
-@SuppressWarnings("unchecked")
 public abstract class ClassUtils {
 
 	/** Suffix for array class names: "[]" */
@@ -114,9 +116,9 @@ public abstract class ClassUtils {
 
 		Set<Class<?>> primitiveTypes = new HashSet<Class<?>>(32);
 		primitiveTypes.addAll(primitiveWrapperTypeMap.values());
-		primitiveTypes.addAll(Arrays.asList(
+		primitiveTypes.addAll(Arrays.asList(new Class<?>[] {
 				boolean[].class, byte[].class, char[].class, double[].class,
-				float[].class, int[].class, long[].class, short[].class));
+				float[].class, int[].class, long[].class, short[].class}));
 		primitiveTypes.add(void.class);
 		for (Class<?> primitiveType : primitiveTypes) {
 			primitiveTypeNameMap.put(primitiveType.getName(), primitiveType);
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java
index 35f37a9ead..1171bdc1d3 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java
@@ -64,7 +64,7 @@ public class NullSafeComparator<T> implements Comparator<T> {
 	 * @see #NULLS_LOW
 	 * @see #NULLS_HIGH
 	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@SuppressWarnings({ "unchecked"})
 	private NullSafeComparator(boolean nullsLow) {
 		this.nonNullComparator = new ComparableComparator();
 		this.nullsLow = nullsLow;
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 4869064edc..138518660a 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
@@ -475,7 +475,6 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 			this.type = type;
 		}
 
-		@SuppressWarnings("unused")
 		public String getType() {
 			return this.type;
 		}
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 3d4ae96845..78f00a9f2e 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
@@ -293,7 +293,6 @@ class PersistenceUnitReader {
 	/**
 	 * Parse the {@code property} XML elements.
 	 */
-	@SuppressWarnings("unchecked")
 	protected void parseProperties(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) {
 		Element propRoot = DomUtils.getChildElementByTagName(persistenceUnit, PROPERTIES);
 		if (propRoot == null) {
@@ -310,7 +309,6 @@ class PersistenceUnitReader {
 	/**
 	 * Parse the {@code class} XML elements.
 	 */
-	@SuppressWarnings("unchecked")
 	protected void parseManagedClasses(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) {
 		List<Element> classes = DomUtils.getChildElementsByTagName(persistenceUnit, MANAGED_CLASS_NAME);
 		for (Element element : classes) {
@@ -323,7 +321,6 @@ class PersistenceUnitReader {
 	/**
 	 * Parse the {@code mapping-file} XML elements.
 	 */
-	@SuppressWarnings("unchecked")
 	protected void parseMappingFiles(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) {
 		List<Element> files = DomUtils.getChildElementsByTagName(persistenceUnit, MAPPING_FILE_NAME);
 		for (Element element : files) {
@@ -337,7 +334,6 @@ class PersistenceUnitReader {
 	/**
 	 * Parse the {@code jar-file} XML elements.
 	 */
-	@SuppressWarnings("unchecked")
 	protected void parseJarFiles(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) throws IOException {
 		List<Element> jars = DomUtils.getChildElementsByTagName(persistenceUnit, JAR_FILE_URL);
 		for (Element element : jars) {
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 2d865d8afd..01302bb110 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
@@ -126,7 +126,6 @@ public class ServletTestExecutionListener extends AbstractTestExecutionListener
 				RequestContextHolder.setRequestAttributes(servletWebRequest);
 
 				if (wac instanceof ConfigurableApplicationContext) {
-					@SuppressWarnings("resource")
 					ConfigurableApplicationContext configurableApplicationContext = (ConfigurableApplicationContext) wac;
 					ConfigurableListableBeanFactory bf = configurableApplicationContext.getBeanFactory();
 					bf.registerResolvableDependency(MockHttpServletResponse.class, response);
diff --git a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
index 060d7880a3..3afa516586 100644
--- a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -326,7 +326,6 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 
 		private final LoadTimeWeaver ltw;
 
-		@SuppressWarnings("unused")
 		public LoadTimeWeaverInjectingBeanPostProcessor(LoadTimeWeaver ltw) {
 			this.ltw = ltw;
 		}
@@ -347,7 +346,6 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 
 		private final ClassLoader shadowingClassLoader;
 
-		@SuppressWarnings("unused")
 		public ShadowingLoadTimeWeaver(ClassLoader shadowingClassLoader) {
 			this.shadowingClassLoader = shadowingClassLoader;
 		}
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 d5ec8642b9..2e104d8e75 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
@@ -252,7 +252,7 @@ public final class WebAsyncManager {
 	 * @see #getConcurrentResult()
 	 * @see #getConcurrentResultContext()
 	 */
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"unchecked" })
 	public void startCallableProcessing(final Callable<?> callable, Object... processingContext) throws Exception {
 		Assert.notNull(callable, "Callable must not be null");
 		startCallableProcessing(new WebAsyncTask(callable), processingContext);
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 ec2fbecb8b..e1e54b6b21 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
@@ -156,7 +156,6 @@ public class ServletContextResourcePatternResolver extends PathMatchingResourceP
 	 * @param result the Set of matching Resources to add to
 	 * @throws IOException if jar contents could not be retrieved
 	 */
-	@SuppressWarnings("unchecked")
 	private void doRetrieveMatchingJarEntries(String jarFilePath, String entryPattern, Set<Resource> result) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Searching jar file [" + jarFilePath + "] for entries matching [" + entryPattern + "]");
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 19d435b77d..ab995b112f 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
@@ -103,7 +103,6 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public Map<String, String[]> getParameterMap() {
 		Map<String, String[]> paramMap = new HashMap<String, String[]>();
 		paramMap.putAll(super.getParameterMap());
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 d35ed57273..0a901294a0 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
@@ -573,7 +573,6 @@ public abstract class WebUtils {
 	 * @return the value of the parameter, or {@code null}
 	 * if the parameter does not exist in given request
 	 */
-	@SuppressWarnings("unchecked")
 	public static String findParameterValue(ServletRequest request, String name) {
 		return findParameterValue(request.getParameterMap(), name);
 	}
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/Jaxb2RootElementHttpMessageConverterTest.java
index 5763411e8e..e2545123fe 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/Jaxb2RootElementHttpMessageConverterTest.java
@@ -72,7 +72,6 @@ public class Jaxb2RootElementHttpMessageConverterTest {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	public void readXmlRootElement() throws Exception {
 		byte[] body = "<rootElement><type s=\"Hello World\"/></rootElement>".getBytes("UTF-8");
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
@@ -81,7 +80,6 @@ public class Jaxb2RootElementHttpMessageConverterTest {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	public void readXmlRootElementSubclass() throws Exception {
 		byte[] body = "<rootElement><type s=\"Hello World\"/></rootElement>".getBytes("UTF-8");
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
@@ -90,7 +88,6 @@ public class Jaxb2RootElementHttpMessageConverterTest {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	public void readXmlType() throws Exception {
 		byte[] body = "<foo s=\"Hello World\"/>".getBytes("UTF-8");
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
index 550e08867d..a2b8184f9a 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
@@ -131,7 +131,6 @@ public class DefaultMultipartActionRequest extends ActionRequestWrapper implemen
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public Map<String, String[]> getParameterMap() {
 		Map<String, String[]> paramMap = new HashMap<String, String[]>();
 		paramMap.putAll(super.getParameterMap());

From 40357be72bcd687972c0778f03593d076fe05d98 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 19 Dec 2012 16:03:11 +0100
Subject: [PATCH 26/36] Fix various compiler warnings in spring-context

All warning types other than [deprecation] and [unchecked] are now
fixed in spring-context/src/test
---
 .../java/example/scannable/ServiceInvocationCounter.java     | 3 +--
 .../springframework/beans/factory/config/SimpleMapScope.java | 4 ++--
 .../context/annotation/ConfigurationClassAndBFPPTests.java   | 5 +----
 .../java/org/springframework/validation/DataBinderTests.java | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java b/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java
index fbaf713374..292b058656 100644
--- a/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java
+++ b/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java
@@ -40,8 +40,7 @@ public class ServiceInvocationCounter {
 	@Before("serviceExecution()")
 	public void countUse() {
 		this.useCount++;
-		this.threadLocalCount.set(this.useCount);
-		System.out.println("");
+		threadLocalCount.set(this.useCount);
 	}
 
 	public int getCount() {
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
index 9ae909d7b7..604d2595b0 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
@@ -70,8 +70,8 @@ public class SimpleMapScope implements Scope, Serializable {
 	}
 
 	public void close() {
-		for (Iterator it = this.callbacks.iterator(); it.hasNext();) {
-			Runnable runnable = (Runnable) it.next();
+		for (Iterator<Runnable> it = this.callbacks.iterator(); it.hasNext();) {
+			Runnable runnable = it.next();
 			runnable.run();
 		}
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
index 060c9f6bf2..d917b0d608 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
@@ -99,14 +99,11 @@ public class ConfigurationClassAndBFPPTests {
 
 
 	@Test
-	@SuppressWarnings("static-access")
 	public void staticBeanMethodsDoNotRespectScoping() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(ConfigWithStaticBeanMethod.class);
 		ctx.refresh();
-
-		ConfigWithStaticBeanMethod config = ctx.getBean(ConfigWithStaticBeanMethod.class);
-		assertThat(config.testBean(), not(sameInstance(config.testBean())));
+		assertThat(ConfigWithStaticBeanMethod.testBean(), not(sameInstance(ConfigWithStaticBeanMethod.testBean())));
 	}
 
 
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 c9f12660a1..e85cf9a623 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
@@ -1444,7 +1444,6 @@ public class DataBinderTests extends TestCase {
 		assertEquals("badName", nameError.getCode());
 	}
 
-	@SuppressWarnings("unchecked")
 	public void testBindingWithResortedList() {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
@@ -1590,6 +1589,7 @@ public class DataBinderTests extends TestCase {
 		mpv.add("f[list][1]", "secondValue");
 		binder.bind(mpv);
 		assertFalse(binder.getBindingResult().hasErrors());
+		@SuppressWarnings("unchecked")
 		List<Object> list = (List<Object>) form.getF().get("list");
 		assertEquals("firstValue", list.get(0));
 		assertEquals("secondValue", list.get(1));

From 3ac45547cfccdf3cbfd6ca80e160d25110c99e58 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Wed, 19 Dec 2012 14:57:27 -0800
Subject: [PATCH 27/36] Update -Xlint compiler warning output

Enable output for the compiler warnings that have been eliminated so
far. 'rawtypes', 'deprecation', and 'unchecked' remain suppressed until
these warnings can be fully eliminated as well.
---
 build.gradle | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a0882a2fe0..540694d2ee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,26 @@ configure(allprojects) {
 	sourceCompatibility=1.5
 	targetCompatibility=1.5
 
-	[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:none"]
+	[compileJava, compileTestJava]*.options*.compilerArgs = [
+		"-Xlint:serial",
+		"-Xlint:varargs",
+		"-Xlint:cast",
+		"-Xlint:classfile",
+		"-Xlint:dep-ann",
+		"-Xlint:divzero",
+		"-Xlint:empty",
+		"-Xlint:finally",
+		"-Xlint:overrides",
+		"-Xlint:path",
+		"-Xlint:processing",
+		"-Xlint:static",
+		"-Xlint:try",
+		"-Xlint:-options",     // intentionally disabled
+		"-Xlint:-fallthrough", // intentionally disabled
+		"-Xlint:-rawtypes",    // TODO enable and fix warnings
+		"-Xlint:-deprecation", // TODO enable and fix warnings
+		"-Xlint:-unchecked"    // TODO enable and fix warnings
+	]
 
 	sourceSets.test.resources.srcDirs = ["src/test/resources", "src/test/java"]
 

From 6f0c7eb8c166040eb16787ba0a1248c67e075aa1 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 19 Dec 2012 09:22:33 +0100
Subject: [PATCH 28/36] Update test source and target JDK compatibility

"test" source and target compatibility has been upgraded to 1.7 except
where noted, allowing us to use 1.7 language features such as
diamond-style (<>) generics declarations, automatic resource management
and multi-catch. More importantly, we will be able to upgrade to 1.8
once it is available in order to make use of lambda expressions, etc in
our test cases.

IDE configurations must be relaxed to allow 1.7 across the board, as
neither Eclipse nor IDEA are clever enough to allow for different
language levels across production and test resources. See [1] for a
feature request on that front.

spring-oxm is a special case here, and has been pinned at 1.6
compatibility even for its test sources in order to avoid a class
verification error that JibX throws when encountering 1.7-level
bytecode [2].

Likewise with spring-orm, toplink encounters a similar class
verification error, so has been pinned to 1.6 for the time being.
When we remove the (already deprecated since 3.2) Toplink support
we can restore compatibility to 1.7.

[1]: http://youtrack.jetbrains.com/issue/IDEA-97814
[2]: http://jira.codehaus.org/browse/JIBX-465

Issue: SPR-10129
---
 build.gradle                                  | 26 +++++++++++++++++--
 .../oxm/castor/CastorUnmarshallerTests.java   | 10 ++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 540694d2ee..5e996570c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,8 +32,14 @@ configure(allprojects) {
 
 	group = "org.springframework"
 
-	sourceCompatibility=1.5
-	targetCompatibility=1.5
+	compileJava {
+		sourceCompatibility=1.5
+		targetCompatibility=1.5
+	}
+	compileTestJava {
+		sourceCompatibility=1.7
+		targetCompatibility=1.7
+	}
 
 	[compileJava, compileTestJava]*.options*.compilerArgs = [
 		"-Xlint:serial",
@@ -333,6 +339,14 @@ project("spring-tx") {
 project("spring-oxm") {
 	description = "Spring Object/XML Marshalling"
 	apply from: "oxm.gradle"
+
+	compileTestJava {
+		// necessary to avoid java.lang.VerifyError on jibx compilation
+		// see http://jira.codehaus.org/browse/JIBX-465
+		sourceCompatibility=1.6
+		targetCompatibility=1.6
+	}
+
 	dependencies {
 		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
@@ -458,6 +472,14 @@ project("spring-web") {
 
 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
+		sourceCompatibility=1.6
+		targetCompatibility=1.6
+	}
+
 	dependencies {
 		compile("aopalliance:aopalliance:1.0")
 		optional("org.hibernate:hibernate-core:3.3.2.GA")
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 4c5387aaa3..367b4aa5c1 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-2011 the original author or authors.
+ * 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.
@@ -29,6 +29,8 @@ import org.springframework.oxm.AbstractUnmarshallerTests;
 import org.springframework.oxm.MarshallingException;
 import org.springframework.oxm.Unmarshaller;
 
+import static org.hamcrest.CoreMatchers.*;
+
 import static org.junit.Assert.*;
 
 /**
@@ -66,7 +68,7 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests {
 	protected void testFlight(Object o) {
 		Flight flight = (Flight) o;
 		assertNotNull("Flight is null", flight);
-		assertEquals("Number is invalid", 42L, flight.getNumber());
+		assertThat("Number is invalid", flight.getNumber(), equalTo(42L));
 	}
 
 	@Override
@@ -104,10 +106,10 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests {
 		assertEquals("Invalid amount of items", 2, order.getOrderItemCount());
 		OrderItem item = order.getOrderItem(0);
 		assertEquals("Invalid items", "1", item.getId());
-		assertEquals("Invalid items", 15, item.getQuantity());
+		assertThat("Invalid items", item.getQuantity(), equalTo(15));
 		item = order.getOrderItem(1);
 		assertEquals("Invalid items", "3", item.getId());
-		assertEquals("Invalid items", 20, item.getQuantity());
+		assertThat("Invalid items", item.getQuantity(), equalTo(20));
 	}
 
 	@Test

From 4c8cd7b0bd45bbe37ec9cc588b0f29608831b05f Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 28 Dec 2012 13:59:24 +0100
Subject: [PATCH 29/36] Add @Override annotations to test sources

Issue: SPR-10129
---
 .../AspectJExpressionPointcutTests.java       |  2 +
 .../BeanNamePointcutMatchingTests.java        |  1 +
 ...hodInvocationProceedingJoinPointTests.java |  4 ++
 .../TrickyAspectJPointcutExpressionTests.java |  2 +
 .../AbstractAspectJAdvisorFactoryTests.java   | 11 +++
 .../annotation/ArgumentBindingTests.java      |  1 +
 .../annotation/AspectProxyFactoryTests.java   |  1 +
 .../AspectJPrecedenceComparatorTests.java     |  1 +
 .../aop/framework/AopProxyUtilsTests.java     |  1 +
 .../framework/IntroductionBenchmarkTests.java |  1 +
 .../aop/framework/MethodInvocationTests.java  |  1 +
 .../aop/framework/NullPrimitiveTests.java     |  3 +
 .../aop/framework/PrototypeTargetTests.java   |  2 +
 .../aop/framework/ProxyFactoryTests.java      |  4 ++
 .../adapter/ThrowsAdviceInterceptorTests.java |  1 +
 .../ConcurrencyThrottleInterceptorTests.java  |  1 +
 .../CustomizableTraceInterceptorTests.java    |  1 +
 .../interceptor/DebugInterceptorTests.java    |  1 +
 .../ExposeBeanNameAdvisorsTests.java          |  1 +
 .../ExposeInvocationInterceptorTests.java     |  3 +
 .../aop/support/AopUtilsTests.java            |  2 +
 .../aop/support/ComposablePointcutTests.java  |  4 ++
 ...elegatingIntroductionInterceptorTests.java |  8 +++
 .../support/JdkRegexpMethodPointcutTests.java |  1 +
 .../aop/support/MethodMatchersTests.java      |  3 +
 .../aop/support/PointcutsTests.java           |  9 +++
 .../target/LazyCreationTargetSourceTests.java |  2 +
 .../aop/target/LazyInitTargetSourceTests.java |  1 +
 .../PrototypeBasedTargetSourceTests.java      |  2 +
 .../target/ThreadLocalTargetSourceTests.java  |  1 +
 .../dynamic/RefreshableTargetSourceTests.java |  2 +
 .../java/test/aop/CountingBeforeAdvice.java   |  1 +
 .../test/java/test/aop/DefaultLockable.java   |  3 +
 .../test/java/test/aop/NopInterceptor.java    |  1 +
 .../test/java/test/aop/PerTargetAspect.java   |  1 +
 .../test/aop/SerializableNopInterceptor.java  |  2 +
 .../test/java/test/beans/DerivedTestBean.java |  4 ++
 .../test/java/test/beans/NestedTestBean.java  |  1 +
 .../java/test/beans/SerializablePerson.java   |  5 ++
 .../src/test/java/test/beans/TestBean.java    | 17 +++++
 .../CollectingReaderEventListener.java        |  4 ++
 .../foo/ComponentBeanDefinitionParser.java    |  1 +
 .../java/com/foo/ComponentFactoryBean.java    |  3 +
 .../com/foo/ComponentNamespaceHandler.java    |  1 +
 .../springframework/beans/BeanUtilsTests.java |  4 ++
 .../beans/BeanWrapperGenericsTests.java       |  6 ++
 .../beans/BeanWrapperTests.java               | 13 ++++
 .../beans/ConcurrentBeanWrapperTests.java     |  1 +
 .../beans/ExtendedBeanInfoTests.java          |  5 ++
 ...uiredAnnotationBeanPostProcessorTests.java |  2 +
 .../factory/ConcurrentBeanFactoryTests.java   |  2 +
 .../DefaultListableBeanFactoryTests.java      | 31 +++++++++
 .../beans/factory/FactoryBeanTests.java       |  8 +++
 .../factory/SharedBeanRegistryTests.java      |  1 +
 ...wiredAnnotationBeanPostProcessorTests.java |  7 ++
 .../CustomAutowireConfigurerTests.java        |  2 +
 ...njectAnnotationBeanPostProcessorTests.java |  7 ++
 .../config/CustomEditorConfigurerTests.java   |  2 +
 .../PropertyResourceConfigurerTests.java      |  3 +
 .../factory/config/SimpleScopeTests.java      |  1 +
 .../beans/factory/config/TestTypes.java       |  5 ++
 .../parsing/CustomProblemReporterTests.java   |  3 +
 .../support/BeanFactoryGenericsTests.java     |  2 +
 .../PropertiesBeanDefinitionReaderTests.java  |  1 +
 .../beans/factory/support/Spr8954Tests.java   |  3 +
 .../security/CallbacksSecurityTests.java      | 18 +++++
 .../security/support/CustomFactoryBean.java   |  3 +
 .../support/security/support/DestroyBean.java |  1 +
 .../support/security/support/InitBean.java    |  1 +
 .../factory/xml/AbstractBeanFactoryTests.java |  2 +
 .../factory/xml/BeanNameGenerationTests.java  |  1 +
 .../xml/CollectingReaderEventListener.java    |  4 ++
 .../factory/xml/CollectionMergingTests.java   |  1 +
 .../beans/factory/xml/CountingFactory.java    |  3 +
 .../xml/DefaultLifecycleMethodsTests.java     |  1 +
 .../xml/DelegatingEntityResolverTests.java    |  1 +
 .../beans/factory/xml/DependenciesBean.java   |  1 +
 .../factory/xml/EventPublicationTests.java    |  1 +
 .../beans/factory/xml/GeneratedNameBean.java  |  1 +
 .../factory/xml/MetadataAttachmentTests.java  |  1 +
 .../xml/ProfileXmlBeanDefinitionTests.java    |  1 +
 .../factory/xml/ProtectedLifecycleBean.java   |  6 ++
 .../xml/UtilNamespaceHandlerTests.java        |  1 +
 .../xml/XmlListableBeanFactoryTests.java      |  5 ++
 .../beans/propertyeditors/BeanInfoTests.java  |  2 +
 .../propertyeditors/CustomEditorTests.java    | 46 +++++++++++++
 .../support/PropertyComparatorTests.java      |  1 +
 .../test/java/test/beans/DerivedTestBean.java |  4 ++
 .../test/java/test/beans/DummyFactory.java    |  7 ++
 .../test/java/test/beans/LifecycleBean.java   |  6 ++
 .../test/java/test/beans/NestedTestBean.java  |  1 +
 .../src/test/java/test/beans/TestBean.java    | 20 ++++++
 .../springframework/beans/NestedTestBean.java |  1 +
 .../org/springframework/beans/TestBean.java   | 20 ++++++
 .../cache/ehcache/EhCacheSupportTests.java    |  3 +
 .../javamail/InternetAddressEditorTests.java  |  1 +
 .../mail/javamail/JavaMailSenderTests.java    |  4 ++
 .../scheduling/quartz/QuartzSupportTests.java | 28 ++++++++
 .../JasperReportsUtilsTests.java              |  1 +
 .../AutowiredQualifierFooService.java         |  3 +
 .../example/scannable/FooServiceImpl.java     |  3 +
 .../scannable/ScopedProxyTestBean.java        |  3 +
 .../java/example/scannable/StubFooDao.java    |  1 +
 .../AspectAndAdvicePrecedenceTests.java       | 10 +++
 ...AspectJExpressionPointcutAdvisorTests.java |  1 +
 .../aop/aspectj/BeanNamePointcutTests.java    |  1 +
 .../DeclarationOrderIndependenceTests.java    |  6 ++
 .../aop/aspectj/ProceedTests.java             |  9 +++
 .../SubtypeSensitiveMatchingTests.java        |  3 +
 .../aspectj/TargetPointcutSelectionTests.java |  2 +
 ...tSelectionOnlyPointcutsAtAspectJTests.java |  3 +
 ...sAndTargetSelectionOnlyPointcutsTests.java |  1 +
 .../aop/aspectj/_TestTypes.java               |  5 ++
 .../autoproxy/AnnotationPointcutTests.java    |  1 +
 .../AspectImplementingInterfaceTests.java     |  1 +
 .../AspectJAutoProxyCreatorTests.java         |  6 ++
 .../AtAspectJAnnotationBindingTests.java      |  3 +
 .../aop/aspectj/autoproxy/_TestTypes.java     |  4 ++
 .../autoproxy/benchmark/BenchmarkTests.java   |  5 ++
 .../autoproxy/spr3064/SPR3064Tests.java       |  1 +
 .../GenericBridgeMethodMatchingTests.java     |  2 +
 .../GenericParameterMatchingTests.java        |  2 +
 .../aop/framework/AbstractAopProxyTests.java  | 60 ++++++++++++++++
 .../aop/framework/CglibProxyTests.java        |  6 ++
 .../aop/framework/JdkDynamicProxyTests.java   |  7 ++
 .../aop/framework/ProxyFactoryBeanTests.java  | 10 +++
 .../aop/framework/_TestTypes.java             |  3 +
 .../AdvisorAdapterRegistrationTests.java      |  4 ++
 .../AdvisorAutoProxyCreatorTests.java         |  1 +
 .../autoproxy/AutoProxyCreatorTests.java      |  2 +
 .../BeanNameAutoProxyCreatorInitTests.java    |  1 +
 .../BeanNameAutoProxyCreatorTests.java        |  3 +
 .../beans/DerivedTestBean.java                |  4 ++
 .../springframework/beans/NestedTestBean.java |  1 +
 .../beans/SerializablePerson.java             |  5 ++
 .../org/springframework/beans/TestBean.java   | 20 ++++++
 .../factory/AbstractBeanFactoryTests.java     |  1 +
 .../beans/factory/DummyFactory.java           |  7 ++
 .../beans/factory/LifecycleBean.java          |  6 ++
 .../beans/factory/MustBeInitialized.java      |  1 +
 .../BridgeMethodAutowiringTests.java          |  1 +
 .../beans/factory/config/SimpleMapScope.java  |  5 ++
 .../CollectingReaderEventListener.java        |  4 ++
 .../beans/factory/xml/DependenciesBean.java   |  1 +
 .../factory/xml/QualifierAnnotationTests.java |  3 +
 .../factory/xml/XmlBeanFactoryTestTypes.java  | 11 +++
 .../factory/xml/XmlBeanFactoryTests.java      | 10 +++
 .../support/CustomNamespaceHandlerTests.java  |  9 +++
 .../AnnotatedClassCacheableService.java       | 22 ++++++
 .../cache/config/DefaultCacheableService.java | 22 ++++++
 .../cache/config/EnableCachingTests.java      |  4 ++
 .../springframework/context/ACATester.java    |  1 +
 .../AbstractApplicationContextTests.java      |  2 +
 .../context/BeanThatBroadcasts.java           |  1 +
 .../context/BeanThatListens.java              |  1 +
 .../context/LifecycleContextBean.java         |  3 +
 .../springframework/context/TestListener.java |  1 +
 ...ntextSingletonBeanFactoryLocatorTests.java |  2 +
 ...notationConfigApplicationContextTests.java |  7 ++
 .../AnnotationProcessorPerformanceTests.java  |  2 +
 ...ommonAnnotationBeanPostProcessorTests.java | 10 +++
 .../annotation/ComponentScanParserTests.java  |  1 +
 .../ConfigurationClassAndBFPPTests.java       |  2 +
 ...tionWithFactoryBeanAndAutowiringTests.java |  6 ++
 ...tionWithFactoryBeanAndParametersTests.java |  3 +
 .../DestroyMethodInferenceTests.java          |  1 +
 .../EnableLoadTimeWeavingTests.java           |  3 +
 .../FooServiceDependentConverter.java         |  1 +
 .../context/annotation/ImportAwareTests.java  |  5 ++
 .../ImportBeanDefinitionRegistrarTests.java   |  4 ++
 .../NestedConfigurationClassTests.java        |  1 +
 .../Spr3775InitDestroyLifecycleTests.java     |  4 ++
 .../context/annotation/Spr6602Tests.java      |  3 +
 .../annotation/TestBeanNameGenerator.java     |  1 +
 .../annotation/TestScopeMetadataResolver.java |  1 +
 .../ConfigurationBeanNameTests.java           |  1 +
 ...ClassCglibCallbackDeregistrationTests.java |  1 +
 .../ConfigurationClassProcessingTests.java    |  4 ++
 .../configuration/ScopingTests.java           |  5 ++
 .../configuration/Spr7167Tests.java           |  1 +
 .../context/annotation3/StubFooDao.java       |  1 +
 .../context/annotation5/OtherFooDao.java      |  1 +
 .../StringToBarConverter.java                 |  1 +
 .../event/ApplicationContextEventTests.java   |  5 ++
 .../EventPublicationInterceptorTests.java     |  4 ++
 .../context/event/LifecycleEventTests.java    |  4 ++
 .../ApplicationContextExpressionTests.java    |  5 ++
 .../BeanFactoryPostProcessorTests.java        |  1 +
 .../ClassPathXmlApplicationContextTests.java  |  1 +
 .../ConversionServiceFactoryBeanTests.java    |  5 ++
 .../DefaultLifecycleProcessorTests.java       | 22 ++++++
 .../FactoryBeanAndApplicationListener.java    |  4 ++
 .../context/support/LifecycleTestBean.java    |  3 +
 .../context/support/Logic.java                |  1 +
 .../context/support/ResourceConverter.java    |  1 +
 .../context/support/Service.java              |  4 ++
 .../support/SimpleThreadScopeTest.java        |  2 +
 ...ticApplicationContextMulticasterTests.java |  4 ++
 .../StaticApplicationContextTests.java        |  2 +
 .../support/StaticMessageSourceTests.java     |  3 +
 .../context/support/TestProxyFactoryBean.java |  1 +
 .../core/task/NoOpRunnable.java               |  1 +
 .../LocalSlsbInvokerInterceptorTests.java     |  2 +
 ...StatelessSessionProxyFactoryBeanTests.java |  4 ++
 ...mpleRemoteSlsbInvokerInterceptorTests.java |  2 +
 ...StatelessSessionProxyFactoryBeanTests.java |  9 +++
 .../format/number/NumberFormattingTests.java  |  1 +
 ...tingConversionServiceFactoryBeanTests.java |  8 +++
 .../FormattingConversionServiceTests.java     |  8 +++
 .../ReflectiveLoadTimeWeaverTests.java        |  2 +
 .../springframework/jmx/AbstractJmxTests.java |  2 +
 .../jmx/AbstractMBeanServerTests.java         |  2 +
 .../org/springframework/jmx/JmxTestBean.java  |  7 ++
 .../access/MBeanClientInterceptorTests.java   |  4 ++
 ...moteMBeanClientInterceptorTestsIgnore.java |  3 +
 .../export/CustomEditorConfigurerTests.java   |  1 +
 .../export/MBeanExporterOperationsTests.java  |  2 +
 .../jmx/export/MBeanExporterTests.java        |  8 +++
 .../jmx/export/NotificationListenerTests.java |  3 +
 .../export/NotificationPublisherTests.java    |  9 +++
 .../PropertyPlaceholderConfigurerTests.java   |  1 +
 .../jmx/export/TestDynamicMBean.java          |  6 ++
 .../AnnotationMetadataAssemblerTests.java     |  4 ++
 .../export/annotation/AnnotationTestBean.java |  7 ++
 .../annotation/AnnotationTestBeanFactory.java |  3 +
 .../annotation/AnnotationTestSubBean.java     |  4 ++
 .../annotation/JmxUtilsAnnotationTests.java   |  2 +
 ...tractMetadataAssemblerAutodetectTests.java |  1 +
 .../AbstractMetadataAssemblerTests.java       |  4 ++
 ...aceBasedMBeanInfoAssemblerCustomTests.java |  5 ++
 ...aceBasedMBeanInfoAssemblerMappedTests.java |  5 ++
 ...InterfaceBasedMBeanInfoAssemblerTests.java |  5 ++
 ...ExclusionMBeanInfoAssemblerComboTests.java |  5 ++
 ...xclusionMBeanInfoAssemblerMappedTests.java |  5 ++
 ...usionMBeanInfoAssemblerNotMappedTests.java |  5 ++
 ...ethodExclusionMBeanInfoAssemblerTests.java |  5 ++
 ...ameBasedMBeanInfoAssemblerMappedTests.java |  5 ++
 ...ethodNameBasedMBeanInfoAssemblerTests.java |  5 ++
 .../assembler/ReflectiveAssemblerTests.java   |  5 ++
 .../export/naming/KeyNamingStrategyTests.java |  4 ++
 .../PropertiesFileNamingStrategyTests.java    |  1 +
 .../naming/PropertiesNamingStrategyTests.java |  4 ++
 .../ModelMBeanNotificationPublisherTests.java |  2 +
 .../jmx/support/JmxUtilsTests.java            |  9 +++
 .../jndi/JndiObjectFactoryBeanTests.java      |  4 ++
 .../jndi/JndiTemplateTests.java               |  7 ++
 .../jndi/SimpleNamingContextTests.java        |  9 +++
 .../mock/jndi/ExpectedLookupTemplate.java     |  1 +
 .../mock/jndi/SimpleNamingContext.java        | 36 ++++++++++
 .../mock/jndi/SimpleNamingContextBuilder.java |  2 +
 .../remoting/rmi/RmiSupportTests.java         | 10 +++
 ...AsyncAnnotationBeanPostProcessorTests.java |  3 +
 .../annotation/AsyncExecutionTests.java       |  7 ++
 .../annotation/EnableAsyncTests.java          |  1 +
 .../annotation/EnableSchedulingTests.java     |  7 ++
 .../ScheduledExecutorFactoryBeanTests.java    |  4 ++
 .../ThreadPoolTaskSchedulerTests.java         |  4 ++
 .../ExecutorBeanDefinitionParserTests.java    |  1 +
 ...heduledTasksBeanDefinitionParserTests.java |  1 +
 .../support/PeriodicTriggerTests.java         |  3 +
 .../scheduling/timer/TimerSupportTests.java   |  7 ++
 .../timer/TimerTaskExecutorTests.java         |  5 ++
 .../scripting/config/OtherTestBean.java       |  3 +
 .../scripting/groovy/ConcreteMessenger.java   |  2 +
 .../groovy/GroovyScriptFactoryTests.java      |  2 +
 .../scripting/groovy/LogUserAdvice.java       |  1 +
 .../scripting/groovy/TestServiceImpl.java     |  1 +
 .../jruby/JRubyScriptFactoryTests.java        |  1 +
 .../scripting/support/StubMessenger.java      |  2 +
 .../org/springframework/ui/ModelMapTests.java |  1 +
 .../DataBinderFieldAccessTests.java           |  2 +
 .../validation/DataBinderTests.java           | 50 ++++++++++++++
 .../DefaultMessageCodesResolverTests.java     |  1 +
 .../validation/ValidationUtilsTests.java      |  4 ++
 .../beanvalidation/MethodValidationTests.java |  1 +
 .../beanvalidation/ValidatorFactoryTests.java |  2 +
 .../advice/CountingAfterReturningAdvice.java  |  1 +
 .../test/advice/CountingBeforeAdvice.java     |  1 +
 .../java/test/aspect/PerTargetAspect.java     |  1 +
 .../src/test/java/test/beans/CustomScope.java |  5 ++
 .../test/java/test/beans/NestedTestBean.java  |  1 +
 .../src/test/java/test/beans/TestBean.java    | 17 +++++
 .../java/test/interceptor/NopInterceptor.java |  1 +
 .../SerializableNopInterceptor.java           |  2 +
 .../TimestampIntroductionInterceptor.java     |  1 +
 .../test/java/test/mixin/DefaultLockable.java |  3 +
 .../src/test/java/test/mixin/LockMixin.java   |  4 ++
 .../beans/DerivedTestBean.java                |  4 ++
 .../springframework/beans/NestedTestBean.java |  1 +
 .../org/springframework/beans/TestBean.java   | 18 +++++
 .../core/AttributeAccessorSupportTests.java   |  2 +
 .../core/BridgeMethodResolverTests.java       | 69 +++++++++++++++++++
 .../core/DefaultControlFlowTests.java         |  1 +
 .../GenericCollectionTypeResolverTests.java   |  2 +
 .../core/Jdk14ControlFlowTests.java           |  1 +
 .../core/OrderComparatorTests.java            |  2 +
 ...ioritizedParameterNameDiscovererTests.java |  4 ++
 .../core/annotation/AnnotationUtilsTests.java |  5 ++
 .../core/convert/TypeDescriptorTests.java     |  8 +++
 .../converter/ConvertingComparatorTests.java  |  2 +
 .../CollectionToCollectionConverterTests.java | 12 ++++
 .../support/DefaultConversionTests.java       |  1 +
 .../GenericConversionServiceTests.java        | 19 +++++
 .../core/enums/LabeledEnumTests.java          |  4 ++
 .../core/io/ResourceTests.java                |  6 ++
 .../core/io/support/MyDummyFactory1.java      |  1 +
 .../core/io/support/MyDummyFactory2.java      |  1 +
 .../core/style/ToStringCreatorTests.java      |  1 +
 .../task/SimpleAsyncTaskExecutorTests.java    |  4 ++
 .../util/AutoPopulatingListTests.java         |  1 +
 .../util/CachingMapDecoratorTests.java        |  1 +
 .../springframework/util/ClassUtilsTests.java |  1 +
 .../util/ConcurrentReferenceHashMapTests.java |  6 ++
 .../util/FileSystemUtilsTests.java            |  1 +
 .../util/MethodInvokerTests.java              |  6 ++
 .../util/MockLog4jAppender.java               |  3 +
 .../util/PropertyPlaceholderHelperTests.java  |  1 +
 .../util/ReflectionUtilsTests.java            |  2 +
 .../util/ResourceUtilsTests.java              |  1 +
 .../spel/ConstructorInvocationTests.java      |  1 +
 .../expression/spel/EvaluationTests.java      |  3 +
 .../spel/ExpressionLanguageScenarioTests.java | 10 +++
 ...essionTestsUsingCoreConversionService.java |  2 +
 .../expression/spel/IndexingTests.java        |  5 ++
 .../expression/spel/MapAccessTests.java       |  5 ++
 .../spel/MethodInvocationTests.java           |  3 +
 .../spel/OperatorOverloaderTests.java         |  2 +
 .../expression/spel/PropertyAccessTests.java  |  5 ++
 .../spel/ScenariosForSpringSecurity.java      | 15 ++++
 .../spel/SpelDocumentationTests.java          |  3 +
 .../expression/spel/SpelReproTests.java       | 16 +++++
 .../spel/TemplateExpressionParsingTests.java  |  6 ++
 .../expression/spel/ast/OpPlusTests.java      |  1 +
 .../springframework/beans/NestedTestBean.java |  1 +
 .../org/springframework/beans/TestBean.java   | 20 ++++++
 .../jdbc/AbstractJdbcTests.java               |  2 +
 .../InitializeDatabaseIntegrationTests.java   |  1 +
 .../jdbc/core/AbstractRowMapperTests.java     |  1 +
 .../jdbc/core/JdbcTemplateQueryTests.java     |  5 ++
 .../jdbc/core/JdbcTemplateTests.java          | 52 ++++++++++++++
 .../jdbc/core/RowMapperTests.java             |  4 ++
 .../core/SimpleRowCountCallbackHandler.java   |  1 +
 .../jdbc/core/StatementCreatorUtilsTests.java |  2 +
 .../NamedParameterJdbcTemplateTests.java      |  9 +++
 .../namedparam/NamedParameterQueryTests.java  |  4 ++
 .../core/simple/CallMetaDataContextTests.java |  2 +
 ...rameterizedBeanPropertyRowMapperTests.java |  1 +
 .../jdbc/core/simple/SimpleJdbcCallTests.java |  2 +
 .../core/simple/SimpleJdbcInsertTests.java    |  2 +
 .../core/simple/SimpleJdbcTemplateTests.java  |  3 +
 .../simple/TableMetaDataContextTests.java     |  2 +
 .../core/support/JdbcDaoSupportTests.java     |  2 +
 .../jdbc/core/support/LobSupportTests.java    |  2 +
 .../jdbc/core/support/SqlLobValueTests.java   |  7 ++
 .../DataSourceJtaTransactionTests.java        | 15 ++++
 .../DataSourceTransactionManagerTests.java    | 58 ++++++++++++++++
 .../DriverManagerDataSourceTests.java         |  3 +
 .../datasource/TestDataSourceWrapper.java     |  2 +
 .../EmbeddedDatabaseFactoryTests.java         |  1 +
 .../lookup/JndiDataSourceLookupTests.java     |  2 +
 .../datasource/lookup/StubDataSource.java     |  2 +
 .../jdbc/object/CustomerMapper.java           |  1 +
 .../jdbc/object/GenericSqlQueryTests.java     |  3 +
 .../object/GenericStoredProcedureTests.java   |  3 +
 .../jdbc/object/RdbmsOperationTests.java      |  1 +
 .../jdbc/object/SqlQueryTests.java            | 20 ++++++
 .../jdbc/object/SqlUpdateTests.java           |  3 +
 .../jdbc/object/StoredProcedureTests.java     |  8 +++
 .../support/CustomSqlExceptionTranslator.java |  1 +
 .../jdbc/support/KeyHolderTests.java          |  1 +
 ...LErrorCodeSQLExceptionTranslatorTests.java |  1 +
 .../support/SQLErrorCodesFactoryTests.java    |  5 ++
 .../rowset/ResultSetWrappingRowSetTests.java  |  1 +
 .../springframework/beans/NestedTestBean.java |  1 +
 .../org/springframework/beans/TestBean.java   | 20 ++++++
 .../core/task/StubTaskExecutor.java           |  1 +
 .../jca/StubActivationSpec.java               |  3 +
 .../jca/StubResourceAdapter.java              |  5 ++
 .../jms/StubConnectionFactory.java            |  2 +
 .../org/springframework/jms/StubQueue.java    |  1 +
 .../org/springframework/jms/StubTopic.java    |  1 +
 .../jms/config/JmsNamespaceHandlerTests.java  |  6 ++
 .../JmsTransactionManagerTests.java           | 20 ++++++
 .../jms/connection/TestConnection.java        | 11 +++
 .../jms/connection/TestExceptionListener.java |  1 +
 .../jms/core/JmsTemplate102JtaTests.java      |  2 +
 .../jms/core/JmsTemplate102Tests.java         | 13 ++++
 .../core/JmsTemplate102TransactedTests.java   |  2 +
 .../jms/core/JmsTemplateJtaTests.java         |  2 +
 .../jms/core/JmsTemplateTests.java            | 10 +++
 .../jms/core/JmsTemplateTransactedTests.java  |  2 +
 .../core/support/JmsGatewaySupportTests.java  |  2 +
 .../SimpleMessageListenerContainerTests.java  | 15 ++++
 .../MessageListenerAdapter102Tests.java       |  6 ++
 .../adapter/MessageListenerAdapterTests.java  | 11 +++
 .../adapter/StubMessageListenerAdapter.java   |  1 +
 .../StubMessageListenerAdapter102.java        |  1 +
 .../DefaultJmsActivationSpecFactoryTests.java |  1 +
 .../StubJmsActivationSpecFactory.java         |  1 +
 .../jms/remoting/JmsInvokerTests.java         | 66 ++++++++++++++++++
 .../SimpleMessageConverter102Tests.java       |  2 +
 .../support/SimpleMessageConverterTests.java  |  2 +
 .../JndiDestinationResolverTests.java         |  4 ++
 .../CallCountingTransactionManager.java       |  4 ++
 .../web/DelegatingServletInputStream.java     |  2 +
 .../web/DelegatingServletOutputStream.java    |  3 +
 .../mock/web/MockFilterChain.java             |  4 ++
 .../mock/web/MockFilterConfig.java            |  4 ++
 .../mock/web/MockHttpServletRequest.java      | 54 +++++++++++++++
 .../mock/web/MockHttpServletResponse.java     | 38 ++++++++++
 .../mock/web/MockHttpSession.java             | 17 +++++
 .../mock/web/MockRequestDispatcher.java       |  2 +
 .../mock/web/MockServletConfig.java           |  4 ++
 .../mock/web/MockServletContext.java          | 25 +++++++
 .../mock/web/PassThroughFilterChain.java      |  1 +
 .../HibernateTransactionManagerTests.java     | 32 +++++++++
 .../springframework/beans/NestedTestBean.java |  1 +
 .../org/springframework/beans/TestBean.java   | 20 ++++++
 .../beans/factory/config/SimpleMapScope.java  |  5 ++
 .../mock/jndi/ExpectedLookupTemplate.java     |  1 +
 .../mock/jndi/SimpleNamingContext.java        | 36 ++++++++++
 .../mock/jndi/SimpleNamingContextBuilder.java |  2 +
 .../hibernate3/HibernateInterceptorTests.java |  6 ++
 .../HibernateJtaTransactionTests.java         | 46 +++++++++++++
 .../hibernate3/HibernateTemplateTests.java    | 37 ++++++++++
 .../HibernateTransactionManagerTests.java     | 58 ++++++++++++++++
 .../LocalSessionFactoryBeanTests.java         | 47 +++++++++++++
 .../support/HibernateDaoSupportTests.java     |  2 +
 .../orm/hibernate3/support/LobTypeTests.java  |  2 +
 .../support/OpenSessionInViewTests.java       | 10 +++
 .../support/ScopedBeanInterceptorTests.java   |  4 ++
 .../orm/ibatis/SqlMapClientTests.java         |  4 ++
 .../ibatis/support/LobTypeHandlerTests.java   |  4 ++
 .../orm/jdo/JdoInterceptorTests.java          |  5 ++
 .../orm/jdo/JdoTemplateTests.java             | 14 ++++
 .../orm/jdo/JdoTransactionManagerTests.java   | 50 ++++++++++++++
 .../LocalPersistenceManagerFactoryTests.java  |  5 ++
 .../orm/jdo/support/JdoDaoSupportTests.java   |  2 +
 .../OpenPersistenceManagerInViewTests.java    |  2 +
 ...AbstractEntityManagerFactoryBeanTests.java |  2 +
 ...tEntityManagerFactoryIntegrationTests.java |  1 +
 .../orm/jpa/DefaultJpaDialectTests.java       |  2 +
 .../orm/jpa/JpaInterceptorTests.java          |  5 ++
 .../orm/jpa/JpaTemplateTests.java             |  7 ++
 .../orm/jpa/JpaTransactionManagerTests.java   | 56 +++++++++++++++
 ...ontainerEntityManagerFactoryBeanTests.java |  8 +++
 .../LocalEntityManagerFactoryBeanTests.java   |  2 +
 ...kEntityManagerFactoryIntegrationTests.java |  1 +
 ...eEntityManagerFactoryIntegrationTests.java |  1 +
 ...iEntityManagerFactoryIntegrationTests.java |  1 +
 ...aEntityManagerFactoryIntegrationTests.java |  2 +
 ...oryWithAspectJWeavingIntegrationTests.java |  1 +
 .../orm/jpa/support/JpaDaoSupportTests.java   |  3 +
 .../support/OpenEntityManagerInViewTests.java |  6 ++
 .../support/PersistenceInjectionTests.java    |  5 ++
 ...kEntityManagerFactoryIntegrationTests.java |  1 +
 ...iEntityManagerFactoryIntegrationTests.java |  1 +
 ...DependencyInjectionSpringContextTests.java |  1 +
 .../AbstractSingleSpringContextTests.java     |  3 +
 ...sactionalDataSourceSpringContextTests.java |  1 +
 ...stractTransactionalSpringContextTests.java |  2 +
 .../test/ConditionalTestCase.java             |  1 +
 ...ractAnnotationAwareTransactionalTests.java |  1 +
 .../annotation/SystemProfileValueSource.java  |  1 +
 .../test/jpa/AbstractJpaTests.java            |  4 ++
 .../transaction/MockJtaTransaction.java       |  7 ++
 .../oxm/jaxb/Jaxb2MarshallerTests.java        |  4 ++
 .../web/struts/TestAction.java                |  1 +
 .../web/servlet/DefaultMvcResultTests.java    |  2 +
 .../test/web/servlet/StubMvcResult.java       |  9 +++
 .../MockHttpServletRequestBuilderTests.java   |  1 +
 .../result/PrintingResultHandlerTests.java    |  3 +
 .../samples/standalone/AsyncTests.java        |  1 +
 .../samples/standalone/FilterTests.java       |  1 +
 .../standalone/RequestBuilderTests.java       |  1 +
 ...ConditionalDelegatingFilterProxyTests.java |  3 +
 .../springframework/beans/NestedTestBean.java |  1 +
 .../org/springframework/beans/TestBean.java   | 20 ++++++
 .../mock/web/MockFilterChainTests.java        |  3 +
 ...stractSpr3350SingleSpringContextTests.java |  1 +
 ...sBasedSpr3350SingleSpringContextTests.java |  2 +
 ...DependencyInjectionSpringContextTests.java |  1 +
 ...lBasedSpr3350SingleSpringContextTests.java |  1 +
 ...alueAnnotationAwareTransactionalTests.java |  1 +
 .../test/context/ContextLoaderUtilsTests.java |  2 +
 .../MergedContextConfigurationTests.java      |  2 +
 .../SpringRunnerContextCacheTests.java        |  1 +
 ...ransactionalJUnit38SpringContextTests.java |  2 +
 ...ProfileValueJUnit38SpringContextTests.java |  1 +
 .../ClassLevelDisabledSpringRunnerTests.java  |  5 ++
 ...TransactionalJUnit4SpringContextTests.java |  3 +
 ...edProfileValueSourceSpringRunnerTests.java |  1 +
 ...ackTrueTransactionalSpringRunnerTests.java |  2 +
 .../SpringJUnit4ClassRunnerAppCtxTests.java   |  3 +
 .../junit4/aci/DevProfileInitializer.java     |  1 +
 .../junit4/aci/FooBarAliasInitializer.java    |  1 +
 ...alizerWithoutConfigFilesOrClassesTest.java |  1 +
 ...rgedInitializersAnnotationConfigTests.java |  1 +
 ...eredInitializersAnnotationConfigTests.java |  3 +
 .../hibernate/HibernatePersonRepository.java  |  2 +
 .../service/impl/StandardPersonService.java   |  2 +
 ...aTransactionManagementConfigurerTests.java |  1 +
 ...TransactionalTestNGSpringContextTests.java |  2 +
 .../FailingBeforeAndAfterMethodsTests.java    |  7 ++
 .../context/web/AbstractBasicWacTests.java    |  1 +
 .../CallCountingTransactionManager.java       |  4 ++
 .../test/util/ReflectionTestUtilsTests.java   |  6 ++
 .../beans/DerivedTestBean.java                |  4 ++
 .../springframework/beans/NestedTestBean.java |  1 +
 .../org/springframework/beans/TestBean.java   | 20 ++++++
 .../CollectingReaderEventListener.java        |  4 ++
 ...tenceExceptionTranslationAdvisorTests.java |  2 +
 ...xceptionTranslationPostProcessorTests.java |  1 +
 .../dao/support/DataAccessUtilsTests.java     |  1 +
 .../jca/cci/CciLocalTransactionTests.java     |  2 +
 .../jca/cci/CciTemplateTests.java             |  1 +
 .../jca/cci/EisOperationTests.java            |  2 +
 .../mock/jndi/ExpectedLookupTemplate.java     |  1 +
 .../mock/jndi/SimpleNamingContext.java        | 36 ++++++++++
 .../mock/jndi/SimpleNamingContextBuilder.java |  2 +
 .../CallCountingTransactionManager.java       |  4 ++
 .../JndiJtaTransactionManagerTests.java       |  5 ++
 .../JtaTransactionManagerTests.java           | 50 ++++++++++++++
 ...kCallbackPreferringTransactionManager.java |  4 ++
 .../transaction/MockJtaTransaction.java       |  7 ++
 .../transaction/TestTransactionManager.java   |  6 ++
 .../transaction/TransactionSupportTests.java  |  7 ++
 .../TxNamespaceHandlerEventTests.java         |  1 +
 .../transaction/TxNamespaceHandlerTests.java  |  1 +
 ...tationTransactionAttributeSourceTests.java | 33 +++++++++
 ...AnnotationTransactionInterceptorTests.java |  7 ++
 ...ationTransactionNamespaceHandlerTests.java |  2 +
 .../EnableTransactionManagementTests.java     |  1 +
 .../config/AnnotationDrivenTests.java         |  1 +
 .../AbstractTransactionAspectTests.java       |  7 ++
 .../BeanFactoryTransactionTests.java          |  6 ++
 .../MapTransactionAttributeSource.java        |  2 +
 .../PlatformTransactionManagerFacade.java     |  3 +
 .../TransactionInterceptorTests.java          |  5 ++
 .../transaction/jta/MockUOWManager.java       | 11 +++
 .../WebSphereUowTransactionManagerTests.java  | 19 +++++
 .../beans/DerivedTestBean.java                |  4 ++
 .../springframework/beans/NestedTestBean.java |  1 +
 .../beans/SerializablePerson.java             |  5 ++
 .../org/springframework/beans/TestBean.java   | 28 ++++++++
 .../beans/factory/DummyFactory.java           |  7 ++
 .../core/task/MockRunnable.java               |  1 +
 .../http/MockHttpInputMessage.java            |  2 +
 .../http/MockHttpOutputMessage.java           |  2 +
 ...BufferedSimpleHttpRequestFactoryTests.java |  1 +
 ...mponentsClientHttpRequestFactoryTests.java |  1 +
 ...rceptingClientHttpRequestFactoryTests.java | 18 +++++
 ...treamingSimpleHttpRequestFactoryTests.java |  1 +
 .../FormHttpMessageConverterTests.java        |  4 ++
 .../test/DelegatingServletInputStream.java    |  2 +
 .../test/DelegatingServletOutputStream.java   |  3 +
 .../mock/web/test/MockAsyncContext.java       | 13 ++++
 .../mock/web/test/MockBodyContent.java        | 28 ++++++++
 .../web/test/MockExpressionEvaluator.java     |  3 +
 .../mock/web/test/MockFilterChain.java        |  4 ++
 .../mock/web/test/MockFilterConfig.java       |  4 ++
 .../mock/web/test/MockHttpServletRequest.java | 66 ++++++++++++++++++
 .../web/test/MockHttpServletResponse.java     | 42 +++++++++++
 .../mock/web/test/MockHttpSession.java        | 17 +++++
 .../mock/web/test/MockJspWriter.java          | 26 +++++++
 .../mock/web/test/MockMultipartFile.java      |  8 +++
 .../test/MockMultipartHttpServletRequest.java |  9 +++
 .../mock/web/test/MockPageContext.java        | 27 ++++++++
 .../mock/web/test/MockPart.java               |  9 +++
 .../mock/web/test/MockRequestDispatcher.java  |  2 +
 .../mock/web/test/MockServletConfig.java      |  4 ++
 .../mock/web/test/MockServletContext.java     | 51 ++++++++++++++
 .../mock/web/test/PassThroughFilterChain.java |  1 +
 .../remoting/caucho/CauchoRemotingTests.java  |  6 ++
 .../httpinvoker/HttpInvokerTests.java         | 19 +++++
 .../remoting/jaxrpc/JaxRpcSupportTests.java   | 17 +++++
 .../remoting/jaxws/OrderServiceImpl.java      |  1 +
 .../bind/ServletRequestDataBinderTests.java   |  2 +
 .../support/WebRequestDataBinderTests.java    |  1 +
 .../request/RequestContextListenerTests.java  |  1 +
 .../context/request/RequestScopeTests.java    |  1 +
 .../context/request/SessionScopeTests.java    |  7 ++
 .../request/async/DeferredResultTests.java    |  2 +
 .../request/async/WebAsyncManagerTests.java   |  1 +
 .../async/WebAsyncManagerTimeoutTests.java    |  5 ++
 .../web/filter/CompositeFilterTests.java      |  3 +
 .../filter/DelegatingFilterProxyTests.java    |  3 +
 .../filter/HiddenHttpMethodFilterTest.java    |  2 +
 .../web/filter/RequestContextFilterTests.java |  1 +
 .../web/filter/RequestLoggingFilterTests.java |  4 ++
 .../filter/ShallowEtagHeaderFilterTests.java  |  3 +
 .../web/jsf/DelegatingPhaseListenerTests.java |  5 ++
 .../jsf/DelegatingVariableResolverTests.java  |  3 +
 .../web/jsf/MockFacesContext.java             | 19 +++++
 .../web/jsf/MockLifecycle.java                |  5 ++
 .../ModelAttributeMethodProcessorTests.java   |  3 +
 .../support/InvocableHandlerMethodTests.java  |  2 +
 .../method/support/StubArgumentResolver.java  |  2 +
 .../support/StubReturnValueHandler.java       |  2 +
 .../CommonsMultipartResolverTests.java        | 17 +++++
 .../util/ExpressionEvaluationUtilsTests.java  |  3 +
 .../web/util/MockLog4jAppender.java           |  3 +
 .../beans/DerivedTestBean.java                |  4 ++
 .../springframework/beans/NestedTestBean.java |  1 +
 .../org/springframework/beans/TestBean.java   | 20 ++++++
 .../factory/AbstractBeanFactoryTests.java     |  1 +
 .../beans/factory/DummyFactory.java           |  7 ++
 .../beans/factory/LifecycleBean.java          |  6 ++
 .../beans/factory/MustBeInitialized.java      |  1 +
 .../springframework/context/ACATester.java    |  1 +
 .../AbstractApplicationContextTests.java      |  2 +
 .../context/BeanThatBroadcasts.java           |  1 +
 .../context/BeanThatListens.java              |  1 +
 .../context/LifecycleContextBean.java         |  3 +
 .../springframework/context/TestListener.java |  1 +
 .../web/DelegatingServletOutputStream.java    |  3 +
 .../mock/web/MockHttpServletResponse.java     | 38 ++++++++++
 .../mock/web/MockHttpSession.java             | 17 +++++
 .../mock/web/MockMultipartFile.java           |  8 +++
 .../mock/web/MockRequestDispatcher.java       |  2 +
 .../mock/web/MockServletContext.java          | 25 +++++++
 .../mock/web/portlet/MockActionResponse.java  |  7 ++
 .../mock/web/portlet/MockBaseURL.java         |  9 +++
 .../mock/web/portlet/MockCacheControl.java    |  8 +++
 .../web/portlet/MockClientDataRequest.java    |  7 ++
 .../mock/web/portlet/MockEvent.java           |  3 +
 .../mock/web/portlet/MockEventRequest.java    |  2 +
 .../mock/web/portlet/MockEventResponse.java   |  1 +
 .../mock/web/portlet/MockMimeResponse.java    | 16 +++++
 .../portlet/MockMultipartActionRequest.java   |  6 ++
 .../mock/web/portlet/MockPortalContext.java   |  5 ++
 .../mock/web/portlet/MockPortletConfig.java   | 11 +++
 .../mock/web/portlet/MockPortletContext.java  | 20 ++++++
 .../mock/web/portlet/MockPortletRequest.java  | 38 ++++++++++
 .../portlet/MockPortletRequestDispatcher.java |  3 +
 .../mock/web/portlet/MockPortletResponse.java |  7 ++
 .../mock/web/portlet/MockPortletSession.java  | 18 +++++
 .../mock/web/portlet/MockPortletURL.java      |  5 ++
 .../mock/web/portlet/MockRenderRequest.java   |  1 +
 .../mock/web/portlet/MockRenderResponse.java  |  2 +
 .../mock/web/portlet/MockResourceRequest.java |  4 ++
 .../web/portlet/MockResourceResponse.java     |  1 +
 .../mock/web/portlet/MockResourceURL.java     |  3 +
 .../web/portlet/MockStateAwareResponse.java   | 11 +++
 .../ServletWrappingPortletContext.java        | 20 ++++++
 .../ComplexPortletApplicationContext.java     | 39 +++++++++++
 .../web/portlet/DispatcherPortletTests.java   |  1 +
 .../SimplePortletApplicationContext.java      |  5 ++
 .../bind/PortletRequestDataBinderTests.java   |  1 +
 ...AbstractXmlWebApplicationContextTests.java |  4 ++
 .../context/PortletConfigAwareBean.java       |  1 +
 .../context/PortletContextAwareBean.java      |  1 +
 .../XmlPortletApplicationContextTests.java    |  6 ++
 .../handler/ParameterHandlerMappingTests.java |  1 +
 .../PortletModeHandlerMappingTests.java       |  1 +
 ...rtletModeParameterHandlerMappingTests.java |  1 +
 .../SimpleMappingExceptionResolverTests.java  |  1 +
 .../portlet/mvc/CommandControllerTests.java   | 16 +++++
 .../PortletModeNameViewControllerTests.java   |  1 +
 .../mvc/PortletWrappingControllerTests.java   |  5 ++
 .../Portlet20AnnotationControllerTests.java   | 25 +++++++
 .../PortletAnnotationControllerTests.java     | 24 +++++++
 .../web/portlet/util/PortletUtilsTests.java   |  3 +
 .../beans/DerivedTestBean.java                |  4 ++
 .../springframework/beans/NestedTestBean.java |  1 +
 .../beans/SerializablePerson.java             |  5 ++
 .../org/springframework/beans/TestBean.java   | 20 ++++++
 .../beans/factory/DummyFactory.java           |  7 ++
 .../beans/factory/LifecycleBean.java          |  6 ++
 .../beans/factory/MustBeInitialized.java      |  1 +
 .../springframework/context/ACATester.java    |  1 +
 .../context/BeanThatBroadcasts.java           |  1 +
 .../context/BeanThatListens.java              |  1 +
 .../context/LifecycleContextBean.java         |  3 +
 .../springframework/context/TestListener.java |  1 +
 .../AbstractApplicationContextTests.java      |  2 +
 .../web/context/AbstractBeanFactoryTests.java |  1 +
 .../web/context/ContextLoaderTests.java       |  6 ++
 .../ResourceBundleMessageSourceTests.java     |  3 +
 .../web/context/ServletConfigAwareBean.java   |  1 +
 .../web/context/ServletContextAwareBean.java  |  1 +
 .../XmlWebApplicationContextTests.java        |  8 +++
 .../support/HttpRequestHandlerTests.java      |  1 +
 .../support/ServletContextSupportTests.java   |  4 ++
 .../servlet/ComplexWebApplicationContext.java | 33 +++++++++
 .../web/servlet/DispatcherServletTests.java   |  2 +
 .../servlet/SimpleWebApplicationContext.java  |  4 ++
 ...tationDrivenBeanDefinitionParserTests.java |  7 ++
 .../web/servlet/config/MvcNamespaceTests.java |  2 +
 .../annotation/InterceptorRegistryTests.java  |  3 +
 ...MvcConfigurationSupportExtensionTests.java |  3 +
 .../BeanNameUrlHandlerMappingTests.java       |  1 +
 .../mvc/CancellableFormControllerTests.java   |  3 +
 .../servlet/mvc/CommandControllerTests.java   | 12 ++++
 .../web/servlet/mvc/ControllerTests.java      |  5 ++
 .../web/servlet/mvc/FormControllerTests.java  | 14 ++++
 .../mvc/WizardFormControllerTests.java        |  9 +++
 ...ontrollerClassNameHandlerMappingTests.java |  1 +
 .../JdkProxyServletAnnotationTests.java       |  3 +
 ...estSpecificMappingInfoComparatorTests.java |  1 +
 .../ServletAnnotationControllerTests.java     | 35 ++++++++++
 .../servlet/mvc/annotation/Spr7766Tests.java  |  1 +
 .../servlet/mvc/annotation/Spr7839Tests.java  |  1 +
 .../web/servlet/mvc/mapping/Controller.java   |  1 +
 ...ControllerBeanNameHandlerMappingTests.java |  1 +
 ...ontrollerClassNameHandlerMappingTests.java |  1 +
 .../mvc/mapping/WelcomeController.java        |  1 +
 .../mvc/method/RequestMappingInfoTests.java   |  1 +
 ...HandlerMethodAnnotationDetectionTests.java | 18 +++++
 .../HttpEntityMethodProcessorTests.java       |  3 +
 ...ResolverMethodReturnValueHandlerTests.java |  1 +
 ...MappingHandlerAdapterIntegrationTests.java |  5 ++
 ...equestPartMethodArgumentResolverTests.java |  1 +
 ...tResponseBodyMethodProcessorMockTests.java |  1 +
 ...questResponseBodyMethodProcessorTests.java |  3 +
 ...nnotationControllerHandlerMethodTests.java | 58 ++++++++++++++++
 .../ServletInvocableHandlerMethodTests.java   |  2 +
 ...letRequestMethodArgumentResolverTests.java |  1 +
 ...nnotationControllerHandlerMethodTests.java |  3 +
 .../RedirectAttributesModelMapTests.java      |  1 +
 .../support/MockFilterRegistration.java       | 11 +++
 .../support/MockServletRegistration.java      | 14 ++++
 .../RequestDataValueProcessorWrapper.java     |  4 ++
 .../BindTagOutsideDispatcherServletTests.java |  1 +
 .../web/servlet/tags/BindTagTests.java        |  2 +
 .../web/servlet/tags/EvalTagTests.java        |  1 +
 ...scapeTagOutsideDispatcherServletTests.java |  1 +
 .../web/servlet/tags/HtmlEscapeTagTests.java  |  9 +++
 ...ssageTagOutsideDispatcherServletTests.java |  1 +
 .../web/servlet/tags/MessageTagTests.java     | 20 ++++++
 .../web/servlet/tags/ParamTagTests.java       |  1 +
 .../web/servlet/tags/ThemeTagTests.java       |  1 +
 .../tags/form/AbstractFormTagTests.java       |  2 +
 .../form/AbstractHtmlElementTagTests.java     |  1 +
 .../web/servlet/tags/form/ButtonTagTests.java |  2 +
 .../servlet/tags/form/CheckboxTagTests.java   |  5 ++
 .../servlet/tags/form/CheckboxesTagTests.java |  8 +++
 .../web/servlet/tags/form/ErrorsTagTests.java |  4 ++
 .../web/servlet/tags/form/FormTagTests.java   |  2 +
 .../tags/form/HiddenInputTagTests.java        |  3 +
 .../web/servlet/tags/form/InputTagTests.java  |  3 +
 .../web/servlet/tags/form/ItemPet.java        |  2 +
 .../web/servlet/tags/form/LabelTagTests.java  |  4 ++
 .../servlet/tags/form/OptionTagEnumTests.java |  3 +
 .../web/servlet/tags/form/OptionTagTests.java | 15 ++++
 .../servlet/tags/form/OptionsTagTests.java    |  6 ++
 .../tags/form/PasswordInputTagTests.java      |  5 ++
 .../tags/form/RadioButtonTagTests.java        |  5 ++
 .../tags/form/RadioButtonsTagTests.java       |  4 ++
 .../web/servlet/tags/form/SelectTagTests.java | 22 ++++++
 .../servlet/tags/form/SimpleFloatEditor.java  |  2 +
 .../web/servlet/tags/form/TagWriterTests.java |  1 +
 .../servlet/tags/form/TextareaTagTests.java   |  3 +
 .../web/servlet/view/BaseViewTests.java       |  3 +
 .../view/InternalResourceViewTests.java       |  2 +
 ...esourceBundleViewResolverNoCacheTests.java |  1 +
 .../view/ResourceBundleViewResolverTests.java |  3 +
 .../web/servlet/view/ViewResolverTests.java   |  6 ++
 .../servlet/view/document/ExcelViewTests.java | 11 +++
 .../servlet/view/document/PdfViewTests.java   |  1 +
 .../freemarker/FreeMarkerConfigurerTests.java |  2 +
 .../view/freemarker/FreeMarkerViewTests.java  |  2 +
 .../AbstractJasperReportsTests.java           |  1 +
 .../AbstractJasperReportsViewTests.java       |  2 +
 ...rableJasperReportsViewWithStreamTests.java |  2 +
 ...rableJasperReportsViewWithWriterTests.java |  2 +
 .../jasperreports/ExporterParameterTests.java |  1 +
 .../JasperReportsCsvViewTests.java            |  2 +
 .../JasperReportsHtmlViewTests.java           |  2 +
 .../JasperReportsMultiFormatViewTests.java    |  5 ++
 ...ultiFormatViewWithCustomMappingsTests.java |  3 +
 .../JasperReportsPdfViewTests.java            |  2 +
 .../JasperReportsXlsViewTests.java            |  2 +
 .../view/velocity/TestVelocityEngine.java     |  1 +
 .../velocity/VelocityConfigurerTests.java     |  4 ++
 .../view/velocity/VelocityMacroTests.java     |  4 ++
 .../view/velocity/VelocityRenderTests.java    |  5 ++
 .../velocity/VelocityToolboxViewTests.java    |  2 +
 .../velocity/VelocityViewResolverTests.java   |  4 ++
 .../view/velocity/VelocityViewTests.java      |  8 +++
 .../servlet/view/xslt/TestXsltViewTests.java  | 13 ++++
 ...visorAutoProxyCreatorIntegrationTests.java |  8 +++
 .../EnableCachingIntegrationTests.java        |  1 +
 ...ionScannerJsr330ScopeIntegrationTests.java |  3 +
 ...efinitionScannerScopeIntegrationTests.java |  3 +
 .../core/env/EnvironmentIntegrationTests.java |  1 +
 .../support/BeanFactoryTypeConverter.java     |  3 +
 ...ansactionalAnnotationIntegrationTests.java |  3 +
 .../CallCountingTransactionManager.java       |  4 ++
 ...TransactionManagementIntegrationTests.java |  3 +
 .../ProxyAnnotationDiscoveryTests.java        |  2 +
 .../advice/CountingAfterReturningAdvice.java  |  1 +
 .../test/advice/CountingBeforeAdvice.java     |  1 +
 src/test/java/test/beans/NestedTestBean.java  |  1 +
 src/test/java/test/beans/TestBean.java        | 20 ++++++
 .../java/test/interceptor/NopInterceptor.java |  1 +
 .../SerializableNopInterceptor.java           |  2 +
 797 files changed, 4745 insertions(+)

diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
index 2b09c8a30d..630c1e3ea4 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
@@ -113,6 +113,7 @@ public final class AspectJExpressionPointcutTests {
 
 	public static class OtherIOther implements IOther {
 
+		@Override
 		public void absquatulate() {
 			// Empty
 		}
@@ -354,6 +355,7 @@ class CallCountingInterceptor implements MethodInterceptor {
 
 	private int count;
 
+	@Override
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		count++;
 		return methodInvocation.proceed();
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
index 37140304cb..1c30480fbd 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
@@ -90,6 +90,7 @@ public final class BeanNamePointcutMatchingTests {
 	private static boolean matches(final String beanName, String pcExpression) {
 		@SuppressWarnings("serial")
 		AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut() {
+			@Override
 			protected String getCurrentProxiedBeanName() {
 				return beanName;
 			}
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
index e72e475abe..2af6f16be4 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
@@ -79,6 +79,7 @@ public final class MethodInvocationProceedingJoinPointTests {
 		pf.addAdvice(new MethodBeforeAdvice() {
 			private int depth;
 
+			@Override
 			public void before(Method method, Object[] args, Object target) throws Throwable {
 				JoinPoint jp = AbstractAspectJAdvice.currentJoinPoint();
 				assertTrue("Method named in toString", jp.toString().contains(method.getName()));
@@ -135,6 +136,7 @@ public final class MethodInvocationProceedingJoinPointTests {
 		ProxyFactory pf = new ProxyFactory(raw);
 		pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
 		pf.addAdvice(new MethodBeforeAdvice() {
+			@Override
 			public void before(Method method, Object[] args, Object target) throws Throwable {
 				SourceLocation sloc = AbstractAspectJAdvice.currentJoinPoint().getSourceLocation();
 				assertEquals("Same source location must be returned on subsequent requests",  sloc, AbstractAspectJAdvice.currentJoinPoint().getSourceLocation());
@@ -167,6 +169,7 @@ public final class MethodInvocationProceedingJoinPointTests {
 		ProxyFactory pf = new ProxyFactory(raw);
 		pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
 		pf.addAdvice(new MethodBeforeAdvice() {
+			@Override
 			public void before(Method method, Object[] args, Object target) throws Throwable {
 				StaticPart staticPart = AbstractAspectJAdvice.currentJoinPoint().getStaticPart();
 				assertEquals("Same static part must be returned on subsequent requests",  staticPart, AbstractAspectJAdvice.currentJoinPoint().getStaticPart());
@@ -186,6 +189,7 @@ public final class MethodInvocationProceedingJoinPointTests {
 		ProxyFactory pf = new ProxyFactory(raw);
 		pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
 		pf.addAdvice(new MethodBeforeAdvice() {
+			@Override
 			public void before(Method method, Object[] args, Object target) throws Throwable {
 				// makeEncSJP, although meant for computing the enclosing join point,
 				// it serves our purpose here
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
index c10c50ddf8..088ba138c3 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
@@ -137,6 +137,7 @@ public class TrickyAspectJPointcutExpressionTests {
 
 	@Log
 	public static class TestServiceImpl implements TestService {
+		@Override
 		public String sayHello() {
 			throw new TestException("TestServiceImpl");
 		}
@@ -148,6 +149,7 @@ public class TrickyAspectJPointcutExpressionTests {
 
 		private int countThrows = 0;
 
+		@Override
 		public void before(Method method, Object[] objects, Object o) throws Throwable {
 			countBefore++;
 		}
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
index f6f82fb412..ae3ac04918 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
@@ -675,19 +675,23 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 			return this.count;
 		}
 
+		@Override
 		public Object getAspectInstance() {
 			++this.count;
 			return new PerTypeWithinAspect();
 		}
 
+		@Override
 		public ClassLoader getAspectClassLoader() {
 			return PerTypeWithinAspect.class.getClassLoader();
 		}
 
+		@Override
 		public AspectMetadata getAspectMetadata() {
 			return new AspectMetadata(PerTypeWithinAspect.class, "perTypeWithin");
 		}
 
+		@Override
 		public int getOrder() {
 			return Ordered.LOWEST_PRECEDENCE;
 		}
@@ -897,14 +901,17 @@ abstract class AbstractMakeModifiable {
 	public static class ModifiableImpl implements MutableModifable {
 		private boolean modified;
 
+		@Override
 		public void acceptChanges() {
 			modified = false;
 		}
 
+		@Override
 		public boolean isModified() {
 			return modified;
 		}
 
+		@Override
 		public void markDirty() {
 			this.modified = true;
 		}
@@ -1020,17 +1027,21 @@ class MakeLockable {
 
 class CannotBeUnlocked implements Lockable, Comparable<Object> {
 
+	@Override
 	public void lock() {
 	}
 
+	@Override
 	public void unlock() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public boolean locked() {
 		return true;
 	}
 
+	@Override
 	public int compareTo(Object arg0) {
 		throw new UnsupportedOperationException();
 	}
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
index ebb9f03c43..6a5a746063 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
@@ -84,6 +84,7 @@ public final class ArgumentBindingTests {
 
 	public static class TransactionalBean implements ITransactionalBean {
 
+		@Override
 		@Transactional
 		public void doInTransaction() {
 		}
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
index d6c24cd0a1..c0b30c27e2 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
@@ -111,6 +111,7 @@ public final class AspectProxyFactoryTests {
 
 		private int age;
 
+		@Override
 		public int getAge() {
 			return age;
 		}
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
index de10e14b42..9c4b78b54d 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
@@ -194,6 +194,7 @@ public final class AspectJPrecedenceComparatorTests {
 
 	private Advisor createSpringAOPAfterAdvice(int order) {
 		AfterReturningAdvice advice = new AfterReturningAdvice() {
+			@Override
 			public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable {
 			}
 		};
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
index fc5268c840..96a22b3353 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
@@ -129,6 +129,7 @@ public final class AopProxyUtilsTests {
 	public void testProxiedUserInterfacesWithNoInterface() {
 		Object proxy = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[0],
 				new InvocationHandler() {
+					@Override
 					public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 						return null;
 					}
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
index 9de8964805..5940cd5718 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
@@ -42,6 +42,7 @@ public final class IntroductionBenchmarkTests {
 
 	@SuppressWarnings("serial")
 	public static class SimpleCounterIntroduction extends DelegatingIntroductionInterceptor implements Counter {
+		@Override
 		public int getCount() {
 			return EXPECTED_COMPARE;
 		}
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
index f5c4a8edca..f4602bf0b5 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
@@ -42,6 +42,7 @@ public final class MethodInvocationTests {
 		final Object returnValue = new Object();
 		List<Object> is = new LinkedList<Object>();
 		is.add(new MethodInterceptor() {
+			@Override
 			public Object invoke(MethodInvocation invocation) throws Throwable {
 				return returnValue;
 			}
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java
index 1879f8a4cd..11b127d0bc 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java
@@ -44,6 +44,7 @@ public class NullPrimitiveTests {
 	public void testNullPrimitiveWithJdkProxy() {
 
 		class SimpleFoo implements Foo {
+			@Override
 			public int getValue() {
 				return 100;
 			}
@@ -52,6 +53,7 @@ public class NullPrimitiveTests {
 		SimpleFoo target = new SimpleFoo();
 		ProxyFactory factory = new ProxyFactory(target);
 		factory.addAdvice(new MethodInterceptor() {
+			@Override
 			public Object invoke(MethodInvocation invocation) throws Throwable {
 				return null;
 			}
@@ -76,6 +78,7 @@ public class NullPrimitiveTests {
 		Bar target = new Bar();
 		ProxyFactory factory = new ProxyFactory(target);
 		factory.addAdvice(new MethodInterceptor() {
+			@Override
 			public Object invoke(MethodInvocation invocation) throws Throwable {
 				return null;
 			}
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
index 814b902540..64abdd4891 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
@@ -73,6 +73,7 @@ public final class PrototypeTargetTests {
 			constructionCount++;
 		}
 
+		@Override
 		public void doSomething() {
 		}
 	}
@@ -81,6 +82,7 @@ public final class PrototypeTargetTests {
 	public static class TestInterceptor implements MethodInterceptor {
 		private int invocationCount = 0;
 
+		@Override
 		public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 			invocationCount++;
 			return methodInvocation.proceed();
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
index f8999fe674..1255baae2a 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
@@ -165,6 +165,7 @@ public final class ProxyFactoryTests {
 	@Test
 	public void testAddRepeatedInterface() {
 		TimeStamped tst = new TimeStamped() {
+			@Override
 			public long getTimeStamp() {
 				throw new UnsupportedOperationException("getTimeStamp");
 			}
@@ -181,6 +182,7 @@ public final class ProxyFactoryTests {
 	public void testGetsAllInterfaces() throws Exception {
 		// Extend to get new interface
 		class TestBeanSubclass extends TestBean implements Comparable<Object> {
+			@Override
 			public int compareTo(Object arg0) {
 				throw new UnsupportedOperationException("compareTo");
 			}
@@ -214,6 +216,7 @@ public final class ProxyFactoryTests {
 	@Test
 	public void testInterceptorInclusionMethods() {
 		class MyInterceptor implements MethodInterceptor {
+			@Override
 			public Object invoke(MethodInvocation invocation) throws Throwable {
 				throw new UnsupportedOperationException();
 			}
@@ -350,6 +353,7 @@ public final class ProxyFactoryTests {
 			this.ts = ts;
 		}
 
+		@Override
 		public long getTimeStamp() {
 			return ts;
 		}
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
index ceae4f577e..1a245999d1 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
@@ -125,6 +125,7 @@ public final class ThrowsAdviceInterceptorTests {
 
 		@SuppressWarnings("serial")
 		MyThrowsHandler th = new MyThrowsHandler() {
+			@Override
 			public void afterThrowing(RemoteException ex) throws Throwable {
 				super.afterThrowing(ex);
 				throw t;
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
index 9b3aaf6d9a..0d2edb525a 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
@@ -120,6 +120,7 @@ public final class ConcurrencyThrottleInterceptorTests {
 			this.ex = ex;
 		}
 
+		@Override
 		public void run() {
 			if (this.ex != null) {
 				try {
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java
index 1fe27b3dfc..14845cfd5c 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java
@@ -189,6 +189,7 @@ public final class CustomizableTraceInterceptorTests {
 			this.log = log;
 		}
 
+		@Override
 		protected Log getLoggerForInvocation(MethodInvocation invocation) {
 			return this.log;
 		}
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
index cd7f8b8bda..92908baac7 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
@@ -96,6 +96,7 @@ public final class DebugInterceptorTests {
 			this.log = log;
 		}
 
+		@Override
 		protected Log getLoggerForInvocation(MethodInvocation invocation) {
 			return log;
 		}
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
index c5f6cf8fe4..fc19053502 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
@@ -38,6 +38,7 @@ public final class ExposeBeanNameAdvisorsTests {
 			this.beanName = beanName;
 		}
 
+		@Override
 		public int getAge() {
 			assertEquals(beanName, ExposeBeanNameAdvisors.getBeanName());
 			return super.getAge();
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
index 72e2cf3693..f514800cfb 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
@@ -53,12 +53,14 @@ public final class ExposeInvocationInterceptorTests {
 
 abstract class ExposedInvocationTestBean extends TestBean {
 
+	@Override
 	public String getName() {
 		MethodInvocation invocation = ExposeInvocationInterceptor.currentInvocation();
 		assertions(invocation);
 		return super.getName();
 	}
 
+	@Override
 	public void absquatulate() {
 		MethodInvocation invocation = ExposeInvocationInterceptor.currentInvocation();
 		assertions(invocation);
@@ -70,6 +72,7 @@ abstract class ExposedInvocationTestBean extends TestBean {
 
 
 class InvocationCheckExposedInvocationTestBean extends ExposedInvocationTestBean {
+	@Override
 	protected void assertions(MethodInvocation invocation) {
 		assertTrue(invocation.getThis() == this);
 		assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(),
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
index 6b86cd7232..6090b16b8d 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
@@ -40,6 +40,7 @@ public final class AopUtilsTests {
 	@Test
 	public void testPointcutCanNeverApply() {
 		class TestPointcut extends StaticMethodMatcherPointcut {
+			@Override
 			public boolean matches(Method method, Class<?> clazzy) {
 				return false;
 			}
@@ -58,6 +59,7 @@ public final class AopUtilsTests {
 	@Test
 	public void testPointcutAppliesToOneMethodOnObject() {
 		class TestPointcut extends StaticMethodMatcherPointcut {
+			@Override
 			public boolean matches(Method method, Class<?> clazz) {
 				return method.getName().equals("hashCode");
 			}
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
index 41c3e2dd54..b66105de6c 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
@@ -35,24 +35,28 @@ import test.beans.TestBean;
 public final class ComposablePointcutTests {
 
 	public static MethodMatcher GETTER_METHOD_MATCHER = new StaticMethodMatcher() {
+		@Override
 		public boolean matches(Method m, Class<?> targetClass) {
 			return m.getName().startsWith("get");
 		}
 	};
 
 	public static MethodMatcher GET_AGE_METHOD_MATCHER = new StaticMethodMatcher() {
+		@Override
 		public boolean matches(Method m, Class<?> targetClass) {
 			return m.getName().equals("getAge");
 		}
 	};
 
 	public static MethodMatcher ABSQUATULATE_METHOD_MATCHER = new StaticMethodMatcher() {
+		@Override
 		public boolean matches(Method m, Class<?> targetClass) {
 			return m.getName().equals("absquatulate");
 		}
 	};
 
 	public static MethodMatcher SETTER_METHOD_MATCHER = new StaticMethodMatcher() {
+		@Override
 		public boolean matches(Method m, Class<?> targetClass) {
 			return m.getName().startsWith("set");
 		}
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
index f74bb4c61e..65d58d61f8 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
@@ -112,8 +112,10 @@ public final class DelegatingIntroductionInterceptorTests {
 	public void testAutomaticInterfaceRecognitionInDelegate() throws Exception {
 		final long t = 1001L;
 		class Tester implements TimeStamped, ITester {
+			@Override
 			public void foo() throws Exception {
 			}
+			@Override
 			public long getTimeStamp() {
 				return t;
 			}
@@ -141,8 +143,10 @@ public final class DelegatingIntroductionInterceptorTests {
 		final long t = 1001L;
 		@SuppressWarnings("serial")
 		class TestII extends DelegatingIntroductionInterceptor implements TimeStamped, ITester {
+			@Override
 			public void foo() throws Exception {
 			}
+			@Override
 			public long getTimeStamp() {
 				return t;
 			}
@@ -206,6 +210,7 @@ public final class DelegatingIntroductionInterceptorTests {
 		String company = "Interface21";
 		target.setCompany(company);
 		TestBean delegate = new TestBean() {
+			@Override
 			public ITestBean getSpouse() {
 				return this;
 			}
@@ -250,6 +255,7 @@ public final class DelegatingIntroductionInterceptorTests {
 		final long t = 1001L;
 		@SuppressWarnings("serial")
 		class TestII extends DelegatingIntroductionInterceptor implements TimeStamped {
+			@Override
 			public long getTimeStamp() {
 				return t;
 			}
@@ -278,6 +284,7 @@ public final class DelegatingIntroductionInterceptorTests {
 			this.ts = ts;
 		}
 
+		@Override
 		public long getTimeStamp() {
 			return ts;
 		}
@@ -292,6 +299,7 @@ public final class DelegatingIntroductionInterceptorTests {
 			this.t = t;
 		}
 
+		@Override
 		public long getTimeStamp() {
 			return t;
 		}
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java
index ca4f8839c8..404fc55d81 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java
@@ -21,6 +21,7 @@ package org.springframework.aop.support;
  */
 public final class JdkRegexpMethodPointcutTests extends AbstractRegexpMethodPointcutTests {
 
+	@Override
 	protected AbstractRegexpMethodPointcut getRegexpMethodPointcut() {
 		return new JdkRegexpMethodPointcut();
 	}
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 a55b083a3f..614ba7a532 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
@@ -107,6 +107,7 @@ public final class MethodMatchersTests {
 		public StartsWithMatcher(String s) {
 			this.prefix = s;
 		}
+		@Override
 		public boolean matches(Method m, Class<?> targetClass) {
 			return m.getName().startsWith(prefix);
 		}
@@ -114,12 +115,14 @@ public final class MethodMatchersTests {
 
 
 	private static class TestDynamicMethodMatcherWhichMatches extends DynamicMethodMatcher {
+		@Override
 		public boolean matches(Method m, Class<?> targetClass, Object[] args) {
 			return true;
 		}
 	}
 
 	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/aop/support/PointcutsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
index e796719866..72255612df 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
@@ -53,14 +53,17 @@ public final class PointcutsTests {
 	 * Matches only TestBean class, not subclasses
 	 */
 	public static Pointcut allTestBeanMethodsPointcut = new StaticMethodMatcherPointcut() {
+		@Override
 		public ClassFilter getClassFilter() {
 			return new ClassFilter() {
+				@Override
 				public boolean matches(Class<?> clazz) {
 					return clazz.equals(TestBean.class);
 				}
 			};
 		}
 
+		@Override
 		public boolean matches(Method m, Class<?> targetClass) {
 			return true;
 		}
@@ -73,10 +76,12 @@ public final class PointcutsTests {
 	}
 
 	public static Pointcut myTestBeanSetterPointcut = new StaticMethodMatcherPointcut() {
+		@Override
 		public ClassFilter getClassFilter() {
 			return new RootClassFilter(MyTestBean.class);
 		}
 
+		@Override
 		public boolean matches(Method m, Class<?> targetClass) {
 			return m.getName().startsWith("set");
 		}
@@ -84,10 +89,12 @@ public final class PointcutsTests {
 
 	// Will match MyTestBeanSubclass
 	public static Pointcut myTestBeanGetterPointcut = new StaticMethodMatcherPointcut() {
+		@Override
 		public ClassFilter getClassFilter() {
 			return new RootClassFilter(MyTestBean.class);
 		}
 
+		@Override
 		public boolean matches(Method m, Class<?> targetClass) {
 			return m.getName().startsWith("get");
 		}
@@ -98,10 +105,12 @@ public final class PointcutsTests {
 	}
 
 	public static Pointcut myTestBeanSubclassGetterPointcut = new StaticMethodMatcherPointcut() {
+		@Override
 		public ClassFilter getClassFilter() {
 			return new RootClassFilter(MyTestBeanSubclass.class);
 		}
 
+		@Override
 		public boolean matches(Method m, Class<?> targetClass) {
 			return m.getName().startsWith("get");
 		}
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java
index d6dc8f426c..55661a8901 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java
@@ -32,9 +32,11 @@ public final class LazyCreationTargetSourceTests {
 	@Test
 	public void testCreateLazy() {
 		TargetSource targetSource = new AbstractLazyCreationTargetSource() {
+			@Override
 			protected Object createObject() {
 				return new InitCountingBean();
 			}
+			@Override
 			public Class<?> getTargetClass() {
 				return InitCountingBean.class;
 			}
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
index d08d6f5357..4283695ba6 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
@@ -83,6 +83,7 @@ public final class LazyInitTargetSourceTests {
 	@SuppressWarnings("serial")
 	public static class CustomLazyInitTargetSource extends LazyInitTargetSource {
 
+		@Override
 		protected void postProcessTargetObject(Object targetObject) {
 			((ITestBean) targetObject).setName("Rob Harrop");
 		}
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
index 3fe1c3ca70..39325e2dcb 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
@@ -70,10 +70,12 @@ public final class PrototypeBasedTargetSourceTests {
 		 */
 		private TestBean thisFieldIsNotSerializable = new TestBean();
 
+		@Override
 		public Object getTarget() throws Exception {
 			return newPrototypeInstance();
 		}
 
+		@Override
 		public void releaseTarget(Object target) throws Exception {
 			// Do nothing
 		}
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
index 2519e89f82..875ba6dc82 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
@@ -113,6 +113,7 @@ public class ThreadLocalTargetSourceTests {
 
 		class Runner implements Runnable {
 			public SideEffectBean mine;
+			@Override
 			public void run() {
 				this.mine = (SideEffectBean) beanFactory.getBean("apartment");
 				assertEquals(INITIAL_COUNT, mine.getCount() );
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java
index ee0913a114..3f90fb8aef 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java
@@ -116,6 +116,7 @@ public final class RefreshableTargetSourceTests {
 			this.requiresRefresh = requiresRefresh;
 		}
 
+		@Override
 		protected Object freshTarget() {
 			this.callCount++;
 			return new Object();
@@ -125,6 +126,7 @@ public final class RefreshableTargetSourceTests {
 			return this.callCount;
 		}
 
+		@Override
 		protected boolean requiresRefresh() {
 			return this.requiresRefresh;
 		}
diff --git a/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java b/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java
index 7a7baa3ef2..d59b8ddd3b 100644
--- a/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java
+++ b/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java
@@ -28,6 +28,7 @@ import org.springframework.aop.MethodBeforeAdvice;
 @SuppressWarnings("serial")
 public class CountingBeforeAdvice extends MethodCounter implements MethodBeforeAdvice {
 
+	@Override
 	public void before(Method m, Object[] args, Object target) throws Throwable {
 		count(m);
 	}
diff --git a/spring-aop/src/test/java/test/aop/DefaultLockable.java b/spring-aop/src/test/java/test/aop/DefaultLockable.java
index 82c59d8bc5..a7f6c4ac7e 100644
--- a/spring-aop/src/test/java/test/aop/DefaultLockable.java
+++ b/spring-aop/src/test/java/test/aop/DefaultLockable.java
@@ -25,14 +25,17 @@ public class DefaultLockable implements Lockable {
 
 	private boolean locked;
 
+	@Override
 	public void lock() {
 		this.locked = true;
 	}
 
+	@Override
 	public void unlock() {
 		this.locked = false;
 	}
 
+	@Override
 	public boolean locked() {
 		return this.locked;
 	}
diff --git a/spring-aop/src/test/java/test/aop/NopInterceptor.java b/spring-aop/src/test/java/test/aop/NopInterceptor.java
index 1dc341d427..fd4d9e9ff6 100644
--- a/spring-aop/src/test/java/test/aop/NopInterceptor.java
+++ b/spring-aop/src/test/java/test/aop/NopInterceptor.java
@@ -31,6 +31,7 @@ public class NopInterceptor implements MethodInterceptor {
 	/**
 	 * @see org.aopalliance.intercept.MethodInterceptor#invoke(MethodInvocation)
 	 */
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		increment();
 		return invocation.proceed();
diff --git a/spring-aop/src/test/java/test/aop/PerTargetAspect.java b/spring-aop/src/test/java/test/aop/PerTargetAspect.java
index cee2420138..3896f2dc7a 100644
--- a/spring-aop/src/test/java/test/aop/PerTargetAspect.java
+++ b/spring-aop/src/test/java/test/aop/PerTargetAspect.java
@@ -25,6 +25,7 @@ public class PerTargetAspect implements Ordered {
 		++count;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
diff --git a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
index 3b306743b2..5a21b1d7f0 100644
--- a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
+++ b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
@@ -37,10 +37,12 @@ public class SerializableNopInterceptor extends NopInterceptor implements Serial
 	 */
 	private int count;
 
+	@Override
 	public int getCount() {
 		return this.count;
 	}
 
+	@Override
 	protected void increment() {
 		++count;
 	}
diff --git a/spring-aop/src/test/java/test/beans/DerivedTestBean.java b/spring-aop/src/test/java/test/beans/DerivedTestBean.java
index 8cb213cefe..a26ee9b471 100644
--- a/spring-aop/src/test/java/test/beans/DerivedTestBean.java
+++ b/spring-aop/src/test/java/test/beans/DerivedTestBean.java
@@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		if (this.beanName == null || beanName == null) {
 			this.beanName = beanName;
 		}
 	}
 
+	@Override
 	public String getBeanName() {
 		return beanName;
 	}
@@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void destroy() {
 		this.destroyed = true;
 	}
 
+	@Override
 	public boolean wasDestroyed() {
 		return destroyed;
 	}
diff --git a/spring-aop/src/test/java/test/beans/NestedTestBean.java b/spring-aop/src/test/java/test/beans/NestedTestBean.java
index a630f8662a..6855305fb3 100644
--- a/spring-aop/src/test/java/test/beans/NestedTestBean.java
+++ b/spring-aop/src/test/java/test/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-aop/src/test/java/test/beans/SerializablePerson.java b/spring-aop/src/test/java/test/beans/SerializablePerson.java
index adb2966907..60fa67417d 100644
--- a/spring-aop/src/test/java/test/beans/SerializablePerson.java
+++ b/spring-aop/src/test/java/test/beans/SerializablePerson.java
@@ -31,22 +31,27 @@ public class SerializablePerson implements Person, Serializable {
 	private String name;
 	private int age;
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
 
+	@Override
 	public Object echo(Object o) throws Throwable {
 		if (o instanceof Throwable) {
 			throw (Throwable) o;
diff --git a/spring-aop/src/test/java/test/beans/TestBean.java b/spring-aop/src/test/java/test/beans/TestBean.java
index 8f14fd61a2..5c5e4abb23 100644
--- a/spring-aop/src/test/java/test/beans/TestBean.java
+++ b/spring-aop/src/test/java/test/beans/TestBean.java
@@ -146,10 +146,12 @@ public class TestBean implements ITestBean, IOther, Comparable<Object> {
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -165,10 +167,12 @@ public class TestBean implements ITestBean, IOther, Comparable<Object> {
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -181,14 +185,17 @@ public class TestBean implements ITestBean, IOther, Comparable<Object> {
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -215,10 +222,12 @@ public class TestBean implements ITestBean, IOther, Comparable<Object> {
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -287,6 +296,7 @@ public class TestBean implements ITestBean, IOther, Comparable<Object> {
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -295,6 +305,7 @@ public class TestBean implements ITestBean, IOther, Comparable<Object> {
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -347,18 +358,21 @@ public class TestBean implements ITestBean, IOther, Comparable<Object> {
 	/**
 	 * @see ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 	/**
 	 * @see ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -366,9 +380,11 @@ public class TestBean implements ITestBean, IOther, Comparable<Object> {
 	/**
 	 * @see IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -398,6 +414,7 @@ public class TestBean implements ITestBean, IOther, Comparable<Object> {
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java b/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java
index 4d9355f616..be5819bb3c 100644
--- a/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java
+++ b/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java
@@ -46,6 +46,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 	private final List<ImportDefinition> imports = new LinkedList<ImportDefinition>();
 
 
+	@Override
 	public void defaultsRegistered(DefaultsDefinition defaultsDefinition) {
 		this.defaults.add(defaultsDefinition);
 	}
@@ -54,6 +55,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return Collections.unmodifiableList(this.defaults);
 	}
 
+	@Override
 	public void componentRegistered(ComponentDefinition componentDefinition) {
 		this.componentDefinitions.put(componentDefinition.getName(), componentDefinition);
 	}
@@ -67,6 +69,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return collection.toArray(new ComponentDefinition[collection.size()]);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void aliasRegistered(AliasDefinition aliasDefinition) {
 		List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName());
@@ -82,6 +85,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return aliases == null ? null : Collections.unmodifiableList(aliases);
 	}
 
+	@Override
 	public void importProcessed(ImportDefinition importDefinition) {
 		this.imports.add(importDefinition);
 	}
diff --git a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java
index 3483077e85..94dd439bfb 100644
--- a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java
+++ b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java
@@ -13,6 +13,7 @@ import org.w3c.dom.Element;
 
 public class ComponentBeanDefinitionParser extends AbstractBeanDefinitionParser {
 
+	@Override
 	protected AbstractBeanDefinition parseInternal(Element element,
 			ParserContext parserContext) {
 		return parseComponentElement(element);
diff --git a/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java b/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java
index e62eab786e..ac47c4efea 100644
--- a/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java
+++ b/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java
@@ -16,6 +16,7 @@ public class ComponentFactoryBean implements FactoryBean<Component> {
 		this.children = children;
 	}
 
+	@Override
 	public Component getObject() throws Exception {
 		if (this.children != null && this.children.size() > 0) {
 			for (Component child : children) {
@@ -25,10 +26,12 @@ public class ComponentFactoryBean implements FactoryBean<Component> {
 		return this.parent;
 	}
 
+	@Override
 	public Class<Component> getObjectType() {
 		return Component.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java b/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java
index 3ccc7f167b..b29eeca061 100644
--- a/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java
+++ b/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java
@@ -3,6 +3,7 @@ package com.foo;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 public class ComponentNamespaceHandler extends NamespaceHandlerSupport {
+	@Override
 	public void init() {
 		registerBeanDefinitionParser("component",
 				new ComponentBeanDefinitionParser());
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 fb6831eb8c..f62d800356 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
@@ -360,18 +360,22 @@ public final class BeanUtilsTests {
 
 		private String value;
 
+		@Override
 		public String getKey() {
 			return key;
 		}
 
+		@Override
 		public void setKey(String aKey) {
 			key = aKey;
 		}
 
+		@Override
 		public String getValue() {
 			return value;
 		}
 
+		@Override
 		public void setValue(String aValue) {
 			value = aValue;
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
index c1f3b5e3ac..5825d6a08b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
@@ -507,6 +507,7 @@ public class BeanWrapperGenericsTests {
 
 		private Map<String, List<List<Integer>>> mapOfListOfListOfInteger;
 
+		@Override
 		public Map<String, Integer> getMapOfInteger() {
 			return mapOfInteger;
 		}
@@ -515,10 +516,12 @@ public class BeanWrapperGenericsTests {
 			this.mapOfInteger = mapOfInteger;
 		}
 
+		@Override
 		public Map<String, List<Integer>> getMapOfListOfInteger() {
 			return mapOfListOfInteger;
 		}
 
+		@Override
 		public void setMapOfListOfInteger(Map<String, List<Integer>> mapOfListOfInteger) {
 			this.mapOfListOfInteger = mapOfListOfInteger;
 		}
@@ -591,6 +594,7 @@ public class BeanWrapperGenericsTests {
 
 		private double version;
 
+		@Override
 		public Double getVersion() {
 			return this.version;
 		}
@@ -613,10 +617,12 @@ public class BeanWrapperGenericsTests {
 
 	  private Long id;
 
+	  @Override
 	  public Long getId() {
 		  return id;
 	  }
 
+	  @Override
 	  public void setId(Long aId) {
 		  this.id = aId;
 	  }
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 d420e860c5..930c530961 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
@@ -329,6 +329,7 @@ public final class BeanWrapperTests {
 		TestBean tb = new TestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
+			@Override
 			public void setValue(Object value) {
 				super.setValue(value.toString());
 			}
@@ -500,6 +501,7 @@ public final class BeanWrapperTests {
 		PropsTester pt = new PropsTester();
 		BeanWrapper bw = new BeanWrapperImpl(pt);
 		bw.registerCustomEditor(String.class, "stringArray", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) {
 				setValue(text.substring(1));
 			}
@@ -559,6 +561,7 @@ public final class BeanWrapperTests {
 		TestBean tb = new TestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(String.class, "name", new PropertyEditorSupport() {
+			@Override
 			public void setValue(Object value) {
 				if (value instanceof String[]) {
 					setValue(StringUtils.arrayToDelimitedString(((String[]) value), "-"));
@@ -636,6 +639,7 @@ public final class BeanWrapperTests {
 		PropsTester pt = new PropsTester();
 		BeanWrapper bw = new BeanWrapperImpl(pt);
 		bw.registerCustomEditor(int.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) {
 				setValue(new Integer(Integer.parseInt(text) + 1));
 			}
@@ -1022,6 +1026,7 @@ public final class BeanWrapperTests {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(TestBean.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				if (!StringUtils.hasLength(text)) {
 					throw new IllegalArgumentException();
@@ -1055,6 +1060,7 @@ public final class BeanWrapperTests {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				if (!StringUtils.hasLength(text)) {
 					throw new IllegalArgumentException();
@@ -1078,6 +1084,7 @@ public final class BeanWrapperTests {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				if (!StringUtils.hasLength(text)) {
 					throw new IllegalArgumentException();
@@ -1191,6 +1198,7 @@ public final class BeanWrapperTests {
 		PrimitiveArrayBean tb = new PrimitiveArrayBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(int.class, "array", new PropertyEditorSupport() {
+			@Override
 			public void setValue(Object value) {
 				if (value instanceof Integer) {
 					super.setValue(new Integer(((Integer) value).intValue() + 1));
@@ -1209,6 +1217,7 @@ public final class BeanWrapperTests {
 		PrimitiveArrayBean tb = new PrimitiveArrayBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(int.class, "array[1]", new PropertyEditorSupport() {
+			@Override
 			public void setValue(Object value) {
 				if (value instanceof Integer) {
 					super.setValue(new Integer(((Integer) value).intValue() + 1));
@@ -1821,6 +1830,7 @@ public final class BeanWrapperTests {
 			this.frozen = true;
 		}
 
+		@Override
 		public V put(K key, V value) {
 			if (this.frozen) {
 				throw new UnsupportedOperationException();
@@ -1830,16 +1840,19 @@ public final class BeanWrapperTests {
 			}
 		}
 
+		@Override
 		public Set<Map.Entry<K, V>> entrySet() {
 			this.accessed = true;
 			return super.entrySet();
 		}
 
+		@Override
 		public Set<K> keySet() {
 			this.accessed = true;
 			return super.keySet();
 		}
 
+		@Override
 		public int size() {
 			this.accessed = true;
 			return super.size();
diff --git a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
index 2a0cf025b0..8eaac3b46b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
@@ -115,6 +115,7 @@ public final class ConcurrentBeanWrapperTests {
 			this.test = test;
 		}
 
+		@Override
 		public void run() {
 			try {
 				for (int i = 0; i < 100; i++) {
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 5e05fc91db..fd53b58af7 100644
--- a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
@@ -214,6 +214,7 @@ public class ExtendedBeanInfoTests {
 	@Test
 	public void cornerSpr9453() throws IntrospectionException {
 		final class Bean implements Spr9453<Class<?>> {
+			@Override
 			public Class<?> getProp() {
 				return null;
 			}
@@ -589,7 +590,9 @@ public class ExtendedBeanInfoTests {
 			public Number setFoo(String foo) { return null; }
 		}
 		class C extends B {
+			@Override
 			public String getFoo() { return null; }
+			@Override
 			public Integer setFoo(String foo) { return null; }
 		}
 
@@ -861,6 +864,7 @@ public class ExtendedBeanInfoTests {
 	}
 
 	interface TextBookOperations extends BookOperations {
+		@Override
 		TextBook getBook();
 	}
 
@@ -870,6 +874,7 @@ public class ExtendedBeanInfoTests {
 	}
 
 	class LawLibrary extends Library implements TextBookOperations {
+		@Override
 		public LawBook getBook() { return null; }
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java
index dd52eea7b8..5696a0ad8c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java
@@ -182,10 +182,12 @@ class RequiredTestBean implements BeanNameAware, BeanFactoryAware {
 		this.jobTitle = jobTitle;
 	}
 
+	@Override
 	@Required
 	public void setBeanName(String name) {
 	}
 
+	@Override
 	@Required
 	public void setBeanFactory(BeanFactory beanFactory) {
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
index 3ba946c962..f3b990fdba 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
@@ -72,6 +72,7 @@ public final class ConcurrentBeanFactoryTests {
 	public void setUp() throws Exception {
 		XmlBeanFactory factory = new XmlBeanFactory(CONTEXT);
 		factory.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
+			@Override
 			public void registerCustomEditors(PropertyEditorRegistry registry) {
 				registry.registerCustomEditor(Date.class, new CustomDateEditor((DateFormat) DATE_FORMAT.clone(), false));
 			}
@@ -125,6 +126,7 @@ public final class ConcurrentBeanFactoryTests {
 
 	private class TestRun extends Thread {
 
+		@Override
 		public void run() {
 			try {
 				for (int i = 0; i < 10000; i++) {
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 d52f73e510..bc9f1ffba1 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
@@ -836,6 +836,7 @@ public class DefaultListableBeanFactoryTests {
 	public void testCustomEditor() {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		lbf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
+			@Override
 			public void registerCustomEditors(PropertyEditorRegistry registry) {
 				NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN);
 				registry.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, true));
@@ -853,6 +854,7 @@ public class DefaultListableBeanFactoryTests {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		GenericConversionService conversionService = new DefaultConversionService();
 		conversionService.addConverter(new Converter<String, Float>() {
+			@Override
 			public Float convert(String source) {
 				try {
 					NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN);
@@ -875,6 +877,7 @@ public class DefaultListableBeanFactoryTests {
 	public void testCustomEditorWithBeanReference() {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		lbf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
+			@Override
 			public void registerCustomEditors(PropertyEditorRegistry registry) {
 				NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN);
 				registry.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, true));
@@ -1907,9 +1910,11 @@ public class DefaultListableBeanFactoryTests {
 		RootBeanDefinition bd = new RootBeanDefinition(BeanWithDisposableBean.class);
 		lbf.registerBeanDefinition("test", bd);
 		lbf.addBeanPostProcessor(new BeanPostProcessor() {
+			@Override
 			public Object postProcessBeforeInitialization(Object bean, String beanName) {
 				return new TestBean();
 			}
+			@Override
 			public Object postProcessAfterInitialization(Object bean, String beanName) {
 				return bean;
 			}
@@ -1926,9 +1931,11 @@ public class DefaultListableBeanFactoryTests {
 		RootBeanDefinition bd = new RootBeanDefinition(BeanWithCloseable.class);
 		lbf.registerBeanDefinition("test", bd);
 		lbf.addBeanPostProcessor(new BeanPostProcessor() {
+			@Override
 			public Object postProcessBeforeInitialization(Object bean, String beanName) {
 				return new TestBean();
 			}
+			@Override
 			public Object postProcessAfterInitialization(Object bean, String beanName) {
 				return bean;
 			}
@@ -1946,9 +1953,11 @@ public class DefaultListableBeanFactoryTests {
 		bd.setDestroyMethodName("close");
 		lbf.registerBeanDefinition("test", bd);
 		lbf.addBeanPostProcessor(new BeanPostProcessor() {
+			@Override
 			public Object postProcessBeforeInitialization(Object bean, String beanName) {
 				return new TestBean();
 			}
+			@Override
 			public Object postProcessAfterInitialization(Object bean, String beanName) {
 				return bean;
 			}
@@ -2117,6 +2126,7 @@ public class DefaultListableBeanFactoryTests {
 		lbf.registerBeanDefinition("test", bd);
 		final String nameSetOnField = "nameSetOnField";
 		lbf.addBeanPostProcessor(new InstantiationAwareBeanPostProcessorAdapter() {
+			@Override
 			public boolean postProcessAfterInstantiation(Object bean, String beanName) throws BeansException {
 				TestBean tb = (TestBean) bean;
 				try {
@@ -2156,6 +2166,7 @@ public class DefaultListableBeanFactoryTests {
 
 		TestSecuredBean bean = (TestSecuredBean) Subject.doAsPrivileged(subject,
 				new PrivilegedAction() {
+					@Override
 					public Object run() {
 						return lbf.getBean("test");
 					}
@@ -2244,14 +2255,17 @@ public class DefaultListableBeanFactoryTests {
 		public ConstructorDependencyFactoryBean(String dependency) {
 		}
 
+		@Override
 		public Object getObject() {
 			return "test";
 		}
 
+		@Override
 		public Class<?> getObjectType() {
 			return String.class;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return true;
 		}
@@ -2262,6 +2276,7 @@ public class DefaultListableBeanFactoryTests {
 
 		private static boolean closed;
 
+		@Override
 		public void destroy() {
 			closed = true;
 		}
@@ -2272,6 +2287,7 @@ public class DefaultListableBeanFactoryTests {
 
 		private static boolean closed;
 
+		@Override
 		public void close() {
 			closed = true;
 		}
@@ -2316,14 +2332,17 @@ public class DefaultListableBeanFactoryTests {
 
 	public static class FactoryBeanThatShouldntBeCalled implements FactoryBean<Object> {
 
+		@Override
 		public Object getObject() {
 			throw new IllegalStateException();
 		}
 
+		@Override
 		public Class<?> getObjectType() {
 			return null;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return false;
 		}
@@ -2334,15 +2353,18 @@ public class DefaultListableBeanFactoryTests {
 
 		public boolean initialized = false;
 
+		@Override
 		public Object getObject() throws Exception {
 			this.initialized = true;
 			return "";
 		}
 
+		@Override
 		public Class<?> getObjectType() {
 			return String.class;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return true;
 		}
@@ -2353,23 +2375,28 @@ public class DefaultListableBeanFactoryTests {
 
 		public boolean initialized = false;
 
+		@Override
 		public Object getObject() throws Exception {
 			this.initialized = true;
 			return "";
 		}
 
+		@Override
 		public Class<?> getObjectType() {
 			return String.class;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return true;
 		}
 
+		@Override
 		public boolean isPrototype() {
 			return false;
 		}
 
+		@Override
 		public boolean isEagerInit() {
 			return true;
 		}
@@ -2452,6 +2479,7 @@ public class DefaultListableBeanFactoryTests {
 			this.numberFormat = numberFormat;
 		}
 
+		@Override
 		@SuppressWarnings("unchecked")
 		public Object convertIfNecessary(Object value, Class requiredType) {
 			if (value instanceof String && Float.class.isAssignableFrom(requiredType)) {
@@ -2470,11 +2498,13 @@ public class DefaultListableBeanFactoryTests {
 			}
 		}
 
+		@Override
 		@SuppressWarnings("unchecked")
 		public Object convertIfNecessary(Object value, Class requiredType, MethodParameter methodParam) {
 			return convertIfNecessary(value, requiredType);
 		}
 
+		@Override
 		@SuppressWarnings("unchecked")
 		public Object convertIfNecessary(Object value, Class requiredType, Field field) {
 			return convertIfNecessary(value, requiredType);
@@ -2490,6 +2520,7 @@ public class DefaultListableBeanFactoryTests {
 			this.name = name;
 		}
 
+		@Override
 		public String getName() {
 			return this.name;
 		}
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 c1e5f9acfe..5bb7f93ae0 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
@@ -77,14 +77,17 @@ public final class FactoryBeanTests {
 
 	public static class NullReturningFactoryBean implements FactoryBean<Object> {
 
+		@Override
 		public Object getObject() {
 			return null;
 		}
 
+		@Override
 		public Class<?> getObjectType() {
 			return null;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return true;
 		}
@@ -103,6 +106,7 @@ public final class FactoryBeanTests {
 			return beta;
 		}
 
+		@Override
 		public void afterPropertiesSet() {
 			Assert.notNull(beta, "'beta' property is required");
 		}
@@ -131,6 +135,7 @@ public final class FactoryBeanTests {
 			return name;
 		}
 
+		@Override
 		public void afterPropertiesSet() {
 			Assert.notNull(gamma, "'gamma' property is required");
 		}
@@ -149,14 +154,17 @@ public final class FactoryBeanTests {
 			this.beta = beta;
 		}
 
+		@Override
 		public Object getObject() {
 			return this.beta;
 		}
 
+		@Override
 		public Class<?> getObjectType() {
 			return null;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return true;
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
index 15dd2bcf93..e417ccdba0 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
@@ -43,6 +43,7 @@ public final class SharedBeanRegistryTests {
 		assertSame(tb, beanRegistry.getSingleton("tb"));
 
 		TestBean tb2 = (TestBean) beanRegistry.getSingleton("tb2", new ObjectFactory<Object>() {
+			@Override
 			public Object getObject() throws BeansException {
 				return new TestBean();
 			}
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 a24c78d989..9df0cbc309 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
@@ -989,6 +989,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests {
 		public ExtendedResourceInjectionBean() {
 		}
 
+		@Override
 		@Autowired @Required
 		public void setTestBean2(TestBean testBean2) {
 			super.setTestBean2(testBean2);
@@ -1068,6 +1069,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests {
 
 		private ITestBean testBean4;
 
+		@Override
 		@Autowired(required = false)
 		public void setTestBean2(TestBean testBean2) {
 			super.setTestBean2(testBean2);
@@ -1114,6 +1116,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests {
 
 		private ITestBean testBean4;
 
+		@Override
 		@Autowired(required = false)
 		public void setTestBean2(TestBean testBean2) {
 			super.setTestBean2(testBean2);
@@ -1185,6 +1188,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		@Autowired
 		public void setTestBean2(TestBean testBean2) {
 			super.setTestBean2(testBean2);
@@ -1447,14 +1451,17 @@ public final class AutowiredAnnotationBeanPostProcessorTests {
 
 	public static class StringFactoryBean implements FactoryBean<String> {
 
+		@Override
 		public String getObject() throws Exception {
 			return "";
 		}
 
+		@Override
 		public Class<String> getObjectType() {
 			return String.class;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return true;
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
index 4f96efc8d3..6afaa8b219 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
@@ -69,6 +69,7 @@ public final class CustomAutowireConfigurerTests {
 
 	public static class CustomResolver implements AutowireCandidateResolver {
 
+		@Override
 		public boolean isAutowireCandidate(BeanDefinitionHolder bdHolder, DependencyDescriptor descriptor) {
 			if (!bdHolder.getBeanDefinition().isAutowireCandidate()) {
 				return false;
@@ -82,6 +83,7 @@ public final class CustomAutowireConfigurerTests {
 			return false;
 		}
 
+		@Override
 		public Object getSuggestedValue(DependencyDescriptor descriptor) {
 			return null;
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
index fdaa110f36..9760821441 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
@@ -609,6 +609,7 @@ public class InjectAnnotationBeanPostProcessorTests {
 		public ExtendedResourceInjectionBean() {
 		}
 
+		@Override
 		@Inject @Required
 		public void setTestBean2(TestBean testBean2) {
 			super.setTestBean2(testBean2);
@@ -662,6 +663,7 @@ public class InjectAnnotationBeanPostProcessorTests {
 
 		private ITestBean testBean4;
 
+		@Override
 		@Inject
 		public void setTestBean2(TestBean testBean2) {
 			super.setTestBean2(testBean2);
@@ -708,6 +710,7 @@ public class InjectAnnotationBeanPostProcessorTests {
 
 		private ITestBean testBean4;
 
+		@Override
 		@Inject
 		public void setTestBean2(TestBean testBean2) {
 			super.setTestBean2(testBean2);
@@ -779,6 +782,7 @@ public class InjectAnnotationBeanPostProcessorTests {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		@Inject
 		public void setTestBean2(TestBean testBean2) {
 			super.setTestBean2(testBean2);
@@ -1074,14 +1078,17 @@ public class InjectAnnotationBeanPostProcessorTests {
 
 	public static class StringFactoryBean implements FactoryBean<String> {
 
+		@Override
 		public String getObject() throws Exception {
 			return "";
 		}
 
+		@Override
 		public Class<String> getObjectType() {
 			return String.class;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return true;
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
index 265fea19a6..72073bc190 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
@@ -53,6 +53,7 @@ public final class CustomEditorConfigurerTests {
 		final DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.GERMAN);
 		cec.setPropertyEditorRegistrars(new PropertyEditorRegistrar[] {
 				new PropertyEditorRegistrar() {
+					@Override
 					public void registerCustomEditors(PropertyEditorRegistry registry) {
 						registry.registerCustomEditor(Date.class, new CustomDateEditor(df, true));
 					}
@@ -189,6 +190,7 @@ public final class CustomEditorConfigurerTests {
 
 	public static class MyTestEditor extends PropertyEditorSupport {
 
+		@Override
 		public void setAsText(String text) {
 			setValue(new String[] {"test"});
 		}
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 1f080734bc..931dd10e8e 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
@@ -812,6 +812,7 @@ public final class PropertyResourceConfigurerTests {
 
 	private static class ConvertingOverrideConfigurer extends PropertyOverrideConfigurer {
 
+		@Override
 		protected String convertPropertyValue(String originalValue) {
 			return "X" + originalValue;
 		}
@@ -826,10 +827,12 @@ public final class PropertyResourceConfigurerTests {
 
 		private Preferences userRoot = new MockPreferences();
 
+		@Override
 		public Preferences systemRoot() {
 			return systemRoot;
 		}
 
+		@Override
 		public Preferences userRoot() {
 			return userRoot;
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
index 14b272ee0f..601e564b63 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
@@ -53,6 +53,7 @@ public final class SimpleScopeTests {
 				objects.add(new TestBean());
 				objects.add(new TestBean());
 			}
+			@Override
 			public Object get(String name, ObjectFactory<?> objectFactory) {
 				if (index >= objects.size()) {
 					index = 0;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java
index 5460f8bd01..e834490226 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java
@@ -30,21 +30,26 @@ final class TestTypes {}
  */
 class NoOpScope implements Scope {
 
+	@Override
 	public Object get(String name, ObjectFactory<?> objectFactory) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Object remove(String name) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void registerDestructionCallback(String name, Runnable callback) {
 	}
 
+	@Override
 	public Object resolveContextualObject(String key) {
 		return null;
 	}
 
+	@Override
 	public String getConversationId() {
 		return null;
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
index d5e4441f20..10422ae527 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
@@ -71,10 +71,12 @@ public final class CustomProblemReporterTests {
 		private List<Problem> warnings = new ArrayList<Problem>();
 
 
+		@Override
 		public void fatal(Problem problem) {
 			throw new BeanDefinitionParsingException(problem);
 		}
 
+		@Override
 		public void error(Problem problem) {
 			System.out.println(problem);
 			this.errors.add(problem);
@@ -84,6 +86,7 @@ public final class CustomProblemReporterTests {
 			return this.errors.toArray(new Problem[this.errors.size()]);
 		}
 
+		@Override
 		public void warning(Problem problem) {
 			System.out.println(problem);
 			this.warnings.add(problem);
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 f01cc9b303..9a4612382e 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
@@ -391,6 +391,7 @@ public class BeanFactoryGenericsTests {
 	public void testGenericMapWithCollectionValueConstructor() throws MalformedURLException {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
+			@Override
 			public void registerCustomEditors(PropertyEditorRegistry registry) {
 				registry.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false));
 			}
@@ -547,6 +548,7 @@ public class BeanFactoryGenericsTests {
 	public void testGenericMapWithCollectionValueFactoryMethod() throws MalformedURLException {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
+			@Override
 			public void registerCustomEditors(PropertyEditorRegistry registry) {
 				registry.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false));
 			}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
index 3442e720d4..caacb5604f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
@@ -30,6 +30,7 @@ public class PropertiesBeanDefinitionReaderTests extends TestCase {
 
 	private PropertiesBeanDefinitionReader reader;
 
+	@Override
 	protected void setUp() throws Exception {
 		this.beanFactory = new DefaultListableBeanFactory();
 		this.reader = new PropertiesBeanDefinitionReader(beanFactory);
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 0cd040b469..5c1368c461 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
@@ -61,14 +61,17 @@ public class Spr8954Tests {
 
 	static class FooFactoryBean implements FactoryBean<Foo>, AnInterface {
 
+		@Override
 		public Foo getObject() throws Exception {
 			return new Foo();
 		}
 
+		@Override
 		public Class<?> getObjectType() {
 			return Foo.class;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return true;
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
index cac02472ca..d4c80b410d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
@@ -129,23 +129,28 @@ public class CallbacksSecurityTests {
 			checkCurrentContext();
 		}
 
+		@Override
 		public void afterPropertiesSet() {
 			checkCurrentContext();
 		}
 
+		@Override
 		public void destroy() {
 			checkCurrentContext();
 			destroyed = true;
 		}
 
+		@Override
 		public void setBeanName(String name) {
 			checkCurrentContext();
 		}
 
+		@Override
 		public void setBeanClassLoader(ClassLoader classLoader) {
 			checkCurrentContext();
 		}
 
+		@Override
 		public void setBeanFactory(BeanFactory beanFactory)
 				throws BeansException {
 			checkCurrentContext();
@@ -164,26 +169,31 @@ public class CallbacksSecurityTests {
 			checkCurrentContext();
 		}
 
+		@Override
 		public boolean isEagerInit() {
 			checkCurrentContext();
 			return false;
 		}
 
+		@Override
 		public boolean isPrototype() {
 			checkCurrentContext();
 			return true;
 		}
 
+		@Override
 		public Object getObject() throws Exception {
 			checkCurrentContext();
 			return new Object();
 		}
 
+		@Override
 		public Class getObjectType() {
 			checkCurrentContext();
 			return Object.class;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			checkCurrentContext();
 			return false;
@@ -219,6 +229,7 @@ public class CallbacksSecurityTests {
 
 		return AccessController.doPrivileged(new PrivilegedAction<String>() {
 
+			@Override
 			public String run() {
 				Subject subject = Subject.getSubject(acc);
 				if (subject == null) {
@@ -246,6 +257,7 @@ public class CallbacksSecurityTests {
 			this.name = name;
 		}
 
+		@Override
 		public String getName() {
 			return this.name;
 		}
@@ -291,6 +303,7 @@ public class CallbacksSecurityTests {
 			private final AccessControlContext acc = new AccessControlContext(
 					new ProtectionDomain[] { empty });
 
+			@Override
 			public AccessControlContext getAccessControlContext() {
 				return acc;
 			}
@@ -320,6 +333,7 @@ public class CallbacksSecurityTests {
 		try {
 			AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
 
+				@Override
 				public Object run() throws Exception {
 					method.invoke(bean);
 					return null;
@@ -334,6 +348,7 @@ public class CallbacksSecurityTests {
 			AccessController.doPrivileged(
 					new PrivilegedExceptionAction<Object>() {
 
+						@Override
 						public Object run() throws Exception {
 							return cl.newInstance();
 						}
@@ -444,6 +459,7 @@ public class CallbacksSecurityTests {
 
 		AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
 
+			@Override
 			public Object run() throws Exception {
 				beanFactory.getBean("working-factory-method");
 				beanFactory.getBean("container-execution");
@@ -478,6 +494,7 @@ public class CallbacksSecurityTests {
 
 		NonPrivilegedBean bean = Subject.doAsPrivileged(
 				subject, new PrivilegedAction<NonPrivilegedBean>() {
+					@Override
 					public NonPrivilegedBean run() {
 						return lbf.getBean("test", NonPrivilegedBean.class);
 					}
@@ -502,6 +519,7 @@ public class CallbacksSecurityTests {
 		// request the beans from non-privileged code
 		Subject.doAsPrivileged(subject, new PrivilegedAction<Object>() {
 
+			@Override
 			public Object run() {
 				// sanity check
 				assertEquals("user1", getCurrentSubjectName());
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
index 12f80e38b7..4296a2f303 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
@@ -24,15 +24,18 @@ import org.springframework.beans.factory.FactoryBean;
  */
 public class CustomFactoryBean implements FactoryBean<Object> {
 
+	@Override
 	public Object getObject() throws Exception {
 		return System.getProperties();
 	}
 
+	@Override
 	public Class getObjectType() {
 		System.setProperty("factory.object.type", "true");
 		return Properties.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
index b429cd8e4b..175ce84f16 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.DisposableBean;
  */
 public class DestroyBean implements DisposableBean {
 
+	@Override
 	public void destroy() throws Exception {
 		System.setProperty("security.destroy", "true");
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
index 62f379ee8b..1009e9e76b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.InitializingBean;
  */
 public class InitBean implements InitializingBean {
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		System.getProperties();
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
index eba0541e09..35fa49013b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
@@ -326,6 +326,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase {
 
 	public static class TestBeanEditor extends PropertyEditorSupport {
 
+		@Override
 		public void setAsText(String text) {
 			TestBean tb = new TestBean();
 			StringTokenizer st = new StringTokenizer(text, "_");
@@ -350,6 +351,7 @@ class MustBeInitialized implements InitializingBean {
 	/**
 	 * @see InitializingBean#afterPropertiesSet()
 	 */
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		this.inited = true;
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
index 32e6134823..ce0ba6e7f0 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
@@ -30,6 +30,7 @@ public class BeanNameGenerationTests extends TestCase {
 
 	private DefaultListableBeanFactory beanFactory;
 
+	@Override
 	public void setUp() {
 		this.beanFactory = new DefaultListableBeanFactory();
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
index 2be0637cf6..3b552f0762 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
@@ -45,6 +45,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 	private final List imports = new LinkedList();
 
 
+	@Override
 	public void defaultsRegistered(DefaultsDefinition defaultsDefinition) {
 		this.defaults.add(defaultsDefinition);
 	}
@@ -53,6 +54,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return Collections.unmodifiableList(this.defaults);
 	}
 
+	@Override
 	public void componentRegistered(ComponentDefinition componentDefinition) {
 		this.componentDefinitions.put(componentDefinition.getName(), componentDefinition);
 	}
@@ -66,6 +68,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return (ComponentDefinition[]) collection.toArray(new ComponentDefinition[collection.size()]);
 	}
 
+	@Override
 	public void aliasRegistered(AliasDefinition aliasDefinition) {
 		List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName());
 		if(aliases == null) {
@@ -80,6 +83,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return aliases == null ? null : Collections.unmodifiableList(aliases);
 	}
 
+	@Override
 	public void importProcessed(ImportDefinition importDefinition) {
 		this.imports.add(importDefinition);
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
index 55f7f920f5..0c0974fd72 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
@@ -40,6 +40,7 @@ public class CollectionMergingTests extends TestCase {
 
 	private DefaultListableBeanFactory beanFactory;
 
+	@Override
 	protected void setUp() throws Exception {
 		this.beanFactory = new DefaultListableBeanFactory();
 		BeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
index 27ea4461be..0b0a476bca 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
@@ -51,14 +51,17 @@ public class CountingFactory implements FactoryBean {
 	}
 
 
+	@Override
 	public Object getObject() {
 		return "myString";
 	}
 
+	@Override
 	public Class getObjectType() {
 		return String.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
index 8662e52c78..357dc5d6ce 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
@@ -27,6 +27,7 @@ public class DefaultLifecycleMethodsTests extends TestCase {
 
 	private XmlBeanFactory beanFactory;
 
+	@Override
 	protected void setUp() throws Exception {
 		this.beanFactory = new XmlBeanFactory(new ClassPathResource("defaultLifecycleMethods.xml", getClass()));
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java
index ec52dfaa8c..00933e788a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java
@@ -45,6 +45,7 @@ public final class DelegatingEntityResolverTests {
 
 
 	private static final class NoOpEntityResolver implements EntityResolver {
+		@Override
 		public InputSource resolveEntity(String publicId, String systemId) {
 			return null;
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
index 7387cdf600..7cb8a58627 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
@@ -62,6 +62,7 @@ public class DependenciesBean implements BeanFactoryAware {
 		return spouse;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
index a9e9925d51..765c438449 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
@@ -42,6 +42,7 @@ public class EventPublicationTests extends TestCase {
 	private final CollectingReaderEventListener eventListener = new CollectingReaderEventListener();
 
 
+	@Override
 	protected void setUp() throws Exception {
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory);
 		reader.setEventListener(this.eventListener);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java
index 52eb2b2938..01afc69024 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java
@@ -27,6 +27,7 @@ public class GeneratedNameBean implements BeanNameAware {
 
 	private GeneratedNameBean child;
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java
index b943361f1a..b8757c3e3f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java
@@ -29,6 +29,7 @@ public class MetadataAttachmentTests extends TestCase {
 
 	private XmlBeanFactory beanFactory;
 
+	@Override
 	protected void setUp() throws Exception {
 		this.beanFactory = new XmlBeanFactory(new ClassPathResource("withMeta.xml", getClass()));
 	}
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 bc4e58426f..1cd7a54124 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
@@ -171,6 +171,7 @@ public class ProfileXmlBeanDefinitionTests {
 	private static Matcher<BeanDefinitionRegistry> containsBeanDefinition(final String beanName) {
 		return new TypeSafeMatcher<BeanDefinitionRegistry>() {
 
+			@Override
 			public void describeTo(Description desc) {
 				desc.appendText("a BeanDefinitionRegistry containing bean named ")
 					.appendValue(beanName);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java
index ed8167b112..75af81b55c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java
@@ -57,6 +57,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 		return initMethodDeclared;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		this.beanName = name;
 	}
@@ -65,6 +66,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.owningFactory = beanFactory;
 	}
@@ -79,6 +81,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 		this.postProcessedBeforeInit = true;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.owningFactory == null) {
 			throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean");
@@ -130,6 +133,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 		}
 	}
 
+	@Override
 	public void destroy() {
 		if (this.destroyed) {
 			throw new IllegalStateException("Already destroyed");
@@ -144,6 +148,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 
 	public static class PostProcessor implements BeanPostProcessor {
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
 			if (bean instanceof ProtectedLifecycleBean) {
 				((ProtectedLifecycleBean) bean).postProcessBeforeInit();
@@ -151,6 +156,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
 			if (bean instanceof ProtectedLifecycleBean) {
 				((ProtectedLifecycleBean) bean).postProcessAfterInit();
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 3345bf52fb..cf83b0be7c 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
@@ -46,6 +46,7 @@ public class UtilNamespaceHandlerTests extends TestCase {
 
 	private CollectingReaderEventListener listener = new CollectingReaderEventListener();
 
+	@Override
 	public void setUp() {
 		this.beanFactory = new DefaultListableBeanFactory();
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
index 22d4fcb30c..9cc4745469 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
@@ -46,6 +46,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
 
 	private XmlBeanFactory factory;
 
+	@Override
 	protected void setUp() {
 		parent = new DefaultListableBeanFactory();
 		Map m = new HashMap();
@@ -59,6 +60,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
 
 		this.factory = new XmlBeanFactory(new ClassPathResource("test.xml", getClass()), parent);
 		this.factory.addBeanPostProcessor(new BeanPostProcessor() {
+			@Override
 			public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
 				if (bean instanceof TestBean) {
 					((TestBean) bean).setPostProcessed(true);
@@ -68,6 +70,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
 				}
 				return bean;
 			}
+			@Override
 			public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
 				return bean;
 			}
@@ -77,10 +80,12 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
 		//this.factory.preInstantiateSingletons();
 	}
 
+	@Override
 	protected BeanFactory getBeanFactory() {
 		return factory;
 	}
 
+	@Override
 	public void testCount() {
 		assertCount(24);
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java
index 9be6a107f3..7f4cf0d9fa 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java
@@ -70,6 +70,7 @@ public class BeanInfoTests extends TestCase {
 
 	public static class ValueBeanBeanInfo extends SimpleBeanInfo {
 
+		@Override
 		public PropertyDescriptor[] getPropertyDescriptors() {
 			try {
 				PropertyDescriptor pd = new PropertyDescriptor("value", ValueBean.class);
@@ -96,6 +97,7 @@ public class BeanInfoTests extends TestCase {
 			this.target = target;
 		}
 
+		@Override
 		public void setAsText(String text) throws IllegalArgumentException {
 			if (JdkVersion.getMajorJavaVersion() >= JdkVersion.JAVA_15) {
 				Assert.isTrue(this.target instanceof ValueBean, "Target must be available on JDK 1.5+");
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 c5a230a2c8..c8cf8d7649 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
@@ -113,6 +113,7 @@ public class CustomEditorTests {
 		TestBean tb = new TestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(String.class, "name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("prefix" + text);
 			}
@@ -130,6 +131,7 @@ public class CustomEditorTests {
 		TestBean tb = new TestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("prefix" + text);
 			}
@@ -148,6 +150,7 @@ public class CustomEditorTests {
 		tb.setSpouse(new TestBean());
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(String.class, "spouse.name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("prefix" + text);
 			}
@@ -166,6 +169,7 @@ public class CustomEditorTests {
 		tb.setSpouse(new TestBean());
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("prefix" + text);
 			}
@@ -853,6 +857,7 @@ public class CustomEditorTests {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("prefix" + text);
 			}
@@ -905,16 +910,19 @@ public class CustomEditorTests {
 		IndexedTestBean bean = new IndexedTestBean(false);
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(String.class, "array.name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("array" + text);
 			}
 		});
 		bw.registerCustomEditor(String.class, "list.name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("list" + text);
 			}
 		});
 		bw.registerCustomEditor(String.class, "map.name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("map" + text);
 			}
@@ -969,31 +977,37 @@ public class CustomEditorTests {
 		IndexedTestBean bean = new IndexedTestBean(false);
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(String.class, "array[0].name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("array0" + text);
 			}
 		});
 		bw.registerCustomEditor(String.class, "array[1].name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("array1" + text);
 			}
 		});
 		bw.registerCustomEditor(String.class, "list[0].name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("list0" + text);
 			}
 		});
 		bw.registerCustomEditor(String.class, "list[1].name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("list1" + text);
 			}
 		});
 		bw.registerCustomEditor(String.class, "map[key1].name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("mapkey1" + text);
 			}
 		});
 		bw.registerCustomEditor(String.class, "map[key2].name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("mapkey2" + text);
 			}
@@ -1060,28 +1074,34 @@ public class CustomEditorTests {
 		tb5.setNestedIndexedBean(new IndexedTestBean());
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(String.class, "array.nestedIndexedBean.array.name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("array" + text);
 			}
 
+			@Override
 			public String getAsText() {
 				return ((String) getValue()).substring(5);
 			}
 		});
 		bw.registerCustomEditor(String.class, "list.nestedIndexedBean.list.name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("list" + text);
 			}
 
+			@Override
 			public String getAsText() {
 				return ((String) getValue()).substring(4);
 			}
 		});
 		bw.registerCustomEditor(String.class, "map.nestedIndexedBean.map.name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("map" + text);
 			}
 
+			@Override
 			public String getAsText() {
 				return ((String) getValue()).substring(4);
 			}
@@ -1138,16 +1158,19 @@ public class CustomEditorTests {
 		tb5.setNestedIndexedBean(new IndexedTestBean());
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(String.class, "array[0].nestedIndexedBean.array[0].name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("array" + text);
 			}
 		});
 		bw.registerCustomEditor(String.class, "list.nestedIndexedBean.list[1].name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("list" + text);
 			}
 		});
 		bw.registerCustomEditor(String.class, "map[key1].nestedIndexedBean.map.name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("map" + text);
 			}
@@ -1174,28 +1197,34 @@ public class CustomEditorTests {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(TestBean.class, "array", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean("array" + text, 99));
 			}
 
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
 		});
 		bw.registerCustomEditor(TestBean.class, "list", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean("list" + text, 99));
 			}
 
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
 		});
 		bw.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean("map" + text, 99));
 			}
 
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
@@ -1222,55 +1251,67 @@ public class CustomEditorTests {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(TestBean.class, "array[0]", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean("array0" + text, 99));
 			}
 
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
 		});
 		bw.registerCustomEditor(TestBean.class, "array[1]", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean("array1" + text, 99));
 			}
 
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
 		});
 		bw.registerCustomEditor(TestBean.class, "list[0]", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean("list0" + text, 99));
 			}
 
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
 		});
 		bw.registerCustomEditor(TestBean.class, "list[1]", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean("list1" + text, 99));
 			}
 
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
 		});
 		bw.registerCustomEditor(TestBean.class, "map[key1]", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean("mapkey1" + text, 99));
 			}
 
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
 		});
 		bw.registerCustomEditor(TestBean.class, "map[key2]", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean("mapkey2" + text, 99));
 			}
 
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
@@ -1297,6 +1338,7 @@ public class CustomEditorTests {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(List.class, "list", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				List<TestBean> result = new ArrayList<TestBean>();
 				result.add(new TestBean("list" + text, 99));
@@ -1347,6 +1389,7 @@ public class CustomEditorTests {
 		IndexedTestBean tb = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(TestBean.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean(text, 99));
 			}
@@ -1362,6 +1405,7 @@ public class CustomEditorTests {
 		TestBean tb = new TestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("-" + text + "-");
 			}
@@ -1436,6 +1480,7 @@ public class CustomEditorTests {
 
 	private static class TestBeanEditor extends PropertyEditorSupport {
 
+		@Override
 		public void setAsText(String text) {
 			TestBean tb = new TestBean();
 			StringTokenizer st = new StringTokenizer(text, "_");
@@ -1448,6 +1493,7 @@ public class CustomEditorTests {
 
 	private static class OldValueAccessingTestBeanEditor extends PropertyEditorSupport {
 
+		@Override
 		public void setAsText(String text) {
 			TestBean tb = new TestBean();
 			StringTokenizer st = new StringTokenizer(text, "_");
diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
index 34bfbac3b9..ab99515279 100644
--- a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
@@ -104,6 +104,7 @@ public class PropertyComparatorTests {
 
 		private String lastName;
 
+		@Override
 		public int compareTo(Object o) {
 			return nickName.compareTo(((Dog)o).nickName);
 		}
diff --git a/spring-beans/src/test/java/test/beans/DerivedTestBean.java b/spring-beans/src/test/java/test/beans/DerivedTestBean.java
index fbc9fb5090..87133f27d5 100644
--- a/spring-beans/src/test/java/test/beans/DerivedTestBean.java
+++ b/spring-beans/src/test/java/test/beans/DerivedTestBean.java
@@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		if (this.beanName == null || beanName == null) {
 			this.beanName = beanName;
 		}
 	}
 
+	@Override
 	public String getBeanName() {
 		return beanName;
 	}
@@ -79,10 +81,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void destroy() {
 		this.destroyed = true;
 	}
 
+	@Override
 	public boolean wasDestroyed() {
 		return destroyed;
 	}
diff --git a/spring-beans/src/test/java/test/beans/DummyFactory.java b/spring-beans/src/test/java/test/beans/DummyFactory.java
index 75b585a498..99f2efc266 100644
--- a/spring-beans/src/test/java/test/beans/DummyFactory.java
+++ b/spring-beans/src/test/java/test/beans/DummyFactory.java
@@ -81,6 +81,7 @@ public class DummyFactory
 	 * Return if the bean managed by this factory is a singleton.
 	 * @see FactoryBean#isSingleton()
 	 */
+	@Override
 	public boolean isSingleton() {
 		return this.singleton;
 	}
@@ -92,6 +93,7 @@ public class DummyFactory
 		this.singleton = singleton;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -100,6 +102,7 @@ public class DummyFactory
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = (AutowireCapableBeanFactory) beanFactory;
 		this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName);
@@ -126,6 +129,7 @@ public class DummyFactory
 		return otherTestBean;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (initialized) {
 			throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean");
@@ -151,6 +155,7 @@ public class DummyFactory
 	 * and prototype mode.
 	 * @see FactoryBean#getObject()
 	 */
+	@Override
 	public Object getObject() throws BeansException {
 		if (isSingleton()) {
 			return this.testBean;
@@ -165,11 +170,13 @@ public class DummyFactory
 		}
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return TestBean.class;
 	}
 
 
+	@Override
 	public void destroy() {
 		if (this.testBean != null) {
 			this.testBean.setName(null);
diff --git a/spring-beans/src/test/java/test/beans/LifecycleBean.java b/spring-beans/src/test/java/test/beans/LifecycleBean.java
index 145413deef..e0dd4d3e32 100644
--- a/spring-beans/src/test/java/test/beans/LifecycleBean.java
+++ b/spring-beans/src/test/java/test/beans/LifecycleBean.java
@@ -59,6 +59,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		return initMethodDeclared;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		this.beanName = name;
 	}
@@ -67,6 +68,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.owningFactory = beanFactory;
 	}
@@ -81,6 +83,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		this.postProcessedBeforeInit = true;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.owningFactory == null) {
 			throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean");
@@ -132,6 +135,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		}
 	}
 
+	@Override
 	public void destroy() {
 		if (this.destroyed) {
 			throw new IllegalStateException("Already destroyed");
@@ -146,6 +150,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 
 	public static class PostProcessor implements BeanPostProcessor {
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
 			if (bean instanceof LifecycleBean) {
 				((LifecycleBean) bean).postProcessBeforeInit();
@@ -153,6 +158,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
 			if (bean instanceof LifecycleBean) {
 				((LifecycleBean) bean).postProcessAfterInit();
diff --git a/spring-beans/src/test/java/test/beans/NestedTestBean.java b/spring-beans/src/test/java/test/beans/NestedTestBean.java
index a630f8662a..6855305fb3 100644
--- a/spring-beans/src/test/java/test/beans/NestedTestBean.java
+++ b/spring-beans/src/test/java/test/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-beans/src/test/java/test/beans/TestBean.java b/spring-beans/src/test/java/test/beans/TestBean.java
index 7e8089e6e7..1ad802cc97 100644
--- a/spring-beans/src/test/java/test/beans/TestBean.java
+++ b/spring-beans/src/test/java/test/beans/TestBean.java
@@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 	/**
 	 * @see ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
index 0eb8df5c8a..e136978f9e 100644
--- a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-context-support/src/test/java/org/springframework/beans/TestBean.java b/spring-context-support/src/test/java/org/springframework/beans/TestBean.java
index 7842bbfeac..7a27cf0894 100644
--- a/spring-context-support/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-context-support/src/test/java/org/springframework/beans/TestBean.java
@@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 	/**
 	 * @see org.springframework.beans.ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java
index 8ea783e17c..646a679717 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java
@@ -188,6 +188,7 @@ public class EhCacheSupportTests extends TestCase {
 			cacheFb.setCacheManager(cm);
 			cacheFb.setCacheName("myCache1");
 			cacheFb.setCacheEntryFactory(new CacheEntryFactory() {
+				@Override
 				public Object createEntry(Object key) throws Exception {
 					return key;
 				}
@@ -212,9 +213,11 @@ public class EhCacheSupportTests extends TestCase {
 			cacheFb.setCacheManager(cm);
 			cacheFb.setCacheName("myCache1");
 			cacheFb.setCacheEntryFactory(new UpdatingCacheEntryFactory() {
+				@Override
 				public Object createEntry(Object key) throws Exception {
 					return key;
 				}
+				@Override
 				public void updateEntryValue(Object key, Object value) throws Exception {
 				}
 			});
diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java
index 3233099bac..cd49644c6e 100644
--- a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java
+++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java
@@ -30,6 +30,7 @@ public class InternetAddressEditorTests extends TestCase {
 
 	private InternetAddressEditor editor;
 
+	@Override
 	protected void setUp() {
 		editor = new InternetAddressEditor();
 	}
diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
index b0deb96a6a..fc5bf4cfc5 100644
--- a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
+++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
@@ -170,6 +170,7 @@ public class JavaMailSenderTests extends TestCase {
 		final List<Message> messages = new ArrayList<Message>();
 
 		MimeMessagePreparator preparator = new MimeMessagePreparator() {
+			@Override
 			public void prepare(MimeMessage mimeMessage) throws MessagingException {
 				mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("you@mail.org"));
 				messages.add(mimeMessage);
@@ -194,12 +195,14 @@ public class JavaMailSenderTests extends TestCase {
 		final List<Message> messages = new ArrayList<Message>();
 
 		MimeMessagePreparator preparator1 = new MimeMessagePreparator() {
+			@Override
 			public void prepare(MimeMessage mimeMessage) throws MessagingException {
 				mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("he@mail.org"));
 				messages.add(mimeMessage);
 			}
 		};
 		MimeMessagePreparator preparator2 = new MimeMessagePreparator() {
+			@Override
 			public void prepare(MimeMessage mimeMessage) throws MessagingException {
 				mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("she@mail.org"));
 				messages.add(mimeMessage);
@@ -300,6 +303,7 @@ public class JavaMailSenderTests extends TestCase {
 	public void testJavaMailSenderWithParseExceptionOnMimeMessagePreparator() {
 		MockJavaMailSender sender = new MockJavaMailSender();
 		MimeMessagePreparator preparator = new MimeMessagePreparator() {
+			@Override
 			public void prepare(MimeMessage mimeMessage) throws MessagingException {
 				mimeMessage.setFrom(new InternetAddress(""));
 			}
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
index 0607947d6c..3d78535c8b 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
@@ -154,6 +154,7 @@ public class QuartzSupportTests {
 		schedulerControl.replay();
 
 		SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() {
+			@Override
 			protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) {
 				return scheduler;
 			}
@@ -248,6 +249,7 @@ public class QuartzSupportTests {
 		schedulerControl.replay();
 
 		SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() {
+			@Override
 			protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) {
 				return scheduler;
 			}
@@ -346,6 +348,7 @@ public class QuartzSupportTests {
 		schedulerControl.replay();
 
 		SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() {
+			@Override
 			protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) {
 				return scheduler;
 			}
@@ -401,6 +404,7 @@ public class QuartzSupportTests {
 		schedulerControl.replay();
 
 		SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() {
+			@Override
 			protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) {
 				return scheduler;
 			}
@@ -570,6 +574,7 @@ public class QuartzSupportTests {
 		schedulerControl.replay();
 
 		SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() {
+			@Override
 			protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) {
 				return scheduler;
 			}
@@ -605,6 +610,7 @@ public class QuartzSupportTests {
 		schedulerControl.replay();
 
 		SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() {
+			@Override
 			protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) {
 				return scheduler;
 			}
@@ -1040,30 +1046,39 @@ public class QuartzSupportTests {
 
 	private static class TestSchedulerListener implements SchedulerListener {
 
+		@Override
 		public void jobScheduled(Trigger trigger) {
 		}
 
+		@Override
 		public void jobUnscheduled(String triggerName, String triggerGroup) {
 		}
 
+		@Override
 		public void triggerFinalized(Trigger trigger) {
 		}
 
+		@Override
 		public void triggersPaused(String triggerName, String triggerGroup) {
 		}
 
+		@Override
 		public void triggersResumed(String triggerName, String triggerGroup) {
 		}
 
+		@Override
 		public void jobsPaused(String jobName, String jobGroup) {
 		}
 
+		@Override
 		public void jobsResumed(String jobName, String jobGroup) {
 		}
 
+		@Override
 		public void schedulerError(String msg, SchedulerException cause) {
 		}
 
+		@Override
 		public void schedulerShutdown() {
 		}
 	}
@@ -1071,16 +1086,20 @@ public class QuartzSupportTests {
 
 	private static class TestJobListener implements JobListener {
 
+		@Override
 		public String getName() {
 			return null;
 		}
 
+		@Override
 		public void jobToBeExecuted(JobExecutionContext context) {
 		}
 
+		@Override
 		public void jobExecutionVetoed(JobExecutionContext context) {
 		}
 
+		@Override
 		public void jobWasExecuted(JobExecutionContext context, JobExecutionException jobException) {
 		}
 	}
@@ -1088,20 +1107,25 @@ public class QuartzSupportTests {
 
 	private static class TestTriggerListener implements TriggerListener {
 
+		@Override
 		public String getName() {
 			return null;
 		}
 
+		@Override
 		public void triggerFired(Trigger trigger, JobExecutionContext context) {
 		}
 
+		@Override
 		public boolean vetoJobExecution(Trigger trigger, JobExecutionContext context) {
 			return false;
 		}
 
+		@Override
 		public void triggerMisfired(Trigger trigger) {
 		}
 
+		@Override
 		public void triggerComplete(Trigger trigger, JobExecutionContext context, int triggerInstructionCode) {
 		}
 	}
@@ -1111,6 +1135,7 @@ public class QuartzSupportTests {
 
 		private int count;
 
+		@Override
 		public void execute(Runnable task) {
 			this.count++;
 			task.run();
@@ -1131,6 +1156,7 @@ public class QuartzSupportTests {
 			param = value;
 		}
 
+		@Override
 		public synchronized void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
 			count++;
 		}
@@ -1150,6 +1176,7 @@ public class QuartzSupportTests {
 			param = value;
 		}
 
+		@Override
 		protected synchronized void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
 			count++;
 		}
@@ -1169,6 +1196,7 @@ public class QuartzSupportTests {
 			param = value;
 		}
 
+		@Override
 		public void run() {
 			count++;
 		}
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
index 7e22fe88f7..4f8cc86fca 100644
--- 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
@@ -236,6 +236,7 @@ public class JasperReportsUtilsTests extends TestCase {
 
 		private boolean invoked = false;
 
+		@Override
 		public void afterPageExport() {
 			this.invoked = true;
 		}
diff --git a/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java b/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java
index 2bdea2ecce..1bf169f777 100644
--- a/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java
+++ b/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java
@@ -45,14 +45,17 @@ public class AutowiredQualifierFooService implements FooService {
 		this.initCalled = true;
 	}
 
+	@Override
 	public String foo(int id) {
 		return this.fooDao.findFoo(id);
 	}
 
+	@Override
 	public Future<String> asyncFoo(int id) {
 		return new AsyncResult<String>(this.fooDao.findFoo(id));
 	}
 
+	@Override
 	public boolean isInitCalled() {
 		return this.initCalled;
 	}
diff --git a/spring-context/src/test/java/example/scannable/FooServiceImpl.java b/spring-context/src/test/java/example/scannable/FooServiceImpl.java
index ef2b6094b3..e4941f4bf8 100644
--- a/spring-context/src/test/java/example/scannable/FooServiceImpl.java
+++ b/spring-context/src/test/java/example/scannable/FooServiceImpl.java
@@ -74,16 +74,19 @@ public class FooServiceImpl implements FooService {
 		this.initCalled = true;
 	}
 
+	@Override
 	public String foo(int id) {
 		return this.fooDao.findFoo(id);
 	}
 
+	@Override
 	public Future<String> asyncFoo(int id) {
 		System.out.println(Thread.currentThread().getName());
 		Assert.state(ServiceInvocationCounter.getThreadLocalCount() != null, "Thread-local counter not exposed");
 		return new AsyncResult<String>(this.fooDao.findFoo(id));
 	}
 
+	@Override
 	public boolean isInitCalled() {
 		return this.initCalled;
 	}
diff --git a/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java b/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java
index 34d3160098..601722be84 100644
--- a/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java
+++ b/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java
@@ -28,14 +28,17 @@ import org.springframework.scheduling.annotation.AsyncResult;
 @Scope("myScope")
 public class ScopedProxyTestBean implements FooService {
 
+	@Override
 	public String foo(int id) {
 		return "bar";
 	}
 
+	@Override
 	public Future<String> asyncFoo(int id) {
 		return new AsyncResult<String>("bar");
 	}
 
+	@Override
 	public boolean isInitCalled() {
 		return false;
 	}
diff --git a/spring-context/src/test/java/example/scannable/StubFooDao.java b/spring-context/src/test/java/example/scannable/StubFooDao.java
index b4ea5b65d5..052d9cd25e 100644
--- a/spring-context/src/test/java/example/scannable/StubFooDao.java
+++ b/spring-context/src/test/java/example/scannable/StubFooDao.java
@@ -26,6 +26,7 @@ import org.springframework.stereotype.Repository;
 @Qualifier("testing")
 public class StubFooDao implements FooDao {
 
+	@Override
 	public String findFoo(int id) {
 		return "bar";
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
index 0355c8f7c3..6eae7b3b64 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
@@ -110,26 +110,32 @@ public final class AspectAndAdvicePrecedenceTests {
 			}
 		}
 
+		@Override
 		public void beforeAdviceOne(String beanName) {
 			checkAdvice("beforeAdviceOne(" + beanName + ")");
 		}
 
+		@Override
 		public void beforeAdviceTwo(String beanName) {
 			checkAdvice("beforeAdviceTwo(" + beanName + ")");
 		}
 
+		@Override
 		public void aroundAdviceOne(String beanName) {
 			checkAdvice("aroundAdviceOne(" + beanName + ")");
 		}
 
+		@Override
 		public void aroundAdviceTwo(String beanName) {
 			checkAdvice("aroundAdviceTwo(" + beanName + ")");
 		}
 
+		@Override
 		public void afterAdviceOne(String beanName) {
 			checkAdvice("afterAdviceOne(" + beanName + ")");
 		}
 
+		@Override
 		public void afterAdviceTwo(String beanName) {
 			checkAdvice("afterAdviceTwo(" + beanName + ")");
 		}
@@ -147,6 +153,7 @@ class PrecedenceTestAspect implements BeanNameAware, Ordered {
 	private Collaborator collaborator;
 
 
+	@Override
 	public void setBeanName(String name) {
 		this.name = name;
 	}
@@ -155,6 +162,7 @@ class PrecedenceTestAspect implements BeanNameAware, Ordered {
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return order;
 	}
@@ -223,6 +231,7 @@ class SimpleSpringBeforeAdvice implements MethodBeforeAdvice, BeanNameAware {
 	/* (non-Javadoc)
 	 * @see org.springframework.aop.MethodBeforeAdvice#before(java.lang.reflect.Method, java.lang.Object[], java.lang.Object)
 	 */
+	@Override
 	public void before(Method method, Object[] args, Object target)
 			throws Throwable {
 		this.collaborator.beforeAdviceOne(this.name);
@@ -235,6 +244,7 @@ class SimpleSpringBeforeAdvice implements MethodBeforeAdvice, BeanNameAware {
 	/* (non-Javadoc)
 	 * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String)
 	 */
+	@Override
 	public void setBeanName(String name) {
 		this.name = name;
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
index dbe4e3e51a..977038a1f0 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
@@ -60,6 +60,7 @@ class CallCountingInterceptor implements MethodInterceptor {
 
 	private int count;
 
+	@Override
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		count++;
 		return methodInvocation.proceed();
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
index 2e998b24df..5d5930c80b 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
@@ -126,6 +126,7 @@ public final class BeanNamePointcutTests {
 
 		private int interceptionCount;
 
+		@Override
 		public void before(Method method, Object[] args, Object target) throws Throwable {
 			interceptionCount++;
 		}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
index cfeb2ca217..0eb1c2192d 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
@@ -88,6 +88,7 @@ public final class DeclarationOrderIndependenceTests {
 		/* (non-Javadoc)
 		 * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String)
 		 */
+		@Override
 		public void setBeanName(String name) {
 			this.beanName = name;
 		}
@@ -148,6 +149,7 @@ class TopsyTurvyTargetImpl implements TopsyTurvyTarget {
 	/* (non-Javadoc)
 	 * @see org.springframework.aop.aspectj.TopsyTurvyTarget#doSomething()
 	 */
+	@Override
 	public void doSomething() {
 		this.x = 10;
 	}
@@ -155,6 +157,7 @@ class TopsyTurvyTargetImpl implements TopsyTurvyTarget {
 	/* (non-Javadoc)
 	 * @see org.springframework.aop.aspectj.TopsyTurvyTarget#getX()
 	 */
+	@Override
 	public int getX() {
 		return x;
 	}
@@ -171,6 +174,7 @@ class AspectCollaborator implements TopsyTurvyAspect.Collaborator {
 	/* (non-Javadoc)
 	 * @see org.springframework.aop.aspectj.TopsyTurvyAspect.Collaborator#afterReturningAdviceFired()
 	 */
+	@Override
 	public void afterReturningAdviceFired() {
 		this.afterReturningFired = true;
 	}
@@ -178,6 +182,7 @@ class AspectCollaborator implements TopsyTurvyAspect.Collaborator {
 	/* (non-Javadoc)
 	 * @see org.springframework.aop.aspectj.TopsyTurvyAspect.Collaborator#aroundAdviceFired()
 	 */
+	@Override
 	public void aroundAdviceFired() {
 		this.aroundFired = true;
 	}
@@ -185,6 +190,7 @@ class AspectCollaborator implements TopsyTurvyAspect.Collaborator {
 	/* (non-Javadoc)
 	 * @see org.springframework.aop.aspectj.TopsyTurvyAspect.Collaborator#beforeAdviceFired()
 	 */
+	@Override
 	public void beforeAdviceFired() {
 		this.beforeFired = true;
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
index 70464c5312..22e729d633 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
@@ -101,34 +101,42 @@ class SimpleBeanImpl implements SimpleBean {
 	private String name;
 	private String sex;
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public float getMyFloat() {
 		return aFloat;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public String getSex() {
 		return sex;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
 
+	@Override
 	public void setMyFloat(float f) {
 		this.aFloat = f;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
 
+	@Override
 	public void setSex(String sex) {
 		this.sex = sex;
 	}
@@ -143,6 +151,7 @@ class ProceedTestingAspect implements Ordered {
 	private int order;
 
 	public void setOrder(int order) { this.order = order; }
+	@Override
 	public int getOrder() { return this.order; }
 
 	public Object capitalize(ProceedingJoinPoint pjp, String value) throws Throwable {
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
index bcd1234398..a31b0be91e 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
@@ -74,6 +74,7 @@ interface SerializableFoo extends Serializable { void foo(); }
 
 class SubtypeMatchingTestClassA implements NonSerializableFoo {
 
+	@Override
 	public void foo() {}
 
 }
@@ -81,6 +82,7 @@ class SubtypeMatchingTestClassA implements NonSerializableFoo {
 @SuppressWarnings("serial")
 class SubtypeMatchingTestClassB implements SerializableFoo {
 
+	@Override
 	public void foo() {}
 
 }
@@ -89,6 +91,7 @@ interface Bar { void bar(Object o); }
 
 class SubtypeMatchingTestClassC implements Bar {
 
+	@Override
 	public void bar(Object o) {}
 
 }
\ No newline at end of file
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 f440f0490b..8b9ab4ea51 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
@@ -82,6 +82,7 @@ public final class TargetPointcutSelectionTests {
 	// include the advised method's implementation (instead a base class should include it)
 	public static abstract class AbstractTestImpl implements TestInterface {
 
+		@Override
 		public void interfaceMethod() {
 		}
 	}
@@ -107,6 +108,7 @@ public final class TargetPointcutSelectionTests {
 
 	public static class TestInterceptor extends TestAspect implements MethodInterceptor {
 
+		@Override
 		public Object invoke(MethodInvocation mi) throws Throwable {
 			increment();
 			return mi.proceed();
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
index 6633bb808e..5bf6196f59 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
@@ -108,6 +108,7 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests {
 	}
 
 	public static class TestImpl implements TestInterface {
+		@Override
 		public void doIt() {
 		}
 	}
@@ -119,11 +120,13 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests {
 
 	@TestAnnotation
 	public static class AnnotatedClassTestImpl implements TestInterface {
+		@Override
 		public void doIt() {
 		}
 	}
 
 	public static class AnnotatedMethodTestImpl implements TestInterface {
+		@Override
 		@TestAnnotation
 		public void doIt() {
 		}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
index bcd93c0523..2ae946206e 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
@@ -115,6 +115,7 @@ interface TestInterface {
 
 
 class TestImpl implements TestInterface {
+	@Override
 	public void doIt() {
 	}
 }
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
index 935cf4bd58..2bb1fb39a6 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
@@ -118,22 +118,27 @@ final class Counter implements ICounter {
 	public Counter() {
 	}
 
+	@Override
 	public void increment() {
 		count++;
 	}
 
+	@Override
 	public void decrement() {
 		count--;
 	}
 
+	@Override
 	public int getCount() {
 		return count;
 	}
 
+	@Override
 	public void setCount(int counter) {
 		this.count = counter;
 	}
 
+	@Override
 	public void reset() {
 		this.count = 0;
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java
index 925038414e..a8247ac352 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java
@@ -55,6 +55,7 @@ public final class AnnotationPointcutTests {
 
 class TestMethodInterceptor implements MethodInterceptor {
 
+	@Override
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		return "this value";
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
index e88d5ada0b..bdf4d1ddc1 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
@@ -57,6 +57,7 @@ class InterfaceExtendingAspect implements AnInterface {
 		pjp.proceed();
 	}
 
+	@Override
 	public void interfaceMethod() {
 	}
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
index 9bb9c8d83a..66aa6e0e57 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -387,6 +387,7 @@ class PerTargetAspect implements Ordered {
 		++count;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
@@ -438,14 +439,17 @@ class DummyAspectWithParameter {
 
 class DummyFactoryBean implements FactoryBean<Object> {
 
+	@Override
 	public Object getObject() throws Exception {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public boolean isSingleton() {
 		throw new UnsupportedOperationException();
 	}
@@ -573,12 +577,14 @@ class TestBeanAdvisor extends StaticMethodMatcherPointcutAdvisor {
 
 	public TestBeanAdvisor() {
 		setAdvice(new MethodBeforeAdvice() {
+			@Override
 			public void before(Method method, Object[] args, Object target) throws Throwable {
 				++count;
 			}
 		});
 	}
 
+	@Override
 	public boolean matches(Method method, Class<?> targetClass) {
 		return ITestBean.class.isAssignableFrom(targetClass);
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
index 1868a63a3d..ef61c94dfd 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
@@ -82,16 +82,19 @@ class AtAspectJAnnotationBindingTestAspect {
 
 class ResourceArrayFactoryBean implements FactoryBean<Object> {
 
+	@Override
 	@TestAnnotation("some value")
 	public Object getObject() throws Exception {
 		return new Resource[0];
 	}
 
+	@Override
 	@TestAnnotation("some value")
 	public Class<?> getObjectType() {
 		return Resource[].class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java
index 66897ba62d..247e416e1c 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java
@@ -72,22 +72,26 @@ interface AnnotatedTestBean {
  */
 class AnnotatedTestBeanImpl implements AnnotatedTestBean {
 
+	@Override
 	@TestAnnotation("this value")
 	public String doThis() {
 		return "doThis";
 	}
 
+	@Override
 	@TestAnnotation("that value")
 	public String doThat() {
 		return "doThat";
 	}
 
+	@Override
 	@TestAnnotation("array value")
 	public String[] doArray() {
 		return new String[] {"doThis", "doThat"};
 	}
 
 	// not annotated
+	@Override
 	public String doTheOther() {
 		return "doTheOther";
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
index 918dd87535..8d12136b54 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
@@ -206,6 +206,7 @@ class MultiplyReturnValueInterceptor implements MethodInterceptor {
 		return this.multiple;
 	}
 
+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		++invocations;
 		int result = (Integer) mi.proceed();
@@ -219,6 +220,7 @@ class TraceAfterReturningAdvice implements AfterReturningAdvice {
 
 	public int afterTakesInt;
 
+	@Override
 	public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable {
 		++afterTakesInt;
 	}
@@ -226,6 +228,7 @@ class TraceAfterReturningAdvice implements AfterReturningAdvice {
 	public static Advisor advisor() {
 		return new DefaultPointcutAdvisor(
 			new StaticMethodMatcherPointcut() {
+				@Override
 				public boolean matches(Method method, Class<?> targetClass) {
 					return method.getParameterTypes().length == 1 &&
 						method.getParameterTypes()[0].equals(Integer.class);
@@ -261,6 +264,7 @@ class TraceBeforeAdvice implements MethodBeforeAdvice {
 
 	public int beforeStringReturn;
 
+	@Override
 	public void before(Method method, Object[] args, Object target) throws Throwable {
 		++beforeStringReturn;
 	}
@@ -268,6 +272,7 @@ class TraceBeforeAdvice implements MethodBeforeAdvice {
 	public static Advisor advisor() {
 		return new DefaultPointcutAdvisor(
 			new StaticMethodMatcherPointcut() {
+				@Override
 				public boolean matches(Method method, Class<?> targetClass) {
 					return method.getReturnType().equals(String.class);
 				}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java
index 17e5943b3a..e048453a4f 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java
@@ -81,6 +81,7 @@ interface Service {
 
 class ServiceImpl implements Service {
 
+	@Override
 	@Transaction
 	public void serveMe() {
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java
index b8c85fbef3..8085f19b22 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java
@@ -87,9 +87,11 @@ interface DerivedInterface<T> extends BaseInterface<T> {
 
 class DerivedStringParameterizedClass implements DerivedInterface<String> {
 
+	@Override
 	public void genericDerivedInterfaceMethod(String t) {
 	}
 
+	@Override
 	public void genericBaseInterfaceMethod(String t) {
 	}
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java
index 6260e98b06..9bf5331329 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java
@@ -82,9 +82,11 @@ public final class GenericParameterMatchingTests {
 
 	static class GenericImpl<T> implements GenericInterface<T> {
 
+		@Override
 		public void save(T bean) {
 		}
 
+		@Override
 		public void saveAll(Collection<T> beans) {
 		}
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
index 5af410a894..51b63bd7d6 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
@@ -409,6 +409,7 @@ public abstract class AbstractAopProxyTests {
 		final String s = "foo";
 		// Test return value
 		MethodInterceptor mi = new MethodInterceptor() {
+			@Override
 			public Object invoke(MethodInvocation invocation) throws Throwable {
 				if (!context) {
 					assertNoInvocationContext();
@@ -457,6 +458,7 @@ public abstract class AbstractAopProxyTests {
 		final Exception expectedException = new Exception();
 		// Test return value
 		MethodInterceptor mi = new MethodInterceptor() {
+			@Override
 			public Object invoke(MethodInvocation invocation) throws Throwable {
 				throw expectedException;
 			}
@@ -491,6 +493,7 @@ public abstract class AbstractAopProxyTests {
 		final Exception unexpectedException = new Exception();
 		// Test return value
 		MethodInterceptor mi = new MethodInterceptor() {
+			@Override
 			public Object invoke(MethodInvocation invocation) throws Throwable {
 				throw unexpectedException;
 			}
@@ -523,6 +526,7 @@ public abstract class AbstractAopProxyTests {
 		final RuntimeException unexpectedException = new RuntimeException();
 		// Test return value
 		MethodInterceptor mi = new MethodInterceptor() {
+			@Override
 			public Object invoke(MethodInvocation invocation) throws Throwable {
 				throw unexpectedException;
 			}
@@ -573,6 +577,7 @@ public abstract class AbstractAopProxyTests {
 		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] {ITestBean.class, IOther.class});
 		pc.addAdvice(ExposeInvocationInterceptor.INSTANCE);
 		TrapTargetInterceptor tii = new TrapTargetInterceptor() {
+			@Override
 			public Object invoke(MethodInvocation invocation) throws Throwable {
 				// Assert that target matches BEFORE invocation returns
 				assertEquals("Target is correct", expectedTarget, invocation.getThis());
@@ -727,6 +732,7 @@ public abstract class AbstractAopProxyTests {
 		pc.addAdvice(di);
 		final long ts = 37;
 		pc.addAdvice(new DelegatingIntroductionInterceptor(new TimeStamped() {
+			@Override
 			public long getTimeStamp() {
 				return ts;
 			}
@@ -811,6 +817,7 @@ public abstract class AbstractAopProxyTests {
 			/**
 			 * @see test.util.TimeStamped#getTimeStamp()
 			 */
+			@Override
 			public long getTimeStamp() {
 				throw new UnsupportedOperationException();
 			}
@@ -1132,6 +1139,7 @@ public abstract class AbstractAopProxyTests {
 		pc.addInterface(ITestBean.class);
 
 		MethodInterceptor twoBirthdayInterceptor = new MethodInterceptor() {
+			@Override
 			public Object invoke(MethodInvocation mi) throws Throwable {
 				// Clone the invocation to proceed three times
 				// "The Moor's Last Sigh": this technology can cause premature aging
@@ -1144,6 +1152,7 @@ public abstract class AbstractAopProxyTests {
 		};
 		@SuppressWarnings("serial")
 		StaticMethodMatcherPointcutAdvisor advisor = new StaticMethodMatcherPointcutAdvisor(twoBirthdayInterceptor) {
+			@Override
 			public boolean matches(Method m, Class<?> targetClass) {
 				return "haveBirthday".equals(m.getName());
 			}
@@ -1173,6 +1182,7 @@ public abstract class AbstractAopProxyTests {
 		 * Changes the name, then changes it back.
 		 */
 		MethodInterceptor nameReverter = new MethodInterceptor() {
+			@Override
 			public Object invoke(MethodInvocation mi) throws Throwable {
 				MethodInvocation clone = ((ReflectiveMethodInvocation) mi).invocableClone();
 				String oldName = ((ITestBean) mi.getThis()).getName();
@@ -1186,6 +1196,7 @@ public abstract class AbstractAopProxyTests {
 		class NameSaver implements MethodInterceptor {
 			private List<Object> names = new LinkedList<Object>();
 
+			@Override
 			public Object invoke(MethodInvocation mi) throws Throwable {
 				names.add(mi.getArguments()[0]);
 				return mi.proceed();
@@ -1219,12 +1230,14 @@ public abstract class AbstractAopProxyTests {
 		ProxyFactory pc = new ProxyFactory(target);
 		NopInterceptor overLoadVoids = new NopInterceptor();
 		pc.addAdvisor(new StaticMethodMatcherPointcutAdvisor(overLoadVoids) {
+			@Override
 			public boolean matches(Method m, Class<?> targetClass) {
 				return m.getName().equals("overload") && m.getParameterTypes().length == 0;
 			}
 		});
 		NopInterceptor overLoadInts = new NopInterceptor();
 		pc.addAdvisor(new StaticMethodMatcherPointcutAdvisor(overLoadInts) {
+			@Override
 			public boolean matches(Method m, Class<?> targetClass) {
 				return m.getName().equals("overload") && m.getParameterTypes().length == 1 &&
 					m.getParameterTypes()[0].equals(int.class);
@@ -1255,19 +1268,23 @@ public abstract class AbstractAopProxyTests {
 		Advised config = (Advised) proxy;
 		// This class just checks proxy is bound before getTarget() call
 		config.setTargetSource(new TargetSource() {
+			@Override
 			public Class<?> getTargetClass() {
 				return TestBean.class;
 			}
 
+			@Override
 			public boolean isStatic() {
 				return false;
 			}
 
+			@Override
 			public Object getTarget() throws Exception {
 				assertEquals(proxy, AopContext.currentProxy());
 				return target;
 			}
 
+			@Override
 			public void releaseTarget(Object target) throws Exception {
 			}
 		});
@@ -1311,6 +1328,7 @@ public abstract class AbstractAopProxyTests {
 		CountingBeforeAdvice cba = new CountingBeforeAdvice();
 		@SuppressWarnings("serial")
 		Advisor matchesNoArgs = new StaticMethodMatcherPointcutAdvisor(cba) {
+			@Override
 			public boolean matches(Method m, Class<?> targetClass) {
 				return m.getParameterTypes().length == 0;
 			}
@@ -1343,6 +1361,7 @@ public abstract class AbstractAopProxyTests {
 				this.expectedValues = expectedValues;
 				this.valuesToAdd = valuesToAdd;
 			}
+			@Override
 			public Object invoke(MethodInvocation invocation) throws Throwable {
 				ReflectiveMethodInvocation rmi = (ReflectiveMethodInvocation) invocation;
 				for (Iterator<String> it = rmi.getUserAttributes().keySet().iterator(); it.hasNext(); ){
@@ -1390,6 +1409,7 @@ public abstract class AbstractAopProxyTests {
 		CountingMultiAdvice cca = new CountingMultiAdvice();
 		@SuppressWarnings("serial")
 		Advisor matchesNoArgs = new StaticMethodMatcherPointcutAdvisor(cca) {
+			@Override
 			public boolean matches(Method m, Class<?> targetClass) {
 				return m.getParameterTypes().length == 0 || "exceptional".equals(m.getName());
 			}
@@ -1428,6 +1448,7 @@ public abstract class AbstractAopProxyTests {
 		final RuntimeException rex = new RuntimeException();
 		@SuppressWarnings("serial")
 		CountingBeforeAdvice ba = new CountingBeforeAdvice() {
+			@Override
 			public void before(Method m, Object[] args, Object target) throws Throwable {
 				super.before(m, args, target);
 				if (m.getName().startsWith("set"))
@@ -1471,6 +1492,7 @@ public abstract class AbstractAopProxyTests {
 	public void testAfterReturningAdvisorIsInvoked() {
 		class SummingAfterAdvice implements AfterReturningAdvice {
 			public int sum;
+			@Override
 			public void afterReturning(Object returnValue, Method m, Object[] args, Object target) throws Throwable {
 				sum += ((Integer) returnValue).intValue();
 			}
@@ -1478,6 +1500,7 @@ public abstract class AbstractAopProxyTests {
 		SummingAfterAdvice aa = new SummingAfterAdvice();
 		@SuppressWarnings("serial")
 		Advisor matchesInt = new StaticMethodMatcherPointcutAdvisor(aa) {
+			@Override
 			public boolean matches(Method m, Class<?> targetClass) {
 				return m.getReturnType() == int.class;
 			}
@@ -1535,6 +1558,7 @@ public abstract class AbstractAopProxyTests {
 		MyThrowsHandler th = new MyThrowsHandler();
 		@SuppressWarnings("serial")
 		Advisor matchesEchoInvocations = new StaticMethodMatcherPointcutAdvisor(th) {
+			@Override
 			public boolean matches(Method m, Class<?> targetClass) {
 				return m.getName().startsWith("echo");
 			}
@@ -1609,6 +1633,7 @@ public abstract class AbstractAopProxyTests {
 
 	private static class CheckMethodInvocationIsSameInAndOutInterceptor implements MethodInterceptor {
 
+		@Override
 		public Object invoke(MethodInvocation mi) throws Throwable {
 			Method m = mi.getMethod();
 			Object retval = mi.proceed();
@@ -1623,6 +1648,7 @@ public abstract class AbstractAopProxyTests {
 	 */
 	private static class CheckMethodInvocationViaThreadLocalIsSameInAndOutInterceptor implements MethodInterceptor {
 
+		@Override
 		public Object invoke(MethodInvocation mi) throws Throwable {
 			String task = "get invocation on way IN";
 			try {
@@ -1649,6 +1675,7 @@ public abstract class AbstractAopProxyTests {
 	 */
 	private static class ProxyMatcherInterceptor implements MethodInterceptor {
 
+		@Override
 		public Object invoke(MethodInvocation mi) throws Throwable {
 			Object proxy = AopContext.currentProxy();
 			Object ret = mi.proceed();
@@ -1667,6 +1694,7 @@ public abstract class AbstractAopProxyTests {
 	protected static class StringSetterNullReplacementAdvice extends DefaultPointcutAdvisor {
 
 		private static MethodInterceptor cleaner = new MethodInterceptor() {
+			@Override
 			public Object invoke(MethodInvocation mi) throws Throwable {
 				// We know it can only be invoked if there's a single parameter of type string
 				mi.getArguments()[0] = "";
@@ -1677,9 +1705,11 @@ public abstract class AbstractAopProxyTests {
 		public StringSetterNullReplacementAdvice() {
 			super(cleaner);
 			setPointcut(new DynamicMethodMatcherPointcut() {
+				@Override
 				public boolean matches(Method m, Class<?> targetClass, Object[] args) {
 					return args[0] == null;
 				}
+				@Override
 				public boolean matches(Method m, Class<?> targetClass) {
 					return m.getName().startsWith("set") &&
 						m.getParameterTypes().length == 1 &&
@@ -1698,6 +1728,7 @@ public abstract class AbstractAopProxyTests {
 		public TestDynamicPointcutAdvice(MethodInterceptor mi, final String pattern) {
 			super(mi);
 			setPointcut(new DynamicMethodMatcherPointcut() {
+				@Override
 				public boolean matches(Method m, Class<?> targetClass, Object[] args) {
 					boolean run = m.getName().indexOf(pattern) != -1;
 					if (run) ++count;
@@ -1716,11 +1747,13 @@ public abstract class AbstractAopProxyTests {
 		public TestDynamicPointcutForSettersOnly(MethodInterceptor mi, final String pattern) {
 			super(mi);
 			setPointcut(new DynamicMethodMatcherPointcut() {
+				@Override
 				public boolean matches(Method m, Class<?> targetClass, Object[] args) {
 					boolean run = m.getName().indexOf(pattern) != -1;
 					if (run) ++count;
 					return run;
 				}
+				@Override
 				public boolean matches(Method m, Class<?> clazz) {
 					return m.getName().startsWith("set");
 				}
@@ -1739,6 +1772,7 @@ public abstract class AbstractAopProxyTests {
 			super(mi);
 			this.pattern = pattern;
 		}
+		@Override
 		public boolean matches(Method m, Class<?> targetClass) {
 			boolean run = m.getName().indexOf(pattern) != -1;
 			if (run) ++count;
@@ -1757,6 +1791,7 @@ public abstract class AbstractAopProxyTests {
 
 		public Object target;
 
+		@Override
 		public Object invoke(MethodInvocation invocation) throws Throwable {
 			this.target = invocation.getThis();
 			return invocation.proceed();
@@ -1766,6 +1801,7 @@ public abstract class AbstractAopProxyTests {
 
 	private static class DummyIntroductionAdviceImpl implements DynamicIntroductionAdvice {
 
+		@Override
 		public boolean implementsInterface(Class<?> intf) {
 			return true;
 		}
@@ -1774,6 +1810,7 @@ public abstract class AbstractAopProxyTests {
 
 	public static class OwnSpouse extends TestBean {
 
+		@Override
 		public ITestBean getSpouse() {
 			return this;
 		}
@@ -1790,6 +1827,7 @@ public abstract class AbstractAopProxyTests {
 			return getClass().hashCode();
 		}
 
+		@Override
 		public void absquatulate() {
 		}
 	}
@@ -1811,14 +1849,17 @@ public abstract class AbstractAopProxyTests {
 
 		private int count;
 
+		@Override
 		public int getCount() {
 			return count;
 		}
 
+		@Override
 		public void incrementViaThis() {
 			this.increment();
 		}
 
+		@Override
 		public void incrementViaProxy() {
 			INeedsToSeeProxy thisViaProxy = (INeedsToSeeProxy) AopContext.currentProxy();
 			thisViaProxy.increment();
@@ -1829,6 +1870,7 @@ public abstract class AbstractAopProxyTests {
 		protected void checkAdvised(Advised advised) {
 		}
 
+		@Override
 		public void increment() {
 			++count;
 		}
@@ -1837,6 +1879,7 @@ public abstract class AbstractAopProxyTests {
 
 	public static class TargetChecker extends NeedsToSeeProxy {
 
+		@Override
 		protected void checkAdvised(Advised advised) {
 			// TODO replace this check: no longer possible
 			//assertEquals(advised.getTarget(), this);
@@ -1854,11 +1897,13 @@ public abstract class AbstractAopProxyTests {
 			this.expectedSource = expectedSource;
 		}
 
+		@Override
 		public void activated(AdvisedSupport advised) {
 			assertEquals(expectedSource, advised);
 			++activates;
 		}
 
+		@Override
 		public void adviceChanged(AdvisedSupport advised) {
 			assertEquals(expectedSource, advised);
 			++adviceChanges;
@@ -1870,10 +1915,12 @@ public abstract class AbstractAopProxyTests {
 
 		public int refreshes;
 
+		@Override
 		public void activated(AdvisedSupport advised) {
 			++refreshes;
 		}
 
+		@Override
 		public void adviceChanged(AdvisedSupport advised) {
 			++refreshes;
 		}
@@ -1894,17 +1941,21 @@ public abstract class AbstractAopProxyTests {
 
 	public static class Overloads implements IOverloads {
 
+		@Override
 		public void overload() {
 		}
 
+		@Override
 		public int overload(int i) {
 			return i;
 		}
 
+		@Override
 		public String overload(String s) {
 			return s;
 		}
 
+		@Override
 		public void noAdvice() {
 		}
 	}
@@ -1914,10 +1965,12 @@ public abstract class AbstractAopProxyTests {
 	public static class CountingMultiAdvice extends MethodCounter implements MethodBeforeAdvice,
 			AfterReturningAdvice, ThrowsAdvice {
 
+		@Override
 		public void before(Method m, Object[] args, Object target) throws Throwable {
 			count(m);
 		}
 
+		@Override
 		public void afterReturning(Object o, Method m, Object[] args, Object target)
 				throws Throwable {
 			count(m);
@@ -1983,6 +2036,7 @@ public abstract class AbstractAopProxyTests {
 		/**
 		 * @see org.springframework.aop.TargetSource#getTargetClass()
 		 */
+		@Override
 		public Class<?> getTargetClass() {
 			return target.getClass();
 		}
@@ -1990,6 +2044,7 @@ public abstract class AbstractAopProxyTests {
 		/**
 		 * @see org.springframework.aop.TargetSource#getTarget()
 		 */
+		@Override
 		public Object getTarget() throws Exception {
 			++gets;
 			return target;
@@ -1998,6 +2053,7 @@ public abstract class AbstractAopProxyTests {
 		/**
 		 * @see org.springframework.aop.TargetSource#releaseTarget(java.lang.Object)
 		 */
+		@Override
 		public void releaseTarget(Object pTarget) throws Exception {
 			if (pTarget != this.target)
 				throw new RuntimeException("Released wrong target");
@@ -2016,6 +2072,7 @@ public abstract class AbstractAopProxyTests {
 		/**
 		 * @see org.springframework.aop.TargetSource#isStatic()
 		 */
+		@Override
 		public boolean isStatic() {
 			return false;
 		}
@@ -2025,12 +2082,14 @@ public abstract class AbstractAopProxyTests {
 
 	static abstract class ExposedInvocationTestBean extends TestBean {
 
+		@Override
 		public String getName() {
 			MethodInvocation invocation = ExposeInvocationInterceptor.currentInvocation();
 			assertions(invocation);
 			return super.getName();
 		}
 
+		@Override
 		public void absquatulate() {
 			MethodInvocation invocation = ExposeInvocationInterceptor.currentInvocation();
 			assertions(invocation);
@@ -2042,6 +2101,7 @@ public abstract class AbstractAopProxyTests {
 
 
 	static class InvocationCheckExposedInvocationTestBean extends ExposedInvocationTestBean {
+		@Override
 		protected void assertions(MethodInvocation invocation) {
 			TestCase.assertTrue(invocation.getThis() == this);
 			TestCase.assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(),
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 a52cbe3cc0..d600115868 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
@@ -58,6 +58,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 	private static final String DEPENDENCY_CHECK_CONTEXT =  CglibProxyTests.class.getSimpleName() + "-with-dependency-checking.xml";
 
 
+	@Override
 	protected Object createProxy(ProxyCreatorSupport as) {
 		as.setProxyTargetClass(true);
 		Object proxy = as.createAopProxy().getProxy();
@@ -65,11 +66,13 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 		return proxy;
 	}
 
+	@Override
 	protected AopProxy createAopProxy(AdvisedSupport as) {
 		as.setProxyTargetClass(true);
 		return new CglibAopProxy(as);
 	}
 
+	@Override
 	protected boolean requiresTarget() {
 		return true;
 	}
@@ -207,10 +210,12 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri
 
 		MethodInterceptor advice = new NopInterceptor();
 		Pointcut pointcut = new Pointcut() {
+			@Override
 			public ClassFilter getClassFilter() {
 				return ClassFilter.TRUE;
 			}
 
+			@Override
 			public MethodMatcher getMethodMatcher() {
 				return MethodMatcher.TRUE;
 			}
@@ -492,6 +497,7 @@ 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/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
index b845070078..fff56bde6f 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
@@ -42,6 +42,7 @@ import org.springframework.beans.TestBean;
 @SuppressWarnings("serial")
 public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements Serializable {
 
+	@Override
 	protected Object createProxy(ProxyCreatorSupport as) {
 		assertFalse("Not forcible CGLIB", as.isProxyTargetClass());
 		Object proxy = as.createAopProxy().getProxy();
@@ -49,6 +50,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 		return proxy;
 	}
 
+	@Override
 	protected AopProxy createAopProxy(AdvisedSupport as) {
 		return new JdkDynamicAopProxy(as);
 	}
@@ -94,6 +96,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 
 	public void testTargetCanGetInvocationWithPrivateClass() throws Throwable {
 		final ExposedInvocationTestBean expectedTarget = new ExposedInvocationTestBean() {
+			@Override
 			protected void assertions(MethodInvocation invocation) {
 				assertTrue(invocation.getThis() == this);
 				assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(),
@@ -104,6 +107,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] { ITestBean.class, IOther.class });
 		pc.addAdvice(ExposeInvocationInterceptor.INSTANCE);
 		TrapTargetInterceptor tii = new TrapTargetInterceptor() {
+			@Override
 			public Object invoke(MethodInvocation invocation) throws Throwable {
 				// Assert that target matches BEFORE invocation returns
 				assertEquals("Target is correct", expectedTarget, invocation.getThis());
@@ -165,10 +169,12 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 
 	public static class FooBar implements Foo, Bar {
 
+		@Override
 		public Bar getBarThis() {
 			return this;
 		}
 
+		@Override
 		public Foo getFooThis() {
 			return this;
 		}
@@ -189,6 +195,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 
 		private final String name = "Rob Harrop";
 
+		@Override
 		public String getName() {
 			return this.name;
 		}
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
index 6c255751b4..0bf067154a 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
@@ -307,6 +307,7 @@ public final class ProxyFactoryBeanTests {
 		final Exception ex = new UnsupportedOperationException("invoke");
 		// Add evil interceptor to head of list
 		config.addAdvice(0, new MethodInterceptor() {
+			@Override
 			public Object invoke(MethodInvocation invocation) throws Throwable {
 				throw ex;
 			}
@@ -705,12 +706,14 @@ public final class ProxyFactoryBeanTests {
 
 		public PointcutForVoid() {
 			setAdvice(new MethodInterceptor() {
+				@Override
 				public Object invoke(MethodInvocation invocation) throws Throwable {
 					methodNames.add(invocation.getMethod().getName());
 					return invocation.proceed();
 				}
 			});
 			setPointcut(new DynamicMethodMatcherPointcut() {
+				@Override
 				public boolean matches(Method m, Class<?> targetClass, Object[] args) {
 					return m.getReturnType() == Void.TYPE;
 				}
@@ -734,10 +737,12 @@ public final class ProxyFactoryBeanTests {
 	 */
 	public static class GlobalAspectInterfaceInterceptor implements IntroductionInterceptor {
 
+		@Override
 		public boolean implementsInterface(Class<?> intf) {
 			return intf.equals(AddedGlobalInterface.class);
 		}
 
+		@Override
 		public Object invoke(MethodInvocation mi) throws Throwable {
 			if (mi.getMethod().getDeclaringClass().equals(AddedGlobalInterface.class)) {
 				return new Integer(-1);
@@ -751,22 +756,27 @@ public final class ProxyFactoryBeanTests {
 
 		private IntroductionInterceptor gi = new GlobalAspectInterfaceInterceptor();
 
+		@Override
 		public ClassFilter getClassFilter() {
 			return ClassFilter.TRUE;
 		}
 
+		@Override
 		public Advice getAdvice() {
 			return this.gi;
 		}
 
+		@Override
 		public Class<?>[] getInterfaces() {
 			return new Class<?>[] { AddedGlobalInterface.class };
 		}
 
+		@Override
 		public boolean isPerInstance() {
 			return false;
 		}
 
+		@Override
 		public void validateInterfaces() {
 		}
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java
index 216510950e..ea1924b101 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java
@@ -27,14 +27,17 @@ interface IEcho {
 class Echo implements IEcho {
 	private int a;
 
+	@Override
 	public int echoException(int i, Throwable t) throws Throwable {
 		if (t != null)
 			throw t;
 		return i;
 	}
+	@Override
 	public void setA(int a) {
 		this.a = a;
 	}
+	@Override
 	public int getA() {
 		return a;
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java
index 39dc7410b8..57e8de8112 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java
@@ -96,10 +96,12 @@ interface SimpleBeforeAdvice extends BeforeAdvice {
 @SuppressWarnings("serial")
 class SimpleBeforeAdviceAdapter implements AdvisorAdapter, Serializable {
 
+	@Override
 	public boolean supportsAdvice(Advice advice) {
 		return (advice instanceof SimpleBeforeAdvice);
 	}
 
+	@Override
 	public MethodInterceptor getInterceptor(Advisor advisor) {
 		SimpleBeforeAdvice advice = (SimpleBeforeAdvice) advisor.getAdvice();
 		return new SimpleBeforeAdviceInterceptor(advice) ;
@@ -112,6 +114,7 @@ class SimpleBeforeAdviceImpl implements SimpleBeforeAdvice {
 
 	private int invocationCounter;
 
+	@Override
 	public void before() throws Throwable {
 		++invocationCounter;
 	}
@@ -131,6 +134,7 @@ final class SimpleBeforeAdviceInterceptor implements MethodInterceptor {
 		this.advice = advice;
 	}
 
+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		advice.before();
 		return mi.proceed();
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
index 185075670f..e6bf8c37da 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
@@ -218,6 +218,7 @@ class CountingTestBean extends TestBean {
 
 class SelectivePrototypeTargetSourceCreator extends AbstractBeanFactoryBasedTargetSourceCreator {
 
+	@Override
 	protected AbstractBeanFactoryBasedTargetSource createBeanFactoryBasedTargetSource(
 			Class<?> beanClass, String beanName) {
 		if (!beanName.startsWith("prototype")) {
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
index f8b0e7a01f..d9237d23b9 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
@@ -281,6 +281,7 @@ public final class AutoProxyCreatorTests {
 			this.proxyObject = proxyObject;
 		}
 
+		@Override
 		protected Object[] getAdvicesAndAdvisorsForBean(Class<?> beanClass, String name, TargetSource customTargetSource) {
 			if (StaticMessageSource.class.equals(beanClass)) {
 				return DO_NOT_PROXY;
@@ -308,6 +309,7 @@ public final class AutoProxyCreatorTests {
 
 		public int nrOfInvocations = 0;
 
+		@Override
 		public Object invoke(MethodInvocation invocation) throws Throwable {
 			if (!invocation.getMethod().getName().equals("finalize")) {
 				this.nrOfInvocations++;
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java
index 77bbaf3e3c..0197bb6840 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java
@@ -47,6 +47,7 @@ public final class BeanNameAutoProxyCreatorInitTests {
 
 class NullChecker implements MethodBeforeAdvice {
 
+	@Override
 	public void before(Method method, Object[] args, Object target) throws Throwable {
 		check(args);
 	}
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
index 0b8f9a15cd..54242e6ffc 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
@@ -205,6 +205,7 @@ class CreatesTestBean implements FactoryBean<Object> {
 	/**
 	 * @see org.springframework.beans.factory.FactoryBean#getObject()
 	 */
+	@Override
 	public Object getObject() throws Exception {
 		return new TestBean();
 	}
@@ -212,6 +213,7 @@ class CreatesTestBean implements FactoryBean<Object> {
 	/**
 	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
 	 */
+	@Override
 	public Class<?> getObjectType() {
 		return TestBean.class;
 	}
@@ -219,6 +221,7 @@ class CreatesTestBean implements FactoryBean<Object> {
 	/**
 	 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
 	 */
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
index 0940539f54..8ada7848fa 100644
--- a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		if (this.beanName == null || beanName == null) {
 			this.beanName = beanName;
 		}
 	}
 
+	@Override
 	public String getBeanName() {
 		return beanName;
 	}
@@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void destroy() {
 		this.destroyed = true;
 	}
 
+	@Override
 	public boolean wasDestroyed() {
 		return destroyed;
 	}
diff --git a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
index 0eb8df5c8a..e136978f9e 100644
--- a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
index 13c2c5447a..9a2a3193df 100644
--- a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
+++ b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
@@ -31,22 +31,27 @@ public class SerializablePerson implements Person, Serializable {
 	private String name;
 	private int age;
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
 
+	@Override
 	public Object echo(Object o) throws Throwable {
 		if (o instanceof Throwable) {
 			throw (Throwable) o;
diff --git a/spring-context/src/test/java/org/springframework/beans/TestBean.java b/spring-context/src/test/java/org/springframework/beans/TestBean.java
index b93bf96be3..21526c932b 100644
--- a/spring-context/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/TestBean.java
@@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 	/**
 	 * @see org.springframework.beans.ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
index a04d179644..9c8be8ac4c 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
@@ -317,6 +317,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase {
 
 	public static class TestBeanEditor extends PropertyEditorSupport {
 
+		@Override
 		public void setAsText(String text) {
 			TestBean tb = new TestBean();
 			StringTokenizer st = new StringTokenizer(text, "_");
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
index b9999baa5e..bd402c3040 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
@@ -74,6 +74,7 @@ public class DummyFactory
 	 * Return if the bean managed by this factory is a singleton.
 	 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
 	 */
+	@Override
 	public boolean isSingleton() {
 		return this.singleton;
 	}
@@ -85,6 +86,7 @@ public class DummyFactory
 		this.singleton = singleton;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -93,6 +95,7 @@ public class DummyFactory
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = (AutowireCapableBeanFactory) beanFactory;
 		this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName);
@@ -119,6 +122,7 @@ public class DummyFactory
 		return otherTestBean;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (initialized) {
 			throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean");
@@ -144,6 +148,7 @@ public class DummyFactory
 	 * and prototype mode.
 	 * @see org.springframework.beans.factory.FactoryBean#getObject()
 	 */
+	@Override
 	public Object getObject() throws BeansException {
 		if (isSingleton()) {
 			return this.testBean;
@@ -158,11 +163,13 @@ public class DummyFactory
 		}
 	}
 
+	@Override
 	public Class<TestBean> getObjectType() {
 		return TestBean.class;
 	}
 
 
+	@Override
 	public void destroy() {
 		if (this.testBean != null) {
 			this.testBean.setName(null);
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java
index 19b7da62f8..191b3509c7 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java
@@ -53,6 +53,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		return initMethodDeclared;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		this.beanName = name;
 	}
@@ -61,6 +62,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.owningFactory = beanFactory;
 	}
@@ -75,6 +77,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		this.postProcessedBeforeInit = true;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.owningFactory == null) {
 			throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean");
@@ -126,6 +129,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		}
 	}
 
+	@Override
 	public void destroy() {
 		if (this.destroyed) {
 			throw new IllegalStateException("Already destroyed");
@@ -140,6 +144,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 
 	public static class PostProcessor implements BeanPostProcessor {
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
 			if (bean instanceof LifecycleBean) {
 				((LifecycleBean) bean).postProcessBeforeInit();
@@ -147,6 +152,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
 			if (bean instanceof LifecycleBean) {
 				((LifecycleBean) bean).postProcessAfterInit();
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
index 1dcc1aaf72..afb3dbe2f1 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
@@ -28,6 +28,7 @@ public class MustBeInitialized implements InitializingBean {
 	/**
 	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
 	 */
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		this.inited = true;
 	}
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 822da917c5..6bb485f835 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
@@ -49,6 +49,7 @@ class UserServiceImpl extends GenericServiceImpl<Foo> {
 
 	protected Foo object;
 
+	@Override
 	@Inject
 	@Named("userObject")
 	public void setObject(Foo object) {
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
index 604d2595b0..9901e8feb8 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
@@ -44,6 +44,7 @@ public class SimpleMapScope implements Scope, Serializable {
 	}
 
 
+	@Override
 	public Object get(String name, ObjectFactory<?> objectFactory) {
 		synchronized (this.map) {
 			Object scopedObject = this.map.get(name);
@@ -55,16 +56,19 @@ public class SimpleMapScope implements Scope, Serializable {
 		}
 	}
 
+	@Override
 	public Object remove(String name) {
 		synchronized (this.map) {
 			return this.map.remove(name);
 		}
 	}
 
+	@Override
 	public void registerDestructionCallback(String name, Runnable callback) {
 		this.callbacks.add(callback);
 	}
 
+	@Override
 	public Object resolveContextualObject(String key) {
 		return null;
 	}
@@ -76,6 +80,7 @@ public class SimpleMapScope implements Scope, Serializable {
 		}
 	}
 
+	@Override
 	public String getConversationId() {
 		return null;
 	}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
index 8da9a81a6f..ebd2ad7ea2 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
@@ -40,6 +40,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 	private final List<ImportDefinition> imports = new LinkedList<ImportDefinition>();
 
 
+	@Override
 	public void defaultsRegistered(DefaultsDefinition defaultsDefinition) {
 		this.defaults.add(defaultsDefinition);
 	}
@@ -48,6 +49,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return Collections.unmodifiableList(this.defaults);
 	}
 
+	@Override
 	public void componentRegistered(ComponentDefinition componentDefinition) {
 		this.componentDefinitions.put(componentDefinition.getName(), componentDefinition);
 	}
@@ -61,6 +63,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return collection.toArray(new ComponentDefinition[collection.size()]);
 	}
 
+	@Override
 	public void aliasRegistered(AliasDefinition aliasDefinition) {
 		List<AliasDefinition> aliases = this.aliasMap.get(aliasDefinition.getBeanName());
 		if(aliases == null) {
@@ -75,6 +78,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return aliases == null ? null : Collections.unmodifiableList(aliases);
 	}
 
+	@Override
 	public void importProcessed(ImportDefinition importDefinition) {
 		this.imports.add(importDefinition);
 	}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
index f17b3dfc89..d5c2f1ce3d 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
@@ -65,6 +65,7 @@ public final class DependenciesBean implements BeanFactoryAware {
 		return spouse;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java
index 09bd64d34d..4a1923181f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java
@@ -389,14 +389,17 @@ public final class QualifierAnnotationTests {
 	@Qualifier(FACTORY_QUALIFIER)
 	public static class QualifiedFactoryBean implements FactoryBean<Theta> {
 
+		@Override
 		public Theta getObject() {
 			return new Theta() {};
 		}
 
+		@Override
 		public Class<Theta> getObjectType() {
 			return Theta.class;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return true;
 		}
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 cebec37bd6..98f0450564 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
@@ -256,6 +256,7 @@ class DummyBoImpl implements DummyBo {
 		this.dao = dao;
 	}
 
+	@Override
 	public void something() {
 
 	}
@@ -430,6 +431,7 @@ class FixedMethodReplacer implements MethodReplacer {
 
 	public static final String VALUE = "fixedMethodReplacer";
 
+	@Override
 	public Object reimplement(Object obj, Method method, Object[] args) throws Throwable {
 		return VALUE;
 	}
@@ -513,6 +515,7 @@ abstract class OverrideOneMethod extends MethodReplaceCandidate implements Overr
 
 	protected abstract TestBean protectedOverrideSingleton();
 
+	@Override
 	public TestBean getPrototypeDependency(Object someParam) {
 		return new TestBean();
 	}
@@ -540,6 +543,7 @@ abstract class OverrideOneMethod extends MethodReplaceCandidate implements Overr
 		return "replaceMe:" + someParam;
 	}
 
+	@Override
 	public String replaceMe(String someParam) {
 		return "replaceMe:"  + someParam;
 	}
@@ -595,6 +599,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 		return initMethodDeclared;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		this.beanName = name;
 	}
@@ -603,6 +608,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.owningFactory = beanFactory;
 	}
@@ -617,6 +623,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 		this.postProcessedBeforeInit = true;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.owningFactory == null) {
 			throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean");
@@ -668,6 +675,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 		}
 	}
 
+	@Override
 	public void destroy() {
 		if (this.destroyed) {
 			throw new IllegalStateException("Already destroyed");
@@ -682,6 +690,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 
 	public static class PostProcessor implements BeanPostProcessor {
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
 			if (bean instanceof ProtectedLifecycleBean) {
 				((ProtectedLifecycleBean) bean).postProcessBeforeInit();
@@ -689,6 +698,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
 			if (bean instanceof ProtectedLifecycleBean) {
 				((ProtectedLifecycleBean) bean).postProcessAfterInit();
@@ -706,6 +716,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial
 @SuppressWarnings("serial")
 class ReverseMethodReplacer implements MethodReplacer, Serializable {
 
+	@Override
 	public Object reimplement(Object obj, Method method, Object[] args) throws Throwable {
 		String s = (String) args[0];
 		return new StringBuffer(s).reverse().toString();
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 91c0c5f4b3..997523aaf6 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
@@ -1511,6 +1511,7 @@ public final class XmlBeanFactoryTests {
 
 		public Object lastArg;
 
+		@Override
 		public Object reimplement(Object obj, Method method, Object[] args) throws Throwable {
 			assertEquals(1, args.length);
 			assertEquals("doSomething", method.getName());
@@ -1558,6 +1559,7 @@ public final class XmlBeanFactoryTests {
 			constructed = true;
 		}
 
+		@Override
 		public void afterPropertiesSet() {
 			if (this.initMethodInvoked) {
 				fail();
@@ -1579,6 +1581,7 @@ public final class XmlBeanFactoryTests {
 			this.initMethodInvoked = true;
 		}
 
+		@Override
 		public void destroy() {
 			if (this.customDestroyed) {
 				fail();
@@ -1611,6 +1614,7 @@ public final class XmlBeanFactoryTests {
 			prepared = true;
 		}
 
+		@Override
 		public void destroy() {
 			destroyed = true;
 		}
@@ -1627,6 +1631,7 @@ public final class XmlBeanFactoryTests {
 			prepared = true;
 		}
 
+		@Override
 		public void destroy() {
 			destroyed = true;
 		}
@@ -1654,12 +1659,14 @@ public final class XmlBeanFactoryTests {
 		public void setInTheMiddleBean(InTheMiddleBean bean) {
 		}
 
+		@Override
 		public void afterPropertiesSet() {
 			if (!(PreparingBean1.prepared && PreparingBean2.prepared)) {
 				throw new IllegalStateException("Need prepared PreparingBeans!");
 			}
 		}
 
+		@Override
 		public void destroy() {
 			if (PreparingBean1.destroyed || PreparingBean2.destroyed) {
 				throw new IllegalStateException("Should not be destroyed after PreparingBeans");
@@ -1692,6 +1699,7 @@ public final class XmlBeanFactoryTests {
 			this.dependingBean = dependingBean;
 		}
 
+		@Override
 		public void destroy() {
 			if (this.dependingBean.destroyed) {
 				throw new IllegalStateException("Should not be destroyed after DependingBean");
@@ -1794,10 +1802,12 @@ public final class XmlBeanFactoryTests {
 
 	public static class WrappingPostProcessor implements BeanPostProcessor {
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 			ProxyFactory pf = new ProxyFactory(bean);
 			return pf.getProxy();
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
index d236686275..148c3d2e2b 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
@@ -194,6 +194,7 @@ public class CustomNamespaceHandlerTests {
 			super(CLASS.getClassLoader());
 		}
 
+		@Override
 		public InputSource resolveEntity(String publicId, String systemId) throws IOException {
 			InputSource source = super.resolveEntity(publicId, systemId);
 			if (source == null) {
@@ -216,6 +217,7 @@ public class CustomNamespaceHandlerTests {
  */
 final class TestNamespaceHandler extends NamespaceHandlerSupport {
 
+	@Override
 	public void init() {
 		registerBeanDefinitionParser("testBean", new TestBeanDefinitionParser());
 		registerBeanDefinitionParser("person", new PersonDefinitionParser());
@@ -228,6 +230,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport {
 
 	private static class TestBeanDefinitionParser implements BeanDefinitionParser {
 
+		@Override
 		public BeanDefinition parse(Element element, ParserContext parserContext) {
 			RootBeanDefinition definition = new RootBeanDefinition();
 			definition.setBeanClass(TestBean.class);
@@ -245,10 +248,12 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport {
 
 	private static final class PersonDefinitionParser extends AbstractSingleBeanDefinitionParser {
 
+		@Override
 		protected Class<?> getBeanClass(Element element) {
 			return TestBean.class;
 		}
 
+		@Override
 		protected void doParse(Element element, BeanDefinitionBuilder builder) {
 			builder.addPropertyValue("name", element.getAttribute("name"));
 			builder.addPropertyValue("age", element.getAttribute("age"));
@@ -257,6 +262,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport {
 
 	private static class PropertyModifyingBeanDefinitionDecorator implements BeanDefinitionDecorator {
 
+		@Override
 		public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
 			Element element = (Element) node;
 			BeanDefinition def = definition.getBeanDefinition();
@@ -272,6 +278,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport {
 
 	private static class DebugBeanDefinitionDecorator extends AbstractInterceptorDrivenBeanDefinitionDecorator {
 
+		@Override
 		protected BeanDefinition createInterceptorDefinition(Node node) {
 			return new RootBeanDefinition(DebugInterceptor.class);
 		}
@@ -279,6 +286,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport {
 
 	private static class NopInterceptorBeanDefinitionDecorator extends AbstractInterceptorDrivenBeanDefinitionDecorator {
 
+		@Override
 		protected BeanDefinition createInterceptorDefinition(Node node) {
 			return new RootBeanDefinition(NopInterceptor.class);
 		}
@@ -286,6 +294,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport {
 
 	private static class ObjectNameBeanDefinitionDecorator implements BeanDefinitionDecorator {
 
+		@Override
 		public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
 			Attr objectNameAttribute = (Attr) node;
 			definition.getBeanDefinition().setAttribute("objectName", objectNameAttribute.getValue());
diff --git a/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
index 80fa6f50e2..4d4ea48a61 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
@@ -32,105 +32,127 @@ public class AnnotatedClassCacheableService implements CacheableService<Object>
 	private final AtomicLong counter = new AtomicLong();
 	public static final AtomicLong nullInvocations = new AtomicLong();
 
+	@Override
 	public Object cache(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	public Object conditional(int field) {
 		return null;
 	}
 
+	@Override
 	@CacheEvict("default")
 	public void invalidate(Object arg1) {
 	}
 
+	@Override
 	@CacheEvict("default")
 	public void evictWithException(Object arg1) {
 		throw new RuntimeException("exception thrown - evict should NOT occur");
 	}
 
+	@Override
 	@CacheEvict(value = "default", allEntries = true)
 	public void evictAll(Object arg1) {
 	}
 
+	@Override
 	@CacheEvict(value = "default", beforeInvocation = true)
 	public void evictEarly(Object arg1) {
 		throw new RuntimeException("exception thrown - evict should still occur");
 	}
 
+	@Override
 	@CacheEvict(value = "default", key = "#p0")
 	public void evict(Object arg1, Object arg2) {
 	}
 
+	@Override
 	@CacheEvict(value = "default", key = "#p0", beforeInvocation = true)
 	public void invalidateEarly(Object arg1, Object arg2) {
 		throw new RuntimeException("exception thrown - evict should still occur");
 	}
 
+	@Override
 	@Cacheable(value = "default", key = "#p0")
 	public Object key(Object arg1, Object arg2) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Cacheable(value = "default", key = "#root.methodName + #root.caches[0].name")
 	public Object name(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Cacheable(value = "default", key = "#root.methodName + #root.method.name + #root.targetClass + #root.target")
 	public Object rootVars(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@CachePut("default")
 	public Object update(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@CachePut(value = "default", condition = "#arg.equals(3)")
 	public Object conditionalUpdate(Object arg) {
 		return arg;
 	}
 
+	@Override
 	public Object nullValue(Object arg1) {
 		nullInvocations.incrementAndGet();
 		return null;
 	}
 
+	@Override
 	public Number nullInvocations() {
 		return nullInvocations.get();
 	}
 
+	@Override
 	public Long throwChecked(Object arg1) throws Exception {
 		throw new UnsupportedOperationException(arg1.toString());
 	}
 
+	@Override
 	public Long throwUnchecked(Object arg1) {
 		throw new UnsupportedOperationException();
 	}
 
 	// multi annotations
 
+	@Override
 	@Caching(cacheable = { @Cacheable("primary"), @Cacheable("secondary") })
 	public Object multiCache(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#a0"),  @CacheEvict(value = "primary", key = "#p0 + 'A'") })
 	public Object multiEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(cacheable = { @Cacheable(value = "primary", key = "#root.methodName") }, evict = { @CacheEvict("secondary") })
 	public Object multiCacheAndEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(cacheable = { @Cacheable(value = "primary", condition = "#a0 == 3") }, evict = { @CacheEvict("secondary") })
 	public Object multiConditionalCacheAndEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(put = { @CachePut("primary"), @CachePut("secondary") })
 	public Object multiUpdate(Object arg1) {
 		return arg1;
diff --git a/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
index fc46127cd4..b3a19df189 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
@@ -33,83 +33,100 @@ public class DefaultCacheableService implements CacheableService<Long> {
 	private final AtomicLong counter = new AtomicLong();
 	private final AtomicLong nullInvocations = new AtomicLong();
 
+	@Override
 	@Cacheable("default")
 	public Long cache(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@CacheEvict("default")
 	public void invalidate(Object arg1) {
 	}
 
+	@Override
 	@CacheEvict("default")
 	public void evictWithException(Object arg1) {
 		throw new RuntimeException("exception thrown - evict should NOT occur");
 	}
 
+	@Override
 	@CacheEvict(value = "default", allEntries = true)
 	public void evictAll(Object arg1) {
 	}
 
+	@Override
 	@CacheEvict(value = "default", beforeInvocation = true)
 	public void evictEarly(Object arg1) {
 		throw new RuntimeException("exception thrown - evict should still occur");
 	}
 
+	@Override
 	@CacheEvict(value = "default", key = "#p0")
 	public void evict(Object arg1, Object arg2) {
 	}
 
+	@Override
 	@CacheEvict(value = "default", key = "#p0", beforeInvocation = true)
 	public void invalidateEarly(Object arg1, Object arg2) {
 		throw new RuntimeException("exception thrown - evict should still occur");
 	}
 
+	@Override
 	@Cacheable(value = "default", condition = "#classField == 3")
 	public Long conditional(int classField) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Cacheable(value = "default", key = "#p0")
 	public Long key(Object arg1, Object arg2) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Cacheable(value = "default", key = "#root.methodName")
 	public Long name(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Cacheable(value = "default", key = "#root.methodName + #root.method.name + #root.targetClass + #root.target")
 	public Long rootVars(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@CachePut("default")
 	public Long update(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@CachePut(value = "default", condition = "#arg.equals(3)")
 	public Long conditionalUpdate(Object arg) {
 		return Long.valueOf(arg.toString());
 	}
 
+	@Override
 	@Cacheable("default")
 	public Long nullValue(Object arg1) {
 		nullInvocations.incrementAndGet();
 		return null;
 	}
 
+	@Override
 	public Number nullInvocations() {
 		return nullInvocations.get();
 	}
 
+	@Override
 	@Cacheable("default")
 	public Long throwChecked(Object arg1) throws Exception {
 		throw new Exception(arg1.toString());
 	}
 
+	@Override
 	@Cacheable("default")
 	public Long throwUnchecked(Object arg1) {
 		throw new UnsupportedOperationException(arg1.toString());
@@ -117,26 +134,31 @@ public class DefaultCacheableService implements CacheableService<Long> {
 
 	// multi annotations
 
+	@Override
 	@Caching(cacheable = { @Cacheable("primary"), @Cacheable("secondary") })
 	public Long multiCache(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#p0"), @CacheEvict(value = "primary", key = "#p0 + 'A'") })
 	public Long multiEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(cacheable = { @Cacheable(value = "primary", key = "#root.methodName") }, evict = { @CacheEvict("secondary") })
 	public Long multiCacheAndEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(cacheable = { @Cacheable(value = "primary", condition = "#p0 == 3") }, evict = { @CacheEvict("secondary") })
 	public Long multiConditionalCacheAndEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(put = { @CachePut("primary"), @CachePut("secondary") })
 	public Long multiUpdate(Object arg1) {
 		return Long.valueOf(arg1.toString());
diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
index 29114dd967..3e9138fd5e 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
@@ -115,6 +115,7 @@ public class EnableCachingTests extends AbstractAnnotationTests {
 	@Configuration
 	@EnableCaching
 	static class EnableCachingConfig implements CachingConfigurer {
+		@Override
 		@Bean
 		public CacheManager cacheManager() {
 			SimpleCacheManager cm = new SimpleCacheManager();
@@ -135,6 +136,7 @@ public class EnableCachingTests extends AbstractAnnotationTests {
 			return new AnnotatedClassCacheableService();
 		}
 
+		@Override
 		@Bean
 		public KeyGenerator keyGenerator() {
 			return new SomeKeyGenerator();
@@ -174,9 +176,11 @@ public class EnableCachingTests extends AbstractAnnotationTests {
 		@Bean
 		public CacheManager cm2() { return new NoOpCacheManager(); }
 
+		@Override
 		public CacheManager cacheManager() {
 			return cm1();
 		}
+		@Override
 		public KeyGenerator keyGenerator() {
 			return null;
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/ACATester.java b/spring-context/src/test/java/org/springframework/context/ACATester.java
index 3faf3ba364..e2603726cc 100644
--- a/spring-context/src/test/java/org/springframework/context/ACATester.java
+++ b/spring-context/src/test/java/org/springframework/context/ACATester.java
@@ -22,6 +22,7 @@ public class ACATester implements ApplicationContextAware {
 
 	private ApplicationContext ac;
 
+	@Override
 	public void setApplicationContext(ApplicationContext ctx) throws ApplicationContextException {
 		// check reinitialization
 		if (this.ac != null) {
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 a0493b62ec..fe8201644b 100644
--- a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
@@ -39,10 +39,12 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe
 
 	protected TestListener parentListener = new TestListener();
 
+	@Override
 	protected void setUp() throws Exception {
 		this.applicationContext = createContext();
 	}
 
+	@Override
 	protected BeanFactory getBeanFactory() {
 		return applicationContext;
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java
index f525d38fe1..8ec1c33a34 100644
--- a/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java
+++ b/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java
@@ -26,6 +26,7 @@ public class BeanThatBroadcasts implements ApplicationContextAware {
 	public int receivedCount;
 
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 		if (applicationContext.getDisplayName().indexOf("listener") != -1) {
diff --git a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java
index 3bda3d3723..9ca20496a3 100644
--- a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java
+++ b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java
@@ -43,6 +43,7 @@ public class BeanThatListens implements ApplicationListener<ApplicationEvent> {
 	}
 
 
+	@Override
 	public void onApplicationEvent(ApplicationEvent event) {
 		eventCount++;
 		if (beanThatBroadcasts != null) {
diff --git a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
index 720a7cd9b4..68664e6a01 100644
--- a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
@@ -30,18 +30,21 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo
 
 	protected ApplicationContext owningContext;
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		super.setBeanFactory(beanFactory);
 		if (this.owningContext != null)
 			throw new RuntimeException("Factory called setBeanFactory after setApplicationContext");
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
 		if (this.owningContext == null)
 			throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean");
 	}
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		if (this.owningFactory == null)
 			throw new RuntimeException("Factory called setApplicationContext before setBeanFactory");
diff --git a/spring-context/src/test/java/org/springframework/context/TestListener.java b/spring-context/src/test/java/org/springframework/context/TestListener.java
index 834439484c..c4d12a1881 100644
--- a/spring-context/src/test/java/org/springframework/context/TestListener.java
+++ b/spring-context/src/test/java/org/springframework/context/TestListener.java
@@ -34,6 +34,7 @@ public class TestListener implements ApplicationListener<ApplicationEvent> {
 		eventCount = 0;
 	}
 
+	@Override
 	public void onApplicationEvent(ApplicationEvent e) {
 		++eventCount;
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
index 96750057f5..e4d3dfbe14 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
@@ -47,6 +47,7 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor
 		new XmlBeanFactory(new ClassPathResource("/org/springframework/beans/factory/access/beans2.xml"));
 	}
 
+	@Override
 	@Test
 	public void testBasicFunctionality() {
 		ContextSingletonBeanFactoryLocator facLoc = new ContextSingletonBeanFactoryLocator(
@@ -71,6 +72,7 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor
 	 * 2nd and subsequent calls will actually get back same locator instance. This is not
 	 * really an issue, since the contained bean factories will still be loaded and released.
 	 */
+	@Override
 	@Test
 	public void testGetInstance() {
 		// Try with and without 'classpath*:' prefix, and with 'classpath:' prefix.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
index a829ee49f9..f82a42fc5c 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
@@ -159,18 +159,22 @@ public class AnnotationConfigApplicationContextTests {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		context.register(AutowiredConfig.class);
 		context.getBeanFactory().addBeanPostProcessor(new BeanPostProcessor() {
+			@Override
 			public Object postProcessBeforeInitialization(Object bean, String beanName) {
 				return (bean instanceof TestBean ? null : bean);
 			}
+			@Override
 			public Object postProcessAfterInitialization(Object bean, String beanName) {
 				return bean;
 			}
 		});
 		context.getBeanFactory().addBeanPostProcessor(new BeanPostProcessor() {
+			@Override
 			public Object postProcessBeforeInitialization(Object bean, String beanName) {
 				bean.getClass().getName();
 				return bean;
 			}
+			@Override
 			public Object postProcessAfterInitialization(Object bean, String beanName) {
 				bean.getClass().getName();
 				return bean;
@@ -230,14 +234,17 @@ public class AnnotationConfigApplicationContextTests {
 
 	static class UntypedFactoryBean implements FactoryBean<Object> {
 
+		@Override
 		public Object getObject() {
 			return null;
 		}
 
+		@Override
 		public Class<?> getObjectType() {
 			return null;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return false;
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
index 8792128587..e225b5cfe9 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
@@ -151,6 +151,7 @@ public class AnnotationProcessorPerformanceTests {
 
 	private static class ResourceAnnotatedTestBean extends TestBean {
 
+		@Override
 		@Resource @Required
 		public void setSpouse(ITestBean spouse) {
 			super.setSpouse(spouse);
@@ -160,6 +161,7 @@ public class AnnotationProcessorPerformanceTests {
 
 	private static class AutowiredAnnotatedTestBean extends TestBean {
 
+		@Override
 		@Autowired @Required
 		public void setSpouse(ITestBean spouse) {
 			super.setSpouse(spouse);
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 b4135bf646..5029e1c7e6 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
@@ -207,6 +207,7 @@ public class CommonAnnotationBeanPostProcessorTests {
 
 		bf.registerResolvableDependency(BeanFactory.class, bf);
 		bf.registerResolvableDependency(INestedTestBean.class, new ObjectFactory<Object>() {
+			@Override
 			public Object getObject() throws BeansException {
 				return new NestedTestBean();
 			}
@@ -452,6 +453,7 @@ public class CommonAnnotationBeanPostProcessorTests {
 
 	public static class InitDestroyBeanPostProcessor implements DestructionAwareBeanPostProcessor {
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 			if (bean instanceof AnnotatedInitDestroyBean) {
 				assertFalse(((AnnotatedInitDestroyBean) bean).initCalled);
@@ -459,6 +461,7 @@ public class CommonAnnotationBeanPostProcessorTests {
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 			if (bean instanceof AnnotatedInitDestroyBean) {
 				assertTrue(((AnnotatedInitDestroyBean) bean).initCalled);
@@ -466,6 +469,7 @@ public class CommonAnnotationBeanPostProcessorTests {
 			return bean;
 		}
 
+		@Override
 		public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException {
 			if (bean instanceof AnnotatedInitDestroyBean) {
 				assertFalse(((AnnotatedInitDestroyBean) bean).destroyCalled);
@@ -566,6 +570,7 @@ public class CommonAnnotationBeanPostProcessorTests {
 		@Resource
 		private BeanFactory beanFactory;
 
+		@Override
 		@Resource
 		public void setTestBean2(TestBean testBean2) {
 			super.setTestBean2(testBean2);
@@ -597,6 +602,7 @@ public class CommonAnnotationBeanPostProcessorTests {
 			return testBean6;
 		}
 
+		@Override
 		@PostConstruct
 		protected void init2() {
 			if (this.testBean3 == null || this.testBean4 == null) {
@@ -605,6 +611,7 @@ public class CommonAnnotationBeanPostProcessorTests {
 			super.init2();
 		}
 
+		@Override
 		@PreDestroy
 		protected void destroy2() {
 			super.destroy2();
@@ -627,6 +634,7 @@ public class CommonAnnotationBeanPostProcessorTests {
 		@Resource
 		private BeanFactory beanFactory;
 
+		@Override
 		@EJB
 		public void setTestBean2(TestBean testBean2) {
 			super.setTestBean2(testBean2);
@@ -650,6 +658,7 @@ public class CommonAnnotationBeanPostProcessorTests {
 			return testBean4;
 		}
 
+		@Override
 		@PostConstruct
 		protected void init2() {
 			if (this.testBean3 == null || this.testBean4 == null) {
@@ -658,6 +667,7 @@ public class CommonAnnotationBeanPostProcessorTests {
 			super.init2();
 		}
 
+		@Override
 		@PreDestroy
 		protected void destroy2() {
 			super.destroy2();
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java
index 75bef42a0f..b377f6b437 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java
@@ -147,6 +147,7 @@ public class ComponentScanParserTests {
 
 	public static class CustomTypeFilter implements TypeFilter {
 
+		@Override
 		public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) {
 			return metadataReader.getClassMetadata().getClassName().contains("Custom");
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
index d917b0d608..3e672f556c 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
@@ -75,6 +75,7 @@ public class ConfigurationClassAndBFPPTests {
 		@Bean
 		public BeanFactoryPostProcessor bfpp() {
 			return new BeanFactoryPostProcessor() {
+				@Override
 				public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 					// no-op
 				}
@@ -90,6 +91,7 @@ public class ConfigurationClassAndBFPPTests {
 		@Bean
 		public static final BeanFactoryPostProcessor bfpp() {
 			return new BeanFactoryPostProcessor() {
+				@Override
 				public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 					// no-op
 				}
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 14d1932dca..d79256a53b 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
@@ -95,12 +95,15 @@ class DummyBean {
 
 
 class MyFactoryBean implements FactoryBean<String> {
+	@Override
 	public String getObject() throws Exception {
 		return "foo";
 	}
+	@Override
 	public Class<String> getObjectType() {
 		return String.class;
 	}
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -115,15 +118,18 @@ class MyParameterizedFactoryBean<T> implements FactoryBean<T> {
 		this.obj = obj;
 	}
 
+	@Override
 	public T getObject() throws Exception {
 		return obj;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Class<T> getObjectType() {
 		return (Class<T>)obj.getClass();
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java
index b2c1db67d9..3fc42a1f14 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java
@@ -63,14 +63,17 @@ class Bar {
 
 class FooFactoryBean implements FactoryBean<Foo> {
 
+	@Override
 	public Foo getObject() {
 		return new Foo();
 	}
 
+	@Override
 	public Class<Foo> getObjectType() {
 		return Foo.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java
index d89deb4415..f8613d29ac 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java
@@ -140,6 +140,7 @@ public class DestroyMethodInferenceTests {
 
 	static class WithInheritedCloseMethod implements Closeable {
 		boolean closed = false;
+		@Override
 		public void close() throws IOException {
 			closed = true;
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
index df6b5fb8e9..fb0683ed27 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
@@ -70,6 +70,7 @@ public class EnableLoadTimeWeavingTests {
 	@Configuration
 	@EnableLoadTimeWeaving(aspectjWeaving=AspectJWeaving.DISABLED)
 	static class EnableLTWConfig_withAjWeavingDisabled implements LoadTimeWeavingConfigurer {
+		@Override
 		public LoadTimeWeaver getLoadTimeWeaver() {
 			LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class);
 			// no expectations -> a class file transformer should NOT be added
@@ -81,6 +82,7 @@ public class EnableLoadTimeWeavingTests {
 	@Configuration
 	@EnableLoadTimeWeaving(aspectjWeaving=AspectJWeaving.AUTODETECT)
 	static class EnableLTWConfig_withAjWeavingAutodetect implements LoadTimeWeavingConfigurer {
+		@Override
 		public LoadTimeWeaver getLoadTimeWeaver() {
 			LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class);
 			// no expectations -> a class file transformer should NOT be added
@@ -93,6 +95,7 @@ public class EnableLoadTimeWeavingTests {
 	@Configuration
 	@EnableLoadTimeWeaving(aspectjWeaving=AspectJWeaving.ENABLED)
 	static class EnableLTWConfig_withAjWeavingEnabled implements LoadTimeWeavingConfigurer {
+		@Override
 		public LoadTimeWeaver getLoadTimeWeaver() {
 			LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class);
 			mockLTW.addTransformer(isA(ClassFileTransformer.class));
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java b/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java
index 4546a22de0..a52d8cc504 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java
@@ -31,6 +31,7 @@ public class FooServiceDependentConverter implements Converter<String, org.sprin
 		this.fooService = fooService;
 	}
 
+	@Override
 	public org.springframework.beans.TestBean convert(String source) {
 		return new org.springframework.beans.TestBean(source);
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java
index 964348e48f..1983404903 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java
@@ -124,6 +124,7 @@ public class ImportAwareTests {
 
 		AnnotationMetadata importMetadata;
 
+		@Override
 		public void setImportMetadata(AnnotationMetadata importMetadata) {
 			this.importMetadata = importMetadata;
 		}
@@ -142,14 +143,17 @@ public class ImportAwareTests {
 
 	static class BPP implements BeanFactoryAware, BeanPostProcessor {
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 			return bean;
 		}
 
+		@Override
 		public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		}
 	}
@@ -175,6 +179,7 @@ public class ImportAwareTests {
 
 		static boolean called;
 
+		@Override
 		public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata,
 				BeanDefinitionRegistry registry) {
 			BeanDefinition beanDefinition = new GenericBeanDefinition();
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 be69b30cdc..6f55b1f669 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
@@ -75,18 +75,22 @@ public class ImportBeanDefinitionRegistrarTests {
 		static ResourceLoader resourceLoader;
 		static BeanFactory beanFactory;
 
+		@Override
 		public void setBeanClassLoader(ClassLoader classLoader) {
 			SampleRegistrar.classLoader = classLoader;
 		}
 
+		@Override
 		public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 			SampleRegistrar.beanFactory = beanFactory;
 		}
 
+		@Override
 		public void setResourceLoader(ResourceLoader resourceLoader) {
 			SampleRegistrar.resourceLoader = resourceLoader;
 		}
 
+		@Override
 		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 fd0adecba0..6c8540be51 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
@@ -132,6 +132,7 @@ public class NestedConfigurationClassTests {
 
 	@Configuration
 	static class S1Config extends L0Config {
+		@Override
 		@Bean
 		public TestBean overrideBean() {
 			return new TestBean("override-s1");
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
index 437d3bb211..e661727c40 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
@@ -209,10 +209,12 @@ public class Spr3775InitDestroyLifecycleTests {
 	public static class CustomInitializingDisposableBean extends CustomInitDestroyBean
 			implements InitializingBean, DisposableBean {
 
+		@Override
 		public void afterPropertiesSet() throws Exception {
 			this.initMethods.add("afterPropertiesSet");
 		}
 
+		@Override
 		public void destroy() throws Exception {
 			this.destroyMethods.add("destroy");
 		}
@@ -254,11 +256,13 @@ public class Spr3775InitDestroyLifecycleTests {
 		final List<String> initMethods = new ArrayList<String>();
 		final List<String> destroyMethods = new ArrayList<String>();
 
+		@Override
 		@PostConstruct
 		public void afterPropertiesSet() throws Exception {
 			this.initMethods.add("afterPropertiesSet");
 		}
 
+		@Override
 		@PreDestroy
 		public void destroy() throws Exception {
 			this.destroyMethods.add("destroy");
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java
index 50453f6b5d..68dd81c5af 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java
@@ -85,14 +85,17 @@ public class Spr6602Tests {
 
 	public static class BarFactory implements FactoryBean<Bar> {
 
+		@Override
 		public Bar getObject() throws Exception {
 			return new Bar();
 		}
 
+		@Override
 		public Class<? extends Bar> getObjectType() {
 			return Bar.class;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return true;
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java b/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java
index 1f77d726b9..6bed19ab6e 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java
@@ -24,6 +24,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
  */
 public class TestBeanNameGenerator extends AnnotationBeanNameGenerator {
 
+	@Override
 	public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
 		String beanName = super.generateBeanName(definition, registry);
 		return "testing." + beanName;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java b/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java
index 5471d438af..eef18312ba 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java
@@ -23,6 +23,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
  */
 public class TestScopeMetadataResolver implements ScopeMetadataResolver {
 
+	@Override
 	public ScopeMetadata resolveScopeMetadata(BeanDefinition beanDefinition) {
 		ScopeMetadata metadata = new ScopeMetadata();
 		metadata.setScopeName("myCustomScope");
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationBeanNameTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationBeanNameTests.java
index 445397c384..39c2654d0b 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationBeanNameTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationBeanNameTests.java
@@ -65,6 +65,7 @@ public class ConfigurationBeanNameTests {
 	public void registerOuterConfig_withBeanNameGenerator() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.setBeanNameGenerator(new AnnotationBeanNameGenerator() {
+			@Override
 			public String generateBeanName(
 					BeanDefinition definition, BeanDefinitionRegistry registry) {
 				return "custom-" + super.generateBeanName(definition, registry);
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java
index 1d21211ad7..d198b49180 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java
@@ -70,6 +70,7 @@ public class ConfigurationClassCglibCallbackDeregistrationTests {
 	@Configuration
 	static class DisposableConfig implements DisposableBean {
 		boolean destroyed = false;
+		@Override
 		public void destroy() throws Exception {
 			this.destroyed = true;
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
index 8073f92b83..6e8f7c649c 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
@@ -284,12 +284,14 @@ public class ConfigurationClassProcessingTests {
 				public void setNameSuffix(String nameSuffix) {
 					this.nameSuffix = nameSuffix;
 				}
+				@Override
 				public Object postProcessBeforeInitialization(Object bean, String beanName) {
 					if (bean instanceof ITestBean) {
 						((ITestBean) bean).setName(((ITestBean) bean).getName() + nameSuffix);
 					}
 					return bean;
 				}
+				@Override
 				public Object postProcessAfterInitialization(Object bean, String beanName) {
 					return bean;
 				}
@@ -302,6 +304,7 @@ public class ConfigurationClassProcessingTests {
 		//@Bean
 		public BeanFactoryPostProcessor beanFactoryPostProcessor() {
 			return new BeanFactoryPostProcessor() {
+				@Override
 				public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
 					BeanDefinition bd = beanFactory.getBeanDefinition("beanPostProcessor");
 					bd.getPropertyValues().addPropertyValue("nameSuffix", "-processed-" + myProp);
@@ -334,6 +337,7 @@ public class ConfigurationClassProcessingTests {
 			super.setSpouse(spouse);
 		}
 
+		@Override
 		public void onApplicationEvent(ContextRefreshedEvent event) {
 			this.refreshed = true;
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
index b0d617e9cf..6be61e22c5 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
@@ -379,6 +379,7 @@ public class ScopingTests {
 
 		private Map<String, Object> beans = new HashMap<String, Object>();
 
+		@Override
 		public Object get(String name, ObjectFactory<?> objectFactory) {
 			if (createNewScope) {
 				beans.clear();
@@ -396,18 +397,22 @@ public class ScopingTests {
 			return beans.get(name);
 		}
 
+		@Override
 		public String getConversationId() {
 			return null;
 		}
 
+		@Override
 		public void registerDestructionCallback(String name, Runnable callback) {
 			// do nothing
 		}
 
+		@Override
 		public Object remove(String name) {
 			return beans.remove(name);
 		}
 
+		@Override
 		public Object resolveContextualObject(String key) {
 			return null;
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java
index 9c8f240003..910e71b9c9 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java
@@ -67,6 +67,7 @@ class MyPostProcessor implements BeanFactoryPostProcessor {
 	public MyPostProcessor(Dependency someDependency) {
 	}
 
+	@Override
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 		AbstractBeanDefinition bd = (AbstractBeanDefinition) beanFactory.getBeanDefinition("someDependency");
 		bd.setDescription("post processed by MyPostProcessor");
diff --git a/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java
index 64f491bd4e..1363f45d89 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java
@@ -28,6 +28,7 @@ import example.scannable.FooDao;
 @Qualifier("testing")
 public class StubFooDao implements FooDao {
 
+	@Override
 	public String findFoo(int id) {
 		return "bar";
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java
index 67f0760177..6e1461dd36 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java
@@ -24,6 +24,7 @@ import example.scannable.FooDao;
 @MyRepository
 public class OtherFooDao implements FooDao {
 
+	@Override
 	public String findFoo(int id) {
 		return "other";
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java b/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java
index 5248cb2644..654ffa9153 100644
--- a/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java
+++ b/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java
@@ -23,6 +23,7 @@ import org.springframework.core.convert.converter.Converter;
  */
 public class StringToBarConverter implements Converter<String, Bar> {
 
+	@Override
 	public Bar convert(String source) {
 		return new Bar(source);
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
index 24dec9ad54..1811a78938 100644
--- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
@@ -214,10 +214,12 @@ public class ApplicationContextEventTests {
 
 		public final Set<ApplicationEvent> seenEvents = new HashSet<ApplicationEvent>();
 
+		@Override
 		public void onApplicationEvent(ApplicationEvent event) {
 			this.seenEvents.add(event);
 		}
 
+		@Override
 		public int getOrder() {
 			return 0;
 		}
@@ -230,6 +232,7 @@ public class ApplicationContextEventTests {
 
 	public static abstract class MyOrderedListenerBase implements MyOrderedListenerIfc<MyEvent> {
 
+		@Override
 		public int getOrder() {
 			return 1;
 		}
@@ -244,6 +247,7 @@ public class ApplicationContextEventTests {
 			this.otherListener = otherListener;
 		}
 
+		@Override
 		public void onApplicationEvent(MyEvent event) {
 			assertTrue(otherListener.seenEvents.contains(event));
 		}
@@ -254,6 +258,7 @@ public class ApplicationContextEventTests {
 
 		public static final Set<ApplicationEvent> seenEvents = new HashSet<ApplicationEvent>();
 
+		@Override
 		public void onApplicationEvent(ApplicationEvent event) {
 			seenEvents.add(event);
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
index 4e1f90468c..3cf6771099 100644
--- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
@@ -90,6 +90,7 @@ public class EventPublicationInterceptorTests {
 		final TestListener listener = new TestListener();
 
 		class TestContext extends StaticApplicationContext {
+			@Override
 			protected void onRefresh() throws BeansException {
 				addListener(listener);
 			}
@@ -140,14 +141,17 @@ public class EventPublicationInterceptorTests {
 
 	public static class FactoryBeanTestListener extends TestListener implements FactoryBean<Object> {
 
+		@Override
 		public Object getObject() throws Exception {
 			return "test";
 		}
 
+		@Override
 		public Class<String> getObjectType() {
 			return String.class;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return true;
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
index b1bbb815ac..c6f95b24bb 100644
--- a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
@@ -71,6 +71,7 @@ public class LifecycleEventTests extends TestCase {
 
 		private int stoppedCount;
 
+		@Override
 		public void onApplicationEvent(ApplicationEvent event) {
 			if (event instanceof ContextStartedEvent) {
 				this.context = ((ContextStartedEvent) event).getApplicationContext();
@@ -100,14 +101,17 @@ public class LifecycleEventTests extends TestCase {
 
 		private boolean running;
 
+		@Override
 		public boolean isRunning() {
 			return this.running;
 		}
 
+		@Override
 		public void start() {
 			this.running = true;
 		}
 
+		@Override
 		public void stop() {
 			this.running = false;
 		}
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 cfd70979e9..16eccd8d33 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
@@ -57,14 +57,18 @@ public class ApplicationContextExpressionTests {
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(ac);
 
 		ac.getBeanFactory().registerScope("myScope", new Scope() {
+			@Override
 			public Object get(String name, ObjectFactory<?> objectFactory) {
 				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) {
 				if (key.equals("mySpecialAttr")) {
 					return "42";
@@ -73,6 +77,7 @@ public class ApplicationContextExpressionTests {
 					return null;
 				}
 			}
+			@Override
 			public String getConversationId() {
 				return null;
 			}
diff --git a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
index 2e36dde141..94d465bcda 100644
--- a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
@@ -104,6 +104,7 @@ public class BeanFactoryPostProcessorTests {
 
 		public boolean wasCalled = false;
 
+		@Override
 		public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
 			wasCalled = true;
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
index 68ddae1f8c..903ff41532 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
@@ -320,6 +320,7 @@ public final class ClassPathXmlApplicationContextTests {
 	@Test
 	public void testResourceAndInputStream() throws IOException {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(RESOURCE_CONTEXT) {
+			@Override
 			public Resource getResource(String location) {
 				if (TEST_PROPERTIES.equals(location)) {
 					return new ClassPathResource(TEST_PROPERTIES, ClassPathXmlApplicationContextTests.class);
diff --git a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
index 34588e19a7..9ee0025433 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
@@ -54,14 +54,17 @@ public class ConversionServiceFactoryBeanTests {
 		ConversionServiceFactoryBean factory = new ConversionServiceFactoryBean();
 		Set<Object> converters = new HashSet<Object>();
 		converters.add(new Converter<String, Foo>() {
+			@Override
 			public Foo convert(String source) {
 				return new Foo();
 			}
 		});
 		converters.add(new ConverterFactory<String, Bar>() {
+			@Override
 			public <T extends Bar> Converter<String, T> getConverter(Class<T> targetType) {
 				return new Converter<String, T> () {
 					@SuppressWarnings("unchecked")
+					@Override
 					public T convert(String source) {
 						return (T) new Bar();
 					}
@@ -69,9 +72,11 @@ public class ConversionServiceFactoryBeanTests {
 			}
 		});
 		converters.add(new GenericConverter() {
+			@Override
 			public Set<ConvertiblePair> getConvertibleTypes() {
 				return Collections.singleton(new ConvertiblePair(String.class, Baz.class));
 			}
+			@Override
 			public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 				return new Baz();
 			}
diff --git a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
index a561e2cbf3..cc345c79e0 100644
--- a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
@@ -585,10 +585,12 @@ public class DefaultLifecycleProcessorTests {
 			this.stoppedBeans = stoppedBeans;
 		}
 
+		@Override
 		public boolean isRunning() {
 			return this.running;
 		}
 
+		@Override
 		public void start() {
 			if (this.startedBeans != null) {
 				this.startedBeans.add(this);
@@ -596,6 +598,7 @@ public class DefaultLifecycleProcessorTests {
 			this.running = true;
 		}
 
+		@Override
 		public void stop() {
 			if (this.stoppedBeans != null) {
 				this.stoppedBeans.add(this);
@@ -627,10 +630,12 @@ public class DefaultLifecycleProcessorTests {
 			this.shutdownDelay = shutdownDelay;
 		}
 
+		@Override
 		public int getPhase() {
 			return this.phase;
 		}
 
+		@Override
 		public boolean isAutoStartup() {
 			return this.autoStartup;
 		}
@@ -639,12 +644,14 @@ public class DefaultLifecycleProcessorTests {
 			this.autoStartup = autoStartup;
 		}
 
+		@Override
 		public void stop(final Runnable callback) {
 			// calling stop() before the delay to preserve
 			// invocation order in the 'stoppedBeans' list
 			stop();
 			final int delay = this.shutdownDelay;
 			new Thread(new Runnable() {
+				@Override
 				public void run() {
 					try {
 						Thread.sleep(delay);
@@ -665,27 +672,33 @@ public class DefaultLifecycleProcessorTests {
 
 		public boolean running = false;
 
+		@Override
 		public boolean isAutoStartup() {
 			return true;
 		}
 
+		@Override
 		public void stop(Runnable callback) {
 			this.running = false;
 			callback.run();
 		}
 
+		@Override
 		public void start() {
 			this.running = true;
 		}
 
+		@Override
 		public void stop() {
 			this.running = false;
 		}
 
+		@Override
 		public boolean isRunning() {
 			return this.running;
 		}
 
+		@Override
 		public int getPhase() {
 			return 0;
 		}
@@ -698,39 +711,48 @@ public class DefaultLifecycleProcessorTests {
 
 		DummySmartLifecycleBean bean = new DummySmartLifecycleBean();
 
+		@Override
 		public Object getObject() throws Exception {
 			return this.bean;
 		}
 
+		@Override
 		public Class<?> getObjectType() {
 			return DummySmartLifecycleBean.class;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return true;
 		}
 
+		@Override
 		public boolean isAutoStartup() {
 			return true;
 		}
 
+		@Override
 		public void stop(Runnable callback) {
 			this.running = false;
 			callback.run();
 		}
 
+		@Override
 		public void start() {
 			this.running = true;
 		}
 
+		@Override
 		public void stop() {
 			this.running = false;
 		}
 
+		@Override
 		public boolean isRunning() {
 			return this.running;
 		}
 
+		@Override
 		public int getPhase() {
 			return 0;
 		}
diff --git a/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java b/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java
index a545e69e68..cd68925cc9 100644
--- a/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java
+++ b/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java
@@ -10,18 +10,22 @@ import org.springframework.context.ApplicationListener;
  */
 public class FactoryBeanAndApplicationListener implements FactoryBean<String>, ApplicationListener<ApplicationEvent> {
 
+	@Override
 	public String getObject() throws Exception {
 		return "";
 	}
 
+	@Override
 	public Class<String> getObjectType() {
 		return String.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
 
+	@Override
 	public void onApplicationEvent(ApplicationEvent event) {
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java b/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java
index 44dcf38bd6..24e94a154b 100644
--- a/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java
+++ b/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java
@@ -43,15 +43,18 @@ public class LifecycleTestBean implements Lifecycle {
 		return stopOrder;
 	}
 
+	@Override
 	public boolean isRunning() {
 		return this.running;
 	}
 
+	@Override
 	public void start() {
 		this.startOrder = ++startCounter;
 		this.running = true;
 	}
 
+	@Override
 	public void stop() {
 		this.stopOrder = ++stopCounter;
 		this.running = false;
diff --git a/spring-context/src/test/java/org/springframework/context/support/Logic.java b/spring-context/src/test/java/org/springframework/context/support/Logic.java
index 325ebc10a4..71d169120e 100644
--- a/spring-context/src/test/java/org/springframework/context/support/Logic.java
+++ b/spring-context/src/test/java/org/springframework/context/support/Logic.java
@@ -34,6 +34,7 @@ public class Logic implements BeanNameAware {
 	/* (non-Javadoc)
 	 * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String)
 	 */
+	@Override
 	public void setBeanName(String name) {
 		this.name = name;
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java b/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java
index f5834e8e6f..91ff6bd022 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java
@@ -25,6 +25,7 @@ import org.springframework.core.io.Resource;
  */
 public class ResourceConverter implements Converter<String, Resource> {
 
+	@Override
 	public Resource convert(String source) {
 		return new FileSystemResource(source + ".xml");
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/support/Service.java b/spring-context/src/test/java/org/springframework/context/support/Service.java
index 8778978bd8..a0be957e75 100644
--- a/spring-context/src/test/java/org/springframework/context/support/Service.java
+++ b/spring-context/src/test/java/org/springframework/context/support/Service.java
@@ -40,10 +40,12 @@ public class Service implements ApplicationContextAware, MessageSourceAware, Dis
 	private boolean properlyDestroyed = false;
 
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 	}
 
+	@Override
 	public void setMessageSource(MessageSource messageSource) {
 		if (this.messageSource != null) {
 			throw new IllegalArgumentException("MessageSource should not be set twice");
@@ -64,9 +66,11 @@ public class Service implements ApplicationContextAware, MessageSourceAware, Dis
 	}
 
 
+	@Override
 	public void destroy() {
 		this.properlyDestroyed = true;
 		Thread thread = new Thread() {
+			@Override
 			public void run() {
 				Assert.isTrue(applicationContext.getBean("messageSource") instanceof StaticMessageSource);
 				try {
diff --git a/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java b/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java
index 01d95795fa..42d89e9254 100644
--- a/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java
+++ b/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java
@@ -49,11 +49,13 @@ public class SimpleThreadScopeTest {
 	public void getMultipleInstances() throws Exception {
 		final TestBean[] beans = new TestBean[2];
 		Thread thread1 = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				beans[0] = applicationContext.getBean("threadScopedObject", TestBean.class);
 			}
 		});
 		Thread thread2 = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				beans[1] = applicationContext.getBean("threadScopedObject", TestBean.class);
 			}
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
index 9ac7433589..fc211895ac 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
@@ -43,6 +43,7 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio
 	protected StaticApplicationContext sac;
 
 	/** Run for each test */
+	@Override
 	protected ConfigurableApplicationContext createContext() throws Exception {
 		StaticApplicationContext parent = new StaticApplicationContext();
 		Map<String, String> m = new HashMap<String, String>();
@@ -73,10 +74,12 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio
 	}
 
 	/** Overridden */
+	@Override
 	public void testCount() {
 		assertCount(15);
 	}
 
+	@Override
 	public void testEvents() throws Exception {
 		TestApplicationEventMulticaster.counter = 0;
 		super.testEvents();
@@ -88,6 +91,7 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio
 
 		private static int counter = 0;
 
+		@Override
 		public void multicastEvent(ApplicationEvent event) {
 			super.multicastEvent(event);
 			counter++;
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
index 2dba7fc9ea..b6f936dd1a 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
@@ -39,6 +39,7 @@ public class StaticApplicationContextTests extends AbstractApplicationContextTes
 	protected StaticApplicationContext sac;
 
 	/** Run for each test */
+	@Override
 	protected ConfigurableApplicationContext createContext() throws Exception {
 		StaticApplicationContext parent = new StaticApplicationContext();
 		Map<String, String> m = new HashMap<String, String>();
@@ -66,6 +67,7 @@ public class StaticApplicationContextTests extends AbstractApplicationContextTes
 	}
 
 	/** Overridden */
+	@Override
 	public void testCount() {
 		assertCount(15);
 	}
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
index 73d0cab651..8469cbd64f 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
@@ -49,11 +49,13 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests {
 	protected StaticApplicationContext sac;
 
 	/** Overridden */
+	@Override
 	public void testCount() {
 		// These are only checked for current Ctx (not parent ctx)
 		assertCount(15);
 	}
 
+	@Override
 	public void testMessageSource() throws NoSuchMessageException {
 		// Do nothing here since super is looking for errorCodes we
 		// do NOT have in the Context
@@ -195,6 +197,7 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests {
 	}
 
 	/** Run for each test */
+	@Override
 	protected ConfigurableApplicationContext createContext() throws Exception {
 		StaticApplicationContext parent = new StaticApplicationContext();
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java b/spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java
index 0fa4b0e392..f51d024715 100644
--- a/spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java
+++ b/spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java
@@ -28,6 +28,7 @@ public class TestProxyFactoryBean extends AbstractSingletonProxyFactoryBean impl
 		return new NoOpAdvice();
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java b/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java
index acec31ff7c..701f7518ee 100644
--- a/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java
+++ b/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java
@@ -23,6 +23,7 @@ package org.springframework.core.task;
  */
 public class NoOpRunnable implements Runnable {
 
+	@Override
 	public void run() {
 		// explicit no-op
 		System.out.println("Running");
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
index bcfc34c71b..3dc63f5cde 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
@@ -57,6 +57,7 @@ public class LocalSlsbInvokerInterceptorTests {
 		final NamingException nex = new NamingException();
 		final String jndiName= "foobar";
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			public Object lookup(String name) throws NamingException {
 				assertTrue(jndiName.equals(name));
 				throw nex;
@@ -174,6 +175,7 @@ public class LocalSlsbInvokerInterceptorTests {
 
 		LocalSlsbInvokerInterceptor si = new LocalSlsbInvokerInterceptor();
 		si.setJndiTemplate(new JndiTemplate() {
+			@Override
 			protected Context createInitialContext() throws NamingException {
 				return mockCtx;
 			}
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
index c2c9e07aaa..b053e3e038 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
@@ -52,6 +52,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		replay(home);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			public Object lookup(String name) throws NamingException {
 				// parameterize
 				assertTrue(name.equals("java:comp/env/" + jndiName));
@@ -85,6 +86,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		replay(myEjb);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			public Object lookup(String name) throws NamingException {
 				// parameterize
 				assertTrue(name.equals("java:comp/env/" + jndiName));
@@ -117,6 +119,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		replay(home);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			public Object lookup(String name) throws NamingException {
 				// parameterize
 				assertTrue(name.equals(jndiName));
@@ -158,6 +161,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		replay(home);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			public Object lookup(String name) throws NamingException {
 				// parameterize
 				assertTrue(name.equals("java:comp/env/" + jndiName));
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
index a48935c47c..cbf75b1831 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
@@ -63,6 +63,7 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 
 		SimpleRemoteSlsbInvokerInterceptor si = createInterceptor();
 		si.setJndiTemplate(new JndiTemplate() {
+			@Override
 			protected Context createInitialContext() {
 				return mockCtx;
 			}
@@ -121,6 +122,7 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 		final NamingException nex = new NamingException();
 		final String jndiName = "foobar";
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			public Object lookup(String name) throws NamingException {
 				assertTrue(jndiName.equals(name));
 				throw nex;
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
index 396d347b17..dca93a798e 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
@@ -38,10 +38,12 @@ import org.springframework.remoting.RemoteAccessException;
  */
 public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRemoteSlsbInvokerInterceptorTests {
 
+	@Override
 	protected SimpleRemoteSlsbInvokerInterceptor createInterceptor() {
 		return new SimpleRemoteStatelessSessionProxyFactoryBean();
 	}
 
+	@Override
 	protected Object configuredProxy(SimpleRemoteSlsbInvokerInterceptor si, Class<?> ifc) throws NamingException {
 		SimpleRemoteStatelessSessionProxyFactoryBean fb = (SimpleRemoteStatelessSessionProxyFactoryBean) si;
 		fb.setBusinessInterface(ifc);
@@ -64,6 +66,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		replay(home);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			public Object lookup(String name) {
 				// parameterize
 				assertTrue(name.equals("java:comp/env/" + jndiName));
@@ -97,6 +100,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		replay(myEjb);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			public Object lookup(String name) {
 				// parameterize
 				assertTrue(name.equals("java:comp/env/" + jndiName));
@@ -119,6 +123,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		verify(myEjb);
 	}
 
+	@Override
 	@Test
 	public void testRemoteException() throws Exception {
 		final RemoteException rex = new RemoteException();
@@ -136,6 +141,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		replay(home);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			public Object lookup(String name) {
 				// parameterize
 				assertTrue(name.equals("java:comp/env/" + jndiName));
@@ -175,6 +181,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		replay(home);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			public Object lookup(String name) {
 				// parameterize
 				assertTrue(name.equals(jndiName));
@@ -216,6 +223,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		replay(home);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			public Object lookup(String name) {
 				// parameterize
 				assertTrue(name.equals(jndiName));
@@ -257,6 +265,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		replay(home);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			public Object lookup(String name) throws NamingException {
 				// parameterize
 				assertTrue(name.equals(jndiName));
diff --git a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
index 9d60580e5d..556d5a78bd 100644
--- a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
+++ b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
@@ -48,6 +48,7 @@ public class NumberFormattingTests {
 	public void setUp() {
 		DefaultConversionService.addDefaultConverters(conversionService);
 		conversionService.setEmbeddedValueResolver(new StringValueResolver() {
+			@Override
 			public String resolveStringValue(String strVal) {
 				if ("${pattern}".equals(strVal)) {
 					return "#,##.00";
diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
index a5c07dbe80..d501dafa40 100644
--- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
@@ -149,10 +149,12 @@ public class FormattingConversionServiceFactoryBeanTests {
 
 	private static class TestBeanFormatter implements Formatter<TestBean> {
 
+		@Override
 		public String print(TestBean object, Locale locale) {
 			return String.valueOf(object.getSpecialInt());
 		}
 
+		@Override
 		public TestBean parse(String text, Locale locale) throws ParseException {
 			TestBean object = new TestBean();
 			object.setSpecialInt(Integer.parseInt(text));
@@ -169,20 +171,25 @@ public class FormattingConversionServiceFactoryBeanTests {
 			fieldTypes.add(Integer.class);
 		}
 
+		@Override
 		public Set<Class<?>> getFieldTypes() {
 			return fieldTypes;
 		}
 
+		@Override
 		public Printer<?> getPrinter(SpecialInt annotation, Class<?> fieldType) {
 			return new Printer<Integer>() {
+				@Override
 				public String print(Integer object, Locale locale) {
 					return ":" + object.toString();
 				}
 			};
 		}
 
+		@Override
 		public Parser<?> getParser(SpecialInt annotation, Class<?> fieldType) {
 			return new Parser<Integer>() {
+				@Override
 				public Integer parse(String text, Locale locale) throws ParseException {
 					return Integer.parseInt(text.substring(1));
 				}
@@ -192,6 +199,7 @@ public class FormattingConversionServiceFactoryBeanTests {
 
 	private static class TestFormatterRegistrar implements FormatterRegistrar {
 
+		@Override
 		public void registerFormatters(FormatterRegistry registry) {
 			registry.addFormatter(new TestBeanFormatter());
 		}
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 c620be5b74..6fcefd9d75 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
@@ -86,6 +86,7 @@ public class FormattingConversionServiceTests {
 	@Test
 	public void testFormatFieldForTypeWithPrinterParserWithCoercion() throws ParseException {
 		formattingService.addConverter(new Converter<DateTime, LocalDate>() {
+			@Override
 			public LocalDate convert(DateTime source) {
 				return source.toLocalDate();
 			}
@@ -170,11 +171,13 @@ public class FormattingConversionServiceTests {
 	@SuppressWarnings("unchecked")
 	private void doTestFormatFieldForAnnotation(Class<?> modelClass, boolean directFieldAccess) throws Exception {
 		formattingService.addConverter(new Converter<Date, Long>() {
+			@Override
 			public Long convert(Date source) {
 				return source.getTime();
 			}
 		});
 		formattingService.addConverter(new Converter<DateTime, Date>() {
+			@Override
 			public Date convert(DateTime source) {
 				return source.toDate();
 			}
@@ -277,17 +280,20 @@ public class FormattingConversionServiceTests {
 	@Test
 	public void testFormatFieldForAnnotationWithSubclassAsFieldType() throws Exception {
 		formattingService.addFormatterForFieldAnnotation(new JodaDateTimeFormatAnnotationFormatterFactory() {
+			@Override
 			public Printer<?> getPrinter(org.springframework.format.annotation.DateTimeFormat annotation, Class<?> fieldType) {
 				assertEquals(MyDate.class, fieldType);
 				return super.getPrinter(annotation, fieldType);
 			}
 		});
 		formattingService.addConverter(new Converter<MyDate, Long>() {
+			@Override
 			public Long convert(MyDate source) {
 				return source.getTime();
 			}
 		});
 		formattingService.addConverter(new Converter<MyDate, Date>() {
+			@Override
 			public Date convert(MyDate source) {
 				return source;
 			}
@@ -364,10 +370,12 @@ public class FormattingConversionServiceTests {
 
 	public static class NullReturningFormatter implements Formatter<Integer> {
 
+		@Override
 		public String print(Integer object, Locale locale) {
 			return null;
 		}
 
+		@Override
 		public Integer parse(String text, Locale locale) throws ParseException {
 			return null;
 		}
diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java
index 09644b02c0..8abddb5ea3 100644
--- a/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java
+++ b/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java
@@ -46,6 +46,7 @@ public final class ReflectiveLoadTimeWeaverTests {
 		JustAddTransformerClassLoader classLoader = new JustAddTransformerClassLoader();
 		ReflectiveLoadTimeWeaver weaver = new ReflectiveLoadTimeWeaver(classLoader);
 		weaver.addTransformer(new ClassFileTransformer() {
+			@Override
 			public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) {
 				return "CAFEDEAD".getBytes();
 			}
@@ -97,6 +98,7 @@ public final class ReflectiveLoadTimeWeaverTests {
 		private int numTimesGetThrowawayClassLoaderCalled = 0;
 
 
+		@Override
 		public int getNumTimesGetThrowawayClassLoaderCalled() {
 			return this.numTimesGetThrowawayClassLoaderCalled;
 		}
diff --git a/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java b/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java
index bb94cbe364..3f3580b37d 100644
--- a/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java
@@ -31,10 +31,12 @@ public abstract class AbstractJmxTests extends AbstractMBeanServerTests {
 	private ConfigurableApplicationContext ctx;
 
 
+	@Override
 	protected final void onSetUp() throws Exception {
 		ctx = loadContext(getApplicationContextPath());
 	}
 
+	@Override
 	protected final void onTearDown() throws Exception {
 		if (ctx != null) {
 			ctx.close();
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 c40b734119..06122a2a02 100644
--- a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java
@@ -45,6 +45,7 @@ public abstract class AbstractMBeanServerTests extends TestCase {
 
 	protected MBeanServer server;
 
+	@Override
 	public final void setUp() throws Exception {
 		this.server = MBeanServerFactory.createMBeanServer();
 		try {
@@ -63,6 +64,7 @@ public abstract class AbstractMBeanServerTests extends TestCase {
 		return ctx;
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		releaseServer();
 		onTearDown();
diff --git a/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java b/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java
index e73f6106c7..5268a8d653 100644
--- a/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java
@@ -43,10 +43,12 @@ public class JmxTestBean implements IJmxTestBean {
 	 * @@org.springframework.jmx.export.metadata.ManagedAttribute
 	 *   (description="The Age Attribute", currencyTimeLimit=15)
 	 */
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -54,6 +56,7 @@ public class JmxTestBean implements IJmxTestBean {
 	/**
 	 * @@org.springframework.jmx.export.metadata.ManagedOperation(currencyTimeLimit=30)
 	 */
+	@Override
 	public long myOperation() {
 		return 1L;
 	}
@@ -63,6 +66,7 @@ public class JmxTestBean implements IJmxTestBean {
 	 *  (description="The Name Attribute",  currencyTimeLimit=20,
 	 *   defaultValue="bar", persistPolicy="OnUpdate")
 	 */
+	@Override
 	public void setName(String name) throws Exception {
 		if ("Juergen".equals(name)) {
 			throw new IllegalArgumentException("Juergen");
@@ -80,6 +84,7 @@ public class JmxTestBean implements IJmxTestBean {
 	 * @@org.springframework.jmx.export.metadata.ManagedAttribute
 	 *   (defaultValue="foo", persistPeriod=300)
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -117,6 +122,7 @@ public class JmxTestBean implements IJmxTestBean {
 	 * @@org.springframework.jmx.export.metadata.ManagedOperationParameter(index=0, name="x", description="Left operand")
 	 * @@org.springframework.jmx.export.metadata.ManagedOperationParameter(index=1, name="y", description="Right operand")
 	 */
+	@Override
 	public int add(int x, int y) {
 		return x + y;
 	}
@@ -124,6 +130,7 @@ public class JmxTestBean implements IJmxTestBean {
 	/**
 	 * Test method that is not exposed by the MetadataAssembler.
 	 */
+	@Override
 	public void dontExposeMe() {
 		throw new RuntimeException();
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
index a6af50e132..29d2c04037 100644
--- a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
@@ -50,6 +50,7 @@ public class MBeanClientInterceptorTests extends AbstractMBeanServerTests {
 
 	protected boolean runTests = true;
 
+	@Override
 	public void onSetUp() throws Exception {
 		target = new JmxTestBean();
 		target.setAge(100);
@@ -277,10 +278,12 @@ public class MBeanClientInterceptorTests extends AbstractMBeanServerTests {
 
 	private static class ProxyTestAssembler extends AbstractReflectiveMBeanInfoAssembler {
 
+		@Override
 		protected boolean includeReadAttribute(Method method, String beanKey) {
 			return true;
 		}
 
+		@Override
 		protected boolean includeWriteAttribute(Method method, String beanKey) {
 			if ("setAge".equals(method.getName())) {
 				return false;
@@ -288,6 +291,7 @@ public class MBeanClientInterceptorTests extends AbstractMBeanServerTests {
 			return true;
 		}
 
+		@Override
 		protected boolean includeOperation(Method method, String beanKey) {
 			if ("dontExposeMe".equals(method.getName())) {
 				return false;
diff --git a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java
index 77aefe6167..b33a5793aa 100644
--- a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java
+++ b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java
@@ -46,6 +46,7 @@ public class RemoteMBeanClientInterceptorTestsIgnore extends MBeanClientIntercep
 
 	private JMXConnector connector;
 
+	@Override
 	public void onSetUp() throws Exception {
 		super.onSetUp();
 		this.connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(getServiceUrl(), null, getServer());
@@ -61,11 +62,13 @@ public class RemoteMBeanClientInterceptorTestsIgnore extends MBeanClientIntercep
 		return new JMXServiceURL(SERVICE_URL);
 	}
 
+	@Override
 	protected MBeanServerConnection getServerConnection() throws Exception {
 		this.connector = JMXConnectorFactory.connect(getServiceUrl());
 		return this.connector.getMBeanServerConnection();
 	}
 
+	@Override
 	public void tearDown() throws Exception {
 		if (this.connector != null) {
 			this.connector.close();
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java
index d9aba5b4c0..67c8adc64b 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java
@@ -31,6 +31,7 @@ public class CustomEditorConfigurerTests extends AbstractJmxTests {
 
 	private final SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd");
 
+	@Override
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/customConfigurer.xml";
 	}
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 d95c6b4f28..716fccfc7c 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
@@ -67,6 +67,7 @@ public class MBeanExporterOperationsTests extends AbstractMBeanServerTests {
 		MBeanExporter exporter = new MBeanExporter();
 		exporter.setServer(getServer());
 		exporter.setNamingStrategy(new ObjectNamingStrategy() {
+			@Override
 			public ObjectName getObjectName(Object managedBean, String beanKey) {
 				return objectNameTemplate;
 			}
@@ -92,6 +93,7 @@ public class MBeanExporterOperationsTests extends AbstractMBeanServerTests {
 		exporter.setServer(getServer());
 		exporter.setEnsureUniqueRuntimeObjectNames(false);
 		exporter.setNamingStrategy(new ObjectNamingStrategy() {
+			@Override
 			public ObjectName getObjectName(Object managedBean, String beanKey) {
 				return objectNameTemplate;
 			}
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 85865af76f..83011aec3b 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
@@ -98,6 +98,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests {
 	public void testRegisterNotificationListenerForNonExistentMBean() throws Exception {
 		Map listeners = new HashMap();
 		NotificationListener dummyListener = new NotificationListener() {
+			@Override
 			public void handleNotification(Notification notification, Object handback) {
 				throw new UnsupportedOperationException();
 			}
@@ -666,6 +667,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests {
 
 		private boolean invoked = false;
 
+		@Override
 		public ModelMBeanInfo getMBeanInfo(Object managedResource, String beanKey) throws JMException {
 			invoked = true;
 			return null;
@@ -678,10 +680,12 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests {
 
 		private List<ObjectName> unregistered = new ArrayList<ObjectName>();
 
+		@Override
 		public void mbeanRegistered(ObjectName objectName) {
 			registered.add(objectName);
 		}
 
+		@Override
 		public void mbeanUnregistered(ObjectName objectName) {
 			unregistered.add(objectName);
 		}
@@ -703,6 +707,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests {
 			this.objectName = objectName;
 		}
 
+		@Override
 		public ObjectName getObjectName() throws MalformedObjectNameException {
 			return this.objectName;
 		}
@@ -717,6 +722,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests {
 
 		private String name;
 
+		@Override
 		public String getName() {
 			return name;
 		}
@@ -730,6 +736,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests {
 
 		private List<Notification> notifications = new ArrayList<Notification>();
 
+		@Override
 		public void handleNotification(Notification notification, Object handback) {
 			this.notifications.add(notification);
 		}
@@ -756,6 +763,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests {
 			this.namedBean = namedBean;
 		}
 
+		@Override
 		public boolean includeBean(Class<?> beanClass, String beanName) {
 			return this.namedBean.equals(beanName);
 		}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
index 3ab938d95d..3eb6fe9baa 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
@@ -158,6 +158,7 @@ public class NotificationListenerTests extends AbstractMBeanServerTests {
 		NotificationListenerBean listenerBean = new NotificationListenerBean();
 		listenerBean.setNotificationListener(listener);
 		listenerBean.setNotificationFilter(new NotificationFilter() {
+			@Override
 			public boolean isNotificationEnabled(Notification notification) {
 				if (notification instanceof AttributeChangeNotification) {
 					AttributeChangeNotification changeNotification = (AttributeChangeNotification) notification;
@@ -434,6 +435,7 @@ public class NotificationListenerTests extends AbstractMBeanServerTests {
 
 		private Map attributeHandbacks = new HashMap();
 
+		@Override
 		public void handleNotification(Notification notification, Object handback) {
 			if (notification instanceof AttributeChangeNotification) {
 				AttributeChangeNotification attNotification = (AttributeChangeNotification) notification;
@@ -473,6 +475,7 @@ public class NotificationListenerTests extends AbstractMBeanServerTests {
 			this.objectName = objectName;
 		}
 
+		@Override
 		public ObjectName getObjectName() throws MalformedObjectNameException {
 			return this.objectName;
 		}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java
index 24d7f4b57d..ef79c481c6 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java
@@ -119,6 +119,7 @@ public class NotificationPublisherTests extends AbstractMBeanServerTests {
 
 		private Notification lastNotification;
 
+		@Override
 		public void handleNotification(Notification notification, Object handback) {
 			this.lastNotification = notification;
 			this.count++;
@@ -139,6 +140,7 @@ public class NotificationPublisherTests extends AbstractMBeanServerTests {
 
 		private NotificationPublisher notificationPublisher;
 
+		@Override
 		public void setNotificationPublisher(NotificationPublisher notificationPublisher) {
 			this.notificationPublisher = notificationPublisher;
 		}
@@ -158,28 +160,34 @@ public class NotificationPublisherTests extends AbstractMBeanServerTests {
 
 	public static class MyNotificationPublisherMBean extends NotificationBroadcasterSupport implements DynamicMBean {
 
+		@Override
 		public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException,
 				ReflectionException {
 			return null;
 		}
 
+		@Override
 		public void setAttribute(Attribute attribute) throws AttributeNotFoundException,
 				InvalidAttributeValueException, MBeanException, ReflectionException {
 		}
 
+		@Override
 		public AttributeList getAttributes(String[] attributes) {
 			return null;
 		}
 
+		@Override
 		public AttributeList setAttributes(AttributeList attributes) {
 			return null;
 		}
 
+		@Override
 		public Object invoke(String actionName, Object params[], String signature[]) throws MBeanException,
 				ReflectionException {
 			return null;
 		}
 
+		@Override
 		public MBeanInfo getMBeanInfo() {
 			return new MBeanInfo(MyNotificationPublisherMBean.class.getName(), "", new MBeanAttributeInfo[0],
 					new MBeanConstructorInfo[0], new MBeanOperationInfo[0], new MBeanNotificationInfo[0]);
@@ -192,6 +200,7 @@ public class NotificationPublisherTests extends AbstractMBeanServerTests {
 
 	public static class MyNotificationPublisherStandardMBean extends NotificationBroadcasterSupport implements MyMBean {
 
+		@Override
 		public void sendNotification() {
 			sendNotification(new Notification("test", this, 1));
 		}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java
index 96167d24ec..ba05256527 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java
@@ -26,6 +26,7 @@ import org.springframework.jmx.IJmxTestBean;
  */
 public class PropertyPlaceholderConfigurerTests extends AbstractJmxTests {
 
+	@Override
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/propertyPlaceholderConfigurer.xml";
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java b/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java
index a52d6a7e78..7ed0f6c7ec 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java
@@ -37,6 +37,7 @@ public class TestDynamicMBean implements DynamicMBean {
 		}
 	}
 
+	@Override
 	public Object getAttribute(String attribute) {
 		if ("Name".equals(attribute)) {
 			return "Rob Harrop";
@@ -44,21 +45,26 @@ public class TestDynamicMBean implements DynamicMBean {
 		return null;
 	}
 
+	@Override
 	public void setAttribute(Attribute attribute) {
 	}
 
+	@Override
 	public AttributeList getAttributes(String[] attributes) {
 		return null;
 	}
 
+	@Override
 	public AttributeList setAttributes(AttributeList attributes) {
 		return null;
 	}
 
+	@Override
 	public Object invoke(String actionName, Object[] params, String[] signature) {
 		return null;
 	}
 
+	@Override
 	public MBeanInfo getMBeanInfo() {
 		MBeanAttributeInfo attr = new MBeanAttributeInfo("name", "java.lang.String", "", true, false, false);
 		return new MBeanInfo(
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java
index 5f65e056f6..e75c9a7ad5 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java
@@ -48,18 +48,22 @@ public class AnnotationMetadataAssemblerTests extends AbstractMetadataAssemblerT
 		assertNotNull(op);
 	}
 
+	@Override
 	protected JmxAttributeSource getAttributeSource() {
 		return new AnnotationJmxAttributeSource();
 	}
 
+	@Override
 	protected String getObjectName() {
 		return OBJECT_NAME;
 	}
 
+	@Override
 	protected IJmxTestBean createJmxTestBean() {
 		return new AnnotationTestSubBean();
 	}
 
+	@Override
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/annotation/annotations.xml";
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java
index 97a3581954..4d751020b6 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java
@@ -40,20 +40,24 @@ public class AnnotationTestBean implements IJmxTestBean {
 	private boolean isSuperman;
 
 
+	@Override
 	@ManagedAttribute(description = "The Age Attribute", currencyTimeLimit = 15)
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
 
+	@Override
 	@ManagedOperation(currencyTimeLimit = 30)
 	public long myOperation() {
 		return 1L;
 	}
 
+	@Override
 	@ManagedAttribute(description = "The Name Attribute",
 			currencyTimeLimit = 20,
 			defaultValue = "bar",
@@ -62,6 +66,7 @@ public class AnnotationTestBean implements IJmxTestBean {
 		this.name = name;
 	}
 
+	@Override
 	@ManagedAttribute(defaultValue = "foo", persistPeriod = 300)
 	public String getName() {
 		return name;
@@ -85,6 +90,7 @@ public class AnnotationTestBean implements IJmxTestBean {
 		return isSuperman;
 	}
 
+	@Override
 	@org.springframework.jmx.export.annotation.ManagedOperation(description = "Add Two Numbers Together")
 	@ManagedOperationParameters({@ManagedOperationParameter(name="x", description="Left operand"),
 	@ManagedOperationParameter(name="y", description="Right operand")})
@@ -95,6 +101,7 @@ public class AnnotationTestBean implements IJmxTestBean {
 	/**
 	 * Test method that is not exposed by the MetadataAssembler.
 	 */
+	@Override
 	public void dontExposeMe() {
 		throw new RuntimeException();
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java
index 3e47e82bfd..2dc4fa087b 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java
@@ -30,14 +30,17 @@ public class AnnotationTestBeanFactory implements FactoryBean<FactoryCreatedAnno
 		this.instance.setName("FACTORY");
 	}
 
+	@Override
 	public FactoryCreatedAnnotationTestBean getObject() throws Exception {
 		return this.instance;
 	}
 
+	@Override
 	public Class<? extends IJmxTestBean> getObjectType() {
 		return FactoryCreatedAnnotationTestBean.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java
index 8bfbc77ac0..dc9f58375c 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java
@@ -38,17 +38,21 @@ public class AnnotationTestSubBean extends AnnotationTestBean implements IAnnota
 		return super.getAge();
 	}
 
+	@Override
 	public String getColour() {
 		return this.colour;
 	}
 
+	@Override
 	public void setColour(String colour) {
 		this.colour = colour;
 	}
 
+	@Override
 	public void fromInterface() {
 	}
 
+	@Override
 	public int getExpensiveToCalculate() {
 		return Integer.MAX_VALUE;
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java
index d409d1e8e2..675deb0ae3 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java
@@ -54,6 +54,7 @@ public class JmxUtilsAnnotationTests extends TestCase {
 
 	public static class FooNotX implements FooNotMXBean {
 
+		@Override
 		public String getName() {
 			return "Rob Harrop";
 		}
@@ -69,6 +70,7 @@ public class JmxUtilsAnnotationTests extends TestCase {
 
 	public static class FooX implements FooIfc {
 
+		@Override
 		public String getName() {
 			return "Rob Harrop";
 		}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java
index 6aa94facb2..968b955a47 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java
@@ -23,6 +23,7 @@ import org.springframework.jmx.export.metadata.JmxAttributeSource;
  */
 public abstract class AbstractMetadataAssemblerAutodetectTests extends AbstractAutodetectTests {
 
+	@Override
 	protected AutodetectCapableMBeanInfoAssembler getAssembler() {
 		MetadataMBeanInfoAssembler assembler = new MetadataMBeanInfoAssembler();
 		assembler.setAttributeSource(getAttributeSource());
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
index 93735097c6..15e5812236 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
@@ -204,12 +204,15 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble
 		assertNull("Metric Category should not be populated", desc.getFieldValue("metricCategory"));
 	}
 
+	@Override
 	protected abstract String getObjectName();
 
+	@Override
 	protected int getExpectedAttributeCount() {
 		return 6;
 	}
 
+	@Override
 	protected int getExpectedOperationCount() {
 		return 9;
 	}
@@ -218,6 +221,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble
 		return new JmxTestBean();
 	}
 
+	@Override
 	protected MBeanInfoAssembler getAssembler() {
 		MetadataMBeanInfoAssembler assembler = new MetadataMBeanInfoAssembler();
 		assembler.setAttributeSource(getAttributeSource());
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
index 4be8a6cc92..27beb0b470 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
@@ -26,18 +26,22 @@ public class InterfaceBasedMBeanInfoAssemblerCustomTests extends AbstractJmxAsse
 
 	protected static final String OBJECT_NAME = "bean:name=testBean5";
 
+	@Override
 	protected String getObjectName() {
 		return OBJECT_NAME;
 	}
 
+	@Override
 	protected int getExpectedOperationCount() {
 		return 5;
 	}
 
+	@Override
 	protected int getExpectedAttributeCount() {
 		return 2;
 	}
 
+	@Override
 	protected MBeanInfoAssembler getAssembler() {
 		InterfaceBasedMBeanInfoAssembler assembler = new InterfaceBasedMBeanInfoAssembler();
 		assembler.setManagedInterfaces(new Class<?>[] {ICustomJmxBean.class});
@@ -52,6 +56,7 @@ public class InterfaceBasedMBeanInfoAssemblerCustomTests extends AbstractJmxAsse
 		assertFalse(attr.isWritable());
 	}
 
+	@Override
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml";
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
index a0681cc398..0ada6be575 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
@@ -75,24 +75,29 @@ public class InterfaceBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAsse
 		assertNickName(attr);
 	}
 
+	@Override
 	protected String getObjectName() {
 		return OBJECT_NAME;
 	}
 
+	@Override
 	protected int getExpectedOperationCount() {
 		return 7;
 	}
 
+	@Override
 	protected int getExpectedAttributeCount() {
 		return 3;
 	}
 
+	@Override
 	protected MBeanInfoAssembler getAssembler() throws Exception {
 		return getWithMapping(
 				"org.springframework.jmx.export.assembler.IAdditionalTestMethods, " +
 				"org.springframework.jmx.export.assembler.ICustomJmxBean");
 	}
 
+	@Override
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml";
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java
index 6d8266b4ac..cfe7261990 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java
@@ -21,22 +21,27 @@ package org.springframework.jmx.export.assembler;
  */
 public class InterfaceBasedMBeanInfoAssemblerTests extends AbstractJmxAssemblerTests {
 
+	@Override
 	protected String getObjectName() {
 		return "bean:name=testBean4";
 	}
 
+	@Override
 	protected int getExpectedOperationCount() {
 		return 7;
 	}
 
+	@Override
 	protected int getExpectedAttributeCount() {
 		return 2;
 	}
 
+	@Override
 	protected MBeanInfoAssembler getAssembler() {
 		return new InterfaceBasedMBeanInfoAssembler();
 	}
 
+	@Override
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/assembler/interfaceAssembler.xml";
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java
index 73d4fb56f5..53629c55bb 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java
@@ -45,22 +45,27 @@ public class MethodExclusionMBeanInfoAssemblerComboTests extends AbstractJmxAsse
 		assertTrue("Nick Name should be readable", attr.isReadable());
 	}
 
+	@Override
 	protected String getObjectName() {
 		return OBJECT_NAME;
 	}
 
+	@Override
 	protected int getExpectedOperationCount() {
 		return 7;
 	}
 
+	@Override
 	protected int getExpectedAttributeCount() {
 		return 3;
 	}
 
+	@Override
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml";
 	}
 
+	@Override
 	protected MBeanInfoAssembler getAssembler() throws Exception {
 		MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler();
 		Properties props = new Properties();
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java
index a3f11f9fef..2015cbbece 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java
@@ -44,22 +44,27 @@ public class MethodExclusionMBeanInfoAssemblerMappedTests extends AbstractJmxAss
 		assertTrue("Nick Name should be readable", attr.isReadable());
 	}
 
+	@Override
 	protected String getObjectName() {
 		return OBJECT_NAME;
 	}
 
+	@Override
 	protected int getExpectedOperationCount() {
 		return 7;
 	}
 
+	@Override
 	protected int getExpectedAttributeCount() {
 		return 3;
 	}
 
+	@Override
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml";
 	}
 
+	@Override
 	protected MBeanInfoAssembler getAssembler() throws Exception {
 		MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler();
 		Properties props = new Properties();
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java
index c19ef5969d..9cb85d799d 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java
@@ -45,22 +45,27 @@ public class MethodExclusionMBeanInfoAssemblerNotMappedTests extends AbstractJmx
 		assertTrue("Nick Name should be readable", attr.isReadable());
 	}
 
+	@Override
 	protected String getObjectName() {
 		return OBJECT_NAME;
 	}
 
+	@Override
 	protected int getExpectedOperationCount() {
 		return 11;
 	}
 
+	@Override
 	protected int getExpectedAttributeCount() {
 		return 4;
 	}
 
+	@Override
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml";
 	}
 
+	@Override
 	protected MBeanInfoAssembler getAssembler() throws Exception {
 		MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler();
 		Properties props = new Properties();
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
index 2370488f80..e13a4ff2af 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
@@ -33,22 +33,27 @@ public class MethodExclusionMBeanInfoAssemblerTests extends AbstractJmxAssembler
 	private static final String OBJECT_NAME = "bean:name=testBean5";
 
 
+	@Override
 	protected String getObjectName() {
 		return OBJECT_NAME;
 	}
 
+	@Override
 	protected int getExpectedOperationCount() {
 		return 9;
 	}
 
+	@Override
 	protected int getExpectedAttributeCount() {
 		return 4;
 	}
 
+	@Override
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/assembler/methodExclusionAssembler.xml";
 	}
 
+	@Override
 	protected MBeanInfoAssembler getAssembler() {
 		MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler();
 		assembler.setIgnoredMethods(new String[] {"dontExposeMe", "setSuperman"});
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 496c3d7c9f..b7741897e7 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
@@ -54,22 +54,27 @@ public class MethodNameBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAss
 		assertNickName(attr);
 	}
 
+	@Override
 	protected String getObjectName() {
 		return OBJECT_NAME;
 	}
 
+	@Override
 	protected int getExpectedOperationCount() {
 		return 7;
 	}
 
+	@Override
 	protected int getExpectedAttributeCount() {
 		return 3;
 	}
 
+	@Override
 	protected MBeanInfoAssembler getAssembler() throws Exception {
 		return getWithMapping("getNickName,setNickName,add,myOperation,getName,setName,getAge");
 	}
 
+	@Override
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml";
 	}
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 28cc9f5b53..1ae6c75130 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
@@ -26,18 +26,22 @@ public class MethodNameBasedMBeanInfoAssemblerTests extends AbstractJmxAssembler
 
 	protected static final String OBJECT_NAME = "bean:name=testBean5";
 
+	@Override
 	protected String getObjectName() {
 		return OBJECT_NAME;
 	}
 
+	@Override
 	protected int getExpectedOperationCount() {
 		return 5;
 	}
 
+	@Override
 	protected int getExpectedAttributeCount() {
 		return 2;
 	}
 
+	@Override
 	protected MBeanInfoAssembler getAssembler() {
 		MethodNameBasedMBeanInfoAssembler assembler = new MethodNameBasedMBeanInfoAssembler();
 		assembler.setManagedMethods(new String[] {"add", "myOperation", "getName", "setName", "getAge"});
@@ -52,6 +56,7 @@ public class MethodNameBasedMBeanInfoAssemblerTests extends AbstractJmxAssembler
 		assertFalse(attr.isWritable());
 	}
 
+	@Override
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/assembler/methodNameAssembler.xml";
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java
index 91f97e0a1d..5e0a4bf984 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java
@@ -26,22 +26,27 @@ public class ReflectiveAssemblerTests extends AbstractJmxAssemblerTests {
 
 	protected static final String OBJECT_NAME = "bean:name=testBean1";
 
+	@Override
 	protected String getObjectName() {
 		return OBJECT_NAME;
 	}
 
+	@Override
 	protected int getExpectedOperationCount() {
 		return 11;
 	}
 
+	@Override
 	protected int getExpectedAttributeCount() {
 		return 4;
 	}
 
+	@Override
 	protected MBeanInfoAssembler getAssembler() {
 		return new SimpleReflectiveMBeanInfoAssembler();
 	}
 
+	@Override
 	protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/assembler/reflectiveAssembler.xml";
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java
index c98f88489f..28696ff1a1 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java
@@ -23,18 +23,22 @@ public class KeyNamingStrategyTests extends AbstractNamingStrategyTests {
 
 	private static final String OBJECT_NAME = "spring:name=test";
 
+	@Override
 	protected ObjectNamingStrategy getStrategy() throws Exception {
 		return new KeyNamingStrategy();
 	}
 
+	@Override
 	protected Object getManagedResource() {
 		return new Object();
 	}
 
+	@Override
 	protected String getKey() {
 		return OBJECT_NAME;
 	}
 
+	@Override
 	protected String getCorrectObjectName() {
 		return OBJECT_NAME;
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java
index 9772ff4ae4..4b0e1a3920 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java
@@ -23,6 +23,7 @@ import org.springframework.core.io.ClassPathResource;
  */
 public class PropertiesFileNamingStrategyTests extends PropertiesNamingStrategyTests {
 
+	@Override
 	protected ObjectNamingStrategy getStrategy() throws Exception {
 		KeyNamingStrategy strat = new KeyNamingStrategy();
 		strat.setMappingLocation(new ClassPathResource("jmx-names.properties", getClass()));
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java
index fefc10ffc8..4c474100a7 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java
@@ -26,6 +26,7 @@ public class PropertiesNamingStrategyTests extends AbstractNamingStrategyTests {
 
 	private static final String OBJECT_NAME = "bean:name=namingTest";
 
+	@Override
 	protected ObjectNamingStrategy getStrategy() throws Exception {
 		KeyNamingStrategy strat = new KeyNamingStrategy();
 		Properties mappings = new Properties();
@@ -35,14 +36,17 @@ public class PropertiesNamingStrategyTests extends AbstractNamingStrategyTests {
 		return strat;
 	}
 
+	@Override
 	protected Object getManagedResource() {
 		return new Object();
 	}
 
+	@Override
 	protected String getKey() {
 		return "namingTest";
 	}
 
+	@Override
 	protected String getCorrectObjectName() {
 		return OBJECT_NAME;
 	}
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java
index 6f9ab8e724..cfffabaead 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java
@@ -113,10 +113,12 @@ public final class ModelMBeanNotificationPublisherTests {
 			return this.actualNotification;
 		}
 
+		@Override
 		public void sendNotification(Notification notification) throws RuntimeOperationsException {
 			this.actualNotification = notification;
 		}
 
+		@Override
 		public void sendAttributeChangeNotification(AttributeChangeNotification notification) throws RuntimeOperationsException {
 			this.actualNotification = notification;
 		}
diff --git a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java
index b72082cef1..333d2e5f27 100644
--- a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java
@@ -151,28 +151,35 @@ public class JmxUtilsTests extends TestCase {
 			super(IJmxTestBean.class);
 		}
 
+		@Override
 		public int add(int x, int y) {
 			return 0;
 		}
 
+		@Override
 		public long myOperation() {
 			return 0;
 		}
 
+		@Override
 		public int getAge() {
 			return 0;
 		}
 
+		@Override
 		public void setAge(int age) {
 		}
 
+		@Override
 		public void setName(String name) {
 		}
 
+		@Override
 		public String getName() {
 			return null;
 		}
 
+		@Override
 		public void dontExposeMe() {
 		}
 	}
@@ -186,6 +193,7 @@ public class JmxUtilsTests extends TestCase {
 
 	public static class Foo implements FooMBean {
 
+		@Override
 		public String getName() {
 			return "Rob Harrop";
 		}
@@ -200,6 +208,7 @@ public class JmxUtilsTests extends TestCase {
 
 	public static class FooX implements FooMXBean {
 
+		@Override
 		public String getName() {
 			return "Rob Harrop";
 		}
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 5acfff7608..fbc8e6221e 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
@@ -233,6 +233,7 @@ public class JndiObjectFactoryBeanTests {
 		JndiObjectFactoryBean jof = new JndiObjectFactoryBean();
 		final TestBean tb = new TestBean();
 		jof.setJndiTemplate(new JndiTemplate() {
+			@Override
 			public Object lookup(String name) {
 				if ("foo".equals(name)) {
 					tb.setName("tb");
@@ -259,6 +260,7 @@ public class JndiObjectFactoryBeanTests {
 		JndiObjectFactoryBean jof = new JndiObjectFactoryBean();
 		final TestBean tb = new TestBean();
 		jof.setJndiTemplate(new JndiTemplate() {
+			@Override
 			public Object lookup(String name) {
 				if ("foo".equals(name)) {
 					tb.setName("tb");
@@ -287,6 +289,7 @@ public class JndiObjectFactoryBeanTests {
 		JndiObjectFactoryBean jof = new JndiObjectFactoryBean();
 		final TestBean tb = new TestBean();
 		jof.setJndiTemplate(new JndiTemplate() {
+			@Override
 			public Object lookup(String name) {
 				if ("foo".equals(name)) {
 					tb.setName("tb");
@@ -386,6 +389,7 @@ public class JndiObjectFactoryBeanTests {
 		expectLastCall().times(2);
 		replay(mockCtx);
 		jof.setJndiTemplate(new JndiTemplate() {
+			@Override
 			protected Context createInitialContext() {
 				return mockCtx;
 			}
diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java
index 4d658bc2cf..f4fbd09453 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java
@@ -42,6 +42,7 @@ public class JndiTemplateTests {
 		replay(context);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			protected Context createInitialContext() {
 				return context;
 			}
@@ -62,6 +63,7 @@ public class JndiTemplateTests {
 		replay(context);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			protected Context createInitialContext() {
 				return context;
 			}
@@ -86,6 +88,7 @@ public class JndiTemplateTests {
 		replay(context);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			protected Context createInitialContext() {
 				return context;
 			}
@@ -111,6 +114,7 @@ public class JndiTemplateTests {
 		replay(context);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			protected Context createInitialContext() {
 				return context;
 			}
@@ -136,6 +140,7 @@ public class JndiTemplateTests {
 		replay(context);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			protected Context createInitialContext() {
 				return context;
 			}
@@ -155,6 +160,7 @@ public class JndiTemplateTests {
 		replay(context);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			protected Context createInitialContext() {
 				return context;
 			}
@@ -173,6 +179,7 @@ public class JndiTemplateTests {
 		replay(context);
 
 		JndiTemplate jt = new JndiTemplate() {
+			@Override
 			protected Context createInitialContext() {
 				return context;
 			}
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 bc635f183d..3851c6bbee 100644
--- a/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java
@@ -219,38 +219,47 @@ public class SimpleNamingContextTests {
 
 class StubDataSource implements DataSource {
 
+	@Override
 	public Connection getConnection() 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 int getLoginTimeout() throws SQLException {
 		return 0;
 	}
 
+	@Override
 	public void setLogWriter(PrintWriter arg0) throws SQLException {
 
 	}
 
+	@Override
 	public void setLoginTimeout(int arg0) throws SQLException {
 
 	}
 
+	@Override
 	public boolean isWrapperFor(Class<?> arg0) throws SQLException {
 		return false;
 	}
 
+	@Override
 	public <T> T unwrap(Class<T> arg0) throws SQLException {
 		return null;
 	}
 
+	@Override
 	public Logger getParentLogger() {
 		return null;
 	}
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index 10ae6d4283..9b3d10470d 100644
--- a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -70,6 +70,7 @@ public class ExpectedLookupTemplate extends JndiTemplate {
 	 * return the object provided in the constructor. If the name is
 	 * unexpected, a respective NamingException gets thrown.
 	 */
+	@Override
 	public Object lookup(String name) throws NamingException {
 		Object object = this.jndiObjects.get(name);
 		if (object == null) {
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
index c71d6e8681..5ab0d31377 100644
--- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
@@ -91,6 +91,7 @@ public class SimpleNamingContext implements Context {
 
 	// Actual implementations of Context methods follow
 
+	@Override
 	public NamingEnumeration<NameClassPair> list(String root) throws NamingException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Listing name/class pairs under [" + root + "]");
@@ -98,6 +99,7 @@ public class SimpleNamingContext implements Context {
 		return new NameClassPairEnumeration(this, root);
 	}
 
+	@Override
 	public NamingEnumeration<Binding> listBindings(String root) throws NamingException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Listing bindings under [" + root + "]");
@@ -111,6 +113,7 @@ public class SimpleNamingContext implements Context {
 	 * Will be used by any standard InitialContext JNDI lookups.
 	 * @throws javax.naming.NameNotFoundException if the object could not be found
 	 */
+	@Override
 	public Object lookup(String lookupName) throws NameNotFoundException {
 		String name = this.root + lookupName;
 		if (logger.isDebugEnabled()) {
@@ -136,6 +139,7 @@ public class SimpleNamingContext implements Context {
 		return found;
 	}
 
+	@Override
 	public Object lookupLink(String name) throws NameNotFoundException {
 		return lookup(name);
 	}
@@ -147,6 +151,7 @@ public class SimpleNamingContext implements Context {
 	 * Use SimpleNamingContextBuilder to set up JNDI bindings then.
 	 * @see org.springframework.mock.jndi.SimpleNamingContextBuilder#bind
 	 */
+	@Override
 	public void bind(String name, Object obj) {
 		if (logger.isInfoEnabled()) {
 			logger.info("Static JNDI binding: [" + this.root + name + "] = [" + obj + "]");
@@ -154,6 +159,7 @@ public class SimpleNamingContext implements Context {
 		this.boundObjects.put(this.root + name, obj);
 	}
 
+	@Override
 	public void unbind(String name) {
 		if (logger.isInfoEnabled()) {
 			logger.info("Static JNDI remove: [" + this.root + name + "]");
@@ -161,16 +167,19 @@ public class SimpleNamingContext implements Context {
 		this.boundObjects.remove(this.root + name);
 	}
 
+	@Override
 	public void rebind(String name, Object obj) {
 		bind(name, obj);
 	}
 
+	@Override
 	public void rename(String oldName, String newName) throws NameNotFoundException {
 		Object obj = lookup(oldName);
 		unbind(oldName);
 		bind(newName, obj);
 	}
 
+	@Override
 	public Context createSubcontext(String name) {
 		String subcontextName = this.root + name;
 		if (!subcontextName.endsWith("/")) {
@@ -181,84 +190,104 @@ public class SimpleNamingContext implements Context {
 		return subcontext;
 	}
 
+	@Override
 	public void destroySubcontext(String name) {
 		unbind(name);
 	}
 
+	@Override
 	public String composeName(String name, String prefix) {
 		return prefix + name;
 	}
 
+	@Override
 	public Hashtable<String, Object> getEnvironment() {
 		return this.environment;
 	}
 
+	@Override
 	public Object addToEnvironment(String propName, Object propVal) {
 		return this.environment.put(propName, propVal);
 	}
 
+	@Override
 	public Object removeFromEnvironment(String propName) {
 		return this.environment.remove(propName);
 	}
 
+	@Override
 	public void close() {
 	}
 
 
 	// Unsupported methods follow: no support for javax.naming.Name
 
+	@Override
 	public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Object lookup(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Object lookupLink(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void bind(Name name, Object obj) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void unbind(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void rebind(Name name, Object obj) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void rename(Name oldName, Name newName) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Context createSubcontext(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void destroySubcontext(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public String getNameInNamespace() throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public NameParser getNameParser(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public NameParser getNameParser(String name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Name composeName(Name name, Name prefix) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
@@ -298,22 +327,27 @@ public class SimpleNamingContext implements Context {
 
 		protected abstract T createObject(String strippedName, Object obj);
 
+		@Override
 		public boolean hasMore() {
 			return this.iterator.hasNext();
 		}
 
+		@Override
 		public T next() {
 			return this.iterator.next();
 		}
 
+		@Override
 		public boolean hasMoreElements() {
 			return this.iterator.hasNext();
 		}
 
+		@Override
 		public T nextElement() {
 			return this.iterator.next();
 		}
 
+		@Override
 		public void close() {
 		}
 	}
@@ -325,6 +359,7 @@ public class SimpleNamingContext implements Context {
 			super(context, root);
 		}
 
+		@Override
 		protected NameClassPair createObject(String strippedName, Object obj) {
 			return new NameClassPair(strippedName, obj.getClass().getName());
 		}
@@ -337,6 +372,7 @@ public class SimpleNamingContext implements Context {
 			super(context, root);
 		}
 
+		@Override
 		protected Binding createObject(String strippedName, Object obj) {
 			return new Binding(strippedName, obj);
 		}
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index f21936897b..32908a306a 100644
--- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -192,6 +192,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 	 * creating a new SimpleNamingContext instance.
 	 * @see SimpleNamingContext
 	 */
+	@Override
 	public InitialContextFactory createInitialContextFactory(Hashtable<?,?> environment) {
 		if (activated == null && environment != null) {
 			Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY);
@@ -225,6 +226,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 
 		// Default case...
 		return new InitialContextFactory() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public Context getInitialContext(Hashtable<?,?> environment) {
 				return new SimpleNamingContext("", boundObjects, (Hashtable<String, Object>) environment);
diff --git a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
index dbb46d5385..c92f3d0aca 100644
--- a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
+++ b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
@@ -322,18 +322,23 @@ public class RmiSupportTests extends TestCase {
 		final Method setNameMethod = rb.getClass().getDeclaredMethod("setName", new Class<?>[] {String.class});
 
 		MethodInvocation mi = new MethodInvocation() {
+			@Override
 			public Method getMethod() {
 				return setNameMethod;
 			}
+			@Override
 			public Object[] getArguments() {
 				return new Object[] {"bla"};
 			}
+			@Override
 			public Object proceed() throws Throwable {
 				throw new UnsupportedOperationException();
 			}
+			@Override
 			public Object getThis() {
 				return rb;
 			}
+			@Override
 			public AccessibleObject getStaticPart() {
 				return setNameMethod;
 			}
@@ -363,11 +368,14 @@ public class RmiSupportTests extends TestCase {
 	public void testRmiInvokerWithSpecialLocalMethods() throws Exception {
 		String serviceUrl = "rmi://localhost:1090/test";
 		RmiProxyFactoryBean factory = new RmiProxyFactoryBean() {
+			@Override
 			protected Remote lookupStub() {
 				return new RmiInvocationHandler() {
+					@Override
 					public String getTargetInterfaceName() {
 						return null;
 					}
+					@Override
 					public Object invoke(RemoteInvocation invocation) throws RemoteException {
 						throw new RemoteException();
 					}
@@ -400,6 +408,7 @@ public class RmiSupportTests extends TestCase {
 
 		private int counter = 0;
 
+		@Override
 		protected Remote lookupStub() {
 			counter++;
 			return new RemoteBean();
@@ -432,6 +441,7 @@ public class RmiSupportTests extends TestCase {
 
 		private static String name;
 
+		@Override
 		public void setName(String nam) throws RemoteException {
 			if (nam != null && nam.endsWith("Exception")) {
 				RemoteException rex = null;
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java
index be6ef187d2..e52582125a 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java
@@ -116,16 +116,19 @@ public class AsyncAnnotationBeanPostProcessorTests {
 
 		private final CountDownLatch latch = new CountDownLatch(1);
 
+		@Override
 		public Thread getThread() {
 			return this.thread;
 		}
 
+		@Override
 		@Async
 		public void test() {
 			this.thread = Thread.currentThread();
 			this.latch.countDown();
 		}
 
+		@Override
 		public void await(long timeout) {
 			try {
 				this.latch.await(timeout, TimeUnit.MILLISECONDS);
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 f5f0aca435..a0985345de 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
@@ -248,10 +248,12 @@ public class AsyncExecutionTests {
 
 	public static class AsyncInterfaceBean implements AsyncInterface {
 
+		@Override
 		public void doSomething(int i) {
 			assertTrue(!Thread.currentThread().getName().equals(originalThreadName));
 		}
 
+		@Override
 		public Future<String> returnSomething(int i) {
 			assertTrue(!Thread.currentThread().getName().equals(originalThreadName));
 			return new AsyncResult<String>(Integer.toString(i));
@@ -273,14 +275,17 @@ public class AsyncExecutionTests {
 
 	public static class AsyncMethodsInterfaceBean implements AsyncMethodsInterface {
 
+		@Override
 		public void doNothing(int i) {
 			assertTrue(Thread.currentThread().getName().equals(originalThreadName));
 		}
 
+		@Override
 		public void doSomething(int i) {
 			assertTrue(!Thread.currentThread().getName().equals(originalThreadName));
 		}
 
+		@Override
 		public Future<String> returnSomething(int i) {
 			assertTrue(!Thread.currentThread().getName().equals(originalThreadName));
 			return new AsyncResult<String>(Integer.toString(i));
@@ -290,6 +295,7 @@ public class AsyncExecutionTests {
 
 	public static class AsyncMethodListener implements ApplicationListener<ApplicationEvent> {
 
+		@Override
 		@Async
 		public void onApplicationEvent(ApplicationEvent event) {
 			listenerCalled++;
@@ -305,6 +311,7 @@ public class AsyncExecutionTests {
 			listenerConstructed++;
 		}
 
+		@Override
 		public void onApplicationEvent(ApplicationEvent event) {
 			listenerCalled++;
 			assertTrue(!Thread.currentThread().getName().equals(originalThreadName));
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
index e96c31f739..3b3329e0d9 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java
@@ -247,6 +247,7 @@ public class EnableAsyncTests {
 			return new AsyncBean();
 		}
 
+		@Override
 		public Executor getAsyncExecutor() {
 			ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
 			executor.setThreadNamePrefix("Custom-");
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
index 9cab480483..349c6ec387 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
@@ -216,6 +216,7 @@ public class EnableSchedulingTests {
 			return null;
 		}
 
+		@Override
 		public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
 			taskRegistrar.setScheduler(taskScheduler1());
 		}
@@ -318,6 +319,7 @@ public class EnableSchedulingTests {
 			return new ThreadAwareWorker();
 		}
 
+		@Override
 		public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
 			taskRegistrar.setScheduler(taskScheduler2());
 		}
@@ -378,6 +380,7 @@ public class EnableSchedulingTests {
 			return scheduler;
 		}
 
+		@Override
 		public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
 			taskRegistrar.setScheduler(taskScheduler2());
 		}
@@ -410,10 +413,12 @@ public class EnableSchedulingTests {
 			return new ThreadPoolTaskScheduler();
 		}
 
+		@Override
 		public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
 			taskRegistrar.setScheduler(taskScheduler());
 			taskRegistrar.addFixedRateTask(new IntervalTask(
 					new Runnable() {
+						@Override
 						public void run() {
 							worker().executedByThread = Thread.currentThread().getName();
 						}
@@ -449,11 +454,13 @@ public class EnableSchedulingTests {
 			scheduler.initialize();
 			scheduler.schedule(
 				new Runnable() {
+					@Override
 					public void run() {
 						counter().incrementAndGet();
 					}
 				},
 				new Trigger() {
+					@Override
 					public Date nextExecutionTime(TriggerContext triggerContext) {
 						return new Date(new Date().getTime()+10);
 					}
diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
index 0b0f791cc5..0882599218 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
@@ -65,6 +65,7 @@ public class ScheduledExecutorFactoryBeanTests {
 		mockScheduledExecutorService.replay();
 
 		ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() {
+			@Override
 			protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) {
 				return executor;
 			}
@@ -88,6 +89,7 @@ public class ScheduledExecutorFactoryBeanTests {
 		mockScheduledExecutorService.replay();
 
 		ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() {
+			@Override
 			protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) {
 				return executor;
 			}
@@ -233,6 +235,7 @@ public class ScheduledExecutorFactoryBeanTests {
 	@SuppressWarnings("serial")
 	public void testSettingThreadFactoryToNullForcesUseOfDefaultButIsOtherwiseCool() throws Exception {
 		ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() {
+			@Override
 			protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) {
 				assertNotNull("Bah; the setThreadFactory(..) method must use a default ThreadFactory if a null arg is passed in.");
 				return super.createExecutor(poolSize, threadFactory, rejectedExecutionHandler);
@@ -250,6 +253,7 @@ public class ScheduledExecutorFactoryBeanTests {
 	@SuppressWarnings("serial")
 	public void testSettingRejectedExecutionHandlerToNullForcesUseOfDefaultButIsOtherwiseCool() throws Exception {
 		ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() {
+			@Override
 			protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) {
 				assertNotNull("Bah; the setRejectedExecutionHandler(..) method must use a default RejectedExecutionHandler if a null arg is passed in.");
 				return super.createExecutor(poolSize, threadFactory, rejectedExecutionHandler);
diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java
index 7d3b05f631..c17d9f27fa 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java
@@ -239,6 +239,7 @@ public class ThreadPoolTaskSchedulerTests {
 			this.latch = new CountDownLatch(expectedRunCount);
 		}
 
+		@Override
 		public void run() {
 			lastThread = Thread.currentThread();
 			if (actualRunCount.incrementAndGet() > expectedRunCount) {
@@ -259,6 +260,7 @@ public class ThreadPoolTaskSchedulerTests {
 			this.expectedRunCount = expectedRunCount;
 		}
 
+		@Override
 		public String call() throws Exception {
 			if (actualRunCount.incrementAndGet() > expectedRunCount) {
 				throw new RuntimeException("intentional test failure");
@@ -278,6 +280,7 @@ public class ThreadPoolTaskSchedulerTests {
 			this.latch = new CountDownLatch(expectedErrorCount);
 		}
 
+		@Override
 		public void handleError(Throwable t) {
 			this.lastError = t;
 			this.latch.countDown();
@@ -295,6 +298,7 @@ public class ThreadPoolTaskSchedulerTests {
 			this.maxRunCount = maxRunCount;
 		}
 
+		@Override
 		public Date nextExecutionTime(TriggerContext triggerContext) {
 			if (this.actualRunCount.incrementAndGet() > this.maxRunCount) {
 				return null;
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 3425f60db5..6c32a85bd0 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
@@ -56,6 +56,7 @@ public class ExecutorBeanDefinitionParserTests {
 		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";
 			}
diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java
index 921a5c4e11..697c747d33 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java
@@ -123,6 +123,7 @@ public class ScheduledTasksBeanDefinitionParserTests {
 
 	static class TestTrigger implements Trigger {
 
+		@Override
 		public Date nextExecutionTime(TriggerContext triggerContext) {
 			return null;
 		}
diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java
index c0faca5e68..8e04507325 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java
@@ -254,14 +254,17 @@ public class PeriodicTriggerTests {
 			this.completion = completion;
 		}
 
+		@Override
 		public Date lastActualExecutionTime() {
 			return this.actual;
 		}
 
+		@Override
 		public Date lastCompletionTime() {
 			return this.completion;
 		}
 
+		@Override
 		public Date lastScheduledExecutionTime() {
 			return this.scheduled;
 		}
diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
index 2659b23576..5d210b344a 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
@@ -50,27 +50,32 @@ public class TimerSupportTests extends TestCase {
 
 		final List<Boolean> success = new ArrayList<Boolean>(3);
 		final Timer timer = new Timer(true) {
+			@Override
 			public void schedule(TimerTask task, long delay, long period) {
 				if (task == timerTask0 && delay == 0 && period == 10) {
 					success.add(Boolean.TRUE);
 				}
 			}
+			@Override
 			public void scheduleAtFixedRate(TimerTask task, long delay, long period) {
 				if (task == timerTask1 && delay == 10 && period == 20) {
 					success.add(Boolean.TRUE);
 				}
 			}
+			@Override
 			public void schedule(TimerTask task, long delay) {
 				if (task instanceof DelegatingTimerTask && delay == 20) {
 					success.add(Boolean.TRUE);
 				}
 			}
+			@Override
 			public void cancel() {
 				success.add(Boolean.TRUE);
 			}
 		};
 
 		TimerFactoryBean timerFactoryBean = new TimerFactoryBean() {
+			@Override
 			protected Timer createTimer(String name, boolean daemon) {
 				return timer;
 			}
@@ -104,6 +109,7 @@ public class TimerSupportTests extends TestCase {
 
 		private int counter = 0;
 
+		@Override
 		public void run() {
 			counter++;
 		}
@@ -114,6 +120,7 @@ public class TimerSupportTests extends TestCase {
 
 		private int counter = 0;
 
+		@Override
 		public void run() {
 			counter++;
 		}
diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
index 0655210a42..4632e4852c 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
@@ -96,6 +96,7 @@ public final class TimerTaskExecutorTests {
 
 		TimerTaskExecutor executor = new TimerTaskExecutor() {
 
+			@Override
 			protected Timer createTimer() {
 				return timer;
 			}
@@ -129,6 +130,7 @@ public final class TimerTaskExecutorTests {
 			return this.createTimerWasCalled;
 		}
 
+		@Override
 		protected Timer createTimer() {
 			this.createTimerWasCalled = true;
 			return super.createTimer();
@@ -146,6 +148,7 @@ public final class TimerTaskExecutorTests {
 		}
 
 
+		@Override
 		public void cancel() {
 			this.cancelWasCalled = true;
 			super.cancel();
@@ -166,6 +169,7 @@ public final class TimerTaskExecutorTests {
 		}
 
 
+		@Override
 		public void run() {
 			this.runWasCalled = true;
 			synchronized (monitor) {
@@ -176,6 +180,7 @@ public final class TimerTaskExecutorTests {
 
 	private static final class NoOpRunnable implements Runnable {
 
+		@Override
 		public void run() {
 			// explicit no-op
 		}
diff --git a/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java b/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java
index 4a542c0c6e..f00e514803 100644
--- a/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java
+++ b/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java
@@ -21,14 +21,17 @@ package org.springframework.scripting.config;
  */
 public class OtherTestBean implements ITestBean {
 
+	@Override
 	public ITestBean getOtherBean() {
 		return null;
 	}
 
+	@Override
 	public boolean isInitialized() {
 		return false;
 	}
 
+	@Override
 	public boolean isDestroyed() {
 		return false;
 	}
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java b/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java
index 6aab4f5df3..4f55dc01f8 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java
@@ -26,10 +26,12 @@ public class ConcreteMessenger implements ConfigurableMessenger {
 
 	private String message;
 
+	@Override
 	public String getMessage() {
 		return message;
 	}
 
+	@Override
 	public void setMessage(String message) {
 		this.message = message;
 	}
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 763827a05a..f142c6bcc1 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
@@ -478,8 +478,10 @@ public class GroovyScriptFactoryTests {
 
 	public static class TestCustomizer implements GroovyObjectCustomizer {
 
+		@Override
 		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) {
 						throw new IllegalStateException("Gotcha");
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java b/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java
index a7066c828c..28330777f3 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java
@@ -11,6 +11,7 @@ public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice {
 
 	private int countThrows = 0;
 
+	@Override
 	public void before(Method method, Object[] objects, Object o) throws Throwable {
 		countBefore++;
 		System.out.println("Method:"+method.getName());
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java b/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java
index 749fc42fde..ed90507212 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java
@@ -2,6 +2,7 @@ package org.springframework.scripting.groovy;
 
 @Log
 public class TestServiceImpl implements TestService{
+    @Override
     public String sayHello() {
         throw new TestException("TestServiceImpl");
     }
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 cc7e1ce392..f2899f520e 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
@@ -278,6 +278,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 
 		public int count;
 
+		@Override
 		public String getContent() {
 			this.count++;
 			return "Hello World!";
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java b/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java
index 3a4ffb7043..d67f8d47b7 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java
+++ b/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java
@@ -25,10 +25,12 @@ public final class StubMessenger implements ConfigurableMessenger {
 
 	private String message = "I used to be smart... now I'm just stupid.";
 
+	@Override
 	public void setMessage(String message) {
 		this.message = message;
 	}
 
+	@Override
 	public String getMessage() {
 		return message;
 	}
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 336fe78e67..30835d1dff 100644
--- a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
+++ b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
@@ -278,6 +278,7 @@ public final class ModelMapTests {
 				getClass().getClassLoader(),
 				new Class<?>[] {Map.class},
 				new InvocationHandler() {
+					@Override
 					public Object invoke(Object proxy, Method method, Object[] args) {
 						return "proxy";
 					}
diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
index b1ba9804d2..7d00f31184 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
@@ -115,9 +115,11 @@ public class DataBinderFieldAccessTests extends TestCase {
 		DataBinder binder = new DataBinder(rod, "person");
 		binder.initDirectFieldAccess();
 		binder.registerCustomEditor(TestBean.class, "spouse", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean(text, 0));
 			}
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
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 e85cf9a623..ac5b020c9d 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
@@ -254,17 +254,21 @@ public class DataBinderTests extends TestCase {
 		TestBean rod = new TestBean();
 		DataBinder binder = new DataBinder(rod, "person");
 		binder.registerCustomEditor(String.class, "touchy", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("prefix_" + text);
 			}
+			@Override
 			public String getAsText() {
 				return getValue().toString().substring(7);
 			}
 		});
 		binder.registerCustomEditor(TestBean.class, "spouse", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean(text, 0));
 			}
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
@@ -381,9 +385,11 @@ public class DataBinderTests extends TestCase {
 		FormattingConversionService conversionService = new FormattingConversionService();
 		DefaultConversionService.addDefaultConverters(conversionService);
 		conversionService.addFormatterForFieldType(String.class, new Formatter<String>() {
+			@Override
 			public String parse(String text, Locale locale) throws ParseException {
 				throw new ParseException(text, 0);
 			}
+			@Override
 			public String print(String object, Locale locale) {
 				return object;
 			}
@@ -669,6 +675,7 @@ public class DataBinderTests extends TestCase {
 
 		DataBinder binder = new DataBinder(tb, "person");
 		binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean());
 			}
@@ -689,9 +696,11 @@ public class DataBinderTests extends TestCase {
 		DataBinder binder = new DataBinder(tb, "tb");
 
 		binder.registerCustomEditor(String.class, "name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("prefix" + text);
 			}
+			@Override
 			public String getAsText() {
 				return ((String) getValue()).substring(6);
 			}
@@ -725,9 +734,11 @@ public class DataBinderTests extends TestCase {
 		DataBinder binder = new DataBinder(tb, "tb");
 
 		binder.registerCustomEditor(int.class, "age", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new Integer(99));
 			}
+			@Override
 			public String getAsText() {
 				return "argh";
 			}
@@ -746,9 +757,11 @@ public class DataBinderTests extends TestCase {
 		DataBinder binder = new DataBinder(tb, "tb");
 
 		binder.registerCustomEditor(String.class, null, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("prefix" + text);
 			}
+			@Override
 			public String getAsText() {
 				return ((String) getValue()).substring(6);
 			}
@@ -775,6 +788,7 @@ public class DataBinderTests extends TestCase {
 		DataBinder binder = new DataBinder(tb, "tb");
 
 		binder.registerCustomEditor(String.class, null, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				if (getValue() == null || !text.equalsIgnoreCase(getValue().toString())) {
 					setValue(text);
@@ -1053,6 +1067,7 @@ public class DataBinderTests extends TestCase {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(Set.class, new CustomCollectionEditor(TreeSet.class) {
+			@Override
 			protected Object convertElement(Object element) {
 				return new Integer(element.toString());
 			}
@@ -1091,6 +1106,7 @@ public class DataBinderTests extends TestCase {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(String.class, "array.name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("array" + text);
 			}
@@ -1130,6 +1146,7 @@ public class DataBinderTests extends TestCase {
 		tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean());
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(String.class, "array.nestedIndexedBean.list.name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("list" + text);
 			}
@@ -1166,9 +1183,11 @@ public class DataBinderTests extends TestCase {
 		tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean());
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(String.class, "array.nestedIndexedBean.list.name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("list" + text);
 			}
+			@Override
 			public String getAsText() {
 				return ((String) getValue()).substring(4);
 			}
@@ -1189,9 +1208,11 @@ public class DataBinderTests extends TestCase {
 		tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean());
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(String.class, "array[0].nestedIndexedBean.list.name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("list" + text);
 			}
+			@Override
 			public String getAsText() {
 				return ((String) getValue()).substring(4);
 			}
@@ -1212,9 +1233,11 @@ public class DataBinderTests extends TestCase {
 		tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean());
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(String.class, "array.nestedIndexedBean.list[0].name", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("list" + text);
 			}
+			@Override
 			public String getAsText() {
 				return ((String) getValue()).substring(4);
 			}
@@ -1233,11 +1256,13 @@ public class DataBinderTests extends TestCase {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(TestBean.class, "array", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				DerivedTestBean tb = new DerivedTestBean();
 				tb.setName("array" + text);
 				setValue(tb);
 			}
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
@@ -1283,11 +1308,13 @@ public class DataBinderTests extends TestCase {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(TestBean.class, "map[key0]", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				DerivedTestBean tb = new DerivedTestBean();
 				tb.setName("array" + text);
 				setValue(tb);
 			}
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
@@ -1311,11 +1338,13 @@ public class DataBinderTests extends TestCase {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				DerivedTestBean tb = new DerivedTestBean();
 				tb.setName("array" + text);
 				setValue(tb);
 			}
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
@@ -1339,11 +1368,13 @@ public class DataBinderTests extends TestCase {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(TestBean.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				DerivedTestBean tb = new DerivedTestBean();
 				tb.setName("array" + text);
 				setValue(tb);
 			}
+			@Override
 			public String getAsText() {
 				return ((TestBean) getValue()).getName();
 			}
@@ -1370,6 +1401,7 @@ public class DataBinderTests extends TestCase {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(String[].class, "stringArray", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(StringUtils.delimitedListToStringArray(text, "-"));
 			}
@@ -1387,6 +1419,7 @@ public class DataBinderTests extends TestCase {
 		TestBean tb = new TestBean();
 		DataBinder binder = new DataBinder(tb, "tb");
 		binder.registerCustomEditor(String.class, "stringArray", new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue("X" + text);
 			}
@@ -1647,10 +1680,12 @@ public class DataBinderTests extends TestCase {
 
 	private static class TestBeanValidator implements Validator {
 
+		@Override
 		public boolean supports(Class<?> clazz) {
 			return TestBean.class.isAssignableFrom(clazz);
 		}
 
+		@Override
 		public void validate(Object obj, Errors errors) {
 			TestBean tb = (TestBean) obj;
 			if (tb.getAge() < 32) {
@@ -1674,10 +1709,12 @@ public class DataBinderTests extends TestCase {
 
 	private static class SpouseValidator implements Validator {
 
+		@Override
 		public boolean supports(Class<?> clazz) {
 			return TestBean.class.isAssignableFrom(clazz);
 		}
 
+		@Override
 		public void validate(Object obj, Errors errors) {
 			TestBean tb = (TestBean) obj;
 			if (tb == null || "XXX".equals(tb.getName())) {
@@ -1703,6 +1740,7 @@ public class DataBinderTests extends TestCase {
 			return list;
 		}
 
+		@Override
 		public E get(int index) {
 			if (index >= list.size()) {
 				for (int i = list.size(); i < index; i++) {
@@ -1716,50 +1754,62 @@ public class DataBinderTests extends TestCase {
 			}
 		}
 
+		@Override
 		public int size() {
 			return list.size();
 		}
 
+		@Override
 		public boolean add(E o) {
 			return list.add(o);
 		}
 
+		@Override
 		public void add(int index, E element) {
 			list.add(index, element);
 		}
 
+		@Override
 		public boolean addAll(int index, Collection<? extends E> c) {
 			return list.addAll(index, c);
 		}
 
+		@Override
 		public void clear() {
 			list.clear();
 		}
 
+		@Override
 		public int indexOf(Object o) {
 			return list.indexOf(o);
 		}
 
+		@Override
 		public Iterator<E> iterator() {
 			return list.iterator();
 		}
 
+		@Override
 		public int lastIndexOf(Object o) {
 			return list.lastIndexOf(o);
 		}
 
+		@Override
 		public ListIterator<E> listIterator() {
 			return list.listIterator();
 		}
 
+		@Override
 		public ListIterator<E> listIterator(int index) {
 			return list.listIterator(index);
 		}
 
+		@Override
 		public E remove(int index) {
 			return list.remove(index);
 		}
 
+		@Override
 		public E set(int index, E element) {
 			return list.set(index, element);
 		}
diff --git a/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java b/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java
index db86c2384d..d5e094a2e1 100644
--- a/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java
@@ -146,6 +146,7 @@ public class DefaultMessageCodesResolverTests {
 	@Test
 	public void shouldSupportCustomFormat() throws Exception {
 		resolver.setMessageCodeFormatter(new MessageCodeFormatter() {
+			@Override
 			public String format(String errorCode, String objectName, String field) {
 				return DefaultMessageCodesResolver.Format.toDelimitedString(
 						"CUSTOM-" + errorCode, objectName, field);
diff --git a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
index 4ab4f448f4..48a9b9bfe9 100644
--- a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
@@ -161,10 +161,12 @@ public class ValidationUtilsTests {
 
 	private static class EmptyValidator implements Validator {
 
+		@Override
 		public boolean supports(Class<?> clazz) {
 			return TestBean.class.isAssignableFrom(clazz);
 		}
 
+		@Override
 		public void validate(Object obj, Errors errors) {
 			ValidationUtils.rejectIfEmpty(errors, "name", "EMPTY", "You must enter a name!");
 		}
@@ -173,10 +175,12 @@ public class ValidationUtilsTests {
 
 	private static class EmptyOrWhitespaceValidator implements Validator {
 
+		@Override
 		public boolean supports(Class<?> clazz) {
 			return TestBean.class.isAssignableFrom(clazz);
 		}
 
+		@Override
 		public void validate(Object obj, Errors errors) {
 			ValidationUtils.rejectIfEmptyOrWhitespace(errors, "name", "EMPTY_OR_WHITESPACE", "You must enter a name!");
 		}
diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java
index ce29597e0c..43ac003895 100644
--- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java
@@ -84,6 +84,7 @@ public class MethodValidationTests {
 	@MyStereotype
 	public static class MyValidBean implements MyValidInterface {
 
+		@Override
 		public Object myValidMethod(String arg1, int arg2) {
 			return (arg2 == 0 ? null : "value");
 		}
diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
index 41f500d93e..5c2dad22a4 100644
--- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
@@ -273,9 +273,11 @@ public class ValidatorFactoryTests {
 
 	public static class NameAddressValidator implements ConstraintValidator<NameAddressValid, ValidPerson> {
 
+		@Override
 		public void initialize(NameAddressValid constraintAnnotation) {
 		}
 
+		@Override
 		public boolean isValid(ValidPerson value, ConstraintValidatorContext constraintValidatorContext) {
 			return (value.name == null || !value.address.street.contains(value.name));
 		}
diff --git a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
index 2e9aaa5a15..fe373ecc7e 100644
--- a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
+++ b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
@@ -28,6 +28,7 @@ import org.springframework.aop.AfterReturningAdvice;
 @SuppressWarnings("serial")
 public class CountingAfterReturningAdvice extends MethodCounter implements AfterReturningAdvice {
 
+	@Override
 	public void afterReturning(Object o, Method m, Object[] args, Object target) throws Throwable {
 		count(m);
 	}
diff --git a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
index 3dc49faf24..89fc45aeb5 100644
--- a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
+++ b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
@@ -28,6 +28,7 @@ import org.springframework.aop.MethodBeforeAdvice;
 @SuppressWarnings("serial")
 public class CountingBeforeAdvice extends MethodCounter implements MethodBeforeAdvice {
 
+	@Override
 	public void before(Method m, Object[] args, Object target) throws Throwable {
 		count(m);
 	}
diff --git a/spring-context/src/test/java/test/aspect/PerTargetAspect.java b/spring-context/src/test/java/test/aspect/PerTargetAspect.java
index 47fb82e40b..b3d562e65f 100644
--- a/spring-context/src/test/java/test/aspect/PerTargetAspect.java
+++ b/spring-context/src/test/java/test/aspect/PerTargetAspect.java
@@ -25,6 +25,7 @@ public class PerTargetAspect implements Ordered {
 		++count;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
diff --git a/spring-context/src/test/java/test/beans/CustomScope.java b/spring-context/src/test/java/test/beans/CustomScope.java
index b047ae29c0..2f63f3cbfe 100644
--- a/spring-context/src/test/java/test/beans/CustomScope.java
+++ b/spring-context/src/test/java/test/beans/CustomScope.java
@@ -33,6 +33,7 @@ public class CustomScope implements Scope {
 
 	private Map<String, Object> beans = new HashMap<String, Object>();
 
+	@Override
 	public Object get(String name, ObjectFactory<?> objectFactory) {
 		if (createNewScope) {
 			beans.clear();
@@ -50,18 +51,22 @@ public class CustomScope implements Scope {
 		return beans.get(name);
 	}
 
+	@Override
 	public String getConversationId() {
 		return null;
 	}
 
+	@Override
 	public void registerDestructionCallback(String name, Runnable callback) {
 		// do nothing
 	}
 
+	@Override
 	public Object remove(String name) {
 		return beans.remove(name);
 	}
 
+	@Override
 	public Object resolveContextualObject(String key) {
 		return null;
 	}
diff --git a/spring-context/src/test/java/test/beans/NestedTestBean.java b/spring-context/src/test/java/test/beans/NestedTestBean.java
index 2a37c6b8c1..70736e816e 100644
--- a/spring-context/src/test/java/test/beans/NestedTestBean.java
+++ b/spring-context/src/test/java/test/beans/NestedTestBean.java
@@ -36,6 +36,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = ((company != null) ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-context/src/test/java/test/beans/TestBean.java b/spring-context/src/test/java/test/beans/TestBean.java
index c528573e4d..4e6489e168 100644
--- a/spring-context/src/test/java/test/beans/TestBean.java
+++ b/spring-context/src/test/java/test/beans/TestBean.java
@@ -120,6 +120,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -128,6 +129,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -144,10 +146,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -160,10 +164,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.sex = sex;
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -176,10 +182,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return spouse;
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouse = spouse;
 	}
@@ -280,10 +288,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -320,6 +330,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -347,12 +358,14 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
@@ -360,6 +373,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -367,9 +381,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -401,6 +417,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if ((this.name != null) && (other instanceof TestBean)) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-context/src/test/java/test/interceptor/NopInterceptor.java b/spring-context/src/test/java/test/interceptor/NopInterceptor.java
index 79158e74ea..ccda818994 100644
--- a/spring-context/src/test/java/test/interceptor/NopInterceptor.java
+++ b/spring-context/src/test/java/test/interceptor/NopInterceptor.java
@@ -32,6 +32,7 @@ public class NopInterceptor implements MethodInterceptor {
 	/**
 	 * @see org.aopalliance.intercept.MethodInterceptor#invoke(MethodInvocation)
 	 */
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		increment();
 		return invocation.proceed();
diff --git a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
index 3b8350e4c8..cec29e2749 100644
--- a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
+++ b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
@@ -35,10 +35,12 @@ public class SerializableNopInterceptor extends NopInterceptor implements Serial
 	 */
 	private int count;
 
+	@Override
 	public int getCount() {
 		return this.count;
 	}
 
+	@Override
 	protected void increment() {
 		++count;
 	}
diff --git a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
index 83761c2d3c..038d1cc6af 100644
--- a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
+++ b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
@@ -37,6 +37,7 @@ public class TimestampIntroductionInterceptor extends DelegatingIntroductionInte
 		this.ts = ts;
 	}
 
+	@Override
 	public long getTimeStamp() {
 		return ts;
 	}
diff --git a/spring-context/src/test/java/test/mixin/DefaultLockable.java b/spring-context/src/test/java/test/mixin/DefaultLockable.java
index 2510395bf6..ec739f29ee 100644
--- a/spring-context/src/test/java/test/mixin/DefaultLockable.java
+++ b/spring-context/src/test/java/test/mixin/DefaultLockable.java
@@ -26,14 +26,17 @@ public class DefaultLockable implements Lockable {
 
 	private boolean locked;
 
+	@Override
 	public void lock() {
 		this.locked = true;
 	}
 
+	@Override
 	public void unlock() {
 		this.locked = false;
 	}
 
+	@Override
 	public boolean locked() {
 		return this.locked;
 	}
diff --git a/spring-context/src/test/java/test/mixin/LockMixin.java b/spring-context/src/test/java/test/mixin/LockMixin.java
index b038bff1fd..5894f97a9b 100644
--- a/spring-context/src/test/java/test/mixin/LockMixin.java
+++ b/spring-context/src/test/java/test/mixin/LockMixin.java
@@ -34,10 +34,12 @@ public class LockMixin extends DelegatingIntroductionInterceptor implements Lock
 	/** This field demonstrates additional state in the mixin */
 	private boolean locked;
 
+	@Override
 	public void lock() {
 		this.locked = true;
 	}
 
+	@Override
 	public void unlock() {
 		this.locked = false;
 	}
@@ -45,6 +47,7 @@ public class LockMixin extends DelegatingIntroductionInterceptor implements Lock
 	/**
 	 * @see test.mixin.AopProxyTests.Lockable#locked()
 	 */
+	@Override
 	public boolean locked() {
 		return this.locked;
 	}
@@ -56,6 +59,7 @@ public class LockMixin extends DelegatingIntroductionInterceptor implements Lock
 	 * Lockable(this) then target behaviour.
 	 * @see org.aopalliance.MethodInterceptor#invoke(org.aopalliance.MethodInvocation)
 	 */
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		if (locked() && invocation.getMethod().getName().indexOf("set") == 0)
 			throw new LockedException();
diff --git a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
index c4681d4f4c..497400a7af 100644
--- a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -48,12 +48,14 @@ public class DerivedTestBean extends TestBean implements Serializable {
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		if (this.beanName == null || beanName == null) {
 			this.beanName = beanName;
 		}
 	}
 
+	@Override
 	public String getBeanName() {
 		return beanName;
 	}
@@ -72,10 +74,12 @@ public class DerivedTestBean extends TestBean implements Serializable {
 	}
 
 
+	@Override
 	public void destroy() {
 		this.destroyed = true;
 	}
 
+	@Override
 	public boolean wasDestroyed() {
 		return destroyed;
 	}
diff --git a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
index 0eb8df5c8a..e136978f9e 100644
--- a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-core/src/test/java/org/springframework/beans/TestBean.java b/spring-core/src/test/java/org/springframework/beans/TestBean.java
index 2e08e2c034..3fef4caba0 100644
--- a/spring-core/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-core/src/test/java/org/springframework/beans/TestBean.java
@@ -148,10 +148,12 @@ public class TestBean implements ITestBean, IOther, Comparable {
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -167,10 +169,12 @@ public class TestBean implements ITestBean, IOther, Comparable {
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -183,14 +187,17 @@ public class TestBean implements ITestBean, IOther, Comparable {
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -217,10 +224,12 @@ public class TestBean implements ITestBean, IOther, Comparable {
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -289,6 +298,7 @@ public class TestBean implements ITestBean, IOther, Comparable {
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -297,6 +307,7 @@ public class TestBean implements ITestBean, IOther, Comparable {
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -329,6 +340,7 @@ public class TestBean implements ITestBean, IOther, Comparable {
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -357,18 +369,21 @@ public class TestBean implements ITestBean, IOther, Comparable {
 	/**
 	 * @see ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 	/**
 	 * @see ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -376,9 +391,11 @@ public class TestBean implements ITestBean, IOther, Comparable {
 	/**
 	 * @see IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -408,6 +425,7 @@ public class TestBean implements ITestBean, IOther, Comparable {
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
index 03a192119d..e14e03181e 100644
--- a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
+++ b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
@@ -32,6 +32,7 @@ public class AttributeAccessorSupportTests extends TestCase {
 
 	private AttributeAccessor attributeAccessor;
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void setUp() throws Exception {
 		this.attributeAccessor = new AttributeAccessorSupport() {
@@ -64,6 +65,7 @@ public class AttributeAccessorSupportTests extends TestCase {
 		assertTrue(Arrays.binarySearch(attributeNames, NAME) > -1);
 		assertTrue(Arrays.binarySearch(attributeNames, "abc") > -1);
 	}
+	@Override
 	protected void tearDown() throws Exception {
 		this.attributeAccessor.removeAttribute(NAME);
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
index 98c4a54314..d1f09e0576 100644
--- a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
@@ -356,9 +356,11 @@ public class BridgeMethodResolverTests {
 		public void someMethod(Integer theArg, Object otherArg) {
 		}
 
+		@Override
 		public void someMethod(String theArg, Object otherArg) {
 		}
 
+		@Override
 		public void someVarargMethod(String theArg, Object... otherArgs) {
 		}
 	}
@@ -383,6 +385,7 @@ public class BridgeMethodResolverTests {
 
 	public static class MyBar extends InterBar<String> {
 
+		@Override
 		public void someMethod(String theArg, Object otherArg) {
 		}
 
@@ -399,6 +402,7 @@ public class BridgeMethodResolverTests {
 
 	public abstract class AbstractDateAdder implements Adder<Date> {
 
+		@Override
 		public abstract void add(Date date);
 	}
 
@@ -430,6 +434,7 @@ public class BridgeMethodResolverTests {
 
 			public class ExtendsReallyDeepNow extends ReallyDeepNow<Long> {
 
+				@Override
 				void someMethod(Integer s, String t, Long r) {
 					throw new UnsupportedOperationException();
 				}
@@ -448,10 +453,12 @@ public class BridgeMethodResolverTests {
 
 	public class MyBoo implements Boo<String, Integer> {
 
+		@Override
 		public void foo(String e) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public void foo(Integer t) {
 			throw new UnsupportedOperationException();
 		}
@@ -478,12 +485,14 @@ public class BridgeMethodResolverTests {
 
 	public interface SettingsDao<T extends Settings, S> extends Dao<T, S> {
 
+		@Override
 		T load();
 	}
 
 
 	public interface ConcreteSettingsDao extends SettingsDao<ConcreteSettings, String> {
 
+		@Override
 		String loadFromParent();
 	}
 
@@ -500,6 +509,7 @@ public class BridgeMethodResolverTests {
 		}
 
 		//@Transactional(readOnly = true)
+		@Override
 		public S loadFromParent() {
 			return otherObject;
 		}
@@ -513,6 +523,7 @@ public class BridgeMethodResolverTests {
 		}
 
 		//@Transactional(readOnly = true)
+		@Override
 		public ConcreteSettings load() {
 			return super.object;
 		}
@@ -527,6 +538,7 @@ public class BridgeMethodResolverTests {
 
 	private static class AbstractBounded<E> implements Bounded<E> {
 
+		@Override
 		public boolean boundedOperation(E myE) {
 			return true;
 		}
@@ -535,6 +547,7 @@ public class BridgeMethodResolverTests {
 
 	private static class SerializableBounded<E extends HashMap & Delayed> extends AbstractBounded<E> {
 
+		@Override
 		public boolean boundedOperation(E myE) {
 			return false;
 		}
@@ -549,6 +562,7 @@ public class BridgeMethodResolverTests {
 
 	private static class StringGenericParameter implements GenericParameter<String> {
 
+		@Override
 		public String getFor(Class<String> cls) {
 			return "foo";
 		}
@@ -561,94 +575,117 @@ public class BridgeMethodResolverTests {
 
 	private static class StringList implements List<String> {
 
+		@Override
 		public int size() {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public boolean isEmpty() {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public boolean contains(Object o) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public Iterator<String> iterator() {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public Object[] toArray() {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public <T> T[] toArray(T[] a) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public boolean add(String o) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public boolean remove(Object o) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public boolean containsAll(Collection<?> c) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public boolean addAll(Collection<? extends String> c) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public boolean addAll(int index, Collection<? extends String> c) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public boolean removeAll(Collection<?> c) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public boolean retainAll(Collection<?> c) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public void clear() {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public String get(int index) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public String set(int index, String element) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public void add(int index, String element) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public String remove(int index) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public int indexOf(Object o) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public int lastIndexOf(Object o) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public ListIterator<String> listIterator() {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public ListIterator<String> listIterator(int index) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public List<String> subList(int fromIndex, int toIndex) {
 			throw new UnsupportedOperationException();
 		}
@@ -665,6 +702,7 @@ public class BridgeMethodResolverTests {
 
 		private int priority;
 
+		@Override
 		public int getPriority() {
 			return priority;
 		}
@@ -743,6 +781,7 @@ public class BridgeMethodResolverTests {
 		 */
 		public abstract Receiver<T> getInstance();
 
+		@Override
 		public void setChannel(Channel channel) {
 			this.channel = channel;
 		}
@@ -753,10 +792,12 @@ public class BridgeMethodResolverTests {
 			this.beanName = name;
 		}
 
+		@Override
 		public void subscribe() {
 
 		}
 
+		@Override
 		public void unsubscribe() {
 
 		}
@@ -800,6 +841,7 @@ public class BridgeMethodResolverTests {
 			super(NewMessageEvent.class);
 		}
 
+		@Override
 		public void receive(MessageEvent event) {
 			throw new UnsupportedOperationException("should not be called, use subclassed events");
 		}
@@ -861,6 +903,7 @@ public class BridgeMethodResolverTests {
 		public void setRepos(R... reps) {
 		}
 
+		@Override
 		public <T> SimpleGenericRepository<T> getFor(Class<T> entityType) {
 			return null;
 		}
@@ -896,40 +939,50 @@ public class BridgeMethodResolverTests {
 		public void setPersistentClass(Class<T> c) {
 		}
 
+		@Override
 		public Class<T> getPersistentClass() {
 			return null;
 		}
 
+		@Override
 		public T findById(ID id, boolean lock) {
 			return null;
 		}
 
+		@Override
 		public List<T> findAll() {
 			return null;
 		}
 
+		@Override
 		public List<T> findByExample(T exampleInstance) {
 			return null;
 		}
 
+		@Override
 		public List<T> findByQuery() {
 			return null;
 		}
 
+		@Override
 		public T saveOrUpdate(T entity) {
 			return null;
 		}
 
+		@Override
 		public void delete(T entity) {
 		}
 
+		@Override
 		public T refresh(T entity) {
 			return null;
 		}
 
+		@Override
 		public void delete(ID id) {
 		}
 
+		@Override
 		public void delete(Collection<T> entities) {
 		}
 	}
@@ -937,9 +990,11 @@ public class BridgeMethodResolverTests {
 
 	public class HibernateRepositoryRegistry extends SettableRepositoryRegistry<GenericHibernateRepository<?, ?>> {
 
+		@Override
 		public void injectInto(GenericHibernateRepository<?, ?> rep) {
 		}
 
+		@Override
 		public <T> GenericHibernateRepository<T, ?> getFor(Class<T> entityType) {
 			return null;
 		}
@@ -958,6 +1013,7 @@ public class BridgeMethodResolverTests {
 
 	public class MyHomer<T extends Bounded<T>, L extends T> implements Homer<L> {
 
+		@Override
 		public void foo(L t) {
 			throw new UnsupportedOperationException();
 		}
@@ -966,6 +1022,7 @@ public class BridgeMethodResolverTests {
 
 	public class YourHomer<T extends AbstractBounded<T>, L extends T> extends MyHomer<T, L> {
 
+		@Override
 		public void foo(L t) {
 			throw new UnsupportedOperationException();
 		}
@@ -984,6 +1041,7 @@ public class BridgeMethodResolverTests {
 
 	public class GenericSqlMapDao<T extends Serializable> implements ConvenienceGenericDao<T> {
 
+		@Override
 		public void saveOrUpdate(T t) {
 			throw new UnsupportedOperationException();
 		}
@@ -992,6 +1050,7 @@ public class BridgeMethodResolverTests {
 
 	public class GenericSqlMapIntegerDao<T extends Integer> extends GenericSqlMapDao<T> {
 
+		@Override
 		public void saveOrUpdate(T t) {
 		}
 	}
@@ -1027,9 +1086,11 @@ public class BridgeMethodResolverTests {
 
 	public class UserDaoImpl extends AbstractDao<User> implements UserDao {
 
+		@Override
 		public void save(Permission perm) {
 		}
 
+		@Override
 		public void saveVararg(User user, Object... args) {
 		}
 	}
@@ -1053,9 +1114,11 @@ public class BridgeMethodResolverTests {
 
 	public class BusinessDao extends BusinessGenericDao<Business<?>, Long> {
 
+	@Override
 	public void save(Business<?> business) {
 	}
 
+		@Override
 		public Business<?> get(Long id) {
 			return null;
 		}
@@ -1110,6 +1173,7 @@ public class BridgeMethodResolverTests {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public void receive(MegaMessageEvent event) {
 			throw new UnsupportedOperationException();
 		}
@@ -1136,6 +1200,7 @@ public class BridgeMethodResolverTests {
 
 	private static abstract class AbstractImplementsInterface<D extends DomainObjectSuper> implements IGenericInterface<D> {
 
+		@Override
 		public <T> void doSomething(D domainObject, T value) {
 		}
 
@@ -1175,10 +1240,12 @@ public class BridgeMethodResolverTests {
 
 	private static class DomainObject extends AbstractDomainObject<ParameterType, byte[]> {
 
+		@Override
 		public byte[] method1(ParameterType p) {
 			return super.method1(p);
 		}
 
+		@Override
 		public void method2(ParameterType p, byte[] r) {
 			super.method2(p, r);
 		}
@@ -1215,6 +1282,7 @@ public class BridgeMethodResolverTests {
 	public static class ExternalMessageProvider<S extends ExternalMessage, T extends ExternalMessageSearchConditions<S>>
 			implements IExternalMessageProvider<S, T> {
 
+		@Override
 		public Collection<S> findBy(T conditions) {
 			return null;
 		}
@@ -1235,6 +1303,7 @@ public class BridgeMethodResolverTests {
 
 	public static class TestEmailProvider extends EmailMessageProvider {
 
+		@Override
 		public Collection<EmailMessage> findBy(EmailSearchConditions conditions) {
 			return null;
 		}
diff --git a/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java
index ea011aa984..8f354e8253 100644
--- a/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java
+++ b/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java
@@ -30,6 +30,7 @@ public class DefaultControlFlowTests extends AbstractControlFlowTests {
 	public void testThisClassPlease() {
 	}
 
+	@Override
 	protected ControlFlow createControlFlow() {
 		return ControlFlowFactory.createControlFlow();
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
index d86ed5ebb6..1d0b3f7510 100644
--- a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
@@ -36,6 +36,7 @@ import org.springframework.core.io.Resource;
  */
 public class GenericCollectionTypeResolverTests extends AbstractGenericsTests {
 
+	@Override
 	protected void setUp() throws Exception {
 		this.targetClass = Foo.class;
 		this.methods = new String[] {"a", "b", "b2", "b3", "c", "d", "d2", "d3", "e", "e2", "e3"};
@@ -44,6 +45,7 @@ public class GenericCollectionTypeResolverTests extends AbstractGenericsTests {
 			Integer.class, Integer.class, Integer.class, Integer.class, Integer.class};
 	}
 
+	@Override
 	protected Type getType(Method method) {
 		return GenericCollectionTypeResolver.getMapValueReturnType(method);
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java
index 281141361e..8acc0645d3 100644
--- a/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java
+++ b/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java
@@ -30,6 +30,7 @@ public class Jdk14ControlFlowTests extends AbstractControlFlowTests {
 	public void testThisClassPlease() {
 	}
 
+	@Override
 	protected ControlFlow createControlFlow() {
 		return ControlFlowFactory.createControlFlow();
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java b/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java
index 9c9d515bab..602000ac7c 100644
--- a/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java
@@ -30,6 +30,7 @@ public final class OrderComparatorTests extends TestCase {
 	private Comparator comparator;
 
 
+	@Override
 	protected void setUp() throws Exception {
 		this.comparator = new OrderComparator();
 	}
@@ -64,6 +65,7 @@ public final class OrderComparatorTests extends TestCase {
 			this.order = order;
 		}
 
+		@Override
 		public int getOrder() {
 			return this.order;
 		}
diff --git a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
index b5480482e4..3cf0875625 100644
--- a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
+++ b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
@@ -31,18 +31,22 @@ public class PrioritizedParameterNameDiscovererTests extends TestCase {
 	private static final String[] SOMETHING_ELSE = new String[] { "something", "else" };
 
 	ParameterNameDiscoverer returnsFooBar = new ParameterNameDiscoverer() {
+		@Override
 		public String[] getParameterNames(Method m) {
 			return FOO_BAR;
 		}
+		@Override
 		public String[] getParameterNames(Constructor ctor) {
 			return FOO_BAR;
 		}
 	};
 
 	ParameterNameDiscoverer returnsSomethingElse = new ParameterNameDiscoverer() {
+		@Override
 		public String[] getParameterNames(Method m) {
 			return SOMETHING_ELSE;
 		}
+		@Override
 		public String[] getParameterNames(Constructor ctor) {
 			return SOMETHING_ELSE;
 		}
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 b02c6c3aaa..0c5d88f334 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
@@ -258,6 +258,7 @@ public class AnnotationUtilsTests {
 
 		}
 
+		@Override
 		public void fromInterfaceImplementedByRoot() {
 
 		}
@@ -290,6 +291,7 @@ public class AnnotationUtilsTests {
 
 	public static class SimpleFoo extends Foo<String> {
 
+		@Override
 		@Transactional
 		public void something(final String arg) {
 
@@ -339,12 +341,14 @@ public class AnnotationUtilsTests {
 
 	public static class ImplementsInterfaceWithAnnotatedMethod implements InterfaceWithAnnotatedMethod {
 
+		@Override
 		public void foo() {
 		}
 	}
 
 	public static class SubOfImplementsInterfaceWithAnnotatedMethod extends ImplementsInterfaceWithAnnotatedMethod {
 
+		@Override
 		public void foo() {
 		}
 	}
@@ -354,6 +358,7 @@ public class AnnotationUtilsTests {
 
 	public static class SubOfAbstractImplementsInterfaceWithAnnotatedMethod extends AbstractDoesNotImplementInterfaceWithAnnotatedMethod {
 
+		@Override
 		public void foo() {
 		}
 	}
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 21d87d9b15..90e2bf893b 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
@@ -255,34 +255,42 @@ public class TypeDescriptorTests {
 
 	public class IntegerType implements GenericType<Integer> {
 
+		@Override
 		public Integer getProperty() {
 			return null;
 		}
 
+		@Override
 		public void setProperty(Integer t) {
 		}
 
+		@Override
 		public List<Integer> getListProperty() {
 			return null;
 		}
 
+		@Override
 		public void setListProperty(List<Integer> t) {
 		}
 	}
 
 	public class NumberType implements GenericType<Number> {
 
+		@Override
 		public Integer getProperty() {
 			return null;
 		}
 
+		@Override
 		public void setProperty(Number t) {
 		}
 
+		@Override
 		public List<Number> getListProperty() {
 			return null;
 		}
 
+		@Override
 		public void setListProperty(List<Number> t) {
 		}
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java b/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java
index 500fd9c0e5..4cadfe7406 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java
@@ -120,6 +120,7 @@ public class ConvertingComparatorTests {
 
 	private static class StringToInteger implements Converter<String, Integer> {
 
+		@Override
 		public Integer convert(String source) {
 			return new Integer(source);
 		}
@@ -131,6 +132,7 @@ public class ConvertingComparatorTests {
 
 		private boolean called;
 
+		@Override
 		public int compare(Integer o1, Integer o2) {
 			assertThat(o1, instanceOf(Integer.class));
 			assertThat(o2, instanceOf(Integer.class));
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 6c16ee75a3..96f3fc71df 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
@@ -223,50 +223,62 @@ public class CollectionToCollectionConverterTests {
 
 	public static abstract class BaseResource implements Resource {
 
+		@Override
 		public InputStream getInputStream() throws IOException {
 			return null;
 		}
 
+		@Override
 		public boolean exists() {
 			return false;
 		}
 
+		@Override
 		public boolean isReadable() {
 			return false;
 		}
 
+		@Override
 		public boolean isOpen() {
 			return false;
 		}
 
+		@Override
 		public URL getURL() throws IOException {
 			return null;
 		}
 
+		@Override
 		public URI getURI() throws IOException {
 			return null;
 		}
 
+		@Override
 		public File getFile() throws IOException {
 			return null;
 		}
 
+		@Override
 		public long contentLength() throws IOException {
 			return 0;
 		}
 
+		@Override
 		public long lastModified() throws IOException {
 			return 0;
 		}
 
+		@Override
 		public Resource createRelative(String relativePath) throws IOException {
 			return null;
 		}
 
+		@Override
 		public String getFilename() {
 			return null;
 		}
 
+		@Override
 		public String getDescription() {
 			return null;
 		}
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 c0495b5213..38f3c835e5 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
@@ -307,6 +307,7 @@ public class DefaultConversionTests {
 	}
 
 	public class ColorConverter implements Converter<String, Color> {
+		@Override
 		public Color convert(String source) { if (!source.startsWith("#")) source = "#" + source; return Color.decode(source); }
 	}
 
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 b5ede248ed..41333498ba 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
@@ -143,6 +143,7 @@ public class GenericConversionServiceTests {
 	public void addConverterNoSourceTargetClassInfoAvailable() {
 		try {
 			conversionService.addConverter(new Converter() {
+				@Override
 				public Object convert(Object source) {
 					return source;
 				}
@@ -201,6 +202,7 @@ public class GenericConversionServiceTests {
 	@Test
 	public void convertSuperSourceType() {
 		conversionService.addConverter(new Converter<CharSequence, Integer>() {
+			@Override
 			public Integer convert(CharSequence source) {
 				return Integer.valueOf(source.toString());
 			}
@@ -218,6 +220,7 @@ public class GenericConversionServiceTests {
 	}
 
 	public class ColorConverter implements Converter<String, Color> {
+		@Override
 		public Color convert(String source) { if (!source.startsWith("#")) source = "#" + source; return Color.decode(source); }
 	}
 
@@ -503,6 +506,7 @@ public class GenericConversionServiceTests {
 
 	private static class MyBaseInterfaceConverter implements Converter<MyBaseInterface, String> {
 
+		@Override
 		public String convert(MyBaseInterface source) {
 			return "RESULT";
 		}
@@ -511,6 +515,7 @@ public class GenericConversionServiceTests {
 
 	private static class MyStringArrayToResourceArrayConverter implements Converter<String[], Resource[]>	{
 
+		@Override
 		public Resource[] convert(String[] source) {
 			Resource[] result = new Resource[source.length];
 			for (int i = 0; i < source.length; i++) {
@@ -523,6 +528,7 @@ public class GenericConversionServiceTests {
 
 	private static class MyStringArrayToIntegerArrayConverter implements Converter<String[], Integer[]>	{
 
+		@Override
 		public Integer[] convert(String[] source) {
 			Integer[] result = new Integer[source.length];
 			for (int i = 0; i < source.length; i++) {
@@ -535,6 +541,7 @@ public class GenericConversionServiceTests {
 
 	private static class MyStringToIntegerArrayConverter implements Converter<String, Integer[]>	{
 
+		@Override
 		public Integer[] convert(String source) {
 			String[] srcArray = StringUtils.commaDelimitedListToStringArray(source);
 			Integer[] result = new Integer[srcArray.length];
@@ -673,10 +680,12 @@ public class GenericConversionServiceTests {
 		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) {
 				return null;
@@ -716,6 +725,7 @@ public class GenericConversionServiceTests {
 	public void convertCannotOptimizeArray() throws Exception {
 		GenericConversionService conversionService = new GenericConversionService();
 		conversionService.addConverter(new Converter<Byte, Byte>() {
+			@Override
 			public Byte convert(Byte source) {
 				return (byte) (source + 1);
 			}
@@ -764,11 +774,13 @@ public class GenericConversionServiceTests {
 
 		private int matchAttempts = 0;
 
+		@Override
 		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			matchAttempts++;
 			return false;
 		}
 
+		@Override
 		public Color convert(String source) {
 			throw new IllegalStateException();
 		}
@@ -783,15 +795,18 @@ public class GenericConversionServiceTests {
 
 		private List<TypeDescriptor> sourceTypes = new ArrayList<TypeDescriptor>();
 
+		@Override
 		public Set<ConvertiblePair> getConvertibleTypes() {
 			return null;
 		}
 
+		@Override
 		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			sourceTypes.add(sourceType);
 			return false;
 		}
 
+		@Override
 		public Object convert(Object source, TypeDescriptor sourceType,
 				TypeDescriptor targetType) {
 			return null;
@@ -809,11 +824,13 @@ public class GenericConversionServiceTests {
 
 		private int matchAttempts = 0;
 
+		@Override
 		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			matchAttempts++;
 			return true;
 		}
 
+		@Override
 		@SuppressWarnings("unchecked")
 		public <T extends Color> Converter<String, T> getConverter(Class<T> targetType) {
 			return (Converter<String, T>) converter;
@@ -834,6 +851,7 @@ public class GenericConversionServiceTests {
 
 	public static enum MyEnum implements MyEnumInterface {
 		A {
+			@Override
 			public String getCode() {
 				return "1";
 			}
@@ -842,6 +860,7 @@ public class GenericConversionServiceTests {
 
 	private static class MyEnumInterfaceToStringConverter<T extends MyEnumInterface>
 			implements Converter<T, String> {
+		@Override
 		public String convert(T source) {
 			return source.getCode();
 		}
diff --git a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
index f3d6258fbb..c9f0eae2a5 100644
--- a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
+++ b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
@@ -136,6 +136,7 @@ public class LabeledEnumTests extends TestCase {
 
 		public static final Dog GOLDEN_RETRIEVER = new Dog(11, null) {
 
+			@Override
 			public String getLabel() {
 				return "Golden Retriever";
 			}
@@ -143,6 +144,7 @@ public class LabeledEnumTests extends TestCase {
 			// Overriding getType() is no longer necessary as of Spring 2.5;
 			// however, this is left here to provide valid testing for
 			// backwards compatibility.
+			@Override
 			public Class getType() {
 				return Dog.class;
 			}
@@ -165,12 +167,14 @@ public class LabeledEnumTests extends TestCase {
 	private static abstract class ValuedEnum extends StaticLabeledEnum {
 
 		public static final ValuedEnum ONE = new ValuedEnum(1, "one") {
+			@Override
 			public int getValue() {
 				return 1;
 			}
 		};
 
 		public static final ValuedEnum TWO = new ValuedEnum(2, "two") {
+			@Override
 			public int getValue() {
 				return 2;
 			}
diff --git a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
index 469795437c..2da1da5164 100644
--- a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
@@ -186,9 +186,11 @@ public class ResourceTests {
 		final String name = "test-resource";
 
 		Resource resource = new AbstractResource() {
+			@Override
 			public String getDescription() {
 				return name;
 			}
+			@Override
 			public InputStream getInputStream() {
 				return null;
 			}
@@ -222,9 +224,11 @@ public class ResourceTests {
 	@Test
 	public void testContentLength() throws IOException {
 		AbstractResource resource = new AbstractResource() {
+			@Override
 			public InputStream getInputStream() throws IOException {
 				return new ByteArrayInputStream(new byte[] { 'a', 'b', 'c' });
 			}
+			@Override
 			public String getDescription() {
 				return null;
 			}
@@ -235,9 +239,11 @@ public class ResourceTests {
 	@Test(expected=IllegalStateException.class)
 	public void testContentLength_withNullInputStream() throws IOException {
 		AbstractResource resource = new AbstractResource() {
+			@Override
 			public InputStream getInputStream() throws IOException {
 				return null;
 			}
+			@Override
 			public String getDescription() {
 				return null;
 			}
diff --git a/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory1.java b/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory1.java
index d1b6fa034d..11dd7ebf48 100644
--- a/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory1.java
+++ b/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory1.java
@@ -26,6 +26,7 @@ import org.springframework.core.annotation.Order;
 @Order(1)
 public class MyDummyFactory1 implements DummyFactory {
 
+	@Override
 	public String getString() {
 		return "Foo";
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory2.java b/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory2.java
index 4872d0053e..5105c6b47e 100644
--- a/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory2.java
+++ b/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory2.java
@@ -26,6 +26,7 @@ import org.springframework.core.annotation.Order;
 @Order(2)
 public class MyDummyFactory2 implements DummyFactory {
 
+	@Override
 	public String getString() {
 		return "Bar";
 	}
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 f8db4e7fd9..576ab73814 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
@@ -33,6 +33,7 @@ public class ToStringCreatorTests extends TestCase {
 
 	private SomeObject s1, s2, s3;
 
+	@Override
 	protected void setUp() throws Exception {
 		s1 = new SomeObject() {
 			public String toString() {
diff --git a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
index 78ced2402f..b7a6d5c381 100644
--- a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
@@ -56,6 +56,7 @@ public final class SimpleAsyncTaskExecutorTests extends TestCase {
 	public void testThreadFactoryOverridesDefaults() throws Exception {
 		final Object monitor = new Object();
 		SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor(new ThreadFactory() {
+			@Override
 			public Thread newThread(Runnable r) {
 				return new Thread(r, "test");
 			}
@@ -88,6 +89,7 @@ public final class SimpleAsyncTaskExecutorTests extends TestCase {
 
 	private static final class NoOpRunnable implements Runnable {
 
+		@Override
 		public void run() {
 			// no-op
 		}
@@ -102,6 +104,7 @@ public final class SimpleAsyncTaskExecutorTests extends TestCase {
 			this.monitor = monitor;
 		}
 
+		@Override
 		public final void run() {
 			synchronized (this.monitor) {
 				try {
@@ -129,6 +132,7 @@ public final class SimpleAsyncTaskExecutorTests extends TestCase {
 			return this.threadName;
 		}
 
+		@Override
 		protected void doRun() {
 			this.threadName = Thread.currentThread().getName();
 		}
diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
index d7bdd36e41..b82a952c26 100644
--- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
+++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
@@ -85,6 +85,7 @@ public class AutoPopulatingListTests extends TestCase {
 
 	private static class MockElementFactory implements AutoPopulatingList.ElementFactory {
 
+		@Override
 		public Object createElement(int index) {
 			TestBean bean = new TestBean();
 			bean.setAge(index);
diff --git a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
index 57a2998e0b..fe70ac344d 100644
--- a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
+++ b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
@@ -99,6 +99,7 @@ public class CachingMapDecoratorTests extends TestCase {
 
 		private boolean createCalled;
 
+		@Override
 		protected String create(String key) {
 			createCalled = true;
 			return (key != null ? "expensive value to cache" : null);
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 8b7fdff79a..96146d31a8 100644
--- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
@@ -41,6 +41,7 @@ import org.springframework.beans.TestBean;
  */
 public class ClassUtilsTests extends TestCase {
 
+	@Override
 	public void setUp() {
 		InnerClass.noArgCalled = false;
 		InnerClass.argCalled = false;
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 5d35e6c059..f9a6d1070e 100644
--- a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java
@@ -490,6 +490,7 @@ public class ConcurrentReferenceHashMapTests {
 		StopWatch mapTime = timeMultiThreaded("SynchronizedMap", synchronizedMap,
 				new ValueFactory<WeakReference<String>>() {
 
+					@Override
 					public WeakReference<String> newValue(int v) {
 						return new WeakReference<String>(String.valueOf(v));
 					}
@@ -500,6 +501,7 @@ public class ConcurrentReferenceHashMapTests {
 		StopWatch cacheTime = timeMultiThreaded("WeakConcurrentCache", this.map,
 				new ValueFactory<String>() {
 
+					@Override
 					public String newValue(int v) {
 						return String.valueOf(v);
 					}
@@ -650,18 +652,22 @@ public class ConcurrentReferenceHashMapTests {
 			this.queue = queue;
 		}
 
+		@Override
 		public Entry<K, V> get() {
 			return this.entry;
 		}
 
+		@Override
 		public int getHash() {
 			return this.hash;
 		}
 
+		@Override
 		public Reference<K, V> getNext() {
 			return this.next;
 		}
 
+		@Override
 		public void release() {
 			this.queue.add(this);
 			this.entry = null;
diff --git a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
index 5eaa203ef5..94e790d97e 100644
--- a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
@@ -73,6 +73,7 @@ public class FileSystemUtilsTests extends TestCase {
 		assertTrue(!src.exists());
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		File tmp = new File("./tmp");
 		if (tmp.exists()) {
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 bb9e5700fe..356fad6b53 100644
--- a/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java
+++ b/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java
@@ -227,6 +227,7 @@ public class MethodInvokerTests extends TestCase {
 
 	private static class Purchaser implements Greetable {
 
+		@Override
 		public String getGreeting() {
 			return "hello";
 		}
@@ -235,6 +236,7 @@ public class MethodInvokerTests extends TestCase {
 
 	private static class Shopper extends Purchaser implements Person {
 
+		@Override
 		public String getGreeting() {
 			return "may I help you?";
 		}
@@ -243,6 +245,7 @@ public class MethodInvokerTests extends TestCase {
 
 	private static class Salesman implements Person {
 
+		@Override
 		public String getGreeting() {
 			return "how are sales?";
 		}
@@ -251,6 +254,7 @@ public class MethodInvokerTests extends TestCase {
 
 	private static class Customer extends Shopper {
 
+		@Override
 		public String getGreeting() {
 			return "good day";
 		}
@@ -265,6 +269,7 @@ public class MethodInvokerTests extends TestCase {
 			this.name = name;
 		}
 
+		@Override
 		public String getGreeting() {
 			return "welcome back " + name ;
 		}
@@ -277,6 +282,7 @@ public class MethodInvokerTests extends TestCase {
 			super(name);
 		}
 
+		@Override
 		public String getGreeting() {
 			return "whassup dude?";
 		}
diff --git a/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java
index 13e662d381..be48ab08ff 100644
--- a/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java
+++ b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java
@@ -34,6 +34,7 @@ public class MockLog4jAppender extends AppenderSkeleton {
 	/* (non-Javadoc)
 	 * @see org.apache.log4j.AppenderSkeleton#append(org.apache.log4j.spi.LoggingEvent)
 	 */
+	@Override
 	protected void append(LoggingEvent evt) {
 		//System.out.println("Adding " + evt.getMessage());
 		loggingStrings.add(evt.getMessage());
@@ -42,6 +43,7 @@ public class MockLog4jAppender extends AppenderSkeleton {
 	/* (non-Javadoc)
 	 * @see org.apache.log4j.Appender#close()
 	 */
+	@Override
 	public void close() {
 		closeCalled = true;
 	}
@@ -49,6 +51,7 @@ public class MockLog4jAppender extends AppenderSkeleton {
 	/* (non-Javadoc)
 	 * @see org.apache.log4j.Appender#requiresLayout()
 	 */
+	@Override
 	public boolean requiresLayout() {
 		return false;
 	}
diff --git a/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java b/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java
index d353cb9e0a..20bb969c6e 100644
--- a/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java
+++ b/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java
@@ -82,6 +82,7 @@ public class PropertyPlaceholderHelperTests {
 
 		assertEquals("foo=bar",
 				this.helper.replacePlaceholders(text, new PropertyPlaceholderHelper.PlaceholderResolver() {
+					@Override
 					public String resolvePlaceholder(String placeholderName) {
 						if ("foo".equals(placeholderName)) {
 							return "bar";
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 20d69e05b4..512b9af993 100644
--- a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
@@ -212,6 +212,7 @@ public class ReflectionUtilsTests {
 	public void doWithProtectedMethods() {
 		ListSavingMethodCallback mc = new ListSavingMethodCallback();
 		ReflectionUtils.doWithMethods(TestBean.class, mc, new ReflectionUtils.MethodFilter() {
+			@Override
 			public boolean matches(Method m) {
 				return Modifier.isProtected(m.getModifiers());
 			}
@@ -353,6 +354,7 @@ public class ReflectionUtilsTests {
 
 		private List<Method> methods = new LinkedList<Method>();
 
+		@Override
 		public void doWith(Method m) throws IllegalArgumentException, IllegalAccessException {
 			this.methodNames.add(m.getName());
 			this.methods.add(m);
diff --git a/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java
index 923c9fe5ac..7e47d99f5b 100644
--- a/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java
@@ -63,6 +63,7 @@ public class ResourceUtilsTests extends TestCase {
 	 */
 	private static class DummyURLStreamHandler extends URLStreamHandler {
 
+		@Override
 		protected URLConnection openConnection(URL url) throws IOException {
 			throw new UnsupportedOperationException();
 		}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
index bbf14c1227..516e7ce66e 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
@@ -173,6 +173,7 @@ public class ConstructorInvocationTests extends ExpressionTestCase {
 
 	static class DummyConstructorResolver implements ConstructorResolver {
 
+		@Override
 		public ConstructorExecutor resolve(EvaluationContext context, String typeName, List<TypeDescriptor> argumentTypes)
 				throws AccessException {
 			throw new UnsupportedOperationException("Auto-generated method stub");
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
index 56e26f30da..aeb991ab55 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
@@ -608,6 +608,7 @@ public class EvaluationTests extends ExpressionTestCase {
 
 	static class CustomMethodResolver implements MethodResolver {
 
+		@Override
 		public MethodExecutor resolve(EvaluationContext context,
 				Object targetObject, String name,
 				List<TypeDescriptor> argumentTypes) throws AccessException {
@@ -617,6 +618,7 @@ public class EvaluationTests extends ExpressionTestCase {
 
 	static class CustomMethodFilter implements MethodFilter {
 
+		@Override
 		public List<Method> filter(List<Method> methods) {
 			return null;
 		}
@@ -1373,6 +1375,7 @@ public class EvaluationTests extends ExpressionTestCase {
 
 	static class MyBeanResolver implements BeanResolver {
 
+		@Override
 		public Object resolve(EvaluationContext context, String beanName)
 				throws AccessException {
 			if (beanName.equals("foo") || beanName.equals("bar")) {
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
index b225aa66df..ca8a5db519 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
@@ -256,22 +256,27 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 		/**
 		 * Null means you might be able to read any property, if an earlier property resolver hasn't beaten you to it
 		 */
+		@Override
 		public Class<?>[] getSpecificTargetClasses() {
 			return null;
 		}
 
+		@Override
 		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 			return propertyMap.containsKey(name);
 		}
 
+		@Override
 		public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 			return new TypedValue(propertyMap.get(name));
 		}
 
+		@Override
 		public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 			return false;
 		}
 
+		@Override
 		public void write(EvaluationContext context, Object target, String name, Object newValue)
 				throws AccessException {
 		}
@@ -295,22 +300,27 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 		/**
 		 * Null means you might be able to read any property, if an earlier property resolver hasn't beaten you to it
 		 */
+		@Override
 		public Class<?>[] getSpecificTargetClasses() {
 			return null;
 		}
 
+		@Override
 		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 			return propertyMap.containsKey(name);
 		}
 
+		@Override
 		public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 			return new TypedValue(propertyMap.get(name));
 		}
 
+		@Override
 		public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 			return false;
 		}
 
+		@Override
 		public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException {
 		}
 
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
index 9f4d22b363..a9b24b1b38 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
@@ -182,10 +182,12 @@ public class ExpressionTestsUsingCoreConversionService extends ExpressionTestCas
 
 		private final ConversionService service = new DefaultConversionService();
 
+		@Override
 		public boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			return this.service.canConvert(sourceType, targetType);
 		}
 
+		@Override
 		public Object convertValue(Object value, TypeDescriptor sourceType, TypeDescriptor targetType) throws EvaluationException {
 			return this.service.convert(value, sourceType, targetType);
 		}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
index f94503828b..aebe158468 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
@@ -62,24 +62,29 @@ public class IndexingTests {
 
 	public static class MapAccessor implements PropertyAccessor {
 
+		@Override
 		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 			return (((Map) target).containsKey(name));
 		}
 
+		@Override
 		public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 			return new TypedValue(((Map) target).get(name));
 		}
 
+		@Override
 		public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 			return true;
 		}
 
+		@Override
 		@SuppressWarnings("unchecked")
 		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 };
 		}
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 215e703671..d95227dffb 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
@@ -149,24 +149,29 @@ public class MapAccessTests extends ExpressionTestCase {
 
 	public static class MapAccessor implements PropertyAccessor {
 
+		@Override
 		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 			return (((Map) target).containsKey(name));
 		}
 
+		@Override
 		public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 			return new TypedValue(((Map) target).get(name));
 		}
 
+		@Override
 		public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 			return true;
 		}
 
+		@Override
 		@SuppressWarnings("unchecked")
 		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 };
 		}
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 56555b209d..682dfe525e 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
@@ -274,6 +274,7 @@ public class MethodInvocationTests extends ExpressionTestCase {
 			return false;
 		}
 
+		@Override
 		public List<Method> filter(List<Method> methods) {
 			filterCalled = true;
 			List<Method> forRemoval = new ArrayList<Method>();
@@ -329,6 +330,7 @@ public class MethodInvocationTests extends ExpressionTestCase {
 
 	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");
@@ -379,6 +381,7 @@ public class MethodInvocationTests extends ExpressionTestCase {
 		byte[] bytes = new byte[100];
 		StandardEvaluationContext context = new StandardEvaluationContext(bytes);
 		context.setBeanResolver(new BeanResolver() {
+			@Override
 			public Object resolve(EvaluationContext context, String beanName)
 					throws AccessException {
 				if ("service".equals(beanName)) {
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
index 66aa85fb89..604016eb99 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
@@ -34,6 +34,7 @@ public class OperatorOverloaderTests extends ExpressionTestCase {
 
 	static class StringAndBooleanAddition implements OperatorOverloader {
 
+		@Override
 		public Object operate(Operation operation, Object leftOperand, Object rightOperand) throws EvaluationException {
 			if (operation==Operation.ADD) {
 				return ((String)leftOperand)+((Boolean)rightOperand).toString();
@@ -42,6 +43,7 @@ public class OperatorOverloaderTests extends ExpressionTestCase {
 			}
 		}
 
+		@Override
 		public boolean overridesOperation(Operation operation, Object leftOperand, Object rightOperand)
 				throws EvaluationException {
 			if (leftOperand instanceof String && rightOperand instanceof Boolean) {
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
index 3cb81de5e9..104000d878 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
@@ -170,28 +170,33 @@ public class PropertyAccessTests extends ExpressionTestCase {
 
 		int flibbles = 7;
 
+		@Override
 		public Class<?>[] getSpecificTargetClasses() {
 			return new Class[] { String.class };
 		}
 
+		@Override
 		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 			if (!(target instanceof String))
 				throw new RuntimeException("Assertion Failed! target should be String");
 			return (name.equals("flibbles"));
 		}
 
+		@Override
 		public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 			if (!(target instanceof String))
 				throw new RuntimeException("Assertion Failed! target should be String");
 			return (name.equals("flibbles"));
 		}
 
+		@Override
 		public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 			if (!name.equals("flibbles"))
 				throw new RuntimeException("Assertion Failed! name should be flibbles");
 			return new TypedValue(flibbles);
 		}
 
+		@Override
 		public void write(EvaluationContext context, Object target, String name, Object newValue)
 				throws AccessException {
 			if (!name.equals("flibbles"))
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
index 5bc84c9d38..214af39187 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
@@ -187,6 +187,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 			super(n);
 		}
 
+		@Override
 		public String[] getRoles() { return new String[]{"MANAGER"};}
 	}
 
@@ -197,6 +198,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 			super(n);
 		}
 
+		@Override
 		public String[] getRoles() { return new String[]{"TELLER"};}
 	}
 
@@ -207,6 +209,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 			super(n);
 		}
 
+		@Override
 		public String[] getRoles() { return new String[]{"SUPERVISOR"};}
 	}
 
@@ -217,22 +220,27 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 			public String name = "Andy";
 		}
 
+		@Override
 		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 			return name.equals("principal");
 		}
 
+		@Override
 		public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 			return new TypedValue(new Principal());
 		}
 
+		@Override
 		public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 			return false;
 		}
 
+		@Override
 		public void write(EvaluationContext context, Object target, String name, Object newValue)
 				throws AccessException {
 		}
 
+		@Override
 		public Class<?>[] getSpecificTargetClasses() {
 			return null;
 		}
@@ -247,22 +255,27 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 
 		void setPerson(Person p) { this.activePerson = p; }
 
+		@Override
 		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 			return name.equals("p");
 		}
 
+		@Override
 		public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 			return new TypedValue(activePerson);
 		}
 
+		@Override
 		public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 			return false;
 		}
 
+		@Override
 		public void write(EvaluationContext context, Object target, String name, Object newValue)
 				throws AccessException {
 		}
 
+		@Override
 		public Class<?>[] getSpecificTargetClasses() {
 			return null;
 		}
@@ -280,6 +293,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 				this.tc = typeConverter;
 			}
 
+			@Override
 			public TypedValue execute(EvaluationContext context, Object target, Object... arguments)
 					throws AccessException {
 				try {
@@ -303,6 +317,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 			}
 		}
 
+		@Override
 		public MethodExecutor resolve(EvaluationContext context, Object targetObject, String name, List<TypeDescriptor> arguments)
 				throws AccessException {
 			if (name.equals("hasRole")) {
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
index 6876afb0e1..0216f5c7af 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
@@ -487,14 +487,17 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 	static class TemplatedParserContext implements ParserContext {
 
+		@Override
 		public String getExpressionPrefix() {
 			return "${";
 		}
 
+		@Override
 		public String getExpressionSuffix() {
 			return "}";
 		}
 
+		@Override
 		public boolean isTemplate() {
 			return true;
 		}
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 dad8d43bea..e1122ab04f 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
@@ -122,6 +122,7 @@ public class SpelReproTests extends ExpressionTestCase {
 
 	static class MyTypeLocator extends StandardTypeLocator {
 
+		@Override
 		public Class<?> findType(String typename) throws EvaluationException {
 			if (typename.equals("Spr5899Class")) {
 				return Spr5899Class.class;
@@ -240,23 +241,28 @@ public class SpelReproTests extends ExpressionTestCase {
 
 	static class MapAccessor implements PropertyAccessor {
 
+		@Override
 		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 			return (((Map<?,?>) target).containsKey(name));
 		}
 
+		@Override
 		public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 			return new TypedValue(((Map<?,?>) target).get(name));
 		}
 
+		@Override
 		public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 			return true;
 		}
 
+		@Override
 		@SuppressWarnings("unchecked")
 		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};
 		}
@@ -546,12 +552,15 @@ public class SpelReproTests extends ExpressionTestCase {
 	}
 
 	private static final ParserContext DOLLARSQUARE_TEMPLATE_PARSER_CONTEXT = new ParserContext() {
+		@Override
 		public String getExpressionPrefix() {
 			return "$[";
 		}
+		@Override
 		public String getExpressionSuffix() {
 			return "]";
 		}
+		@Override
 		public boolean isTemplate() {
 			return true;
 		}
@@ -626,6 +635,7 @@ public class SpelReproTests extends ExpressionTestCase {
 	}
 
 	static class MyBeanResolver implements BeanResolver {
+		@Override
 		public Object resolve(EvaluationContext context, String beanname) throws AccessException {
 			if (beanname.equals("foo")) {
 				return "custard";
@@ -1100,21 +1110,26 @@ public class SpelReproTests extends ExpressionTestCase {
 			}
 			return null;
 		}
+		@Override
 		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 {
 			return getMap(target).containsKey(name);
 		}
+		@Override
 		public Class<?>[] getSpecificTargetClasses() {
 			return new Class[]{ContextObject.class};
 		}
+		@Override
 		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 {
 			getMap(target).put(name, (String) newValue);
@@ -1701,6 +1716,7 @@ public class SpelReproTests extends ExpressionTestCase {
 
 	private static class GenericImplementation implements GenericInterface<Integer> {
 
+		@Override
 		public Integer getProperty() {
 			return null;
 		}
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 201944098d..ab4e0dcd84 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
@@ -36,24 +36,30 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
 public class TemplateExpressionParsingTests extends ExpressionTestCase {
 
 	public static final ParserContext DEFAULT_TEMPLATE_PARSER_CONTEXT = new ParserContext() {
+		@Override
 		public String getExpressionPrefix() {
 			return "${";
 		}
+		@Override
 		public String getExpressionSuffix() {
 			return "}";
 		}
+		@Override
 		public boolean isTemplate() {
 			return true;
 		}
 	};
 
 	public static final ParserContext HASH_DELIMITED_PARSER_CONTEXT = new ParserContext() {
+		@Override
 		public String getExpressionPrefix() {
 			return "#{";
 		}
+		@Override
 		public String getExpressionSuffix() {
 			return "}";
 		}
+		@Override
 		public boolean isTemplate() {
 			return true;
 		}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ast/OpPlusTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ast/OpPlusTests.java
index b156b565c0..cbcb5ced3e 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ast/OpPlusTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ast/OpPlusTests.java
@@ -199,6 +199,7 @@ public class OpPlusTests {
 
 		GenericConversionService conversionService = new GenericConversionService();
 		conversionService.addConverter(new Converter<Time, String>() {
+			@Override
 			public String convert(Time source) {
 				return format.format(source);
 			}
diff --git a/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java
index 0eb8df5c8a..e136978f9e 100644
--- a/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java
index 7842bbfeac..7a27cf0894 100644
--- a/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java
@@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 	/**
 	 * @see org.springframework.beans.ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java
index ded9cd0bf7..8cf9e5fdaf 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java
@@ -45,6 +45,7 @@ public abstract class AbstractJdbcTests extends TestCase {
 	 */
 	private boolean shouldVerify;
 
+	@Override
 	protected void setUp() throws Exception {
 		this.shouldVerify = false;
 		super.setUp();
@@ -68,6 +69,7 @@ public abstract class AbstractJdbcTests extends TestCase {
 		this.shouldVerify = true;
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
index 4d722fb2c8..daa891016e 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
@@ -124,6 +124,7 @@ public class InitializeDatabaseIntegrationTests {
 			return cache;
 		}
 
+		@Override
 		public void afterPropertiesSet() throws Exception {
 			cache = jdbcTemplate.queryForList("SELECT * FROM T_TEST");
 		}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
index 6f672cf1ea..ed87fd3edc 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
@@ -74,6 +74,7 @@ public abstract class AbstractRowMapperTests extends TestCase {
 	protected Statement stmt3;
 	protected JdbcTemplate jdbcTemplate3;
 
+	@Override
 	protected void setUp() throws SQLException {
 		conControl = MockControl.createControl(Connection.class);
 		con = (Connection) conControl.getMock();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
index de75c0d0f2..c681fc1ed6 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
@@ -49,6 +49,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests {
 	private MockControl ctrlResultSetMetaData;
 	private ResultSetMetaData mockResultSetMetaData;
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 
@@ -62,6 +63,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests {
 		mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock();
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		ctrlStatement.replay();
@@ -70,6 +72,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests {
 		ctrlResultSetMetaData.replay();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		if (shouldVerify()) {
@@ -349,6 +352,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 
 		Object o = template.queryForObject(sql, new RowMapper() {
+			@Override
 			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 				return new Integer(rs.getInt(1));
 			}
@@ -852,6 +856,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 
 		Object o = template.queryForObject(sql, new Object[] {new Integer(3)}, new RowMapper() {
+			@Override
 			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 				return new Integer(rs.getInt(1));
 			}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
index 62d3c66cf4..ba9b97dcae 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
@@ -159,6 +159,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 	public void testStringsWithStaticSql() throws Exception {
 		doTestStrings(new JdbcTemplateCallback() {
+			@Override
 			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
 				template.query(sql, rch);
 			}
@@ -167,6 +168,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 	public void testStringsWithStaticSqlAndFetchSizeAndMaxRows() throws Exception {
 		doTestStrings(new JdbcTemplateCallback() {
+			@Override
 			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
 				template.query(sql, rch);
 			}
@@ -175,6 +177,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 	public void testStringsWithEmptyPreparedStatementSetter() throws Exception {
 		doTestStrings(new JdbcTemplateCallback() {
+			@Override
 			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
 				template.query(sql, (PreparedStatementSetter) null, rch);
 			}
@@ -184,8 +187,10 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 	public void testStringsWithPreparedStatementSetter() throws Exception {
 		final Integer argument = new Integer(99);
 		doTestStrings(new JdbcTemplateCallback() {
+			@Override
 			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
 				template.query(sql, new PreparedStatementSetter() {
+					@Override
 					public void setValues(PreparedStatement ps) throws SQLException {
 						ps.setObject(1, argument);
 					}
@@ -196,6 +201,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 	public void testStringsWithEmptyPreparedStatementArgs() throws Exception {
 		doTestStrings(new JdbcTemplateCallback() {
+			@Override
 			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
 				template.query(sql, (Object[]) null, rch);
 			}
@@ -205,6 +211,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 	public void testStringsWithPreparedStatementArgs() throws Exception {
 		final Integer argument = new Integer(99);
 		doTestStrings(new JdbcTemplateCallback() {
+			@Override
 			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
 				template.query(sql, new Object[] {argument}, rch);
 			}
@@ -221,6 +228,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		class StringHandler implements RowCallbackHandler {
 			private List list = new LinkedList();
+			@Override
 			public void processRow(ResultSet rs) throws SQLException {
 				list.add(rs.getString(1));
 			}
@@ -365,6 +373,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		template.setNativeJdbcExtractor(new PlainNativeJdbcExtractor());
 		Object result = template.execute(new ConnectionCallback() {
+			@Override
 			public Object doInConnection(Connection con) {
 				assertSame(mockConnection, con);
 				return "test";
@@ -389,6 +398,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		Object result = template.execute(new ConnectionCallback() {
+			@Override
 			public Object doInConnection(Connection con) throws SQLException {
 				PreparedStatement ps = con.prepareStatement("some SQL");
 				ps.close();
@@ -471,6 +481,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		try {
 			template.query(sql, new RowCallbackHandler() {
+				@Override
 				public void processRow(ResultSet rs) {
 					throw rex;
 				}
@@ -790,10 +801,12 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		BatchPreparedStatementSetter setter =
 			new BatchPreparedStatementSetter() {
+			@Override
 			public void setValues(PreparedStatement ps, int i)
 				throws SQLException {
 				ps.setInt(1, ids[i]);
 			}
+			@Override
 			public int getBatchSize() {
 				return ids.length;
 			}
@@ -854,14 +867,17 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		BatchPreparedStatementSetter setter =
 				new InterruptibleBatchPreparedStatementSetter() {
+					@Override
 					public void setValues(PreparedStatement ps, int i) throws SQLException {
 						if (i < ids.length) {
 							ps.setInt(1, ids[i]);
 						}
 					}
+					@Override
 					public int getBatchSize() {
 						return 1000;
 					}
+					@Override
 					public boolean isBatchExhausted(int i) {
 						return (i >= ids.length);
 					}
@@ -922,6 +938,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		BatchPreparedStatementSetter setter =
 				new AbstractInterruptibleBatchPreparedStatementSetter() {
+					@Override
 					protected boolean setValuesIfAvailable(PreparedStatement ps, int i) throws SQLException {
 						if (i < ids.length) {
 							ps.setInt(1, ids[i]);
@@ -986,6 +1003,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		BatchPreparedStatementSetter setter =
 				new AbstractInterruptibleBatchPreparedStatementSetter() {
+					@Override
 					protected boolean setValuesIfAvailable(PreparedStatement ps, int i) throws SQLException {
 						if (i < ids.length) {
 							ps.setInt(1, ids[i]);
@@ -1039,9 +1057,11 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		replay();
 
 		BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() {
+			@Override
 			public void setValues(PreparedStatement ps, int i) throws SQLException {
 				ps.setInt(1, ids[i]);
 			}
+			@Override
 			public int getBatchSize() {
 				return ids.length;
 			}
@@ -1099,9 +1119,11 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		replay();
 
 		BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() {
+			@Override
 			public void setValues(PreparedStatement ps, int i) throws SQLException {
 				ps.setInt(1, ids[i]);
 			}
+			@Override
 			public int getBatchSize() {
 				return ids.length;
 			}
@@ -1242,6 +1264,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		replay();
 
 		ParameterizedPreparedStatementSetter setter = new ParameterizedPreparedStatementSetter<Integer>() {
+			@Override
 			public void setValues(PreparedStatement ps, Integer argument) throws SQLException {
 				ps.setInt(1, argument.intValue());
 			}
@@ -1470,6 +1493,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		replay();
 
 		PreparedStatementSetter pss = new PreparedStatementSetter() {
+			@Override
 			public void setValues(PreparedStatement ps) throws SQLException {
 				ps.setString(1, name);
 			}
@@ -1506,6 +1530,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		replay();
 
 		PreparedStatementSetter pss = new PreparedStatementSetter() {
+			@Override
 			public void setValues(PreparedStatement ps) throws SQLException {
 				ps.setString(1, name);
 			}
@@ -1591,6 +1616,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		t.setIgnoreWarnings(false);
 		try {
 			t.query(sql, new RowCallbackHandler() {
+				@Override
 				public void processRow(ResultSet rs) throws SQLException {
 					rs.getByte(1);
 				}
@@ -1643,6 +1669,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		template.setIgnoreWarnings(true);
 		template.query(sql, new RowCallbackHandler() {
+			@Override
 			public void processRow(ResultSet rs)
 				throws java.sql.SQLException {
 				rs.getByte(1);
@@ -1689,6 +1716,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		try {
 			template.query(sql, new RowCallbackHandler() {
+				@Override
 				public void processRow(ResultSet rs) throws SQLException {
 					throw sex;
 				}
@@ -1736,6 +1764,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		template.afterPropertiesSet();
 		try {
 			template.query(sql, new RowCallbackHandler() {
+				@Override
 				public void processRow(ResultSet rs) throws SQLException {
 					throw sex;
 				}
@@ -1805,6 +1834,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		template.afterPropertiesSet();
 		try {
 			template.query(sql, new RowCallbackHandler() {
+				@Override
 				public void processRow(ResultSet rs)
 					throws SQLException {
 					throw sex;
@@ -1901,39 +1931,49 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		template.setNativeJdbcExtractor(new NativeJdbcExtractor() {
+			@Override
 			public boolean isNativeConnectionNecessaryForNativeStatements() {
 				return false;
 			}
+			@Override
 			public boolean isNativeConnectionNecessaryForNativePreparedStatements() {
 				return false;
 			}
+			@Override
 			public boolean isNativeConnectionNecessaryForNativeCallableStatements() {
 				return false;
 			}
+			@Override
 			public Connection getNativeConnection(Connection con) {
 				return con;
 			}
+			@Override
 			public Connection getNativeConnectionFromStatement(Statement stmt) throws SQLException {
 				return stmt.getConnection();
 			}
+			@Override
 			public Statement getNativeStatement(Statement stmt) {
 				assertTrue(stmt == mockStatement);
 				return mockStatement2;
 			}
+			@Override
 			public PreparedStatement getNativePreparedStatement(PreparedStatement ps) {
 				assertTrue(ps == mockPreparedStatement);
 				return mockPreparedStatement2;
 			}
+			@Override
 			public CallableStatement getNativeCallableStatement(CallableStatement cs) {
 				assertTrue(cs == mockCallableStatement);
 				return mockCallableStatement2;
 			}
+			@Override
 			public ResultSet getNativeResultSet(ResultSet rs) {
 				return rs;
 			}
 		});
 
 		template.query("my query",	new ResultSetExtractor() {
+			@Override
 			public Object extractData(ResultSet rs2) {
 				assertEquals(mockResultSet, rs2);
 				return null;
@@ -1941,10 +1981,12 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		});
 
 		template.query(new PreparedStatementCreator() {
+			@Override
 			public PreparedStatement createPreparedStatement(Connection conn) {
 				return mockPreparedStatement;
 			}
 		}, new ResultSetExtractor() {
+			@Override
 			public Object extractData(ResultSet rs2) {
 				assertEquals(mockResultSet, rs2);
 				return null;
@@ -1952,6 +1994,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		});
 
 		template.call(new CallableStatementCreator() {
+			@Override
 			public CallableStatement createCallableStatement(Connection con) {
 				return mockCallableStatement;
 			}
@@ -2015,6 +2058,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		try {
 			template.query("my query", new ResultSetExtractor() {
+				@Override
 				public Object extractData(ResultSet rs) {
 					throw new InvalidDataAccessApiUsageException("");
 				}
@@ -2027,6 +2071,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		try {
 			template.query(new PreparedStatementCreator() {
+				@Override
 				public PreparedStatement createPreparedStatement(Connection con) throws SQLException {
 					return con.prepareStatement("my query");
 				}
@@ -2034,6 +2079,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 					return null;
 				}
 			}, new ResultSetExtractor() {
+				@Override
 				public Object extractData(ResultSet rs2) {
 					throw new InvalidDataAccessApiUsageException("");
 				}
@@ -2084,6 +2130,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		List params = new ArrayList();
 		params.add(new SqlReturnResultSet("", new RowCallbackHandler() {
+			@Override
 			public void processRow(ResultSet rs) {
 				throw new InvalidDataAccessApiUsageException("");
 			}
@@ -2093,6 +2140,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		try {
 			template.call(new CallableStatementCreator() {
+				@Override
 				public CallableStatement createCallableStatement(Connection conn) throws SQLException {
 					return conn.prepareCall("my query");
 				}
@@ -2143,6 +2191,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		params.add(new SqlOutParameter("a", 12));
 
 		Map out = template.call(new CallableStatementCreator() {
+			@Override
 			public CallableStatement createCallableStatement(Connection conn) throws SQLException {
 				return conn.prepareCall("my query");
 			}
@@ -2157,6 +2206,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 	private static class PlainNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 
+		@Override
 		protected Connection doGetNativeConnection(Connection con) throws SQLException {
 			return con;
 		}
@@ -2179,12 +2229,14 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 			this.sql = sql;
 		}
 
+		@Override
 		public PreparedStatement createPreparedStatement(Connection conn) throws SQLException {
 			PreparedStatement ps = conn.prepareStatement(sql);
 			ps.setInt(1, id);
 			return ps;
 		}
 
+		@Override
 		public String getSql() {
 			return sql;
 		}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java
index bd992919cb..5760ebfe34 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java
@@ -47,6 +47,7 @@ public class RowMapperTests extends TestCase {
 	private JdbcTemplate jdbcTemplate;
 	private List result;
 
+	@Override
 	protected void setUp() throws SQLException {
 		conControl = MockControl.createControl(Connection.class);
 		con = (Connection) conControl.getMock();
@@ -121,6 +122,7 @@ public class RowMapperTests extends TestCase {
 
 		result = jdbcTemplate.query(
 				new PreparedStatementCreator() {
+					@Override
 					public PreparedStatement createPreparedStatement(Connection con) throws SQLException {
 						return ps;
 					}
@@ -153,6 +155,7 @@ public class RowMapperTests extends TestCase {
 		result = jdbcTemplate.query(
 				"some SQL",
 				new PreparedStatementSetter() {
+					@Override
 					public void setValues(PreparedStatement ps) throws SQLException {
 						ps.setString(1, "test");
 					}
@@ -240,6 +243,7 @@ public class RowMapperTests extends TestCase {
 
 	private static class TestRowMapper implements RowMapper {
 
+		@Override
 		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return new TestBean(rs.getString(1), rs.getInt(2));
 		}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java
index ae4d973702..3ed281abfc 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java
@@ -31,6 +31,7 @@ public class SimpleRowCountCallbackHandler implements RowCallbackHandler {
 	private int count;
 
 
+	@Override
 	public void processRow(ResultSet rs) throws SQLException {
 		count++;
 	}
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 1729286939..15ce2e9504 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
@@ -35,11 +35,13 @@ public class StatementCreatorUtilsTests extends TestCase {
 	private MockControl psControl;
 	private PreparedStatement ps;
 
+	@Override
 	protected void setUp() {
 		psControl = MockControl.createControl(PreparedStatement.class);
 		ps = (PreparedStatement) psControl.getMock();
 	}
 
+	@Override
 	protected void tearDown() {
 		psControl.verify();
 	}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
index 4716527a36..e18b28a19f 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
@@ -71,6 +71,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 	private MockControl ctrlResultSet;
 	private ResultSet mockResultSet;
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		ctrlPreparedStatement =	MockControl.createControl(PreparedStatement.class);
@@ -79,6 +80,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		mockResultSet = (ResultSet) ctrlResultSet.getMock();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		if (shouldVerify()) {
@@ -87,6 +89,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		}
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		ctrlPreparedStatement.replay();
@@ -132,6 +135,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		params.put("perfId", new Integer(1));
 		params.put("priceId", new Integer(1));
 		assertEquals("result", jt.execute(UPDATE_NAMED_PARAMETERS, params, new PreparedStatementCallback() {
+			@Override
 			public Object doInPreparedStatement(PreparedStatement ps) throws SQLException {
 				assertEquals(mockPreparedStatement, ps);
 				ps.executeUpdate();
@@ -164,6 +168,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		params.put("perfId", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
 		params.put("priceId", new SqlParameterValue(Types.INTEGER, new Integer(1)));
 		assertEquals("result", jt.execute(UPDATE_NAMED_PARAMETERS, params, new PreparedStatementCallback() {
+			@Override
 			public Object doInPreparedStatement(PreparedStatement ps) throws SQLException {
 				assertEquals(mockPreparedStatement, ps);
 				ps.executeUpdate();
@@ -259,6 +264,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
 		params.put("country", "UK");
 		Customer cust = (Customer) jt.query(SELECT_NAMED_PARAMETERS, params, new ResultSetExtractor() {
+			@Override
 			public Object extractData(ResultSet rs) throws SQLException, DataAccessException {
 				rs.next();
 				Customer cust = new Customer();
@@ -307,6 +313,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		params.put("country", "UK");
 		final List customers = new LinkedList();
 		jt.query(SELECT_NAMED_PARAMETERS, params, new RowCallbackHandler() {
+			@Override
 			public void processRow(ResultSet rs) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -355,6 +362,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
 		params.put("country", "UK");
 		List customers = jt.query(SELECT_NAMED_PARAMETERS, params, new RowMapper() {
+			@Override
 			public Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -403,6 +411,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 		params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
 		params.put("country", "UK");
 		Customer cust = (Customer) jt.queryForObject(SELECT_NAMED_PARAMETERS, params, new RowMapper() {
+			@Override
 			public Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
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 92166a19bb..5abcb764ed 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
@@ -44,6 +44,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests {
 	private MockControl ctrlResultSetMetaData;
 	private ResultSetMetaData mockResultSetMetaData;
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
@@ -54,6 +55,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests {
 		mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock();
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		ctrlPreparedStatement.replay();
@@ -61,6 +63,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests {
 		ctrlResultSetMetaData.replay();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		if (false && shouldVerify()) {
@@ -317,6 +320,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests {
 		parms.addValue("id", new Integer(3));
 
 		Object o = template.queryForObject(sql, parms, new RowMapper() {
+			@Override
 			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 				return new Integer(rs.getInt(1));
 			}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java
index 6ca38bd21f..3340c760d7 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java
@@ -31,6 +31,7 @@ public class CallMetaDataContextTests extends TestCase {
 
 	private CallMetaDataContext context = new CallMetaDataContext();
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 
@@ -51,6 +52,7 @@ public class CallMetaDataContextTests extends TestCase {
 
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		ctrlDatabaseMetaData.verify();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java
index 64bca82610..7ed70e88e1 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java
@@ -31,6 +31,7 @@ public class ParameterizedBeanPropertyRowMapperTests extends AbstractRowMapperTe
 
 	private SimpleJdbcTemplate simpleJdbcTemplate;
 
+	@Override
 	protected void setUp() throws SQLException {
 		super.setUp();
 		simpleJdbcTemplate = new SimpleJdbcTemplate(jdbcTemplate);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
index 3f69a45319..1f664107a6 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
@@ -49,6 +49,7 @@ public class SimpleJdbcCallTests extends TestCase {
 	private MockControl ctrlCallable;
 	private CallableStatement mockCallable;
 
+	@Override
 	protected void setUp() throws Exception {
 		ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
 		mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
@@ -69,6 +70,7 @@ public class SimpleJdbcCallTests extends TestCase {
 		mockCallable = (CallableStatement) ctrlCallable.getMock();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		ctrlDatabaseMetaData.verify();
 		ctrlDataSource.verify();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
index b6ffa6f70f..088e48f98a 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
@@ -40,6 +40,7 @@ public class SimpleJdbcInsertTests extends TestCase {
 	private MockControl ctrlDatabaseMetaData;
 	private DatabaseMetaData mockDatabaseMetaData;
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 
@@ -60,6 +61,7 @@ public class SimpleJdbcInsertTests extends TestCase {
 
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		ctrlDatabaseMetaData.verify();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
index a80ebbe4d4..8bfe278c63 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
@@ -254,6 +254,7 @@ public class SimpleJdbcTemplateTests extends TestCase {
 		Date expectedResult = new Date();
 
 		ParameterizedRowMapper<Date> rm = new ParameterizedRowMapper<Date>() {
+			@Override
 			public Date mapRow(ResultSet rs, int rowNum) {
 				return new Date();
 			}
@@ -279,6 +280,7 @@ public class SimpleJdbcTemplateTests extends TestCase {
 		Object arg3 = new Object();
 
 		ParameterizedRowMapper<Date> rm = new ParameterizedRowMapper<Date>() {
+			@Override
 			public Date mapRow(ResultSet rs, int rowNum) {
 				return new Date();
 			}
@@ -305,6 +307,7 @@ public class SimpleJdbcTemplateTests extends TestCase {
 		Object arg3 = new Object();
 
 		ParameterizedRowMapper<Date> rm = new ParameterizedRowMapper<Date>() {
+			@Override
 			public Date mapRow(ResultSet rs, int rowNum) {
 				return new Date();
 			}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java
index d42a5810dd..f9eb882873 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java
@@ -30,6 +30,7 @@ public class TableMetaDataContextTests extends TestCase {
 
 	private TableMetaDataContext context = new TableMetaDataContext();
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 
@@ -50,6 +51,7 @@ public class TableMetaDataContextTests extends TestCase {
 
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		ctrlDatabaseMetaData.verify();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
index 69d03b371d..76034050ef 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
@@ -37,6 +37,7 @@ public class JdbcDaoSupportTests extends TestCase {
 		DataSource ds = (DataSource) dsControl.getMock();
 		final List test = new ArrayList();
 		JdbcDaoSupport dao = new JdbcDaoSupport() {
+			@Override
 			protected void initDao() {
 				test.add("test");
 			}
@@ -52,6 +53,7 @@ public class JdbcDaoSupportTests extends TestCase {
 		JdbcTemplate template = new JdbcTemplate();
 		final List test = new ArrayList();
 		JdbcDaoSupport dao = new JdbcDaoSupport() {
+			@Override
 			protected void initDao() {
 				test.add("test");
 			}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
index b63387c48c..02cafbb198 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
@@ -69,6 +69,7 @@ public class LobSupportTests extends TestCase {
 		AbstractLobCreatingPreparedStatementCallback psc =
 			new AbstractLobCreatingPreparedStatementCallback(handler) {
 
+			@Override
 			protected void setValues(PreparedStatement ps, LobCreator lobCreator)
 					throws SQLException, DataAccessException {
 				svc.b = true;
@@ -155,6 +156,7 @@ public class LobSupportTests extends TestCase {
 
 	private AbstractLobStreamingResultSetExtractor getResultSetExtractor(final boolean ex) {
 		AbstractLobStreamingResultSetExtractor lobRse = new AbstractLobStreamingResultSetExtractor() {
+			@Override
 			protected void streamData(ResultSet rs) throws SQLException, IOException {
 				if (ex) {
 					throw new IOException();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
index f2345bbc73..65e5b3f9a8 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
@@ -57,6 +57,7 @@ public class SqlLobValueTests extends TestCase {
 	private MockControl lobCreatorControl;
 	private LobCreator creator;
 
+	@Override
 	public void setUp() {
 		//	create preparedstatement
 		psControl = MockControl.createControl(PreparedStatement.class);
@@ -97,11 +98,13 @@ public class SqlLobValueTests extends TestCase {
 		creator.setBlobAsBytes(ps, 1, testString.getBytes());
 		// set a matcher to match the byte array!
 		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
+			@Override
 			public boolean matches(Object[] arg0, Object[] arg1) {
 				byte[] one = (byte[]) arg0[2];
 				byte[] two = (byte[]) arg1[2];
 				return Arrays.equals(one, two);
 			}
+			@Override
 			public String toString(Object[] arg0) {
 				return "bla";
 			}
@@ -149,10 +152,12 @@ public class SqlLobValueTests extends TestCase {
 		ByteArrayInputStream bais = new ByteArrayInputStream(testContent);
 		creator.setClobAsAsciiStream(ps, 1, bais, 3);
 		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
+			@Override
 			public boolean matches(Object[] arg0, Object[] arg1) {
 				// for now, match always
 				return true;
 			}
+			@Override
 			public String toString(Object[] arg0) {
 				return null;
 			}
@@ -172,10 +177,12 @@ public class SqlLobValueTests extends TestCase {
 		InputStreamReader reader = new InputStreamReader(bais);
 		creator.setClobAsCharacterStream(ps, 1, reader, 3);
 		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
+			@Override
 			public boolean matches(Object[] arg0, Object[] arg1) {
 				// for now, match always
 				return true;
 			}
+			@Override
 			public String toString(Object[] arg0) {
 				return null;
 			}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
index 8acf5aa045..4fe8a5b43f 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
@@ -96,6 +96,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 				assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -223,6 +224,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
 				assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -246,6 +248,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 				for (int i = 0; i < 5; i++) {
 
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
 							assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -418,6 +421,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -429,6 +433,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 				tt2.setPropagationBehavior(requiresNew ?
 						TransactionDefinition.PROPAGATION_REQUIRES_NEW : TransactionDefinition.PROPAGATION_REQUIRED);
 				tt2.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) {
 						assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 						assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -547,6 +552,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
 					assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -569,6 +575,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 					try {
 						tt.execute(new TransactionCallbackWithoutResult() {
+							@Override
 							protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 								assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
 								assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -653,9 +660,11 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		@SuppressWarnings("serial")
 		JtaTransactionManager ptm = new JtaTransactionManager(ut) {
+			@Override
 			protected void doRegisterAfterCompletionWithJtaTransaction(
 					JtaTransactionObject txObject, final List synchronizations) {
 				Thread async = new Thread() {
+					@Override
 					public void run() {
 						invokeAfterCompletion(synchronizations, TransactionSynchronization.STATUS_COMMITTED);
 					}
@@ -691,6 +700,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 			final boolean releaseCon = (i != 1);
 
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
 					assertTrue("Is existing transaction", !status.isNewTransaction());
@@ -769,6 +779,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		TransactionTemplate tt = new TransactionTemplate(ptm);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				Connection c = DataSourceUtils.getConnection(dsToUse);
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
@@ -780,6 +791,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 		tt.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ);
 		tt.setReadOnly(true);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				Connection c = DataSourceUtils.getConnection(dsToUse);
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
@@ -865,6 +877,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		TransactionTemplate tt = new TransactionTemplate(ptm);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				Connection c = DataSourceUtils.getConnection(dsToUse);
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
@@ -875,6 +888,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		tt.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				Connection c = DataSourceUtils.getConnection(dsToUse);
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
@@ -890,6 +904,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 		utControl.verify();
 	}
 
+	@Override
 	protected void tearDown() {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
index cf3cf2cb45..28eb6b3c04 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
@@ -134,6 +134,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
 				assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -242,6 +243,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		final RuntimeException ex = new RuntimeException("Application exception");
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
 					assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -291,6 +293,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		final RuntimeException ex = new RuntimeException("Application exception");
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 					assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
@@ -359,10 +362,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 			final TransactionTemplate tt = new TransactionTemplate(tm);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Is existing transaction", !status.isNewTransaction());
 					assertFalse("Is not rollback-only", status.isRollbackOnly());
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 							assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -433,9 +438,11 @@ public class DataSourceTransactionManagerTests extends TestCase {
 			tt2.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE);
 
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertFalse("Is not rollback-only", status.isRollbackOnly());
 					tt2.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							status.setRollbackOnly();
 						}
@@ -489,9 +496,11 @@ public class DataSourceTransactionManagerTests extends TestCase {
 			tt2.setReadOnly(false);
 
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertFalse("Is not rollback-only", status.isRollbackOnly());
 					tt2.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							status.setRollbackOnly();
 						}
@@ -539,9 +548,11 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 		final TestTransactionSynchronization synch =
 				new TestTransactionSynchronization(ds, TransactionSynchronization.STATUS_COMMITTED) {
+					@Override
 					public void afterCompletion(int status) {
 						super.afterCompletion(status);
 						tt.execute(new TransactionCallbackWithoutResult() {
+							@Override
 							protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							}
 						});
@@ -549,6 +560,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 				};
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				TransactionSynchronizationManager.registerSynchronization(synch);
 			}
@@ -599,10 +611,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 			final TransactionTemplate tt = new TransactionTemplate(tm2);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Is existing transaction", !status.isNewTransaction());
 					assertFalse("Is not rollback-only", status.isRollbackOnly());
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 							assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -661,12 +675,14 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				tt.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 						assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 						assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -737,12 +753,14 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				tt2.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 						assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 						assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -807,12 +825,14 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Is new transaction", status.isNewTransaction());
 					assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
 					assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 					assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 					tt2.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							status.setRollbackOnly();
 						}
@@ -858,12 +878,14 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED);
 				tt.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 						assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 						assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -911,10 +933,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					assertTrue("Is new transaction", status.isNewTransaction());
 					tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NEVER);
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							fail("Should have thrown IllegalTransactionStateException");
 						}
@@ -959,11 +983,13 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
 				TransactionTemplate tt2 = new TransactionTemplate(tm);
 				tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 				tt2.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 						assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 						assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -1015,6 +1041,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
 				assertSame(con1, DataSourceUtils.getConnection(ds));
@@ -1022,6 +1049,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 				TransactionTemplate tt2 = new TransactionTemplate(tm);
 				tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 				tt2.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 						assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 						assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -1079,6 +1107,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		tt.setReadOnly(true);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
@@ -1142,6 +1171,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					try {
 						Thread.sleep(1500);
@@ -1207,6 +1237,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				// something transactional
 				assertEquals(con, DataSourceUtils.getConnection(ds));
@@ -1260,6 +1291,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				// something transactional
 				assertEquals(con, DataSourceUtils.getConnection(ds));
@@ -1275,6 +1307,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 				}
 
 				tt.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) {
 						// something transactional
 						assertEquals(con, DataSourceUtils.getConnection(ds));
@@ -1338,6 +1371,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				// something transactional
 				assertEquals(con, DataSourceUtils.getConnection(ds));
@@ -1354,6 +1388,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 				}
 
 				tt.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) {
 						// something transactional
 						assertEquals(con, DataSourceUtils.getConnection(ds));
@@ -1406,6 +1441,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 				}
@@ -1443,6 +1479,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 				}
@@ -1483,6 +1520,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 				}
@@ -1525,6 +1563,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 					status.setRollbackOnly();
 				}
@@ -1550,6 +1589,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
@@ -1573,6 +1613,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
@@ -1594,6 +1635,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
@@ -1655,11 +1697,13 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				assertTrue("Isn't nested transaction", !status.hasSavepoint());
 				for (int i = 0; i < count; i++) {
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 							assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 							assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -1721,10 +1765,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				assertTrue("Isn't nested transaction", !status.hasSavepoint());
 				tt.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 						assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 						assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive());
@@ -1786,6 +1832,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				Object savepoint = status.createSavepoint();
@@ -1842,6 +1889,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				Object savepoint = status.createSavepoint();
@@ -1883,6 +1931,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 			}
@@ -1919,6 +1968,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				assertTrue("Is new transaction", status.isNewTransaction());
 				status.setRollbackOnly();
@@ -1930,6 +1980,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		dsControl.verify();
 	}
 
+	@Override
 	protected void tearDown() {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
@@ -1953,15 +2004,19 @@ public class DataSourceTransactionManagerTests extends TestCase {
 			this.status = status;
 		}
 
+		@Override
 		public void suspend() {
 		}
 
+		@Override
 		public void resume() {
 		}
 
+		@Override
 		public void flush() {
 		}
 
+		@Override
 		public void beforeCommit(boolean readOnly) {
 			if (this.status != TransactionSynchronization.STATUS_COMMITTED) {
 				fail("Should never be called");
@@ -1970,11 +2025,13 @@ public class DataSourceTransactionManagerTests extends TestCase {
 			this.beforeCommitCalled = true;
 		}
 
+		@Override
 		public void beforeCompletion() {
 			assertFalse(this.beforeCompletionCalled);
 			this.beforeCompletionCalled = true;
 		}
 
+		@Override
 		public void afterCommit() {
 			if (this.status != TransactionSynchronization.STATUS_COMMITTED) {
 				fail("Should never be called");
@@ -1983,6 +2040,7 @@ public class DataSourceTransactionManagerTests extends TestCase {
 			this.afterCommitCalled = true;
 		}
 
+		@Override
 		public void afterCompletion(int status) {
 			assertFalse(this.afterCompletionCalled);
 			this.afterCompletionCalled = true;
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java
index 8696edf257..28b3040888 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java
@@ -38,6 +38,7 @@ public class DriverManagerDataSourceTests extends TestCase {
 		ctrlConnection.replay();
 
 		class TestDriverManagerDataSource extends DriverManagerDataSource {
+			@Override
 			protected Connection getConnectionFromDriverManager(String url, Properties props) {
 				assertEquals(jdbcUrl, url);
 				assertEquals(uname, props.getProperty("user"));
@@ -77,6 +78,7 @@ public class DriverManagerDataSourceTests extends TestCase {
 		ctrlConnection.replay();
 
 		class TestDriverManagerDataSource extends DriverManagerDataSource {
+			@Override
 			protected Connection getConnectionFromDriverManager(String url, Properties props) {
 				assertEquals(jdbcUrl, url);
 				assertEquals("uname", props.getProperty("user"));
@@ -117,6 +119,7 @@ public class DriverManagerDataSourceTests extends TestCase {
 		ctrlConnection.replay();
 
 		class TestDriverManagerDataSource extends DriverManagerDataSource {
+			@Override
 			protected Connection getConnectionFromDriverManager(String url, Properties props) {
 				assertEquals(jdbcUrl, url);
 				assertEquals(uname, props.getProperty("user"));
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java
index a8c3a79b79..5e5b5afd6e 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java
@@ -12,10 +12,12 @@ public class TestDataSourceWrapper extends AbstractDataSource {
 		this.target = target;
 	}
 
+	@Override
 	public Connection getConnection() throws SQLException {
 		return target.getConnection();
 	}
 
+	@Override
 	public Connection getConnection(String username, String password) throws SQLException {
 		return target.getConnection(username, password);
 	}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java
index 3a9f6b94ec..77970dbe08 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java
@@ -24,6 +24,7 @@ public class EmbeddedDatabaseFactoryTests {
 
 		private boolean populateCalled;
 
+		@Override
 		public void populate(Connection connection) {
 			this.populateCalled = true;
 		}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java
index 4534d493ed..48174456d9 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java
@@ -35,6 +35,7 @@ public final class JndiDataSourceLookupTests {
 	public void testSunnyDay() throws Exception {
 		final DataSource expectedDataSource = new StubDataSource();
 		JndiDataSourceLookup lookup = new JndiDataSourceLookup() {
+			@Override
 			@SuppressWarnings("unchecked")
 			protected Object lookup(String jndiName, Class requiredType) {
 				assertEquals(DATA_SOURCE_NAME, jndiName);
@@ -49,6 +50,7 @@ public final class JndiDataSourceLookupTests {
 	@Test(expected=DataSourceLookupFailureException.class)
 	public void testNoDataSourceAtJndiLocation() throws Exception {
 		JndiDataSourceLookup lookup = new JndiDataSourceLookup() {
+			@Override
 			@SuppressWarnings("unchecked")
 			protected Object lookup(String jndiName, Class requiredType) throws NamingException {
 				assertEquals(DATA_SOURCE_NAME, jndiName);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java
index a8521e70ba..17276e3aeb 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java
@@ -30,10 +30,12 @@ import org.springframework.jdbc.datasource.AbstractDataSource;
  */
 class StubDataSource extends AbstractDataSource {
 
+	@Override
 	public Connection getConnection() throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Connection getConnection(String username, String password) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java
index a497dca34e..9a1e61d9bb 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java
@@ -10,6 +10,7 @@ public class CustomerMapper implements RowMapper<Customer> {
 
 	private static final String[] COLUMN_NAMES = new String[] {"id", "forename"};
 
+	@Override
 	public Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 		Customer cust = new Customer();
 		cust.setId(rs.getInt(COLUMN_NAMES[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 4bf0f2eed4..5c00e0bf75 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
@@ -61,6 +61,7 @@ public class GenericSqlQueryTests extends AbstractJdbcTests {
 	private BeanFactory bf;
 
 
+	@Override
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
@@ -72,6 +73,7 @@ public class GenericSqlQueryTests extends AbstractJdbcTests {
 		testDataSource.setTarget(mockDataSource);
 	}
 
+	@Override
 	@After
 	public void tearDown() throws Exception {
 		super.tearDown();
@@ -81,6 +83,7 @@ public class GenericSqlQueryTests extends AbstractJdbcTests {
 		}
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		EasyMock.replay(mockPreparedStatement);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
index fd96db3e39..9c1ff6069e 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
@@ -52,6 +52,7 @@ public class GenericStoredProcedureTests extends AbstractJdbcTests {
 
 	private BeanFactory bf;
 
+	@Override
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
@@ -62,6 +63,7 @@ public class GenericStoredProcedureTests extends AbstractJdbcTests {
 		testDataSource.setTarget(mockDataSource);
 	}
 
+	@Override
 	@After
 	public void tearDown() throws Exception {
 		super.tearDown();
@@ -70,6 +72,7 @@ public class GenericStoredProcedureTests extends AbstractJdbcTests {
 		}
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		EasyMock.replay(mockCallable);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
index 8feb57fc97..189c59a1a0 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
@@ -213,6 +213,7 @@ public class RdbmsOperationTests extends TestCase {
 
 	private static class TestRdbmsOperation extends RdbmsOperation {
 
+		@Override
 		protected void compileInternal() {
 		}
 	}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
index 08b71e6fcb..478328af8c 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
@@ -82,6 +82,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 	private ResultSet mockResultSet;
 
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		ctrlPreparedStatement =	MockControl.createControl(PreparedStatement.class);
@@ -90,6 +91,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 		mockResultSet = (ResultSet) ctrlResultSet.getMock();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		if (shouldVerify()) {
@@ -98,6 +100,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 		}
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		ctrlPreparedStatement.replay();
@@ -130,6 +133,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 		replay();
 
 		SqlQuery query = new MappingSqlQueryWithParameters() {
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum, Object[] params, Map context) throws SQLException {
 				assertTrue("params were null", params == null);
 				assertTrue("context was null", context == null);
@@ -154,6 +158,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 		replay();
 
 		MappingSqlQuery query = new MappingSqlQuery() {
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				return new Integer(rs.getInt(1));
 			}
@@ -180,6 +185,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 		replay();
 
 		MappingSqlQuery query = new MappingSqlQuery() {
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				return new Integer(rs.getInt(1));
 			}
@@ -374,6 +380,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -431,6 +438,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -522,6 +530,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -587,6 +596,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -654,6 +664,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -712,6 +723,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -767,6 +779,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -797,6 +810,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -876,6 +890,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -943,6 +958,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -1016,6 +1032,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -1057,6 +1074,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
@@ -1128,6 +1146,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 				compile();
 			}
 
+			@Override
 			protected Object updateRow(ResultSet rs, int rownum, Map context) throws SQLException {
 				rs.updateString(2, "" + context.get(new Integer(rs.getInt(COLUMN_NAMES[0]))));
 				return null;
@@ -1148,6 +1167,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			compile();
 		}
 
+		@Override
 		protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
 			return rs.getString(1);
 		}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
index 867f1891ac..011fe1624b 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
@@ -66,12 +66,14 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 	private ResultSetMetaData mockResultSetMetaData;
 
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
 		mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		if (shouldVerify()) {
@@ -79,6 +81,7 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 		}
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		ctrlPreparedStatement.replay();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
index 48ec7f2b12..3dae947930 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
@@ -62,6 +62,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 	private MockControl ctrlCallable;
 	private CallableStatement mockCallable;
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 
@@ -69,6 +70,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		mockCallable = (CallableStatement) ctrlCallable.getMock();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		if (shouldVerify()) {
@@ -76,6 +78,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 	}
 
+	@Override
 	protected void replay() {
 		super.replay();
 		ctrlCallable.replay();
@@ -255,6 +258,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 
 		class TestJdbcTemplate extends JdbcTemplate {
 			int calls;
+			@Override
 			public Map call(CallableStatementCreator csc, List declaredParameters) throws DataAccessException {
 				calls++;
 				return super.call(csc, declaredParameters);
@@ -934,6 +938,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 
 		private static class RowMapperImpl implements RowMapper {
+			@Override
 			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 				return rs.getString(2);
 			}
@@ -964,6 +969,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 			private TestParameterMapper() {
 			}
 
+			@Override
 			public Map createMap(Connection conn) throws SQLException {
 				Map inParms = new HashMap();
 				String testValue = conn.toString();
@@ -989,6 +995,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		public Map executeTest(final int[] inValue) {
 			Map in = new HashMap(1);
 			in.put("in", new AbstractSqlTypeValue() {
+				@Override
 				public Object createTypeValue(Connection con, int type, String typeName) {
 					//assertEquals(Connection.class, con.getClass());
 					//assertEquals(Types.ARRAY, type);
@@ -1030,6 +1037,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 			setDataSource(ds);
 			setSql(SQL);
 			getJdbcTemplate().setExceptionTranslator(new SQLExceptionTranslator() {
+				@Override
 				public DataAccessException translate(
 					String task,
 					String sql,
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java
index 467f03f2e8..5fb13c2233 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java
@@ -27,6 +27,7 @@ import java.sql.SQLException;
  * @author Thomas Risberg
  */
 public class CustomSqlExceptionTranslator implements SQLExceptionTranslator {
+	@Override
 	public DataAccessException translate(String task, String sql, SQLException ex) {
 		if (ex.getErrorCode() == 2) {
 			return new TransientDataAccessResourceException("Custom", ex);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
index 565e7d1cce..039a938a76 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
@@ -35,6 +35,7 @@ import junit.framework.TestCase;
 public class KeyHolderTests extends TestCase {
 	private KeyHolder kh;
 
+	@Override
 	public void setUp() {
 		kh = new GeneratedKeyHolder();
 	}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
index 2a016ef6e6..6695bb35af 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
@@ -110,6 +110,7 @@ public class SQLErrorCodeSQLExceptionTranslatorTests extends TestCase {
 		SQLException intVioEx = new SQLException("", "", 6);
 
 		SQLErrorCodeSQLExceptionTranslator sext = new SQLErrorCodeSQLExceptionTranslator() {
+			@Override
 			protected DataAccessException customTranslate(String task, String sql, SQLException sqlex) {
 				assertEquals(TASK, task);
 				assertEquals(SQL, sql);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
index 67e9cdc47f..d44b0d1a25 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
@@ -122,6 +122,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	public void testLookupOrder() {
 		class TestSQLErrorCodesFactory extends SQLErrorCodesFactory {
 			private int lookups = 0;
+			@Override
 			protected Resource loadResource(String path) {
 				++lookups;
 				if (lookups == 1) {
@@ -148,6 +149,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	 */
 	public void testFindUserDefinedCodes() {
 		class TestSQLErrorCodesFactory extends SQLErrorCodesFactory {
+			@Override
 			protected Resource loadResource(String path) {
 				if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) {
 					return new ClassPathResource("test-error-codes.xml", SQLErrorCodesFactoryTests.class);
@@ -166,6 +168,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 
 	public void testInvalidUserDefinedCodeFormat() {
 		class TestSQLErrorCodesFactory extends SQLErrorCodesFactory {
+			@Override
 			protected Resource loadResource(String path) {
 				if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) {
 					// Guaranteed to be on the classpath, but most certainly NOT XML
@@ -186,6 +189,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	 */
 	public void testFindCustomCodes() {
 		class TestSQLErrorCodesFactory extends SQLErrorCodesFactory {
+			@Override
 			protected Resource loadResource(String path) {
 				if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) {
 					return new ClassPathResource("custom-error-codes.xml", SQLErrorCodesFactoryTests.class);
@@ -318,6 +322,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	 */
 	public void testWildCardNameRecognized() throws Exception {
 		class WildcardSQLErrorCodesFactory extends SQLErrorCodesFactory {
+			@Override
 			protected Resource loadResource(String path) {
 				if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) {
 					return new ClassPathResource("wildcard-error-codes.xml", SQLErrorCodesFactoryTests.class);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java
index 4c72a08876..1b415ea8fb 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java
@@ -39,6 +39,7 @@ public class ResultSetWrappingRowSetTests extends TestCase {
 	private ResultSet rset;
 	private ResultSetWrappingSqlRowSet rowset;
 
+	@Override
 	public void setUp() throws Exception {
 		rsetControl = MockControl.createControl(ResultSet.class);
 		rset = (ResultSet) rsetControl.getMock();
diff --git a/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java
index 0eb8df5c8a..e136978f9e 100644
--- a/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/beans/TestBean.java b/spring-jms/src/test/java/org/springframework/beans/TestBean.java
index ef4aef309e..7815bf1af3 100644
--- a/spring-jms/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-jms/src/test/java/org/springframework/beans/TestBean.java
@@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 	/**
 	 * @see ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java b/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java
index 5270aff4d3..ccf756b53e 100644
--- a/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java
+++ b/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java
@@ -21,6 +21,7 @@ package org.springframework.core.task;
  */
 public class StubTaskExecutor implements TaskExecutor {
 
+	@Override
 	public void execute(Runnable task) {
 	}
 
diff --git a/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java b/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java
index 9f38822a4e..4aa339db76 100644
--- a/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java
+++ b/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java
@@ -26,13 +26,16 @@ import javax.resource.spi.ResourceAdapter;
  */
 public class StubActivationSpec implements ActivationSpec {
 
+	@Override
 	public void validate() throws InvalidPropertyException {
 	}
 
+	@Override
 	public ResourceAdapter getResourceAdapter() {
 		return null;
 	}
 
+	@Override
 	public void setResourceAdapter(ResourceAdapter resourceAdapter) throws ResourceException {
 	}
 
diff --git a/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java b/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java
index 65dcd8b017..0c70d70dd7 100644
--- a/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java
+++ b/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java
@@ -29,18 +29,23 @@ import javax.transaction.xa.XAResource;
  */
 public class StubResourceAdapter implements ResourceAdapter {
 
+	@Override
 	public void start(BootstrapContext bootstrapContext) throws ResourceAdapterInternalException {
 	}
 
+	@Override
 	public void stop() {
 	}
 
+	@Override
 	public void endpointActivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec) throws ResourceException {
 	}
 
+	@Override
 	public void endpointDeactivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec) {
 	}
 
+	@Override
 	public XAResource[] getXAResources(ActivationSpec[] activationSpecs) throws ResourceException {
 		return null;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
index 3d7b35490c..650c51aa34 100644
--- a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
+++ b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
@@ -27,10 +27,12 @@ import javax.jms.JMSException;
  */
 public class StubConnectionFactory implements ConnectionFactory {
 
+	@Override
 	public Connection createConnection() throws JMSException {
 		return null;
 	}
 
+	@Override
 	public Connection createConnection(String username, String password) throws JMSException {
 		return null;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/StubQueue.java b/spring-jms/src/test/java/org/springframework/jms/StubQueue.java
index 20586ae952..eca20ea2b4 100644
--- a/spring-jms/src/test/java/org/springframework/jms/StubQueue.java
+++ b/spring-jms/src/test/java/org/springframework/jms/StubQueue.java
@@ -39,6 +39,7 @@ public class StubQueue implements Queue {
 	}
 
 
+	@Override
 	public String getQueueName() {
 		return this.queueName;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/StubTopic.java b/spring-jms/src/test/java/org/springframework/jms/StubTopic.java
index 022ecdfbdb..e3b0f1eca6 100644
--- a/spring-jms/src/test/java/org/springframework/jms/StubTopic.java
+++ b/spring-jms/src/test/java/org/springframework/jms/StubTopic.java
@@ -39,6 +39,7 @@ public class StubTopic implements Topic {
 	}
 
 
+	@Override
 	public String getTopicName() {
 		return this.topicName;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
index 4f51d133a0..b62e9e41bb 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
@@ -58,10 +58,12 @@ public class JmsNamespaceHandlerTests extends TestCase {
 	private ToolingTestApplicationContext context;
 
 
+	@Override
 	protected void setUp() throws Exception {
 		this.context = new ToolingTestApplicationContext("jmsNamespaceHandlerTests.xml", getClass());
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		this.context.close();
 	}
@@ -211,6 +213,7 @@ public class JmsNamespaceHandlerTests extends TestCase {
 
 		public Message message;
 
+		@Override
 		public void onMessage(Message message) {
 			this.message = message;
 		}
@@ -229,6 +232,7 @@ public class JmsNamespaceHandlerTests extends TestCase {
 			super(path, clazz);
 		}
 
+		@Override
 		protected void initBeanDefinitionReader(XmlBeanDefinitionReader beanDefinitionReader) {
 			this.registeredComponents = new HashSet<ComponentDefinition>();
 			beanDefinitionReader.setEventListener(new StoringReaderEventListener(this.registeredComponents));
@@ -268,6 +272,7 @@ public class JmsNamespaceHandlerTests extends TestCase {
 			this.registeredComponents = registeredComponents;
 		}
 
+		@Override
 		public void componentRegistered(ComponentDefinition componentDefinition) {
 			this.registeredComponents.add(componentDefinition);
 		}
@@ -276,6 +281,7 @@ public class JmsNamespaceHandlerTests extends TestCase {
 
 	static class TestErrorHandler implements ErrorHandler {
 
+		@Override
 		public void handleError(Throwable t) {
 		}
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java
index 24211c5fd5..4e5a4afc03 100644
--- a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java
@@ -79,6 +79,7 @@ public class JmsTransactionManagerTests extends TestCase {
 		TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition());
 		JmsTemplate jt = new JmsTemplate(cf);
 		jt.execute(new SessionCallback() {
+			@Override
 			public Object doInJms(Session sess) {
 				assertTrue(sess == session);
 				return null;
@@ -118,6 +119,7 @@ public class JmsTransactionManagerTests extends TestCase {
 		TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition());
 		JmsTemplate jt = new JmsTemplate(cf);
 		jt.execute(new SessionCallback() {
+			@Override
 			public Object doInJms(Session sess) {
 				assertTrue(sess == session);
 				return null;
@@ -157,6 +159,7 @@ public class JmsTransactionManagerTests extends TestCase {
 		TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition());
 		final JmsTemplate jt = new JmsTemplate(cf);
 		jt.execute(new SessionCallback() {
+			@Override
 			public Object doInJms(Session sess) {
 				assertTrue(sess == session);
 				return null;
@@ -164,8 +167,10 @@ public class JmsTransactionManagerTests extends TestCase {
 		});
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				jt.execute(new SessionCallback() {
+					@Override
 					public Object doInJms(Session sess) {
 						assertTrue(sess == session);
 						return null;
@@ -207,6 +212,7 @@ public class JmsTransactionManagerTests extends TestCase {
 		TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition());
 		final JmsTemplate jt = new JmsTemplate(cf);
 		jt.execute(new SessionCallback() {
+			@Override
 			public Object doInJms(Session sess) {
 				assertTrue(sess == session);
 				return null;
@@ -214,8 +220,10 @@ public class JmsTransactionManagerTests extends TestCase {
 		});
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				jt.execute(new SessionCallback() {
+					@Override
 					public Object doInJms(Session sess) {
 						assertTrue(sess == session);
 						return null;
@@ -270,6 +278,7 @@ public class JmsTransactionManagerTests extends TestCase {
 		TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition());
 		final JmsTemplate jt = new JmsTemplate(cf);
 		jt.execute(new SessionCallback() {
+			@Override
 			public Object doInJms(Session sess) {
 				assertTrue(sess == session);
 				return null;
@@ -278,8 +287,10 @@ public class JmsTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				jt.execute(new SessionCallback() {
+					@Override
 					public Object doInJms(Session sess) {
 						assertTrue(sess != session);
 						return null;
@@ -288,6 +299,7 @@ public class JmsTransactionManagerTests extends TestCase {
 			}
 		});
 		jt.execute(new SessionCallback() {
+			@Override
 			public Object doInJms(Session sess) {
 				assertTrue(sess == session);
 				return null;
@@ -335,6 +347,7 @@ public class JmsTransactionManagerTests extends TestCase {
 		TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition());
 		final JmsTemplate jt = new JmsTemplate(cf);
 		jt.execute(new SessionCallback() {
+			@Override
 			public Object doInJms(Session sess) {
 				assertTrue(sess == session);
 				return null;
@@ -343,8 +356,10 @@ public class JmsTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				jt.execute(new SessionCallback() {
+					@Override
 					public Object doInJms(Session sess) {
 						assertTrue(sess != session);
 						return null;
@@ -353,6 +368,7 @@ public class JmsTransactionManagerTests extends TestCase {
 			}
 		});
 		jt.execute(new SessionCallback() {
+			@Override
 			public Object doInJms(Session sess) {
 				assertTrue(sess == session);
 				return null;
@@ -407,6 +423,7 @@ public class JmsTransactionManagerTests extends TestCase {
 		TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition());
 		JmsTemplate jt = new JmsTemplate(cf);
 		jt.send(dest, new MessageCreator() {
+			@Override
 			public Message createMessage(Session session) throws JMSException {
 				return message;
 			}
@@ -446,6 +463,7 @@ public class JmsTransactionManagerTests extends TestCase {
 		TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition());
 		JmsTemplate jt = new JmsTemplate102(cf, false);
 		jt.execute(new SessionCallback() {
+			@Override
 			public Object doInJms(Session sess) {
 				assertTrue(sess == session);
 				return null;
@@ -485,6 +503,7 @@ public class JmsTransactionManagerTests extends TestCase {
 		TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition());
 		JmsTemplate jt = new JmsTemplate102(cf, true);
 		jt.execute(new SessionCallback() {
+			@Override
 			public Object doInJms(Session sess) {
 				assertTrue(sess == session);
 				return null;
@@ -497,6 +516,7 @@ public class JmsTransactionManagerTests extends TestCase {
 		cfControl.verify();
 	}
 
+	@Override
 	protected void tearDown() {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java
index e37dd2e5dc..b1cd2e2b02 100644
--- a/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java
+++ b/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java
@@ -38,44 +38,55 @@ public class TestConnection implements Connection {
 	private int closeCount;
 
 
+	@Override
 	public Session createSession(boolean b, int i) throws JMSException {
 		return null;
 	}
 
+	@Override
 	public String getClientID() throws JMSException {
 		return null;
 	}
 
+	@Override
 	public void setClientID(String paramName) throws JMSException {
 	}
 
+	@Override
 	public ConnectionMetaData getMetaData() throws JMSException {
 		return null;
 	}
 
+	@Override
 	public ExceptionListener getExceptionListener() throws JMSException {
 		return exceptionListener;
 	}
 
+	@Override
 	public void setExceptionListener(ExceptionListener exceptionListener) throws JMSException {
 		this.exceptionListener = exceptionListener;
 	}
 
+	@Override
 	public void start() throws JMSException {
 		this.startCount++;
 	}
 
+	@Override
 	public void stop() throws JMSException {
 	}
 
+	@Override
 	public void close() throws JMSException {
 		this.closeCount++;
 	}
 
+	@Override
 	public ConnectionConsumer createConnectionConsumer(Destination destination, String paramName, ServerSessionPool serverSessionPool, int i) throws JMSException {
 		return null;
 	}
 
+	@Override
 	public ConnectionConsumer createDurableConnectionConsumer(Topic topic, String paramName, String paramName1, ServerSessionPool serverSessionPool, int i) throws JMSException {
 		return null;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java
index e3f489f8a8..16a20d342e 100644
--- a/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java
+++ b/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java
@@ -26,6 +26,7 @@ public class TestExceptionListener implements ExceptionListener {
 
 	private int count = 0;
 
+	@Override
 	public void onException(JMSException ex) {
 		this.count++;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java
index 8918069e1b..41c15ccf2b 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java
@@ -22,10 +22,12 @@ package org.springframework.jms.core;
  */
 public class JmsTemplate102JtaTests extends JmsTemplate102Tests {
 
+	@Override
 	protected boolean useTransactedSession() {
 		return true;
 	}
 
+	@Override
 	protected boolean useTransactedTemplate() {
 		return false;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java
index b37037c444..aa03485dc5 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java
@@ -102,6 +102,7 @@ public class JmsTemplate102Tests extends TestCase {
 	/**
 	 * Create the mock objects for testing.
 	 */
+	@Override
 	protected void setUp() throws Exception {
 		mockJndiControl = MockControl.createControl(Context.class);
 		mockJndiContext = (Context) this.mockJndiControl.getMock();
@@ -169,6 +170,7 @@ public class JmsTemplate102Tests extends TestCase {
 		JmsTemplate102 template = new JmsTemplate102();
 		JndiDestinationResolver destMan = new JndiDestinationResolver();
 		destMan.setJndiTemplate(new JndiTemplate() {
+			@Override
 			protected Context createInitialContext() {
 				return mockJndiContext;
 			}
@@ -203,6 +205,7 @@ public class JmsTemplate102Tests extends TestCase {
 		topicConnectionControl.replay();
 
 		template.execute(new SessionCallback() {
+			@Override
 			public Object doInJms(Session session) throws JMSException {
 				boolean b = session.getTransacted();
 				return null;
@@ -244,6 +247,7 @@ public class JmsTemplate102Tests extends TestCase {
 		topicConnectionControl.replay();
 
 		template.execute(new ProducerCallback() {
+			@Override
 			public Object doInJms(Session session, MessageProducer producer) throws JMSException {
 				boolean b = session.getTransacted();
 				int i = producer.getPriority();
@@ -292,6 +296,7 @@ public class JmsTemplate102Tests extends TestCase {
 		topicConnectionControl.replay();
 
 		template.execute(new ProducerCallback() {
+			@Override
 			public Object doInJms(Session session, MessageProducer producer) throws JMSException {
 				boolean b = session.getTransacted();
 				int i = producer.getPriority();
@@ -324,6 +329,7 @@ public class JmsTemplate102Tests extends TestCase {
 		queueConnectionControl.replay();
 
 		template.execute(new SessionCallback() {
+			@Override
 			public Object doInJms(Session session) throws JMSException {
 				boolean b = session.getTransacted();
 				return null;
@@ -365,6 +371,7 @@ public class JmsTemplate102Tests extends TestCase {
 		queueConnectionControl.replay();
 
 		template.execute(new ProducerCallback() {
+			@Override
 			public Object doInJms(Session session, MessageProducer producer)
 				throws JMSException {
 				boolean b = session.getTransacted();
@@ -411,6 +418,7 @@ public class JmsTemplate102Tests extends TestCase {
 		queueConnectionControl.replay();
 
 		template.execute(new ProducerCallback() {
+			@Override
 			public Object doInJms(Session session, MessageProducer producer) throws JMSException {
 				boolean b = session.getTransacted();
 				int i = producer.getPriority();
@@ -611,6 +619,7 @@ public class JmsTemplate102Tests extends TestCase {
 
 		if (useDefaultDestination) {
 			template.send(new MessageCreator() {
+				@Override
 				public Message createMessage(Session session) throws JMSException {
 					return session.createTextMessage("just testing");
 				}
@@ -619,6 +628,7 @@ public class JmsTemplate102Tests extends TestCase {
 		else {
 			if (explicitQueue) {
 				template.send(mockQueue, new MessageCreator() {
+					@Override
 					public Message createMessage(Session session) throws JMSException {
 						return session.createTextMessage("just testing");
 					}
@@ -626,6 +636,7 @@ public class JmsTemplate102Tests extends TestCase {
 			}
 			else {
 				template.send("testQueue", new MessageCreator() {
+					@Override
 					public Message createMessage(Session session)
 						throws JMSException {
 						return session.createTextMessage("just testing");
@@ -689,6 +700,7 @@ public class JmsTemplate102Tests extends TestCase {
 
 		if (explicitTopic) {
 			template.send(mockTopic, new MessageCreator() {
+				@Override
 				public Message createMessage(Session session)
 					throws JMSException {
 					return session.createTextMessage("just testing");
@@ -697,6 +709,7 @@ public class JmsTemplate102Tests extends TestCase {
 		}
 		else {
 			template.send("testTopic", new MessageCreator() {
+				@Override
 				public Message createMessage(Session session)
 					throws JMSException {
 					return session.createTextMessage("just testing");
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java
index 20e5b3ed2b..de630545c5 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java
@@ -22,10 +22,12 @@ package org.springframework.jms.core;
  */
 public class JmsTemplate102TransactedTests extends JmsTemplate102Tests {
 
+	@Override
 	protected boolean useTransactedSession() {
 		return true;
 	}
 
+	@Override
 	protected boolean useTransactedTemplate() {
 		return true;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java
index f13a7ccd56..0fea92f956 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java
@@ -22,10 +22,12 @@ package org.springframework.jms.core;
  */
 public class JmsTemplateJtaTests extends JmsTemplateTests {
 
+	@Override
 	protected boolean useTransactedSession() {
 		return true;
 	}
 
+	@Override
 	protected boolean useTransactedTemplate() {
 		return false;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
index bcf880eaae..7ede7b3a22 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
@@ -91,6 +91,7 @@ public class JmsTemplateTests extends TestCase {
 	/**
 	 * Create the mock objects for testing.
 	 */
+	@Override
 	protected void setUp() throws Exception {
 		mockJndiControl = MockControl.createControl(Context.class);
 		mockJndiContext = (Context) this.mockJndiControl.getMock();
@@ -131,6 +132,7 @@ public class JmsTemplateTests extends TestCase {
 		JmsTemplate template = new JmsTemplate();
 		JndiDestinationResolver destMan = new JndiDestinationResolver();
 		destMan.setJndiTemplate(new JndiTemplate() {
+			@Override
 			protected Context createInitialContext() {
 				return mockJndiContext;
 			}
@@ -186,6 +188,7 @@ public class JmsTemplateTests extends TestCase {
 		connectionControl.replay();
 
 		template.execute(new ProducerCallback() {
+			@Override
 			public Object doInJms(Session session, MessageProducer producer) throws JMSException {
 				boolean b = session.getTransacted();
 				int i = producer.getPriority();
@@ -229,6 +232,7 @@ public class JmsTemplateTests extends TestCase {
 		connectionControl.replay();
 
 		template.execute(new ProducerCallback() {
+			@Override
 			public Object doInJms(Session session, MessageProducer producer) throws JMSException {
 				boolean b = session.getTransacted();
 				int i = producer.getPriority();
@@ -258,6 +262,7 @@ public class JmsTemplateTests extends TestCase {
 		connectionControl.replay();
 
 		template.execute(new SessionCallback() {
+			@Override
 			public Object doInJms(Session session) throws JMSException {
 				boolean b = session.getTransacted();
 				return null;
@@ -296,12 +301,14 @@ public class JmsTemplateTests extends TestCase {
 		TransactionSynchronizationManager.initSynchronization();
 		try {
 			template.execute(new SessionCallback() {
+				@Override
 				public Object doInJms(Session session) throws JMSException {
 					boolean b = session.getTransacted();
 					return null;
 				}
 			});
 			template.execute(new SessionCallback() {
+				@Override
 				public Object doInJms(Session session) throws JMSException {
 					boolean b = session.getTransacted();
 					return null;
@@ -472,6 +479,7 @@ public class JmsTemplateTests extends TestCase {
 
 		if (useDefaultDestination) {
 			template.send(new MessageCreator() {
+				@Override
 				public Message createMessage(Session session) throws JMSException {
 					return session.createTextMessage("just testing");
 				}
@@ -480,6 +488,7 @@ public class JmsTemplateTests extends TestCase {
 		else {
 			if (explicitDestination) {
 				template.send(mockQueue, new MessageCreator() {
+					@Override
 					public Message createMessage(Session session) throws JMSException {
 						return session.createTextMessage("just testing");
 					}
@@ -487,6 +496,7 @@ public class JmsTemplateTests extends TestCase {
 			}
 			else {
 				template.send(destinationName, new MessageCreator() {
+					@Override
 					public Message createMessage(Session session) throws JMSException {
 						return session.createTextMessage("just testing");
 					}
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java
index a3874798cc..bfa36dcb5d 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java
@@ -22,10 +22,12 @@ package org.springframework.jms.core;
  */
 public class JmsTemplateTransactedTests extends JmsTemplateTests {
 
+	@Override
 	protected boolean useTransactedSession() {
 		return true;
 	}
 
+	@Override
 	protected boolean useTransactedTemplate() {
 		return true;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
index dbc3663fa0..2072342bd6 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
@@ -37,6 +37,7 @@ public class JmsGatewaySupportTests extends TestCase {
 		connectionFactoryControl.replay();
 		final List test = new ArrayList();
 		JmsGatewaySupport gateway = new JmsGatewaySupport() {
+			@Override
 			protected void initGateway() {
 				test.add("test");
 			}
@@ -53,6 +54,7 @@ public class JmsGatewaySupportTests extends TestCase {
 		JmsTemplate template = new JmsTemplate();
 		final List test = new ArrayList();
 		JmsGatewaySupport gateway = new JmsGatewaySupport() {
+			@Override
 			protected void initGateway() {
 				test.add("test");
 			}
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
index 18e47584a4..388fbe86c8 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
@@ -63,6 +63,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener
 		this.container = (SimpleMessageListenerContainer) getContainer();
 	}
 
+	@Override
 	protected AbstractMessageListenerContainer getContainer() {
 		return new SimpleMessageListenerContainer();
 	}
@@ -234,6 +235,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener
 		this.container.setConnectionFactory(connectionFactory);
 		this.container.setDestinationName(DESTINATION_NAME);
 		this.container.setMessageListener(new SessionAwareMessageListener() {
+			@Override
 			public void onMessage(Message message, Session sess) {
 				try {
 					// Check correct Session passed into SessionAwareMessageListener.
@@ -301,6 +303,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener
 		this.container.setDestinationName(DESTINATION_NAME);
 		this.container.setMessageListener(listener);
 		this.container.setTaskExecutor(new TaskExecutor() {
+			@Override
 			public void execute(Runnable task) {
 				listener.executorInvoked = true;
 				assertFalse(listener.listenerInvoked);
@@ -364,6 +367,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener
 		this.container.setConnectionFactory(connectionFactory);
 		this.container.setDestinationName(DESTINATION_NAME);
 		this.container.setMessageListener(new SessionAwareMessageListener() {
+			@Override
 			public void onMessage(Message message, Session session) throws JMSException {
 				throw theException;
 			}
@@ -430,6 +434,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener
 		this.container.setConnectionFactory(connectionFactory);
 		this.container.setDestinationName(DESTINATION_NAME);
 		this.container.setMessageListener(new SessionAwareMessageListener() {
+			@Override
 			public void onMessage(Message message, Session session) throws JMSException {
 				throw theException;
 			}
@@ -491,6 +496,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener
 		this.container.setConnectionFactory(connectionFactory);
 		this.container.setDestinationName(DESTINATION_NAME);
 		this.container.setMessageListener(new MessageListener() {
+			@Override
 			public void onMessage(Message message) {
 				throw new UnsupportedOperationException();
 			}
@@ -555,6 +561,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener
 		this.container.setConnectionFactory(connectionFactory);
 		this.container.setDestinationName(DESTINATION_NAME);
 		this.container.setMessageListener(new MessageListener() {
+			@Override
 			public void onMessage(Message message) {
 				throw new UnsupportedOperationException();
 			}
@@ -644,6 +651,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener
 
 		public boolean listenerInvoked = false;
 
+		@Override
 		public void onMessage(Message message) {
 			this.listenerInvoked = true;
 		}
@@ -658,30 +666,37 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener
 			this.messageListener.onMessage(message);
 		}
 
+		@Override
 		public String getMessageSelector() throws JMSException {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public MessageListener getMessageListener() throws JMSException {
 			return this.messageListener;
 		}
 
+		@Override
 		public void setMessageListener(MessageListener messageListener) throws JMSException {
 			this.messageListener = messageListener;
 		}
 
+		@Override
 		public Message receive() throws JMSException {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public Message receive(long l) throws JMSException {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public Message receiveNoWait() throws JMSException {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public void close() throws JMSException {
 			throw new UnsupportedOperationException();
 		}
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java
index 56c56a8e65..d34c5597d6 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java
@@ -169,6 +169,7 @@ public final class MessageListenerAdapter102Tests {
 		mockDelegate.replay();
 
 		MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) {
+			@Override
 			protected Object extractMessage(Message message) {
 				return message;
 			}
@@ -230,6 +231,7 @@ public final class MessageListenerAdapter102Tests {
 		mockDelegate.replay();
 
 		MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) {
+			@Override
 			protected Object extractMessage(Message message) {
 				return message;
 			}
@@ -291,6 +293,7 @@ public final class MessageListenerAdapter102Tests {
 		mockDelegate.replay();
 
 		MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) {
+			@Override
 			protected Object extractMessage(Message message) {
 				return message;
 			}
@@ -337,6 +340,7 @@ public final class MessageListenerAdapter102Tests {
 		mockDelegate.replay();
 
 		final MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) {
+			@Override
 			protected Object extractMessage(Message message) {
 				return message;
 			}
@@ -399,6 +403,7 @@ public final class MessageListenerAdapter102Tests {
 		mockDelegate.replay();
 
 		final MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) {
+			@Override
 			protected Object extractMessage(Message message) {
 				return message;
 			}
@@ -434,6 +439,7 @@ public final class MessageListenerAdapter102Tests {
 		mockDelegate.replay();
 
 		final MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) {
+			@Override
 			protected Object extractMessage(Message message) {
 				return message;
 			}
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
index 2afee39fef..6a29626208 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
@@ -216,6 +216,7 @@ public class MessageListenerAdapterTests {
 		mockDelegate.replay();
 
 		MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) {
+			@Override
 			protected void handleListenerException(Throwable ex) {
 				assertNotNull("The Throwable passed to the handleListenerException(..) method must never be null.", ex);
 				assertTrue("The Throwable passed to the handleListenerException(..) method must be of type [ListenerExecutionFailedException].",
@@ -320,6 +321,7 @@ public class MessageListenerAdapterTests {
 		mockDelegate.replay();
 
 		MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) {
+			@Override
 			protected Object extractMessage(Message message) {
 				return message;
 			}
@@ -382,6 +384,7 @@ public class MessageListenerAdapterTests {
 		mockDelegate.replay();
 
 		MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) {
+			@Override
 			protected Object extractMessage(Message message) {
 				return message;
 			}
@@ -427,6 +430,7 @@ public class MessageListenerAdapterTests {
 		mockDelegate.replay();
 
 		final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) {
+			@Override
 			protected Object extractMessage(Message message) {
 				return message;
 			}
@@ -488,6 +492,7 @@ public class MessageListenerAdapterTests {
 		mockDelegate.replay();
 
 		final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) {
+			@Override
 			protected Object extractMessage(Message message) {
 				return message;
 			}
@@ -522,6 +527,7 @@ public class MessageListenerAdapterTests {
 		mockDelegate.replay();
 
 		final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) {
+			@Override
 			protected Object extractMessage(Message message) {
 				return message;
 			}
@@ -546,6 +552,7 @@ public class MessageListenerAdapterTests {
 		mockMessage.replay();
 
 		final MessageListenerAdapter adapter = new MessageListenerAdapter() {
+			@Override
 			protected void handleListenerException(Throwable ex) {
 				assertTrue(ex instanceof IllegalStateException);
 			}
@@ -566,9 +573,11 @@ public class MessageListenerAdapterTests {
 		mockMessage.replay();
 
 		final MessageListenerAdapter adapter = new MessageListenerAdapter() {
+			@Override
 			protected void handleListenerException(Throwable ex) {
 				assertTrue(ex instanceof javax.jms.IllegalStateException);
 			}
+			@Override
 			protected String getListenerMethodName(Message originalMessage, Object extractedMessage) {
 				return null;
 			}
@@ -596,6 +605,7 @@ public class MessageListenerAdapterTests {
 		mockDelegate.replay();
 
 		final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) {
+			@Override
 			protected Object extractMessage(Message message) {
 				return message;
 			}
@@ -654,6 +664,7 @@ public class MessageListenerAdapterTests {
 		mockDelegate.replay();
 
 		final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) {
+			@Override
 			protected Object extractMessage(Message message) {
 				return message;
 			}
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java
index 4973cda8ce..218ec707e1 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java
@@ -35,6 +35,7 @@ public class StubMessageListenerAdapter extends MessageListenerAdapter {
 		this.wasCalled = true;
 	}
 
+	@Override
 	protected void handleListenerException(Throwable ex) {
 		System.out.println(ex);
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java
index 20ea0c40bb..324c7bf817 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java
@@ -35,6 +35,7 @@ public class StubMessageListenerAdapter102 extends MessageListenerAdapter102 {
 		this.wasCalled = true;
 	}
 
+	@Override
 	protected void handleListenerException(Throwable ex) {
 		System.out.println(ex);
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java
index 3b7e23a91f..880e535f92 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java
@@ -34,6 +34,7 @@ public class DefaultJmsActivationSpecFactoryTests extends TestCase {
 
 	private JmsActivationSpecConfig activationSpecConfig;
 
+	@Override
 	protected void setUp() throws Exception {
 		activationSpecConfig = new JmsActivationSpecConfig();
 		activationSpecConfig.setMaxConcurrency(5);
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java
index 1be6176bd6..cf433e3352 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java
@@ -26,6 +26,7 @@ import org.springframework.jca.StubActivationSpec;
  */
 public class StubJmsActivationSpecFactory implements JmsActivationSpecFactory {
 
+	@Override
 	public ActivationSpec createActivationSpec(ResourceAdapter adapter, JmsActivationSpecConfig config) {
 		return new StubActivationSpec();
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java b/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java
index 97c33f0307..49b1f47f6c 100644
--- a/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java
@@ -56,6 +56,7 @@ public class JmsInvokerTests extends TestCase {
 	private Queue mockQueue;
 
 
+	@Override
 	protected void setUp() throws Exception {
 		connectionFactoryControl = MockControl.createControl(QueueConnectionFactory.class);
 		mockConnectionFactory = (QueueConnectionFactory) connectionFactoryControl.getMock();
@@ -107,6 +108,7 @@ public class JmsInvokerTests extends TestCase {
 		exporter.afterPropertiesSet();
 
 		JmsInvokerProxyFactoryBean pfb = new JmsInvokerProxyFactoryBean() {
+			@Override
 			protected Message doExecuteRequest(Session session, Queue queue, Message requestMessage) throws JMSException {
 				MockControl exporterSessionControl = MockControl.createControl(Session.class);
 				Session mockExporterSession = (Session) exporterSessionControl.getMock();
@@ -167,59 +169,75 @@ public class JmsInvokerTests extends TestCase {
 
 		public boolean closed = false;
 
+		@Override
 		public void setDisableMessageID(boolean b) throws JMSException {
 		}
 
+		@Override
 		public boolean getDisableMessageID() throws JMSException {
 			return false;
 		}
 
+		@Override
 		public void setDisableMessageTimestamp(boolean b) throws JMSException {
 		}
 
+		@Override
 		public boolean getDisableMessageTimestamp() throws JMSException {
 			return false;
 		}
 
+		@Override
 		public void setDeliveryMode(int i) throws JMSException {
 		}
 
+		@Override
 		public int getDeliveryMode() throws JMSException {
 			return 0;
 		}
 
+		@Override
 		public void setPriority(int i) throws JMSException {
 		}
 
+		@Override
 		public int getPriority() throws JMSException {
 			return 0;
 		}
 
+		@Override
 		public void setTimeToLive(long l) throws JMSException {
 		}
 
+		@Override
 		public long getTimeToLive() throws JMSException {
 			return 0;
 		}
 
+		@Override
 		public Destination getDestination() throws JMSException {
 			return null;
 		}
 
+		@Override
 		public void close() throws JMSException {
 			this.closed = true;
 		}
 
+		@Override
 		public void send(Message message) throws JMSException {
 			this.response = message;
 		}
 
+		@Override
 		public void send(Message message, int i, int i1, long l) throws JMSException {
 		}
 
+		@Override
 		public void send(Destination destination, Message message) throws JMSException {
 		}
 
+		@Override
 		public void send(Destination destination, Message message, int i, int i1, long l) throws JMSException {
 		}
 	}
@@ -235,169 +253,216 @@ public class JmsInvokerTests extends TestCase {
 			this.serializable = serializable;
 		}
 
+		@Override
 		public void setObject(Serializable serializable) throws JMSException {
 			this.serializable = serializable;
 		}
 
+		@Override
 		public Serializable getObject() throws JMSException {
 			return serializable;
 		}
 
+		@Override
 		public String getJMSMessageID() throws JMSException {
 			return null;
 		}
 
+		@Override
 		public void setJMSMessageID(String string) throws JMSException {
 		}
 
+		@Override
 		public long getJMSTimestamp() throws JMSException {
 			return 0;
 		}
 
+		@Override
 		public void setJMSTimestamp(long l) throws JMSException {
 		}
 
+		@Override
 		public byte[] getJMSCorrelationIDAsBytes() throws JMSException {
 			return new byte[0];
 		}
 
+		@Override
 		public void setJMSCorrelationIDAsBytes(byte[] bytes) throws JMSException {
 		}
 
+		@Override
 		public void setJMSCorrelationID(String string) throws JMSException {
 		}
 
+		@Override
 		public String getJMSCorrelationID() throws JMSException {
 			return null;
 		}
 
+		@Override
 		public Destination getJMSReplyTo() throws JMSException {
 			return replyTo;
 		}
 
+		@Override
 		public void setJMSReplyTo(Destination destination) throws JMSException {
 			this.replyTo = destination;
 		}
 
+		@Override
 		public Destination getJMSDestination() throws JMSException {
 			return null;
 		}
 
+		@Override
 		public void setJMSDestination(Destination destination) throws JMSException {
 		}
 
+		@Override
 		public int getJMSDeliveryMode() throws JMSException {
 			return 0;
 		}
 
+		@Override
 		public void setJMSDeliveryMode(int i) throws JMSException {
 		}
 
+		@Override
 		public boolean getJMSRedelivered() throws JMSException {
 			return false;
 		}
 
+		@Override
 		public void setJMSRedelivered(boolean b) throws JMSException {
 		}
 
+		@Override
 		public String getJMSType() throws JMSException {
 			return null;
 		}
 
+		@Override
 		public void setJMSType(String string) throws JMSException {
 		}
 
+		@Override
 		public long getJMSExpiration() throws JMSException {
 			return 0;
 		}
 
+		@Override
 		public void setJMSExpiration(long l) throws JMSException {
 		}
 
+		@Override
 		public int getJMSPriority() throws JMSException {
 			return 0;
 		}
 
+		@Override
 		public void setJMSPriority(int i) throws JMSException {
 		}
 
+		@Override
 		public void clearProperties() throws JMSException {
 		}
 
+		@Override
 		public boolean propertyExists(String string) throws JMSException {
 			return false;
 		}
 
+		@Override
 		public boolean getBooleanProperty(String string) throws JMSException {
 			return false;
 		}
 
+		@Override
 		public byte getByteProperty(String string) throws JMSException {
 			return 0;
 		}
 
+		@Override
 		public short getShortProperty(String string) throws JMSException {
 			return 0;
 		}
 
+		@Override
 		public int getIntProperty(String string) throws JMSException {
 			return 0;
 		}
 
+		@Override
 		public long getLongProperty(String string) throws JMSException {
 			return 0;
 		}
 
+		@Override
 		public float getFloatProperty(String string) throws JMSException {
 			return 0;
 		}
 
+		@Override
 		public double getDoubleProperty(String string) throws JMSException {
 			return 0;
 		}
 
+		@Override
 		public String getStringProperty(String string) throws JMSException {
 			return null;
 		}
 
+		@Override
 		public Object getObjectProperty(String string) throws JMSException {
 			return null;
 		}
 
+		@Override
 		public Enumeration getPropertyNames() throws JMSException {
 			return null;
 		}
 
+		@Override
 		public void setBooleanProperty(String string, boolean b) throws JMSException {
 		}
 
+		@Override
 		public void setByteProperty(String string, byte b) throws JMSException {
 		}
 
+		@Override
 		public void setShortProperty(String string, short i) throws JMSException {
 		}
 
+		@Override
 		public void setIntProperty(String string, int i) throws JMSException {
 		}
 
+		@Override
 		public void setLongProperty(String string, long l) throws JMSException {
 		}
 
+		@Override
 		public void setFloatProperty(String string, float v) throws JMSException {
 		}
 
+		@Override
 		public void setDoubleProperty(String string, double v) throws JMSException {
 		}
 
+		@Override
 		public void setStringProperty(String string, String string1) throws JMSException {
 		}
 
+		@Override
 		public void setObjectProperty(String string, Object object) throws JMSException {
 		}
 
+		@Override
 		public void acknowledge() throws JMSException {
 		}
 
+		@Override
 		public void clearBody() throws JMSException {
 		}
 	}
@@ -405,6 +470,7 @@ public class JmsInvokerTests extends TestCase {
 
 	private static class MockSimpleMessageConverter extends SimpleMessageConverter {
 
+		@Override
 		public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
 			return new MockObjectMessage((Serializable) object);
 		}
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java
index 450c0889a5..861ff0a52b 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java
@@ -49,12 +49,14 @@ public final class SimpleMessageConverter102Tests extends TestCase {
 		messageControl.setVoidCallable(1);
 		message.readBytes(new byte[SimpleMessageConverter102.BUFFER_SIZE]);
 		messageControl.setMatcher(new ArgumentsMatcher() {
+			@Override
 			public boolean matches(Object[] arg0, Object[] arg1) {
 				byte[] one = (byte[]) arg0[0];
 				byte[] two = (byte[]) arg1[0];
 				return Arrays.equals(one, two);
 			}
 
+			@Override
 			public String toString(Object[] arg0) {
 				return "bla";
 			}
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
index 7085c1669b..6546fd869d 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
@@ -87,12 +87,14 @@ public final class SimpleMessageConverterTests {
 		messageControl.setReturnValue(content.length, 1);
 		message.readBytes(new byte[content.length]);
 		messageControl.setMatcher(new ArgumentsMatcher() {
+			@Override
 			public boolean matches(Object[] arg0, Object[] arg1) {
 				byte[] one = (byte[]) arg0[0];
 				byte[] two = (byte[]) arg1[0];
 				return Arrays.equals(one, two);
 			}
 
+			@Override
 			public String toString(Object[] arg0) {
 				return "bla";
 			}
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java
index 739dbe3d3c..531ff04c4c 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java
@@ -88,6 +88,7 @@ public class JndiDestinationResolverTests {
 		mockDestinationResolver.replay();
 
 		JndiDestinationResolver resolver = new JndiDestinationResolver() {
+			@Override
 			protected Object lookup(String jndiName, Class requiredClass) throws NamingException {
 				throw new NamingException();
 			}
@@ -114,6 +115,7 @@ public class JndiDestinationResolverTests {
 		mockDestinationResolver.replay();
 
 		final JndiDestinationResolver resolver = new JndiDestinationResolver() {
+			@Override
 			protected Object lookup(String jndiName, Class requiredClass) throws NamingException {
 				throw new NamingException();
 			}
@@ -134,6 +136,7 @@ public class JndiDestinationResolverTests {
 
 		private boolean called;
 
+		@Override
 		protected Object lookup(String jndiName, Class requiredType) throws NamingException {
 			if (called) {
 				fail("Must not be delegating to lookup(..), must be resolving from cache.");
@@ -152,6 +155,7 @@ public class JndiDestinationResolverTests {
 			return this.callCount;
 		}
 
+		@Override
 		protected Object lookup(String jndiName, Class requiredType) throws NamingException {
 			++this.callCount;
 			return DESTINATION;
diff --git a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index 0c0b3cb81c..02996e490f 100644
--- a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -32,21 +32,25 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM
 	public int rollbacks;
 	public int inflight;
 
+	@Override
 	protected Object doGetTransaction() {
 		return new Object();
 	}
 
+	@Override
 	protected void doBegin(Object transaction, TransactionDefinition definition) {
 		this.lastDefinition = definition;
 		++begun;
 		++inflight;
 	}
 
+	@Override
 	protected void doCommit(DefaultTransactionStatus status) {
 		++commits;
 		--inflight;
 	}
 
+	@Override
 	protected void doRollback(DefaultTransactionStatus status) {
 		++rollbacks;
 		--inflight;
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
index 66ce8a2b07..573e70e2e9 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
@@ -54,10 +54,12 @@ public class DelegatingServletInputStream extends ServletInputStream {
 	}
 
 
+	@Override
 	public int read() throws IOException {
 		return this.sourceStream.read();
 	}
 
+	@Override
 	public void close() throws IOException {
 		super.close();
 		this.sourceStream.close();
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
index 784e160483..c4d9b9ebb3 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
@@ -54,15 +54,18 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 	}
 
 
+	@Override
 	public void write(int b) throws IOException {
 		this.targetStream.write(b);
 	}
 
+	@Override
 	public void flush() throws IOException {
 		super.flush();
 		this.targetStream.flush();
 	}
 
+	@Override
 	public void close() throws IOException {
 		super.close();
 		this.targetStream.close();
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java
index 3f5d5106c3..bb1fa0ee83 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java
@@ -116,6 +116,7 @@ public class MockFilterChain implements FilterChain {
 	 * Invoke registered {@link javax.servlet.Filter}s and/or {@link javax.servlet.Servlet} also saving the
 	 * request and response.
 	 */
+	@Override
 	public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
@@ -159,15 +160,18 @@ public class MockFilterChain implements FilterChain {
 			this.delegateServlet = servlet;
 		}
 
+		@Override
 		public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
 				throws IOException, ServletException {
 
 			this.delegateServlet.service(request, response);
 		}
 
+		@Override
 		public void init(FilterConfig filterConfig) throws ServletException {
 		}
 
+		@Override
 		public void destroy() {
 		}
 
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java
index 34cafd55fc..2de79f09c2 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java
@@ -79,10 +79,12 @@ public class MockFilterConfig implements FilterConfig {
 	}
 
 
+	@Override
 	public String getFilterName() {
 		return filterName;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return servletContext;
 	}
@@ -92,11 +94,13 @@ public class MockFilterConfig implements FilterConfig {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
index 7df22ffaf8..8d0b813d48 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
@@ -282,20 +282,24 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	// ServletRequest interface
 	// ---------------------------------------------------------------------
 
+	@Override
 	public Object getAttribute(String name) {
 		checkActive();
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		checkActive();
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
 
+	@Override
 	public void setCharacterEncoding(String characterEncoding) {
 		this.characterEncoding = characterEncoding;
 		updateContentTypeHeader();
@@ -315,6 +319,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.content = content;
 	}
 
+	@Override
 	public int getContentLength() {
 		return (this.content != null ? this.content.length : -1);
 	}
@@ -331,10 +336,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public ServletInputStream getInputStream() {
 		if (this.content != null) {
 			return new DelegatingServletInputStream(new ByteArrayInputStream(this.content));
@@ -455,21 +462,25 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.parameters.clear();
 	}
 
+	@Override
 	public String getParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		String[] arr = this.parameters.get(name);
 		return (arr != null && arr.length > 0 ? arr[0] : null);
 	}
 
+	@Override
 	public Enumeration<String> getParameterNames() {
 		return Collections.enumeration(this.parameters.keySet());
 	}
 
+	@Override
 	public String[] getParameterValues(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.parameters.get(name);
 	}
 
+	@Override
 	public Map<String, String[]> getParameterMap() {
 		return Collections.unmodifiableMap(this.parameters);
 	}
@@ -478,6 +489,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.protocol = protocol;
 	}
 
+	@Override
 	public String getProtocol() {
 		return this.protocol;
 	}
@@ -486,6 +498,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.scheme = scheme;
 	}
 
+	@Override
 	public String getScheme() {
 		return this.scheme;
 	}
@@ -494,6 +507,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.serverName = serverName;
 	}
 
+	@Override
 	public String getServerName() {
 		return this.serverName;
 	}
@@ -502,10 +516,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.serverPort = serverPort;
 	}
 
+	@Override
 	public int getServerPort() {
 		return this.serverPort;
 	}
 
+	@Override
 	public BufferedReader getReader() throws UnsupportedEncodingException {
 		if (this.content != null) {
 			InputStream sourceStream = new ByteArrayInputStream(this.content);
@@ -522,6 +538,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remoteAddr = remoteAddr;
 	}
 
+	@Override
 	public String getRemoteAddr() {
 		return this.remoteAddr;
 	}
@@ -530,10 +547,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remoteHost = remoteHost;
 	}
 
+	@Override
 	public String getRemoteHost() {
 		return this.remoteHost;
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		checkActive();
 		Assert.notNull(name, "Attribute name must not be null");
@@ -545,6 +564,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		checkActive();
 		Assert.notNull(name, "Attribute name must not be null");
@@ -579,10 +599,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.locales.addAll(locales);
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locales.get(0);
 	}
 
+	@Override
 	public Enumeration<Locale> getLocales() {
 		return Collections.enumeration(this.locales);
 	}
@@ -591,14 +613,17 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.secure = secure;
 	}
 
+	@Override
 	public boolean isSecure() {
 		return this.secure;
 	}
 
+	@Override
 	public RequestDispatcher getRequestDispatcher(String path) {
 		return new MockRequestDispatcher(path);
 	}
 
+	@Override
 	public String getRealPath(String path) {
 		return this.servletContext.getRealPath(path);
 	}
@@ -607,6 +632,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remotePort = remotePort;
 	}
 
+	@Override
 	public int getRemotePort() {
 		return this.remotePort;
 	}
@@ -615,6 +641,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.localName = localName;
 	}
 
+	@Override
 	public String getLocalName() {
 		return this.localName;
 	}
@@ -623,6 +650,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.localAddr = localAddr;
 	}
 
+	@Override
 	public String getLocalAddr() {
 		return this.localAddr;
 	}
@@ -631,6 +659,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.localPort = localPort;
 	}
 
+	@Override
 	public int getLocalPort() {
 		return this.localPort;
 	}
@@ -643,6 +672,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.authType = authType;
 	}
 
+	@Override
 	public String getAuthType() {
 		return this.authType;
 	}
@@ -651,6 +681,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.cookies = cookies;
 	}
 
+	@Override
 	public Cookie[] getCookies() {
 		return this.cookies;
 	}
@@ -699,6 +730,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public long getDateHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		Object value = (header != null ? header.getValue() : null);
@@ -717,20 +749,24 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public String getHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		return (header != null ? header.getStringValue() : null);
 	}
 
+	@Override
 	public Enumeration<String> getHeaders(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		return Collections.enumeration(header != null ? header.getStringValues() : new LinkedList<String>());
 	}
 
+	@Override
 	public Enumeration<String> getHeaderNames() {
 		return Collections.enumeration(this.headers.keySet());
 	}
 
+	@Override
 	public int getIntHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		Object value = (header != null ? header.getValue() : null);
@@ -752,6 +788,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.method = method;
 	}
 
+	@Override
 	public String getMethod() {
 		return this.method;
 	}
@@ -760,10 +797,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.pathInfo = pathInfo;
 	}
 
+	@Override
 	public String getPathInfo() {
 		return this.pathInfo;
 	}
 
+	@Override
 	public String getPathTranslated() {
 		return (this.pathInfo != null ? getRealPath(this.pathInfo) : null);
 	}
@@ -772,6 +811,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.contextPath = contextPath;
 	}
 
+	@Override
 	public String getContextPath() {
 		return this.contextPath;
 	}
@@ -780,6 +820,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.queryString = queryString;
 	}
 
+	@Override
 	public String getQueryString() {
 		return this.queryString;
 	}
@@ -788,6 +829,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remoteUser = remoteUser;
 	}
 
+	@Override
 	public String getRemoteUser() {
 		return this.remoteUser;
 	}
@@ -796,6 +838,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.userRoles.add(role);
 	}
 
+	@Override
 	public boolean isUserInRole(String role) {
 		return (this.userRoles.contains(role) || (this.servletContext instanceof MockServletContext && ((MockServletContext) this.servletContext).getDeclaredRoles().contains(
 			role)));
@@ -805,6 +848,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.userPrincipal = userPrincipal;
 	}
 
+	@Override
 	public Principal getUserPrincipal() {
 		return this.userPrincipal;
 	}
@@ -813,6 +857,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionId = requestedSessionId;
 	}
 
+	@Override
 	public String getRequestedSessionId() {
 		return this.requestedSessionId;
 	}
@@ -821,10 +866,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestURI = requestURI;
 	}
 
+	@Override
 	public String getRequestURI() {
 		return this.requestURI;
 	}
 
+	@Override
 	public StringBuffer getRequestURL() {
 		StringBuffer url = new StringBuffer(this.scheme);
 		url.append("://").append(this.serverName).append(':').append(this.serverPort);
@@ -836,6 +883,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.servletPath = servletPath;
 	}
 
+	@Override
 	public String getServletPath() {
 		return this.servletPath;
 	}
@@ -848,6 +896,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public HttpSession getSession(boolean create) {
 		checkActive();
 		// Reset session if invalidated.
@@ -861,6 +910,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		return this.session;
 	}
 
+	@Override
 	public HttpSession getSession() {
 		return getSession(true);
 	}
@@ -869,6 +919,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionIdValid = requestedSessionIdValid;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdValid() {
 		return this.requestedSessionIdValid;
 	}
@@ -877,6 +928,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionIdFromCookie = requestedSessionIdFromCookie;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdFromCookie() {
 		return this.requestedSessionIdFromCookie;
 	}
@@ -885,10 +937,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionIdFromURL = requestedSessionIdFromURL;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdFromURL() {
 		return this.requestedSessionIdFromURL;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdFromUrl() {
 		return isRequestedSessionIdFromURL();
 	}
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
index c86e95a93a..5a2b7fd1aa 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -136,6 +136,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.writerAccessAllowed;
 	}
 
+	@Override
 	public void setCharacterEncoding(String characterEncoding) {
 		this.characterEncoding = characterEncoding;
 		this.charset = true;
@@ -152,10 +153,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
 
+	@Override
 	public ServletOutputStream getOutputStream() {
 		if (!this.outputStreamAccessAllowed) {
 			throw new IllegalStateException("OutputStream access not allowed");
@@ -163,6 +166,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.outputStream;
 	}
 
+	@Override
 	public PrintWriter getWriter() throws UnsupportedEncodingException {
 		if (!this.writerAccessAllowed) {
 			throw new IllegalStateException("Writer access not allowed");
@@ -186,6 +190,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 				this.content.toString(this.characterEncoding) : this.content.toString();
 	}
 
+	@Override
 	public void setContentLength(int contentLength) {
 		this.contentLength = contentLength;
 		doAddHeaderValue(CONTENT_LENGTH_HEADER, contentLength, true);
@@ -195,6 +200,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.contentLength;
 	}
 
+	@Override
 	public void setContentType(String contentType) {
 		this.contentType = contentType;
 		if (contentType != null) {
@@ -208,22 +214,27 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public void setBufferSize(int bufferSize) {
 		this.bufferSize = bufferSize;
 	}
 
+	@Override
 	public int getBufferSize() {
 		return this.bufferSize;
 	}
 
+	@Override
 	public void flushBuffer() {
 		setCommitted(true);
 	}
 
+	@Override
 	public void resetBuffer() {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot reset buffer - response is already committed");
@@ -242,10 +253,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		this.committed = committed;
 	}
 
+	@Override
 	public boolean isCommitted() {
 		return this.committed;
 	}
 
+	@Override
 	public void reset() {
 		resetBuffer();
 		this.characterEncoding = null;
@@ -258,10 +271,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		this.errorMessage = null;
 	}
 
+	@Override
 	public void setLocale(Locale locale) {
 		this.locale = locale;
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locale;
 	}
@@ -271,6 +286,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	// HttpServletResponse interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public void addCookie(Cookie cookie) {
 		Assert.notNull(cookie, "Cookie must not be null");
 		this.cookies.add(cookie);
@@ -290,6 +306,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return null;
 	}
 
+	@Override
 	public boolean containsHeader(String name) {
 		return (HeaderValueHolder.getByName(this.headers, name) != null);
 	}
@@ -365,6 +382,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * The default implementation returns the given URL String as-is.
 	 * <p>Can be overridden in subclasses, appending a session id or the like.
 	 */
+	@Override
 	public String encodeURL(String url) {
 		return url;
 	}
@@ -377,18 +395,22 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * override the common {@link #encodeURL} method instead, applying
 	 * to redirect URLs as well as to general URLs.
 	 */
+	@Override
 	public String encodeRedirectURL(String url) {
 		return encodeURL(url);
 	}
 
+	@Override
 	public String encodeUrl(String url) {
 		return encodeURL(url);
 	}
 
+	@Override
 	public String encodeRedirectUrl(String url) {
 		return encodeRedirectURL(url);
 	}
 
+	@Override
 	public void sendError(int status, String errorMessage) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot set error status - response is already committed");
@@ -398,6 +420,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		setCommitted(true);
 	}
 
+	@Override
 	public void sendError(int status) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot set error status - response is already committed");
@@ -406,6 +429,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		setCommitted(true);
 	}
 
+	@Override
 	public void sendRedirect(String url) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot send redirect - response is already committed");
@@ -420,26 +444,32 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return getHeader(LOCATION_HEADER);
 	}
 
+	@Override
 	public void setDateHeader(String name, long value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addDateHeader(String name, long value) {
 		addHeaderValue(name, value);
 	}
 
+	@Override
 	public void setHeader(String name, String value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addHeader(String name, String value) {
 		addHeaderValue(name, value);
 	}
 
+	@Override
 	public void setIntHeader(String name, int value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addIntHeader(String name, int value) {
 		addHeaderValue(name, value);
 	}
@@ -487,10 +517,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public void setStatus(int status) {
 		this.status = status;
 	}
 
+	@Override
 	public void setStatus(int status, String errorMessage) {
 		this.status = status;
 		this.errorMessage = errorMessage;
@@ -553,12 +585,14 @@ public class MockHttpServletResponse implements HttpServletResponse {
 			super(out);
 		}
 
+		@Override
 		public void write(int b) throws IOException {
 			super.write(b);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void flush() throws IOException {
 			super.flush();
 			setCommitted(true);
@@ -576,24 +610,28 @@ public class MockHttpServletResponse implements HttpServletResponse {
 			super(out, true);
 		}
 
+		@Override
 		public void write(char buf[], int off, int len) {
 			super.write(buf, off, len);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void write(String s, int off, int len) {
 			super.write(s, off, len);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void write(int c) {
 			super.write(c);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void flush() {
 			super.flush();
 			setCommitted(true);
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java
index c5096572d0..f7b086c987 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java
@@ -98,10 +98,12 @@ public class MockHttpSession implements HttpSession {
 		this.id = (id != null ? id : Integer.toString(nextId++));
 	}
 
+	@Override
 	public long getCreationTime() {
 		return this.creationTime;
 	}
 
+	@Override
 	public String getId() {
 		return this.id;
 	}
@@ -111,43 +113,53 @@ public class MockHttpSession implements HttpSession {
 		this.isNew = false;
 	}
 
+	@Override
 	public long getLastAccessedTime() {
 		return this.lastAccessedTime;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
 
+	@Override
 	public void setMaxInactiveInterval(int interval) {
 		this.maxInactiveInterval = interval;
 	}
 
+	@Override
 	public int getMaxInactiveInterval() {
 		return this.maxInactiveInterval;
 	}
 
+	@Override
 	public HttpSessionContext getSessionContext() {
 		throw new UnsupportedOperationException("getSessionContext");
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Object getValue(String name) {
 		return getAttribute(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	public String[] getValueNames() {
 		return this.attributes.keySet().toArray(new String[this.attributes.size()]);
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		Assert.notNull(name, "Attribute name must not be null");
 		if (value != null) {
@@ -161,10 +173,12 @@ public class MockHttpSession implements HttpSession {
 		}
 	}
 
+	@Override
 	public void putValue(String name, Object value) {
 		setAttribute(name, value);
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		Object value = this.attributes.remove(name);
@@ -173,6 +187,7 @@ public class MockHttpSession implements HttpSession {
 		}
 	}
 
+	@Override
 	public void removeValue(String name) {
 		removeAttribute(name);
 	}
@@ -197,6 +212,7 @@ public class MockHttpSession implements HttpSession {
 	 *
 	 * @throws IllegalStateException if this method is called on an already invalidated session
 	 */
+	@Override
 	public void invalidate() {
 		if (this.invalid) {
 			throw new IllegalStateException("The session has already been invalidated");
@@ -215,6 +231,7 @@ public class MockHttpSession implements HttpSession {
 		this.isNew = value;
 	}
 
+	@Override
 	public boolean isNew() {
 		return this.isNew;
 	}
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
index 9ce5f8d5c0..46924b0893 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
@@ -55,6 +55,7 @@ public class MockRequestDispatcher implements RequestDispatcher {
 	}
 
 
+	@Override
 	public void forward(ServletRequest request, ServletResponse response) {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
@@ -67,6 +68,7 @@ public class MockRequestDispatcher implements RequestDispatcher {
 		}
 	}
 
+	@Override
 	public void include(ServletRequest request, ServletResponse response) {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java
index c62ec1520d..d8e8abdf5e 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java
@@ -78,10 +78,12 @@ public class MockServletConfig implements ServletConfig {
 	}
 
 
+	@Override
 	public String getServletName() {
 		return this.servletName;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
@@ -91,11 +93,13 @@ public class MockServletConfig implements ServletConfig {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java
index 7851a77e49..70ae2b53ce 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java
@@ -195,6 +195,7 @@ public class MockServletContext implements ServletContext {
 	}
 
 	/* This is a Servlet API 2.5 method. */
+	@Override
 	public String getContextPath() {
 		return this.contextPath;
 	}
@@ -203,6 +204,7 @@ public class MockServletContext implements ServletContext {
 		this.contexts.put(contextPath, context);
 	}
 
+	@Override
 	public ServletContext getContext(String contextPath) {
 		if (this.contextPath.equals(contextPath)) {
 			return this;
@@ -214,6 +216,7 @@ public class MockServletContext implements ServletContext {
 		this.majorVersion = majorVersion;
 	}
 
+	@Override
 	public int getMajorVersion() {
 		return this.majorVersion;
 	}
@@ -222,6 +225,7 @@ public class MockServletContext implements ServletContext {
 		this.minorVersion = minorVersion;
 	}
 
+	@Override
 	public int getMinorVersion() {
 		return this.minorVersion;
 	}
@@ -242,10 +246,12 @@ public class MockServletContext implements ServletContext {
 		return this.effectiveMinorVersion;
 	}
 
+	@Override
 	public String getMimeType(String filePath) {
 		return MimeTypeResolver.getMimeType(filePath);
 	}
 
+	@Override
 	public Set<String> getResourcePaths(String path) {
 		String actualPath = (path.endsWith("/") ? path : path + "/");
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(actualPath));
@@ -271,6 +277,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public URL getResource(String path) throws MalformedURLException {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		if (!resource.exists()) {
@@ -288,6 +295,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public InputStream getResourceAsStream(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		if (!resource.exists()) {
@@ -302,6 +310,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public RequestDispatcher getRequestDispatcher(String path) {
 		if (!path.startsWith("/")) {
 			throw new IllegalArgumentException("RequestDispatcher path at ServletContext level must start with '/'");
@@ -309,6 +318,7 @@ public class MockServletContext implements ServletContext {
 		return new MockRequestDispatcher(path);
 	}
 
+	@Override
 	public RequestDispatcher getNamedDispatcher(String path) {
 		return this.namedRequestDispatchers.get(path);
 	}
@@ -366,30 +376,37 @@ public class MockServletContext implements ServletContext {
 		registerNamedDispatcher(this.defaultServletName, new MockRequestDispatcher(this.defaultServletName));
 	}
 
+	@Override
 	public Servlet getServlet(String name) {
 		return null;
 	}
 
+	@Override
 	public Enumeration<Servlet> getServlets() {
 		return Collections.enumeration(new HashSet<Servlet>());
 	}
 
+	@Override
 	public Enumeration<String> getServletNames() {
 		return Collections.enumeration(new HashSet<String>());
 	}
 
+	@Override
 	public void log(String message) {
 		logger.info(message);
 	}
 
+	@Override
 	public void log(Exception ex, String message) {
 		logger.info(message, ex);
 	}
 
+	@Override
 	public void log(String message, Throwable ex) {
 		logger.info(message, ex);
 	}
 
+	@Override
 	public String getRealPath(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		try {
@@ -401,15 +418,18 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public String getServerInfo() {
 		return "MockServletContext";
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
@@ -428,15 +448,18 @@ public class MockServletContext implements ServletContext {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return new Vector<String>(this.attributes.keySet()).elements();
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		Assert.notNull(name, "Attribute name must not be null");
 		if (value != null) {
@@ -447,6 +470,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		this.attributes.remove(name);
@@ -456,6 +480,7 @@ public class MockServletContext implements ServletContext {
 		this.servletContextName = servletContextName;
 	}
 
+	@Override
 	public String getServletContextName() {
 		return this.servletContextName;
 	}
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
index b3484a0a83..1a98d4c657 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
@@ -73,6 +73,7 @@ public class PassThroughFilterChain implements FilterChain {
 	/**
 	 * Pass the call on to the Filter/Servlet.
 	 */
+	@Override
 	public void doFilter(ServletRequest request, ServletResponse response) throws ServletException, IOException {
 		if (this.filter != null) {
 			this.filter.doFilter(request, response, this.nextFilterChain);
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTransactionManagerTests.java b/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTransactionManagerTests.java
index 65cf39acaf..26bdd97e29 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTransactionManagerTests.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTransactionManagerTests.java
@@ -128,6 +128,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sfProxy));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -186,6 +187,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					throw new RuntimeException("application exception");
@@ -239,6 +241,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				Session session = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession();
@@ -299,8 +302,10 @@ public class HibernateTransactionManagerTests extends TestCase {
 		l.add("test");
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				return tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						Session session = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession();
 						session.flush();
@@ -348,8 +353,10 @@ public class HibernateTransactionManagerTests extends TestCase {
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					return tt.execute(new TransactionCallback() {
+						@Override
 						public Object doInTransaction(TransactionStatus status) {
 							throw new RuntimeException("application exception");
 						}
@@ -400,8 +407,10 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					return tt.execute(new TransactionCallback() {
+						@Override
 						public Object doInTransaction(TransactionStatus status) {
 							status.setRollbackOnly();
 							return null;
@@ -471,12 +480,14 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				final SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf);
 				assertTrue("Has thread session", holder != null);
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						Session session = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession();
 						assertTrue("Not enclosing session", session != holder.getSession());
@@ -538,6 +549,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf);
 				assertTrue("Has thread session", holder != null);
@@ -545,6 +557,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED);
 				tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 						assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -596,6 +609,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy));
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
@@ -668,6 +682,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
@@ -676,6 +691,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 				Session session = sfProxy.openSession();
 				assertSame(session1, session);
 				tt2.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 						assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
@@ -752,6 +768,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -817,6 +834,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					return l;
@@ -890,6 +908,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -970,12 +989,14 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				public void doInTransactionWithoutResult(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 					SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.getResource(sf);
 					assertEquals(tx1, sessionHolder.getTransaction());
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						public void doInTransactionWithoutResult(TransactionStatus status) {
 							status.setRollbackOnly();
 							Session sess = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession();
@@ -996,6 +1017,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Not marked rollback-only", !sessionHolder.isRollbackOnly());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			public void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1066,9 +1088,11 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				public void doInTransactionWithoutResult(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						public void doInTransactionWithoutResult(TransactionStatus status) {
 							status.setRollbackOnly();
 							Session sess = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession();
@@ -1086,6 +1110,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			public void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				Session sess = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession();
@@ -1176,6 +1201,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1185,6 +1211,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 				}
 				else {
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) {
 							assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 							assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1233,6 +1260,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1275,6 +1303,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session));
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1327,6 +1356,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1370,6 +1400,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			public void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -1385,6 +1416,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		txControl.verify();
 	}
 
+	@Override
 	protected void tearDown() {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
diff --git a/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java
index 0eb8df5c8a..e136978f9e 100644
--- a/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-orm/src/test/java/org/springframework/beans/TestBean.java b/spring-orm/src/test/java/org/springframework/beans/TestBean.java
index 7842bbfeac..7a27cf0894 100644
--- a/spring-orm/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-orm/src/test/java/org/springframework/beans/TestBean.java
@@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 	/**
 	 * @see org.springframework.beans.ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
index b149254bfd..cd4a7ef25f 100644
--- a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
+++ b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
@@ -44,6 +44,7 @@ public class SimpleMapScope implements Scope, Serializable {
 	}
 
 
+	@Override
 	public Object get(String name, ObjectFactory objectFactory) {
 		synchronized (this.map) {
 			Object scopedObject = this.map.get(name);
@@ -55,16 +56,19 @@ public class SimpleMapScope implements Scope, Serializable {
 		}
 	}
 
+	@Override
 	public Object remove(String name) {
 		synchronized (this.map) {
 			return this.map.remove(name);
 		}
 	}
 
+	@Override
 	public void registerDestructionCallback(String name, Runnable callback) {
 		this.callbacks.add(callback);
 	}
 
+	@Override
 	public Object resolveContextualObject(String key) {
 		return null;
 	}
@@ -76,6 +80,7 @@ public class SimpleMapScope implements Scope, Serializable {
 		}
 	}
 
+	@Override
 	public String getConversationId() {
 		return null;
 	}
diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index 10ae6d4283..9b3d10470d 100644
--- a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -70,6 +70,7 @@ public class ExpectedLookupTemplate extends JndiTemplate {
 	 * return the object provided in the constructor. If the name is
 	 * unexpected, a respective NamingException gets thrown.
 	 */
+	@Override
 	public Object lookup(String name) throws NamingException {
 		Object object = this.jndiObjects.get(name);
 		if (object == null) {
diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
index c71d6e8681..5ab0d31377 100644
--- a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
@@ -91,6 +91,7 @@ public class SimpleNamingContext implements Context {
 
 	// Actual implementations of Context methods follow
 
+	@Override
 	public NamingEnumeration<NameClassPair> list(String root) throws NamingException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Listing name/class pairs under [" + root + "]");
@@ -98,6 +99,7 @@ public class SimpleNamingContext implements Context {
 		return new NameClassPairEnumeration(this, root);
 	}
 
+	@Override
 	public NamingEnumeration<Binding> listBindings(String root) throws NamingException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Listing bindings under [" + root + "]");
@@ -111,6 +113,7 @@ public class SimpleNamingContext implements Context {
 	 * Will be used by any standard InitialContext JNDI lookups.
 	 * @throws javax.naming.NameNotFoundException if the object could not be found
 	 */
+	@Override
 	public Object lookup(String lookupName) throws NameNotFoundException {
 		String name = this.root + lookupName;
 		if (logger.isDebugEnabled()) {
@@ -136,6 +139,7 @@ public class SimpleNamingContext implements Context {
 		return found;
 	}
 
+	@Override
 	public Object lookupLink(String name) throws NameNotFoundException {
 		return lookup(name);
 	}
@@ -147,6 +151,7 @@ public class SimpleNamingContext implements Context {
 	 * Use SimpleNamingContextBuilder to set up JNDI bindings then.
 	 * @see org.springframework.mock.jndi.SimpleNamingContextBuilder#bind
 	 */
+	@Override
 	public void bind(String name, Object obj) {
 		if (logger.isInfoEnabled()) {
 			logger.info("Static JNDI binding: [" + this.root + name + "] = [" + obj + "]");
@@ -154,6 +159,7 @@ public class SimpleNamingContext implements Context {
 		this.boundObjects.put(this.root + name, obj);
 	}
 
+	@Override
 	public void unbind(String name) {
 		if (logger.isInfoEnabled()) {
 			logger.info("Static JNDI remove: [" + this.root + name + "]");
@@ -161,16 +167,19 @@ public class SimpleNamingContext implements Context {
 		this.boundObjects.remove(this.root + name);
 	}
 
+	@Override
 	public void rebind(String name, Object obj) {
 		bind(name, obj);
 	}
 
+	@Override
 	public void rename(String oldName, String newName) throws NameNotFoundException {
 		Object obj = lookup(oldName);
 		unbind(oldName);
 		bind(newName, obj);
 	}
 
+	@Override
 	public Context createSubcontext(String name) {
 		String subcontextName = this.root + name;
 		if (!subcontextName.endsWith("/")) {
@@ -181,84 +190,104 @@ public class SimpleNamingContext implements Context {
 		return subcontext;
 	}
 
+	@Override
 	public void destroySubcontext(String name) {
 		unbind(name);
 	}
 
+	@Override
 	public String composeName(String name, String prefix) {
 		return prefix + name;
 	}
 
+	@Override
 	public Hashtable<String, Object> getEnvironment() {
 		return this.environment;
 	}
 
+	@Override
 	public Object addToEnvironment(String propName, Object propVal) {
 		return this.environment.put(propName, propVal);
 	}
 
+	@Override
 	public Object removeFromEnvironment(String propName) {
 		return this.environment.remove(propName);
 	}
 
+	@Override
 	public void close() {
 	}
 
 
 	// Unsupported methods follow: no support for javax.naming.Name
 
+	@Override
 	public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Object lookup(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Object lookupLink(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void bind(Name name, Object obj) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void unbind(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void rebind(Name name, Object obj) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void rename(Name oldName, Name newName) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Context createSubcontext(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void destroySubcontext(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public String getNameInNamespace() throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public NameParser getNameParser(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public NameParser getNameParser(String name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Name composeName(Name name, Name prefix) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
@@ -298,22 +327,27 @@ public class SimpleNamingContext implements Context {
 
 		protected abstract T createObject(String strippedName, Object obj);
 
+		@Override
 		public boolean hasMore() {
 			return this.iterator.hasNext();
 		}
 
+		@Override
 		public T next() {
 			return this.iterator.next();
 		}
 
+		@Override
 		public boolean hasMoreElements() {
 			return this.iterator.hasNext();
 		}
 
+		@Override
 		public T nextElement() {
 			return this.iterator.next();
 		}
 
+		@Override
 		public void close() {
 		}
 	}
@@ -325,6 +359,7 @@ public class SimpleNamingContext implements Context {
 			super(context, root);
 		}
 
+		@Override
 		protected NameClassPair createObject(String strippedName, Object obj) {
 			return new NameClassPair(strippedName, obj.getClass().getName());
 		}
@@ -337,6 +372,7 @@ public class SimpleNamingContext implements Context {
 			super(context, root);
 		}
 
+		@Override
 		protected Binding createObject(String strippedName, Object obj) {
 			return new Binding(strippedName, obj);
 		}
diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index f21936897b..32908a306a 100644
--- a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -192,6 +192,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 	 * creating a new SimpleNamingContext instance.
 	 * @see SimpleNamingContext
 	 */
+	@Override
 	public InitialContextFactory createInitialContextFactory(Hashtable<?,?> environment) {
 		if (activated == null && environment != null) {
 			Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY);
@@ -225,6 +226,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 
 		// Default case...
 		return new InitialContextFactory() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public Context getInitialContext(Hashtable<?,?> environment) {
 				return new SimpleNamingContext("", boundObjects, (Hashtable<String, Object>) environment);
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java
index e957562d6d..db0b7901ba 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java
@@ -528,6 +528,7 @@ public class HibernateInterceptorTests extends TestCase {
 		sessionControl.verify();
 	}
 
+	@Override
 	protected void tearDown() {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
@@ -542,6 +543,7 @@ public class HibernateInterceptorTests extends TestCase {
 			this.sessionFactory = sessionFactory;
 		}
 
+		@Override
 		public Object proceed() throws Throwable {
 			if (!TransactionSynchronizationManager.hasResource(this.sessionFactory)) {
 				throw new IllegalStateException("Session not bound");
@@ -561,10 +563,12 @@ public class HibernateInterceptorTests extends TestCase {
 			return null;
 		}
 
+		@Override
 		public Method getMethod() {
 			return null;
 		}
 
+		@Override
 		public AccessibleObject getStaticPart() {
 			return null;
 		}
@@ -573,6 +577,7 @@ public class HibernateInterceptorTests extends TestCase {
 			return null;
 		}
 
+		@Override
 		public Object[] getArguments() {
 			return null;
 		}
@@ -584,6 +589,7 @@ public class HibernateInterceptorTests extends TestCase {
 			return 0;
 		}
 
+		@Override
 		public Object getThis() {
 			return null;
 		}
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java
index 5b84f9a6f0..7d6a94844b 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java
@@ -136,6 +136,7 @@ public class HibernateJtaTransactionTests {
 
 		Object result = tt.execute(new TransactionCallback() {
 
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				try {
 					assertTrue("JTA synchronizations active",
@@ -145,6 +146,7 @@ public class HibernateJtaTransactionTests {
 					ht.setExposeNativeSession(true);
 					ht.executeFind(new HibernateCallback() {
 
+						@Override
 						public Object doInHibernate(org.hibernate.Session sess) {
 							assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 							assertEquals(session, sess);
@@ -154,6 +156,7 @@ public class HibernateJtaTransactionTests {
 					ht = new HibernateTemplate(sf);
 					List htl = ht.executeFind(new HibernateCallback() {
 
+						@Override
 						public Object doInHibernate(org.hibernate.Session sess) {
 							assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 							return sess.createQuery("some query string").list();
@@ -246,6 +249,7 @@ public class HibernateJtaTransactionTests {
 
 		Object result = tt.execute(new TransactionCallback() {
 
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				try {
 					assertTrue("JTA synchronizations active",
@@ -255,6 +259,7 @@ public class HibernateJtaTransactionTests {
 					ht.setExposeNativeSession(true);
 					List htl = ht.executeFind(new HibernateCallback() {
 
+						@Override
 						public Object doInHibernate(org.hibernate.Session sess) {
 							assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 							assertEquals(session, sess);
@@ -265,6 +270,7 @@ public class HibernateJtaTransactionTests {
 					ht.setExposeNativeSession(true);
 					htl = ht.executeFind(new HibernateCallback() {
 
+						@Override
 						public Object doInHibernate(org.hibernate.Session sess) {
 							assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 							assertEquals(session, sess);
@@ -338,6 +344,7 @@ public class HibernateJtaTransactionTests {
 		try {
 			tt.execute(new TransactionCallback() {
 
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					try {
 						assertTrue("JTA synchronizations active",
@@ -347,6 +354,7 @@ public class HibernateJtaTransactionTests {
 						ht.setExposeNativeSession(true);
 						List htl = ht.executeFind(new HibernateCallback() {
 
+							@Override
 							public Object doInHibernate(org.hibernate.Session sess) {
 								assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 								assertEquals(session, sess);
@@ -357,6 +365,7 @@ public class HibernateJtaTransactionTests {
 						ht.setExposeNativeSession(true);
 						htl = ht.executeFind(new HibernateCallback() {
 
+							@Override
 							public Object doInHibernate(org.hibernate.Session sess) {
 								assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 								assertEquals(session, sess);
@@ -442,6 +451,7 @@ public class HibernateJtaTransactionTests {
 
 		Object result = tt.execute(new TransactionCallback() {
 
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				try {
 					assertTrue("JTA synchronizations active",
@@ -449,6 +459,7 @@ public class HibernateJtaTransactionTests {
 					HibernateTemplate ht = new HibernateTemplate(sf);
 					List htl = ht.executeFind(new HibernateCallback() {
 
+						@Override
 						public Object doInHibernate(org.hibernate.Session session) {
 							return l;
 						}
@@ -578,6 +589,7 @@ public class HibernateJtaTransactionTests {
 
 			Object result = tt.execute(new TransactionCallback() {
 
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					try {
 						assertTrue("JTA synchronizations active",
@@ -589,6 +601,7 @@ public class HibernateJtaTransactionTests {
 						for (int i = 0; i < 5; i++) {
 							htl = ht.executeFind(new HibernateCallback() {
 
+								@Override
 								public Object doInHibernate(org.hibernate.Session sess) {
 									assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 									assertEquals(session, sess);
@@ -679,9 +692,11 @@ public class HibernateJtaTransactionTests {
 
 			tt.execute(new TransactionCallbackWithoutResult() {
 
+				@Override
 				public void doInTransactionWithoutResult(TransactionStatus status) {
 					tt.execute(new TransactionCallbackWithoutResult() {
 
+						@Override
 						public void doInTransactionWithoutResult(TransactionStatus status) {
 							status.setRollbackOnly();
 							try {
@@ -693,6 +708,7 @@ public class HibernateJtaTransactionTests {
 								for (int i = 0; i < 5; i++) {
 									ht.execute(new HibernateCallback() {
 
+										@Override
 										public Object doInHibernate(org.hibernate.Session sess) {
 											assertTrue("Has thread session",
 												TransactionSynchronizationManager.hasResource(sf));
@@ -829,6 +845,7 @@ public class HibernateJtaTransactionTests {
 		try {
 			tt.execute(new TransactionCallback() {
 
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					org.hibernate.Session outerSession = SessionFactoryUtils.getSession(sf, false);
 					assertSame(session1, outerSession);
@@ -837,6 +854,7 @@ public class HibernateJtaTransactionTests {
 					try {
 						tt.execute(new TransactionCallback() {
 
+							@Override
 							public Object doInTransaction(TransactionStatus status) {
 								org.hibernate.Session innerSession = SessionFactoryUtils.getSession(sf, false);
 								assertSame(session2, innerSession);
@@ -844,6 +862,7 @@ public class HibernateJtaTransactionTests {
 								ht.setFlushMode(HibernateTemplate.FLUSH_EAGER);
 								return ht.executeFind(new HibernateCallback() {
 
+									@Override
 									public Object doInHibernate(org.hibernate.Session innerSession) {
 										if (rollback) {
 											throw new HibernateException("");
@@ -949,6 +968,7 @@ public class HibernateJtaTransactionTests {
 		try {
 			tt.execute(new TransactionCallback() {
 
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					org.hibernate.Session outerSession = SessionFactoryUtils.getSession(sf, false);
 					assertSame(session1, outerSession);
@@ -956,6 +976,7 @@ public class HibernateJtaTransactionTests {
 					assertTrue("Has thread session", holder != null);
 					tt.execute(new TransactionCallback() {
 
+						@Override
 						public Object doInTransaction(TransactionStatus status) {
 							return null;
 						}
@@ -1074,6 +1095,7 @@ public class HibernateJtaTransactionTests {
 		try {
 			tt.execute(new TransactionCallback() {
 
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					org.hibernate.Session outerSession = SessionFactoryUtils.getSession(sf, false);
 					assertSame(session1, outerSession);
@@ -1082,6 +1104,7 @@ public class HibernateJtaTransactionTests {
 					try {
 						tt.execute(new TransactionCallback() {
 
+							@Override
 							public Object doInTransaction(TransactionStatus status) {
 								org.hibernate.Session innerSession = SessionFactoryUtils.getSession(sf, false);
 								assertSame(session2, innerSession);
@@ -1089,6 +1112,7 @@ public class HibernateJtaTransactionTests {
 								ht.setFlushMode(HibernateTemplate.FLUSH_EAGER);
 								return ht.executeFind(new HibernateCallback() {
 
+									@Override
 									public Object doInHibernate(org.hibernate.Session innerSession) {
 										if (rollback) {
 											throw new HibernateException("");
@@ -1172,6 +1196,7 @@ public class HibernateJtaTransactionTests {
 
 		tt.execute(new TransactionCallback() {
 
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
@@ -1181,6 +1206,7 @@ public class HibernateJtaTransactionTests {
 				ht.setFlushMode(HibernateTemplate.FLUSH_EAGER);
 				ht.execute(new HibernateCallback() {
 
+					@Override
 					public Object doInHibernate(org.hibernate.Session session) {
 						return null;
 					}
@@ -1239,6 +1265,7 @@ public class HibernateJtaTransactionTests {
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 		tt.execute(new TransactionCallback() {
 
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
@@ -1248,6 +1275,7 @@ public class HibernateJtaTransactionTests {
 				ht.setFlushMode(HibernateTemplate.FLUSH_EAGER);
 				ht.execute(new HibernateCallback() {
 
+					@Override
 					public Object doInHibernate(org.hibernate.Session session) {
 						return null;
 					}
@@ -1255,11 +1283,13 @@ public class HibernateJtaTransactionTests {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				tt2.execute(new TransactionCallback() {
 
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						HibernateTemplate ht = new HibernateTemplate(sf);
 						ht.setFlushMode(HibernateTemplate.FLUSH_EAGER);
 						return ht.executeFind(new HibernateCallback() {
 
+							@Override
 							public Object doInHibernate(org.hibernate.Session session) {
 								assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 								// assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
@@ -1315,6 +1345,7 @@ public class HibernateJtaTransactionTests {
 		for (int i = 0; i < 5; i++) {
 			ht.executeFind(new HibernateCallback() {
 
+				@Override
 				public Object doInHibernate(org.hibernate.Session sess) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertEquals(session, sess);
@@ -1368,6 +1399,7 @@ public class HibernateJtaTransactionTests {
 		for (int i = 0; i < 5; i++) {
 			ht.executeFind(new HibernateCallback() {
 
+				@Override
 				public Object doInHibernate(org.hibernate.Session sess) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertEquals(session, sess);
@@ -1424,6 +1456,7 @@ public class HibernateJtaTransactionTests {
 		for (int i = 0; i < 5; i++) {
 			ht.executeFind(new HibernateCallback() {
 
+				@Override
 				public Object doInHibernate(org.hibernate.Session sess) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertEquals(session, sess);
@@ -1436,6 +1469,7 @@ public class HibernateJtaTransactionTests {
 		assertTrue("JTA synchronization registered", synchronization != null);
 		Thread thread = new Thread() {
 
+			@Override
 			public void run() {
 				synchronization.afterCompletion(Status.STATUS_ROLLEDBACK);
 			}
@@ -1451,11 +1485,13 @@ public class HibernateJtaTransactionTests {
 		tt.setReadOnly(true);
 		tt.execute(new TransactionCallbackWithoutResult() {
 
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
 				for (int i = 0; i < 5; i++) {
 					ht.executeFind(new HibernateCallback() {
 
+						@Override
 						public Object doInHibernate(org.hibernate.Session sess) {
 							assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 							assertEquals(session, sess);
@@ -1513,6 +1549,7 @@ public class HibernateJtaTransactionTests {
 		for (int i = 0; i < 5; i++) {
 			ht.executeFind(new HibernateCallback() {
 
+				@Override
 				public Object doInHibernate(org.hibernate.Session sess) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertEquals(session, sess);
@@ -1587,6 +1624,7 @@ public class HibernateJtaTransactionTests {
 		ht.setExposeNativeSession(true);
 		ht.executeFind(new HibernateCallback() {
 
+			@Override
 			public Object doInHibernate(org.hibernate.Session sess) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertEquals(session1, sess);
@@ -1595,6 +1633,7 @@ public class HibernateJtaTransactionTests {
 		});
 		ht.executeFind(new HibernateCallback() {
 
+			@Override
 			public Object doInHibernate(org.hibernate.Session sess) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertEquals(session2, sess);
@@ -1662,6 +1701,7 @@ public class HibernateJtaTransactionTests {
 		for (int i = 0; i < 5; i++) {
 			ht.executeFind(new HibernateCallback() {
 
+				@Override
 				public Object doInHibernate(org.hibernate.Session sess) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertEquals(session, sess);
@@ -1725,6 +1765,7 @@ public class HibernateJtaTransactionTests {
 		for (int i = 0; i < 2; i++) {
 			ht.executeFind(new HibernateCallback() {
 
+				@Override
 				public Object doInHibernate(org.hibernate.Session sess) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertEquals(session, sess);
@@ -1736,10 +1777,12 @@ public class HibernateJtaTransactionTests {
 		TransactionTemplate tt = new TransactionTemplate(new JtaTransactionManager(ut));
 		tt.execute(new TransactionCallbackWithoutResult() {
 
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				for (int i = 2; i < 5; i++) {
 					ht.executeFind(new HibernateCallback() {
 
+						@Override
 						public Object doInHibernate(org.hibernate.Session sess) {
 							assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 							assertEquals(session, sess);
@@ -1813,6 +1856,7 @@ public class HibernateJtaTransactionTests {
 			for (int i = 0; i < 5; i++) {
 				ht.executeFind(new HibernateCallback() {
 
+					@Override
 					public Object doInHibernate(org.hibernate.Session sess) {
 						assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 						assertEquals(session, sess);
@@ -1900,6 +1944,7 @@ public class HibernateJtaTransactionTests {
 			for (int i = 0; i < 5; i++) {
 				ht.executeFind(new HibernateCallback() {
 
+					@Override
 					public Object doInHibernate(org.hibernate.Session sess) {
 						assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 						assertEquals(session, sess);
@@ -1917,6 +1962,7 @@ public class HibernateJtaTransactionTests {
 			// coordinator.
 			Thread synch = new Thread() {
 
+				@Override
 				public void run() {
 					synchronization.beforeCompletion();
 					synchronization.afterCompletion(Status.STATUS_COMMITTED);
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java
index 9dcb05b7f6..37539cc0a5 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java
@@ -75,6 +75,7 @@ public class HibernateTemplateTests extends TestCase {
 	private MockControl sessionControl;
 	private Session session;
 
+	@Override
 	protected void setUp() {
 		sfControl = MockControl.createControl(SessionFactory.class);
 		sf = (SessionFactory) sfControl.getMock();
@@ -100,6 +101,7 @@ public class HibernateTemplateTests extends TestCase {
 		final List l = new ArrayList();
 		l.add("test");
 		List result = ht.executeFind(new HibernateCallback() {
+			@Override
 			public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 				return l;
 			}
@@ -124,6 +126,7 @@ public class HibernateTemplateTests extends TestCase {
 		final List l = new ArrayList();
 		l.add("test");
 		List result = ht.executeFind(new HibernateCallback() {
+			@Override
 			public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 				return l;
 			}
@@ -150,6 +153,7 @@ public class HibernateTemplateTests extends TestCase {
 		final List l = new ArrayList();
 		l.add("test");
 		List result = ht.executeFind(new HibernateCallback() {
+			@Override
 			public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 				return l;
 			}
@@ -178,6 +182,7 @@ public class HibernateTemplateTests extends TestCase {
 		final List l = new ArrayList();
 		l.add("test");
 		List result = ht.executeFind(new HibernateCallback() {
+			@Override
 			public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 				return l;
 			}
@@ -195,6 +200,7 @@ public class HibernateTemplateTests extends TestCase {
 		ht.setAllowCreate(false);
 		try {
 			ht.execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					return null;
 				}
@@ -217,6 +223,7 @@ public class HibernateTemplateTests extends TestCase {
 		final List l = new ArrayList();
 		l.add("test");
 		List result = ht.executeFind(new HibernateCallback() {
+			@Override
 			public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 				return l;
 			}
@@ -244,6 +251,7 @@ public class HibernateTemplateTests extends TestCase {
 			final List l = new ArrayList();
 			l.add("test");
 			List result = ht.executeFind(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					return l;
 				}
@@ -275,6 +283,7 @@ public class HibernateTemplateTests extends TestCase {
 			final List l = new ArrayList();
 			l.add("test");
 			List result = ht.executeFind(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					return l;
 				}
@@ -310,6 +319,7 @@ public class HibernateTemplateTests extends TestCase {
 			final List l = new ArrayList();
 			l.add("test");
 			List result = ht.executeFind(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					return l;
 				}
@@ -407,6 +417,7 @@ public class HibernateTemplateTests extends TestCase {
 			final List l = new ArrayList();
 			l.add("test");
 			List result = ht.executeFind(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					return l;
 				}
@@ -448,6 +459,7 @@ public class HibernateTemplateTests extends TestCase {
 			final List l = new ArrayList();
 			l.add("test");
 			List result = ht.executeFind(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					return l;
 				}
@@ -479,6 +491,7 @@ public class HibernateTemplateTests extends TestCase {
 		final List l = new ArrayList();
 		l.add("test");
 		List result = ht.executeFind(new HibernateCallback() {
+			@Override
 			public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 				return l;
 			}
@@ -523,6 +536,7 @@ public class HibernateTemplateTests extends TestCase {
 		HibernateTemplate ht = new HibernateTemplate(sf);
 		ht.setCacheQueries(true);
 		ht.execute(new HibernateCallback() {
+			@Override
 			public Object doInHibernate(org.hibernate.Session sess) throws HibernateException {
 				assertNotSame(session, sess);
 				assertTrue(Proxy.isProxyClass(sess.getClass()));
@@ -584,6 +598,7 @@ public class HibernateTemplateTests extends TestCase {
 		ht.setCacheQueries(true);
 		ht.setQueryCacheRegion("myRegion");
 		ht.execute(new HibernateCallback() {
+			@Override
 			public Object doInHibernate(org.hibernate.Session sess) throws HibernateException {
 				assertNotSame(session, sess);
 				assertTrue(Proxy.isProxyClass(sess.getClass()));
@@ -634,6 +649,7 @@ public class HibernateTemplateTests extends TestCase {
 		ht.setCacheQueries(true);
 		ht.setQueryCacheRegion("myRegion");
 		ht.execute(new HibernateCallback() {
+			@Override
 			public Object doInHibernate(org.hibernate.Session sess) throws HibernateException {
 				assertSame(session, sess);
 				sess.createQuery("some query");
@@ -692,6 +708,7 @@ public class HibernateTemplateTests extends TestCase {
 		ht.setFetchSize(10);
 		ht.setMaxResults(20);
 		ht.execute(new HibernateCallback() {
+			@Override
 			public Object doInHibernate(org.hibernate.Session sess) throws HibernateException {
 				sess.createQuery("some query");
 				sess.getNamedQuery("some query name");
@@ -2273,6 +2290,7 @@ public class HibernateTemplateTests extends TestCase {
 		final JDBCConnectionException jcex = new JDBCConnectionException("mymsg", sqlEx);
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw jcex;
 				}
@@ -2288,6 +2306,7 @@ public class HibernateTemplateTests extends TestCase {
 		final SQLGrammarException sgex = new SQLGrammarException("mymsg", sqlEx);
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw sgex;
 				}
@@ -2303,6 +2322,7 @@ public class HibernateTemplateTests extends TestCase {
 		final LockAcquisitionException laex = new LockAcquisitionException("mymsg", sqlEx);
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw laex;
 				}
@@ -2318,6 +2338,7 @@ public class HibernateTemplateTests extends TestCase {
 		final ConstraintViolationException cvex = new ConstraintViolationException("mymsg", sqlEx, "myconstraint");
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw cvex;
 				}
@@ -2333,6 +2354,7 @@ public class HibernateTemplateTests extends TestCase {
 		final DataException dex = new DataException("mymsg", sqlEx);
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw dex;
 				}
@@ -2348,6 +2370,7 @@ public class HibernateTemplateTests extends TestCase {
 		final JDBCException jdex = new JDBCException("mymsg", sqlEx);
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw jdex;
 				}
@@ -2363,6 +2386,7 @@ public class HibernateTemplateTests extends TestCase {
 		final PropertyValueException pvex = new PropertyValueException("mymsg", "myentity", "myproperty");
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw pvex;
 				}
@@ -2377,6 +2401,7 @@ public class HibernateTemplateTests extends TestCase {
 
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw new PersistentObjectException("");
 				}
@@ -2389,6 +2414,7 @@ public class HibernateTemplateTests extends TestCase {
 
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw new TransientObjectException("");
 				}
@@ -2402,6 +2428,7 @@ public class HibernateTemplateTests extends TestCase {
 		final ObjectDeletedException odex = new ObjectDeletedException("msg", "id", TestBean.class.getName());
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw odex;
 				}
@@ -2417,6 +2444,7 @@ public class HibernateTemplateTests extends TestCase {
 		qex.setQueryString("query");
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw qex;
 				}
@@ -2432,6 +2460,7 @@ public class HibernateTemplateTests extends TestCase {
 		final UnresolvableObjectException uoex = new UnresolvableObjectException("id", TestBean.class.getName());
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw uoex;
 				}
@@ -2448,6 +2477,7 @@ public class HibernateTemplateTests extends TestCase {
 		final ObjectNotFoundException onfe = new ObjectNotFoundException("id", TestBean.class.getName());
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw onfe;
 				}
@@ -2464,6 +2494,7 @@ public class HibernateTemplateTests extends TestCase {
 		final WrongClassException wcex = new WrongClassException("msg", "id", TestBean.class.getName());
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw wcex;
 				}
@@ -2480,6 +2511,7 @@ public class HibernateTemplateTests extends TestCase {
 		final NonUniqueResultException nuex = new NonUniqueResultException(2);
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw nuex;
 				}
@@ -2495,6 +2527,7 @@ public class HibernateTemplateTests extends TestCase {
 		final StaleObjectStateException sosex = new StaleObjectStateException(TestBean.class.getName(), "id");
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw sosex;
 				}
@@ -2511,6 +2544,7 @@ public class HibernateTemplateTests extends TestCase {
 		final StaleStateException ssex = new StaleStateException("msg");
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw ssex;
 				}
@@ -2527,6 +2561,7 @@ public class HibernateTemplateTests extends TestCase {
 		final HibernateException hex = new HibernateException("msg");
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw hex;
 				}
@@ -2545,6 +2580,7 @@ public class HibernateTemplateTests extends TestCase {
 		final GenericJDBCException gjex = new GenericJDBCException("mymsg", sqlEx);
 		try {
 			createTemplate().execute(new HibernateCallback() {
+				@Override
 				public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 					throw gjex;
 				}
@@ -2572,6 +2608,7 @@ public class HibernateTemplateTests extends TestCase {
 		return new HibernateTemplate(sf);
 	}
 
+	@Override
 	protected void tearDown() {
 		try {
 			sfControl.verify();
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
index 4e7e29d6d7..3eff114c3f 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
@@ -117,6 +117,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		queryControl.replay();
 
 		LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() {
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) throws HibernateException {
 				return sf;
 			}
@@ -136,6 +137,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sfProxy));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -196,10 +198,12 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					HibernateTemplate ht = new HibernateTemplate(sf);
 					return ht.executeFind(new HibernateCallback() {
+						@Override
 						public Object doInHibernate(org.hibernate.Session session) {
 							throw new RuntimeException("application exception");
 						}
@@ -258,11 +262,13 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				HibernateTemplate ht = new HibernateTemplate(sf);
 				ht.setFlushMode(HibernateTemplate.FLUSH_EAGER);
 				ht.execute(new HibernateCallback() {
+					@Override
 					public Object doInHibernate(org.hibernate.Session session) {
 						return null;
 					}
@@ -339,6 +345,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		queryControl.replay();
 
 		LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() {
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) throws HibernateException {
 				return sf;
 			}
@@ -359,6 +366,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sfProxy));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -416,6 +424,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		txControl.replay();
 
 		LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() {
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) throws HibernateException {
 				return sf;
 			}
@@ -429,12 +438,15 @@ public class HibernateTransactionManagerTests extends TestCase {
 		l.add("test");
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				return tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						HibernateTemplate ht = new HibernateTemplate(sfProxy);
 						ht.setFlushMode(HibernateTemplate.FLUSH_EAGER);
 						return ht.executeFind(new HibernateCallback() {
+							@Override
 							public Object doInHibernate(org.hibernate.Session session) {
 								return l;
 							}
@@ -486,12 +498,15 @@ public class HibernateTransactionManagerTests extends TestCase {
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					return tt.execute(new TransactionCallback() {
+						@Override
 						public Object doInTransaction(TransactionStatus status) {
 							HibernateTemplate ht = new HibernateTemplate(sf);
 							ht.setFlushMode(HibernateTemplate.FLUSH_EAGER);
 							return ht.executeFind(new HibernateCallback() {
+								@Override
 								public Object doInHibernate(org.hibernate.Session session) {
 									throw new RuntimeException("application exception");
 								}
@@ -548,11 +563,14 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					return tt.execute(new TransactionCallback() {
+						@Override
 						public Object doInTransaction(TransactionStatus status) {
 							HibernateTemplate ht = new HibernateTemplate(sf);
 							ht.execute(new HibernateCallback() {
+								@Override
 								public Object doInHibernate(org.hibernate.Session session) {
 									return l;
 								}
@@ -631,16 +649,19 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				final SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf);
 				assertTrue("Has thread session", holder != null);
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						HibernateTemplate ht = new HibernateTemplate(sf);
 						ht.setFlushMode(HibernateTemplate.FLUSH_EAGER);
 						return ht.executeFind(new HibernateCallback() {
+							@Override
 							public Object doInHibernate(org.hibernate.Session session) {
 								assertTrue("Not enclosing session", session != holder.getSession());
 								assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -710,6 +731,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf);
 				assertTrue("Has thread session", holder != null);
@@ -717,6 +739,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED);
 				tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 						assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -724,6 +747,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 						HibernateTemplate ht = new HibernateTemplate(sf);
 						ht.setFlushMode(HibernateTemplate.FLUSH_EAGER);
 						return ht.executeFind(new HibernateCallback() {
+							@Override
 							public Object doInHibernate(org.hibernate.Session session) {
 								return null;
 							}
@@ -770,6 +794,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		sessionControl.replay();
 
 		LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() {
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) throws HibernateException {
 				return sf;
 			}
@@ -783,6 +808,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy));
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
@@ -791,6 +817,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 				HibernateTemplate ht = new HibernateTemplate(sfProxy);
 				ht.setFlushMode(HibernateTemplate.FLUSH_EAGER);
 				ht.execute(new HibernateCallback() {
+					@Override
 					public Object doInHibernate(org.hibernate.Session session) {
 						return null;
 					}
@@ -854,6 +881,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		txControl.replay();
 
 		LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() {
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) throws HibernateException {
 				return sf;
 			}
@@ -873,12 +901,14 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertFalse(TransactionSynchronizationManager.isActualTransactionActive());
 				ht.execute(new HibernateCallback() {
+					@Override
 					public Object doInHibernate(org.hibernate.Session session) {
 						assertSame(session1, session);
 						return null;
@@ -886,8 +916,10 @@ public class HibernateTransactionManagerTests extends TestCase {
 				});
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sfProxy));
 				tt2.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						return ht.executeFind(new HibernateCallback() {
+							@Override
 							public Object doInHibernate(org.hibernate.Session session) {
 								assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 								assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
@@ -955,10 +987,12 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				HibernateTemplate ht = new HibernateTemplate(sf);
 				return ht.executeFind(new HibernateCallback() {
+					@Override
 					public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 						return l;
 					}
@@ -1036,10 +1070,12 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		for (int i = 0; i < 2; i++) {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				public void doInTransactionWithoutResult(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					HibernateTemplate ht = new HibernateTemplate(sf);
 					ht.execute(new HibernateCallback() {
+						@Override
 						public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 							return null;
 						}
@@ -1113,6 +1149,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -1195,10 +1232,12 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					HibernateTemplate ht = new HibernateTemplate(sf);
 					return ht.executeFind(new HibernateCallback() {
+						@Override
 						public Object doInHibernate(org.hibernate.Session session) throws HibernateException {
 							return l;
 						}
@@ -1279,6 +1318,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1287,6 +1327,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 				HibernateTemplate ht = new HibernateTemplate(sf);
 				ht.setExposeNativeSession(true);
 				return ht.executeFind(new HibernateCallback() {
+					@Override
 					public Object doInHibernate(org.hibernate.Session sess) throws HibernateException {
 						assertEquals(session, sess);
 						return l;
@@ -1370,17 +1411,20 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				public void doInTransactionWithoutResult(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
 					SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.getResource(sf);
 					assertEquals(tx1, sessionHolder.getTransaction());
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						public void doInTransactionWithoutResult(TransactionStatus status) {
 							status.setRollbackOnly();
 							HibernateTemplate ht = new HibernateTemplate(sf);
 							ht.setExposeNativeSession(true);
 							ht.execute(new HibernateCallback() {
+								@Override
 								public Object doInHibernate(org.hibernate.Session sess) throws HibernateException {
 									assertEquals(session, sess);
 									return null;
@@ -1402,6 +1446,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Not marked rollback-only", !sessionHolder.isRollbackOnly());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			public void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1410,6 +1455,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 				HibernateTemplate ht = new HibernateTemplate(sf);
 				ht.setExposeNativeSession(true);
 				ht.execute(new HibernateCallback() {
+					@Override
 					public Object doInHibernate(org.hibernate.Session sess) throws HibernateException {
 						assertEquals(session, sess);
 						return null;
@@ -1485,15 +1531,18 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				public void doInTransactionWithoutResult(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						public void doInTransactionWithoutResult(TransactionStatus status) {
 							status.setRollbackOnly();
 							HibernateTemplate ht = new HibernateTemplate(sf);
 							ht.setAllowCreate(false);
 							ht.setExposeNativeSession(true);
 							ht.execute(new HibernateCallback() {
+								@Override
 								public Object doInHibernate(org.hibernate.Session sess) throws HibernateException {
 									assertEquals(session, sess);
 									return null;
@@ -1512,12 +1561,14 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf));
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			public void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				HibernateTemplate ht = new HibernateTemplate(sf);
 				ht.setAllowCreate(false);
 				ht.setExposeNativeSession(true);
 				ht.execute(new HibernateCallback() {
+					@Override
 					public Object doInHibernate(org.hibernate.Session sess) throws HibernateException {
 						assertEquals(session, sess);
 						return null;
@@ -1612,6 +1663,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1621,6 +1673,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 				}
 				else {
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) {
 							assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 							assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1670,6 +1723,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1713,6 +1767,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session));
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1766,6 +1821,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1809,6 +1865,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			public void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf));
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -1824,6 +1881,7 @@ public class HibernateTransactionManagerTests extends TestCase {
 		txControl.verify();
 	}
 
+	@Override
 	protected void tearDown() {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
index 95fb2af930..0ba20000bf 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
@@ -67,8 +67,10 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
 		final List invocations = new ArrayList();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected Configuration newConfiguration() {
 				return new Configuration() {
+					@Override
 					public Configuration addInputStream(InputStream is) {
 						try {
 							is.close();
@@ -80,6 +82,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 					}
 				};
 			}
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
 				assertEquals(LocalDataSourceConnectionProvider.class.getName(),
 						config.getProperty(Environment.CONNECTION_PROVIDER));
@@ -99,8 +102,10 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		final RegionFactory regionFactory = new NoCachingRegionFactory(null);
 		final List invocations = new ArrayList();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected Configuration newConfiguration() {
 				return new Configuration() {
+					@Override
 					public Configuration addInputStream(InputStream is) {
 						try {
 							is.close();
@@ -112,6 +117,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 					}
 				};
 			}
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
 				assertEquals(LocalRegionFactoryProxy.class.getName(),
 						config.getProperty(Environment.CACHE_REGION_FACTORY));
@@ -131,8 +137,10 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		final CacheProvider cacheProvider = new NoCacheProvider();
 		final List invocations = new ArrayList();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected Configuration newConfiguration() {
 				return new Configuration() {
+					@Override
 					public Configuration addInputStream(InputStream is) {
 						try {
 							is.close();
@@ -145,6 +153,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 				};
 			}
 
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
 				assertEquals(LocalCacheProviderProxy.class.getName(),
 						config.getProperty(Environment.CACHE_PROVIDER));
@@ -164,8 +173,10 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
 		final List invocations = new ArrayList();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected Configuration newConfiguration() {
 				return new Configuration() {
+					@Override
 					public Configuration addInputStream(InputStream is) {
 						try {
 							is.close();
@@ -178,6 +189,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 				};
 			}
 
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
 				assertEquals(TransactionAwareDataSourceConnectionProvider.class.getName(),
 						config.getProperty(Environment.CONNECTION_PROVIDER));
@@ -200,8 +212,10 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		final TransactionManager tm = (TransactionManager) tmControl.getMock();
 		final List invocations = new ArrayList();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected Configuration newConfiguration() {
 				return new Configuration() {
+					@Override
 					public Configuration addInputStream(InputStream is) {
 						try {
 							is.close();
@@ -214,6 +228,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 				};
 			}
 
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
 				assertEquals(LocalJtaDataSourceConnectionProvider.class.getName(),
 						config.getProperty(Environment.CONNECTION_PROVIDER));
@@ -242,8 +257,10 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
 		final Set invocations = new HashSet();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected Configuration newConfiguration() {
 				return new Configuration() {
+					@Override
 					public Configuration addJar(File file) {
 						invocations.add("addResource " + file.getPath());
 						return this;
@@ -251,6 +268,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 				};
 			}
 
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
 				assertEquals(LocalDataSourceConnectionProvider.class.getName(),
 						config.getProperty(Environment.CONNECTION_PROVIDER));
@@ -274,8 +292,10 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		final DriverManagerDataSource ds = new DriverManagerDataSource();
 		final Set invocations = new HashSet();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected Configuration newConfiguration() {
 				return new Configuration() {
+					@Override
 					public Configuration addInputStream(InputStream is) {
 						try {
 							is.close();
@@ -288,6 +308,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 				};
 			}
 
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
 				assertEquals(LocalDataSourceConnectionProvider.class.getName(),
 						config.getProperty(Environment.CONNECTION_PROVIDER));
@@ -313,6 +334,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 	public void testLocalSessionFactoryBeanWithValidProperties() throws Exception {
 		final Set invocations = new HashSet();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
 				assertEquals(UserSuppliedConnectionProvider.class.getName(),
 						config.getProperty(Environment.CONNECTION_PROVIDER));
@@ -362,6 +384,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		factoryControl.setVoidCallable(1);
 		factoryControl.replay();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
 				return sessionFactory;
 			}
@@ -378,8 +401,10 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithEntityInterceptor() throws Exception {
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected Configuration newConfiguration() {
 				return new Configuration() {
+					@Override
 					public Configuration setInterceptor(Interceptor interceptor) {
 						throw new IllegalArgumentException(interceptor.toString());
 					}
@@ -405,8 +430,10 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 	@SuppressWarnings("serial")
 	public void testLocalSessionFactoryBeanWithNamingStrategy() throws Exception {
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected Configuration newConfiguration() {
 				return new Configuration() {
+					@Override
 					public Configuration setNamingStrategy(NamingStrategy namingStrategy) {
 						throw new IllegalArgumentException(namingStrategy.toString());
 					}
@@ -431,18 +458,22 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		final Properties registeredClassCache = new Properties();
 		final Properties registeredCollectionCache = new Properties();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected Configuration newConfiguration() {
 				return new Configuration() {
+					@Override
 					public Configuration setCacheConcurrencyStrategy(String clazz, String concurrencyStrategy) {
 						registeredClassCache.setProperty(clazz, concurrencyStrategy);
 						return this;
 					}
+					@Override
 					public Configuration setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy) {
 						registeredCollectionCache.setProperty(collectionRole, concurrencyStrategy);
 						return this;
 					}
 				};
 			}
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
 				return null;
 			}
@@ -467,17 +498,21 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 		final Properties registeredClassCache = new Properties();
 		final Properties registeredCollectionCache = new Properties();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected Configuration newConfiguration() {
 				return new Configuration() {
 					// changed from return type 'void' to 'Configuration' in Hibernate 3.6
+					@Override
 					public void setCacheConcurrencyStrategy(String clazz, String concurrencyStrategy, String regionName) {
 						registeredClassCache.setProperty(clazz, concurrencyStrategy + "," + regionName);
 					}
+					@Override
 					public void setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy, String regionName) {
 						registeredCollectionCache.setProperty(collectionRole, concurrencyStrategy + "," + regionName);
 					}
 				};
 			}
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
 				return null;
 			}
@@ -501,13 +536,16 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 	public void testLocalSessionFactoryBeanWithEventListeners() throws Exception {
 		final Map registeredListeners = new HashMap();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected Configuration newConfiguration() {
 				return new Configuration() {
+					@Override
 					public void setListener(String type, Object listener) {
 						registeredListeners.put(type, listener);
 					}
 				};
 			}
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
 				return null;
 			}
@@ -526,14 +564,17 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 	public void testLocalSessionFactoryBeanWithEventListenerSet() throws Exception {
 		final Map registeredListeners = new HashMap();
 		LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() {
+			@Override
 			protected Configuration newConfiguration() {
 				return new Configuration() {
+					@Override
 					public void setListeners(String type, Object[] listeners) {
 						assertTrue(listeners instanceof MergeEventListener[]);
 						registeredListeners.put(type, new HashSet(Arrays.asList(listeners)));
 					}
 				};
 			}
+			@Override
 			protected SessionFactory newSessionFactory(Configuration config) {
 				return null;
 			}
@@ -594,14 +635,17 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 
 		public List registeredFilterDefinitions = new LinkedList();
 
+		@Override
 		protected Configuration newConfiguration() throws HibernateException {
 			return new Configuration() {
+				@Override
 				public void addFilterDefinition(FilterDefinition definition) {
 					registeredFilterDefinitions.add(definition);
 				}
 			};
 		}
 
+		@Override
 		protected SessionFactory newSessionFactory(Configuration config) {
 			return null;
 		}
@@ -612,6 +656,7 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 
 		public Mappings mappings;
 
+		@Override
 		protected SessionFactory newSessionFactory(Configuration config) {
 			this.mappings = config.createMappings();
 			return null;
@@ -622,9 +667,11 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 	@SuppressWarnings("serial")
 	public static class DummyMergeEventListener implements MergeEventListener {
 
+		@Override
 		public void onMerge(MergeEvent event) throws HibernateException {
 		}
 
+		@Override
 		public void onMerge(MergeEvent event, Map copiedAlready) throws HibernateException {
 		}
 	}
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java
index b0d96c7d32..50b8d0631e 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java
@@ -37,6 +37,7 @@ public class HibernateDaoSupportTests extends TestCase {
 		sfControl.replay();
 		final List test = new ArrayList();
 		HibernateDaoSupport dao = new HibernateDaoSupport() {
+			@Override
 			protected void initDao() {
 				test.add("test");
 			}
@@ -53,6 +54,7 @@ public class HibernateDaoSupportTests extends TestCase {
 		HibernateTemplate template = new HibernateTemplate();
 		final List test = new ArrayList();
 		HibernateDaoSupport dao = new HibernateDaoSupport() {
+			@Override
 			protected void initDao() {
 				test.add("test");
 			}
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java
index 3be8ba5f85..dc90981e93 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java
@@ -60,6 +60,7 @@ public class LobTypeTests extends TestCase {
 	private MockControl lobCreatorControl = MockControl.createControl(LobCreator.class);
 	private LobCreator lobCreator = (LobCreator) lobCreatorControl.getMock();
 
+	@Override
 	protected void setUp() throws SQLException {
 		lobHandler.getLobCreator();
 		lobHandlerControl.setReturnValue(lobCreator);
@@ -613,6 +614,7 @@ public class LobTypeTests extends TestCase {
 		}
 	}
 
+	@Override
 	protected void tearDown() {
 		try {
 			rsControl.verify();
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
index e0273f1074..41058bb7c4 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java
@@ -182,6 +182,7 @@ public class OpenSessionInViewTests {
 		asyncManager.setAsyncWebRequest(asyncWebRequest);
 
 		asyncManager.startCallableProcessing(new Callable<String>() {
+			@Override
 			public String call() throws Exception {
 				return "anything";
 			}
@@ -422,6 +423,7 @@ public class OpenSessionInViewTests {
 		filter2.init(filterConfig2);
 
 		final FilterChain filterChain = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) {
 				assertTrue(TransactionSynchronizationManager.hasResource(sf));
 				servletRequest.setAttribute("invoked", Boolean.TRUE);
@@ -429,6 +431,7 @@ public class OpenSessionInViewTests {
 		};
 
 		final FilterChain filterChain2 = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
 				throws IOException, ServletException {
 				assertTrue(TransactionSynchronizationManager.hasResource(sf2));
@@ -480,6 +483,7 @@ public class OpenSessionInViewTests {
 		filter.init(filterConfig);
 
 		final FilterChain filterChain = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) {
 				assertTrue(TransactionSynchronizationManager.hasResource(sf));
 				count.incrementAndGet();
@@ -498,6 +502,7 @@ public class OpenSessionInViewTests {
 		asyncManager.setTaskExecutor(new SyncTaskExecutor());
 		asyncManager.setAsyncWebRequest(asyncWebRequest);
 		asyncManager.startCallableProcessing(new Callable<String>() {
+			@Override
 			public String call() throws Exception {
 				return "anything";
 			}
@@ -568,6 +573,7 @@ public class OpenSessionInViewTests {
 		filter.init(filterConfig);
 
 		final FilterChain filterChain = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) {
 				assertTrue(TransactionSynchronizationManager.hasResource(sf));
 				servletRequest.setAttribute("invoked", Boolean.TRUE);
@@ -639,6 +645,7 @@ public class OpenSessionInViewTests {
 		filter2.init(filterConfig2);
 
 		final FilterChain filterChain = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) {
 				HibernateTransactionManager tm = new HibernateTransactionManager(sf);
 				TransactionStatus ts = tm.getTransaction(
@@ -658,6 +665,7 @@ public class OpenSessionInViewTests {
 		};
 
 		final FilterChain filterChain2 = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
 				throws IOException, ServletException {
 
@@ -738,6 +746,7 @@ public class OpenSessionInViewTests {
 		filter2.init(filterConfig2);
 
 		final FilterChain filterChain = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) {
 				HibernateTransactionManager tm = new HibernateTransactionManager(sf);
 				TransactionStatus ts = tm.getTransaction(
@@ -760,6 +769,7 @@ public class OpenSessionInViewTests {
 		};
 
 		FilterChain filterChain2 = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
 				throws IOException, ServletException {
 				filter.doFilter(servletRequest, servletResponse, filterChain);
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java
index c884a39fa4..c6931097ce 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java
@@ -31,9 +31,11 @@ public class ScopedBeanInterceptorTests extends TestCase {
 		final Object realObject = new Object();
 
 		ScopedObject scoped = new ScopedObject() {
+			@Override
 			public Object getTargetObject() {
 				return realObject;
 			}
+			@Override
 			public void removeFromScope() {
 				// do nothing
 			}
@@ -53,9 +55,11 @@ public class ScopedBeanInterceptorTests extends TestCase {
 		final Object proxy = proxyFactory.getProxy();
 
 		ScopedObject scoped = new ScopedObject() {
+			@Override
 			public Object getTargetObject() {
 				return proxy;
 			}
+			@Override
 			public void removeFromScope() {
 				// do nothing
 			}
diff --git a/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java b/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java
index c2f9c63ff9..4e4068ce50 100644
--- a/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java
@@ -88,6 +88,7 @@ public class SqlMapClientTests extends TestCase {
 		template.setSqlMapClient(client);
 		template.afterPropertiesSet();
 		Object result = template.execute(new SqlMapClientCallback() {
+			@Override
 			public Object doInSqlMapClient(SqlMapExecutor executor) {
 				assertTrue(executor == session);
 				return "done";
@@ -124,6 +125,7 @@ public class SqlMapClientTests extends TestCase {
 		template.setSqlMapClient(client);
 		template.afterPropertiesSet();
 		Object result = template.execute(new SqlMapClientCallback() {
+			@Override
 			public Object doInSqlMapClient(SqlMapExecutor executor) {
 				assertTrue(executor == session);
 				return "done";
@@ -420,6 +422,7 @@ public class SqlMapClientTests extends TestCase {
 		public MockControl executorControl = MockControl.createControl(SqlMapExecutor.class);
 		public SqlMapExecutor executor = (SqlMapExecutor) executorControl.getMock();
 
+		@Override
 		public Object execute(SqlMapClientCallback action) throws DataAccessException {
 			try {
 				return action.doInSqlMapClient(executor);
@@ -433,6 +436,7 @@ public class SqlMapClientTests extends TestCase {
 
 	private static class TestRowHandler implements RowHandler {
 
+		@Override
 		public void handleRow(Object row) {
 		}
 	}
diff --git a/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java b/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java
index 6732ddcd54..c0b9717a22 100644
--- a/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java
@@ -55,6 +55,7 @@ public class LobTypeHandlerTests extends TestCase {
 	private MockControl lobCreatorControl = MockControl.createControl(LobCreator.class);
 	private LobCreator lobCreator = (LobCreator) lobCreatorControl.getMock();
 
+	@Override
 	protected void setUp() throws SQLException {
 		rs.findColumn("column");
 		rsControl.setReturnValue(1);
@@ -170,9 +171,11 @@ public class LobTypeHandlerTests extends TestCase {
 		lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()), 1);
 		lobCreator.setBlobAsBytes(ps, 1, baos.toByteArray());
 		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
+			@Override
 			public boolean matches(Object[] o1, Object[] o2) {
 				return Arrays.equals((byte[]) o1[2], (byte[]) o2[2]);
 			}
+			@Override
 			public String toString(Object[] objects) {
 				return null;
 			}
@@ -224,6 +227,7 @@ public class LobTypeHandlerTests extends TestCase {
 		}
 	}
 
+	@Override
 	protected void tearDown() {
 		try {
 			rsControl.verify();
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java
index a07a672b09..b7a1a64631 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java
@@ -94,6 +94,7 @@ public class JdoInterceptorTests extends TestCase {
 			this.persistenceManagerFactory = persistenceManagerFactory;
 		}
 
+		@Override
 		public Object proceed() throws Throwable {
 			if (!TransactionSynchronizationManager.hasResource(this.persistenceManagerFactory)) {
 				throw new IllegalStateException("PersistenceManager not bound");
@@ -101,6 +102,7 @@ public class JdoInterceptorTests extends TestCase {
 			return null;
 		}
 
+		@Override
 		public Object[] getArguments() {
 			return null;
 		}
@@ -117,10 +119,12 @@ public class JdoInterceptorTests extends TestCase {
 			return null;
 		}
 
+		@Override
 		public Method getMethod() {
 			return null;
 		}
 
+		@Override
 		public AccessibleObject getStaticPart() {
 			return getMethod();
 		}
@@ -136,6 +140,7 @@ public class JdoInterceptorTests extends TestCase {
 			return 0;
 		}
 
+		@Override
 		public Object getThis() {
 			return null;
 		}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java
index 5ac6d36042..890fdb1f8c 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java
@@ -50,6 +50,7 @@ public class JdoTemplateTests extends TestCase {
 	private MockControl pmControl;
 	private PersistenceManager pm;
 
+	@Override
 	protected void setUp() {
 		pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
 		pmf = (PersistenceManagerFactory) pmfControl.getMock();
@@ -59,6 +60,7 @@ public class JdoTemplateTests extends TestCase {
 		pmfControl.setReturnValue(null, 1);
 	}
 
+	@Override
 	protected void tearDown() {
 		try {
 			pmfControl.verify();
@@ -75,6 +77,7 @@ public class JdoTemplateTests extends TestCase {
 		jt.setAllowCreate(false);
 		try {
 			jt.execute(new JdoCallback() {
+				@Override
 				public Object doInJdo(PersistenceManager pm) {
 					return null;
 				}
@@ -96,6 +99,7 @@ public class JdoTemplateTests extends TestCase {
 		final List l = new ArrayList();
 		l.add("test");
 		List result = (List) jt.execute(new JdoCallback() {
+			@Override
 			public Object doInJdo(PersistenceManager pm) {
 				return l;
 			}
@@ -116,6 +120,7 @@ public class JdoTemplateTests extends TestCase {
 		final List l = new ArrayList();
 		l.add("test");
 		List result = (List) jt.execute(new JdoCallback() {
+			@Override
 			public Object doInJdo(PersistenceManager pm) {
 				return l;
 			}
@@ -136,6 +141,7 @@ public class JdoTemplateTests extends TestCase {
 		final List l = new ArrayList();
 		l.add("test");
 		List result = (List) jt.execute(new JdoCallback() {
+			@Override
 			public Object doInJdo(PersistenceManager pm) {
 				return l;
 			}
@@ -620,6 +626,7 @@ public class JdoTemplateTests extends TestCase {
 	public void testTemplateExceptions() {
 		try {
 			createTemplate().execute(new JdoCallback() {
+				@Override
 				public Object doInJdo(PersistenceManager pm) {
 					throw new JDOObjectNotFoundException();
 				}
@@ -632,6 +639,7 @@ public class JdoTemplateTests extends TestCase {
 
 		try {
 			createTemplate().execute(new JdoCallback() {
+				@Override
 				public Object doInJdo(PersistenceManager pm) {
 					throw new JDOOptimisticVerificationException();
 				}
@@ -644,6 +652,7 @@ public class JdoTemplateTests extends TestCase {
 
 		try {
 			createTemplate().execute(new JdoCallback() {
+				@Override
 				public Object doInJdo(PersistenceManager pm) {
 					throw new JDODataStoreException();
 				}
@@ -656,6 +665,7 @@ public class JdoTemplateTests extends TestCase {
 
 		try {
 			createTemplate().execute(new JdoCallback() {
+				@Override
 				public Object doInJdo(PersistenceManager pm) {
 					throw new JDOFatalDataStoreException();
 				}
@@ -668,6 +678,7 @@ public class JdoTemplateTests extends TestCase {
 
 		try {
 			createTemplate().execute(new JdoCallback() {
+				@Override
 				public Object doInJdo(PersistenceManager pm) {
 					throw new JDOUserException();
 				}
@@ -680,6 +691,7 @@ public class JdoTemplateTests extends TestCase {
 
 		try {
 			createTemplate().execute(new JdoCallback() {
+				@Override
 				public Object doInJdo(PersistenceManager pm) {
 					throw new JDOFatalUserException();
 				}
@@ -692,6 +704,7 @@ public class JdoTemplateTests extends TestCase {
 
 		try {
 			createTemplate().execute(new JdoCallback() {
+				@Override
 				public Object doInJdo(PersistenceManager pm) {
 					throw new JDOException();
 				}
@@ -714,6 +727,7 @@ public class JdoTemplateTests extends TestCase {
 			JdoTemplate template = createTemplate();
 			template.setJdoDialect(dialect);
 			template.execute(new JdoCallback() {
+				@Override
 				public Object doInJdo(PersistenceManager pm) {
 					throw ex;
 				}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java
index 204d4e1b31..a7ab5fa9e6 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java
@@ -67,6 +67,7 @@ public class JdoTransactionManagerTests extends TestCase {
 	private Transaction tx;
 
 
+	@Override
 	protected void setUp() {
 		pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
 		pmf = (PersistenceManagerFactory) pmfControl.getMock();
@@ -78,6 +79,7 @@ public class JdoTransactionManagerTests extends TestCase {
 		pmfControl.setReturnValue(null, 1);
 	}
 
+	@Override
 	protected void tearDown() {
 		try {
 			pmfControl.verify();
@@ -123,6 +125,7 @@ public class JdoTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 
@@ -149,6 +152,7 @@ public class JdoTransactionManagerTests extends TestCase {
 
 				JdoTemplate jt = new JdoTemplate(pmf);
 				return jt.execute(new JdoCallback() {
+					@Override
 					public Object doInJdo(PersistenceManager pm2) {
 						pm2.flush();
 						return l;
@@ -188,10 +192,12 @@ public class JdoTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 					JdoTemplate jt = new JdoTemplate(pmf);
 					return jt.execute(new JdoCallback() {
+						@Override
 						public Object doInJdo(PersistenceManager pm) {
 							throw new RuntimeException("application exception");
 						}
@@ -232,10 +238,12 @@ public class JdoTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 					JdoTemplate jt = new JdoTemplate(pmf);
 					return jt.execute(new JdoCallback() {
+						@Override
 						public Object doInJdo(PersistenceManager pm) {
 							throw new RuntimeException("application exception");
 						}
@@ -278,10 +286,12 @@ public class JdoTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf));
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 				JdoTemplate jt = new JdoTemplate(pmf);
 				jt.execute(new JdoCallback() {
+					@Override
 					public Object doInJdo(PersistenceManager pm2) {
 						pm2.flush();
 						return null;
@@ -318,6 +328,7 @@ public class JdoTransactionManagerTests extends TestCase {
 		l.add("test");
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				txControl.reset();
 				tx.isActive();
@@ -329,9 +340,11 @@ public class JdoTransactionManagerTests extends TestCase {
 				txControl.replay();
 
 				return tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						JdoTemplate jt = new JdoTemplate(pmf);
 						return jt.execute(new JdoCallback() {
+							@Override
 							public Object doInJdo(PersistenceManager pm2) {
 								pm2.flush();
 								return l;
@@ -365,6 +378,7 @@ public class JdoTransactionManagerTests extends TestCase {
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					txControl.reset();
 					tx.isActive();
@@ -376,9 +390,11 @@ public class JdoTransactionManagerTests extends TestCase {
 					txControl.replay();
 
 					return tt.execute(new TransactionCallback() {
+						@Override
 						public Object doInTransaction(TransactionStatus status) {
 							JdoTemplate jt = new JdoTemplate(pmf);
 							return jt.execute(new JdoCallback() {
+								@Override
 								public Object doInJdo(PersistenceManager pm) {
 									throw new RuntimeException("application exception");
 								}
@@ -418,6 +434,7 @@ public class JdoTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					txControl.reset();
 					tx.isActive();
@@ -433,9 +450,11 @@ public class JdoTransactionManagerTests extends TestCase {
 					txControl.replay();
 
 					return tt.execute(new TransactionCallback() {
+						@Override
 						public Object doInTransaction(TransactionStatus status) {
 							JdoTemplate jt = new JdoTemplate(pmf);
 							jt.execute(new JdoCallback() {
+								@Override
 								public Object doInJdo(PersistenceManager pm2) {
 									pm2.flush();
 									return l;
@@ -478,6 +497,7 @@ public class JdoTransactionManagerTests extends TestCase {
 		l.add("test");
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				txControl.verify();
 				txControl.reset();
@@ -492,9 +512,11 @@ public class JdoTransactionManagerTests extends TestCase {
 				txControl.replay();
 
 				return tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						JdoTemplate jt = new JdoTemplate(pmf);
 						return jt.execute(new JdoCallback() {
+							@Override
 							public Object doInJdo(PersistenceManager pm2) {
 								pm2.flush();
 								return l;
@@ -534,6 +556,7 @@ public class JdoTransactionManagerTests extends TestCase {
 		assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				txControl.verify();
 				txControl.reset();
@@ -549,15 +572,18 @@ public class JdoTransactionManagerTests extends TestCase {
 
 				JdoTemplate jt = new JdoTemplate(pmf);
 				jt.execute(new JdoCallback() {
+					@Override
 					public Object doInJdo(PersistenceManager pm2) {
 						return null;
 					}
 				});
 
 				return tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						JdoTemplate jt = new JdoTemplate(pmf);
 						return jt.execute(new JdoCallback() {
+							@Override
 							public Object doInJdo(PersistenceManager pm2) {
 								pm2.flush();
 								return l;
@@ -604,11 +630,13 @@ public class JdoTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
 				assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf));
 				JdoTemplate jt = new JdoTemplate(pmf);
 				jt.execute(new JdoCallback() {
+					@Override
 					public Object doInJdo(PersistenceManager pm2) {
 						assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 						pm2.flush();
@@ -616,6 +644,7 @@ public class JdoTransactionManagerTests extends TestCase {
 					}
 				});
 				Object result = jt.execute(new JdoCallback() {
+					@Override
 					public Object doInJdo(PersistenceManager pm2) {
 						assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 						pm2.flush();
@@ -667,6 +696,7 @@ public class JdoTransactionManagerTests extends TestCase {
 		assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				try {
 					utControl.verify();
@@ -692,15 +722,18 @@ public class JdoTransactionManagerTests extends TestCase {
 
 				JdoTemplate jt = new JdoTemplate(pmf);
 				jt.execute(new JdoCallback() {
+					@Override
 					public Object doInJdo(PersistenceManager pm2) {
 						return null;
 					}
 				});
 
 				return tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						JdoTemplate jt = new JdoTemplate(pmf);
 						return jt.execute(new JdoCallback() {
+							@Override
 							public Object doInJdo(PersistenceManager pm2) {
 								pm2.flush();
 								return l;
@@ -737,11 +770,13 @@ public class JdoTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf));
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf));
 				assertTrue("Is not new transaction", !status.isNewTransaction());
 				JdoTemplate jt = new JdoTemplate(pmf);
 				return jt.execute(new JdoCallback() {
+					@Override
 					public Object doInJdo(PersistenceManager pm) {
 						return l;
 					}
@@ -770,6 +805,7 @@ public class JdoTransactionManagerTests extends TestCase {
 		tt.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE);
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 				}
 			});
@@ -806,10 +842,12 @@ public class JdoTransactionManagerTests extends TestCase {
 		assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 				JdoTemplate jt = new JdoTemplate(pmf);
 				return jt.execute(new JdoCallback() {
+					@Override
 					public Object doInJdo(PersistenceManager pm) {
 						return l;
 					}
@@ -868,11 +906,13 @@ public class JdoTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf));
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 				assertTrue("Has thread con", TransactionSynchronizationManager.hasResource(ds));
 				JdoTemplate jt = new JdoTemplate(pmf);
 				return jt.execute(new JdoCallback() {
+					@Override
 					public Object doInJdo(PersistenceManager pm) {
 						return l;
 					}
@@ -938,11 +978,13 @@ public class JdoTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf));
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 				assertTrue("Has thread con", TransactionSynchronizationManager.hasResource(ds));
 				JdoTemplate jt = new JdoTemplate(pmf);
 				return jt.execute(new JdoCallback() {
+					@Override
 					public Object doInJdo(PersistenceManager pm) {
 						return l;
 					}
@@ -1004,6 +1046,7 @@ public class JdoTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf));
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 				assertTrue("Hasn't thread con", !TransactionSynchronizationManager.hasResource(ds));
@@ -1011,6 +1054,7 @@ public class JdoTransactionManagerTests extends TestCase {
 				jt.setPersistenceManagerFactory(pmf);
 				jt.setJdoDialect(dialect);
 				return jt.execute(new JdoCallback() {
+					@Override
 					public Object doInJdo(PersistenceManager pm2) {
 						pm2.flush();
 						return l;
@@ -1104,6 +1148,7 @@ public class JdoTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf));
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 				assertTrue("Has thread con", TransactionSynchronizationManager.hasResource(ds));
@@ -1113,6 +1158,7 @@ public class JdoTransactionManagerTests extends TestCase {
 				}
 				else {
 					tt.execute(new TransactionCallbackWithoutResult() {
+						@Override
 						protected void doInTransactionWithoutResult(TransactionStatus status) {
 							assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(pmf));
 							assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
@@ -1122,6 +1168,7 @@ public class JdoTransactionManagerTests extends TestCase {
 				}
 				JdoTemplate jt = new JdoTemplate(pmf);
 				return jt.execute(new JdoCallback() {
+					@Override
 					public Object doInJdo(PersistenceManager pm2) {
 						pm2.flush();
 						return l;
@@ -1193,6 +1240,7 @@ public class JdoTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 				JdoTemplate jt = new JdoTemplate(pmf);
@@ -1201,6 +1249,7 @@ public class JdoTransactionManagerTests extends TestCase {
 					jt.setExposeNativePersistenceManager(true);
 				}
 				return jt.execute(new JdoCallback() {
+					@Override
 					public Object doInJdo(PersistenceManager pm2) {
 						if (exposeNativePm) {
 							assertSame(pm, pm2);
@@ -1249,6 +1298,7 @@ public class JdoTransactionManagerTests extends TestCase {
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			public void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf));
 				status.flush();
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java
index 5ad9c14d39..c5a20a83b1 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java
@@ -37,6 +37,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase {
 		MockControl pmfControl = MockControl.createControl(PersistenceManagerFactory.class);
 		final PersistenceManagerFactory pmf = (PersistenceManagerFactory) pmfControl.getMock();
 		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
+			@Override
 			protected PersistenceManagerFactory newPersistenceManagerFactory(Map props) {
 				return pmf;
 			}
@@ -73,6 +74,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase {
 
 	public void testLocalPersistenceManagerFactoryBeanWithInvalidProperty() throws IOException {
 		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
+			@Override
 			protected PersistenceManagerFactory newPersistenceManagerFactory(Map props) {
 				throw new IllegalArgumentException((String) props.get("myKey"));
 			}
@@ -92,6 +94,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase {
 
 	public void testLocalPersistenceManagerFactoryBeanWithFile() throws IOException {
 		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
+			@Override
 			protected PersistenceManagerFactory newPersistenceManagerFactory(Map props) {
 				throw new IllegalArgumentException((String) props.get("myKey"));
 			}
@@ -109,6 +112,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase {
 
 	public void testLocalPersistenceManagerFactoryBeanWithName() throws IOException {
 		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
+			@Override
 			protected PersistenceManagerFactory newPersistenceManagerFactory(String name) {
 				throw new IllegalArgumentException(name);
 			}
@@ -126,6 +130,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase {
 
 	public void testLocalPersistenceManagerFactoryBeanWithNameAndProperties() throws IOException {
 		LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() {
+			@Override
 			protected PersistenceManagerFactory newPersistenceManagerFactory(String name) {
 				throw new IllegalArgumentException(name);
 			}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java
index 99a55063d4..cfbd52a416 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java
@@ -40,6 +40,7 @@ public class JdoDaoSupportTests extends TestCase {
 		pmfControl.replay();
 		final List test = new ArrayList();
 		JdoDaoSupport dao = new JdoDaoSupport() {
+			@Override
 			protected void initDao() {
 				test.add("test");
 			}
@@ -56,6 +57,7 @@ public class JdoDaoSupportTests extends TestCase {
 		JdoTemplate template = new JdoTemplate();
 		final List test = new ArrayList();
 		JdoDaoSupport dao = new JdoDaoSupport() {
+			@Override
 			protected void initDao() {
 				test.add("test");
 			}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java
index c01d831d8a..7a5784ac93 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java
@@ -146,6 +146,7 @@ public class OpenPersistenceManagerInViewTests extends TestCase {
 		filter2.init(filterConfig2);
 
 		final FilterChain filterChain = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) {
 				assertTrue(TransactionSynchronizationManager.hasResource(pmf));
 				servletRequest.setAttribute("invoked", Boolean.TRUE);
@@ -153,6 +154,7 @@ public class OpenPersistenceManagerInViewTests extends TestCase {
 		};
 
 		final FilterChain filterChain2 = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
 				throws IOException, ServletException {
 				assertTrue(TransactionSynchronizationManager.hasResource(pmf2));
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
index 177734aee6..225289d63a 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
@@ -80,10 +80,12 @@ public abstract class AbstractEntityManagerFactoryBeanTests extends TestCase {
 			return emf;
 		}
 
+		@Override
 		public PersistenceUnitInfo getPersistenceUnitInfo() {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public String getPersistenceUnitName() {
 			return "test";
 		}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
index e453aad9b5..15148f29c6 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
@@ -65,6 +65,7 @@ public abstract class AbstractEntityManagerFactoryIntegrationTests extends Abstr
 		return null;
 	}
 
+	@Override
 	protected String[] getConfigLocations() {
 		Provider provider = getProvider();
 		switch (provider) {
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
index 8bea214403..d145444a7b 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
@@ -35,10 +35,12 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
 public class DefaultJpaDialectTests extends TestCase {
 	JpaDialect dialect;
 
+	@Override
 	protected void setUp() throws Exception {
 		dialect = new DefaultJpaDialect();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		dialect = null;
 	}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java
index a94be01f20..f2f545dcf9 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java
@@ -242,6 +242,7 @@ public class JpaInterceptorTests extends TestCase {
 			this.entityManagerFactory = entityManagerFactory;
 		}
 
+		@Override
 		public Object proceed() throws Throwable {
 			if (!TransactionSynchronizationManager.hasResource(this.entityManagerFactory)) {
 				throw new IllegalStateException("Session not bound");
@@ -261,10 +262,12 @@ public class JpaInterceptorTests extends TestCase {
 			return null;
 		}
 
+		@Override
 		public Method getMethod() {
 			return null;
 		}
 
+		@Override
 		public AccessibleObject getStaticPart() {
 			return null;
 		}
@@ -273,6 +276,7 @@ public class JpaInterceptorTests extends TestCase {
 			return null;
 		}
 
+		@Override
 		public Object[] getArguments() {
 			return null;
 		}
@@ -284,6 +288,7 @@ public class JpaInterceptorTests extends TestCase {
 			return 0;
 		}
 
+		@Override
 		public Object getThis() {
 			return null;
 		}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java
index c78959f5cc..41bb035269 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java
@@ -44,6 +44,7 @@ public class JpaTemplateTests extends TestCase {
 
 	private EntityManagerFactory factory;
 
+	@Override
 	protected void setUp() throws Exception {
 		template = new JpaTemplate();
 
@@ -57,6 +58,7 @@ public class JpaTemplateTests extends TestCase {
 
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		template = null;
 		factoryControl = null;
@@ -95,6 +97,7 @@ public class JpaTemplateTests extends TestCase {
 
 		template.execute(new JpaCallback() {
 
+			@Override
 			public Object doInJpa(EntityManager em) throws PersistenceException {
 				assertSame(em, manager);
 				return null;
@@ -104,6 +107,7 @@ public class JpaTemplateTests extends TestCase {
 		template.setExposeNativeEntityManager(false);
 		template.execute(new JpaCallback() {
 
+			@Override
 			public Object doInJpa(EntityManager em) throws PersistenceException {
 				assertNotSame(em, manager);
 				return null;
@@ -128,6 +132,7 @@ public class JpaTemplateTests extends TestCase {
 		try {
 			template.executeFind(new JpaCallback() {
 
+				@Override
 				public Object doInJpa(EntityManager em) throws PersistenceException {
 					assertSame(em, manager);
 					return new Object();
@@ -161,6 +166,7 @@ public class JpaTemplateTests extends TestCase {
 		factoryControl.replay();
 
 		template.execute(new JpaCallback() {
+			@Override
 			public Object doInJpa(EntityManager em) throws PersistenceException {
 				assertSame(em, manager);
 				return null;
@@ -183,6 +189,7 @@ public class JpaTemplateTests extends TestCase {
 		try {
 			template.execute(new JpaCallback() {
 
+				@Override
 				public Object doInJpa(EntityManager em) throws PersistenceException {
 					assertSame(em, manager);
 					return null;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
index 722f25adfe..e9ba8b8685 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
@@ -60,6 +60,7 @@ public class JpaTransactionManagerTests extends TestCase {
 	private TransactionTemplate tt;
 
 
+	@Override
 	protected void setUp() throws Exception {
 		factoryControl = MockControl.createControl(EntityManagerFactory.class);
 		factory = (EntityManagerFactory) factoryControl.getMock();
@@ -80,6 +81,7 @@ public class JpaTransactionManagerTests extends TestCase {
 		manager.close();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
@@ -106,9 +108,11 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.hasResource(factory));
 				return template.execute(new JpaCallback() {
+					@Override
 					public Object doInJpa(EntityManager em) {
 						em.flush();
 						return l;
@@ -146,9 +150,11 @@ public class JpaTransactionManagerTests extends TestCase {
 
 		try {
 			Object result = tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.hasResource(factory));
 					return template.execute(new JpaCallback() {
+						@Override
 						public Object doInJpa(EntityManager em) {
 							em.flush();
 							return l;
@@ -188,9 +194,11 @@ public class JpaTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.hasResource(factory));
 					return template.execute(new JpaCallback() {
+						@Override
 						public Object doInJpa(EntityManager em) {
 							throw new RuntimeException("some exception");
 						}
@@ -229,9 +237,11 @@ public class JpaTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.hasResource(factory));
 					return template.execute(new JpaCallback() {
+						@Override
 						public Object doInJpa(EntityManager em) {
 							throw new RuntimeException("some exception");
 						}
@@ -269,10 +279,12 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.hasResource(factory));
 
 				Object res = template.execute(new JpaCallback() {
+					@Override
 					public Object doInJpa(EntityManager em) {
 						em.flush();
 						return l;
@@ -307,6 +319,7 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				txControl.reset();
 				txControl.expectAndReturn(tx.getRollbackOnly(), false);
@@ -316,9 +329,11 @@ public class JpaTransactionManagerTests extends TestCase {
 				assertTrue(TransactionSynchronizationManager.hasResource(factory));
 
 				return tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 
 						return template.execute(new JpaCallback() {
+							@Override
 							public Object doInJpa(EntityManager em) {
 								em.flush();
 								return l;
@@ -351,6 +366,7 @@ public class JpaTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					txControl.reset();
 					txControl.expectAndReturn(tx.isActive(), true, 2);
@@ -360,8 +376,10 @@ public class JpaTransactionManagerTests extends TestCase {
 
 					assertTrue(TransactionSynchronizationManager.hasResource(factory));
 					return tt.execute(new TransactionCallback() {
+						@Override
 						public Object doInTransaction(TransactionStatus status) {
 							return template.execute(new JpaCallback() {
+								@Override
 								public Object doInJpa(EntityManager em) {
 									throw new RuntimeException("exception");
 								}
@@ -400,6 +418,7 @@ public class JpaTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					txControl.reset();
 					txControl.expectAndReturn(tx.isActive(), true);
@@ -412,9 +431,11 @@ public class JpaTransactionManagerTests extends TestCase {
 					assertTrue(TransactionSynchronizationManager.hasResource(factory));
 
 					return tt.execute(new TransactionCallback() {
+						@Override
 						public Object doInTransaction(TransactionStatus status) {
 
 							template.execute(new JpaCallback() {
+								@Override
 								public Object doInJpa(EntityManager em2) {
 									em2.flush();
 									return l;
@@ -462,6 +483,7 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				txControl.verify();
 				txControl.reset();
@@ -476,8 +498,10 @@ public class JpaTransactionManagerTests extends TestCase {
 
 				assertTrue(TransactionSynchronizationManager.hasResource(factory));
 				return tt.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						return template.execute(new JpaCallback() {
+							@Override
 							public Object doInJpa(EntityManager em2) {
 								em2.flush();
 								return l;
@@ -517,6 +541,7 @@ public class JpaTransactionManagerTests extends TestCase {
 
 		try {
 			Object result = tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					txControl.verify();
 					txControl.reset();
@@ -531,6 +556,7 @@ public class JpaTransactionManagerTests extends TestCase {
 
 					JpaTemplate template2 = new JpaTemplate(factory);
 					template2.execute(new JpaCallback() {
+						@Override
 						public Object doInJpa(EntityManager em) throws PersistenceException {
 							return null;
 						}
@@ -538,8 +564,10 @@ public class JpaTransactionManagerTests extends TestCase {
 
 					assertTrue(TransactionSynchronizationManager.hasResource(factory));
 					return tt.execute(new TransactionCallback() {
+						@Override
 						public Object doInTransaction(TransactionStatus status) {
 							return template.execute(new JpaCallback() {
+								@Override
 								public Object doInJpa(EntityManager em2) {
 									em2.flush();
 									return l;
@@ -582,13 +610,16 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertFalse(TransactionSynchronizationManager.hasResource(factory));
 				TransactionTemplate tt2 = new TransactionTemplate(transactionManager);
 				tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 				return tt2.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						return template.execute(new JpaCallback() {
+							@Override
 							public Object doInJpa(EntityManager em2) {
 								em2.flush();
 								return l;
@@ -630,9 +661,11 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				JpaTemplate template2 = new JpaTemplate(factory);
 				template2.execute(new JpaCallback() {
+					@Override
 					public Object doInJpa(EntityManager em) throws PersistenceException {
 						return null;
 					}
@@ -642,8 +675,10 @@ public class JpaTransactionManagerTests extends TestCase {
 				TransactionTemplate tt2 = new TransactionTemplate(transactionManager);
 				tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 				return tt2.execute(new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						return template.execute(new JpaCallback() {
+							@Override
 							public Object doInJpa(EntityManager em2) {
 								em2.flush();
 								return l;
@@ -694,18 +729,23 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				template.execute(new JpaCallback() {
+					@Override
 					public Object doInJpa(EntityManager em2) {
 						em2.flush();
 						return null;
 					}
 				});
 				TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
+					@Override
 					public void afterCompletion(int status) {
 						tt.execute(new TransactionCallback() {
+							@Override
 							public Object doInTransaction(TransactionStatus status) {
 								return template.execute(new JpaCallback() {
+									@Override
 									public Object doInJpa(EntityManager em2) {
 										em2.flush();
 										return null;
@@ -750,11 +790,13 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertTrue(!status.isNewTransaction());
 				return template.execute(new JpaCallback() {
+					@Override
 					public Object doInJpa(EntityManager em) {
 						em.flush();
 						return l;
@@ -790,11 +832,13 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue(!TransactionSynchronizationManager.hasResource(factory));
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertTrue(!status.isNewTransaction());
 				template.execute(new JpaCallback() {
+					@Override
 					public Object doInJpa(EntityManager em) {
 						em.flush();
 						return null;
@@ -836,10 +880,12 @@ public class JpaTransactionManagerTests extends TestCase {
 
 		try {
 			Object result = tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.hasResource(factory));
 					assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 					return template.execute(new JpaCallback() {
+						@Override
 						public Object doInJpa(EntityManager em) {
 							return l;
 						}
@@ -881,10 +927,12 @@ public class JpaTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.hasResource(factory));
 					assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 					template.execute(new JpaCallback() {
+						@Override
 						public Object doInJpa(EntityManager em) {
 							return null;
 						}
@@ -929,11 +977,13 @@ public class JpaTransactionManagerTests extends TestCase {
 
 		try {
 			Object result = tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.hasResource(factory));
 					assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 					assertTrue(!status.isNewTransaction());
 					return template.execute(new JpaCallback() {
+						@Override
 						public Object doInJpa(EntityManager em) {
 							em.flush();
 							return l;
@@ -976,11 +1026,13 @@ public class JpaTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.hasResource(factory));
 					assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 					assertTrue(!status.isNewTransaction());
 					template.execute(new JpaCallback() {
+						@Override
 						public Object doInJpa(EntityManager em) {
 							em.flush();
 							return null;
@@ -1026,10 +1078,12 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
 		Object result = tt.execute(new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.hasResource(factory));
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				return template.execute(new JpaCallback() {
+					@Override
 					public Object doInJpa(EntityManager em) {
 						em.flush();
 						return l;
@@ -1063,6 +1117,7 @@ public class JpaTransactionManagerTests extends TestCase {
 
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 				}
 			});
@@ -1092,6 +1147,7 @@ public class JpaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			public void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.hasResource(factory));
 				status.flush();
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java
index 89c41cdc24..a0ebba76b6 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java
@@ -366,12 +366,14 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM
 
 	private static class DummyContainerPersistenceProvider implements PersistenceProvider {
 
+		@Override
 		public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo pui, Map map) {
 			actualPui = pui;
 			actualProps = map;
 			return mockEmf;
 		}
 
+		@Override
 		public EntityManagerFactory createEntityManagerFactory(String emfName, Map properties) {
 			throw new UnsupportedOperationException();
 		}
@@ -380,23 +382,29 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM
 
 	private static class NoOpEntityTransaction implements EntityTransaction {
 
+		@Override
 		public void begin() {
 		}
 
+		@Override
 		public void commit() {
 		}
 
+		@Override
 		public void rollback() {
 		}
 
+		@Override
 		public void setRollbackOnly() {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public boolean getRollbackOnly() {
 			return false;
 		}
 
+		@Override
 		public boolean isActive() {
 			return false;
 		}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
index ad68b90a6f..8371e18766 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
@@ -80,10 +80,12 @@ public class LocalEntityManagerFactoryBeanTests extends AbstractEntityManagerFac
 
 	protected static class DummyPersistenceProvider implements PersistenceProvider {
 
+		@Override
 		public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo pui, Map map) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public EntityManagerFactory createEntityManagerFactory(String emfName, Map properties) {
 			actualName = emfName;
 			actualProps = properties;
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java
index 4e092f7ffc..67f586adb0 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java
@@ -28,6 +28,7 @@ import org.springframework.orm.jpa.EntityManagerFactoryInfo;
  */
 public class EclipseLinkEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests {
 
+	@Override
 	protected String[] getConfigLocations() {
 		return ECLIPSELINK_CONFIG_LOCATIONS;
 	}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
index e7a439080a..8759b3710b 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
@@ -45,6 +45,7 @@ public class HibernateEntityManagerFactoryIntegrationTests extends
 		this.sessionFactory = sessionFactory;
 	}
 
+	@Override
 	protected String[] getConfigLocations() {
 		return HIBERNATE_CONFIG_LOCATIONS;
 	}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java
index 65147c04d1..8e66b70971 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java
@@ -40,6 +40,7 @@ public class HibernateMultiEntityManagerFactoryIntegrationTests extends
 		this.entityManagerFactory2 = entityManagerFactory2;
 	}
 
+	@Override
 	protected String[] getConfigLocations() {
 		return new String[] {
 			"/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml",
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java
index fbdb0eda30..68e82f5f80 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java
@@ -39,6 +39,7 @@ import org.springframework.transaction.support.TransactionTemplate;
  */
 public class OpenJpaEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests {
 
+	@Override
 	protected String[] getConfigLocations() {
 		return OPENJPA_CONFIG_LOCATIONS;
 	}
@@ -62,6 +63,7 @@ public class OpenJpaEntityManagerFactoryIntegrationTests extends AbstractContain
 		TransactionTemplate tt = new TransactionTemplate(transactionManager);
 		tt.setPropagationBehavior(TransactionTemplate.PROPAGATION_NESTED);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				Person tony = new Person();
 				tony.setFirstName("Tony");
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java
index 3b1f71ba3c..20d9e5f029 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java
@@ -32,6 +32,7 @@ import org.junit.Ignore;
 @Ignore("this test causes gradle to hang")
 public class OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests extends OpenJpaEntityManagerFactoryIntegrationTests {
 
+	@Override
 	protected String[] getConfigLocations() {
 		return new String[] {
 				"/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml",
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java
index ec65890b88..28b03587ab 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java
@@ -38,6 +38,7 @@ public class JpaDaoSupportTests extends TestCase {
 		mockControl.replay();
 		final List test = new ArrayList();
 		JpaDaoSupport dao = new JpaDaoSupport() {
+			@Override
 			protected void initDao() {
 				test.add("test");
 			}
@@ -56,6 +57,7 @@ public class JpaDaoSupportTests extends TestCase {
 		mockControl.replay();
 		final List test = new ArrayList();
 		JpaDaoSupport dao = new JpaDaoSupport() {
+			@Override
 			protected void initDao() {
 				test.add("test");
 			}
@@ -73,6 +75,7 @@ public class JpaDaoSupportTests extends TestCase {
 		JpaTemplate template = new JpaTemplate();
 		final List test = new ArrayList();
 		JpaDaoSupport dao = new JpaDaoSupport() {
+			@Override
 			protected void initDao() {
 				test.add("test");
 			}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
index 06fdf97311..3431e4a421 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
@@ -163,6 +163,7 @@ public class OpenEntityManagerInViewTests extends TestCase {
 		asyncManager.setTaskExecutor(new SyncTaskExecutor());
 		asyncManager.setAsyncWebRequest(asyncWebRequest);
 		asyncManager.startCallableProcessing(new Callable<String>() {
+			@Override
 			public String call() throws Exception {
 				return "anything";
 			}
@@ -257,6 +258,7 @@ public class OpenEntityManagerInViewTests extends TestCase {
 		filter2.init(filterConfig2);
 
 		final FilterChain filterChain = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) {
 				assertTrue(TransactionSynchronizationManager.hasResource(factory));
 				servletRequest.setAttribute("invoked", Boolean.TRUE);
@@ -264,6 +266,7 @@ public class OpenEntityManagerInViewTests extends TestCase {
 		};
 
 		final FilterChain filterChain2 = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
 				throws IOException, ServletException {
 				assertTrue(TransactionSynchronizationManager.hasResource(factory2));
@@ -323,6 +326,7 @@ public class OpenEntityManagerInViewTests extends TestCase {
 		final AtomicInteger count = new AtomicInteger(0);
 
 		final FilterChain filterChain = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) {
 				assertTrue(TransactionSynchronizationManager.hasResource(factory));
 				servletRequest.setAttribute("invoked", Boolean.TRUE);
@@ -333,6 +337,7 @@ public class OpenEntityManagerInViewTests extends TestCase {
 		final AtomicInteger count2 = new AtomicInteger(0);
 
 		final FilterChain filterChain2 = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse)
 				throws IOException, ServletException {
 				assertTrue(TransactionSynchronizationManager.hasResource(factory2));
@@ -355,6 +360,7 @@ public class OpenEntityManagerInViewTests extends TestCase {
 		asyncManager.setTaskExecutor(new SyncTaskExecutor());
 		asyncManager.setAsyncWebRequest(asyncWebRequest);
 		asyncManager.startCallableProcessing(new Callable<String>() {
+			@Override
 			public String call() throws Exception {
 				return "anything";
 			}
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 f8af85a584..4675422aab 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
@@ -734,14 +734,17 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 		@PersistenceContext
 		private EntityManager em;
 
+		@Override
 		public Object getObject() throws Exception {
 			return null;
 		}
 
+		@Override
 		public Class getObjectType() {
 			return null;
 		}
 
+		@Override
 		public boolean isSingleton() {
 			return true;
 		}
@@ -785,6 +788,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 	@SuppressWarnings("serial")
 	public static class SpecificPublicPersistenceContextSetter extends DefaultPublicPersistenceContextSetter {
 
+		@Override
 		@PersistenceContext(unitName="unit2", type = PersistenceContextType.EXTENDED)
 		public void setEntityManager(EntityManager em) {
 			super.setEntityManager(em);
@@ -880,6 +884,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
 
 		public static boolean closed;
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			if ("isOpen".equals(method.getName())) {
 				return true;
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 d69241996e..64e43ed7d4 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
@@ -28,6 +28,7 @@ import org.springframework.orm.jpa.EntityManagerFactoryInfo;
  */
 public class TopLinkEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests {
 
+	@Override
 	protected String[] getConfigLocations() {
 		return TOPLINK_CONFIG_LOCATIONS;
 	}
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java
index c3350e0e25..78e8f86af5 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java
@@ -44,6 +44,7 @@ public class TopLinkMultiEntityManagerFactoryIntegrationTests extends
 		this.entityManagerFactory2 = entityManagerFactory2;
 	}
 
+	@Override
 	protected String[] getConfigLocations() {
 		return new String[] {
 			"/org/springframework/orm/jpa/toplink/toplink-manager-multi.xml",
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
index 5da624d1cb..8cb7fd8744 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
@@ -172,6 +172,7 @@ public abstract class AbstractDependencyInjectionSpringContextTests extends Abst
 	 * message will be written to the log.
 	 * @see #injectDependencies()
 	 */
+	@Override
 	protected void prepareTestInstance() throws Exception {
 		if (getApplicationContext() == null) {
 			if (this.logger.isInfoEnabled()) {
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java
index e1365de448..b99e20d03f 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java
@@ -95,6 +95,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	 * This implementation is final. Override {@code onSetUp} for custom behavior.
 	 * @see #onSetUp()
 	 */
+	@Override
 	protected final void setUp() throws Exception {
 		// lazy load, in case getApplicationContext() has not yet been called.
 		if (this.applicationContext == null) {
@@ -136,6 +137,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	 * custom behavior.
 	 * @see #onTearDown()
 	 */
+	@Override
 	protected final void tearDown() throws Exception {
 		onTearDown();
 	}
@@ -168,6 +170,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	 * {@code contextKey()} returns.
 	 * @see #getConfigLocations()
 	 */
+	@Override
 	protected ConfigurableApplicationContext loadContext(Object key) throws Exception {
 		return loadContextLocations((String[]) key);
 	}
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
index f159866bc0..1f0b6123db 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
@@ -120,6 +120,7 @@ public abstract class AbstractTransactionalDataSourceSpringContextTests
 	 * cleared, as a defensive measure against accidental <i>permanent</i> wiping of a database.
 	 * @see org.springframework.test.AbstractTransactionalSpringContextTests#setComplete()
 	 */
+	@Override
 	protected final void setComplete() {
 		if (this.zappedTables) {
 			throw new IllegalStateException("Cannot set complete after deleting tables");
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
index b0030de783..e45774e1c9 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
@@ -187,6 +187,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe
 	 * @throws Exception simply let any exception propagate
 	 * @see #onTearDown()
 	 */
+	@Override
 	protected void onSetUp() throws Exception {
 		this.complete = !this.isRollback();
 
@@ -250,6 +251,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe
 	 * @throws Exception simply let any exception propagate
 	 * @see #onSetUp()
 	 */
+	@Override
 	protected void onTearDown() throws Exception {
 		// Call onTearDownInTransaction and end transaction if the transaction
 		// is still active.
diff --git a/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java b/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java
index 9fd3119315..8c9dc686d9 100644
--- a/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java
+++ b/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java
@@ -66,6 +66,7 @@ public abstract class ConditionalTestCase extends TestCase {
 		super(name);
 	}
 
+	@Override
 	public void runBare() throws Throwable {
 		// getName will return the name of the method being run
 		if (isDisabledInThisEnvironment(getName())) {
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
index 93b25efcc5..fa6dd008a0 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
@@ -173,6 +173,7 @@ public abstract class AbstractAnnotationAwareTransactionalTests extends
 
 		// Let JUnit handle execution. We're just changing the state of the test class first.
 		runTestTimed(new TestExecutionCallback() {
+			@Override
 			public void run() throws Throwable {
 				try {
 					AbstractAnnotationAwareTransactionalTests.super.runBare();
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java b/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java
index f806acc1ff..7bd17b9bd5 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java
@@ -50,6 +50,7 @@ public class SystemProfileValueSource implements ProfileValueSource {
 	 * system properties.
 	 * @see System#getProperty(String)
 	 */
+	@Override
 	public String get(String key) {
 		Assert.hasText(key, "'key' must not be empty");
 		return System.getProperty(key);
diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
index f351a00dfa..b4cb804032 100644
--- a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -331,6 +331,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 			this.ltw = ltw;
 		}
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 			if (bean instanceof LocalContainerEntityManagerFactoryBean) {
 				((LocalContainerEntityManagerFactoryBean) bean).setLoadTimeWeaver(this.ltw);
@@ -352,6 +353,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 			this.shadowingClassLoader = shadowingClassLoader;
 		}
 
+		@Override
 		public void addTransformer(ClassFileTransformer transformer) {
 			try {
 				Method addClassFileTransformer =
@@ -364,10 +366,12 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 			}
 		}
 
+		@Override
 		public ClassLoader getInstrumentableClassLoader() {
 			return this.shadowingClassLoader;
 		}
 
+		@Override
 		public ClassLoader getThrowawayClassLoader() {
 			// Be sure to copy the same resource overrides and same class file transformers:
 			// We want the throwaway class loader to behave like the instrumentable class loader.
diff --git a/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java
index c9c8709c48..de79edcd74 100644
--- a/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java
+++ b/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java
@@ -28,10 +28,12 @@ public class MockJtaTransaction implements javax.transaction.Transaction {
 
 	private Synchronization synchronization;
 
+	@Override
 	public int getStatus() {
 		return Status.STATUS_ACTIVE;
 	}
 
+	@Override
 	public void registerSynchronization(Synchronization synchronization) {
 		this.synchronization = synchronization;
 	}
@@ -40,20 +42,25 @@ public class MockJtaTransaction implements javax.transaction.Transaction {
 		return synchronization;
 	}
 
+	@Override
 	public boolean enlistResource(XAResource xaResource) {
 		return false;
 	}
 
+	@Override
 	public boolean delistResource(XAResource xaResource, int i) {
 		return false;
 	}
 
+	@Override
 	public void commit() {
 	}
 
+	@Override
 	public void rollback() {
 	}
 
+	@Override
 	public void setRollbackOnly() {
 	}
 
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 a550a4daed..9255438766 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
@@ -206,6 +206,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests {
 	private void testSupportsPrimitives() {
 		final Primitives primitives = new Primitives();
 		ReflectionUtils.doWithMethods(Primitives.class, new ReflectionUtils.MethodCallback() {
+			@Override
 			public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
 				Type returnType = method.getGenericReturnType();
 				assertTrue("Jaxb2Marshaller does not support JAXBElement<" + method.getName().substring(9) + ">",
@@ -220,6 +221,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests {
 				}
 			}
 		}, new ReflectionUtils.MethodFilter() {
+			@Override
 			public boolean matches(Method method) {
 				return method.getName().startsWith("primitive");
 			}
@@ -229,6 +231,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests {
 	private void testSupportsStandardClasses() throws Exception {
 		final StandardClasses standardClasses = new StandardClasses();
 		ReflectionUtils.doWithMethods(StandardClasses.class, new ReflectionUtils.MethodCallback() {
+			@Override
 			public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
 				Type returnType = method.getGenericReturnType();
 				assertTrue("Jaxb2Marshaller does not support JAXBElement<" + method.getName().substring(13) + ">",
@@ -243,6 +246,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests {
 				}
 			}
 		}, new ReflectionUtils.MethodFilter() {
+			@Override
 			public boolean matches(Method method) {
 				return method.getName().startsWith("standardClass");
 			}
diff --git a/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java b/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java
index 68dda908f5..e89fe77b45 100644
--- a/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java
+++ b/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java
@@ -34,6 +34,7 @@ public class TestAction extends Action implements BeanNameAware {
 
 	private String beanName;
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
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 66e5e064ef..56d4c5b40d 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
@@ -120,10 +120,12 @@ public class DefaultMvcResultTests {
 			this.asyncStarted = asyncStarted;
 		}
 
+		@Override
 		public boolean isAsyncStarted() {
 			return this.asyncStarted;
 		}
 
+		@Override
 		public AsyncContext getAsyncContext() {
 			return asyncContext;
 		}
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
index c86e290137..60426d8075 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java
@@ -60,30 +60,37 @@ public class StubMvcResult implements MvcResult {
 		this.response = response;
 	}
 
+	@Override
 	public MockHttpServletRequest getRequest() {
 		return request;
 	}
 
+	@Override
 	public Object getHandler() {
 		return handler;
 	}
 
+	@Override
 	public HandlerInterceptor[] getInterceptors() {
 		return interceptors;
 	}
 
+	@Override
 	public Exception getResolvedException() {
 		return resolvedException;
 	}
 
+	@Override
 	public ModelAndView getModelAndView() {
 		return mav;
 	}
 
+	@Override
 	public FlashMap getFlashMap() {
 		return flashMap;
 	}
 
+	@Override
 	public MockHttpServletResponse getResponse() {
 		return response;
 	}
@@ -120,10 +127,12 @@ public class StubMvcResult implements MvcResult {
 		this.response = response;
 	}
 
+	@Override
 	public Object getAsyncResult() {
 		return null;
 	}
 
+	@Override
 	public Object getAsyncResult(long timeout) {
 		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 926942869a..9320acd338 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
@@ -392,6 +392,7 @@ public class MockHttpServletRequestBuilderTests {
 
 	private final class User implements Principal {
 
+		@Override
 		public String getName() {
 			return "Foo";
 		}
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
index 0eea853376..5902cb5e94 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
@@ -63,6 +63,7 @@ public class PrintingResultHandlerTests {
 	public void setup() {
 		this.handler = new TestPrintingResultHandler();
 		this.request = new MockHttpServletRequest("GET", "/") {
+			@Override
 			public boolean isAsyncStarted() {
 				return false;
 			}
@@ -228,11 +229,13 @@ public class PrintingResultHandlerTests {
 
 			private Map<String, Map<String, Object>> printedValues = new HashMap<String, Map<String, Object>>();
 
+			@Override
 			public void printHeading(String heading) {
 				this.printedHeading = heading;
 				this.printedValues.put(heading, new HashMap<String, Object>());
 			}
 
+			@Override
 			public void printValue(String label, Object value) {
 				Assert.notNull(this.printedHeading,
 						"Heading not printed before label " + label + " with value " + value);
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
index 0a22f71ac0..f021e1355a 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
@@ -97,6 +97,7 @@ public class AsyncTests {
 		@ResponseBody
 		public Callable<Person> getCallable(final Model model) {
 			return new Callable<Person>() {
+				@Override
 				public Person call() throws Exception {
 					return new Person("Joe");
 				}
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
index 56539b9921..de8760c879 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java
@@ -151,6 +151,7 @@ public class FilterTests {
 				@Override
 				public Principal getUserPrincipal() {
 					return new Principal() {
+						@Override
 						public String getName() {
 							return PRINCIPAL_NAME;
 						}
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java
index b62a0e3ded..b36043a7e4 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java
@@ -82,6 +82,7 @@ public class RequestBuilderTests {
 			return this;
 		}
 
+		@Override
 		public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
 			for (String headerName : this.headers.keySet()) {
 				request.addHeader(headerName, this.headers.get(headerName));
diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
index 9282d4885a..eaf01a5782 100644
--- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
+++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java
@@ -253,10 +253,12 @@ public class ConditionalDelegatingFilterProxyTests {
 		private FilterChain chain;
 		private boolean destroy;
 
+		@Override
 		public void init(FilterConfig filterConfig) throws ServletException {
 			this.filterConfig = filterConfig;
 		}
 
+		@Override
 		public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
 				ServletException {
 			this.request = request;
@@ -264,6 +266,7 @@ public class ConditionalDelegatingFilterProxyTests {
 			this.chain = chain;
 		}
 
+		@Override
 		public void destroy() {
 			this.destroy = true;
 		}
diff --git a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
index 0eb8df5c8a..e136978f9e 100644
--- a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-test/src/test/java/org/springframework/beans/TestBean.java b/spring-test/src/test/java/org/springframework/beans/TestBean.java
index d84f85d096..66e2624f05 100644
--- a/spring-test/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-test/src/test/java/org/springframework/beans/TestBean.java
@@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] { spouse };
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -369,12 +383,14 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
@@ -382,6 +398,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -419,6 +438,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java
index e627a333be..a254398c4e 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java
@@ -143,6 +143,7 @@ public class MockFilterChainTests {
 			this.servlet = servlet;
 		}
 
+		@Override
 		public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
 				throws IOException, ServletException {
 
@@ -156,9 +157,11 @@ public class MockFilterChainTests {
 			}
 		}
 
+		@Override
 		public void init(FilterConfig filterConfig) throws ServletException {
 		}
 
+		@Override
 		public void destroy() {
 		}
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
index eb8f362d56..f02ce34303 100644
--- a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
@@ -54,6 +54,7 @@ public abstract class AbstractSpr3350SingleSpringContextTests extends AbstractDe
 	 *
 	 * @see org.springframework.test.AbstractSingleSpringContextTests#getConfigPath()
 	 */
+	@Override
 	protected abstract String getConfigPath();
 
 	/**
diff --git a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java
index d0da3c8e5a..a8908bfd8f 100644
--- a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java
@@ -44,6 +44,7 @@ public class PropertiesBasedSpr3350SingleSpringContextTests extends AbstractSpr3
 	 *
 	 * @see org.springframework.test.AbstractSingleSpringContextTests#createBeanDefinitionReader(org.springframework.context.support.GenericApplicationContext)
 	 */
+	@Override
 	protected final BeanDefinitionReader createBeanDefinitionReader(GenericApplicationContext context) {
 		return new PropertiesBeanDefinitionReader(context);
 	}
@@ -52,6 +53,7 @@ public class PropertiesBasedSpr3350SingleSpringContextTests extends AbstractSpr3
 	 * Returns
 	 * &quot;PropertiesBasedSpr3350SingleSpringContextTests-context.properties&quot;.
 	 */
+	@Override
 	protected final String getConfigPath() {
 		return "PropertiesBasedSpr3350SingleSpringContextTests-context.properties";
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
index ab6e42dc68..1872385e61 100644
--- a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
@@ -57,6 +57,7 @@ public class Spr3264DependencyInjectionSpringContextTests extends AbstractDepend
 		// Assert changes to AbstractDependencyInjectionSpringContextTests:
 		new AssertThrows(IllegalStateException.class) {
 
+			@Override
 			public void test() throws Exception {
 				Spr3264DependencyInjectionSpringContextTests.super.injectDependencies();
 			}
diff --git a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java
index 8143c77511..9701ab3364 100644
--- a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java
@@ -38,6 +38,7 @@ public class XmlBasedSpr3350SingleSpringContextTests extends AbstractSpr3350Sing
 	/**
 	 * Returns &quot;XmlBasedSpr3350SingleSpringContextTests-context.xml&quot;.
 	 */
+	@Override
 	protected final String getConfigPath() {
 		return "XmlBasedSpr3350SingleSpringContextTests-context.xml";
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
index 580b873b10..1568b6fbac 100644
--- a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
+++ b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
@@ -138,6 +138,7 @@ public class ProfileValueAnnotationAwareTransactionalTests extends TestCase {
 
 	public static class HardCodedProfileValueSource implements ProfileValueSource {
 
+		@Override
 		public String get(String key) {
 			return (key.equals(NAME) ? VALUE : null);
 		}
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 aace2b29a4..fdfa4eb4ac 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
@@ -447,12 +447,14 @@ public class ContextLoaderUtilsTests {
 
 	private static class FooInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
 
+		@Override
 		public void initialize(GenericApplicationContext applicationContext) {
 		}
 	}
 
 	private static class BarInitializer implements ApplicationContextInitializer<GenericWebApplicationContext> {
 
+		@Override
 		public void initialize(GenericWebApplicationContext applicationContext) {
 		}
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java
index 9bd67303ba..35b64fa432 100644
--- a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java
@@ -369,12 +369,14 @@ public class MergedContextConfigurationTests {
 
 	private static class FooInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
 
+		@Override
 		public void initialize(GenericApplicationContext applicationContext) {
 		}
 	}
 
 	private static class BarInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
 
+		@Override
 		public void initialize(GenericApplicationContext applicationContext) {
 		}
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java b/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java
index 8ae941c107..d27e3ca50d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java
@@ -146,6 +146,7 @@ public class SpringRunnerContextCacheTests {
 
 			java.util.Collections.sort(testMethods, new Comparator<FrameworkMethod>() {
 
+				@Override
 				public int compare(FrameworkMethod method1, FrameworkMethod method2) {
 					return method1.getName().compareTo(method2.getName());
 				}
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
index b1a0a4e551..70778c7f1c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
@@ -109,10 +109,12 @@ public class ConcreteTransactionalJUnit38SpringContextTests extends AbstractTran
 		return simpleJdbcTemplate.update("DELETE FROM person WHERE name=?", name);
 	}
 
+	@Override
 	public final void afterPropertiesSet() throws Exception {
 		this.beanInitialized = true;
 	}
 
+	@Override
 	public final void setBeanName(final String beanName) {
 		this.beanName = beanName;
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
index 39cf8624ad..85a7c0a244 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
@@ -187,6 +187,7 @@ public class ProfileValueJUnit38SpringContextTests extends TestCase {
 
 	public static class HardCodedProfileValueSource implements ProfileValueSource {
 
+		@Override
 		public String get(final String key) {
 			return (key.equals(NAME) ? VALUE : null);
 		}
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java
index 1c18259f1f..a9ce65e0d3 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java
@@ -42,22 +42,27 @@ public class ClassLevelDisabledSpringRunnerTests {
 
 	public static class CustomTestExecutionListener implements TestExecutionListener {
 
+		@Override
 		public void beforeTestClass(TestContext testContext) throws Exception {
 			fail("A listener method for a disabled test should never be executed!");
 		}
 
+		@Override
 		public void prepareTestInstance(TestContext testContext) throws Exception {
 			fail("A listener method for a disabled test should never be executed!");
 		}
 
+		@Override
 		public void beforeTestMethod(TestContext testContext) throws Exception {
 			fail("A listener method for a disabled test should never be executed!");
 		}
 
+		@Override
 		public void afterTestMethod(TestContext testContext) throws Exception {
 			fail("A listener method for a disabled test should never be executed!");
 		}
 
+		@Override
 		public void afterTestClass(TestContext testContext) throws Exception {
 			fail("A listener method for a disabled test should never be executed!");
 		}
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 01ec43a2fd..59ad1be4f5 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
@@ -104,6 +104,7 @@ public class ConcreteTransactionalJUnit4SpringContextTests extends AbstractTrans
 		return simpleJdbcTemplate.update("DELETE FROM person WHERE name=?", name);
 	}
 
+	@Override
 	@Resource
 	public void setDataSource(DataSource dataSource) {
 		super.setDataSource(dataSource);
@@ -119,10 +120,12 @@ public class ConcreteTransactionalJUnit4SpringContextTests extends AbstractTrans
 		this.bar = bar;
 	}
 
+	@Override
 	public final void setBeanName(final String beanName) {
 		this.beanName = beanName;
 	}
 
+	@Override
 	public final void afterPropertiesSet() throws Exception {
 		this.beanInitialized = true;
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
index 8e422e1c0c..72a98004de 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
@@ -48,6 +48,7 @@ public class HardCodedProfileValueSourceSpringRunnerTests extends EnabledAndIgno
 
 	public static class HardCodedProfileValueSource implements ProfileValueSource {
 
+		@Override
 		public String get(final String key) {
 			return (key.equals(NAME) ? VALUE : null);
 		}
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java
index 22f0c6ebe8..c41eb33238 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java
@@ -53,6 +53,7 @@ public class RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests e
 			countRowsInPersonTable(simpleJdbcTemplate));
 	}
 
+	@Override
 	@Before
 	public void verifyInitialTestData() {
 		clearPersonTable(simpleJdbcTemplate);
@@ -61,6 +62,7 @@ public class RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests e
 			countRowsInPersonTable(simpleJdbcTemplate));
 	}
 
+	@Override
 	@Test
 	@Transactional
 	@Rollback(false)
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
index 85af698bd3..c65ab7c939 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
@@ -136,14 +136,17 @@ public class SpringJUnit4ClassRunnerAppCtxTests implements ApplicationContextAwa
 
 	// ------------------------------------------------------------------------|
 
+	@Override
 	public final void afterPropertiesSet() throws Exception {
 		this.beanInitialized = true;
 	}
 
+	@Override
 	public final void setApplicationContext(final ApplicationContext applicationContext) throws BeansException {
 		this.applicationContext = applicationContext;
 	}
 
+	@Override
 	public final void setBeanName(final String beanName) {
 		this.beanName = beanName;
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java
index 64d8cf2e48..f5424607d5 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java
@@ -25,6 +25,7 @@ import org.springframework.context.support.GenericApplicationContext;
  */
 public class DevProfileInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
 
+	@Override
 	public void initialize(GenericApplicationContext applicationContext) {
 		applicationContext.getEnvironment().setActiveProfiles("dev");
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java
index 0f0858c4ba..1259b82d83 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java
@@ -25,6 +25,7 @@ import org.springframework.context.support.GenericApplicationContext;
  */
 public class FooBarAliasInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
 
+	@Override
 	public void initialize(GenericApplicationContext applicationContext) {
 		applicationContext.registerAlias("foo", "bar");
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTest.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTest.java
index 3c0b074a81..5d1459c4ce 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTest.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTest.java
@@ -53,6 +53,7 @@ public class InitializerWithoutConfigFilesOrClassesTest {
 
 	static class EntireAppInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
 
+		@Override
 		public void initialize(GenericApplicationContext applicationContext) {
 			new AnnotatedBeanDefinitionReader(applicationContext).register(GlobalConfig.class);
 		}
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/MergedInitializersAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/MergedInitializersAnnotationConfigTests.java
index 30fe35276f..0bc08e1c45 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/MergedInitializersAnnotationConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/MergedInitializersAnnotationConfigTests.java
@@ -34,6 +34,7 @@ import org.springframework.test.context.junit4.aci.DevProfileInitializer;
 @ContextConfiguration(initializers = DevProfileInitializer.class)
 public class MergedInitializersAnnotationConfigTests extends SingleInitializerAnnotationConfigTests {
 
+	@Override
 	@Test
 	public void activeBeans() {
 		assertEquals("foo", foo);
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/OrderedInitializersAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/OrderedInitializersAnnotationConfigTests.java
index d3fcf1dd82..2eac43320f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/OrderedInitializersAnnotationConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/OrderedInitializersAnnotationConfigTests.java
@@ -125,10 +125,12 @@ public class OrderedInitializersAnnotationConfigTests {
 
 	static class OrderedOneInitializer implements ApplicationContextInitializer<GenericApplicationContext>, Ordered {
 
+		@Override
 		public void initialize(GenericApplicationContext applicationContext) {
 			applicationContext.getEnvironment().setActiveProfiles(PROFILE_ONE);
 		}
 
+		@Override
 		public int getOrder() {
 			return 1;
 		}
@@ -137,6 +139,7 @@ public class OrderedInitializersAnnotationConfigTests {
 	@Order(2)
 	static class OrderedTwoInitializer implements ApplicationContextInitializer<GenericApplicationContext> {
 
+		@Override
 		public void initialize(GenericApplicationContext applicationContext) {
 			applicationContext.getEnvironment().setActiveProfiles(PROFILE_TWO);
 		}
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
index 994b886b30..bb90b212fd 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
@@ -39,11 +39,13 @@ public class HibernatePersonRepository implements PersonRepository {
 		this.sessionFactory = sessionFactory;
 	}
 
+	@Override
 	public Person save(Person person) {
 		this.sessionFactory.getCurrentSession().save(person);
 		return person;
 	}
 
+	@Override
 	public Person findByName(String name) {
 		return (Person) this.sessionFactory.getCurrentSession().createQuery(
 			"from Person person where person.name = :name").setString("name", name).uniqueResult();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java
index 039faa6894..b6247e4a7e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java
@@ -41,10 +41,12 @@ public class StandardPersonService implements PersonService {
 		this.personRepository = personRepository;
 	}
 
+	@Override
 	public Person findByName(String name) {
 		return this.personRepository.findByName(name);
 	}
 
+	@Override
 	@Transactional(readOnly = false)
 	public Person save(Person person) {
 		return this.personRepository.save(person);
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java
index de9e21b2e3..cd20e40f3f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java
@@ -50,6 +50,7 @@ public class LookUpTxMgrViaTransactionManagementConfigurerTests {
 	@Configuration
 	static class Config implements TransactionManagementConfigurer {
 
+		@Override
 		public PlatformTransactionManager annotationDrivenTransactionManager() {
 			return txManager1();
 		}
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
index 27a08c054c..f395a90a66 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
@@ -90,10 +90,12 @@ public class ConcreteTransactionalTestNGSpringContextTests extends AbstractTrans
 		return simpleJdbcTemplate.update("DELETE FROM person WHERE name=?", name);
 	}
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		this.beanInitialized = true;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
index 66318987d0..09d76fb883 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
@@ -123,27 +123,34 @@ public class FailingBeforeAndAfterMethodsTests {
 		int failedConfigurationsCount = 0;
 
 
+		@Override
 		public void onFinish(ITestContext testContext) {
 			this.failedConfigurationsCount += testContext.getFailedConfigurations().size();
 		}
 
+		@Override
 		public void onStart(ITestContext testContext) {
 		}
 
+		@Override
 		public void onTestFailedButWithinSuccessPercentage(ITestResult testResult) {
 		}
 
+		@Override
 		public void onTestFailure(ITestResult testResult) {
 			this.testFailureCount++;
 		}
 
+		@Override
 		public void onTestSkipped(ITestResult testResult) {
 		}
 
+		@Override
 		public void onTestStart(ITestResult testResult) {
 			this.testStartCount++;
 		}
 
+		@Override
 		public void onTestSuccess(ITestResult testResult) {
 			this.testSuccessCount++;
 		}
diff --git a/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java b/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java
index 5a1a8421dd..334983d807 100644
--- a/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java
@@ -66,6 +66,7 @@ public abstract class AbstractBasicWacTests implements ServletContextAware {
 	protected String foo;
 
 
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java b/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java
index 8713dbe5ee..13f3b5d360 100644
--- a/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java
+++ b/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java
@@ -34,21 +34,25 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM
 	public int inflight;
 
 
+	@Override
 	protected Object doGetTransaction() {
 		return new Object();
 	}
 
+	@Override
 	protected void doBegin(Object transaction, TransactionDefinition definition) {
 		this.lastDefinition = definition;
 		++begun;
 		++inflight;
 	}
 
+	@Override
 	protected void doCommit(DefaultTransactionStatus status) {
 		++commits;
 		--inflight;
 	}
 
+	@Override
 	protected void doRollback(DefaultTransactionStatus status) {
 		++rollbacks;
 		--inflight;
diff --git a/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java b/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
index 5b64657360..7e10a05453 100644
--- a/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
@@ -86,6 +86,7 @@ public class ReflectionTestUtilsTests {
 		new AssertThrows(IllegalArgumentException.class,
 			"Calling setField() with NULL for a primitive type should throw an IllegalArgumentException.") {
 
+			@Override
 			public void test() throws Exception {
 				setField(person, "id", null, long.class);
 			}
@@ -94,6 +95,7 @@ public class ReflectionTestUtilsTests {
 		new AssertThrows(IllegalArgumentException.class,
 			"Calling setField() with NULL for a primitive type should throw an IllegalArgumentException.") {
 
+			@Override
 			public void test() throws Exception {
 				setField(person, "age", null, int.class);
 			}
@@ -102,6 +104,7 @@ public class ReflectionTestUtilsTests {
 		new AssertThrows(IllegalArgumentException.class,
 			"Calling setField() with NULL for a primitive type should throw an IllegalArgumentException.") {
 
+			@Override
 			public void test() throws Exception {
 				setField(person, "likesPets", null, boolean.class);
 			}
@@ -187,6 +190,7 @@ public class ReflectionTestUtilsTests {
 		new AssertThrows(IllegalArgumentException.class,
 			"Calling invokeSetterMethod() with NULL for a primitive type should throw an IllegalArgumentException.") {
 
+			@Override
 			public void test() throws Exception {
 				invokeSetterMethod(person, "id", null, long.class);
 			}
@@ -195,6 +199,7 @@ public class ReflectionTestUtilsTests {
 		new AssertThrows(IllegalArgumentException.class,
 			"Calling invokeSetterMethod() with NULL for a primitive type should throw an IllegalArgumentException.") {
 
+			@Override
 			public void test() throws Exception {
 				invokeSetterMethod(person, "age", null, int.class);
 			}
@@ -203,6 +208,7 @@ public class ReflectionTestUtilsTests {
 		new AssertThrows(IllegalArgumentException.class,
 			"Calling invokeSetterMethod() with NULL for a primitive type should throw an IllegalArgumentException.") {
 
+			@Override
 			public void test() throws Exception {
 				invokeSetterMethod(person, "likesPets", null, boolean.class);
 			}
diff --git a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
index 0940539f54..8ada7848fa 100644
--- a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		if (this.beanName == null || beanName == null) {
 			this.beanName = beanName;
 		}
 	}
 
+	@Override
 	public String getBeanName() {
 		return beanName;
 	}
@@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void destroy() {
 		this.destroyed = true;
 	}
 
+	@Override
 	public boolean wasDestroyed() {
 		return destroyed;
 	}
diff --git a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
index 0eb8df5c8a..e136978f9e 100644
--- a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-tx/src/test/java/org/springframework/beans/TestBean.java b/spring-tx/src/test/java/org/springframework/beans/TestBean.java
index 7842bbfeac..7a27cf0894 100644
--- a/spring-tx/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-tx/src/test/java/org/springframework/beans/TestBean.java
@@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 	/**
 	 * @see org.springframework.beans.ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
index e2bfda3f1d..c1be3a5745 100644
--- a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
+++ b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
@@ -40,6 +40,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 	private final List imports = new LinkedList();
 
 
+	@Override
 	public void defaultsRegistered(DefaultsDefinition defaultsDefinition) {
 		this.defaults.add(defaultsDefinition);
 	}
@@ -48,6 +49,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return Collections.unmodifiableList(this.defaults);
 	}
 
+	@Override
 	public void componentRegistered(ComponentDefinition componentDefinition) {
 		this.componentDefinitions.put(componentDefinition.getName(), componentDefinition);
 	}
@@ -61,6 +63,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return (ComponentDefinition[]) collection.toArray(new ComponentDefinition[collection.size()]);
 	}
 
+	@Override
 	public void aliasRegistered(AliasDefinition aliasDefinition) {
 		List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName());
 		if(aliases == null) {
@@ -75,6 +78,7 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return aliases == null ? null : Collections.unmodifiableList(aliases);
 	}
 
+	@Override
 	public void importProcessed(ImportDefinition importDefinition) {
 		this.imports.add(importDefinition);
 	}
diff --git a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java
index 8099156006..9142a73b5b 100644
--- a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java
+++ b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java
@@ -167,12 +167,14 @@ public class PersistenceExceptionTranslationAdvisorTests extends TestCase {
 			this.runtimeException = rex;
 		}
 
+		@Override
 		public void noThrowsClause() {
 			if (runtimeException != null) {
 				throw runtimeException;
 			}
 		}
 
+		@Override
 		public void throwsPersistenceException() throws PersistenceException {
 			if (runtimeException != null) {
 				throw runtimeException;
diff --git a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java
index 3b759466a5..2bd949d3ad 100644
--- a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java
+++ b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java
@@ -114,6 +114,7 @@ public class PersistenceExceptionTranslationPostProcessorTests extends TestCase
 	public static class RepositoryWithoutInterfaceAndOtherwiseAdvised extends StereotypedRepositoryInterfaceImpl
 			implements Additional {
 
+		@Override
 		public void additionalMethod() {
 		}
 	}
diff --git a/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java b/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java
index e0a4523bfb..bdab740fba 100644
--- a/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java
+++ b/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java
@@ -270,6 +270,7 @@ public class DataAccessUtilsTests extends TestCase {
 			this.translations.put(in, out);
 		}
 
+		@Override
 		public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 			return (DataAccessException) translations.get(ex);
 		}
diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
index 16f1012a75..ce88bbf03d 100644
--- a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
+++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
@@ -81,6 +81,7 @@ public class CciLocalTransactionTests {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(connectionFactory));
 				CciTemplate ct = new CciTemplate(connectionFactory);
@@ -131,6 +132,7 @@ public class CciLocalTransactionTests {
 
 		try {
 			tt.execute(new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(connectionFactory));
 					CciTemplate ct = new CciTemplate(connectionFactory);
diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
index 50bdd4c2de..f8a7250621 100644
--- a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
+++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
@@ -153,6 +153,7 @@ public class CciTemplateTests {
 
 		CciTemplate ct = new CciTemplate(connectionFactory);
 		ct.setOutputRecordCreator(new RecordCreator() {
+			@Override
 			public Record createRecord(RecordFactory recordFactory) {
 				assertTrue(recordFactory instanceof NotSupportedRecordFactory);
 				return outputRecord;
diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
index bd8f7fb5d0..a7e40c6bf4 100644
--- a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
+++ b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
@@ -233,10 +233,12 @@ public class EisOperationTests {
 			this.callDetector = callDetector;
 		}
 
+		@Override
 		protected Record createInputRecord(RecordFactory recordFactory, Object inputObject) {
 			return this.callDetector.callCreateInputRecord(recordFactory, inputObject);
 		}
 
+		@Override
 		protected Object extractOutputData(Record outputRecord) throws ResourceException {
 			return this.callDetector.callExtractOutputData(outputRecord);
 		}
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index 10ae6d4283..9b3d10470d 100644
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -70,6 +70,7 @@ public class ExpectedLookupTemplate extends JndiTemplate {
 	 * return the object provided in the constructor. If the name is
 	 * unexpected, a respective NamingException gets thrown.
 	 */
+	@Override
 	public Object lookup(String name) throws NamingException {
 		Object object = this.jndiObjects.get(name);
 		if (object == null) {
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
index c71d6e8681..5ab0d31377 100644
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
@@ -91,6 +91,7 @@ public class SimpleNamingContext implements Context {
 
 	// Actual implementations of Context methods follow
 
+	@Override
 	public NamingEnumeration<NameClassPair> list(String root) throws NamingException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Listing name/class pairs under [" + root + "]");
@@ -98,6 +99,7 @@ public class SimpleNamingContext implements Context {
 		return new NameClassPairEnumeration(this, root);
 	}
 
+	@Override
 	public NamingEnumeration<Binding> listBindings(String root) throws NamingException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Listing bindings under [" + root + "]");
@@ -111,6 +113,7 @@ public class SimpleNamingContext implements Context {
 	 * Will be used by any standard InitialContext JNDI lookups.
 	 * @throws javax.naming.NameNotFoundException if the object could not be found
 	 */
+	@Override
 	public Object lookup(String lookupName) throws NameNotFoundException {
 		String name = this.root + lookupName;
 		if (logger.isDebugEnabled()) {
@@ -136,6 +139,7 @@ public class SimpleNamingContext implements Context {
 		return found;
 	}
 
+	@Override
 	public Object lookupLink(String name) throws NameNotFoundException {
 		return lookup(name);
 	}
@@ -147,6 +151,7 @@ public class SimpleNamingContext implements Context {
 	 * Use SimpleNamingContextBuilder to set up JNDI bindings then.
 	 * @see org.springframework.mock.jndi.SimpleNamingContextBuilder#bind
 	 */
+	@Override
 	public void bind(String name, Object obj) {
 		if (logger.isInfoEnabled()) {
 			logger.info("Static JNDI binding: [" + this.root + name + "] = [" + obj + "]");
@@ -154,6 +159,7 @@ public class SimpleNamingContext implements Context {
 		this.boundObjects.put(this.root + name, obj);
 	}
 
+	@Override
 	public void unbind(String name) {
 		if (logger.isInfoEnabled()) {
 			logger.info("Static JNDI remove: [" + this.root + name + "]");
@@ -161,16 +167,19 @@ public class SimpleNamingContext implements Context {
 		this.boundObjects.remove(this.root + name);
 	}
 
+	@Override
 	public void rebind(String name, Object obj) {
 		bind(name, obj);
 	}
 
+	@Override
 	public void rename(String oldName, String newName) throws NameNotFoundException {
 		Object obj = lookup(oldName);
 		unbind(oldName);
 		bind(newName, obj);
 	}
 
+	@Override
 	public Context createSubcontext(String name) {
 		String subcontextName = this.root + name;
 		if (!subcontextName.endsWith("/")) {
@@ -181,84 +190,104 @@ public class SimpleNamingContext implements Context {
 		return subcontext;
 	}
 
+	@Override
 	public void destroySubcontext(String name) {
 		unbind(name);
 	}
 
+	@Override
 	public String composeName(String name, String prefix) {
 		return prefix + name;
 	}
 
+	@Override
 	public Hashtable<String, Object> getEnvironment() {
 		return this.environment;
 	}
 
+	@Override
 	public Object addToEnvironment(String propName, Object propVal) {
 		return this.environment.put(propName, propVal);
 	}
 
+	@Override
 	public Object removeFromEnvironment(String propName) {
 		return this.environment.remove(propName);
 	}
 
+	@Override
 	public void close() {
 	}
 
 
 	// Unsupported methods follow: no support for javax.naming.Name
 
+	@Override
 	public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Object lookup(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Object lookupLink(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void bind(Name name, Object obj) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void unbind(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void rebind(Name name, Object obj) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void rename(Name oldName, Name newName) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Context createSubcontext(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void destroySubcontext(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public String getNameInNamespace() throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public NameParser getNameParser(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public NameParser getNameParser(String name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Name composeName(Name name, Name prefix) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
@@ -298,22 +327,27 @@ public class SimpleNamingContext implements Context {
 
 		protected abstract T createObject(String strippedName, Object obj);
 
+		@Override
 		public boolean hasMore() {
 			return this.iterator.hasNext();
 		}
 
+		@Override
 		public T next() {
 			return this.iterator.next();
 		}
 
+		@Override
 		public boolean hasMoreElements() {
 			return this.iterator.hasNext();
 		}
 
+		@Override
 		public T nextElement() {
 			return this.iterator.next();
 		}
 
+		@Override
 		public void close() {
 		}
 	}
@@ -325,6 +359,7 @@ public class SimpleNamingContext implements Context {
 			super(context, root);
 		}
 
+		@Override
 		protected NameClassPair createObject(String strippedName, Object obj) {
 			return new NameClassPair(strippedName, obj.getClass().getName());
 		}
@@ -337,6 +372,7 @@ public class SimpleNamingContext implements Context {
 			super(context, root);
 		}
 
+		@Override
 		protected Binding createObject(String strippedName, Object obj) {
 			return new Binding(strippedName, obj);
 		}
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index f21936897b..32908a306a 100644
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -192,6 +192,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 	 * creating a new SimpleNamingContext instance.
 	 * @see SimpleNamingContext
 	 */
+	@Override
 	public InitialContextFactory createInitialContextFactory(Hashtable<?,?> environment) {
 		if (activated == null && environment != null) {
 			Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY);
@@ -225,6 +226,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 
 		// Default case...
 		return new InitialContextFactory() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public Context getInitialContext(Hashtable<?,?> environment) {
 				return new SimpleNamingContext("", boundObjects, (Hashtable<String, Object>) environment);
diff --git a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index 0c0b3cb81c..02996e490f 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -32,21 +32,25 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM
 	public int rollbacks;
 	public int inflight;
 
+	@Override
 	protected Object doGetTransaction() {
 		return new Object();
 	}
 
+	@Override
 	protected void doBegin(Object transaction, TransactionDefinition definition) {
 		this.lastDefinition = definition;
 		++begun;
 		++inflight;
 	}
 
+	@Override
 	protected void doCommit(DefaultTransactionStatus status) {
 		++commits;
 		--inflight;
 	}
 
+	@Override
 	protected void doRollback(DefaultTransactionStatus status) {
 		++rollbacks;
 		--inflight;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
index c78fdcf43c..ecacf398aa 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
@@ -112,6 +112,7 @@ public class JndiJtaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				// something transactional
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
@@ -157,6 +158,7 @@ public class JndiJtaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				// something transactional
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
@@ -206,6 +208,7 @@ public class JndiJtaTransactionManagerTests extends TestCase {
 		assertTrue(!TransactionSynchronizationManager.isSynchronizationActive());
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				// something transactional
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
@@ -215,6 +218,7 @@ public class JndiJtaTransactionManagerTests extends TestCase {
 
 		ptm.setJndiTemplate(new ExpectedLookupTemplate("java:comp/UserTransaction", ut2));
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				// something transactional
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
@@ -232,6 +236,7 @@ public class JndiJtaTransactionManagerTests extends TestCase {
 	 * Prevent any side-effects due to this test modifying ThreadLocals that might
 	 * affect subsequent tests when all tests are run in the same JVM, as with Eclipse.
 	 */
+	@Override
 	protected void tearDown() {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
diff --git a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
index 480b869d3a..b2522b08a8 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
@@ -78,6 +78,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		assertNull(TransactionSynchronizationManager.getCurrentTransactionName());
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				// something transactional
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
@@ -124,6 +125,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		ptm.setTransactionSynchronization(JtaTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION);
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				// something transactional
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
@@ -156,6 +158,7 @@ public class JtaTransactionManagerTests extends TestCase {
 
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 			}
@@ -197,6 +200,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		assertNull(TransactionSynchronizationManager.getCurrentTransactionName());
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				TransactionSynchronizationManager.registerSynchronization(synch);
@@ -242,6 +246,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		tt.setTimeout(10);
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				TransactionSynchronizationManager.registerSynchronization(synch);
@@ -277,6 +282,7 @@ public class JtaTransactionManagerTests extends TestCase {
 
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 				status.setRollbackOnly();
@@ -308,6 +314,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(ptm);
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				TransactionSynchronizationManager.registerSynchronization(synch);
@@ -342,6 +349,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 					TransactionSynchronizationManager.registerSynchronization(synch);
@@ -383,6 +391,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 					TransactionSynchronizationManager.registerSynchronization(synch);
@@ -421,6 +430,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(ptm);
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				TransactionSynchronizationManager.registerSynchronization(synch);
@@ -454,6 +464,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 					TransactionSynchronizationManager.registerSynchronization(synch);
@@ -500,6 +511,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(ptm);
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				TransactionSynchronizationManager.registerSynchronization(synch);
@@ -538,6 +550,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		ptm.setTransactionSynchronization(JtaTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION);
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				TransactionSynchronizationManager.registerSynchronization(synch);
@@ -566,6 +579,7 @@ public class JtaTransactionManagerTests extends TestCase {
 
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 				status.setRollbackOnly();
@@ -598,6 +612,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				TransactionSynchronizationManager.registerSynchronization(synch);
@@ -630,6 +645,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				TransactionSynchronizationManager.registerSynchronization(synch);
@@ -657,6 +673,7 @@ public class JtaTransactionManagerTests extends TestCase {
 
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 				status.setRollbackOnly();
@@ -682,6 +699,7 @@ public class JtaTransactionManagerTests extends TestCase {
 
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 				status.setRollbackOnly();
@@ -713,6 +731,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED);
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				status.setRollbackOnly();
@@ -757,6 +776,7 @@ public class JtaTransactionManagerTests extends TestCase {
 
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertEquals("txName", TransactionSynchronizationManager.getCurrentTransactionName());
@@ -767,6 +787,7 @@ public class JtaTransactionManagerTests extends TestCase {
 				tt2.setReadOnly(true);
 				tt2.setName("txName2");
 				tt2.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) {
 						assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 						assertEquals("txName2", TransactionSynchronizationManager.getCurrentTransactionName());
@@ -804,6 +825,7 @@ public class JtaTransactionManagerTests extends TestCase {
 
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -812,6 +834,7 @@ public class JtaTransactionManagerTests extends TestCase {
 				TransactionTemplate tt2 = new TransactionTemplate(ptm);
 				tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 				tt2.execute(new TransactionCallbackWithoutResult() {
+					@Override
 					protected void doInTransactionWithoutResult(TransactionStatus status) {
 						assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 						assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -854,6 +877,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 			}
@@ -882,6 +906,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				}
@@ -921,6 +946,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				}
@@ -958,6 +984,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 			}
@@ -980,6 +1007,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 				}
 			});
@@ -1005,6 +1033,7 @@ public class JtaTransactionManagerTests extends TestCase {
 			TransactionTemplate tt = new TransactionTemplate(ptm);
 			tt.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 				}
@@ -1029,6 +1058,7 @@ public class JtaTransactionManagerTests extends TestCase {
 			JtaTransactionManager ptm = newJtaTransactionManager(ut);
 			TransactionTemplate tt = new TransactionTemplate(ptm);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 				}
@@ -1057,6 +1087,7 @@ public class JtaTransactionManagerTests extends TestCase {
 		TransactionTemplate tt = new TransactionTemplate(ptm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED);
 		tt.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 				// something transactional
 			}
@@ -1079,6 +1110,7 @@ public class JtaTransactionManagerTests extends TestCase {
 			TransactionTemplate tt = new TransactionTemplate(ptm);
 			tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 				}
@@ -1106,6 +1138,7 @@ public class JtaTransactionManagerTests extends TestCase {
 			TransactionTemplate tt = new TransactionTemplate(ptm);
 			tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 				}
@@ -1132,6 +1165,7 @@ public class JtaTransactionManagerTests extends TestCase {
 			JtaTransactionManager ptm = newJtaTransactionManager(ut);
 			TransactionTemplate tt = new TransactionTemplate(ptm);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 				}
@@ -1162,9 +1196,11 @@ public class JtaTransactionManagerTests extends TestCase {
 			JtaTransactionManager ptm = newJtaTransactionManager(ut);
 			TransactionTemplate tt = new TransactionTemplate(ptm);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 					TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
+						@Override
 						public void afterCompletion(int status) {
 							assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_ROLLED_BACK);
 						}
@@ -1218,9 +1254,11 @@ public class JtaTransactionManagerTests extends TestCase {
 
 			TransactionTemplate tt = new TransactionTemplate(tm);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 					TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
+						@Override
 						public void afterCompletion(int status) {
 							assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_ROLLED_BACK);
 						}
@@ -1266,9 +1304,11 @@ public class JtaTransactionManagerTests extends TestCase {
 			JtaTransactionManager ptm = newJtaTransactionManager(ut);
 			TransactionTemplate tt = new TransactionTemplate(ptm);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 					TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
+						@Override
 						public void afterCompletion(int status) {
 							assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN);
 						}
@@ -1302,9 +1342,11 @@ public class JtaTransactionManagerTests extends TestCase {
 			JtaTransactionManager ptm = newJtaTransactionManager(ut);
 			TransactionTemplate tt = new TransactionTemplate(ptm);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 					TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
+						@Override
 						public void afterCompletion(int status) {
 							assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN);
 						}
@@ -1338,9 +1380,11 @@ public class JtaTransactionManagerTests extends TestCase {
 			JtaTransactionManager ptm = newJtaTransactionManager(ut);
 			TransactionTemplate tt = new TransactionTemplate(ptm);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					// something transactional
 					TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
+						@Override
 						public void afterCompletion(int status) {
 							assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN);
 						}
@@ -1373,8 +1417,10 @@ public class JtaTransactionManagerTests extends TestCase {
 			JtaTransactionManager ptm = newJtaTransactionManager(ut);
 			TransactionTemplate tt = new TransactionTemplate(ptm);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
+						@Override
 						public void afterCompletion(int status) {
 							assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN);
 						}
@@ -1404,6 +1450,7 @@ public class JtaTransactionManagerTests extends TestCase {
 			JtaTransactionManager ptm = newJtaTransactionManager(ut);
 			TransactionTemplate tt = new TransactionTemplate(ptm);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					status.setRollbackOnly();
 				}
@@ -1430,9 +1477,11 @@ public class JtaTransactionManagerTests extends TestCase {
 			JtaTransactionManager ptm = newJtaTransactionManager(ut);
 			TransactionTemplate tt = new TransactionTemplate(ptm);
 			tt.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					status.setRollbackOnly();
 					TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
+						@Override
 						public void afterCompletion(int status) {
 							assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN);
 						}
@@ -1562,6 +1611,7 @@ public class JtaTransactionManagerTests extends TestCase {
 	 * Prevent any side-effects due to this test modifying ThreadLocals that might
 	 * affect subsequent tests when all tests are run in the same JVM, as with Eclipse.
 	 */
+	@Override
 	protected void tearDown() {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
diff --git a/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java
index f810e715b9..7c25061054 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java
@@ -30,6 +30,7 @@ public class MockCallbackPreferringTransactionManager implements CallbackPreferr
 	private TransactionStatus status;
 
 
+	@Override
 	public Object execute(TransactionDefinition definition, TransactionCallback callback) throws TransactionException {
 		this.definition = definition;
 		this.status = new SimpleTransactionStatus();
@@ -45,14 +46,17 @@ public class MockCallbackPreferringTransactionManager implements CallbackPreferr
 	}
 
 
+	@Override
 	public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void commit(TransactionStatus status) throws TransactionException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void rollback(TransactionStatus status) throws TransactionException {
 		throw new UnsupportedOperationException();
 	}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java
index c9c8709c48..de79edcd74 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java
@@ -28,10 +28,12 @@ public class MockJtaTransaction implements javax.transaction.Transaction {
 
 	private Synchronization synchronization;
 
+	@Override
 	public int getStatus() {
 		return Status.STATUS_ACTIVE;
 	}
 
+	@Override
 	public void registerSynchronization(Synchronization synchronization) {
 		this.synchronization = synchronization;
 	}
@@ -40,20 +42,25 @@ public class MockJtaTransaction implements javax.transaction.Transaction {
 		return synchronization;
 	}
 
+	@Override
 	public boolean enlistResource(XAResource xaResource) {
 		return false;
 	}
 
+	@Override
 	public boolean delistResource(XAResource xaResource, int i) {
 		return false;
 	}
 
+	@Override
 	public void commit() {
 	}
 
+	@Override
 	public void rollback() {
 	}
 
+	@Override
 	public void setRollbackOnly() {
 	}
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
index 1fdd0659eb..579e1a815f 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
@@ -46,14 +46,17 @@ class TestTransactionManager extends AbstractPlatformTransactionManager {
 		setTransactionSynchronization(SYNCHRONIZATION_NEVER);
 	}
 
+	@Override
 	protected Object doGetTransaction() {
 		return TRANSACTION;
 	}
 
+	@Override
 	protected boolean isExistingTransaction(Object transaction) {
 		return existingTransaction;
 	}
 
+	@Override
 	protected void doBegin(Object transaction, TransactionDefinition definition) {
 		if (!TRANSACTION.equals(transaction)) {
 			throw new IllegalArgumentException("Not the same transaction object");
@@ -64,6 +67,7 @@ class TestTransactionManager extends AbstractPlatformTransactionManager {
 		this.begin = true;
 	}
 
+	@Override
 	protected void doCommit(DefaultTransactionStatus status) {
 		if (!TRANSACTION.equals(status.getTransaction())) {
 			throw new IllegalArgumentException("Not the same transaction object");
@@ -71,6 +75,7 @@ class TestTransactionManager extends AbstractPlatformTransactionManager {
 		this.commit = true;
 	}
 
+	@Override
 	protected void doRollback(DefaultTransactionStatus status) {
 		if (!TRANSACTION.equals(status.getTransaction())) {
 			throw new IllegalArgumentException("Not the same transaction object");
@@ -78,6 +83,7 @@ class TestTransactionManager extends AbstractPlatformTransactionManager {
 		this.rollback = true;
 	}
 
+	@Override
 	protected void doSetRollbackOnly(DefaultTransactionStatus status) {
 		if (!TRANSACTION.equals(status.getTransaction())) {
 			throw new IllegalArgumentException("Not the same transaction object");
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
index 1364632258..e29ecca39f 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
@@ -139,6 +139,7 @@ public class TransactionSupportTests extends TestCase {
 		TestTransactionManager tm = new TestTransactionManager(false, true);
 		TransactionTemplate template = new TransactionTemplate(tm);
 		template.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 			}
 		});
@@ -152,6 +153,7 @@ public class TransactionSupportTests extends TestCase {
 		MockCallbackPreferringTransactionManager ptm = new MockCallbackPreferringTransactionManager();
 		TransactionTemplate template = new TransactionTemplate(ptm);
 		template.execute(new TransactionCallbackWithoutResult() {
+			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) {
 			}
 		});
@@ -165,6 +167,7 @@ public class TransactionSupportTests extends TestCase {
 		final RuntimeException ex = new RuntimeException("Some application exception");
 		try {
 			template.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					throw ex;
 				}
@@ -185,6 +188,7 @@ public class TransactionSupportTests extends TestCase {
 	public void testTransactionTemplateWithRollbackException() {
 		final TransactionSystemException tex = new TransactionSystemException("system exception");
 		TestTransactionManager tm = new TestTransactionManager(false, true) {
+			@Override
 			protected void doRollback(DefaultTransactionStatus status) {
 				super.doRollback(status);
 				throw tex;
@@ -194,6 +198,7 @@ public class TransactionSupportTests extends TestCase {
 		final RuntimeException ex = new RuntimeException("Some application exception");
 		try {
 			template.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					throw ex;
 				}
@@ -215,6 +220,7 @@ public class TransactionSupportTests extends TestCase {
 		TransactionTemplate template = new TransactionTemplate(tm);
 		try {
 			template.execute(new TransactionCallbackWithoutResult() {
+				@Override
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					throw new Error("Some application error");
 				}
@@ -277,6 +283,7 @@ public class TransactionSupportTests extends TestCase {
 		assertTrue("Correct isolation level set", template.getIsolationLevel() == TransactionDefinition.ISOLATION_REPEATABLE_READ);
 	}
 
+	@Override
 	protected void tearDown() {
 		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java
index e2a96b972a..e76730f727 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java
@@ -36,6 +36,7 @@ public class TxNamespaceHandlerEventTests extends TestCase {
 	private CollectingReaderEventListener eventListener = new CollectingReaderEventListener();
 
 
+	@Override
 	public void setUp() throws Exception {
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory);
 		reader.setEventListener(this.eventListener);
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
index cfae77ca56..72f1bdac10 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
@@ -40,6 +40,7 @@ public class TxNamespaceHandlerTests extends TestCase {
 
 	private Method setAgeMethod;
 
+	@Override
 	public void setUp() throws Exception {
 		this.context = new ClassPathXmlApplicationContext("txNamespaceHandlerTests.xml", getClass());
 		this.getAgeMethod = ITestBean.class.getMethod("getAge", new Class[0]);
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
index 1dfd6a1bb1..16f29f90f6 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
@@ -311,18 +311,22 @@ public class AnnotationTransactionAttributeSourceTests {
 			this.age = age;
 		}
 
+		@Override
 		public String getName() {
 			return name;
 		}
 
+		@Override
 		public void setName(String name) {
 			this.name = name;
 		}
 
+		@Override
 		public int getAge() {
 			return age;
 		}
 
+		@Override
 		public void setAge(int age) {
 			this.age = age;
 		}
@@ -344,19 +348,23 @@ public class AnnotationTransactionAttributeSourceTests {
 			this.age = age;
 		}
 
+		@Override
 		public String getName() {
 			return name;
 		}
 
+		@Override
 		public void setName(String name) {
 			this.name = name;
 		}
 
+		@Override
 		@Transactional(rollbackFor=Exception.class)
 		public int getAge() {
 			return age;
 		}
 
+		@Override
 		public void setAge(int age) {
 			this.age = age;
 		}
@@ -377,18 +385,22 @@ public class AnnotationTransactionAttributeSourceTests {
 			this.age = age;
 		}
 
+		@Override
 		public String getName() {
 			return name;
 		}
 
+		@Override
 		public void setName(String name) {
 			this.name = name;
 		}
 
+		@Override
 		public int getAge() {
 			return age;
 		}
 
+		@Override
 		public void setAge(int age) {
 			this.age = age;
 		}
@@ -409,20 +421,24 @@ public class AnnotationTransactionAttributeSourceTests {
 			this.age = age;
 		}
 
+		@Override
 		public String getName() {
 			return name;
 		}
 
+		@Override
 		public void setName(String name) {
 			this.name = name;
 		}
 
+		@Override
 		@Transactional(propagation=Propagation.REQUIRES_NEW, isolation=Isolation.REPEATABLE_READ, timeout=5,
 				readOnly=true, rollbackFor=Exception.class, noRollbackFor={IOException.class})
 		public int getAge() {
 			return age;
 		}
 
+		@Override
 		public void setAge(int age) {
 			this.age = age;
 		}
@@ -444,18 +460,22 @@ public class AnnotationTransactionAttributeSourceTests {
 			this.age = age;
 		}
 
+		@Override
 		public String getName() {
 			return name;
 		}
 
+		@Override
 		public void setName(String name) {
 			this.name = name;
 		}
 
+		@Override
 		public int getAge() {
 			return age;
 		}
 
+		@Override
 		public void setAge(int age) {
 			this.age = age;
 		}
@@ -495,6 +515,7 @@ public class AnnotationTransactionAttributeSourceTests {
 
 	public static class MyFoo implements Foo<String> {
 
+		@Override
 		@Transactional
 		public void doSomething(String theArgument) {
 			System.out.println(theArgument);
@@ -508,20 +529,24 @@ public class AnnotationTransactionAttributeSourceTests {
 
 		private int age;
 
+		@Override
 		@javax.ejb.TransactionAttribute(TransactionAttributeType.SUPPORTS)
 		public String getName() {
 			return name;
 		}
 
+		@Override
 		public void setName(String name) {
 			this.name = name;
 		}
 
+		@Override
 		@javax.ejb.TransactionAttribute
 		public int getAge() {
 			return age;
 		}
 
+		@Override
 		public void setAge(int age) {
 			this.age = age;
 		}
@@ -535,19 +560,23 @@ public class AnnotationTransactionAttributeSourceTests {
 
 		private int age;
 
+		@Override
 		public String getName() {
 			return name;
 		}
 
+		@Override
 		public void setName(String name) {
 			this.name = name;
 		}
 
+		@Override
 		@javax.ejb.TransactionAttribute
 		public int getAge() {
 			return age;
 		}
 
+		@Override
 		public void setAge(int age) {
 			this.age = age;
 		}
@@ -574,18 +603,22 @@ public class AnnotationTransactionAttributeSourceTests {
 
 		private int age;
 
+		@Override
 		public String getName() {
 			return name;
 		}
 
+		@Override
 		public void setName(String name) {
 			this.name = name;
 		}
 
+		@Override
 		public int getAge() {
 			return age;
 		}
 
+		@Override
 		public void setAge(int age) {
 			this.age = age;
 		}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java
index 608512aefa..a38057e108 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java
@@ -36,6 +36,7 @@ public class AnnotationTransactionInterceptorTests extends TestCase {
 	private TransactionInterceptor ti;
 
 
+	@Override
 	public void setUp() {
 		this.ptm = new CallCountingTransactionManager();
 		this.source = new AnnotationTransactionAttributeSource();
@@ -319,11 +320,13 @@ public class AnnotationTransactionInterceptorTests extends TestCase {
 
 	public static class TestWithInterfaceImpl implements TestWithInterface {
 
+		@Override
 		public void doSomething() {
 			assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 			assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 		}
 
+		@Override
 		public void doSomethingElse() {
 			assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 			assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
@@ -345,13 +348,16 @@ public class AnnotationTransactionInterceptorTests extends TestCase {
 
 	public static class SomeServiceImpl implements SomeService {
 
+		@Override
 		public void bar() {
 		}
 
+		@Override
 		@Transactional
 		public void foo() {
 		}
 
+		@Override
 		@Transactional(readOnly = false)
 		public void fooBar() {
 		}
@@ -367,6 +373,7 @@ public class AnnotationTransactionInterceptorTests extends TestCase {
 	@Transactional
 	public static class OtherServiceImpl implements OtherService {
 
+		@Override
 		public void foo() {
 		}
 	}
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 36c076ce52..564887d424 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
@@ -41,11 +41,13 @@ public class AnnotationTransactionNamespaceHandlerTests extends TestCase {
 
 	private ConfigurableApplicationContext context;
 
+	@Override
 	public void setUp() {
 		this.context = new ClassPathXmlApplicationContext(
 				"org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml");
 	}
 
+	@Override
 	protected void tearDown() {
 		this.context.close();
 	}
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 fcbc5e880a..11eff8c216 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
@@ -127,6 +127,7 @@ public class EnableTransactionManagementTests {
 			return new CallCountingTransactionManager();
 		}
 
+		@Override
 		public PlatformTransactionManager annotationDrivenTransactionManager() {
 			return txManager2();
 		}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
index ec6f49fe14..5768b1bd9b 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
@@ -87,6 +87,7 @@ public class AnnotationDrivenTests extends TestCase {
 	@SuppressWarnings("serial")
 	public static class TransactionCheckingInterceptor implements MethodInterceptor, Serializable {
 
+		@Override
 		public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 			if (methodInvocation.getMethod().getName().equals("setSomething")) {
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
index 59947292cf..ffad95f811 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
@@ -250,6 +250,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 		final String spouseName = "innerName";
 
 		TestBean outer = new TestBean() {
+			@Override
 			public void exceptional(Throwable t) throws Throwable {
 				TransactionInfo ti = TransactionAspectSupport.currentTransactionInfo();
 				assertTrue(ti.hasTransaction());
@@ -257,6 +258,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 			}
 		};
 		TestBean inner = new TestBean() {
+			@Override
 			public String getName() {
 				// Assert that we're in the inner proxy
 				TransactionInfo ti = TransactionAspectSupport.currentTransactionInfo();
@@ -311,6 +313,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 		final String spouseName = "innerName";
 
 		TestBean outer = new TestBean() {
+			@Override
 			public void exceptional(Throwable t) throws Throwable {
 				TransactionInfo ti = TransactionAspectSupport.currentTransactionInfo();
 				assertTrue(ti.hasTransaction());
@@ -319,6 +322,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 			}
 		};
 		TestBean inner = new TestBean() {
+			@Override
 			public String getName() {
 				// Assert that we're in the inner proxy
 				TransactionInfo ti = TransactionAspectSupport.currentTransactionInfo();
@@ -386,6 +390,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 			final Exception ex, final boolean shouldRollback, boolean rollbackException) throws Exception {
 
 		TransactionAttribute txatt = new DefaultTransactionAttribute() {
+			@Override
 			public boolean rollbackOn(Throwable t) {
 				assertTrue(t == ex);
 				return shouldRollback;
@@ -461,6 +466,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 
 		final String name = "jenny";
 		TestBean tb = new TestBean() {
+			@Override
 			public String getName() {
 				TransactionStatus txStatus = TransactionInterceptor.currentTransactionStatus();
 				txStatus.setRollbackOnly();
@@ -504,6 +510,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase {
 		ptmControl.replay();
 
 		TestBean tb = new TestBean() {
+			@Override
 			public String getName() {
 				throw new UnsupportedOperationException(
 						"Shouldn't have invoked target method when couldn't create transaction for transactional method");
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 27d72c2dc4..593c4dd464 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
@@ -50,6 +50,7 @@ public class BeanFactoryTransactionTests extends TestCase {
 
 	private XmlBeanFactory factory;
 
+	@Override
 	public void setUp() {
 		this.factory = new XmlBeanFactory(new ClassPathResource("transactionalBeanFactory.xml", getClass()));
 	}
@@ -127,6 +128,7 @@ public class BeanFactoryTransactionTests extends TestCase {
 		final TransactionStatus ts = (TransactionStatus) statusControl.getMock();
 		ptm = new PlatformTransactionManager() {
 			private boolean invoked;
+			@Override
 			public TransactionStatus getTransaction(TransactionDefinition def) throws TransactionException {
 				if (invoked) {
 					throw new IllegalStateException("getTransaction should not get invoked more than once");
@@ -138,9 +140,11 @@ public class BeanFactoryTransactionTests extends TestCase {
 				}
 				return ts;
 			}
+			@Override
 			public void commit(TransactionStatus status) throws TransactionException {
 				assertTrue(status == ts);
 			}
+			@Override
 			public void rollback(TransactionStatus status) throws TransactionException {
 				throw new IllegalStateException("rollback should not get invoked");
 			}
@@ -204,6 +208,7 @@ public class BeanFactoryTransactionTests extends TestCase {
 
 		int counter = 0;
 
+		@Override
 		public boolean matches(Method method, Class clazz) {
 			counter++;
 			return true;
@@ -215,6 +220,7 @@ public class BeanFactoryTransactionTests extends TestCase {
 
 		int counter = 0;
 
+		@Override
 		public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 			counter++;
 			return methodInvocation.proceed();
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java
index a260d3ef71..7c2eed8ac9 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java
@@ -40,10 +40,12 @@ public class MapTransactionAttributeSource extends AbstractFallbackTransactionAt
 	}
 
 
+	@Override
 	protected TransactionAttribute findTransactionAttribute(Method method) {
 		return this.attributeMap.get(method);
 	}
 
+	@Override
 	protected TransactionAttribute findTransactionAttribute(Class clazz) {
 		return this.attributeMap.get(clazz);
 	}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java
index 7aa4a1e275..a6cc819e62 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java
@@ -37,14 +37,17 @@ public class PlatformTransactionManagerFacade implements PlatformTransactionMana
 	 */
 	public static PlatformTransactionManager delegate;
 
+	@Override
 	public TransactionStatus getTransaction(TransactionDefinition definition) {
 		return delegate.getTransaction(definition);
 	}
 
+	@Override
 	public void commit(TransactionStatus status) {
 		delegate.commit(status);
 	}
 
+	@Override
 	public void rollback(TransactionStatus status) {
 		delegate.rollback(status);
 	}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
index 5255b972ac..a9f3775b94 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
@@ -34,6 +34,7 @@ import org.springframework.util.SerializationTestUtils;
  */
 public class TransactionInterceptorTests extends AbstractTransactionAspectTests {
 
+	@Override
 	protected Object advised(Object target, PlatformTransactionManager ptm, TransactionAttributeSource[] tas) throws Exception {
 		TransactionInterceptor ti = new TransactionInterceptor();
 		ti.setTransactionManager(ptm);
@@ -49,6 +50,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
 	 * target object and transaction setup.
 	 * Creates a TransactionInterceptor and applies it.
 	 */
+	@Override
 	protected Object advised(Object target, PlatformTransactionManager ptm, TransactionAttributeSource tas) {
 		TransactionInterceptor ti = new TransactionInterceptor();
 		ti.setTransactionManager(ptm);
@@ -111,14 +113,17 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests
 	@SuppressWarnings("serial")
 	public static class SerializableTransactionManager implements PlatformTransactionManager, Serializable {
 
+		@Override
 		public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public void commit(TransactionStatus status) throws TransactionException {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public void rollback(TransactionStatus status) throws TransactionException {
 			throw new UnsupportedOperationException();
 		}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java
index 94ca902580..7eaad371bf 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java
@@ -48,6 +48,7 @@ public class MockUOWManager implements UOWManager {
 	private final List synchronizations = new LinkedList();
 
 
+	@Override
 	public void runUnderUOW(int type, boolean join, UOWAction action) throws UOWActionException, UOWException {
 		this.type = type;
 		this.joined = join;
@@ -70,6 +71,7 @@ public class MockUOWManager implements UOWManager {
 		}
 	}
 
+	@Override
 	public int getUOWType() {
 		return this.type;
 	}
@@ -78,22 +80,27 @@ public class MockUOWManager implements UOWManager {
 		return this.joined;
 	}
 
+	@Override
 	public long getLocalUOWId() {
 		return 0;
 	}
 
+	@Override
 	public void setUOWTimeout(int uowType, int timeout) {
 		this.timeout = timeout;
 	}
 
+	@Override
 	public int getUOWTimeout() {
 		return this.timeout;
 	}
 
+	@Override
 	public void setRollbackOnly() {
 		this.rollbackOnly = true;
 	}
 
+	@Override
 	public boolean getRollbackOnly() {
 		return this.rollbackOnly;
 	}
@@ -102,18 +109,22 @@ public class MockUOWManager implements UOWManager {
 		this.status = status;
 	}
 
+	@Override
 	public int getUOWStatus() {
 		return this.status;
 	}
 
+	@Override
 	public void putResource(Object key, Object value) {
 		this.resources.put(key, value);
 	}
 
+	@Override
 	public Object getResource(Object key) throws NullPointerException {
 		return this.resources.get(key);
 	}
 
+	@Override
 	public void registerInterposedSynchronization(Synchronization sync) {
 		this.synchronizations.add(sync);
 	}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
index b6dbf51348..5f9d5ba630 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
@@ -52,6 +52,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 
 		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
 		assertEquals("result", ptm.execute(definition, new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				return "result";
 			}
@@ -87,6 +88,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 		TransactionStatus ts = ptm.getTransaction(definition);
 		ptm.commit(ts);
 		assertEquals("result", ptm.execute(definition, new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				return "result";
 			}
@@ -105,6 +107,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 
 		try {
 			ptm.execute(definition, new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					return "result";
 				}
@@ -174,6 +177,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 
 		assertEquals("result", ptm.execute(definition, new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				if (synchMode == WebSphereUowTransactionManager.SYNCHRONIZATION_ALWAYS) {
 					assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
@@ -257,6 +261,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 
 		assertEquals("result", ptm.execute(definition, new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				if (synchMode != WebSphereUowTransactionManager.SYNCHRONIZATION_NEVER) {
 					assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
@@ -294,6 +299,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 
 		assertEquals("result", ptm.execute(definition, new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
@@ -315,6 +321,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 	public void testNewTransactionWithCommitException() {
 		final RollbackException rex = new RollbackException();
 		MockUOWManager manager = new MockUOWManager() {
+			@Override
 			public void runUnderUOW(int type, boolean join, UOWAction action) throws UOWException {
 				throw new UOWException(rex);
 			}
@@ -328,6 +335,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 
 		try {
 			ptm.execute(definition, new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 					assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
@@ -362,6 +370,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 
 		try {
 			ptm.execute(definition, new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 					assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
@@ -395,6 +404,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 
 		assertEquals("result", ptm.execute(definition, new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
@@ -425,6 +435,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 
 		assertEquals("result", ptm.execute(definition, new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
@@ -452,6 +463,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 
 		try {
 			ptm.execute(definition, new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					return "result";
 				}
@@ -472,6 +484,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 
 		try {
 			ptm.execute(definition, new TransactionCallback() {
+				@Override
 				public Object doInTransaction(TransactionStatus status) {
 					return "result";
 				}
@@ -508,11 +521,13 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 
 		assertEquals("result", ptm.execute(definition, new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertEquals("result2", ptm.execute(definition2, new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 						assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
@@ -555,11 +570,13 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 
 		assertEquals("result", ptm.execute(definition, new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertEquals("result2", ptm.execute(definition2, new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 						assertEquals(propagationBehavior == TransactionDefinition.PROPAGATION_REQUIRES_NEW,
@@ -600,11 +617,13 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
 		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 
 		assertEquals("result", ptm.execute(definition, new TransactionCallback() {
+			@Override
 			public Object doInTransaction(TransactionStatus status) {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertEquals("result2", ptm.execute(definition2, new TransactionCallback() {
+					@Override
 					public Object doInTransaction(TransactionStatus status) {
 						assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 						assertFalse(TransactionSynchronizationManager.isActualTransactionActive());
diff --git a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
index 0940539f54..8ada7848fa 100644
--- a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		if (this.beanName == null || beanName == null) {
 			this.beanName = beanName;
 		}
 	}
 
+	@Override
 	public String getBeanName() {
 		return beanName;
 	}
@@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void destroy() {
 		this.destroyed = true;
 	}
 
+	@Override
 	public boolean wasDestroyed() {
 		return destroyed;
 	}
diff --git a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
index 0eb8df5c8a..e136978f9e 100644
--- a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
index 13c2c5447a..9a2a3193df 100644
--- a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
+++ b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
@@ -31,22 +31,27 @@ public class SerializablePerson implements Person, Serializable {
 	private String name;
 	private int age;
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
 
+	@Override
 	public Object echo(Object o) throws Throwable {
 		if (o instanceof Throwable) {
 			throw (Throwable) o;
diff --git a/spring-web/src/test/java/org/springframework/beans/TestBean.java b/spring-web/src/test/java/org/springframework/beans/TestBean.java
index 282a18352d..e553f31f5b 100644
--- a/spring-web/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-web/src/test/java/org/springframework/beans/TestBean.java
@@ -143,6 +143,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -151,6 +152,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -167,10 +169,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -186,10 +190,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -202,6 +208,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
@@ -214,10 +221,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return (spouses != null ? (TestBean) spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -244,42 +253,52 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
 
+	@Override
 	public Integer[] getSomeIntegerArray() {
 		return someIntegerArray;
 	}
 
+	@Override
 	public void setSomeIntegerArray(Integer[] someIntegerArray) {
 		this.someIntegerArray = someIntegerArray;
 	}
 
+	@Override
 	public Integer[][] getNestedIntegerArray() {
 		return nestedIntegerArray;
 	}
 
+	@Override
 	public void setNestedIntegerArray(Integer[][] nestedIntegerArray) {
 		this.nestedIntegerArray = nestedIntegerArray;
 	}
 
+	@Override
 	public int[] getSomeIntArray() {
 		return someIntArray;
 	}
 
+	@Override
 	public void setSomeIntArray(int[] someIntArray) {
 		this.someIntArray = someIntArray;
 	}
 
+	@Override
 	public int[][] getNestedIntArray() {
 		return nestedIntArray;
 	}
 
+	@Override
 	public void setNestedIntArray(int[][] nestedIntArray) {
 		this.nestedIntArray = nestedIntArray;
 	}
@@ -340,6 +359,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -348,6 +368,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -380,6 +401,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -405,23 +427,28 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
 
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -451,6 +478,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java
index 006228975a..f3d6eedefe 100644
--- a/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ b/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java
@@ -74,6 +74,7 @@ public class DummyFactory
 	 * Return if the bean managed by this factory is a singleton.
 	 * @see FactoryBean#isSingleton()
 	 */
+	@Override
 	public boolean isSingleton() {
 		return this.singleton;
 	}
@@ -85,6 +86,7 @@ public class DummyFactory
 		this.singleton = singleton;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -93,6 +95,7 @@ public class DummyFactory
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = (AutowireCapableBeanFactory) beanFactory;
 		this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName);
@@ -119,6 +122,7 @@ public class DummyFactory
 		return otherTestBean;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (initialized) {
 			throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean");
@@ -144,6 +148,7 @@ public class DummyFactory
 	 * and prototype mode.
 	 * @see FactoryBean#getObject()
 	 */
+	@Override
 	public Object getObject() throws BeansException {
 		if (isSingleton()) {
 			return this.testBean;
@@ -158,11 +163,13 @@ public class DummyFactory
 		}
 	}
 
+	@Override
 	public Class getObjectType() {
 		return TestBean.class;
 	}
 
 
+	@Override
 	public void destroy() {
 		if (this.testBean != null) {
 			this.testBean.setName(null);
diff --git a/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java b/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java
index 42b9adbfd5..a826a9c207 100644
--- a/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java
+++ b/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java
@@ -23,6 +23,7 @@ public class MockRunnable implements Runnable {
 
 	private boolean executed = false;
 
+	@Override
 	public void run() {
 		this.executed = true;
 	}
diff --git a/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java b/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java
index 4461024f64..43dc47e3c6 100644
--- a/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java
+++ b/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java
@@ -41,10 +41,12 @@ public class MockHttpInputMessage implements HttpInputMessage {
 		this.body = body;
 	}
 
+	@Override
 	public HttpHeaders getHeaders() {
 		return headers;
 	}
 
+	@Override
 	public InputStream getBody() throws IOException {
 		return body;
 	}
diff --git a/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java b/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java
index 323fff1af3..75f5db49b2 100644
--- a/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java
+++ b/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java
@@ -30,10 +30,12 @@ public class MockHttpOutputMessage implements HttpOutputMessage {
 
 	private final ByteArrayOutputStream body = new ByteArrayOutputStream();
 
+	@Override
 	public HttpHeaders getHeaders() {
 		return headers;
 	}
 
+	@Override
 	public OutputStream getBody() throws IOException {
 		return body;
 	}
diff --git a/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java
index 7408552ff5..4904ea3191 100644
--- a/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java
@@ -28,6 +28,7 @@ public class BufferedSimpleHttpRequestFactoryTests extends AbstractHttpRequestFa
 		return new SimpleClientHttpRequestFactory();
 	}
 
+	@Override
 	@Test
 	public void httpMethods() throws Exception {
 		try {
diff --git a/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java
index 917e5de114..0eabc67d93 100644
--- a/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java
@@ -26,6 +26,7 @@ public class HttpComponentsClientHttpRequestFactoryTests extends AbstractHttpReq
 		return new HttpComponentsClientHttpRequestFactory();
 	}
 
+	@Override
 	@Test
 	public void httpMethods() throws Exception {
 		assertHttpMethod("patch", HttpMethod.PATCH);
diff --git a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
index 70f5e257d2..2df6331b8e 100644
--- a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java
@@ -79,6 +79,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 	public void noExecution() throws Exception {
 		List<ClientHttpRequestInterceptor> interceptors = new ArrayList<ClientHttpRequestInterceptor>();
 		interceptors.add(new ClientHttpRequestInterceptor() {
+			@Override
 			public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
 					throws IOException {
 				return responseMock;
@@ -101,6 +102,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 		final String headerName = "Foo";
 		final String headerValue = "Bar";
 		ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() {
+			@Override
 			public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
 					throws IOException {
 
@@ -134,6 +136,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 	public void changeURI() throws Exception {
 		final URI changedUri = new URI("http://example.com/2");
 		ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() {
+			@Override
 			public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
 					throws IOException {
 
@@ -166,6 +169,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 	public void changeMethod() throws Exception {
 		final HttpMethod changedMethod = HttpMethod.POST;
 		ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() {
+			@Override
 			public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
 					throws IOException {
 
@@ -198,6 +202,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 	public void changeBody() throws Exception {
 		final byte[] changedBody = "Foo".getBytes();
 		ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() {
+			@Override
 			public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
 					throws IOException {
 
@@ -217,6 +222,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 
 		private boolean invoked = false;
 
+		@Override
 		public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
 				throws IOException {
 			invoked = true;
@@ -226,6 +232,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 
 	private class RequestFactoryMock implements ClientHttpRequestFactory {
 
+		@Override
 		public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
 			requestMock.setURI(uri);
 			requestMock.setMethod(httpMethod);
@@ -249,6 +256,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 		private RequestMock() {
 		}
 
+		@Override
 		public URI getURI() {
 			return uri;
 		}
@@ -257,6 +265,7 @@ public class InterceptingClientHttpRequestFactoryTests {
 			this.uri = uri;
 		}
 
+		@Override
 		public HttpMethod getMethod() {
 			return method;
 		}
@@ -265,14 +274,17 @@ public class InterceptingClientHttpRequestFactoryTests {
 			this.method = method;
 		}
 
+		@Override
 		public HttpHeaders getHeaders() {
 			return headers;
 		}
 
+		@Override
 		public OutputStream getBody() throws IOException {
 			return body;
 		}
 
+		@Override
 		public ClientHttpResponse execute() throws IOException {
 			executed = true;
 			return responseMock;
@@ -287,26 +299,32 @@ public class InterceptingClientHttpRequestFactoryTests {
 
 		private HttpHeaders headers = new HttpHeaders();
 
+		@Override
 		public HttpStatus getStatusCode() throws IOException {
 			return statusCode;
 		}
 
+		@Override
 		public int getRawStatusCode() throws IOException {
 			return statusCode.value();
 		}
 
+		@Override
 		public String getStatusText() throws IOException {
 			return statusText;
 		}
 
+		@Override
 		public HttpHeaders getHeaders() {
 			return headers;
 		}
 
+		@Override
 		public InputStream getBody() throws IOException {
 			return null;
 		}
 
+		@Override
 		public void close() {
 		}
 	}
diff --git a/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java
index 8507cdbfe8..6adeed5eca 100644
--- a/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java
@@ -47,6 +47,7 @@ public class StreamingSimpleHttpRequestFactoryTests extends AbstractHttpRequestF
 		final String headerName = "MyHeader";
 		final String headerValue = "MyValue";
 		ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() {
+			@Override
 			public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
 					throws IOException {
 				request.getHeaders().add(headerName, headerValue);
diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
index 0771b1f4c7..7f1110d6ef 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
@@ -167,20 +167,24 @@ public class FormHttpMessageConverterTests {
 			this.outputMessage = outputMessage;
 		}
 
+		@Override
 		public String getCharacterEncoding() {
 			MediaType contentType = outputMessage.getHeaders().getContentType();
 			return contentType != null && contentType.getCharSet() != null ? contentType.getCharSet().name() : null;
 		}
 
+		@Override
 		public String getContentType() {
 			MediaType contentType = outputMessage.getHeaders().getContentType();
 			return contentType != null ? contentType.toString() : null;
 		}
 
+		@Override
 		public int getContentLength() {
 			return outputMessage.getBodyAsBytes().length;
 		}
 
+		@Override
 		public InputStream getInputStream() throws IOException {
 			return new ByteArrayInputStream(outputMessage.getBodyAsBytes());
 		}
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java
index d3e3ff6785..f0a259edd2 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java
@@ -54,10 +54,12 @@ public class DelegatingServletInputStream extends ServletInputStream {
 	}
 
 
+	@Override
 	public int read() throws IOException {
 		return this.sourceStream.read();
 	}
 
+	@Override
 	public void close() throws IOException {
 		super.close();
 		this.sourceStream.close();
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java
index 5f32208ecb..58aa59d49d 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java
@@ -54,15 +54,18 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 	}
 
 
+	@Override
 	public void write(int b) throws IOException {
 		this.targetStream.write(b);
 	}
 
+	@Override
 	public void flush() throws IOException {
 		super.flush();
 		this.targetStream.flush();
 	}
 
+	@Override
 	public void close() throws IOException {
 		super.close();
 		this.targetStream.close();
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java
index 00a632f47d..f4ff566922 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java
@@ -56,14 +56,17 @@ public class MockAsyncContext implements AsyncContext {
 		this.response = (HttpServletResponse) response;
 	}
 
+	@Override
 	public ServletRequest getRequest() {
 		return this.request;
 	}
 
+	@Override
 	public ServletResponse getResponse() {
 		return this.response;
 	}
 
+	@Override
 	public boolean hasOriginalRequestAndResponse() {
 		return (this.request instanceof MockHttpServletRequest) && (this.response instanceof MockHttpServletResponse);
 	}
@@ -72,18 +75,22 @@ public class MockAsyncContext implements AsyncContext {
 		return this.dispatchedPath;
 	}
 
+	@Override
 	public void dispatch() {
 		dispatch(this.request.getRequestURI());
  	}
 
+	@Override
 	public void dispatch(String path) {
 		dispatch(null, path);
 	}
 
+	@Override
 	public void dispatch(ServletContext context, String path) {
 		this.dispatchedPath = path;
 	}
 
+	@Override
 	public void complete() {
 		MockHttpServletRequest mockRequest = WebUtils.getNativeRequest(request, MockHttpServletRequest.class);
 		if (mockRequest != null) {
@@ -99,6 +106,7 @@ public class MockAsyncContext implements AsyncContext {
 		}
 	}
 
+	@Override
 	public void start(Runnable runnable) {
 		runnable.run();
 	}
@@ -107,22 +115,27 @@ public class MockAsyncContext implements AsyncContext {
 		return this.listeners;
 	}
 
+	@Override
 	public void addListener(AsyncListener listener) {
 		this.listeners.add(listener);
 	}
 
+	@Override
 	public void addListener(AsyncListener listener, ServletRequest request, ServletResponse response) {
 		this.listeners.add(listener);
 	}
 
+	@Override
 	public <T extends AsyncListener> T createListener(Class<T> clazz) throws ServletException {
 		return BeanUtils.instantiateClass(clazz);
 	}
 
+	@Override
 	public long getTimeout() {
 		return this.timeout;
 	}
 
+	@Override
 	public void setTimeout(long timeout) {
 		this.timeout = timeout;
 	}
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockBodyContent.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockBodyContent.java
index 7160e64155..eb3ebe8e8b 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockBodyContent.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockBodyContent.java
@@ -77,14 +77,17 @@ public class MockBodyContent extends BodyContent {
 	}
 
 
+	@Override
 	public Reader getReader() {
 		return new StringReader(this.content);
 	}
 
+	@Override
 	public String getString() {
 		return this.content;
 	}
 
+	@Override
 	public void writeOut(Writer writer) throws IOException {
 		writer.write(this.content);
 	}
@@ -94,102 +97,127 @@ public class MockBodyContent extends BodyContent {
 	// Delegating implementations of JspWriter's abstract methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void clear() throws IOException {
 		getEnclosingWriter().clear();
 	}
 
+	@Override
 	public void clearBuffer() throws IOException {
 		getEnclosingWriter().clearBuffer();
 	}
 
+	@Override
 	public void close() throws IOException {
 		getEnclosingWriter().close();
 	}
 
+	@Override
 	public int getRemaining() {
 		return getEnclosingWriter().getRemaining();
 	}
 
+	@Override
 	public void newLine() throws IOException {
 		getEnclosingWriter().println();
 	}
 
+	@Override
 	public void write(char value[], int offset, int length) throws IOException {
 		getEnclosingWriter().write(value, offset, length);
 	}
 
+	@Override
 	public void print(boolean value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(char value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(char[] value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(double value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(float value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(int value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(long value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(Object value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(String value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void println() throws IOException {
 		getEnclosingWriter().println();
 	}
 
+	@Override
 	public void println(boolean value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(char value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(char[] value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(double value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(float value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(int value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(long value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(Object value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(String value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java
index e13749eef1..b399bafe62 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java
@@ -53,17 +53,20 @@ public class MockExpressionEvaluator extends ExpressionEvaluator {
 		this.pageContext = pageContext;
 	}
 
+	@Override
 	public Expression parseExpression(
 			final String expression, final Class expectedType, final FunctionMapper functionMapper)
 			throws ELException {
 
 		return new Expression() {
+			@Override
 			public Object evaluate(VariableResolver variableResolver) throws ELException {
 				return doEvaluate(expression, expectedType, functionMapper);
 			}
 		};
 	}
 
+	@Override
 	public Object evaluate(
 			String expression, Class expectedType, VariableResolver variableResolver, FunctionMapper functionMapper)
 			throws ELException {
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterChain.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterChain.java
index a6fa2f6b26..5b4b68b94d 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterChain.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterChain.java
@@ -117,6 +117,7 @@ public class MockFilterChain implements FilterChain {
 	 * Invoke registered {@link Filter}s and/or {@link Servlet} also saving the
 	 * request and response.
 	 */
+	@Override
 	public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
@@ -160,15 +161,18 @@ public class MockFilterChain implements FilterChain {
 			this.delegateServlet = servlet;
 		}
 
+		@Override
 		public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
 				throws IOException, ServletException {
 
 			this.delegateServlet.service(request, response);
 		}
 
+		@Override
 		public void init(FilterConfig filterConfig) throws ServletException {
 		}
 
+		@Override
 		public void destroy() {
 		}
 
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterConfig.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterConfig.java
index 9db10c665b..12fbe613ec 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterConfig.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterConfig.java
@@ -79,10 +79,12 @@ public class MockFilterConfig implements FilterConfig {
 	}
 
 
+	@Override
 	public String getFilterName() {
 		return filterName;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return servletContext;
 	}
@@ -92,11 +94,13 @@ public class MockFilterConfig implements FilterConfig {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
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 4544448afa..5694b66610 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
@@ -264,6 +264,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	 * Return the ServletContext that this request is associated with. (Not
 	 * available in the standard HttpServletRequest interface for some reason.)
 	 */
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
@@ -305,20 +306,24 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	// ServletRequest interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public Object getAttribute(String name) {
 		checkActive();
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		checkActive();
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
 
+	@Override
 	public void setCharacterEncoding(String characterEncoding) {
 		this.characterEncoding = characterEncoding;
 		updateContentTypeHeader();
@@ -338,6 +343,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.content = content;
 	}
 
+	@Override
 	public int getContentLength() {
 		return (this.content != null ? this.content.length : -1);
 	}
@@ -354,10 +360,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public ServletInputStream getInputStream() {
 		if (this.content != null) {
 			return new DelegatingServletInputStream(new ByteArrayInputStream(this.content));
@@ -480,21 +488,25 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.parameters.clear();
 	}
 
+	@Override
 	public String getParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		String[] arr = this.parameters.get(name);
 		return (arr != null && arr.length > 0 ? arr[0] : null);
 	}
 
+	@Override
 	public Enumeration<String> getParameterNames() {
 		return Collections.enumeration(this.parameters.keySet());
 	}
 
+	@Override
 	public String[] getParameterValues(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.parameters.get(name);
 	}
 
+	@Override
 	public Map<String, String[]> getParameterMap() {
 		return Collections.unmodifiableMap(this.parameters);
 	}
@@ -503,6 +515,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.protocol = protocol;
 	}
 
+	@Override
 	public String getProtocol() {
 		return this.protocol;
 	}
@@ -511,6 +524,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.scheme = scheme;
 	}
 
+	@Override
 	public String getScheme() {
 		return this.scheme;
 	}
@@ -519,6 +533,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.serverName = serverName;
 	}
 
+	@Override
 	public String getServerName() {
 		return this.serverName;
 	}
@@ -527,10 +542,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.serverPort = serverPort;
 	}
 
+	@Override
 	public int getServerPort() {
 		return this.serverPort;
 	}
 
+	@Override
 	public BufferedReader getReader() throws UnsupportedEncodingException {
 		if (this.content != null) {
 			InputStream sourceStream = new ByteArrayInputStream(this.content);
@@ -547,6 +564,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remoteAddr = remoteAddr;
 	}
 
+	@Override
 	public String getRemoteAddr() {
 		return this.remoteAddr;
 	}
@@ -555,10 +573,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remoteHost = remoteHost;
 	}
 
+	@Override
 	public String getRemoteHost() {
 		return this.remoteHost;
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		checkActive();
 		Assert.notNull(name, "Attribute name must not be null");
@@ -570,6 +590,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		checkActive();
 		Assert.notNull(name, "Attribute name must not be null");
@@ -604,10 +625,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.locales.addAll(locales);
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locales.get(0);
 	}
 
+	@Override
 	public Enumeration<Locale> getLocales() {
 		return Collections.enumeration(this.locales);
 	}
@@ -616,14 +639,17 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.secure = secure;
 	}
 
+	@Override
 	public boolean isSecure() {
 		return this.secure;
 	}
 
+	@Override
 	public RequestDispatcher getRequestDispatcher(String path) {
 		return new MockRequestDispatcher(path);
 	}
 
+	@Override
 	public String getRealPath(String path) {
 		return this.servletContext.getRealPath(path);
 	}
@@ -632,6 +658,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remotePort = remotePort;
 	}
 
+	@Override
 	public int getRemotePort() {
 		return this.remotePort;
 	}
@@ -640,6 +667,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.localName = localName;
 	}
 
+	@Override
 	public String getLocalName() {
 		return this.localName;
 	}
@@ -648,6 +676,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.localAddr = localAddr;
 	}
 
+	@Override
 	public String getLocalAddr() {
 		return this.localAddr;
 	}
@@ -656,6 +685,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.localPort = localPort;
 	}
 
+	@Override
 	public int getLocalPort() {
 		return this.localPort;
 	}
@@ -669,6 +699,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.authType = authType;
 	}
 
+	@Override
 	public String getAuthType() {
 		return this.authType;
 	}
@@ -677,6 +708,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.cookies = cookies;
 	}
 
+	@Override
 	public Cookie[] getCookies() {
 		return this.cookies;
 	}
@@ -725,6 +757,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public long getDateHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		Object value = (header != null ? header.getValue() : null);
@@ -743,20 +776,24 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public String getHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		return (header != null ? header.getValue().toString() : null);
 	}
 
+	@Override
 	public Enumeration<String> getHeaders(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		return Collections.enumeration(header != null ? header.getStringValues() : new LinkedList<String>());
 	}
 
+	@Override
 	public Enumeration<String> getHeaderNames() {
 		return Collections.enumeration(this.headers.keySet());
 	}
 
+	@Override
 	public int getIntHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		Object value = (header != null ? header.getValue() : null);
@@ -778,6 +815,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.method = method;
 	}
 
+	@Override
 	public String getMethod() {
 		return this.method;
 	}
@@ -786,10 +824,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.pathInfo = pathInfo;
 	}
 
+	@Override
 	public String getPathInfo() {
 		return this.pathInfo;
 	}
 
+	@Override
 	public String getPathTranslated() {
 		return (this.pathInfo != null ? getRealPath(this.pathInfo) : null);
 	}
@@ -798,6 +838,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.contextPath = contextPath;
 	}
 
+	@Override
 	public String getContextPath() {
 		return this.contextPath;
 	}
@@ -806,6 +847,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.queryString = queryString;
 	}
 
+	@Override
 	public String getQueryString() {
 		return this.queryString;
 	}
@@ -814,6 +856,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remoteUser = remoteUser;
 	}
 
+	@Override
 	public String getRemoteUser() {
 		return this.remoteUser;
 	}
@@ -822,6 +865,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.userRoles.add(role);
 	}
 
+	@Override
 	public boolean isUserInRole(String role) {
 		return (this.userRoles.contains(role) || (this.servletContext instanceof MockServletContext && ((MockServletContext) this.servletContext).getDeclaredRoles().contains(
 			role)));
@@ -831,6 +875,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.userPrincipal = userPrincipal;
 	}
 
+	@Override
 	public Principal getUserPrincipal() {
 		return this.userPrincipal;
 	}
@@ -839,6 +884,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionId = requestedSessionId;
 	}
 
+	@Override
 	public String getRequestedSessionId() {
 		return this.requestedSessionId;
 	}
@@ -847,10 +893,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestURI = requestURI;
 	}
 
+	@Override
 	public String getRequestURI() {
 		return this.requestURI;
 	}
 
+	@Override
 	public StringBuffer getRequestURL() {
 		StringBuffer url = new StringBuffer(this.scheme);
 		url.append("://").append(this.serverName).append(':').append(this.serverPort);
@@ -862,6 +910,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.servletPath = servletPath;
 	}
 
+	@Override
 	public String getServletPath() {
 		return this.servletPath;
 	}
@@ -874,6 +923,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public HttpSession getSession(boolean create) {
 		checkActive();
 		// Reset session if invalidated.
@@ -887,6 +937,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		return this.session;
 	}
 
+	@Override
 	public HttpSession getSession() {
 		return getSession(true);
 	}
@@ -895,6 +946,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionIdValid = requestedSessionIdValid;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdValid() {
 		return this.requestedSessionIdValid;
 	}
@@ -903,6 +955,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionIdFromCookie = requestedSessionIdFromCookie;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdFromCookie() {
 		return this.requestedSessionIdFromCookie;
 	}
@@ -911,10 +964,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionIdFromURL = requestedSessionIdFromURL;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdFromURL() {
 		return this.requestedSessionIdFromURL;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdFromUrl() {
 		return isRequestedSessionIdFromURL();
 	}
@@ -924,6 +979,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	// Methods introduced in Servlet 3.0
 	//---------------------------------------------------------------------
 
+	@Override
 	public AsyncContext getAsyncContext() {
 		return this.asyncContext;
 	}
@@ -932,6 +988,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.asyncContext = asyncContext;
 	}
 
+	@Override
 	public DispatcherType getDispatcherType() {
 		return this.dispatcherType;
 	}
@@ -944,14 +1001,17 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.asyncSupported = asyncSupported;
 	}
 
+	@Override
 	public boolean isAsyncSupported() {
 		return this.asyncSupported;
 	}
 
+	@Override
 	public AsyncContext startAsync() {
 		return startAsync(this, null);
 	}
 
+	@Override
 	public AsyncContext startAsync(ServletRequest request, ServletResponse response) {
 		if (!this.asyncSupported) {
 			throw new IllegalStateException("Async not supported");
@@ -965,10 +1025,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.asyncStarted = asyncStarted;
 	}
 
+	@Override
 	public boolean isAsyncStarted() {
 		return this.asyncStarted;
 	}
 
+	@Override
 	public boolean authenticate(HttpServletResponse arg0) throws IOException, ServletException {
 		throw new UnsupportedOperationException();
 	}
@@ -977,18 +1039,22 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		parts.put(part.getName(), part);
 	}
 
+	@Override
 	public Part getPart(String key) throws IOException, IllegalStateException, ServletException {
 		return parts.get(key);
 	}
 
+	@Override
 	public Collection<Part> getParts() throws IOException, IllegalStateException, ServletException {
 		return parts.values();
 	}
 
+	@Override
 	public void login(String arg0, String arg1) throws ServletException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void logout() throws ServletException {
 		throw new UnsupportedOperationException();
 	}
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
index ce6ef7fa9b..6f52ab8e3e 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
@@ -138,6 +138,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.writerAccessAllowed;
 	}
 
+	@Override
 	public void setCharacterEncoding(String characterEncoding) {
 		this.characterEncoding = characterEncoding;
 		this.charset = true;
@@ -154,10 +155,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
 
+	@Override
 	public ServletOutputStream getOutputStream() {
 		if (!this.outputStreamAccessAllowed) {
 			throw new IllegalStateException("OutputStream access not allowed");
@@ -165,6 +168,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.outputStream;
 	}
 
+	@Override
 	public PrintWriter getWriter() throws UnsupportedEncodingException {
 		if (!this.writerAccessAllowed) {
 			throw new IllegalStateException("Writer access not allowed");
@@ -188,6 +192,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 				this.content.toString(this.characterEncoding) : this.content.toString();
 	}
 
+	@Override
 	public void setContentLength(int contentLength) {
 		this.contentLength = contentLength;
 		doAddHeaderValue(CONTENT_LENGTH_HEADER, contentLength, true);
@@ -197,6 +202,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.contentLength;
 	}
 
+	@Override
 	public void setContentType(String contentType) {
 		this.contentType = contentType;
 		if (contentType != null) {
@@ -210,22 +216,27 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public void setBufferSize(int bufferSize) {
 		this.bufferSize = bufferSize;
 	}
 
+	@Override
 	public int getBufferSize() {
 		return this.bufferSize;
 	}
 
+	@Override
 	public void flushBuffer() {
 		setCommitted(true);
 	}
 
+	@Override
 	public void resetBuffer() {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot reset buffer - response is already committed");
@@ -244,10 +255,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		this.committed = committed;
 	}
 
+	@Override
 	public boolean isCommitted() {
 		return this.committed;
 	}
 
+	@Override
 	public void reset() {
 		resetBuffer();
 		this.characterEncoding = null;
@@ -260,10 +273,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		this.errorMessage = null;
 	}
 
+	@Override
 	public void setLocale(Locale locale) {
 		this.locale = locale;
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locale;
 	}
@@ -273,6 +288,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	// HttpServletResponse interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public void addCookie(Cookie cookie) {
 		Assert.notNull(cookie, "Cookie must not be null");
 		this.cookies.add(cookie);
@@ -292,6 +308,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return null;
 	}
 
+	@Override
 	public boolean containsHeader(String name) {
 		return (HeaderValueHolder.getByName(this.headers, name) != null);
 	}
@@ -301,6 +318,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * <p>As of Servlet 3.0, this method is also defined HttpServletResponse.
 	 * @return the {@code Set} of header name {@code Strings}, or an empty {@code Set} if none
 	 */
+	@Override
 	public Set<String> getHeaderNames() {
 		return this.headers.keySet();
 	}
@@ -314,6 +332,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * @param name the name of the header
 	 * @return the associated header value, or {@code null} if none
 	 */
+	@Override
 	public String getHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		return (header != null ? header.getStringValue() : null);
@@ -327,6 +346,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * @param name the name of the header
 	 * @return the associated header values, or an empty List if none
 	 */
+	@Override
 	public List<String> getHeaders(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		if (header != null) {
@@ -367,6 +387,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * The default implementation returns the given URL String as-is.
 	 * <p>Can be overridden in subclasses, appending a session id or the like.
 	 */
+	@Override
 	public String encodeURL(String url) {
 		return url;
 	}
@@ -379,18 +400,22 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * override the common {@link #encodeURL} method instead, applying
 	 * to redirect URLs as well as to general URLs.
 	 */
+	@Override
 	public String encodeRedirectURL(String url) {
 		return encodeURL(url);
 	}
 
+	@Override
 	public String encodeUrl(String url) {
 		return encodeURL(url);
 	}
 
+	@Override
 	public String encodeRedirectUrl(String url) {
 		return encodeRedirectURL(url);
 	}
 
+	@Override
 	public void sendError(int status, String errorMessage) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot set error status - response is already committed");
@@ -400,6 +425,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		setCommitted(true);
 	}
 
+	@Override
 	public void sendError(int status) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot set error status - response is already committed");
@@ -408,6 +434,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		setCommitted(true);
 	}
 
+	@Override
 	public void sendRedirect(String url) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot send redirect - response is already committed");
@@ -422,26 +449,32 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return getHeader(LOCATION_HEADER);
 	}
 
+	@Override
 	public void setDateHeader(String name, long value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addDateHeader(String name, long value) {
 		addHeaderValue(name, value);
 	}
 
+	@Override
 	public void setHeader(String name, String value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addHeader(String name, String value) {
 		addHeaderValue(name, value);
 	}
 
+	@Override
 	public void setIntHeader(String name, int value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addIntHeader(String name, int value) {
 		addHeaderValue(name, value);
 	}
@@ -489,15 +522,18 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public void setStatus(int status) {
 		this.status = status;
 	}
 
+	@Override
 	public void setStatus(int status, String errorMessage) {
 		this.status = status;
 		this.errorMessage = errorMessage;
 	}
 
+	@Override
 	public int getStatus() {
 		return this.status;
 	}
@@ -555,12 +591,14 @@ public class MockHttpServletResponse implements HttpServletResponse {
 			super(out);
 		}
 
+		@Override
 		public void write(int b) throws IOException {
 			super.write(b);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void flush() throws IOException {
 			super.flush();
 			setCommitted(true);
@@ -578,24 +616,28 @@ public class MockHttpServletResponse implements HttpServletResponse {
 			super(out, true);
 		}
 
+		@Override
 		public void write(char buf[], int off, int len) {
 			super.write(buf, off, len);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void write(String s, int off, int len) {
 			super.write(s, off, len);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void write(int c) {
 			super.write(c);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void flush() {
 			super.flush();
 			setCommitted(true);
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java
index ae7d58af43..12301763b6 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java
@@ -98,10 +98,12 @@ public class MockHttpSession implements HttpSession {
 		this.id = (id != null ? id : Integer.toString(nextId++));
 	}
 
+	@Override
 	public long getCreationTime() {
 		return this.creationTime;
 	}
 
+	@Override
 	public String getId() {
 		return this.id;
 	}
@@ -111,43 +113,53 @@ public class MockHttpSession implements HttpSession {
 		this.isNew = false;
 	}
 
+	@Override
 	public long getLastAccessedTime() {
 		return this.lastAccessedTime;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
 
+	@Override
 	public void setMaxInactiveInterval(int interval) {
 		this.maxInactiveInterval = interval;
 	}
 
+	@Override
 	public int getMaxInactiveInterval() {
 		return this.maxInactiveInterval;
 	}
 
+	@Override
 	public HttpSessionContext getSessionContext() {
 		throw new UnsupportedOperationException("getSessionContext");
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Object getValue(String name) {
 		return getAttribute(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	public String[] getValueNames() {
 		return this.attributes.keySet().toArray(new String[this.attributes.size()]);
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		Assert.notNull(name, "Attribute name must not be null");
 		if (value != null) {
@@ -161,10 +173,12 @@ public class MockHttpSession implements HttpSession {
 		}
 	}
 
+	@Override
 	public void putValue(String name, Object value) {
 		setAttribute(name, value);
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		Object value = this.attributes.remove(name);
@@ -173,6 +187,7 @@ public class MockHttpSession implements HttpSession {
 		}
 	}
 
+	@Override
 	public void removeValue(String name) {
 		removeAttribute(name);
 	}
@@ -197,6 +212,7 @@ public class MockHttpSession implements HttpSession {
 	 *
 	 * @throws IllegalStateException if this method is called on an already invalidated session
 	 */
+	@Override
 	public void invalidate() {
 		if (this.invalid) {
 			throw new IllegalStateException("The session has already been invalidated");
@@ -215,6 +231,7 @@ public class MockHttpSession implements HttpSession {
 		this.isNew = value;
 	}
 
+	@Override
 	public boolean isNew() {
 		return this.isNew;
 	}
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockJspWriter.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockJspWriter.java
index dc1dc5c51c..e83ff23521 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockJspWriter.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockJspWriter.java
@@ -82,6 +82,7 @@ public class MockJspWriter extends JspWriter {
 	}
 
 
+	@Override
 	public void clear() throws IOException {
 		if (this.response.isCommitted()) {
 			throw new IOException("Response already committed");
@@ -89,101 +90,126 @@ public class MockJspWriter extends JspWriter {
 		this.response.resetBuffer();
 	}
 
+	@Override
 	public void clearBuffer() throws IOException {
 	}
 
+	@Override
 	public void flush() throws IOException {
 		this.response.flushBuffer();
 	}
 
+	@Override
 	public void close() throws IOException {
 		flush();
 	}
 
+	@Override
 	public int getRemaining() {
 		return Integer.MAX_VALUE;
 	}
 
+	@Override
 	public void newLine() throws IOException {
 		getTargetWriter().println();
 	}
 
+	@Override
 	public void write(char value[], int offset, int length) throws IOException {
 		getTargetWriter().write(value, offset, length);
 	}
 
+	@Override
 	public void print(boolean value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(char value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(char[] value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(double value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(float value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(int value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(long value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(Object value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(String value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void println() throws IOException {
 		getTargetWriter().println();
 	}
 
+	@Override
 	public void println(boolean value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(char value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(char[] value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(double value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(float value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(int value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(long value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(Object value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(String value) throws IOException {
 		getTargetWriter().println(value);
 	}
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java
index c9bf074296..8cad672a2d 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java
@@ -96,34 +96,42 @@ public class MockMultipartFile implements MultipartFile {
 	}
 
 
+	@Override
 	public String getName() {
 		return this.name;
 	}
 
+	@Override
 	public String getOriginalFilename() {
 		return this.originalFilename;
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return (this.content.length == 0);
 	}
 
+	@Override
 	public long getSize() {
 		return this.content.length;
 	}
 
+	@Override
 	public byte[] getBytes() throws IOException {
 		return this.content;
 	}
 
+	@Override
 	public InputStream getInputStream() throws IOException {
 		return new ByteArrayInputStream(this.content);
 	}
 
+	@Override
 	public void transferTo(File dest) throws IOException, IllegalStateException {
 		FileCopyUtils.copy(this.content, dest);
 	}
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java
index dc915eec4f..868d786bdd 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java
@@ -66,14 +66,17 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
 		this.multipartFiles.add(file.getName(), file);
 	}
 
+	@Override
 	public Iterator<String> getFileNames() {
 		return this.multipartFiles.keySet().iterator();
 	}
 
+	@Override
 	public MultipartFile getFile(String name) {
 		return this.multipartFiles.getFirst(name);
 	}
 
+	@Override
 	public List<MultipartFile> getFiles(String name) {
 		List<MultipartFile> multipartFiles = this.multipartFiles.get(name);
 		if (multipartFiles != null) {
@@ -84,14 +87,17 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
 		}
 	}
 
+	@Override
 	public Map<String, MultipartFile> getFileMap() {
 		return this.multipartFiles.toSingleValueMap();
 	}
 
+	@Override
 	public MultiValueMap<String, MultipartFile> getMultiFileMap() {
 		return new LinkedMultiValueMap<String, MultipartFile>(this.multipartFiles);
 	}
 
+	@Override
 	public String getMultipartContentType(String paramOrFileName) {
 		MultipartFile file = getFile(paramOrFileName);
 		if (file != null) {
@@ -102,10 +108,12 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
 		}
 	}
 
+	@Override
 	public HttpMethod getRequestMethod() {
 		return HttpMethod.valueOf(getMethod());
 	}
 
+	@Override
 	public HttpHeaders getRequestHeaders() {
 		HttpHeaders headers = new HttpHeaders();
 		Enumeration<String> headerNames = getHeaderNames();
@@ -116,6 +124,7 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
 		return headers;
 	}
 
+	@Override
 	public HttpHeaders getMultipartHeaders(String paramOrFileName) {
 		String contentType = getMultipartContentType(paramOrFileName);
 		if (contentType != null) {
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java
index efa1319b92..2c17aca78e 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java
@@ -125,6 +125,7 @@ public class MockPageContext extends PageContext {
 	}
 
 
+	@Override
 	public void initialize(
 			Servlet servlet, ServletRequest request, ServletResponse response,
 			String errorPageURL, boolean needsSession, int bufferSize, boolean autoFlush) {
@@ -132,9 +133,11 @@ public class MockPageContext extends PageContext {
 		throw new UnsupportedOperationException("Use appropriate constructor");
 	}
 
+	@Override
 	public void release() {
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		Assert.notNull(name, "Attribute name must not be null");
 		if (value != null) {
@@ -145,6 +148,7 @@ public class MockPageContext extends PageContext {
 		}
 	}
 
+	@Override
 	public void setAttribute(String name, Object value, int scope) {
 		Assert.notNull(name, "Attribute name must not be null");
 		switch (scope) {
@@ -165,11 +169,13 @@ public class MockPageContext extends PageContext {
 		}
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Object getAttribute(String name, int scope) {
 		Assert.notNull(name, "Attribute name must not be null");
 		switch (scope) {
@@ -187,6 +193,7 @@ public class MockPageContext extends PageContext {
 		}
 	}
 
+	@Override
 	public Object findAttribute(String name) {
 		Object value = getAttribute(name);
 		if (value == null) {
@@ -201,6 +208,7 @@ public class MockPageContext extends PageContext {
 		return value;
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		this.removeAttribute(name, PageContext.PAGE_SCOPE);
@@ -209,6 +217,7 @@ public class MockPageContext extends PageContext {
 		this.removeAttribute(name, PageContext.APPLICATION_SCOPE);
 	}
 
+	@Override
 	public void removeAttribute(String name, int scope) {
 		Assert.notNull(name, "Attribute name must not be null");
 		switch (scope) {
@@ -229,6 +238,7 @@ public class MockPageContext extends PageContext {
 		}
 	}
 
+	@Override
 	public int getAttributesScope(String name) {
 		if (getAttribute(name) != null) {
 			return PAGE_SCOPE;
@@ -251,6 +261,7 @@ public class MockPageContext extends PageContext {
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Enumeration<String> getAttributeNamesInScope(int scope) {
 		switch (scope) {
@@ -268,6 +279,7 @@ public class MockPageContext extends PageContext {
 		}
 	}
 
+	@Override
 	public JspWriter getOut() {
 		if (this.out == null) {
 			this.out = new MockJspWriter(this.response);
@@ -275,54 +287,67 @@ public class MockPageContext extends PageContext {
 		return this.out;
 	}
 
+	@Override
 	public ExpressionEvaluator getExpressionEvaluator() {
 		return new MockExpressionEvaluator(this);
 	}
 
+	@Override
 	public ELContext getELContext() {
 		return null;
 	}
 
+	@Override
 	public VariableResolver getVariableResolver() {
 		return null;
 	}
 
+	@Override
 	public HttpSession getSession() {
 		return this.request.getSession();
 	}
 
+	@Override
 	public Object getPage() {
 		return this;
 	}
 
+	@Override
 	public ServletRequest getRequest() {
 		return this.request;
 	}
 
+	@Override
 	public ServletResponse getResponse() {
 		return this.response;
 	}
 
+	@Override
 	public Exception getException() {
 		return null;
 	}
 
+	@Override
 	public ServletConfig getServletConfig() {
 		return this.servletConfig;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
 
+	@Override
 	public void forward(String path) throws ServletException, IOException {
 		this.request.getRequestDispatcher(path).forward(this.request, this.response);
 	}
 
+	@Override
 	public void include(String path) throws ServletException, IOException {
 		this.request.getRequestDispatcher(path).include(this.request, this.response);
 	}
 
+	@Override
 	public void include(String path, boolean flush) throws ServletException, IOException {
 		this.request.getRequestDispatcher(path).include(this.request, this.response);
 		if (flush) {
@@ -340,10 +365,12 @@ public class MockPageContext extends PageContext {
 		return ((MockHttpServletResponse) this.response).getContentAsString();
 	}
 
+	@Override
 	public void handlePageException(Exception ex) throws ServletException, IOException {
 		throw new ServletException("Page exception", ex);
 	}
 
+	@Override
 	public void handlePageException(Throwable ex) throws ServletException, IOException {
 		throw new ServletException("Page exception", ex);
 	}
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockPart.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockPart.java
index ef594bc757..f26dfc2b9c 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockPart.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockPart.java
@@ -90,22 +90,27 @@ public class MockPart implements Part {
 	}
 
 
+	@Override
 	public String getName() {
 		return this.name;
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public long getSize() {
 		return this.content.length;
 	}
 
+	@Override
 	public InputStream getInputStream() throws IOException {
 		return new ByteArrayInputStream(this.content);
 	}
 
+	@Override
 	public String getHeader(String name) {
 		if (CONTENT_TYPE.equalsIgnoreCase(name)) {
 			return this.contentType;
@@ -115,6 +120,7 @@ public class MockPart implements Part {
 		}
 	}
 
+	@Override
 	public Collection<String> getHeaders(String name) {
 		if (CONTENT_TYPE.equalsIgnoreCase(name)) {
 			return Collections.singleton(this.contentType);
@@ -124,14 +130,17 @@ public class MockPart implements Part {
 		}
 	}
 
+	@Override
 	public Collection<String> getHeaderNames() {
 		return Collections.singleton(CONTENT_TYPE);
 	}
 
+	@Override
 	public void write(String fileName) throws IOException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void delete() throws IOException {
 		throw new UnsupportedOperationException();
 	}
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockRequestDispatcher.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockRequestDispatcher.java
index d2766fcb0f..b8679b8020 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockRequestDispatcher.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockRequestDispatcher.java
@@ -55,6 +55,7 @@ public class MockRequestDispatcher implements RequestDispatcher {
 	}
 
 
+	@Override
 	public void forward(ServletRequest request, ServletResponse response) {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
@@ -67,6 +68,7 @@ public class MockRequestDispatcher implements RequestDispatcher {
 		}
 	}
 
+	@Override
 	public void include(ServletRequest request, ServletResponse response) {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletConfig.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletConfig.java
index 9447b10d7e..d7738c9527 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletConfig.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletConfig.java
@@ -78,10 +78,12 @@ public class MockServletConfig implements ServletConfig {
 	}
 
 
+	@Override
 	public String getServletName() {
 		return this.servletName;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
@@ -91,11 +93,13 @@ public class MockServletConfig implements ServletConfig {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
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 3a0e23e293..d18678dc4a 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
@@ -205,6 +205,7 @@ public class MockServletContext implements ServletContext {
 	}
 
 	/* This is a Servlet API 2.5 method. */
+	@Override
 	public String getContextPath() {
 		return this.contextPath;
 	}
@@ -213,6 +214,7 @@ public class MockServletContext implements ServletContext {
 		this.contexts.put(contextPath, context);
 	}
 
+	@Override
 	public ServletContext getContext(String contextPath) {
 		if (this.contextPath.equals(contextPath)) {
 			return this;
@@ -224,6 +226,7 @@ public class MockServletContext implements ServletContext {
 		this.majorVersion = majorVersion;
 	}
 
+	@Override
 	public int getMajorVersion() {
 		return this.majorVersion;
 	}
@@ -232,6 +235,7 @@ public class MockServletContext implements ServletContext {
 		this.minorVersion = minorVersion;
 	}
 
+	@Override
 	public int getMinorVersion() {
 		return this.minorVersion;
 	}
@@ -240,6 +244,7 @@ public class MockServletContext implements ServletContext {
 		this.effectiveMajorVersion = effectiveMajorVersion;
 	}
 
+	@Override
 	public int getEffectiveMajorVersion() {
 		return this.effectiveMajorVersion;
 	}
@@ -248,14 +253,17 @@ public class MockServletContext implements ServletContext {
 		this.effectiveMinorVersion = effectiveMinorVersion;
 	}
 
+	@Override
 	public int getEffectiveMinorVersion() {
 		return this.effectiveMinorVersion;
 	}
 
+	@Override
 	public String getMimeType(String filePath) {
 		return MimeTypeResolver.getMimeType(filePath);
 	}
 
+	@Override
 	public Set<String> getResourcePaths(String path) {
 		String actualPath = (path.endsWith("/") ? path : path + "/");
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(actualPath));
@@ -281,6 +289,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public URL getResource(String path) throws MalformedURLException {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		if (!resource.exists()) {
@@ -298,6 +307,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public InputStream getResourceAsStream(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		if (!resource.exists()) {
@@ -312,6 +322,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public RequestDispatcher getRequestDispatcher(String path) {
 		if (!path.startsWith("/")) {
 			throw new IllegalArgumentException("RequestDispatcher path at ServletContext level must start with '/'");
@@ -319,6 +330,7 @@ public class MockServletContext implements ServletContext {
 		return new MockRequestDispatcher(path);
 	}
 
+	@Override
 	public RequestDispatcher getNamedDispatcher(String path) {
 		return this.namedRequestDispatchers.get(path);
 	}
@@ -376,30 +388,37 @@ public class MockServletContext implements ServletContext {
 		registerNamedDispatcher(this.defaultServletName, new MockRequestDispatcher(this.defaultServletName));
 	}
 
+	@Override
 	public Servlet getServlet(String name) {
 		return null;
 	}
 
+	@Override
 	public Enumeration<Servlet> getServlets() {
 		return Collections.enumeration(new HashSet<Servlet>());
 	}
 
+	@Override
 	public Enumeration<String> getServletNames() {
 		return Collections.enumeration(new HashSet<String>());
 	}
 
+	@Override
 	public void log(String message) {
 		logger.info(message);
 	}
 
+	@Override
 	public void log(Exception ex, String message) {
 		logger.info(message, ex);
 	}
 
+	@Override
 	public void log(String message, Throwable ex) {
 		logger.info(message, ex);
 	}
 
+	@Override
 	public String getRealPath(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		try {
@@ -411,19 +430,23 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public String getServerInfo() {
 		return "MockServletContext";
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
 
+	@Override
 	public boolean setInitParameter(String name, String value) {
 		Assert.notNull(name, "Parameter name must not be null");
 		if (this.initParameters.containsKey(name)) {
@@ -438,15 +461,18 @@ public class MockServletContext implements ServletContext {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		Assert.notNull(name, "Attribute name must not be null");
 		if (value != null) {
@@ -457,6 +483,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		this.attributes.remove(name);
@@ -466,14 +493,17 @@ public class MockServletContext implements ServletContext {
 		this.servletContextName = servletContextName;
 	}
 
+	@Override
 	public String getServletContextName() {
 		return this.servletContextName;
 	}
 
+	@Override
 	public ClassLoader getClassLoader() {
 		return ClassUtils.getDefaultClassLoader();
 	}
 
+	@Override
 	public void declareRoles(String... roleNames) {
 		Assert.notNull(roleNames, "Role names array must not be null");
 		for (String roleName : roleNames) {
@@ -503,90 +533,111 @@ public class MockServletContext implements ServletContext {
 	// Methods introduced in Servlet 3.0
 	//---------------------------------------------------------------------
 
+	@Override
 	public FilterRegistration.Dynamic addFilter(String filterName, String className) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void addListener(Class<? extends EventListener> listenerClass) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void addListener(String className) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public <T extends EventListener> void addListener(T t) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public ServletRegistration.Dynamic addServlet(String servletName, String className) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public ServletRegistration.Dynamic addServlet(String servletName,
 			Class<? extends Servlet> servletClass) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public <T extends Filter> T createFilter(Class<T> c)
 			throws ServletException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public <T extends EventListener> T createListener(Class<T> c)
 			throws ServletException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public <T extends Servlet> T createServlet(Class<T> c)
 			throws ServletException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public FilterRegistration getFilterRegistration(String filterName) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public JspConfigDescriptor getJspConfigDescriptor() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public ServletRegistration getServletRegistration(String servletName) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Map<String, ? extends ServletRegistration> getServletRegistrations() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public SessionCookieConfig getSessionCookieConfig() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes)
 			throws IllegalStateException, IllegalArgumentException {
 		throw new UnsupportedOperationException();
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/PassThroughFilterChain.java b/spring-web/src/test/java/org/springframework/mock/web/test/PassThroughFilterChain.java
index 3e3b09b159..505aa3f6bc 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/PassThroughFilterChain.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/PassThroughFilterChain.java
@@ -73,6 +73,7 @@ public class PassThroughFilterChain implements FilterChain {
 	/**
 	 * Pass the call on to the Filter/Servlet.
 	 */
+	@Override
 	public void doFilter(ServletRequest request, ServletResponse response) throws ServletException, IOException {
 		if (this.filter != null) {
 			this.filter.doFilter(request, response, this.nextFilterChain);
diff --git a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
index b2ca68eb7f..17369efaa5 100644
--- a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
+++ b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
@@ -219,14 +219,17 @@ public class CauchoRemotingTests extends TestCase {
 		private String password;
 		private boolean overloadEnabled;
 
+		@Override
 		public void setUser(String user) {
 			this.user = user;
 		}
 
+		@Override
 		public void setPassword(String password) {
 			this.password = password;
 		}
 
+		@Override
 		public void setOverloadEnabled(boolean overloadEnabled) {
 			this.overloadEnabled = overloadEnabled;
 		}
@@ -239,14 +242,17 @@ public class CauchoRemotingTests extends TestCase {
 		private String password;
 		private boolean overloadEnabled;
 
+		@Override
 		public void setUser(String user) {
 			this.user = user;
 		}
 
+		@Override
 		public void setPassword(String password) {
 			this.password = password;
 		}
 
+		@Override
 		public void setOverloadEnabled(boolean overloadEnabled) {
 			this.overloadEnabled = overloadEnabled;
 		}
diff --git a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
index 56569a8e04..71c463177a 100644
--- a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
+++ b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
@@ -73,6 +73,7 @@ public class HttpInvokerTests extends TestCase {
 		pfb.setServiceUrl("http://myurl");
 
 		pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() {
+			@Override
 			protected RemoteInvocationResult doExecuteRequest(
 					HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception {
 				assertEquals("http://myurl", config.getServiceUrl());
@@ -138,6 +139,7 @@ public class HttpInvokerTests extends TestCase {
 		pfb.setServiceUrl("http://myurl");
 
 		pfb.setHttpInvokerRequestExecutor(new HttpInvokerRequestExecutor() {
+			@Override
 			public RemoteInvocationResult executeRequest(
 					HttpInvokerClientConfiguration config, RemoteInvocation invocation) throws IOException {
 				throw new IOException("argh");
@@ -160,6 +162,7 @@ public class HttpInvokerTests extends TestCase {
 		TestBean target = new TestBean("myname", 99);
 
 		final HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter() {
+			@Override
 			protected InputStream decorateInputStream(HttpServletRequest request, InputStream is) throws IOException {
 				if ("gzip".equals(request.getHeader("Compression"))) {
 					return new GZIPInputStream(is);
@@ -168,6 +171,7 @@ public class HttpInvokerTests extends TestCase {
 					return is;
 				}
 			}
+			@Override
 			protected OutputStream decorateOutputStream(
 					HttpServletRequest request, HttpServletResponse response, OutputStream os) throws IOException {
 				if ("gzip".equals(request.getHeader("Compression"))) {
@@ -187,6 +191,7 @@ public class HttpInvokerTests extends TestCase {
 		pfb.setServiceUrl("http://myurl");
 
 		pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() {
+			@Override
 			protected RemoteInvocationResult doExecuteRequest(
 					HttpInvokerClientConfiguration config, ByteArrayOutputStream baos)
 					throws IOException, ClassNotFoundException {
@@ -204,9 +209,11 @@ public class HttpInvokerTests extends TestCase {
 				return readRemoteInvocationResult(
 						new ByteArrayInputStream(response.getContentAsByteArray()), config.getCodebaseUrl());
 			}
+			@Override
 			protected OutputStream decorateOutputStream(OutputStream os) throws IOException {
 				return new GZIPOutputStream(os);
 			}
+			@Override
 			protected InputStream decorateInputStream(InputStream is) throws IOException {
 				return new GZIPInputStream(is);
 			}
@@ -239,6 +246,7 @@ public class HttpInvokerTests extends TestCase {
 		TestBean target = new TestBean("myname", 99);
 
 		final HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter() {
+			@Override
 			protected RemoteInvocation doReadRemoteInvocation(ObjectInputStream ois)
 					throws IOException, ClassNotFoundException {
 				Object obj = ois.readObject();
@@ -248,6 +256,7 @@ public class HttpInvokerTests extends TestCase {
 				}
 				return ((TestRemoteInvocationWrapper) obj).remoteInvocation;
 			}
+			@Override
 			protected void doWriteRemoteInvocationResult(RemoteInvocationResult result, ObjectOutputStream oos)
 					throws IOException {
 				oos.writeObject(new TestRemoteInvocationResultWrapper(result));
@@ -262,6 +271,7 @@ public class HttpInvokerTests extends TestCase {
 		pfb.setServiceUrl("http://myurl");
 
 		pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() {
+			@Override
 			protected RemoteInvocationResult doExecuteRequest(
 					HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception {
 				assertEquals("http://myurl", config.getServiceUrl());
@@ -272,9 +282,11 @@ public class HttpInvokerTests extends TestCase {
 				return readRemoteInvocationResult(
 						new ByteArrayInputStream(response.getContentAsByteArray()), config.getCodebaseUrl());
 			}
+			@Override
 			protected void doWriteRemoteInvocation(RemoteInvocation invocation, ObjectOutputStream oos) throws IOException {
 				oos.writeObject(new TestRemoteInvocationWrapper(invocation));
 			}
+			@Override
 			protected RemoteInvocationResult doReadRemoteInvocationResult(ObjectInputStream ois)
 					throws IOException, ClassNotFoundException {
 				Object obj = ois.readObject();
@@ -316,6 +328,7 @@ public class HttpInvokerTests extends TestCase {
 		exporter.setServiceInterface(ITestBean.class);
 		exporter.setService(target);
 		exporter.setRemoteInvocationExecutor(new DefaultRemoteInvocationExecutor() {
+			@Override
 			public Object invoke(RemoteInvocation invocation, Object targetObject)
 					throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
 				assertNotNull(invocation.getAttributes());
@@ -331,6 +344,7 @@ public class HttpInvokerTests extends TestCase {
 		pfb.setServiceInterface(ITestBean.class);
 		pfb.setServiceUrl("http://myurl");
 		pfb.setRemoteInvocationFactory(new RemoteInvocationFactory() {
+			@Override
 			public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) {
 				RemoteInvocation invocation = new RemoteInvocation(methodInvocation);
 				invocation.addAttribute("myKey", "myValue");
@@ -350,6 +364,7 @@ public class HttpInvokerTests extends TestCase {
 		});
 
 		pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() {
+			@Override
 			protected RemoteInvocationResult doExecuteRequest(
 					HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception {
 				assertEquals("http://myurl", config.getServiceUrl());
@@ -375,6 +390,7 @@ public class HttpInvokerTests extends TestCase {
 		exporter.setServiceInterface(ITestBean.class);
 		exporter.setService(target);
 		exporter.setRemoteInvocationExecutor(new DefaultRemoteInvocationExecutor() {
+			@Override
 			public Object invoke(RemoteInvocation invocation, Object targetObject)
 					throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
 				assertTrue(invocation instanceof TestRemoteInvocation);
@@ -389,6 +405,7 @@ public class HttpInvokerTests extends TestCase {
 		pfb.setServiceInterface(ITestBean.class);
 		pfb.setServiceUrl("http://myurl");
 		pfb.setRemoteInvocationFactory(new RemoteInvocationFactory() {
+			@Override
 			public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) {
 				RemoteInvocation invocation = new TestRemoteInvocation(methodInvocation);
 				assertNull(invocation.getAttributes());
@@ -398,6 +415,7 @@ public class HttpInvokerTests extends TestCase {
 		});
 
 		pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() {
+			@Override
 			protected RemoteInvocationResult doExecuteRequest(
 					HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception {
 				assertEquals("http://myurl", config.getServiceUrl());
@@ -423,6 +441,7 @@ public class HttpInvokerTests extends TestCase {
 		pfb.setServiceUrl(serviceUrl);
 
 		pfb.setHttpInvokerRequestExecutor(new HttpInvokerRequestExecutor() {
+			@Override
 			public RemoteInvocationResult executeRequest(
 					HttpInvokerClientConfiguration config, RemoteInvocation invocation) throws IOException {
 				throw new IOException("argh");
diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java b/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java
index 1f249589b5..ac50ac8d2e 100644
--- a/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java
+++ b/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java
@@ -495,6 +495,7 @@ public class JaxRpcSupportTests extends TestCase {
 			service1Control.setReturnValue(new RemoteBean());
 		}
 
+		@Override
 		public Service createService(QName qName) throws ServiceException {
 			if (!"myNamespace".equals(qName.getNamespaceURI()) || !"myService1".equals(qName.getLocalPart())) {
 				throw new ServiceException("not supported");
@@ -503,6 +504,7 @@ public class JaxRpcSupportTests extends TestCase {
 			return service1;
 		}
 
+		@Override
 		public Service createService(URL url, QName qName) throws ServiceException {
 			try {
 				if (!(new URL("http://myUrl1")).equals(url) || !"".equals(qName.getNamespaceURI()) ||
@@ -516,6 +518,7 @@ public class JaxRpcSupportTests extends TestCase {
 			return service2;
 		}
 
+		@Override
 		public Service loadService(URL url, QName qName, Properties props) throws ServiceException {
 			try {
 				if (!(new URL("http://myUrl1")).equals(url) || !"".equals(qName.getNamespaceURI()) ||
@@ -532,6 +535,7 @@ public class JaxRpcSupportTests extends TestCase {
 			return service1;
 		}
 
+		@Override
 		public Service loadService(Class ifc) throws ServiceException {
 			if (!IRemoteBean.class.equals(ifc)) {
 				throw new ServiceException("not supported");
@@ -540,6 +544,7 @@ public class JaxRpcSupportTests extends TestCase {
 			return service2;
 		}
 
+		@Override
 		public Service loadService(URL url, Class ifc, Properties props) throws ServiceException {
 			try {
 				if (!(new URL("http://myUrl1")).equals(url) || !IRemoteBean.class.equals(ifc)) {
@@ -563,6 +568,7 @@ public class JaxRpcSupportTests extends TestCase {
 			super();
 		}
 
+		@Override
 		protected void initMocks() throws Exception {
 			super.initMocks();
 			service1.getPort(new QName("myNamespace", "myPort"), IRemoteBean.class);
@@ -580,6 +586,7 @@ public class JaxRpcSupportTests extends TestCase {
 			super();
 		}
 
+		@Override
 		protected void initMocks() throws Exception {
 			initStandardCall(1);
 		}
@@ -591,9 +598,11 @@ public class JaxRpcSupportTests extends TestCase {
 			service1Control.setReturnValue(call1, count);
 			call1.invoke(new Object[] {"myName"});
 			call1Control.setMatcher(new ArgumentsMatcher() {
+				@Override
 				public boolean matches(Object[] objects, Object[] objects1) {
 					return Arrays.equals((Object[]) objects[0], (Object[]) objects1[0]);
 				}
+				@Override
 				public String toString(Object[] objects) {
 					return ObjectUtils.nullSafeToString(objects[0]);
 				}
@@ -616,6 +625,7 @@ public class JaxRpcSupportTests extends TestCase {
 		public ExceptionCallMockServiceFactory() throws Exception {
 		}
 
+		@Override
 		protected void initMocks() throws Exception {
 			initExceptionCall();
 			initStandardCall(2);
@@ -628,9 +638,11 @@ public class JaxRpcSupportTests extends TestCase {
 			service1Control.setReturnValue(call2);
 			call2.invoke(new Object[] {"exception"});
 			call2Control.setMatcher(new ArgumentsMatcher() {
+				@Override
 				public boolean matches(Object[] objects, Object[] objects1) {
 					return Arrays.equals((Object[]) objects[0], (Object[]) objects1[0]);
 				}
+				@Override
 				public String toString(Object[] objects) {
 					return ObjectUtils.nullSafeToString(objects[0]);
 				}
@@ -646,6 +658,7 @@ public class JaxRpcSupportTests extends TestCase {
 		public CallWithPropertiesMockServiceFactory() throws Exception {
 		}
 
+		@Override
 		protected void extendStandardCall() {
 			call1.setProperty(Call.USERNAME_PROPERTY, "user");
 			call1Control.setVoidCallable();
@@ -682,6 +695,7 @@ public class JaxRpcSupportTests extends TestCase {
 			properties = new HashMap();
 		}
 
+		@Override
 		public void setName(String nam) throws RemoteException {
 			if ("exception".equals(nam)) {
 				throw new RemoteException();
@@ -689,14 +703,17 @@ public class JaxRpcSupportTests extends TestCase {
 			name = nam;
 		}
 
+		@Override
 		public void _setProperty(String key, Object o) {
 			properties.put(key, o);
 		}
 
+		@Override
 		public Object _getProperty(String key) {
 			return properties.get(key);
 		}
 
+		@Override
 		public Iterator _getPropertyNames() {
 			return properties.keySet().iterator();
 		}
diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java
index 6c9ba36462..4cd69cbb41 100644
--- a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java
+++ b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java
@@ -31,6 +31,7 @@ public class OrderServiceImpl implements OrderService {
 	@Resource
 	private WebServiceContext webServiceContext;
 
+	@Override
 	public String getOrder(int id) throws OrderNotFoundException {
 		Assert.notNull(this.webServiceContext, "WebServiceContext has not been injected");
 		if (id == 0) {
diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
index a34e3749b9..cf514b44b8 100644
--- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
+++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
@@ -44,6 +44,7 @@ public class ServletRequestDataBinderTests {
 
 		ServletRequestDataBinder binder = new ServletRequestDataBinder(tb, "person");
 		binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean());
 			}
@@ -168,6 +169,7 @@ public class ServletRequestDataBinderTests {
 
 		ServletRequestDataBinder binder = new ServletRequestDataBinder(tb, "person");
 		binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean());
 			}
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 49be202f58..3f194e9bd0 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
@@ -46,6 +46,7 @@ public class WebRequestDataBinderTests {
 
 		WebRequestDataBinder binder = new WebRequestDataBinder(tb, "person");
 		binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean());
 			}
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java
index 55a115e2d4..6d9d28e0a7 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java
@@ -87,6 +87,7 @@ public class RequestContextListenerTests extends TestCase {
 
 		// Execute requestDestroyed callback in different thread.
 		Thread thread = new Thread() {
+			@Override
 			public void run() {
 				listener.requestDestroyed(new ServletRequestEvent(context, request));
 			}
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
index 80a3a1b80c..3b12ab2dba 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
@@ -38,6 +38,7 @@ public class RequestScopeTests extends TestCase {
 
 	private DefaultListableBeanFactory beanFactory;
 
+	@Override
 	protected void setUp() throws Exception {
 		this.beanFactory = new DefaultListableBeanFactory();
 		this.beanFactory.registerScope("request", new RequestScope());
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
index cb45ad363a..c6b0c656fa 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
@@ -40,6 +40,7 @@ public class SessionScopeTests extends TestCase {
 
 	private DefaultListableBeanFactory beanFactory;
 
+	@Override
 	protected void setUp() throws Exception {
 		this.beanFactory = new DefaultListableBeanFactory();
 		this.beanFactory.registerScope("session", new SessionScope());
@@ -162,14 +163,17 @@ public class SessionScopeTests extends TestCase {
 
 	private static class CustomDestructionAwareBeanPostProcessor implements DestructionAwareBeanPostProcessor {
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 			return bean;
 		}
 
+		@Override
 		public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException {
 		}
 	}
@@ -179,14 +183,17 @@ public class SessionScopeTests extends TestCase {
 	private static class CustomSerializableDestructionAwareBeanPostProcessor
 			implements DestructionAwareBeanPostProcessor, Serializable {
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 			return bean;
 		}
 
+		@Override
 		public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException {
 			if (bean instanceof BeanNameAware) {
 				((BeanNameAware) bean).setBeanName(null);
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java
index bcb780ae9a..2590481d3d 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java
@@ -86,6 +86,7 @@ public class DeferredResultTests {
 
 		DeferredResult<String> result = new DeferredResult<String>();
 		result.onCompletion(new Runnable() {
+			@Override
 			public void run() {
 				sb.append("completion event");
 			}
@@ -108,6 +109,7 @@ public class DeferredResultTests {
 		DeferredResult<String> result = new DeferredResult<String>(null, "timeout result");
 		result.setResultHandler(handler);
 		result.onTimeout(new Runnable() {
+			@Override
 			public void run() {
 				sb.append("timeout event");
 			}
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java
index 50df5a3a35..506201f5ba 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java
@@ -432,6 +432,7 @@ public class WebAsyncManagerTests {
 			this.value = value;
 		}
 
+		@Override
 		public Object call() throws Exception {
 			if (this.value instanceof Exception) {
 				throw ((Exception) this.value);
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java
index 6ffbec1d7a..936be8d79a 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java
@@ -104,6 +104,7 @@ public class WebAsyncManagerTimeoutTests {
 		StubCallable callable = new StubCallable();
 		WebAsyncTask<Object> webAsyncTask = new WebAsyncTask<Object>(callable);
 		webAsyncTask.onTimeout(new Callable<Object>() {
+			@Override
 			public Object call() throws Exception {
 				return 7;
 			}
@@ -207,6 +208,7 @@ public class WebAsyncManagerTimeoutTests {
 
 		final DeferredResult<Integer> deferredResult = new DeferredResult<Integer>();
 		deferredResult.onTimeout(new Runnable() {
+			@Override
 			public void run() {
 				deferredResult.setResult(23);
 			}
@@ -228,6 +230,7 @@ public class WebAsyncManagerTimeoutTests {
 		DeferredResult<Integer> deferredResult = new DeferredResult<Integer>();
 
 		DeferredResultProcessingInterceptor interceptor = new DeferredResultProcessingInterceptorAdapter() {
+			@Override
 			public <T> boolean handleTimeout(NativeWebRequest request, DeferredResult<T> result) throws Exception {
 				result.setErrorResult(23);
 				return true;
@@ -252,6 +255,7 @@ public class WebAsyncManagerTimeoutTests {
 		final Exception exception = new Exception();
 
 		DeferredResultProcessingInterceptor interceptor = new DeferredResultProcessingInterceptorAdapter() {
+			@Override
 			public <T> boolean handleTimeout(NativeWebRequest request, DeferredResult<T> result) throws Exception {
 				throw exception;
 			}
@@ -270,6 +274,7 @@ public class WebAsyncManagerTimeoutTests {
 
 
 	private final class StubCallable implements Callable<Object> {
+		@Override
 		public Object call() throws Exception {
 			return 21;
 		}
diff --git a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java
index 4f7d5451d3..d55954f32e 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java
@@ -71,14 +71,17 @@ public class CompositeFilterTests {
 
 		public FilterConfig filterConfig;
 
+		@Override
 		public void init(FilterConfig filterConfig) throws ServletException {
 			this.filterConfig = filterConfig;
 		}
 
+		@Override
 		public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException {
 			request.setAttribute("called", Boolean.TRUE);
 		}
 
+		@Override
 		public void destroy() {
 			this.filterConfig = null;
 		}
diff --git a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java
index 0d54f55d48..69df4dd5f1 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java
@@ -272,14 +272,17 @@ public class DelegatingFilterProxyTests {
 
 		public FilterConfig filterConfig;
 
+		@Override
 		public void init(FilterConfig filterConfig) throws ServletException {
 			this.filterConfig = filterConfig;
 		}
 
+		@Override
 		public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException {
 			request.setAttribute("called", Boolean.TRUE);
 		}
 
+		@Override
 		public void destroy() {
 			this.filterConfig = null;
 		}
diff --git a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java
index 13f74da0aa..d1af1f1fcc 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java
@@ -48,6 +48,7 @@ public class HiddenHttpMethodFilterTest {
 
 		FilterChain filterChain = new FilterChain() {
 
+			@Override
 			public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse)
 					throws IOException, ServletException {
 				assertEquals("Invalid method", "DELETE", ((HttpServletRequest) filterRequest).getMethod());
@@ -63,6 +64,7 @@ public class HiddenHttpMethodFilterTest {
 
 		FilterChain filterChain = new FilterChain() {
 
+			@Override
 			public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse)
 					throws IOException, ServletException {
 				assertEquals("Invalid method", "POST", ((HttpServletRequest) filterRequest).getMethod());
diff --git a/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java
index 5eed6a55ac..d8c4128bf4 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java
@@ -54,6 +54,7 @@ public class RequestContextFilterTests extends TestCase {
 		// Expect one invocation by the filter being tested
 		class DummyFilterChain implements FilterChain {
 			public int invocations = 0;
+			@Override
 			public void doFilter(ServletRequest req, ServletResponse resp) throws IOException, ServletException {
 				++invocations;
 				if (invocations == 1) {
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 a05f09a2fa..15ab9998a4 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
@@ -97,6 +97,7 @@ public class RequestLoggingFilterTests {
 		request.setContent(requestBody);
 		FilterChain filterChain = new FilterChain() {
 
+			@Override
 			public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse)
 					throws IOException, ServletException {
 				((HttpServletResponse) filterResponse).setStatus(HttpServletResponse.SC_OK);
@@ -122,6 +123,7 @@ public class RequestLoggingFilterTests {
 		request.setContent(requestBody.getBytes("UTF-8"));
 		FilterChain filterChain = new FilterChain() {
 
+			@Override
 			public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse)
 					throws IOException, ServletException {
 				((HttpServletResponse) filterResponse).setStatus(HttpServletResponse.SC_OK);
@@ -148,6 +150,7 @@ public class RequestLoggingFilterTests {
 		request.setContent(requestBody);
 		FilterChain filterChain = new FilterChain() {
 
+			@Override
 			public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse)
 					throws IOException, ServletException {
 				((HttpServletResponse) filterResponse).setStatus(HttpServletResponse.SC_OK);
@@ -182,6 +185,7 @@ public class RequestLoggingFilterTests {
 
 	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/filter/ShallowEtagHeaderFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java
index f5fdf08499..8ff31eb224 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java
@@ -58,6 +58,7 @@ public class ShallowEtagHeaderFilterTests {
 		final byte[] responseBody = "Hello World".getBytes("UTF-8");
 		FilterChain filterChain = new FilterChain() {
 
+			@Override
 			public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse)
 					throws IOException, ServletException {
 				assertEquals("Invalid request passed", request, filterRequest);
@@ -83,6 +84,7 @@ public class ShallowEtagHeaderFilterTests {
 
 		FilterChain filterChain = new FilterChain() {
 
+			@Override
 			public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse)
 					throws IOException, ServletException {
 				assertEquals("Invalid request passed", request, filterRequest);
@@ -109,6 +111,7 @@ public class ShallowEtagHeaderFilterTests {
 
 		FilterChain filterChain = new FilterChain() {
 
+			@Override
 			public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse)
 					throws IOException, ServletException {
 				assertEquals("Invalid request passed", request, filterRequest);
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
index e106045cf9..0138ccd067 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
@@ -36,12 +36,14 @@ public class DelegatingPhaseListenerTests extends TestCase {
 	private StaticListableBeanFactory beanFactory;
 	private DelegatingPhaseListenerMulticaster delPhaseListener;
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void setUp() {
 		facesContext = new MockFacesContext();
 		beanFactory = new StaticListableBeanFactory();
 
 		delPhaseListener = new DelegatingPhaseListenerMulticaster() {
+			@Override
 			protected ListableBeanFactory getBeanFactory(FacesContext facesContext) {
 				return beanFactory;
 			}
@@ -87,14 +89,17 @@ public class DelegatingPhaseListenerTests extends TestCase {
 		boolean beforeCalled = false;
 		boolean afterCalled = false;
 
+		@Override
 		public PhaseId getPhaseId() {
 			return PhaseId.ANY_PHASE;
 		}
 
+		@Override
 		public void beforePhase(PhaseEvent arg0) {
 			beforeCalled = true;
 		}
 
+		@Override
 		public void afterPhase(PhaseEvent arg0) {
 			afterCalled = true;
 		}
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
index 76e8c829b1..0eefcba0c7 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
@@ -42,6 +42,7 @@ public class DelegatingVariableResolverTests extends TestCase {
 		// We need to override the getWebApplicationContext method here:
 		// FacesContext and ExternalContext are hard to mock.
 		DelegatingVariableResolver resolver = new DelegatingVariableResolver(new OriginalVariableResolver()) {
+			@Override
 			protected WebApplicationContext getWebApplicationContext(FacesContext facesContext) {
 				return wac;
 			}
@@ -61,6 +62,7 @@ public class DelegatingVariableResolverTests extends TestCase {
 		// We need to override the getWebApplicationContext method here:
 		// FacesContext and ExternalContext are hard to mock.
 		SpringBeanVariableResolver resolver = new SpringBeanVariableResolver(new OriginalVariableResolver()) {
+			@Override
 			protected WebApplicationContext getWebApplicationContext(FacesContext facesContext) {
 				return wac;
 			}
@@ -72,6 +74,7 @@ public class DelegatingVariableResolverTests extends TestCase {
 
 	private static class OriginalVariableResolver extends VariableResolver {
 
+		@Override
 		public Object resolveVariable(FacesContext facesContext, String name) throws EvaluationException {
 			if ("var1".equals(name)) {
 				return "val1";
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
index 1e6c9d3f9f..7faee579e7 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
@@ -44,6 +44,7 @@ public class MockFacesContext extends FacesContext {
 	private UIViewRoot viewRoot;
 
 
+	@Override
 	public Application getApplication() {
 		return application;
 	}
@@ -52,10 +53,12 @@ public class MockFacesContext extends FacesContext {
 		this.application = application;
 	}
 
+	@Override
 	public Iterator getClientIdsWithMessages() {
 		return null;
 	}
 
+	@Override
 	public ExternalContext getExternalContext() {
 		return externalContext;
 	}
@@ -64,61 +67,77 @@ public class MockFacesContext extends FacesContext {
 		this.externalContext = externalContext;
 	}
 
+	@Override
 	public Severity getMaximumSeverity() {
 		return null;
 	}
 
+	@Override
 	public Iterator getMessages() {
 		return null;
 	}
 
+	@Override
 	public Iterator getMessages(String arg0) {
 		return null;
 	}
 
+	@Override
 	public RenderKit getRenderKit() {
 		return null;
 	}
 
+	@Override
 	public boolean getRenderResponse() {
 		return false;
 	}
 
+	@Override
 	public boolean getResponseComplete() {
 		return false;
 	}
 
+	@Override
 	public ResponseStream getResponseStream() {
 		return null;
 	}
 
+	@Override
 	public void setResponseStream(ResponseStream arg0) {
 	}
 
+	@Override
 	public ResponseWriter getResponseWriter() {
 		return null;
 	}
 
+	@Override
 	public void setResponseWriter(ResponseWriter arg0) {
 	}
 
+	@Override
 	public UIViewRoot getViewRoot() {
 		return viewRoot;
 	}
 
+	@Override
 	public void setViewRoot(UIViewRoot viewRoot) {
 		this.viewRoot = viewRoot;
 	}
 
+	@Override
 	public void addMessage(String arg0, FacesMessage arg1) {
 	}
 
+	@Override
 	public void release() {
 	}
 
+	@Override
 	public void renderResponse() {
 	}
 
+	@Override
 	public void responseComplete() {
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java
index 5cda13aead..0ab7d46b39 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java
@@ -27,19 +27,24 @@ import javax.faces.lifecycle.Lifecycle;
  */
 public class MockLifecycle extends Lifecycle {
 
+	@Override
 	public void addPhaseListener(PhaseListener phaseListener) {
 	}
 
+	@Override
 	public void execute(FacesContext facesContext) throws FacesException {
 	}
 
+	@Override
 	public PhaseListener[] getPhaseListeners() {
 		return null;
 	}
 
+	@Override
 	public void removePhaseListener(PhaseListener phaseListener) {
 	}
 
+	@Override
 	public void render(FacesContext facesContext) throws FacesException {
 	}
 
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java
index 573b1c54b3..986df7e9fa 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java
@@ -265,14 +265,17 @@ public class ModelAttributeMethodProcessorTests {
 			return validateInvoked;
 		}
 
+		@Override
 		public void bind(WebRequest request) {
 			bindInvoked = true;
 		}
 
+		@Override
 		public void validate() {
 			validateInvoked = true;
 		}
 
+		@Override
 		public void validate(Object... validationHints) {
 			validateInvoked = true;
 		}
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 9eb740031e..d4e681abe3 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
@@ -226,10 +226,12 @@ public class InvocableHandlerMethodTests {
 
 	private static class ExceptionRaisingArgumentResolver implements HandlerMethodArgumentResolver {
 
+		@Override
 		public boolean supportsParameter(MethodParameter parameter) {
 			return true;
 		}
 
+		@Override
 		public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
 				NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
 			throw new HttpMessageNotReadableException("oops, can't read");
diff --git a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java
index 45c84b353b..918894fb5f 100644
--- a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java
+++ b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java
@@ -46,10 +46,12 @@ public class StubArgumentResolver implements HandlerMethodArgumentResolver {
 		return resolvedParameters;
 	}
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return parameter.getParameterType().equals(this.parameterType);
 	}
 
+	@Override
 	public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
 		this.resolvedParameters.add(parameter);
diff --git a/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java b/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java
index 7f88809354..0320b88612 100644
--- a/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java
+++ b/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java
@@ -38,10 +38,12 @@ public class StubReturnValueHandler implements HandlerMethodReturnValueHandler {
 		return this.returnValue;
 	}
 
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		return returnType.getParameterType().equals(this.returnType);
 	}
 
+	@Override
 	public void handleReturnValue(Object returnValue, MethodParameter returnType, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest) throws Exception {
 		this.returnValue = returnValue;
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 ae2f318b4c..b3aa9beb68 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
@@ -282,6 +282,7 @@ public class CommonsMultipartResolverTests {
 
 		final List<MultipartFile> files = new ArrayList<MultipartFile>();
 		final FilterChain filterChain = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) {
 				MultipartHttpServletRequest request = (MultipartHttpServletRequest) servletRequest;
 				files.addAll(request.getFileMap().values());
@@ -319,6 +320,7 @@ public class CommonsMultipartResolverTests {
 
 		final List<MultipartFile> files = new ArrayList<MultipartFile>();
 		FilterChain filterChain = new FilterChain() {
+			@Override
 			public void doFilter(ServletRequest originalRequest, ServletResponse response) {
 				if (originalRequest instanceof MultipartHttpServletRequest) {
 					MultipartHttpServletRequest request = (MultipartHttpServletRequest) originalRequest;
@@ -415,38 +417,47 @@ public class CommonsMultipartResolverTests {
 			this.value = value;
 		}
 
+		@Override
 		public InputStream getInputStream() throws IOException {
 			return new ByteArrayInputStream(value.getBytes());
 		}
 
+		@Override
 		public String getContentType() {
 			return contentType;
 		}
 
+		@Override
 		public String getName() {
 			return name;
 		}
 
+		@Override
 		public boolean isInMemory() {
 			return true;
 		}
 
+		@Override
 		public long getSize() {
 			return value.length();
 		}
 
+		@Override
 		public byte[] get() {
 			return value.getBytes();
 		}
 
+		@Override
 		public String getString(String encoding) throws UnsupportedEncodingException {
 			return new String(get(), encoding);
 		}
 
+		@Override
 		public String getString() {
 			return value;
 		}
 
+		@Override
 		public void write(File file) throws Exception {
 			this.writtenFile = file;
 		}
@@ -455,6 +466,7 @@ public class CommonsMultipartResolverTests {
 			return writtenFile;
 		}
 
+		@Override
 		public void delete() {
 			this.deleted = true;
 		}
@@ -463,22 +475,27 @@ public class CommonsMultipartResolverTests {
 			return deleted;
 		}
 
+		@Override
 		public String getFieldName() {
 			return fieldName;
 		}
 
+		@Override
 		public void setFieldName(String s) {
 			this.fieldName = s;
 		}
 
+		@Override
 		public boolean isFormField() {
 			return (this.name == null);
 		}
 
+		@Override
 		public void setFormField(boolean b) {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public OutputStream getOutputStream() throws IOException {
 			throw new UnsupportedOperationException();
 		}
diff --git a/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java
index 72f1019cdc..80bf92165b 100644
--- a/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java
@@ -270,6 +270,7 @@ public class ExpressionEvaluationUtilsTests {
 
 		private ExpressionEvaluator eval = new CountingMockExpressionEvaluator(this);
 
+		@Override
 		public ExpressionEvaluator getExpressionEvaluator() {
 			return eval;
 		}
@@ -286,11 +287,13 @@ public class ExpressionEvaluationUtilsTests {
 			super(pageContext);
 		}
 
+		@Override
 		public Expression parseExpression(String expression, Class expectedType, FunctionMapper functionMapper) throws ELException {
 			this.parseExpressionCount++;
 			return super.parseExpression(expression, expectedType, functionMapper);
 		}
 
+		@Override
 		public Object evaluate(String expression, Class expectedType, VariableResolver variableResolver, FunctionMapper functionMapper) throws ELException {
 			this.evaluateCount++;
 			return super.evaluate(expression, expectedType, variableResolver, functionMapper);
diff --git a/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java b/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java
index bb078da54c..d2eab76bc3 100644
--- a/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java
+++ b/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java
@@ -34,6 +34,7 @@ public class MockLog4jAppender extends AppenderSkeleton {
 	/* (non-Javadoc)
 	 * @see org.apache.log4j.AppenderSkeleton#append(org.apache.log4j.spi.LoggingEvent)
 	 */
+	@Override
 	protected void append(LoggingEvent evt) {
 		//System.out.println("Adding " + evt.getMessage());
 		loggingStrings.add(evt.getMessage());
@@ -42,6 +43,7 @@ public class MockLog4jAppender extends AppenderSkeleton {
 	/* (non-Javadoc)
 	 * @see org.apache.log4j.Appender#close()
 	 */
+	@Override
 	public void close() {
 		closeCalled = true;
 	}
@@ -49,6 +51,7 @@ public class MockLog4jAppender extends AppenderSkeleton {
 	/* (non-Javadoc)
 	 * @see org.apache.log4j.Appender#requiresLayout()
 	 */
+	@Override
 	public boolean requiresLayout() {
 		return false;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
index 0940539f54..8ada7848fa 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		if (this.beanName == null || beanName == null) {
 			this.beanName = beanName;
 		}
 	}
 
+	@Override
 	public String getBeanName() {
 		return beanName;
 	}
@@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void destroy() {
 		this.destroyed = true;
 	}
 
+	@Override
 	public boolean wasDestroyed() {
 		return destroyed;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
index 0eb8df5c8a..e136978f9e 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java
index 7842bbfeac..7a27cf0894 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java
@@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 	/**
 	 * @see org.springframework.beans.ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
index a04d179644..9c8be8ac4c 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
@@ -317,6 +317,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase {
 
 	public static class TestBeanEditor extends PropertyEditorSupport {
 
+		@Override
 		public void setAsText(String text) {
 			TestBean tb = new TestBean();
 			StringTokenizer st = new StringTokenizer(text, "_");
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java
index 006228975a..f3d6eedefe 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java
@@ -74,6 +74,7 @@ public class DummyFactory
 	 * Return if the bean managed by this factory is a singleton.
 	 * @see FactoryBean#isSingleton()
 	 */
+	@Override
 	public boolean isSingleton() {
 		return this.singleton;
 	}
@@ -85,6 +86,7 @@ public class DummyFactory
 		this.singleton = singleton;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -93,6 +95,7 @@ public class DummyFactory
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = (AutowireCapableBeanFactory) beanFactory;
 		this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName);
@@ -119,6 +122,7 @@ public class DummyFactory
 		return otherTestBean;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (initialized) {
 			throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean");
@@ -144,6 +148,7 @@ public class DummyFactory
 	 * and prototype mode.
 	 * @see FactoryBean#getObject()
 	 */
+	@Override
 	public Object getObject() throws BeansException {
 		if (isSingleton()) {
 			return this.testBean;
@@ -158,11 +163,13 @@ public class DummyFactory
 		}
 	}
 
+	@Override
 	public Class getObjectType() {
 		return TestBean.class;
 	}
 
 
+	@Override
 	public void destroy() {
 		if (this.testBean != null) {
 			this.testBean.setName(null);
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java
index 19b7da62f8..191b3509c7 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java
@@ -53,6 +53,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		return initMethodDeclared;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		this.beanName = name;
 	}
@@ -61,6 +62,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.owningFactory = beanFactory;
 	}
@@ -75,6 +77,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		this.postProcessedBeforeInit = true;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.owningFactory == null) {
 			throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean");
@@ -126,6 +129,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		}
 	}
 
+	@Override
 	public void destroy() {
 		if (this.destroyed) {
 			throw new IllegalStateException("Already destroyed");
@@ -140,6 +144,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 
 	public static class PostProcessor implements BeanPostProcessor {
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
 			if (bean instanceof LifecycleBean) {
 				((LifecycleBean) bean).postProcessBeforeInit();
@@ -147,6 +152,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
 			if (bean instanceof LifecycleBean) {
 				((LifecycleBean) bean).postProcessAfterInit();
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
index 4715fe448f..17fd214598 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
@@ -30,6 +30,7 @@ public class MustBeInitialized implements InitializingBean {
 	/**
 	 * @see InitializingBean#afterPropertiesSet()
 	 */
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		this.inited = true;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java
index 72c129ca4e..2a624d5c97 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java
@@ -27,6 +27,7 @@ public class ACATester implements ApplicationContextAware {
 
 	private ApplicationContext ac;
 
+	@Override
 	public void setApplicationContext(ApplicationContext ctx) throws ApplicationContextException {
 		// check reinitialization
 		if (this.ac != null) {
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
index a0493b62ec..fe8201644b 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
@@ -39,10 +39,12 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe
 
 	protected TestListener parentListener = new TestListener();
 
+	@Override
 	protected void setUp() throws Exception {
 		this.applicationContext = createContext();
 	}
 
+	@Override
 	protected BeanFactory getBeanFactory() {
 		return applicationContext;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java
index 8137de62f6..bd15215911 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java
@@ -29,6 +29,7 @@ public class BeanThatBroadcasts implements ApplicationContextAware {
 	public int receivedCount;
 
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 		if (applicationContext.getDisplayName().indexOf("listener") != -1) {
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java
index 9ab3f8ea40..a4c79b2e2c 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java
@@ -43,6 +43,7 @@ public class BeanThatListens implements ApplicationListener {
 	}
 
 
+	@Override
 	public void onApplicationEvent(ApplicationEvent event) {
 		eventCount++;
 		if (beanThatBroadcasts != null) {
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java
index 50c9936c44..14acac1ceb 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java
@@ -15,18 +15,21 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo
 
 	protected ApplicationContext owningContext;
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		super.setBeanFactory(beanFactory);
 		if (this.owningContext != null)
 			throw new RuntimeException("Factory called setBeanFactory after setApplicationContext");
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
 		if (this.owningContext == null)
 			throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean");
 	}
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		if (this.owningFactory == null)
 			throw new RuntimeException("Factory called setApplicationContext before setBeanFactory");
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java
index 29f375105f..739222190f 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java
@@ -21,6 +21,7 @@ public class TestListener implements ApplicationListener {
 		eventCount = 0;
 	}
 
+	@Override
 	public void onApplicationEvent(ApplicationEvent e) {
 		++eventCount;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
index 784e160483..c4d9b9ebb3 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
@@ -54,15 +54,18 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 	}
 
 
+	@Override
 	public void write(int b) throws IOException {
 		this.targetStream.write(b);
 	}
 
+	@Override
 	public void flush() throws IOException {
 		super.flush();
 		this.targetStream.flush();
 	}
 
+	@Override
 	public void close() throws IOException {
 		super.close();
 		this.targetStream.close();
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
index c86e95a93a..5a2b7fd1aa 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -136,6 +136,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.writerAccessAllowed;
 	}
 
+	@Override
 	public void setCharacterEncoding(String characterEncoding) {
 		this.characterEncoding = characterEncoding;
 		this.charset = true;
@@ -152,10 +153,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
 
+	@Override
 	public ServletOutputStream getOutputStream() {
 		if (!this.outputStreamAccessAllowed) {
 			throw new IllegalStateException("OutputStream access not allowed");
@@ -163,6 +166,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.outputStream;
 	}
 
+	@Override
 	public PrintWriter getWriter() throws UnsupportedEncodingException {
 		if (!this.writerAccessAllowed) {
 			throw new IllegalStateException("Writer access not allowed");
@@ -186,6 +190,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 				this.content.toString(this.characterEncoding) : this.content.toString();
 	}
 
+	@Override
 	public void setContentLength(int contentLength) {
 		this.contentLength = contentLength;
 		doAddHeaderValue(CONTENT_LENGTH_HEADER, contentLength, true);
@@ -195,6 +200,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.contentLength;
 	}
 
+	@Override
 	public void setContentType(String contentType) {
 		this.contentType = contentType;
 		if (contentType != null) {
@@ -208,22 +214,27 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public void setBufferSize(int bufferSize) {
 		this.bufferSize = bufferSize;
 	}
 
+	@Override
 	public int getBufferSize() {
 		return this.bufferSize;
 	}
 
+	@Override
 	public void flushBuffer() {
 		setCommitted(true);
 	}
 
+	@Override
 	public void resetBuffer() {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot reset buffer - response is already committed");
@@ -242,10 +253,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		this.committed = committed;
 	}
 
+	@Override
 	public boolean isCommitted() {
 		return this.committed;
 	}
 
+	@Override
 	public void reset() {
 		resetBuffer();
 		this.characterEncoding = null;
@@ -258,10 +271,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		this.errorMessage = null;
 	}
 
+	@Override
 	public void setLocale(Locale locale) {
 		this.locale = locale;
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locale;
 	}
@@ -271,6 +286,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	// HttpServletResponse interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public void addCookie(Cookie cookie) {
 		Assert.notNull(cookie, "Cookie must not be null");
 		this.cookies.add(cookie);
@@ -290,6 +306,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return null;
 	}
 
+	@Override
 	public boolean containsHeader(String name) {
 		return (HeaderValueHolder.getByName(this.headers, name) != null);
 	}
@@ -365,6 +382,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * The default implementation returns the given URL String as-is.
 	 * <p>Can be overridden in subclasses, appending a session id or the like.
 	 */
+	@Override
 	public String encodeURL(String url) {
 		return url;
 	}
@@ -377,18 +395,22 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * override the common {@link #encodeURL} method instead, applying
 	 * to redirect URLs as well as to general URLs.
 	 */
+	@Override
 	public String encodeRedirectURL(String url) {
 		return encodeURL(url);
 	}
 
+	@Override
 	public String encodeUrl(String url) {
 		return encodeURL(url);
 	}
 
+	@Override
 	public String encodeRedirectUrl(String url) {
 		return encodeRedirectURL(url);
 	}
 
+	@Override
 	public void sendError(int status, String errorMessage) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot set error status - response is already committed");
@@ -398,6 +420,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		setCommitted(true);
 	}
 
+	@Override
 	public void sendError(int status) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot set error status - response is already committed");
@@ -406,6 +429,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		setCommitted(true);
 	}
 
+	@Override
 	public void sendRedirect(String url) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot send redirect - response is already committed");
@@ -420,26 +444,32 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return getHeader(LOCATION_HEADER);
 	}
 
+	@Override
 	public void setDateHeader(String name, long value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addDateHeader(String name, long value) {
 		addHeaderValue(name, value);
 	}
 
+	@Override
 	public void setHeader(String name, String value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addHeader(String name, String value) {
 		addHeaderValue(name, value);
 	}
 
+	@Override
 	public void setIntHeader(String name, int value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addIntHeader(String name, int value) {
 		addHeaderValue(name, value);
 	}
@@ -487,10 +517,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public void setStatus(int status) {
 		this.status = status;
 	}
 
+	@Override
 	public void setStatus(int status, String errorMessage) {
 		this.status = status;
 		this.errorMessage = errorMessage;
@@ -553,12 +585,14 @@ public class MockHttpServletResponse implements HttpServletResponse {
 			super(out);
 		}
 
+		@Override
 		public void write(int b) throws IOException {
 			super.write(b);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void flush() throws IOException {
 			super.flush();
 			setCommitted(true);
@@ -576,24 +610,28 @@ public class MockHttpServletResponse implements HttpServletResponse {
 			super(out, true);
 		}
 
+		@Override
 		public void write(char buf[], int off, int len) {
 			super.write(buf, off, len);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void write(String s, int off, int len) {
 			super.write(s, off, len);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void write(int c) {
 			super.write(c);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void flush() {
 			super.flush();
 			setCommitted(true);
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
index 1855230d2c..82a89b61a3 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
@@ -98,10 +98,12 @@ public class MockHttpSession implements HttpSession {
 		this.id = (id != null ? id : Integer.toString(nextId++));
 	}
 
+	@Override
 	public long getCreationTime() {
 		return this.creationTime;
 	}
 
+	@Override
 	public String getId() {
 		return this.id;
 	}
@@ -111,43 +113,53 @@ public class MockHttpSession implements HttpSession {
 		this.isNew = false;
 	}
 
+	@Override
 	public long getLastAccessedTime() {
 		return this.lastAccessedTime;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
 
+	@Override
 	public void setMaxInactiveInterval(int interval) {
 		this.maxInactiveInterval = interval;
 	}
 
+	@Override
 	public int getMaxInactiveInterval() {
 		return this.maxInactiveInterval;
 	}
 
+	@Override
 	public HttpSessionContext getSessionContext() {
 		throw new UnsupportedOperationException("getSessionContext");
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Object getValue(String name) {
 		return getAttribute(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	public String[] getValueNames() {
 		return this.attributes.keySet().toArray(new String[this.attributes.size()]);
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		Assert.notNull(name, "Attribute name must not be null");
 		if (value != null) {
@@ -161,10 +173,12 @@ public class MockHttpSession implements HttpSession {
 		}
 	}
 
+	@Override
 	public void putValue(String name, Object value) {
 		setAttribute(name, value);
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		Object value = this.attributes.remove(name);
@@ -173,6 +187,7 @@ public class MockHttpSession implements HttpSession {
 		}
 	}
 
+	@Override
 	public void removeValue(String name) {
 		removeAttribute(name);
 	}
@@ -197,6 +212,7 @@ public class MockHttpSession implements HttpSession {
 	 *
 	 * @throws IllegalStateException if this method is called on an already invalidated session
 	 */
+	@Override
 	public void invalidate() {
 		if (this.invalid) {
 			throw new IllegalStateException("The session has already been invalidated");
@@ -215,6 +231,7 @@ public class MockHttpSession implements HttpSession {
 		this.isNew = value;
 	}
 
+	@Override
 	public boolean isNew() {
 		return this.isNew;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
index f71992aed7..dbcfa62be3 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
@@ -96,34 +96,42 @@ public class MockMultipartFile implements MultipartFile {
 	}
 
 
+	@Override
 	public String getName() {
 		return this.name;
 	}
 
+	@Override
 	public String getOriginalFilename() {
 		return this.originalFilename;
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return (this.content.length == 0);
 	}
 
+	@Override
 	public long getSize() {
 		return this.content.length;
 	}
 
+	@Override
 	public byte[] getBytes() throws IOException {
 		return this.content;
 	}
 
+	@Override
 	public InputStream getInputStream() throws IOException {
 		return new ByteArrayInputStream(this.content);
 	}
 
+	@Override
 	public void transferTo(File dest) throws IOException, IllegalStateException {
 		FileCopyUtils.copy(this.content, dest);
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
index 88660bb3ae..e43172c198 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
@@ -55,6 +55,7 @@ public class MockRequestDispatcher implements RequestDispatcher {
 	}
 
 
+	@Override
 	public void forward(ServletRequest request, ServletResponse response) {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
@@ -67,6 +68,7 @@ public class MockRequestDispatcher implements RequestDispatcher {
 		}
 	}
 
+	@Override
 	public void include(ServletRequest request, ServletResponse response) {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java
index e3fa23eff3..cf3e6e26c1 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java
@@ -195,6 +195,7 @@ public class MockServletContext implements ServletContext {
 	}
 
 	/* This is a Servlet API 2.5 method. */
+	@Override
 	public String getContextPath() {
 		return this.contextPath;
 	}
@@ -203,6 +204,7 @@ public class MockServletContext implements ServletContext {
 		this.contexts.put(contextPath, context);
 	}
 
+	@Override
 	public ServletContext getContext(String contextPath) {
 		if (this.contextPath.equals(contextPath)) {
 			return this;
@@ -214,6 +216,7 @@ public class MockServletContext implements ServletContext {
 		this.majorVersion = majorVersion;
 	}
 
+	@Override
 	public int getMajorVersion() {
 		return this.majorVersion;
 	}
@@ -222,6 +225,7 @@ public class MockServletContext implements ServletContext {
 		this.minorVersion = minorVersion;
 	}
 
+	@Override
 	public int getMinorVersion() {
 		return this.minorVersion;
 	}
@@ -242,10 +246,12 @@ public class MockServletContext implements ServletContext {
 		return this.effectiveMinorVersion;
 	}
 
+	@Override
 	public String getMimeType(String filePath) {
 		return MimeTypeResolver.getMimeType(filePath);
 	}
 
+	@Override
 	public Set<String> getResourcePaths(String path) {
 		String actualPath = (path.endsWith("/") ? path : path + "/");
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(actualPath));
@@ -271,6 +277,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public URL getResource(String path) throws MalformedURLException {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		if (!resource.exists()) {
@@ -288,6 +295,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public InputStream getResourceAsStream(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		if (!resource.exists()) {
@@ -302,6 +310,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public RequestDispatcher getRequestDispatcher(String path) {
 		if (!path.startsWith("/")) {
 			throw new IllegalArgumentException("RequestDispatcher path at ServletContext level must start with '/'");
@@ -309,6 +318,7 @@ public class MockServletContext implements ServletContext {
 		return new MockRequestDispatcher(path);
 	}
 
+	@Override
 	public RequestDispatcher getNamedDispatcher(String path) {
 		return this.namedRequestDispatchers.get(path);
 	}
@@ -366,30 +376,37 @@ public class MockServletContext implements ServletContext {
 		registerNamedDispatcher(this.defaultServletName, new MockRequestDispatcher(this.defaultServletName));
 	}
 
+	@Override
 	public Servlet getServlet(String name) {
 		return null;
 	}
 
+	@Override
 	public Enumeration<Servlet> getServlets() {
 		return Collections.enumeration(new HashSet<Servlet>());
 	}
 
+	@Override
 	public Enumeration<String> getServletNames() {
 		return Collections.enumeration(new HashSet<String>());
 	}
 
+	@Override
 	public void log(String message) {
 		logger.info(message);
 	}
 
+	@Override
 	public void log(Exception ex, String message) {
 		logger.info(message, ex);
 	}
 
+	@Override
 	public void log(String message, Throwable ex) {
 		logger.info(message, ex);
 	}
 
+	@Override
 	public String getRealPath(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		try {
@@ -401,15 +418,18 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public String getServerInfo() {
 		return "MockServletContext";
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
@@ -428,15 +448,18 @@ public class MockServletContext implements ServletContext {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return new Vector<String>(this.attributes.keySet()).elements();
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		Assert.notNull(name, "Attribute name must not be null");
 		if (value != null) {
@@ -447,6 +470,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		this.attributes.remove(name);
@@ -456,6 +480,7 @@ public class MockServletContext implements ServletContext {
 		this.servletContextName = servletContextName;
 	}
 
+	@Override
 	public String getServletContextName() {
 		return this.servletContextName;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java
index bec6687887..2f5c773e0c 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java
@@ -59,6 +59,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 	}
 
 
+	@Override
 	public void setWindowState(WindowState windowState) throws WindowStateException {
 		if (this.redirectedUrl != null) {
 			throw new IllegalStateException("Cannot set WindowState after sendRedirect has been called");
@@ -67,6 +68,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 		this.redirectAllowed = false;
 	}
 
+	@Override
 	public void setPortletMode(PortletMode portletMode) throws PortletModeException {
 		if (this.redirectedUrl != null) {
 			throw new IllegalStateException("Cannot set PortletMode after sendRedirect has been called");
@@ -75,6 +77,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 		this.redirectAllowed = false;
 	}
 
+	@Override
 	public void setRenderParameters(Map<String, String[]> parameters) {
 		if (this.redirectedUrl != null) {
 			throw new IllegalStateException("Cannot set render parameters after sendRedirect has been called");
@@ -83,6 +86,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 		this.redirectAllowed = false;
 	}
 
+	@Override
 	public void setRenderParameter(String key, String value) {
 		if (this.redirectedUrl != null) {
 			throw new IllegalStateException("Cannot set render parameters after sendRedirect has been called");
@@ -91,6 +95,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 		this.redirectAllowed = false;
 	}
 
+	@Override
 	public void setRenderParameter(String key, String[] values) {
 		if (this.redirectedUrl != null) {
 			throw new IllegalStateException("Cannot set render parameters after sendRedirect has been called");
@@ -99,6 +104,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 		this.redirectAllowed = false;
 	}
 
+	@Override
 	public void sendRedirect(String location) throws IOException {
 		if (!this.redirectAllowed) {
 			throw new IllegalStateException(
@@ -108,6 +114,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 		this.redirectedUrl = location;
 	}
 
+	@Override
 	public void sendRedirect(String location, String renderUrlParamName) throws IOException {
 		sendRedirect(location);
 		if (renderUrlParamName != null) {
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java
index aad992058b..fcdc50acdc 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java
@@ -56,18 +56,21 @@ public abstract class MockBaseURL implements BaseURL {
 	// BaseURL methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void setParameter(String key, String value) {
 		Assert.notNull(key, "Parameter key must be null");
 		Assert.notNull(value, "Parameter value must not be null");
 		this.parameters.put(key, new String[] {value});
 	}
 
+	@Override
 	public void setParameter(String key, String[] values) {
 		Assert.notNull(key, "Parameter key must be null");
 		Assert.notNull(values, "Parameter values must not be null");
 		this.parameters.put(key, values);
 	}
 
+	@Override
 	public void setParameters(Map<String, String[]> parameters) {
 		Assert.notNull(parameters, "Parameters Map must not be null");
 		this.parameters.clear();
@@ -87,10 +90,12 @@ public abstract class MockBaseURL implements BaseURL {
 		return this.parameters.get(name);
 	}
 
+	@Override
 	public Map<String, String[]> getParameterMap() {
 		return Collections.unmodifiableMap(this.parameters);
 	}
 
+	@Override
 	public void setSecure(boolean secure) throws PortletSecurityException {
 		this.secure = secure;
 	}
@@ -99,14 +104,17 @@ public abstract class MockBaseURL implements BaseURL {
 		return this.secure;
 	}
 
+	@Override
 	public void write(Writer out) throws IOException {
 		out.write(toString());
 	}
 
+	@Override
 	public void write(Writer out, boolean escapeXML) throws IOException {
 		out.write(toString());
 	}
 
+	@Override
 	public void addProperty(String key, String value) {
 		String[] values = this.properties.get(key);
 		if (values != null) {
@@ -117,6 +125,7 @@ public abstract class MockBaseURL implements BaseURL {
 		}
 	}
 
+	@Override
 	public void setProperty(String key, String value) {
 		this.properties.put(key, new String[] {value});
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java
index 0ee9fbeb7c..cac1a83d5f 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java
@@ -35,34 +35,42 @@ public class MockCacheControl implements CacheControl {
 	private boolean useCachedContent = false;
 
 
+	@Override
 	public int getExpirationTime() {
 		return this.expirationTime;
 	}
 
+	@Override
 	public void setExpirationTime(int time) {
 		this.expirationTime = time;
 	}
 
+	@Override
 	public boolean isPublicScope() {
 		return this.publicScope;
 	}
 
+	@Override
 	public void setPublicScope(boolean publicScope) {
 		this.publicScope = publicScope;
 	}
 
+	@Override
 	public String getETag() {
 		return this.etag;
 	}
 
+	@Override
 	public void setETag(String token) {
 		this.etag = token;
 	}
 
+	@Override
 	public boolean useCachedContent() {
 		return this.useCachedContent;
 	}
 
+	@Override
 	public void setUseCachedContent(boolean useCachedContent) {
 		this.useCachedContent = useCachedContent;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
index 8f36c3a764..8fa396de4d 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
@@ -76,6 +76,7 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD
 		this.content = content;
 	}
 
+	@Override
 	public InputStream getPortletInputStream() throws IOException {
 		if (this.content != null) {
 			return new ByteArrayInputStream(this.content);
@@ -85,10 +86,12 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD
 		}
 	}
 
+	@Override
 	public void setCharacterEncoding(String characterEncoding) {
 		this.characterEncoding = characterEncoding;
 	}
 
+	@Override
 	public BufferedReader getReader() throws UnsupportedEncodingException {
 		if (this.content != null) {
 			InputStream sourceStream = new ByteArrayInputStream(this.content);
@@ -101,6 +104,7 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD
 		}
 	}
 
+	@Override
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
@@ -109,10 +113,12 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD
 		this.contentType = contentType;
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public int getContentLength() {
 		return (this.content != null ? content.length : -1);
 	}
@@ -121,6 +127,7 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD
 		this.method = method;
 	}
 
+	@Override
 	public String getMethod() {
 		return this.method;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java
index 0dc7efaba8..c2c82febae 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java
@@ -73,14 +73,17 @@ public class MockEvent implements Event {
 	}
 
 
+	@Override
 	public QName getQName() {
 		return this.name;
 	}
 
+	@Override
 	public String getName() {
 		return this.name.getLocalPart();
 	}
 
+	@Override
 	public Serializable getValue() {
 		return this.value;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java
index 2406f18d01..af4725dea7 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java
@@ -73,6 +73,7 @@ public class MockEventRequest extends MockPortletRequest implements EventRequest
 		return EVENT_PHASE;
 	}
 
+	@Override
 	public Event getEvent() {
 		return this.event;
 	}
@@ -81,6 +82,7 @@ public class MockEventRequest extends MockPortletRequest implements EventRequest
 		this.method = method;
 	}
 
+	@Override
 	public String getMethod() {
 		return this.method;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java
index 1a00e8b2d5..f7c846e028 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java
@@ -27,6 +27,7 @@ import javax.portlet.EventResponse;
  */
 public class MockEventResponse extends MockStateAwareResponse implements EventResponse {
 
+	@Override
 	public void setRenderParameters(EventRequest request) {
 		setRenderParameters(request.getParameterMap());
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java
index e606fc808d..cbfb70bca1 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java
@@ -101,6 +101,7 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 	// RenderResponse methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void setContentType(String contentType) {
 		if (this.request != null) {
 			Enumeration<String> supportedTypes = this.request.getResponseContentTypes();
@@ -112,6 +113,7 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 		this.contentType = contentType;
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
@@ -120,10 +122,12 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 		this.characterEncoding = characterEncoding;
 	}
 
+	@Override
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
 
+	@Override
 	public PrintWriter getWriter() throws UnsupportedEncodingException {
 		if (this.writer == null) {
 			Writer targetWriter = (this.characterEncoding != null
@@ -150,18 +154,22 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 		this.locale = locale;
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locale;
 	}
 
+	@Override
 	public void setBufferSize(int bufferSize) {
 		this.bufferSize = bufferSize;
 	}
 
+	@Override
 	public int getBufferSize() {
 		return this.bufferSize;
 	}
 
+	@Override
 	public void flushBuffer() {
 		if (this.writer != null) {
 			this.writer.flush();
@@ -177,6 +185,7 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 		this.committed = true;
 	}
 
+	@Override
 	public void resetBuffer() {
 		if (this.committed) {
 			throw new IllegalStateException("Cannot reset buffer - response is already committed");
@@ -188,10 +197,12 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 		this.committed = committed;
 	}
 
+	@Override
 	public boolean isCommitted() {
 		return this.committed;
 	}
 
+	@Override
 	public void reset() {
 		resetBuffer();
 		this.characterEncoding = null;
@@ -199,22 +210,27 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 		this.locale = null;
 	}
 
+	@Override
 	public OutputStream getPortletOutputStream() throws IOException {
 		return this.outputStream;
 	}
 
+	@Override
 	public PortletURL createRenderURL() {
 		return new MockPortletURL(getPortalContext(), MockPortletURL.URL_TYPE_RENDER);
 	}
 
+	@Override
 	public PortletURL createActionURL() {
 		return new MockPortletURL(getPortalContext(), MockPortletURL.URL_TYPE_ACTION);
 	}
 
+	@Override
 	public ResourceURL createResourceURL() {
 		return new MockResourceURL();
 	}
 
+	@Override
 	public CacheControl getCacheControl() {
 		return this.cacheControl;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
index 7df8b547b0..54201b8ec8 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
@@ -56,14 +56,17 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul
 		this.multipartFiles.add(file.getName(), file);
 	}
 
+	@Override
 	public Iterator<String> getFileNames() {
 		return this.multipartFiles.keySet().iterator();
 	}
 
+	@Override
 	public MultipartFile getFile(String name) {
 		return this.multipartFiles.getFirst(name);
 	}
 
+	@Override
 	public List<MultipartFile> getFiles(String name) {
 		List<MultipartFile> multipartFiles = this.multipartFiles.get(name);
 		if (multipartFiles != null) {
@@ -74,14 +77,17 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul
 		}
 	}
 
+	@Override
 	public Map<String, MultipartFile> getFileMap() {
 		return this.multipartFiles.toSingleValueMap();
 	}
 
+	@Override
 	public MultiValueMap<String, MultipartFile> getMultiFileMap() {
 		return new LinkedMultiValueMap<String, MultipartFile>(this.multipartFiles);
 	}
 
+	@Override
 	public String getMultipartContentType(String paramOrFileName) {
 		MultipartFile file = getFile(paramOrFileName);
 		if (file != null) {
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java
index 949d077b9a..8731438d70 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java
@@ -74,6 +74,7 @@ public class MockPortalContext implements PortalContext {
 	}
 
 
+	@Override
 	public String getPortalInfo() {
 		return "MockPortal/1.0";
 	}
@@ -82,18 +83,22 @@ public class MockPortalContext implements PortalContext {
 		this.properties.put(name, value);
 	}
 
+	@Override
 	public String getProperty(String name) {
 		return this.properties.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getPropertyNames() {
 		return Collections.enumeration(this.properties.keySet());
 	}
 
+	@Override
 	public Enumeration<PortletMode> getSupportedPortletModes() {
 		return Collections.enumeration(this.portletModes);
 	}
 
+	@Override
 	public Enumeration<WindowState> getSupportedWindowStates() {
 		return Collections.enumeration(this.windowStates);
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java
index 985c1e20dc..8d9157e1d2 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java
@@ -96,10 +96,12 @@ public class MockPortletConfig implements PortletConfig {
 	}
 
 
+	@Override
 	public String getPortletName() {
 		return this.portletName;
 	}
 
+	@Override
 	public PortletContext getPortletContext() {
 		return this.portletContext;
 	}
@@ -109,6 +111,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.resourceBundles.put(locale, resourceBundle);
 	}
 
+	@Override
 	public ResourceBundle getResourceBundle(Locale locale) {
 		Assert.notNull(locale, "Locale must not be null");
 		return this.resourceBundles.get(locale);
@@ -119,11 +122,13 @@ public class MockPortletConfig implements PortletConfig {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
@@ -132,6 +137,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.publicRenderParameterNames.add(name);
 	}
 
+	@Override
 	public Enumeration<String> getPublicRenderParameterNames() {
 		return Collections.enumeration(this.publicRenderParameterNames);
 	}
@@ -140,6 +146,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.defaultNamespace = defaultNamespace;
 	}
 
+	@Override
 	public String getDefaultNamespace() {
 		return this.defaultNamespace;
 	}
@@ -148,6 +155,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.publishingEventQNames.add(name);
 	}
 
+	@Override
 	public Enumeration<QName> getPublishingEventQNames() {
 		return Collections.enumeration(this.publishingEventQNames);
 	}
@@ -156,6 +164,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.processingEventQNames.add(name);
 	}
 
+	@Override
 	public Enumeration<QName> getProcessingEventQNames() {
 		return Collections.enumeration(this.processingEventQNames);
 	}
@@ -164,6 +173,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.supportedLocales.add(locale);
 	}
 
+	@Override
 	public Enumeration<Locale> getSupportedLocales() {
 		return Collections.enumeration(this.supportedLocales);
 	}
@@ -176,6 +186,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.containerRuntimeOptions.put(key, values);
 	}
 
+	@Override
 	public Map<String, String[]> getContainerRuntimeOptions() {
 		return Collections.unmodifiableMap(this.containerRuntimeOptions);
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java
index cd8c997e37..a37c747e12 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java
@@ -124,10 +124,12 @@ public class MockPortletContext implements PortletContext {
 	}
 
 
+	@Override
 	public String getServerInfo() {
 		return "MockPortal/1.0";
 	}
 
+	@Override
 	public PortletRequestDispatcher getRequestDispatcher(String path) {
 		if (!path.startsWith("/")) {
 			throw new IllegalArgumentException(
@@ -136,10 +138,12 @@ public class MockPortletContext implements PortletContext {
 		return new MockPortletRequestDispatcher(path);
 	}
 
+	@Override
 	public PortletRequestDispatcher getNamedDispatcher(String path) {
 		return null;
 	}
 
+	@Override
 	public InputStream getResourceAsStream(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		try {
@@ -151,18 +155,22 @@ public class MockPortletContext implements PortletContext {
 		}
 	}
 
+	@Override
 	public int getMajorVersion() {
 		return 2;
 	}
 
+	@Override
 	public int getMinorVersion() {
 		return 0;
 	}
 
+	@Override
 	public String getMimeType(String filePath) {
 		return null;
 	}
 
+	@Override
 	public String getRealPath(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		try {
@@ -174,6 +182,7 @@ public class MockPortletContext implements PortletContext {
 		}
 	}
 
+	@Override
 	public Set<String> getResourcePaths(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		try {
@@ -192,6 +201,7 @@ public class MockPortletContext implements PortletContext {
 		}
 	}
 
+	@Override
 	public URL getResource(String path) throws MalformedURLException {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		try {
@@ -203,14 +213,17 @@ public class MockPortletContext implements PortletContext {
 		}
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		if (value != null) {
 			this.attributes.put(name, value);
@@ -220,6 +233,7 @@ public class MockPortletContext implements PortletContext {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		this.attributes.remove(name);
 	}
@@ -229,19 +243,23 @@ public class MockPortletContext implements PortletContext {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
 
+	@Override
 	public void log(String message) {
 		logger.info(message);
 	}
 
+	@Override
 	public void log(String message, Throwable t) {
 		logger.info(message, t);
 	}
@@ -250,6 +268,7 @@ public class MockPortletContext implements PortletContext {
 		this.portletContextName = portletContextName;
 	}
 
+	@Override
 	public String getPortletContextName() {
 		return this.portletContextName;
 	}
@@ -258,6 +277,7 @@ public class MockPortletContext implements PortletContext {
 		this.containerRuntimeOptions.add(key);
 	}
 
+	@Override
 	public Enumeration<String> getContainerRuntimeOptions() {
 		return Collections.enumeration(this.containerRuntimeOptions);
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java
index b885f35852..d5dab011ce 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java
@@ -171,10 +171,12 @@ public class MockPortletRequest implements PortletRequest {
 	// PortletRequest methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public boolean isWindowStateAllowed(WindowState windowState) {
 		return CollectionUtils.contains(this.portalContext.getSupportedWindowStates(), windowState);
 	}
 
+	@Override
 	public boolean isPortletModeAllowed(PortletMode portletMode) {
 		return CollectionUtils.contains(this.portalContext.getSupportedPortletModes(), portletMode);
 	}
@@ -184,6 +186,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.portletMode = portletMode;
 	}
 
+	@Override
 	public PortletMode getPortletMode() {
 		return this.portletMode;
 	}
@@ -193,6 +196,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.windowState = windowState;
 	}
 
+	@Override
 	public WindowState getWindowState() {
 		return this.windowState;
 	}
@@ -202,6 +206,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.portletPreferences = preferences;
 	}
 
+	@Override
 	public PortletPreferences getPreferences() {
 		return this.portletPreferences;
 	}
@@ -214,10 +219,12 @@ public class MockPortletRequest implements PortletRequest {
 		}
 	}
 
+	@Override
 	public PortletSession getPortletSession() {
 		return getPortletSession(true);
 	}
 
+	@Override
 	public PortletSession getPortletSession(boolean create) {
 		checkActive();
 		// Reset session if invalidated.
@@ -261,21 +268,25 @@ public class MockPortletRequest implements PortletRequest {
 		}
 	}
 
+	@Override
 	public String getProperty(String key) {
 		Assert.notNull(key, "Property key must not be null");
 		List list = this.properties.get(key);
 		return (list != null && list.size() > 0 ? (String) list.get(0) : null);
 	}
 
+	@Override
 	public Enumeration<String> getProperties(String key) {
 		Assert.notNull(key, "property key must not be null");
 		return Collections.enumeration(this.properties.get(key));
 	}
 
+	@Override
 	public Enumeration<String> getPropertyNames() {
 		return Collections.enumeration(this.properties.keySet());
 	}
 
+	@Override
 	public PortalContext getPortalContext() {
 		return this.portalContext;
 	}
@@ -284,6 +295,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.authType = authType;
 	}
 
+	@Override
 	public String getAuthType() {
 		return this.authType;
 	}
@@ -292,6 +304,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.contextPath = contextPath;
 	}
 
+	@Override
 	public String getContextPath() {
 		return this.contextPath;
 	}
@@ -300,6 +313,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.remoteUser = remoteUser;
 	}
 
+	@Override
 	public String getRemoteUser() {
 		return this.remoteUser;
 	}
@@ -308,6 +322,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.userPrincipal = userPrincipal;
 	}
 
+	@Override
 	public Principal getUserPrincipal() {
 		return this.userPrincipal;
 	}
@@ -316,15 +331,18 @@ public class MockPortletRequest implements PortletRequest {
 		this.userRoles.add(role);
 	}
 
+	@Override
 	public boolean isUserInRole(String role) {
 		return this.userRoles.contains(role);
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		checkActive();
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		checkActive();
 		return Collections.enumeration(this.attributes.keySet());
@@ -365,19 +383,23 @@ public class MockPortletRequest implements PortletRequest {
 		}
 	}
 
+	@Override
 	public String getParameter(String name) {
 		String[] arr = this.parameters.get(name);
 		return (arr != null && arr.length > 0 ? arr[0] : null);
 	}
 
+	@Override
 	public Enumeration<String> getParameterNames() {
 		return Collections.enumeration(this.parameters.keySet());
 	}
 
+	@Override
 	public String[] getParameterValues(String name) {
 		return this.parameters.get(name);
 	}
 
+	@Override
 	public Map<String, String[]> getParameterMap() {
 		return Collections.unmodifiableMap(this.parameters);
 	}
@@ -386,10 +408,12 @@ public class MockPortletRequest implements PortletRequest {
 		this.secure = secure;
 	}
 
+	@Override
 	public boolean isSecure() {
 		return this.secure;
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		checkActive();
 		if (value != null) {
@@ -400,11 +424,13 @@ public class MockPortletRequest implements PortletRequest {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		checkActive();
 		this.attributes.remove(name);
 	}
 
+	@Override
 	public String getRequestedSessionId() {
 		PortletSession session = this.getPortletSession();
 		return (session != null ? session.getId() : null);
@@ -414,6 +440,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.requestedSessionIdValid = requestedSessionIdValid;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdValid() {
 		return this.requestedSessionIdValid;
 	}
@@ -426,10 +453,12 @@ public class MockPortletRequest implements PortletRequest {
 		this.responseContentTypes.add(0, responseContentType);
 	}
 
+	@Override
 	public String getResponseContentType() {
 		return this.responseContentTypes.get(0);
 	}
 
+	@Override
 	public Enumeration<String> getResponseContentTypes() {
 		return Collections.enumeration(this.responseContentTypes);
 	}
@@ -442,10 +471,12 @@ public class MockPortletRequest implements PortletRequest {
 		this.locales.add(0, locale);
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locales.get(0);
 	}
 
+	@Override
 	public Enumeration<Locale> getLocales() {
 		return Collections.enumeration(this.locales);
 	}
@@ -454,6 +485,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.scheme = scheme;
 	}
 
+	@Override
 	public String getScheme() {
 		return this.scheme;
 	}
@@ -462,6 +494,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.serverName = serverName;
 	}
 
+	@Override
 	public String getServerName() {
 		return this.serverName;
 	}
@@ -470,6 +503,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.serverPort = serverPort;
 	}
 
+	@Override
 	public int getServerPort() {
 		return this.serverPort;
 	}
@@ -478,6 +512,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.windowID = windowID;
 	}
 
+	@Override
 	public String getWindowID() {
 		return this.windowID;
 	}
@@ -486,10 +521,12 @@ public class MockPortletRequest implements PortletRequest {
 		this.cookies = cookies;
 	}
 
+	@Override
 	public Cookie[] getCookies() {
 		return this.cookies;
 	}
 
+	@Override
 	public Map<String, String[]> getPrivateParameterMap() {
 		if (!this.publicParameterNames.isEmpty()) {
 			Map<String, String[]> filtered = new LinkedHashMap<String, String[]>();
@@ -505,6 +542,7 @@ public class MockPortletRequest implements PortletRequest {
 		}
 	}
 
+	@Override
 	public Map<String, String[]> getPublicParameterMap() {
 		if (!this.publicParameterNames.isEmpty()) {
 			Map<String, String[]> filtered = new LinkedHashMap<String, String[]>();
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
index ca8695f90e..5ba423ed0e 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
@@ -53,10 +53,12 @@ public class MockPortletRequestDispatcher implements PortletRequestDispatcher {
 	}
 
 
+	@Override
 	public void include(RenderRequest request, RenderResponse response) throws PortletException, IOException {
 		include((PortletRequest) request, (PortletResponse) response);
 	}
 
+	@Override
 	public void include(PortletRequest request, PortletResponse response) throws PortletException, IOException {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
@@ -69,6 +71,7 @@ public class MockPortletRequestDispatcher implements PortletRequestDispatcher {
 		}
 	}
 
+	@Override
 	public void forward(PortletRequest request, PortletResponse response) throws PortletException, IOException {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java
index b556209fcd..9fe6d6315f 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java
@@ -85,6 +85,7 @@ public class MockPortletResponse implements PortletResponse {
 	// PortletResponse methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void addProperty(String key, String value) {
 		Assert.notNull(key, "Property key must not be null");
 		String[] oldArr = this.properties.get(key);
@@ -99,6 +100,7 @@ public class MockPortletResponse implements PortletResponse {
 		}
 	}
 
+	@Override
 	public void setProperty(String key, String value) {
 		Assert.notNull(key, "Property key must not be null");
 		this.properties.put(key, new String[] {value});
@@ -119,6 +121,7 @@ public class MockPortletResponse implements PortletResponse {
 		return this.properties.get(key);
 	}
 
+	@Override
 	public String encodeURL(String path) {
 		return path;
 	}
@@ -127,10 +130,12 @@ public class MockPortletResponse implements PortletResponse {
 		this.namespace = namespace;
 	}
 
+	@Override
 	public String getNamespace() {
 		return this.namespace;
 	}
 
+	@Override
 	public void addProperty(Cookie cookie) {
 		Assert.notNull(cookie, "Cookie must not be null");
 		this.cookies.add(cookie);
@@ -150,6 +155,7 @@ public class MockPortletResponse implements PortletResponse {
 		return null;
 	}
 
+	@Override
 	public void addProperty(String key, Element value) {
 		Assert.notNull(key, "Property key must not be null");
 		Element[] oldArr = this.xmlProperties.get(key);
@@ -180,6 +186,7 @@ public class MockPortletResponse implements PortletResponse {
 		return this.xmlProperties.get(key);
 	}
 
+	@Override
 	public Element createElement(String tagName) throws DOMException {
 		if (this.xmlDocument == null) {
 			try {
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java
index d9632906f7..e589e6a103 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java
@@ -76,10 +76,12 @@ public class MockPortletSession implements PortletSession {
 	}
 
 
+	@Override
 	public Object getAttribute(String name) {
 		return this.portletAttributes.get(name);
 	}
 
+	@Override
 	public Object getAttribute(String name, int scope) {
 		if (scope == PortletSession.PORTLET_SCOPE) {
 			return this.portletAttributes.get(name);
@@ -90,10 +92,12 @@ public class MockPortletSession implements PortletSession {
 		return null;
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return Collections.enumeration(this.portletAttributes.keySet());
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames(int scope) {
 		if (scope == PortletSession.PORTLET_SCOPE) {
 			return Collections.enumeration(this.portletAttributes.keySet());
@@ -104,10 +108,12 @@ public class MockPortletSession implements PortletSession {
 		return null;
 	}
 
+	@Override
 	public long getCreationTime() {
 		return this.creationTime;
 	}
 
+	@Override
 	public String getId() {
 		return this.id;
 	}
@@ -117,10 +123,12 @@ public class MockPortletSession implements PortletSession {
 		setNew(false);
 	}
 
+	@Override
 	public long getLastAccessedTime() {
 		return this.lastAccessedTime;
 	}
 
+	@Override
 	public int getMaxInactiveInterval() {
 		return this.maxInactiveInterval;
 	}
@@ -146,6 +154,7 @@ public class MockPortletSession implements PortletSession {
 		}
 	}
 
+	@Override
 	public void invalidate() {
 		this.invalid = true;
 		clearAttributes();
@@ -159,14 +168,17 @@ public class MockPortletSession implements PortletSession {
 		this.isNew = value;
 	}
 
+	@Override
 	public boolean isNew() {
 		return this.isNew;
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		this.portletAttributes.remove(name);
 	}
 
+	@Override
 	public void removeAttribute(String name, int scope) {
 		if (scope == PortletSession.PORTLET_SCOPE) {
 			this.portletAttributes.remove(name);
@@ -176,6 +188,7 @@ public class MockPortletSession implements PortletSession {
 		}
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		if (value != null) {
 			this.portletAttributes.put(name, value);
@@ -185,6 +198,7 @@ public class MockPortletSession implements PortletSession {
 		}
 	}
 
+	@Override
 	public void setAttribute(String name, Object value, int scope) {
 		if (scope == PortletSession.PORTLET_SCOPE) {
 			if (value != null) {
@@ -204,18 +218,22 @@ public class MockPortletSession implements PortletSession {
 		}
 	}
 
+	@Override
 	public void setMaxInactiveInterval(int interval) {
 		this.maxInactiveInterval = interval;
 	}
 
+	@Override
 	public PortletContext getPortletContext() {
 		return this.portletContext;
 	}
 
+	@Override
 	public Map<String, Object> getAttributeMap() {
 		return Collections.unmodifiableMap(this.portletAttributes);
 	}
 
+	@Override
 	public Map<String, Object> getAttributeMap(int scope) {
 		if (scope == PortletSession.PORTLET_SCOPE) {
 			return Collections.unmodifiableMap(this.portletAttributes);
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java
index 12abdf57c9..53deff0916 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java
@@ -69,6 +69,7 @@ public class MockPortletURL extends MockBaseURL implements PortletURL {
 	// PortletURL methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void setWindowState(WindowState windowState) throws WindowStateException {
 		if (!CollectionUtils.contains(this.portalContext.getSupportedWindowStates(), windowState)) {
 			throw new WindowStateException("WindowState not supported", windowState);
@@ -76,10 +77,12 @@ public class MockPortletURL extends MockBaseURL implements PortletURL {
 		this.windowState = windowState;
 	}
 
+	@Override
 	public WindowState getWindowState() {
 		return this.windowState;
 	}
 
+	@Override
 	public void setPortletMode(PortletMode portletMode) throws PortletModeException {
 		if (!CollectionUtils.contains(this.portalContext.getSupportedPortletModes(), portletMode)) {
 			throw new PortletModeException("PortletMode not supported", portletMode);
@@ -87,10 +90,12 @@ public class MockPortletURL extends MockBaseURL implements PortletURL {
 		this.portletMode = portletMode;
 	}
 
+	@Override
 	public PortletMode getPortletMode() {
 		return this.portletMode;
 	}
 
+	@Override
 	public void removePublicRenderParameter(String name) {
 		this.parameters.remove(name);
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java
index d86ba7f2ad..672a51dcb7 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java
@@ -86,6 +86,7 @@ public class MockRenderRequest extends MockPortletRequest implements RenderReque
 		return RENDER_PHASE;
 	}
 
+	@Override
 	public String getETag() {
 		return getProperty(RenderRequest.ETAG);
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java
index a2feeb3726..7f70be9a05 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java
@@ -69,6 +69,7 @@ public class MockRenderResponse extends MockMimeResponse implements RenderRespon
 	// RenderResponse methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void setTitle(String title) {
 		this.title = title;
 	}
@@ -77,6 +78,7 @@ public class MockRenderResponse extends MockMimeResponse implements RenderRespon
 		return this.title;
 	}
 
+	@Override
 	public void setNextPossiblePortletModes(Collection<PortletMode> portletModes) {
 		this.nextPossiblePortletModes = portletModes;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java
index 7cce4ba3c6..e889d92314 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java
@@ -97,6 +97,7 @@ public class MockResourceRequest extends MockClientDataRequest implements Resour
 		this.resourceID = resourceID;
 	}
 
+	@Override
 	public String getResourceID() {
 		return this.resourceID;
 	}
@@ -105,10 +106,12 @@ public class MockResourceRequest extends MockClientDataRequest implements Resour
 		this.cacheability = cacheLevel;
 	}
 
+	@Override
 	public String getCacheability() {
 		return this.cacheability;
 	}
 
+	@Override
 	public String getETag() {
 		return getProperty(RenderRequest.ETAG);
 	}
@@ -121,6 +124,7 @@ public class MockResourceRequest extends MockClientDataRequest implements Resour
 		this.privateRenderParameterMap.put(key, values);
 	}
 
+	@Override
 	public Map<String, String[]> getPrivateRenderParameterMap() {
 		return Collections.unmodifiableMap(this.privateRenderParameterMap);
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java
index 297a19682e..00a267b1d8 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java
@@ -29,6 +29,7 @@ public class MockResourceResponse extends MockMimeResponse implements ResourceRe
 	private int contentLength = 0;
 
 
+	@Override
 	public void setContentLength(int len) {
 		this.contentLength = len;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java
index cce36b18d5..12b7fd4a39 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java
@@ -36,6 +36,7 @@ public class MockResourceURL extends MockBaseURL implements ResourceURL {
 	// ResourceURL methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void setResourceID(String resourceID) {
 		this.resourceID = resourceID;
 	}
@@ -44,10 +45,12 @@ public class MockResourceURL extends MockBaseURL implements ResourceURL {
 		return this.resourceID;
 	}
 
+	@Override
 	public void setCacheability(String cacheLevel) {
 		this.cacheability = cacheLevel;
 	}
 
+	@Override
 	public String getCacheability() {
 		return this.cacheability;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
index 6853658447..6d2f6d74fa 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
@@ -68,6 +68,7 @@ public class MockStateAwareResponse extends MockPortletResponse implements State
 	}
 
 
+	@Override
 	public void setWindowState(WindowState windowState) throws WindowStateException {
 		if (!CollectionUtils.contains(getPortalContext().getSupportedWindowStates(), windowState)) {
 			throw new WindowStateException("WindowState not supported", windowState);
@@ -75,10 +76,12 @@ public class MockStateAwareResponse extends MockPortletResponse implements State
 		this.windowState = windowState;
 	}
 
+	@Override
 	public WindowState getWindowState() {
 		return this.windowState;
 	}
 
+	@Override
 	public void setPortletMode(PortletMode portletMode) throws PortletModeException {
 		if (!CollectionUtils.contains(getPortalContext().getSupportedPortletModes(), portletMode)) {
 			throw new PortletModeException("PortletMode not supported", portletMode);
@@ -86,22 +89,26 @@ public class MockStateAwareResponse extends MockPortletResponse implements State
 		this.portletMode = portletMode;
 	}
 
+	@Override
 	public PortletMode getPortletMode() {
 		return this.portletMode;
 	}
 
+	@Override
 	public void setRenderParameters(Map<String, String[]> parameters) {
 		Assert.notNull(parameters, "Parameters Map must not be null");
 		this.renderParameters.clear();
 		this.renderParameters.putAll(parameters);
 	}
 
+	@Override
 	public void setRenderParameter(String key, String value) {
 		Assert.notNull(key, "Parameter key must not be null");
 		Assert.notNull(value, "Parameter value must not be null");
 		this.renderParameters.put(key, new String[] {value});
 	}
 
+	@Override
 	public void setRenderParameter(String key, String[] values) {
 		Assert.notNull(key, "Parameter key must not be null");
 		Assert.notNull(values, "Parameter values must not be null");
@@ -123,18 +130,22 @@ public class MockStateAwareResponse extends MockPortletResponse implements State
 		return this.renderParameters.keySet().iterator();
 	}
 
+	@Override
 	public Map<String, String[]> getRenderParameterMap() {
 		return Collections.unmodifiableMap(this.renderParameters);
 	}
 
+	@Override
 	public void removePublicRenderParameter(String name) {
 		this.renderParameters.remove(name);
 	}
 
+	@Override
 	public void setEvent(QName name, Serializable value) {
 		this.events.put(name, value);
 	}
 
+	@Override
 	public void setEvent(String name, Serializable value) {
 		this.events.put(new QName(name), value);
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
index a333984f48..bb7e68319c 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
@@ -59,85 +59,105 @@ public class ServletWrappingPortletContext implements PortletContext {
 	}
 
 
+	@Override
 	public String getServerInfo() {
 		return this.servletContext.getServerInfo();
 	}
 
+	@Override
 	public PortletRequestDispatcher getRequestDispatcher(String path) {
 		return null;
 	}
 
+	@Override
 	public PortletRequestDispatcher getNamedDispatcher(String name) {
 		return null;
 	}
 
+	@Override
 	public InputStream getResourceAsStream(String path) {
 		return this.servletContext.getResourceAsStream(path);
 	}
 
+	@Override
 	public int getMajorVersion() {
 		return 2;
 	}
 
+	@Override
 	public int getMinorVersion() {
 		return 0;
 	}
 
+	@Override
 	public String getMimeType(String file) {
 		return this.servletContext.getMimeType(file);
 	}
 
+	@Override
 	public String getRealPath(String path) {
 		return this.servletContext.getRealPath(path);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Set<String> getResourcePaths(String path) {
 		return this.servletContext.getResourcePaths(path);
 	}
 
+	@Override
 	public URL getResource(String path) throws MalformedURLException {
 		return this.servletContext.getResource(path);
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		return this.servletContext.getAttribute(name);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Enumeration<String> getAttributeNames() {
 		return this.servletContext.getAttributeNames();
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		return this.servletContext.getInitParameter(name);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Enumeration<String> getInitParameterNames() {
 		return this.servletContext.getInitParameterNames();
 	}
 
+	@Override
 	public void log(String msg) {
 		this.servletContext.log(msg);
 	}
 
+	@Override
 	public void log(String message, Throwable throwable) {
 		this.servletContext.log(message, throwable);
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		this.servletContext.removeAttribute(name);
 	}
 
+	@Override
 	public void setAttribute(String name, Object object) {
 		this.servletContext.setAttribute(name, object);
 	}
 
+	@Override
 	public String getPortletContextName() {
 		return this.servletContext.getServletContextName();
 	}
 
+	@Override
 	public Enumeration<String> getContainerRuntimeOptions() {
 		return Collections.enumeration(new HashSet<String>());
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
index f2fc531e76..0bed2747f1 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
@@ -80,6 +80,7 @@ import org.springframework.web.portlet.mvc.SimpleControllerHandlerAdapter;
  */
 public class ComplexPortletApplicationContext extends StaticPortletApplicationContext {
 
+	@Override
 	public void refresh() throws BeansException {
 		registerSingleton("standardHandlerAdapter", SimpleControllerHandlerAdapter.class);
 		registerSingleton("portletHandlerAdapter", SimplePortletHandlerAdapter.class);
@@ -185,10 +186,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class TestController1 implements Controller {
 
+		@Override
 		public void handleActionRequest(ActionRequest request, ActionResponse response) {
 			response.setRenderParameter("result", "test1-action");
 		}
 
+		@Override
 		public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception {
 			return null;
 		}
@@ -197,8 +200,10 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class TestController2 implements Controller {
 
+		@Override
 		public void handleActionRequest(ActionRequest request, ActionResponse response) {}
 
+		@Override
 		public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception {
 			response.setProperty("result", "test2-view");
 			return null;
@@ -208,8 +213,10 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class ViewController implements Controller {
 
+		@Override
 		public void handleActionRequest(ActionRequest request, ActionResponse response) {}
 
+		@Override
 		public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception {
 			return new ModelAndView("someViewName", "result", "view was here");
 		}
@@ -218,10 +225,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class EditController implements Controller {
 
+		@Override
 		public void handleActionRequest(ActionRequest request, ActionResponse response) {
 			response.setRenderParameter("param", "edit was here");
 		}
 
+		@Override
 		public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception {
 			return new ModelAndView(request.getParameter("param"));
 		}
@@ -230,10 +239,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class HelpController1 implements Controller {
 
+		@Override
 		public void handleActionRequest(ActionRequest request, ActionResponse response) {
 			response.setRenderParameter("param", "help1 was here");
 		}
 
+		@Override
 		public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception {
 			return new ModelAndView("help1-view");
 		}
@@ -242,10 +253,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class HelpController2 implements Controller {
 
+		@Override
 		public void handleActionRequest(ActionRequest request, ActionResponse response) {
 			response.setRenderParameter("param", "help2 was here");
 		}
 
+		@Override
 		public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception {
 			return new ModelAndView("help2-view");
 		}
@@ -253,12 +266,14 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class RequestLocaleCheckingController implements Controller {
 
+		@Override
 		public void handleActionRequest(ActionRequest request, ActionResponse response) throws PortletException {
 			if (!Locale.CANADA.equals(request.getLocale())) {
 				throw new PortletException("Incorrect Locale in ActionRequest");
 			}
 		}
 
+		@Override
 		public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response)
 			throws PortletException, IOException {
 			if (!Locale.CANADA.equals(request.getLocale())) {
@@ -272,12 +287,14 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class LocaleContextCheckingController implements Controller {
 
+		@Override
 		public void handleActionRequest(ActionRequest request, ActionResponse response) throws PortletException {
 			if (!Locale.CANADA.equals(LocaleContextHolder.getLocale())) {
 				throw new PortletException("Incorrect Locale in LocaleContextHolder");
 			}
 		}
 
+		@Override
 		public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response)
 			throws PortletException, IOException {
 			if (!Locale.CANADA.equals(LocaleContextHolder.getLocale())) {
@@ -293,14 +310,17 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 		private PortletConfig portletConfig;
 
+		@Override
 		public void init(PortletConfig portletConfig) throws PortletException {
 			this.portletConfig = portletConfig;
 		}
 
+		@Override
 		public void processAction(ActionRequest request, ActionResponse response) throws PortletException {
 			response.setRenderParameter("result", "myPortlet action called");
 		}
 
+		@Override
 		public void render(RenderRequest request, RenderResponse response) throws PortletException, IOException {
 			response.getWriter().write("myPortlet was here");
 		}
@@ -309,6 +329,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 			return this.portletConfig;
 		}
 
+		@Override
 		public void destroy() {
 			this.portletConfig = null;
 		}
@@ -323,6 +344,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class ExceptionThrowingHandler implements MyHandler {
 
+		@Override
 		public void doSomething(PortletRequest request) throws Exception {
 			if (request.getParameter("fail") != null) {
 				throw new ModelAndViewDefiningException(new ModelAndView("failed-modelandview"));
@@ -346,28 +368,34 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class MyHandlerAdapter implements HandlerAdapter, Ordered {
 
+		@Override
 		public int getOrder() {
 			return 99;
 		}
 
+		@Override
 		public boolean supports(Object handler) {
 			return handler != null && MyHandler.class.isAssignableFrom(handler.getClass());
 		}
 
+		@Override
 		public void handleAction(ActionRequest request, ActionResponse response, Object delegate) throws Exception {
 			((MyHandler) delegate).doSomething(request);
 		}
 
+		@Override
 		public ModelAndView handleRender(RenderRequest request, RenderResponse response, Object delegate) throws Exception {
 			((MyHandler) delegate).doSomething(request);
 			return null;
 		}
 
+		@Override
 		public ModelAndView handleResource(ResourceRequest request, ResourceResponse response, Object handler)
 				throws Exception {
 			return null;
 		}
 
+		@Override
 		public void handleEvent(EventRequest request, EventResponse response, Object handler) throws Exception {
 		}
 	}
@@ -375,6 +403,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class MyHandlerInterceptor1 extends HandlerInterceptorAdapter {
 
+		@Override
 		public boolean preHandleRender(RenderRequest request, RenderResponse response, Object handler)
 			throws PortletException {
 			if (request.getAttribute("test2-remove-never") != null) {
@@ -386,6 +415,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 			return true;
 		}
 
+		@Override
 		public void postHandleRender(
 				RenderRequest request, RenderResponse response, Object handler, ModelAndView modelAndView)
 				throws PortletException {
@@ -398,6 +428,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 			request.removeAttribute("test1-remove-post");
 		}
 
+		@Override
 		public void afterRenderCompletion(
 				RenderRequest request, RenderResponse response, Object handler, Exception ex)
 				throws PortletException {
@@ -411,6 +442,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class MyHandlerInterceptor2 extends HandlerInterceptorAdapter {
 
+		@Override
 		public boolean preHandleRender(RenderRequest request, RenderResponse response, Object handler)
 			throws PortletException {
 			if (request.getAttribute("test1-remove-post") == null) {
@@ -425,6 +457,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 			return true;
 		}
 
+		@Override
 		public void postHandleRender(
 				RenderRequest request, RenderResponse response, Object handler, ModelAndView modelAndView)
 				throws PortletException {
@@ -440,6 +473,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 			request.removeAttribute("test2-remove-post");
 		}
 
+		@Override
 		public void afterRenderCompletion(
 				RenderRequest request, RenderResponse response, Object handler, Exception ex)
 				throws Exception {
@@ -453,6 +487,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class MultipartCheckingHandler implements MyHandler {
 
+		@Override
 		public void doSomething(PortletRequest request) throws PortletException, IllegalAccessException {
 			if (!(request instanceof MultipartActionRequest)) {
 				throw new PortletException("Not in a MultipartActionRequest");
@@ -463,10 +498,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 	public static class MockMultipartResolver implements PortletMultipartResolver {
 
+		@Override
 		public boolean isMultipart(ActionRequest request) {
 			return true;
 		}
 
+		@Override
 		public MultipartActionRequest resolveMultipart(ActionRequest request) throws MultipartException {
 			if (request.getAttribute("fail") != null) {
 				throw new MaxUploadSizeExceededException(1000);
@@ -485,6 +522,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 			return new DefaultMultipartActionRequest(request, files, params, Collections.<String, String>emptyMap());
 		}
 
+		@Override
 		public void cleanupMultipart(MultipartActionRequest request) {
 			if (request.getAttribute("cleanedUp") != null) {
 				throw new IllegalStateException("Already cleaned up");
@@ -498,6 +536,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo
 
 		public int counter = 0;
 
+		@Override
 		public void onApplicationEvent(ApplicationEvent event) {
 			if (event instanceof PortletRequestHandledEvent) {
 				this.counter++;
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java
index b624737c1b..46ea7b2ba0 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java
@@ -73,6 +73,7 @@ public class DispatcherPortletTests extends TestCase {
 	private DispatcherPortlet complexDispatcherPortlet;
 
 
+	@Override
 	protected void setUp() throws PortletException {
 		simplePortletConfig = new MockPortletConfig(new MockPortletContext(), "simple");
 		complexPortletConfig = new MockPortletConfig(simplePortletConfig.getPortletContext(), "complex");
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java
index b2bc75c703..7bd390f9d2 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java
@@ -44,6 +44,7 @@ public class SimplePortletApplicationContext extends StaticPortletApplicationCon
 	private String renderCommandSessionAttributeName;
 	private String formSessionAttributeName;
 
+	@Override
 	public void refresh() throws BeansException {
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		registerSingleton("controller1", TestFormController.class, pvs);
@@ -98,17 +99,20 @@ public class SimplePortletApplicationContext extends StaticPortletApplicationCon
 			this.setFormView("form");
 		}
 
+		@Override
 		public void doSubmitAction(Object command) {
 			TestBean testBean = (TestBean) command;
 			testBean.setAge(testBean.getAge() + 10);
 		}
 
+		@Override
 		public ModelAndView showForm(RenderRequest request, RenderResponse response, BindException errors) throws Exception {
 			TestBean testBean = (TestBean) errors.getModel().get(getCommandName());
 			this.writeResponse(response, testBean, false);
 			return null;
 		}
 
+		@Override
 		public ModelAndView onSubmitRender(RenderRequest request, RenderResponse response, Object command, BindException errors)
 				throws IOException {
 			TestBean testBean = (TestBean) command;
@@ -128,6 +132,7 @@ public class SimplePortletApplicationContext extends StaticPortletApplicationCon
 			response.getWriter().write((finished ? "finished" : "") + (testBean.getAge() + 5));
 		}
 
+		@Override
 		public void handleEventRequest(EventRequest request, EventResponse response) throws Exception {
 			response.setRenderParameter("event", request.getEvent().getName());
 		}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
index da9b841c1b..128f169bb8 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
@@ -70,6 +70,7 @@ public class PortletRequestDataBinderTests extends TestCase {
 
 		PortletRequestDataBinder binder = new PortletRequestDataBinder(bean);
 		binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(new TestBean(text));
 			}
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 98f3b17858..13fafe991a 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
@@ -44,6 +44,7 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl
 	 * Overridden as we can't trust superclass method
 	 * @see org.springframework.context.AbstractApplicationContextTests#testEvents()
 	 */
+	@Override
 	public void testEvents() throws Exception {
 		TestListener listener = (TestListener) this.applicationContext.getBean("testListener");
 		listener.zeroCounter();
@@ -58,6 +59,7 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl
 		assertTrue("1 parent events after publication", parentListener.getEventCount() == 1);
 	}
 
+	@Override
 	public void testCount() {
 		assertTrue("should have 14 beans, not "+ this.applicationContext.getBeanDefinitionCount(),
 			this.applicationContext.getBeanDefinitionCount() == 14);
@@ -104,6 +106,7 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl
 			constructed = true;
 		}
 
+		@Override
 		public void afterPropertiesSet() {
 			if (this.initMethodInvoked)
 				fail();
@@ -117,6 +120,7 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl
 			this.initMethodInvoked = true;
 		}
 
+		@Override
 		public void destroy() {
 			if (this.customDestroyed)
 				fail();
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java
index 3492556e9a..58118d7711 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java
@@ -25,6 +25,7 @@ public class PortletConfigAwareBean implements PortletConfigAware {
 
 	private PortletConfig portletConfig;
 
+	@Override
 	public void setPortletConfig(PortletConfig portletConfig) {
 		this.portletConfig = portletConfig;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java
index b89b393ea7..405bc5d9fe 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java
@@ -25,6 +25,7 @@ public class PortletContextAwareBean implements PortletContextAware {
 
 	private PortletContext portletContext;
 
+	@Override
 	public void setPortletContext(PortletContext portletContext) {
 		this.portletContext = portletContext;
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
index 148943c06d..61a42a0257 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
@@ -41,6 +41,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication
 
 	private ConfigurablePortletApplicationContext root;
 
+	@Override
 	protected ConfigurableApplicationContext createContext() throws Exception {
 		root = new XmlPortletApplicationContext();
 		PortletContext portletContext = new MockPortletContext();
@@ -48,8 +49,10 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication
 		root.setPortletConfig(portletConfig);
 		root.setConfigLocations(new String[] {"/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml"});
 		root.addBeanFactoryPostProcessor(new BeanFactoryPostProcessor() {
+			@Override
 			public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 				beanFactory.addBeanPostProcessor(new BeanPostProcessor() {
+					@Override
 					public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 						if(bean instanceof TestBean) {
 							((TestBean) bean).getFriends().add("myFriend");
@@ -57,6 +60,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication
 						return bean;
 					}
 
+					@Override
 					public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 						return bean;
 					}
@@ -101,6 +105,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication
 	 * Overridden in order to access the root ApplicationContext
 	 * @see org.springframework.web.context.XmlWebApplicationContextTests#testContextNesting()
 	 */
+	@Override
 	public void testContextNesting() {
 		TestBean father = (TestBean) this.applicationContext.getBean("father");
 		assertTrue("Bean from root context", father != null);
@@ -116,6 +121,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication
 		assertTrue("Custom BeanPostProcessor applied", rod.getFriends().contains("myFriend"));
 	}
 
+	@Override
 	public void testCount() {
 		assertTrue("should have 16 beans, not "+ this.applicationContext.getBeanDefinitionCount(),
 				this.applicationContext.getBeanDefinitionCount() == 16);
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java
index 8f3c4a539d..f260a37505 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java
@@ -33,6 +33,7 @@ public class ParameterHandlerMappingTests extends TestCase {
 
 	private ConfigurablePortletApplicationContext pac;
 
+	@Override
 	public void setUp() throws Exception {
 		MockPortletContext portletContext = new MockPortletContext();
 		pac = new XmlPortletApplicationContext();
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java
index cff6418b88..d1b9f80628 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java
@@ -35,6 +35,7 @@ public class PortletModeHandlerMappingTests extends TestCase {
 
 	private ConfigurablePortletApplicationContext pac;
 
+	@Override
 	public void setUp() throws Exception {
 		MockPortletContext portletContext = new MockPortletContext();
 		pac = new XmlPortletApplicationContext();
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java
index 687e4938e4..09206812b0 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java
@@ -35,6 +35,7 @@ public class PortletModeParameterHandlerMappingTests extends TestCase {
 
 	private ConfigurablePortletApplicationContext pac;
 
+	@Override
 	public void setUp() throws Exception {
 		MockPortletContext portletContext = new MockPortletContext();
 		pac = new XmlPortletApplicationContext();
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 aecf7ef773..a1bd2834d9 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
@@ -43,6 +43,7 @@ public class SimpleMappingExceptionResolverTests extends TestCase {
 	private Object handler2;
 	private Exception genericException;
 
+	@Override
 	protected void setUp() {
 		exceptionResolver = new SimpleMappingExceptionResolver();
 		request = new MockRenderRequest();
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
index fdf57bb0af..f68e3b8d2d 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
@@ -212,6 +212,7 @@ public class CommandControllerTests extends TestCase {
 
 	public void testSuppressBinding() throws Exception {
 		TestController tc = new TestController() {
+			@Override
 			protected boolean suppressBinding(PortletRequest request) {
 				return true;
 			}
@@ -236,6 +237,7 @@ public class CommandControllerTests extends TestCase {
 	public void testWithCustomDateEditor() throws Exception {
 		final DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy");
 		TestController tc = new TestController() {
+			@Override
 			protected void initBinder(PortletRequest request, PortletRequestDataBinder binder) {
 				binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, false));
 			}
@@ -261,6 +263,7 @@ public class CommandControllerTests extends TestCase {
 	public void testWithCustomDateEditorEmptyNotAllowed() throws Exception {
 		final DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy");
 		TestController tc = new TestController() {
+			@Override
 			protected void initBinder(PortletRequest request, PortletRequestDataBinder binder) {
 				binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, false));
 			}
@@ -287,6 +290,7 @@ public class CommandControllerTests extends TestCase {
 	public void testWithCustomDateEditorEmptyAllowed() throws Exception {
 		final DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy");
 		TestController tc = new TestController() {
+			@Override
 			protected void initBinder(PortletRequest request, PortletRequestDataBinder binder) {
 				binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));
 			}
@@ -310,8 +314,10 @@ public class CommandControllerTests extends TestCase {
 
 	public void testNestedBindingWithPropertyEditor() throws Exception {
 		TestController tc = new TestController() {
+			@Override
 			protected void initBinder(PortletRequest request, PortletRequestDataBinder binder) {
 				binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() {
+					@Override
 					public void setAsText(String text) throws IllegalArgumentException {
 						setValue(new TestBean(text));
 					}
@@ -341,9 +347,11 @@ public class CommandControllerTests extends TestCase {
 
 	public void testWithValidatorNotSupportingCommandClass() throws Exception {
 		Validator v = new Validator() {
+			@Override
 			public boolean supports(Class c) {
 				return false;
 			}
+			@Override
 			public void validate(Object o, Errors e) {}
 		};
 		TestController tc = new TestController();
@@ -364,9 +372,11 @@ public class CommandControllerTests extends TestCase {
 		final String defaultMessage = "validation error!";
 		TestController tc = new TestController();
 		tc.setValidator(new Validator() {
+			@Override
 			public boolean supports(Class c) {
 				return TestBean.class.isAssignableFrom(c);
 			}
+			@Override
 			public void validate(Object o, Errors e) {
 				e.reject(errorCode, defaultMessage);
 			}
@@ -386,9 +396,11 @@ public class CommandControllerTests extends TestCase {
 		final String defaultMessage = "validation error!";
 		TestController tc = new TestController();
 		tc.setValidator(new Validator() {
+			@Override
 			public boolean supports(Class c) {
 				return TestBean.class.isAssignableFrom(c);
 			}
+			@Override
 			public void validate(Object o, Errors e) {
 				ValidationUtils.rejectIfEmpty(e, "name", errorCode, defaultMessage);
 			}
@@ -413,9 +425,11 @@ public class CommandControllerTests extends TestCase {
 		final String defaultMessage = "validation error!";
 		TestController tc = new TestController();
 		tc.setValidator(new Validator() {
+			@Override
 			public boolean supports(Class c) {
 				return TestBean.class.isAssignableFrom(c);
 			}
+			@Override
 			public void validate(Object o, Errors e) {
 				ValidationUtils.rejectIfEmptyOrWhitespace(e, "name", errorCode, defaultMessage);
 			}
@@ -444,10 +458,12 @@ public class CommandControllerTests extends TestCase {
 			super(TestBean.class, "testBean");
 		}
 
+		@Override
 		protected void handleAction(ActionRequest request, ActionResponse response, Object command, BindException errors) {
 			((TestBean)command).setJedi(true);
 		}
 
+		@Override
 		protected ModelAndView handleRender(RenderRequest request, RenderResponse response, Object command, BindException errors) {
 			assertNotNull(command);
 			assertNotNull(errors);
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java
index 008ccfaeeb..af1d41ae3e 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java
@@ -34,6 +34,7 @@ public class PortletModeNameViewControllerTests extends TestCase {
 
 	private PortletModeNameViewController controller;
 
+	@Override
 	public void setUp() {
 		controller = new PortletModeNameViewController();
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java
index 1bda3ed3d2..93490aa461 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java
@@ -155,10 +155,12 @@ public final class PortletWrappingControllerTests {
 		private PortletConfig portletConfig;
 
 
+		@Override
 		public void init(PortletConfig portletConfig) {
 			this.portletConfig = portletConfig;
 		}
 
+		@Override
 		public void processAction(ActionRequest request, ActionResponse response) throws PortletException {
 			if (request.getParameter("test") != null) {
 				response.setRenderParameter(RESULT_RENDER_PARAMETER_NAME, "myPortlet-action");
@@ -169,6 +171,7 @@ public final class PortletWrappingControllerTests {
 			}
 		}
 
+		@Override
 		public void render(RenderRequest request, RenderResponse response) throws IOException {
 			response.getWriter().write(RENDERED_RESPONSE_CONTENT);
 		}
@@ -177,6 +180,7 @@ public final class PortletWrappingControllerTests {
 			return this.portletConfig;
 		}
 
+		@Override
 		public void destroy() {
 			throw new IllegalStateException("Being destroyed...");
 		}
@@ -185,6 +189,7 @@ public final class PortletWrappingControllerTests {
 
 	private static final class MyApplicationContext extends StaticPortletApplicationContext {
 
+		@Override
 		public void refresh() throws BeansException {
 			MutablePropertyValues pvs = new MutablePropertyValues();
 			pvs.add("portletClass", MyPortlet.class);
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java
index 71fd56e812..4705be2f54 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java
@@ -104,6 +104,7 @@ public class Portlet20AnnotationControllerTests {
 	@Test
 	public void standardHandleMethod() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MyController.class));
@@ -122,6 +123,7 @@ public class Portlet20AnnotationControllerTests {
 	@Test
 	public void standardHandleMethodWithResources() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				StaticPortletApplicationContext wac = new StaticPortletApplicationContext();
 				wac.setPortletConfig(getPortletConfig());
@@ -173,6 +175,7 @@ public class Portlet20AnnotationControllerTests {
 
 	private void doTestAdaptedHandleMethods(final Class controllerClass) throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(controllerClass));
@@ -217,12 +220,14 @@ public class Portlet20AnnotationControllerTests {
 	@Test
 	public void formController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MyFormController.class));
 				wac.refresh();
 				return wac;
 			}
+			@Override
 			protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception {
 				new TestView().render(mv.getViewName(), mv.getModel(), request, response);
 			}
@@ -240,12 +245,14 @@ public class Portlet20AnnotationControllerTests {
 	@Test
 	public void modelFormController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MyModelFormController.class));
 				wac.refresh();
 				return wac;
 			}
+			@Override
 			protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception {
 				new TestView().render(mv.getViewName(), mv.getModel(), request, response);
 			}
@@ -263,6 +270,7 @@ public class Portlet20AnnotationControllerTests {
 	@Test
 	public void commandProvidingFormController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MyCommandProvidingFormController.class));
@@ -272,6 +280,7 @@ public class Portlet20AnnotationControllerTests {
 				wac.refresh();
 				return wac;
 			}
+			@Override
 			protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception {
 				new TestView().render(mv.getViewName(), mv.getModel(), request, response);
 			}
@@ -290,6 +299,7 @@ public class Portlet20AnnotationControllerTests {
 	@Test
 	public void typedCommandProvidingFormController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MyTypedCommandProvidingFormController.class));
@@ -301,6 +311,7 @@ public class Portlet20AnnotationControllerTests {
 				wac.refresh();
 				return wac;
 			}
+			@Override
 			protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception {
 				new TestView().render(mv.getViewName(), mv.getModel(), request, response);
 			}
@@ -338,12 +349,14 @@ public class Portlet20AnnotationControllerTests {
 	@Test
 	public void binderInitializingCommandProvidingFormController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MyBinderInitializingCommandProvidingFormController.class));
 				wac.refresh();
 				return wac;
 			}
+			@Override
 			protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception {
 				new TestView().render(mv.getViewName(), mv.getModel(), request, response);
 			}
@@ -362,12 +375,14 @@ public class Portlet20AnnotationControllerTests {
 	@Test
 	public void specificBinderInitializingCommandProvidingFormController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				StaticPortletApplicationContext wac = new StaticPortletApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MySpecificBinderInitializingCommandProvidingFormController.class));
 				wac.refresh();
 				return wac;
 			}
+			@Override
 			protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception {
 				new TestView().render(mv.getViewName(), mv.getModel(), request, response);
 			}
@@ -386,6 +401,7 @@ public class Portlet20AnnotationControllerTests {
 	@Test
 	public void parameterDispatchingController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				StaticPortletApplicationContext wac = new StaticPortletApplicationContext();
 				wac.setPortletContext(new MockPortletContext());
@@ -427,6 +443,7 @@ public class Portlet20AnnotationControllerTests {
 	@Test
 	public void typeLevelParameterDispatchingController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				StaticPortletApplicationContext wac = new StaticPortletApplicationContext();
 				wac.setPortletContext(new MockPortletContext());
@@ -513,6 +530,7 @@ public class Portlet20AnnotationControllerTests {
 	@Test
 	public void portlet20DispatchingController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				StaticPortletApplicationContext wac = new StaticPortletApplicationContext();
 				wac.setPortletContext(new MockPortletContext());
@@ -613,6 +631,7 @@ public class Portlet20AnnotationControllerTests {
 	@Test
 	public void eventDispatchingController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				StaticPortletApplicationContext wac = new StaticPortletApplicationContext();
 				wac.setPortletContext(new MockPortletContext());
@@ -697,6 +716,7 @@ public class Portlet20AnnotationControllerTests {
 	@Test
 	public void testPredicatePriorityComparisonAcrossControllers() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				StaticPortletApplicationContext wac = new StaticPortletApplicationContext();
 				// The order of handler registration is important to get
@@ -762,6 +782,7 @@ public class Portlet20AnnotationControllerTests {
 	@RequestMapping("VIEW")
 	private static class MyController extends AbstractController {
 
+		@Override
 		protected ModelAndView handleRenderRequestInternal(RenderRequest request, RenderResponse response) throws Exception {
 			response.getWriter().write("test");
 			return null;
@@ -950,6 +971,7 @@ public class Portlet20AnnotationControllerTests {
 			return new TestBean(defaultName.getClass().getSimpleName() + ":" + defaultName.toString());
 		}
 
+		@Override
 		@RequestMapping("VIEW")
 		@RenderMapping
 		public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult errors, ModelMap model) {
@@ -996,6 +1018,7 @@ public class Portlet20AnnotationControllerTests {
 	private static class MyOtherTypedCommandProvidingFormController
 			extends MyCommandProvidingFormController<Integer, TestBean, ITestBean> {
 
+		@Override
 		@RequestMapping("VIEW")
 		@RenderMapping
 		public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult errors, ModelMap model) {
@@ -1034,6 +1057,7 @@ public class Portlet20AnnotationControllerTests {
 
 	private static class MyWebBindingInitializer implements WebBindingInitializer {
 
+		@Override
 		public void initBinder(WebDataBinder binder, WebRequest request) {
 			assertNotNull(request.getLocale());
 			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -1045,6 +1069,7 @@ public class Portlet20AnnotationControllerTests {
 
 	private static class MySpecialArgumentResolver implements WebArgumentResolver {
 
+		@Override
 		public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) {
 			if (methodParameter.getParameterType().equals(MySpecialArg.class)) {
 				return new MySpecialArg("myValue");
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
index 88cec55802..c1bc5ab676 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
@@ -86,6 +86,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 
 	public void testStandardHandleMethod() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MyController.class));
@@ -115,6 +116,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 
 	public void doTestAdaptedHandleMethods(final Class controllerClass) throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(controllerClass));
@@ -153,12 +155,14 @@ public class PortletAnnotationControllerTests extends TestCase {
 
 	public void testFormController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MyFormController.class));
 				wac.refresh();
 				return wac;
 			}
+			@Override
 			protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception {
 				new TestView().render(mv.getViewName(), mv.getModel(), request, response);
 			}
@@ -175,12 +179,14 @@ public class PortletAnnotationControllerTests extends TestCase {
 
 	public void testModelFormController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MyModelFormController.class));
 				wac.refresh();
 				return wac;
 			}
+			@Override
 			protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception {
 				new TestView().render(mv.getViewName(), mv.getModel(), request, response);
 			}
@@ -197,6 +203,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 
 	public void testCommandProvidingFormController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MyCommandProvidingFormController.class));
@@ -206,6 +213,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 				wac.refresh();
 				return wac;
 			}
+			@Override
 			protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception {
 				new TestView().render(mv.getViewName(), mv.getModel(), request, response);
 			}
@@ -223,6 +231,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 
 	public void testTypedCommandProvidingFormController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MyTypedCommandProvidingFormController.class));
@@ -234,6 +243,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 				wac.refresh();
 				return wac;
 			}
+			@Override
 			protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception {
 				new TestView().render(mv.getViewName(), mv.getModel(), request, response);
 			}
@@ -270,12 +280,14 @@ public class PortletAnnotationControllerTests extends TestCase {
 
 	public void testBinderInitializingCommandProvidingFormController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				GenericWebApplicationContext wac = new GenericWebApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MyBinderInitializingCommandProvidingFormController.class));
 				wac.refresh();
 				return wac;
 			}
+			@Override
 			protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception {
 				new TestView().render(mv.getViewName(), mv.getModel(), request, response);
 			}
@@ -293,12 +305,14 @@ public class PortletAnnotationControllerTests extends TestCase {
 
 	public void testSpecificBinderInitializingCommandProvidingFormController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				StaticPortletApplicationContext wac = new StaticPortletApplicationContext();
 				wac.registerBeanDefinition("controller", new RootBeanDefinition(MySpecificBinderInitializingCommandProvidingFormController.class));
 				wac.refresh();
 				return wac;
 			}
+			@Override
 			protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception {
 				new TestView().render(mv.getViewName(), mv.getModel(), request, response);
 			}
@@ -316,6 +330,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 
 	public void testParameterDispatchingController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				StaticPortletApplicationContext wac = new StaticPortletApplicationContext();
 				wac.setPortletContext(new MockPortletContext());
@@ -356,6 +371,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 
 	public void testTypeLevelParameterDispatchingController() throws Exception {
 		DispatcherPortlet portlet = new DispatcherPortlet() {
+			@Override
 			protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException {
 				StaticPortletApplicationContext wac = new StaticPortletApplicationContext();
 				wac.setPortletContext(new MockPortletContext());
@@ -465,6 +481,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 	@RequestMapping("VIEW")
 	private static class MyController extends AbstractController {
 
+		@Override
 		protected ModelAndView handleRenderRequestInternal(RenderRequest request, RenderResponse response) throws Exception {
 			response.getWriter().write("test");
 			return null;
@@ -600,6 +617,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 			return new TestBean(defaultName.getClass().getSimpleName() + ":" + defaultName.toString());
 		}
 
+		@Override
 		@RequestMapping("VIEW")
 		public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult errors, ModelMap model) {
 			if (!model.containsKey("myKey")) {
@@ -644,6 +662,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 	private static class MyOtherTypedCommandProvidingFormController
 			extends MyCommandProvidingFormController<Integer, TestBean, ITestBean> {
 
+		@Override
 		@RequestMapping("VIEW")
 		public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult errors, ModelMap model) {
 			if (!model.containsKey("myKey")) {
@@ -681,6 +700,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 
 	private static class MyWebBindingInitializer implements WebBindingInitializer {
 
+		@Override
 		public void initBinder(WebDataBinder binder, WebRequest request) {
 			assertNotNull(request.getLocale());
 			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -692,6 +712,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 
 	private static class MySpecialArgumentResolver implements WebArgumentResolver {
 
+		@Override
 		public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) {
 			if (methodParameter.getParameterType().equals(MySpecialArg.class)) {
 				return new MySpecialArg("myValue");
@@ -807,6 +828,7 @@ public class PortletAnnotationControllerTests extends TestCase {
 
 	public static class MyModelAndViewResolver implements ModelAndViewResolver {
 
+		@Override
 		public org.springframework.web.servlet.ModelAndView resolveModelAndView(Method handlerMethod,
 				Class handlerType,
 				Object returnValue,
@@ -814,10 +836,12 @@ public class PortletAnnotationControllerTests extends TestCase {
 				NativeWebRequest webRequest) {
 			if (returnValue instanceof MySpecialArg) {
 				return new org.springframework.web.servlet.ModelAndView(new View() {
+					@Override
 					public String getContentType() {
 						return "text/html";
 					}
 
+					@Override
 					public void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response)
 							throws Exception {
 						response.getWriter().write("myValue");
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java
index a55e0d8e96..66903c3b91 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java
@@ -83,6 +83,7 @@ public final class PortletUtilsTests {
 	@Test(expected=FileNotFoundException.class)
 	public void testGetRealPathWithPathThatCannotBeResolvedToFile() throws Exception {
 		PortletUtils.getRealPath(new MockPortletContext() {
+			@Override
 			public String getRealPath(String path) {
 				return null;
 			}
@@ -221,6 +222,7 @@ public final class PortletUtilsTests {
 		request.setParameter("William", "Baskerville");
 		request.setParameter("Adso", "Melk");
 		MockActionResponse response = new MockActionResponse() {
+			@Override
 			public void setRenderParameter(String key, String[] values) {
 				throw new IllegalStateException();
 			}
@@ -243,6 +245,7 @@ public final class PortletUtilsTests {
 	@Test
 	public void testClearAllRenderParametersDoesNotPropagateExceptionIfRedirectAlreadySentAtTimeOfCall() throws Exception {
 		MockActionResponse response = new MockActionResponse() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public void setRenderParameters(Map parameters) {
 				throw new IllegalStateException();
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
index 0940539f54..8ada7848fa 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		if (this.beanName == null || beanName == null) {
 			this.beanName = beanName;
 		}
 	}
 
+	@Override
 	public String getBeanName() {
 		return beanName;
 	}
@@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
 	}
 
 
+	@Override
 	public void destroy() {
 		this.destroyed = true;
 	}
 
+	@Override
 	public boolean wasDestroyed() {
 		return destroyed;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
index 0eb8df5c8a..e136978f9e 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
index 13c2c5447a..9a2a3193df 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
@@ -31,22 +31,27 @@ public class SerializablePerson implements Person, Serializable {
 	private String name;
 	private int age;
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
 
+	@Override
 	public Object echo(Object o) throws Throwable {
 		if (o instanceof Throwable) {
 			throw (Throwable) o;
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java
index 7842bbfeac..7a27cf0894 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java
@@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 	/**
 	 * @see org.springframework.beans.ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see org.springframework.beans.IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java
index 006228975a..f3d6eedefe 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java
@@ -74,6 +74,7 @@ public class DummyFactory
 	 * Return if the bean managed by this factory is a singleton.
 	 * @see FactoryBean#isSingleton()
 	 */
+	@Override
 	public boolean isSingleton() {
 		return this.singleton;
 	}
@@ -85,6 +86,7 @@ public class DummyFactory
 		this.singleton = singleton;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -93,6 +95,7 @@ public class DummyFactory
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = (AutowireCapableBeanFactory) beanFactory;
 		this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName);
@@ -119,6 +122,7 @@ public class DummyFactory
 		return otherTestBean;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (initialized) {
 			throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean");
@@ -144,6 +148,7 @@ public class DummyFactory
 	 * and prototype mode.
 	 * @see FactoryBean#getObject()
 	 */
+	@Override
 	public Object getObject() throws BeansException {
 		if (isSingleton()) {
 			return this.testBean;
@@ -158,11 +163,13 @@ public class DummyFactory
 		}
 	}
 
+	@Override
 	public Class getObjectType() {
 		return TestBean.class;
 	}
 
 
+	@Override
 	public void destroy() {
 		if (this.testBean != null) {
 			this.testBean.setName(null);
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java
index 19b7da62f8..191b3509c7 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java
@@ -53,6 +53,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		return initMethodDeclared;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		this.beanName = name;
 	}
@@ -61,6 +62,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.owningFactory = beanFactory;
 	}
@@ -75,6 +77,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		this.postProcessedBeforeInit = true;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.owningFactory == null) {
 			throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean");
@@ -126,6 +129,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 		}
 	}
 
+	@Override
 	public void destroy() {
 		if (this.destroyed) {
 			throw new IllegalStateException("Already destroyed");
@@ -140,6 +144,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 
 	public static class PostProcessor implements BeanPostProcessor {
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
 			if (bean instanceof LifecycleBean) {
 				((LifecycleBean) bean).postProcessBeforeInit();
@@ -147,6 +152,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
 			if (bean instanceof LifecycleBean) {
 				((LifecycleBean) bean).postProcessAfterInit();
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
index 4715fe448f..17fd214598 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
@@ -30,6 +30,7 @@ public class MustBeInitialized implements InitializingBean {
 	/**
 	 * @see InitializingBean#afterPropertiesSet()
 	 */
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		this.inited = true;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc/src/test/java/org/springframework/context/ACATester.java
index 72c129ca4e..2a624d5c97 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/ACATester.java
+++ b/spring-webmvc/src/test/java/org/springframework/context/ACATester.java
@@ -27,6 +27,7 @@ public class ACATester implements ApplicationContextAware {
 
 	private ApplicationContext ac;
 
+	@Override
 	public void setApplicationContext(ApplicationContext ctx) throws ApplicationContextException {
 		// check reinitialization
 		if (this.ac != null) {
diff --git a/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java
index 8137de62f6..bd15215911 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java
+++ b/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java
@@ -29,6 +29,7 @@ public class BeanThatBroadcasts implements ApplicationContextAware {
 	public int receivedCount;
 
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 		if (applicationContext.getDisplayName().indexOf("listener") != -1) {
diff --git a/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java b/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java
index 9ab3f8ea40..a4c79b2e2c 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java
+++ b/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java
@@ -43,6 +43,7 @@ public class BeanThatListens implements ApplicationListener {
 	}
 
 
+	@Override
 	public void onApplicationEvent(ApplicationEvent event) {
 		eventCount++;
 		if (beanThatBroadcasts != null) {
diff --git a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
index 50c9936c44..14acac1ceb 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
@@ -15,18 +15,21 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo
 
 	protected ApplicationContext owningContext;
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		super.setBeanFactory(beanFactory);
 		if (this.owningContext != null)
 			throw new RuntimeException("Factory called setBeanFactory after setApplicationContext");
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
 		if (this.owningContext == null)
 			throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean");
 	}
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		if (this.owningFactory == null)
 			throw new RuntimeException("Factory called setApplicationContext before setBeanFactory");
diff --git a/spring-webmvc/src/test/java/org/springframework/context/TestListener.java b/spring-webmvc/src/test/java/org/springframework/context/TestListener.java
index 29f375105f..739222190f 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/TestListener.java
+++ b/spring-webmvc/src/test/java/org/springframework/context/TestListener.java
@@ -21,6 +21,7 @@ public class TestListener implements ApplicationListener {
 		eventCount = 0;
 	}
 
+	@Override
 	public void onApplicationEvent(ApplicationEvent e) {
 		++eventCount;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java
index ce3c45d2e7..facc86bace 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java
@@ -45,10 +45,12 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe
 
 	protected TestListener parentListener = new TestListener();
 
+	@Override
 	protected void setUp() throws Exception {
 		this.applicationContext = createContext();
 	}
 
+	@Override
 	protected BeanFactory getBeanFactory() {
 		return applicationContext;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
index cd81c78fa6..2e0e3a0d3c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
@@ -325,6 +325,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase {
 
 	public static class TestBeanEditor extends PropertyEditorSupport {
 
+		@Override
 		public void setAsText(String text) {
 			TestBean tb = new TestBean();
 			StringTokenizer st = new StringTokenizer(text, "_");
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 8169998a93..a84b83f7ad 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
@@ -105,6 +105,7 @@ public final class ContextLoaderTests {
 		sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
 				"/org/springframework/web/context/WEB-INF/applicationContext.xml");
 		final 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);
@@ -301,6 +302,7 @@ public final class ContextLoaderTests {
 				"/org/springframework/web/context/WEB-INF/applicationContext.xml",
 				"/org/springframework/web/context/WEB-INF/fail.xml" }) {
 
+				@Override
 				public void refresh() throws BeansException {
 					try {
 						super.refresh();
@@ -320,6 +322,7 @@ public final class ContextLoaderTests {
 	}
 
 	private static class TestContextInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+		@Override
 		public void initialize(ConfigurableApplicationContext applicationContext) {
 			ConfigurableEnvironment environment = applicationContext.getEnvironment();
 			environment.getPropertySources().addFirst(new PropertySource<Object>("testPropertySource") {
@@ -332,6 +335,7 @@ public final class ContextLoaderTests {
 	}
 
 	private static class TestWebContextInitializer implements ApplicationContextInitializer<ConfigurableWebApplicationContext> {
+		@Override
 		public void initialize(ConfigurableWebApplicationContext applicationContext) {
 			ServletContext ctx = applicationContext.getServletContext(); // type-safe access to servlet-specific methods
 			ctx.setAttribute("initialized", true);
@@ -339,6 +343,7 @@ public final class ContextLoaderTests {
 	}
 
 	private static class EnvApplicationContextInitializer implements ApplicationContextInitializer<ConfigurableWebApplicationContext> {
+		@Override
 		public void initialize(ConfigurableWebApplicationContext applicationContext) {
 			// test that ApplicationContextInitializers can access ServletContext properties
 			// via the environment (SPR-8991)
@@ -352,6 +357,7 @@ public final class ContextLoaderTests {
 	}
 
 	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/ResourceBundleMessageSourceTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java
index ff462f3650..b9710dd798 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java
@@ -60,6 +60,7 @@ public class ResourceBundleMessageSourceTests extends AbstractApplicationContext
 
 	private MessageSource themeMsgSource;
 
+	@Override
 	protected ConfigurableApplicationContext createContext() throws Exception {
 		root = new XmlWebApplicationContext();
 		MockServletContext sc = new MockServletContext();
@@ -82,6 +83,7 @@ public class ResourceBundleMessageSourceTests extends AbstractApplicationContext
 		return wac;
 	}
 
+	@Override
 	public void testCount() {
 		assertTrue("should have 14 beans, not " +
 				this.applicationContext.getBeanDefinitionCount(),
@@ -92,6 +94,7 @@ public class ResourceBundleMessageSourceTests extends AbstractApplicationContext
 	 * Overridden as we can't trust superclass method.
 	 * @see org.springframework.context.AbstractApplicationContextTests#testEvents()
 	 */
+	@Override
 	public void testEvents() throws Exception {
 		// Do nothing
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java
index c3dc6275e1..018dd1cfeb 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java
@@ -25,6 +25,7 @@ public class ServletConfigAwareBean implements ServletConfigAware {
 
 	private ServletConfig servletConfig;
 
+	@Override
 	public void setServletConfig(ServletConfig servletConfig) {
 		this.servletConfig = servletConfig;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java
index a868f2f30d..2272378104 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java
@@ -25,6 +25,7 @@ public class ServletContextAwareBean implements ServletContextAware {
 
 	private ServletContext servletContext;
 
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
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 cca608e9f1..3423fd8e88 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
@@ -45,6 +45,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes
 
 	private ConfigurableWebApplicationContext root;
 
+	@Override
 	protected ConfigurableApplicationContext createContext() throws Exception {
 		InitAndIB.constructed = false;
 		root = new XmlWebApplicationContext();
@@ -53,8 +54,10 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes
 		root.setServletContext(sc);
 		root.setConfigLocations(new String[] {"/org/springframework/web/context/WEB-INF/applicationContext.xml"});
 		root.addBeanFactoryPostProcessor(new BeanFactoryPostProcessor() {
+			@Override
 			public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
 				beanFactory.addBeanPostProcessor(new BeanPostProcessor() {
+					@Override
 					@SuppressWarnings("unchecked")
 					public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
 						if (bean instanceof TestBean) {
@@ -62,6 +65,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes
 						}
 						return bean;
 					}
+					@Override
 					public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
 						return bean;
 					}
@@ -90,6 +94,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes
 	 * Overridden as we can't trust superclass method
 	 * @see org.springframework.context.AbstractApplicationContextTests#testEvents()
 	 */
+	@Override
 	public void testEvents() throws Exception {
 		TestListener listener = (TestListener) this.applicationContext.getBean("testListener");
 		listener.zeroCounter();
@@ -104,6 +109,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes
 		assertTrue("1 parent events after publication", parentListener.getEventCount() == 1);
 	}
 
+	@Override
 	public void testCount() {
 		assertTrue("should have 14 beans, not "+ this.applicationContext.getBeanDefinitionCount(),
 			this.applicationContext.getBeanDefinitionCount() == 14);
@@ -169,6 +175,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes
 			constructed = true;
 		}
 
+		@Override
 		public void afterPropertiesSet() {
 			if (this.initMethodInvoked)
 				fail();
@@ -182,6 +189,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes
 			this.initMethodInvoked = true;
 		}
 
+		@Override
 		public void destroy() {
 			if (this.customDestroyed)
 				fail();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java
index 96429a28cd..c6a5025c13 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java
@@ -48,6 +48,7 @@ public class HttpRequestHandlerTests {
 
 		StaticWebApplicationContext wac = new StaticWebApplicationContext();
 		wac.getBeanFactory().registerSingleton("myHandler", new HttpRequestHandler() {
+			@Override
 			public void handleRequest(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
 				assertSame(request, req);
 				assertSame(response, res);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
index 75af2c0b5a..2bf2ee7edb 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
@@ -371,6 +371,7 @@ public class ServletContextSupportTests {
 		paths.add("/WEB-INF/context2.xml");
 
 		MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context") {
+			@Override
 			public Set<String> getResourcePaths(String path) {
 				if ("/WEB-INF/".equals(path)) {
 					return paths;
@@ -397,6 +398,7 @@ public class ServletContextSupportTests {
 		dirs.add("/WEB-INF/mydir2/");
 
 		MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context") {
+			@Override
 			public Set<String> getResourcePaths(String path) {
 				if ("/WEB-INF/".equals(path)) {
 					return dirs;
@@ -433,6 +435,7 @@ public class ServletContextSupportTests {
 		paths.add("/WEB-INF/mydir2/mydir3/");
 
 		MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context") {
+			@Override
 			public Set<String> getResourcePaths(String path) {
 				if ("/WEB-INF/".equals(path)) {
 					return dirs;
@@ -470,6 +473,7 @@ public class ServletContextSupportTests {
 		paths.add("C:/webroot/someOtherDirThatDoesntContainPath");
 
 		MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context") {
+			@Override
 			public Set<String> getResourcePaths(String path) {
 				if ("/WEB-INF/".equals(path)) {
 					return paths;
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 cae1504005..17bbabaa3d 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
@@ -73,6 +73,7 @@ import org.springframework.web.servlet.view.ResourceBundleViewResolver;
  */
 public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 
+	@Override
 	public void refresh() throws BeansException {
 		registerSingleton(DispatcherServlet.LOCALE_RESOLVER_BEAN_NAME, SessionLocaleResolver.class);
 		registerSingleton(DispatcherServlet.THEME_RESOLVER_BEAN_NAME, SessionThemeResolver.class);
@@ -179,6 +180,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 
 	public static class HeadController implements Controller {
 
+		@Override
 		public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
 			if ("HEAD".equals(request.getMethod())) {
 				response.setContentLength(5);
@@ -190,6 +192,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 
 	public static class BodyController implements Controller {
 
+		@Override
 		public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
 			response.getOutputStream().write("body".getBytes());
 			return null;
@@ -199,6 +202,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 
 	public static class NoViewController implements Controller {
 
+		@Override
 		public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
 			return new ModelAndView();
 		}
@@ -209,22 +213,27 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 
 		private ServletConfig servletConfig;
 
+		@Override
 		public void init(ServletConfig servletConfig) throws ServletException {
 			this.servletConfig = servletConfig;
 		}
 
+		@Override
 		public ServletConfig getServletConfig() {
 			return servletConfig;
 		}
 
+		@Override
 		public void service(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException {
 			servletResponse.getOutputStream().write("body".getBytes());
 		}
 
+		@Override
 		public String getServletInfo() {
 			return null;
 		}
 
+		@Override
 		public void destroy() {
 			this.servletConfig = null;
 		}
@@ -241,20 +250,24 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 
 	public static class MyHandlerAdapter extends ApplicationObjectSupport implements HandlerAdapter, Ordered {
 
+		@Override
 		public int getOrder() {
 			return 99;
 		}
 
+		@Override
 		public boolean supports(Object handler) {
 			return handler != null && MyHandler.class.isAssignableFrom(handler.getClass());
 		}
 
+		@Override
 		public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object delegate)
 			throws ServletException, IllegalAccessException {
 			((MyHandler) delegate).doSomething(request);
 			return null;
 		}
 
+		@Override
 		public long getLastModified(HttpServletRequest request, Object delegate) {
 			return ((MyHandler) delegate).lastModified();
 		}
@@ -263,15 +276,18 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 
 	public static class MyDummyAdapter extends ApplicationObjectSupport implements HandlerAdapter {
 
+		@Override
 		public boolean supports(Object handler) {
 			return handler != null && MyHandler.class.isAssignableFrom(handler.getClass());
 		}
 
+		@Override
 		public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object delegate)
 			throws IOException, ServletException {
 			throw new ServletException("dummy");
 		}
 
+		@Override
 		public long getLastModified(HttpServletRequest request, Object delegate) {
 			return -1;
 		}
@@ -280,6 +296,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 
 	public static class MyHandlerInterceptor1 implements HandlerInterceptor {
 
+		@Override
 		public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws ServletException {
 			if (request.getAttribute("test2") != null) {
@@ -291,6 +308,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 			return true;
 		}
 
+		@Override
 		public void postHandle(
 				HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView)
 				throws ServletException {
@@ -303,6 +321,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 			request.removeAttribute("test1x");
 		}
 
+		@Override
 		public void afterCompletion(
 				HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
 				throws ServletException {
@@ -316,6 +335,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 
 	public static class MyHandlerInterceptor2 implements HandlerInterceptor {
 
+		@Override
 		public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws ServletException {
 			if (request.getAttribute("test1x") == null) {
@@ -330,6 +350,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 			return true;
 		}
 
+		@Override
 		public void postHandle(
 				HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView)
 				throws ServletException {
@@ -345,6 +366,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 			request.removeAttribute("test2x");
 		}
 
+		@Override
 		public void afterCompletion(
 				HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
 				throws Exception {
@@ -358,14 +380,17 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 
 	public static class MyWebRequestInterceptor implements WebRequestInterceptor {
 
+		@Override
 		public void preHandle(WebRequest request) throws Exception {
 			request.setAttribute("test3", "test3", WebRequest.SCOPE_REQUEST);
 		}
 
+		@Override
 		public void postHandle(WebRequest request, ModelMap model) throws Exception {
 			request.setAttribute("test3x", "test3x", WebRequest.SCOPE_REQUEST);
 		}
 
+		@Override
 		public void afterCompletion(WebRequest request, Exception ex) throws Exception {
 			request.setAttribute("test3y", "test3y", WebRequest.SCOPE_REQUEST);
 		}
@@ -374,6 +399,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 
 	public static class ComplexLocaleChecker implements MyHandler {
 
+		@Override
 		public void doSomething(HttpServletRequest request) throws ServletException, IllegalAccessException {
 			WebApplicationContext wac = RequestContextUtils.getWebApplicationContext(request);
 			if (!(wac instanceof ComplexWebApplicationContext)) {
@@ -411,6 +437,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 			}
 		}
 
+		@Override
 		public long lastModified() {
 			return 99;
 		}
@@ -419,10 +446,12 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 
 	public static class MockMultipartResolver implements MultipartResolver {
 
+		@Override
 		public boolean isMultipart(HttpServletRequest request) {
 			return true;
 		}
 
+		@Override
 		public MultipartHttpServletRequest resolveMultipart(HttpServletRequest request) throws MultipartException {
 			if (request.getAttribute("fail") != null) {
 				throw new MaxUploadSizeExceededException(1000);
@@ -435,15 +464,18 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 			}
 			request.setAttribute("resolved", Boolean.TRUE);
 			return new AbstractMultipartHttpServletRequest(request) {
+				@Override
 				public HttpHeaders getMultipartHeaders(String paramOrFileName) {
 					return null;
 				}
+				@Override
 				public String getMultipartContentType(String paramOrFileName) {
 					return null;
 				}
 			};
 		}
 
+		@Override
 		public void cleanupMultipart(MultipartHttpServletRequest request) {
 			if (request.getAttribute("cleanedUp") != null) {
 				throw new IllegalStateException("Already cleaned up");
@@ -457,6 +489,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 
 		public int counter = 0;
 
+		@Override
 		public void onApplicationEvent(ApplicationEvent event) {
 			if (event instanceof RequestHandledEvent) {
 				this.counter++;
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 9eadbf6461..635b8e0ba8 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
@@ -81,6 +81,7 @@ public class DispatcherServletTests extends TestCase {
 
 	private DispatcherServlet complexDispatcherServlet;
 
+	@Override
 	protected void setUp() throws ServletException {
 		servletConfig = new MockServletConfig(new MockServletContext(), "simple");
 		MockServletConfig complexConfig = new MockServletConfig(servletConfig.getServletContext(), "complex");
@@ -869,6 +870,7 @@ public class DispatcherServletTests extends TestCase {
 
 	public static class ControllerFromParent implements Controller {
 
+		@Override
 		public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
 			return new ModelAndView(ControllerFromParent.class.getName());
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
index 70c40be9fd..85a0756fb7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
@@ -47,6 +47,7 @@ import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping;
  */
 public class SimpleWebApplicationContext extends StaticWebApplicationContext {
 
+	@Override
 	public void refresh() throws BeansException {
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("commandClass", "org.springframework.beans.TestBean");
@@ -75,6 +76,7 @@ public class SimpleWebApplicationContext extends StaticWebApplicationContext {
 
 	public static class LocaleChecker implements Controller, LastModified {
 
+		@Override
 		public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response)
 				throws ServletException, IOException {
 			if (!(RequestContextUtils.getWebApplicationContext(request) instanceof SimpleWebApplicationContext)) {
@@ -89,6 +91,7 @@ public class SimpleWebApplicationContext extends StaticWebApplicationContext {
 			return null;
 		}
 
+		@Override
 		public long getLastModified(HttpServletRequest request) {
 			return 98;
 		}
@@ -105,6 +108,7 @@ public class SimpleWebApplicationContext extends StaticWebApplicationContext {
 			this.messageSource.addMessage("themetestArgs", Locale.ENGLISH, "theme test message {0}");
 		}
 
+		@Override
 		public Theme getTheme(String themeName) {
 			if (AbstractThemeResolver.ORIGINAL_DEFAULT_THEME_NAME.equals(themeName)) {
 				return new SimpleTheme(AbstractThemeResolver.ORIGINAL_DEFAULT_THEME_NAME, this.messageSource);
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 e1c8898604..c55aeb7d0c 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
@@ -148,6 +148,7 @@ public class AnnotationDrivenBeanDefinitionParserTests {
 
 class TestWebArgumentResolver implements WebArgumentResolver {
 
+	@Override
 	public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) throws Exception {
 		return null;
 	}
@@ -156,10 +157,12 @@ class TestWebArgumentResolver implements WebArgumentResolver {
 
 class TestHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return false;
 	}
 
+	@Override
 	public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
 		return null;
@@ -168,10 +171,12 @@ class TestHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver
 
 class TestHandlerMethodReturnValueHandler implements HandlerMethodReturnValueHandler {
 
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		return false;
 	}
 
+	@Override
 	public void handleReturnValue(Object returnValue,
 			MethodParameter returnType, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest) throws Exception {
@@ -181,10 +186,12 @@ class TestHandlerMethodReturnValueHandler implements HandlerMethodReturnValueHan
 
 class TestMessageCodesResolver implements MessageCodesResolver {
 
+	@Override
 	public String[] resolveMessageCodes(String errorCode, String objectName) {
 		return new String[] { "test.foo.bar" };
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public String[] resolveMessageCodes(String errorCode, String objectName, String field, Class fieldType) {
 		return new String[] { "test.foo.bar" };
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 9ced7b5ddd..8ff997204f 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
@@ -516,10 +516,12 @@ public class MvcNamespaceTests {
 
 		boolean validatorInvoked;
 
+		@Override
 		public boolean supports(Class<?> clazz) {
 			return true;
 		}
 
+		@Override
 		public void validate(Object target, Errors errors) {
 			this.validatorInvoked = true;
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java
index 6c43c1ea0f..b1433e2986 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java
@@ -161,13 +161,16 @@ public class InterceptorRegistryTests {
 
 		private boolean preHandleInvoked = false;
 
+		@Override
 		public void preHandle(WebRequest request) throws Exception {
 			preHandleInvoked = true;
 		}
 
+		@Override
 		public void postHandle(WebRequest request, ModelMap model) throws Exception {
 		}
 
+		@Override
 		public void afterCompletion(WebRequest request, Exception ex) throws Exception {
 		}
 
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 c14ad7735c..1c270ae571 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
@@ -222,6 +222,7 @@ public class WebMvcConfigurationSupportExtensionTests {
 		@Override
 		public void addFormatters(FormatterRegistry registry) {
 			registry.addConverter(new Converter<TestBean, String>() {
+				@Override
 				public String convert(TestBean source) {
 					return "converted";
 				}
@@ -236,9 +237,11 @@ public class WebMvcConfigurationSupportExtensionTests {
 		@Override
 		public Validator getValidator() {
 			return new Validator() {
+				@Override
 				public void validate(Object target, Errors errors) {
 					errors.reject("invalid");
 				}
+				@Override
 				public boolean supports(Class<?> clazz) {
 					return true;
 				}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
index 6e018218fd..c8e3a860d7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java
@@ -38,6 +38,7 @@ public class BeanNameUrlHandlerMappingTests extends TestCase {
 
 	private ConfigurableWebApplicationContext wac;
 
+	@Override
 	public void setUp() throws Exception {
 		MockServletContext sc = new MockServletContext("");
 		wac = new XmlWebApplicationContext();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java
index d066e44525..ea1b09ed21 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java
@@ -183,6 +183,7 @@ public class CancellableFormControllerTests extends TestCase {
 	final String reason = "Because I wanted to";
 
 		TestController ctl = new TestController() {
+			@Override
 			protected ModelAndView onCancel(HttpServletRequest request, HttpServletResponse response, Object command) {
 				return new ModelAndView(getCancelView(), "reason", reason);
 			}
@@ -221,9 +222,11 @@ public class CancellableFormControllerTests extends TestCase {
 
 		private boolean invoked = false;
 
+		@Override
 		public boolean supports(Class clazz) {
 			return TestBean.class.isAssignableFrom(clazz);
 		}
+		@Override
 		public void validate(Object target, Errors errors) {
 			this.invoked = true;
 			TestBean tb = (TestBean) target;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java
index 26b73b097f..4749c85df7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java
@@ -208,6 +208,7 @@ public class CommandControllerTests extends TestCase {
 
 	public void testCachingWithLastModified() throws Exception {
 		class LastModifiedTestController extends TestController implements LastModified {
+			@Override
 			public long getLastModified(HttpServletRequest request) {
 				return 0;
 			}
@@ -223,6 +224,7 @@ public class CommandControllerTests extends TestCase {
 
 	public void testCachingWithCustomCacheForSecondsCall() throws Exception {
 		TestController mc = new TestController() {
+			@Override
 			protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) {
 				cacheForSeconds(response, 5);
 				return super.handle(request, response, command, errors);
@@ -237,6 +239,7 @@ public class CommandControllerTests extends TestCase {
 
 	public void testCachingWithCustomApplyCacheSecondsCall1() throws Exception {
 		TestController mc = new TestController() {
+			@Override
 			protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) {
 				applyCacheSeconds(response, 5);
 				return super.handle(request, response, command, errors);
@@ -251,6 +254,7 @@ public class CommandControllerTests extends TestCase {
 
 	public void testCachingWithCustomApplyCacheSecondsCall2() throws Exception {
 		TestController mc = new TestController() {
+			@Override
 			protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) {
 				applyCacheSeconds(response, 0);
 				return super.handle(request, response, command, errors);
@@ -267,6 +271,7 @@ public class CommandControllerTests extends TestCase {
 
 	public void testCachingWithCustomApplyCacheSecondsCall3() throws Exception {
 		TestController mc = new TestController() {
+			@Override
 			protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) {
 				applyCacheSeconds(response, -1);
 				return super.handle(request, response, command, errors);
@@ -282,6 +287,7 @@ public class CommandControllerTests extends TestCase {
 	public void testCustomDateEditorWithAllowEmpty() throws Exception {
 		final DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.GERMAN);
 		TestController mc = new TestController() {
+			@Override
 			protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) {
 				binder.registerCustomEditor(Date.class, new CustomDateEditor(df, true));
 			}
@@ -311,6 +317,7 @@ public class CommandControllerTests extends TestCase {
 	public void testCustomDateEditorWithoutAllowEmpty() throws Exception {
 		final DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.GERMAN);
 		TestController mc = new TestController() {
+			@Override
 			protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) {
 				binder.registerCustomEditor(Date.class, new CustomDateEditor(df, false));
 			}
@@ -341,6 +348,7 @@ public class CommandControllerTests extends TestCase {
 		final NumberFormat nf = NumberFormat.getNumberInstance(Locale.GERMAN);
 
 		TestController mc = new TestController() {
+			@Override
 			protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) {
 				binder.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, true));
 			}
@@ -371,6 +379,7 @@ public class CommandControllerTests extends TestCase {
 		final NumberFormat nf = NumberFormat.getNumberInstance(Locale.GERMAN);
 
 		TestController mc = new TestController() {
+			@Override
 			protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) {
 				binder.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, false));
 			}
@@ -463,9 +472,11 @@ public class CommandControllerTests extends TestCase {
 
 	public void testResetEmptyFieldsTurnedOff() throws Exception {
 		TestController mc = new TestController() {
+			@Override
 			protected Object getCommand(HttpServletRequest request) throws Exception {
 				return new TestBean("original", 99);
 			}
+			@Override
 			protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) {
 				binder.setFieldMarkerPrefix(null);
 			}
@@ -497,6 +508,7 @@ public class CommandControllerTests extends TestCase {
 			super(TestBean.class, "person");
 		}
 
+		@Override
 		protected ModelAndView handle(HttpServletRequest request,	HttpServletResponse response,	Object command,	BindException errors) {
 			Map m = new HashMap();
 			assertTrue("Command not null", command != null);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java
index 584e03d14c..208225c433 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java
@@ -178,23 +178,28 @@ public class ControllerTests extends TestCase {
 			destroyed = false;
 		}
 
+		@Override
 		public void init(ServletConfig servletConfig) {
 			config = servletConfig;
 		}
 
+		@Override
 		public ServletConfig getServletConfig() {
 			return config;
 		}
 
+		@Override
 		public void service(ServletRequest servletRequest, ServletResponse servletResponse) {
 			request = servletRequest;
 			response = servletResponse;
 		}
 
+		@Override
 		public String getServletInfo() {
 			return "TestServlet";
 		}
 
+		@Override
 		public void destroy() {
 			destroyed = true;
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
index ac926b224f..26b84eff65 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
@@ -122,6 +122,7 @@ public class FormControllerTests extends TestCase {
 		final Integer someNumber = new Integer(12);
 
 		TestController mc = new TestController() {
+			@Override
 			protected void onBindOnNewForm(HttpServletRequest request, Object command) throws Exception {
 				TestBean testBean = (TestBean)command;
 				testBean.setSomeNumber(new Integer(12));
@@ -370,6 +371,7 @@ public class FormControllerTests extends TestCase {
 		String successView = "s";
 
 		TestController mc = new TestController() {
+			@Override
 			protected ModelAndView handleInvalidSubmit(HttpServletRequest request, HttpServletResponse response)
 				throws ServletException, IOException {
 				throw new ServletException("invalid submit");
@@ -438,10 +440,12 @@ public class FormControllerTests extends TestCase {
 	final Float myFloat = new Float("123.45");
 
 		TestController mc = new TestController() {
+			@Override
 			protected boolean isFormChangeRequest(HttpServletRequest request) {
 				return (request.getParameter("formChange") != null);
 			}
 
+			@Override
 			protected void onFormChange(HttpServletRequest request, HttpServletResponse response, Object command) {
 				assertNotNull("Command should not be null", command);
 				assertEquals("Incorrect command class", TestBean.class, command.getClass());
@@ -513,8 +517,10 @@ public class FormControllerTests extends TestCase {
 
 		public static String TOOSHORT = "tooshort";
 
+		@Override
 		public boolean supports(Class clazz) { return true; }
 
+		@Override
 		public void validate(Object obj, Errors errors) {
 			TestBean tb = (TestBean) obj;
 			if (tb.getName() == null || "".equals(tb.getName()))
@@ -529,8 +535,10 @@ public class FormControllerTests extends TestCase {
 
 		public static String TOOSHORT = "tooshort";
 
+		@Override
 		public boolean supports(Class clazz) { return true; }
 
+		@Override
 		public void validate(Object obj, Errors errors) {
 			errors.reject("test", "testmessage");
 		}
@@ -548,12 +556,14 @@ public class FormControllerTests extends TestCase {
 			setCommandName(BEAN_NAME);
 		}
 
+		@Override
 		protected Object formBackingObject(HttpServletRequest request) throws ServletException {
 			TestBean person = new TestBean();
 			person.setAge(DEFAULT_AGE);
 			return person;
 		}
 
+		@Override
 		protected boolean isFormChangeRequest(HttpServletRequest request) {
 			return (request.getParameter("formChange") != null);
 		}
@@ -562,6 +572,7 @@ public class FormControllerTests extends TestCase {
 
 	private static class TestControllerWithCustomOnSubmit extends TestController {
 
+		@Override
 		protected ModelAndView onSubmit(Object command) throws Exception {
 			return new ModelAndView("mySuccess");
 		}
@@ -580,6 +591,7 @@ public class FormControllerTests extends TestCase {
 			setCommandClass(TestBean.class);
 		}
 
+		@Override
 		protected Map referenceData(HttpServletRequest request) {
 			++refDataCount;
 			Map m = new HashMap();
@@ -595,6 +607,7 @@ public class FormControllerTests extends TestCase {
 
 	public static class BooleanBindingFormController extends AbstractFormController {
 
+		@Override
 		protected ModelAndView processFormSubmission
 				(HttpServletRequest req, HttpServletResponse resp, Object command, BindException errors) throws Exception {
 			ModelAndView mav = new ModelAndView();
@@ -602,6 +615,7 @@ public class FormControllerTests extends TestCase {
 			return mav;
 		}
 
+		@Override
 		protected ModelAndView showForm(
 				HttpServletRequest req, HttpServletResponse resp, BindException err) throws Exception {
 			return null;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
index 1d48f052d5..5249a82cdd 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
@@ -105,9 +105,11 @@ public class WizardFormControllerTests extends TestCase {
 
 	public void testCustomSessionAttributes() throws Exception {
 		AbstractWizardFormController wizard = new TestWizardController() {
+			@Override
 			protected String getFormSessionAttributeName() {
 				return "myFormAttr";
 			}
+			@Override
 			protected String getPageSessionAttributeName() {
 				return "myPageAttr";
 			}
@@ -140,9 +142,11 @@ public class WizardFormControllerTests extends TestCase {
 
 	public void testCustomRequestDependentSessionAttributes() throws Exception {
 		AbstractWizardFormController wizard = new TestWizardController() {
+			@Override
 			protected String getFormSessionAttributeName(HttpServletRequest request) {
 				return "myFormAttr" + request.getParameter("formAttr");
 			}
+			@Override
 			protected String getPageSessionAttributeName(HttpServletRequest request) {
 				return "myPageAttr" + request.getParameter("pageAttr");
 			}
@@ -383,15 +387,18 @@ public class WizardFormControllerTests extends TestCase {
 			setPages(new String[] {"page0", "page1"});
 		}
 
+		@Override
 		protected Map referenceData(HttpServletRequest request, int page) throws Exception {
 			assertEquals(new Integer(page), request.getAttribute("target"));
 			return super.referenceData(request, page);
 		}
 
+		@Override
 		protected boolean suppressValidation(HttpServletRequest request, Object command) {
 			return (request.getParameter("formChange") != null);
 		}
 
+		@Override
 		protected void validatePage(Object command, Errors errors, int page) {
 			TestBean tb = (TestBean) command;
 			switch (page) {
@@ -410,6 +417,7 @@ public class WizardFormControllerTests extends TestCase {
 			}
 		}
 
+		@Override
 		protected ModelAndView processFinish(
 				HttpServletRequest request, HttpServletResponse response, Object command, BindException errors)
 			throws ServletException, IOException {
@@ -417,6 +425,7 @@ public class WizardFormControllerTests extends TestCase {
 			return new ModelAndView("success", getCommandName(), command);
 		}
 
+		@Override
 		protected ModelAndView processCancel(
 				HttpServletRequest request, HttpServletResponse response, Object command, BindException errors)
 			throws ServletException, IOException {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java
index cbf9da3061..6c495b31ab 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java
@@ -41,6 +41,7 @@ public class ControllerClassNameHandlerMappingTests extends TestCase {
 
 	private HandlerMapping hm4;
 
+	@Override
 	public void setUp() throws Exception {
 		MockServletContext sc = new MockServletContext("");
 		this.wac = new XmlWebApplicationContext();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java
index bac4f505bb..45249d3e4b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java
@@ -110,6 +110,7 @@ public class JdkProxyServletAnnotationTests {
 
 	public static class TypeLevelImpl implements TypeLevel {
 
+		@Override
 		public void doIt(Writer writer) throws IOException {
 			writer.write("doIt");
 		}
@@ -126,6 +127,7 @@ public class JdkProxyServletAnnotationTests {
 
 	public static class MethodLevelImpl implements MethodLevel {
 
+		@Override
 		public void doIt(Writer writer) throws IOException {
 			writer.write("doIt");
 		}
@@ -142,6 +144,7 @@ public class JdkProxyServletAnnotationTests {
 
 	public static class TypeAndMethodLevelImpl implements TypeAndMethodLevel {
 
+		@Override
 		public void doIt(Writer writer) throws IOException {
 			writer.write("doIt");
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java
index 22299a891f..e85d4aafa5 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java
@@ -124,6 +124,7 @@ public class RequestSpecificMappingInfoComparatorTests {
 
 	private static class MockComparator implements Comparator<String> {
 
+		@Override
 		public int compare(String s1, String s2) {
 			return 0;
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
index cd36fa2508..07d68187be 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
@@ -1964,6 +1964,7 @@ public class ServletAnnotationControllerTests {
 
 	public static class ListEditorRegistrar implements PropertyEditorRegistrar {
 
+		@Override
 		public void registerCustomEditors(PropertyEditorRegistry registry) {
 			registry.registerCustomEditor(Set.class, new ListEditor());
 		}
@@ -2190,12 +2191,14 @@ public class ServletAnnotationControllerTests {
 	@Controller
 	public static class MySessionAttributesControllerImpl implements MySessionAttributesControllerIfc {
 
+		@Override
 		public String get(Model model) {
 			model.addAttribute("object1", new Object());
 			model.addAttribute("object2", new Object());
 			return "page1";
 		}
 
+		@Override
 		public String post(@ModelAttribute("object1") Object object1) {
 			//do something with object1
 			return "page2";
@@ -2222,6 +2225,7 @@ public class ServletAnnotationControllerTests {
 	@Controller
 	public static class MyParameterizedControllerImpl implements MyEditableParameterizedControllerIfc<TestBean> {
 
+		@Override
 		public List<TestBean> getTestBeans() {
 			List<TestBean> list = new LinkedList<TestBean>();
 			list.add(new TestBean("tb1"));
@@ -2229,12 +2233,14 @@ public class ServletAnnotationControllerTests {
 			return list;
 		}
 
+		@Override
 		public String get(Model model) {
 			model.addAttribute("object1", new TestBean());
 			model.addAttribute("object2", new TestBean());
 			return "page1";
 		}
 
+		@Override
 		public String post(TestBean object) {
 			//do something with object1
 			return "page2";
@@ -2244,6 +2250,7 @@ public class ServletAnnotationControllerTests {
 	@Controller
 	public static class MyParameterizedControllerImplWithOverriddenMappings implements MyEditableParameterizedControllerIfc<TestBean> {
 
+		@Override
 		@ModelAttribute("testBeanList")
 		public List<TestBean> getTestBeans() {
 			List<TestBean> list = new LinkedList<TestBean>();
@@ -2252,6 +2259,7 @@ public class ServletAnnotationControllerTests {
 			return list;
 		}
 
+		@Override
 		@RequestMapping(method = RequestMethod.GET)
 		public String get(Model model) {
 			model.addAttribute("object1", new TestBean());
@@ -2259,6 +2267,7 @@ public class ServletAnnotationControllerTests {
 			return "page1";
 		}
 
+		@Override
 		@RequestMapping(method = RequestMethod.POST)
 		public String post(@ModelAttribute("object1") TestBean object1) {
 			//do something with object1
@@ -2428,6 +2437,7 @@ public class ServletAnnotationControllerTests {
 
 	private static class MyWebBindingInitializer implements WebBindingInitializer {
 
+		@Override
 		public void initBinder(WebDataBinder binder, WebRequest request) {
 			LocalValidatorFactoryBean vf = new LocalValidatorFactoryBean();
 			vf.afterPropertiesSet();
@@ -2441,6 +2451,7 @@ public class ServletAnnotationControllerTests {
 
 	private static class MySpecialArgumentResolver implements WebArgumentResolver {
 
+		@Override
 		public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) {
 			if (methodParameter.getParameterType().equals(MySpecialArg.class)) {
 				return new MySpecialArg("myValue");
@@ -2599,6 +2610,7 @@ public class ServletAnnotationControllerTests {
 
 	private static class TestPrincipal implements Principal {
 
+		@Override
 		public String getName() {
 			return "test";
 		}
@@ -2606,6 +2618,7 @@ public class ServletAnnotationControllerTests {
 
 	private static class OtherPrincipal implements Principal {
 
+		@Override
 		public String getName() {
 			return "other";
 		}
@@ -2613,12 +2626,15 @@ public class ServletAnnotationControllerTests {
 
 	private static class TestViewResolver implements ViewResolver {
 
+		@Override
 		public View resolveViewName(final String viewName, Locale locale) throws Exception {
 			return new View() {
+				@Override
 				public String getContentType() {
 					return null;
 				}
 
+				@Override
 				@SuppressWarnings({"unchecked", "deprecation"})
 				public void render(Map model, HttpServletRequest request, HttpServletResponse response)
 						throws Exception {
@@ -2657,11 +2673,14 @@ public class ServletAnnotationControllerTests {
 
 	public static class ModelExposingViewResolver implements ViewResolver {
 
+		@Override
 		public View resolveViewName(final String viewName, Locale locale) throws Exception {
 			return new View() {
+				@Override
 				public String getContentType() {
 					return null;
 				}
+				@Override
 				public void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response) {
 					request.setAttribute("viewName", viewName);
 					request.getSession().setAttribute("model", model);
@@ -2758,6 +2777,7 @@ public class ServletAnnotationControllerTests {
 
 	public static class TestBeanConverter implements Converter<String, ITestBean> {
 
+		@Override
 		public ITestBean convert(String source) {
 			return new TestBean(source);
 		}
@@ -2849,23 +2869,28 @@ public class ServletAnnotationControllerTests {
 
 	public static class NotReadableMessageConverter implements HttpMessageConverter {
 
+		@Override
 		public boolean canRead(Class clazz, MediaType mediaType) {
 			return true;
 		}
 
+		@Override
 		public boolean canWrite(Class clazz, MediaType mediaType) {
 			return true;
 		}
 
+		@Override
 		public List getSupportedMediaTypes() {
 			return Collections.singletonList(new MediaType("application", "pdf"));
 		}
 
+		@Override
 		public Object read(Class clazz, HttpInputMessage inputMessage)
 				throws IOException, HttpMessageNotReadableException {
 			throw new HttpMessageNotReadableException("Could not read");
 		}
 
+		@Override
 		public void write(Object o, MediaType contentType, HttpOutputMessage outputMessage)
 				throws IOException, HttpMessageNotWritableException {
 			throw new UnsupportedOperationException("Not implemented");
@@ -2880,23 +2905,28 @@ public class ServletAnnotationControllerTests {
 			this.supportedMediaTypes = Arrays.asList(supportedMediaTypes);
 		}
 
+		@Override
 		public boolean canRead(Class clazz, MediaType mediaType) {
 			return supportedMediaTypes.contains(mediaType);
 		}
 
+		@Override
 		public boolean canWrite(Class clazz, MediaType mediaType) {
 			return supportedMediaTypes.contains(mediaType);
 		}
 
+		@Override
 		public List getSupportedMediaTypes() {
 			return supportedMediaTypes;
 		}
 
+		@Override
 		public Object read(Class clazz, HttpInputMessage inputMessage)
 				throws IOException, HttpMessageNotReadableException {
 			return null;
 		}
 
+		@Override
 		public void write(Object o, MediaType contentType, HttpOutputMessage outputMessage)
 				throws IOException, HttpMessageNotWritableException {
 			outputMessage.getHeaders().setContentType(contentType);
@@ -2968,6 +2998,7 @@ public class ServletAnnotationControllerTests {
 
 	public static class MyModelAndViewResolver implements ModelAndViewResolver {
 
+		@Override
 		public ModelAndView resolveModelAndView(Method handlerMethod,
 				Class handlerType,
 				Object returnValue,
@@ -2975,10 +3006,12 @@ public class ServletAnnotationControllerTests {
 				NativeWebRequest webRequest) {
 			if (returnValue instanceof MySpecialArg) {
 				return new ModelAndView(new View() {
+					@Override
 					public String getContentType() {
 						return "text/html";
 					}
 
+					@Override
 					public void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response)
 							throws Exception {
 						response.getWriter().write("myValue");
@@ -3036,6 +3069,7 @@ public class ServletAnnotationControllerTests {
 	@Controller
 	public static class TestControllerImpl implements TestController<MyEntity> {
 
+		@Override
 		@RequestMapping("/method")
 		public ModelAndView method(MyEntity object) {
 			return new ModelAndView("/something");
@@ -3131,6 +3165,7 @@ public class ServletAnnotationControllerTests {
 	@Controller
 	public static class IMyControllerImpl implements IMyController {
 
+		@Override
 		public void handle(Writer writer, @RequestParam(value="p", required=false) String param) throws IOException {
 			writer.write("handle " + param);
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java
index b88c10fa9f..bd2ac2fccf 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java
@@ -46,6 +46,7 @@ public class Spr7766Tests {
 	}
 
 	public class ColorConverter implements Converter<String, Color> {
+		@Override
 		public Color convert(String source) { if (!source.startsWith("#")) source = "#" + source; return Color.decode(source); }
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
index f9c1b200c2..555dbd89b6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
@@ -48,6 +48,7 @@ public class Spr7839Tests {
 		ConfigurableWebBindingInitializer binder = new ConfigurableWebBindingInitializer();
 		GenericConversionService service = new DefaultConversionService();
 		service.addConverter(new Converter<String, NestedBean>() {
+			@Override
 			public NestedBean convert(String source) {
 				return new NestedBean(source);
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java
index 307b6ab80d..53cb85a215 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java
@@ -26,6 +26,7 @@ import org.springframework.web.servlet.ModelAndView;
  */
 public class Controller implements org.springframework.web.servlet.mvc.Controller {
 
+	@Override
 	public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) {
 		return new ModelAndView("indexView");
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java
index fce0eca69a..a0822913bc 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java
@@ -35,6 +35,7 @@ public class ControllerBeanNameHandlerMappingTests extends TestCase {
 
 	private HandlerMapping hm;
 
+	@Override
 	public void setUp() throws Exception {
 		MockServletContext sc = new MockServletContext("");
 		this.wac = new XmlWebApplicationContext();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java
index bb2ee10976..15cdacd232 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java
@@ -42,6 +42,7 @@ public class ControllerClassNameHandlerMappingTests extends TestCase {
 
 	private HandlerMapping hm4;
 
+	@Override
 	public void setUp() throws Exception {
 		MockServletContext sc = new MockServletContext("");
 		this.wac = new XmlWebApplicationContext();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java
index 5c36b0989d..b8fa5d7e66 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java
@@ -27,6 +27,7 @@ import org.springframework.web.servlet.mvc.Controller;
  */
 public class WelcomeController implements Controller {
 
+	@Override
 	public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) {
 		return new ModelAndView("welcomeView");
 	}
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 ea7e21b24f..676e44729d 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
@@ -195,6 +195,7 @@ public class RequestMappingInfoTests {
 						new ParamsRequestCondition("foo"), null, null, null, null);
 
 		Comparator<RequestMappingInfo> comparator = new Comparator<RequestMappingInfo>() {
+			@Override
 			public int compare(RequestMappingInfo info, RequestMappingInfo otherInfo) {
 				return info.compareTo(otherInfo, new MockHttpServletRequest());
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
index eaabf4c2d9..fa7a9f8130 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
@@ -114,6 +114,7 @@ public class HandlerMethodAnnotationDetectionTests {
 	}
 
 	class TestPointcut extends StaticMethodMatcherPointcut {
+		@Override
 		public boolean matches(Method method, Class<?> clazz) {
 			return method.getName().equals("hashCode");
 		}
@@ -202,19 +203,23 @@ public class HandlerMethodAnnotationDetectionTests {
 	 */
 	static class AbstractClassController extends MappingAbstractClass {
 
+		@Override
 		public void initBinder(WebDataBinder dataBinder, @RequestParam("datePattern") String pattern) {
 			CustomDateEditor dateEditor = new CustomDateEditor(new SimpleDateFormat(pattern), false);
 			dataBinder.registerCustomEditor(Date.class, dateEditor);
 		}
 
+		@Override
 		public void initModel(@RequestHeader("header1") Date date, Model model) {
 			model.addAttribute("attr1", date);
 		}
 
+		@Override
 		public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception {
 			return date;
 		}
 
+		@Override
 		public String handleException(Exception exception) {
 			return exception.getMessage();
 		}
@@ -251,19 +256,23 @@ public class HandlerMethodAnnotationDetectionTests {
 	 */
 	static class InterfaceController implements MappingInterface {
 
+		@Override
 		public void initBinder(WebDataBinder dataBinder, @RequestParam("datePattern") String thePattern) {
 			CustomDateEditor dateEditor = new CustomDateEditor(new SimpleDateFormat(thePattern), false);
 			dataBinder.registerCustomEditor(Date.class, dateEditor);
 		}
 
+		@Override
 		public void initModel(@RequestHeader("header1") Date date, Model model) {
 			model.addAttribute("attr1", date);
 		}
 
+		@Override
 		public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception {
 			return date;
 		}
 
+		@Override
 		public String handleException(Exception exception) {
 			return exception.getMessage();
 		}
@@ -295,19 +304,23 @@ public class HandlerMethodAnnotationDetectionTests {
 	 */
 	static class ParameterizedAbstractClassController extends MappingParameterizedAbstractClass<String, Date, Date> {
 
+		@Override
 		public void initBinder(WebDataBinder dataBinder, @RequestParam("datePattern") String thePattern) {
 			CustomDateEditor dateEditor = new CustomDateEditor(new SimpleDateFormat(thePattern), false);
 			dataBinder.registerCustomEditor(Date.class, dateEditor);
 		}
 
+		@Override
 		public void initModel(@RequestHeader("header1") Date date, Model model) {
 			model.addAttribute("attr1", date);
 		}
 
+		@Override
 		public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception {
 			return date;
 		}
 
+		@Override
 		public String handleException(Exception exception) {
 			return exception.getMessage();
 		}
@@ -340,23 +353,27 @@ public class HandlerMethodAnnotationDetectionTests {
 	 */
 	static class ParameterizedInterfaceController implements MappingParameterizedInterface<String, Date, Date> {
 
+		@Override
 		@InitBinder
 		public void initBinder(WebDataBinder dataBinder, @RequestParam("datePattern") String thePattern) {
 			CustomDateEditor dateEditor = new CustomDateEditor(new SimpleDateFormat(thePattern), false);
 			dataBinder.registerCustomEditor(Date.class, dateEditor);
 		}
 
+		@Override
 		@ModelAttribute
 		public void initModel(@RequestHeader("header1") Date date, Model model) {
 			model.addAttribute("attr1", date);
 		}
 
+		@Override
 		@RequestMapping(value="/path1/path2", method=RequestMethod.POST)
 		@ModelAttribute("attr2")
 		public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception {
 			return date;
 		}
 
+		@Override
 		@ExceptionHandler(Exception.class)
 		@ResponseBody
 		public String handleException(Exception exception) {
@@ -412,6 +429,7 @@ public class HandlerMethodAnnotationDetectionTests {
 
 		private static StaticMethodMatcherPointcut getControllerPointcut() {
 			return new StaticMethodMatcherPointcut() {
+				@Override
 				public boolean matches(Method method, Class<?> targetClass) {
 					return ((AnnotationUtils.findAnnotation(targetClass, Controller.class) != null) ||
 							(AnnotationUtils.findAnnotation(targetClass, RequestMapping.class) != null));
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java
index 467fff6dcf..cd431d6154 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java
@@ -159,10 +159,12 @@ public class HttpEntityMethodProcessorTests {
 		private Long id;
 		private String name;
 
+		@Override
 		public Long getId() {
 			return id;
 		}
 
+		@Override
 		public void setId(Long id) {
 			this.id = id;
 		}
@@ -177,6 +179,7 @@ public class HttpEntityMethodProcessorTests {
 	}
 
 	private final class ValidatingBinderFactory implements WebDataBinderFactory {
+		@Override
 		public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception {
 			LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
 			validator.afterPropertiesSet();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java
index 1ff5a6303e..54d187f91a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java
@@ -124,6 +124,7 @@ public class ModelAndViewResolverMethodReturnValueHandlerTests {
 			this.returnValueType = returnValueType;
 		}
 
+		@Override
 		@SuppressWarnings("rawtypes")
 		public ModelAndView resolveModelAndView(Method method, Class handlerType, Object returnValue,
 				ExtendedModelMap model, NativeWebRequest request) {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java
index e86b96b373..450315e6de 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java
@@ -394,28 +394,33 @@ public class RequestMappingHandlerAdapterIntegrationTests {
 	}
 
 	private static class StubValidator implements Validator {
+		@Override
 		public boolean supports(Class<?> clazz) {
 			return true;
 		}
 
+		@Override
 		public void validate(Object target, Errors errors) {
 			errors.reject("error");
 		}
 	}
 
 	private static class ColorArgumentResolver implements WebArgumentResolver {
+		@Override
 		public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) throws Exception {
 			return new Color(0);
 		}
 	}
 
 	private static class User implements Principal {
+		@Override
 		public String getName() {
 			return "user";
 		}
 	}
 
 	private static class OtherUser implements Principal {
+		@Override
 		public String getName() {
 			return "other user";
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
index 813c7819a9..5f9869e1dc 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java
@@ -275,6 +275,7 @@ public class RequestPartMethodArgumentResolverTests {
 	}
 
 	private final class ValidatingBinderFactory implements WebDataBinderFactory {
+		@Override
 		public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception {
 			LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
 			validator.afterPropertiesSet();
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 85ab677a0a..315040419e 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
@@ -323,6 +323,7 @@ public class RequestResponseBodyMethodProcessorMockTests {
 	}
 
 	private final class ValidatingBinderFactory implements WebDataBinderFactory {
+		@Override
 		public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception {
 			LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
 			validator.afterPropertiesSet();
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 e42a2aa967..5c69b6f424 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
@@ -259,10 +259,12 @@ public class RequestResponseBodyMethodProcessorTests {
 		private Long id;
 		private String name;
 
+		@Override
 		public Long getId() {
 			return id;
 		}
 
+		@Override
 		public void setId(Long id) {
 			this.id = id;
 		}
@@ -277,6 +279,7 @@ public class RequestResponseBodyMethodProcessorTests {
 	}
 
 	private final class ValidatingBinderFactory implements WebDataBinderFactory {
+		@Override
 		public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception {
 			LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
 			validator.afterPropertiesSet();
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 d1872128cb..e42ccb2969 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
@@ -243,6 +243,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void defaultExpressionParameters() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext context) {
 				RootBeanDefinition ppc = new RootBeanDefinition(PropertyPlaceholderConfigurer.class);
 				ppc.getPropertyValues().add("properties", "myKey=foo");
@@ -266,6 +267,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void typeNestedSetBinding() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext context) {
 				RootBeanDefinition csDef = new RootBeanDefinition(FormattingConversionServiceFactoryBean.class);
 				csDef.getPropertyValues().add("converters", new TestBeanConverter());
@@ -308,6 +310,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void emptyParameterListHandleMethod() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext context) {
 				RootBeanDefinition vrDef = new RootBeanDefinition(InternalResourceViewResolver.class);
 				vrDef.getPropertyValues().add("suffix", ".jsp");
@@ -328,6 +331,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void sessionAttributeExposure() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext context) {
 				context.registerBeanDefinition("viewResolver", new RootBeanDefinition(ModelExposingViewResolver.class));
 			}
@@ -358,6 +362,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void sessionAttributeExposureWithInterface() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext context) {
 				context.registerBeanDefinition("viewResolver", new RootBeanDefinition(ModelExposingViewResolver.class));
 				DefaultAdvisorAutoProxyCreator autoProxyCreator = new DefaultAdvisorAutoProxyCreator();
@@ -392,6 +397,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void parameterizedAnnotatedInterface() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext context) {
 				context.registerBeanDefinition("viewResolver", new RootBeanDefinition(ModelExposingViewResolver.class));
 			}
@@ -424,6 +430,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void parameterizedAnnotatedInterfaceWithOverriddenMappingsInImpl() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext context) {
 				context.registerBeanDefinition("viewResolver", new RootBeanDefinition(ModelExposingViewResolver.class));
 			}
@@ -508,6 +515,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void formController() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class));
 			}
@@ -524,6 +532,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void modelFormController() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class));
 			}
@@ -540,6 +549,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void proxiedFormController() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class));
 				DefaultAdvisorAutoProxyCreator autoProxyCreator = new DefaultAdvisorAutoProxyCreator();
@@ -561,6 +571,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void commandProvidingFormControllerWithCustomEditor() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class));
 				RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
@@ -581,6 +592,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void typedCommandProvidingFormController() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class));
 				RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
@@ -620,6 +632,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void binderInitializingCommandProvidingFormController() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class));
 			}
@@ -637,6 +650,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void specificBinderInitializingCommandProvidingFormController() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class));
 			}
@@ -658,6 +672,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 
 		WebApplicationContext  webAppContext =
 			initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+				@Override
 				public void initialize(GenericWebApplicationContext wac) {
 					wac.setServletContext(servletContext);
 					AnnotationConfigUtils.registerAnnotationConfigProcessors(wac);
@@ -831,6 +846,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void responseBodyNoAcceptableMediaType() throws ServletException, IOException {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
 				StringHttpMessageConverter converter = new StringHttpMessageConverter();
@@ -866,6 +882,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void unsupportedRequestBody() throws ServletException, IOException {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
 				adapterDef.getPropertyValues().add("messageConverters", new ByteArrayHttpMessageConverter());
@@ -900,6 +917,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void badRequestRequestBody() throws ServletException, IOException {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
 				adapterDef.getPropertyValues().add("messageConverters", new NotReadableMessageConverter());
@@ -946,6 +964,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void overlappingMessageConvertersRequestBody() throws ServletException, IOException {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
 				List<HttpMessageConverter<?>> messageConverters = new ArrayList<HttpMessageConverter<?>>();
@@ -980,6 +999,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void responseBodyArgMismatch() throws ServletException, IOException {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				Jaxb2Marshaller marshaller = new Jaxb2Marshaller();
 				marshaller.setClassesToBeBound(A.class, B.class);
@@ -1155,6 +1175,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void mavResolver() throws ServletException, IOException {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class);
 				ModelAndViewResolver[] mavResolvers = new ModelAndViewResolver[] {new MyModelAndViewResolver()};
@@ -1283,6 +1304,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void requestMappingInterfaceWithProxy() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				DefaultAdvisorAutoProxyCreator autoProxyCreator = new DefaultAdvisorAutoProxyCreator();
 				autoProxyCreator.setBeanFactory(wac.getBeanFactory());
@@ -1420,6 +1442,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void parameterCsvAsStringArray() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext wac) {
 				RootBeanDefinition csDef = new RootBeanDefinition(FormattingConversionServiceFactoryBean.class);
 				RootBeanDefinition wbiDef = new RootBeanDefinition(ConfigurableWebBindingInitializer.class);
@@ -1525,6 +1548,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Test
 	public void prototypeController() throws Exception {
 		initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+			@Override
 			public void initialize(GenericWebApplicationContext context) {
 				RootBeanDefinition beanDef = new RootBeanDefinition(PrototypeController.class);
 				beanDef.setScope(BeanDefinition.SCOPE_PROTOTYPE);
@@ -1727,12 +1751,14 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 
 	public static class MySessionAttributesControllerImpl implements MySessionAttributesControllerIfc {
 
+		@Override
 		public String get(Model model) {
 			model.addAttribute("object1", new Object());
 			model.addAttribute("object2", new Object());
 			return "page1";
 		}
 
+		@Override
 		public String post(@ModelAttribute("object1") Object object1) {
 			//do something with object1
 			return "page2";
@@ -1759,6 +1785,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Controller
 	public static class MyParameterizedControllerImpl implements MyEditableParameterizedControllerIfc<TestBean> {
 
+		@Override
 		public List<TestBean> getTestBeans() {
 			List<TestBean> list = new LinkedList<TestBean>();
 			list.add(new TestBean("tb1"));
@@ -1766,12 +1793,14 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 			return list;
 		}
 
+		@Override
 		public String get(Model model) {
 			model.addAttribute("object1", new TestBean());
 			model.addAttribute("object2", new TestBean());
 			return "page1";
 		}
 
+		@Override
 		public String post(TestBean object) {
 			//do something with object1
 			return "page2";
@@ -1781,6 +1810,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Controller
 	public static class MyParameterizedControllerImplWithOverriddenMappings implements MyEditableParameterizedControllerIfc<TestBean> {
 
+		@Override
 		@ModelAttribute("testBeanList")
 		public List<TestBean> getTestBeans() {
 			List<TestBean> list = new LinkedList<TestBean>();
@@ -1789,6 +1819,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 			return list;
 		}
 
+		@Override
 		@RequestMapping(method = RequestMethod.GET)
 		public String get(Model model) {
 			model.addAttribute("object1", new TestBean());
@@ -1796,6 +1827,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 			return "page1";
 		}
 
+		@Override
 		@RequestMapping(method = RequestMethod.POST)
 		public String post(@ModelAttribute("object1") TestBean object1) {
 			//do something with object1
@@ -1966,6 +1998,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 
 	static class MyWebBindingInitializer implements WebBindingInitializer {
 
+		@Override
 		public void initBinder(WebDataBinder binder, WebRequest request) {
 			LocalValidatorFactoryBean vf = new LocalValidatorFactoryBean();
 			vf.afterPropertiesSet();
@@ -1979,6 +2012,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 
 	static class MySpecialArgumentResolver implements WebArgumentResolver {
 
+		@Override
 		public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) {
 			if (methodParameter.getParameterType().equals(MySpecialArg.class)) {
 				return new MySpecialArg("myValue");
@@ -2132,6 +2166,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 
 	static class TestPrincipal implements Principal {
 
+		@Override
 		public String getName() {
 			return "test";
 		}
@@ -2139,6 +2174,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 
 	static class OtherPrincipal implements Principal {
 
+		@Override
 		public String getName() {
 			return "other";
 		}
@@ -2146,12 +2182,15 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 
 	static class TestViewResolver implements ViewResolver {
 
+		@Override
 		public View resolveViewName(final String viewName, Locale locale) throws Exception {
 			return new View() {
+				@Override
 				public String getContentType() {
 					return null;
 				}
 
+				@Override
 				@SuppressWarnings({"unchecked", "deprecation", "rawtypes"})
 				public void render(Map model, HttpServletRequest request, HttpServletResponse response)
 						throws Exception {
@@ -2190,11 +2229,14 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 
 	public static class ModelExposingViewResolver implements ViewResolver {
 
+		@Override
 		public View resolveViewName(final String viewName, Locale locale) throws Exception {
 			return new View() {
+				@Override
 				public String getContentType() {
 					return null;
 				}
+				@Override
 				public void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response) {
 					request.setAttribute("viewName", viewName);
 					request.getSession().setAttribute("model", model);
@@ -2291,6 +2333,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 
 	public static class TestBeanConverter implements Converter<String, ITestBean> {
 
+		@Override
 		public ITestBean convert(String source) {
 			return new TestBean(source);
 		}
@@ -2398,23 +2441,28 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 
 	public static class NotReadableMessageConverter implements HttpMessageConverter<Object> {
 
+		@Override
 		public boolean canRead(Class<?> clazz, MediaType mediaType) {
 			return true;
 		}
 
+		@Override
 		public boolean canWrite(Class<?> clazz, MediaType mediaType) {
 			return true;
 		}
 
+		@Override
 		public List<MediaType> getSupportedMediaTypes() {
 			return Collections.singletonList(new MediaType("application", "pdf"));
 		}
 
+		@Override
 		public Object read(Class<?> clazz, HttpInputMessage inputMessage)
 				throws IOException, HttpMessageNotReadableException {
 			throw new HttpMessageNotReadableException("Could not read");
 		}
 
+		@Override
 		public void write(Object o, MediaType contentType, HttpOutputMessage outputMessage)
 				throws IOException, HttpMessageNotWritableException {
 			throw new UnsupportedOperationException("Not implemented");
@@ -2429,23 +2477,28 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 			this.supportedMediaTypes = Arrays.asList(supportedMediaTypes);
 		}
 
+		@Override
 		public boolean canRead(Class<?> clazz, MediaType mediaType) {
 			return supportedMediaTypes.contains(mediaType);
 		}
 
+		@Override
 		public boolean canWrite(Class<?> clazz, MediaType mediaType) {
 			return supportedMediaTypes.contains(mediaType);
 		}
 
+		@Override
 		public List<MediaType> getSupportedMediaTypes() {
 			return supportedMediaTypes;
 		}
 
+		@Override
 		public Object read(Class<?> clazz, HttpInputMessage inputMessage)
 				throws IOException, HttpMessageNotReadableException {
 			return null;
 		}
 
+		@Override
 		public void write(Object o, MediaType contentType, HttpOutputMessage outputMessage)
 				throws IOException, HttpMessageNotWritableException {
 			outputMessage.getHeaders().setContentType(contentType);
@@ -2545,6 +2598,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 
 	public static class MyModelAndViewResolver implements ModelAndViewResolver {
 
+		@Override
 		@SuppressWarnings("rawtypes")
 		public ModelAndView resolveModelAndView(Method handlerMethod,
 				Class handlerType,
@@ -2553,10 +2607,12 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 				NativeWebRequest webRequest) {
 			if (returnValue instanceof MySpecialArg) {
 				return new ModelAndView(new View() {
+					@Override
 					public String getContentType() {
 						return "text/html";
 					}
 
+					@Override
 					public void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response)
 							throws Exception {
 						response.getWriter().write("myValue");
@@ -2628,6 +2684,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Controller
 	public static class TestControllerImpl implements TestController<MyEntity> {
 
+		@Override
 		@RequestMapping("/method")
 		public ModelAndView method(MyEntity object) {
 			return new ModelAndView("/something");
@@ -2723,6 +2780,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 	@Controller
 	public static class IMyControllerImpl implements IMyController {
 
+		@Override
 		public void handle(Writer writer, @RequestParam(value="p", required=false) String param) throws IOException {
 			writer.write("handle " + param);
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
index 50d30583af..5365749ed5 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
@@ -185,10 +185,12 @@ public class ServletInvocableHandlerMethodTests {
 
 	private static class ExceptionRaisingReturnValueHandler implements HandlerMethodReturnValueHandler {
 
+		@Override
 		public boolean supportsReturnType(MethodParameter returnType) {
 			return true;
 		}
 
+		@Override
 		public void handleReturnValue(Object returnValue, MethodParameter returnType,
 				ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception {
 			throw new HttpMessageNotWritableException("oops, can't write");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
index f3c51db5a8..0b0afcee8d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java
@@ -95,6 +95,7 @@ public class ServletRequestMethodArgumentResolverTests {
 	@Test
 	public void principal() throws Exception {
 		Principal principal = new Principal() {
+			@Override
 			public String getName() {
 				return "Foo";
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java
index 22e924e600..3739046c59 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java
@@ -107,6 +107,7 @@ public class UriTemplateServletAnnotationControllerHandlerMethodTests extends Ab
 
 		WebApplicationContext wac =
 			initServlet(new ApplicationContextInitializer<GenericWebApplicationContext>() {
+				@Override
 				public void initialize(GenericWebApplicationContext context) {
 					RootBeanDefinition beanDef = new RootBeanDefinition(ModelValidatingViewResolver.class);
 					beanDef.getConstructorArgumentValues().addGenericArgumentValue(pathVars);
@@ -671,8 +672,10 @@ public class UriTemplateServletAnnotationControllerHandlerMethodTests extends Ab
 			this.attrsToValidate = attrsToValidate;
 		}
 
+		@Override
 		public View resolveViewName(final String viewName, Locale locale) throws Exception {
 			return new AbstractView () {
+				@Override
 				public String getContentType() {
 					return null;
 				}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
index e229bac169..43c83b7ef4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
@@ -139,6 +139,7 @@ public class RedirectAttributesModelMapTests {
 
 	public static class TestBeanConverter implements Converter<TestBean, String> {
 
+		@Override
 		public String convert(TestBean source) {
 			return "[" + source.getName() + "]";
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java
index 92b5d65487..d3d0547fba 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java
@@ -39,10 +39,12 @@ class MockFilterRegistration implements Dynamic {
 		return this.asyncSupported;
 	}
 
+	@Override
 	public void setAsyncSupported(boolean isAsyncSupported) {
 		this.asyncSupported = isAsyncSupported;
 	}
 
+	@Override
 	public void addMappingForServletNames(EnumSet<DispatcherType> dispatcherTypes,
 			boolean isMatchAfter, String... servletNames) {
 
@@ -53,38 +55,47 @@ class MockFilterRegistration implements Dynamic {
 
 	// Not implemented
 
+	@Override
 	public String getName() {
 		return null;
 	}
 
+	@Override
 	public Collection<String> getServletNameMappings() {
 		return null;
 	}
 
+	@Override
 	public void addMappingForUrlPatterns(EnumSet<DispatcherType> dispatcherTypes,
 			boolean isMatchAfter, String... urlPatterns) {
 	}
 
+	@Override
 	public Collection<String> getUrlPatternMappings() {
 		return null;
 	}
 
+	@Override
 	public String getClassName() {
 		return null;
 	}
 
+	@Override
 	public boolean setInitParameter(String name, String value) {
 		return false;
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		return null;
 	}
 
+	@Override
 	public Set<String> setInitParameters(Map<String, String> initParameters) {
 		return null;
 	}
 
+	@Override
 	public Map<String, String> getInitParameters() {
 		return null;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java
index 2b0e15a4db..958f1755b4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java
@@ -40,27 +40,33 @@ class MockServletRegistration implements ServletRegistration.Dynamic {
 		return loadOnStartup;
 	}
 
+	@Override
 	public void setLoadOnStartup(int loadOnStartup) {
 		this.loadOnStartup = loadOnStartup;
 	}
 
+	@Override
 	public void setRunAsRole(String roleName) {
 		this.roleName = roleName;
 	}
 
+	@Override
 	public Set<String> addMapping(String... urlPatterns) {
 		mappings.addAll(Arrays.asList(urlPatterns));
 		return mappings;
 	}
 
+	@Override
 	public Collection<String> getMappings() {
 		return mappings;
 	}
 
+	@Override
 	public String getRunAsRole() {
 		return roleName;
 	}
 
+	@Override
 	public void setAsyncSupported(boolean isAsyncSupported) {
 		this.asyncSupported = isAsyncSupported;
 	}
@@ -71,33 +77,41 @@ class MockServletRegistration implements ServletRegistration.Dynamic {
 
 	// not implemented
 
+	@Override
 	public String getName() {
 		return null;
 	}
 
+	@Override
 	public void setMultipartConfig(MultipartConfigElement multipartConfig) {
 	}
 
+	@Override
 	public Set<String> setServletSecurity(ServletSecurityElement constraint) {
 		return null;
 	}
 
+	@Override
 	public String getClassName() {
 		return null;
 	}
 
+	@Override
 	public boolean setInitParameter(String name, String value) {
 		return false;
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		return null;
 	}
 
+	@Override
 	public Set<String> setInitParameters(Map<String, String> initParameters) {
 		return null;
 	}
 
+	@Override
 	public Map<String, String> getInitParameters() {
 		return null;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
index 84e940352a..2fcc677126 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
@@ -30,18 +30,22 @@ public class RequestDataValueProcessorWrapper implements RequestDataValueProcess
 		this.processor = processor;
 	}
 
+	@Override
 	public String processUrl(HttpServletRequest request, String url) {
 		return (this.processor != null) ? this.processor.processUrl(request, url) : url;
 	}
 
+	@Override
 	public String processFormFieldValue(HttpServletRequest request, String name, String value, String type) {
 		return (this.processor != null) ? this.processor.processFormFieldValue(request, name, value, type) : value;
 	}
 
+	@Override
 	public String processAction(HttpServletRequest request, String action) {
 		return (this.processor != null) ? this.processor.processAction(request, action) : action;
 	}
 
+	@Override
 	public Map<String, String> getExtraHiddenFields(HttpServletRequest request) {
 		return (this.processor != null) ? this.processor.getExtraHiddenFields(request) : null;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java
index e4fce1213f..976fcb923e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java
@@ -22,6 +22,7 @@ package org.springframework.web.servlet.tags;
  */
 public class BindTagOutsideDispatcherServletTests extends BindTagTests {
 
+	@Override
 	protected boolean inDispatcherServlet() {
 		return false;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
index 03c39fa8de..6f22532bdc 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
@@ -509,6 +509,7 @@ public class BindTagTests extends AbstractTagTests {
 		IndexedTestBean tb = new IndexedTestBean();
 		DataBinder binder = new ServletRequestDataBinder(tb, "tb");
 		binder.registerCustomEditor(TestBean.class, null, new PropertyEditorSupport() {
+			@Override
 			public String getAsText() {
 				return "something";
 			}
@@ -987,6 +988,7 @@ public class BindTagTests extends AbstractTagTests {
 		pc.getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "tb", binder.getBindingResult());
 
 		FormTag formTag = new FormTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(new StringWriter());
 			}
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 9dbbf6416f..1cec18763f 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
@@ -40,6 +40,7 @@ public class EvalTagTests extends AbstractTagTests {
 
 	private MockPageContext context;
 
+	@Override
 	protected void setUp() throws Exception {
 		context = createPageContext();
 		FormattingConversionServiceFactoryBean factory = new FormattingConversionServiceFactoryBean();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java
index 4d3e4c9f76..3795717267 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java
@@ -22,6 +22,7 @@ package org.springframework.web.servlet.tags;
  */
 public class HtmlEscapeTagOutsideDispatcherServletTests extends HtmlEscapeTagTests {
 
+	@Override
 	protected boolean inDispatcherServlet() {
 		return false;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
index 51820dc839..f33101a3b8 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
@@ -37,6 +37,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests {
 		tag.setPageContext(pc);
 		tag.doStartTag();
 		HtmlEscapingAwareTag testTag = new HtmlEscapingAwareTag() {
+			@Override
 			public int doStartTagInternal() throws Exception {
 				return EVAL_BODY_INCLUDE;
 			}
@@ -113,9 +114,11 @@ public class HtmlEscapeTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer result = new StringBuffer();
 		EscapeBodyTag tag = new EscapeBodyTag() {
+			@Override
 			protected String readBodyContent() {
 				return "test text";
 			}
+			@Override
 			protected void writeBodyContent(String content) {
 				result.append(content);
 			}
@@ -131,9 +134,11 @@ public class HtmlEscapeTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer result = new StringBuffer();
 		EscapeBodyTag tag = new EscapeBodyTag() {
+			@Override
 			protected String readBodyContent() {
 				return "test & text";
 			}
+			@Override
 			protected void writeBodyContent(String content) {
 				result.append(content);
 			}
@@ -150,9 +155,11 @@ public class HtmlEscapeTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer result = new StringBuffer();
 		EscapeBodyTag tag = new EscapeBodyTag() {
+			@Override
 			protected String readBodyContent() {
 				return "' test & text \\";
 			}
+			@Override
 			protected void writeBodyContent(String content) {
 				result.append(content);
 			}
@@ -169,9 +176,11 @@ public class HtmlEscapeTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer result = new StringBuffer();
 		EscapeBodyTag tag = new EscapeBodyTag() {
+			@Override
 			protected String readBodyContent() {
 				return "' test & text \\";
 			}
+			@Override
 			protected void writeBodyContent(String content) {
 				result.append(content);
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
index d2205f8fcc..8148682f0f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
@@ -22,6 +22,7 @@ package org.springframework.web.servlet.tags;
  */
 public class MessageTagOutsideDispatcherServletTests extends MessageTagTests {
 
+	@Override
 	protected boolean inDispatcherServlet() {
 		return false;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
index 8e737c2257..8aa294af9a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
@@ -43,6 +43,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -58,6 +59,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -74,6 +76,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -91,6 +94,7 @@ public class MessageTagTests extends AbstractTagTests {
 		request.addPreferredLocale(Locale.CANADA);
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -108,6 +112,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -123,6 +128,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -139,6 +145,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -155,6 +162,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -172,6 +180,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -188,6 +197,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -204,6 +214,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -221,6 +232,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -239,6 +251,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -256,6 +269,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -274,6 +288,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -290,6 +305,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -307,6 +323,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -323,6 +340,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -341,6 +359,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
@@ -357,6 +376,7 @@ public class MessageTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		MessageTag tag = new MessageTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
index cbd498112e..bff2b1eef9 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
@@ -97,6 +97,7 @@ public class ParamTagTests extends AbstractTagTests {
 
 		private Param param;
 
+		@Override
 		public void addParam(Param param) {
 			this.param = param;
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
index fc92aeaa46..9beea85f11 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
@@ -40,6 +40,7 @@ public class ThemeTagTests extends AbstractTagTests {
 		PageContext pc = createPageContext();
 		final StringBuffer message = new StringBuffer();
 		ThemeTag tag = new ThemeTag() {
+			@Override
 			protected void writeMessage(String msg) {
 				message.append(msg);
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java
index 4d9df5c648..e380397ed4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java
@@ -31,12 +31,14 @@ public abstract class AbstractFormTagTests extends AbstractHtmlElementTagTests {
 	private FormTag formTag = new FormTag();
 
 
+	@Override
 	protected void extendRequest(MockHttpServletRequest request) {
 		request.setAttribute(COMMAND_NAME, createTestBean());
 	}
 
 	protected abstract TestBean createTestBean();
 
+	@Override
 	protected void extendPageContext(MockPageContext pageContext) throws JspException {
 		this.formTag.setCommandName(COMMAND_NAME);
 		this.formTag.setAction("myAction");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
index e101be304b..a114680a94 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java
@@ -53,6 +53,7 @@ public abstract class AbstractHtmlElementTagTests extends AbstractTagTests {
 	private MockPageContext pageContext;
 
 
+	@Override
 	protected final void setUp() throws Exception {
 		// set up a writer for the tag content to be written to
 		this.writer = new StringWriter();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
index 431f85d03d..ebe0e344a2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
@@ -29,6 +29,7 @@ public class ButtonTagTests extends AbstractFormTagTests {
 
 	private ButtonTag tag;
 
+	@Override
 	protected void onSetUp() {
 		this.tag = createTag(getWriter());
 		this.tag.setParent(getFormTag());
@@ -82,6 +83,7 @@ public class ButtonTagTests extends AbstractFormTagTests {
 	@SuppressWarnings("serial")
 	protected ButtonTag createTag(final Writer writer) {
 		return new ButtonTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(writer);
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
index 1ac1ea619e..77e0a6fa31 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
@@ -50,9 +50,11 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 	private TestBean bean;
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new CheckboxTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
@@ -636,6 +638,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 		return cal.getTime();
 	}
 
+	@Override
 	protected TestBean createTestBean() {
 		List colours = new ArrayList();
 		colours.add(Colour.BLUE);
@@ -678,6 +681,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 			super(false);
 		}
 
+		@Override
 		public void setAsText(String text) {
 			this.count++;
 			super.setAsText(text);
@@ -689,6 +693,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
 
 		public int count = 0;
 
+		@Override
 		public void setAsText(String text) {
 			this.count++;
 			setValue(new Integer(text.trim()));
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
index 96bae8946c..b0baea7884 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
@@ -59,9 +59,11 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 
 	private TestBean bean;
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new CheckboxesTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
@@ -426,9 +428,11 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(this.bean, COMMAND_NAME);
 		FormattingConversionService cs = new FormattingConversionService();
 		cs.addFormatterForFieldType(String.class, new Formatter<String>() {
+			@Override
 			public String print(String object, Locale locale) {
 				return object;
 			}
+			@Override
 			public String parse(String text, Locale locale) throws ParseException {
 				return text.trim();
 			}
@@ -728,6 +732,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 		return cal.getTime();
 	}
 
+	@Override
 	protected TestBean createTestBean() {
 		List colours = new ArrayList();
 		colours.add(Colour.BLUE);
@@ -770,6 +775,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 			super(false);
 		}
 
+		@Override
 		public void setAsText(String text) {
 			super.setAsText(text);
 			this.allProcessedValues.add(getValue());
@@ -779,10 +785,12 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
 
 	private static class MyLowerCaseEditor extends PropertyEditorSupport {
 
+		@Override
 		public void setAsText(String text) throws IllegalArgumentException {
 			setValue(text.toLowerCase());
 		}
 
+		@Override
 		public String getAsText() {
 			return ObjectUtils.nullSafeToString(getValue()).toUpperCase();
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
index 90cdd281d2..6e11e06331 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
@@ -48,9 +48,11 @@ public class ErrorsTagTests extends AbstractFormTagTests {
 	private ErrorsTag tag;
 
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new ErrorsTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
@@ -60,6 +62,7 @@ public class ErrorsTagTests extends AbstractFormTagTests {
 		this.tag.setPageContext(getPageContext());
 	}
 
+	@Override
 	protected TestBean createTestBean() {
 		return new TestBean();
 	}
@@ -434,6 +437,7 @@ public class ErrorsTagTests extends AbstractFormTagTests {
 		assertTrue(output.contains("field error"));
 	}
 
+	@Override
 	protected void exposeBindingResult(Errors errors) {
 		// wrap errors in a Model
 		Map model = new HashMap();
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 f8023dffb2..3bd879a1ea 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
@@ -47,9 +47,11 @@ public class FormTagTests extends AbstractHtmlElementTagTests {
 	private MockHttpServletRequest request;
 
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new FormTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
index 4058788ffd..26828da7bd 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
@@ -31,9 +31,11 @@ public class HiddenInputTagTests extends AbstractFormTagTests {
 
 	private TestBean bean;
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new HiddenInputTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
@@ -120,6 +122,7 @@ public class HiddenInputTagTests extends AbstractFormTagTests {
 		assertTrue(output.startsWith("<input "));
 	}
 
+	@Override
 	protected TestBean createTestBean() {
 		this.bean = new TestBean();
 		bean.setName("Sally Greenwood");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
index fc9101e384..878b666d1a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
@@ -39,12 +39,14 @@ public class InputTagTests extends AbstractFormTagTests {
 	private TestBean rob;
 
 
+	@Override
 	protected void onSetUp() {
 		this.tag = createTag(getWriter());
 		this.tag.setParent(getFormTag());
 		this.tag.setPageContext(getPageContext());
 	}
 
+	@Override
 	protected TestBean createTestBean() {
 		// set up test data
 		this.rob = new TestBean();
@@ -388,6 +390,7 @@ public class InputTagTests extends AbstractFormTagTests {
 	@SuppressWarnings("serial")
 	protected InputTag createTag(final Writer writer) {
 		return new InputTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(writer);
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java
index 4d19958d3e..c2fcc67a0d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java
@@ -59,10 +59,12 @@ public class ItemPet {
 
 	public static class CustomEditor extends PropertyEditorSupport {
 
+		@Override
 		public void setAsText(String text) throws IllegalArgumentException {
 			setValue(new ItemPet(text));
 		}
 
+		@Override
 		public String getAsText() {
 			return ((ItemPet) getValue()).getName();
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
index 3264512017..5654062ff7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
@@ -34,9 +34,11 @@ public class LabelTagTests extends AbstractFormTagTests {
 	private LabelTag tag;
 
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new LabelTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
@@ -44,6 +46,7 @@ public class LabelTagTests extends AbstractFormTagTests {
 		this.tag.setPageContext(getPageContext());
 	}
 
+	@Override
 	protected void extendPageContext(MockPageContext pageContext) throws JspException {
 		super.extendPageContext(pageContext);
 
@@ -139,6 +142,7 @@ public class LabelTagTests extends AbstractFormTagTests {
 	}
 
 
+	@Override
 	protected TestBean createTestBean() {
 		TestBean bean = new TestBean();
 		bean.setSpouse(new TestBean("Hoopy"));
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
index 0d4035c981..cfb6528ae7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
@@ -32,14 +32,17 @@ public class OptionTagEnumTests extends AbstractHtmlElementTagTests {
 
 	private SelectTag parentTag;
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new OptionTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
 		};
 		this.parentTag = new SelectTag() {
+			@Override
 			public String getName() {
 				// Should not be used other than to delegate to
 				// RequestDataValueDataProcessor
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
index a8872851aa..3acacbb8b8 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
@@ -51,14 +51,17 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 
 	private SelectTag parentTag;
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new OptionTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
 		};
 		this.parentTag = new SelectTag() {
+			@Override
 			public String getName() {
 				// Should not be used other than to delegate to
 				// RequestDataValueDataProcessor
@@ -239,6 +242,7 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 	public void testWithPropertyEditor() throws Exception {
 		String selectName = "testBean.stringArray";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false) {
+			@Override
 			public PropertyEditor getEditor() {
 				return new StringArrayPropertyEditor();
 			}
@@ -268,6 +272,7 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 		testBeanEditor.setValue(new TestBean("Sally"));
 		String selectName = "testBean.spouse";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false) {
+			@Override
 			public PropertyEditor getEditor() {
 				return testBeanEditor;
 			}
@@ -332,6 +337,7 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 		floatEditor.setValue(new Float("12.34"));
 		String selectName = "testBean.someNumber";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false) {
+			@Override
 			public PropertyEditor getEditor() {
 				return floatEditor;
 			}
@@ -357,6 +363,7 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 		final PropertyEditor floatEditor = new SimpleFloatEditor();
 		String selectName = "testBean.someNumber";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false) {
+			@Override
 			public PropertyEditor getEditor() {
 				return floatEditor;
 			}
@@ -443,6 +450,7 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 	public void testAsBodyTagWithEditor() throws Exception {
 		String selectName = "testBean.stringArray";
 		BindStatus bindStatus = new BindStatus(getRequestContext(), selectName, false) {
+			@Override
 			public PropertyEditor getEditor() {
 				return new RulesVariantEditor();
 			}
@@ -499,6 +507,7 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 		assertTrue(output.endsWith("</option>"));
 	}
 
+	@Override
 	protected void extendRequest(MockHttpServletRequest request) {
 		TestBean bean = new TestBean();
 		bean.setName("foo");
@@ -520,10 +529,12 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 
 	private static class TestBeanPropertyEditor extends PropertyEditorSupport {
 
+		@Override
 		public void setAsText(String text) throws IllegalArgumentException {
 			setValue(new TestBean(text + "k", 123));
 		}
 
+		@Override
 		public String getAsText() {
 			return ((TestBean) getValue()).getName();
 		}
@@ -589,10 +600,12 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 
 	public class RulesVariantEditor extends PropertyEditorSupport {
 
+		@Override
 		public void setAsText(String text) throws IllegalArgumentException {
 			setValue(RulesVariant.fromId(text));
 		}
 
+		@Override
 		public String getAsText() {
 			RulesVariant rulesVariant = (RulesVariant) getValue();
 			return rulesVariant.toId();
@@ -602,11 +615,13 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
 
 	private static class FriendEditor extends PropertyEditorSupport {
 
+		@Override
 		public void setAsText(String text) throws IllegalArgumentException {
 			setValue(new TestBean(text));
 		}
 
 
+		@Override
 		public String getAsText() {
 			return ((TestBean) getValue()).getName();
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
index accbc09cf4..92290c23cc 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
@@ -54,17 +54,21 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
 	private SelectTag selectTag;
 	private OptionsTag tag;
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new OptionsTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
 		};
 		selectTag = new SelectTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
+			@Override
 			public String getName() {
 				// Should not be used other than to delegate to
 				// RequestDataValueDataProcessor
@@ -276,6 +280,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
 		assertEquals(value2, rootElement.selectSingleNode("option[@selected]"));
 	}
 
+	@Override
 	protected void extendRequest(MockHttpServletRequest request) {
 		TestBean bean = new TestBean();
 		bean.setName("foo");
@@ -295,6 +300,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
 		request.setAttribute("floats", floats);
 	}
 
+	@Override
 	protected void exposeBindingResult(Errors errors) {
 		// wrap errors in a Model
 		Map model = new HashMap();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
index 242135cb76..50485dec42 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
@@ -78,6 +78,7 @@ public class PasswordInputTagTests extends InputTagTests {
 		assertValueAttribute(output, "");
 	}
 
+	@Override
 	public void testDynamicTypeAttribute() throws JspException {
 		try {
 			this.getTag().setDynamicAttribute(null, "type", "email");
@@ -88,6 +89,7 @@ public class PasswordInputTagTests extends InputTagTests {
 		}
 	}
 
+	@Override
 	protected void assertValueAttribute(String output, String expectedValue) {
 		if (this.getPasswordTag().isShowPassword()) {
 			super.assertValueAttribute(output, expectedValue);
@@ -96,13 +98,16 @@ public class PasswordInputTagTests extends InputTagTests {
 		}
 	}
 
+	@Override
 	protected String getType() {
 		return "password";
 	}
 
+	@Override
 	@SuppressWarnings("serial")
 	protected InputTag createTag(final Writer writer) {
 		return new PasswordInputTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(writer);
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
index 2c372aa6da..12652ed2e6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
@@ -43,9 +43,11 @@ public class RadioButtonTagTests extends AbstractFormTagTests {
 
 	private TestBean bean;
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new RadioButtonTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
@@ -251,6 +253,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests {
 		return new Float("12.99");
 	}
 
+	@Override
 	protected TestBean createTestBean() {
 		this.bean = new TestBean();
 		bean.setSex("M");
@@ -262,10 +265,12 @@ public class RadioButtonTagTests extends AbstractFormTagTests {
 
 	private static class MyFloatEditor extends PropertyEditorSupport {
 
+		@Override
 		public void setAsText(String text) throws IllegalArgumentException {
 			setValue(text.substring(1));
 		}
 
+		@Override
 		public String getAsText() {
 			return "F" + getValue();
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
index 8ac6039771..de6e902eb2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
@@ -53,9 +53,11 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests {
 
 	private TestBean bean;
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new RadioButtonsTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
@@ -582,6 +584,7 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests {
 		return cal.getTime();
 	}
 
+	@Override
 	protected TestBean createTestBean() {
 		List colours = new ArrayList();
 		colours.add(Colour.BLUE);
@@ -619,6 +622,7 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests {
 			super(false);
 		}
 
+		@Override
 		public void setAsText(String text) {
 			super.setAsText(text);
 			this.allProcessedValues.add(getValue());
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
index dc9b9404e2..8786a091fa 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
@@ -64,9 +64,11 @@ public class SelectTagTests extends AbstractFormTagTests {
 	private TestBeanWithRealCountry bean;
 
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new SelectTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
@@ -175,9 +177,11 @@ public class SelectTagTests extends AbstractFormTagTests {
 		this.tag.setItems("${countries}");
 		BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(getTestBean(), "testBean");
 		bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(Country.getCountryWithIsoCode(text));
 			}
+			@Override
 			public String getAsText() {
 				return ((Country) getValue()).getName();
 			}
@@ -203,9 +207,11 @@ public class SelectTagTests extends AbstractFormTagTests {
 		this.tag.setItemLabel("name");
 		BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(getTestBean(), "testBean");
 		bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(Country.getCountryWithIsoCode(text));
 			}
+			@Override
 			public String getAsText() {
 				return ((Country) getValue()).getName();
 			}
@@ -230,6 +236,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 		testBean.setBean(withCountry);
 		BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(testBean , "testBean");
 		bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				if (text==null || text.length()==0) {
 					setValue(null);
@@ -237,6 +244,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 				}
 				setValue(Country.getCountryWithIsoCode(text));
 			}
+			@Override
 			public String getAsText() {
 				Country value = (Country) getValue();
 				if (value==null) {
@@ -263,9 +271,11 @@ public class SelectTagTests extends AbstractFormTagTests {
 		testBean.setBean(getTestBean());
 		BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(testBean , "testBean");
 		bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(Country.getCountryWithIsoCode(text));
 			}
+			@Override
 			public String getAsText() {
 				return ((Country) getValue()).getName();
 			}
@@ -287,9 +297,11 @@ public class SelectTagTests extends AbstractFormTagTests {
 		testBean.setRealCountry(null);
 		BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(testBean, "testBean");
 		bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() {
+			@Override
 			public void setAsText(String text) throws IllegalArgumentException {
 				setValue(Country.getCountryWithIsoCode(text));
 			}
+			@Override
 			public String getAsText() {
 				Country value = (Country) getValue();
 				if (value==null) {
@@ -470,9 +482,11 @@ public class SelectTagTests extends AbstractFormTagTests {
 		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(this.bean, COMMAND_NAME);
 		FormattingConversionService cs = new FormattingConversionService();
 		cs.addFormatterForFieldType(Country.class, new Formatter<Country>() {
+			@Override
 			public String print(Country object, Locale locale) {
 				return object.getName();
 			}
+			@Override
 			public Country parse(String text, Locale locale) throws ParseException {
 				return new Country(text, text);
 			}
@@ -515,9 +529,11 @@ public class SelectTagTests extends AbstractFormTagTests {
 		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(this.bean, COMMAND_NAME);
 		FormattingConversionService cs = new FormattingConversionService();
 		cs.addFormatterForFieldType(Country.class, new Formatter<Country>() {
+			@Override
 			public String print(Country object, Locale locale) {
 				return object.getName();
 			}
+			@Override
 			public Country parse(String text, Locale locale) throws ParseException {
 				return new Country(text, text);
 			}
@@ -563,6 +579,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 
 		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(this.bean, COMMAND_NAME);
 		errors.getPropertyAccessor().registerCustomEditor(List.class, new CustomCollectionEditor(LinkedList.class) {
+			@Override
 			public String getAsText() {
 				return getValue().toString();
 			}
@@ -671,10 +688,12 @@ public class SelectTagTests extends AbstractFormTagTests {
 			BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(getTestBean(), COMMAND_NAME);
 			bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() {
 
+				@Override
 				public void setAsText(final String text) throws IllegalArgumentException {
 					setValue(Country.getCountryWithIsoCode(text));
 				}
 
+				@Override
 				public String getAsText() {
 					return ((Country) getValue()).getIsoCode();
 				}
@@ -772,6 +791,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 
 	private Map getCountryToLocaleMap() {
 		Map map = new TreeMap(new Comparator() {
+			@Override
 			public int compare(Object o1, Object o2) {
 				return ((Country)o1).getName().compareTo(((Country)o2).getName());
 			}
@@ -793,6 +813,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 		return sexes;
 	}
 
+	@Override
 	protected void extendRequest(MockHttpServletRequest request) {
 		super.extendRequest(request);
 		request.setAttribute("countries", Country.getCountries());
@@ -834,6 +855,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 		}
 	}
 
+	@Override
 	protected TestBean createTestBean() {
 		this.bean = new TestBeanWithRealCountry();
 		this.bean.setName("Rob");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java
index 075ea9e011..127656b978 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java
@@ -24,10 +24,12 @@ import java.beans.PropertyEditorSupport;
  */
 class SimpleFloatEditor extends PropertyEditorSupport {
 
+	@Override
 	public void setAsText(String text) throws IllegalArgumentException {
 		setValue(new Float(text));
 	}
 
+	@Override
 	public String getAsText() {
 		return getValue() + "f";
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java
index 965bd06a41..82de492c30 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java
@@ -31,6 +31,7 @@ public class TagWriterTests extends TestCase {
 	private StringWriter data;
 
 
+	@Override
 	protected void setUp() throws Exception {
 		this.data = new StringWriter();
 		this.writer = new TagWriter(this.data);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
index 44521f112d..2fc7c3100e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
@@ -33,9 +33,11 @@ public class TextareaTagTests extends AbstractFormTagTests {
 
 	private TestBean rob;
 
+	@Override
 	@SuppressWarnings("serial")
 	protected void onSetUp() {
 		this.tag = new TextareaTag() {
+			@Override
 			protected TagWriter createTagWriter() {
 				return new TagWriter(getWriter());
 			}
@@ -110,6 +112,7 @@ public class TextareaTagTests extends AbstractFormTagTests {
 		assertBlockTagContains(output, "12.34f");
 	}
 
+	@Override
 	protected TestBean createTestBean() {
 		// set up test data
 		this.rob = new TestBean();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
index d3e02cc7c2..289fcbf064 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java
@@ -309,6 +309,7 @@ public class BaseViewTests extends TestCase {
 	 */
 	private class ConcreteView extends AbstractView {
 		// Do-nothing concrete subclass
+		@Override
 		protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 			throw new UnsupportedOperationException();
@@ -330,6 +331,7 @@ public class BaseViewTests extends TestCase {
 			this.wac = wac;
 
 		}
+		@Override
 		protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 				// do nothing
@@ -338,6 +340,7 @@ public class BaseViewTests extends TestCase {
 		/**
 		 * @see org.springframework.context.support.ApplicationObjectSupport#initApplicationContext()
 		 */
+		@Override
 		protected void initApplicationContext() throws ApplicationContextException {
 			if (inited)
 				throw new RuntimeException("Already initialized");
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
index 46d34e7b33..e46aa5449e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java
@@ -73,6 +73,7 @@ public class InternalResourceViewTests extends TestCase {
 		InternalResourceView view = new InternalResourceView();
 		view.setUrl(url);
 		view.setServletContext(new MockServletContext() {
+			@Override
 			public int getMinorVersion() {
 				return 4;
 			}
@@ -118,6 +119,7 @@ public class InternalResourceViewTests extends TestCase {
 		InternalResourceView view = new InternalResourceView();
 		view.setUrl(url);
 		view.setServletContext(new MockServletContext() {
+			@Override
 			public int getMinorVersion() {
 				return 4;
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java
index 1695bd0c54..56feded2d6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java
@@ -21,6 +21,7 @@ package org.springframework.web.servlet.view;
  */
 public class ResourceBundleViewResolverNoCacheTests extends ResourceBundleViewResolverTests {
 
+	@Override
 	protected boolean getCache() {
 		return false;
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java
index 117063f7af..b100a6a68e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java
@@ -46,6 +46,7 @@ public class ResourceBundleViewResolverTests extends TestCase {
 	private StaticWebApplicationContext wac;
 
 
+	@Override
 	protected void setUp() throws Exception {
 		rb = new ResourceBundleViewResolver();
 		rb.setBasename(PROPS_FILE);
@@ -170,9 +171,11 @@ public class ResourceBundleViewResolverTests extends TestCase {
 			}
 		}
 
+		@Override
 		protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) {
 		}
 
+		@Override
 		protected void initApplicationContext() {
 			++initCount;
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
index 286f628e22..fadc606373 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
@@ -249,8 +249,10 @@ public class ViewResolverTests {
 		vr.setApplicationContext(wac);
 
 		MockHttpServletRequest request = new MockHttpServletRequest(sc) {
+			@Override
 			public RequestDispatcher getRequestDispatcher(String path) {
 				return new MockRequestDispatcher(path) {
+					@Override
 					public void forward(ServletRequest forwardRequest, ServletResponse forwardResponse) {
 						assertTrue("Correct rc attribute", forwardRequest.getAttribute("rc") == null);
 						assertEquals("value1", forwardRequest.getAttribute("key1"));
@@ -287,8 +289,10 @@ public class ViewResolverTests {
 		vr.setApplicationContext(wac);
 
 		MockHttpServletRequest request = new MockHttpServletRequest(sc) {
+			@Override
 			public RequestDispatcher getRequestDispatcher(String path) {
 				return new MockRequestDispatcher(path) {
+					@Override
 					public void forward(ServletRequest forwardRequest, ServletResponse forwardResponse) {
 						assertTrue("Correct rc attribute", forwardRequest.getAttribute("rc") == null);
 						assertEquals("value1", forwardRequest.getAttribute("key1"));
@@ -432,6 +436,7 @@ public class ViewResolverTests {
 	@Test
 	public void testXmlViewResolverDefaultLocation() {
 		StaticWebApplicationContext wac = new StaticWebApplicationContext() {
+			@Override
 			protected Resource getResourceByPath(String path) {
 				assertTrue("Correct default location", XmlViewResolver.DEFAULT_LOCATION.equals(path));
 				return super.getResourceByPath(path);
@@ -453,6 +458,7 @@ public class ViewResolverTests {
 	@Test
 	public void testXmlViewResolverWithoutCache() throws Exception {
 		StaticWebApplicationContext wac = new StaticWebApplicationContext() {
+			@Override
 			protected Resource getResourceByPath(String path) {
 				assertTrue("Correct default location", XmlViewResolver.DEFAULT_LOCATION.equals(path));
 				return super.getResourceByPath(path);
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 5f44339cbd..62ba99fb7b 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
@@ -57,6 +57,7 @@ public class ExcelViewTests extends TestCase {
 	private MockHttpServletResponse response;
 	private StaticWebApplicationContext webAppCtx;
 
+	@Override
 	public void setUp() {
 		servletCtx = new MockServletContext("org/springframework/web/servlet/view/document");
 		request = new MockHttpServletRequest(servletCtx);
@@ -67,6 +68,7 @@ public class ExcelViewTests extends TestCase {
 
 	public void testExcel() throws Exception {
 		AbstractExcelView excelView = new AbstractExcelView() {
+			@Override
 			protected void buildExcelDocument(Map model, HSSFWorkbook wb,
 					HttpServletRequest request, HttpServletResponse response)
 					throws Exception {
@@ -101,6 +103,7 @@ public class ExcelViewTests extends TestCase {
 				newDummyLocaleResolver("nl", "nl"));
 
 		AbstractExcelView excelView = new AbstractExcelView() {
+			@Override
 			protected void buildExcelDocument(Map model, HSSFWorkbook wb,
 					HttpServletRequest request, HttpServletResponse response)
 					throws Exception {
@@ -135,6 +138,7 @@ public class ExcelViewTests extends TestCase {
 				newDummyLocaleResolver("en", "US"));
 
 		AbstractExcelView excelView = new AbstractExcelView() {
+			@Override
 			protected void buildExcelDocument(Map model, HSSFWorkbook wb,
 					HttpServletRequest request, HttpServletResponse response)
 					throws Exception {
@@ -169,6 +173,7 @@ public class ExcelViewTests extends TestCase {
 				newDummyLocaleResolver("de", ""));
 
 		AbstractExcelView excelView = new AbstractExcelView() {
+			@Override
 			protected void buildExcelDocument(Map model, HSSFWorkbook wb,
 					HttpServletRequest request, HttpServletResponse response)
 					throws Exception {
@@ -200,6 +205,7 @@ public class ExcelViewTests extends TestCase {
 
 	public void testJExcel() throws Exception {
 		AbstractJExcelView excelView = new AbstractJExcelView() {
+			@Override
 			protected void buildExcelDocument(Map model,
 					WritableWorkbook wb,
 					HttpServletRequest request,
@@ -229,6 +235,7 @@ public class ExcelViewTests extends TestCase {
 				newDummyLocaleResolver("nl", "nl"));
 
 		AbstractJExcelView excelView = new AbstractJExcelView() {
+			@Override
 			protected void buildExcelDocument(Map model,
 					WritableWorkbook wb,
 					HttpServletRequest request,
@@ -259,6 +266,7 @@ public class ExcelViewTests extends TestCase {
 				newDummyLocaleResolver("en", "US"));
 
 		AbstractJExcelView excelView = new AbstractJExcelView() {
+			@Override
 			protected void buildExcelDocument(Map model,
 					WritableWorkbook wb,
 					HttpServletRequest request,
@@ -289,6 +297,7 @@ public class ExcelViewTests extends TestCase {
 				newDummyLocaleResolver("de", ""));
 
 		AbstractJExcelView excelView = new AbstractJExcelView() {
+			@Override
 			protected void buildExcelDocument(Map model,
 					WritableWorkbook wb,
 					HttpServletRequest request,
@@ -316,10 +325,12 @@ public class ExcelViewTests extends TestCase {
 
 	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!
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
index c0b9938bb5..933b8e0129 100644
--- 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
@@ -44,6 +44,7 @@ public class PdfViewTests extends TestCase {
 		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));
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java
index 8da83022c4..8b49f3ba55 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java
@@ -85,12 +85,14 @@ public class FreeMarkerConfigurerTests extends TestCase {
 		settings.setProperty("localized_lookup", "false");
 		fcfb.setFreemarkerSettings(settings);
 		fcfb.setResourceLoader(new ResourceLoader() {
+			@Override
 			public Resource getResource(String location) {
 				if (!("file:/mydir".equals(location) || "file:/mydir/test".equals(location))) {
 					throw new IllegalArgumentException(location);
 				}
 				return new ByteArrayResource("test".getBytes(), "test");
 			}
+			@Override
 			public ClassLoader getClassLoader() {
 				return getClass().getClassLoader();
 			}
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 d3a6bfab40..ff233b9be2 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
@@ -202,9 +202,11 @@ public class FreeMarkerViewTests {
 
 	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")) {
+					@Override
 					public void process(Object model, Writer writer) throws TemplateException, IOException {
 						assertEquals(Locale.US, locale);
 						assertTrue(model instanceof AllHttpScopesHashModel);
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
index 5638a35db6..f78a5f1b02 100644
--- 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
@@ -54,6 +54,7 @@ public abstract class AbstractJasperReportsTests extends TestCase {
 	protected MockHttpServletResponse response;
 
 
+	@Override
 	public void setUp() {
 		request = new MockHttpServletRequest();
 		response = new MockHttpServletResponse();
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
index a4a9fb610a..5350f15999 100755
--- 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
@@ -411,10 +411,12 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
 			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
index 85ce6ff5ff..046d3cfc55 100644
--- 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
@@ -23,6 +23,7 @@ import net.sf.jasperreports.engine.export.JRHtmlExporter;
  */
 public class ConfigurableJasperReportsViewWithStreamTests extends AbstractConfigurableJasperReportsViewTests {
 
+	@Override
 	protected AbstractJasperReportsView getViewImplementation() {
 		ConfigurableJasperReportsView view = new ConfigurableJasperReportsView();
 		view.setExporterClass(JRHtmlExporter.class);
@@ -31,6 +32,7 @@ public class ConfigurableJasperReportsViewWithStreamTests extends AbstractConfig
 		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
index e35f3e93a8..349f455f3e 100644
--- 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
@@ -23,6 +23,7 @@ import net.sf.jasperreports.engine.export.JRPdfExporter;
  */
 public class ConfigurableJasperReportsViewWithWriterTests extends AbstractConfigurableJasperReportsViewTests {
 
+	@Override
 	protected AbstractJasperReportsView getViewImplementation() {
 		ConfigurableJasperReportsView view = new ConfigurableJasperReportsView();
 		view.setExporterClass(JRPdfExporter.class);
@@ -31,6 +32,7 @@ public class ConfigurableJasperReportsViewWithWriterTests extends AbstractConfig
 		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
index 18e25e2cd8..0cd2f131f2 100755
--- 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
@@ -41,6 +41,7 @@ public class ExporterParameterTests extends AbstractJasperReportsTests {
 		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 {
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java
index 2200bd3f6f..09cb2aa70b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java
@@ -21,10 +21,12 @@ package org.springframework.web.servlet.view.jasperreports;
  */
 public class JasperReportsCsvViewTests extends AbstractJasperReportsViewTests {
 
+	@Override
 	protected AbstractJasperReportsView getViewImplementation() {
 		return new JasperReportsCsvView();
 	}
 
+	@Override
 	protected String getDesiredContentType() {
 		return "text/csv";
 	}
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
index 0c38a3b2a8..88d83e4fcb 100644
--- 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
@@ -30,10 +30,12 @@ import org.springframework.web.servlet.DispatcherServlet;
  */
 public class JasperReportsHtmlViewTests extends AbstractJasperReportsViewTests {
 
+	@Override
 	protected AbstractJasperReportsView getViewImplementation() {
 		return new JasperReportsHtmlView();
 	}
 
+	@Override
 	protected String getDesiredContentType() {
 		return "text/html";
 	}
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
index e91dc32e57..093afd7853 100644
--- 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
@@ -29,6 +29,7 @@ import net.sf.jasperreports.engine.JasperPrint;
  */
 public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsViewTests {
 
+	@Override
 	protected void extendModel(Map<String, Object> model) {
 		model.put(getDiscriminatorKey(), "csv");
 	}
@@ -48,6 +49,7 @@ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsView
 		assertEquals("Invalid content type", "text/html", response.getContentType());
 	}
 
+	@Override
 	public void testOverrideContentDisposition() throws Exception {
 		if (!canCompileReport) {
 			return;
@@ -101,10 +103,12 @@ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsView
 		return "format";
 	}
 
+	@Override
 	protected AbstractJasperReportsView getViewImplementation() {
 		return new JasperReportsMultiFormatView();
 	}
 
+	@Override
 	protected String getDesiredContentType() {
 		return "text/csv";
 	}
@@ -121,6 +125,7 @@ public class JasperReportsMultiFormatViewTests 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
index 3bb3b30bd0..b7b1e9ebea 100644
--- 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
@@ -25,6 +25,7 @@ import java.util.Map;
  */
 public class JasperReportsMultiFormatViewWithCustomMappingsTests extends JasperReportsMultiFormatViewTests {
 
+	@Override
 	protected AbstractJasperReportsView getViewImplementation() {
 		JasperReportsMultiFormatView view = new JasperReportsMultiFormatView();
 		view.setFormatKey("fmt");
@@ -37,10 +38,12 @@ public class JasperReportsMultiFormatViewWithCustomMappingsTests extends JasperR
 		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/JasperReportsPdfViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java
index 84060185ca..6fbf2076b6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java
@@ -21,10 +21,12 @@ package org.springframework.web.servlet.view.jasperreports;
  */
 public class JasperReportsPdfViewTests extends AbstractJasperReportsViewTests {
 
+	@Override
 	protected AbstractJasperReportsView getViewImplementation() {
 		return new JasperReportsPdfView();
 	}
 
+	@Override
 	protected String getDesiredContentType() {
 		return "application/pdf";
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java
index af86756cb4..2f09e9bf0f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java
@@ -21,10 +21,12 @@ package org.springframework.web.servlet.view.jasperreports;
  */
 public class JasperReportsXlsViewTests extends AbstractJasperReportsViewTests {
 
+	@Override
 	protected AbstractJasperReportsView getViewImplementation() {
 		return new JasperReportsXlsView();
 	}
 
+	@Override
 	protected String getDesiredContentType() {
 		return "application/vnd.ms-excel";
 	}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java
index 401c914230..92f0b4c4bf 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java
@@ -44,6 +44,7 @@ public class TestVelocityEngine extends VelocityEngine {
 	}
 
 
+	@Override
 	public Template getTemplate(String name) throws ResourceNotFoundException {
 		Template template = (Template) this.templates.get(name);
 		if (template == null) {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java
index af090a253b..bf51bed1c7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java
@@ -87,6 +87,7 @@ public class VelocityConfigurerTests extends TestCase {
 		VelocityEngineFactoryBean vefb = new VelocityEngineFactoryBean();
 		vefb.setResourceLoaderPath("file:/mydir");
 		vefb.setResourceLoader(new ResourceLoader() {
+			@Override
 			public Resource getResource(String location) {
 				if (location.equals("file:/mydir") || location.equals("file:/mydir/test")) {
 					return new ByteArrayResource("test".getBytes(), "test");
@@ -98,6 +99,7 @@ public class VelocityConfigurerTests extends TestCase {
 					throw new IllegalArgumentException(ex.toString());
 				}
 			}
+			@Override
 			public ClassLoader getClassLoader() {
 				return getClass().getClassLoader();
 			}
@@ -133,12 +135,14 @@ public class VelocityConfigurerTests extends TestCase {
 		VelocityConfigurer vc = new VelocityConfigurer();
 		vc.setResourceLoaderPath("file:/mydir,file:/yourdir");
 		vc.setResourceLoader(new ResourceLoader() {
+			@Override
 			public Resource getResource(String location) {
 				if ("file:/yourdir/test".equals(location)) {
 					return new DescriptiveResource("");
 				}
 				return new ByteArrayResource("test".getBytes(), "test");
 			}
+			@Override
 			public ClassLoader getClassLoader() {
 				return getClass().getClassLoader();
 			}
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 fb265453d9..3ed4276550 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
@@ -57,12 +57,14 @@ public class VelocityMacroTests extends TestCase {
 	private MockHttpServletResponse response;
 
 
+	@Override
 	public void setUp() throws Exception {
 		wac = new StaticWebApplicationContext();
 		wac.setServletContext(new MockServletContext());
 
 		final Template expectedTemplate = new Template();
 		VelocityConfig vc = new VelocityConfig() {
+			@Override
 			public VelocityEngine getVelocityEngine() {
 				return new TestVelocityEngine(TEMPLATE_FILE, expectedTemplate);
 			}
@@ -79,6 +81,7 @@ public class VelocityMacroTests extends TestCase {
 
 	public void testExposeSpringMacroHelpers() throws Exception {
 		VelocityView vv = new VelocityView() {
+			@Override
 			protected void mergeTemplate(Template template, Context context, HttpServletResponse response) {
 				assertTrue(context.get(VelocityView.SPRING_MACRO_REQUEST_CONTEXT_ATTRIBUTE) instanceof RequestContext);
 				RequestContext rc = (RequestContext) context.get(VelocityView.SPRING_MACRO_REQUEST_CONTEXT_ATTRIBUTE);
@@ -100,6 +103,7 @@ public class VelocityMacroTests extends TestCase {
 		final String helperTool = "wrongType";
 
 		VelocityView vv = new VelocityView() {
+			@Override
 			protected void mergeTemplate(Template template, Context context, HttpServletResponse response) {
 				fail();
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java
index 97dc0cb787..43f3d5d5cc 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java
@@ -64,6 +64,7 @@ public class VelocityRenderTests {
 
 		final Template expectedTemplate = new Template();
 		VelocityConfig vc = new VelocityConfig() {
+			@Override
 			public VelocityEngine getVelocityEngine() {
 				return new TestVelocityEngine("test.vm", expectedTemplate);
 			}
@@ -106,9 +107,11 @@ public class VelocityRenderTests {
 		thrown.expect(NestedServletException.class);
 
 		thrown.expect(new TypeSafeMatcher<Exception>() {
+			@Override
 			public boolean matchesSafely(Exception item) {
 				return item.getCause() instanceof MethodInvocationException;
 			}
+			@Override
 			public void describeTo(Description description) {
 				description.appendText("exception has cause of MethodInvocationException");
 
@@ -138,9 +141,11 @@ public class VelocityRenderTests {
 		thrown.expect(NestedServletException.class);
 
 		thrown.expect(new TypeSafeMatcher<Exception>() {
+			@Override
 			public boolean matchesSafely(Exception item) {
 				return item.getCause() instanceof IOException;
 			}
+			@Override
 			public void describeTo(Description description) {
 				description.appendText("exception has cause of IOException");
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java
index 5bf06837bf..4cdf72c4b3 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java
@@ -39,6 +39,7 @@ public class VelocityToolboxViewTests {
 		wac.setServletContext(new MockServletContext());
 		final Template expectedTemplate = new Template();
 		VelocityConfig vc = new VelocityConfig() {
+			@Override
 			public VelocityEngine getVelocityEngine() {
 				return new TestVelocityEngine(templateName, expectedTemplate);
 			}
@@ -49,6 +50,7 @@ public class VelocityToolboxViewTests {
 		final HttpServletResponse expectedResponse = new MockHttpServletResponse();
 
 		VelocityToolboxView vv = new VelocityToolboxView() {
+			@Override
 			protected void mergeTemplate(Template template, Context context, HttpServletResponse response) throws Exception {
 				assertTrue(template == expectedTemplate);
 				assertTrue(response == expectedResponse);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java
index d8a43ebf48..e17f0b0087 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java
@@ -24,6 +24,7 @@ public class VelocityViewResolverTests {
 	@Test
 	public void testVelocityViewResolver() throws Exception {
 		VelocityConfig vc = new VelocityConfig() {
+			@Override
 			public VelocityEngine getVelocityEngine() {
 				return new TestVelocityEngine("prefix_test_suffix", new Template());
 			}
@@ -57,6 +58,7 @@ public class VelocityViewResolverTests {
 	@Test
 	public void testVelocityViewResolverWithToolbox() throws Exception {
 		VelocityConfig vc = new VelocityConfig() {
+			@Override
 			public VelocityEngine getVelocityEngine() {
 				return new TestVelocityEngine("prefix_test_suffix", new Template());
 			}
@@ -83,6 +85,7 @@ public class VelocityViewResolverTests {
 	@Test
 	public void testVelocityViewResolverWithToolboxSubclass() throws Exception {
 		VelocityConfig vc = new VelocityConfig() {
+			@Override
 			public VelocityEngine getVelocityEngine() {
 				TestVelocityEngine ve = new TestVelocityEngine();
 				ve.addTemplate("prefix_test_suffix", new Template());
@@ -113,6 +116,7 @@ public class VelocityViewResolverTests {
 	@Test
 	public void testVelocityLayoutViewResolver() throws Exception {
 		VelocityConfig vc = new VelocityConfig() {
+			@Override
 			public VelocityEngine getVelocityEngine() {
 				TestVelocityEngine ve = new TestVelocityEngine();
 				ve.addTemplate("prefix_test_suffix", new Template());
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java
index 916e1f2fb1..ac1a396f65 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java
@@ -137,6 +137,7 @@ public class VelocityViewTests {
 
 		final Template expectedTemplate = new Template();
 		VelocityConfig vc = new VelocityConfig() {
+			@Override
 			public VelocityEngine getVelocityEngine() {
 				return new TestVelocityEngine(templateName, expectedTemplate);
 			}
@@ -157,6 +158,7 @@ public class VelocityViewTests {
 		final HttpServletResponse expectedResponse = new MockHttpServletResponse();
 
 		VelocityView vv = new VelocityView() {
+			@Override
 			protected void mergeTemplate(Template template, Context context, HttpServletResponse response) throws Exception {
 				assertTrue(template == expectedTemplate);
 				assertTrue(context.getKeys().length >= 1);
@@ -194,6 +196,7 @@ public class VelocityViewTests {
 
 		final Template expectedTemplate = new Template();
 		VelocityConfig vc = new VelocityConfig() {
+			@Override
 			public VelocityEngine getVelocityEngine() {
 				return new TestVelocityEngine(templateName, expectedTemplate);
 			}
@@ -215,10 +218,12 @@ public class VelocityViewTests {
 		expectedResponse.setContentType("myContentType");
 
 		VelocityView vv = new VelocityView() {
+			@Override
 			protected void mergeTemplate(Template template, Context context, HttpServletResponse response) {
 				assertTrue(template == expectedTemplate);
 				assertTrue(response == expectedResponse);
 			}
+			@Override
 			protected void exposeHelpers(Map<String, Object> model, HttpServletRequest request) throws Exception {
 				model.put("myHelper", "myValue");
 			}
@@ -244,6 +249,7 @@ public class VelocityViewTests {
 
 		final Template expectedTemplate = new Template();
 		VelocityConfig vc = new VelocityConfig() {
+			@Override
 			public VelocityEngine getVelocityEngine() {
 				return new TestVelocityEngine(templateName, expectedTemplate);
 			}
@@ -268,6 +274,7 @@ public class VelocityViewTests {
 		final HttpServletResponse expectedResponse = new MockHttpServletResponse();
 
 		VelocityView vv = new VelocityView() {
+			@Override
 			protected void mergeTemplate(Template template, Context context, HttpServletResponse response) throws Exception {
 				assertTrue(template == expectedTemplate);
 				assertTrue(response == expectedResponse);
@@ -284,6 +291,7 @@ public class VelocityViewTests {
 				assertTrue(numberTool.getLocale().equals(Locale.CANADA));
 			}
 
+			@Override
 			protected void exposeHelpers(Map<String, Object> model, HttpServletRequest request) throws Exception {
 				model.put("myHelper", "myValue");
 			}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java
index 2b96a0c3e3..43cbba5a77 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java
@@ -63,6 +63,7 @@ public class TestXsltViewTests extends TestCase {
 	private int fatal = 0;
 
 
+	@Override
 	public void setUp() {
 		this.view = new TestXsltView();
 	}
@@ -80,12 +81,15 @@ public class TestXsltViewTests extends TestCase {
 
 	public void testCustomErrorListener() {
 		view.setErrorListener(new ErrorListener() {
+			@Override
 			public void warning(TransformerException ex) {
 				incWarnings();
 			}
+			@Override
 			public void error(TransformerException ex) {
 				incErrors();
 			}
+			@Override
 			public void fatalError(TransformerException ex) {
 				incFatals();
 			}
@@ -110,6 +114,7 @@ public class TestXsltViewTests extends TestCase {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		AbstractXsltView view = new AbstractXsltView() {
+			@Override
 			protected Source createXsltSource(Map model, String root, HttpServletRequest request, HttpServletResponse response) throws Exception {
 				Hero hero = (Hero) model.get("hero");
 				Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
@@ -136,6 +141,7 @@ public class TestXsltViewTests extends TestCase {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		AbstractXsltView view = new AbstractXsltView() {
+			@Override
 			protected Source createXsltSource(Map model, String root, HttpServletRequest request, HttpServletResponse response) throws Exception {
 				Hero hero = (Hero) model.get("hero");
 				Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
@@ -163,6 +169,7 @@ public class TestXsltViewTests extends TestCase {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		AbstractXsltView view = new AbstractXsltView() {
+			@Override
 			protected Map getParameters(HttpServletRequest request) {
 				Map parameters = new HashMap();
 				parameters.put("sex", "Male");
@@ -195,6 +202,7 @@ public class TestXsltViewTests extends TestCase {
 		response.setWriterAccessAllowed(false);
 
 		AbstractXsltView view = new AbstractXsltView() {
+			@Override
 			protected Map getParameters(HttpServletRequest request) {
 				Map parameters = new HashMap();
 				parameters.put("sex", "Male");
@@ -221,6 +229,7 @@ public class TestXsltViewTests extends TestCase {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		AbstractXsltView view = new AbstractXsltView() {
+			@Override
 			protected Map getParameters(HttpServletRequest request) {
 				Map parameters = new HashMap();
 				parameters.put("sex", "Male");
@@ -256,6 +265,7 @@ public class TestXsltViewTests extends TestCase {
 		response.setOutputStreamAccessAllowed(false);
 
 		AbstractXsltView view = new AbstractXsltView() {
+			@Override
 			protected Source createXsltSource(Map model, String root, HttpServletRequest request, HttpServletResponse response) throws Exception {
 				Hero hero = (Hero) model.get("hero");
 				Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
@@ -265,11 +275,13 @@ public class TestXsltViewTests extends TestCase {
 				node.setAttribute("catchphrase", hero.getCatchphrase());
 				return new DOMSource(node);
 			}
+			@Override
 			protected Map getParameters(HttpServletRequest request) {
 				Map parameters = new HashMap();
 				parameters.put("sex", "Male");
 				return parameters;
 			}
+			@Override
 			protected boolean useWriter() {
 				return true;
 			}
@@ -299,6 +311,7 @@ public class TestXsltViewTests extends TestCase {
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		AbstractXsltView view = new AbstractXsltView() {
+			@Override
 			protected Source createXsltSource(
 					Map model, String rootName, HttpServletRequest request, HttpServletResponse response)
 					throws Exception {
diff --git a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
index 7b2f7d94a4..93a34f1466 100644
--- a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
+++ b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
@@ -207,6 +207,7 @@ class NeverMatchAdvisor extends StaticMethodMatcherPointcutAdvisor {
 	/**
 	 * @see org.springframework.aop.MethodMatcher#matches(java.lang.reflect.Method, java.lang.Class)
 	 */
+	@Override
 	public boolean matches(Method m, Class<?> targetClass) {
 		return false;
 	}
@@ -249,10 +250,12 @@ class OrderedTxCheckAdvisor extends StaticMethodMatcherPointcutAdvisor implement
 		return (CountingBeforeAdvice) getAdvice();
 	}
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		setAdvice(new TxCountingBeforeAdvice());
 	}
 
+	@Override
 	public boolean matches(Method method, Class<?> targetClass) {
 		return method.getName().startsWith("setAge");
 	}
@@ -260,6 +263,7 @@ class OrderedTxCheckAdvisor extends StaticMethodMatcherPointcutAdvisor implement
 
 	private class TxCountingBeforeAdvice extends CountingBeforeAdvice {
 
+		@Override
 		public void before(Method method, Object[] args, Object target) throws Throwable {
 			// do transaction checks
 			if (requireTransactionContext) {
@@ -323,21 +327,25 @@ class CallCountingTransactionManager extends AbstractPlatformTransactionManager
 	public int rollbacks;
 	public int inflight;
 
+	@Override
 	protected Object doGetTransaction() {
 		return new Object();
 	}
 
+	@Override
 	protected void doBegin(Object transaction, TransactionDefinition definition) {
 		this.lastDefinition = definition;
 		++begun;
 		++inflight;
 	}
 
+	@Override
 	protected void doCommit(DefaultTransactionStatus status) {
 		++commits;
 		--inflight;
 	}
 
+	@Override
 	protected void doRollback(DefaultTransactionStatus status) {
 		++rollbacks;
 		--inflight;
diff --git a/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java b/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java
index b209a01d54..01155d3f3b 100644
--- a/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java
+++ b/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java
@@ -121,6 +121,7 @@ public class EnableCachingIntegrationTests {
 	@Repository
 	static class DummyFooRepository implements FooRepository {
 
+		@Override
 		@Cacheable("primary")
 		public List<Object> findAll() {
 			return Collections.emptyList();
diff --git a/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
index c1d74a88d2..89964f2e85 100644
--- a/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
+++ b/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
@@ -300,6 +300,7 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests {
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
 		scanner.setIncludeAnnotationConfig(false);
 		scanner.setScopeMetadataResolver(new ScopeMetadataResolver() {
+			@Override
 			public ScopeMetadata resolveScopeMetadata(BeanDefinition definition) {
 				ScopeMetadata metadata = new ScopeMetadata();
 				if (definition instanceof AnnotatedBeanDefinition) {
@@ -345,8 +346,10 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests {
 
 		private String name = DEFAULT_NAME;
 
+		@Override
 		public String getName() { return this.name; }
 
+		@Override
 		public void setName(String name) { this.name = name; }
 	}
 
diff --git a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
index dab551d075..9ee6eb4a8c 100644
--- a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
+++ b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
@@ -284,6 +284,7 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests {
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
 		scanner.setIncludeAnnotationConfig(false);
 		scanner.setBeanNameGenerator(new BeanNameGenerator() {
+			@Override
 			public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
 				return definition.getScope();
 			}
@@ -311,8 +312,10 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests {
 
 		private String name = DEFAULT_NAME;
 
+		@Override
 		public String getName() { return this.name; }
 
+		@Override
 		public void setName(String name) { this.name = name; }
 	}
 
diff --git a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java
index c4da57a4f8..ee65521d4d 100644
--- a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java
+++ b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java
@@ -656,6 +656,7 @@ public class EnvironmentIntegrationTests {
 
 		public Environment environment;
 
+		@Override
 		public void setEnvironment(Environment environment) {
 			this.environment = environment;
 		}
diff --git a/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java b/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java
index 032ab7c6fb..e095fd1e56 100644
--- a/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java
+++ b/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java
@@ -57,6 +57,7 @@ class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		if (beanFactory instanceof ConfigurableBeanFactory) {
 			Object typeConverter = ((ConfigurableBeanFactory) beanFactory).getTypeConverter();
@@ -80,6 +81,7 @@ class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware {
 		return delegate.findCustomEditor(targetType, null) != null || delegate.getDefaultEditor(targetType) != null;
 	}
 
+	@Override
 	public boolean canConvert(TypeDescriptor sourceTypeDescriptor, TypeDescriptor targetTypeDescriptor) {
 		if (conversionService.canConvert(sourceTypeDescriptor, targetTypeDescriptor)) {
 			return true;
@@ -90,6 +92,7 @@ class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware {
 		return canConvert(sourceType, targetType);
 	}
 
+	@Override
 	public Object convertValue(Object value, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (targetType.getType() == Void.class || targetType.getType() == Void.TYPE) {
 			return null;
diff --git a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
index 2970b5f0aa..eb715261ea 100644
--- a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
+++ b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
@@ -153,6 +153,7 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests {
 			this.count.incrementAndGet();
 		}
 
+		@Override
 		public int getInvocationCount() {
 			return this.count.get();
 		}
@@ -168,12 +169,14 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests {
 
 		private final AtomicInteger count = new AtomicInteger(0);
 
+		@Override
 		@Transactional
 		@Scheduled(fixedDelay = 5)
 		public void scheduled() {
 			this.count.incrementAndGet();
 		}
 
+		@Override
 		public int getInvocationCount() {
 			return this.count.get();
 		}
diff --git a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index 4b5aaa39de..943a9e1e1b 100644
--- a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -33,21 +33,25 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM
 	public int rollbacks;
 	public int inflight;
 
+	@Override
 	protected Object doGetTransaction() {
 		return new Object();
 	}
 
+	@Override
 	protected void doBegin(Object transaction, TransactionDefinition definition) {
 		this.lastDefinition = definition;
 		++begun;
 		++inflight;
 	}
 
+	@Override
 	protected void doCommit(DefaultTransactionStatus status) {
 		++commits;
 		--inflight;
 	}
 
+	@Override
 	protected void doRollback(DefaultTransactionStatus status) {
 		++rollbacks;
 		--inflight;
diff --git a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
index 6391a5328e..ced09c321f 100644
--- a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
+++ b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
@@ -219,6 +219,7 @@ public class EnableTransactionManagementIntegrationTests {
 			return new CallCountingTransactionManager();
 		}
 
+		@Override
 		public PlatformTransactionManager annotationDrivenTransactionManager() {
 			return txManager1();
 		}
@@ -327,6 +328,7 @@ public class EnableTransactionManagementIntegrationTests {
 		public void setDataSource(DataSource dataSource) {
 		}
 
+		@Override
 		@Transactional
 		public List<Object> findAll() {
 			return Collections.emptyList();
@@ -336,6 +338,7 @@ public class EnableTransactionManagementIntegrationTests {
 	@Repository
 	static class DummyFooRepository implements FooRepository {
 
+		@Override
 		@Transactional
 		public List<Object> findAll() {
 			return Collections.emptyList();
diff --git a/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java b/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java
index 076f73b84c..26bc6fdb19 100644
--- a/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java
+++ b/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java
@@ -115,10 +115,12 @@ interface AnnotatedService {
 }
 
 class NonAnnotatedServiceImpl implements AnnotatedService {
+	@Override
 	public void m() { }
 }
 
 class AnnotatedServiceImpl implements NonAnnotatedService {
+	@Override
 	@Transactional public void m() { }
 }
 
diff --git a/src/test/java/test/advice/CountingAfterReturningAdvice.java b/src/test/java/test/advice/CountingAfterReturningAdvice.java
index 2e9aaa5a15..fe373ecc7e 100644
--- a/src/test/java/test/advice/CountingAfterReturningAdvice.java
+++ b/src/test/java/test/advice/CountingAfterReturningAdvice.java
@@ -28,6 +28,7 @@ import org.springframework.aop.AfterReturningAdvice;
 @SuppressWarnings("serial")
 public class CountingAfterReturningAdvice extends MethodCounter implements AfterReturningAdvice {
 
+	@Override
 	public void afterReturning(Object o, Method m, Object[] args, Object target) throws Throwable {
 		count(m);
 	}
diff --git a/src/test/java/test/advice/CountingBeforeAdvice.java b/src/test/java/test/advice/CountingBeforeAdvice.java
index 3dc49faf24..89fc45aeb5 100644
--- a/src/test/java/test/advice/CountingBeforeAdvice.java
+++ b/src/test/java/test/advice/CountingBeforeAdvice.java
@@ -28,6 +28,7 @@ import org.springframework.aop.MethodBeforeAdvice;
 @SuppressWarnings("serial")
 public class CountingBeforeAdvice extends MethodCounter implements MethodBeforeAdvice {
 
+	@Override
 	public void before(Method m, Object[] args, Object target) throws Throwable {
 		count(m);
 	}
diff --git a/src/test/java/test/beans/NestedTestBean.java b/src/test/java/test/beans/NestedTestBean.java
index b0f9df9d9b..610931b50c 100644
--- a/src/test/java/test/beans/NestedTestBean.java
+++ b/src/test/java/test/beans/NestedTestBean.java
@@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean {
 		this.company = (company != null ? company : "");
 	}
 
+	@Override
 	public String getCompany() {
 		return company;
 	}
diff --git a/src/test/java/test/beans/TestBean.java b/src/test/java/test/beans/TestBean.java
index 2c42a8cca5..d237316c8a 100644
--- a/src/test/java/test/beans/TestBean.java
+++ b/src/test/java/test/beans/TestBean.java
@@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return beanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return postProcessed;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		}
 	}
 
+	@Override
 	public int getAge() {
 		return age;
 	}
 
+	@Override
 	public void setAge(int age) {
 		this.age = age;
 	}
@@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.jedi = jedi;
 	}
 
+	@Override
 	public ITestBean getSpouse() {
 		return (spouses != null ? spouses[0] : null);
 	}
 
+	@Override
 	public void setSpouse(ITestBean spouse) {
 		this.spouses = new ITestBean[] {spouse};
 	}
 
+	@Override
 	public ITestBean[] getSpouses() {
 		return spouses;
 	}
@@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.country = country;
 	}
 
+	@Override
 	public String[] getStringArray() {
 		return stringArray;
 	}
 
+	@Override
 	public void setStringArray(String[] stringArray) {
 		this.stringArray = stringArray;
 	}
@@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someProperties = someProperties;
 	}
 
+	@Override
 	public INestedTestBean getDoctor() {
 		return doctor;
 	}
@@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.doctor = doctor;
 	}
 
+	@Override
 	public INestedTestBean getLawyer() {
 		return lawyer;
 	}
@@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someBoolean = someBoolean;
 	}
 
+	@Override
 	public IndexedTestBean getNestedIndexedBean() {
 		return nestedIndexedBean;
 	}
@@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see ITestBean#exceptional(Throwable)
 	 */
+	@Override
 	public void exceptional(Throwable t) throws Throwable {
 		if (t != null) {
 			throw t;
 		}
 	}
 
+	@Override
 	public void unreliableFileOperation() throws IOException {
 		throw new IOException();
 	}
 	/**
 	 * @see ITestBean#returnsThis()
 	 */
+	@Override
 	public Object returnsThis() {
 		return this;
 	}
@@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	/**
 	 * @see IOther#absquatulate()
 	 */
+	@Override
 	public void absquatulate() {
 	}
 
+	@Override
 	public int haveBirthday() {
 		return age++;
 	}
@@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.age;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (this.name != null && other instanceof TestBean) {
 			return this.name.compareTo(((TestBean) other).getName());
diff --git a/src/test/java/test/interceptor/NopInterceptor.java b/src/test/java/test/interceptor/NopInterceptor.java
index 79158e74ea..ccda818994 100644
--- a/src/test/java/test/interceptor/NopInterceptor.java
+++ b/src/test/java/test/interceptor/NopInterceptor.java
@@ -32,6 +32,7 @@ public class NopInterceptor implements MethodInterceptor {
 	/**
 	 * @see org.aopalliance.intercept.MethodInterceptor#invoke(MethodInvocation)
 	 */
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		increment();
 		return invocation.proceed();
diff --git a/src/test/java/test/interceptor/SerializableNopInterceptor.java b/src/test/java/test/interceptor/SerializableNopInterceptor.java
index c7b2acf82f..f33e0d1e1b 100644
--- a/src/test/java/test/interceptor/SerializableNopInterceptor.java
+++ b/src/test/java/test/interceptor/SerializableNopInterceptor.java
@@ -35,10 +35,12 @@ public class SerializableNopInterceptor extends NopInterceptor implements Serial
 	 */
 	private int count;
 
+	@Override
 	public int getCount() {
 		return this.count;
 	}
 
+	@Override
 	protected void increment() {
 		++count;
 	}

From d66c733ef49d75c141989ff19a5fdf070a82fa25 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Wed, 19 Dec 2012 14:45:29 -0800
Subject: [PATCH 30/36] Replace EasyMock with Mockito in test sources

Issue: SPR-10126
---
 build.gradle                                  |   14 +-
 .../adapter/ThrowsAdviceInterceptorTests.java |   39 +-
 .../CustomizableTraceInterceptorTests.java    |   74 +-
 .../interceptor/DebugInterceptorTests.java    |   38 +-
 .../PerformanceMonitorInterceptorTests.java   |   36 +-
 .../SimpleTraceInterceptorTests.java          |   44 +-
 .../aop/scope/DefaultScopedObjectTests.java   |    9 +-
 ...elegatingIntroductionInterceptorTests.java |   24 +-
 .../config/CustomScopeConfigurerTests.java    |   10 +-
 ...ObjectFactoryCreatingFactoryBeanTests.java |   11 +-
 .../ServiceLocatorFactoryBeanTests.java       |    8 +-
 .../parsing/FailFastProblemReporterTests.java |   11 +-
 .../support/BeanFactoryGenericsTests.java     |   13 +-
 .../wiring/BeanConfigurerSupportTests.java    |   35 +-
 .../scheduling/quartz/QuartzSupportTests.java |  217 +-
 .../aop/aspectj/AfterAdviceBindingTests.java  |   29 +-
 .../AfterReturningAdviceBindingTests.java     |   57 +-
 .../AfterThrowingAdviceBindingTests.java      |   38 +-
 .../aop/aspectj/AroundAdviceBindingTests.java |   21 +-
 .../aop/aspectj/BeforeAdviceBindingTests.java |   25 +-
 .../MethodLocatingFactoryBeanTests.java       |   46 +-
 .../aop/framework/JdkDynamicProxyTests.java   |   12 +-
 .../ContextBeanFactoryReferenceTests.java     |   10 +-
 .../EnableLoadTimeWeavingTests.java           |   38 +-
 .../event/ApplicationContextEventTests.java   |   23 +-
 .../EventPublicationInterceptorTests.java     |   10 +-
 .../LocalSlsbInvokerInterceptorTests.java     |   51 +-
 ...StatelessSessionProxyFactoryBeanTests.java |   37 +-
 ...mpleRemoteSlsbInvokerInterceptorTests.java |  118 +-
 ...StatelessSessionProxyFactoryBeanTests.java |   58 +-
 .../GlassFishLoadTimeWeaverTests.java         |  270 ++-
 .../jndi/JndiObjectFactoryBeanTests.java      |   14 +-
 .../jndi/JndiTemplateTests.java               |   61 +-
 .../ScheduledExecutorFactoryBeanTests.java    |   89 +-
 .../scripting/bsh/BshScriptFactoryTests.java  |   15 +-
 .../groovy/GroovyScriptFactoryTests.java      |   27 +-
 .../RefreshableScriptTargetSourceTests.java   |    7 +-
 .../support/ResourceScriptSourceTests.java    |   33 +-
 .../ScriptFactoryPostProcessorTests.java      |    7 +-
 .../build/test/mockito/MockitoUtils.java      |   88 +
 .../xml/AbstractStaxXMLReaderTestCase.java    |  477 ++--
 .../util/xml/StaxEventXMLReaderTests.java     |   24 +-
 .../util/xml/StaxStreamXMLReaderTests.java    |   32 +-
 .../build/test/hamcrest/Matchers.java         |   67 +
 .../jdbc/AbstractJdbcTests.java               |   87 -
 .../jdbc/core/AbstractRowMapperTests.java     |  322 +--
 .../jdbc/core/BatchUpdateTestHelper.java      |  112 -
 .../jdbc/core/BeanPropertyRowMapperTests.java |  161 +-
 .../jdbc/core/JdbcTemplateQueryTests.java     | 1012 ++-------
 .../jdbc/core/JdbcTemplateTests.java          | 1995 +++++------------
 .../jdbc/core/RowMapperTests.java             |  287 +--
 .../jdbc/core/StatementCreatorUtilsTests.java |  211 +-
 .../NamedParameterJdbcTemplateTests.java      |  601 ++---
 .../namedparam/NamedParameterQueryTests.java  |  639 ++----
 .../core/simple/CallMetaDataContextTests.java |   99 +-
 ...rameterizedBeanPropertyRowMapperTests.java |   61 +-
 .../jdbc/core/simple/SimpleJdbcCallTests.java |  565 ++---
 .../core/simple/SimpleJdbcInsertTests.java    |  122 +-
 .../core/simple/SimpleJdbcTemplateTests.java  |  657 ++----
 .../simple/TableMetaDataContextTests.java     |  271 +--
 .../JdbcBeanDefinitionReaderTests.java        |   67 +-
 .../core/support/JdbcDaoSupportTests.java     |   18 +-
 .../jdbc/core/support/LobSupportTests.java    |  133 +-
 .../jdbc/core/support/SqlLobValueTests.java   |  237 +-
 .../DataSourceJtaTransactionTests.java        |  627 ++----
 .../DataSourceTransactionManagerTests.java    | 1089 ++-------
 .../datasource/DelegatingDataSourceTest.java  |   50 +-
 .../DriverManagerDataSourceTests.java         |   47 +-
 ...UserCredentialsDataSourceAdapterTests.java |   58 +-
 .../init/DatabasePopulatorTests.java          |   15 +-
 .../BeanFactoryDataSourceLookupTests.java     |   27 +-
 .../jdbc/object/BatchSqlUpdateTests.java      |   73 +-
 .../jdbc/object/GenericSqlQueryTests.java     |  123 +-
 .../object/GenericStoredProcedureTests.java   |  101 +-
 .../jdbc/object/SqlQueryTests.java            | 1085 +++------
 .../jdbc/object/SqlUpdateTests.java           |  423 ++--
 .../jdbc/object/StoredProcedureTests.java     |  932 +++-----
 .../DataFieldMaxValueIncrementerTests.java    |  218 +-
 .../jdbc/support/DefaultLobHandlerTests.java  |  112 +-
 .../support/NativeJdbcExtractorTests.java     |   88 +-
 .../support/SQLErrorCodesFactoryTests.java    |   97 +-
 .../rowset/ResultSetWrappingRowSetTests.java  |   99 +-
 82 files changed, 4828 insertions(+), 10460 deletions(-)
 create mode 100644 spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java
 create mode 100644 spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java
 delete mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java
 delete mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/core/BatchUpdateTestHelper.java

diff --git a/build.gradle b/build.gradle
index 5e996570c4..d01d0d701b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,7 +74,7 @@ configure(allprojects) {
 	dependencies {
 		testCompile("junit:junit:${junitVersion}")
 		testCompile("org.hamcrest:hamcrest-all:1.3")
-		testCompile("org.easymock:easymock:${easymockVersion}")
+		testCompile("org.mockito:mockito-core:1.9.5")
 	}
 
 	ext.javadocLinks = [
@@ -100,6 +100,16 @@ configure(allprojects) {
 	] as String[]
 }
 
+configure(allprojects.findAll{it.name in ["spring", "spring-jms", "spring-orm",
+		"spring-orm-hibernate4", "spring-oxm", "spring-struts", "spring-test",
+		"spring-test-mvc", "spring-tx", "spring-web", "spring-webmvc",
+		"spring-webmvc-portlet", "spring-webmvc-tiles3"]}) {
+	dependencies {
+		testCompile("org.easymock:easymock:${easymockVersion}")
+		testCompile "org.easymock:easymockclassextension:${easymockVersion}"
+	}
+}
+
 configure(subprojects) { subproject ->
 	apply plugin: "merge"
 	apply from: "${gradleScriptDir}/publish-maven.gradle"
@@ -330,7 +340,6 @@ project("spring-tx") {
 		optional("javax.resource:connector-api:1.5")
 		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
 		optional("javax.ejb:ejb-api:3.0")
-		testCompile "org.easymock:easymockclassextension:${easymockVersion}"
 		testCompile("javax.persistence:persistence-api:1.0")
 		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
 	}
@@ -678,7 +687,6 @@ project("spring-test-mvc") {
 		testCompile("javax.activation:activation:1.1")
 		testCompile("javax.mail:mail:1.4")
 		testCompile("javax.xml.bind:jaxb-api:2.2.6")
-		testCompile("org.easymock:easymockclassextension:${easymockVersion}")
 		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") {
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
index 1a245999d1..77707f16bc 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
@@ -23,8 +23,10 @@ import java.rmi.RemoteException;
 import javax.transaction.TransactionRolledbackException;
 
 import org.aopalliance.intercept.MethodInvocation;
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
 import org.junit.Test;
 import test.aop.MethodCounter;
 
@@ -47,12 +49,10 @@ public final class ThrowsAdviceInterceptorTests {
 		MyThrowsHandler th = new MyThrowsHandler();
 		ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
 		Object ret = new Object();
-		MethodInvocation mi = createMock(MethodInvocation.class);
-		expect(mi.proceed()).andReturn(ret);
-		replay(mi);
+		MethodInvocation mi = mock(MethodInvocation.class);
+		given(mi.proceed()).willReturn(ret);
 		assertEquals(ret, ti.invoke(mi));
 		assertEquals(0, th.getCalls());
-		verify(mi);
 	}
 
 	@Test
@@ -61,9 +61,8 @@ public final class ThrowsAdviceInterceptorTests {
 		ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
 		assertEquals(2, ti.getHandlerMethodCount());
 		Exception ex = new Exception();
-		MethodInvocation mi = createMock(MethodInvocation.class);
-		expect(mi.proceed()).andThrow(ex);
-		replay(mi);
+		MethodInvocation mi = mock(MethodInvocation.class);
+		given(mi.proceed()).willThrow(ex);
 		try {
 			ti.invoke(mi);
 			fail();
@@ -72,7 +71,6 @@ public final class ThrowsAdviceInterceptorTests {
 			assertEquals(ex, caught);
 		}
 		assertEquals(0, th.getCalls());
-		verify(mi);
 	}
 
 	@Test
@@ -80,12 +78,10 @@ public final class ThrowsAdviceInterceptorTests {
 		MyThrowsHandler th = new MyThrowsHandler();
 		ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
 		FileNotFoundException ex = new FileNotFoundException();
-		MethodInvocation mi = createMock(MethodInvocation.class);
-		expect(mi.getMethod()).andReturn(Object.class.getMethod("hashCode", (Class[]) null));
-		expect(mi.getArguments()).andReturn(null);
-		expect(mi.getThis()).andReturn(new Object());
-		expect(mi.proceed()).andThrow(ex);
-		replay(mi);
+		MethodInvocation mi = mock(MethodInvocation.class);
+		given(mi.getMethod()).willReturn(Object.class.getMethod("hashCode", (Class[]) null));
+		given(mi.getThis()).willReturn(new Object());
+		given(mi.proceed()).willThrow(ex);
 		try {
 			ti.invoke(mi);
 			fail();
@@ -95,7 +91,6 @@ public final class ThrowsAdviceInterceptorTests {
 		}
 		assertEquals(1, th.getCalls());
 		assertEquals(1, th.getCalls("ioException"));
-		verify(mi);
 	}
 
 	@Test
@@ -104,9 +99,8 @@ public final class ThrowsAdviceInterceptorTests {
 		ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
 		// Extends RemoteException
 		TransactionRolledbackException ex = new TransactionRolledbackException();
-		MethodInvocation mi = createMock(MethodInvocation.class);
-		expect(mi.proceed()).andThrow(ex);
-		replay(mi);
+		MethodInvocation mi = mock(MethodInvocation.class);
+		given(mi.proceed()).willThrow(ex);
 		try {
 			ti.invoke(mi);
 			fail();
@@ -116,7 +110,6 @@ public final class ThrowsAdviceInterceptorTests {
 		}
 		assertEquals(1, th.getCalls());
 		assertEquals(1, th.getCalls("remoteException"));
-		verify(mi);
 	}
 
 	@Test
@@ -135,9 +128,8 @@ public final class ThrowsAdviceInterceptorTests {
 		ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
 		// Extends RemoteException
 		TransactionRolledbackException ex = new TransactionRolledbackException();
-		MethodInvocation mi = createMock(MethodInvocation.class);
-		expect(mi.proceed()).andThrow(ex);
-		replay(mi);
+		MethodInvocation mi = mock(MethodInvocation.class);
+		given(mi.proceed()).willThrow(ex);
 		try {
 			ti.invoke(mi);
 			fail();
@@ -147,7 +139,6 @@ public final class ThrowsAdviceInterceptorTests {
 		}
 		assertEquals(1, th.getCalls());
 		assertEquals(1, th.getCalls("remoteException"));
-		verify(mi);
 	}
 
 	@SuppressWarnings("serial")
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java
index 14845cfd5c..deceb5c215 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java
@@ -16,8 +16,13 @@
 
 package org.springframework.aop.interceptor;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import java.lang.reflect.Method;
 
@@ -83,47 +88,32 @@ public final class CustomizableTraceInterceptorTests {
 
 	@Test
 	public void testSunnyDayPathLogsCorrectly() throws Throwable {
-		Log log = createMock(Log.class);
 
-		MethodInvocation methodInvocation = createMock(MethodInvocation.class);
+		MethodInvocation methodInvocation = mock(MethodInvocation.class);
+		given(methodInvocation.getMethod()).willReturn(String.class.getMethod("toString", new Class[]{}));
+		given(methodInvocation.getThis()).willReturn(this);
 
-		Method toString = String.class.getMethod("toString", new Class[]{});
-
-		expect(log.isTraceEnabled()).andReturn(true);
-		expect(methodInvocation.getMethod()).andReturn(toString).times(4);
-		expect(methodInvocation.getThis()).andReturn(this).times(2);
-		log.trace(isA(String.class));
-		expect(methodInvocation.proceed()).andReturn(null);
-		log.trace(isA(String.class));
-
-		replay(methodInvocation);
-		replay(log);
+		Log log = mock(Log.class);
+		given(log.isTraceEnabled()).willReturn(true);
 
 		CustomizableTraceInterceptor interceptor = new StubCustomizableTraceInterceptor(log);
 		interceptor.invoke(methodInvocation);
 
-		verify(log);
-		verify(methodInvocation);
+		verify(log, times(2)).trace(anyString());
 	}
 
 	@Test
 	public void testExceptionPathLogsCorrectly() throws Throwable {
-		Log log = createMock(Log.class);
 
-		MethodInvocation methodInvocation = createMock(MethodInvocation.class);
+		MethodInvocation methodInvocation = mock(MethodInvocation.class);
 
-		Method toString = String.class.getMethod("toString", new Class[]{});
-
-		expect(log.isTraceEnabled()).andReturn(true);
-		expect(methodInvocation.getMethod()).andReturn(toString).times(4);
-		expect(methodInvocation.getThis()).andReturn(this).times(2);
-		log.trace(isA(String.class));
 		IllegalArgumentException exception = new IllegalArgumentException();
-		expect(methodInvocation.proceed()).andThrow(exception);
-		log.trace(isA(String.class), eq(exception));
+		given(methodInvocation.getMethod()).willReturn(String.class.getMethod("toString", new Class[]{}));
+		given(methodInvocation.getThis()).willReturn(this);
+		given(methodInvocation.proceed()).willThrow(exception);
 
-		replay(log);
-		replay(methodInvocation);
+		Log log = mock(Log.class);
+		given(log.isTraceEnabled()).willReturn(true);
 
 		CustomizableTraceInterceptor interceptor = new StubCustomizableTraceInterceptor(log);
 		try {
@@ -133,29 +123,22 @@ public final class CustomizableTraceInterceptorTests {
 		catch (IllegalArgumentException expected) {
 		}
 
-		verify(log);
-		verify(methodInvocation);
+		verify(log).trace(anyString());
+		verify(log).trace(anyString(), eq(exception));
 	}
 
 	@Test
 	public void testSunnyDayPathLogsCorrectlyWithPrettyMuchAllPlaceholdersMatching() throws Throwable {
-		Log log = createMock(Log.class);
 
-		MethodInvocation methodInvocation = createMock(MethodInvocation.class);
+		MethodInvocation methodInvocation = mock(MethodInvocation.class);
 
-		Method toString = String.class.getMethod("toString", new Class[0]);
-		Object[] arguments = new Object[]{"$ One \\$", new Long(2)};
+		given(methodInvocation.getMethod()).willReturn(String.class.getMethod("toString", new Class[0]));
+		given(methodInvocation.getThis()).willReturn(this);
+		given(methodInvocation.getArguments()).willReturn(new Object[]{"$ One \\$", new Long(2)});
+		given(methodInvocation.proceed()).willReturn("Hello!");
 
-		expect(log.isTraceEnabled()).andReturn(true);
-		expect(methodInvocation.getMethod()).andReturn(toString).times(7);
-		expect(methodInvocation.getThis()).andReturn(this).times(2);
-		expect(methodInvocation.getArguments()).andReturn(arguments).times(2);
-		log.trace(isA(String.class));
-		expect(methodInvocation.proceed()).andReturn("Hello!");
-		log.trace(isA(String.class));
-
-		replay(methodInvocation);
-		replay(log);
+		Log log = mock(Log.class);
+		given(log.isTraceEnabled()).willReturn(true);
 
 		CustomizableTraceInterceptor interceptor = new StubCustomizableTraceInterceptor(log);
 		interceptor.setEnterMessage(new StringBuffer()
@@ -174,8 +157,7 @@ public final class CustomizableTraceInterceptorTests {
 			.append("' this long.").toString());
 		interceptor.invoke(methodInvocation);
 
-		verify(log);
-		verify(methodInvocation);
+		verify(log, times(2)).trace(anyString());
 	}
 
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
index 92908baac7..d13c8e6512 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
@@ -16,8 +16,13 @@
 
 package org.springframework.aop.interceptor;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.logging.Log;
@@ -33,40 +38,29 @@ public final class DebugInterceptorTests {
 
 	@Test
 	public void testSunnyDayPathLogsCorrectly() throws Throwable {
-		Log log = createMock(Log.class);
 
-		MethodInvocation methodInvocation = createMock(MethodInvocation.class);
+		MethodInvocation methodInvocation = mock(MethodInvocation.class);
 
-		expect(log.isTraceEnabled()).andReturn(true);
-		log.trace(isA(String.class));
-		expect(methodInvocation.proceed()).andReturn(null);
-		log.trace(isA(String.class));
-
-		replay(methodInvocation);
-		replay(log);
+		Log log = mock(Log.class);
+		given(log.isTraceEnabled()).willReturn(true);
 
 		DebugInterceptor interceptor = new StubDebugInterceptor(log);
 		interceptor.invoke(methodInvocation);
 		checkCallCountTotal(interceptor);
 
-		verify(methodInvocation);
-		verify(log);
+		verify(log, times(2)).trace(anyString());
 	}
 
 	@Test
 	public void testExceptionPathStillLogsCorrectly() throws Throwable {
-		Log log = createMock(Log.class);
 
-		MethodInvocation methodInvocation = createMock(MethodInvocation.class);
+		MethodInvocation methodInvocation = mock(MethodInvocation.class);
 
-		expect(log.isTraceEnabled()).andReturn(true);
-		log.trace(isA(String.class));
 		IllegalArgumentException exception = new IllegalArgumentException();
-		expect(methodInvocation.proceed()).andThrow(exception);
-		log.trace(isA(String.class), eq(exception));
+		given(methodInvocation.proceed()).willThrow(exception);
 
-		replay(methodInvocation);
-		replay(log);
+		Log log = mock(Log.class);
+		given(log.isTraceEnabled()).willReturn(true);
 
 		DebugInterceptor interceptor = new StubDebugInterceptor(log);
 		try {
@@ -76,8 +70,8 @@ public final class DebugInterceptorTests {
 		}
 		checkCallCountTotal(interceptor);
 
-		verify(methodInvocation);
-		verify(log);
+		verify(log).trace(anyString());
+		verify(log).trace(anyString(), eq(exception));
 	}
 
 	private void checkCallCountTotal(DebugInterceptor interceptor) {
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java
index 5cc35f10ec..c36ca5ba68 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java
@@ -16,10 +16,11 @@
 
 package org.springframework.aop.interceptor;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
-
-import java.lang.reflect.Method;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.logging.Log;
@@ -48,35 +49,24 @@ public final class PerformanceMonitorInterceptorTests {
 
 	@Test
 	public void testSunnyDayPathLogsPerformanceMetricsCorrectly() throws Throwable {
-		Log log = createMock(Log.class);
-		MethodInvocation mi = createMock(MethodInvocation.class);
+		MethodInvocation mi = mock(MethodInvocation.class);
+		given(mi.getMethod()).willReturn(String.class.getMethod("toString", new Class[0]));
 
-		Method toString = String.class.getMethod("toString", new Class[0]);
-
-		expect(mi.getMethod()).andReturn(toString);
-		expect(mi.proceed()).andReturn(null);
-		log.trace(isA(String.class));
-
-		replay(mi, log);
+		Log log = mock(Log.class);
 
 		PerformanceMonitorInterceptor interceptor = new PerformanceMonitorInterceptor(true);
 		interceptor.invokeUnderTrace(mi, log);
 
-		verify(mi, log);
+		verify(log).trace(anyString());
 	}
 
 	@Test
 	public void testExceptionPathStillLogsPerformanceMetricsCorrectly() throws Throwable {
-		Log log = createMock(Log.class);
-		MethodInvocation mi = createMock(MethodInvocation.class);
+		MethodInvocation mi = mock(MethodInvocation.class);
 
-		Method toString = String.class.getMethod("toString", new Class[0]);
-
-		expect(mi.getMethod()).andReturn(toString);
-		expect(mi.proceed()).andThrow(new IllegalArgumentException());
-		log.trace(isA(String.class));
-
-		replay(mi, log);
+		given(mi.getMethod()).willReturn(String.class.getMethod("toString", new Class[0]));
+		given(mi.proceed()).willThrow(new IllegalArgumentException());
+		Log log = mock(Log.class);
 
 		PerformanceMonitorInterceptor interceptor = new PerformanceMonitorInterceptor(true);
 		try {
@@ -86,7 +76,7 @@ public final class PerformanceMonitorInterceptorTests {
 		catch (IllegalArgumentException expected) {
 		}
 
-		verify(mi, log);
+		verify(log).trace(anyString());
 	}
 
 }
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java
index 7845f1268b..6732be2f90 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java
@@ -16,8 +16,13 @@
 
 package org.springframework.aop.interceptor;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import java.lang.reflect.Method;
 
@@ -35,39 +40,27 @@ public final class SimpleTraceInterceptorTests {
 
 	@Test
 	public void testSunnyDayPathLogsCorrectly() throws Throwable {
-		Log log = createMock(Log.class);
-		MethodInvocation mi = createMock(MethodInvocation.class);
+		MethodInvocation mi = mock(MethodInvocation.class);
+		given(mi.getMethod()).willReturn(String.class.getMethod("toString", new Class[]{}));
+		given(mi.getThis()).willReturn(this);
 
-		Method toString = String.class.getMethod("toString", new Class[]{});
-
-		expect(mi.getMethod()).andReturn(toString);
-		expect(mi.getThis()).andReturn(this);
-		log.trace(isA(String.class));
-		expect(mi.proceed()).andReturn(null);
-		log.trace(isA(String.class));
-
-		replay(mi, log);
+		Log log = mock(Log.class);
 
 		SimpleTraceInterceptor interceptor = new SimpleTraceInterceptor(true);
 		interceptor.invokeUnderTrace(mi, log);
 
-		verify(mi, log);
+		verify(log, times(2)).trace(anyString());
 	}
 
+	@Test
 	public void testExceptionPathStillLogsCorrectly() throws Throwable {
-		Log log = createMock(Log.class);
-		MethodInvocation mi = createMock(MethodInvocation.class);
-
-		Method toString = String.class.getMethod("toString", new Class[]{});
-
-		expect(mi.getMethod()).andReturn(toString);
-		expect(mi.getThis()).andReturn(this);
-		log.trace(isA(String.class));
+		MethodInvocation mi = mock(MethodInvocation.class);
+		given(mi.getMethod()).willReturn(String.class.getMethod("toString", new Class[]{}));
+		given(mi.getThis()).willReturn(this);
 		IllegalArgumentException exception = new IllegalArgumentException();
-		expect(mi.proceed()).andThrow(exception);
-		log.trace(isA(String.class));
+		given(mi.proceed()).willThrow(exception);
 
-		replay(mi, log);
+		Log log = mock(Log.class);
 
 		final SimpleTraceInterceptor interceptor = new SimpleTraceInterceptor(true);
 
@@ -77,7 +70,8 @@ public final class SimpleTraceInterceptorTests {
 		} catch (IllegalArgumentException expected) {
 		}
 
-		verify(mi, log);
+		verify(log).trace(anyString());
+		verify(log).trace(anyString(), eq(exception));
 	}
 
 }
diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java
index 80f62da86b..d968e957ed 100644
--- a/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java
@@ -16,7 +16,7 @@
 
 package org.springframework.aop.scope;
 
-import static org.easymock.EasyMock.*;
+import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -52,14 +52,9 @@ public final class DefaultScopedObjectTests {
 		testBadTargetBeanName("   ");
 	}
 
-
 	private static void testBadTargetBeanName(final String badTargetBeanName) {
-		ConfigurableBeanFactory factory = createMock(ConfigurableBeanFactory.class);
-		replay(factory);
-
+		ConfigurableBeanFactory factory = mock(ConfigurableBeanFactory.class);
 		new DefaultScopedObject(factory, badTargetBeanName);
-
-		verify(factory);
 	}
 
 }
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
index 65d58d61f8..cb812d668d 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
@@ -16,8 +16,9 @@
 
 package org.springframework.aop.support;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
 
 import java.io.Serializable;
 
@@ -56,17 +57,14 @@ public final class DelegatingIntroductionInterceptorTests {
 		assertTrue(! (raw instanceof TimeStamped));
 		ProxyFactory factory = new ProxyFactory(raw);
 
-		TimeStamped ts = createMock(TimeStamped.class);
+		TimeStamped ts = mock(TimeStamped.class);
 		long timestamp = 111L;
-		expect(ts.getTimeStamp()).andReturn(timestamp);
-		replay(ts);
+		given(ts.getTimeStamp()).willReturn(timestamp);
 
 		factory.addAdvisor(0, new DefaultIntroductionAdvisor(new DelegatingIntroductionInterceptor(ts)));
 
 		TimeStamped tsp = (TimeStamped) factory.getProxy();
 		assertTrue(tsp.getTimeStamp() == timestamp);
-
-		verify(ts);
 	}
 
 	@Test
@@ -75,17 +73,14 @@ public final class DelegatingIntroductionInterceptorTests {
 		assertTrue(! (raw instanceof SubTimeStamped));
 		ProxyFactory factory = new ProxyFactory(raw);
 
-		TimeStamped ts = createMock(SubTimeStamped.class);
+		TimeStamped ts = mock(SubTimeStamped.class);
 		long timestamp = 111L;
-		expect(ts.getTimeStamp()).andReturn(timestamp);
-		replay(ts);
+		given(ts.getTimeStamp()).willReturn(timestamp);
 
 		factory.addAdvisor(0, new DefaultIntroductionAdvisor(new DelegatingIntroductionInterceptor(ts), SubTimeStamped.class));
 
 		SubTimeStamped tsp = (SubTimeStamped) factory.getProxy();
 		assertTrue(tsp.getTimeStamp() == timestamp);
-
-		verify(ts);
 	}
 
 	@Test
@@ -94,18 +89,15 @@ public final class DelegatingIntroductionInterceptorTests {
 		assertTrue(! (raw instanceof TimeStamped));
 		ProxyFactory factory = new ProxyFactory(raw);
 
-		TimeStamped ts = createMock(SubTimeStamped.class);
+		TimeStamped ts = mock(SubTimeStamped.class);
 		long timestamp = 111L;
-		expect(ts.getTimeStamp()).andReturn(timestamp);
-		replay(ts);
+		given(ts.getTimeStamp()).willReturn(timestamp);
 
 		factory.addAdvisor(0, new DefaultIntroductionAdvisor(new DelegatingIntroductionInterceptor(ts), TimeStamped.class));
 
 		TimeStamped tsp = (TimeStamped) factory.getProxy();
 		assertTrue(!(tsp instanceof SubTimeStamped));
 		assertTrue(tsp.getTimeStamp() == timestamp);
-
-		verify(ts);
 	}
 
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java
index 0e31d83c10..ba08ffe4ba 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java
@@ -16,8 +16,8 @@
 
 package org.springframework.beans.factory.config;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -45,24 +45,20 @@ public final class CustomScopeConfigurerTests {
 
 	@Test
 	public void testWithNoScopes() throws Exception {
-		Scope scope = createMock(Scope.class);
-		replay(scope);
+		Scope scope = mock(Scope.class);
 		CustomScopeConfigurer figurer = new CustomScopeConfigurer();
 		figurer.postProcessBeanFactory(factory);
-		verify(scope);
 	}
 
 	@Test
 	public void testSunnyDayWithBonaFideScopeInstance() throws Exception {
-		Scope scope = createMock(Scope.class);
-		replay(scope);
+		Scope scope = mock(Scope.class);
 		factory.registerScope(FOO_SCOPE, scope);
 		Map<String, Object> scopes = new HashMap<String, Object>();
 		scopes.put(FOO_SCOPE, scope);
 		CustomScopeConfigurer figurer = new CustomScopeConfigurer();
 		figurer.setScopes(scopes);
 		figurer.postProcessBeanFactory(factory);
-		verify(scope);
 	}
 
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
index e02b77f2a1..88a6f09ef9 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
@@ -19,9 +19,11 @@ package org.springframework.beans.factory.config;
 import java.util.Date;
 import javax.inject.Provider;
 
-import static org.easymock.EasyMock.*;
 import org.junit.After;
 import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
 import org.junit.Before;
 import org.junit.Test;
 import static test.util.TestResourceUtils.*;
@@ -105,9 +107,8 @@ public class ObjectFactoryCreatingFactoryBeanTests {
 		final String targetBeanName = "singleton";
 		final String expectedSingleton = "Alicia Keys";
 
-		BeanFactory beanFactory = createMock(BeanFactory.class);
-		expect(beanFactory.getBean(targetBeanName)).andReturn(expectedSingleton);
-		replay(beanFactory);
+		BeanFactory beanFactory = mock(BeanFactory.class);
+		given(beanFactory.getBean(targetBeanName)).willReturn(expectedSingleton);
 
 		ObjectFactoryCreatingFactoryBean factory = new ObjectFactoryCreatingFactoryBean();
 		factory.setTargetBeanName(targetBeanName);
@@ -116,8 +117,6 @@ public class ObjectFactoryCreatingFactoryBeanTests {
 		ObjectFactory<?> objectFactory = factory.getObject();
 		Object actualSingleton = objectFactory.getObject();
 		assertSame(expectedSingleton, actualSingleton);
-
-		verify(beanFactory);
 	}
 
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
index 115f618a00..44e6abf05e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
@@ -16,8 +16,8 @@
 
 package org.springframework.beans.factory.config;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition;
 
 import org.junit.Before;
@@ -269,17 +269,13 @@ public final class ServiceLocatorFactoryBeanTests {
 
 	@Test
 	public void testRequiresListableBeanFactoryAndChokesOnAnythingElse() throws Exception {
-		final BeanFactory beanFactory = createMock(BeanFactory.class);
-		replay(beanFactory);
-
+		BeanFactory beanFactory = mock(BeanFactory.class);
 		try {
 			ServiceLocatorFactoryBean factory = new ServiceLocatorFactoryBean();
 			factory.setBeanFactory(beanFactory);
 		} catch (FatalBeanException ex) {
 			// expected
 		}
-
-		verify(beanFactory);
 	}
 
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java
index 3ebe8ec705..8907294f72 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java
@@ -16,7 +16,10 @@
 
 package org.springframework.beans.factory.parsing;
 
-import static org.easymock.EasyMock.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import org.apache.commons.logging.Log;
 import org.junit.Test;
@@ -41,15 +44,13 @@ public final class FailFastProblemReporterTests {
 		Problem problem = new Problem("VGER", new Location(new DescriptiveResource("here")),
 				null, new IllegalArgumentException());
 
-		Log log = createMock(Log.class);
-		log.warn(anyObject(), isA(IllegalArgumentException.class));
-		replay(log);
+		Log log = mock(Log.class);
 
 		FailFastProblemReporter reporter = new FailFastProblemReporter();
 		reporter.setLogger(log);
 		reporter.warning(problem);
 
-		verify(log);
+		verify(log).warn(any(), isA(IllegalArgumentException.class));
 	}
 
 }
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 9a4612382e..2849614541 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
@@ -30,8 +30,9 @@ import java.util.Set;
 
 import static org.junit.Assert.*;
 
-import org.easymock.EasyMock;
 import org.junit.Test;
+import org.mockito.Mockito;
+
 import test.beans.GenericBean;
 import test.beans.GenericIntegerBean;
 import test.beans.GenericSetOfIntegerBean;
@@ -626,10 +627,10 @@ public class BeanFactoryGenericsTests {
 
 	/**
 	 * Tests support for parameterized {@code factory-method} declarations such
-	 * as EasyMock's {@code createMock()} method which has the following signature.
+	 * as Mockito {@code mock()} method which has the following signature.
 	 *
 	 * <pre>{@code
-	 * public static <T> T createMock(Class<T> toMock)
+	 * public static <T> T mock(Class<T> classToMock)
 	 * }</pre>
 	 *
 	 * See SPR-9493
@@ -637,12 +638,12 @@ public class BeanFactoryGenericsTests {
 	 */
 	@Test
 	public void parameterizedFactoryMethod() {
-		RootBeanDefinition rbd = new RootBeanDefinition(EasyMock.class);
-		rbd.setFactoryMethodName("createMock");
+		RootBeanDefinition rbd = new RootBeanDefinition(Mockito.class);
+		rbd.setFactoryMethodName("mock");
 		rbd.getConstructorArgumentValues().addGenericArgumentValue(Runnable.class);
 
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
-		bf.registerBeanDefinition("easyMock", rbd);
+		bf.registerBeanDefinition("mock", rbd);
 
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
 		assertEquals(1, beans.size());
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
index 2a72cde701..1567bad02f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
@@ -16,8 +16,10 @@
 
 package org.springframework.beans.factory.wiring;
 
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import junit.framework.TestCase;
-import org.easymock.MockControl;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -32,31 +34,24 @@ import test.beans.TestBean;
 public class BeanConfigurerSupportTests extends TestCase {
 
 	public void testSupplyIncompatibleBeanFactoryImplementation() throws Exception {
-		MockControl mock = MockControl.createControl(BeanFactory.class);
-		mock.replay();
 		try {
-			new StubBeanConfigurerSupport().setBeanFactory((BeanFactory) mock.getMock());
+			new StubBeanConfigurerSupport().setBeanFactory(mock(BeanFactory.class));
 			fail("Must have thrown an IllegalArgumentException by this point (incompatible BeanFactory implementation supplied)");
 		}
 		catch (IllegalArgumentException expected) {
 		}
-		mock.verify();
 	}
 
 	public void testConfigureBeanDoesNothingIfBeanWiringInfoResolverResolvesToNull() throws Exception {
 		TestBean beanInstance = new TestBean();
 
-		MockControl mock = MockControl.createControl(BeanWiringInfoResolver.class);
-		BeanWiringInfoResolver resolver = (BeanWiringInfoResolver) mock.getMock();
-		resolver.resolveWiringInfo(beanInstance);
-		mock.setReturnValue(null);
-		mock.replay();
+		BeanWiringInfoResolver resolver = mock(BeanWiringInfoResolver.class);
 
 		BeanConfigurerSupport configurer = new StubBeanConfigurerSupport();
 		configurer.setBeanWiringInfoResolver(resolver);
 		configurer.setBeanFactory(new DefaultListableBeanFactory());
 		configurer.configureBean(beanInstance);
-		mock.verify();
+		verify(resolver).resolveWiringInfo(beanInstance);
 		assertNull(beanInstance.getName());
 	}
 
@@ -91,19 +86,14 @@ public class BeanConfigurerSupportTests extends TestCase {
 		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
 		factory.registerBeanDefinition("spouse", builder.getBeanDefinition());
 
-		MockControl mock = MockControl.createControl(BeanWiringInfoResolver.class);
-		BeanWiringInfoResolver resolver = (BeanWiringInfoResolver) mock.getMock();
-		resolver.resolveWiringInfo(beanInstance);
-		mock.setReturnValue(new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_NAME, false));
-		mock.replay();
+		BeanWiringInfoResolver resolver = mock(BeanWiringInfoResolver.class);
+		given(resolver.resolveWiringInfo(beanInstance)).willReturn(new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_NAME, false));
 
 		BeanConfigurerSupport configurer = new StubBeanConfigurerSupport();
 		configurer.setBeanFactory(factory);
 		configurer.setBeanWiringInfoResolver(resolver);
 		configurer.configureBean(beanInstance);
 		assertEquals("Bean is evidently not being configured (for some reason)", "David Gavurin", beanInstance.getSpouse().getName());
-
-		mock.verify();
 	}
 
 	public void testConfigureBeanPerformsAutowiringByTypeIfAppropriateBeanWiringInfoResolverIsPluggedIn() throws Exception {
@@ -115,19 +105,14 @@ public class BeanConfigurerSupportTests extends TestCase {
 		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
 		factory.registerBeanDefinition("Mmm, I fancy a salad!", builder.getBeanDefinition());
 
-		MockControl mock = MockControl.createControl(BeanWiringInfoResolver.class);
-		BeanWiringInfoResolver resolver = (BeanWiringInfoResolver) mock.getMock();
-		resolver.resolveWiringInfo(beanInstance);
-		mock.setReturnValue(new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_TYPE, false));
-		mock.replay();
+		BeanWiringInfoResolver resolver = mock(BeanWiringInfoResolver.class);
+		given(resolver.resolveWiringInfo(beanInstance)).willReturn(new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_TYPE, false));
 
 		BeanConfigurerSupport configurer = new StubBeanConfigurerSupport();
 		configurer.setBeanFactory(factory);
 		configurer.setBeanWiringInfoResolver(resolver);
 		configurer.configureBean(beanInstance);
 		assertEquals("Bean is evidently not being configured (for some reason)", "David Gavurin", beanInstance.getSpouse().getName());
-
-		mock.verify();
 	}
 
 
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
index 3d78535c8b..855bf68692 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
@@ -21,6 +21,9 @@ 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 static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -30,7 +33,6 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
-import org.easymock.MockControl;
 import org.junit.Test;
 import org.quartz.CronTrigger;
 import org.quartz.Job;
@@ -127,31 +129,10 @@ public class QuartzSupportTests {
 		trigger1.setRepeatInterval(20);
 		trigger1.afterPropertiesSet();
 
-		MockControl schedulerControl = MockControl.createControl(Scheduler.class);
-		final Scheduler scheduler = (Scheduler) schedulerControl.getMock();
-		scheduler.getContext();
-		schedulerControl.setReturnValue(new SchedulerContext());
-		scheduler.getJobDetail("myJob0", Scheduler.DEFAULT_GROUP);
-		schedulerControl.setReturnValue(null);
-		scheduler.getJobDetail("myJob1", Scheduler.DEFAULT_GROUP);
-		schedulerControl.setReturnValue(null);
-		scheduler.getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP);
-		schedulerControl.setReturnValue(null);
-		scheduler.getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP);
-		schedulerControl.setReturnValue(null);
-		scheduler.addJob(jobDetail0, true);
-		schedulerControl.setVoidCallable();
-		scheduler.scheduleJob(trigger0);
-		schedulerControl.setReturnValue(new Date());
-		scheduler.addJob(jobDetail1, true);
-		schedulerControl.setVoidCallable();
-		scheduler.scheduleJob(trigger1);
-		schedulerControl.setReturnValue(new Date());
-		scheduler.start();
-		schedulerControl.setVoidCallable();
-		scheduler.shutdown(false);
-		schedulerControl.setVoidCallable();
-		schedulerControl.replay();
+		final Scheduler scheduler = mock(Scheduler.class);
+		given(scheduler.getContext()).willReturn(new SchedulerContext());
+		given(scheduler.scheduleJob(trigger0)).willReturn(new Date());
+		given(scheduler.scheduleJob(trigger1)).willReturn(new Date());
 
 		SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() {
 			@Override
@@ -175,7 +156,14 @@ public class QuartzSupportTests {
 			schedulerFactoryBean.destroy();
 		}
 
-		schedulerControl.verify();
+		verify(scheduler).getJobDetail("myJob0", Scheduler.DEFAULT_GROUP);
+		verify(scheduler).getJobDetail("myJob1", Scheduler.DEFAULT_GROUP);
+		verify(scheduler).getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP);
+		verify(scheduler).getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP);
+		verify(scheduler).addJob(jobDetail0, true);
+		verify(scheduler).addJob(jobDetail1, true);
+		verify(scheduler).start();
+		verify(scheduler).shutdown(false);
 	}
 
 	@Test
@@ -220,33 +208,11 @@ public class QuartzSupportTests {
 		trigger1.setRepeatInterval(20);
 		trigger1.afterPropertiesSet();
 
-		MockControl schedulerControl = MockControl.createControl(Scheduler.class);
-		final Scheduler scheduler = (Scheduler) schedulerControl.getMock();
-		scheduler.getContext();
-		schedulerControl.setReturnValue(new SchedulerContext());
-		scheduler.getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP);
-		schedulerControl.setReturnValue(null);
-		scheduler.getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP);
-		schedulerControl.setReturnValue(new SimpleTrigger());
-		if (overwrite) {
-			scheduler.addJob(jobDetail1, true);
-			schedulerControl.setVoidCallable();
-			scheduler.rescheduleJob("myTrigger1", Scheduler.DEFAULT_GROUP, trigger1);
-			schedulerControl.setReturnValue(new Date());
-		}
-		else {
-			scheduler.getJobDetail("myJob0", Scheduler.DEFAULT_GROUP);
-			schedulerControl.setReturnValue(null);
-		}
-		scheduler.addJob(jobDetail0, true);
-		schedulerControl.setVoidCallable();
-		scheduler.scheduleJob(trigger0);
-		schedulerControl.setReturnValue(new Date());
-		scheduler.start();
-		schedulerControl.setVoidCallable();
-		scheduler.shutdown(false);
-		schedulerControl.setVoidCallable();
-		schedulerControl.replay();
+		final Scheduler scheduler = mock(Scheduler.class);
+		given(scheduler.getContext()).willReturn(new SchedulerContext());
+		given(scheduler.rescheduleJob("myTrigger1", Scheduler.DEFAULT_GROUP, trigger1)).willReturn(new Date());
+		given(scheduler.getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP)).willReturn(new SimpleTrigger());
+		given(scheduler.scheduleJob(trigger0)).willReturn(new Date());
 
 		SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() {
 			@Override
@@ -270,7 +236,18 @@ public class QuartzSupportTests {
 			schedulerFactoryBean.destroy();
 		}
 
-		schedulerControl.verify();
+		verify(scheduler).getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP);
+		verify(scheduler).getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP);
+		if (overwrite) {
+			verify(scheduler).addJob(jobDetail1, true);
+			verify(scheduler).rescheduleJob("myTrigger1", Scheduler.DEFAULT_GROUP, trigger1);
+		}
+		else {
+			verify(scheduler).getJobDetail("myJob0", Scheduler.DEFAULT_GROUP);
+		}
+		verify(scheduler).addJob(jobDetail0, true);
+		verify(scheduler).start();
+		verify(scheduler).shutdown(false);
 	}
 
 	@Test
@@ -315,37 +292,16 @@ public class QuartzSupportTests {
 		trigger1.setRepeatInterval(20);
 		trigger1.afterPropertiesSet();
 
-		MockControl schedulerControl = MockControl.createControl(Scheduler.class);
-		final Scheduler scheduler = (Scheduler) schedulerControl.getMock();
-		scheduler.getContext();
-		schedulerControl.setReturnValue(new SchedulerContext());
-		scheduler.getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP);
-		schedulerControl.setReturnValue(null);
-		scheduler.getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP);
-		schedulerControl.setReturnValue(new SimpleTrigger());
+		final Scheduler scheduler = mock(Scheduler.class);
+		given(scheduler.getContext()).willReturn(new SchedulerContext());
+		given(scheduler.getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP)).willReturn(new SimpleTrigger());
 		if (overwrite) {
-			scheduler.addJob(jobDetail1, true);
-			schedulerControl.setVoidCallable();
-			scheduler.rescheduleJob("myTrigger1", Scheduler.DEFAULT_GROUP, trigger1);
-			schedulerControl.setReturnValue(new Date());
+			given(scheduler.rescheduleJob("myTrigger1", Scheduler.DEFAULT_GROUP, trigger1)).willReturn(new Date());
 		}
-		else {
-			scheduler.getJobDetail("myJob0", Scheduler.DEFAULT_GROUP);
-			schedulerControl.setReturnValue(null);
-		}
-		scheduler.addJob(jobDetail0, true);
-		schedulerControl.setVoidCallable();
-		scheduler.scheduleJob(trigger0);
-		schedulerControl.setThrowable(new ObjectAlreadyExistsException(""));
+		given(scheduler.scheduleJob(trigger0)).willThrow(new ObjectAlreadyExistsException(""));
 		if (overwrite) {
-			scheduler.rescheduleJob("myTrigger0", Scheduler.DEFAULT_GROUP, trigger0);
-			schedulerControl.setReturnValue(new Date());
+			given(scheduler.rescheduleJob("myTrigger0", Scheduler.DEFAULT_GROUP, trigger0)).willReturn(new Date());
 		}
-		scheduler.start();
-		schedulerControl.setVoidCallable();
-		scheduler.shutdown(false);
-		schedulerControl.setVoidCallable();
-		schedulerControl.replay();
 
 		SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() {
 			@Override
@@ -369,15 +325,25 @@ public class QuartzSupportTests {
 			schedulerFactoryBean.destroy();
 		}
 
-		schedulerControl.verify();
+		verify(scheduler).getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP);
+		verify(scheduler).getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP);
+		if (overwrite) {
+			verify(scheduler).addJob(jobDetail1, true);
+			verify(scheduler).rescheduleJob("myTrigger1", Scheduler.DEFAULT_GROUP, trigger1);
+		}
+		else {
+			verify(scheduler).getJobDetail("myJob0", Scheduler.DEFAULT_GROUP);
+		}
+		verify(scheduler).addJob(jobDetail0, true);
+		verify(scheduler).start();
+		verify(scheduler).shutdown(false);
 	}
 
 	@Test
 	public void testSchedulerFactoryBeanWithListeners() throws Exception {
 		JobFactory jobFactory = new AdaptableJobFactory();
 
-		MockControl schedulerControl = MockControl.createControl(Scheduler.class);
-		final Scheduler scheduler = (Scheduler) schedulerControl.getMock();
+		final Scheduler scheduler = mock(Scheduler.class);
 
 		SchedulerListener schedulerListener = new TestSchedulerListener();
 		JobListener globalJobListener = new TestJobListener();
@@ -385,24 +351,6 @@ public class QuartzSupportTests {
 		TriggerListener globalTriggerListener = new TestTriggerListener();
 		TriggerListener triggerListener = new TestTriggerListener();
 
-		scheduler.setJobFactory(jobFactory);
-		schedulerControl.setVoidCallable();
-		scheduler.addSchedulerListener(schedulerListener);
-		schedulerControl.setVoidCallable();
-		scheduler.addGlobalJobListener(globalJobListener);
-		schedulerControl.setVoidCallable();
-		scheduler.addJobListener(jobListener);
-		schedulerControl.setVoidCallable();
-		scheduler.addGlobalTriggerListener(globalTriggerListener);
-		schedulerControl.setVoidCallable();
-		scheduler.addTriggerListener(triggerListener);
-		schedulerControl.setVoidCallable();
-		scheduler.start();
-		schedulerControl.setVoidCallable();
-		scheduler.shutdown(false);
-		schedulerControl.setVoidCallable();
-		schedulerControl.replay();
-
 		SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() {
 			@Override
 			protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) {
@@ -423,7 +371,14 @@ public class QuartzSupportTests {
 			schedulerFactoryBean.destroy();
 		}
 
-		schedulerControl.verify();
+		verify(scheduler).setJobFactory(jobFactory);
+		verify(scheduler).addSchedulerListener(schedulerListener);
+		verify(scheduler).addGlobalJobListener(globalJobListener);
+		verify(scheduler).addJobListener(jobListener);
+		verify(scheduler).addGlobalTriggerListener(globalTriggerListener);
+		verify(scheduler).addTriggerListener(triggerListener);
+		verify(scheduler).start();
+		verify(scheduler).shutdown(false);
 	}
 
 	/*public void testMethodInvocationWithConcurrency() throws Exception {
@@ -547,31 +502,9 @@ public class QuartzSupportTests {
 		trigger1.setRepeatCount(SimpleTrigger.REPEAT_INDEFINITELY);
 		trigger1.setRepeatInterval(20);
 
-		MockControl schedulerControl = MockControl.createControl(Scheduler.class);
-		final Scheduler scheduler = (Scheduler) schedulerControl.getMock();
-		scheduler.setJobFactory(jobFactory);
-		schedulerControl.setVoidCallable();
-		scheduler.getJobDetail("myJob0", Scheduler.DEFAULT_GROUP);
-		schedulerControl.setReturnValue(null);
-		scheduler.getJobDetail("myJob1", Scheduler.DEFAULT_GROUP);
-		schedulerControl.setReturnValue(null);
-		scheduler.getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP);
-		schedulerControl.setReturnValue(null);
-		scheduler.getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP);
-		schedulerControl.setReturnValue(null);
-		scheduler.addJob(jobDetail0, true);
-		schedulerControl.setVoidCallable();
-		scheduler.addJob(jobDetail1, true);
-		schedulerControl.setVoidCallable();
-		scheduler.scheduleJob(trigger0);
-		schedulerControl.setReturnValue(new Date());
-		scheduler.scheduleJob(trigger1);
-		schedulerControl.setReturnValue(new Date());
-		scheduler.start();
-		schedulerControl.setVoidCallable();
-		scheduler.shutdown(false);
-		schedulerControl.setVoidCallable();
-		schedulerControl.replay();
+		final Scheduler scheduler = mock(Scheduler.class);
+		given(scheduler.scheduleJob(trigger0)).willReturn(new Date());
+		given(scheduler.scheduleJob(trigger1)).willReturn(new Date());
 
 		SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() {
 			@Override
@@ -590,7 +523,17 @@ public class QuartzSupportTests {
 			schedulerFactoryBean.destroy();
 		}
 
-		schedulerControl.verify();
+		verify(scheduler).setJobFactory(jobFactory);
+		verify(scheduler).getJobDetail("myJob0", Scheduler.DEFAULT_GROUP);
+		verify(scheduler).getJobDetail("myJob1", Scheduler.DEFAULT_GROUP);
+		verify(scheduler).getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP);
+		verify(scheduler).getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP);
+		verify(scheduler).addJob(jobDetail0, true);
+		verify(scheduler).addJob(jobDetail1, true);
+		verify(scheduler).scheduleJob(trigger0);
+		verify(scheduler).scheduleJob(trigger1);
+		verify(scheduler).start();
+		verify(scheduler).shutdown(false);
 	}
 
 	@Test
@@ -598,16 +541,9 @@ public class QuartzSupportTests {
 		TestBean tb = new TestBean("tb", 99);
 		StaticApplicationContext ac = new StaticApplicationContext();
 
-		MockControl schedulerControl = MockControl.createControl(Scheduler.class);
-		final Scheduler scheduler = (Scheduler) schedulerControl.getMock();
+		final Scheduler scheduler = mock(Scheduler.class);
 		SchedulerContext schedulerContext = new SchedulerContext();
-		scheduler.getContext();
-		schedulerControl.setReturnValue(schedulerContext, 4);
-		scheduler.start();
-		schedulerControl.setVoidCallable();
-		scheduler.shutdown(false);
-		schedulerControl.setVoidCallable();
-		schedulerControl.replay();
+		given(scheduler.getContext()).willReturn(schedulerContext);
 
 		SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() {
 			@Override
@@ -632,7 +568,8 @@ public class QuartzSupportTests {
 			schedulerFactoryBean.destroy();
 		}
 
-		schedulerControl.verify();
+		verify(scheduler).start();
+		verify(scheduler).shutdown(false);
 	}
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
index 2bf712344e..a241920c66 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
@@ -16,8 +16,9 @@
 
 package org.springframework.aop.aspectj;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -55,56 +56,44 @@ public final class AfterAdviceBindingTests {
 		// we need the real target too, not just the proxy...
 		testBeanTarget = (TestBean) ((Advised) testBeanProxy).getTargetSource().getTarget();
 
-		mockCollaborator = createNiceMock(AdviceBindingCollaborator.class);
+		mockCollaborator = mock(AdviceBindingCollaborator.class);
 		afterAdviceAspect.setCollaborator(mockCollaborator);
 	}
 
 	@Test
 	public void testOneIntArg() {
-		mockCollaborator.oneIntArg(5);
-		replay(mockCollaborator);
 		testBeanProxy.setAge(5);
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneIntArg(5);
 	}
 
 	@Test
 	public void testOneObjectArgBindingProxyWithThis() {
-		mockCollaborator.oneObjectArg(this.testBeanProxy);
-		replay(mockCollaborator);
 		testBeanProxy.getAge();
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneObjectArg(this.testBeanProxy);
 	}
 
 	@Test
 	public void testOneObjectArgBindingTarget() {
-		mockCollaborator.oneObjectArg(this.testBeanTarget);
-		replay(mockCollaborator);
 		testBeanProxy.getDoctor();
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneObjectArg(this.testBeanTarget);
 	}
 
 	@Test
 	public void testOneIntAndOneObjectArgs() {
-		mockCollaborator.oneIntAndOneObject(5,this.testBeanProxy);
-		replay(mockCollaborator);
 		testBeanProxy.setAge(5);
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneIntAndOneObject(5,this.testBeanProxy);
 	}
 
 	@Test
 	public void testNeedsJoinPoint() {
-		mockCollaborator.needsJoinPoint("getAge");
-		replay(mockCollaborator);
 		testBeanProxy.getAge();
-		verify(mockCollaborator);
+		verify(mockCollaborator).needsJoinPoint("getAge");
 	}
 
 	@Test
 	public void testNeedsJoinPointStaticPart() {
-		mockCollaborator.needsJoinPointStaticPart("getAge");
-		replay(mockCollaborator);
 		testBeanProxy.getAge();
-		verify(mockCollaborator);
+		verify(mockCollaborator).needsJoinPointStaticPart("getAge");
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
index 2c8e8a714b..e85b6cd311 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
@@ -16,8 +16,10 @@
 
 package org.springframework.aop.aspectj;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -58,7 +60,7 @@ public final class AfterReturningAdviceBindingTests {
 
 		afterAdviceAspect = (AfterReturningAdviceBindingTestAspect) ctx.getBean("testAspect");
 
-		mockCollaborator = createNiceMock(AfterReturningAdviceBindingCollaborator.class);
+		mockCollaborator = mock(AfterReturningAdviceBindingCollaborator.class);
 		afterAdviceAspect.setCollaborator(mockCollaborator);
 
 		testBeanProxy = (ITestBean) ctx.getBean("testBean");
@@ -71,106 +73,79 @@ public final class AfterReturningAdviceBindingTests {
 
 	@Test
 	public void testOneIntArg() {
-		mockCollaborator.oneIntArg(5);
-		replay(mockCollaborator);
 		testBeanProxy.setAge(5);
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneIntArg(5);
 	}
 
 	@Test
 	public void testOneObjectArg() {
-		mockCollaborator.oneObjectArg(this.testBeanProxy);
-		replay(mockCollaborator);
 		testBeanProxy.getAge();
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneObjectArg(this.testBeanProxy);
 	}
 
 	@Test
 	public void testOneIntAndOneObjectArgs() {
-		mockCollaborator.oneIntAndOneObject(5,this.testBeanProxy);
-		replay(mockCollaborator);
 		testBeanProxy.setAge(5);
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneIntAndOneObject(5,this.testBeanProxy);
 	}
 
 	@Test
 	public void testNeedsJoinPoint() {
-		mockCollaborator.needsJoinPoint("getAge");
-		replay(mockCollaborator);
 		testBeanProxy.getAge();
-		verify(mockCollaborator);
+		verify(mockCollaborator).needsJoinPoint("getAge");
 	}
 
 	@Test
 	public void testNeedsJoinPointStaticPart() {
-		mockCollaborator.needsJoinPointStaticPart("getAge");
-		replay(mockCollaborator);
 		testBeanProxy.getAge();
-		verify(mockCollaborator);
+		verify(mockCollaborator).needsJoinPointStaticPart("getAge");
 	}
 
 	@Test
 	public void testReturningString() {
-		mockCollaborator.oneString("adrian");
-		replay(mockCollaborator);
 		testBeanProxy.setName("adrian");
 		testBeanProxy.getName();
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneString("adrian");
 	}
 
 	@Test
 	public void testReturningObject() {
-		mockCollaborator.oneObjectArg(this.testBeanTarget);
-		replay(mockCollaborator);
 		testBeanProxy.returnsThis();
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneObjectArg(this.testBeanTarget);
 	}
 
 	@Test
 	public void testReturningBean() {
-		mockCollaborator.oneTestBeanArg(this.testBeanTarget);
-		replay(mockCollaborator);
 		testBeanProxy.returnsThis();
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneTestBeanArg(this.testBeanTarget);
 	}
 
 	@Test
 	public void testReturningBeanArray() {
 		this.testBeanTarget.setSpouse(new TestBean());
 		ITestBean[] spouses = this.testBeanTarget.getSpouses();
-		mockCollaborator.testBeanArrayArg(spouses);
-		replay(mockCollaborator);
 		testBeanProxy.getSpouses();
-		verify(mockCollaborator);
+		verify(mockCollaborator).testBeanArrayArg(spouses);
 	}
 
 	@Test
 	public void testNoInvokeWhenReturningParameterTypeDoesNotMatch() {
-		// we need a strict mock for this...
-		mockCollaborator = createMock(AfterReturningAdviceBindingCollaborator.class);
-		afterAdviceAspect.setCollaborator(mockCollaborator);
-
-		replay(mockCollaborator);
 		testBeanProxy.setSpouse(this.testBeanProxy);
 		testBeanProxy.getSpouse();
-		verify(mockCollaborator);
+		verifyZeroInteractions(mockCollaborator);
 	}
 
 	@Test
 	public void testReturningByType() {
-		mockCollaborator.objectMatchNoArgs();
-		replay(mockCollaborator);
 		testBeanProxy.returnsThis();
-		verify(mockCollaborator);
+		verify(mockCollaborator).objectMatchNoArgs();
 	}
 
 	@Test
 	public void testReturningPrimitive() {
-		mockCollaborator.oneInt(20);
-		replay(mockCollaborator);
 		testBeanProxy.setAge(20);
 		testBeanProxy.haveBirthday();
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneInt(20);
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
index 0424250ca5..dc32a581db 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
@@ -16,9 +16,9 @@
 
 package org.springframework.aop.aspectj;
 
-import static org.easymock.EasyMock.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.aspectj.AfterThrowingAdviceBindingTestAspect.AfterThrowingAdviceBindingCollaborator;
@@ -47,65 +47,49 @@ public final class AfterThrowingAdviceBindingTests {
 		testBean = (ITestBean) ctx.getBean("testBean");
 		afterThrowingAdviceAspect = (AfterThrowingAdviceBindingTestAspect) ctx.getBean("testAspect");
 
-		mockCollaborator = createNiceMock(AfterThrowingAdviceBindingCollaborator.class);
+		mockCollaborator = mock(AfterThrowingAdviceBindingCollaborator.class);
 		afterThrowingAdviceAspect.setCollaborator(mockCollaborator);
 	}
 
-	@After
-	public void tearDown() {
-		verify(mockCollaborator);
-	}
-
 	@Test(expected=Throwable.class)
 	public void testSimpleAfterThrowing() throws Throwable {
-		mockCollaborator.noArgs();
-		replay(mockCollaborator);
 		this.testBean.exceptional(new Throwable());
+		verify(mockCollaborator).noArgs();
 	}
 
 	@Test(expected=Throwable.class)
 	public void testAfterThrowingWithBinding() throws Throwable {
 		Throwable t = new Throwable();
-		mockCollaborator.oneThrowable(t);
-		replay(mockCollaborator);
 		this.testBean.exceptional(t);
+		verify(mockCollaborator).oneThrowable(t);
 	}
 
 	@Test(expected=Throwable.class)
 	public void testAfterThrowingWithNamedTypeRestriction() throws Throwable {
 		Throwable t = new Throwable();
-		// need a strict mock for this test...
-		mockCollaborator = createMock(AfterThrowingAdviceBindingCollaborator.class);
-		afterThrowingAdviceAspect.setCollaborator(mockCollaborator);
-
-		mockCollaborator.noArgs();
-		mockCollaborator.oneThrowable(t);
-		mockCollaborator.noArgsOnThrowableMatch();
-		replay(mockCollaborator);
 		this.testBean.exceptional(t);
+		verify(mockCollaborator).noArgs();
+		verify(mockCollaborator).oneThrowable(t);
+		verify(mockCollaborator).noArgsOnThrowableMatch();
 	}
 
 	@Test(expected=Throwable.class)
 	public void testAfterThrowingWithRuntimeExceptionBinding() throws Throwable {
 		RuntimeException ex = new RuntimeException();
-		mockCollaborator.oneRuntimeException(ex);
-		replay(mockCollaborator);
 		this.testBean.exceptional(ex);
+		verify(mockCollaborator).oneRuntimeException(ex);
 	}
 
 	@Test(expected=Throwable.class)
 	public void testAfterThrowingWithTypeSpecified() throws Throwable {
-		mockCollaborator.noArgsOnThrowableMatch();
-		replay(mockCollaborator);
 		this.testBean.exceptional(new Throwable());
+		verify(mockCollaborator).noArgsOnThrowableMatch();
 	}
 
 	@Test(expected=Throwable.class)
 	public void testAfterThrowingWithRuntimeTypeSpecified() throws Throwable {
-		mockCollaborator.noArgsOnRuntimeExceptionMatch();
-		replay(mockCollaborator);
 		this.testBean.exceptional(new RuntimeException());
-		verify(mockCollaborator);
+		verify(mockCollaborator).noArgsOnRuntimeExceptionMatch();
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
index 05b171f6bb..913d173a55 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
@@ -16,8 +16,9 @@
 
 package org.springframework.aop.aspectj;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.junit.Before;
@@ -60,40 +61,32 @@ public class AroundAdviceBindingTests {
 
 		this.testBeanTarget = (TestBean) ((Advised) testBeanProxy).getTargetSource().getTarget();
 
-		mockCollaborator = createNiceMock(AroundAdviceBindingCollaborator.class);
+		mockCollaborator = mock(AroundAdviceBindingCollaborator.class);
 		aroundAdviceAspect.setCollaborator(mockCollaborator);
 	}
 
 	@Test
 	public void testOneIntArg() {
-		mockCollaborator.oneIntArg(5);
-		replay(mockCollaborator);
 		testBeanProxy.setAge(5);
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneIntArg(5);
 	}
 
 	@Test
 	public void testOneObjectArgBoundToTarget() {
-		mockCollaborator.oneObjectArg(this.testBeanTarget);
-		replay(mockCollaborator);
 		testBeanProxy.getAge();
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneObjectArg(this.testBeanTarget);;
 	}
 
 	@Test
 	public void testOneIntAndOneObjectArgs() {
-		mockCollaborator.oneIntAndOneObject(5, this.testBeanProxy);
-		replay(mockCollaborator);
 		testBeanProxy.setAge(5);
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneIntAndOneObject(5, this.testBeanProxy);;
 	}
 
 	@Test
 	public void testJustJoinPoint() {
-		mockCollaborator.justJoinPoint("getAge");
-		replay(mockCollaborator);
 		testBeanProxy.getAge();
-		verify(mockCollaborator);
+		verify(mockCollaborator).justJoinPoint("getAge");;
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
index a1f2fe9736..08250b6ff3 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
@@ -16,8 +16,9 @@
 
 package org.springframework.aop.aspectj;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -60,49 +61,39 @@ public final class BeforeAdviceBindingTests {
 
 		AdviceBindingTestAspect beforeAdviceAspect = (AdviceBindingTestAspect) ctx.getBean("testAspect");
 
-		mockCollaborator = createNiceMock(AdviceBindingCollaborator.class);
+		mockCollaborator = mock(AdviceBindingCollaborator.class);
 		beforeAdviceAspect.setCollaborator(mockCollaborator);
 	}
 
 
 	@Test
 	public void testOneIntArg() {
-		mockCollaborator.oneIntArg(5);
-		replay(mockCollaborator);
 		testBeanProxy.setAge(5);
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneIntArg(5);
 	}
 
 	@Test
 	public void testOneObjectArgBoundToProxyUsingThis() {
-		mockCollaborator.oneObjectArg(this.testBeanProxy);
-		replay(mockCollaborator);
 		testBeanProxy.getAge();
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneObjectArg(this.testBeanProxy);
 	}
 
 	@Test
 	public void testOneIntAndOneObjectArgs() {
-		mockCollaborator.oneIntAndOneObject(5,this.testBeanTarget);
-		replay(mockCollaborator);
 		testBeanProxy.setAge(5);
-		verify(mockCollaborator);
+		verify(mockCollaborator).oneIntAndOneObject(5,this.testBeanTarget);
 	}
 
 	@Test
 	public void testNeedsJoinPoint() {
-		mockCollaborator.needsJoinPoint("getAge");
-		replay(mockCollaborator);
 		testBeanProxy.getAge();
-		verify(mockCollaborator);
+		verify(mockCollaborator).needsJoinPoint("getAge");
 	}
 
 	@Test
 	public void testNeedsJoinPointStaticPart() {
-		mockCollaborator.needsJoinPointStaticPart("getAge");
-		replay(mockCollaborator);
 		testBeanProxy.getAge();
-		verify(mockCollaborator);
+		verify(mockCollaborator).needsJoinPointStaticPart("getAge");
 	}
 
 
diff --git a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
index e06876b430..60ec4288f6 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
@@ -16,14 +16,17 @@
 
 package org.springframework.aop.config;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.lang.reflect.Method;
 
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-
 import org.springframework.beans.factory.BeanFactory;
 
 /**
@@ -39,40 +42,27 @@ public final class MethodLocatingFactoryBeanTests {
 	@Before
 	public void setUp() {
 		factory = new MethodLocatingFactoryBean();
-
-		// methods must set up expectations and call replay() manually for this mock
-		beanFactory = createMock(BeanFactory.class);
-	}
-
-	@After
-	public void tearDown() {
-		verify(beanFactory);
+		beanFactory = mock(BeanFactory.class);
 	}
 
 	@Test
 	public void testIsSingleton() {
-		replay(beanFactory);
 		assertTrue(factory.isSingleton());
 	}
 
 	@Test
 	public void testGetObjectType() {
-		replay(beanFactory);
 		assertEquals(Method.class, factory.getObjectType());
 	}
 
 	@Test(expected=IllegalArgumentException.class)
 	public void testWithNullTargetBeanName() {
-		replay(beanFactory);
-
 		factory.setMethodName("toString()");
 		factory.setBeanFactory(beanFactory);
 	}
 
 	@Test(expected=IllegalArgumentException.class)
 	public void testWithEmptyTargetBeanName() {
-		replay(beanFactory);
-
 		factory.setTargetBeanName("");
 		factory.setMethodName("toString()");
 		factory.setBeanFactory(beanFactory);
@@ -80,16 +70,12 @@ public final class MethodLocatingFactoryBeanTests {
 
 	@Test(expected=IllegalArgumentException.class)
 	public void testWithNullTargetMethodName() {
-		replay(beanFactory);
-
 		factory.setTargetBeanName(BEAN_NAME);
 		factory.setBeanFactory(beanFactory);
 	}
 
 	@Test(expected=IllegalArgumentException.class)
 	public void testWithEmptyTargetMethodName() {
-		replay(beanFactory);
-
 		factory.setTargetBeanName(BEAN_NAME);
 		factory.setMethodName("");
 		factory.setBeanFactory(beanFactory);
@@ -97,20 +83,16 @@ public final class MethodLocatingFactoryBeanTests {
 
 	@Test(expected=IllegalArgumentException.class)
 	public void testWhenTargetBeanClassCannotBeResolved() {
-		expect(beanFactory.getType(BEAN_NAME)).andReturn(null);
-		replay(beanFactory);
-
 		factory.setTargetBeanName(BEAN_NAME);
 		factory.setMethodName("toString()");
 		factory.setBeanFactory(beanFactory);
+		verify(beanFactory).getType(BEAN_NAME);
 	}
 
 	@Test
-	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@SuppressWarnings("unchecked")
 	public void testSunnyDayPath() throws Exception {
-		expect((Class) beanFactory.getType(BEAN_NAME)).andReturn(String.class);
-		replay(beanFactory);
-
+		given(beanFactory.getType(BEAN_NAME)).willReturn((Class)String.class);
 		factory.setTargetBeanName(BEAN_NAME);
 		factory.setMethodName("toString()");
 		factory.setBeanFactory(beanFactory);
@@ -122,11 +104,9 @@ public final class MethodLocatingFactoryBeanTests {
 	}
 
 	@Test(expected=IllegalArgumentException.class)
-	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@SuppressWarnings("unchecked")
 	public void testWhereMethodCannotBeResolved() {
-		expect((Class) beanFactory.getType(BEAN_NAME)).andReturn(String.class);
-		replay(beanFactory);
-
+		given(beanFactory.getType(BEAN_NAME)).willReturn((Class)String.class);
 		factory.setTargetBeanName(BEAN_NAME);
 		factory.setMethodName("loadOfOld()");
 		factory.setBeanFactory(beanFactory);
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
index fff56bde6f..17103fce2f 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
@@ -16,11 +16,9 @@
 
 package org.springframework.aop.framework;
 
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
 
 import java.io.Serializable;
 
@@ -80,18 +78,16 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements
 	public void testInterceptorIsInvokedWithNoTarget() throws Throwable {
 		// Test return value
 		int age = 25;
-		MethodInterceptor mi = createMock(MethodInterceptor.class);
+		MethodInterceptor mi = mock(MethodInterceptor.class);
 
 		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] { ITestBean.class });
 		pc.addAdvice(mi);
 		AopProxy aop = createAopProxy(pc);
 
-		expect(mi.invoke(null)).andReturn(age);
-		replay(mi);
+		given(mi.invoke(null)).willReturn(age);
 
 		ITestBean tb = (ITestBean) aop.getProxy();
 		assertTrue("correct return value", tb.getAge() == age);
-		verify(mi);
 	}
 
 	public void testTargetCanGetInvocationWithPrivateClass() throws Throwable {
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java
index c93760bf67..a2eaf26f79 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java
@@ -16,8 +16,9 @@
 
 package org.springframework.context.access;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import org.junit.Test;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -32,10 +33,7 @@ public class ContextBeanFactoryReferenceTests {
 
 	@Test
 	public void testAllOperations() {
-		ConfigurableApplicationContext ctx = createMock(ConfigurableApplicationContext.class);
-
-		ctx.close();
-		replay(ctx);
+		ConfigurableApplicationContext ctx = mock(ConfigurableApplicationContext.class);
 
 		ContextBeanFactoryReference bfr = new ContextBeanFactoryReference(ctx);
 
@@ -49,6 +47,6 @@ public class ContextBeanFactoryReferenceTests {
 			// expected
 		}
 
-		verify(ctx);
+		verify(ctx).close();
 	}
 }
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
index fb0683ed27..48ef3c6eaf 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
@@ -16,10 +16,10 @@
 
 package org.springframework.context.annotation;
 
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.replay;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import java.lang.instrument.ClassFileTransformer;
 
@@ -40,7 +40,7 @@ public class EnableLoadTimeWeavingTests {
 	public void control() {
 		GenericXmlApplicationContext ctx =
 			new GenericXmlApplicationContext(getClass(), "EnableLoadTimeWeavingTests-context.xml");
-		ctx.getBean("loadTimeWeaver");
+		ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class);
 	}
 
 	@Test
@@ -48,7 +48,8 @@ public class EnableLoadTimeWeavingTests {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(EnableLTWConfig_withAjWeavingDisabled.class);
 		ctx.refresh();
-		ctx.getBean("loadTimeWeaver");
+		LoadTimeWeaver loadTimeWeaver = ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class);
+		verifyZeroInteractions(loadTimeWeaver);
 	}
 
 	@Test
@@ -56,7 +57,10 @@ public class EnableLoadTimeWeavingTests {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(EnableLTWConfig_withAjWeavingAutodetect.class);
 		ctx.refresh();
-		ctx.getBean("loadTimeWeaver");
+		LoadTimeWeaver loadTimeWeaver = ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class);
+		// no expectations -> a class file transformer should NOT be added
+		// because no META-INF/aop.xml is present on the classpath
+		verifyZeroInteractions(loadTimeWeaver);
 	}
 
 	@Test
@@ -64,7 +68,8 @@ public class EnableLoadTimeWeavingTests {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(EnableLTWConfig_withAjWeavingEnabled.class);
 		ctx.refresh();
-		ctx.getBean("loadTimeWeaver");
+		LoadTimeWeaver loadTimeWeaver = ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class);
+		verify(loadTimeWeaver).addTransformer(isA(ClassFileTransformer.class));
 	}
 
 	@Configuration
@@ -72,10 +77,7 @@ public class EnableLoadTimeWeavingTests {
 	static class EnableLTWConfig_withAjWeavingDisabled implements LoadTimeWeavingConfigurer {
 		@Override
 		public LoadTimeWeaver getLoadTimeWeaver() {
-			LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class);
-			// no expectations -> a class file transformer should NOT be added
-			replay(mockLTW);
-			return mockLTW;
+			return mock(LoadTimeWeaver.class);
 		}
 	}
 
@@ -84,11 +86,7 @@ public class EnableLoadTimeWeavingTests {
 	static class EnableLTWConfig_withAjWeavingAutodetect implements LoadTimeWeavingConfigurer {
 		@Override
 		public LoadTimeWeaver getLoadTimeWeaver() {
-			LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class);
-			// no expectations -> a class file transformer should NOT be added
-			// because no META-INF/aop.xml is present on the classpath
-			replay(mockLTW);
-			return mockLTW;
+			return mock(LoadTimeWeaver.class);
 		}
 	}
 
@@ -97,11 +95,7 @@ public class EnableLoadTimeWeavingTests {
 	static class EnableLTWConfig_withAjWeavingEnabled implements LoadTimeWeavingConfigurer {
 		@Override
 		public LoadTimeWeaver getLoadTimeWeaver() {
-			LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class);
-			mockLTW.addTransformer(isA(ClassFileTransformer.class));
-			expectLastCall();
-			replay(mockLTW);
-			return mockLTW;
+			return mock(LoadTimeWeaver.class);
 		}
 	}
 }
diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
index 1811a78938..19a54ec52d 100644
--- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
@@ -20,9 +20,12 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.aopalliance.intercept.MethodInvocation;
-import org.easymock.EasyMock;
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import org.junit.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
@@ -50,14 +53,12 @@ public class ApplicationContextEventTests {
 		@SuppressWarnings("unchecked")
 		ApplicationListener<ApplicationEvent> listener = mock(ApplicationListener.class);
 		ApplicationEvent evt = new ContextClosedEvent(new StaticApplicationContext());
-		listener.onApplicationEvent(evt);
 
 		SimpleApplicationEventMulticaster smc = new SimpleApplicationEventMulticaster();
 		smc.addApplicationListener(listener);
 
-		replay(listener);
 		smc.multicastEvent(evt);
-		verify(listener);
+		verify(listener).onApplicationEvent(evt);
 	}
 
 	@Test
@@ -91,20 +92,18 @@ public class ApplicationContextEventTests {
 
 	@Test
 	public void testEventPublicationInterceptor() throws Throwable {
-		MethodInvocation invocation = EasyMock.createMock(MethodInvocation.class);
-		ApplicationContext ctx = EasyMock.createMock(ApplicationContext.class);
+		MethodInvocation invocation = mock(MethodInvocation.class);
+		ApplicationContext ctx = mock(ApplicationContext.class);
 
 		EventPublicationInterceptor interceptor = new EventPublicationInterceptor();
 		interceptor.setApplicationEventClass(MyEvent.class);
 		interceptor.setApplicationEventPublisher(ctx);
 		interceptor.afterPropertiesSet();
 
-		expect(invocation.proceed()).andReturn(new Object());
-		expect(invocation.getThis()).andReturn(new Object());
-		ctx.publishEvent(isA(MyEvent.class));
-		replay(invocation, ctx);
+		given(invocation.proceed()).willReturn(new Object());
+		given(invocation.getThis()).willReturn(new Object());
 		interceptor.invoke(invocation);
-		verify(invocation, ctx);
+		verify(ctx).publishEvent(isA(MyEvent.class));
 	}
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
index 3cf6771099..31ca74fa67 100644
--- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
@@ -16,8 +16,8 @@
 
 package org.springframework.context.event;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -44,13 +44,7 @@ public class EventPublicationInterceptorTests {
 
 	@Before
 	public void setUp() {
-		publisher = createMock(ApplicationEventPublisher.class);
-		replay(publisher);
-	}
-
-	@After
-	public void tearDown() {
-		verify(publisher);
+		publisher = mock(ApplicationEventPublisher.class);
 	}
 
 	@Test(expected=IllegalArgumentException.class)
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
index 3dc63f5cde..efa2967148 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
@@ -16,8 +16,10 @@
 
 package org.springframework.ejb.access;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import javax.ejb.CreateException;
 import javax.ejb.EJBLocalHome;
@@ -41,15 +43,14 @@ public class LocalSlsbInvokerInterceptorTests {
 	 */
 	@Test
 	public void testPerformsLookup() throws Exception {
-		LocalInterfaceWithBusinessMethods ejb = createMock(LocalInterfaceWithBusinessMethods.class);
-		replay(ejb);
+		LocalInterfaceWithBusinessMethods ejb = mock(LocalInterfaceWithBusinessMethods.class);
 
 		String jndiName= "foobar";
 		Context mockContext = mockContext(jndiName, ejb);
 
 		configuredInterceptor(mockContext, jndiName);
 
-		verify(mockContext);
+		verify(mockContext).close();
 	}
 
 	@Test
@@ -81,10 +82,8 @@ public class LocalSlsbInvokerInterceptorTests {
 	@Test
 	public void testInvokesMethodOnEjbInstance() throws Exception {
 		Object retVal = new Object();
-		LocalInterfaceWithBusinessMethods ejb = createMock(LocalInterfaceWithBusinessMethods.class);
-		expect(ejb.targetMethod()).andReturn(retVal);
-		ejb.remove();
-		replay(ejb);
+		LocalInterfaceWithBusinessMethods ejb = mock(LocalInterfaceWithBusinessMethods.class);
+		given(ejb.targetMethod()).willReturn(retVal);
 
 		String jndiName= "foobar";
 		Context mockContext = mockContext(jndiName, ejb);
@@ -97,17 +96,15 @@ public class LocalSlsbInvokerInterceptorTests {
 
 		assertTrue(target.targetMethod() == retVal);
 
-		verify(mockContext);
-		verify(ejb);
+		verify(mockContext).close();
+		verify(ejb).remove();
 	}
 
 	@Test
 	public void testInvokesMethodOnEjbInstanceWithSeparateBusinessMethods() throws Exception {
 		Object retVal = new Object();
-		LocalInterface ejb = createMock(LocalInterface.class);
-		expect(ejb.targetMethod()).andReturn(retVal);
-		ejb.remove();
-		replay(ejb);
+		LocalInterface ejb = mock(LocalInterface.class);
+		given(ejb.targetMethod()).willReturn(retVal);
 
 		String jndiName= "foobar";
 		Context mockContext = mockContext(jndiName, ejb);
@@ -120,14 +117,13 @@ public class LocalSlsbInvokerInterceptorTests {
 
 		assertTrue(target.targetMethod() == retVal);
 
-		verify(mockContext);
-		verify(ejb);
+		verify(mockContext).close();
+		verify(ejb).remove();
 	}
 
 	private void testException(Exception expected) throws Exception {
-		LocalInterfaceWithBusinessMethods ejb = createMock(LocalInterfaceWithBusinessMethods.class);
-		expect(ejb.targetMethod()).andThrow(expected);
-		replay(ejb);
+		LocalInterfaceWithBusinessMethods ejb = mock(LocalInterfaceWithBusinessMethods.class);
+		given(ejb.targetMethod()).willThrow(expected);
 
 		String jndiName= "foobar";
 		Context mockContext = mockContext(jndiName, ejb);
@@ -146,8 +142,7 @@ public class LocalSlsbInvokerInterceptorTests {
 			assertTrue(thrown == expected);
 		}
 
-		verify(mockContext);
-		verify(ejb);
+		verify(mockContext).close();
 	}
 
 	@Test
@@ -157,16 +152,10 @@ public class LocalSlsbInvokerInterceptorTests {
 
 	protected Context mockContext(final String jndiName, final Object ejbInstance)
 			throws Exception {
-
-		final SlsbHome mockHome = createMock(SlsbHome.class);
-		expect(mockHome.create()).andReturn((LocalInterface)ejbInstance);
-		replay(mockHome);
-
-		final Context mockCtx = createMock(Context.class);
-
-		expect(mockCtx.lookup("java:comp/env/" + jndiName)).andReturn(mockHome);
-		mockCtx.close();
-		replay(mockCtx);
+		SlsbHome mockHome = mock(SlsbHome.class);
+		given(mockHome.create()).willReturn((LocalInterface)ejbInstance);
+		Context mockCtx = mock(Context.class);
+		given(mockCtx.lookup("java:comp/env/" + jndiName)).willReturn(mockHome);
 		return mockCtx;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
index b053e3e038..53e414146e 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
@@ -16,8 +16,11 @@
 
 package org.springframework.ejb.access;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import java.lang.reflect.Proxy;
 
@@ -42,14 +45,11 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		final int value = 11;
 		final String jndiName = "foo";
 
-		MyEjb myEjb = createMock(MyEjb.class);
-		expect(myEjb.getValue()).andReturn(value);
-		myEjb.remove();
-		replay(myEjb);
+		MyEjb myEjb = mock(MyEjb.class);
+		given(myEjb.getValue()).willReturn(value);
 
-		final MyHome home = createMock(MyHome.class);
-		expect(home.create()).andReturn(myEjb);
-		replay(home);
+		final MyHome home = mock(MyHome.class);
+		given(home.create()).willReturn(myEjb);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -72,8 +72,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
 		assertTrue(Proxy.isProxyClass(mbm.getClass()));
 		assertTrue(mbm.getValue() == value);
-		verify(myEjb);
-		verify(home);
+		verify(myEjb).remove();
 	}
 
 	@Test
@@ -81,9 +80,8 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		final int value = 11;
 		final String jndiName = "foo";
 
-		final MyEjb myEjb = createMock(MyEjb.class);
-		expect(myEjb.getValue()).andReturn(value);
-		replay(myEjb);
+		final MyEjb myEjb = mock(MyEjb.class);
+		given(myEjb.getValue()).willReturn(value);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -106,7 +104,6 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
 		assertTrue(Proxy.isProxyClass(mbm.getClass()));
 		assertTrue(mbm.getValue() == value);
-		verify(myEjb);
 	}
 
 	@Test
@@ -114,9 +111,8 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		final String jndiName = "foo";
 
 		final CreateException cex = new CreateException();
-		final MyHome home = createMock(MyHome.class);
-		expect(home.create()).andThrow(cex);
-		replay(home);
+		final MyHome home = mock(MyHome.class);
+		given(home.create()).willThrow(cex);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -147,8 +143,6 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		catch (EjbAccessException ex) {
 			assertSame(cex, ex.getCause());
 		}
-
-		verify(home);
 	}
 
 	@Test
@@ -157,8 +151,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		// Could actually try to figure out interface from create?
 		final String jndiName = "foo";
 
-		final MyHome home = createMock(MyHome.class);
-		replay(home);
+		final MyHome home = mock(MyHome.class);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -188,7 +181,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
 		}
 
 		// Expect no methods on home
-		verify(home);
+		verifyZeroInteractions(home);
 	}
 
 
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
index cbf75b1831..ac3d59b47e 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
@@ -16,8 +16,12 @@
 
 package org.springframework.ejb.access;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import java.rmi.ConnectException;
 import java.rmi.RemoteException;
@@ -41,20 +45,12 @@ import org.springframework.remoting.RemoteAccessException;
 public class SimpleRemoteSlsbInvokerInterceptorTests {
 
 	private Context mockContext(
-			String jndiName, RemoteInterface ejbInstance, int createCount, int lookupCount, int closeCount)
+			String jndiName, RemoteInterface ejbInstance)
 			throws Exception {
-
-		final SlsbHome mockHome = createMock(SlsbHome.class);
-		expect(mockHome.create()).andReturn(ejbInstance).times(createCount);
-		replay(mockHome);
-
-		final Context mockCtx = createMock(Context.class);
-
-		expect(mockCtx.lookup("java:comp/env/" + jndiName)).andReturn(mockHome).times(lookupCount);
-		mockCtx.close();
-		expectLastCall().times(closeCount);
-		replay(mockCtx);
-
+		SlsbHome mockHome = mock(SlsbHome.class);
+		given(mockHome.create()).willReturn(ejbInstance);
+		Context mockCtx = mock(Context.class);
+		given(mockCtx.lookup("java:comp/env/" + jndiName)).willReturn(mockHome);
 		return mockCtx;
 	}
 
@@ -88,33 +84,32 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 
 	@Test
 	public void testPerformsLookup() throws Exception {
-		RemoteInterface ejb = createMock(RemoteInterface.class);
-		replay(ejb);
+		RemoteInterface ejb = mock(RemoteInterface.class);
 
 		String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb, 1, 1, 1);
+		Context mockContext = mockContext(jndiName, ejb);
 
 		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
 		configuredProxy(si, RemoteInterface.class);
 
-		verify(mockContext);
+		verify(mockContext).close();
 	}
 
 	@Test
 	public void testPerformsLookupWithAccessContext() throws Exception {
-		RemoteInterface ejb = createMock(RemoteInterface.class);
-		expect(ejb.targetMethod()).andReturn(null);
-		replay(ejb);
+		RemoteInterface ejb = mock(RemoteInterface.class);
 
 		String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb, 1, 1, 2);
+		Context mockContext = mockContext(jndiName, ejb);
 
 		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
 		si.setExposeAccessContext(true);
 		RemoteInterface target = (RemoteInterface) configuredProxy(si, RemoteInterface.class);
 		assertNull(target.targetMethod());
 
-		verify(mockContext);
+		verify(mockContext, times(2)).close();
+		verify(ejb).targetMethod();
+
 	}
 
 	@Test
@@ -165,10 +160,8 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 
 	private void doTestInvokesMethodOnEjbInstance(boolean lookupHomeOnStartup, boolean cacheHome) throws Exception {
 		Object retVal = new Object();
-		final RemoteInterface ejb = createMock(RemoteInterface.class);
-		expect(ejb.targetMethod()).andReturn(retVal).times(2);
-		ejb.remove();
-		replay(ejb);
+		final RemoteInterface ejb = mock(RemoteInterface.class);
+		given(ejb.targetMethod()).willReturn(retVal);
 
 		int lookupCount = 1;
 		if (!cacheHome) {
@@ -179,7 +172,7 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 		}
 
 		final String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb, 2, lookupCount, lookupCount);
+		Context mockContext = mockContext(jndiName, ejb);
 
 		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
 		si.setLookupHomeOnStartup(lookupHomeOnStartup);
@@ -189,19 +182,18 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 		assertTrue(target.targetMethod() == retVal);
 		assertTrue(target.targetMethod() == retVal);
 
-		verify(mockContext, ejb);
+		verify(mockContext, times(lookupCount)).close();
+		verify(ejb, times(2)).remove();
 	}
 
 	@Test
 	public void testInvokesMethodOnEjbInstanceWithHomeInterface() throws Exception {
 		Object retVal = new Object();
-		final RemoteInterface ejb = createMock(RemoteInterface.class);
-		expect(ejb.targetMethod()).andReturn(retVal);
-		ejb.remove();
-		replay(ejb);
+		final RemoteInterface ejb = mock(RemoteInterface.class);
+		given(ejb.targetMethod()).willReturn(retVal);
 
 		final String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb, 1, 1, 1);
+		Context mockContext = mockContext(jndiName, ejb);
 
 		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
 		si.setHomeInterface(SlsbHome.class);
@@ -209,18 +201,18 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 		RemoteInterface target = (RemoteInterface) configuredProxy(si, RemoteInterface.class);
 		assertTrue(target.targetMethod() == retVal);
 
-		verify(mockContext, ejb);
+		verify(mockContext).close();
+		verify(ejb).remove();
 	}
 
 	@Test
 	public void testInvokesMethodOnEjbInstanceWithRemoteException() throws Exception {
-		final RemoteInterface ejb = createMock(RemoteInterface.class);
-		expect(ejb.targetMethod()).andThrow(new RemoteException());
+		final RemoteInterface ejb = mock(RemoteInterface.class);
+		given(ejb.targetMethod()).willThrow(new RemoteException());
 		ejb.remove();
-		replay(ejb);
 
 		final String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb, 1, 1, 1);
+		Context mockContext = mockContext(jndiName, ejb);
 
 		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
 
@@ -233,7 +225,8 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 			// expected
 		}
 
-		verify(mockContext, ejb);
+		verify(mockContext).close();
+		verify(ejb, times(2)).remove();
 	}
 
 	@Test
@@ -259,11 +252,8 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 	private void doTestInvokesMethodOnEjbInstanceWithConnectExceptionWithRefresh(
 			boolean lookupHomeOnStartup, boolean cacheHome) throws Exception {
 
-		final RemoteInterface ejb = createMock(RemoteInterface.class);
-		expect(ejb.targetMethod()).andThrow(new ConnectException("")).times(2);
-		ejb.remove();
-		expectLastCall().times(2);
-		replay(ejb);
+		final RemoteInterface ejb = mock(RemoteInterface.class);
+		given(ejb.targetMethod()).willThrow(new ConnectException(""));
 
 		int lookupCount = 2;
 		if (!cacheHome) {
@@ -274,7 +264,7 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 		}
 
 		final String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb, 2, lookupCount, lookupCount);
+		Context mockContext = mockContext(jndiName, ejb);
 
 		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
 		si.setRefreshHomeOnConnectFailure(true);
@@ -290,37 +280,35 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 			// expected
 		}
 
-		verify(mockContext, ejb);
+		verify(mockContext, times(lookupCount)).close();
+		verify(ejb, times(2)).remove();
 	}
 
 	@Test
 	public void testInvokesMethodOnEjbInstanceWithBusinessInterface() throws Exception {
 		Object retVal = new Object();
-		final RemoteInterface ejb = createMock(RemoteInterface.class);
-		expect(ejb.targetMethod()).andReturn(retVal);
-		ejb.remove();
-		replay(ejb);
+		final RemoteInterface ejb = mock(RemoteInterface.class);
+		given(ejb.targetMethod()).willReturn(retVal);
 
 		final String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb, 1, 1, 1);
+		Context mockContext = mockContext(jndiName, ejb);
 
 		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
 
 		BusinessInterface target = (BusinessInterface) configuredProxy(si, BusinessInterface.class);
 		assertTrue(target.targetMethod() == retVal);
 
-		verify(mockContext, ejb);
+		verify(mockContext).close();
+		verify(ejb).remove();
 	}
 
 	@Test
 	public void testInvokesMethodOnEjbInstanceWithBusinessInterfaceWithRemoteException() throws Exception {
-		final RemoteInterface ejb = createMock(RemoteInterface.class);
-		expect(ejb.targetMethod()).andThrow(new RemoteException());
-		ejb.remove();
-		replay(ejb);
+		final RemoteInterface ejb = mock(RemoteInterface.class);
+		given(ejb.targetMethod()).willThrow(new RemoteException());
 
 		final String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb, 1, 1, 1);
+		Context mockContext = mockContext(jndiName, ejb);
 
 		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
 
@@ -333,7 +321,8 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 			// expected
 		}
 
-		verify(mockContext, ejb);
+		verify(mockContext).close();
+		verify(ejb).remove();
 	}
 
 	@Test
@@ -347,13 +336,11 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 	}
 
 	private void doTestException(Exception expected) throws Exception {
-		final RemoteInterface ejb = createMock(RemoteInterface.class);
-		expect(ejb.targetMethod()).andThrow(expected);
-		ejb.remove();
-		replay(ejb);
+		final RemoteInterface ejb = mock(RemoteInterface.class);
+		given(ejb.targetMethod()).willThrow(expected);
 
 		final String jndiName= "foobar";
-		Context mockContext = mockContext(jndiName, ejb, 1, 1, 1);
+		Context mockContext = mockContext(jndiName, ejb);
 
 		SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName);
 
@@ -366,7 +353,8 @@ public class SimpleRemoteSlsbInvokerInterceptorTests {
 			assertTrue(thrown == expected);
 		}
 
-		verify(mockContext, ejb);
+		verify(mockContext).close();
+		verify(ejb).remove();
 	}
 
 
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
index dca93a798e..527babf603 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
@@ -16,8 +16,11 @@
 
 package org.springframework.ejb.access;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import java.lang.reflect.Proxy;
 import java.rmi.RemoteException;
@@ -56,14 +59,11 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		final int value = 11;
 		final String jndiName = "foo";
 
-		MyEjb myEjb = createMock(MyEjb.class);
-		expect(myEjb.getValue()).andReturn(value);
-		myEjb.remove();
-		replay(myEjb);
+		MyEjb myEjb = mock(MyEjb.class);
+		given(myEjb.getValue()).willReturn(value);
 
-		final MyHome home = createMock(MyHome.class);
-		expect(home.create()).andReturn(myEjb);
-		replay(home);
+		final MyHome home = mock(MyHome.class);
+		given(home.create()).willReturn(myEjb);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -86,8 +86,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
 		assertTrue(Proxy.isProxyClass(mbm.getClass()));
 		assertEquals("Returns expected value", value, mbm.getValue());
-		verify(myEjb);
-		verify(home);
+		verify(myEjb).remove();
 	}
 
 	@Test
@@ -95,9 +94,8 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		final int value = 11;
 		final String jndiName = "foo";
 
-		final MyEjb myEjb = createMock(MyEjb.class);
-		expect(myEjb.getValue()).andReturn(value);
-		replay(myEjb);
+		final MyEjb myEjb = mock(MyEjb.class);
+		given(myEjb.getValue()).willReturn(value);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -120,7 +118,6 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject();
 		assertTrue(Proxy.isProxyClass(mbm.getClass()));
 		assertEquals("Returns expected value", value, mbm.getValue());
-		verify(myEjb);
 	}
 
 	@Override
@@ -129,16 +126,13 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		final RemoteException rex = new RemoteException();
 		final String jndiName = "foo";
 
-		MyEjb myEjb = createMock(MyEjb.class);
-		expect(myEjb.getValue()).andThrow(rex);
+		MyEjb myEjb = mock(MyEjb.class);
+		given(myEjb.getValue()).willThrow(rex);
 		// TODO might want to control this behaviour...
 		// Do we really want to call remove after a remote exception?
-		myEjb.remove();
-		replay(myEjb);
 
-		final MyHome home = createMock(MyHome.class);
-		expect(home.create()).andReturn(myEjb);
-		replay(home);
+		final MyHome home = mock(MyHome.class);
+		given(home.create()).willReturn(myEjb);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -167,8 +161,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		catch (RemoteException ex) {
 			assertSame("Threw expected RemoteException", rex, ex);
 		}
-		verify(myEjb);
-		verify(home);
+		verify(myEjb).remove();
 	}
 
 	@Test
@@ -176,9 +169,8 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		final String jndiName = "foo";
 
 		final CreateException cex = new CreateException();
-		final MyHome home = createMock(MyHome.class);
-		expect(home.create()).andThrow(cex);
-		replay(home);
+		final MyHome home = mock(MyHome.class);
+		given(home.create()).willThrow(cex);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -209,8 +201,6 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		catch (RemoteException ex) {
 			// expected
 		}
-
-		verify(home);
 	}
 
 	@Test
@@ -218,9 +208,8 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		final String jndiName = "foo";
 
 		final CreateException cex = new CreateException();
-		final MyHome home = createMock(MyHome.class);
-		expect(home.create()).andThrow(cex);
-		replay(home);
+		final MyHome home = mock(MyHome.class);
+		given(home.create()).willThrow(cex);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -251,8 +240,6 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		catch (RemoteAccessException ex) {
 			assertTrue(ex.getCause() == cex);
 		}
-
-		verify(home);
 	}
 
 	@Test
@@ -261,8 +248,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		// Could actually try to figure out interface from create?
 		final String jndiName = "foo";
 
-		final MyHome home = createMock(MyHome.class);
-		replay(home);
+		final MyHome home = mock(MyHome.class);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -292,7 +278,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
 		}
 
 		// Expect no methods on home
-		verify(home);
+		verifyZeroInteractions(home);
 	}
 
 
diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java
index db49e67a1b..7867139ae3 100644
--- a/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java
+++ b/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java
@@ -16,154 +16,136 @@
 
 package org.springframework.instrument.classloading.glassfish;
 
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
-
-import java.lang.instrument.ClassFileTransformer;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.SecureClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.persistence.spi.ClassTransformer;
-
-import org.easymock.ArgumentsMatcher;
-import org.easymock.MockControl;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Test;
-import org.springframework.instrument.classloading.LoadTimeWeaver;
 
 // converting away from old-style EasyMock APIs was problematic with this class
+// glassfish dependencies no longer on classpath
 @SuppressWarnings("deprecation")
 @Ignore
 public class GlassFishLoadTimeWeaverTests {
 
-	private MockControl loaderCtrl;
-	private GlassFishClassLoaderAdapter loader;
-	private LoadTimeWeaver ltw;
-
-	private class DummyInstrumentableClassLoader extends SecureClassLoader {
-
-		String INSTR_CL_NAME = GlassFishClassLoaderAdapter.INSTRUMENTABLE_CLASSLOADER_GLASSFISH_V2;
-
-		public DummyInstrumentableClassLoader() {
-			super();
-		}
-
-		public DummyInstrumentableClassLoader(ClassLoader parent) {
-			super(parent);
-		}
-
-		private List<ClassTransformer> v2Transformers = new ArrayList<ClassTransformer>();
-		private List<ClassFileTransformer> v3Transformers = new ArrayList<ClassFileTransformer>();
-
-		public void addTransformer(ClassTransformer transformer) {
-			v2Transformers.add(transformer);
-		}
-
-		public void addTransformer(ClassFileTransformer transformer) {
-			v3Transformers.add(transformer);
-		}
-
-		public ClassLoader copy() {
-			return new DummyInstrumentableClassLoader();
-		}
-
-		@Override
-		public Class<?> loadClass(String name) throws ClassNotFoundException {
-			if (INSTR_CL_NAME.equals(name)) {
-				return this.getClass();
-			}
-
-			return getClass().getClassLoader().loadClass(name);
-		}
-	}
-
-	@Before
-	public void setUp() throws Exception {
-		ltw = new GlassFishLoadTimeWeaver(new DummyInstrumentableClassLoader());
-	}
-
-	@After
-	public void tearDown() throws Exception {
-		loaderCtrl.verify();
-		ltw = null;
-	}
-
-	@Test
-	public void testGlassFishLoadTimeWeaver() {
-		try {
-			ltw = new GlassFishLoadTimeWeaver();
-			fail("expected exception");
-		} catch (IllegalArgumentException ex) {
-			// expected
-		}
-
-	}
-
-	@Test
-	public void testGlassFishLoadTimeWeaverClassLoader() {
-		try {
-			ltw = new GlassFishLoadTimeWeaver(null);
-			fail("expected exception");
-		} catch (RuntimeException e) {
-			// expected
-		}
-
-		ClassLoader cl1 = new URLClassLoader(new URL[0]);
-		ClassLoader cl2 = new URLClassLoader(new URL[0], cl1);
-		ClassLoader cl3 = new DummyInstrumentableClassLoader(cl2);
-		ClassLoader cl4 = new URLClassLoader(new URL[0], cl3);
-
-		ltw = new GlassFishLoadTimeWeaver(cl4);
-		assertSame(cl3, ltw.getInstrumentableClassLoader());
-
-		cl1 = new URLClassLoader(new URL[0]);
-		cl2 = new URLClassLoader(new URL[0], cl1);
-		cl3 = new DummyInstrumentableClassLoader(cl2);
-		cl4 = new DummyInstrumentableClassLoader(cl3);
-
-		ltw = new GlassFishLoadTimeWeaver(cl4);
-		assertSame(cl4, ltw.getInstrumentableClassLoader());
-	}
-
-	@Test
-	public void testAddTransformer() {
-		ClassFileTransformer transformer = MockControl.createNiceControl(ClassFileTransformer.class).getMock();
-		loaderCtrl.reset();
-		loader.addTransformer(transformer);
-		loaderCtrl.setMatcher(new ArgumentsMatcher() {
-
-			public boolean matches(Object[] arg0, Object[] arg1) {
-				for (int i = 0; i < arg0.length; i++) {
-					if (arg0 != null && arg0.getClass() != arg1.getClass())
-						return false;
-				}
-				return true;
-			}
-
-			public String toString(Object[] arg0) {
-				return Arrays.toString(arg0);
-			}
-
-		});
-
-		loaderCtrl.replay();
-
-		ltw.addTransformer(transformer);
-	}
-
-	@Test
-	public void testGetThrowawayClassLoader() {
-		loaderCtrl.reset();
-		ClassLoader cl = new URLClassLoader(new URL[0]);
-		loaderCtrl.expectAndReturn(loader.getClassLoader(), cl);
-		loaderCtrl.replay();
-
-		assertSame(ltw.getThrowawayClassLoader(), cl);
-	}
-}
\ No newline at end of file
+//	private MockControl loaderCtrl;
+//	private GlassFishClassLoaderAdapter loader;
+//	private LoadTimeWeaver ltw;
+//
+//	private class DummyInstrumentableClassLoader extends SecureClassLoader {
+//
+//		String INSTR_CL_NAME = GlassFishClassLoaderAdapter.INSTRUMENTABLE_CLASSLOADER_GLASSFISH_V2;
+//
+//		public DummyInstrumentableClassLoader() {
+//			super();
+//		}
+//
+//		public DummyInstrumentableClassLoader(ClassLoader parent) {
+//			super(parent);
+//		}
+//
+//		private List<ClassTransformer> v2Transformers = new ArrayList<ClassTransformer>();
+//		private List<ClassFileTransformer> v3Transformers = new ArrayList<ClassFileTransformer>();
+//
+//		public void addTransformer(ClassTransformer transformer) {
+//			v2Transformers.add(transformer);
+//		}
+//
+//		public void addTransformer(ClassFileTransformer transformer) {
+//			v3Transformers.add(transformer);
+//		}
+//
+//		public ClassLoader copy() {
+//			return new DummyInstrumentableClassLoader();
+//		}
+//
+//		@Override
+//		public Class<?> loadClass(String name) throws ClassNotFoundException {
+//			if (INSTR_CL_NAME.equals(name)) {
+//				return this.getClass();
+//			}
+//
+//			return getClass().getClassLoader().loadClass(name);
+//		}
+//	}
+//
+//	@Before
+//	public void setUp() throws Exception {
+//		ltw = new GlassFishLoadTimeWeaver(new DummyInstrumentableClassLoader());
+//	}
+//
+//	@After
+//	public void tearDown() throws Exception {
+//		loaderCtrl.verify();
+//		ltw = null;
+//	}
+//
+//	@Test
+//	public void testGlassFishLoadTimeWeaver() {
+//		try {
+//			ltw = new GlassFishLoadTimeWeaver();
+//			fail("expected exception");
+//		} catch (IllegalArgumentException ex) {
+//			// expected
+//		}
+//
+//	}
+//
+//	@Test
+//	public void testGlassFishLoadTimeWeaverClassLoader() {
+//		try {
+//			ltw = new GlassFishLoadTimeWeaver(null);
+//			fail("expected exception");
+//		} catch (RuntimeException e) {
+//			// expected
+//		}
+//
+//		ClassLoader cl1 = new URLClassLoader(new URL[0]);
+//		ClassLoader cl2 = new URLClassLoader(new URL[0], cl1);
+//		ClassLoader cl3 = new DummyInstrumentableClassLoader(cl2);
+//		ClassLoader cl4 = new URLClassLoader(new URL[0], cl3);
+//
+//		ltw = new GlassFishLoadTimeWeaver(cl4);
+//		assertSame(cl3, ltw.getInstrumentableClassLoader());
+//
+//		cl1 = new URLClassLoader(new URL[0]);
+//		cl2 = new URLClassLoader(new URL[0], cl1);
+//		cl3 = new DummyInstrumentableClassLoader(cl2);
+//		cl4 = new DummyInstrumentableClassLoader(cl3);
+//
+//		ltw = new GlassFishLoadTimeWeaver(cl4);
+//		assertSame(cl4, ltw.getInstrumentableClassLoader());
+//	}
+//
+//	@Test
+//	public void testAddTransformer() {
+//		ClassFileTransformer transformer = MockControl.createNiceControl(ClassFileTransformer.class).getMock();
+//		loaderCtrl.reset();
+//		loader.addTransformer(transformer);
+//		loaderCtrl.setMatcher(new ArgumentsMatcher() {
+//
+//			public boolean matches(Object[] arg0, Object[] arg1) {
+//				for (int i = 0; i < arg0.length; i++) {
+//					if (arg0 != null && arg0.getClass() != arg1.getClass())
+//						return false;
+//				}
+//				return true;
+//			}
+//
+//			public String toString(Object[] arg0) {
+//				return Arrays.toString(arg0);
+//			}
+//
+//		});
+//
+//		loaderCtrl.replay();
+//
+//		ltw.addTransformer(transformer);
+//	}
+//
+//	@Test
+//	public void testGetThrowawayClassLoader() {
+//		loaderCtrl.reset();
+//		ClassLoader cl = new URLClassLoader(new URL[0]);
+//		loaderCtrl.expectAndReturn(loader.getClassLoader(), cl);
+//		loaderCtrl.replay();
+//
+//		assertSame(ltw.getThrowawayClassLoader(), cl);
+//	}
+}
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 fbc8e6221e..6244e0fae6 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
@@ -16,8 +16,11 @@
 
 package org.springframework.jndi;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import javax.naming.Context;
 import javax.naming.NamingException;
@@ -383,11 +386,8 @@ public class JndiObjectFactoryBeanTests {
 	public void testLookupWithExposeAccessContext() throws Exception {
 		JndiObjectFactoryBean jof = new JndiObjectFactoryBean();
 		TestBean tb = new TestBean();
-		final Context mockCtx = createMock(Context.class);
-		expect(mockCtx.lookup("foo")).andReturn(tb);
-		mockCtx.close();
-		expectLastCall().times(2);
-		replay(mockCtx);
+		final Context mockCtx = mock(Context.class);
+		given(mockCtx.lookup("foo")).willReturn(tb);
 		jof.setJndiTemplate(new JndiTemplate() {
 			@Override
 			protected Context createInitialContext() {
@@ -406,7 +406,7 @@ public class JndiObjectFactoryBeanTests {
 		proxy.equals(proxy);
 		proxy.hashCode();
 		proxy.toString();
-		verify(mockCtx);
+		verify(mockCtx, times(2)).close();
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java
index f4fbd09453..bf98aa1adc 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java
@@ -16,8 +16,10 @@
 
 package org.springframework.jndi;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import javax.naming.Context;
 import javax.naming.NameNotFoundException;
@@ -36,10 +38,8 @@ public class JndiTemplateTests {
 	public void testLookupSucceeds() throws Exception {
 		Object o = new Object();
 		String name = "foo";
-		final Context context = createMock(Context.class);
-		expect(context.lookup(name)).andReturn(o);
-		context.close();
-		replay(context);
+		final Context context = mock(Context.class);
+		given(context.lookup(name)).willReturn(o);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -50,17 +50,15 @@ public class JndiTemplateTests {
 
 		Object o2 = jt.lookup(name);
 		assertEquals(o, o2);
-		verify(context);
+		verify(context).close();
 	}
 
 	@Test
 	public void testLookupFails() throws Exception {
 		NameNotFoundException ne = new NameNotFoundException();
 		String name = "foo";
-		final Context context = createMock(Context.class);
-		expect(context.lookup(name)).andThrow(ne);
-		context.close();
-		replay(context);
+		final Context context = mock(Context.class);
+		given(context.lookup(name)).willThrow(ne);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -76,16 +74,14 @@ public class JndiTemplateTests {
 		catch (NameNotFoundException ex) {
 			// Ok
 		}
-		verify(context);
+		verify(context).close();
 	}
 
 	@Test
 	public void testLookupReturnsNull() throws Exception {
 		String name = "foo";
-		final Context context = createMock(Context.class);
-		expect(context.lookup(name)).andReturn(null);
-		context.close();
-		replay(context);
+		final Context context = mock(Context.class);
+		given(context.lookup(name)).willReturn(null);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -101,17 +97,15 @@ public class JndiTemplateTests {
 		catch (NameNotFoundException ex) {
 			// Ok
 		}
-		verify(context);
+		verify(context).close();
 	}
 
 	@Test
 	public void testLookupFailsWithTypeMismatch() throws Exception {
 		Object o = new Object();
 		String name = "foo";
-		final Context context = createMock(Context.class);
-		expect(context.lookup(name)).andReturn(o);
-		context.close();
-		replay(context);
+		final Context context = mock(Context.class);
+		given(context.lookup(name)).willReturn(o);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -127,17 +121,14 @@ public class JndiTemplateTests {
 		catch (TypeMismatchNamingException ex) {
 			// Ok
 		}
-		verify(context);
+		verify(context).close();
 	}
 
 	@Test
 	public void testBind() throws Exception {
 		Object o = new Object();
 		String name = "foo";
-		final Context context = createMock(Context.class);
-		context.bind(name, o);
-		context.close();
-		replay(context);
+		final Context context = mock(Context.class);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -147,17 +138,15 @@ public class JndiTemplateTests {
 		};
 
 		jt.bind(name, o);
-		verify(context);
+		verify(context).bind(name, o);
+		verify(context).close();
 	}
 
 	@Test
 	public void testRebind() throws Exception {
 		Object o = new Object();
 		String name = "foo";
-		final Context context = createMock(Context.class);
-		context.rebind(name, o);
-		context.close();
-		replay(context);
+		final Context context = mock(Context.class);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -167,16 +156,15 @@ public class JndiTemplateTests {
 		};
 
 		jt.rebind(name, o);
-		verify(context);
+		verify(context).rebind(name, o);
+		verify(context).close();
+;
 	}
 
 	@Test
 	public void testUnbind() throws Exception {
 		String name = "something";
-		final Context context = createMock(Context.class);
-		context.unbind(name);
-		context.close();
-		replay(context);
+		final Context context = mock(Context.class);
 
 		JndiTemplate jt = new JndiTemplate() {
 			@Override
@@ -186,7 +174,8 @@ public class JndiTemplateTests {
 		};
 
 		jt.unbind(name);
-		verify(context);
+		verify(context).unbind(name);
+		verify(context).close();
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
index 0882599218..4808b1011a 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
@@ -19,21 +19,20 @@ package org.springframework.scheduling.concurrent;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
 
-import junit.framework.AssertionFailedError;
-
-import org.easymock.MockControl;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.core.task.NoOpRunnable;
 
-import static org.mockito.Mockito.*;
-
-
 /**
  * @author Rick Evans
  * @author Juergen Hoeller
@@ -58,11 +57,7 @@ public class ScheduledExecutorFactoryBeanTests {
 	@Test
 	@SuppressWarnings("serial")
 	public void testShutdownNowIsPropagatedToTheExecutorOnDestroy() throws Exception {
-		MockControl mockScheduledExecutorService = MockControl.createNiceControl(ScheduledExecutorService.class);
-		final ScheduledExecutorService executor = (ScheduledExecutorService) mockScheduledExecutorService.getMock();
-		executor.shutdownNow();
-		mockScheduledExecutorService.setReturnValue(null);
-		mockScheduledExecutorService.replay();
+		final ScheduledExecutorService executor = mock(ScheduledExecutorService.class);
 
 		ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() {
 			@Override
@@ -76,17 +71,13 @@ public class ScheduledExecutorFactoryBeanTests {
 		factory.afterPropertiesSet();
 		factory.destroy();
 
-		mockScheduledExecutorService.verify();
+		verify(executor).shutdownNow();
 	}
 
 	@Test
 	@SuppressWarnings("serial")
 	public void testShutdownIsPropagatedToTheExecutorOnDestroy() throws Exception {
-		MockControl mockScheduledExecutorService = MockControl.createNiceControl(ScheduledExecutorService.class);
-		final ScheduledExecutorService executor = (ScheduledExecutorService) mockScheduledExecutorService.getMock();
-		executor.shutdown();
-		mockScheduledExecutorService.setVoidCallable();
-		mockScheduledExecutorService.replay();
+		final ScheduledExecutorService executor = mock(ScheduledExecutorService.class);
 
 		ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() {
 			@Override
@@ -101,16 +92,12 @@ public class ScheduledExecutorFactoryBeanTests {
 		factory.afterPropertiesSet();
 		factory.destroy();
 
-		mockScheduledExecutorService.verify();
+		verify(executor).shutdown();
 	}
 
 	@Test
 	public void testOneTimeExecutionIsSetUpAndFiresCorrectly() throws Exception {
-		MockControl mockRunnable = MockControl.createControl(Runnable.class);
-		Runnable runnable = (Runnable) mockRunnable.getMock();
-		runnable.run();
-		mockRunnable.setVoidCallable();
-		mockRunnable.replay();
+		Runnable runnable = mock(Runnable.class);
 
 		ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean();
 		factory.setScheduledExecutorTasks(new ScheduledExecutorTask[]{
@@ -120,18 +107,12 @@ public class ScheduledExecutorFactoryBeanTests {
 		pauseToLetTaskStart(1);
 		factory.destroy();
 
-		mockRunnable.verify();
+		verify(runnable).run();
 	}
 
 	@Test
 	public void testFixedRepeatedExecutionIsSetUpAndFiresCorrectly() throws Exception {
-		MockControl mockRunnable = MockControl.createControl(Runnable.class);
-		Runnable runnable = (Runnable) mockRunnable.getMock();
-		runnable.run();
-		mockRunnable.setVoidCallable();
-		runnable.run();
-		mockRunnable.setVoidCallable();
-		mockRunnable.replay();
+		Runnable runnable = mock(Runnable.class);
 
 		ScheduledExecutorTask task = new ScheduledExecutorTask(runnable);
 		task.setPeriod(500);
@@ -143,18 +124,13 @@ public class ScheduledExecutorFactoryBeanTests {
 		pauseToLetTaskStart(2);
 		factory.destroy();
 
-		mockRunnable.verify();
+		verify(runnable, atLeast(2)).run();
 	}
 
 	@Test
 	public void testFixedRepeatedExecutionIsSetUpAndFiresCorrectlyAfterException() throws Exception {
-		MockControl mockRunnable = MockControl.createControl(Runnable.class);
-		Runnable runnable = (Runnable) mockRunnable.getMock();
-		runnable.run();
-		mockRunnable.setThrowable(new IllegalStateException());
-		runnable.run();
-		mockRunnable.setThrowable(new IllegalStateException());
-		mockRunnable.replay();
+		Runnable runnable = mock(Runnable.class);
+		willThrow(new IllegalStateException()).given(runnable).run();
 
 		ScheduledExecutorTask task = new ScheduledExecutorTask(runnable);
 		task.setPeriod(500);
@@ -167,19 +143,13 @@ public class ScheduledExecutorFactoryBeanTests {
 		pauseToLetTaskStart(2);
 		factory.destroy();
 
-		mockRunnable.verify();
+		verify(runnable, atLeast(2)).run();
 	}
 
 	@Ignore
 	@Test
 	public void testWithInitialDelayRepeatedExecutionIsSetUpAndFiresCorrectly() throws Exception {
-		MockControl mockRunnable = MockControl.createControl(Runnable.class);
-		Runnable runnable = (Runnable) mockRunnable.getMock();
-		runnable.run();
-		mockRunnable.setVoidCallable();
-		runnable.run();
-		mockRunnable.setVoidCallable();
-		mockRunnable.replay();
+		Runnable runnable = mock(Runnable.class);
 
 		ScheduledExecutorTask task = new ScheduledExecutorTask(runnable);
 		task.setPeriod(500);
@@ -192,24 +162,15 @@ public class ScheduledExecutorFactoryBeanTests {
 		// invoke destroy before tasks have even been scheduled...
 		factory.destroy();
 
-		try {
-			mockRunnable.verify();
-			fail("Mock must never have been called");
-		}
-		catch (AssertionFailedError expected) {
-		}
+		// Mock must never have been called
+		verify(runnable, never()).run();
 	}
 
 	@Ignore
 	@Test
 	public void testWithInitialDelayRepeatedExecutionIsSetUpAndFiresCorrectlyAfterException() throws Exception {
-		MockControl mockRunnable = MockControl.createControl(Runnable.class);
-		Runnable runnable = (Runnable) mockRunnable.getMock();
-		runnable.run();
-		mockRunnable.setThrowable(new IllegalStateException());
-		runnable.run();
-		mockRunnable.setThrowable(new IllegalStateException());
-		mockRunnable.replay();
+		Runnable runnable = mock(Runnable.class);
+		willThrow(new IllegalStateException()).given(runnable).run();
 
 		ScheduledExecutorTask task = new ScheduledExecutorTask(runnable);
 		task.setPeriod(500);
@@ -223,12 +184,8 @@ public class ScheduledExecutorFactoryBeanTests {
 		// invoke destroy before tasks have even been scheduled...
 		factory.destroy();
 
-		try {
-			mockRunnable.verify();
-			fail("Mock must never have been called");
-		}
-		catch (AssertionFailedError expected) {
-		}
+		// Mock must never have been called
+		verify(runnable, never()).run();
 	}
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
index 90582292d4..01a4f6a78c 100644
--- a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
@@ -16,11 +16,13 @@
 
 package org.springframework.scripting.bsh;
 
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
 import java.util.Arrays;
 import java.util.Collection;
 
 import junit.framework.TestCase;
-import org.easymock.MockControl;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.target.dynamic.Refreshable;
@@ -189,14 +191,10 @@ public class BshScriptFactoryTests extends TestCase {
 	}
 
 	public void testScriptThatCompilesButIsJustPlainBad() throws Exception {
-		MockControl mock = MockControl.createControl(ScriptSource.class);
-		ScriptSource script = (ScriptSource) mock.getMock();
-		script.getScriptAsString();
+		ScriptSource script = mock(ScriptSource.class);
 		final String badScript = "String getMessage() { throw new IllegalArgumentException(); }";
-		mock.setReturnValue(badScript);
-		script.isModified();
-		mock.setReturnValue(true);
-		mock.replay();
+		given(script.getScriptAsString()).willReturn(badScript);
+		given(script.isModified()).willReturn(true);
 		BshScriptFactory factory = new BshScriptFactory(
 				ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX + badScript,
 				new Class<?>[] {Messenger.class});
@@ -207,7 +205,6 @@ public class BshScriptFactoryTests extends TestCase {
 		}
 		catch (BshScriptUtils.BshExecutionException expected) {
 		}
-		mock.verify();
 	}
 
 	public void testCtorWithNullScriptSourceLocator() throws Exception {
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 f142c6bcc1..9aa2b1436b 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
@@ -23,6 +23,8 @@ import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
 import groovy.lang.DelegatingMetaClass;
 import groovy.lang.GroovyObject;
 
@@ -30,7 +32,6 @@ import java.io.FileNotFoundException;
 import java.util.Arrays;
 import java.util.Map;
 
-import org.easymock.EasyMock;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.aop.support.AopUtils;
@@ -193,11 +194,10 @@ public class GroovyScriptFactoryTests {
 
 	@Test
 	public void testScriptedClassThatDoesNotHaveANoArgCtor() throws Exception {
-		ScriptSource script = EasyMock.createMock(ScriptSource.class);
+		ScriptSource script = mock(ScriptSource.class);
 		final String badScript = "class Foo { public Foo(String foo) {}}";
-		EasyMock.expect(script.getScriptAsString()).andReturn(badScript);
-		EasyMock.expect(script.suggestedClassName()).andReturn("someName");
-		EasyMock.replay(script);
+		given(script.getScriptAsString()).willReturn(badScript);
+		given(script.suggestedClassName()).willReturn("someName");
 		GroovyScriptFactory factory = new GroovyScriptFactory(ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX
 				+ badScript);
 		try {
@@ -206,16 +206,14 @@ public class GroovyScriptFactoryTests {
 		} catch (ScriptCompilationException expected) {
 			assertTrue(expected.contains(InstantiationException.class));
 		}
-		EasyMock.verify(script);
 	}
 
 	@Test
 	public void testScriptedClassThatHasNoPublicNoArgCtor() throws Exception {
-		ScriptSource script = EasyMock.createMock(ScriptSource.class);
+		ScriptSource script = mock(ScriptSource.class);
 		final String badScript = "class Foo { protected Foo() {}}";
-		EasyMock.expect(script.getScriptAsString()).andReturn(badScript);
-		EasyMock.expect(script.suggestedClassName()).andReturn("someName");
-		EasyMock.replay(script);
+		given(script.getScriptAsString()).willReturn(badScript);
+		given(script.suggestedClassName()).willReturn("someName");
 		GroovyScriptFactory factory = new GroovyScriptFactory(ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX
 				+ badScript);
 		try {
@@ -224,7 +222,6 @@ public class GroovyScriptFactoryTests {
 		} catch (ScriptCompilationException expected) {
 			assertTrue(expected.contains(IllegalAccessException.class));
 		}
-		EasyMock.verify(script);
 	}
 
 	@Test
@@ -290,15 +287,13 @@ public class GroovyScriptFactoryTests {
 
 	@Test
 	public void testGetScriptedObjectDoesNotChokeOnNullInterfacesBeingPassedIn() throws Exception {
-		ScriptSource script = EasyMock.createMock(ScriptSource.class);
-		EasyMock.expect(script.getScriptAsString()).andReturn("class Bar {}");
-		EasyMock.expect(script.suggestedClassName()).andReturn("someName");
-		EasyMock.replay(script);
+		ScriptSource script = mock(ScriptSource.class);
+		given(script.getScriptAsString()).willReturn("class Bar {}");
+		given(script.suggestedClassName()).willReturn("someName");
 
 		GroovyScriptFactory factory = new GroovyScriptFactory("a script source locator (doesn't matter here)");
 		Object scriptedObject = factory.getScriptedObject(script, null);
 		assertNotNull(scriptedObject);
-		EasyMock.verify(script);
 	}
 
 	@Test
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java
index dd39e65576..12b3496757 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java
@@ -16,8 +16,8 @@
 
 package org.springframework.scripting.support;
 
+import static org.mockito.Mockito.mock;
 import junit.framework.TestCase;
-import org.easymock.MockControl;
 
 import org.springframework.beans.factory.BeanFactory;
 
@@ -27,15 +27,12 @@ import org.springframework.beans.factory.BeanFactory;
 public class RefreshableScriptTargetSourceTests extends TestCase {
 
 	public void testCreateWithNullScriptSource() throws Exception {
-		MockControl mockFactory = MockControl.createNiceControl(BeanFactory.class);
-		mockFactory.replay();
 		try {
-			new RefreshableScriptTargetSource((BeanFactory) mockFactory.getMock(), "a.bean", null, null, false);
+			new RefreshableScriptTargetSource(mock(BeanFactory.class), "a.bean", null, null, false);
 			fail("Must have failed when passed a null ScriptSource.");
 		}
 		catch (IllegalArgumentException expected) {
 		}
-		mockFactory.verify();
 	}
 
 }
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
index d77ff16084..5303be385a 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
@@ -16,12 +16,14 @@
 
 package org.springframework.scripting.support;
 
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
 import junit.framework.TestCase;
 
-import org.easymock.MockControl;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 
@@ -41,43 +43,29 @@ public class ResourceScriptSourceTests extends TestCase {
 	}
 
 	public void testDoesNotPropagateFatalExceptionOnResourceThatCannotBeResolvedToAFile() throws Exception {
-		MockControl mock = MockControl.createControl(Resource.class);
-		Resource resource = (Resource) mock.getMock();
-		resource.lastModified();
-		mock.setThrowable(new IOException());
-		mock.replay();
+		Resource resource = mock(Resource.class);
+		given(resource.lastModified()).willThrow(new IOException());
 
 		ResourceScriptSource scriptSource = new ResourceScriptSource(resource);
 		long lastModified = scriptSource.retrieveLastModifiedTime();
 		assertEquals(0, lastModified);
-		mock.verify();
 	}
 
 	public void testBeginsInModifiedState() throws Exception {
-		MockControl mock = MockControl.createControl(Resource.class);
-		Resource resource = (Resource) mock.getMock();
-		mock.replay();
-
+		Resource resource = mock(Resource.class);
 		ResourceScriptSource scriptSource = new ResourceScriptSource(resource);
 		assertTrue(scriptSource.isModified());
-		mock.verify();
 	}
 
 	public void testLastModifiedWorksWithResourceThatDoesNotSupportFileBasedReading() throws Exception {
-		MockControl mock = MockControl.createControl(Resource.class);
-		Resource resource = (Resource) mock.getMock();
+		Resource resource = mock(Resource.class);
 		// underlying File is asked for so that the last modified time can be checked...
-		resource.lastModified();
-		mock.setReturnValue(100, 2);
+		// And then mock the file changing; i.e. the File says it has been modified
+		given(resource.lastModified()).willReturn(100L, 100L, 200L);
 		// does not support File-based reading; delegates to InputStream-style reading...
 		//resource.getFile();
 		//mock.setThrowable(new FileNotFoundException());
-		resource.getInputStream();
-		mock.setReturnValue(new ByteArrayInputStream(new byte[0]));
-		// And then mock the file changing; i.e. the File says it has been modified
-		resource.lastModified();
-		mock.setReturnValue(200);
-		mock.replay();
+		given(resource.getInputStream()).willReturn(new ByteArrayInputStream(new byte[0]));
 
 		ResourceScriptSource scriptSource = new ResourceScriptSource(resource);
 		assertTrue("ResourceScriptSource must start off in the 'isModified' state (it obviously isn't).", scriptSource.isModified());
@@ -85,7 +73,6 @@ public class ResourceScriptSourceTests extends TestCase {
 		assertFalse("ResourceScriptSource must not report back as being modified if the underlying File resource is not reporting a changed lastModified time.", scriptSource.isModified());
 		// Must now report back as having been modified
 		assertTrue("ResourceScriptSource must report back as being modified if the underlying File resource is reporting a changed lastModified time.", scriptSource.isModified());
-		mock.verify();
 	}
 
 	public void testLastModifiedWorksWithResourceThatDoesNotSupportFileBasedAccessAtAll() throws Exception {
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
index db4323a318..7b6b40b258 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
@@ -16,8 +16,8 @@
 
 package org.springframework.scripting.support;
 
+import static org.mockito.Mockito.mock;
 import junit.framework.TestCase;
-import org.easymock.MockControl;
 
 import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.factory.BeanFactory;
@@ -75,15 +75,12 @@ public class ScriptFactoryPostProcessorTests extends TestCase {
 	}
 
 	public void testThrowsExceptionIfGivenNonAbstractBeanFactoryImplementation() throws Exception {
-		MockControl mock = MockControl.createControl(BeanFactory.class);
-		mock.replay();
 		try {
-			new ScriptFactoryPostProcessor().setBeanFactory((BeanFactory) mock.getMock());
+			new ScriptFactoryPostProcessor().setBeanFactory(mock(BeanFactory.class));
 			fail("Must have thrown exception by this point.");
 		}
 		catch (IllegalStateException expected) {
 		}
-		mock.verify();
 	}
 
 	public void testChangeScriptWithRefreshableBeanFunctionality() throws Exception {
diff --git a/spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java b/spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java
new file mode 100644
index 0000000000..63d4524987
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java
@@ -0,0 +1,88 @@
+/*
+ * 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.build.test.mockito;
+
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.List;
+
+import org.mockito.Mockito;
+import org.mockito.internal.util.MockUtil;
+import org.mockito.invocation.Invocation;
+
+/**
+ * General test utilities for use with {@link Mockito}.
+ *
+ * @author Phillip Webb
+ */
+public class MockitoUtils {
+
+	private static MockUtil mockUtil = new MockUtil();
+
+	/**
+	 * Verify the same invocations have been applied to two mocks. This is generally not
+	 * the preferred way test with mockito and should be avoided if possible.
+	 * @param expected the mock containing expected invocations
+	 * @param actual the mock containing actual invocations
+	 * @param argumentAdapters adapters that can be used to change argument values before
+	 *        they are compared
+	 */
+	public static <T> void verifySameInvocations(T expected, T actual, InvocationArgumentsAdapter... argumentAdapters) {
+		List<Invocation> expectedInvocations = mockUtil.getMockHandler(expected).getInvocationContainer().getInvocations();
+		List<Invocation> actualInvocations = mockUtil.getMockHandler(actual).getInvocationContainer().getInvocations();
+		verifySameInvocations(expectedInvocations, actualInvocations, argumentAdapters);
+	}
+
+	private static void verifySameInvocations(List<Invocation> expectedInvocations, List<Invocation> actualInvocations, InvocationArgumentsAdapter... argumentAdapters) {
+		assertThat(expectedInvocations.size(), is(equalTo(actualInvocations.size())));
+		for (int i = 0; i < expectedInvocations.size(); i++) {
+			verifySameInvocation(expectedInvocations.get(i), actualInvocations.get(i), argumentAdapters);
+		}
+	}
+
+	private static void verifySameInvocation(Invocation expectedInvocation, Invocation actualInvocation, InvocationArgumentsAdapter... argumentAdapters) {
+		System.out.println(expectedInvocation);
+		System.out.println(actualInvocation);
+		assertThat(expectedInvocation.getMethod(), is(equalTo(actualInvocation.getMethod())));
+		Object[] expectedArguments = getInvocationArguments(expectedInvocation, argumentAdapters);
+		Object[] actualArguments = getInvocationArguments(actualInvocation, argumentAdapters);
+		assertThat(expectedArguments, is(equalTo(actualArguments)));
+	}
+
+	private static Object[] getInvocationArguments(Invocation invocation, InvocationArgumentsAdapter... argumentAdapters) {
+		Object[] arguments = invocation.getArguments();
+		for (InvocationArgumentsAdapter adapter : argumentAdapters) {
+			arguments = adapter.adaptArguments(arguments);
+		}
+		return arguments;
+	}
+
+	/**
+	 * Adapter strategy that can be used to change invocation arguments.
+	 */
+	public static interface InvocationArgumentsAdapter {
+
+		/**
+		 * Change the arguments if required
+		 * @param arguments the source arguments
+		 * @return updated or original arguments (never {@code null})
+		 */
+		Object[] adaptArguments(Object[] arguments);
+	}
+}
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 3ab6a1655b..d160d596f7 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
@@ -16,347 +16,228 @@
 
 package org.springframework.util.xml;
 
-import java.io.IOException;
+import static org.mockito.BDDMockito.willAnswer;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+
 import java.io.InputStream;
-import java.util.Arrays;
+
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 
-import org.easymock.AbstractMatcher;
-import org.easymock.MockControl;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.springframework.build.test.mockito.MockitoUtils;
+import org.springframework.build.test.mockito.MockitoUtils.InvocationArgumentsAdapter;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.ext.LexicalHandler;
 import org.xml.sax.helpers.AttributesImpl;
 import org.xml.sax.helpers.XMLReaderFactory;
 
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-
 public abstract class AbstractStaxXMLReaderTestCase {
 
 	protected static XMLInputFactory inputFactory;
 
 	private XMLReader standardReader;
 
-	private MockControl contentHandlerControl;
-
-	private ContentHandler contentHandler;
+	private ContentHandler standardContentHandler;
 
 	@Before
 	public void setUp() throws Exception {
 		inputFactory = XMLInputFactory.newInstance();
 		standardReader = XMLReaderFactory.createXMLReader();
-		contentHandlerControl = MockControl.createStrictControl(ContentHandler.class);
-		contentHandlerControl.setDefaultMatcher(new SaxArgumentMatcher());
-		ContentHandler contentHandlerMock = (ContentHandler) contentHandlerControl.getMock();
-		contentHandler = new CopyingContentHandler(contentHandlerMock);
-		standardReader.setContentHandler(contentHandler);
+		standardContentHandler = mockContentHandler();
+		standardReader.setContentHandler(standardContentHandler);
+	}
+
+	@Test
+	public void contentHandlerNamespacesNoPrefixes() throws Exception {
+		standardReader.setFeature("http://xml.org/sax/features/namespaces", true);
+		standardReader.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
+		standardReader.parse(new InputSource(createTestInputStream()));
+
+		AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(createTestInputStream());
+		ContentHandler contentHandler = mockContentHandler();
+		staxXmlReader.setFeature("http://xml.org/sax/features/namespaces", true);
+		staxXmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
+		staxXmlReader.setContentHandler(contentHandler);
+		staxXmlReader.parse(new InputSource());
+
+		verifyIdenticalInvocations(standardContentHandler, contentHandler);
+	}
+
+	@Test
+	public void contentHandlerNamespacesPrefixes() throws Exception {
+		standardReader.setFeature("http://xml.org/sax/features/namespaces", true);
+		standardReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
+		standardReader.parse(new InputSource(createTestInputStream()));
+
+		AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(createTestInputStream());
+		ContentHandler contentHandler = mockContentHandler();
+		staxXmlReader.setFeature("http://xml.org/sax/features/namespaces", true);
+		staxXmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
+		staxXmlReader.setContentHandler(contentHandler);
+		staxXmlReader.parse(new InputSource());
+
+		verifyIdenticalInvocations(standardContentHandler, contentHandler);
+	}
+
+	@Test
+	public void contentHandlerNoNamespacesPrefixes() throws Exception {
+		standardReader.setFeature("http://xml.org/sax/features/namespaces", false);
+		standardReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
+		standardReader.parse(new InputSource(createTestInputStream()));
+
+		AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(createTestInputStream());
+		ContentHandler contentHandler = mockContentHandler();
+		staxXmlReader.setFeature("http://xml.org/sax/features/namespaces", false);
+		staxXmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
+		staxXmlReader.setContentHandler(contentHandler);
+		staxXmlReader.parse(new InputSource());
+
+		verifyIdenticalInvocations(standardContentHandler, contentHandler);
+	}
+
+	@Test
+	public void lexicalHandler() throws Exception {
+		Resource testLexicalHandlerXml = new ClassPathResource("testLexicalHandler.xml", getClass());
+
+		LexicalHandler expectedLexicalHandler = mockLexicalHandler();
+		standardReader.setContentHandler(null);
+		standardReader.setProperty("http://xml.org/sax/properties/lexical-handler", expectedLexicalHandler);
+		standardReader.parse(new InputSource(testLexicalHandlerXml.getInputStream()));
+		inputFactory.setProperty("javax.xml.stream.isCoalescing", Boolean.FALSE);
+		inputFactory.setProperty("http://java.sun.com/xml/stream/properties/report-cdata-event", Boolean.TRUE);
+		inputFactory.setProperty("javax.xml.stream.isReplacingEntityReferences", Boolean.FALSE);
+		inputFactory.setProperty("javax.xml.stream.isSupportingExternalEntities", Boolean.FALSE);
+
+		LexicalHandler actualLexicalHandler = mockLexicalHandler();
+		willAnswer(new Answer<Object>() {
+			public Object answer(InvocationOnMock invocation) throws Throwable {
+				return invocation.getArguments()[0] = "element";
+			}
+		}).given(actualLexicalHandler).startDTD(anyString(), anyString(), anyString());
+		AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(testLexicalHandlerXml.getInputStream());
+		staxXmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", actualLexicalHandler);
+		staxXmlReader.parse(new InputSource());
+
+		verifyIdenticalInvocations(expectedLexicalHandler, actualLexicalHandler);
+	}
+
+	private final LexicalHandler mockLexicalHandler() throws Exception {
+		LexicalHandler lexicalHandler = mock(LexicalHandler.class);
+		willAnswer(new CopyCharsAnswer()).given(lexicalHandler).comment(any(char[].class), anyInt(), anyInt());
+		return lexicalHandler;
 	}
 
 	private InputStream createTestInputStream() {
 		return getClass().getResourceAsStream("testContentHandler.xml");
 	}
 
-	@Test
-	public void contentHandlerNamespacesNoPrefixes() throws SAXException, IOException, XMLStreamException {
-		standardReader.setFeature("http://xml.org/sax/features/namespaces", true);
-		standardReader.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
-
-		standardReader.parse(new InputSource(createTestInputStream()));
-		contentHandlerControl.replay();
-
-		AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(createTestInputStream());
-		staxXmlReader.setFeature("http://xml.org/sax/features/namespaces", true);
-		staxXmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
-
-		staxXmlReader.setContentHandler(contentHandler);
-		staxXmlReader.parse(new InputSource());
-		contentHandlerControl.verify();
-	}
-
-	@Test
-	public void contentHandlerNamespacesPrefixes() throws SAXException, IOException, XMLStreamException {
-		standardReader.setFeature("http://xml.org/sax/features/namespaces", true);
-		standardReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
-
-		standardReader.parse(new InputSource(createTestInputStream()));
-		contentHandlerControl.replay();
-
-		AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(createTestInputStream());
-		staxXmlReader.setFeature("http://xml.org/sax/features/namespaces", true);
-		staxXmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
-
-		staxXmlReader.setContentHandler(contentHandler);
-		staxXmlReader.parse(new InputSource());
-		contentHandlerControl.verify();
-	}
-
-	@Test
-	public void contentHandlerNoNamespacesPrefixes() throws SAXException, IOException, XMLStreamException {
-		standardReader.setFeature("http://xml.org/sax/features/namespaces", false);
-		standardReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
-
-		standardReader.parse(new InputSource(createTestInputStream()));
-		contentHandlerControl.replay();
-
-		AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(createTestInputStream());
-		staxXmlReader.setFeature("http://xml.org/sax/features/namespaces", false);
-		staxXmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
-
-		staxXmlReader.setContentHandler(contentHandler);
-		staxXmlReader.parse(new InputSource());
-		contentHandlerControl.verify();
-	}
-
-	@Test
-	public void lexicalHandler() throws SAXException, IOException, XMLStreamException {
-		MockControl lexicalHandlerControl = MockControl.createStrictControl(LexicalHandler.class);
-		lexicalHandlerControl.setDefaultMatcher(new SaxArgumentMatcher());
-		LexicalHandler lexicalHandlerMock = (LexicalHandler) lexicalHandlerControl.getMock();
-		LexicalHandler lexicalHandler = new CopyingLexicalHandler(lexicalHandlerMock);
-
-		Resource testLexicalHandlerXml = new ClassPathResource("testLexicalHandler.xml", getClass());
-
-		standardReader.setContentHandler(null);
-		standardReader.setProperty("http://xml.org/sax/properties/lexical-handler", lexicalHandler);
-		standardReader.parse(new InputSource(testLexicalHandlerXml.getInputStream()));
-		lexicalHandlerControl.replay();
-
-		inputFactory.setProperty("javax.xml.stream.isCoalescing", Boolean.FALSE);
-		inputFactory.setProperty("http://java.sun.com/xml/stream/properties/report-cdata-event", Boolean.TRUE);
-		inputFactory.setProperty("javax.xml.stream.isReplacingEntityReferences", Boolean.FALSE);
-		inputFactory.setProperty("javax.xml.stream.isSupportingExternalEntities", Boolean.FALSE);
-
-		AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(testLexicalHandlerXml.getInputStream());
-
-		staxXmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", lexicalHandler);
-		staxXmlReader.parse(new InputSource());
-		lexicalHandlerControl.verify();
-	}
-
 	protected abstract AbstractStaxXMLReader createStaxXmlReader(InputStream inputStream) throws XMLStreamException;
 
-	/** Easymock {@code AbstractMatcher} implementation that matches SAX arguments. */
-	@SuppressWarnings("serial")
-	protected static class SaxArgumentMatcher extends AbstractMatcher {
+	protected final ContentHandler mockContentHandler() throws Exception {
+		ContentHandler contentHandler = mock(ContentHandler.class);
+		willAnswer(new CopyCharsAnswer()).given(contentHandler).characters(any(char[].class), anyInt(), anyInt());
+		willAnswer(new CopyCharsAnswer()).given(contentHandler).ignorableWhitespace(any(char[].class), anyInt(), anyInt());
+		willAnswer(new Answer<Object>() {
+			public Object answer(InvocationOnMock invocation) throws Throwable {
+				invocation.getArguments()[3] = new AttributesImpl((Attributes) invocation.getArguments()[3]);
+				return null;
+			}
+		}).given(contentHandler).startElement(anyString(), anyString(), anyString(), any(Attributes.class));
+		return contentHandler;
+	}
 
-		@Override
-		public boolean matches(Object[] expected, Object[] actual) {
-			if (expected == actual) {
-				return true;
+	protected <T> void verifyIdenticalInvocations(T expected, T actual) {
+		MockitoUtils.verifySameInvocations(expected, actual,
+				new SkipLocatorArgumentsAdapter(), new CharArrayToStringAdapter(), new PartialAttributesAdapter());
+	}
+
+	private static class SkipLocatorArgumentsAdapter implements InvocationArgumentsAdapter {
+		public Object[] adaptArguments(Object[] arguments) {
+			for(int i=0; i<arguments.length; i++) {
+				if(arguments[i] instanceof Locator) {
+					arguments[i] = null;
+				}
 			}
-			if (expected == null || actual == null) {
-				return false;
-			}
-			if (expected.length != actual.length) {
-				throw new IllegalArgumentException("Expected and actual arguments must have the same size");
-			}
-			if (expected.length == 3 && expected[0] instanceof char[] && expected[1] instanceof Integer &&
-					expected[2] instanceof Integer) {
-				// handling of the character(char[], int, int) methods
-				String expectedString = new String((char[]) expected[0], (Integer) expected[1], (Integer) expected[2]);
-				String actualString = new String((char[]) actual[0], (Integer) actual[1], (Integer) actual[2]);
-				return expectedString.equals(actualString);
-			}
-			else if (expected.length == 1 && (expected[0] instanceof Locator)) {
-				return true;
-			}
-			else {
-				return super.matches(expected, actual);
+			return arguments;
+		}
+	}
+
+	private static class CharArrayToStringAdapter implements InvocationArgumentsAdapter {
+		public Object[] adaptArguments(Object[] arguments) {
+			if(arguments.length == 3 && arguments[0] instanceof char[]
+					&& arguments[1] instanceof Integer && arguments[2] instanceof Integer) {
+				return new Object[] {new String((char[]) arguments[0], (Integer) arguments[1], (Integer) arguments[2])};
 			}
+			return arguments;
+		}
+	}
+
+	private static class PartialAttributesAdapter implements InvocationArgumentsAdapter {
+		public Object[] adaptArguments(Object[] arguments) {
+			for (int i = 0; i < arguments.length; i++) {
+				if(arguments[i] instanceof Attributes) {
+					arguments[i] = new PartialAttributes((Attributes) arguments[i]);
+				}
+			};
+			return arguments;
+		}
+	}
+
+	private static class CopyCharsAnswer implements Answer<Object> {
+		public Object answer(InvocationOnMock invocation) throws Throwable {
+			char[] chars = (char[]) invocation.getArguments()[0];
+			char[] copy = new char[chars.length];
+			System.arraycopy(chars, 0, copy, 0, chars.length);
+			invocation.getArguments()[0] = copy;
+			return null;
+		}
+	}
+
+	private static class PartialAttributes {
+
+		private Attributes attributes;
+
+		public PartialAttributes(Attributes attributes) {
+			this.attributes = attributes;
 		}
 
 		@Override
-		protected boolean argumentMatches(Object expected, Object actual) {
-			if (expected instanceof char[]) {
-				return Arrays.equals((char[]) expected, (char[]) actual);
-			}
-			else if (expected instanceof Attributes) {
-				Attributes expectedAttributes = (Attributes) expected;
-				Attributes actualAttributes = (Attributes) actual;
-				if (expectedAttributes.getLength() != actualAttributes.getLength()) {
+		public int hashCode() {
+			return 1;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			Attributes other = ((PartialAttributes) obj).attributes;
+			for (int i = 0; i < other.getLength(); i++) {
+				boolean found = false;
+				for (int j = 0; j < attributes.getLength(); j++) {
+					if (other.getURI(i).equals(attributes.getURI(j))
+							&& other.getQName(i).equals(attributes.getQName(j))
+							&& other.getType(i).equals(attributes.getType(j))
+							&& other.getValue(i).equals(attributes.getValue(j))) {
+						found = true;
+						break;
+					}
+				}
+				if (!found) {
 					return false;
 				}
-				for (int i = 0; i < expectedAttributes.getLength(); i++) {
-					boolean found = false;
-					for (int j = 0; j < actualAttributes.getLength(); j++) {
-						if (expectedAttributes.getURI(i).equals(actualAttributes.getURI(j)) &&
-								expectedAttributes.getQName(i).equals(actualAttributes.getQName(j)) &&
-								expectedAttributes.getType(i).equals(actualAttributes.getType(j)) &&
-								expectedAttributes.getValue(i).equals(actualAttributes.getValue(j))) {
-							found = true;
-							break;
-						}
-					}
-					if (!found) {
-						return false;
-					}
-				}
-				return true;
-			}
-			else {
-				return super.argumentMatches(expected, actual);
-			}
-		}
-
-		@Override
-		public String toString(Object[] arguments) {
-			if (arguments != null && arguments.length == 3 && arguments[0] instanceof char[] &&
-					arguments[1] instanceof Integer && arguments[2] instanceof Integer) {
-				return new String((char[]) arguments[0], (Integer) arguments[1], (Integer) arguments[2]);
-			}
-			else {
-				return super.toString(arguments);
-			}
-		}
-
-		@Override
-		protected String argumentToString(Object argument) {
-			if (argument instanceof char[]) {
-				char[] array = (char[]) argument;
-				StringBuilder buffer = new StringBuilder();
-				for (char anArray : array) {
-					buffer.append(anArray);
-				}
-				return buffer.toString();
-			}
-			else if (argument instanceof Attributes) {
-				Attributes attributes = (Attributes) argument;
-				StringBuilder buffer = new StringBuilder("[");
-				for (int i = 0; i < attributes.getLength(); i++) {
-					if (attributes.getURI(i).length() != 0) {
-						buffer.append('{');
-						buffer.append(attributes.getURI(i));
-						buffer.append('}');
-					}
-					if (attributes.getQName(i).length() != 0) {
-						buffer.append(attributes.getQName(i));
-					}
-					buffer.append('=');
-					buffer.append(attributes.getValue(i));
-					if (i < attributes.getLength() - 1) {
-						buffer.append(", ");
-					}
-				}
-				buffer.append(']');
-				return buffer.toString();
-			}
-			else if (argument instanceof Locator) {
-				Locator locator = (Locator) argument;
-				StringBuilder buffer = new StringBuilder("[");
-				buffer.append(locator.getLineNumber());
-				buffer.append(',');
-				buffer.append(locator.getColumnNumber());
-				buffer.append(']');
-				return buffer.toString();
-			}
-			else {
-				return super.argumentToString(argument);
 			}
+			return true;
 		}
 	}
-
-	private static class CopyingContentHandler implements ContentHandler {
-
-		private final ContentHandler wrappee;
-
-		private CopyingContentHandler(ContentHandler wrappee) {
-			this.wrappee = wrappee;
-		}
-
-		public void setDocumentLocator(Locator locator) {
-			wrappee.setDocumentLocator(locator);
-		}
-
-		public void startDocument() throws SAXException {
-			wrappee.startDocument();
-		}
-
-		public void endDocument() throws SAXException {
-			wrappee.endDocument();
-		}
-
-		public void startPrefixMapping(String prefix, String uri) throws SAXException {
-			wrappee.startPrefixMapping(prefix, uri);
-		}
-
-		public void endPrefixMapping(String prefix) throws SAXException {
-			wrappee.endPrefixMapping(prefix);
-		}
-
-		public void startElement(String uri, String localName, String qName, Attributes attributes)
-				throws SAXException {
-			wrappee.startElement(uri, localName, qName, new AttributesImpl(attributes));
-		}
-
-		public void endElement(String uri, String localName, String qName) throws SAXException {
-			wrappee.endElement(uri, localName, qName);
-		}
-
-		public void characters(char ch[], int start, int length) throws SAXException {
-			wrappee.characters(copy(ch), start, length);
-		}
-
-		public void ignorableWhitespace(char ch[], int start, int length) throws SAXException {
-		}
-
-		public void processingInstruction(String target, String data) throws SAXException {
-			wrappee.processingInstruction(target, data);
-		}
-
-		public void skippedEntity(String name) throws SAXException {
-			wrappee.skippedEntity(name);
-		}
-	}
-
-	private static class CopyingLexicalHandler implements LexicalHandler {
-
-		private final LexicalHandler wrappee;
-
-		private CopyingLexicalHandler(LexicalHandler wrappee) {
-			this.wrappee = wrappee;
-		}
-
-		public void startDTD(String name, String publicId, String systemId) throws SAXException {
-			wrappee.startDTD("element", publicId, systemId);
-		}
-
-		public void endDTD() throws SAXException {
-			wrappee.endDTD();
-		}
-
-		public void startEntity(String name) throws SAXException {
-			wrappee.startEntity(name);
-		}
-
-		public void endEntity(String name) throws SAXException {
-			wrappee.endEntity(name);
-		}
-
-		public void startCDATA() throws SAXException {
-			wrappee.startCDATA();
-		}
-
-		public void endCDATA() throws SAXException {
-			wrappee.endCDATA();
-		}
-
-		public void comment(char ch[], int start, int length) throws SAXException {
-			wrappee.comment(copy(ch), start, length);
-		}
-	}
-
-	private static char[] copy(char[] ch) {
-		char[] copy = new char[ch.length];
-		System.arraycopy(ch, 0, copy, 0, ch.length);
-		return copy;
-	}
-
 }
diff --git a/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
index f13cf00318..39e6bd1f35 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
@@ -16,13 +16,15 @@
 
 package org.springframework.util.xml;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.io.InputStream;
 import java.io.StringReader;
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 
-import org.easymock.MockControl;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.AttributesImpl;
@@ -41,21 +43,13 @@ public class StaxEventXMLReaderTests extends AbstractStaxXMLReaderTestCase {
 		XMLEventReader eventReader = inputFactory.createXMLEventReader(new StringReader(CONTENT));
 		eventReader.nextTag(); // skip to root
 		StaxEventXMLReader xmlReader = new StaxEventXMLReader(eventReader);
-
-		MockControl mockControl = MockControl.createStrictControl(ContentHandler.class);
-		mockControl.setDefaultMatcher(new SaxArgumentMatcher());
-		ContentHandler contentHandlerMock = (ContentHandler) mockControl.getMock();
-
-		contentHandlerMock.startDocument();
-		contentHandlerMock.startElement("http://springframework.org/spring-ws", "child", "child", new AttributesImpl());
-		contentHandlerMock.endElement("http://springframework.org/spring-ws", "child", "child");
-		contentHandlerMock.endDocument();
-
-		xmlReader.setContentHandler(contentHandlerMock);
-		mockControl.replay();
+		ContentHandler contentHandler = mock(ContentHandler.class);
+		xmlReader.setContentHandler(contentHandler);
 		xmlReader.parse(new InputSource());
-		mockControl.verify();
+		verify(contentHandler).startDocument();
+		verify(contentHandler).startElement("http://springframework.org/spring-ws", "child", "child", new AttributesImpl());
+		verify(contentHandler).endElement("http://springframework.org/spring-ws", "child", "child");
+		verify(contentHandler).endDocument();
 	}
-
 }
 
diff --git a/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
index f9a00625d0..2552d2b7ac 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
@@ -23,12 +23,17 @@ import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.easymock.MockControl;
 import static org.junit.Assert.*;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import org.junit.Test;
+import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
-import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.Locator;
 
 public class StaxStreamXMLReaderTests extends AbstractStaxXMLReaderTestCase {
 
@@ -51,22 +56,15 @@ public class StaxStreamXMLReaderTests extends AbstractStaxXMLReaderTestCase {
 				streamReader.getName());
 		StaxStreamXMLReader xmlReader = new StaxStreamXMLReader(streamReader);
 
-		MockControl mockControl = MockControl.createStrictControl(ContentHandler.class);
-		mockControl.setDefaultMatcher(new SaxArgumentMatcher());
-		ContentHandler contentHandlerMock = (ContentHandler) mockControl.getMock();
-
-		contentHandlerMock.setDocumentLocator(null);
-		mockControl.setMatcher(MockControl.ALWAYS_MATCHER);
-		contentHandlerMock.startDocument();
-		contentHandlerMock.startElement("http://springframework.org/spring-ws", "child", "child", new AttributesImpl());
-		contentHandlerMock.endElement("http://springframework.org/spring-ws", "child", "child");
-		contentHandlerMock.endDocument();
-
-		xmlReader.setContentHandler(contentHandlerMock);
-		mockControl.replay();
+		ContentHandler contentHandler = mock(ContentHandler.class);
+		xmlReader.setContentHandler(contentHandler);
 		xmlReader.parse(new InputSource());
-		mockControl.verify();
+
+		verify(contentHandler).setDocumentLocator(any(Locator.class));
+		verify(contentHandler).startDocument();
+		verify(contentHandler).startElement(eq("http://springframework.org/spring-ws"), eq("child"), eq("child"), any(Attributes.class));
+		verify(contentHandler).endElement("http://springframework.org/spring-ws", "child", "child");
+		verify(contentHandler).endDocument();
 	}
 
-
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java b/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java
new file mode 100644
index 0000000000..da69a9831f
--- /dev/null
+++ b/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2002-2007 the original author 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.build.test.hamcrest;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.junit.Rule;
+import org.junit.rules.ExpectedException;
+
+/**
+ * Additional hamcrest matchers.
+ *
+ * @author Phillip Webb
+ */
+public class Matchers {
+
+	/**
+	 * Create a matcher that wrapps the specified matcher and tests against the
+	 * {@link Throwable#getCause() cause} of an exception. If the item tested
+	 * is {@code null} not a {@link Throwable} the wrapped matcher will be called
+	 * with a {@code null} item.
+	 *
+	 * <p>Often useful when working with JUnit {@link ExpectedException}
+	 * {@link Rule @Rule}s, for example:
+	 * <pre>
+	 * thrown.expect(DataAccessException.class);
+	 * thrown.except(exceptionCause(isA(SQLException.class)));
+	 * </pre>
+	 *
+	 * @param matcher the matcher to wrap (must not be null)
+	 * @return a matcher that tests using the exception cause
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T> Matcher<T> exceptionCause(final Matcher<T> matcher) {
+		return (Matcher<T>) new BaseMatcher<Object>() {
+			@Override
+			public boolean matches(Object item) {
+				Throwable cause = null;
+				if(item != null && item instanceof Throwable) {
+					cause = ((Throwable)item).getCause();
+				}
+				return matcher.matches(cause);
+			}
+
+			@Override
+			public void describeTo(Description description) {
+				description.appendText("exception cause ").appendDescriptionOf(matcher);
+			}
+		};
+	}
+
+}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java
deleted file mode 100644
index 8cf9e5fdaf..0000000000
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * AbstractJdbcTests.java
- *
- * Copyright (C) 2002 by Interprise Software.  All rights reserved.
- */
-/*
- * 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.jdbc;
-
-import java.sql.Connection;
-
-import javax.sql.DataSource;
-
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-
-/**
- * @author Trevor D. Cook
- */
-public abstract class AbstractJdbcTests extends TestCase {
-
-	protected MockControl ctrlDataSource;
-	protected DataSource mockDataSource;
-	protected MockControl ctrlConnection;
-	protected Connection mockConnection;
-
-	/**
-	 * Set to true if the user wants verification, indicated
-	 * by a call to replay(). We need to make this optional,
-	 * otherwise we setUp() will always result in verification failures
-	 */
-	private boolean shouldVerify;
-
-	@Override
-	protected void setUp() throws Exception {
-		this.shouldVerify = false;
-		super.setUp();
-
-		ctrlConnection = MockControl.createControl(Connection.class);
-		mockConnection = (Connection) ctrlConnection.getMock();
-		mockConnection.getMetaData();
-		ctrlConnection.setDefaultReturnValue(null);
-		mockConnection.close();
-		ctrlConnection.setDefaultVoidCallable();
-
-		ctrlDataSource = MockControl.createControl(DataSource.class);
-		mockDataSource = (DataSource) ctrlDataSource.getMock();
-		mockDataSource.getConnection();
-		ctrlDataSource.setDefaultReturnValue(mockConnection);
-	}
-
-	protected void replay() {
-		ctrlDataSource.replay();
-		ctrlConnection.replay();
-		this.shouldVerify = true;
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-
-		// we shouldn't verify unless the user called replay()
-		if (shouldVerify()) {
-			ctrlDataSource.verify();
-			//ctrlConnection.verify();
-		}
-	}
-
-	protected boolean shouldVerify() {
-		return this.shouldVerify;
-	}
-
-}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
index ed87fd3edc..996f96f329 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
@@ -16,6 +16,12 @@
 
 package org.springframework.jdbc.core;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -23,9 +29,6 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-import org.apache.commons.logging.LogFactory;
 
 import org.springframework.jdbc.core.test.ConcretePerson;
 import org.springframework.jdbc.core.test.Person;
@@ -39,254 +42,16 @@ import org.springframework.jdbc.support.SQLStateSQLExceptionTranslator;
  *
  * @author Thomas Risberg
  */
-public abstract class AbstractRowMapperTests extends TestCase {
+public abstract class AbstractRowMapperTests {
 
-	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
-
-	protected MockControl conControl;
-	protected Connection con;
-	protected MockControl conControl2;
-	protected Connection con2;
-	protected MockControl conControl3;
-	protected Connection con3;
-
-	protected MockControl rsmdControl;
-	protected ResultSetMetaData rsmd;
-	protected MockControl rsControl;
-	protected ResultSet rs;
-	protected MockControl stmtControl;
-	protected Statement stmt;
-	protected JdbcTemplate jdbcTemplate;
-
-	protected MockControl rsmdControl2;
-	protected ResultSetMetaData rsmd2;
-	protected MockControl rsControl2;
-	protected ResultSet rs2;
-	protected MockControl stmtControl2;
-	protected Statement stmt2;
-	protected JdbcTemplate jdbcTemplate2;
-
-	protected MockControl rsmdControl3;
-	protected ResultSetMetaData rsmd3;
-	protected MockControl rsControl3;
-	protected ResultSet rs3;
-	protected MockControl stmtControl3;
-	protected Statement stmt3;
-	protected JdbcTemplate jdbcTemplate3;
-
-	@Override
-	protected void setUp() throws SQLException {
-		conControl = MockControl.createControl(Connection.class);
-		con = (Connection) conControl.getMock();
-		con.isClosed();
-		conControl.setDefaultReturnValue(false);
-
-		rsmdControl = MockControl.createControl(ResultSetMetaData.class);
-		rsmd = (ResultSetMetaData)rsmdControl.getMock();
-		rsmd.getColumnCount();
-		rsmdControl.setReturnValue(4, 1);
-		rsmd.getColumnLabel(1);
-		rsmdControl.setReturnValue("name", 1);
-		rsmd.getColumnLabel(2);
-		rsmdControl.setReturnValue("age", 1);
-		rsmd.getColumnLabel(3);
-		rsmdControl.setReturnValue("birth_date", 1);
-		rsmd.getColumnLabel(4);
-		rsmdControl.setReturnValue("balance", 1);
-		rsmdControl.replay();
-
-		rsControl = MockControl.createControl(ResultSet.class);
-		rs = (ResultSet) rsControl.getMock();
-		rs.getMetaData();
-		rsControl.setReturnValue(rsmd, 1);
-		rs.next();
-		rsControl.setReturnValue(true, 1);
-		rs.getString(1);
-		rsControl.setReturnValue("Bubba", 1);
-		rs.wasNull();
-		rsControl.setReturnValue(false, 1);
-		rs.getLong(2);
-		rsControl.setReturnValue(22, 1);
-		rs.getTimestamp(3);
-		rsControl.setReturnValue(new Timestamp(1221222L), 1);
-		rs.getBigDecimal(4);
-		rsControl.setReturnValue(new BigDecimal("1234.56"), 1);
-		rs.next();
-		rsControl.setReturnValue(false, 1);
-		rs.close();
-		rsControl.setVoidCallable(1);
-		rsControl.replay();
-
-		stmtControl = MockControl.createControl(Statement.class);
-		stmt = (Statement) stmtControl.getMock();
-
-		con.createStatement();
-		conControl.setReturnValue(stmt, 1);
-		stmt.executeQuery("select name, age, birth_date, balance from people");
-		stmtControl.setReturnValue(rs, 1);
-		if (debugEnabled) {
-			stmt.getWarnings();
-			stmtControl.setReturnValue(null, 1);
-		}
-		stmt.close();
-		stmtControl.setVoidCallable(1);
-
-		conControl.replay();
-		stmtControl.replay();
-
-		conControl2 = MockControl.createControl(Connection.class);
-		con2 = (Connection) conControl2.getMock();
-		con2.isClosed();
-		conControl2.setDefaultReturnValue(false);
-
-		rsmdControl2 = MockControl.createControl(ResultSetMetaData.class);
-		rsmd2 = (ResultSetMetaData)rsmdControl2.getMock();
-		rsmd2.getColumnCount();
-		rsmdControl2.setReturnValue(4, 2);
-		rsmd2.getColumnLabel(1);
-		rsmdControl2.setReturnValue("name", 2);
-		rsmd2.getColumnLabel(2);
-		rsmdControl2.setReturnValue("age", 2);
-		rsmd2.getColumnLabel(3);
-		rsmdControl2.setReturnValue("birth_date", 1);
-		rsmd2.getColumnLabel(4);
-		rsmdControl2.setReturnValue("balance", 1);
-		rsmdControl2.replay();
-
-		rsControl2 = MockControl.createControl(ResultSet.class);
-		rs2 = (ResultSet) rsControl2.getMock();
-		rs2.getMetaData();
-		rsControl2.setReturnValue(rsmd2, 2);
-		rs2.next();
-		rsControl2.setReturnValue(true, 2);
-		rs2.getString(1);
-		rsControl2.setReturnValue("Bubba", 2);
-		rs2.wasNull();
-		rsControl2.setReturnValue(true, 2);
-		rs2.getLong(2);
-		rsControl2.setReturnValue(0, 2);
-		rs2.getTimestamp(3);
-		rsControl2.setReturnValue(new Timestamp(1221222L), 1);
-		rs2.getBigDecimal(4);
-		rsControl2.setReturnValue(new BigDecimal("1234.56"), 1);
-		rs2.next();
-		rsControl2.setReturnValue(false, 1);
-		rs2.close();
-		rsControl2.setVoidCallable(2);
-		rsControl2.replay();
-
-		stmtControl2 = MockControl.createControl(Statement.class);
-		stmt2 = (Statement) stmtControl2.getMock();
-
-		con2.createStatement();
-		conControl2.setReturnValue(stmt2, 2);
-		stmt2.executeQuery("select name, null as age, birth_date, balance from people");
-		stmtControl2.setReturnValue(rs2, 2);
-		if (debugEnabled) {
-			stmt2.getWarnings();
-			stmtControl2.setReturnValue(null, 2);
-		}
-		stmt2.close();
-		stmtControl2.setVoidCallable(2);
-
-		conControl2.replay();
-		stmtControl2.replay();
-
-		conControl3 = MockControl.createControl(Connection.class);
-		con3 = (Connection) conControl3.getMock();
-		con3.isClosed();
-		conControl3.setDefaultReturnValue(false);
-
-		rsmdControl3 = MockControl.createControl(ResultSetMetaData.class);
-		rsmd3 = (ResultSetMetaData)rsmdControl3.getMock();
-		rsmd3.getColumnCount();
-		rsmdControl3.setReturnValue(4, 1);
-		rsmd3.getColumnLabel(1);
-		rsmdControl3.setReturnValue("Last Name", 1);
-		rsmd3.getColumnLabel(2);
-		rsmdControl3.setReturnValue("age", 1);
-		rsmd3.getColumnLabel(3);
-		rsmdControl3.setReturnValue("birth_date", 1);
-		rsmd3.getColumnLabel(4);
-		rsmdControl3.setReturnValue("balance", 1);
-		rsmdControl3.replay();
-
-		rsControl3 = MockControl.createControl(ResultSet.class);
-		rs3 = (ResultSet) rsControl3.getMock();
-		rs3.getMetaData();
-		rsControl3.setReturnValue(rsmd3, 1);
-		rs3.next();
-		rsControl3.setReturnValue(true, 1);
-		rs3.getString(1);
-		rsControl3.setReturnValue("Gagarin", 1);
-		rs3.wasNull();
-		rsControl3.setReturnValue(false, 1);
-		rs3.getLong(2);
-		rsControl3.setReturnValue(22, 1);
-		rs3.getTimestamp(3);
-		rsControl3.setReturnValue(new Timestamp(1221222L), 1);
-		rs3.getBigDecimal(4);
-		rsControl3.setReturnValue(new BigDecimal("1234.56"), 1);
-		rs3.next();
-		rsControl3.setReturnValue(false, 1);
-		rs3.close();
-		rsControl3.setVoidCallable(1);
-		rsControl3.replay();
-
-		stmtControl3 = MockControl.createControl(Statement.class);
-		stmt3 = (Statement) stmtControl3.getMock();
-
-		con3.createStatement();
-		conControl3.setReturnValue(stmt3, 1);
-		stmt3.executeQuery("select last_name as \"Last Name\", age, birth_date, balance from people");
-		stmtControl3.setReturnValue(rs3, 1);
-		if (debugEnabled) {
-			stmt3.getWarnings();
-			stmtControl3.setReturnValue(null, 1);
-		}
-		stmt3.close();
-		stmtControl3.setVoidCallable(1);
-
-		conControl3.replay();
-		stmtControl3.replay();
-
-		jdbcTemplate = new JdbcTemplate();
-		jdbcTemplate.setDataSource(new SingleConnectionDataSource(con, false));
-		jdbcTemplate.setExceptionTranslator(new SQLStateSQLExceptionTranslator());
-		jdbcTemplate.afterPropertiesSet();
-
-		jdbcTemplate2 = new JdbcTemplate();
-		jdbcTemplate2.setDataSource(new SingleConnectionDataSource(con2, false));
-		jdbcTemplate2.setExceptionTranslator(new SQLStateSQLExceptionTranslator());
-		jdbcTemplate2.afterPropertiesSet();
-
-		jdbcTemplate3 = new JdbcTemplate();
-		jdbcTemplate3.setDataSource(new SingleConnectionDataSource(con3, false));
-		jdbcTemplate3.setExceptionTranslator(new SQLStateSQLExceptionTranslator());
-		jdbcTemplate3.afterPropertiesSet();
-	}
-
-	protected void verifyPerson(Person bean) {
-		verify();
+	protected void verifyPerson(Person bean) throws Exception {
 		assertEquals("Bubba", bean.getName());
 		assertEquals(22L, bean.getAge());
 		assertEquals(new java.util.Date(1221222L), bean.getBirth_date());
 		assertEquals(new BigDecimal("1234.56"), bean.getBalance());
 	}
 
-	protected void verifyPersonWithZeroAge(Person bean) {
-		conControl2.verify();
-		rsControl2.verify();
-		rsmdControl2.verify();
-		stmtControl2.verify();
-		assertEquals("Bubba", bean.getName());
-		assertEquals(0L, bean.getAge());
-		assertEquals(new java.util.Date(1221222L), bean.getBirth_date());
-		assertEquals(new BigDecimal("1234.56"), bean.getBalance());
-	}
-
-	protected void verifyConcretePerson(ConcretePerson bean) {
-		verify();
+	protected void verifyConcretePerson(ConcretePerson bean) throws Exception {
 		assertEquals("Bubba", bean.getName());
 		assertEquals(22L, bean.getAge());
 		assertEquals(new java.util.Date(1221222L), bean.getBirth_date());
@@ -294,21 +59,68 @@ public abstract class AbstractRowMapperTests extends TestCase {
 	}
 
 	protected void verifySpacePerson(SpacePerson bean) {
-		conControl3.verify();
-		rsControl3.verify();
-		rsmdControl3.verify();
-		stmtControl3.verify();
-		assertEquals("Gagarin", bean.getLastName());
+		assertEquals("Bubba", bean.getLastName());
 		assertEquals(22L, bean.getAge());
 		assertEquals(new java.util.Date(1221222L), bean.getBirthDate());
 		assertEquals(new BigDecimal("1234.56"), bean.getBalance());
 	}
 
-	private void verify() {
-		conControl.verify();
-		rsControl.verify();
-		rsmdControl.verify();
-		stmtControl.verify();
-	}
+	protected static enum MockType {ONE,TWO,THREE};
 
+	protected static class Mock {
+
+		private Connection connection;
+
+		private ResultSetMetaData resultSetMetaData;
+
+		private ResultSet resultSet;
+
+		private Statement statement;
+
+		private JdbcTemplate jdbcTemplate;
+
+		public Mock() throws Exception {
+			this(MockType.ONE);
+		}
+
+		public Mock(MockType type)
+				throws Exception {
+			connection = mock(Connection.class);
+			statement = mock(Statement.class);
+			resultSet = mock(ResultSet.class);
+			resultSetMetaData = mock(ResultSetMetaData.class);
+
+			given(connection.createStatement()).willReturn(statement);
+			given(statement.executeQuery(anyString())).willReturn(resultSet);
+			given(resultSet.getMetaData()).willReturn(resultSetMetaData);
+
+			given(resultSet.next()).willReturn(true, false);
+			given(resultSet.getString(1)).willReturn("Bubba");
+			given(resultSet.getLong(2)).willReturn(22L);
+			given(resultSet.getTimestamp(3)).willReturn(new Timestamp(1221222L));
+			given(resultSet.getBigDecimal(4)).willReturn(new BigDecimal("1234.56"));
+			given(resultSet.wasNull()).willReturn(type == MockType.TWO ? true : false);
+
+			given(resultSetMetaData.getColumnCount()).willReturn(4);
+			given(resultSetMetaData.getColumnLabel(1)).willReturn(
+					type == MockType.THREE ? "Last Name" : "name");
+			given(resultSetMetaData.getColumnLabel(2)).willReturn("age");
+			given(resultSetMetaData.getColumnLabel(3)).willReturn("birth_date");
+			given(resultSetMetaData.getColumnLabel(4)).willReturn("balance");
+
+			jdbcTemplate = new JdbcTemplate();
+			jdbcTemplate.setDataSource(new SingleConnectionDataSource(connection, false));
+			jdbcTemplate.setExceptionTranslator(new SQLStateSQLExceptionTranslator());
+			jdbcTemplate.afterPropertiesSet();
+		}
+
+		public JdbcTemplate getJdbcTemplate() {
+			return jdbcTemplate;
+		}
+
+		public void verifyClosed() throws Exception {
+			verify(resultSet).close();
+			verify(statement).close();
+		}
+	}
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BatchUpdateTestHelper.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BatchUpdateTestHelper.java
deleted file mode 100644
index 4da3cd40bf..0000000000
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BatchUpdateTestHelper.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.springframework.jdbc.core;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-import javax.sql.DataSource;
-
-import org.easymock.MockControl;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.jdbc.core.namedparam.SqlParameterSource;
-
-/**
- * @author Thomas Risberg
- */
-public abstract class BatchUpdateTestHelper {
-
-	public static void prepareBatchUpdateMocks(String sqlToUse, Object ids, int[] sqlTypes,
-			int[] rowsAffected,
-			MockControl ctrlDataSource, DataSource mockDataSource, MockControl ctrlConnection, Connection mockConnection,
-			MockControl ctrlPreparedStatement,
-			PreparedStatement mockPreparedStatement, MockControl ctrlDatabaseMetaData, DatabaseMetaData mockDatabaseMetaData)
-			throws SQLException {
-		mockConnection.getMetaData();
-		ctrlConnection.setDefaultReturnValue(null);
-		mockConnection.close();
-		ctrlConnection.setDefaultVoidCallable();
-
-		mockDataSource.getConnection();
-		ctrlDataSource.setDefaultReturnValue(mockConnection);
-
-		mockPreparedStatement.getConnection();
-		ctrlPreparedStatement.setReturnValue(mockConnection);
-		int idLength = 0;
-		if (ids instanceof SqlParameterSource[]) {
-			idLength = ((SqlParameterSource[])ids).length;
-		}
-		else if (ids instanceof Map[]) {
-			idLength = ((Map[])ids).length;
-		}
-		else {
-			idLength = ((List)ids).size();
-		}
-
-		for (int i = 0; i < idLength; i++) {
-			if (ids instanceof SqlParameterSource[]) {
-				if (sqlTypes != null) {
-					mockPreparedStatement.setObject(1, ((SqlParameterSource[])ids)[i].getValue("id"), sqlTypes[0]);
-				}
-				else {
-					mockPreparedStatement.setObject(1, ((SqlParameterSource[])ids)[i].getValue("id"));
-				}
-			}
-			else if (ids instanceof Map[]) {
-				if (sqlTypes != null) {
-					mockPreparedStatement.setObject(1, ((Map[])ids)[i].get("id"), sqlTypes[0]);
-				}
-				else {
-					mockPreparedStatement.setObject(1, ((Map[])ids)[i].get("id"));
-				}
-			}
-			else {
-				if (sqlTypes != null) {
-					mockPreparedStatement.setObject(1, ((Object[])((List)ids).get(i))[0], sqlTypes[0]);
-				}
-				else {
-					mockPreparedStatement.setObject(1, ((Object[])((List)ids).get(i))[0]);
-				}
-			}
-			ctrlPreparedStatement.setVoidCallable();
-			mockPreparedStatement.addBatch();
-			ctrlPreparedStatement.setVoidCallable();
-		}
-		mockPreparedStatement.executeBatch();
-		ctrlPreparedStatement.setReturnValue(rowsAffected);
-		if (LogFactory.getLog(JdbcTemplate.class).isDebugEnabled()) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MySQL");
-		mockDatabaseMetaData.supportsBatchUpdates();
-		ctrlDatabaseMetaData.setReturnValue(true);
-
-		mockConnection.prepareStatement(sqlToUse);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(mockDatabaseMetaData, 2);
-	}
-
-	public static void replayBatchUpdateMocks(MockControl ctrlDataSource,
-			MockControl ctrlConnection,
-			MockControl ctrlPreparedStatement,
-			MockControl ctrlDatabaseMetaData) {
-		ctrlPreparedStatement.replay();
-		ctrlDatabaseMetaData.replay();
-		ctrlDataSource.replay();
-		ctrlConnection.replay();
-	}
-
-	public static void verifyBatchUpdateMocks(MockControl ctrlPreparedStatement, MockControl ctrlDatabaseMetaData) {
-		ctrlPreparedStatement.verify();
-		ctrlDatabaseMetaData.verify();
-	}
-
-}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
index 006666d1ce..66eb5b5496 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
@@ -16,15 +16,19 @@
 
 package org.springframework.jdbc.core;
 
-import java.sql.SQLException;
+import static org.junit.Assert.assertEquals;
+
 import java.util.List;
 
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.springframework.beans.TypeMismatchException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.jdbc.core.test.ConcretePerson;
 import org.springframework.jdbc.core.test.ExtendedPerson;
 import org.springframework.jdbc.core.test.Person;
 import org.springframework.jdbc.core.test.SpacePerson;
-import org.springframework.beans.TypeMismatchException;
 
 /**
  * @author Thomas Risberg
@@ -32,89 +36,94 @@ import org.springframework.beans.TypeMismatchException;
  */
 public class BeanPropertyRowMapperTests extends AbstractRowMapperTests {
 
-	public void testOverridingClassDefinedForMapping() {
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+	@Test
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	public void testOverridingDifferentClassDefinedForMapping() {
 		BeanPropertyRowMapper mapper = new BeanPropertyRowMapper(Person.class);
-		try {
-			mapper.setMappedClass(Long.class);
-			fail("Setting new class should have thrown InvalidDataAccessApiUsageException");
-		}
-		catch (InvalidDataAccessApiUsageException ex) {
-		}
-		try {
-			mapper.setMappedClass(Person.class);
-		}
-		catch (InvalidDataAccessApiUsageException ex) {
-			fail("Setting same class should not have thrown InvalidDataAccessApiUsageException");
-		}
+		thrown.expect(InvalidDataAccessApiUsageException.class);
+		mapper.setMappedClass(Long.class);
 	}
 
-	public void testStaticQueryWithRowMapper() throws SQLException {
-		List result = jdbcTemplate.query("select name, age, birth_date, balance from people",
-				new BeanPropertyRowMapper(Person.class));
-		assertEquals(1, result.size());
-		Person bean = (Person) result.get(0);
-		verifyPerson(bean);
+	@Test
+	public void testOverridingSameClassDefinedForMapping() {
+		BeanPropertyRowMapper<Person> mapper = new BeanPropertyRowMapper<Person>(Person.class);
+		mapper.setMappedClass(Person.class);
 	}
 
-	public void testMappingWithInheritance() throws SQLException {
-		List result = jdbcTemplate.query("select name, age, birth_date, balance from people",
-				new BeanPropertyRowMapper(ConcretePerson.class));
+	@Test
+	public void testStaticQueryWithRowMapper() throws Exception {
+		Mock mock = new Mock();
+		List<Person> result = mock.getJdbcTemplate().query(
+				"select name, age, birth_date, balance from people",
+				new BeanPropertyRowMapper<Person>(Person.class));
 		assertEquals(1, result.size());
-		ConcretePerson bean = (ConcretePerson) result.get(0);
+		verifyPerson(result.get(0));
+		mock.verifyClosed();
+	}
+
+	@Test
+	public void testMappingWithInheritance() throws Exception {
+		Mock mock = new Mock();
+		List<ConcretePerson> result = mock.getJdbcTemplate().query(
+				"select name, age, birth_date, balance from people",
+				new BeanPropertyRowMapper<ConcretePerson>(ConcretePerson.class));
+		assertEquals(1, result.size());
+		verifyConcretePerson(result.get(0));
+		mock.verifyClosed();
+	}
+
+	@Test
+	public void testMappingWithNoUnpopulatedFieldsFound() throws Exception {
+		Mock mock = new Mock();
+		List<ConcretePerson> result = mock.getJdbcTemplate().query(
+				"select name, age, birth_date, balance from people",
+				new BeanPropertyRowMapper<ConcretePerson>(ConcretePerson.class, true));
+		assertEquals(1, result.size());
+		verifyConcretePerson(result.get(0));
+		mock.verifyClosed();
+	}
+
+	@Test
+	public void testMappingWithUnpopulatedFieldsNotChecked() throws Exception {
+		Mock mock = new Mock();
+		List<ExtendedPerson> result = mock.getJdbcTemplate().query(
+				"select name, age, birth_date, balance from people",
+				new BeanPropertyRowMapper<ExtendedPerson>(ExtendedPerson.class));
+		assertEquals(1, result.size());
+		ExtendedPerson bean = result.get(0);
 		verifyConcretePerson(bean);
+		mock.verifyClosed();
 	}
 
-	public void testMappingWithNoUnpopulatedFieldsFound() throws SQLException {
-		List result = jdbcTemplate.query("select name, age, birth_date, balance from people",
-				new BeanPropertyRowMapper(ConcretePerson.class, true));
+	@Test
+	public void testMappingWithUnpopulatedFieldsNotAccepted() throws Exception {
+		Mock mock = new Mock();
+		thrown.expect(InvalidDataAccessApiUsageException.class);
+		mock.getJdbcTemplate().query(
+				"select name, age, birth_date, balance from people",
+				new BeanPropertyRowMapper<ExtendedPerson>(ExtendedPerson.class, true));
+	}
+
+	@Test
+	public void testMappingNullValue() throws Exception {
+		BeanPropertyRowMapper<Person> mapper = new BeanPropertyRowMapper<Person>(Person.class);
+		Mock mock = new Mock(MockType.TWO);
+		thrown.expect(TypeMismatchException.class);
+		mock.getJdbcTemplate().query(
+				"select name, null as age, birth_date, balance from people", mapper);
+	}
+
+	@Test
+	public void testQueryWithSpaceInColumnName() throws Exception {
+		Mock mock = new Mock(MockType.THREE);
+		List<SpacePerson> result = mock.getJdbcTemplate().query(
+				"select last_name as \"Last Name\", age, birth_date, balance from people",
+				new BeanPropertyRowMapper<SpacePerson>(SpacePerson.class));
 		assertEquals(1, result.size());
-		ConcretePerson bean = (ConcretePerson) result.get(0);
-		verifyConcretePerson(bean);
+		verifySpacePerson(result.get(0));
+		mock.verifyClosed();
 	}
-
-	public void testMappingWithUnpopulatedFieldsNotChecked() throws SQLException {
-		List result = jdbcTemplate.query("select name, age, birth_date, balance from people",
-				new BeanPropertyRowMapper(ExtendedPerson.class));
-		assertEquals(1, result.size());
-		ExtendedPerson bean = (ExtendedPerson) result.get(0);
-		verifyConcretePerson(bean);
-	}
-
-	public void testMappingWithUnpopulatedFieldsNotAccepted() throws SQLException {
-		try {
-			List result = jdbcTemplate.query("select name, age, birth_date, balance from people",
-					new BeanPropertyRowMapper(ExtendedPerson.class, true));
-			fail("Should have thrown InvalidDataAccessApiUsageException because of missing field");
-		}
-		catch (InvalidDataAccessApiUsageException ex) {
-			// expected
-		}
-	}
-
-	public void testMappingNullValue() throws SQLException {
-		BeanPropertyRowMapper mapper = new BeanPropertyRowMapper(Person.class);
-		try {
-			List result1 = jdbcTemplate2.query("select name, null as age, birth_date, balance from people",
-					mapper);
-			fail("Should have thrown TypeMismatchException because of null value");
-		}
-		catch (TypeMismatchException ex) {
-			// expected
-		}
-		mapper.setPrimitivesDefaultedForNullValue(true);
-		List result2 = jdbcTemplate2.query("select name, null as age, birth_date, balance from people",
-				mapper);
-		assertEquals(1, result2.size());
-		Person bean = (Person) result2.get(0);
-		verifyPersonWithZeroAge(bean);
-	}
-
-	public void testQueryWithSpaceInColumnName() throws SQLException {
-		List result = jdbcTemplate3.query("select last_name as \"Last Name\", age, birth_date, balance from people",
-				new BeanPropertyRowMapper(SpacePerson.class));
-		assertEquals(1, result.size());
-		SpacePerson bean = (SpacePerson) result.get(0);
-		verifySpacePerson(bean);
-	}
-
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
index c681fc1ed6..86518a5f87 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
@@ -16,8 +16,17 @@
 
 package org.springframework.jdbc.core;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -26,963 +35,334 @@ import java.sql.Statement;
 import java.util.List;
 import java.util.Map;
 
-import org.easymock.MockControl;
-import org.apache.commons.logging.LogFactory;
+import javax.sql.DataSource;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.jdbc.AbstractJdbcTests;
 
 /**
  * @author Juergen Hoeller
+ * @author Phillip Webb
  * @since 19.12.2004
  */
-public class JdbcTemplateQueryTests extends AbstractJdbcTests {
+public class JdbcTemplateQueryTests {
 
-	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
-	private MockControl ctrlStatement;
-	private Statement mockStatement;
-	private MockControl ctrlPreparedStatement;
-	private PreparedStatement mockPreparedStatement;
-	private MockControl ctrlResultSet;
-	private ResultSet mockResultSet;
-	private MockControl ctrlResultSetMetaData;
-	private ResultSetMetaData mockResultSetMetaData;
+	private Connection connection;
+	private DataSource dataSource;
+	private Statement statement;
+	private PreparedStatement preparedStatement;
+	private ResultSet resultSet;
+	private ResultSetMetaData resultSetMetaData;
+	private JdbcTemplate template;
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		ctrlStatement = MockControl.createControl(Statement.class);
-		mockStatement = (Statement) ctrlStatement.getMock();
-		ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		ctrlResultSet = MockControl.createControl(ResultSet.class);
-		mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		ctrlResultSetMetaData = MockControl.createControl(ResultSetMetaData.class);
-		mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock();
-	}
-
-	@Override
-	protected void replay() {
-		super.replay();
-		ctrlStatement.replay();
-		ctrlPreparedStatement.replay();
-		ctrlResultSet.replay();
-		ctrlResultSetMetaData.replay();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (shouldVerify()) {
-			ctrlStatement.verify();
-			ctrlPreparedStatement.verify();
-			ctrlResultSet.verify();
-			ctrlResultSetMetaData.verify();
-		}
+	@Before
+	public void setUp() throws Exception {
+		this.connection = mock(Connection.class);
+		this.dataSource = mock(DataSource.class);
+		this.statement = mock(Statement.class);
+		this.preparedStatement = mock(PreparedStatement.class);
+		this.resultSet = mock(ResultSet.class);
+		this.resultSetMetaData = mock(ResultSetMetaData.class);
+		this.template = new JdbcTemplate(this.dataSource);
+		given(this.dataSource.getConnection()).willReturn(this.connection);
+		given(this.resultSet.getMetaData()).willReturn(this.resultSetMetaData);
+		given(this.resultSetMetaData.getColumnCount()).willReturn(1);
+		given(this.resultSetMetaData.getColumnLabel(1)).willReturn("age");
+		given(this.connection.createStatement()).willReturn(this.statement);
+		given(this.connection.prepareStatement(anyString())).willReturn(this.preparedStatement);
+		given(this.preparedStatement.executeQuery()).willReturn(this.resultSet);
+		given(this.statement.executeQuery(anyString())).willReturn(this.resultSet);
 	}
 
+	@Test
 	public void testQueryForList() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1, 2);
-		mockResultSetMetaData.getColumnLabel(1);
-		ctrlResultSetMetaData.setReturnValue("age", 2);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData, 2);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue(new Integer(11));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue(new Integer(12));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		List li = template.queryForList(sql);
+		given(this.resultSet.next()).willReturn(true, true, false);
+		given(this.resultSet.getObject(1)).willReturn(11, 12);
+		List li = this.template.queryForList(sql);
 		assertEquals("All rows returned", 2, li.size());
 		assertEquals("First row is Integer", 11, ((Integer)((Map)li.get(0)).get("age")).intValue());
 		assertEquals("Second row is Integer", 12, ((Integer)((Map)li.get(1)).get("age")).intValue());
+		verify(this.resultSet).close();
+		verify(this.statement).close();
 	}
 
+	@Test
 	public void testQueryForListWithEmptyResult() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3";
-
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		List li = template.queryForList(sql);
+		given(this.resultSet.next()).willReturn(false);
+		List li = this.template.queryForList(sql);
 		assertEquals("All rows returned", 0, li.size());
+		verify(this.resultSet).close();
+		verify(this.statement).close();
 	}
 
+	@Test
 	public void testQueryForListWithSingleRowAndColumn() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-		mockResultSetMetaData.getColumnLabel(1);
-		ctrlResultSetMetaData.setReturnValue("age", 1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue(new Integer(11));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		List li = template.queryForList(sql);
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getObject(1)).willReturn(11);
+		List li = this.template.queryForList(sql);
 		assertEquals("All rows returned", 1, li.size());
 		assertEquals("First row is Integer", 11, ((Integer)((Map)li.get(0)).get("age")).intValue());
+		verify(this.resultSet).close();
+		verify(this.statement).close();
 	}
 
+	@Test
 	public void testQueryForListWithIntegerElement() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(11);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		List li = template.queryForList(sql, Integer.class);
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getInt(1)).willReturn(11);
+		List li = this.template.queryForList(sql, Integer.class);
 		assertEquals("All rows returned", 1, li.size());
 		assertEquals("Element is Integer", 11, ((Integer) li.get(0)).intValue());
+		verify(this.resultSet).close();
+		verify(this.statement).close();
 	}
 
+	@Test
 	public void testQueryForMapWithSingleRowAndColumn() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-		mockResultSetMetaData.getColumnLabel(1);
-		ctrlResultSetMetaData.setReturnValue("age", 1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue(new Integer(11));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		Map map = template.queryForMap(sql);
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getObject(1)).willReturn(11);
+		Map map = this.template.queryForMap(sql);
 		assertEquals("Wow is Integer", 11, ((Integer) map.get("age")).intValue());
+		verify(this.resultSet).close();
+		verify(this.statement).close();
 	}
 
+	@Test
 	public void testQueryForObjectThrowsIncorrectResultSizeForMoreThanOneRow() throws Exception {
 		String sql = "select pass from t_account where first_name='Alef'";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getString(1);
-		ctrlResultSet.setReturnValue("pass");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-		mockResultSet.getString(1);
-		ctrlResultSet.setReturnValue("pass");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
+		given(this.resultSet.next()).willReturn(true, true, false);
+		given(this.resultSet.getString(1)).willReturn("pass");
+		this.thrown.expect(IncorrectResultSizeDataAccessException.class);
 		try {
-			template.queryForObject(sql, String.class);
-			fail("Should have thrown IncorrectResultSizeDataAccessException");
-		}
-		catch (IncorrectResultSizeDataAccessException ex) {
-			// expected
+			this.template.queryForObject(sql, String.class);
+		} finally {
+			verify(this.resultSet).close();
+			verify(this.statement).close();
 		}
 	}
 
+	@Test
 	public void testQueryForObjectWithRowMapper() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3";
-
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(22);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		Object o = template.queryForObject(sql, new RowMapper() {
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getInt(1)).willReturn(22);
+		Object o = this.template.queryForObject(sql, new RowMapper<Integer>() {
 			@Override
-			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
-				return new Integer(rs.getInt(1));
+			public Integer mapRow(ResultSet rs, int rowNum) throws SQLException {
+				return rs.getInt(1);
 			}
 		});
 		assertTrue("Correct result type", o instanceof Integer);
+		verify(this.resultSet).close();
+		verify(this.statement).close();
 	}
 
+	@Test
 	public void testQueryForObjectWithString() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getString(1);
-		ctrlResultSet.setReturnValue("myvalue");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		assertEquals("myvalue", template.queryForObject(sql, String.class));
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getString(1)).willReturn("myvalue");
+		assertEquals("myvalue", this.template.queryForObject(sql, String.class));
+		verify(this.resultSet).close();
+		verify(this.statement).close();
 	}
 
+	@Test
 	public void testQueryForObjectWithBigInteger() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue("22");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		assertEquals(new BigInteger("22"), template.queryForObject(sql, BigInteger.class));
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getObject(1)).willReturn("22");
+		assertEquals(new BigInteger("22"), this.template.queryForObject(sql, BigInteger.class));
+		verify(this.resultSet).close();
+		verify(this.statement).close();
 	}
 
+	@Test
 	public void testQueryForObjectWithBigDecimal() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getBigDecimal(1);
-		ctrlResultSet.setReturnValue(new BigDecimal(22.5));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		assertEquals(new BigDecimal(22.5), template.queryForObject(sql, BigDecimal.class));
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getBigDecimal(1)).willReturn(new BigDecimal(22.5));
+		assertEquals(new BigDecimal(22.5), this.template.queryForObject(sql, BigDecimal.class));
+		verify(this.resultSet).close();
+		verify(this.statement).close();
 	}
 
+	@Test
 	public void testQueryForObjectWithInteger() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(22);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		assertEquals(new Integer(22), template.queryForObject(sql, Integer.class));
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getInt(1)).willReturn(22);
+		assertEquals(new Integer(22), this.template.queryForObject(sql, Integer.class));
+		verify(this.resultSet).close();
+		verify(this.statement).close();
 	}
 
+	@Test
 	public void testQueryForObjectWithIntegerAndNull() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(0);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		assertNull(template.queryForObject(sql, Integer.class));
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getInt(1)).willReturn(0);
+		given(this.resultSet.wasNull()).willReturn(true);
+		assertNull(this.template.queryForObject(sql, Integer.class));
+		verify(this.resultSet).close();
+		verify(this.statement).close();
 	}
 
+	@Test
 	public void testQueryForInt() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(22);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		int i = template.queryForInt(sql);
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getInt(1)).willReturn(22);
+		int i = this.template.queryForInt(sql);
 		assertEquals("Return of an int", 22, i);
+		verify(this.resultSet).close();
+		verify(this.statement).close();
 	}
 
+	@Test
 	public void testQueryForLong() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getLong(1);
-		ctrlResultSet.setReturnValue(87);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		long l = template.queryForLong(sql);
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getLong(1)).willReturn(87L);
+		long l = this.template.queryForLong(sql);
 		assertEquals("Return of a long", 87, l);
+		verify(this.resultSet).close();
+		verify(this.statement).close();
 	}
 
+	@Test
 	public void testQueryForListWithArgs() throws Exception {
 		doTestQueryForListWithArgs("SELECT AGE FROM CUSTMR WHERE ID < ?");
 	}
 
+	@Test
 	public void testQueryForListIsNotConfusedByNamedParameterPrefix() throws Exception {
 		doTestQueryForListWithArgs("SELECT AGE FROM PREFIX:CUSTMR WHERE ID < ?");
 	}
 
 	private void doTestQueryForListWithArgs(String sql) throws Exception {
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1, 2);
-		mockResultSetMetaData.getColumnLabel(1);
-		ctrlResultSetMetaData.setReturnValue("age", 2);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData, 2);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue(new Integer(11));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue(new Integer(12));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		List li = template.queryForList(sql, new Object[] {new Integer(3)});
+		given(this.resultSet.next()).willReturn(true, true, false);
+		given(this.resultSet.getObject(1)).willReturn(11, 12);
+		List li = this.template.queryForList(sql, new Object[] {new Integer(3)});
 		assertEquals("All rows returned", 2, li.size());
 		assertEquals("First row is Integer", 11, ((Integer)((Map)li.get(0)).get("age")).intValue());
 		assertEquals("Second row is Integer", 12, ((Integer)((Map)li.get(1)).get("age")).intValue());
+		verify(this.preparedStatement).setObject(1, 3);
+		verify(this.resultSet).close();
+		verify(this.preparedStatement).close();
 	}
 
+	@Test
 	public void testQueryForListWithArgsAndEmptyResult() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID < ?";
-
-		ctrlResultSet = MockControl.createControl(ResultSet.class);
-		mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		List li = template.queryForList(sql, new Object[] {new Integer(3)});
+		given(this.resultSet.next()).willReturn(false);
+		List li = this.template.queryForList(sql, new Object[] {new Integer(3)});
 		assertEquals("All rows returned", 0, li.size());
+		verify(this.preparedStatement).setObject(1, 3);
+		verify(this.resultSet).close();
+		verify(this.preparedStatement).close();
 	}
 
+	@Test
 	public void testQueryForListWithArgsAndSingleRowAndColumn() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID < ?";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-		mockResultSetMetaData.getColumnLabel(1);
-		ctrlResultSetMetaData.setReturnValue("age", 1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue(new Integer(11));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		List li = template.queryForList(sql, new Object[] {new Integer(3)});
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getObject(1)).willReturn(11);
+		List li = this.template.queryForList(sql, new Object[] {new Integer(3)});
 		assertEquals("All rows returned", 1, li.size());
 		assertEquals("First row is Integer", 11, ((Integer)((Map)li.get(0)).get("age")).intValue());
+		verify(this.preparedStatement).setObject(1, 3);
+		verify(this.resultSet).close();
+		verify(this.preparedStatement).close();
 	}
 
+	@Test
 	public void testQueryForListWithArgsAndIntegerElementAndSingleRowAndColumn() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID < ?";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(11);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		List li = template.queryForList(sql, new Object[] {new Integer(3)}, Integer.class);
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getInt(1)).willReturn(11);
+		List li = this.template.queryForList(sql, new Object[] {new Integer(3)}, Integer.class);
 		assertEquals("All rows returned", 1, li.size());
 		assertEquals("First row is Integer", 11, ((Integer) li.get(0)).intValue());
+		verify(this.preparedStatement).setObject(1, 3);
+		verify(this.resultSet).close();
+		verify(this.preparedStatement).close();
 	}
 
+	@Test
 	public void testQueryForMapWithArgsAndSingleRowAndColumn() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID < ?";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-		mockResultSetMetaData.getColumnLabel(1);
-		ctrlResultSetMetaData.setReturnValue("age", 1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue(new Integer(11));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		Map map = template.queryForMap(sql, new Object[] {new Integer(3)});
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getObject(1)).willReturn(11);
+		Map map = this.template.queryForMap(sql, new Object[] {new Integer(3)});
 		assertEquals("Row is Integer", 11, ((Integer) map.get("age")).intValue());
+		verify(this.preparedStatement).setObject(1, 3);
+		verify(this.resultSet).close();
+		verify(this.preparedStatement).close();
 	}
 
+	@Test
 	public void testQueryForObjectWithArgsAndRowMapper() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID = ?";
-
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(22);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		Object o = template.queryForObject(sql, new Object[] {new Integer(3)}, new RowMapper() {
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getInt(1)).willReturn(22);
+		Object o = this.template.queryForObject(sql, new Object[] {new Integer(3)}, new RowMapper<Integer>() {
 			@Override
-			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
-				return new Integer(rs.getInt(1));
+			public Integer mapRow(ResultSet rs, int rowNum) throws SQLException {
+				return rs.getInt(1);
 			}
 		});
 		assertTrue("Correct result type", o instanceof Integer);
+		verify(this.preparedStatement).setObject(1, 3);
+		verify(this.resultSet).close();
+		verify(this.preparedStatement).close();
 	}
 
+	@Test
 	public void testQueryForObjectWithArgsAndInteger() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID = ?";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(22);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		Object o = template.queryForObject(sql, new Object[] {new Integer(3)}, Integer.class);
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getInt(1)).willReturn(22);
+		Object o = this.template.queryForObject(sql, new Object[] {new Integer(3)}, Integer.class);
 		assertTrue("Correct result type", o instanceof Integer);
+		verify(this.preparedStatement).setObject(1, 3);
+		verify(this.resultSet).close();
+		verify(this.preparedStatement).close();
 	}
 
+	@Test
 	public void testQueryForIntWithArgs() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID = ?";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(22);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		int i = template.queryForInt(sql, new Object[] {new Integer(3)});
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getInt(1)).willReturn(22);
+		int i = this.template.queryForInt(sql, new Object[] {new Integer(3)});
 		assertEquals("Return of an int", 22, i);
+		verify(this.preparedStatement).setObject(1, 3);
+		verify(this.resultSet).close();
+		verify(this.preparedStatement).close();
 	}
 
+	@Test
 	public void testQueryForLongWithArgs() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID = ?";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getLong(1);
-		ctrlResultSet.setReturnValue(87);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		long l = template.queryForLong(sql, new Object[] {new Integer(3)});
+		given(this.resultSet.next()).willReturn(true, false);
+		given(this.resultSet.getLong(1)).willReturn(87L);
+		long l = this.template.queryForLong(sql, new Object[] {new Integer(3)});
 		assertEquals("Return of a long", 87, l);
+		verify(this.preparedStatement).setObject(1, 3);
+		verify(this.resultSet).close();
+		verify(this.preparedStatement).close();
 	}
 
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
index ba9b97dcae..e0748aef5a 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
@@ -16,6 +16,27 @@
 
 package org.springframework.jdbc.core;
 
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.isA;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+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 static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.springframework.build.test.hamcrest.Matchers.exceptionCause;
+
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -26,18 +47,19 @@ import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.sql.Types;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+
 import javax.sql.DataSource;
 
-import org.apache.commons.logging.LogFactory;
-import org.easymock.MockControl;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.dao.UncategorizedDataAccessException;
-import org.springframework.jdbc.AbstractJdbcTests;
 import org.springframework.jdbc.BadSqlGrammarException;
 import org.springframework.jdbc.CannotGetJdbcConnectionException;
 import org.springframework.jdbc.SQLWarningException;
@@ -56,139 +78,124 @@ import org.springframework.util.LinkedCaseInsensitiveMap;
  * @author Rod Johnson
  * @author Thomas Risberg
  * @author Juergen Hoeller
+ * @author Phillip Webb
  */
-public class JdbcTemplateTests extends AbstractJdbcTests {
+public class JdbcTemplateTests {
 
-	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
+	private Connection connection;
+	private DataSource dataSource;
+	private PreparedStatement preparedStatement;
+	private Statement statement;
+	private ResultSet resultSet;
+	private JdbcTemplate template;
+	private CallableStatement callableStatement;
 
+	@Before
+	public void setup() throws Exception {
+		this.connection = mock(Connection.class);
+		this.dataSource = mock(DataSource.class);
+		this.preparedStatement = mock(PreparedStatement.class);
+		this.statement = mock(Statement.class);
+		this.resultSet = mock(ResultSet.class);
+		this.template = new JdbcTemplate(this.dataSource);
+		this.callableStatement = mock(CallableStatement.class);
+		given(this.dataSource.getConnection()).willReturn(this.connection);
+		given(this.connection.prepareStatement(anyString())).willReturn(this.preparedStatement);
+		given(this.preparedStatement.executeQuery()).willReturn(this.resultSet);
+		given(this.preparedStatement.executeQuery(anyString())).willReturn(this.resultSet);
+		given(this.preparedStatement.getConnection()).willReturn(this.connection);
+		given(this.statement.getConnection()).willReturn(this.connection);
+		given(this.statement.executeQuery(anyString())).willReturn(this.resultSet);
+		given(this.connection.prepareCall(anyString())).willReturn(this.callableStatement);
+		given(this.callableStatement.getResultSet()).willReturn(this.resultSet);
+	}
+
+	@Test
 	public void testBeanProperties() throws Exception {
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		assertTrue("datasource ok", template.getDataSource() == mockDataSource);
-		assertTrue("ignores warnings by default", template.isIgnoreWarnings());
-		template.setIgnoreWarnings(false);
-		assertTrue("can set NOT to ignore warnings", !template.isIgnoreWarnings());
+		assertTrue("datasource ok", this.template.getDataSource() == this.dataSource);
+		assertTrue("ignores warnings by default", this.template.isIgnoreWarnings());
+		this.template.setIgnoreWarnings(false);
+		assertTrue("can set NOT to ignore warnings", !this.template.isIgnoreWarnings());
 	}
 
+	@Test
 	public void testUpdateCount() throws Exception {
-		final String sql =
-			"UPDATE INVOICE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
+		final String sql = "UPDATE INVOICE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
 		int idParam = 11111;
-
-		MockControl ctrlPreparedStatement =
-			MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement =
-			(PreparedStatement) ctrlPreparedStatement.getMock();
-		mockPreparedStatement.setInt(1, idParam);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(1);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		ctrlPreparedStatement.replay();
-		replay();
-
+		given(this.preparedStatement.executeUpdate()).willReturn(1);
 		Dispatcher d = new Dispatcher(idParam, sql);
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		int rowsAffected = template.update(d);
+		int rowsAffected = this.template.update(d);
 		assertTrue("1 update affected 1 row", rowsAffected == 1);
-
-		/*
-		d = new Dispatcher(idParam);
-		rowsAffected = template.update(d);
-		assertTrue("bogus update affected 0 rows", rowsAffected == 0);
-		*/
-
-		ctrlPreparedStatement.verify();
+		verify(this.preparedStatement).setInt(1, idParam);
+		verify(this.preparedStatement).close();
+		verify(this.connection).close();
 	}
 
+	@Test
 	public void testBogusUpdate() throws Exception {
-		final String sql =
-			"UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
+		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
 		final int idParam = 6666;
 
 		// It's because Integers aren't canonical
-		SQLException sex = new SQLException("bad update");
-
-		MockControl ctrlPreparedStatement =
-			MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement =
-			(PreparedStatement) ctrlPreparedStatement.getMock();
-		mockPreparedStatement.setInt(1, idParam);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setThrowable(sex);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		ctrlPreparedStatement.replay();
-		replay();
+		SQLException sqlException = new SQLException("bad update");
+		given(this.preparedStatement.executeUpdate()).willThrow(sqlException);
 
 		Dispatcher d = new Dispatcher(idParam, sql);
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
+		this.thrown.expect(UncategorizedSQLException.class);
+		this.thrown.expect(exceptionCause(equalTo(sqlException)));
 		try {
-			template.update(d);
-			fail("Bogus update should throw exception");
+			this.template.update(d);
 		}
-		catch (UncategorizedDataAccessException ex) {
-			// pass
-			assertTrue(
-				"Correct exception",
-				ex instanceof UncategorizedSQLException);
-			assertTrue("Root cause is correct", ex.getCause() == sex);
-			//assertTrue("no update occurred", !je.getDataWasUpdated());
+		finally {
+			verify(this.preparedStatement).setInt(1, idParam);
+			verify(this.preparedStatement).close();
+			verify(this.connection, atLeastOnce()).close();
 		}
-
-		ctrlPreparedStatement.verify();
 	}
 
+	@Test
 	public void testStringsWithStaticSql() throws Exception {
-		doTestStrings(new JdbcTemplateCallback() {
+		doTestStrings(false, null, null, null, null, new JdbcTemplateCallback() {
 			@Override
-			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
+			public void doInJdbcTemplate(JdbcTemplate template, String sql,
+					RowCallbackHandler rch) {
 				template.query(sql, rch);
 			}
-		}, false, null, null, null, null);
+		});
 	}
 
+	@Test
 	public void testStringsWithStaticSqlAndFetchSizeAndMaxRows() throws Exception {
-		doTestStrings(new JdbcTemplateCallback() {
+		doTestStrings(false, 10, 20, 30, null, new JdbcTemplateCallback() {
 			@Override
-			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
+			public void doInJdbcTemplate(JdbcTemplate template, String sql,
+					RowCallbackHandler rch) {
 				template.query(sql, rch);
 			}
-		}, false, new Integer(10), new Integer(20), new Integer(30), null);
+		});
 	}
 
+	@Test
 	public void testStringsWithEmptyPreparedStatementSetter() throws Exception {
-		doTestStrings(new JdbcTemplateCallback() {
+		doTestStrings(true, null, null, null, null, new JdbcTemplateCallback() {
 			@Override
-			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
+			public void doInJdbcTemplate(JdbcTemplate template, String sql,
+					RowCallbackHandler rch) {
 				template.query(sql, (PreparedStatementSetter) null, rch);
 			}
-		}, true, null, null, null, null);
+		});
 	}
 
+	@Test
 	public void testStringsWithPreparedStatementSetter() throws Exception {
-		final Integer argument = new Integer(99);
-		doTestStrings(new JdbcTemplateCallback() {
+		final Integer argument = 99;
+		doTestStrings(true, null, null, null, argument, new JdbcTemplateCallback() {
 			@Override
-			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
+			public void doInJdbcTemplate(JdbcTemplate template, String sql,
+					RowCallbackHandler rch) {
 				template.query(sql, new PreparedStatementSetter() {
 					@Override
 					public void setValues(PreparedStatement ps) throws SQLException {
@@ -196,109 +203,59 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 					}
 				}, rch);
 			}
-		}, true, null, null, null, argument);
+		});
 	}
 
+	@Test
 	public void testStringsWithEmptyPreparedStatementArgs() throws Exception {
-		doTestStrings(new JdbcTemplateCallback() {
+		doTestStrings(true, null, null, null, null, new JdbcTemplateCallback() {
 			@Override
-			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
+			public void doInJdbcTemplate(JdbcTemplate template, String sql,
+					RowCallbackHandler rch) {
 				template.query(sql, (Object[]) null, rch);
 			}
-		}, true, null, null, null, null);
+		});
 	}
 
+	@Test
 	public void testStringsWithPreparedStatementArgs() throws Exception {
-		final Integer argument = new Integer(99);
-		doTestStrings(new JdbcTemplateCallback() {
+		final Integer argument = 99;
+		doTestStrings(true, null, null, null, argument, new JdbcTemplateCallback() {
 			@Override
-			public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) {
-				template.query(sql, new Object[] {argument}, rch);
+			public void doInJdbcTemplate(JdbcTemplate template, String sql,
+					RowCallbackHandler rch) {
+				template.query(sql, new Object[] { argument }, rch);
 			}
-		}, true, null, null, null, argument);
+		});
 	}
 
 	private void doTestStrings(
-			JdbcTemplateCallback jdbcTemplateCallback, boolean usePreparedStatement,
-			Integer fetchSize, Integer maxRows, Integer queryTimeout, Object argument)
+			boolean usePreparedStatement,
+			Integer fetchSize, Integer maxRows, Integer queryTimeout, Object argument,
+			JdbcTemplateCallback jdbcTemplateCallback)
 			throws Exception {
 
 		String sql = "SELECT FORENAME FROM CUSTMR";
 		String[] results = { "rod", "gary", " portia" };
 
 		class StringHandler implements RowCallbackHandler {
-			private List list = new LinkedList();
+			private List<String> list = new LinkedList<String>();
 			@Override
 			public void processRow(ResultSet rs) throws SQLException {
-				list.add(rs.getString(1));
+				this.list.add(rs.getString(1));
 			}
 			public String[] getStrings() {
-				return (String[]) list.toArray(new String[list.size()]);
+				return this.list.toArray(new String[this.list.size()]);
 			}
 		}
 
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getString(1);
-		ctrlResultSet.setReturnValue(results[0]);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getString(1);
-		ctrlResultSet.setReturnValue(results[1]);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getString(1);
-		ctrlResultSet.setReturnValue(results[2]);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock();
-		if (fetchSize != null) {
-			mockStatement.setFetchSize(fetchSize.intValue());
-		}
-		if (maxRows != null) {
-			mockStatement.setMaxRows(maxRows.intValue());
-		}
-		if (queryTimeout != null) {
-			mockStatement.setQueryTimeout(queryTimeout.intValue());
-		}
-		if (argument != null) {
-			mockStatement.setObject(1, argument);
-		}
-		if (usePreparedStatement) {
-			mockStatement.executeQuery();
-		}
-		else {
-			mockStatement.executeQuery(sql);
-		}
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		if (usePreparedStatement) {
-			mockConnection.prepareStatement(sql);
-		}
-		else {
-			mockConnection.createStatement();
-		}
-		ctrlConnection.setReturnValue(mockStatement);
-
-		ctrlResultSet.replay();
-		ctrlStatement.replay();
-		replay();
+		given(this.resultSet.next()).willReturn(true, true, true, false);
+		given(this.resultSet.getString(1)).willReturn(results[0], results[1], results[2]);
+		given(this.connection.createStatement()).willReturn(this.preparedStatement);
 
 		StringHandler sh = new StringHandler();
 		JdbcTemplate template = new JdbcTemplate();
-		template.setDataSource(mockDataSource);
+		template.setDataSource(this.dataSource);
 		if (fetchSize != null) {
 			template.setFetchSize(fetchSize.intValue());
 		}
@@ -317,487 +274,259 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 			assertTrue("Row " + i + " matches", forenames[i].equals(results[i]));
 		}
 
-		ctrlResultSet.verify();
-		ctrlStatement.verify();
+		if (fetchSize != null) {
+			verify(this.preparedStatement).setFetchSize(fetchSize.intValue());
+		}
+		if (maxRows != null) {
+			verify(this.preparedStatement).setMaxRows(maxRows.intValue());
+		}
+		if (queryTimeout != null) {
+			verify(this.preparedStatement).setQueryTimeout(queryTimeout.intValue());
+		}
+		if (argument != null) {
+			verify(this.preparedStatement).setObject(1, argument);
+		}
+		verify(this.resultSet).close();
+		verify(this.preparedStatement).close();
+		verify(this.connection).close();
 	}
 
+	@Test
 	public void testLeaveConnectionOpenOnRequest() throws Exception {
 		String sql = "SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3";
 
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		ctrlResultSet = MockControl.createControl(ResultSet.class);
-		mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock();
-		ctrlStatement = MockControl.createControl(PreparedStatement.class);
-		mockStatement = (PreparedStatement) ctrlStatement.getMock();
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.isClosed();
-		ctrlConnection.setReturnValue(false, 2);
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
+		given(this.resultSet.next()).willReturn(false);
+		given(this.connection.isClosed()).willReturn(false);
+		given(this.connection.createStatement()).willReturn(this.preparedStatement);
 		// if close is called entire test will fail
-		mockConnection.close();
-		ctrlConnection.setDefaultThrowable(new RuntimeException());
+		willThrow(new RuntimeException()).given(this.connection).close();
 
-		ctrlResultSet.replay();
-		ctrlStatement.replay();
-		replay();
-
-		SingleConnectionDataSource scf = new SingleConnectionDataSource(mockDataSource.getConnection(), false);
-		JdbcTemplate template2 = new JdbcTemplate(scf, false);
+		SingleConnectionDataSource scf = new SingleConnectionDataSource(this.dataSource.getConnection(), false);
+		this.template = new JdbcTemplate(scf, false);
 		RowCountCallbackHandler rcch = new RowCountCallbackHandler();
-		template2.query(sql, rcch);
+		this.template.query(sql, rcch);
 
-		ctrlResultSet.verify();
-		ctrlStatement.verify();
+		verify(this.resultSet).close();
+		verify(this.preparedStatement).close();
 	}
 
+	@Test
 	public void testConnectionCallback() throws Exception {
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		template.setNativeJdbcExtractor(new PlainNativeJdbcExtractor());
-		Object result = template.execute(new ConnectionCallback() {
+		this.template.setNativeJdbcExtractor(new PlainNativeJdbcExtractor());
+		String result = this.template.execute(new ConnectionCallback<String>() {
 			@Override
-			public Object doInConnection(Connection con) {
-				assertSame(mockConnection, con);
+			public String doInConnection(Connection con) {
+				assertSame(JdbcTemplateTests.this.connection, con);
 				return "test";
 			}
 		});
-
 		assertEquals("test", result);
 	}
 
+	@Test
 	public void testConnectionCallbackWithStatementSettings() throws Exception {
-		MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock();
-		mockConnection.prepareStatement("some SQL");
-		ctrlConnection.setReturnValue(mockStatement, 1);
-		mockStatement.setFetchSize(10);
-		ctrlStatement.setVoidCallable(1);
-		mockStatement.setMaxRows(20);
-		ctrlStatement.setVoidCallable(1);
-		mockStatement.close();
-		ctrlStatement.setVoidCallable(1);
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		Object result = template.execute(new ConnectionCallback() {
+		String result = this.template.execute(new ConnectionCallback<String>() {
 			@Override
-			public Object doInConnection(Connection con) throws SQLException {
+			public String doInConnection(Connection con) throws SQLException {
 				PreparedStatement ps = con.prepareStatement("some SQL");
+				ps.setFetchSize(10);
+				ps.setMaxRows(20);
 				ps.close();
-				assertSame(mockConnection, new PlainNativeJdbcExtractor().getNativeConnection(con));
+				assertSame(JdbcTemplateTests.this.connection, new PlainNativeJdbcExtractor().getNativeConnection(con));
 				return "test";
 			}
 		});
 
 		assertEquals("test", result);
+		verify(this.preparedStatement).setFetchSize(10);
+		verify(this.preparedStatement).setMaxRows(20);
+		verify(this.preparedStatement).close();
+		verify(this.connection).close();
 	}
 
+	@Test
 	public void testCloseConnectionOnRequest() throws Exception {
 		String sql = "SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3";
 
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(this.resultSet.next()).willReturn(false);
+		given(this.connection.createStatement()).willReturn(this.preparedStatement);
 
-		MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock();
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		ctrlResultSet.replay();
-		ctrlStatement.replay();
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
 		RowCountCallbackHandler rcch = new RowCountCallbackHandler();
-		template.query(sql, rcch);
+		this.template.query(sql, rcch);
 
-		ctrlResultSet.verify();
-		ctrlStatement.verify();
+		verify(this.resultSet).close();
+		verify(this.preparedStatement).close();
+		verify(this.connection).close();
 	}
 
 	/**
 	 * Test that we see a runtime exception come back.
 	 */
+	@Test
 	public void testExceptionComesBack() throws Exception {
 		final String sql = "SELECT ID FROM CUSTMR";
-		final RuntimeException rex = new RuntimeException("What I want to see");
+		final RuntimeException runtimeException = new RuntimeException("Expected");
 
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(this.resultSet.next()).willReturn(true);
+		given(this.connection.createStatement()).willReturn(this.preparedStatement);
 
-		MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock();
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		ctrlResultSet.replay();
-		ctrlStatement.replay();
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
+		this.thrown.expect(sameInstance(runtimeException));
 		try {
-			template.query(sql, new RowCallbackHandler() {
+			this.template.query(sql, new RowCallbackHandler() {
 				@Override
 				public void processRow(ResultSet rs) {
-					throw rex;
+					throw runtimeException;
 				}
 			});
-			fail("Should have thrown exception");
 		}
-		catch (RuntimeException ex) {
-			assertTrue("Wanted same exception back, not " + ex, ex == rex);
+		finally {
+			verify(this.resultSet).close();
+			verify(this.preparedStatement).close();
+			verify(this.connection).close();
 		}
 	}
 
 	/**
 	 * Test update with static SQL.
 	 */
+	@Test
 	public void testSqlUpdate() throws Exception {
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 4";
 		int rowsAffected = 33;
 
-		MockControl ctrlStatement = MockControl.createControl(Statement.class);
-		Statement mockStatement = (Statement) ctrlStatement.getMock();
-		mockStatement.executeUpdate(sql);
-		ctrlStatement.setReturnValue(rowsAffected);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
+		given(this.statement.executeUpdate(sql)).willReturn(rowsAffected);
+		given(this.connection.createStatement()).willReturn(this.statement);
 
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-		ctrlStatement.replay();
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		int actualRowsAffected = template.update(sql);
+		int actualRowsAffected = this.template.update(sql);
 		assertTrue("Actual rows affected is correct", actualRowsAffected == rowsAffected);
-		ctrlStatement.verify();
+		verify(this.statement).close();
+		verify(this.connection).close();
 	}
 
 	/**
 	 * Test update with dynamic SQL.
 	 */
+	@Test
 	public void testSqlUpdateWithArguments() throws Exception {
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ? and PR = ?";
 		int rowsAffected = 33;
+		given(this.preparedStatement.executeUpdate()).willReturn(rowsAffected);
 
-		MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock();
-		mockStatement.setObject(1, new Integer(4));
-		ctrlStatement.setVoidCallable();
-		mockStatement.setObject(2, new Float(1.4142), Types.NUMERIC, 2);
-		ctrlStatement.setVoidCallable();
-		mockStatement.executeUpdate();
-		ctrlStatement.setReturnValue(33);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockStatement);
-		ctrlStatement.replay();
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		int actualRowsAffected = template.update(sql,
-				new Object[] {new Integer(4), new SqlParameterValue(Types.NUMERIC, 2, new Float(1.4142))});
+		int actualRowsAffected = this.template.update(sql,
+				new Object[] {4, new SqlParameterValue(Types.NUMERIC, 2, new Float(1.4142))});
 		assertTrue("Actual rows affected is correct", actualRowsAffected == rowsAffected);
-		ctrlStatement.verify();
+		verify(this.preparedStatement).setObject(1, 4);
+		verify(this.preparedStatement).setObject(2, new Float(1.4142), Types.NUMERIC, 2);
+		verify(this.preparedStatement).close();
+		verify(this.connection).close();
 	}
 
+	@Test
 	public void testSqlUpdateEncountersSqlException() throws Exception {
-		SQLException sex = new SQLException("bad update");
+		SQLException sqlException = new SQLException("bad update");
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 4";
 
-		MockControl ctrlStatement = MockControl.createControl(Statement.class);
-		Statement mockStatement = (Statement) ctrlStatement.getMock();
-		mockStatement.executeUpdate(sql);
-		ctrlStatement.setThrowable(sex);
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
+		given(this.statement.executeUpdate(sql)).willThrow(sqlException);
+		given(this.connection.createStatement()).willReturn(this.statement);
 
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		ctrlStatement.replay();
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
+		this.thrown.expect(exceptionCause(sameInstance(sqlException)));
 		try {
-			template.update(sql);
+			this.template.update(sql);
 		}
-		catch (DataAccessException ex) {
-			assertTrue("root cause is correct", ex.getCause() == sex);
+		finally {
+			verify(this.statement).close();
+			verify(this.connection, atLeastOnce()).close();
 		}
-
-		ctrlStatement.verify();
 	}
 
+	@Test
 	public void testSqlUpdateWithThreadConnection() throws Exception {
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 4";
 		int rowsAffected = 33;
 
-		MockControl ctrlStatement = MockControl.createControl(Statement.class);
-		Statement mockStatement = (Statement) ctrlStatement.getMock();
-		mockStatement.executeUpdate(sql);
-		ctrlStatement.setReturnValue(rowsAffected);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
+		given(this.statement.executeUpdate(sql)).willReturn(rowsAffected);
+		given(this.connection.createStatement()).willReturn(this.statement);
 
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
+		int actualRowsAffected = this.template.update(sql);
+		assertTrue("Actual rows affected is correct", actualRowsAffected == rowsAffected);
 
-		ctrlStatement.replay();
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		int actualRowsAffected = template.update(sql);
-		assertTrue(
-			"Actual rows affected is correct",
-			actualRowsAffected == rowsAffected);
-
-		ctrlStatement.verify();
+		verify(this.statement).close();
+		verify(this.connection).close();
 	}
 
+	@Test
 	public void testBatchUpdate() throws Exception {
 		final String[] sql = {"UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 1",
 				"UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 2"};
 
-		MockControl ctrlStatement = MockControl.createControl(Statement.class);
-		Statement mockStatement = (Statement) ctrlStatement.getMock();
-		mockStatement.getConnection();
-		ctrlStatement.setReturnValue(mockConnection);
-		mockStatement.addBatch(sql[0]);
-		ctrlStatement.setVoidCallable();
-		mockStatement.addBatch(sql[1]);
-		ctrlStatement.setVoidCallable();
-		mockStatement.executeBatch();
-		ctrlStatement.setReturnValue(new int[] {1, 1});
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
+		given(this.statement.executeBatch()).willReturn(new int[] {1, 1});
+		mockDatabaseMetaData(true);
+		given(this.connection.createStatement()).willReturn(this.statement);
 
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MySQL");
-		mockDatabaseMetaData.supportsBatchUpdates();
-		ctrlDatabaseMetaData.setReturnValue(true);
-
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(mockDatabaseMetaData, 2);
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		ctrlStatement.replay();
-		ctrlDatabaseMetaData.replay();
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
+		JdbcTemplate template = new JdbcTemplate(this.dataSource, false);
 
 		int[] actualRowsAffected = template.batchUpdate(sql);
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
 
-		ctrlStatement.verify();
-		ctrlDatabaseMetaData.verify();
+		verify(this.statement).addBatch(sql[0]);
+		verify(this.statement).addBatch(sql[1]);
+		verify(this.statement).close();
+		verify(this.connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testBatchUpdateWithNoBatchSupport() throws Exception {
 		final String[] sql = {"UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 1",
 				"UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 2"};
 
-		MockControl ctrlStatement = MockControl.createControl(Statement.class);
-		Statement mockStatement = (Statement) ctrlStatement.getMock();
-		mockStatement.getConnection();
-		ctrlStatement.setReturnValue(mockConnection);
-		mockStatement.execute(sql[0]);
-		ctrlStatement.setReturnValue(false);
-		mockStatement.getUpdateCount();
-		ctrlStatement.setReturnValue(1);
-		mockStatement.execute(sql[1]);
-		ctrlStatement.setReturnValue(false);
-		mockStatement.getUpdateCount();
-		ctrlStatement.setReturnValue(1);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
+		given(this.statement.execute(sql[0])).willReturn(false);
+		given(this.statement.getUpdateCount()).willReturn(1, 1);
+		given(this.statement.execute(sql[1])).willReturn(false);
 
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MySQL");
-		mockDatabaseMetaData.supportsBatchUpdates();
-		ctrlDatabaseMetaData.setReturnValue(false);
+		mockDatabaseMetaData(false);
+		given(this.connection.createStatement()).willReturn(this.statement);
 
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(mockDatabaseMetaData, 2);
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		ctrlStatement.replay();
-		ctrlDatabaseMetaData.replay();
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
+		JdbcTemplate template = new JdbcTemplate(this.dataSource, false);
 
 		int[] actualRowsAffected = template.batchUpdate(sql);
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
 
-		ctrlStatement.verify();
-		ctrlDatabaseMetaData.verify();
+		verify(this.statement, never()).addBatch(anyString());
+		verify(this.statement).close();
+		verify(this.connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testBatchUpdateWithNoBatchSupportAndSelect() throws Exception {
 		final String[] sql = {"UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 1",
 				"SELECT * FROM NOSUCHTABLE"};
 
-		MockControl ctrlStatement = MockControl.createControl(Statement.class);
-		Statement mockStatement = (Statement) ctrlStatement.getMock();
-		mockStatement.getConnection();
-		ctrlStatement.setReturnValue(mockConnection);
-		mockStatement.execute(sql[0]);
-		ctrlStatement.setReturnValue(false);
-		mockStatement.getUpdateCount();
-		ctrlStatement.setReturnValue(1);
-		mockStatement.execute(sql[1]);
-		ctrlStatement.setReturnValue(true);
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MySQL");
-		mockDatabaseMetaData.supportsBatchUpdates();
-		ctrlDatabaseMetaData.setReturnValue(false);
-
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(mockDatabaseMetaData, 2);
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		ctrlStatement.replay();
-		ctrlDatabaseMetaData.replay();
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
+		given(this.statement.execute(sql[0])).willReturn(false);
+		given(this.statement.getUpdateCount()).willReturn(1);
+		given(this.statement.execute(sql[1])).willReturn(true);
+		mockDatabaseMetaData(false);
+		given(this.connection.createStatement()).willReturn(this.statement);
 
+		JdbcTemplate template = new JdbcTemplate(this.dataSource, false);
+		this.thrown.expect(InvalidDataAccessApiUsageException.class);
 		try {
 			template.batchUpdate(sql);
-			fail("Shouldn't have executed batch statement with a select");
 		}
-		catch (DataAccessException ex) {
-			// pass
-			assertTrue("Check exception type", ex.getClass() == InvalidDataAccessApiUsageException.class);
+		finally {
+			verify(this.statement, never()).addBatch(anyString());
+			verify(this.statement).close();
+			verify(this.connection, atLeastOnce()).close();
 		}
-
-		ctrlStatement.verify();
-		ctrlDatabaseMetaData.verify();
 	}
 
+	@Test
 	public void testBatchUpdateWithPreparedStatement() throws Exception {
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
 		final int[] ids = new int[] { 100, 200 };
 		final int[] rowsAffected = new int[] { 1, 2 };
 
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		mockPreparedStatement.getConnection();
-		ctrlPreparedStatement.setReturnValue(mockConnection);
-		mockPreparedStatement.setInt(1, ids[0]);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.addBatch();
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setInt(1, ids[1]);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.addBatch();
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeBatch();
-		ctrlPreparedStatement.setReturnValue(rowsAffected);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MySQL");
-		mockDatabaseMetaData.supportsBatchUpdates();
-		ctrlDatabaseMetaData.setReturnValue(true);
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(mockDatabaseMetaData, 2);
-
-		ctrlPreparedStatement.replay();
-		ctrlDatabaseMetaData.replay();
-		replay();
+		given(this.preparedStatement.executeBatch()).willReturn(rowsAffected);
+		mockDatabaseMetaData(true);
 
 		BatchPreparedStatementSetter setter =
 			new BatchPreparedStatementSetter() {
@@ -812,58 +541,28 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 			}
 		};
 
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
+		JdbcTemplate template = new JdbcTemplate(this.dataSource, false);
 
 		int[] actualRowsAffected = template.batchUpdate(sql, setter);
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
 		assertEquals(rowsAffected[0], actualRowsAffected[0]);
 		assertEquals(rowsAffected[1], actualRowsAffected[1]);
 
-		ctrlPreparedStatement.verify();
-		ctrlDatabaseMetaData.verify();
+		verify(this.preparedStatement, times(2)).addBatch();
+		verify(this.preparedStatement).setInt(1, ids[0]);
+		verify(this.preparedStatement).setInt(1, ids[1]);
+		verify(this.preparedStatement).close();
+		verify(this.connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testInterruptibleBatchUpdate() throws Exception {
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
 		final int[] ids = new int[] { 100, 200 };
 		final int[] rowsAffected = new int[] { 1, 2 };
 
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		mockPreparedStatement.getConnection();
-		ctrlPreparedStatement.setReturnValue(mockConnection);
-		mockPreparedStatement.setInt(1, ids[0]);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.addBatch();
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setInt(1, ids[1]);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.addBatch();
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeBatch();
-		ctrlPreparedStatement.setReturnValue(rowsAffected);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MySQL");
-		mockDatabaseMetaData.supportsBatchUpdates();
-		ctrlDatabaseMetaData.setReturnValue(true);
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(mockDatabaseMetaData, 2);
-
-		ctrlPreparedStatement.replay();
-		ctrlDatabaseMetaData.replay();
-		replay();
+		given(this.preparedStatement.executeBatch()).willReturn(rowsAffected);
+		mockDatabaseMetaData(true);
 
 		BatchPreparedStatementSetter setter =
 				new InterruptibleBatchPreparedStatementSetter() {
@@ -883,58 +582,28 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 					}
 				};
 
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
+		JdbcTemplate template = new JdbcTemplate(this.dataSource, false);
 
 		int[] actualRowsAffected = template.batchUpdate(sql, setter);
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
 		assertEquals(rowsAffected[0], actualRowsAffected[0]);
 		assertEquals(rowsAffected[1], actualRowsAffected[1]);
 
-		ctrlPreparedStatement.verify();
-		ctrlDatabaseMetaData.verify();
+		verify(this.preparedStatement, times(2)).addBatch();
+		verify(this.preparedStatement).setInt(1, ids[0]);
+		verify(this.preparedStatement).setInt(1, ids[1]);
+		verify(this.preparedStatement).close();
+		verify(this.connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testInterruptibleBatchUpdateWithBaseClass() throws Exception {
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
 		final int[] ids = new int[] { 100, 200 };
 		final int[] rowsAffected = new int[] { 1, 2 };
 
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		mockPreparedStatement.getConnection();
-		ctrlPreparedStatement.setReturnValue(mockConnection);
-		mockPreparedStatement.setInt(1, ids[0]);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.addBatch();
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setInt(1, ids[1]);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.addBatch();
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeBatch();
-		ctrlPreparedStatement.setReturnValue(rowsAffected);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MySQL");
-		mockDatabaseMetaData.supportsBatchUpdates();
-		ctrlDatabaseMetaData.setReturnValue(true);
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(mockDatabaseMetaData, 2);
-
-		ctrlPreparedStatement.replay();
-		ctrlDatabaseMetaData.replay();
-		replay();
+		given(this.preparedStatement.executeBatch()).willReturn(rowsAffected);
+		mockDatabaseMetaData(true);
 
 		BatchPreparedStatementSetter setter =
 				new AbstractInterruptibleBatchPreparedStatementSetter() {
@@ -950,56 +619,28 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 					}
 				};
 
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
+		JdbcTemplate template = new JdbcTemplate(this.dataSource, false);
 
 		int[] actualRowsAffected = template.batchUpdate(sql, setter);
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
 		assertEquals(rowsAffected[0], actualRowsAffected[0]);
 		assertEquals(rowsAffected[1], actualRowsAffected[1]);
 
-		ctrlPreparedStatement.verify();
-		ctrlDatabaseMetaData.verify();
+		verify(this.preparedStatement, times(2)).addBatch();
+		verify(this.preparedStatement).setInt(1, ids[0]);
+		verify(this.preparedStatement).setInt(1, ids[1]);
+		verify(this.preparedStatement).close();
+		verify(this.connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testInterruptibleBatchUpdateWithBaseClassAndNoBatchSupport() throws Exception {
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
 		final int[] ids = new int[] { 100, 200 };
 		final int[] rowsAffected = new int[] { 1, 2 };
 
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		mockPreparedStatement.getConnection();
-		ctrlPreparedStatement.setReturnValue(mockConnection);
-		mockPreparedStatement.setInt(1, ids[0]);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(rowsAffected[0]);
-		mockPreparedStatement.setInt(1, ids[1]);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(rowsAffected[1]);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MySQL");
-		mockDatabaseMetaData.supportsBatchUpdates();
-		ctrlDatabaseMetaData.setReturnValue(false);
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(mockDatabaseMetaData, 2);
-
-		ctrlPreparedStatement.replay();
-		ctrlDatabaseMetaData.replay();
-		replay();
+		given(this.preparedStatement.executeUpdate()).willReturn(rowsAffected[0], rowsAffected[1]);
+		mockDatabaseMetaData(false);
 
 		BatchPreparedStatementSetter setter =
 				new AbstractInterruptibleBatchPreparedStatementSetter() {
@@ -1015,46 +656,27 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 					}
 				};
 
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
+		JdbcTemplate template = new JdbcTemplate(this.dataSource, false);
 
 		int[] actualRowsAffected = template.batchUpdate(sql, setter);
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
 		assertEquals(rowsAffected[0], actualRowsAffected[0]);
 		assertEquals(rowsAffected[1], actualRowsAffected[1]);
 
-		ctrlPreparedStatement.verify();
-		ctrlDatabaseMetaData.verify();
+		verify(this.preparedStatement, never()).addBatch();
+		verify(this.preparedStatement).setInt(1, ids[0]);
+		verify(this.preparedStatement).setInt(1, ids[1]);
+		verify(this.preparedStatement).close();
+		verify(this.connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testBatchUpdateWithPreparedStatementAndNoBatchSupport() throws Exception {
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
 		final int[] ids = new int[] { 100, 200 };
 		final int[] rowsAffected = new int[] { 1, 2 };
 
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		mockPreparedStatement.getConnection();
-		ctrlPreparedStatement.setReturnValue(mockConnection);
-		mockPreparedStatement.setInt(1, ids[0]);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(rowsAffected[0]);
-		mockPreparedStatement.setInt(1, ids[1]);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(rowsAffected[1]);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		ctrlPreparedStatement.replay();
-		replay();
+		given(this.preparedStatement.executeUpdate()).willReturn(rowsAffected[0], rowsAffected[1]);
 
 		BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() {
 			@Override
@@ -1067,56 +689,26 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 			}
 		};
 
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-
-		int[] actualRowsAffected = template.batchUpdate(sql, setter);
+		int[] actualRowsAffected = this.template.batchUpdate(sql, setter);
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
 		assertEquals(rowsAffected[0], actualRowsAffected[0]);
 		assertEquals(rowsAffected[1], actualRowsAffected[1]);
 
-		ctrlPreparedStatement.verify();
+		verify(this.preparedStatement, never()).addBatch();
+		verify(this.preparedStatement).setInt(1, ids[0]);
+		verify(this.preparedStatement).setInt(1, ids[1]);
+		verify(this.preparedStatement).close();
+		verify(this.connection).close();
 	}
 
+	@Test
 	public void testBatchUpdateFails() throws Exception {
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
 		final int[] ids = new int[] { 100, 200 };
-		SQLException sex = new SQLException();
+		SQLException sqlException = new SQLException();
 
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		mockPreparedStatement.getConnection();
-		ctrlPreparedStatement.setReturnValue(mockConnection);
-		mockPreparedStatement.setInt(1, ids[0]);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.addBatch();
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setInt(1, ids[1]);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.addBatch();
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeBatch();
-		ctrlPreparedStatement.setThrowable(sex);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MySQL");
-		mockDatabaseMetaData.supportsBatchUpdates();
-		ctrlDatabaseMetaData.setReturnValue(true);
-
-		ctrlConnection.reset();
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(mockDatabaseMetaData, 2);
-		mockConnection.close();
-		ctrlConnection.setVoidCallable(2);
-
-		ctrlPreparedStatement.replay();
-		ctrlDatabaseMetaData.replay();
-		replay();
+		given(this.preparedStatement.executeBatch()).willThrow(sqlException);
+		mockDatabaseMetaData(true);
 
 		BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() {
 			@Override
@@ -1129,19 +721,21 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 			}
 		};
 
+		this.thrown.expect(DataAccessException.class);
+		this.thrown.expect(exceptionCause(sameInstance(sqlException)));
 		try {
-			JdbcTemplate template = new JdbcTemplate(mockDataSource);
-			template.batchUpdate(sql, setter);
-			fail("Should have failed because of SQLException in bulk update");
+			this.template.batchUpdate(sql, setter);
 		}
-		catch (DataAccessException ex) {
-			assertTrue("Root cause is SQLException", ex.getCause() == sex);
+		finally {
+			verify(this.preparedStatement, times(2)).addBatch();
+			verify(this.preparedStatement).setInt(1, ids[0]);
+			verify(this.preparedStatement).setInt(1, ids[1]);
+			verify(this.preparedStatement).close();
+			verify(this.connection, atLeastOnce()).close();
 		}
-
-		ctrlPreparedStatement.verify();
-		ctrlDatabaseMetaData.verify();
 	}
 
+	@Test
 	public void testBatchUpdateWithListOfObjectArrays() throws Exception {
 
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
@@ -1150,22 +744,10 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		ids.add(new Object[] {200});
 		final int[] rowsAffected = new int[] { 1, 2 };
 
-		MockControl ctrlDataSource = MockControl.createControl(DataSource.class);
-		DataSource mockDataSource = (DataSource) ctrlDataSource.getMock();
-		MockControl ctrlConnection = MockControl.createControl(Connection.class);
-		Connection mockConnection = (Connection) ctrlConnection.getMock();
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
+		given(this.preparedStatement.executeBatch()).willReturn(rowsAffected);
+		mockDatabaseMetaData(true);
 
-		BatchUpdateTestHelper.prepareBatchUpdateMocks(sql, ids, null, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection,
-				mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData,
-				mockDatabaseMetaData);
-
-		BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData);
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
+		JdbcTemplate template = new JdbcTemplate(this.dataSource, false);
 
 		int[] actualRowsAffected = template.batchUpdate(sql, ids);
 
@@ -1173,11 +755,15 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		assertEquals(rowsAffected[0], actualRowsAffected[0]);
 		assertEquals(rowsAffected[1], actualRowsAffected[1]);
 
-		BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData);
+		verify(this.preparedStatement, times(2)).addBatch();
+		verify(this.preparedStatement).setObject(1, 100);
+		verify(this.preparedStatement).setObject(1, 200);
+		verify(this.preparedStatement).close();
+		verify(this.connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testBatchUpdateWithListOfObjectArraysPlusTypeInfo() throws Exception {
-
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
 		final List<Object[]> ids = new ArrayList<Object[]>();
 		ids.add(new Object[] {100});
@@ -1185,92 +771,40 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		final int[] sqlTypes = new int[] {Types.NUMERIC};
 		final int[] rowsAffected = new int[] { 1, 2 };
 
-		MockControl ctrlDataSource = MockControl.createControl(DataSource.class);
-		DataSource mockDataSource = (DataSource) ctrlDataSource.getMock();
-		MockControl ctrlConnection = MockControl.createControl(Connection.class);
-		Connection mockConnection = (Connection) ctrlConnection.getMock();
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
+		given(this.preparedStatement.executeBatch()).willReturn(rowsAffected);
+		mockDatabaseMetaData(true);
 
-		BatchUpdateTestHelper.prepareBatchUpdateMocks(sql, ids, sqlTypes, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection,
-				mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData,
-				mockDatabaseMetaData);
-
-		BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData);
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
-
-		int[] actualRowsAffected = template.batchUpdate(sql, ids, sqlTypes);
+		this.template = new JdbcTemplate(this.dataSource, false);
+		int[] actualRowsAffected = this.template.batchUpdate(sql, ids, sqlTypes);
 
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
 		assertEquals(rowsAffected[0], actualRowsAffected[0]);
 		assertEquals(rowsAffected[1], actualRowsAffected[1]);
-
-		BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData);
+		verify(this.preparedStatement, times(2)).addBatch();
+		verify(this.preparedStatement).setObject(1, 100, sqlTypes[0]);
+		verify(this.preparedStatement).setObject(1, 200, sqlTypes[0]);
+		verify(this.preparedStatement).close();
+		verify(this.connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testBatchUpdateWithCollectionOfObjects() throws Exception {
 		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
-		final List<Integer> ids = new ArrayList<Integer>();
-		ids.add(Integer.valueOf(100));
-		ids.add(Integer.valueOf(200));
-		ids.add(Integer.valueOf(300));
+		final List<Integer> ids = Arrays.asList(100, 200, 300);
 		final int[] rowsAffected1 = new int[] { 1, 2 };
 		final int[] rowsAffected2 = new int[] { 3 };
 
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		mockPreparedStatement.getConnection();
-		ctrlPreparedStatement.setReturnValue(mockConnection);
-		mockPreparedStatement.setInt(1, ids.get(0));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.addBatch();
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setInt(1, ids.get(1));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.addBatch();
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setInt(1, ids.get(2));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeBatch();
-		ctrlPreparedStatement.setReturnValue(rowsAffected1);
-		mockPreparedStatement.addBatch();
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeBatch();
-		ctrlPreparedStatement.setReturnValue(rowsAffected2);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
+		given(this.preparedStatement.executeBatch()).willReturn(rowsAffected1, rowsAffected2);
+		mockDatabaseMetaData(true);
 
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MySQL");
-		mockDatabaseMetaData.supportsBatchUpdates();
-		ctrlDatabaseMetaData.setReturnValue(true);
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(mockDatabaseMetaData, 2);
-
-		ctrlPreparedStatement.replay();
-		ctrlDatabaseMetaData.replay();
-		replay();
-
-		ParameterizedPreparedStatementSetter setter = new ParameterizedPreparedStatementSetter<Integer>() {
+		ParameterizedPreparedStatementSetter<Integer> setter = new ParameterizedPreparedStatementSetter<Integer>() {
 			@Override
 			public void setValues(PreparedStatement ps, Integer argument) throws SQLException {
 				ps.setInt(1, argument.intValue());
 			}
 		};
 
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
+		JdbcTemplate template = new JdbcTemplate(this.dataSource, false);
 
 		int[][] actualRowsAffected = template.batchUpdate(sql, ids, 2, setter);
 		assertTrue("executed 2 updates", actualRowsAffected[0].length == 2);
@@ -1278,131 +812,47 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		assertEquals(rowsAffected1[1], actualRowsAffected[0][1]);
 		assertEquals(rowsAffected2[0], actualRowsAffected[1][0]);
 
-		ctrlPreparedStatement.verify();
-		ctrlDatabaseMetaData.verify();
-	}
-
-	public void testCouldntGetConnectionOrExceptionTranslator() throws SQLException {
-		SQLException sex = new SQLException("foo", "07xxx");
-
-		ctrlDataSource = MockControl.createControl(DataSource.class);
-		mockDataSource = (DataSource) ctrlDataSource.getMock();
-		mockDataSource.getConnection();
-		// Expect two calls (one call after caching data product name): make get metadata fail also
-		ctrlDataSource.setThrowable(sex, 2);
-		replay();
-
-		try {
-			JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
-			RowCountCallbackHandler rcch = new RowCountCallbackHandler();
-			template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch);
-			fail("Shouldn't have executed query without a connection");
-		}
-		catch (CannotGetJdbcConnectionException ex) {
-			// pass
-			assertTrue("Check root cause", ex.getCause() == sex);
-		}
-
-		ctrlDataSource.verify();
+		verify(this.preparedStatement, times(3)).addBatch();
+		verify(this.preparedStatement).setInt(1, ids.get(0));
+		verify(this.preparedStatement).setInt(1, ids.get(1));
+		verify(this.preparedStatement).setInt(1, ids.get(2));
+		verify(this.preparedStatement).close();
+		verify(this.connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testCouldntGetConnectionForOperationOrExceptionTranslator() throws SQLException {
-		SQLException sex = new SQLException("foo", "07xxx");
-
-		// Change behavior in setUp() because we only expect one call to getConnection():
-		// none is necessary to get metadata for exception translator
-		ctrlDataSource = MockControl.createControl(DataSource.class);
-		mockDataSource = (DataSource) ctrlDataSource.getMock();
-		mockDataSource.getConnection();
-		// Expect two calls (one call after caching data product name): make get Metadata fail also
-		ctrlDataSource.setThrowable(sex, 2);
-		replay();
-
-		try {
-			JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
-			RowCountCallbackHandler rcch = new RowCountCallbackHandler();
-			template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch);
-			fail("Shouldn't have executed query without a connection");
-		}
-		catch (CannotGetJdbcConnectionException ex) {
-			// pass
-			assertTrue("Check root cause", ex.getCause() == sex);
-		}
-
-		ctrlDataSource.verify();
+		SQLException sqlException = new SQLException("foo", "07xxx");
+		this.dataSource = mock(DataSource.class);
+		given(this.dataSource.getConnection()).willThrow(sqlException);
+		JdbcTemplate template = new JdbcTemplate(this.dataSource, false);
+		RowCountCallbackHandler rcch = new RowCountCallbackHandler();
+		this.thrown.expect(CannotGetJdbcConnectionException.class);
+		this.thrown.expect(exceptionCause(sameInstance(sqlException)));
+		template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch);
 	}
 
+	@Test
 	public void testCouldntGetConnectionForOperationWithLazyExceptionTranslator() throws SQLException {
-		SQLException sex = new SQLException("foo", "07xxx");
-
-		ctrlDataSource = MockControl.createControl(DataSource.class);
-		mockDataSource = (DataSource) ctrlDataSource.getMock();
-		mockDataSource.getConnection();
-		ctrlDataSource.setThrowable(sex, 1);
-		replay();
-
-		try {
-			JdbcTemplate template2 = new JdbcTemplate();
-			template2.setDataSource(mockDataSource);
-			template2.afterPropertiesSet();
-			RowCountCallbackHandler rcch = new RowCountCallbackHandler();
-			template2.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch);
-			fail("Shouldn't have executed query without a connection");
-		}
-		catch (CannotGetJdbcConnectionException ex) {
-			// pass
-			assertTrue("Check root cause", ex.getCause() == sex);
-		}
-
-		ctrlDataSource.verify();
-	}
-
-	/**
-	 * Verify that afterPropertiesSet invokes exception translator.
-	 */
-	public void testCouldntGetConnectionInOperationWithExceptionTranslatorInitialized() throws SQLException {
-		SQLException sex = new SQLException("foo", "07xxx");
-
-		ctrlDataSource = MockControl.createControl(DataSource.class);
-		mockDataSource = (DataSource) ctrlDataSource.getMock();
-		//mockConnection.getMetaData();
-		//ctrlConnection.setReturnValue(null, 1);
-		//mockConnection.close();
-		//ctrlConnection.setVoidCallable(1);
-		ctrlConnection.replay();
-
-		// Change behaviour in setUp() because we only expect one call to getConnection():
-		// none is necessary to get metadata for exception translator
-		ctrlDataSource = MockControl.createControl(DataSource.class);
-		mockDataSource = (DataSource) ctrlDataSource.getMock();
-		// Upfront call for metadata - no longer the case
-		//mockDataSource.getConnection();
-		//ctrlDataSource.setReturnValue(mockConnection, 1);
-		// One call for operation
-		mockDataSource.getConnection();
-		ctrlDataSource.setThrowable(sex, 2);
-		ctrlDataSource.replay();
-
-		try {
-			JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
-			RowCountCallbackHandler rcch = new RowCountCallbackHandler();
-			template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch);
-			fail("Shouldn't have executed query without a connection");
-		}
-		catch (CannotGetJdbcConnectionException ex) {
-			// pass
-			assertTrue("Check root cause", ex.getCause() == sex);
-		}
-
-		ctrlDataSource.verify();
-		ctrlConnection.verify();
+		SQLException sqlException = new SQLException("foo", "07xxx");
+		this.dataSource = mock(DataSource.class);
+		given(this.dataSource.getConnection()).willThrow(sqlException);
+		this.template = new JdbcTemplate();
+		this.template.setDataSource(this.dataSource);
+		this.template.afterPropertiesSet();
+		RowCountCallbackHandler rcch = new RowCountCallbackHandler();
+		this.thrown.expect(CannotGetJdbcConnectionException.class);
+		this.thrown.expect(exceptionCause(sameInstance(sqlException)));
+		this.template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch);
 	}
 
+	@Test
 	public void testCouldntGetConnectionInOperationWithExceptionTranslatorInitializedViaBeanProperty()
 			throws Exception {
 		doTestCouldntGetConnectionInOperationWithExceptionTranslatorInitialized(true);
 	}
 
+	@Test
 	public void testCouldntGetConnectionInOperationWithExceptionTranslatorInitializedInAfterPropertiesSet()
 			throws Exception {
 		doTestCouldntGetConnectionInOperationWithExceptionTranslatorInitialized(false);
@@ -1414,83 +864,33 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 	 */
 	private void doTestCouldntGetConnectionInOperationWithExceptionTranslatorInitialized(boolean beanProperty)
 			throws SQLException {
-
-		SQLException sex = new SQLException("foo", "07xxx");
-
-		ctrlConnection = MockControl.createControl(Connection.class);
-		mockConnection = (Connection) ctrlConnection.getMock();
-		//mockConnection.getMetaData();
-		//ctrlConnection.setReturnValue(null, 1);
-		//mockConnection.close();
-		//ctrlConnection.setVoidCallable(1);
-		ctrlConnection.replay();
-
-		// Change behaviour in setUp() because we only expect one call to getConnection():
-		// none is necessary to get metadata for exception translator
-		ctrlDataSource = MockControl.createControl(DataSource.class);
-		mockDataSource = (DataSource) ctrlDataSource.getMock();
-		// Upfront call for metadata - no longer the case
-		//mockDataSource.getConnection();
-		//ctrlDataSource.setReturnValue(mockConnection, 1);
-		// One call for operation
-		mockDataSource.getConnection();
-		ctrlDataSource.setThrowable(sex, 2);
-		ctrlDataSource.replay();
-
-		try {
-			JdbcTemplate template2 = new JdbcTemplate();
-			template2.setDataSource(mockDataSource);
-			template2.setLazyInit(false);
-			if (beanProperty) {
-				// This will get a connection.
-				template2.setExceptionTranslator(new SQLErrorCodeSQLExceptionTranslator(mockDataSource));
-			}
-			else {
-				// This will cause creation of default SQL translator.
-				// Note that only call should be effective.
-				template2.afterPropertiesSet();
-				template2.afterPropertiesSet();
-			}
-			RowCountCallbackHandler rcch = new RowCountCallbackHandler();
-			template2.query(
-				"SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3",
-				rcch);
-			fail("Shouldn't have executed query without a connection");
+		SQLException sqlException = new SQLException("foo", "07xxx");
+		this.dataSource = mock(DataSource.class);
+		given(this.dataSource.getConnection()).willThrow(sqlException);
+		this.template = new JdbcTemplate();
+		this.template.setDataSource(this.dataSource);
+		this.template.setLazyInit(false);
+		if (beanProperty) {
+			// This will get a connection.
+			this.template.setExceptionTranslator(new SQLErrorCodeSQLExceptionTranslator(this.dataSource));
 		}
-		catch (CannotGetJdbcConnectionException ex) {
-			// pass
-			assertTrue("Check root cause", ex.getCause() == sex);
+		else {
+			// This will cause creation of default SQL translator.
+			this.template.afterPropertiesSet();
 		}
-
-		ctrlDataSource.verify();
-		ctrlConnection.verify();
+		RowCountCallbackHandler rcch = new RowCountCallbackHandler();
+		this.thrown.expect(CannotGetJdbcConnectionException.class);
+		this.thrown.expect(exceptionCause(sameInstance(sqlException)));
+		this.template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch);
 	}
 
+	@Test
 	public void testPreparedStatementSetterSucceeds() throws Exception {
 		final String sql = "UPDATE FOO SET NAME=? WHERE ID = 1";
 		final String name = "Gary";
 		int expectedRowsUpdated = 1;
 
-		MockControl ctrlPreparedStatement =
-			MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement =
-			(PreparedStatement) ctrlPreparedStatement.getMock();
-		mockPreparedStatement.setString(1, name);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(expectedRowsUpdated);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		ctrlPreparedStatement.replay();
-		replay();
+		given(this.preparedStatement.executeUpdate()).willReturn(expectedRowsUpdated);
 
 		PreparedStatementSetter pss = new PreparedStatementSetter() {
 			@Override
@@ -1498,36 +898,19 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 				ps.setString(1, name);
 			}
 		};
-		int actualRowsUpdated =
-			new JdbcTemplate(mockDataSource).update(sql, pss);
-		assertTrue(
-			"updated correct # of rows",
-			actualRowsUpdated == expectedRowsUpdated);
-
-		ctrlPreparedStatement.verify();
+		int actualRowsUpdated = new JdbcTemplate(this.dataSource).update(sql, pss);
+		assertTrue("updated correct # of rows", actualRowsUpdated == expectedRowsUpdated);
+		verify(this.preparedStatement).setString(1, name);
+		verify(this.preparedStatement).close();
+		verify(this.connection).close();
 	}
 
+	@Test
 	public void testPreparedStatementSetterFails() throws Exception {
 		final String sql = "UPDATE FOO SET NAME=? WHERE ID = 1";
 		final String name = "Gary";
-		SQLException sex = new SQLException();
-
-		MockControl ctrlPreparedStatement =
-			MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement =
-			(PreparedStatement) ctrlPreparedStatement.getMock();
-		mockPreparedStatement.setString(1, name);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setThrowable(sex);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		ctrlPreparedStatement.replay();
-		replay();
+		SQLException sqlException = new SQLException();
+		given(this.preparedStatement.executeUpdate()).willThrow(sqlException);
 
 		PreparedStatementSetter pss = new PreparedStatementSetter() {
 			@Override
@@ -1535,85 +918,48 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 				ps.setString(1, name);
 			}
 		};
+		this.thrown.expect(DataAccessException.class);
+		this.thrown.expect(exceptionCause(sameInstance(sqlException)));
 		try {
-			new JdbcTemplate(mockDataSource).update(sql, pss);
-			fail("Should have failed with SQLException");
+			new JdbcTemplate(this.dataSource).update(sql, pss);
 		}
-		catch (DataAccessException ex) {
-			assertTrue("root cause was preserved", ex.getCause() == sex);
+		finally {
+			verify(this.preparedStatement).setString(1, name);
+			verify(this.preparedStatement).close();
+			verify(this.connection, atLeastOnce()).close();
 		}
-
-		ctrlPreparedStatement.verify();
 	}
 
+	@Test
 	public void testCouldntClose() throws Exception {
-		MockControl ctrlStatement = MockControl.createControl(Statement.class);
-		Statement mockStatement = (Statement) ctrlStatement.getMock();
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-		String sql = "SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3";
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		SQLException sex = new SQLException("bar");
-		mockResultSet.close();
-		ctrlResultSet.setThrowable(sex);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setThrowable(sex);
-		mockConnection.close();
-		ctrlConnection.setThrowable(sex);
+		SQLException sqlException = new SQLException("bar");
+		given(this.connection.createStatement()).willReturn(this.statement);
+		given(this.resultSet.next()).willReturn(false);
+		willThrow(sqlException).given(this.resultSet).close();
+		willThrow(sqlException).given(this.statement).close();
+		willThrow(sqlException).given(this.connection).close();
 
-		ctrlStatement.replay();
-		ctrlResultSet.replay();
-		replay();
-
-		JdbcTemplate template2 = new JdbcTemplate(mockDataSource);
 		RowCountCallbackHandler rcch = new RowCountCallbackHandler();
-		template2.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch);
-
-		ctrlStatement.verify();
-		ctrlResultSet.verify();
+		this.template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch);
+		verify(this.connection).close();
 	}
 
 	/**
 	 * Mock objects allow us to produce warnings at will
 	 */
+	@Test
 	public void testFatalWarning() throws Exception {
 		String sql = "SELECT forename from custmr";
 		SQLWarning warnings = new SQLWarning("My warning");
 
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(this.resultSet.next()).willReturn(false);
+		given(this.preparedStatement.getWarnings()).willReturn(warnings);
+		given(this.connection.createStatement()).willReturn(this.preparedStatement);
 
-		MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock();
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		mockStatement.getWarnings();
-		ctrlStatement.setReturnValue(warnings);
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		ctrlResultSet.replay();
-		ctrlStatement.replay();
-		replay();
-
-		JdbcTemplate t = new JdbcTemplate(mockDataSource);
+		JdbcTemplate t = new JdbcTemplate(this.dataSource);
 		t.setIgnoreWarnings(false);
+		this.thrown.expect(SQLWarningException.class);
+		this.thrown.expect(exceptionCause(sameInstance(warnings)));
 		try {
 			t.query(sql, new RowCallbackHandler() {
 				@Override
@@ -1621,163 +967,93 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 					rs.getByte(1);
 				}
 			});
-			fail("Should have thrown exception on warning");
 		}
-		catch (SQLWarningException ex) {
-			// Pass
-			assertTrue(
-				"Root cause of warning was correct",
-				ex.getCause() == warnings);
+		finally {
+			verify(this.resultSet).close();
+			verify(this.preparedStatement).close();
+			verify(this.connection).close();
 		}
-
-		ctrlResultSet.verify();
-		ctrlStatement.verify();
 	}
 
+	@Test
 	public void testIgnoredWarning() throws Exception {
 		String sql = "SELECT forename from custmr";
 		SQLWarning warnings = new SQLWarning("My warning");
 
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		MockControl ctrlStatement =
-			MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockStatement =
-			(PreparedStatement) ctrlStatement.getMock();
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		ctrlResultSet.replay();
-		ctrlStatement.replay();
-		replay();
+		given(this.resultSet.next()).willReturn(false);
+		given(this.connection.createStatement()).willReturn(this.preparedStatement);
+		given(this.preparedStatement.getWarnings()).willReturn(warnings);
 
 		// Too long: truncation
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		template.setIgnoreWarnings(true);
-		template.query(sql, new RowCallbackHandler() {
+
+		this.template.setIgnoreWarnings(true);
+		this.template.query(sql, new RowCallbackHandler() {
 			@Override
-			public void processRow(ResultSet rs)
-				throws java.sql.SQLException {
+			public void processRow(ResultSet rs) throws java.sql.SQLException {
 				rs.getByte(1);
 			}
 		});
 
-		ctrlResultSet.verify();
-		ctrlStatement.verify();
+		verify(this.resultSet).close();
+		verify(this.preparedStatement).close();
+		verify(this.connection).close();
 	}
 
+	@Test
 	public void testSQLErrorCodeTranslation() throws Exception {
-		final SQLException sex = new SQLException("I have a known problem", "99999", 1054);
+		final SQLException sqlException = new SQLException("I have a known problem", "99999", 1054);
 		final String sql = "SELECT ID FROM CUSTOMER";
 
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(this.resultSet.next()).willReturn(true);
+		mockDatabaseMetaData(false);
+		given(this.connection.createStatement()).willReturn(this.preparedStatement);
 
-		MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock();
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MySQL");
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(mockDatabaseMetaData);
-
-		ctrlResultSet.replay();
-		ctrlStatement.replay();
-		ctrlDatabaseMetaData.replay();
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
+		this.thrown.expect(BadSqlGrammarException.class);
+		this.thrown.expect(exceptionCause(sameInstance(sqlException)));
 		try {
-			template.query(sql, new RowCallbackHandler() {
+			this.template.query(sql, new RowCallbackHandler() {
 				@Override
 				public void processRow(ResultSet rs) throws SQLException {
-					throw sex;
+					throw sqlException;
 				}
 			});
 			fail("Should have thrown BadSqlGrammarException");
 		}
-		catch (BadSqlGrammarException ex) {
-			// expected
-			assertTrue("Wanted same exception back, not " + ex, sex == ex.getCause());
+		finally {
+			verify(this.resultSet).close();
+			verify(this.preparedStatement).close();
+			verify(this.connection, atLeastOnce()).close();
 		}
-
-		ctrlResultSet.verify();
-		ctrlStatement.verify();
-		ctrlDatabaseMetaData.verify();
 	}
 
+	@Test
 	public void testSQLErrorCodeTranslationWithSpecifiedDbName() throws Exception {
-		final SQLException sex = new SQLException("I have a known problem", "99999", 1054);
+		final SQLException sqlException = new SQLException("I have a known problem", "99999", 1054);
 		final String sql = "SELECT ID FROM CUSTOMER";
 
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock();
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		ctrlResultSet.replay();
-		ctrlStatement.replay();
-		replay();
+		given(this.resultSet.next()).willReturn(true);
+		given(this.connection.createStatement()).willReturn(this.preparedStatement);
 
 		JdbcTemplate template = new JdbcTemplate();
-		template.setDataSource(mockDataSource);
+		template.setDataSource(this.dataSource);
 		template.setDatabaseProductName("MySQL");
 		template.afterPropertiesSet();
+
+		this.thrown.expect(BadSqlGrammarException.class);
+		this.thrown.expect(exceptionCause(sameInstance(sqlException)));
 		try {
 			template.query(sql, new RowCallbackHandler() {
 				@Override
 				public void processRow(ResultSet rs) throws SQLException {
-					throw sex;
+					throw sqlException;
 				}
 			});
-			fail("Should have thrown BadSqlGrammarException");
 		}
-		catch (BadSqlGrammarException ex) {
-			// expected
-			assertTrue("Wanted same exception back, not " + ex, sex == ex.getCause());
+		finally {
+			verify(this.resultSet).close();
+			verify(this.preparedStatement).close();
+			verify(this.connection).close();
 		}
-
-		ctrlResultSet.verify();
-		ctrlStatement.verify();
 	}
 
 	/**
@@ -1785,152 +1061,60 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 	 * If we provide the SQLExceptionTranslator, we shouldn't use a connection
 	 * to get the metadata
 	 */
+	@Test
 	public void testUseCustomSQLErrorCodeTranslator() throws Exception {
 		// Bad SQL state
-		final SQLException sex = new SQLException("I have a known problem", "07000", 1054);
+		final SQLException sqlException = new SQLException("I have a known problem", "07000", 1054);
 		final String sql = "SELECT ID FROM CUSTOMER";
 
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock();
-		mockStatement.executeQuery(sql);
-		ctrlStatement.setReturnValue(mockResultSet);
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		// Change behaviour in setUp() because we only expect one call to getConnection():
-		// none is necessary to get metadata for exception translator
-		ctrlConnection = MockControl.createControl(Connection.class);
-		mockConnection = (Connection) ctrlConnection.getMock();
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement, 1);
-		mockConnection.close();
-		ctrlConnection.setVoidCallable(1);
-		ctrlConnection.replay();
-
-		ctrlDataSource = MockControl.createControl(DataSource.class);
-		mockDataSource = (DataSource) ctrlDataSource.getMock();
-		mockDataSource.getConnection();
-		ctrlDataSource.setReturnValue(mockConnection, 1);
-		ctrlDataSource.replay();
-		///// end changed behaviour
-
-		ctrlResultSet.replay();
-		ctrlStatement.replay();
+		given(this.resultSet.next()).willReturn(true);
+		given(this.connection.createStatement()).willReturn(this.preparedStatement);
 
 		JdbcTemplate template = new JdbcTemplate();
-		template.setDataSource(mockDataSource);
+		template.setDataSource(this.dataSource);
 		// Set custom exception translator
 		template.setExceptionTranslator(new SQLStateSQLExceptionTranslator());
 		template.afterPropertiesSet();
+
+		this.thrown.expect(BadSqlGrammarException.class);
+		this.thrown.expect(exceptionCause(sameInstance(sqlException)));
 		try {
 			template.query(sql, new RowCallbackHandler() {
 				@Override
-				public void processRow(ResultSet rs)
-					throws SQLException {
-					throw sex;
+				public void processRow(ResultSet rs) throws SQLException {
+					throw sqlException;
 				}
 			});
-			fail("Should have thrown exception");
 		}
-		catch (BadSqlGrammarException ex) {
-			assertTrue(
-				"Wanted same exception back, not " + ex,
-				sex == ex.getCause());
+		finally {
+			verify(this.resultSet).close();
+			verify(this.preparedStatement).close();
+			verify(this.connection).close();
 		}
-
-		ctrlResultSet.verify();
-		ctrlStatement.verify();
-
-		// We didn't call superclass replay() so we need to check these ourselves
-		ctrlDataSource.verify();
-		ctrlConnection.verify();
 	}
 
+	@Test
 	public void testNativeJdbcExtractorInvoked() throws Exception {
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		final ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable(2);
 
-		MockControl ctrlStatement = MockControl.createControl(Statement.class);
-		final Statement mockStatement = (Statement) ctrlStatement.getMock();
-		if (debugEnabled) {
-			mockStatement.getWarnings();
-			ctrlStatement.setReturnValue(null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-		MockControl ctrlStatement2 = MockControl.createControl(Statement.class);
-		final Statement mockStatement2 = (Statement) ctrlStatement2.getMock();
-		mockStatement2.executeQuery("my query");
-		ctrlStatement2.setReturnValue(mockResultSet, 1);
+		final Statement statement2 = mock(Statement.class);
+		given(statement2.executeQuery(anyString())).willReturn(this.resultSet);
 
-		MockControl ctrlPreparedStatement =	MockControl.createControl(PreparedStatement.class);
-		final PreparedStatement mockPreparedStatement =	(PreparedStatement) ctrlPreparedStatement.getMock();
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-		MockControl ctrlPreparedStatement2 =	MockControl.createControl(PreparedStatement.class);
-		final PreparedStatement mockPreparedStatement2 =	(PreparedStatement) ctrlPreparedStatement2.getMock();
-		mockPreparedStatement2.executeQuery();
-		ctrlPreparedStatement2.setReturnValue(mockResultSet, 1);
+		final PreparedStatement preparedStatement2 = mock(PreparedStatement.class);
+		given(preparedStatement2.executeQuery()).willReturn(this.resultSet);
 
-		MockControl ctrlReturnResultSet = MockControl.createControl(ResultSet.class);
-		final ResultSet mockReturnResultSet = (ResultSet) ctrlReturnResultSet.getMock();
-		mockReturnResultSet.next();
-		ctrlReturnResultSet.setReturnValue(false);
-		mockReturnResultSet.close();
-		ctrlReturnResultSet.setVoidCallable(2);
+		final ResultSet returnResultSet = mock(ResultSet.class);
+		given(returnResultSet.next()).willReturn(false);
 
-		MockControl ctrlCallableStatement =	MockControl.createControl(CallableStatement.class);
-		final CallableStatement mockCallableStatement =	(CallableStatement) ctrlCallableStatement.getMock();
-		if (debugEnabled) {
-			mockCallableStatement.getWarnings();
-			ctrlCallableStatement.setReturnValue(null);
-		}
-		mockCallableStatement.close();
-		ctrlCallableStatement.setVoidCallable();
-		MockControl ctrlCallableStatement2 = MockControl.createControl(CallableStatement.class);
-		final CallableStatement mockCallableStatement2 = (CallableStatement) ctrlCallableStatement2.getMock();
-		mockCallableStatement2.execute();
-		ctrlCallableStatement2.setReturnValue(true);
-		mockCallableStatement2.getUpdateCount();
-		ctrlCallableStatement2.setReturnValue(-1);
-		mockCallableStatement2.getResultSet();
-		ctrlCallableStatement2.setReturnValue(mockReturnResultSet);
-		mockCallableStatement2.getMoreResults();
-		ctrlCallableStatement2.setReturnValue(false);
-		mockCallableStatement2.getUpdateCount();
-		ctrlCallableStatement2.setReturnValue(-1);
+		final CallableStatement callableStatement = mock(CallableStatement.class);
+		final CallableStatement callableStatement2 = mock(CallableStatement.class);
+		given(callableStatement2.execute()).willReturn(true);
+		given(callableStatement2.getUpdateCount()).willReturn(-1);
+		given(callableStatement2.getResultSet()).willReturn(returnResultSet);
+		given(callableStatement2.getUpdateCount()).willReturn(-1);
 
-		ctrlResultSet.replay();
-		ctrlStatement.replay();
-		ctrlStatement2.replay();
-		ctrlPreparedStatement.replay();
-		ctrlPreparedStatement2.replay();
-		ctrlReturnResultSet.replay();;
-		ctrlCallableStatement.replay();
-		ctrlCallableStatement2.replay();
+		given(this.connection.createStatement()).willReturn(this.statement);
 
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement, 1);
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		template.setNativeJdbcExtractor(new NativeJdbcExtractor() {
+		this.template.setNativeJdbcExtractor(new NativeJdbcExtractor() {
 			@Override
 			public boolean isNativeConnectionNecessaryForNativeStatements() {
 				return false;
@@ -1953,18 +1137,18 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 			}
 			@Override
 			public Statement getNativeStatement(Statement stmt) {
-				assertTrue(stmt == mockStatement);
-				return mockStatement2;
+				assertTrue(stmt == JdbcTemplateTests.this.statement);
+				return statement2;
 			}
 			@Override
 			public PreparedStatement getNativePreparedStatement(PreparedStatement ps) {
-				assertTrue(ps == mockPreparedStatement);
-				return mockPreparedStatement2;
+				assertTrue(ps == JdbcTemplateTests.this.preparedStatement);
+				return preparedStatement2;
 			}
 			@Override
 			public CallableStatement getNativeCallableStatement(CallableStatement cs) {
-				assertTrue(cs == mockCallableStatement);
-				return mockCallableStatement2;
+				assertTrue(cs == callableStatement);
+				return callableStatement2;
 			}
 			@Override
 			public ResultSet getNativeResultSet(ResultSet rs) {
@@ -1972,92 +1156,51 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 			}
 		});
 
-		template.query("my query",	new ResultSetExtractor() {
+		this.template.query("my query", new ResultSetExtractor<Object>() {
 			@Override
 			public Object extractData(ResultSet rs2) {
-				assertEquals(mockResultSet, rs2);
+				assertEquals(JdbcTemplateTests.this.resultSet, rs2);
 				return null;
 			}
 		});
 
-		template.query(new PreparedStatementCreator() {
+		this.template.query(new PreparedStatementCreator() {
 			@Override
 			public PreparedStatement createPreparedStatement(Connection conn) {
-				return mockPreparedStatement;
+				return JdbcTemplateTests.this.preparedStatement;
 			}
-		}, new ResultSetExtractor() {
+		}, new ResultSetExtractor<Object>() {
 			@Override
 			public Object extractData(ResultSet rs2) {
-				assertEquals(mockResultSet, rs2);
+				assertEquals(JdbcTemplateTests.this.resultSet, rs2);
 				return null;
 			}
 		});
 
-		template.call(new CallableStatementCreator() {
+		this.template.call(new CallableStatementCreator() {
 			@Override
 			public CallableStatement createCallableStatement(Connection con) {
-				return mockCallableStatement;
+				return callableStatement;
 			}
-		},
-		new ArrayList());
+		}, new ArrayList<SqlParameter>());
 
-		ctrlStatement.verify();
-		ctrlStatement2.verify();
-		ctrlPreparedStatement.verify();
-		ctrlPreparedStatement2.verify();
-		ctrlCallableStatement.verify();
-		ctrlCallableStatement2.verify();
+		verify(this.resultSet, times(2)).close();
+		verify(this.statement).close();
+		verify(this.preparedStatement).close();
+		verify(returnResultSet).close();
+		verify(callableStatement).close();
+		verify(this.connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testStaticResultSetClosed() throws Exception {
-		MockControl ctrlResultSet;
-		ResultSet mockResultSet;
-		MockControl ctrlStatement;
-		Statement mockStatement;
-		MockControl ctrlResultSet2;
-		ResultSet mockResultSet2;
-		MockControl ctrlPreparedStatement;
-		PreparedStatement mockPreparedStatement;
-
-		ctrlResultSet = MockControl.createControl(ResultSet.class);
-		mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		ctrlStatement = MockControl.createControl(Statement.class);
-		mockStatement = (Statement) ctrlStatement.getMock();
-		mockStatement.executeQuery("my query");
-		ctrlStatement.setReturnValue(mockResultSet);
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		ctrlResultSet2 = MockControl.createControl(ResultSet.class);
-		mockResultSet2 = (ResultSet) ctrlResultSet2.getMock();
-		mockResultSet2.close();
-		ctrlResultSet2.setVoidCallable();
-
-		ctrlPreparedStatement =	MockControl.createControl(PreparedStatement.class);
-		mockPreparedStatement =	(PreparedStatement) ctrlPreparedStatement.getMock();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet2);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-		mockConnection.prepareStatement("my query");
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		ctrlResultSet.replay();
-		ctrlStatement.replay();
-		ctrlResultSet2.replay();
-		ctrlPreparedStatement.replay();
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
+		ResultSet resultSet2 = mock(ResultSet.class);
+		reset(this.preparedStatement);
+		given(this.preparedStatement.executeQuery()).willReturn(resultSet2);
+		given(this.connection.createStatement()).willReturn(this.statement);
 
 		try {
-			template.query("my query", new ResultSetExtractor() {
+			this.template.query("my query", new ResultSetExtractor<Object>() {
 				@Override
 				public Object extractData(ResultSet rs) {
 					throw new InvalidDataAccessApiUsageException("");
@@ -2070,15 +1213,13 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		}
 
 		try {
-			template.query(new PreparedStatementCreator() {
+			this.template.query(new PreparedStatementCreator() {
 				@Override
-				public PreparedStatement createPreparedStatement(Connection con) throws SQLException {
+				public PreparedStatement createPreparedStatement(Connection con)
+						throws SQLException {
 					return con.prepareStatement("my query");
 				}
-				public String getSql() {
-					return null;
-				}
-			}, new ResultSetExtractor() {
+			}, new ResultSetExtractor<Object>() {
 				@Override
 				public Object extractData(ResultSet rs2) {
 					throw new InvalidDataAccessApiUsageException("");
@@ -2090,45 +1231,19 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 			// ok
 		}
 
-		// verify confirms if test is successful by checking if close() called
-		ctrlResultSet.verify();
-		ctrlStatement.verify();
-		ctrlResultSet2.verify();
-		ctrlPreparedStatement.verify();
+		verify(this.resultSet).close();
+		verify(resultSet2).close();
+		verify(this.preparedStatement).close();
+		verify(this.connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testExecuteClosed() throws Exception {
-		MockControl ctrlResultSet;
-		ResultSet mockResultSet;
-		MockControl ctrlCallable;
-		CallableStatement mockCallable;
+		given(this.resultSet.next()).willReturn(true);
+		given(this.callableStatement.execute()).willReturn(true);
+		given(this.callableStatement.getUpdateCount()).willReturn(-1);
 
-		ctrlResultSet = MockControl.createControl(ResultSet.class);
-		mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		ctrlCallable = MockControl.createControl(CallableStatement.class);
-		mockCallable = (CallableStatement) ctrlCallable.getMock();
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(true);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getResultSet();
-		ctrlCallable.setReturnValue(mockResultSet);
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		mockConnection.prepareCall("my query");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		ctrlResultSet.replay();
-		ctrlCallable.replay();
-		replay();
-
-		List params = new ArrayList();
+		List<SqlParameter> params = new ArrayList<SqlParameter>();
 		params.add(new SqlReturnResultSet("", new RowCallbackHandler() {
 			@Override
 			public void processRow(ResultSet rs) {
@@ -2137,78 +1252,67 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 
 		}));
 
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
+		this.thrown.expect(InvalidDataAccessApiUsageException.class);
 		try {
-			template.call(new CallableStatementCreator() {
+			this.template.call(new CallableStatementCreator() {
 				@Override
-				public CallableStatement createCallableStatement(Connection conn) throws SQLException {
+				public CallableStatement createCallableStatement(Connection conn)
+						throws SQLException {
 					return conn.prepareCall("my query");
 				}
 			}, params);
 		}
-		catch (InvalidDataAccessApiUsageException idaauex) {
-			// ok
+		finally {
+			verify(this.resultSet).close();
+			verify(this.callableStatement).close();
+			verify(this.connection).close();
 		}
-
-		// verify confirms if test is successful by checking if close() called
-		ctrlResultSet.verify();
-		ctrlCallable.verify();
 	}
 
+	@Test
 	public void testCaseInsensitiveResultsMap() throws Exception {
 
-		MockControl ctrlCallable;
-		CallableStatement mockCallable;
+		given(this.callableStatement.execute()).willReturn(false);
+		given(this.callableStatement.getUpdateCount()).willReturn(-1);
+		given(this.callableStatement.getObject(1)).willReturn("X");
 
-		ctrlCallable = MockControl.createControl(CallableStatement.class);
-		mockCallable = (CallableStatement) ctrlCallable.getMock();
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getObject(1);
-		ctrlCallable.setReturnValue("X");
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
+		assertTrue("default should have been NOT case insensitive",
+				!this.template.isResultsMapCaseInsensitive());
 
-		mockConnection.prepareCall("my query");
-		ctrlConnection.setReturnValue(mockCallable);
+		this.template.setResultsMapCaseInsensitive(true);
+		assertTrue("now it should have been set to case insensitive",
+				this.template.isResultsMapCaseInsensitive());
 
-		ctrlCallable.replay();
-		replay();
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource);
-		assertTrue("default should have been NOT case insensitive", !template.isResultsMapCaseInsensitive());
-
-		template.setResultsMapCaseInsensitive(true);
-		assertTrue("now it should have been set to case insensitive", template.isResultsMapCaseInsensitive());
-
-		List params = new ArrayList();
+		List<SqlParameter> params = new ArrayList<SqlParameter>();
 		params.add(new SqlOutParameter("a", 12));
 
-		Map out = template.call(new CallableStatementCreator() {
+		Map out = this.template.call(new CallableStatementCreator() {
 			@Override
-			public CallableStatement createCallableStatement(Connection conn) throws SQLException {
+			public CallableStatement createCallableStatement(Connection conn)
+					throws SQLException {
 				return conn.prepareCall("my query");
 			}
 		}, params);
-		assertTrue("this should have been a LinkedCaseInsensitiveMap", out instanceof LinkedCaseInsensitiveMap);
+
+		assertThat(out, instanceOf(LinkedCaseInsensitiveMap.class));
 		assertNotNull("we should have gotten the result with upper case", out.get("A"));
 		assertNotNull("we should have gotten the result with lower case", out.get("a"));
-
-		ctrlCallable.verify();
+		verify(this.callableStatement).close();
+		verify(this.connection).close();
 	}
 
+	private void mockDatabaseMetaData(boolean supportsBatchUpdates) throws SQLException {
+		DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class);
+		given(databaseMetaData.getDatabaseProductName()).willReturn("MySQL");
+		given(databaseMetaData.supportsBatchUpdates()).willReturn(supportsBatchUpdates);
+		given(this.connection.getMetaData()).willReturn(databaseMetaData);
+	}
 
 	private static class PlainNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
 
 		@Override
-		protected Connection doGetNativeConnection(Connection con) throws SQLException {
-			return con;
+		protected Connection doGetNativeConnection(Connection connection) throws SQLException {
+			return connection;
 		}
 	}
 
@@ -2230,16 +1334,15 @@ public class JdbcTemplateTests extends AbstractJdbcTests {
 		}
 
 		@Override
-		public PreparedStatement createPreparedStatement(Connection conn) throws SQLException {
-			PreparedStatement ps = conn.prepareStatement(sql);
-			ps.setInt(1, id);
+		public PreparedStatement createPreparedStatement(Connection connection) throws SQLException {
+			PreparedStatement ps = connection.prepareStatement(this.sql);
+			ps.setInt(1, this.id);
 			return ps;
 		}
 
 		@Override
 		public String getSql() {
-			return sql;
+			return this.sql;
 		}
 	}
-
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java
index 5760ebfe34..14a7d3d0cb 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java
@@ -16,6 +16,11 @@
 
 package org.springframework.jdbc.core;
 
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -25,9 +30,10 @@ import java.sql.Types;
 import java.util.List;
 
 import junit.framework.TestCase;
-import org.easymock.MockControl;
-import org.apache.commons.logging.LogFactory;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.beans.TestBean;
 import org.springframework.jdbc.datasource.SingleConnectionDataSource;
 import org.springframework.jdbc.support.SQLStateSQLExceptionTranslator;
@@ -38,213 +44,104 @@ import org.springframework.jdbc.support.SQLStateSQLExceptionTranslator;
  */
 public class RowMapperTests extends TestCase {
 
-	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
+	private Connection connection;
+	private Statement statement;
+	private PreparedStatement preparedStatement;
+	private ResultSet resultSet;
 
-	private MockControl conControl;
-	private Connection con;
-	private MockControl rsControl;
-	private ResultSet rs;
-	private JdbcTemplate jdbcTemplate;
-	private List result;
+	private JdbcTemplate template;
 
-	@Override
-	protected void setUp() throws SQLException {
-		conControl = MockControl.createControl(Connection.class);
-		con = (Connection) conControl.getMock();
-		con.isClosed();
-		conControl.setDefaultReturnValue(false);
+	private List<TestBean> result;
 
-		rsControl = MockControl.createControl(ResultSet.class);
-		rs = (ResultSet) rsControl.getMock();
-		rs.next();
-		rsControl.setReturnValue(true, 1);
-		rs.getString(1);
-		rsControl.setReturnValue("tb1", 1);
-		rs.getInt(2);
-		rsControl.setReturnValue(1, 1);
-		rs.next();
-		rsControl.setReturnValue(true, 1);
-		rs.getString(1);
-		rsControl.setReturnValue("tb2", 1);
-		rs.getInt(2);
-		rsControl.setReturnValue(2, 1);
-		rs.next();
-		rsControl.setReturnValue(false, 1);
-		rs.close();
-		rsControl.setVoidCallable(1);
-		rsControl.replay();
-
-		jdbcTemplate = new JdbcTemplate();
-		jdbcTemplate.setDataSource(new SingleConnectionDataSource(con, false));
-		jdbcTemplate.setExceptionTranslator(new SQLStateSQLExceptionTranslator());
-		jdbcTemplate.afterPropertiesSet();
+	@Before
+	public void setUp() throws SQLException {
+		connection = mock(Connection.class);
+		statement = mock(Statement.class);
+		preparedStatement = mock(PreparedStatement.class);
+		resultSet = mock(ResultSet.class);
+		given(connection.createStatement()).willReturn(statement);
+		given(connection.prepareStatement(anyString())).willReturn(preparedStatement);
+		given(statement.executeQuery(anyString())).willReturn(resultSet);
+		given(preparedStatement.executeQuery()).willReturn(resultSet);
+		given(resultSet.next()).willReturn(true, true, false);
+		given(resultSet.getString(1)).willReturn("tb1", "tb2");
+		given(resultSet.getInt(2)).willReturn(1, 2);
+		template = new JdbcTemplate();
+		template.setDataSource(new SingleConnectionDataSource(connection, false));
+		template.setExceptionTranslator(new SQLStateSQLExceptionTranslator());
+		template.afterPropertiesSet();
 	}
 
-	public void testStaticQueryWithRowMapper() throws SQLException {
-		MockControl stmtControl = MockControl.createControl(Statement.class);
-		Statement stmt = (Statement) stmtControl.getMock();
-
-		con.createStatement();
-		conControl.setReturnValue(stmt, 1);
-		stmt.executeQuery("some SQL");
-		stmtControl.setReturnValue(rs, 1);
-		if (debugEnabled) {
-			stmt.getWarnings();
-			stmtControl.setReturnValue(null, 1);
-		}
-		stmt.close();
-		stmtControl.setVoidCallable(1);
-
-		conControl.replay();
-		stmtControl.replay();
-
-		result = jdbcTemplate.query("some SQL", new TestRowMapper());
-
-		stmtControl.verify();
-		verify();
+	@After
+	public void verifyClosed() throws Exception {
+		verify(resultSet).close();
+		verify(connection).close();
 	}
 
-	public void testPreparedStatementCreatorWithRowMapper() throws SQLException {
-		MockControl psControl = MockControl.createControl(PreparedStatement.class);
-		final PreparedStatement ps = (PreparedStatement) psControl.getMock();
-
-		ps.executeQuery();
-		psControl.setReturnValue(rs, 1);
-		if (debugEnabled) {
-			ps.getWarnings();
-			psControl.setReturnValue(null, 1);
-		}
-		ps.close();
-		psControl.setVoidCallable(1);
-
-		conControl.replay();
-		psControl.replay();
-
-		result = jdbcTemplate.query(
-				new PreparedStatementCreator() {
-					@Override
-					public PreparedStatement createPreparedStatement(Connection con) throws SQLException {
-						return ps;
-					}
-				}, new TestRowMapper());
-
-		psControl.verify();
-		verify();
-	}
-
-	public void testPreparedStatementSetterWithRowMapper() throws SQLException {
-		MockControl psControl = MockControl.createControl(PreparedStatement.class);
-		final PreparedStatement ps = (PreparedStatement) psControl.getMock();
-
-		con.prepareStatement("some SQL");
-		conControl.setReturnValue(ps, 1);
-		ps.setString(1, "test");
-		psControl.setVoidCallable(1);
-		ps.executeQuery();
-		psControl.setReturnValue(rs, 1);
-		if (debugEnabled) {
-			ps.getWarnings();
-			psControl.setReturnValue(null, 1);
-		}
-		ps.close();
-		psControl.setVoidCallable(1);
-
-		conControl.replay();
-		psControl.replay();
-
-		result = jdbcTemplate.query(
-				"some SQL",
-				new PreparedStatementSetter() {
-					@Override
-					public void setValues(PreparedStatement ps) throws SQLException {
-						ps.setString(1, "test");
-					}
-				}, new TestRowMapper());
-
-		psControl.verify();
-		verify();
-	}
-
-	public void testQueryWithArgsAndRowMapper() throws SQLException {
-		MockControl psControl = MockControl.createControl(PreparedStatement.class);
-		final PreparedStatement ps = (PreparedStatement) psControl.getMock();
-
-		con.prepareStatement("some SQL");
-		conControl.setReturnValue(ps, 1);
-		ps.setString(1, "test1");
-		ps.setString(2, "test2");
-		psControl.setVoidCallable(1);
-		ps.executeQuery();
-		psControl.setReturnValue(rs, 1);
-		if (debugEnabled) {
-			ps.getWarnings();
-			psControl.setReturnValue(null, 1);
-		}
-		ps.close();
-		psControl.setVoidCallable(1);
-
-		conControl.replay();
-		psControl.replay();
-
-		result = jdbcTemplate.query(
-				"some SQL",
-				new Object[] {"test1", "test2"},
-				new TestRowMapper());
-
-		psControl.verify();
-		verify();
-	}
-
-	public void testQueryWithArgsAndTypesAndRowMapper() throws SQLException {
-		MockControl psControl = MockControl.createControl(PreparedStatement.class);
-		final PreparedStatement ps = (PreparedStatement) psControl.getMock();
-
-		con.prepareStatement("some SQL");
-		conControl.setReturnValue(ps, 1);
-		ps.setString(1, "test1");
-		ps.setString(2, "test2");
-		psControl.setVoidCallable(1);
-		ps.executeQuery();
-		psControl.setReturnValue(rs, 1);
-		if (debugEnabled) {
-			ps.getWarnings();
-			psControl.setReturnValue(null, 1);
-		}
-		ps.close();
-		psControl.setVoidCallable(1);
-
-		conControl.replay();
-		psControl.replay();
-
-		result = jdbcTemplate.query(
-				"some SQL",
-				new Object[] {"test1", "test2"},
-				new int[] {Types.VARCHAR, Types.VARCHAR},
-				new TestRowMapper());
-
-		psControl.verify();
-		verify();
-	}
-
-	protected void verify() {
-		conControl.verify();
-		rsControl.verify();
-
+	@After
+	public void verifyResults() {
 		assertTrue(result != null);
 		assertEquals(2, result.size());
-		TestBean tb1 = (TestBean) result.get(0);
-		TestBean tb2 = (TestBean) result.get(1);
-		assertEquals("tb1", tb1.getName());
-		assertEquals(1, tb1.getAge());
-		assertEquals("tb2", tb2.getName());
-		assertEquals(2, tb2.getAge());
+		assertEquals("tb1", result.get(0).getName());
+		assertEquals("tb2", result.get(1).getName());
+		assertEquals(1, result.get(0).getAge());
+		assertEquals(2, result.get(1).getAge());
 	}
 
+	@Test
+	public void testStaticQueryWithRowMapper() throws SQLException {
+		result = template.query("some SQL", new TestRowMapper());
+		verify(statement).close();
+	}
 
-	private static class TestRowMapper implements RowMapper {
+	@Test
+	public void testPreparedStatementCreatorWithRowMapper() throws SQLException {
+		result = template.query(new PreparedStatementCreator() {
+			@Override
+			public PreparedStatement createPreparedStatement(Connection con)
+					throws SQLException {
+				return preparedStatement;
+			}
+		}, new TestRowMapper());
+		verify(preparedStatement).close();
+	}
 
+	@Test
+	public void testPreparedStatementSetterWithRowMapper() throws SQLException {
+		result = template.query("some SQL", new PreparedStatementSetter() {
+			@Override
+			public void setValues(PreparedStatement ps) throws SQLException {
+				ps.setString(1, "test");
+			}
+		}, new TestRowMapper());
+		verify(preparedStatement).setString(1, "test");
+		verify(preparedStatement).close();
+	}
+
+	@Test
+	public void testQueryWithArgsAndRowMapper() throws SQLException {
+		result = template.query("some SQL",
+				new Object[] { "test1", "test2" },
+				new TestRowMapper());
+		preparedStatement.setString(1, "test1");
+		preparedStatement.setString(2, "test2");
+		preparedStatement.close();
+	}
+
+	@Test
+	public void testQueryWithArgsAndTypesAndRowMapper() throws SQLException {
+		result = template.query("some SQL",
+				new Object[] { "test1", "test2" },
+				new int[] { Types.VARCHAR, Types.VARCHAR },
+				new TestRowMapper());
+		verify(preparedStatement).setString(1, "test1");
+		verify(preparedStatement).setString(2, "test2");
+		verify(preparedStatement).close();
+	}
+
+	private static class TestRowMapper implements RowMapper<TestBean> {
 		@Override
-		public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
+		public TestBean mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return new TestBean(rs.getString(1), rs.getInt(2));
 		}
 	}
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 15ce2e9504..7e8631e6ec 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
@@ -16,6 +16,10 @@
 
 package org.springframework.jdbc.core;
 
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
@@ -23,203 +27,156 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.GregorianCalendar;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * @author Juergen Hoeller
  * @since 31.08.2004
  */
-public class StatementCreatorUtilsTests extends TestCase {
+public class StatementCreatorUtilsTests {
 
-	private MockControl psControl;
-	private PreparedStatement ps;
+	private PreparedStatement preparedStatement;
 
-	@Override
-	protected void setUp() {
-		psControl = MockControl.createControl(PreparedStatement.class);
-		ps = (PreparedStatement) psControl.getMock();
+	@Before
+	public void setUp() {
+		preparedStatement = mock(PreparedStatement.class);
 	}
 
-	@Override
-	protected void tearDown() {
-		psControl.verify();
+	@Test public void testSetParameterValueWithNullAndType() throws SQLException {
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.VARCHAR, null, null);
+		verify(preparedStatement).setNull(1, Types.VARCHAR);
 	}
 
-	public void testSetParameterValueWithNullAndType() throws SQLException {
-		ps.setNull(1, Types.VARCHAR);
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, Types.VARCHAR, null, null);
+	@Test public void testSetParameterValueWithNullAndTypeName() throws SQLException {
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.VARCHAR, "mytype", null);
+		verify(preparedStatement).setNull(1, Types.VARCHAR, "mytype");
 	}
 
-	public void testSetParameterValueWithNullAndTypeName() throws SQLException {
-		ps.setNull(1, Types.VARCHAR, "mytype");
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, Types.VARCHAR, "mytype", null);
-	}
-
-	public void testSetParameterValueWithNullAndUnknownType() throws SQLException {
-		ps.setNull(1, Types.NULL);
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, null, null);
+	@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 {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		MockControl metaDataControl = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData metaData = (DatabaseMetaData) metaDataControl.getMock();
-		ps.getConnection();
-		psControl.setReturnValue(con, 1);
-		con.getMetaData();
-		conControl.setReturnValue(metaData, 1);
-		metaData.getDatabaseProductName();
-		metaDataControl.setReturnValue("Informix Dynamic Server");
-		metaData.getDriverName();
-		metaDataControl.setReturnValue("Informix Driver");
-		ps.setObject(1, null);
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		conControl.replay();
-		metaDataControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, null, null);
-		conControl.verify();
-		metaDataControl.verify();
+		Connection con = mock(Connection.class);
+		DatabaseMetaData metaData = 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");
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null);
+		verify(metaData).getDatabaseProductName();
+		verify(metaData).getDriverName();
+		verify(preparedStatement).setObject(1, null);
 	}
 
-	public void testSetParameterValueWithNullAndUnknownTypeOnDerbyEmbedded() throws SQLException {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		MockControl metaDataControl = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData metaData = (DatabaseMetaData) metaDataControl.getMock();
-		ps.getConnection();
-		psControl.setReturnValue(con, 1);
-		con.getMetaData();
-		conControl.setReturnValue(metaData, 1);
-		metaData.getDatabaseProductName();
-		metaDataControl.setReturnValue("Apache Derby");
-		metaData.getDriverName();
-		metaDataControl.setReturnValue("Apache Derby Embedded Driver");
-		ps.setNull(1, Types.VARCHAR);
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		conControl.replay();
-		metaDataControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, null, null);
-		conControl.verify();
-		metaDataControl.verify();
+	@Test public void testSetParameterValueWithNullAndUnknownTypeOnDerbyEmbedded() throws SQLException {
+		Connection con = mock(Connection.class);
+		DatabaseMetaData metaData = 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");
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null);
+		verify(metaData).getDatabaseProductName();
+		verify(metaData).getDriverName();
+		verify(preparedStatement).setNull(1, Types.VARCHAR);
 	}
 
+	@Test
 	public void testSetParameterValueWithString() throws SQLException {
-		ps.setString(1, "test");
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, Types.VARCHAR, null, "test");
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.VARCHAR, null, "test");
+		verify(preparedStatement).setString(1, "test");
 	}
 
+	@Test
 	public void testSetParameterValueWithStringAndSpecialType() throws SQLException {
-		ps.setObject(1, "test", Types.CHAR);
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, Types.CHAR, null, "test");
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.CHAR, null, "test");
+		verify(preparedStatement).setObject(1, "test", Types.CHAR);
 	}
 
-	public void testSetParameterValueWithStringAndUnknownType() throws SQLException {
-		ps.setString(1, "test");
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, null, "test");
+	@Test public void testSetParameterValueWithStringAndUnknownType() throws SQLException {
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, "test");
+		verify(preparedStatement).setString(1, "test");
 	}
 
+	@Test
 	public void testSetParameterValueWithSqlDate() throws SQLException {
 		java.sql.Date date = new java.sql.Date(1000);
-		ps.setDate(1, date);
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, Types.DATE, null, date);
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.DATE, null, date);
+		verify(preparedStatement).setDate(1, date);
 	}
 
+	@Test
 	public void testSetParameterValueWithDateAndUtilDate() throws SQLException {
 		java.util.Date date = new java.util.Date(1000);
-		ps.setDate(1, new java.sql.Date(1000));
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, Types.DATE, null, date);
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.DATE, null, date);
+		verify(preparedStatement).setDate(1, new java.sql.Date(1000));
 	}
 
+	@Test
 	public void testSetParameterValueWithDateAndCalendar() throws SQLException {
 		java.util.Calendar cal = new GregorianCalendar();
-		ps.setDate(1, new java.sql.Date(cal.getTime().getTime()), cal);
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, Types.DATE, null, cal);
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.DATE, null, cal);
+		verify(preparedStatement).setDate(1, new java.sql.Date(cal.getTime().getTime()), cal);
 	}
 
+	@Test
 	public void testSetParameterValueWithSqlTime() throws SQLException {
 		java.sql.Time time = new java.sql.Time(1000);
-		ps.setTime(1, time);
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, Types.TIME, null, time);
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIME, null, time);
+		verify(preparedStatement).setTime(1, time);
 	}
 
+	@Test
 	public void testSetParameterValueWithTimeAndUtilDate() throws SQLException {
 		java.util.Date date = new java.util.Date(1000);
-		ps.setTime(1, new java.sql.Time(1000));
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, Types.TIME, null, date);
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIME, null, date);
+		verify(preparedStatement).setTime(1, new java.sql.Time(1000));
 	}
 
+	@Test
 	public void testSetParameterValueWithTimeAndCalendar() throws SQLException {
 		java.util.Calendar cal = new GregorianCalendar();
-		ps.setTime(1, new java.sql.Time(cal.getTime().getTime()), cal);
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, Types.TIME, null, cal);
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIME, null, cal);
+		verify(preparedStatement).setTime(1, new java.sql.Time(cal.getTime().getTime()), cal);
 	}
 
+	@Test
 	public void testSetParameterValueWithSqlTimestamp() throws SQLException {
 		java.sql.Timestamp timestamp = new java.sql.Timestamp(1000);
-		ps.setTimestamp(1, timestamp);
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, Types.TIMESTAMP, null, timestamp);
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIMESTAMP, null, timestamp);
+		verify(preparedStatement).setTimestamp(1, timestamp);
 	}
 
+	@Test
 	public void testSetParameterValueWithTimestampAndUtilDate() throws SQLException {
 		java.util.Date date = new java.util.Date(1000);
-		ps.setTimestamp(1, new java.sql.Timestamp(1000));
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, Types.TIMESTAMP, null, date);
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIMESTAMP, null, date);
+		verify(preparedStatement).setTimestamp(1, new java.sql.Timestamp(1000));
 	}
 
+	@Test
 	public void testSetParameterValueWithTimestampAndCalendar() throws SQLException {
 		java.util.Calendar cal = new GregorianCalendar();
-		ps.setTimestamp(1, new java.sql.Timestamp(cal.getTime().getTime()), cal);
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, Types.TIMESTAMP, null, cal);
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIMESTAMP, null, cal);
+		verify(preparedStatement).setTimestamp(1, new java.sql.Timestamp(cal.getTime().getTime()), cal);
 	}
 
+	@Test
 	public void testSetParameterValueWithDateAndUnknownType() throws SQLException {
 		java.util.Date date = new java.util.Date(1000);
-		ps.setTimestamp(1, new java.sql.Timestamp(1000));
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, null, date);
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, date);
+		verify(preparedStatement).setTimestamp(1, new java.sql.Timestamp(1000));
 	}
 
+	@Test
 	public void testSetParameterValueWithCalendarAndUnknownType() throws SQLException {
 		java.util.Calendar cal = new GregorianCalendar();
-		ps.setTimestamp(1, new java.sql.Timestamp(cal.getTime().getTime()), cal);
-		psControl.setVoidCallable(1);
-		psControl.replay();
-		StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, null, cal);
+		StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, cal);
+		verify(preparedStatement).setTimestamp(1, new java.sql.Timestamp(cal.getTime().getTime()), cal);
 	}
 
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
index e18b28a19f..60bec56817 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
@@ -16,41 +16,49 @@
 
 package org.springframework.jdbc.core.namedparam;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Collections;
 
 import javax.sql.DataSource;
 
-import org.easymock.MockControl;
-import org.apache.commons.logging.LogFactory;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.springframework.dao.DataAccessException;
-import org.springframework.jdbc.AbstractJdbcTests;
 import org.springframework.jdbc.Customer;
 import org.springframework.jdbc.core.JdbcOperations;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.PreparedStatementCallback;
 import org.springframework.jdbc.core.ResultSetExtractor;
 import org.springframework.jdbc.core.RowCallbackHandler;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.SqlParameterValue;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.BatchUpdateTestHelper;
 
 /**
  * @author Rick Evans
  * @author Juergen Hoeller
  * @author Chris Beams
  */
-public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
+public class NamedParameterJdbcTemplateTests {
 
 	private static final String SELECT_NAMED_PARAMETERS =
 		"select id, forename from custmr where id = :id and country = :country";
@@ -64,255 +72,166 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 
 	private static final String[] COLUMN_NAMES = new String[] {"id", "forename"};
 
-	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
-	private MockControl ctrlPreparedStatement;
-	private PreparedStatement mockPreparedStatement;
-	private MockControl ctrlResultSet;
-	private ResultSet mockResultSet;
+	private Connection connection;
+	private DataSource dataSource;
+	private PreparedStatement preparedStatement;
+	private ResultSet resultSet;
+	private DatabaseMetaData databaseMetaData;
+	private Map<String, Object> params = new HashMap<String, Object>();
+	private NamedParameterJdbcTemplate namedParameterTemplate;
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		ctrlPreparedStatement =	MockControl.createControl(PreparedStatement.class);
-		mockPreparedStatement =	(PreparedStatement) ctrlPreparedStatement.getMock();
-		ctrlResultSet = MockControl.createControl(ResultSet.class);
-		mockResultSet = (ResultSet) ctrlResultSet.getMock();
+	@Before
+	public void setUp() throws Exception {
+		connection = mock(Connection.class);
+		dataSource = mock(DataSource.class);
+		preparedStatement =	mock(PreparedStatement.class);
+		resultSet = mock(ResultSet.class);
+		namedParameterTemplate = new NamedParameterJdbcTemplate(dataSource);
+		databaseMetaData = mock(DatabaseMetaData.class);
+		given(dataSource.getConnection()).willReturn(connection);
+		given(connection.prepareStatement(anyString())).willReturn(preparedStatement);
+		given(preparedStatement.getConnection()).willReturn(connection);
+		given(preparedStatement.executeQuery()).willReturn(resultSet);
+		given(databaseMetaData.getDatabaseProductName()).willReturn("MySQL");
+		given(databaseMetaData.supportsBatchUpdates()).willReturn(true);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (shouldVerify()) {
-			ctrlPreparedStatement.verify();
-			ctrlResultSet.verify();
-		}
-	}
-
-	@Override
-	protected void replay() {
-		super.replay();
-		ctrlPreparedStatement.replay();
-		ctrlResultSet.replay();
-	}
-
-
+	@Test
 	public void testNullDataSourceProvidedToCtor() throws Exception {
-		try {
-			new NamedParameterJdbcTemplate((DataSource) null);
-			fail("should have thrown IllegalArgumentException");
-		} catch (IllegalArgumentException ex) { /* expected */ }
+		thrown.expect(IllegalArgumentException.class);
+		new NamedParameterJdbcTemplate((DataSource) null);
 	}
 
+	@Test
 	public void testNullJdbcTemplateProvidedToCtor() throws Exception {
-		try {
-			new NamedParameterJdbcTemplate((JdbcOperations) null);
-			fail("should have thrown IllegalArgumentException");
-		} catch (IllegalArgumentException ex) { /* expected */ }
+		thrown.expect(IllegalArgumentException.class);
+		new NamedParameterJdbcTemplate((JdbcOperations) null);
 	}
 
+	@Test
 	public void testExecute() throws SQLException {
-		mockPreparedStatement.setObject(1, new Integer(1));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setObject(2, new Integer(1));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(1);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
+		given(preparedStatement.executeUpdate()).willReturn(1);
 
-		mockConnection.prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
+		params.put("perfId", 1);
+		params.put("priceId", 1);
+		Object result = namedParameterTemplate.execute(UPDATE_NAMED_PARAMETERS, params,
+				new PreparedStatementCallback<Object>() {
+					@Override
+					public Object doInPreparedStatement(PreparedStatement ps)
+							throws SQLException {
+						assertEquals(preparedStatement, ps);
+						ps.executeUpdate();
+						return "result";
+					}
+				});
 
-		replay();
-
-		NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource);
-		Map params = new HashMap();
-		params.put("perfId", new Integer(1));
-		params.put("priceId", new Integer(1));
-		assertEquals("result", jt.execute(UPDATE_NAMED_PARAMETERS, params, new PreparedStatementCallback() {
-			@Override
-			public Object doInPreparedStatement(PreparedStatement ps) throws SQLException {
-				assertEquals(mockPreparedStatement, ps);
-				ps.executeUpdate();
-				return "result";
-			}
-		}));
+		assertEquals("result", result);
+		verify(connection).prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED);
+		verify(preparedStatement).setObject(1, 1);
+		verify(preparedStatement).setObject(2, 1);
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testExecuteWithTypedParameters() throws SQLException {
-		mockPreparedStatement.setObject(1, new Integer(1), Types.DECIMAL);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setObject(2, new Integer(1), Types.INTEGER);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(1);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
+		given(preparedStatement.executeUpdate()).willReturn(1);
 
-		mockConnection.prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
+		params.put("perfId", new SqlParameterValue(Types.DECIMAL, 1));
+		params.put("priceId", new SqlParameterValue(Types.INTEGER, 1));
+		Object result = namedParameterTemplate.execute(UPDATE_NAMED_PARAMETERS, params,
+				new PreparedStatementCallback<Object>() {
+					@Override
+					public Object doInPreparedStatement(PreparedStatement ps)
+							throws SQLException {
+						assertEquals(preparedStatement, ps);
+						ps.executeUpdate();
+						return "result";
+					}
+				});
 
-		replay();
-
-		NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource);
-		Map params = new HashMap();
-		params.put("perfId", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
-		params.put("priceId", new SqlParameterValue(Types.INTEGER, new Integer(1)));
-		assertEquals("result", jt.execute(UPDATE_NAMED_PARAMETERS, params, new PreparedStatementCallback() {
-			@Override
-			public Object doInPreparedStatement(PreparedStatement ps) throws SQLException {
-				assertEquals(mockPreparedStatement, ps);
-				ps.executeUpdate();
-				return "result";
-			}
-		}));
+		assertEquals("result", result);
+		verify(connection).prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED);
+		verify(preparedStatement).setObject(1, 1, Types.DECIMAL);
+		verify(preparedStatement).setObject(2, 1, Types.INTEGER);
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
-	public void testUpdate() throws SQLException {
-		mockPreparedStatement.setObject(1, new Integer(1));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setObject(2, new Integer(1));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(1);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
+	@Test public void testUpdate() throws SQLException {
+		given(preparedStatement.executeUpdate()).willReturn(1);
 
-		mockConnection.prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
+		params.put("perfId", 1);
+		params.put("priceId", 1);
+		int rowsAffected = namedParameterTemplate.update(UPDATE_NAMED_PARAMETERS, params);
 
-		replay();
-
-		NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource);
-		Map params = new HashMap();
-		params.put("perfId", new Integer(1));
-		params.put("priceId", new Integer(1));
-		int rowsAffected = jt.update(UPDATE_NAMED_PARAMETERS, params);
 		assertEquals(1, rowsAffected);
+		verify(connection).prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED);
+		verify(preparedStatement).setObject(1, 1);
+		verify(preparedStatement).setObject(2, 1);
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testUpdateWithTypedParameters() throws SQLException {
-		mockPreparedStatement.setObject(1, new Integer(1), Types.DECIMAL);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setObject(2, new Integer(1), Types.INTEGER);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(1);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
+		given(preparedStatement.executeUpdate()).willReturn(1);
 
-		mockConnection.prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
+		params.put("perfId", new SqlParameterValue(Types.DECIMAL, 1));
+		params.put("priceId", new SqlParameterValue(Types.INTEGER, 1));
+		int rowsAffected = namedParameterTemplate.update(UPDATE_NAMED_PARAMETERS, params);
 
-		replay();
-
-		NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource);
-		Map params = new HashMap();
-		params.put("perfId", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
-		params.put("priceId", new SqlParameterValue(Types.INTEGER, new Integer(1)));
-		int rowsAffected = jt.update(UPDATE_NAMED_PARAMETERS, params);
 		assertEquals(1, rowsAffected);
+		verify(connection).prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED);
+		verify(preparedStatement).setObject(1, 1, Types.DECIMAL);
+		verify(preparedStatement).setObject(2, 1, Types.INTEGER);
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testQueryWithResultSetExtractor() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true);
+		given(resultSet.getInt("id")).willReturn(1);
+		given(resultSet.getString("forename")).willReturn("rod");
 
-		mockPreparedStatement.setObject(1, new Integer(1), Types.DECIMAL);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setString(2, "UK");
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(SELECT_NAMED_PARAMETERS_PARSED);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource);
-		Map params = new HashMap();
-		params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
+		params.put("id", new SqlParameterValue(Types.DECIMAL, 1));
 		params.put("country", "UK");
-		Customer cust = (Customer) jt.query(SELECT_NAMED_PARAMETERS, params, new ResultSetExtractor() {
-			@Override
-			public Object extractData(ResultSet rs) throws SQLException, DataAccessException {
-				rs.next();
-				Customer cust = new Customer();
-				cust.setId(rs.getInt(COLUMN_NAMES[0]));
-				cust.setForename(rs.getString(COLUMN_NAMES[1]));
-				return cust;
-			}
-		});
+		Customer cust = namedParameterTemplate.query(SELECT_NAMED_PARAMETERS, params,
+				new ResultSetExtractor<Customer>() {
+					@Override
+					public Customer extractData(ResultSet rs) throws SQLException,
+							DataAccessException {
+						rs.next();
+						Customer cust = new Customer();
+						cust.setId(rs.getInt(COLUMN_NAMES[0]));
+						cust.setForename(rs.getString(COLUMN_NAMES[1]));
+						return cust;
+					}
+				});
+
 		assertTrue("Customer id was assigned correctly", cust.getId() == 1);
 		assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod"));
+		verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS_PARSED);
+		verify(preparedStatement).setObject(1, 1, Types.DECIMAL);
+		verify(preparedStatement).setString(2, "UK");
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testQueryWithRowCallbackHandler() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt("id")).willReturn(1);
+		given(resultSet.getString("forename")).willReturn("rod");
 
-		mockPreparedStatement.setObject(1, new Integer(1), Types.DECIMAL);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setString(2, "UK");
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(SELECT_NAMED_PARAMETERS_PARSED);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource);
-		Map params = new HashMap();
-		params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
+		params.put("id", new SqlParameterValue(Types.DECIMAL, 1));
 		params.put("country", "UK");
-		final List customers = new LinkedList();
-		jt.query(SELECT_NAMED_PARAMETERS, params, new RowCallbackHandler() {
+		final List<Customer> customers = new LinkedList<Customer>();
+		namedParameterTemplate.query(SELECT_NAMED_PARAMETERS, params, new RowCallbackHandler() {
 			@Override
 			public void processRow(ResultSet rs) throws SQLException {
 				Customer cust = new Customer();
@@ -321,218 +240,148 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests {
 				customers.add(cust);
 			}
 		});
+
 		assertEquals(1, customers.size());
-		Customer cust = (Customer) customers.get(0);
-		assertTrue("Customer id was assigned correctly", cust.getId() == 1);
-		assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod"));
+		assertTrue("Customer id was assigned correctly", customers.get(0).getId() == 1);
+		assertTrue("Customer forename was assigned correctly", customers.get(0).getForename().equals("rod"));
+		verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS_PARSED);
+		verify(preparedStatement).setObject(1, 1, Types.DECIMAL);
+		verify(preparedStatement).setString(2, "UK");
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testQueryWithRowMapper() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt("id")).willReturn(1);
+		given(resultSet.getString("forename")).willReturn("rod");
 
-		mockPreparedStatement.setObject(1, new Integer(1), Types.DECIMAL);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setString(2, "UK");
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(SELECT_NAMED_PARAMETERS_PARSED);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource);
-		Map params = new HashMap();
-		params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
+		params.put("id", new SqlParameterValue(Types.DECIMAL, 1));
 		params.put("country", "UK");
-		List customers = jt.query(SELECT_NAMED_PARAMETERS, params, new RowMapper() {
-			@Override
-			public Object mapRow(ResultSet rs, int rownum) throws SQLException {
-				Customer cust = new Customer();
-				cust.setId(rs.getInt(COLUMN_NAMES[0]));
-				cust.setForename(rs.getString(COLUMN_NAMES[1]));
-				return cust;
-			}
-		});
+		List<Customer> customers = namedParameterTemplate.query(SELECT_NAMED_PARAMETERS, params,
+				new RowMapper<Customer>() {
+					@Override
+					public Customer mapRow(ResultSet rs, int rownum) throws SQLException {
+						Customer cust = new Customer();
+						cust.setId(rs.getInt(COLUMN_NAMES[0]));
+						cust.setForename(rs.getString(COLUMN_NAMES[1]));
+						return cust;
+					}
+				});
 		assertEquals(1, customers.size());
-		Customer cust = (Customer) customers.get(0);
-		assertTrue("Customer id was assigned correctly", cust.getId() == 1);
-		assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod"));
+		assertTrue("Customer id was assigned correctly", customers.get(0).getId() == 1);
+		assertTrue("Customer forename was assigned correctly", customers.get(0).getForename().equals("rod"));
+		verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS_PARSED);
+		verify(preparedStatement).setObject(1, 1, Types.DECIMAL);
+		verify(preparedStatement).setString(2, "UK");
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testQueryForObjectWithRowMapper() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt("id")).willReturn(1);
+		given(resultSet.getString("forename")).willReturn("rod");
 
-		mockPreparedStatement.setObject(1, new Integer(1), Types.DECIMAL);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setString(2, "UK");
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(SELECT_NAMED_PARAMETERS_PARSED);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource);
-		Map params = new HashMap();
-		params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1)));
+		params.put("id", new SqlParameterValue(Types.DECIMAL, 1));
 		params.put("country", "UK");
-		Customer cust = (Customer) jt.queryForObject(SELECT_NAMED_PARAMETERS, params, new RowMapper() {
-			@Override
-			public Object mapRow(ResultSet rs, int rownum) throws SQLException {
-				Customer cust = new Customer();
-				cust.setId(rs.getInt(COLUMN_NAMES[0]));
-				cust.setForename(rs.getString(COLUMN_NAMES[1]));
-				return cust;
-			}
-		});
+		Customer cust = namedParameterTemplate.queryForObject(SELECT_NAMED_PARAMETERS, params,
+				new RowMapper<Customer>() {
+					@Override
+					public Customer mapRow(ResultSet rs, int rownum) throws SQLException {
+						Customer cust = new Customer();
+						cust.setId(rs.getInt(COLUMN_NAMES[0]));
+						cust.setForename(rs.getString(COLUMN_NAMES[1]));
+						return cust;
+					}
+				});
 		assertTrue("Customer id was assigned correctly", cust.getId() == 1);
 		assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod"));
+		verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS_PARSED);
+		verify(preparedStatement).setObject(1, 1, Types.DECIMAL);
+		verify(preparedStatement).setString(2, "UK");
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testBatchUpdateWithPlainMap() throws Exception {
 
-		final String sqlToUse = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
-		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id";
-		final Map[] ids = new Map[2];
+		@SuppressWarnings("unchecked")
+		final Map<String, Integer>[] ids = new Map[2];
 		ids[0] = Collections.singletonMap("id", 100);
 		ids[1] = Collections.singletonMap("id", 200);
 		final int[] rowsAffected = new int[] { 1, 2 };
 
-		MockControl ctrlDataSource = MockControl.createControl(DataSource.class);
-		DataSource mockDataSource = (DataSource) ctrlDataSource.getMock();
-		MockControl ctrlConnection = MockControl.createControl(Connection.class);
-		Connection mockConnection = (Connection) ctrlConnection.getMock();
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
+		given(preparedStatement.executeBatch()).willReturn(rowsAffected);
+		given(connection.getMetaData()).willReturn(databaseMetaData);
 
-		BatchUpdateTestHelper.prepareBatchUpdateMocks(sqlToUse, ids, null, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection,
-				mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData,
-				mockDatabaseMetaData);
-
-		BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData);
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
-		NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(template);
-
-		int[] actualRowsAffected = namedParameterJdbcTemplate.batchUpdate(sql, ids);
+		JdbcTemplate template = new JdbcTemplate(dataSource, false);
+		namedParameterTemplate = new NamedParameterJdbcTemplate(template);
+		int[] actualRowsAffected = namedParameterTemplate.batchUpdate("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id", ids);
 
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
 		assertEquals(rowsAffected[0], actualRowsAffected[0]);
 		assertEquals(rowsAffected[1], actualRowsAffected[1]);
-
-		BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData);
-
+		verify(connection).prepareStatement("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?");
+		verify(preparedStatement).setObject(1, 100);
+		verify(preparedStatement).setObject(1, 200);
+		verify(preparedStatement, times(2)).addBatch();
+		verify(preparedStatement, atLeastOnce()).close();
+		verify(connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testBatchUpdateWithSqlParameterSource() throws Exception {
-
-		final String sqlToUse = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
-		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id";
 		final SqlParameterSource[] ids = new SqlParameterSource[2];
 		ids[0] = new MapSqlParameterSource("id", 100);
 		ids[1] = new MapSqlParameterSource("id", 200);
 		final int[] rowsAffected = new int[] { 1, 2 };
 
-		MockControl ctrlDataSource = MockControl.createControl(DataSource.class);
-		DataSource mockDataSource = (DataSource) ctrlDataSource.getMock();
-		MockControl ctrlConnection = MockControl.createControl(Connection.class);
-		Connection mockConnection = (Connection) ctrlConnection.getMock();
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
+		given(preparedStatement.executeBatch()).willReturn(rowsAffected);
+		given(connection.getMetaData()).willReturn(databaseMetaData);
 
-		BatchUpdateTestHelper.prepareBatchUpdateMocks(sqlToUse, ids, null, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection,
-				mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData,
-				mockDatabaseMetaData);
-
-		BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData);
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
-		NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(template);
-
-		int[] actualRowsAffected = namedParameterJdbcTemplate.batchUpdate(sql, ids);
+		JdbcTemplate template = new JdbcTemplate(dataSource, false);
+		namedParameterTemplate = new NamedParameterJdbcTemplate(template);
+		int[] actualRowsAffected = namedParameterTemplate.batchUpdate("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id", ids);
 
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
 		assertEquals(rowsAffected[0], actualRowsAffected[0]);
 		assertEquals(rowsAffected[1], actualRowsAffected[1]);
-
-		BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData);
-
+		verify(connection).prepareStatement("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?");
+		verify(preparedStatement).setObject(1, 100);
+		verify(preparedStatement).setObject(1, 200);
+		verify(preparedStatement, times(2)).addBatch();
+		verify(preparedStatement, atLeastOnce()).close();
+		verify(connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testBatchUpdateWithSqlParameterSourcePlusTypeInfo() throws Exception {
 
-		final String sqlToUse = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
-		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id";
 		final SqlParameterSource[] ids = new SqlParameterSource[2];
 		ids[0] = new MapSqlParameterSource().addValue("id", 100, Types.NUMERIC);
 		ids[1] = new MapSqlParameterSource().addValue("id", 200, Types.NUMERIC);
-		final int[] sqlTypes = new int[] {Types.NUMERIC};
 		final int[] rowsAffected = new int[] { 1, 2 };
 
-		MockControl ctrlDataSource = MockControl.createControl(DataSource.class);
-		DataSource mockDataSource = (DataSource) ctrlDataSource.getMock();
-		MockControl ctrlConnection = MockControl.createControl(Connection.class);
-		Connection mockConnection = (Connection) ctrlConnection.getMock();
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
+		given(preparedStatement.executeBatch()).willReturn(rowsAffected);
+		given(connection.getMetaData()).willReturn(databaseMetaData);
 
-		BatchUpdateTestHelper.prepareBatchUpdateMocks(sqlToUse, ids, sqlTypes, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection,
-				mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData,
-				mockDatabaseMetaData);
-
-		BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData);
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
-		NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(template);
-
-		int[] actualRowsAffected = namedParameterJdbcTemplate.batchUpdate(sql, ids);
+		JdbcTemplate template = new JdbcTemplate(dataSource, false);
+		namedParameterTemplate = new NamedParameterJdbcTemplate(template);
+		int[] actualRowsAffected = namedParameterTemplate.batchUpdate("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id", ids);
 
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
 		assertEquals(rowsAffected[0], actualRowsAffected[0]);
 		assertEquals(rowsAffected[1], actualRowsAffected[1]);
-
-		BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData);
-
+		verify(connection).prepareStatement("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?");
+		verify(preparedStatement).setObject(1, 100, Types.NUMERIC);
+		verify(preparedStatement).setObject(1, 200, Types.NUMERIC);
+		verify(preparedStatement, times(2)).addBatch();
+		verify(preparedStatement, atLeastOnce()).close();
+		verify(connection, atLeastOnce()).close();
 	}
 
 }
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 5abcb764ed..a2d43fdbba 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
@@ -16,6 +16,14 @@
 
 package org.springframework.jdbc.core.namedparam;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -27,576 +35,261 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.easymock.MockControl;
+import javax.sql.DataSource;
 
-import org.springframework.jdbc.AbstractJdbcTests;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.jdbc.core.RowMapper;
 
 /**
  * @author Thomas Risberg
+ * @author Phillip Webb
  */
-public class NamedParameterQueryTests extends AbstractJdbcTests {
+public class NamedParameterQueryTests {
 
-	private MockControl ctrlPreparedStatement;
-	private PreparedStatement mockPreparedStatement;
-	private MockControl ctrlResultSet;
-	private ResultSet mockResultSet;
-	private MockControl ctrlResultSetMetaData;
-	private ResultSetMetaData mockResultSetMetaData;
+	private DataSource dataSource;
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		ctrlResultSet = MockControl.createControl(ResultSet.class);
-		mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		ctrlResultSetMetaData = MockControl.createControl(ResultSetMetaData.class);
-		mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock();
+	private Connection connection;
+
+	private PreparedStatement preparedStatement;
+
+	private ResultSet resultSet;
+
+	private ResultSetMetaData resultSetMetaData;
+
+	private NamedParameterJdbcTemplate template;
+
+	@Before
+	public void setUp() throws Exception {
+		connection = mock(Connection.class);
+		dataSource = mock(DataSource.class);
+		preparedStatement = mock(PreparedStatement.class);
+		resultSet = mock(ResultSet.class);
+		resultSetMetaData = mock(ResultSetMetaData.class);
+		template = new NamedParameterJdbcTemplate(dataSource);
+		given(dataSource.getConnection()).willReturn(connection);
+		given(resultSetMetaData.getColumnCount()).willReturn(1);
+		given(resultSetMetaData.getColumnLabel(1)).willReturn("age");
+		given(connection.prepareStatement(anyString())).willReturn(preparedStatement);
+		given(preparedStatement.executeQuery()).willReturn(resultSet);
 	}
 
-	@Override
-	protected void replay() {
-		super.replay();
-		ctrlPreparedStatement.replay();
-		ctrlResultSet.replay();
-		ctrlResultSetMetaData.replay();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (false && shouldVerify()) {
-			ctrlPreparedStatement.verify();
-			ctrlResultSet.verify();
-			ctrlResultSetMetaData.verify();
-		}
+	@After
+	public void verifyClose() throws Exception {
+		verify(preparedStatement).close();
+		verify(resultSet).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testQueryForListWithParamMap() throws Exception {
-		String sql = "SELECT AGE FROM CUSTMR WHERE ID < :id";
-		String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID < ?";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1, 2);
-		mockResultSetMetaData.getColumnLabel(1);
-		ctrlResultSetMetaData.setReturnValue("age", 2);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData, 2);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue(new Integer(11));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue(new Integer(12));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		mockPreparedStatement.getWarnings();
-		ctrlPreparedStatement.setReturnValue(null);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sqlToUse);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource);
+		given(resultSet.getMetaData()).willReturn(resultSetMetaData);
+		given(resultSet.next()).willReturn(true, true, false);
+		given(resultSet.getObject(1)).willReturn(11, 12);
 
 		MapSqlParameterSource parms = new MapSqlParameterSource();
-		parms.addValue("id", new Integer(3));
+		parms.addValue("id", 3);
+		List<Map<String, Object>> li = template.queryForList(
+				"SELECT AGE FROM CUSTMR WHERE ID < :id", parms);
 
-		List li = template.queryForList(sql, parms);
 		assertEquals("All rows returned", 2, li.size());
-		assertEquals("First row is Integer", 11, ((Integer)((Map)li.get(0)).get("age")).intValue());
-		assertEquals("Second row is Integer", 12, ((Integer)((Map)li.get(1)).get("age")).intValue());
+		assertEquals("First row is Integer", 11,
+				((Integer) ((Map) li.get(0)).get("age")).intValue());
+		assertEquals("Second row is Integer", 12,
+				((Integer) ((Map) li.get(1)).get("age")).intValue());
+
+		verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?");
+		verify(preparedStatement).setObject(1, 3);
 	}
 
+	@Test
 	public void testQueryForListWithParamMapAndEmptyResult() throws Exception {
-		String sql = "SELECT AGE FROM CUSTMR WHERE ID < :id";
-		String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID < ?";
-
-		ctrlResultSet = MockControl.createControl(ResultSet.class);
-		mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		mockPreparedStatement.getWarnings();
-		ctrlPreparedStatement.setReturnValue(null);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sqlToUse);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource);
+		given(resultSet.next()).willReturn(false);
 
 		MapSqlParameterSource parms = new MapSqlParameterSource();
-		parms.addValue("id", new Integer(3));
+		parms.addValue("id", 3);
+		List<Map<String, Object>> li = template.queryForList(
+				"SELECT AGE FROM CUSTMR WHERE ID < :id", parms);
 
-		List li = template.queryForList(sql, parms);
 		assertEquals("All rows returned", 0, li.size());
+		verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?");
+		verify(preparedStatement).setObject(1, 3);
 	}
 
+	@Test
 	public void testQueryForListWithParamMapAndSingleRowAndColumn() throws Exception {
-		String sql = "SELECT AGE FROM CUSTMR WHERE ID < :id";
-		String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID < ?";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-		mockResultSetMetaData.getColumnLabel(1);
-		ctrlResultSetMetaData.setReturnValue("age", 1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue(new Integer(11));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		mockPreparedStatement.getWarnings();
-		ctrlPreparedStatement.setReturnValue(null);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sqlToUse);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource);
+		given(resultSet.getMetaData()).willReturn(resultSetMetaData);
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getObject(1)).willReturn(11);
 
 		MapSqlParameterSource parms = new MapSqlParameterSource();
-		parms.addValue("id", new Integer(3));
+		parms.addValue("id", 3);
+		List<Map<String, Object>> li = template.queryForList(
+				"SELECT AGE FROM CUSTMR WHERE ID < :id", parms);
 
-		List li = template.queryForList(sql, parms);
 		assertEquals("All rows returned", 1, li.size());
-		assertEquals("First row is Integer", 11, ((Integer)((Map)li.get(0)).get("age")).intValue());
+		assertEquals("First row is Integer", 11,
+				((Integer) ((Map) li.get(0)).get("age")).intValue());
+		verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?");
+		verify(preparedStatement).setObject(1, 3);
 	}
 
-	public void testQueryForListWithParamMapAndIntegerElementAndSingleRowAndColumn() throws Exception {
-		String sql = "SELECT AGE FROM CUSTMR WHERE ID < :id";
-		String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID < ?";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(11);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		mockPreparedStatement.getWarnings();
-		ctrlPreparedStatement.setReturnValue(null);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sqlToUse);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource);
+	@Test
+	public void testQueryForListWithParamMapAndIntegerElementAndSingleRowAndColumn()
+			throws Exception {
+		given(resultSet.getMetaData()).willReturn(resultSetMetaData);
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt(1)).willReturn(11);
 
 		MapSqlParameterSource parms = new MapSqlParameterSource();
-		parms.addValue("id", new Integer(3));
+		parms.addValue("id", 3);
+		List<Integer> li = template.queryForList("SELECT AGE FROM CUSTMR WHERE ID < :id",
+				parms, Integer.class);
 
-		List li = template.queryForList(sql, parms, Integer.class);
 		assertEquals("All rows returned", 1, li.size());
-		assertEquals("First row is Integer", 11, ((Integer) li.get(0)).intValue());
+		assertEquals("First row is Integer", 11, li.get(0).intValue());
+		verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?");
+		verify(preparedStatement).setObject(1, 3);
 	}
 
+	@Test
 	public void testQueryForMapWithParamMapAndSingleRowAndColumn() throws Exception {
-		String sql = "SELECT AGE FROM CUSTMR WHERE ID < :id";
-		String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID < ?";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-		mockResultSetMetaData.getColumnLabel(1);
-		ctrlResultSetMetaData.setReturnValue("age", 1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue(new Integer(11));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		mockPreparedStatement.getWarnings();
-		ctrlPreparedStatement.setReturnValue(null);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sqlToUse);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource);
+		given(resultSet.getMetaData()).willReturn(resultSetMetaData);
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getObject(1)).willReturn(11);
 
 		MapSqlParameterSource parms = new MapSqlParameterSource();
-		parms.addValue("id", new Integer(3));
+		parms.addValue("id", 3);
+		Map map = template.queryForMap("SELECT AGE FROM CUSTMR WHERE ID < :id", parms);
 
-		Map map = template.queryForMap(sql, parms);
 		assertEquals("Row is Integer", 11, ((Integer) map.get("age")).intValue());
+		verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?");
+		verify(preparedStatement).setObject(1, 3);
 	}
 
+	@Test
 	public void testQueryForObjectWithParamMapAndRowMapper() throws Exception {
-		String sql = "SELECT AGE FROM CUSTMR WHERE ID = :id";
-		String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID = ?";
-
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(22);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		mockPreparedStatement.getWarnings();
-		ctrlPreparedStatement.setReturnValue(null);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sqlToUse);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource);
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt(1)).willReturn(22);
 
 		MapSqlParameterSource parms = new MapSqlParameterSource();
-		parms.addValue("id", new Integer(3));
+		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);
+					}
+				});
 
-		Object o = template.queryForObject(sql, parms, new RowMapper() {
-			@Override
-			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
-				return new Integer(rs.getInt(1));
-			}
-		});
 		assertTrue("Correct result type", o instanceof Integer);
+		verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID = ?");
+		verify(preparedStatement).setObject(1, 3);
 	}
 
+	@Test
 	public void testQueryForObjectWithMapAndInteger() throws Exception {
-		String sql = "SELECT AGE FROM CUSTMR WHERE ID = :id";
-		String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID = ?";
+		given(resultSet.getMetaData()).willReturn(resultSetMetaData);
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt(1)).willReturn(22);
 
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
+		Map<String, Object> parms = new HashMap<String, Object>();
+		parms.put("id", 3);
+		Object o = template.queryForObject("SELECT AGE FROM CUSTMR WHERE ID = :id",
+				parms, Integer.class);
 
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(22);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		mockPreparedStatement.getWarnings();
-		ctrlPreparedStatement.setReturnValue(null);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sqlToUse);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource);
-
-		Map parms = new HashMap();
-		parms.put("id", new Integer(3));
-
-		Object o = template.queryForObject(sql, parms, Integer.class);
 		assertTrue("Correct result type", o instanceof Integer);
+		verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID = ?");
+		verify(preparedStatement).setObject(1, 3);
 	}
 
+	@Test
 	public void testQueryForObjectWithParamMapAndInteger() throws Exception {
-		String sql = "SELECT AGE FROM CUSTMR WHERE ID = :id";
-		String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID = ?";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(22);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		mockPreparedStatement.getWarnings();
-		ctrlPreparedStatement.setReturnValue(null);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sqlToUse);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource);
+		given(resultSet.getMetaData()).willReturn(resultSetMetaData);
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt(1)).willReturn(22);
 
 		MapSqlParameterSource parms = new MapSqlParameterSource();
-		parms.addValue("id", new Integer(3));
+		parms.addValue("id", 3);
+		Object o = template.queryForObject("SELECT AGE FROM CUSTMR WHERE ID = :id",
+				parms, Integer.class);
 
-		Object o = template.queryForObject(sql, parms, Integer.class);
 		assertTrue("Correct result type", o instanceof Integer);
+		verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID = ?");
+		verify(preparedStatement).setObject(1, 3);
 	}
 
+	@Test
 	public void testQueryForObjectWithParamMapAndList() throws Exception {
 		String sql = "SELECT AGE FROM CUSTMR WHERE ID IN (:ids)";
 		String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID IN (?, ?)";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(22);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setObject(2, new Integer(4));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		mockPreparedStatement.getWarnings();
-		ctrlPreparedStatement.setReturnValue(null);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sqlToUse);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource);
+		given(resultSet.getMetaData()).willReturn(resultSetMetaData);
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt(1)).willReturn(22);
 
 		MapSqlParameterSource parms = new MapSqlParameterSource();
-		parms.addValue("ids", Arrays.asList(new Object[] {new Integer(3), new Integer(4)}));
-
+		parms.addValue("ids", Arrays.asList(new Object[] { 3, 4 }));
 		Object o = template.queryForObject(sql, parms, Integer.class);
+
 		assertTrue("Correct result type", o instanceof Integer);
+		verify(connection).prepareStatement(sqlToUse);
+		verify(preparedStatement).setObject(1, 3);
 	}
 
+	@Test
 	public void testQueryForObjectWithParamMapAndListOfExpressionLists() throws Exception {
-		String sql = "SELECT AGE FROM CUSTMR WHERE (ID, NAME) IN (:multiExpressionList)";
-		String sqlToUse = "SELECT AGE FROM CUSTMR WHERE (ID, NAME) IN ((?, ?), (?, ?))";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(22);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setString(2, "Rod");
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setObject(3, new Integer(4));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setString(4, "Juergen");
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		mockPreparedStatement.getWarnings();
-		ctrlPreparedStatement.setReturnValue(null);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sqlToUse);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource);
+		given(resultSet.getMetaData()).willReturn(resultSetMetaData);
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt(1)).willReturn(22);
 
 		MapSqlParameterSource parms = new MapSqlParameterSource();
-		List l1 = new ArrayList();
-		l1.add(new Object[] {new Integer(3), "Rod"});
-		l1.add(new Object[] {new Integer(4), "Juergen"});
+		List<Object[]> l1 = new ArrayList<Object[]>();
+		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)",
+				parms, Integer.class);
 
-		Object o = template.queryForObject(sql, parms, Integer.class);
 		assertTrue("Correct result type", o instanceof Integer);
+		verify(connection).prepareStatement(
+				"SELECT AGE FROM CUSTMR WHERE (ID, NAME) IN ((?, ?), (?, ?))");
+		verify(preparedStatement).setObject(1, 3);
 	}
 
+	@Test
 	public void testQueryForIntWithParamMap() throws Exception {
-		String sql = "SELECT AGE FROM CUSTMR WHERE ID = :id";
-		String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID = ?";
-
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(22.0d);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(3));
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		mockPreparedStatement.getWarnings();
-		ctrlPreparedStatement.setReturnValue(null);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sqlToUse);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource);
+		given(resultSet.getMetaData()).willReturn(resultSetMetaData);
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt(1)).willReturn(22);
 
 		MapSqlParameterSource parms = new MapSqlParameterSource();
-		parms.addValue("id", new Integer(3));
+		parms.addValue("id", 3);
+		int i = template.queryForInt("SELECT AGE FROM CUSTMR WHERE ID = :id", parms);
 
-		int i = template.queryForInt(sql, parms);
 		assertEquals("Return of an int", 22, i);
+		verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID = ?");
+		verify(preparedStatement).setObject(1, 3);
 	}
 
+	@Test
 	public void testQueryForLongWithParamBean() throws Exception {
-		String sql = "SELECT AGE FROM CUSTMR WHERE ID = :id";
-		String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID = ?";
+		given(resultSet.getMetaData()).willReturn(resultSetMetaData);
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getLong(1)).willReturn(87L);
 
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
+		BeanPropertySqlParameterSource parms = new BeanPropertySqlParameterSource(
+				new ParameterBean(3));
 
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getLong(1);
-		ctrlResultSet.setReturnValue(87.0d);
-		mockResultSet.wasNull();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		long l = template.queryForLong("SELECT AGE FROM CUSTMR WHERE ID = :id", parms);
 
-		mockPreparedStatement.setObject(1, new Integer(3), Types.INTEGER);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		mockPreparedStatement.getWarnings();
-		ctrlPreparedStatement.setReturnValue(null);
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(sqlToUse);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource);
-		BeanPropertySqlParameterSource parms = new BeanPropertySqlParameterSource(new ParameterBean(3));
-
-		long l = template.queryForLong(sql, parms);
 		assertEquals("Return of a long", 87, l);
+		verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID = ?");
+		verify(preparedStatement).setObject(1, 3, Types.INTEGER);
 	}
 
-
-	private static class ParameterBean {
+	static class ParameterBean {
 
 		private int id;
 
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java
index 3340c760d7..0b09e04dc3 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java
@@ -1,14 +1,11 @@
 package org.springframework.jdbc.core.simple;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-import org.springframework.jdbc.core.metadata.CallMetaDataContext;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.jdbc.core.SqlParameter;
-import org.springframework.jdbc.core.SqlOutParameter;
-import org.springframework.jdbc.core.SqlInOutParameter;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
-import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.Types;
@@ -16,74 +13,51 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import javax.sql.DataSource;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.jdbc.core.SqlInOutParameter;
+import org.springframework.jdbc.core.SqlOutParameter;
+import org.springframework.jdbc.core.SqlParameter;
+import org.springframework.jdbc.core.metadata.CallMetaDataContext;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+
 /**
  * Mock object based tests for CallMetaDataContext.
  *
  * @author Thomas Risberg
  */
-public class CallMetaDataContextTests extends TestCase {
-	private MockControl ctrlDataSource;
-	private DataSource mockDataSource;
-	private MockControl ctrlConnection;
-	private Connection mockConnection;
-	private MockControl ctrlDatabaseMetaData;
-	private DatabaseMetaData mockDatabaseMetaData;
+public class CallMetaDataContextTests {
+
+	private DataSource dataSource;
+	private Connection connection;
+	private DatabaseMetaData databaseMetaData;
 
 	private CallMetaDataContext context = new CallMetaDataContext();
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-
-		ctrlConnection = MockControl.createControl(Connection.class);
-		mockConnection = (Connection) ctrlConnection.getMock();
-		mockConnection.getMetaData();
-		ctrlConnection.setDefaultReturnValue(mockDatabaseMetaData);
-		mockConnection.close();
-		ctrlConnection.setDefaultVoidCallable();
-
-		ctrlDataSource = MockControl.createControl(DataSource.class);
-		mockDataSource = (DataSource) ctrlDataSource.getMock();
-		mockDataSource.getConnection();
-		ctrlDataSource.setDefaultReturnValue(mockConnection);
-
+	@Before
+	public void setUp() throws Exception {
+		connection = mock(Connection.class);
+		databaseMetaData = mock(DatabaseMetaData.class);
+		given(connection.getMetaData()).willReturn(databaseMetaData);
+		dataSource = mock(DataSource.class);
+		given(dataSource.getConnection()).willReturn(connection);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		ctrlDatabaseMetaData.verify();
-		ctrlDataSource.verify();
-	}
-
-	protected void replay() {
-		ctrlDatabaseMetaData.replay();
-		ctrlConnection.replay();
-		ctrlDataSource.replay();
+	@After
+	public void verifyClosed() throws Exception {
+		verify(connection).close();
 	}
 
+	@Test
 	public void testMatchParameterValuesAndSqlInOutParameters() throws Exception {
 		final String TABLE = "customers";
 		final String USER = "me";
-
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MyDB");
-		mockDatabaseMetaData.supportsCatalogsInProcedureCalls();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.supportsSchemasInProcedureCalls();
-		ctrlDatabaseMetaData.setReturnValue(false);
-
-		mockDatabaseMetaData.getUserName();
-		ctrlDatabaseMetaData.setReturnValue(USER);
-		mockDatabaseMetaData.storesUpperCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.storesLowerCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(true);
-
-		replay();
+		given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB");
+		given(databaseMetaData.getUserName()).willReturn(USER);
+		given(databaseMetaData.storesLowerCaseIdentifiers()).willReturn(true);
 
 		List<SqlParameter> parameters = new ArrayList<SqlParameter>();
 		parameters.add(new SqlParameter("id", Types.NUMERIC));
@@ -96,7 +70,7 @@ public class CallMetaDataContextTests extends TestCase {
 		parameterSource.addValue("customer_no", "12345XYZ");
 
 		context.setProcedureName(TABLE);
-		context.initializeMetaData(mockDataSource);
+		context.initializeMetaData(dataSource);
 		context.processParameters(parameters);
 
 		Map<String, Object> inParameters = context.matchInParameterValuesWithCallParameters(parameterSource);
@@ -110,7 +84,6 @@ public class CallMetaDataContextTests extends TestCase {
 
 		List<SqlParameter> callParameters = context.getCallParameters();
 		assertEquals("Wrong number of call parameters", 3, callParameters.size());
-
 	}
 
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java
index 7ed70e88e1..681376564d 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java
@@ -16,9 +16,13 @@
 
 package org.springframework.jdbc.core.simple;
 
-import java.sql.SQLException;
+import static org.junit.Assert.assertEquals;
+
 import java.util.List;
 
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.jdbc.core.AbstractRowMapperTests;
 import org.springframework.jdbc.core.test.ConcretePerson;
@@ -29,46 +33,43 @@ import org.springframework.jdbc.core.test.Person;
  */
 public class ParameterizedBeanPropertyRowMapperTests extends AbstractRowMapperTests {
 
-	private SimpleJdbcTemplate simpleJdbcTemplate;
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
-	@Override
-	protected void setUp() throws SQLException {
-		super.setUp();
-		simpleJdbcTemplate = new SimpleJdbcTemplate(jdbcTemplate);
+	@Test
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	public void testOverridingDifferentClassDefinedForMapping() {
+		ParameterizedBeanPropertyRowMapper mapper = ParameterizedBeanPropertyRowMapper.newInstance(Person.class);
+		thrown.expect(InvalidDataAccessApiUsageException.class);
+		mapper.setMappedClass(Long.class);
 	}
 
-	public void testOverridingClassDefinedForMapping() {
-		ParameterizedBeanPropertyRowMapper<Person> mapper =
-				ParameterizedBeanPropertyRowMapper.newInstance(Person.class);
-		try {
-			((ParameterizedBeanPropertyRowMapper) mapper).setMappedClass(Long.class);
-			fail("Setting new class should have thrown InvalidDataAccessApiUsageException");
-		}
-		catch (InvalidDataAccessApiUsageException ex) {
-			// expected
-		}
-		try {
-			mapper.setMappedClass(Person.class);
-		}
-		catch (InvalidDataAccessApiUsageException ex) {
-			fail("Setting same class should not have thrown InvalidDataAccessApiUsageException");
-		}
+	@Test
+	public void testOverridingSameClassDefinedForMapping() {
+		ParameterizedBeanPropertyRowMapper<Person> mapper = ParameterizedBeanPropertyRowMapper.newInstance(Person.class);
+		mapper.setMappedClass(Person.class);
 	}
 
-	public void testStaticQueryWithRowMapper() throws SQLException {
-		List<Person> result = simpleJdbcTemplate.query("select name, age, birth_date, balance from people",
+	@Test
+	public void testStaticQueryWithRowMapper() throws Exception {
+		Mock mock = new Mock();
+		List<Person> result = mock.getJdbcTemplate().query(
+				"select name, age, birth_date, balance from people",
 				ParameterizedBeanPropertyRowMapper.newInstance(Person.class));
 		assertEquals(1, result.size());
-		Person bean = result.get(0);
-		verifyPerson(bean);
+		verifyPerson(result.get(0));
+		mock.verifyClosed();
 	}
 
-	public void testMappingWithInheritance() throws SQLException {
-		List<ConcretePerson> result = simpleJdbcTemplate.query("select name, age, birth_date, balance from people",
+	@Test
+	public void testMappingWithInheritance() throws Exception {
+		Mock mock = new Mock();
+		List<ConcretePerson> result = mock.getJdbcTemplate().query(
+				"select name, age, birth_date, balance from people",
 				ParameterizedBeanPropertyRowMapper.newInstance(ConcretePerson.class));
 		assertEquals(1, result.size());
-		ConcretePerson bean = result.get(0);
-		verifyConcretePerson(bean);
+		verifyConcretePerson(result.get(0));
+		mock.verifyClosed();
 	}
 
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
index 1f664107a6..f027c15564 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
@@ -16,469 +16,274 @@
 
 package org.springframework.jdbc.core.simple;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-import org.apache.commons.logging.LogFactory;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.springframework.build.test.hamcrest.Matchers.exceptionCause;
 
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import javax.sql.DataSource;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.jdbc.BadSqlGrammarException;
 import org.springframework.jdbc.core.SqlOutParameter;
 import org.springframework.jdbc.core.SqlParameter;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.jdbc.core.simple.SimpleJdbcCall;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-
-import javax.sql.DataSource;
-import java.sql.*;
 
 /**
  * Mock object based tests for SimpleJdbcCall.
  *
  * @author Thomas Risberg
  */
-public class SimpleJdbcCallTests extends TestCase {
+public class SimpleJdbcCallTests {
 
-	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
-	private MockControl ctrlDataSource;
-	private DataSource mockDataSource;
-	private MockControl ctrlConnection;
-	private Connection mockConnection;
-	private MockControl ctrlDatabaseMetaData;
-	private DatabaseMetaData mockDatabaseMetaData;
-	private MockControl ctrlCallable;
-	private CallableStatement mockCallable;
+	private Connection connection;
+	private DatabaseMetaData databaseMetaData;
+	private DataSource dataSource;
+	private CallableStatement callableStatement;
 
-	@Override
-	protected void setUp() throws Exception {
-		ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-
-		ctrlConnection = MockControl.createControl(Connection.class);
-		mockConnection = (Connection) ctrlConnection.getMock();
-		mockConnection.getMetaData();
-		ctrlConnection.setDefaultReturnValue(mockDatabaseMetaData);
-		mockConnection.close();
-		ctrlConnection.setDefaultVoidCallable();
-
-		ctrlDataSource = MockControl.createControl(DataSource.class);
-		mockDataSource = (DataSource) ctrlDataSource.getMock();
-		mockDataSource.getConnection();
-		ctrlDataSource.setDefaultReturnValue(mockConnection);
-
-		ctrlCallable = MockControl.createControl(CallableStatement.class);
-		mockCallable = (CallableStatement) ctrlCallable.getMock();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		ctrlDatabaseMetaData.verify();
-		ctrlDataSource.verify();
-		ctrlCallable.verify();
-	}
-
-	protected void replay() {
-		ctrlDatabaseMetaData.replay();
-		ctrlConnection.replay();
-		ctrlDataSource.replay();
-		ctrlCallable.replay();
+	@Before
+	public void setUp() throws Exception {
+		connection = mock(Connection.class);
+		databaseMetaData = mock(DatabaseMetaData.class);
+		dataSource = mock(DataSource.class);
+		callableStatement = mock(CallableStatement.class);
+		given(connection.getMetaData()).willReturn(databaseMetaData);
+		given(dataSource.getConnection()).willReturn(connection);
 	}
 
+	@Test
 	public void testNoSuchStoredProcedure() throws Exception {
 		final String NO_SUCH_PROC = "x";
-
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MyDB");
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MyDB");
-		mockDatabaseMetaData.getUserName();
-		ctrlDatabaseMetaData.setReturnValue("me");
-		mockDatabaseMetaData.supportsCatalogsInProcedureCalls();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.supportsSchemasInProcedureCalls();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.storesUpperCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.storesLowerCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(true);
-
-		SQLException sex =
-			new SQLException(
-				"Syntax error or access violation exception",
-				"42000");
-		mockCallable.execute();
-		ctrlCallable.setThrowable(sex);
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		mockConnection.prepareCall(
-			"{call " + NO_SUCH_PROC + "()}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-
-		SimpleJdbcCall sproc = new SimpleJdbcCall(mockDataSource).withProcedureName(NO_SUCH_PROC);
+		SQLException sqlException = new SQLException("Syntax error or access violation exception", "42000");
+		given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB");
+		given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB");
+		given(databaseMetaData.getUserName()).willReturn("me");
+		given(databaseMetaData.storesLowerCaseIdentifiers()).willReturn(true);
+		given(callableStatement.execute()).willThrow(sqlException);
+		given(connection.prepareCall("{call " + NO_SUCH_PROC + "()}")).willReturn(callableStatement);
+		SimpleJdbcCall sproc = new SimpleJdbcCall(dataSource).withProcedureName(NO_SUCH_PROC);
+		thrown.expect(BadSqlGrammarException.class);
+		thrown.expect(exceptionCause(sameInstance(sqlException)));
 		try {
 			sproc.execute();
-			fail("Shouldn't succeed in running stored procedure which doesn't exist");
-		} catch (BadSqlGrammarException ex) {
-			// OK
+		}
+		finally {
+			verify(callableStatement).close();
+			verify(connection, atLeastOnce()).close();
 		}
 	}
 
+	@Test
 	public void testUnnamedParameterHandling() throws Exception {
 		final String MY_PROC = "my_proc";
-
-		replay();
-
-		SimpleJdbcCall sproc = new SimpleJdbcCall(mockDataSource).withProcedureName(MY_PROC);
-		try {
-			sproc.addDeclaredParameter(new SqlParameter(1));
-			fail("Shouldn't succeed in adding unnamed parameter");
-		} catch (InvalidDataAccessApiUsageException ex) {
-			// OK
-		}
+		SimpleJdbcCall sproc = new SimpleJdbcCall(dataSource).withProcedureName(MY_PROC);
+		// Shouldn't succeed in adding unnamed parameter
+		thrown.expect(InvalidDataAccessApiUsageException.class);
+		sproc.addDeclaredParameter(new SqlParameter(1));
 	}
 
+	@Test
 	public void testAddInvoiceProcWithoutMetaDataUsingMapParamSource() throws Exception {
-		final int amount = 1103;
-		final int custid = 3;
-
 		initializeAddInvoiceWithoutMetaData(false);
-
-		replay();
-
-		SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withProcedureName("add_invoice");
-		adder.declareParameters(new SqlParameter("amount", Types.INTEGER),
+		SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withProcedureName("add_invoice");
+		adder.declareParameters(
+				new SqlParameter("amount", Types.INTEGER),
 				new SqlParameter("custid", Types.INTEGER),
-				new SqlOutParameter("newid", Types.INTEGER));
-		Number newId = adder.executeObject(Number.class, new MapSqlParameterSource()
-				.addValue("amount", amount)
-				.addValue("custid", custid));
+				new SqlOutParameter("newid",
+				Types.INTEGER));
+		Number newId = adder.executeObject(Number.class, new MapSqlParameterSource().
+				addValue("amount", 1103).
+				addValue("custid", 3));
 		assertEquals(4, newId.intValue());
+		verifyAddInvoiceWithoutMetaData(false);
+		verify(connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testAddInvoiceProcWithoutMetaDataUsingArrayParams() throws Exception {
-		final int amount = 1103;
-		final int custid = 3;
-
 		initializeAddInvoiceWithoutMetaData(false);
-
-		replay();
-
-		SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withProcedureName("add_invoice");
-		adder.declareParameters(new SqlParameter("amount", Types.INTEGER),
+		SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withProcedureName("add_invoice");
+		adder.declareParameters(
+				new SqlParameter("amount", Types.INTEGER),
 				new SqlParameter("custid", Types.INTEGER),
-				new SqlOutParameter("newid", Types.INTEGER));
-		Number newId = adder.executeObject(Number.class, amount, custid);
+				new SqlOutParameter("newid",
+				Types.INTEGER));
+		Number newId = adder.executeObject(Number.class, 1103, 3);
 		assertEquals(4, newId.intValue());
+		verifyAddInvoiceWithoutMetaData(false);
+		verify(connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testAddInvoiceProcWithMetaDataUsingMapParamSource() throws Exception {
-		final int amount = 1103;
-		final int custid = 3;
-
-		MockControl ctrlResultSet = initializeAddInvoiceWithMetaData(false);
-
-		ctrlResultSet.replay();
-		replay();
-
-		SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withProcedureName("add_invoice");
+		initializeAddInvoiceWithMetaData(false);
+		SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withProcedureName("add_invoice");
 		Number newId = adder.executeObject(Number.class, new MapSqlParameterSource()
-				.addValue("amount", amount)
-				.addValue("custid", custid));
+				.addValue("amount", 1103)
+				.addValue("custid", 3));
 		assertEquals(4, newId.intValue());
-
-		ctrlResultSet.verify();
+		verifyAddInvoiceWithMetaData(false);
+		verify(connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testAddInvoiceProcWithMetaDataUsingArrayParams() throws Exception {
-		final int amount = 1103;
-		final int custid = 3;
-
-		MockControl ctrlResultSet = initializeAddInvoiceWithMetaData(false);
-
-		ctrlResultSet.replay();
-		replay();
-
-		SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withProcedureName("add_invoice");
-		Number newId = adder.executeObject(Number.class, amount, custid);
+		initializeAddInvoiceWithMetaData(false);
+		SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withProcedureName("add_invoice");
+		Number newId = adder.executeObject(Number.class, 1103, 3);
 		assertEquals(4, newId.intValue());
-
-		ctrlResultSet.verify();
+		verifyAddInvoiceWithMetaData(false);
+		verify(connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testAddInvoiceFuncWithoutMetaDataUsingMapParamSource() throws Exception {
-		final int amount = 1103;
-		final int custid = 3;
-
 		initializeAddInvoiceWithoutMetaData(true);
-
-		replay();
-
-		SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withFunctionName("add_invoice");
-		adder.declareParameters(new SqlOutParameter("return", Types.INTEGER),
+		SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withFunctionName("add_invoice");
+		adder.declareParameters(
+				new SqlOutParameter("return", Types.INTEGER),
 				new SqlParameter("amount", Types.INTEGER),
 				new SqlParameter("custid", Types.INTEGER));
 		Number newId = adder.executeFunction(Number.class, new MapSqlParameterSource()
-				.addValue("amount", amount)
-				.addValue("custid", custid));
+				.addValue("amount", 1103)
+				.addValue("custid", 3));
 		assertEquals(4, newId.intValue());
+		verifyAddInvoiceWithoutMetaData(true);
+		verify(connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testAddInvoiceFuncWithoutMetaDataUsingArrayParams() throws Exception {
-		final int amount = 1103;
-		final int custid = 3;
-
 		initializeAddInvoiceWithoutMetaData(true);
-
-		replay();
-
-		SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withFunctionName("add_invoice");
-		adder.declareParameters(new SqlOutParameter("return", Types.INTEGER),
+		SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withFunctionName("add_invoice");
+		adder.declareParameters(
+				new SqlOutParameter("return", Types.INTEGER),
 				new SqlParameter("amount", Types.INTEGER),
 				new SqlParameter("custid", Types.INTEGER));
-		Number newId = adder.executeFunction(Number.class, amount, custid);
+		Number newId = adder.executeFunction(Number.class, 1103, 3);
 		assertEquals(4, newId.intValue());
+		verifyAddInvoiceWithoutMetaData(true);
+		verify(connection, atLeastOnce()).close();
 	}
 
+	@Test
 	public void testAddInvoiceFuncWithMetaDataUsingMapParamSource() throws Exception {
-		final int amount = 1103;
-		final int custid = 3;
-
-		MockControl ctrlResultSet = initializeAddInvoiceWithMetaData(true);
-
-		ctrlResultSet.replay();
-		replay();
-
-		SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withFunctionName("add_invoice");
+		initializeAddInvoiceWithMetaData(true);
+		SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withFunctionName("add_invoice");
 		Number newId = adder.executeFunction(Number.class, new MapSqlParameterSource()
-				.addValue("amount", amount)
-				.addValue("custid", custid));
+				.addValue("amount", 1103)
+				.addValue("custid", 3));
 		assertEquals(4, newId.intValue());
+		verifyAddInvoiceWithMetaData(true);
+		verify(connection, atLeastOnce()).close();
 
-		ctrlResultSet.verify();
 	}
 
-	public void testAddInvoiceFuncWithMetaDataUsingArrayParams() throws Exception {
-		final int amount = 1103;
-		final int custid = 3;
-
-		MockControl ctrlResultSet = initializeAddInvoiceWithMetaData(true);
-
-		ctrlResultSet.replay();
-		replay();
-
-		SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withFunctionName("add_invoice");
-		Number newId = adder.executeFunction(Number.class, amount, custid);
+	@Test public void testAddInvoiceFuncWithMetaDataUsingArrayParams() throws Exception {
+		initializeAddInvoiceWithMetaData(true);
+		SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withFunctionName("add_invoice");
+		Number newId = adder.executeFunction(Number.class, 1103, 3);
 		assertEquals(4, newId.intValue());
+		verifyAddInvoiceWithMetaData(true);
+		verify(connection, atLeastOnce()).close();
 
-		ctrlResultSet.verify();
 	}
 
-	private void initializeAddInvoiceWithoutMetaData(boolean isFunction) throws SQLException {
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MyDB");
-		mockDatabaseMetaData.getUserName();
-		ctrlDatabaseMetaData.setReturnValue("me");
-		mockDatabaseMetaData.supportsCatalogsInProcedureCalls();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.supportsSchemasInProcedureCalls();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.storesUpperCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.storesLowerCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(true);
-
+	private void initializeAddInvoiceWithoutMetaData(boolean isFunction)
+			throws SQLException {
+		given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB");
+		given(databaseMetaData.getUserName()).willReturn("me");
+		given(databaseMetaData.storesLowerCaseIdentifiers()).willReturn(true);
+		given(callableStatement.execute()).willReturn(false);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
 		if (isFunction) {
-			mockCallable.registerOutParameter(1, 4);
-			ctrlCallable.setVoidCallable();
-			mockCallable.setObject(2, 1103, 4);
-			ctrlCallable.setVoidCallable();
-			mockCallable.setObject(3, 3, 4);
-			ctrlCallable.setVoidCallable();
+			given(callableStatement.getObject(1)).willReturn(4L);
+			given(connection.prepareCall("{? = call add_invoice(?, ?)}")
+					).willReturn(callableStatement);
 		}
 		else {
-			mockCallable.setObject(1, 1103, 4);
-			ctrlCallable.setVoidCallable();
-			mockCallable.setObject(2, 3, 4);
-			ctrlCallable.setVoidCallable();
-			mockCallable.registerOutParameter(3, 4);
-			ctrlCallable.setVoidCallable();
-		}
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		if (isFunction) {
-			mockCallable.getObject(1);
-		}
-		else {
-			mockCallable.getObject(3);
-		}
-		ctrlCallable.setReturnValue(new Long(4));
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		if (isFunction) {
-			mockConnection.prepareCall(
-				"{? = call add_invoice(?, ?)}");
-			ctrlConnection.setReturnValue(mockCallable);
-		}
-		else {
-			mockConnection.prepareCall(
-				"{call add_invoice(?, ?, ?)}");
-			ctrlConnection.setReturnValue(mockCallable);
+			given(callableStatement.getObject(3)).willReturn(4L);
+			given(connection.prepareCall("{call add_invoice(?, ?, ?)}")
+					).willReturn(callableStatement);
 		}
 	}
 
-	private MockControl initializeAddInvoiceWithMetaData(boolean isFunction) throws SQLException {
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getString("PROCEDURE_CAT");
-		ctrlResultSet.setReturnValue(null);
-		mockResultSet.getString("PROCEDURE_SCHEM");
-		ctrlResultSet.setReturnValue(null);
-		mockResultSet.getString("PROCEDURE_NAME");
-		ctrlResultSet.setReturnValue("add_invoice");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
+	private void verifyAddInvoiceWithoutMetaData(boolean isFunction) throws SQLException {
 		if (isFunction) {
-			mockResultSet.getString("COLUMN_NAME");
-			ctrlResultSet.setReturnValue(null);
-			mockResultSet.getInt("COLUMN_TYPE");
-			ctrlResultSet.setReturnValue(5);
+			verify(callableStatement).registerOutParameter(1, 4);
+			verify(callableStatement).setObject(2, 1103, 4);
+			verify(callableStatement).setObject(3, 3, 4);
 		}
 		else {
-			mockResultSet.getString("COLUMN_NAME");
-			ctrlResultSet.setReturnValue("amount");
-			mockResultSet.getInt("COLUMN_TYPE");
-			ctrlResultSet.setReturnValue(1);
+			verify(callableStatement).setObject(1, 1103, 4);
+			verify(callableStatement).setObject(2, 3, 4);
+			verify(callableStatement).registerOutParameter(3, 4);
 		}
-		mockResultSet.getInt("DATA_TYPE");
-		ctrlResultSet.setReturnValue(4);
-		mockResultSet.getString("TYPE_NAME");
-		ctrlResultSet.setReturnValue(null);
-		mockResultSet.getBoolean("NULLABLE");
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		if (isFunction) {
-			mockResultSet.getString("COLUMN_NAME");
-			ctrlResultSet.setReturnValue("amount");
-			mockResultSet.getInt("COLUMN_TYPE");
-			ctrlResultSet.setReturnValue(1);
-		}
-		else {
-			mockResultSet.getString("COLUMN_NAME");
-			ctrlResultSet.setReturnValue("custid");
-			mockResultSet.getInt("COLUMN_TYPE");
-			ctrlResultSet.setReturnValue(1);
-		}
-		mockResultSet.getInt("DATA_TYPE");
-		ctrlResultSet.setReturnValue(4);
-		mockResultSet.getString("TYPE_NAME");
-		ctrlResultSet.setReturnValue(null);
-		mockResultSet.getBoolean("NULLABLE");
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		if (isFunction) {
-			mockResultSet.getString("COLUMN_NAME");
-			ctrlResultSet.setReturnValue("custid");
-			mockResultSet.getInt("COLUMN_TYPE");
-			ctrlResultSet.setReturnValue(1);
-		}
-		else {
-			mockResultSet.getString("COLUMN_NAME");
-			ctrlResultSet.setReturnValue("newid");
-			mockResultSet.getInt("COLUMN_TYPE");
-			ctrlResultSet.setReturnValue(4);
-		}
-		mockResultSet.getInt("DATA_TYPE");
-		ctrlResultSet.setReturnValue(4);
-		mockResultSet.getString("TYPE_NAME");
-		ctrlResultSet.setReturnValue(null);
-		mockResultSet.getBoolean("NULLABLE");
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("Oracle");
-		mockDatabaseMetaData.getUserName();
-		ctrlDatabaseMetaData.setReturnValue("ME");
-		mockDatabaseMetaData.supportsCatalogsInProcedureCalls();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.supportsSchemasInProcedureCalls();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.storesUpperCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(true);
-		mockDatabaseMetaData.storesLowerCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.getProcedures("", "ME", "ADD_INVOICE");
-		ctrlDatabaseMetaData.setReturnValue(mockResultSet);
-		mockDatabaseMetaData.getProcedureColumns("", "ME", "ADD_INVOICE", null);
-		ctrlDatabaseMetaData.setReturnValue(mockResultSet);
-
-		if (isFunction) {
-			mockCallable.registerOutParameter(1, 4);
-			ctrlCallable.setVoidCallable();
-			mockCallable.setObject(2, 1103, 4);
-			ctrlCallable.setVoidCallable();
-			mockCallable.setObject(3, 3, 4);
-			ctrlCallable.setVoidCallable();
-		}
-		else {
-			mockCallable.setObject(1, 1103, 4);
-			ctrlCallable.setVoidCallable();
-			mockCallable.setObject(2, 3, 4);
-			ctrlCallable.setVoidCallable();
-			mockCallable.registerOutParameter(3, 4);
-			ctrlCallable.setVoidCallable();
-		}
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		if (isFunction) {
-			mockCallable.getObject(1);
-			ctrlCallable.setReturnValue(new Long(4));
-		}
-		else {
-			mockCallable.getObject(3);
-			ctrlCallable.setReturnValue(new Long(4));
-		}
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		if (isFunction) {
-			mockConnection.prepareCall(
-				"{? = call ADD_INVOICE(?, ?)}");
-			ctrlConnection.setReturnValue(mockCallable);
-		}
-		else {
-			mockConnection.prepareCall(
-				"{call ADD_INVOICE(?, ?, ?)}");
-			ctrlConnection.setReturnValue(mockCallable);
-		}
-		return ctrlResultSet;
+		verify(callableStatement).close();
 	}
 
+	private void initializeAddInvoiceWithMetaData(boolean isFunction) throws SQLException {
+		ResultSet proceduresResultSet = mock(ResultSet.class);
+		ResultSet procedureColumnsResultSet = mock(ResultSet.class);
+		given(databaseMetaData.getDatabaseProductName()).willReturn("Oracle");
+		given(databaseMetaData.getUserName()).willReturn("ME");
+		given(databaseMetaData.storesUpperCaseIdentifiers()).willReturn(true);
+		given(databaseMetaData.getProcedures("", "ME", "ADD_INVOICE")).willReturn(proceduresResultSet);
+		given(databaseMetaData.getProcedureColumns("", "ME", "ADD_INVOICE", null)).willReturn(procedureColumnsResultSet);
+
+		given(proceduresResultSet.next()).willReturn(true, false);
+		given(proceduresResultSet.getString("PROCEDURE_NAME")).willReturn("add_invoice");
+
+		given(procedureColumnsResultSet.next()).willReturn(true, true, true, false);
+		given(procedureColumnsResultSet.getInt("DATA_TYPE")).willReturn(4);
+		if (isFunction) {
+			given(procedureColumnsResultSet.getString("COLUMN_NAME")).willReturn(null,"amount", "custid");
+			given(procedureColumnsResultSet.getInt("COLUMN_TYPE")).willReturn(5, 1, 1);
+			given(connection.prepareCall("{? = call ADD_INVOICE(?, ?)}")).willReturn(callableStatement);
+			given(callableStatement.getObject(1)).willReturn(4L);
+		}
+		else {
+			given(procedureColumnsResultSet.getString("COLUMN_NAME")).willReturn("amount", "custid", "newid");
+			given(procedureColumnsResultSet.getInt("COLUMN_TYPE")).willReturn(1, 1, 4);
+			given(connection.prepareCall("{call ADD_INVOICE(?, ?, ?)}")).willReturn(callableStatement);
+			given(callableStatement.getObject(3)).willReturn(4L);
+		}
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+	}
+
+	private void verifyAddInvoiceWithMetaData(boolean isFunction) throws SQLException {
+		ResultSet proceduresResultSet = databaseMetaData.getProcedures("", "ME", "ADD_INVOICE");
+		ResultSet procedureColumnsResultSet = databaseMetaData.getProcedureColumns("", "ME", "ADD_INVOICE", null);
+		if (isFunction) {
+			verify(callableStatement).registerOutParameter(1, 4);
+			verify(callableStatement).setObject(2, 1103, 4);
+			verify(callableStatement).setObject(3, 3, 4);
+		}
+		else {
+			verify(callableStatement).setObject(1, 1103, 4);
+			verify(callableStatement).setObject(2, 3, 4);
+			verify(callableStatement).registerOutParameter(3, 4);
+		}
+		verify(callableStatement).close();
+		verify(proceduresResultSet).close();
+		verify(procedureColumnsResultSet).close();
+
+}
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
index 088e48f98a..1c763595b6 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
@@ -16,105 +16,71 @@
 
 package org.springframework.jdbc.core.simple;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-import org.springframework.dao.InvalidDataAccessApiUsageException;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
-import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.util.HashMap;
 
+import javax.sql.DataSource;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+
 /**
  * Mock object based tests for SimpleJdbcInsert.
  *
  * @author Thomas Risberg
  */
-public class SimpleJdbcInsertTests extends TestCase {
+public class SimpleJdbcInsertTests {
 
-	private MockControl ctrlDataSource;
-	private DataSource mockDataSource;
-	private MockControl ctrlConnection;
-	private Connection mockConnection;
-	private MockControl ctrlDatabaseMetaData;
-	private DatabaseMetaData mockDatabaseMetaData;
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-
-		ctrlConnection = MockControl.createControl(Connection.class);
-		mockConnection = (Connection) ctrlConnection.getMock();
-		mockConnection.getMetaData();
-		ctrlConnection.setDefaultReturnValue(mockDatabaseMetaData);
-		mockConnection.close();
-		ctrlConnection.setDefaultVoidCallable();
-
-		ctrlDataSource = MockControl.createControl(DataSource.class);
-		mockDataSource = (DataSource) ctrlDataSource.getMock();
-		mockDataSource.getConnection();
-		ctrlDataSource.setDefaultReturnValue(mockConnection);
+	private Connection connection;
+	private DatabaseMetaData databaseMetaData;
+	private DataSource dataSource;
 
+	@Before
+	public void setUp() throws Exception {
+		connection = mock(Connection.class);
+		databaseMetaData = mock(DatabaseMetaData.class);
+		dataSource = mock(DataSource.class);
+		given(connection.getMetaData()).willReturn(databaseMetaData);
+		given(dataSource.getConnection()).willReturn(connection);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		ctrlDatabaseMetaData.verify();
-		ctrlDataSource.verify();
-	}
-
-	protected void replay() {
-		ctrlDatabaseMetaData.replay();
-		ctrlConnection.replay();
-		ctrlDataSource.replay();
+	@After
+	public void verifyClosed() throws Exception {
+		verify(connection).close();
 	}
 
+	@Test
 	public void testNoSuchTable() throws Exception {
-		final String NO_SUCH_TABLE = "x";
-		final String USER = "me";
+		ResultSet resultSet = mock(ResultSet.class);
+		given(resultSet.next()).willReturn(false);
+		given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB");
+		given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB");
+		given(databaseMetaData.getDatabaseProductVersion()).willReturn("1.0");
+		given(databaseMetaData.getUserName()).willReturn("me");
+		given(databaseMetaData.storesLowerCaseIdentifiers()).willReturn(true);
+		given(databaseMetaData.getTables(null, null, "x", null)).willReturn(resultSet);
 
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MyDB");
-		mockDatabaseMetaData.supportsGetGeneratedKeys();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MyDB");
-		mockDatabaseMetaData.getDatabaseProductVersion();
-		ctrlDatabaseMetaData.setReturnValue("1.0");
-		mockDatabaseMetaData.getUserName();
-		ctrlDatabaseMetaData.setReturnValue(USER);
-		mockDatabaseMetaData.storesUpperCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.storesLowerCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(true);
-		mockDatabaseMetaData.getTables(null, null, NO_SUCH_TABLE, null);
-		ctrlDatabaseMetaData.setReturnValue(mockResultSet);
-
-		ctrlResultSet.replay();
-		replay();
-
-		SimpleJdbcInsert insert = new SimpleJdbcInsert(mockDataSource).withTableName(NO_SUCH_TABLE);
+		SimpleJdbcInsert insert = new SimpleJdbcInsert(dataSource).withTableName("x");
+		// Shouldn't succeed in inserting into table which doesn't exist
+		thrown.expect(InvalidDataAccessApiUsageException.class);
 		try {
-			insert.execute(new HashMap());
-			fail("Shouldn't succeed in inserting into table which doesn't exist");
-		} catch (InvalidDataAccessApiUsageException ex) {
-			// OK
+			insert.execute(new HashMap<String, Object>());
+		}
+		finally {
+			verify(resultSet).close();
 		}
 	}
-
-	public void testInsert() throws Exception {
-		replay();
-	}
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
index 8bfe278c63..74a4a17c74 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
@@ -16,27 +16,32 @@
 
 package org.springframework.jdbc.core.simple;
 
-import java.lang.reflect.Method;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Types;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+
 import javax.sql.DataSource;
 
-import junit.framework.TestCase;
-import org.apache.commons.logging.LogFactory;
-import org.easymock.MockControl;
-import org.easymock.internal.ArrayMatcher;
-
-import org.springframework.jdbc.core.BatchUpdateTestHelper;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
@@ -49,567 +54,321 @@ import org.springframework.jdbc.core.namedparam.SqlParameterSource;
  * @author Juergen Hoeller
  * @author Thomas Risberg
  */
-public class SimpleJdbcTemplateTests extends TestCase {
+public class SimpleJdbcTemplateTests {
 
-	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
+	private static final String SQL = "sql";
 
+	private static final Object[] ARGS_ARRAY = { 24.7, "foo", new Object() };
+	private static final Map<String, Object> ARGS_MAP;
+	private static final MapSqlParameterSource ARGS_SOURCE;
 
+	static {
+		ARGS_MAP = new HashMap<String, Object>(3);
+		ARGS_SOURCE = new MapSqlParameterSource();
+		for (int i = 0; i < ARGS_ARRAY.length; i++) {
+			ARGS_MAP.put(String.valueOf(i), ARGS_ARRAY[i]);
+			ARGS_SOURCE.addValue(String.valueOf(i), ARGS_ARRAY[i]);
+		}
+	}
+
+	private JdbcOperations operations;
+	private NamedParameterJdbcOperations namedParameterOperations;
+	private SimpleJdbcTemplate template;
+	private SimpleJdbcTemplate namedParameterTemplate;
+
+	@Before
+	public void setup() {
+		this.operations = mock(JdbcOperations.class);
+		this.namedParameterOperations = mock(NamedParameterJdbcOperations.class);
+		this.template = new SimpleJdbcTemplate(operations);
+		this.namedParameterTemplate = new SimpleJdbcTemplate(namedParameterOperations);
+	}
+
+	@Test
 	public void testQueryForIntWithoutArgs() {
-		String sql = "SELECT COUNT(0) FROM BAR";
-		int expectedResult = 666;
-
-		MockControl mc = MockControl.createControl(JdbcOperations.class);
-		JdbcOperations jo = (JdbcOperations) mc.getMock();
-		jo.queryForInt(sql);
-		mc.setReturnValue(expectedResult);
-		mc.replay();
-
-		SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo);
-
-		assertSame(jo, jth.getJdbcOperations());
-
-		int result = jth.queryForInt(sql);
-		assertEquals(expectedResult, result);
-
-		mc.verify();
+		given(operations.queryForInt(SQL)).willReturn(666);
+		int result = template.queryForInt(SQL);
+		assertEquals(666, result);
 	}
 
+	@Test
 	public void testQueryForIntWithArgs() {
-		String sql = "SELECT COUNT(0) FROM BAR WHERE ID=? AND XY=?";
-		int expectedResult = 666;
-		int arg1 = 24;
-		String arg2 = "foo";
-
-		MockControl mc = MockControl.createControl(JdbcOperations.class);
-		JdbcOperations jo = (JdbcOperations) mc.getMock();
-		jo.queryForInt(sql, new Object[]{arg1, arg2});
-		mc.setDefaultMatcher(new ArrayMatcher());
-		mc.setReturnValue(expectedResult);
-		mc.replay();
-
-		SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo);
-		int result = jth.queryForInt(sql, arg1, arg2);
-		assertEquals(expectedResult, result);
-		mc.verify();
+		given(operations.queryForInt(SQL, new Object[] { 24, "foo" })).willReturn(666);
+		int result = template.queryForInt(SQL, 24, "foo");
+		assertEquals(666, result);
 	}
 
+	@Test
 	public void testQueryForIntWithMap() {
-		String sql = "SELECT COUNT(0) FROM BAR WHERE ID=:id AND XY=:xy";
-		int expectedResult = 666;
-		int arg1 = 24;
-		String arg2 = "foo";
-
-		MockControl mc = MockControl.createControl(NamedParameterJdbcOperations.class);
-		NamedParameterJdbcOperations npjo = (NamedParameterJdbcOperations) mc.getMock();
 		Map<String, Object> args = new HashMap<String, Object>(2);
-		args.put("id", arg1);
-		args.put("xy", arg2);
-		npjo.queryForInt(sql, args);
-		mc.setDefaultMatcher(new ArrayMatcher());
-		mc.setReturnValue(expectedResult);
-		mc.replay();
-
-		SimpleJdbcTemplate jth = new SimpleJdbcTemplate(npjo);
-		int result = jth.queryForInt(sql, args);
-		assertEquals(expectedResult, result);
-		mc.verify();
+		args.put("id", 24);
+		args.put("xy", "foo");
+		given(namedParameterOperations.queryForInt(SQL, args)).willReturn(666);
+		int result = namedParameterTemplate.queryForInt(SQL, args);
+		assertEquals(666, result);
 	}
 
+	@Test
 	public void testQueryForIntWitSqlParameterSource() {
-		String sql = "SELECT COUNT(0) FROM BAR WHERE ID=:id AND XY=:xy";
-		int expectedResult = 666;
-		int arg1 = 24;
-		String arg2 = "foo";
-
-		MockControl mc = MockControl.createControl(NamedParameterJdbcOperations.class);
-		NamedParameterJdbcOperations npjo = (NamedParameterJdbcOperations) mc.getMock();
-		SqlParameterSource args = new MapSqlParameterSource().addValue("id", arg1).addValue("xy", arg2);
-		npjo.queryForInt(sql, args);
-		mc.setDefaultMatcher(new ArrayMatcher());
-		mc.setReturnValue(expectedResult);
-		mc.replay();
-
-		SimpleJdbcTemplate jth = new SimpleJdbcTemplate(npjo);
-		int result = jth.queryForInt(sql, args);
-		assertEquals(expectedResult, result);
-		mc.verify();
+		SqlParameterSource args = new MapSqlParameterSource().addValue("id", 24).addValue("xy", "foo");
+		given(namedParameterOperations.queryForInt(SQL, args)).willReturn(666);
+		int result = namedParameterTemplate.queryForInt(SQL, args);
+		assertEquals(666, result);
 	}
 
+	@Test
 	public void testQueryForLongWithoutArgs() {
-		String sql = "SELECT COUNT(0) FROM BAR";
-		long expectedResult = 666;
-
-		MockControl mc = MockControl.createControl(JdbcOperations.class);
-		JdbcOperations jo = (JdbcOperations) mc.getMock();
-		jo.queryForLong(sql);
-		mc.setReturnValue(expectedResult);
-		mc.replay();
-
-		SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo);
-		long result = jth.queryForLong(sql);
-		assertEquals(expectedResult, result);
-
-		mc.verify();
+		given(operations.queryForLong(SQL)).willReturn((long) 666);
+		long result = template.queryForLong(SQL);
+		assertEquals(666, result);
 	}
 
+	@Test
 	public void testQueryForLongWithArgs() {
-		String sql = "SELECT COUNT(0) FROM BAR WHERE ID=? AND XY=?";
 		long expectedResult = 666;
-		double arg1 = 24.7;
-		String arg2 = "foo";
-		Object arg3 = new Object();
-
-		MockControl mc = MockControl.createControl(JdbcOperations.class);
-		JdbcOperations jo = (JdbcOperations) mc.getMock();
-		jo.queryForLong(sql, new Object[]{arg1, arg2, arg3});
-		mc.setDefaultMatcher(new ArrayMatcher());
-		mc.setReturnValue(expectedResult);
-		mc.replay();
-
-		SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo);
-		long result = jth.queryForLong(sql, arg1, arg2, arg3);
+		given(operations.queryForLong(SQL, ARGS_ARRAY)).willReturn(expectedResult);
+		long result = template.queryForLong(SQL, ARGS_ARRAY);
 		assertEquals(expectedResult, result);
-		mc.verify();
 	}
 
+	@Test
 	public void testQueryForObjectWithoutArgs() throws Exception {
-		String sql = "SELECT SYSDATE FROM DUAL";
 		Date expectedResult = new Date();
-
-		MockControl mc = MockControl.createControl(JdbcOperations.class);
-		JdbcOperations jo = (JdbcOperations) mc.getMock();
-		jo.queryForObject(sql, Date.class);
-		mc.setReturnValue(expectedResult);
-		mc.replay();
-
-		SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo);
-		Date result = jth.queryForObject(sql, Date.class);
-		assertEquals(expectedResult, result);
-		mc.verify();
+		given(operations.queryForObject(SQL, Date.class)).willReturn(expectedResult);
+		Date result = template.queryForObject(SQL, Date.class);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForObjectWithArgs() throws Exception {
-		String sql = "SELECT SOMEDATE FROM BAR WHERE ID=? AND XY=?";
 		Date expectedResult = new Date();
-		double arg1 = 24.7;
-		String arg2 = "foo";
-		Object arg3 = new Object();
-
-		MockControl mc = MockControl.createControl(JdbcOperations.class);
-		JdbcOperations jo = (JdbcOperations) mc.getMock();
-		jo.queryForObject(sql, new Object[]{arg1, arg2, arg3}, Date.class);
-		mc.setDefaultMatcher(new ArrayMatcher());
-		mc.setReturnValue(expectedResult);
-		mc.replay();
-
-		SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo);
-		Date result = jth.queryForObject(sql, Date.class, arg1, arg2, arg3);
-		assertEquals(expectedResult, result);
-		mc.verify();
+		given(operations.queryForObject(SQL, ARGS_ARRAY, Date.class)
+				).willReturn(expectedResult);
+		Date result = template.queryForObject(SQL, Date.class,ARGS_ARRAY);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForObjectWithArgArray() throws Exception {
-		String sql = "SELECT SOMEDATE FROM BAR WHERE ID=? AND XY=?";
 		Date expectedResult = new Date();
-		double arg1 = 24.7;
-		String arg2 = "foo";
-		Object arg3 = new Object();
-
-		MockControl mc = MockControl.createControl(JdbcOperations.class);
-		JdbcOperations jo = (JdbcOperations) mc.getMock();
-		jo.queryForObject(sql, new Object[]{arg1, arg2, arg3}, Date.class);
-		mc.setDefaultMatcher(new ArrayMatcher());
-		mc.setReturnValue(expectedResult);
-		mc.replay();
-
-		SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo);
-		Object args = new Object[] {arg1, arg2, arg3};
-		Date result = jth.queryForObject(sql, Date.class, args);
-		assertEquals(expectedResult, result);
-		mc.verify();
+		given(operations.queryForObject(SQL, ARGS_ARRAY, Date.class)
+				).willReturn(expectedResult);
+		Date result = template.queryForObject(SQL, Date.class, ARGS_ARRAY);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForObjectWithMap() throws Exception {
-		String sql = "SELECT SOMEDATE FROM BAR WHERE ID=? AND XY=?";
 		Date expectedResult = new Date();
-		double arg1 = 24.7;
-		String arg2 = "foo";
-		Object arg3 = new Object();
-
-		MockControl mc = MockControl.createControl(JdbcOperations.class);
-		JdbcOperations jo = (JdbcOperations) mc.getMock();
-		jo.queryForObject(sql, new Object[]{arg1, arg2, arg3}, Date.class);
-		mc.setDefaultMatcher(new ArrayMatcher());
-		mc.setReturnValue(expectedResult);
-		mc.replay();
-
-		SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo);
-		Date result = jth.queryForObject(sql, Date.class, arg1, arg2, arg3);
-		assertEquals(expectedResult, result);
-		mc.verify();
+		given(operations.queryForObject(SQL, ARGS_ARRAY, Date.class)
+				).willReturn(expectedResult);
+		Date result = template.queryForObject(SQL, Date.class, ARGS_ARRAY);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForObjectWithRowMapperAndWithoutArgs() throws Exception {
-		String sql = "SELECT SYSDATE FROM DUAL";
 		Date expectedResult = new Date();
-
 		ParameterizedRowMapper<Date> rm = new ParameterizedRowMapper<Date>() {
 			@Override
 			public Date mapRow(ResultSet rs, int rowNum) {
 				return new Date();
 			}
 		};
-
-		MockControl mc = MockControl.createControl(JdbcOperations.class);
-		JdbcOperations jo = (JdbcOperations) mc.getMock();
-		jo.queryForObject(sql, rm);
-		mc.setReturnValue(expectedResult);
-		mc.replay();
-
-		SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo);
-		Date result = jth.queryForObject(sql, rm);
-		assertEquals(expectedResult, result);
-		mc.verify();
+		given(operations.queryForObject(SQL, rm)).willReturn(expectedResult);
+		Date result = template.queryForObject(SQL, rm);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForObjectWithRowMapperAndArgs() throws Exception {
-		String sql = "SELECT SOMEDATE FROM BAR WHERE ID=? AND XY=?";
 		Date expectedResult = new Date();
-		double arg1 = 24.7;
-		String arg2 = "foo";
-		Object arg3 = new Object();
-
 		ParameterizedRowMapper<Date> rm = new ParameterizedRowMapper<Date>() {
 			@Override
 			public Date mapRow(ResultSet rs, int rowNum) {
 				return new Date();
 			}
 		};
-
-		MockControl mc = MockControl.createControl(JdbcOperations.class);
-		JdbcOperations jo = (JdbcOperations) mc.getMock();
-		jo.queryForObject(sql, new Object[]{arg1, arg2, arg3}, rm);
-		mc.setDefaultMatcher(new ArrayMatcher());
-		mc.setReturnValue(expectedResult);
-		mc.replay();
-
-		SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo);
-		Date result = jth.queryForObject(sql, rm, arg1, arg2, arg3);
-		assertEquals(expectedResult, result);
-		mc.verify();
+		given(operations.queryForObject(SQL, ARGS_ARRAY, rm)
+				).willReturn(expectedResult);
+		Date result = template.queryForObject(SQL, rm, ARGS_ARRAY);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForObjectWithRowMapperAndMap() throws Exception {
 		String sql = "SELECT SOMEDATE FROM BAR WHERE ID=? AND XY=?";
 		Date expectedResult = new Date();
-		double arg1 = 24.7;
-		String arg2 = "foo";
-		Object arg3 = new Object();
-
 		ParameterizedRowMapper<Date> rm = new ParameterizedRowMapper<Date>() {
 			@Override
 			public Date mapRow(ResultSet rs, int rowNum) {
 				return new Date();
 			}
 		};
-
-		MockControl mc = MockControl.createControl(JdbcOperations.class);
-		JdbcOperations jo = (JdbcOperations) mc.getMock();
-		jo.queryForObject(sql, new Object[]{arg1, arg2, arg3}, rm);
-		mc.setDefaultMatcher(new ArrayMatcher());
-		mc.setReturnValue(expectedResult);
-		mc.replay();
-
-		SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo);
-		Date result = jth.queryForObject(sql, rm, arg1, arg2, arg3);
-		assertEquals(expectedResult, result);
-		mc.verify();
+		given(operations.queryForObject(sql, ARGS_ARRAY, rm)
+				).willReturn(expectedResult);
+		Date result = template.queryForObject(sql, rm, ARGS_ARRAY);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForListWithoutArgs() throws Exception {
-		testDelegation("queryForList", new Object[]{"sql"}, new Object[]{}, Collections.singletonList(new Object()));
+		List<Map<String, Object>> expectedResult = mockListMapResult();
+		given(operations.queryForList(SQL)).willReturn(expectedResult);
+		List<Map<String, Object>> result = template.queryForList(SQL);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForListWithArgs() throws Exception {
-		testDelegation("queryForList", new Object[]{"sql"}, new Object[]{1, 2, 3}, new LinkedList());
+		List<Map<String, Object>> expectedResult = mockListMapResult();
+		given(operations.queryForList(SQL, 1, 2, 3)).willReturn(expectedResult);
+		List<Map<String, Object>> result = template.queryForList(SQL, 1,2,3);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForListWithMap() throws Exception {
-		HashMap args = new HashMap(3);
-		args.put("1", 1);
-		args.put("2", 2);
-		args.put("3", 3);
-		testDelegation("queryForList", new Object[]{"sql"}, new Object[]{args}, new LinkedList());
+		List<Map<String, Object>> expectedResult = mockListMapResult();
+		given(namedParameterOperations.queryForList(SQL, ARGS_MAP)).willReturn(expectedResult);
+		List<Map<String, Object>> result = namedParameterTemplate.queryForList(SQL, ARGS_MAP);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForListWithSqlParameterSource() throws Exception {
-		MapSqlParameterSource args = new MapSqlParameterSource();
-		args.addValue("1", 1);
-		args.addValue("2", 2);
-		args.addValue("3", 3);
-		testDelegation("queryForList", new Object[]{"sql"}, new Object[]{args}, new LinkedList());
+		List<Map<String, Object>> expectedResult = mockListMapResult();
+		given(namedParameterOperations.queryForList(SQL, ARGS_SOURCE)).willReturn(expectedResult);
+		List<Map<String, Object>> result = namedParameterTemplate.queryForList(SQL, ARGS_SOURCE);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForMapWithoutArgs() throws Exception {
-		testDelegation("queryForMap", new Object[]{"sql"}, new Object[]{}, new HashMap());
+		Map<String, Object> expectedResult = new HashMap<String, Object>();
+		given(operations.queryForMap(SQL)).willReturn(expectedResult);
+		 Map<String, Object> result = template.queryForMap(SQL);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForMapWithArgs() throws Exception {
-		testDelegation("queryForMap", new Object[]{"sql"}, new Object[]{1, 2, 3}, new HashMap());
-		// TODO test generic type
+		Map<String, Object> expectedResult = new HashMap<String, Object>();
+		given(operations.queryForMap(SQL, 1, 2, 3)).willReturn(expectedResult);
+		Map<String, Object> result = template.queryForMap(SQL, 1,2,3);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForMapWithMap() throws Exception {
-		HashMap args = new HashMap(3);
-		args.put("1", 1);
-		args.put("2", 2);
-		args.put("3", 3);
-		testDelegation("queryForMap", new Object[]{"sql"}, new Object[]{args}, new HashMap());
+		Map<String, Object> expectedResult = new HashMap<String, Object>();
+		given(namedParameterOperations.queryForMap(SQL, ARGS_MAP)).willReturn(expectedResult);
+		Map<String, Object> result = namedParameterTemplate.queryForMap(SQL, ARGS_MAP);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testQueryForMapWithSqlParameterSource() throws Exception {
-		MapSqlParameterSource args = new MapSqlParameterSource();
-		args.addValue("1", 1);
-		args.addValue("2", 2);
-		args.addValue("3", 3);
-		testDelegation("queryForMap", new Object[]{"sql"}, new Object[]{args}, new HashMap());
+		Map<String, Object> expectedResult = new HashMap<String, Object>();
+		given(namedParameterOperations.queryForMap(SQL, ARGS_SOURCE)).willReturn(expectedResult);
+		Map<String, Object> result = namedParameterTemplate.queryForMap(SQL, ARGS_SOURCE);
+		assertSame(expectedResult, result);
 	}
 
+	@Test
 	public void testUpdateWithoutArgs() throws Exception {
-		testDelegation("update", new Object[]{"sql"}, new Object[]{}, 666);
+		given(operations.update(SQL)).willReturn(666);
+		int result = template.update(SQL);
+		assertEquals(666, result);
 	}
 
+	@Test
 	public void testUpdateWithArgs() throws Exception {
-		testDelegation("update", new Object[]{"sql"}, new Object[]{1, 2, 3}, 666);
+		given(operations.update(SQL, 1, 2, 3)).willReturn(666);
+		int result = template.update(SQL, 1, 2, 3);
+		assertEquals(666, result);
 	}
 
+	@Test
 	public void testUpdateWithMap() throws Exception {
-		HashMap args = new HashMap(3);
-		args.put("1", 1);
-		args.put("2", 2);
-		args.put("3", 3);
-		testDelegation("update", new Object[]{"sql"}, new Object[]{args}, 666);
+		given(namedParameterOperations.update(SQL, ARGS_MAP)).willReturn(666);
+		int result = namedParameterTemplate.update(SQL, ARGS_MAP);
+		assertEquals(666, result);
 	}
 
+	@Test
 	public void testUpdateWithSqlParameterSource() throws Exception {
-		MapSqlParameterSource args = new MapSqlParameterSource();
-		args.addValue("1", 1);
-		args.addValue("2", 2);
-		args.addValue("3", 3);
-		testDelegation("update", new Object[]{"sql"}, new Object[]{args}, 666);
-	}
-
-	private Object testDelegation(String methodName, Object[] typedArgs, Object[] varargs, Object expectedResult) throws Exception {
-		Class[] unifiedTypes;
-		Object[] unifiedArgs;
-		Class[] unifiedTypes2;
-		Object[] unifiedArgs2;
-		boolean namedParameters = false;
-
-		if (varargs != null && varargs.length > 0) {
-			// Allow for Map
-			if (varargs[0].getClass().equals(HashMap.class)) {
-				unifiedTypes = new Class[typedArgs.length + 1];
-				unifiedArgs = new Object[typedArgs.length + 1];
-				for (int i = 0; i < typedArgs.length; i++) {
-					unifiedTypes[i] = typedArgs[i].getClass();
-					unifiedArgs[i] = typedArgs[i];
-				}
-				unifiedTypes[unifiedTypes.length - 1] = Map.class;
-				unifiedArgs[unifiedArgs.length - 1] = varargs[0];
-				unifiedTypes2 = unifiedTypes;
-				unifiedArgs2 = unifiedArgs;
-				namedParameters = true;
-			}
-			else if (varargs[0].getClass().equals(MapSqlParameterSource.class)) {
-				unifiedTypes = new Class[typedArgs.length + 1];
-				unifiedArgs = new Object[typedArgs.length + 1];
-				for (int i = 0; i < typedArgs.length; i++) {
-					unifiedTypes[i] = typedArgs[i].getClass();
-					unifiedArgs[i] = typedArgs[i];
-				}
-				unifiedTypes[unifiedTypes.length - 1] = SqlParameterSource.class;
-				unifiedArgs[unifiedArgs.length - 1] = varargs[0];
-				unifiedTypes2 = unifiedTypes;
-				unifiedArgs2 = unifiedArgs;
-				namedParameters = true;
-			}
-			else {
-				// Allow for varargs.length
-				unifiedTypes = new Class[typedArgs.length + 1];
-				unifiedArgs = new Object[typedArgs.length + 1];
-				for (int i = 0; i < unifiedTypes.length - 1; i++) {
-					unifiedTypes[i] = typedArgs[i].getClass();
-					unifiedArgs[i] = typedArgs[i];
-				}
-				unifiedTypes[unifiedTypes.length - 1] = Object[].class;
-				unifiedArgs[unifiedTypes.length - 1] = varargs;
-			}
-
-			unifiedTypes2 = unifiedTypes;
-			unifiedArgs2 = unifiedArgs;
-		}
-		else {
-			unifiedTypes = new Class[typedArgs.length];
-			unifiedTypes2 = new Class[typedArgs.length + 1];
-			unifiedArgs = new Object[typedArgs.length];
-			unifiedArgs2 = new Object[typedArgs.length + 1];
-			for (int i = 0; i < typedArgs.length; i++) {
-				unifiedTypes[i] = unifiedTypes2[i] = typedArgs[i].getClass();
-				unifiedArgs[i] = unifiedArgs2[i] = typedArgs[i];
-			}
-			unifiedTypes2[unifiedTypes2.length - 1] = Object[].class;
-			unifiedArgs2[unifiedArgs2.length - 1] = new Object[]{};
-		}
-
-		MockControl mc;
-		JdbcOperations jo = null;
-		NamedParameterJdbcOperations npjo = null;
-		Method joMethod = null;
-		SimpleJdbcTemplate jth = null;
-
-		if (namedParameters) {
-			mc = MockControl.createControl(NamedParameterJdbcOperations.class);
-			npjo = (NamedParameterJdbcOperations) mc.getMock();
-			joMethod = NamedParameterJdbcOperations.class.getMethod(methodName, unifiedTypes);
-			joMethod.invoke(npjo, unifiedArgs);
-			jth = new SimpleJdbcTemplate(npjo);
-		}
-		else {
-			mc = MockControl.createControl(JdbcOperations.class);
-			jo = (JdbcOperations) mc.getMock();
-			joMethod = JdbcOperations.class.getMethod(methodName, unifiedTypes);
-			joMethod.invoke(jo, unifiedArgs);
-			jth = new SimpleJdbcTemplate(jo);
-		}
-
-		mc.setDefaultMatcher(new ArrayMatcher());
-
-		if (joMethod.getReturnType().isPrimitive()) {
-			// TODO bit of a hack with autoboxing passing up Integer when the return
-			// type is an int
-			mc.setReturnValue(((Integer) expectedResult).intValue());
-		}
-		else {
-			mc.setReturnValue(expectedResult);
-		}
-		mc.replay();
-
-		Method jthMethod = SimpleJdbcTemplate.class.getMethod(methodName, unifiedTypes2);
-		Object result = jthMethod.invoke(jth, unifiedArgs2);
-
-		assertEquals(expectedResult, result);
-
-		mc.verify();
-
-		return result;
+		given(namedParameterOperations.update(SQL, ARGS_SOURCE)).willReturn(666);
+		int result = namedParameterTemplate.update(SQL, ARGS_SOURCE);
+		assertEquals(666, result);
 	}
 
+	@Test
 	public void testBatchUpdateWithSqlParameterSource() throws Exception {
-
-		final String sqlToUse = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
-		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id";
+		PreparedStatement preparedStatement = setupBatchOperation();
 		final SqlParameterSource[] ids = new SqlParameterSource[2];
 		ids[0] = new MapSqlParameterSource("id", 100);
 		ids[1] = new MapSqlParameterSource("id", 200);
-		final int[] rowsAffected = new int[] { 1, 2 };
-
-		MockControl ctrlDataSource = MockControl.createControl(DataSource.class);
-		DataSource mockDataSource = (DataSource) ctrlDataSource.getMock();
-		MockControl ctrlConnection = MockControl.createControl(Connection.class);
-		Connection mockConnection = (Connection) ctrlConnection.getMock();
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-
-		BatchUpdateTestHelper.prepareBatchUpdateMocks(sqlToUse, ids, null, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection,
-				mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData,
-				mockDatabaseMetaData);
-
-		BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData);
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
-		SimpleJdbcTemplate simpleJdbcTemplate = new SimpleJdbcTemplate(template);
-
-		int[] actualRowsAffected = simpleJdbcTemplate.batchUpdate(sql, ids);
-
+		int[] actualRowsAffected = template.batchUpdate("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id", ids);
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
-		assertEquals(rowsAffected[0], actualRowsAffected[0]);
-		assertEquals(rowsAffected[1], actualRowsAffected[1]);
-
-		BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData);
+		assertEquals(1, actualRowsAffected[0]);
+		assertEquals(2, actualRowsAffected[1]);
+		verify(preparedStatement).setObject(1, 100);
+		verify(preparedStatement).setObject(1, 200);
+		verify(preparedStatement, times(2)).addBatch();
+		verify(preparedStatement).close();
 	}
 
+	@Test
 	public void testBatchUpdateWithListOfObjectArrays() throws Exception {
-
-		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
-		final List<Object[]> ids = new ArrayList<Object[]>();
-		ids.add(new Object[] {100});
-		ids.add(new Object[] {200});
-		final int[] rowsAffected = new int[] { 1, 2 };
-
-		MockControl ctrlDataSource = MockControl.createControl(DataSource.class);
-		DataSource mockDataSource = (DataSource) ctrlDataSource.getMock();
-		MockControl ctrlConnection = MockControl.createControl(Connection.class);
-		Connection mockConnection = (Connection) ctrlConnection.getMock();
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-
-		BatchUpdateTestHelper.prepareBatchUpdateMocks(sql, ids, null, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection,
-				mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData,
-				mockDatabaseMetaData);
-
-		BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData);
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
-		SimpleJdbcTemplate simpleJdbcTemplate = new SimpleJdbcTemplate(template);
-
-		int[] actualRowsAffected = simpleJdbcTemplate.batchUpdate(sql, ids);
-
+		PreparedStatement preparedStatement = setupBatchOperation();
+		List<Object[]> ids = new ArrayList<Object[]>();
+		ids.add(new Object[] { 100 });
+		ids.add(new Object[] { 200 });
+		int[] actualRowsAffected = template.batchUpdate(SQL, ids);
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
-		assertEquals(rowsAffected[0], actualRowsAffected[0]);
-		assertEquals(rowsAffected[1], actualRowsAffected[1]);
-
-		BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData);
+		assertEquals(1, actualRowsAffected[0]);
+		assertEquals(2, actualRowsAffected[1]);
+		verify(preparedStatement).setObject(1, 100);
+		verify(preparedStatement).setObject(1, 200);
+		verify(preparedStatement, times(2)).addBatch();
+		verify(preparedStatement).close();
 	}
 
+	@Test
 	public void testBatchUpdateWithListOfObjectArraysPlusTypeInfo() throws Exception {
-
-		final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
-		final List<Object[]> ids = new ArrayList<Object[]>();
-		ids.add(new Object[] {100});
-		ids.add(new Object[] {200});
-		final int[] sqlTypes = new int[] {Types.NUMERIC};
-		final int[] rowsAffected = new int[] { 1, 2 };
-
-		MockControl ctrlDataSource = MockControl.createControl(DataSource.class);
-		DataSource mockDataSource = (DataSource) ctrlDataSource.getMock();
-		MockControl ctrlConnection = MockControl.createControl(Connection.class);
-		Connection mockConnection = (Connection) ctrlConnection.getMock();
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-
-		BatchUpdateTestHelper.prepareBatchUpdateMocks(sql, ids, sqlTypes, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection,
-				mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData,
-				mockDatabaseMetaData);
-
-		BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData);
-
-		JdbcTemplate template = new JdbcTemplate(mockDataSource, false);
-		SimpleJdbcTemplate simpleJdbcTemplate = new SimpleJdbcTemplate(template);
-
-		int[] actualRowsAffected = simpleJdbcTemplate.batchUpdate(sql, ids, sqlTypes);
-
+		int[] sqlTypes = new int[] { Types.NUMERIC };
+		PreparedStatement preparedStatement = setupBatchOperation();
+		List<Object[]> ids = new ArrayList<Object[]>();
+		ids.add(new Object[] { 100 });
+		ids.add(new Object[] { 200 });
+		int[] actualRowsAffected = template.batchUpdate(SQL, ids, sqlTypes);
 		assertTrue("executed 2 updates", actualRowsAffected.length == 2);
-		assertEquals(rowsAffected[0], actualRowsAffected[0]);
-		assertEquals(rowsAffected[1], actualRowsAffected[1]);
-
-		BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData);
+		assertEquals(1, actualRowsAffected[0]);
+		assertEquals(2, actualRowsAffected[1]);
+		verify(preparedStatement).setObject(1, 100, Types.NUMERIC);
+		verify(preparedStatement).setObject(1, 200, Types.NUMERIC);
+		verify(preparedStatement, times(2)).addBatch();
+		verify(preparedStatement).close();
 	}
 
+	private PreparedStatement setupBatchOperation() throws SQLException {
+		DataSource dataSource = mock(DataSource.class);
+		Connection connection = mock(Connection.class);
+		PreparedStatement preparedStatement = mock(PreparedStatement.class);
+		DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class);
+		given(dataSource.getConnection()).willReturn(connection);
+		given(preparedStatement.getConnection()).willReturn(connection);
+		given(preparedStatement.executeBatch()).willReturn(new int[] { 1, 2 });
+		given(databaseMetaData.getDatabaseProductName()).willReturn("MySQL");
+		given(databaseMetaData.supportsBatchUpdates()).willReturn(true);
+		given(connection.prepareStatement(anyString())).willReturn(preparedStatement);
+		given(connection.getMetaData()).willReturn(databaseMetaData);
+		template = new SimpleJdbcTemplate(new JdbcTemplate(dataSource, false));
+		return preparedStatement;
+	}
+
+	private List<Map<String, Object>> mockListMapResult() {
+		return new LinkedList<Map<String, Object>>();
+	}
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java
index f9eb882873..a6d22145b9 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java
@@ -1,151 +1,81 @@
 package org.springframework.jdbc.core.simple;
 
-import junit.framework.TestCase;
-import org.springframework.jdbc.core.metadata.TableMetaDataContext;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.jdbc.core.SqlParameterValue;
-import org.easymock.MockControl;
+import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
-import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.ArrayList;
-import java.sql.Types;
-import java.sql.DatabaseMetaData;
-import java.sql.Connection;
-import java.sql.ResultSet;
+
+import javax.sql.DataSource;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.jdbc.core.SqlParameterValue;
+import org.springframework.jdbc.core.metadata.TableMetaDataContext;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 
 /**
  * Mock object based tests for TableMetaDataContext.
  *
  * @author Thomas Risberg
  */
-public class TableMetaDataContextTests extends TestCase {
-	private MockControl ctrlDataSource;
-	private DataSource mockDataSource;
-	private MockControl ctrlConnection;
-	private Connection mockConnection;
-	private MockControl ctrlDatabaseMetaData;
-	private DatabaseMetaData mockDatabaseMetaData;
+public class TableMetaDataContextTests  {
+
+	private Connection connection;
+	private DataSource dataSource;
+	private DatabaseMetaData databaseMetaData;
 
 	private TableMetaDataContext context = new TableMetaDataContext();
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-
-		ctrlConnection = MockControl.createControl(Connection.class);
-		mockConnection = (Connection) ctrlConnection.getMock();
-		mockConnection.getMetaData();
-		ctrlConnection.setDefaultReturnValue(mockDatabaseMetaData);
-		mockConnection.close();
-		ctrlConnection.setDefaultVoidCallable();
-
-		ctrlDataSource = MockControl.createControl(DataSource.class);
-		mockDataSource = (DataSource) ctrlDataSource.getMock();
-		mockDataSource.getConnection();
-		ctrlDataSource.setDefaultReturnValue(mockConnection);
-
+	@Before
+	public void setUp() throws Exception {
+		connection = mock(Connection.class);
+		dataSource = mock(DataSource.class);
+		databaseMetaData = mock(DatabaseMetaData.class);
+		given(connection.getMetaData()).willReturn(databaseMetaData);
+		given(dataSource.getConnection()).willReturn(connection);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		ctrlDatabaseMetaData.verify();
-		ctrlDataSource.verify();
-	}
-
-	protected void replay() {
-		ctrlDatabaseMetaData.replay();
-		ctrlConnection.replay();
-		ctrlDataSource.replay();
+	public void verifyClosed() throws Exception {
+		verify(connection).close();
 	}
 
+	@Test
 	public void testMatchInParametersAndSqlTypeInfoWrapping() throws Exception {
 		final String TABLE = "customers";
 		final String USER = "me";
 
-		MockControl ctrlMetaDataResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockMetaDataResultSet = (ResultSet) ctrlMetaDataResultSet.getMock();
-		mockMetaDataResultSet.next();
-		ctrlMetaDataResultSet.setReturnValue(true);
-		mockMetaDataResultSet.getString("TABLE_CAT");
-		ctrlMetaDataResultSet.setReturnValue(null);
-		mockMetaDataResultSet.getString("TABLE_SCHEM");
-		ctrlMetaDataResultSet.setReturnValue(USER);
-		mockMetaDataResultSet.getString("TABLE_NAME");
-		ctrlMetaDataResultSet.setReturnValue(TABLE);
-		mockMetaDataResultSet.getString("TABLE_TYPE");
-		ctrlMetaDataResultSet.setReturnValue("TABLE");
-		mockMetaDataResultSet.next();
-		ctrlMetaDataResultSet.setReturnValue(false);
-		mockMetaDataResultSet.close();
-		ctrlMetaDataResultSet.setVoidCallable();
+		ResultSet metaDataResultSet = mock(ResultSet.class);
+		given(metaDataResultSet.next()).willReturn(true, false);
+		given(metaDataResultSet.getString("TABLE_SCHEM")).willReturn(USER);
+		given(metaDataResultSet.getString("TABLE_NAME")).willReturn(TABLE);
+		given(metaDataResultSet.getString("TABLE_TYPE")).willReturn("TABLE");
 
-		MockControl ctrlColumnsResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockColumnsResultSet = (ResultSet) ctrlColumnsResultSet.getMock();
-		mockColumnsResultSet.next();
-		ctrlColumnsResultSet.setReturnValue(true);
-		mockColumnsResultSet.getString("COLUMN_NAME");
-		ctrlColumnsResultSet.setReturnValue("id");
-		mockColumnsResultSet.getInt("DATA_TYPE");
-		ctrlColumnsResultSet.setReturnValue(Types.INTEGER);
-		mockColumnsResultSet.getBoolean("NULLABLE");
-		ctrlColumnsResultSet.setReturnValue(false);
-		mockColumnsResultSet.next();
-		ctrlColumnsResultSet.setReturnValue(true);
-		mockColumnsResultSet.getString("COLUMN_NAME");
-		ctrlColumnsResultSet.setReturnValue("name");
-		mockColumnsResultSet.getInt("DATA_TYPE");
-		ctrlColumnsResultSet.setReturnValue(Types.VARCHAR);
-		mockColumnsResultSet.getBoolean("NULLABLE");
-		ctrlColumnsResultSet.setReturnValue(true);
-		mockColumnsResultSet.next();
-		ctrlColumnsResultSet.setReturnValue(true);
-		mockColumnsResultSet.getString("COLUMN_NAME");
-		ctrlColumnsResultSet.setReturnValue("customersince");
-		mockColumnsResultSet.getInt("DATA_TYPE");
-		ctrlColumnsResultSet.setReturnValue(Types.DATE);
-		mockColumnsResultSet.getBoolean("NULLABLE");
-		ctrlColumnsResultSet.setReturnValue(true);
-		mockColumnsResultSet.next();
-		ctrlColumnsResultSet.setReturnValue(true);
-		mockColumnsResultSet.getString("COLUMN_NAME");
-		ctrlColumnsResultSet.setReturnValue("version");
-		mockColumnsResultSet.getInt("DATA_TYPE");
-		ctrlColumnsResultSet.setReturnValue(Types.NUMERIC);
-		mockColumnsResultSet.getBoolean("NULLABLE");
-		ctrlColumnsResultSet.setReturnValue(false);
-		mockColumnsResultSet.next();
-		ctrlColumnsResultSet.setReturnValue(false);
-		mockColumnsResultSet.close();
-		ctrlColumnsResultSet.setVoidCallable();
+		ResultSet columnsResultSet = mock(ResultSet.class);
+		given(columnsResultSet.next()).willReturn(
+				true, true, true, true, false);
+		given(columnsResultSet.getString("COLUMN_NAME")).willReturn(
+				"id", "name", "customersince", "version");
+		given(columnsResultSet.getInt("DATA_TYPE")).willReturn(
+				Types.INTEGER, Types.VARCHAR, Types.DATE, Types.NUMERIC);
+		given(columnsResultSet.getBoolean("NULLABLE")).willReturn(
+				false, true, true, false);
 
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MyDB");
-		mockDatabaseMetaData.supportsGetGeneratedKeys();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MyDB");
-		mockDatabaseMetaData.getDatabaseProductVersion();
-		ctrlDatabaseMetaData.setReturnValue("1.0");
-		mockDatabaseMetaData.getUserName();
-		ctrlDatabaseMetaData.setReturnValue(USER);
-		mockDatabaseMetaData.storesUpperCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.storesLowerCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(true);
-		mockDatabaseMetaData.getTables(null, null, TABLE, null);
-		ctrlDatabaseMetaData.setReturnValue(mockMetaDataResultSet);
-		mockDatabaseMetaData.getColumns(null, USER, TABLE, null);
-		ctrlDatabaseMetaData.setReturnValue(mockColumnsResultSet);
-
-		ctrlMetaDataResultSet.replay();
-		ctrlColumnsResultSet.replay();
-		replay();
+		given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB");
+		given(databaseMetaData.getDatabaseProductName()).willReturn("1.0");
+		given(databaseMetaData.getUserName()).willReturn(USER);
+		given(databaseMetaData.storesLowerCaseIdentifiers()).willReturn(true);
+		given(databaseMetaData.getTables(null, null, TABLE, null)).willReturn(metaDataResultSet);
+		given(databaseMetaData.getColumns(null, USER, TABLE, null)).willReturn(columnsResultSet);
 
 		MapSqlParameterSource map = new MapSqlParameterSource();
 		map.addValue("id", 1);
@@ -156,88 +86,59 @@ public class TableMetaDataContextTests extends TestCase {
 		map.registerSqlType("version", Types.NUMERIC);
 
 		context.setTableName(TABLE);
-		context.processMetaData(mockDataSource, new ArrayList<String>(), new String[] {});
+		context.processMetaData(dataSource, new ArrayList<String>(), new String[] {});
 
 		List<Object> values = context.matchInParameterValuesWithInsertColumns(map);
 
 		assertEquals("wrong number of parameters: ", 4, values.size());
 		assertTrue("id not wrapped with type info", values.get(0) instanceof Number);
 		assertTrue("name not wrapped with type info", values.get(1) instanceof String);
-		assertTrue("date wrapped with type info", values.get(2) instanceof SqlParameterValue);
-		assertTrue("version wrapped with type info", values.get(3) instanceof SqlParameterValue);
+		assertTrue("date wrapped with type info",
+				values.get(2) instanceof SqlParameterValue);
+		assertTrue("version wrapped with type info",
+				values.get(3) instanceof SqlParameterValue);
+		verify(metaDataResultSet, atLeastOnce()).next();
+		verify(columnsResultSet, atLeastOnce()).next();
+		verify(metaDataResultSet).close();
+		verify(columnsResultSet).close();
 	}
 
+	@Test
 	public void testTableWithSingleColumnGeneratedKey() throws Exception {
 		final String TABLE = "customers";
 		final String USER = "me";
 
-		MockControl ctrlMetaDataResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockMetaDataResultSet = (ResultSet) ctrlMetaDataResultSet.getMock();
-		mockMetaDataResultSet.next();
-		ctrlMetaDataResultSet.setReturnValue(true);
-		mockMetaDataResultSet.getString("TABLE_CAT");
-		ctrlMetaDataResultSet.setReturnValue(null);
-		mockMetaDataResultSet.getString("TABLE_SCHEM");
-		ctrlMetaDataResultSet.setReturnValue(USER);
-		mockMetaDataResultSet.getString("TABLE_NAME");
-		ctrlMetaDataResultSet.setReturnValue(TABLE);
-		mockMetaDataResultSet.getString("TABLE_TYPE");
-		ctrlMetaDataResultSet.setReturnValue("TABLE");
-		mockMetaDataResultSet.next();
-		ctrlMetaDataResultSet.setReturnValue(false);
-		mockMetaDataResultSet.close();
-		ctrlMetaDataResultSet.setVoidCallable();
+		ResultSet metaDataResultSet = mock(ResultSet.class);
+		given(metaDataResultSet.next()).willReturn(true, false);
+		given(metaDataResultSet.getString("TABLE_SCHEM")).willReturn(USER);
+		given(metaDataResultSet.getString("TABLE_NAME")).willReturn(TABLE);
+		given(metaDataResultSet.getString("TABLE_TYPE")).willReturn("TABLE");
 
-		MockControl ctrlColumnsResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockColumnsResultSet = (ResultSet) ctrlColumnsResultSet.getMock();
-		mockColumnsResultSet.next();
-		ctrlColumnsResultSet.setReturnValue(true);
-		mockColumnsResultSet.getString("COLUMN_NAME");
-		ctrlColumnsResultSet.setReturnValue("id");
-		mockColumnsResultSet.getInt("DATA_TYPE");
-		ctrlColumnsResultSet.setReturnValue(Types.INTEGER);
-		mockColumnsResultSet.getBoolean("NULLABLE");
-		ctrlColumnsResultSet.setReturnValue(false);
-		mockColumnsResultSet.next();
-		ctrlColumnsResultSet.setReturnValue(false);
-		mockColumnsResultSet.close();
-		ctrlColumnsResultSet.setVoidCallable();
+		ResultSet columnsResultSet = mock(ResultSet.class);
+		given(columnsResultSet.next()).willReturn(true, false);
+		given(columnsResultSet.getString("COLUMN_NAME")).willReturn("id");
+		given(columnsResultSet.getInt("DATA_TYPE")).willReturn(Types.INTEGER);
+		given(columnsResultSet.getBoolean("NULLABLE")).willReturn(false);
 
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MyDB");
-		mockDatabaseMetaData.supportsGetGeneratedKeys();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.getDatabaseProductName();
-		ctrlDatabaseMetaData.setReturnValue("MyDB");
-		mockDatabaseMetaData.getDatabaseProductVersion();
-		ctrlDatabaseMetaData.setReturnValue("1.0");
-		mockDatabaseMetaData.getUserName();
-		ctrlDatabaseMetaData.setReturnValue(USER);
-		mockDatabaseMetaData.storesUpperCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(false);
-		mockDatabaseMetaData.storesLowerCaseIdentifiers();
-		ctrlDatabaseMetaData.setReturnValue(true);
-		mockDatabaseMetaData.getTables(null, null, TABLE, null);
-		ctrlDatabaseMetaData.setReturnValue(mockMetaDataResultSet);
-		mockDatabaseMetaData.getColumns(null, USER, TABLE, null);
-		ctrlDatabaseMetaData.setReturnValue(mockColumnsResultSet);
-
-		ctrlMetaDataResultSet.replay();
-		ctrlColumnsResultSet.replay();
-		replay();
+		given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB");
+		given(databaseMetaData.getDatabaseProductName()).willReturn("1.0");
+		given(databaseMetaData.getUserName()).willReturn(USER);
+		given(databaseMetaData.storesLowerCaseIdentifiers()).willReturn(true);
+		given(databaseMetaData.getTables(null, null, TABLE, null)).willReturn(metaDataResultSet);
+		given(databaseMetaData.getColumns(null, USER, TABLE, null)).willReturn(columnsResultSet);
 
 		MapSqlParameterSource map = new MapSqlParameterSource();
-
-		String[] keyCols = new String[] {"id"};
-
+		String[] keyCols = new String[] { "id" };
 		context.setTableName(TABLE);
-		context.processMetaData(mockDataSource, new ArrayList<String>(), keyCols);
-
+		context.processMetaData(dataSource, new ArrayList<String>(), keyCols);
 		List<Object> values = context.matchInParameterValuesWithInsertColumns(map);
-
 		String insertString = context.createInsertString(keyCols);
 
 		assertEquals("wrong number of parameters: ", 0, values.size());
 		assertEquals("empty insert not generated correctly", "INSERT INTO customers () VALUES()", insertString);
+		verify(metaDataResultSet, atLeastOnce()).next();
+		verify(columnsResultSet, atLeastOnce()).next();
+		verify(metaDataResultSet).close();
+		verify(columnsResultSet).close();
 	}
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java
index 16f620942c..c661c79421 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java
@@ -16,72 +16,53 @@
 
 package org.springframework.jdbc.core.support;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
 
-import org.easymock.MockControl;
-import org.apache.commons.logging.LogFactory;
+import javax.sql.DataSource;
 
+import org.junit.Test;
 import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.jdbc.AbstractJdbcTests;
-import org.springframework.jdbc.core.JdbcTemplate;
 
 /**
  * @author Rod Johnson
  */
-public class JdbcBeanDefinitionReaderTests extends AbstractJdbcTests {
-
-	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
-
+public class JdbcBeanDefinitionReaderTests {
 
+	@Test
 	public void testValid() throws Exception {
 		String sql = "SELECT NAME AS NAME, PROPERTY AS PROPERTY, VALUE AS VALUE FROM T";
 
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		ctrlResultSet.expectAndReturn(mockResultSet.next(), true, 2);
-		ctrlResultSet.expectAndReturn(mockResultSet.next(), false);
+		Connection connection = mock(Connection.class);
+		DataSource dataSource = mock(DataSource.class);
+		given(dataSource.getConnection()).willReturn(connection);
 
-		// first row
-		ctrlResultSet.expectAndReturn(mockResultSet.getString(1), "one");
-		ctrlResultSet.expectAndReturn(mockResultSet.getString(2), "(class)");
-		ctrlResultSet.expectAndReturn(mockResultSet.getString(3), "org.springframework.beans.TestBean");
+		ResultSet resultSet = mock(ResultSet.class);
+		given(resultSet.next()).willReturn(true, true, false);
+		given(resultSet.getString(1)).willReturn("one", "one");
+		given(resultSet.getString(2)).willReturn("(class)", "age");
+		given(resultSet.getString(3)).willReturn("org.springframework.beans.TestBean", "53");
 
-		// second row
-		ctrlResultSet.expectAndReturn(mockResultSet.getString(1), "one");
-		ctrlResultSet.expectAndReturn(mockResultSet.getString(2), "age");
-		ctrlResultSet.expectAndReturn(mockResultSet.getString(3), "53");
-
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		MockControl ctrlStatement = MockControl.createControl(Statement.class);
-		Statement mockStatement = (Statement) ctrlStatement.getMock();
-		ctrlStatement.expectAndReturn(mockStatement.executeQuery(sql), mockResultSet);
-		if (debugEnabled) {
-			ctrlStatement.expectAndReturn(mockStatement.getWarnings(), null);
-		}
-		mockStatement.close();
-		ctrlStatement.setVoidCallable();
-
-		mockConnection.createStatement();
-		ctrlConnection.setReturnValue(mockStatement);
-
-		ctrlResultSet.replay();
-		ctrlStatement.replay();
-		replay();
+		Statement statement = mock(Statement.class);
+		given(statement.executeQuery(sql)).willReturn(resultSet);
+		given(connection.createStatement()).willReturn(statement);
 
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		JdbcBeanDefinitionReader reader = new JdbcBeanDefinitionReader(bf);
-		reader.setDataSource(mockDataSource);
+		reader.setDataSource(dataSource);
 		reader.loadBeanDefinitions(sql);
 		assertEquals("Incorrect number of bean definitions", 1, bf.getBeanDefinitionCount());
 		TestBean tb = (TestBean) bf.getBean("one");
 		assertEquals("Age in TestBean was wrong.", 53, tb.getAge());
 
-		ctrlResultSet.verify();
-		ctrlStatement.verify();
+		verify(resultSet).close();
+		verify(statement).close();
 	}
-
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
index 76034050ef..daae639f03 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
@@ -16,26 +16,27 @@
 
 package org.springframework.jdbc.core.support;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.sql.DataSource;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-
+import org.junit.Test;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 /**
  * @author Juergen Hoeller
  * @since 30.07.2003
  */
-public class JdbcDaoSupportTests extends TestCase {
+public class JdbcDaoSupportTests {
 
+	@Test
 	public void testJdbcDaoSupportWithDataSource() throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		final List test = new ArrayList();
+		DataSource ds = mock(DataSource.class);
+		final List<String> test = new ArrayList<String>();
 		JdbcDaoSupport dao = new JdbcDaoSupport() {
 			@Override
 			protected void initDao() {
@@ -49,9 +50,10 @@ public class JdbcDaoSupportTests extends TestCase {
 		assertEquals("initDao called", test.size(), 1);
 	}
 
+	@Test
 	public void testJdbcDaoSupportWithJdbcTemplate() throws Exception {
 		JdbcTemplate template = new JdbcTemplate();
-		final List test = new ArrayList();
+		final List<String> test = new ArrayList<String>();
 		JdbcDaoSupport dao = new JdbcDaoSupport() {
 			@Override
 			protected void initDao() {
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
index 02cafbb198..f082720f84 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
@@ -16,14 +16,20 @@
 
 package org.springframework.jdbc.core.support;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.io.IOException;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.jdbc.LobRetrievalFailureException;
@@ -33,32 +39,19 @@ import org.springframework.jdbc.support.lob.LobHandler;
 /**
  * @author Alef Arendsen
  */
-public class LobSupportTests extends TestCase {
+public class LobSupportTests {
 
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+	@Test
 	public void testCreatingPreparedStatementCallback() throws SQLException {
-		// - return value should match
-		// - lob creator should be closed
-		// - set return value should be called
-		// - execute update should be called
+		LobHandler handler = mock(LobHandler.class);
+		LobCreator creator = mock(LobCreator.class);
+		PreparedStatement ps = mock(PreparedStatement.class);
 
-		MockControl lobHandlerControl = MockControl.createControl(LobHandler.class);
-		LobHandler handler = (LobHandler)lobHandlerControl.getMock();
-
-		MockControl lobCreatorControl = MockControl.createControl(LobCreator.class);
-		LobCreator creator = (LobCreator)lobCreatorControl.getMock();
-
-		MockControl psControl = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement ps = (PreparedStatement)psControl.getMock();
-
-		handler.getLobCreator();
-		lobHandlerControl.setReturnValue(creator);
-		ps.executeUpdate();
-		psControl.setReturnValue(3);
-		creator.close();
-
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
-		psControl.replay();
+		given(handler.getLobCreator()).willReturn(creator);
+		given(ps.executeUpdate()).willReturn(3);
 
 		class SetValuesCalled {
 			boolean b = false;
@@ -66,9 +59,8 @@ public class LobSupportTests extends TestCase {
 
 		final SetValuesCalled svc = new SetValuesCalled();
 
-		AbstractLobCreatingPreparedStatementCallback psc =
-			new AbstractLobCreatingPreparedStatementCallback(handler) {
-
+		AbstractLobCreatingPreparedStatementCallback psc = new AbstractLobCreatingPreparedStatementCallback(
+				handler) {
 			@Override
 			protected void setValues(PreparedStatement ps, LobCreator lobCreator)
 					throws SQLException, DataAccessException {
@@ -77,85 +69,62 @@ public class LobSupportTests extends TestCase {
 		};
 
 		assertEquals(new Integer(3), psc.doInPreparedStatement(ps));
-
-		lobHandlerControl.verify();
-		lobCreatorControl.verify();
-		psControl.verify();
 		assertTrue(svc.b);
+		verify(creator).close();
+		verify(handler).getLobCreator();
+		verify(ps).executeUpdate();
 	}
 
+	@Test
 	public void testAbstractLobStreamingResultSetExtractorNoRows() throws SQLException {
-		MockControl rsetControl = MockControl.createControl(ResultSet.class);
-		ResultSet rset = (ResultSet)rsetControl.getMock();
-		rset.next();
-		rsetControl.setReturnValue(false);
-		rsetControl.replay();
-
+		ResultSet rset = mock(ResultSet.class);
 		AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false);
+		thrown.expect(IncorrectResultSizeDataAccessException.class);
 		try {
 			lobRse.extractData(rset);
-			fail("IncorrectResultSizeDataAccessException should have been thrown");
-		} catch (IncorrectResultSizeDataAccessException e) {
-			// expected
+		}
+		finally {
+			verify(rset).next();
 		}
 	}
 
+	@Test
 	public void testAbstractLobStreamingResultSetExtractorOneRow() throws SQLException {
-		MockControl rsetControl = MockControl.createControl(ResultSet.class);
-		ResultSet rset = (ResultSet)rsetControl.getMock();
-		rset.next();
-		rsetControl.setReturnValue(true);
-		// see if it's called
-		rset.clearWarnings();
-		rset.next();
-		rsetControl.setReturnValue(false);
-		rsetControl.replay();
-
+		ResultSet rset = mock(ResultSet.class);
+		given(rset.next()).willReturn(true, false);
 		AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false);
 		lobRse.extractData(rset);
-		rsetControl.verify();
+		verify(rset).clearWarnings();
 	}
 
-	public void testAbstractLobStreamingResultSetExtractorMultipleRows() throws SQLException {
-		MockControl rsetControl = MockControl.createControl(ResultSet.class);
-		ResultSet rset = (ResultSet)rsetControl.getMock();
-		rset.next();
-		rsetControl.setReturnValue(true);
-		// see if it's called
-		rset.clearWarnings();
-		rset.next();
-		rsetControl.setReturnValue(true);
-		rsetControl.replay();
-
+	@Test
+	public void testAbstractLobStreamingResultSetExtractorMultipleRows()
+			throws SQLException {
+		ResultSet rset = mock(ResultSet.class);
+		given(rset.next()).willReturn(true, true, false);
 		AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false);
+		thrown.expect(IncorrectResultSizeDataAccessException.class);
 		try {
 			lobRse.extractData(rset);
-			fail("IncorrectResultSizeDataAccessException should have been thrown");
-		} catch (IncorrectResultSizeDataAccessException e) {
-			// expected
 		}
-		rsetControl.verify();
+		finally {
+			verify(rset).clearWarnings();
+		}
 	}
 
-	public void testAbstractLobStreamingResultSetExtractorCorrectException() throws SQLException {
-		MockControl rsetControl = MockControl.createControl(ResultSet.class);
-		ResultSet rset = (ResultSet)rsetControl.getMock();
-		rset.next();
-		rsetControl.setReturnValue(true);
-		rsetControl.replay();
-
+	@Test
+	public void testAbstractLobStreamingResultSetExtractorCorrectException()
+			throws SQLException {
+		ResultSet rset = mock(ResultSet.class);
+		given(rset.next()).willReturn(true);
 		AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(true);
-		try {
-			lobRse.extractData(rset);
-			fail("LobRetrievalFailureException should have been thrown");
-		} catch (LobRetrievalFailureException e) {
-			// expected
-		}
-		rsetControl.verify();
+		thrown.expect(LobRetrievalFailureException.class);
+		lobRse.extractData(rset);
 	}
 
 	private AbstractLobStreamingResultSetExtractor getResultSetExtractor(final boolean ex) {
 		AbstractLobStreamingResultSetExtractor lobRse = new AbstractLobStreamingResultSetExtractor() {
+
 			@Override
 			protected void streamData(ResultSet rs) throws SQLException, IOException {
 				if (ex) {
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
index 65e5b3f9a8..513c702bfd 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
@@ -15,18 +15,28 @@
  */
 package org.springframework.jdbc.core.support;
 
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
-import java.util.Arrays;
-import java.util.Date;
-
-import junit.framework.TestCase;
-import org.easymock.ArgumentsMatcher;
-import org.easymock.MockControl;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.MockitoAnnotations;
 import org.springframework.jdbc.support.lob.LobCreator;
 import org.springframework.jdbc.support.lob.LobHandler;
 
@@ -46,179 +56,96 @@ import org.springframework.jdbc.support.lob.LobHandler;
  *
  * @author Alef Arendsen
  */
-public class SqlLobValueTests extends TestCase {
+public class SqlLobValueTests  {
 
-	private MockControl psControl;
-	private PreparedStatement ps;
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
-	private MockControl lobHandlerControl;
+	private PreparedStatement preparedStatement;
 	private LobHandler handler;
-
-	private MockControl lobCreatorControl;
 	private LobCreator creator;
 
-	@Override
+	@Captor
+	private ArgumentCaptor<InputStream> inputStreamCaptor;
+
+	@Before
 	public void setUp() {
-		//	create preparedstatement
-		psControl = MockControl.createControl(PreparedStatement.class);
-		ps = (PreparedStatement) psControl.getMock();
-
-		// create handler controler
-		lobHandlerControl = MockControl.createControl(LobHandler.class);
-		handler = (LobHandler) lobHandlerControl.getMock();
-
-		// create creator control
-		lobCreatorControl = MockControl.createControl(LobCreator.class);
-		creator = (LobCreator) lobCreatorControl.getMock();
-
-		// set initial state
-		handler.getLobCreator();
-		lobHandlerControl.setReturnValue(creator);
-	}
-
-	private void replay() {
-		psControl.replay();
-		lobHandlerControl.replay();
-		lobCreatorControl.replay();
+		MockitoAnnotations.initMocks(this);
+		preparedStatement = mock(PreparedStatement.class);
+		handler = mock(LobHandler.class);
+		creator = mock(LobCreator.class);
+		given(handler.getLobCreator()).willReturn(creator);
 	}
 
+	@Test
 	public void test1() throws SQLException {
 		byte[] testBytes = "Bla".getBytes();
-		creator.setBlobAsBytes(ps, 1, testBytes);
-		replay();
 		SqlLobValue lob = new SqlLobValue(testBytes, handler);
-		lob.setTypeValue(ps, 1, Types.BLOB, "test");
-		lobHandlerControl.verify();
-		lobCreatorControl.verify();
+		lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test");
+		verify(creator).setBlobAsBytes(preparedStatement, 1, testBytes);
 	}
 
+	@Test
 	public void test2() throws SQLException {
 		String testString = "Bla";
-
-		creator.setBlobAsBytes(ps, 1, testString.getBytes());
-		// set a matcher to match the byte array!
-		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
-			@Override
-			public boolean matches(Object[] arg0, Object[] arg1) {
-				byte[] one = (byte[]) arg0[2];
-				byte[] two = (byte[]) arg1[2];
-				return Arrays.equals(one, two);
-			}
-			@Override
-			public String toString(Object[] arg0) {
-				return "bla";
-			}
-		});
-
-		replay();
-
 		SqlLobValue lob = new SqlLobValue(testString, handler);
-		lob.setTypeValue(ps, 1, Types.BLOB, "test");
-		lobHandlerControl.verify();
-		lobCreatorControl.verify();
-
+		lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test");
+		verify(creator).setBlobAsBytes(preparedStatement, 1, testString.getBytes());
 	}
 
-	public void test3()
-	throws SQLException {
-
-		Date testContent = new Date();
-
-		SqlLobValue lob =
-			new SqlLobValue(new InputStreamReader(new ByteArrayInputStream("Bla".getBytes())), 12);
-		try {
-			lob.setTypeValue(ps, 1, Types.BLOB, "test");
-			fail("IllegalArgumentException should have been thrown");
-		}
-		catch (IllegalArgumentException e) {
-			// expected
-		}
+	@Test
+	public void test3() throws SQLException {
+		SqlLobValue lob = new SqlLobValue(new InputStreamReader(new ByteArrayInputStream("Bla".getBytes())), 12);
+		thrown.expect(IllegalArgumentException.class);
+		lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test");
 	}
 
+	@Test
 	public void test4() throws SQLException {
 		String testContent = "Bla";
-		creator.setClobAsString(ps, 1, testContent);
-
-		replay();
-
 		SqlLobValue lob = new SqlLobValue(testContent, handler);
-		lob.setTypeValue(ps, 1, Types.CLOB, "test");
-		lobHandlerControl.verify();
-		lobCreatorControl.verify();
+		lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test");
+		verify(creator).setClobAsString(preparedStatement, 1, testContent);
 	}
 
-	public void test5() throws SQLException {
+	@Test
+	public void test5() throws Exception {
 		byte[] testContent = "Bla".getBytes();
-		ByteArrayInputStream bais = new ByteArrayInputStream(testContent);
-		creator.setClobAsAsciiStream(ps, 1, bais, 3);
-		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
-			@Override
-			public boolean matches(Object[] arg0, Object[] arg1) {
-				// for now, match always
-				return true;
-			}
-			@Override
-			public String toString(Object[] arg0) {
-				return null;
-			}
-		});
-
-		replay();
-
 		SqlLobValue lob = new SqlLobValue(new ByteArrayInputStream(testContent), 3, handler);
-		lob.setTypeValue(ps, 1, Types.CLOB, "test");
-		lobHandlerControl.verify();
-		lobCreatorControl.verify();
+		lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test");
+		verify(creator).setClobAsAsciiStream(eq(preparedStatement), eq(1), inputStreamCaptor.capture(), eq(3));
+		byte[] bytes = new byte[3];
+		inputStreamCaptor.getValue().read(bytes );
+		assertThat(bytes, equalTo(testContent));
 	}
 
-	public void test6()throws SQLException {
+	@Test
+	public void test6() throws SQLException {
 		byte[] testContent = "Bla".getBytes();
 		ByteArrayInputStream bais = new ByteArrayInputStream(testContent);
 		InputStreamReader reader = new InputStreamReader(bais);
-		creator.setClobAsCharacterStream(ps, 1, reader, 3);
-		lobCreatorControl.setMatcher(new ArgumentsMatcher() {
-			@Override
-			public boolean matches(Object[] arg0, Object[] arg1) {
-				// for now, match always
-				return true;
-			}
-			@Override
-			public String toString(Object[] arg0) {
-				return null;
-			}
-		});
-
-		replay();
-
 		SqlLobValue lob = new SqlLobValue(reader, 3, handler);
-		lob.setTypeValue(ps, 1, Types.CLOB, "test");
-		lobHandlerControl.verify();
-		lobCreatorControl.verify();
-
+		lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test");
+		verify(creator).setClobAsCharacterStream(eq(preparedStatement), eq(1), eq(reader), eq(3));
 	}
 
+	@Test
 	public void test7() throws SQLException {
-		Date testContent = new Date();
-
 		SqlLobValue lob = new SqlLobValue("bla".getBytes());
-		try {
-			lob.setTypeValue(ps, 1, Types.CLOB, "test");
-			fail("IllegalArgumentException should have been thrown");
-		}
-		catch (IllegalArgumentException e) {
-			// expected
-		}
+		thrown.expect(IllegalArgumentException.class);
+		lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test");
 	}
 
+	@Test
 	public void testOtherConstructors() throws SQLException {
 		// a bit BS, but we need to test them, as long as they don't throw exceptions
 
 		SqlLobValue lob = new SqlLobValue("bla");
-		lob.setTypeValue(ps, 1, Types.CLOB, "test");
+		lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test");
 
 		try {
 			lob = new SqlLobValue("bla".getBytes());
-			lob.setTypeValue(ps, 1, Types.CLOB, "test");
+			lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test");
 			fail("IllegalArgumentException should have been thrown");
 		}
 		catch (IllegalArgumentException e) {
@@ -226,27 +153,27 @@ public class SqlLobValueTests extends TestCase {
 		}
 
 		lob = new SqlLobValue(new ByteArrayInputStream("bla".getBytes()), 3);
-		lob.setTypeValue(ps, 1, Types.CLOB, "test");
+		lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test");
 
-		lob = new SqlLobValue(new InputStreamReader(
-				new ByteArrayInputStream("bla".getBytes())), 3);
-		lob.setTypeValue(ps, 1, Types.CLOB, "test");
+		lob = new SqlLobValue(new InputStreamReader(new ByteArrayInputStream(
+				"bla".getBytes())), 3);
+		lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test");
 
 		// same for BLOB
 		lob = new SqlLobValue("bla");
-		lob.setTypeValue(ps, 1, Types.BLOB, "test");
+		lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test");
 
 		lob = new SqlLobValue("bla".getBytes());
-		lob.setTypeValue(ps, 1, Types.BLOB, "test");
+		lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test");
 
 		lob = new SqlLobValue(new ByteArrayInputStream("bla".getBytes()), 3);
-		lob.setTypeValue(ps, 1, Types.BLOB, "test");
+		lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test");
 
-		lob = new SqlLobValue(new InputStreamReader(
-				new ByteArrayInputStream("bla".getBytes())), 3);
+		lob = new SqlLobValue(new InputStreamReader(new ByteArrayInputStream(
+				"bla".getBytes())), 3);
 
 		try {
-			lob.setTypeValue(ps, 1, Types.BLOB, "test");
+			lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test");
 			fail("IllegalArgumentException should have been thrown");
 		}
 		catch (IllegalArgumentException e) {
@@ -254,28 +181,20 @@ public class SqlLobValueTests extends TestCase {
 		}
 	}
 
-	public void testCorrectCleanup()  throws SQLException {
-		creator.setClobAsString(ps, 1, "Bla");
-		creator.close();
-
-		replay();
+	@Test
+	public void testCorrectCleanup() throws SQLException {
 		SqlLobValue lob = new SqlLobValue("Bla", handler);
-		lob.setTypeValue(ps, 1, Types.CLOB, "test");
+		lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test");
 		lob.cleanup();
-
-		lobCreatorControl.verify();
+		verify(creator).setClobAsString(preparedStatement, 1, "Bla");
+		verify(creator).close();
 	}
 
+	@Test
 	public void testOtherSqlType() throws SQLException {
-		replay();
 		SqlLobValue lob = new SqlLobValue("Bla", handler);
-		try {
-			lob.setTypeValue(ps, 1, Types.SMALLINT, "test");
-			fail("IllegalArgumentException should have been thrown");
-		}
-		catch (IllegalArgumentException e) {
-			// expected
-		}
+		thrown.expect(IllegalArgumentException.class);
+		lob.setTypeValue(preparedStatement, 1, Types.SMALLINT, "test");
 	}
 
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
index 4fe8a5b43f..88e6ec73a3 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
@@ -16,6 +16,19 @@
 
 package org.springframework.jdbc.datasource;
 
+import static org.junit.Assert.assertFalse;
+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.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -23,15 +36,16 @@ import java.util.List;
 import java.util.Map;
 
 import javax.sql.DataSource;
+import javax.transaction.RollbackException;
 import javax.transaction.Status;
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.beans.factory.support.StaticListableBeanFactory;
 import org.springframework.jdbc.datasource.lookup.BeanFactoryDataSourceLookup;
 import org.springframework.jdbc.datasource.lookup.IsolationLevelDataSourceRouter;
@@ -49,66 +63,73 @@ import org.springframework.transaction.support.TransactionTemplate;
  * @author Juergen Hoeller
  * @since 17.10.2005
  */
-public class DataSourceJtaTransactionTests extends TestCase {
+public class DataSourceJtaTransactionTests {
 
+	private Connection connection;
+	private DataSource dataSource;
+	private UserTransaction userTransaction;
+	private TransactionManager transactionManager;
+	private Transaction transaction;
+
+	@Before
+	public void setup() throws Exception {
+		connection =mock(Connection.class);
+		dataSource = mock(DataSource.class);
+		userTransaction = mock(UserTransaction.class);
+		transactionManager = mock(TransactionManager.class);
+		transaction = mock(Transaction.class);
+		given(dataSource.getConnection()).willReturn(connection);
+	}
+
+	@After
+	public void verifyTransactionSynchronizationManagerState() {
+		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
+		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
+		assertNull(TransactionSynchronizationManager.getCurrentTransactionName());
+		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
+		assertNull(TransactionSynchronizationManager.getCurrentTransactionIsolationLevel());
+		assertFalse(TransactionSynchronizationManager.isActualTransactionActive());
+	}
+
+	@Test
 	public void testJtaTransactionCommit() throws Exception {
 		doTestJtaTransaction(false);
 	}
 
+	@Test
 	public void testJtaTransactionRollback() throws Exception {
 		doTestJtaTransaction(true);
 	}
 
 	private void doTestJtaTransaction(final boolean rollback) throws Exception {
-		MockControl utControl = MockControl.createControl(UserTransaction.class);
-		UserTransaction ut = (UserTransaction) utControl.getMock();
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1);
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_ACTIVE, 1);
-		ut.begin();
-		utControl.setVoidCallable(1);
 		if (rollback) {
-			ut.rollback();
+			given(userTransaction.getStatus()).willReturn(
+					Status.STATUS_NO_TRANSACTION,Status.STATUS_ACTIVE);
 		}
 		else {
-			ut.getStatus();
-			utControl.setReturnValue(Status.STATUS_ACTIVE, 1);
-			ut.commit();
+			given(userTransaction.getStatus()).willReturn(
+					Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
 		}
-		utControl.setVoidCallable(1);
-		utControl.replay();
 
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-		conControl.replay();
-		dsControl.replay();
-
-		JtaTransactionManager ptm = new JtaTransactionManager(ut);
+		JtaTransactionManager ptm = new JtaTransactionManager(userTransaction);
 		TransactionTemplate tt = new TransactionTemplate(ptm);
-		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
+		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dataSource));
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
 		tt.execute(new TransactionCallbackWithoutResult() {
 			@Override
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
-				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
+				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dataSource));
 				assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
 				assertTrue("Is new transaction", status.isNewTransaction());
 
-				Connection c = DataSourceUtils.getConnection(ds);
-				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
-				DataSourceUtils.releaseConnection(c, ds);
+				Connection c = DataSourceUtils.getConnection(dataSource);
+				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dataSource));
+				DataSourceUtils.releaseConnection(c, dataSource);
 
-				c = DataSourceUtils.getConnection(ds);
-				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
-				DataSourceUtils.releaseConnection(c, ds);
+				c = DataSourceUtils.getConnection(dataSource);
+				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dataSource));
+				DataSourceUtils.releaseConnection(c, dataSource);
 
 				if (rollback) {
 					status.setRollbackOnly();
@@ -116,49 +137,61 @@ public class DataSourceJtaTransactionTests extends TestCase {
 			}
 		});
 
-		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
+		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dataSource));
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
-		dsControl.verify();
-		conControl.verify();
-		utControl.verify();
+		verify(userTransaction).begin();
+		if (rollback) {
+			verify(userTransaction).rollback();
+		}
+		verify(connection).close();
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNew() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNew(false, false, false, false);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewWithAccessAfterResume() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNew(false, false, true, false);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewWithOpenOuterConnection() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNew(false, true, false, false);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewWithOpenOuterConnectionAccessed() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNew(false, true, true, false);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewWithTransactionAwareDataSource() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNew(false, false, true, true);
 	}
 
+	@Test
 	public void testJtaTransactionRollbackWithPropagationRequiresNew() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNew(true, false, false, false);
 	}
 
+	@Test
 	public void testJtaTransactionRollbackWithPropagationRequiresNewWithAccessAfterResume() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNew(true, false, true, false);
 	}
 
+	@Test
 	public void testJtaTransactionRollbackWithPropagationRequiresNewWithOpenOuterConnection() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNew(true, true, false, false);
 	}
 
+	@Test
 	public void testJtaTransactionRollbackWithPropagationRequiresNewWithOpenOuterConnectionAccessed() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNew(true, true, true, false);
 	}
 
+	@Test
 	public void testJtaTransactionRollbackWithPropagationRequiresNewWithTransactionAwareDataSource() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNew(true, false, true, true);
 	}
@@ -167,57 +200,22 @@ public class DataSourceJtaTransactionTests extends TestCase {
 			final boolean rollback, final boolean openOuterConnection, final boolean accessAfterResume,
 			final boolean useTransactionAwareDataSource) throws Exception {
 
-		MockControl utControl = MockControl.createControl(UserTransaction.class);
-		UserTransaction ut = (UserTransaction) utControl.getMock();
-		MockControl tmControl = MockControl.createControl(TransactionManager.class);
-		TransactionManager tm = (TransactionManager) tmControl.getMock();
-		MockControl txControl = MockControl.createControl(Transaction.class);
-		Transaction tx = (Transaction) txControl.getMock();
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1);
-		ut.begin();
-		utControl.setVoidCallable(1);
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_ACTIVE, 16);
-		tm.suspend();
-		tmControl.setReturnValue(tx, 5);
-		ut.begin();
-		utControl.setVoidCallable(5);
-		ut.commit();
-		utControl.setVoidCallable(5);
-		tm.resume(tx);
-		tmControl.setVoidCallable(5);
+		given(transactionManager.suspend()).willReturn(transaction);
 		if (rollback) {
-			ut.rollback();
+			given(userTransaction.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION,
+					Status.STATUS_ACTIVE);
 		}
 		else {
-			ut.getStatus();
-			utControl.setReturnValue(Status.STATUS_ACTIVE, 1);
-			ut.commit();
+			given(userTransaction.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION,
+					Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
 		}
-		utControl.setVoidCallable(1);
-		utControl.replay();
-		tmControl.replay();
 
-		final MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		final MockControl conControl = MockControl.createControl(Connection.class);
-		final Connection con = (Connection) conControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		con.isReadOnly();
-		conControl.setReturnValue(true, 1);
-		if (!openOuterConnection) {
-			con.close();
-			conControl.setVoidCallable(1);
-		}
-		conControl.replay();
-		dsControl.replay();
+		given(connection.isReadOnly()).willReturn(true);
 
 		final DataSource dsToUse = useTransactionAwareDataSource ?
-				new TransactionAwareDataSourceProxy(ds) : ds;
+				new TransactionAwareDataSourceProxy(dataSource) : dataSource;
 
-		JtaTransactionManager ptm = new JtaTransactionManager(ut, tm);
+		JtaTransactionManager ptm = new JtaTransactionManager(userTransaction, transactionManager);
 		final TransactionTemplate tt = new TransactionTemplate(ptm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
@@ -255,19 +253,6 @@ public class DataSourceJtaTransactionTests extends TestCase {
 							assertTrue("Is new transaction", status.isNewTransaction());
 
 							try {
-								dsControl.verify();
-								conControl.verify();
-								dsControl.reset();
-								conControl.reset();
-								ds.getConnection();
-								dsControl.setReturnValue(con, 1);
-								con.isReadOnly();
-								conControl.setReturnValue(true, 1);
-								con.close();
-								conControl.setVoidCallable(1);
-								dsControl.replay();
-								conControl.replay();
-
 								Connection c = DataSourceUtils.getConnection(dsToUse);
 								c.isReadOnly();
 								assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
@@ -290,21 +275,6 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 				if (accessAfterResume) {
 					try {
-						if (!openOuterConnection) {
-							dsControl.verify();
-							dsControl.reset();
-							ds.getConnection();
-							dsControl.setReturnValue(con, 1);
-							dsControl.replay();
-						}
-						conControl.verify();
-						conControl.reset();
-						con.isReadOnly();
-						conControl.setReturnValue(true, 1);
-						con.close();
-						conControl.setVoidCallable(1);
-						conControl.replay();
-
 						if (!openOuterConnection) {
 							c = DataSourceUtils.getConnection(dsToUse);
 						}
@@ -322,15 +292,6 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 				else {
 					if (openOuterConnection) {
-						try {
-							conControl.verify();
-							conControl.reset();
-							con.close();
-							conControl.setVoidCallable(1);
-							conControl.replay();
-						}
-						catch (SQLException ex) {
-						}
 						DataSourceUtils.releaseConnection(c, dsToUse);
 					}
 				}
@@ -339,24 +300,38 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
-		dsControl.verify();
-		conControl.verify();
-		utControl.verify();
-		tmControl.verify();
+		verify(userTransaction, times(6)).begin();
+		verify(transactionManager, times(5)).resume(transaction);
+		if(rollback) {
+			verify(userTransaction, times(5)).commit();
+			verify(userTransaction).rollback();
+		} else {
+			verify(userTransaction, times(6)).commit();
+		}
+		if(accessAfterResume && !openOuterConnection) {
+			verify(connection, times(7)).close();
+		}
+		else {
+			verify(connection, times(6)).close();
+		}
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiredWithinSupports() throws Exception {
 		doTestJtaTransactionCommitWithNewTransactionWithinEmptyTransaction(false, false);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiredWithinNotSupported() throws Exception {
 		doTestJtaTransactionCommitWithNewTransactionWithinEmptyTransaction(false, true);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewWithinSupports() throws Exception {
 		doTestJtaTransactionCommitWithNewTransactionWithinEmptyTransaction(true, false);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewWithinNotSupported() throws Exception {
 		doTestJtaTransactionCommitWithNewTransactionWithinEmptyTransaction(true, true);
 	}
@@ -364,57 +339,28 @@ public class DataSourceJtaTransactionTests extends TestCase {
 	private void doTestJtaTransactionCommitWithNewTransactionWithinEmptyTransaction(
 			final boolean requiresNew, boolean notSupported) throws Exception {
 
-		MockControl utControl = MockControl.createControl(UserTransaction.class);
-		UserTransaction ut = (UserTransaction) utControl.getMock();
-		MockControl tmControl = MockControl.createControl(TransactionManager.class);
-		TransactionManager tm = (TransactionManager) tmControl.getMock();
-		MockControl txControl = MockControl.createControl(Transaction.class);
-		Transaction tx = (Transaction) txControl.getMock();
 		if (notSupported) {
-			ut.getStatus();
-			utControl.setReturnValue(Status.STATUS_ACTIVE, 1);
-			tm.suspend();
-			tmControl.setReturnValue(tx, 1);
+			given(userTransaction.getStatus()).willReturn(
+					Status.STATUS_ACTIVE,
+					Status.STATUS_NO_TRANSACTION,
+					Status.STATUS_ACTIVE,
+					Status.STATUS_ACTIVE);
+			given(transactionManager.suspend()).willReturn(transaction);
 		}
 		else {
-			ut.getStatus();
-			utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1);
+			given(userTransaction.getStatus()).willReturn(
+					Status.STATUS_NO_TRANSACTION,
+					Status.STATUS_NO_TRANSACTION,
+					Status.STATUS_ACTIVE,
+					Status.STATUS_ACTIVE);
 		}
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1);
-		ut.begin();
-		utControl.setVoidCallable(1);
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_ACTIVE, 2);
-		ut.commit();
-		utControl.setVoidCallable(1);
-		if (notSupported) {
-			tm.resume(tx);
-			tmControl.setVoidCallable(1);
-		}
-		utControl.replay();
-		tmControl.replay();
-		txControl.replay();
 
-		final MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		final MockControl con1Control = MockControl.createControl(Connection.class);
-		final Connection con1 = (Connection) con1Control.getMock();
-		final MockControl con2Control = MockControl.createControl(Connection.class);
-		final Connection con2 = (Connection) con2Control.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con1, 1);
-		ds.getConnection();
-		dsControl.setReturnValue(con2, 1);
-		con2.close();
-		con2Control.setVoidCallable(1);
-		con1.close();
-		con1Control.setVoidCallable(1);
-		dsControl.replay();
-		con1Control.replay();
-		con2Control.replay();
+		final DataSource dataSource = mock(DataSource.class);
+		final Connection connection1 = mock(Connection.class);
+		final Connection connection2 = mock(Connection.class);
+		given(dataSource.getConnection()).willReturn(connection1, connection2);
 
-		final JtaTransactionManager ptm = new JtaTransactionManager(ut, tm);
+		final JtaTransactionManager ptm = new JtaTransactionManager(userTransaction, transactionManager);
 		TransactionTemplate tt = new TransactionTemplate(ptm);
 		tt.setPropagationBehavior(notSupported ?
 				TransactionDefinition.PROPAGATION_NOT_SUPPORTED : TransactionDefinition.PROPAGATION_SUPPORTS);
@@ -426,8 +372,8 @@ public class DataSourceJtaTransactionTests extends TestCase {
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertFalse(TransactionSynchronizationManager.isActualTransactionActive());
-				assertSame(con1, DataSourceUtils.getConnection(ds));
-				assertSame(con1, DataSourceUtils.getConnection(ds));
+				assertSame(connection1, DataSourceUtils.getConnection(dataSource));
+				assertSame(connection1, DataSourceUtils.getConnection(dataSource));
 
 				TransactionTemplate tt2 = new TransactionTemplate(ptm);
 				tt2.setPropagationBehavior(requiresNew ?
@@ -438,55 +384,63 @@ public class DataSourceJtaTransactionTests extends TestCase {
 						assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 						assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 						assertTrue(TransactionSynchronizationManager.isActualTransactionActive());
-						assertSame(con2, DataSourceUtils.getConnection(ds));
-						assertSame(con2, DataSourceUtils.getConnection(ds));
+						assertSame(connection2, DataSourceUtils.getConnection(dataSource));
+						assertSame(connection2, DataSourceUtils.getConnection(dataSource));
 					}
 				});
 
 				assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
 				assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
 				assertFalse(TransactionSynchronizationManager.isActualTransactionActive());
-				assertSame(con1, DataSourceUtils.getConnection(ds));
+				assertSame(connection1, DataSourceUtils.getConnection(dataSource));
 			}
 		});
 		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
-
-		utControl.verify();
-		tmControl.verify();
-		txControl.verify();
-		dsControl.verify();
-		con1Control.verify();
-		con2Control.verify();
+		verify(userTransaction).begin();
+		verify(userTransaction).commit();
+		if (notSupported) {
+			verify(transactionManager).resume(transaction);
+		}
+		verify(connection2).close();
+		verify(connection1).close();
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewAndSuspendException() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNewAndBeginException(true, false, false);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewWithOpenOuterConnectionAndSuspendException() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNewAndBeginException(true, true, false);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewWithTransactionAwareDataSourceAndSuspendException() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNewAndBeginException(true, false, true);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewWithOpenOuterConnectionAndTransactionAwareDataSourceAndSuspendException() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNewAndBeginException(true, true, true);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewAndBeginException() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNewAndBeginException(false, false, false);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewWithOpenOuterConnectionAndBeginException() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNewAndBeginException(false, true, false);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewWithOpenOuterConnectionAndTransactionAwareDataSourceAndBeginException() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNewAndBeginException(false, true, true);
 	}
 
+	@Test
 	public void testJtaTransactionCommitWithPropagationRequiresNewWithTransactionAwareDataSourceAndBeginException() throws Exception {
 		doTestJtaTransactionWithPropagationRequiresNewAndBeginException(false, false, true);
 	}
@@ -494,57 +448,27 @@ public class DataSourceJtaTransactionTests extends TestCase {
 	private void doTestJtaTransactionWithPropagationRequiresNewAndBeginException(boolean suspendException,
 			final boolean openOuterConnection, final boolean useTransactionAwareDataSource) throws Exception {
 
-		MockControl utControl = MockControl.createControl(UserTransaction.class);
-		UserTransaction ut = (UserTransaction) utControl.getMock();
-		MockControl tmControl = MockControl.createControl(TransactionManager.class);
-		TransactionManager tm = (TransactionManager) tmControl.getMock();
-		MockControl txControl = MockControl.createControl(Transaction.class);
-		Transaction tx = (Transaction) txControl.getMock();
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1);
-		ut.begin();
-		utControl.setVoidCallable(1);
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_ACTIVE, 2);
+		given(userTransaction.getStatus()).willReturn(
+				Status.STATUS_NO_TRANSACTION,
+				Status.STATUS_ACTIVE,
+				Status.STATUS_ACTIVE);
 		if (suspendException) {
-			tm.suspend();
-			tmControl.setThrowable(new SystemException(), 1);
+			given(transactionManager.suspend()).willThrow(new SystemException());
 		}
 		else {
-			tm.suspend();
-			tmControl.setReturnValue(tx, 1);
-			ut.begin();
-			utControl.setThrowable(new SystemException(), 1);
-			tm.resume(tx);
-			tmControl.setVoidCallable(1);
+			given(transactionManager.suspend()).willReturn(transaction);
+			willThrow(new SystemException()).given(userTransaction).begin();
 		}
-		ut.rollback();
-		utControl.setVoidCallable(1);
-		utControl.replay();
-		tmControl.replay();
 
-		final MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		final MockControl conControl = MockControl.createControl(Connection.class);
-		final Connection con = (Connection) conControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		con.isReadOnly();
-		conControl.setReturnValue(true, 1);
-		if (!openOuterConnection || useTransactionAwareDataSource) {
-			con.close();
-			conControl.setVoidCallable(1);
-		}
-		conControl.replay();
-		dsControl.replay();
+		given(connection.isReadOnly()).willReturn(true);
 
 		final DataSource dsToUse = useTransactionAwareDataSource ?
-				new TransactionAwareDataSourceProxy(ds) : ds;
+				new TransactionAwareDataSourceProxy(dataSource) : dataSource;
 		if (dsToUse instanceof TransactionAwareDataSourceProxy) {
 			((TransactionAwareDataSourceProxy) dsToUse).setReobtainTransactionalConnections(true);
 		}
 
-		JtaTransactionManager ptm = new JtaTransactionManager(ut, tm);
+		JtaTransactionManager ptm = new JtaTransactionManager(userTransaction, transactionManager);
 		final TransactionTemplate tt = new TransactionTemplate(ptm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
@@ -581,50 +505,19 @@ public class DataSourceJtaTransactionTests extends TestCase {
 								assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
 								assertTrue("Is new transaction", status.isNewTransaction());
 
-								try {
-									dsControl.verify();
-									conControl.verify();
-									dsControl.reset();
-									conControl.reset();
-									ds.getConnection();
-									dsControl.setReturnValue(con, 1);
-									con.close();
-									conControl.setVoidCallable(1);
-									dsControl.replay();
-									conControl.replay();
+								Connection c = DataSourceUtils.getConnection(dsToUse);
+								assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
+								DataSourceUtils.releaseConnection(c, dsToUse);
 
-									Connection c = DataSourceUtils.getConnection(dsToUse);
-									assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
-									DataSourceUtils.releaseConnection(c, dsToUse);
-
-									c = DataSourceUtils.getConnection(dsToUse);
-									assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
-									DataSourceUtils.releaseConnection(c, dsToUse);
-								}
-								catch (SQLException ex) {
-								}
+								c = DataSourceUtils.getConnection(dsToUse);
+								assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
+								DataSourceUtils.releaseConnection(c, dsToUse);
 							}
 						});
 					}
 					finally {
 						if (openOuterConnection) {
 							try {
-								dsControl.verify();
-								dsControl.reset();
-								conControl.verify();
-								conControl.reset();
-
-								if (useTransactionAwareDataSource) {
-									ds.getConnection();
-									dsControl.setReturnValue(con, 1);
-								}
-								con.isReadOnly();
-								conControl.setReturnValue(true, 1);
-								con.close();
-								conControl.setVoidCallable(1);
-								dsControl.replay();
-								conControl.replay();
-
 								c.isReadOnly();
 								DataSourceUtils.releaseConnection(c, dsToUse);
 							}
@@ -643,26 +536,30 @@ public class DataSourceJtaTransactionTests extends TestCase {
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
-		dsControl.verify();
-		conControl.verify();
-		utControl.verify();
-		tmControl.verify();
+
+		verify(userTransaction).begin();
+		if(suspendException) {
+			verify(userTransaction).rollback();
+		}
+
+		if (suspendException) {
+			verify(connection, atLeastOnce()).close();
+		}
+		else {
+			verify(connection, never()).close();
+		}
 	}
 
+	@Test
 	public void testJtaTransactionWithConnectionHolderStillBound() throws Exception {
-		MockControl utControl = MockControl.createControl(UserTransaction.class);
-		UserTransaction ut = (UserTransaction) utControl.getMock();
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-
 		@SuppressWarnings("serial")
-		JtaTransactionManager ptm = new JtaTransactionManager(ut) {
+		JtaTransactionManager ptm = new JtaTransactionManager(userTransaction) {
+
 			@Override
 			protected void doRegisterAfterCompletionWithJtaTransaction(
-					JtaTransactionObject txObject, final List synchronizations) {
+					JtaTransactionObject txObject,
+					final List<TransactionSynchronization> synchronizations)
+					throws RollbackException, SystemException {
 				Thread async = new Thread() {
 					@Override
 					public void run() {
@@ -679,24 +576,11 @@ public class DataSourceJtaTransactionTests extends TestCase {
 			}
 		};
 		TransactionTemplate tt = new TransactionTemplate(ptm);
-		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
+		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dataSource));
 		assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
+		given(userTransaction.getStatus()).willReturn(Status.STATUS_ACTIVE);
 		for (int i = 0; i < 3; i++) {
-			utControl.reset();
-			ut.getStatus();
-			utControl.setReturnValue(Status.STATUS_ACTIVE, 1);
-			utControl.replay();
-
-			dsControl.reset();
-			conControl.reset();
-			ds.getConnection();
-			dsControl.setReturnValue(con, 1);
-			con.close();
-			conControl.setVoidCallable(1);
-			dsControl.replay();
-			conControl.replay();
-
 			final boolean releaseCon = (i != 1);
 
 			tt.execute(new TransactionCallbackWithoutResult() {
@@ -705,76 +589,44 @@ public class DataSourceJtaTransactionTests extends TestCase {
 					assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive());
 					assertTrue("Is existing transaction", !status.isNewTransaction());
 
-					Connection c = DataSourceUtils.getConnection(ds);
-					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
-					DataSourceUtils.releaseConnection(c, ds);
+					Connection c = DataSourceUtils.getConnection(dataSource);
+					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dataSource));
+					DataSourceUtils.releaseConnection(c, dataSource);
 
-					c = DataSourceUtils.getConnection(ds);
-					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds));
+					c = DataSourceUtils.getConnection(dataSource);
+					assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dataSource));
 					if (releaseCon) {
-						DataSourceUtils.releaseConnection(c, ds);
+						DataSourceUtils.releaseConnection(c, dataSource);
 					}
 				}
 			});
 
 			if (!releaseCon) {
-				assertTrue("Still has connection holder", TransactionSynchronizationManager.hasResource(ds));
+				assertTrue("Still has connection holder", TransactionSynchronizationManager.hasResource(dataSource));
 			}
 			else {
-				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
+				assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dataSource));
 			}
 			assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive());
-
-			conControl.verify();
-			dsControl.verify();
-			utControl.verify();
 		}
+		verify(connection, times(3)).close();
 	}
 
+	@Test
 	public void testJtaTransactionWithIsolationLevelDataSourceAdapter() throws Exception {
-		MockControl utControl = MockControl.createControl(UserTransaction.class);
-		UserTransaction ut = (UserTransaction) utControl.getMock();
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1);
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_ACTIVE, 2);
-		ut.begin();
-		utControl.setVoidCallable(1);
-		ut.commit();
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1);
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_ACTIVE, 2);
-		ut.begin();
-		utControl.setVoidCallable(1);
-		ut.commit();
-		utControl.setVoidCallable(1);
-		utControl.replay();
-
-		MockControl ds1Control = MockControl.createControl(DataSource.class);
-		final DataSource ds1 = (DataSource) ds1Control.getMock();
-		MockControl con1Control = MockControl.createControl(Connection.class);
-		final Connection con1 = (Connection) con1Control.getMock();
-		ds1.getConnection();
-		ds1Control.setReturnValue(con1, 1);
-		con1.close();
-		con1Control.setVoidCallable(1);
-		ds1.getConnection();
-		ds1Control.setReturnValue(con1, 1);
-		con1.setReadOnly(true);
-		con1Control.setVoidCallable(1);
-		con1.setTransactionIsolation(Connection.TRANSACTION_REPEATABLE_READ);
-		con1Control.setVoidCallable(1);
-		con1.close();
-		con1Control.setVoidCallable(1);
-		con1Control.replay();
-		ds1Control.replay();
+		given(userTransaction.getStatus()).willReturn(
+				Status.STATUS_NO_TRANSACTION,
+				Status.STATUS_ACTIVE,
+				Status.STATUS_ACTIVE,
+				Status.STATUS_NO_TRANSACTION,
+				Status.STATUS_ACTIVE,
+				Status.STATUS_ACTIVE);
 
 		final IsolationLevelDataSourceAdapter dsToUse = new IsolationLevelDataSourceAdapter();
-		dsToUse.setTargetDataSource(ds1);
+		dsToUse.setTargetDataSource(dataSource);
 		dsToUse.afterPropertiesSet();
 
-		JtaTransactionManager ptm = new JtaTransactionManager(ut);
+		JtaTransactionManager ptm = new JtaTransactionManager(userTransaction);
 		ptm.setAllowCustomIsolationLevels(true);
 
 		TransactionTemplate tt = new TransactionTemplate(ptm);
@@ -783,7 +635,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				Connection c = DataSourceUtils.getConnection(dsToUse);
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
-				assertSame(con1, c);
+				assertSame(connection, c);
 				DataSourceUtils.releaseConnection(c, dsToUse);
 			}
 		});
@@ -795,84 +647,57 @@ public class DataSourceJtaTransactionTests extends TestCase {
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				Connection c = DataSourceUtils.getConnection(dsToUse);
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
-				assertSame(con1, c);
+				assertSame(connection, c);
 				DataSourceUtils.releaseConnection(c, dsToUse);
 			}
 		});
 
-		ds1Control.verify();
-		con1Control.verify();
-		utControl.verify();
+		verify(userTransaction, times(2)).begin();
+		verify(userTransaction, times(2)).commit();
+		verify(connection).setReadOnly(true);
+		verify(connection).setTransactionIsolation(Connection.TRANSACTION_REPEATABLE_READ);
+		verify(connection, times(2)).close();
 	}
 
+	@Test
 	public void testJtaTransactionWithIsolationLevelDataSourceRouter() throws Exception {
 		doTestJtaTransactionWithIsolationLevelDataSourceRouter(false);
 	}
 
+	@Test
 	public void testJtaTransactionWithIsolationLevelDataSourceRouterWithDataSourceLookup() throws Exception {
 		doTestJtaTransactionWithIsolationLevelDataSourceRouter(true);
 	}
 
 	private void doTestJtaTransactionWithIsolationLevelDataSourceRouter(boolean dataSourceLookup) throws Exception {
-		MockControl utControl = MockControl.createControl(UserTransaction.class);
-		UserTransaction ut = (UserTransaction) utControl.getMock();
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1);
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_ACTIVE, 2);
-		ut.begin();
-		utControl.setVoidCallable(1);
-		ut.commit();
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1);
-		ut.getStatus();
-		utControl.setReturnValue(Status.STATUS_ACTIVE, 2);
-		ut.begin();
-		utControl.setVoidCallable(1);
-		ut.commit();
-		utControl.setVoidCallable(1);
-		utControl.replay();
+given(		userTransaction.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE, Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE);
 
-		MockControl ds1Control = MockControl.createControl(DataSource.class);
-		final DataSource ds1 = (DataSource) ds1Control.getMock();
-		MockControl con1Control = MockControl.createControl(Connection.class);
-		final Connection con1 = (Connection) con1Control.getMock();
-		ds1.getConnection();
-		ds1Control.setReturnValue(con1, 1);
-		con1.close();
-		con1Control.setVoidCallable(1);
-		con1Control.replay();
-		ds1Control.replay();
+		final DataSource dataSource1 = mock(DataSource.class);
+		final Connection connection1 = mock(Connection.class);
+		given(dataSource1.getConnection()).willReturn(connection1);
 
-		MockControl ds2Control = MockControl.createControl(DataSource.class);
-		final DataSource ds2 = (DataSource) ds2Control.getMock();
-		MockControl con2Control = MockControl.createControl(Connection.class);
-		final Connection con2 = (Connection) con2Control.getMock();
-		ds2.getConnection();
-		ds2Control.setReturnValue(con2, 1);
-		con2.close();
-		con2Control.setVoidCallable(1);
-		con2Control.replay();
-		ds2Control.replay();
+		final DataSource dataSource2 = mock(DataSource.class);
+		final Connection connection2 = mock(Connection.class);
+		given(dataSource2.getConnection()).willReturn(connection2);
 
 		final IsolationLevelDataSourceRouter dsToUse = new IsolationLevelDataSourceRouter();
-		Map targetDataSources = new HashMap();
+		Map<Object, Object> targetDataSources = new HashMap<Object, Object>();
 		if (dataSourceLookup) {
 			targetDataSources.put("ISOLATION_REPEATABLE_READ", "ds2");
 			dsToUse.setDefaultTargetDataSource("ds1");
 			StaticListableBeanFactory beanFactory = new StaticListableBeanFactory();
-			beanFactory.addBean("ds1", ds1);
-			beanFactory.addBean("ds2", ds2);
+			beanFactory.addBean("ds1", dataSource1);
+			beanFactory.addBean("ds2", dataSource2);
 			dsToUse.setDataSourceLookup(new BeanFactoryDataSourceLookup(beanFactory));
 		}
 		else {
-			targetDataSources.put("ISOLATION_REPEATABLE_READ", ds2);
-			dsToUse.setDefaultTargetDataSource(ds1);
+			targetDataSources.put("ISOLATION_REPEATABLE_READ", dataSource2);
+			dsToUse.setDefaultTargetDataSource(dataSource1);
 		}
 		dsToUse.setTargetDataSources(targetDataSources);
 		dsToUse.afterPropertiesSet();
 
-		JtaTransactionManager ptm = new JtaTransactionManager(ut);
+		JtaTransactionManager ptm = new JtaTransactionManager(userTransaction);
 		ptm.setAllowCustomIsolationLevels(true);
 
 		TransactionTemplate tt = new TransactionTemplate(ptm);
@@ -881,7 +706,7 @@ public class DataSourceJtaTransactionTests extends TestCase {
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				Connection c = DataSourceUtils.getConnection(dsToUse);
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
-				assertSame(con1, c);
+				assertSame(connection1, c);
 				DataSourceUtils.releaseConnection(c, dsToUse);
 			}
 		});
@@ -892,26 +717,14 @@ public class DataSourceJtaTransactionTests extends TestCase {
 			protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException {
 				Connection c = DataSourceUtils.getConnection(dsToUse);
 				assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse));
-				assertSame(con2, c);
+				assertSame(connection2, c);
 				DataSourceUtils.releaseConnection(c, dsToUse);
 			}
 		});
 
-		ds1Control.verify();
-		con1Control.verify();
-		ds2Control.verify();
-		con2Control.verify();
-		utControl.verify();
+		verify(userTransaction, times(2)).begin();
+		verify(userTransaction, times(2)).commit();
+		verify(connection1).close();
+		verify(connection2).close();
 	}
-
-	@Override
-	protected void tearDown() {
-		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
-		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
-		assertNull(TransactionSynchronizationManager.getCurrentTransactionName());
-		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
-		assertNull(TransactionSynchronizationManager.getCurrentTransactionIsolationLevel());
-		assertFalse(TransactionSynchronizationManager.isActualTransactionActive());
-	}
-
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
index 28eb6b3c04..02f8f5332d 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
@@ -16,16 +16,26 @@
 
 package org.springframework.jdbc.datasource;
 
+import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Savepoint;
+
 import javax.sql.DataSource;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InOrder;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.jdbc.support.nativejdbc.SimpleNativeJdbcExtractor;
@@ -47,28 +57,54 @@ import org.springframework.transaction.support.TransactionTemplate;
  * @author Juergen Hoeller
  * @since 04.07.2003
  */
-public class DataSourceTransactionManagerTests extends TestCase {
+public class DataSourceTransactionManagerTests  {
 
+	private Connection con;
+	private DataSource ds;
+	private DataSourceTransactionManager tm;
+
+	@Before
+	public void setUp() throws Exception {
+		con = mock(Connection.class);
+		ds	= mock(DataSource.class);
+		tm = new DataSourceTransactionManager(ds);
+		given(ds.getConnection()).willReturn(con);
+	}
+
+	@After
+	public void verifyTransactionSynchronizationManagerState() {
+		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
+		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
+		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
+		assertFalse(TransactionSynchronizationManager.isActualTransactionActive());
+	}
+
+	@Test
 	public void testTransactionCommitWithAutoCommitTrue() throws Exception {
 		doTestTransactionCommitRestoringAutoCommit(true, false, false);
 	}
 
+	@Test
 	public void testTransactionCommitWithAutoCommitFalse() throws Exception {
 		doTestTransactionCommitRestoringAutoCommit(false, false, false);
 	}
 
+	@Test
 	public void testTransactionCommitWithAutoCommitTrueAndLazyConnection() throws Exception {
 		doTestTransactionCommitRestoringAutoCommit(true, true, false);
 	}
 
+	@Test
 	public void testTransactionCommitWithAutoCommitFalseAndLazyConnection() throws Exception {
 		doTestTransactionCommitRestoringAutoCommit(false, true, false);
 	}
 
+	@Test
 	public void testTransactionCommitWithAutoCommitTrueAndLazyConnectionAndStatementCreated() throws Exception {
 		doTestTransactionCommitRestoringAutoCommit(true, true, true);
 	}
 
+	@Test
 	public void testTransactionCommitWithAutoCommitFalseAndLazyConnectionAndStatementCreated() throws Exception {
 		doTestTransactionCommitRestoringAutoCommit(false, true, true);
 	}
@@ -76,59 +112,17 @@ public class DataSourceTransactionManagerTests extends TestCase {
 	private void doTestTransactionCommitRestoringAutoCommit(
 			boolean autoCommit, boolean lazyConnection, final boolean createStatement)
 			throws Exception {
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		final Connection con = (Connection) conControl.getMock();
-
 		if (lazyConnection) {
-			ds.getConnection();
-			dsControl.setReturnValue(con, 1);
-			if (createStatement) {
-				con.getMetaData();
-				conControl.setReturnValue(null, 1);
-			}
-			con.getAutoCommit();
-			conControl.setReturnValue(autoCommit, 1);
-			con.getTransactionIsolation();
-			conControl.setReturnValue(Connection.TRANSACTION_READ_COMMITTED, 1);
-			con.close();
-			conControl.setVoidCallable(1);
+			given(con.getAutoCommit()).willReturn(autoCommit);
+			given(con.getTransactionIsolation()).willReturn(Connection.TRANSACTION_READ_COMMITTED);
 		}
 
 		if (!lazyConnection || createStatement) {
-			ds.getConnection();
-			dsControl.setReturnValue(con, 1);
-			con.getAutoCommit();
-			conControl.setReturnValue(autoCommit, 1);
-			if (autoCommit) {
-				// Must disable autocommit
-				con.setAutoCommit(false);
-				conControl.setVoidCallable(1);
-			}
-			if (createStatement) {
-				con.createStatement();
-				conControl.setReturnValue(null, 1);
-			}
-			con.commit();
-			conControl.setVoidCallable(1);
-			con.isReadOnly();
-			conControl.setReturnValue(false, 1);
-			if (autoCommit) {
-				// must restore autoCommit
-				con.setAutoCommit(true);
-				conControl.setVoidCallable(1);
-			}
-			con.close();
-			conControl.setVoidCallable(1);
+			given(con.getAutoCommit()).willReturn(autoCommit);
 		}
 
-		conControl.replay();
-		dsControl.replay();
-
 		final DataSource dsToUse = (lazyConnection ? new LazyConnectionDataSourceProxy(ds) : ds);
-		PlatformTransactionManager tm = new DataSourceTransactionManager(dsToUse);
+		tm = new DataSourceTransactionManager(dsToUse);
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
@@ -157,85 +151,64 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
-		conControl.verify();
-		dsControl.verify();
+		if(autoCommit && (!lazyConnection || createStatement)) {
+			InOrder ordered = inOrder(con);
+			ordered.verify(con).setAutoCommit(false);
+			ordered.verify(con).commit();
+			ordered.verify(con).setAutoCommit(true);
+		}
+		if (createStatement) {
+			verify(con, times(2)).close();
+		}
+		else {
+			verify(con).close();
+		}
 	}
 
+	@Test
 	public void testTransactionRollbackWithAutoCommitTrue() throws Exception  {
 		doTestTransactionRollbackRestoringAutoCommit(true, false, false);
 	}
 
+	@Test
 	public void testTransactionRollbackWithAutoCommitFalse() throws Exception  {
 		doTestTransactionRollbackRestoringAutoCommit(false, false, false);
 	}
 
+	@Test
 	public void testTransactionRollbackWithAutoCommitTrueAndLazyConnection() throws Exception  {
 		doTestTransactionRollbackRestoringAutoCommit(true, true, false);
 	}
 
+	@Test
 	public void testTransactionRollbackWithAutoCommitFalseAndLazyConnection() throws Exception  {
 		doTestTransactionRollbackRestoringAutoCommit(false, true, false);
 	}
 
+	@Test
 	public void testTransactionRollbackWithAutoCommitTrueAndLazyConnectionAndCreateStatement() throws Exception  {
 		doTestTransactionRollbackRestoringAutoCommit(true, true, true);
 	}
 
+	@Test
 	public void testTransactionRollbackWithAutoCommitFalseAndLazyConnectionAndCreateStatement() throws Exception  {
 		doTestTransactionRollbackRestoringAutoCommit(false, true, true);
 	}
 
 	private void doTestTransactionRollbackRestoringAutoCommit(
 			boolean autoCommit, boolean lazyConnection, final boolean createStatement) throws Exception {
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-
 		if (lazyConnection) {
-			ds.getConnection();
-			dsControl.setReturnValue(con, 1);
-			con.getAutoCommit();
-			conControl.setReturnValue(autoCommit, 1);
-			con.getTransactionIsolation();
-			conControl.setReturnValue(Connection.TRANSACTION_READ_COMMITTED, 1);
-			con.close();
-			conControl.setVoidCallable(1);
+			given(con.getAutoCommit()).willReturn(autoCommit);
+			given(con.getTransactionIsolation()).willReturn(
+					Connection.TRANSACTION_READ_COMMITTED);
 		}
 
 		if (!lazyConnection || createStatement) {
-			ds.getConnection();
-			dsControl.setReturnValue(con, 1);
-			con.getAutoCommit();
-			conControl.setReturnValue(autoCommit, 1);
-			if (autoCommit) {
-				// Must disable autocommit
-				con.setAutoCommit(false);
-				conControl.setVoidCallable(1);
-			}
-			if (createStatement) {
-				con.createStatement();
-				conControl.setReturnValue(null, 1);
-			}
-			con.rollback();
-			conControl.setVoidCallable(1);
-			con.isReadOnly();
-			conControl.setReturnValue(false, 1);
-			if (autoCommit) {
-				// Must restore autocommit
-				con.setAutoCommit(true);
-				conControl.setVoidCallable(1);
-			}
-			con.close();
-			conControl.setVoidCallable(1);
+			given(con.getAutoCommit()).willReturn(autoCommit);
 		}
 
-		conControl.replay();
-		dsControl.replay();
-
 		final DataSource dsToUse = (lazyConnection ? new LazyConnectionDataSourceProxy(ds) : ds);
-		PlatformTransactionManager tm = new DataSourceTransactionManager(dsToUse);
+		 tm = new DataSourceTransactionManager(dsToUse);
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse));
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
@@ -269,19 +242,23 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
-		conControl.verify();
-		dsControl.verify();
+
+		if(autoCommit && (!lazyConnection || createStatement)) {
+			InOrder ordered = inOrder(con);
+			ordered.verify(con).setAutoCommit(false);
+			ordered.verify(con).rollback();
+			ordered.verify(con).setAutoCommit(true);
+		}
+		if (createStatement) {
+			verify(con, times(2)).close();
+		}
+		else {
+			verify(con).close();
+		}
 	}
 
+	@Test
 	public void testTransactionRollbackOnly() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		conControl.replay();
-		dsControl.replay();
-
-		DataSourceTransactionManager tm = new DataSourceTransactionManager(ds);
 		tm.setTransactionSynchronization(DataSourceTransactionManager.SYNCHRONIZATION_NEVER);
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -313,38 +290,20 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		}
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
-		dsControl.verify();
 	}
 
+	@Test
 	public void testParticipatingTransactionWithRollbackOnly() throws Exception {
 		doTestParticipatingTransactionWithRollbackOnly(false);
 	}
 
+	@Test
 	public void testParticipatingTransactionWithRollbackOnlyAndFailEarly() throws Exception {
 		doTestParticipatingTransactionWithRollbackOnly(true);
 	}
 
 	private void doTestParticipatingTransactionWithRollbackOnly(boolean failEarly) throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		con.rollback();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		conControl.replay();
-		dsControl.replay();
-
-		DataSourceTransactionManager tm = new DataSourceTransactionManager(ds);
+		given(con.isReadOnly()).willReturn(false);
 		if (failEarly) {
 			tm.setFailEarlyOnGlobalRollbackOnly(true);
 		}
@@ -403,30 +362,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue(synch.beforeCompletionCalled);
 		assertFalse(synch.afterCommitCalled);
 		assertTrue(synch.afterCompletionCalled);
-		conControl.verify();
-		dsControl.verify();
+		verify(con).rollback();
+		verify(con).close();
 	}
 
+	@Test
 	public void testParticipatingTransactionWithIncompatibleIsolationLevel() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		con.rollback();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		conControl.replay();
-		dsControl.replay();
-
-		DataSourceTransactionManager tm = new DataSourceTransactionManager(ds);
 		tm.setValidateExistingTransaction(true);
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -458,32 +399,13 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		}
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
-		dsControl.verify();
+		verify(con).rollback();
+		verify(con).close();
 	}
 
+	@Test
 	public void testParticipatingTransactionWithIncompatibleReadOnly() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		con.rollback();
-		conControl.setVoidCallable(1);
-		con.setReadOnly(true);
-		conControl.setThrowable(new SQLException("read-only not supported"), 1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		conControl.replay();
-		dsControl.replay();
-
-		DataSourceTransactionManager tm = new DataSourceTransactionManager(ds);
+		willThrow(new SQLException("read-only not supported")).given(con).setReadOnly(true);
 		tm.setValidateExistingTransaction(true);
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -516,30 +438,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		}
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
-		dsControl.verify();
+		verify(con).rollback();
+		verify(con).close();
 	}
 
+	@Test
 	public void testParticipatingTransactionWithTransactionStartedFromSynch() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 2);
-		con.commit();
-		conControl.setVoidCallable(2);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 2);
-		con.close();
-		conControl.setVoidCallable(2);
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 2);
-		conControl.replay();
-		dsControl.replay();
-
-		DataSourceTransactionManager tm = new DataSourceTransactionManager(ds);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 		assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive());
 
@@ -571,30 +475,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue(synch.beforeCompletionCalled);
 		assertTrue(synch.afterCommitCalled);
 		assertTrue(synch.afterCompletionCalled);
-		conControl.verify();
-		dsControl.verify();
+		verify(con, times(2)).commit();
+		verify(con, times(2)).close();
 	}
 
+	@Test
 	public void testParticipatingTransactionWithRollbackOnlyAndInnerSynch() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		con.rollback();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		conControl.replay();
-		dsControl.replay();
-
-		DataSourceTransactionManager tm = new DataSourceTransactionManager(ds);
 		tm.setTransactionSynchronization(DataSourceTransactionManager.SYNCHRONIZATION_NEVER);
 		DataSourceTransactionManager tm2 = new DataSourceTransactionManager(ds);
 		// tm has no synch enabled (used at outer level), tm2 has synch enabled (inner level)
@@ -643,32 +529,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		assertTrue(synch.beforeCompletionCalled);
 		assertFalse(synch.afterCommitCalled);
 		assertTrue(synch.afterCompletionCalled);
-		conControl.verify();
-		dsControl.verify();
+		verify(con).rollback();
+		verify(con).close();
 	}
 
+	@Test
 	public void testPropagationRequiresNewWithExistingTransaction() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 2);
-		con.rollback();
-		conControl.setVoidCallable(1);
-		con.commit();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 2);
-		con.close();
-		conControl.setVoidCallable(2);
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 2);
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -699,48 +565,17 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
-		dsControl.verify();
+		verify(con).rollback();
+		verify(con).commit();
+		verify(con, times(2)).close();
 	}
 
+	@Test
 	public void testPropagationRequiresNewWithExistingTransactionAndUnrelatedDataSource() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		con.commit();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
+		Connection con2 = mock(Connection.class);
+		final DataSource ds2 = mock(DataSource.class);
+		given(ds2.getConnection()).willReturn(con2);
 
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		conControl.replay();
-		dsControl.replay();
-
-		MockControl con2Control = MockControl.createControl(Connection.class);
-		Connection con2 = (Connection) con2Control.getMock();
-		con2.getAutoCommit();
-		con2Control.setReturnValue(false, 1);
-		con2.rollback();
-		con2Control.setVoidCallable(1);
-		con2.isReadOnly();
-		con2Control.setReturnValue(false, 1);
-		con2.close();
-		con2Control.setVoidCallable(1);
-
-		MockControl ds2Control = MockControl.createControl(DataSource.class);
-		final DataSource ds2 = (DataSource) ds2Control.getMock();
-		ds2.getConnection();
-		ds2Control.setReturnValue(con2, 1);
-		con2Control.replay();
-		ds2Control.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 
@@ -778,39 +613,19 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds2));
-		conControl.verify();
-		dsControl.verify();
-		con2Control.verify();
-		ds2Control.verify();
+		verify(con).commit();
+		verify(con).close();
+		verify(con2).rollback();
+		verify(con2).close();
 	}
 
+	@Test
 	public void testPropagationRequiresNewWithExistingTransactionAndUnrelatedFailingDataSource() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		con.rollback();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		conControl.replay();
-		dsControl.replay();
-
-		MockControl ds2Control = MockControl.createControl(DataSource.class);
-		final DataSource ds2 = (DataSource) ds2Control.getMock();
+		final DataSource ds2 = mock(DataSource.class);
 		SQLException failure = new SQLException();
-		ds2.getConnection();
-		ds2Control.setThrowable(failure);
-		ds2Control.replay();
+		given(ds2.getConnection()).willThrow(failure);
+
 
-		DataSourceTransactionManager tm = new DataSourceTransactionManager(ds);
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 
@@ -847,31 +662,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds2));
-		conControl.verify();
-		dsControl.verify();
-		ds2Control.verify();
+		verify(con).rollback();
+		verify(con).close();
 	}
 
+	@Test
 	public void testPropagationNotSupportedWithExistingTransaction() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		con.commit();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -902,30 +698,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
-		dsControl.verify();
+		verify(con).commit();
+		verify(con).close();
 	}
 
+	@Test
 	public void testPropagationNeverWithExistingTransaction() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		con.rollback();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -952,31 +730,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		}
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
-		dsControl.verify();
+		verify(con).rollback();
+		verify(con).close();
 	}
 
+	@Test
 	public void testPropagationSupportsAndRequiresNew() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		final Connection con = (Connection) conControl.getMock();
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		con.commit();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-
-		dsControl.replay();
-		conControl.replay();
-
-		final PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1002,39 +761,17 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		dsControl.verify();
-		conControl.verify();
+		verify(con).commit();
+		verify(con).close();
 	}
 
+	@Test
 	public void testPropagationSupportsAndRequiresNewWithEarlyAccess() throws Exception {
-		MockControl con1Control = MockControl.createControl(Connection.class);
-		final Connection con1 = (Connection) con1Control.getMock();
-		con1.close();
-		con1Control.setVoidCallable(1);
+		final Connection con1 = mock(Connection.class);
+		final Connection con2 = mock(Connection.class);
+		given(ds.getConnection()).willReturn(con1, con2);
 
-		MockControl con2Control = MockControl.createControl(Connection.class);
-		final Connection con2 = (Connection) con2Control.getMock();
-		con2.getAutoCommit();
-		con2Control.setReturnValue(false, 1);
-		con2.commit();
-		con2Control.setVoidCallable(1);
-		con2.isReadOnly();
-		con2Control.setReturnValue(false, 1);
-		con2.close();
-		con2Control.setVoidCallable(1);
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con1, 1);
-		ds.getConnection();
-		dsControl.setReturnValue(con2, 1);
-
-		dsControl.replay();
-		con1Control.replay();
-		con2Control.replay();
-
-		final PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
+		final
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1063,44 +800,16 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		dsControl.verify();
-		con1Control.verify();
-		con2Control.verify();
+		verify(con1).close();
+		verify(con2).commit();
+		verify(con2).close();
 	}
 
+	@Test
 	public void testTransactionWithIsolationAndReadOnly() throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		final Connection con = (Connection) conControl.getMock();
+		given(con.getTransactionIsolation()).willReturn(Connection.TRANSACTION_READ_COMMITTED);
+		given(con.getAutoCommit()).willReturn(true);
 
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		con.getTransactionIsolation();
-		conControl.setReturnValue(Connection.TRANSACTION_READ_COMMITTED, 1);
-		con.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
-		conControl.setVoidCallable(1);
-		con.setReadOnly(true);
-		conControl.setVoidCallable(1);
-		con.getAutoCommit();
-		conControl.setReturnValue(true, 1);
-		con.setAutoCommit(false);
-		conControl.setVoidCallable(1);
-		con.commit();
-		conControl.setVoidCallable(1);
-		con.setAutoCommit(true);
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
-		conControl.setVoidCallable(1);
-		con.close();
-		conControl.setVoidCallable(1);
-
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
 		tt.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE);
@@ -1116,55 +825,30 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
-		dsControl.verify();
+		InOrder ordered = inOrder(con);
+		ordered.verify(con).setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
+		ordered.verify(con).setAutoCommit(false);
+		ordered.verify(con).commit();
+		ordered.verify(con).setAutoCommit(true);
+		ordered.verify(con).setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
+		verify(con).close();
 	}
 
+	@Test
 	public void testTransactionWithLongTimeout() throws Exception {
 		doTestTransactionWithTimeout(10);
 	}
 
+	@Test
 	public void testTransactionWithShortTimeout() throws Exception {
 		doTestTransactionWithTimeout(1);
 	}
 
 	private void doTestTransactionWithTimeout(int timeout) throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		final Connection con = (Connection) conControl.getMock();
-		MockControl psControl = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement ps = (PreparedStatement) psControl.getMock();
+		PreparedStatement ps = mock(PreparedStatement.class);
+		given(con.getAutoCommit()).willReturn(true);
+		given(con.prepareStatement("some SQL statement")).willReturn(ps);
 
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		con.getAutoCommit();
-		conControl.setReturnValue(true, 1);
-		con.setAutoCommit(false);
-		conControl.setVoidCallable(1);
-		con.prepareStatement("some SQL statement");
-		conControl.setReturnValue(ps, 1);
-		if (timeout > 1) {
-			ps.setQueryTimeout(timeout - 1);
-			psControl.setVoidCallable(1);
-			con.commit();
-		}
-		else {
-			con.rollback();
-		}
-		conControl.setVoidCallable(1);
-		con.setAutoCommit(true);
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-
-		psControl.replay();
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setTimeout(timeout);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1202,38 +886,24 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		}
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
-		dsControl.verify();
-		psControl.verify();
+		if (timeout > 1) {
+			verify(ps).setQueryTimeout(timeout - 1);
+			verify(con).commit();
+		}
+		else {
+			verify(con).rollback();
+		}
+		InOrder ordered = inOrder(con);
+		ordered.verify(con).setAutoCommit(false);
+		ordered.verify(con).setAutoCommit(true);
+		verify(con).close();
+
 	}
 
+	@Test
 	public void testTransactionAwareDataSourceProxy() throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		final Connection con = (Connection) conControl.getMock();
+		given(con.getAutoCommit()).willReturn(true);
 
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		con.getMetaData();
-		conControl.setReturnValue(null, 1);
-		con.getAutoCommit();
-		conControl.setReturnValue(true, 1);
-		con.setAutoCommit(false);
-		conControl.setVoidCallable(1);
-		con.commit();
-		conControl.setVoidCallable(1);
-		con.setAutoCommit(true);
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
 		tt.execute(new TransactionCallbackWithoutResult() {
@@ -1255,37 +925,17 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
-		dsControl.verify();
+		InOrder ordered = inOrder(con);
+		ordered.verify(con).setAutoCommit(false);
+		ordered.verify(con).commit();
+		ordered.verify(con).setAutoCommit(true);
+		verify(con).close();
 	}
 
+	@Test
 	public void testTransactionAwareDataSourceProxyWithSuspension() throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		final Connection con = (Connection) conControl.getMock();
+		given(con.getAutoCommit()).willReturn(true);
 
-		ds.getConnection();
-		dsControl.setReturnValue(con, 2);
-		con.getMetaData();
-		conControl.setReturnValue(null, 2);
-		con.getAutoCommit();
-		conControl.setReturnValue(true, 2);
-		con.setAutoCommit(false);
-		conControl.setVoidCallable(2);
-		con.commit();
-		conControl.setVoidCallable(2);
-		con.setAutoCommit(true);
-		conControl.setVoidCallable(2);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 2);
-		con.close();
-		conControl.setVoidCallable(2);
-
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRES_NEW);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1335,37 +985,17 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
-		dsControl.verify();
+		InOrder ordered = inOrder(con);
+		ordered.verify(con).setAutoCommit(false);
+		ordered.verify(con).commit();
+		ordered.verify(con).setAutoCommit(true);
+		verify(con, times(2)).close();
 	}
 
+	@Test
 	public void testTransactionAwareDataSourceProxyWithSuspensionAndReobtaining() throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		final Connection con = (Connection) conControl.getMock();
+		given(con.getAutoCommit()).willReturn(true);
 
-		ds.getConnection();
-		dsControl.setReturnValue(con, 2);
-		con.getMetaData();
-		conControl.setReturnValue(null, 2);
-		con.getAutoCommit();
-		conControl.setReturnValue(true, 2);
-		con.setAutoCommit(false);
-		conControl.setVoidCallable(2);
-		con.commit();
-		conControl.setVoidCallable(2);
-		con.setAutoCommit(true);
-		conControl.setVoidCallable(2);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 2);
-		con.close();
-		conControl.setVoidCallable(2);
-
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRES_NEW);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1416,28 +1046,20 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
-		dsControl.verify();
+		InOrder ordered = inOrder(con);
+		ordered.verify(con).setAutoCommit(false);
+		ordered.verify(con).commit();
+		ordered.verify(con).setAutoCommit(true);
+		verify(con, times(2)).close();
 	}
 
 	/**
 	 * Test behavior if the first operation on a connection (getAutoCommit) throws SQLException.
 	 */
+	@Test
 	public void testTransactionWithExceptionOnBegin() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		final Connection con = (Connection) conControl.getMock();
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		con.getAutoCommit();
-		conControl.setThrowable(new SQLException("Cannot begin"));
-		con.close();
-		conControl.setVoidCallable();
-		conControl.replay();
-		dsControl.replay();
+		willThrow(new SQLException("Cannot begin")).given(con).getAutoCommit();
 
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
@@ -1453,29 +1075,13 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		}
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
+		verify(con).close();
 	}
 
+	@Test
 	public void testTransactionWithExceptionOnCommit() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		final Connection con = (Connection) conControl.getMock();
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		con.getAutoCommit();
-		// No need to restore it
-		conControl.setReturnValue(false, 1);
-		con.commit();
-		conControl.setThrowable(new SQLException("Cannot commit"), 1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-		conControl.replay();
-		dsControl.replay();
+		willThrow(new SQLException("Cannot commit")).given(con).commit();
 
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
@@ -1491,31 +1097,13 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		}
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
+		verify(con).close();
 	}
 
+	@Test
 	public void testTransactionWithExceptionOnCommitAndRollbackOnCommitFailure() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		final Connection con = (Connection) conControl.getMock();
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		con.getAutoCommit();
-		// No need to change or restore
-		conControl.setReturnValue(false);
-		con.commit();
-		conControl.setThrowable(new SQLException("Cannot commit"), 1);
-		con.rollback();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-		conControl.replay();
-		dsControl.replay();
+		willThrow(new SQLException("Cannot commit")).given(con).commit();
 
-		DataSourceTransactionManager tm = new DataSourceTransactionManager(ds);
 		tm.setRollbackOnCommitFailure(true);
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
@@ -1532,34 +1120,15 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		}
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
+		verify(con).rollback();
+		verify(con).close();
 	}
 
+	@Test
 	public void testTransactionWithExceptionOnRollback() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		final Connection con = (Connection) conControl.getMock();
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		con.getAutoCommit();
-		conControl.setReturnValue(true, 1);
-		// Must restore
-		con.setAutoCommit(false);
-		conControl.setVoidCallable(1);
+		given(con.getAutoCommit()).willReturn(true);
+		willThrow(new SQLException("Cannot rollback")).given(con).rollback();
 
-		con.rollback();
-		conControl.setThrowable(new SQLException("Cannot rollback"), 1);
-		con.setAutoCommit(true);
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		try {
 			tt.execute(new TransactionCallbackWithoutResult() {
@@ -1575,15 +1144,15 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		}
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
+		InOrder ordered = inOrder(con);
+		ordered.verify(con).setAutoCommit(false);
+		ordered.verify(con).rollback();
+		ordered.verify(con).setAutoCommit(true);
+		verify(con).close();
 	}
 
+	@Test
 	public void testTransactionWithPropagationSupports() throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1599,15 +1168,9 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		dsControl.verify();
 	}
 
-	public void testTransactionWithPropagationNotSupported() throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
+	@Test public void testTransactionWithPropagationNotSupported() throws Exception {
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1621,15 +1184,10 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		dsControl.verify();
 	}
 
+	@Test
 	public void testTransactionWithPropagationNever() throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NEVER);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1643,54 +1201,28 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		dsControl.verify();
 	}
 
+	@Test
 	public void testExistingTransactionWithPropagationNested() throws Exception {
 		doTestExistingTransactionWithPropagationNested(1);
 	}
 
+	@Test
 	public void testExistingTransactionWithPropagationNestedTwice() throws Exception {
 		doTestExistingTransactionWithPropagationNested(2);
 	}
 
 	private void doTestExistingTransactionWithPropagationNested(final int count) throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		MockControl mdControl = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData md = (DatabaseMetaData) mdControl.getMock();
-		MockControl spControl = MockControl.createControl(Savepoint.class);
-		Savepoint sp = (Savepoint) spControl.getMock();
+		DatabaseMetaData md = mock(DatabaseMetaData.class);
+		Savepoint sp = mock(Savepoint.class);
 
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		md.supportsSavepoints();
-		mdControl.setReturnValue(true, 1);
-		con.getMetaData();
-		conControl.setReturnValue(md, 1);
+		given(md.supportsSavepoints()).willReturn(true);
+		given(con.getMetaData()).willReturn(md);
 		for (int i = 1; i <= count; i++) {
-			con.setSavepoint(ConnectionHolder.SAVEPOINT_NAME_PREFIX + i);
-			conControl.setReturnValue(sp, 1);
-			con.releaseSavepoint(sp);
-			conControl.setVoidCallable(1);
+			given(con.setSavepoint(ConnectionHolder.SAVEPOINT_NAME_PREFIX + i)).willReturn(sp);
 		}
-		con.commit();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
 
-		spControl.replay();
-		mdControl.replay();
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1718,47 +1250,20 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		spControl.verify();
-		mdControl.verify();
-		conControl.verify();
-		dsControl.verify();
+		verify(con, times(count)).releaseSavepoint(sp);
+		verify(con).commit();
+		verify(con).close();
 	}
 
+	@Test
 	public void testExistingTransactionWithPropagationNestedAndRollback() throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		MockControl mdControl = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData md = (DatabaseMetaData) mdControl.getMock();
-		MockControl spControl = MockControl.createControl(Savepoint.class);
-		Savepoint sp = (Savepoint) spControl.getMock();
+		DatabaseMetaData md = mock(DatabaseMetaData.class);
+		Savepoint sp = mock(Savepoint.class);
 
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		md.supportsSavepoints();
-		mdControl.setReturnValue(true, 1);
-		con.getMetaData();
-		conControl.setReturnValue(md, 1);
-		con.setSavepoint("SAVEPOINT_1");
-		conControl.setReturnValue(sp, 1);
-		con.rollback(sp);
-		conControl.setVoidCallable(1);
-		con.commit();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
+		given(md.supportsSavepoints()).willReturn(true);
+		given(con.getMetaData()).willReturn(md);
+		given(con.setSavepoint("SAVEPOINT_1")).willReturn(sp);
 
-		spControl.replay();
-		mdControl.replay();
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1785,47 +1290,21 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		spControl.verify();
-		mdControl.verify();
-		conControl.verify();
-		dsControl.verify();
+		verify(con).rollback(sp);
+		verify(con).commit();
+		verify(con).isReadOnly();
+		verify(con).close();
 	}
 
+	@Test
 	public void testExistingTransactionWithManualSavepoint() throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		MockControl mdControl = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData md = (DatabaseMetaData) mdControl.getMock();
-		MockControl spControl = MockControl.createControl(Savepoint.class);
-		Savepoint sp = (Savepoint) spControl.getMock();
+		DatabaseMetaData md = mock(DatabaseMetaData.class);
+		Savepoint sp = mock(Savepoint.class);
 
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		md.supportsSavepoints();
-		mdControl.setReturnValue(true, 1);
-		con.getMetaData();
-		conControl.setReturnValue(md, 1);
-		con.setSavepoint("SAVEPOINT_1");
-		conControl.setReturnValue(sp, 1);
-		con.releaseSavepoint(sp);
-		conControl.setVoidCallable(1);
-		con.commit();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
+		given(md.supportsSavepoints()).willReturn(true);
+		given(con.getMetaData()).willReturn(md);
+		given(con.setSavepoint("SAVEPOINT_1")).willReturn(sp);
 
-		spControl.replay();
-		mdControl.replay();
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1842,47 +1321,21 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		spControl.verify();
-		mdControl.verify();
-		conControl.verify();
-		dsControl.verify();
+		verify(con).releaseSavepoint(sp);
+		verify(con).commit();
+		verify(con).close();
+		verify(ds).getConnection();
 	}
 
+	@Test
 	public void testExistingTransactionWithManualSavepointAndRollback() throws Exception {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		MockControl mdControl = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData md = (DatabaseMetaData) mdControl.getMock();
-		MockControl spControl = MockControl.createControl(Savepoint.class);
-		Savepoint sp = (Savepoint) spControl.getMock();
+		DatabaseMetaData md = mock(DatabaseMetaData.class);
+		Savepoint sp = mock(Savepoint.class);
 
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		md.supportsSavepoints();
-		mdControl.setReturnValue(true, 1);
-		con.getMetaData();
-		conControl.setReturnValue(md, 1);
-		con.setSavepoint("SAVEPOINT_1");
-		conControl.setReturnValue(sp, 1);
-		con.rollback(sp);
-		conControl.setVoidCallable(1);
-		con.commit();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
+		given(md.supportsSavepoints()).willReturn(true);
+		given(con.getMetaData()).willReturn(md);
+		given(con.setSavepoint("SAVEPOINT_1")).willReturn(sp);
 
-		spControl.replay();
-		mdControl.replay();
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1899,32 +1352,13 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		spControl.verify();
-		mdControl.verify();
-		conControl.verify();
-		dsControl.verify();
+		verify(con).rollback(sp);
+		verify(con).commit();
+		verify(con).close();
 	}
 
+	@Test
 	public void testTransactionWithPropagationNested() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		con.commit();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1938,30 +1372,12 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
-		dsControl.verify();
+		verify(con).commit();
+		verify(con).close();
 	}
 
+	@Test
 	public void testTransactionWithPropagationNestedAndRollback() throws Exception {
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		con.getAutoCommit();
-		conControl.setReturnValue(false, 1);
-		con.rollback();
-		conControl.setVoidCallable(1);
-		con.isReadOnly();
-		conControl.setReturnValue(false, 1);
-		con.close();
-		conControl.setVoidCallable(1);
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		final DataSource ds = (DataSource) dsControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con, 1);
-		conControl.replay();
-		dsControl.replay();
-
-		PlatformTransactionManager tm = new DataSourceTransactionManager(ds);
 		final TransactionTemplate tt = new TransactionTemplate(tm);
 		tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED);
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
@@ -1976,19 +1392,10 @@ public class DataSourceTransactionManagerTests extends TestCase {
 		});
 
 		assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds));
-		conControl.verify();
-		dsControl.verify();
+		verify(con).rollback();
+		verify(con).close();
 	}
 
-	@Override
-	protected void tearDown() {
-		assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
-		assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
-		assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly());
-		assertFalse(TransactionSynchronizationManager.isActualTransactionActive());
-	}
-
-
 	private static class TestTransactionSynchronization implements TransactionSynchronization {
 
 		private DataSource dataSource;
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTest.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTest.java
index 71283546f6..de22e56058 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTest.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTest.java
@@ -18,6 +18,9 @@ package org.springframework.jdbc.datasource;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
@@ -25,7 +28,6 @@ import java.sql.Connection;
 
 import javax.sql.DataSource;
 
-import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -42,100 +44,78 @@ public class DelegatingDataSourceTest {
 
 	@Before
 	public void setup() {
-		this.delegate = EasyMock.createMock(DataSource.class);
+		this.delegate = mock(DataSource.class);
 		this.dataSource = new DelegatingDataSource(delegate);
 	}
 
 	@Test
 	public void shouldDelegateGetConnection() throws Exception {
-		Connection connection = EasyMock.createMock(Connection.class);
-		EasyMock.expect(delegate.getConnection()).andReturn(connection);
-		EasyMock.replay(delegate);
+		Connection connection = mock(Connection.class);
+		given(delegate.getConnection()).willReturn(connection);
 		assertThat(dataSource.getConnection(), is(connection));
-		EasyMock.verify(delegate);
 	}
 
 	@Test
 	public void shouldDelegateGetConnectionWithUsernameAndPassword() throws Exception {
-		Connection connection = EasyMock.createMock(Connection.class);
+		Connection connection = mock(Connection.class);
 		String username = "username";
 		String password = "password";
-		EasyMock.expect(delegate.getConnection(username, password)).andReturn(connection);
-		EasyMock.replay(delegate);
+		given(delegate.getConnection(username, password)).willReturn(connection);
 		assertThat(dataSource.getConnection(username, password), is(connection));
-		EasyMock.verify(delegate);
 	}
 
 	@Test
 	public void shouldDelegateGetLogWriter() throws Exception {
 		PrintWriter writer = new PrintWriter(new ByteArrayOutputStream());
-		EasyMock.expect(delegate.getLogWriter()).andReturn(writer);
-		EasyMock.replay(delegate);
+		given(delegate.getLogWriter()).willReturn(writer);
 		assertThat(dataSource.getLogWriter(), is(writer));
-		EasyMock.verify(delegate);
 	}
 
 	@Test
 	public void shouldDelegateSetLogWriter() throws Exception {
 		PrintWriter writer = new PrintWriter(new ByteArrayOutputStream());
-		delegate.setLogWriter(writer);
-		EasyMock.expectLastCall();
-		EasyMock.replay(delegate);
 		dataSource.setLogWriter(writer);
-		EasyMock.verify(delegate);
+		verify(delegate).setLogWriter(writer);
 	}
 
 	@Test
 	public void shouldDelegateGetLoginTimeout() throws Exception {
 		int timeout = 123;
-		EasyMock.expect(delegate.getLoginTimeout()).andReturn(timeout);
-		EasyMock.replay(delegate);
+		given(delegate.getLoginTimeout()).willReturn(timeout);
 		assertThat(dataSource.getLoginTimeout(), is(timeout));
-		EasyMock.verify(delegate);
 	}
 
 	@Test
 	public void shouldDelegateSetLoginTimeoutWithSeconds() throws Exception {
 		int timeout = 123;
-		delegate.setLoginTimeout(timeout);
-		EasyMock.expectLastCall();
-		EasyMock.replay(delegate);
 		dataSource.setLoginTimeout(timeout);
-		EasyMock.verify(delegate);
+		verify(delegate).setLoginTimeout(timeout);
 	}
 
 	@Test
 	public void shouldDelegateUnwrapWithoutImplementing() throws Exception {
-		ExampleWrapper wrapper = EasyMock.createMock(ExampleWrapper.class);
-		EasyMock.expect(delegate.unwrap(ExampleWrapper.class)).andReturn(wrapper);
-		EasyMock.replay(delegate);
+		ExampleWrapper wrapper = mock(ExampleWrapper.class);
+		given(delegate.unwrap(ExampleWrapper.class)).willReturn(wrapper);
 		assertThat(dataSource.unwrap(ExampleWrapper.class), is(wrapper));
-		EasyMock.verify(delegate);
 	}
 
 	@Test
 	public void shouldDelegateUnwrapImplementing() throws Exception {
 		dataSource = new DelegatingDataSourceWithWrapper();
-		EasyMock.replay(delegate);
 		assertThat(dataSource.unwrap(ExampleWrapper.class),
 				is((ExampleWrapper) dataSource));
-		EasyMock.verify(delegate);
 	}
 
 	@Test
 	public void shouldDelegateIsWrapperForWithoutImplementing() throws Exception {
-		EasyMock.expect(delegate.isWrapperFor(ExampleWrapper.class)).andReturn(true);
-		EasyMock.replay(delegate);
+		given(delegate.isWrapperFor(ExampleWrapper.class)).willReturn(true);
 		assertThat(dataSource.isWrapperFor(ExampleWrapper.class), is(true));
-		EasyMock.verify(delegate);
 	}
 
 	@Test
 	public void shouldDelegateIsWrapperForImplementing() throws Exception {
 		dataSource = new DelegatingDataSourceWithWrapper();
-		EasyMock.replay(delegate);
 		assertThat(dataSource.isWrapperFor(ExampleWrapper.class), is(true));
-		EasyMock.verify(delegate);
 	}
 
 	public static interface ExampleWrapper {
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java
index 28b3040888..fd3d4a1654 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java
@@ -16,34 +16,34 @@
 
 package org.springframework.jdbc.datasource;
 
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+
 import java.sql.Connection;
 import java.util.Properties;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
+import org.junit.Test;
 
 /**
  * @author Rod Johnson
  */
-public class DriverManagerDataSourceTests extends TestCase {
+public class DriverManagerDataSourceTests {
 
+	private Connection connection = mock(Connection.class);
+
+	@Test
 	public void testStandardUsage() throws Exception {
 		final String jdbcUrl = "url";
 		final String uname = "uname";
 		final String pwd = "pwd";
 
-		MockControl ctrlConnection =
-			MockControl.createControl(Connection.class);
-		final Connection mockConnection = (Connection) ctrlConnection.getMock();
-		ctrlConnection.replay();
-
 		class TestDriverManagerDataSource extends DriverManagerDataSource {
 			@Override
 			protected Connection getConnectionFromDriverManager(String url, Properties props) {
 				assertEquals(jdbcUrl, url);
 				assertEquals(uname, props.getProperty("user"));
 				assertEquals(pwd, props.getProperty("password"));
-				return mockConnection;
+				return connection;
 			}
 		}
 
@@ -54,15 +54,14 @@ public class DriverManagerDataSourceTests extends TestCase {
 		ds.setPassword(pwd);
 
 		Connection actualCon = ds.getConnection();
-		assertTrue(actualCon == mockConnection);
+		assertTrue(actualCon == connection);
 
 		assertTrue(ds.getUrl().equals(jdbcUrl));
 		assertTrue(ds.getPassword().equals(pwd));
 		assertTrue(ds.getUsername().equals(uname));
-
-		ctrlConnection.verify();
 	}
 
+	@Test
 	public void testUsageWithConnectionProperties() throws Exception {
 		final String jdbcUrl = "url";
 
@@ -72,11 +71,6 @@ public class DriverManagerDataSourceTests extends TestCase {
 		connProps.setProperty("user", "uname");
 		connProps.setProperty("password", "pwd");
 
-		MockControl ctrlConnection =
-			MockControl.createControl(Connection.class);
-		final Connection mockConnection = (Connection) ctrlConnection.getMock();
-		ctrlConnection.replay();
-
 		class TestDriverManagerDataSource extends DriverManagerDataSource {
 			@Override
 			protected Connection getConnectionFromDriverManager(String url, Properties props) {
@@ -85,7 +79,7 @@ public class DriverManagerDataSourceTests extends TestCase {
 				assertEquals("pwd", props.getProperty("password"));
 				assertEquals("myValue", props.getProperty("myProp"));
 				assertEquals("yourValue", props.getProperty("yourProp"));
-				return mockConnection;
+				return connection;
 			}
 		}
 
@@ -95,13 +89,12 @@ public class DriverManagerDataSourceTests extends TestCase {
 		ds.setConnectionProperties(connProps);
 
 		Connection actualCon = ds.getConnection();
-		assertTrue(actualCon == mockConnection);
+		assertTrue(actualCon == connection);
 
 		assertTrue(ds.getUrl().equals(jdbcUrl));
-
-		ctrlConnection.verify();
 	}
 
+	@Test
 	public void testUsageWithConnectionPropertiesAndUserCredentials() throws Exception {
 		final String jdbcUrl = "url";
 		final String uname = "uname";
@@ -113,11 +106,6 @@ public class DriverManagerDataSourceTests extends TestCase {
 		connProps.setProperty("user", "uname2");
 		connProps.setProperty("password", "pwd2");
 
-		MockControl ctrlConnection =
-			MockControl.createControl(Connection.class);
-		final Connection mockConnection = (Connection) ctrlConnection.getMock();
-		ctrlConnection.replay();
-
 		class TestDriverManagerDataSource extends DriverManagerDataSource {
 			@Override
 			protected Connection getConnectionFromDriverManager(String url, Properties props) {
@@ -126,7 +114,7 @@ public class DriverManagerDataSourceTests extends TestCase {
 				assertEquals(pwd, props.getProperty("password"));
 				assertEquals("myValue", props.getProperty("myProp"));
 				assertEquals("yourValue", props.getProperty("yourProp"));
-				return mockConnection;
+				return connection;
 			}
 		}
 
@@ -138,15 +126,14 @@ public class DriverManagerDataSourceTests extends TestCase {
 		ds.setConnectionProperties(connProps);
 
 		Connection actualCon = ds.getConnection();
-		assertTrue(actualCon == mockConnection);
+		assertTrue(actualCon == connection);
 
 		assertTrue(ds.getUrl().equals(jdbcUrl));
 		assertTrue(ds.getPassword().equals(pwd));
 		assertTrue(ds.getUsername().equals(uname));
-
-		ctrlConnection.verify();
 	}
 
+	@Test
 	public void testInvalidClassName() throws Exception {
 		String bogusClassName = "foobar";
 		DriverManagerDataSource ds = new DriverManagerDataSource();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java
index d020c2113c..23223fc1d7 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java
@@ -16,68 +16,58 @@
 
 package org.springframework.jdbc.datasource;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
 import java.sql.Connection;
 import java.sql.SQLException;
 
 import javax.sql.DataSource;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
+import org.junit.Test;
 
 /**
  * @author Juergen Hoeller
  * @since 28.05.2004
  */
-public class UserCredentialsDataSourceAdapterTests extends TestCase {
+public class UserCredentialsDataSourceAdapterTests {
 
+	@Test
 	public void testStaticCredentials() throws SQLException {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		ds.getConnection("user", "pw");
-		dsControl.setReturnValue(con);
-		dsControl.replay();
-		conControl.replay();
+		DataSource dataSource = mock(DataSource.class);
+		Connection connection = mock(Connection.class);
+		given(dataSource.getConnection("user", "pw")).willReturn(connection);
 
 		UserCredentialsDataSourceAdapter adapter = new UserCredentialsDataSourceAdapter();
-		adapter.setTargetDataSource(ds);
+		adapter.setTargetDataSource(dataSource);
 		adapter.setUsername("user");
 		adapter.setPassword("pw");
-		assertEquals(con, adapter.getConnection());
+		assertEquals(connection, adapter.getConnection());
 	}
 
+	@Test
 	public void testNoCredentials() throws SQLException {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		ds.getConnection();
-		dsControl.setReturnValue(con);
-		dsControl.replay();
-		conControl.replay();
-
+		DataSource dataSource = mock(DataSource.class);
+		Connection connection = mock(Connection.class);
+		given(dataSource.getConnection()).willReturn(connection);
 		UserCredentialsDataSourceAdapter adapter = new UserCredentialsDataSourceAdapter();
-		adapter.setTargetDataSource(ds);
-		assertEquals(con, adapter.getConnection());
+		adapter.setTargetDataSource(dataSource);
+		assertEquals(connection, adapter.getConnection());
 	}
 
+	@Test
 	public void testThreadBoundCredentials() throws SQLException {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		ds.getConnection("user", "pw");
-		dsControl.setReturnValue(con);
-		dsControl.replay();
-		conControl.replay();
+		DataSource dataSource = mock(DataSource.class);
+		Connection connection = mock(Connection.class);
+		given(dataSource.getConnection("user", "pw")).willReturn(connection);
 
 		UserCredentialsDataSourceAdapter adapter = new UserCredentialsDataSourceAdapter();
-		adapter.setTargetDataSource(ds);
+		adapter.setTargetDataSource(dataSource);
 
 		adapter.setCredentialsForCurrentThread("user", "pw");
 		try {
-			assertEquals(con, adapter.getConnection());
+			assertEquals(connection, adapter.getConnection());
 		}
 		finally {
 			adapter.removeCredentialsFromCurrentThread();
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
index 4645558cd4..2e5c67d0f2 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
@@ -17,15 +17,14 @@
 package org.springframework.jdbc.datasource.init;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import org.easymock.EasyMock;
-
 import org.junit.After;
 import org.junit.Test;
-
 import org.springframework.core.io.ClassRelativeResourceLoader;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceUtils;
@@ -257,15 +256,9 @@ public class DatabasePopulatorTests {
 	public void usesBoundConnectionIfAvailable() throws SQLException {
 		TransactionSynchronizationManager.initSynchronization();
 		Connection connection = DataSourceUtils.getConnection(db);
-
-		DatabasePopulator populator = EasyMock.createMock(DatabasePopulator.class);
-		populator.populate(connection);
-		EasyMock.expectLastCall();
-		EasyMock.replay(populator);
-
+		DatabasePopulator populator = mock(DatabasePopulator.class);
 		DatabasePopulatorUtils.execute(populator, db);
-
-		EasyMock.verify(populator);
+		verify(populator).populate(connection);
 	}
 
 	/**
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java
index 20f66ddf3d..f178c5ef2e 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java
@@ -16,8 +16,11 @@
 
 package org.springframework.jdbc.datasource.lookup;
 
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
 
 import javax.sql.DataSource;
 
@@ -37,12 +40,10 @@ public class BeanFactoryDataSourceLookupTests {
 
 	@Test
 	public void testLookupSunnyDay() {
-		BeanFactory beanFactory = createMock(BeanFactory.class);
+		BeanFactory beanFactory = mock(BeanFactory.class);
 
 		StubDataSource expectedDataSource = new StubDataSource();
-		expect(beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class)).andReturn(expectedDataSource);
-
-		replay(beanFactory);
+		given(beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class)).willReturn(expectedDataSource);
 
 		BeanFactoryDataSourceLookup lookup = new BeanFactoryDataSourceLookup();
 		lookup.setBeanFactory(beanFactory);
@@ -50,27 +51,21 @@ public class BeanFactoryDataSourceLookupTests {
 		assertNotNull("A DataSourceLookup implementation must *never* return null from " +
 				"getDataSource(): this one obviously (and incorrectly) is", dataSource);
 		assertSame(expectedDataSource, dataSource);
-
-		verify(beanFactory);
 	}
 
 	@Test
 	public void testLookupWhereBeanFactoryYieldsNonDataSourceType() throws Exception {
-		final BeanFactory beanFactory = createMock(BeanFactory.class);
+		final BeanFactory beanFactory = mock(BeanFactory.class);
 
-		expect(
-				beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class)
-			).andThrow(new BeanNotOfRequiredTypeException(DATASOURCE_BEAN_NAME, DataSource.class, String.class));
-
-		replay(beanFactory);
+		given(beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class)).willThrow(
+				new BeanNotOfRequiredTypeException(DATASOURCE_BEAN_NAME,
+						DataSource.class, String.class));
 
 		try {
 				BeanFactoryDataSourceLookup lookup = new BeanFactoryDataSourceLookup(beanFactory);
 				lookup.getDataSource(DATASOURCE_BEAN_NAME);
 				fail("should have thrown DataSourceLookupFailureException");
 		} catch (DataSourceLookupFailureException ex) { /* expected */ }
-
-		verify(beanFactory);
 	}
 
 	@Test(expected=IllegalStateException.class)
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java
index b635c3a0cb..9ff252a367 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java
@@ -16,30 +16,35 @@
 
 package org.springframework.jdbc.object;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.Types;
 
-import org.easymock.MockControl;
-import org.apache.commons.logging.LogFactory;
+import javax.sql.DataSource;
 
-import org.springframework.jdbc.AbstractJdbcTests;
+import org.junit.Test;
 import org.springframework.jdbc.core.SqlParameter;
-import org.springframework.jdbc.core.JdbcTemplate;
 
 /**
  * @author Juergen Hoeller
  * @since 22.02.2005
  */
-public class BatchSqlUpdateTests extends AbstractJdbcTests {
-
-	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
-
+public class BatchSqlUpdateTests {
 
+	@Test
 	public void testBatchUpdateWithExplicitFlush() throws Exception {
 		doTestBatchUpdate(false);
 	}
 
+	@Test
 	public void testBatchUpdateWithFlushThroughBatchSize() throws Exception {
 		doTestBatchUpdate(true);
 	}
@@ -49,42 +54,19 @@ public class BatchSqlUpdateTests extends AbstractJdbcTests {
 		final int[] ids = new int[] { 100, 200 };
 		final int[] rowsAffected = new int[] { 1, 2 };
 
-		MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
-		mockPreparedStatement.getConnection();
-		ctrlPreparedStatement.setReturnValue(mockConnection);
-		mockPreparedStatement.setObject(1, new Integer(ids[0]), Types.INTEGER);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.addBatch();
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setObject(1, new Integer(ids[1]), Types.INTEGER);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.addBatch();
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeBatch();
-		ctrlPreparedStatement.setReturnValue(rowsAffected);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
+		Connection connection = mock(Connection.class);
+		DataSource dataSource = mock(DataSource.class);
+		given(dataSource.getConnection()).willReturn(connection);
+		PreparedStatement preparedStatement = mock(PreparedStatement.class);
+		given(preparedStatement.getConnection()).willReturn(connection);
+		given(preparedStatement.executeBatch()).willReturn(rowsAffected);
 
-		MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock();
-		mockDatabaseMetaData.supportsBatchUpdates();
-		ctrlDatabaseMetaData.setReturnValue(true);
+		DatabaseMetaData mockDatabaseMetaData = mock(DatabaseMetaData.class);
+		given(mockDatabaseMetaData.supportsBatchUpdates()).willReturn(true);
+		given(connection.prepareStatement(sql)).willReturn(preparedStatement);
+		given(connection.getMetaData()).willReturn(mockDatabaseMetaData);
 
-		mockConnection.prepareStatement(sql);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(mockDatabaseMetaData, 1);
-
-		ctrlPreparedStatement.replay();
-		ctrlDatabaseMetaData.replay();
-		replay();
-
-		BatchSqlUpdate update = new BatchSqlUpdate(mockDataSource, sql);
+		BatchSqlUpdate update = new BatchSqlUpdate(dataSource, sql);
 		update.declareParameter(new SqlParameter(Types.INTEGER));
 		if (flushThroughBatchSize) {
 			update.setBatchSize(2);
@@ -122,8 +104,9 @@ public class BatchSqlUpdateTests extends AbstractJdbcTests {
 		update.reset();
 		assertEquals(0, update.getRowsAffected().length);
 
-		ctrlPreparedStatement.verify();
-		ctrlDatabaseMetaData.verify();
+		verify(preparedStatement).setObject(1, new Integer(ids[0]), Types.INTEGER);
+		verify(preparedStatement).setObject(1, new Integer(ids[1]), Types.INTEGER);
+		verify(preparedStatement, times(2)).addBatch();
+		verify(preparedStatement).close();
 	}
-
 }
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 5c00e0bf75..85152b9a86 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
@@ -16,10 +16,13 @@
 
 package org.springframework.jdbc.object;
 
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
 
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -28,119 +31,85 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.easymock.EasyMock;
-import org.apache.commons.logging.LogFactory;
-import org.junit.Test;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runners.JUnit4;
-import org.junit.runner.RunWith;
+import javax.sql.DataSource;
 
-import org.springframework.jdbc.AbstractJdbcTests;
-import org.springframework.jdbc.Customer;
-import org.springframework.jdbc.datasource.TestDataSourceWrapper;
-import org.springframework.jdbc.core.JdbcTemplate;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.jdbc.Customer;
+import org.springframework.jdbc.datasource.TestDataSourceWrapper;
 
 /**
  * @author Thomas Risberg
  */
-@RunWith(JUnit4.class)
-public class GenericSqlQueryTests extends AbstractJdbcTests {
+public class GenericSqlQueryTests  {
 
 	private static final String SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED =
 		"select id, forename from custmr where id = ? and country = ?";
 
-	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
+	private BeanFactory beanFactory;
 
-	private PreparedStatement mockPreparedStatement;
-	private ResultSet mockResultSet;
+	private Connection connection;
 
-	private BeanFactory bf;
+	private PreparedStatement preparedStatement;
 
+	private ResultSet resultSet;
 
-	@Override
 	@Before
 	public void setUp() throws Exception {
-		super.setUp();
-		mockPreparedStatement =	createMock(PreparedStatement.class);
-		mockResultSet = createMock(ResultSet.class);
-		this.bf = new XmlBeanFactory(
+		this.beanFactory = new XmlBeanFactory(
 				new ClassPathResource("org/springframework/jdbc/object/GenericSqlQueryTests-context.xml"));
-		TestDataSourceWrapper testDataSource = (TestDataSourceWrapper) bf.getBean("dataSource");
-		testDataSource.setTarget(mockDataSource);
-	}
-
-	@Override
-	@After
-	public void tearDown() throws Exception {
-		super.tearDown();
-		if (shouldVerify()) {
-			EasyMock.verify(mockPreparedStatement);
-			EasyMock.verify(mockResultSet);
-		}
-	}
-
-	@Override
-	protected void replay() {
-		super.replay();
-		EasyMock.replay(mockPreparedStatement);
-		EasyMock.replay(mockResultSet);
+		DataSource dataSource = mock(DataSource.class);
+		this.connection = mock(Connection.class);
+		this.preparedStatement = mock(PreparedStatement.class);
+		this.resultSet = mock(ResultSet.class);
+		given(dataSource.getConnection()).willReturn(connection);
+		TestDataSourceWrapper testDataSource = (TestDataSourceWrapper) beanFactory.getBean("dataSource");
+		testDataSource.setTarget(dataSource);
 	}
 
 	@Test
 	public void testPlaceHoldersCustomerQuery() throws SQLException {
-		SqlQuery query = (SqlQuery) bf.getBean("queryWithPlaceHolders");
-		testCustomerQuery(query, false);
+		SqlQuery query = (SqlQuery) beanFactory.getBean("queryWithPlaceHolders");
+		doTestCustomerQuery(query, false);
 	}
 
 	@Test
 	public void testNamedParameterCustomerQuery() throws SQLException {
-		SqlQuery query = (SqlQuery) bf.getBean("queryWithNamedParameters");
-		testCustomerQuery(query, true);
+		SqlQuery query = (SqlQuery) beanFactory.getBean("queryWithNamedParameters");
+		doTestCustomerQuery(query, true);
 	}
 
-	private void testCustomerQuery(SqlQuery query, boolean namedParameters) throws SQLException {
-		expect(mockResultSet.next()).andReturn(true);
-		expect(mockResultSet.getInt("id")).andReturn(1);
-		expect(mockResultSet.getString("forename")).andReturn("rod");
-		expect(mockResultSet.next()).andReturn(false);
-		mockResultSet.close();
-		expectLastCall();
+	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");
+		given(resultSet.next()).willReturn(true, false);
+		given(preparedStatement.executeQuery()).willReturn(resultSet);
+		given(connection.prepareStatement(SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED)).willReturn(preparedStatement);
 
-		mockPreparedStatement.setObject(1, new Integer(1), Types.INTEGER);
-		expectLastCall();
-		mockPreparedStatement.setString(2, "UK");
-		expectLastCall();
-		expect(mockPreparedStatement.executeQuery()).andReturn(mockResultSet);
-		if (debugEnabled) {
-			expect(mockPreparedStatement.getWarnings()).andReturn(null);
-		}
-		mockPreparedStatement.close();
-		expectLastCall();
-
-		mockConnection.prepareStatement(SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		List l;
+		List queryResults;
 		if (namedParameters) {
 			Map<String, Object> params = new HashMap<String, Object>(2);
 			params.put("id", new Integer(1));
 			params.put("country", "UK");
-			l = query.executeByNamedParam(params);
+			queryResults = query.executeByNamedParam(params);
 		}
 		else {
 			Object[] params = new Object[] {new Integer(1), "UK"};
-			l = query.execute(params);
+			queryResults = query.execute(params);
 		}
-		assertTrue("Customer was returned correctly", l.size() == 1);
-		Customer cust = (Customer) l.get(0);
+		assertTrue("Customer was returned correctly", queryResults.size() == 1);
+		Customer cust = (Customer) queryResults.get(0);
 		assertTrue("Customer id was assigned correctly", cust.getId() == 1);
 		assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod"));
+
+		verify(resultSet).close();
+		verify(preparedStatement).setObject(1, new Integer(1), Types.INTEGER);
+		verify(preparedStatement).setString(2, "UK");
+		verify(preparedStatement).close();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
index 9c1ff6069e..6b1760ac8b 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
@@ -16,104 +16,63 @@
 
 package org.springframework.jdbc.object;
 
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import java.sql.CallableStatement;
+import java.sql.Connection;
 import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.easymock.EasyMock;
+import javax.sql.DataSource;
+
 import org.apache.commons.logging.LogFactory;
 import org.junit.Test;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runners.JUnit4;
-import org.junit.runner.RunWith;
-
-import org.springframework.jdbc.AbstractJdbcTests;
-import org.springframework.jdbc.datasource.TestDataSourceWrapper;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.TestDataSourceWrapper;
 
 /**
  * @author Thomas Risberg
  */
-@RunWith(JUnit4.class)
-public class GenericStoredProcedureTests extends AbstractJdbcTests {
+public class GenericStoredProcedureTests {
 
 	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
 
-	private CallableStatement mockCallable;
-
-	private BeanFactory bf;
-
-	@Override
-	@Before
-	public void setUp() throws Exception {
-		super.setUp();
-		mockCallable = createMock(CallableStatement.class);
-		bf = new XmlBeanFactory(
-				new ClassPathResource("org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml"));
-		TestDataSourceWrapper testDataSource = (TestDataSourceWrapper) bf.getBean("dataSource");
-		testDataSource.setTarget(mockDataSource);
-	}
-
-	@Override
-	@After
-	public void tearDown() throws Exception {
-		super.tearDown();
-		if (shouldVerify()) {
-			EasyMock.verify(mockCallable);
-		}
-	}
-
-	@Override
-	protected void replay() {
-		super.replay();
-		EasyMock.replay(mockCallable);
-	}
-
 	@Test
 	public void testAddInvoices() throws Exception {
+		BeanFactory bf = new XmlBeanFactory(
+				new ClassPathResource("org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml"));
+		Connection connection = mock(Connection.class);
+		DataSource dataSource = mock(DataSource.class);
+		given(dataSource.getConnection()).willReturn(connection);
+		CallableStatement callableStatement = mock(CallableStatement.class);
+		TestDataSourceWrapper testDataSource = (TestDataSourceWrapper) bf.getBean("dataSource");
+		testDataSource.setTarget(dataSource);
 
-		mockCallable.setObject(1, new Integer(1106), Types.INTEGER);
-		expectLastCall();
-		mockCallable.setObject(2, new Integer(3), Types.INTEGER);
-		expectLastCall();
-		mockCallable.registerOutParameter(3, Types.INTEGER);
-		expectLastCall();
-		expect(mockCallable.execute()).andReturn(false);
-		expect(mockCallable.getUpdateCount()).andReturn(-1);
-		expect(mockCallable.getObject(3)).andReturn(new Integer(4));
-		if (debugEnabled) {
-			expect(mockCallable.getWarnings()).andReturn(null);
-		}
-		mockCallable.close();
-		expectLastCall();
+		given(callableStatement.execute()).willReturn(false);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(callableStatement.getObject(3)).willReturn(new Integer(4));
 
-		mockConnection.prepareCall("{call " + "add_invoice" + "(?, ?, ?)}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-
-		testAddInvoice(1106, 3);
-	}
-
-	private void testAddInvoice(final int amount, final int custid)
-		throws Exception {
+		given(connection.prepareCall("{call " + "add_invoice" + "(?, ?, ?)}")).willReturn(callableStatement);
 
 		StoredProcedure adder = (StoredProcedure) bf.getBean("genericProcedure");
 		Map<String, Object> in = new HashMap<String, Object>(2);
-		in.put("amount", amount);
-		in.put("custid", custid);
+		in.put("amount", 1106);
+		in.put("custid", 3);
 		Map out = adder.execute(in);
 		Integer id = (Integer) out.get("newid");
 		assertEquals(4, id.intValue());
+
+		verify(callableStatement).setObject(1, new Integer(1106), Types.INTEGER);
+		verify(callableStatement).setObject(2, new Integer(3), Types.INTEGER);
+		verify(callableStatement).registerOutParameter(3, Types.INTEGER);
+		verify(callableStatement).close();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
index 478328af8c..535dca239e 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
@@ -16,362 +16,191 @@
 
 package org.springframework.jdbc.object;
 
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import javax.sql.DataSource;
 
-import org.easymock.MockControl;
-import org.apache.commons.logging.LogFactory;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.jdbc.AbstractJdbcTests;
 import org.springframework.jdbc.Customer;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.SqlParameter;
 
-import junit.framework.Assert;
-
 /**
  * @author Trevor Cook
  * @author Thomas Risberg
  * @author Juergen Hoeller
  */
-public class SqlQueryTests extends AbstractJdbcTests {
+public class SqlQueryTests  {
 
-	private static final String SELECT_ID = "select id from custmr";
+	//FIXME inline?
+	private static final String SELECT_ID =
+			"select id from custmr";
 	private static final String SELECT_ID_WHERE =
-		"select id from custmr where forename = ? and id = ?";
-	private static final String SELECT_FORENAME = "select forename from custmr";
+			"select id from custmr where forename = ? and id = ?";
+	private static final String SELECT_FORENAME =
+			"select forename from custmr";
 	private static final String SELECT_FORENAME_EMPTY =
-		"select forename from custmr WHERE 1 = 2";
+			"select forename from custmr WHERE 1 = 2";
 	private static final String SELECT_ID_FORENAME_WHERE =
-		"select id, forename from prefix:custmr where forename = ?";
+			"select id, forename from prefix:custmr where forename = ?";
 	private static final String SELECT_ID_FORENAME_NAMED_PARAMETERS =
-		"select id, forename from custmr where id = :id and country = :country";
+			"select id, forename from custmr where id = :id and country = :country";
 	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 static final String SELECT_ID_FORENAME_WHERE_ID_IN_LIST_1 =
-		"select id, forename from custmr where id in (?, ?)";
+			"select id, forename from custmr where id in (?, ?)";
 	private static final String SELECT_ID_FORENAME_WHERE_ID_IN_LIST_2 =
-		"select id, forename from custmr where id in (:ids)";
+			"select id, forename from custmr where id in (:ids)";
 	private static final String SELECT_ID_FORENAME_WHERE_ID_REUSED_1 =
-		"select id, forename from custmr where id = ? or id = ?)";
+			"select id, forename from custmr where id = ? or id = ?)";
 	private static final String SELECT_ID_FORENAME_WHERE_ID_REUSED_2 =
-		"select id, forename from custmr where id = :id1 or id = :id1)";
+			"select id, forename from custmr where id = :id1 or id = :id1)";
 	private static final String SELECT_ID_FORENAME_WHERE_ID =
-		"select id, forename from custmr where id <= ?";
+			"select id, forename from custmr where id <= ?";
 
 	private static final String[] COLUMN_NAMES = new String[] {"id", "forename"};
 	private static final int[] COLUMN_TYPES = new int[] {Types.INTEGER, Types.VARCHAR};
 
-	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
-	private MockControl ctrlPreparedStatement;
-	private PreparedStatement mockPreparedStatement;
-	private MockControl ctrlResultSet;
-	private ResultSet mockResultSet;
+	private Connection connection;
+	private DataSource dataSource;
+	private PreparedStatement preparedStatement;
+	private ResultSet resultSet;
 
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		ctrlPreparedStatement =	MockControl.createControl(PreparedStatement.class);
-		mockPreparedStatement =	(PreparedStatement) ctrlPreparedStatement.getMock();
-		ctrlResultSet = MockControl.createControl(ResultSet.class);
-		mockResultSet = (ResultSet) ctrlResultSet.getMock();
+	@Before
+	public void setUp() throws Exception {
+		this.connection = mock(Connection.class);
+		this.dataSource = mock(DataSource.class);
+		this.preparedStatement = mock(PreparedStatement.class);
+		this.resultSet = mock(ResultSet.class);
+		given(this.dataSource.getConnection()).willReturn(this.connection);
+		given(this.connection.prepareStatement(anyString())).willReturn(this.preparedStatement);
+		given(preparedStatement.executeQuery()).willReturn(resultSet);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (shouldVerify()) {
-			ctrlPreparedStatement.verify();
-			ctrlResultSet.verify();
-		}
-	}
-
-	@Override
-	protected void replay() {
-		super.replay();
-		ctrlPreparedStatement.replay();
-		ctrlResultSet.replay();
-	}
-
-
+	@Test
 	public void testQueryWithoutParams() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt(1);
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt(1)).willReturn(1);
 
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(SELECT_ID);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		SqlQuery query = new MappingSqlQueryWithParameters() {
+		SqlQuery<Integer> query = new MappingSqlQueryWithParameters<Integer>() {
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum, Object[] params, Map context) throws SQLException {
+			protected Integer mapRow(ResultSet rs, int rownum, Object[] params, Map context) throws SQLException {
 				assertTrue("params were null", params == null);
 				assertTrue("context was null", context == null);
-				return new Integer(rs.getInt(1));
+				return rs.getInt(1);
 			}
 		};
-
-		query.setDataSource(mockDataSource);
+		query.setDataSource(dataSource);
 		query.setSql(SELECT_ID);
 		query.compile();
-		List list = query.execute();
-		assertTrue("Found customers", list.size() != 0);
-		for (Iterator itr = list.iterator(); itr.hasNext();) {
-			Integer id = (Integer) itr.next();
-			assertTrue(
-				"Customer id was assigned correctly",
-				id.intValue() == 1);
-		}
+		List<Integer> list = query.execute();
+
+		assertThat(list, is(equalTo(Arrays.asList(1))));
+		verify(connection).prepareStatement(SELECT_ID);
+		verify(resultSet).close();
+		verify(preparedStatement).close();
 	}
 
+	@Test
 	public void testQueryWithoutEnoughParams() {
-		replay();
-
-		MappingSqlQuery query = new MappingSqlQuery() {
+		MappingSqlQuery<Integer> query = new MappingSqlQuery<Integer>() {
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
-				return new Integer(rs.getInt(1));
+			protected Integer mapRow(ResultSet rs, int rownum) throws SQLException {
+				return rs.getInt(1);
 			}
-
 		};
-		query.setDataSource(mockDataSource);
+		query.setDataSource(dataSource);
 		query.setSql(SELECT_ID_WHERE);
-		query.declareParameter(
-			new SqlParameter(COLUMN_NAMES[0], COLUMN_TYPES[0]));
-		query.declareParameter(
-			new SqlParameter(COLUMN_NAMES[1], COLUMN_TYPES[1]));
+		query.declareParameter(new SqlParameter(COLUMN_NAMES[0], COLUMN_TYPES[0]));
+		query.declareParameter(new SqlParameter(COLUMN_NAMES[1], COLUMN_TYPES[1]));
 		query.compile();
 
-		try {
-			List list = query.execute();
-			fail("Shouldn't succeed in running query without enough params");
-		}
-		catch (InvalidDataAccessApiUsageException ex) {
-			// OK
-		}
+		thrown.expect(InvalidDataAccessApiUsageException.class);
+		query.execute();
 	}
 
+	@Test
 	public void testQueryWithMissingMapParams() {
-		replay();
-
-		MappingSqlQuery query = new MappingSqlQuery() {
+		MappingSqlQuery<Integer> query = new MappingSqlQuery<Integer>() {
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
-				return new Integer(rs.getInt(1));
+			protected Integer mapRow(ResultSet rs, int rownum) throws SQLException {
+				return rs.getInt(1);
 			}
 		};
-		query.setDataSource(mockDataSource);
+		query.setDataSource(dataSource);
 		query.setSql(SELECT_ID_WHERE);
-		query.declareParameter(
-			new SqlParameter(COLUMN_NAMES[0], COLUMN_TYPES[0]));
-		query.declareParameter(
-			new SqlParameter(COLUMN_NAMES[1], COLUMN_TYPES[1]));
+		query.declareParameter(new SqlParameter(COLUMN_NAMES[0], COLUMN_TYPES[0]));
+		query.declareParameter(new SqlParameter(COLUMN_NAMES[1], COLUMN_TYPES[1]));
 		query.compile();
 
-		try {
-			Map params = new HashMap();
-			params.put(COLUMN_NAMES[0], "Value");
-			List list = query.executeByNamedParam(params);
-			fail("Shouldn't succeed in running query with missing params");
-		}
-		catch (InvalidDataAccessApiUsageException ex) {
-			// OK
-		}
+		thrown.expect(InvalidDataAccessApiUsageException.class);
+		query.executeByNamedParam(Collections.singletonMap(COLUMN_NAMES[0], "value"));
 	}
 
+	@Test
 	public void testStringQueryWithResults() throws Exception {
 		String[] dbResults = new String[] { "alpha", "beta", "charlie" };
-
-		MockControl[] ctrlCountResultSetMetaData = new MockControl[3];
-		ResultSetMetaData[] mockCountResultSetMetaData = new ResultSetMetaData[3];
-		MockControl[] ctrlCountResultSet = new MockControl[3];
-		ResultSet[] mockCountResultSet = new ResultSet[3];
-		MockControl[] ctrlCountPreparedStatement = new MockControl[3];
-		PreparedStatement[] mockCountPreparedStatement = new PreparedStatement[3];
-
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getString(1);
-		ctrlResultSet.setReturnValue(dbResults[0]);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getString(1);
-		ctrlResultSet.setReturnValue(dbResults[1]);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getString(1);
-		ctrlResultSet.setReturnValue(dbResults[2]);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(SELECT_FORENAME);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		for (int i = 0; i < dbResults.length; i++) {
-			ctrlCountResultSetMetaData[i] = MockControl.createControl(ResultSetMetaData.class);
-			mockCountResultSetMetaData[i] = (ResultSetMetaData) ctrlCountResultSetMetaData[i].getMock();
-			mockCountResultSetMetaData[i].getColumnCount();
-			ctrlCountResultSetMetaData[i].setReturnValue(1);
-
-			ctrlCountResultSet[i] = MockControl.createControl(ResultSet.class);
-			mockCountResultSet[i] = (ResultSet) ctrlCountResultSet[i].getMock();
-			mockCountResultSet[i].getMetaData();
-			ctrlCountResultSet[i].setReturnValue(mockCountResultSetMetaData[i]);
-			mockCountResultSet[i].next();
-			ctrlCountResultSet[i].setReturnValue(true);
-			mockCountResultSet[i].getInt(1);
-			ctrlCountResultSet[i].setReturnValue(1);
-			mockCountResultSet[i].wasNull();
-			ctrlCountResultSet[i].setReturnValue(false);
-			mockCountResultSet[i].next();
-			ctrlCountResultSet[i].setReturnValue(false);
-			mockCountResultSet[i].close();
-			ctrlCountResultSet[i].setVoidCallable();
-
-			ctrlCountPreparedStatement[i] = MockControl.createControl(PreparedStatement.class);
-			mockCountPreparedStatement[i] = (PreparedStatement) ctrlCountPreparedStatement[i].getMock();
-			mockCountPreparedStatement[i].executeQuery();
-			ctrlCountPreparedStatement[i].setReturnValue(mockCountResultSet[i]);
-			if (debugEnabled) {
-				mockCountPreparedStatement[i].getWarnings();
-				ctrlCountPreparedStatement[i].setReturnValue(null);
-			}
-			mockCountPreparedStatement[i].close();
-			ctrlCountPreparedStatement[i].setVoidCallable();
-
-			mockConnection.prepareStatement(
-				"SELECT COUNT(FORENAME) FROM CUSTMR WHERE FORENAME='" + dbResults[i] + "'");
-			ctrlConnection.setReturnValue(mockCountPreparedStatement[i]);
-
-			ctrlCountResultSetMetaData[i].replay();
-			ctrlCountResultSet[i].replay();
-			ctrlCountPreparedStatement[i].replay();
-		}
-
-		replay();
-
-		StringQuery query = new StringQuery(mockDataSource, SELECT_FORENAME);
+		given(resultSet.next()).willReturn(true, true, true, false);
+		given(resultSet.getString(1)).willReturn(dbResults[0], dbResults[1], dbResults[2]);
+		StringQuery query = new StringQuery(dataSource, SELECT_FORENAME);
 		query.setRowsExpected(3);
 		String[] results = query.run();
-		assertTrue("Array is non null", results != null);
-		assertTrue("Found results", results.length > 0);
-		assertTrue(
-			"Found expected number of results",
-			query.getRowsExpected() == 3);
-
-		JdbcTemplate helper = new JdbcTemplate(mockDataSource);
-		for (int i = 0; i < results.length; i++) {
-			// BREAKS ON ' in name
-			int dbCount = helper.queryForInt(
-					"SELECT COUNT(FORENAME) FROM CUSTMR WHERE FORENAME='" + results[i] + "'", (Object[]) null);
-			assertTrue("found in db", dbCount == 1);
-		}
-
-		for (int i = 0; i < dbResults.length; i++) {
-			ctrlCountResultSetMetaData[i].verify();
-			ctrlCountResultSet[i].verify();
-			ctrlCountPreparedStatement[i].verify();
-		}
+		assertThat(results, is(equalTo(dbResults)));
+		verify(connection).prepareStatement(SELECT_FORENAME);
+		verify(resultSet).close();
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testStringQueryWithoutResults() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(SELECT_FORENAME_EMPTY);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		StringQuery query =	new StringQuery(mockDataSource, SELECT_FORENAME_EMPTY);
+		given(resultSet.next()).willReturn(false);
+		StringQuery query = new StringQuery(dataSource, SELECT_FORENAME_EMPTY);
 		String[] results = query.run();
-		assertTrue("Array is non null", results != null);
-		assertTrue("Found 0 results", results.length == 0);
+		assertThat(results, is(equalTo(new String[0])));
+		verify(connection).prepareStatement(SELECT_FORENAME_EMPTY);
+		verify(resultSet).close();
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testFindCustomerIntInt() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt("id")).willReturn(1);
+		given(resultSet.getString("forename")).willReturn("rod");
 
-		mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setObject(2, new Integer(1), Types.NUMERIC);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(SELECT_ID_WHERE);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		class CustomerQuery extends MappingSqlQuery {
+		class CustomerQuery extends MappingSqlQuery<Customer> {
 
 			public CustomerQuery(DataSource ds) {
 				super(ds, SELECT_ID_WHERE);
@@ -381,7 +210,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
+			protected Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
 				cust.setForename(rs.getString(COLUMN_NAMES[1]));
@@ -389,48 +218,30 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			public Customer findCustomer(int id, int otherNum) {
-				return (Customer) findObject(id, otherNum);
+				return findObject(id, otherNum);
 			}
 		}
 
-		CustomerQuery query = new CustomerQuery(mockDataSource);
+		CustomerQuery query = new CustomerQuery(dataSource);
 		Customer cust = query.findCustomer(1, 1);
 
 		assertTrue("Customer id was assigned correctly", cust.getId() == 1);
-		assertTrue(
-			"Customer forename was assigned correctly",
-			cust.getForename().equals("rod"));
+		assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod"));
+		verify(preparedStatement).setObject(1, 1, Types.NUMERIC);
+		verify(preparedStatement).setObject(2, 1, Types.NUMERIC);
+		verify(connection).prepareStatement(SELECT_ID_WHERE);
+		verify(resultSet).close();
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testFindCustomerString() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt("id")).willReturn(1);
+		given(resultSet.getString("forename")).willReturn("rod");
 
-		mockPreparedStatement.setString(1, "rod");
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(SELECT_ID_FORENAME_WHERE);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		class CustomerQuery extends MappingSqlQuery {
+		class CustomerQuery extends MappingSqlQuery<Customer> {
 
 			public CustomerQuery(DataSource ds) {
 				super(ds, SELECT_ID_FORENAME_WHERE);
@@ -439,7 +250,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
+			protected Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
 				cust.setForename(rs.getString(COLUMN_NAMES[1]));
@@ -447,91 +258,46 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			public Customer findCustomer(String id) {
-				return (Customer) findObject(id);
+				return findObject(id);
 			}
 		}
 
-		CustomerQuery query = new CustomerQuery(mockDataSource);
+		CustomerQuery query = new CustomerQuery(dataSource);
 		Customer cust = query.findCustomer("rod");
 
 		assertTrue("Customer id was assigned correctly", cust.getId() == 1);
-		assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod"));
+		assertTrue("Customer forename was assigned correctly",
+				cust.getForename().equals("rod"));
+		verify(preparedStatement).setString(1, "rod");
+		verify(connection).prepareStatement(SELECT_ID_FORENAME_WHERE);
+		verify(resultSet).close();
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testFindCustomerMixed() throws SQLException {
-		MockControl ctrlResultSet2;
-		ResultSet mockResultSet2;
-		MockControl ctrlPreparedStatement2;
-		PreparedStatement mockPreparedStatement2;
+		reset(connection);
+		PreparedStatement preparedStatement2 = mock(PreparedStatement.class);
+		ResultSet resultSet2 = mock(ResultSet.class);
+		given(preparedStatement2.executeQuery()).willReturn(resultSet2);
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt("id")).willReturn(1);
+		given(resultSet.getString("forename")).willReturn("rod");
+		given(resultSet2.next()).willReturn(false);
+		given(connection.prepareStatement(SELECT_ID_WHERE)).willReturn(preparedStatement, preparedStatement2);
 
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setObject(1, new Integer(1), Types.INTEGER);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setString(2, "rod");
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		ctrlResultSet2 = MockControl.createControl(ResultSet.class);
-		mockResultSet2 = (ResultSet) ctrlResultSet2.getMock();
-		mockResultSet2.next();
-		ctrlResultSet2.setReturnValue(false);
-		mockResultSet2.close();
-		ctrlResultSet2.setVoidCallable();
-
-		ctrlPreparedStatement2 = MockControl.createControl(PreparedStatement.class);
-		mockPreparedStatement2 = (PreparedStatement) ctrlPreparedStatement2.getMock();
-		mockPreparedStatement2.setObject(1, new Integer(1), Types.INTEGER);
-		ctrlPreparedStatement2.setVoidCallable();
-		mockPreparedStatement2.setString(2, "Roger");
-		ctrlPreparedStatement2.setVoidCallable();
-		mockPreparedStatement2.executeQuery();
-		ctrlPreparedStatement2.setReturnValue(mockResultSet2);
-		if (debugEnabled) {
-			mockPreparedStatement2.getWarnings();
-			ctrlPreparedStatement2.setReturnValue(null);
-		}
-		mockPreparedStatement2.close();
-		ctrlPreparedStatement2.setVoidCallable();
-
-		mockConnection.prepareStatement(SELECT_ID_WHERE);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-		mockConnection.prepareStatement(SELECT_ID_WHERE);
-		ctrlConnection.setReturnValue(mockPreparedStatement2);
-
-		ctrlResultSet2.replay();
-		ctrlPreparedStatement2.replay();
-		replay();
-
-		class CustomerQuery extends MappingSqlQuery {
+		class CustomerQuery extends MappingSqlQuery<Customer> {
 
 			public CustomerQuery(DataSource ds) {
 				super(ds, SELECT_ID_WHERE);
-				declareParameter(
-					new SqlParameter(COLUMN_NAMES[0], COLUMN_TYPES[0]));
-				declareParameter(
-					new SqlParameter(COLUMN_NAMES[1], COLUMN_TYPES[1]));
+				declareParameter(new SqlParameter(COLUMN_NAMES[0], COLUMN_TYPES[0]));
+				declareParameter(new SqlParameter(COLUMN_NAMES[1], COLUMN_TYPES[1]));
 				compile();
 			}
 
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
+			protected Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
 				cust.setForename(rs.getString(COLUMN_NAMES[1]));
@@ -539,12 +305,11 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			public Customer findCustomer(int id, String name) {
-				return (Customer) findObject(
-					new Object[] { new Integer(id), name });
+				return findObject(new Object[] { id, name });
 			}
 		}
 
-		CustomerQuery query = new CustomerQuery(mockDataSource);
+		CustomerQuery query = new CustomerQuery(dataSource);
 
 		Customer cust1 = query.findCustomer(1, "rod");
 		assertTrue("Found customer", cust1 != null);
@@ -552,43 +317,25 @@ public class SqlQueryTests extends AbstractJdbcTests {
 
 		Customer cust2 = query.findCustomer(1, "Roger");
 		assertTrue("No customer found", cust2 == null);
+
+		verify(preparedStatement).setObject(1, 1, Types.INTEGER);
+		verify(preparedStatement).setString(2, "rod");
+		verify(preparedStatement2).setObject(1, 1, Types.INTEGER);
+		verify(preparedStatement2).setString(2, "Roger");
+		verify(resultSet).close();
+		verify(resultSet2).close();
+		verify(preparedStatement).close();
+		verify(preparedStatement2).close();
+		verify(connection, times(2)).close();
 	}
 
+	@Test
 	public void testFindTooManyCustomers() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(2);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true, true, false);
+		given(resultSet.getInt("id")).willReturn(1, 2);
+		given(resultSet.getString("forename")).willReturn("rod", "rod");
 
-		mockPreparedStatement.setString(1, "rod");
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(SELECT_ID_FORENAME_WHERE);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		class CustomerQuery extends MappingSqlQuery {
+		class CustomerQuery extends MappingSqlQuery<Customer> {
 
 			public CustomerQuery(DataSource ds) {
 				super(ds, SELECT_ID_FORENAME_WHERE);
@@ -597,7 +344,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
+			protected Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
 				cust.setForename(rs.getString(COLUMN_NAMES[1]));
@@ -605,57 +352,31 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			public Customer findCustomer(String id) {
-				return (Customer) findObject(id);
+				return findObject(id);
 			}
 		}
 
-		CustomerQuery query = new CustomerQuery(mockDataSource);
+		CustomerQuery query = new CustomerQuery(dataSource);
+		thrown.expect(IncorrectResultSizeDataAccessException.class);
 		try {
-			Customer cust = query.findCustomer("rod");
-			fail("Should fail if more than one row found");
+			query.findCustomer("rod");
 		}
-		catch (IncorrectResultSizeDataAccessException ex) {
-			// OK
+		finally {
+			verify(preparedStatement).setString(1, "rod");
+			verify(connection).prepareStatement(SELECT_ID_FORENAME_WHERE);
+			verify(resultSet).close();
+			verify(preparedStatement).close();
+			verify(connection).close();
 		}
 	}
 
+	@Test
 	public void testListCustomersIntInt() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(2);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("dave");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true, true, false);
+		given(resultSet.getInt("id")).willReturn(1, 2);
+		given(resultSet.getString("forename")).willReturn("rod", "dave");
 
-		mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setObject(2, new Integer(1), Types.NUMERIC);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(SELECT_ID_WHERE);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		class CustomerQuery extends MappingSqlQuery {
+		class CustomerQuery extends MappingSqlQuery<Customer> {
 
 			public CustomerQuery(DataSource ds) {
 				super(ds, SELECT_ID_WHERE);
@@ -665,7 +386,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
+			protected Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
 				cust.setForename(rs.getString(COLUMN_NAMES[1]));
@@ -673,49 +394,26 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 		}
 
-		CustomerQuery query = new CustomerQuery(mockDataSource);
-		List list = query.execute(1, 1);
+		CustomerQuery query = new CustomerQuery(dataSource);
+		List<Customer> list = query.execute(1, 1);
 		assertTrue("2 results in list", list.size() == 2);
-		for (Iterator itr = list.iterator(); itr.hasNext();) {
-			Customer cust = (Customer) itr.next();
-		}
+		assertThat(list.get(0).getForename(), is("rod"));
+		assertThat(list.get(1).getForename(), is("dave"));
+		verify(preparedStatement).setObject(1, 1, Types.NUMERIC);
+		verify(preparedStatement).setObject(2, 1, Types.NUMERIC);
+		verify(connection).prepareStatement(SELECT_ID_WHERE);
+		verify(resultSet).close();
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testListCustomersString() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(2);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("dave");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true, true, false);
+		given(resultSet.getInt("id")).willReturn(1, 2);
+		given(resultSet.getString("forename")).willReturn("rod", "dave");
 
-		mockPreparedStatement.setString(1, "one");
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(SELECT_ID_FORENAME_WHERE);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		class CustomerQuery extends MappingSqlQuery {
+		class CustomerQuery extends MappingSqlQuery<Customer> {
 
 			public CustomerQuery(DataSource ds) {
 				super(ds, SELECT_ID_FORENAME_WHERE);
@@ -724,53 +422,37 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
+			protected Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
 				cust.setForename(rs.getString(COLUMN_NAMES[1]));
 				return cust;
 			}
-
 		}
 
-		CustomerQuery query = new CustomerQuery(mockDataSource);
-		List list = query.execute("one");
+		CustomerQuery query = new CustomerQuery(dataSource);
+		List<Customer> list = query.execute("one");
 		assertTrue("2 results in list", list.size() == 2);
-		for (Iterator itr = list.iterator(); itr.hasNext();) {
-			Customer cust = (Customer) itr.next();
-		}
+		assertThat(list.get(0).getForename(), is("rod"));
+		assertThat(list.get(1).getForename(), is("dave"));
+		verify(preparedStatement).setString(1, "one");
+		verify(connection).prepareStatement(SELECT_ID_FORENAME_WHERE);
+		verify(resultSet).close();
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testFancyCustomerQuery() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt("id")).willReturn(1);
+		given(resultSet.getString("forename")).willReturn("rod");
 
-		mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
+		given(connection.prepareStatement(SELECT_ID_FORENAME_WHERE,
+				ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY)
+			).willReturn(preparedStatement);
 
-		mockConnection.prepareStatement(
-				SELECT_ID_FORENAME_WHERE, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		class CustomerQuery extends MappingSqlQuery {
+		class CustomerQuery extends MappingSqlQuery<Customer> {
 
 			public CustomerQuery(DataSource ds) {
 				super(ds, SELECT_ID_FORENAME_WHERE);
@@ -780,7 +462,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
+			protected Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
 				cust.setForename(rs.getString(COLUMN_NAMES[1]));
@@ -788,20 +470,24 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			public Customer findCustomer(int id) {
-				return (Customer) findObject(id);
+				return findObject(id);
 			}
 		}
 
-		CustomerQuery query = new CustomerQuery(mockDataSource);
+		CustomerQuery query = new CustomerQuery(dataSource);
 		Customer cust = query.findCustomer(1);
 		assertTrue("Customer id was assigned correctly", cust.getId() == 1);
 		assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod"));
+		verify(preparedStatement).setObject(1, 1, Types.NUMERIC);
+		verify(resultSet).close();
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
-	public void testUnnamedParameterDeclarationWithNamedParameterQuery() throws SQLException {
-		replay();
-
-		class CustomerQuery extends MappingSqlQuery {
+	@Test
+	public void testUnnamedParameterDeclarationWithNamedParameterQuery()
+			throws SQLException {
+		class CustomerQuery extends MappingSqlQuery<Customer> {
 
 			public CustomerQuery(DataSource ds) {
 				super(ds, SELECT_ID_FORENAME_WHERE);
@@ -811,7 +497,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
+			protected Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
 				cust.setForename(rs.getString(COLUMN_NAMES[1]));
@@ -819,62 +505,40 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			public Customer findCustomer(int id) {
-				Map params = new HashMap();
-				params.put("id", new Integer(id));
-				return (Customer) executeByNamedParam(params).get(0);
+				Map<String, Integer> params = new HashMap<String, Integer>();
+				params.put("id", id);
+				return executeByNamedParam(params).get(0);
 			}
 		}
 
-		CustomerQuery query = new CustomerQuery(mockDataSource);
-		try {
-			Customer cust = query.findCustomer(1);
-			fail("Query should not succeed since parameter declaration did not specify parameter name");
-		}
-		catch (InvalidDataAccessApiUsageException ex) {
-			// OK - it worked
-		}
+		// Query should not succeed since parameter declaration did not specify parameter name
+		CustomerQuery query = new CustomerQuery(dataSource);
+		thrown.expect(InvalidDataAccessApiUsageException.class);
+		query.findCustomer(1);
 	}
 
-	public void testNamedParameterCustomerQueryWithUnnamedDeclarations() throws SQLException {
+	@Test
+	public void testNamedParameterCustomerQueryWithUnnamedDeclarations()
+			throws SQLException {
 		doTestNamedParameterCustomerQuery(false);
 	}
 
-	public void testNamedParameterCustomerQueryWithNamedDeclarations() throws SQLException {
+	@Test
+	public void testNamedParameterCustomerQueryWithNamedDeclarations()
+			throws SQLException {
 		doTestNamedParameterCustomerQuery(true);
 	}
 
-	private void doTestNamedParameterCustomerQuery(final boolean namedDeclarations) throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+	private void doTestNamedParameterCustomerQuery(final boolean namedDeclarations)
+			throws SQLException {
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getInt("id")).willReturn(1);
+		given(resultSet.getString("forename")).willReturn("rod");
+		given(connection.prepareStatement(SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED,
+				ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY)
+			).willReturn(preparedStatement);
 
-		mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setString(2, "UK");
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(
-				SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		class CustomerQuery extends MappingSqlQuery {
+		class CustomerQuery extends MappingSqlQuery<Customer> {
 
 			public CustomerQuery(DataSource ds) {
 				super(ds, SELECT_ID_FORENAME_NAMED_PARAMETERS);
@@ -891,7 +555,7 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
+			protected Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
 				cust.setForename(rs.getString(COLUMN_NAMES[1]));
@@ -899,57 +563,35 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			public Customer findCustomer(int id, String country) {
-				Map params = new HashMap();
-				params.put("id", new Integer(id));
+				Map<String, Object> params = new HashMap<String, Object>();
+				params.put("id", id);
 				params.put("country", country);
-				return (Customer) executeByNamedParam(params).get(0);
+				return executeByNamedParam(params).get(0);
 			}
 		}
 
-		CustomerQuery query = new CustomerQuery(mockDataSource);
+		CustomerQuery query = new CustomerQuery(dataSource);
 		Customer cust = query.findCustomer(1, "UK");
 		assertTrue("Customer id was assigned correctly", cust.getId() == 1);
 		assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod"));
+		verify(preparedStatement).setObject(1, 1, Types.NUMERIC);
+		verify(preparedStatement).setString(2, "UK");
+		verify(resultSet).close();
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testNamedParameterInListQuery() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(2);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("juergen");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true, true, false);
+		given(resultSet.getInt("id")).willReturn(1, 2);
+		given(resultSet.getString("forename")).willReturn("rod", "juergen");
 
-		mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setObject(2, new Integer(2), Types.NUMERIC);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
+		given(connection.prepareStatement(SELECT_ID_FORENAME_WHERE_ID_IN_LIST_1,
+				ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY)
+			).willReturn(preparedStatement);
 
-		mockConnection.prepareStatement(
-				SELECT_ID_FORENAME_WHERE_ID_IN_LIST_1, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		class CustomerQuery extends MappingSqlQuery {
+		class CustomerQuery extends MappingSqlQuery<Customer> {
 
 			public CustomerQuery(DataSource ds) {
 				super(ds, SELECT_ID_FORENAME_WHERE_ID_IN_LIST_2);
@@ -959,71 +601,49 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
+			protected Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
 				cust.setForename(rs.getString(COLUMN_NAMES[1]));
 				return cust;
 			}
 
-			public List findCustomers(List ids) {
-				Map params = new HashMap();
+			public List<Customer> findCustomers(List<Integer> ids) {
+				Map<String, Object> params = new HashMap<String, Object>();
 				params.put("ids", ids);
 				return executeByNamedParam(params);
 			}
 		}
 
-		CustomerQuery query = new CustomerQuery(mockDataSource);
-		List ids = new ArrayList();
-		ids.add(new Integer(1));
-		ids.add(new Integer(2));
-		List cust = query.findCustomers(ids);
+		CustomerQuery query = new CustomerQuery(dataSource);
+		List<Integer> ids = new ArrayList<Integer>();
+		ids.add(1);
+		ids.add(2);
+		List<Customer> cust = query.findCustomers(ids);
 
 		assertEquals("We got two customers back", cust.size(), 2);
-		Assert.assertEquals("First customer id was assigned correctly", ((Customer)cust.get(0)).getId(), 1);
-		Assert.assertEquals("First customer forename was assigned correctly", ((Customer)cust.get(0)).getForename(), "rod");
-		Assert.assertEquals("Second customer id was assigned correctly", ((Customer)cust.get(1)).getId(), 2);
-		Assert.assertEquals("Second customer forename was assigned correctly", ((Customer)cust.get(1)).getForename(), "juergen");
+		assertEquals("First customer id was assigned correctly", cust.get(0).getId(), 1);
+		assertEquals("First customer forename was assigned correctly", cust.get(0).getForename(), "rod");
+		assertEquals("Second customer id was assigned correctly", cust.get(1).getId(), 2);
+		assertEquals("Second customer forename was assigned correctly", cust.get(1).getForename(), "juergen");
+		verify(preparedStatement).setObject(1, 1, Types.NUMERIC);
+		verify(preparedStatement).setObject(2, 2, Types.NUMERIC);
+		verify(resultSet).close();
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testNamedParameterQueryReusingParameter() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("rod");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(2);
-		mockResultSet.getString("forename");
-		ctrlResultSet.setReturnValue("juergen");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true, true, false);
+		given(resultSet.getInt("id")).willReturn(1, 2);
+		given(resultSet.getString("forename")).willReturn("rod", "juergen");
 
-		mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.setObject(2, new Integer(1), Types.NUMERIC);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
+		given(connection.prepareStatement(SELECT_ID_FORENAME_WHERE_ID_REUSED_1,
+				ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY)).willReturn(preparedStatement)
+;
 
-		mockConnection.prepareStatement(
-				SELECT_ID_FORENAME_WHERE_ID_REUSED_1, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		class CustomerQuery extends MappingSqlQuery {
+		class CustomerQuery extends MappingSqlQuery<Customer> {
 
 			public CustomerQuery(DataSource ds) {
 				super(ds, SELECT_ID_FORENAME_WHERE_ID_REUSED_2);
@@ -1033,39 +653,44 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
+			protected Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
 				cust.setForename(rs.getString(COLUMN_NAMES[1]));
 				return cust;
 			}
 
-			public List findCustomers(Integer id) {
-				Map params = new HashMap();
+			public List<Customer> findCustomers(Integer id) {
+				Map<String, Object> params = new HashMap<String, Object>();
 				params.put("id1", id);
 				return executeByNamedParam(params);
 			}
 		}
 
-		CustomerQuery query = new CustomerQuery(mockDataSource);
-		List cust = query.findCustomers(new Integer(1));
+		CustomerQuery query = new CustomerQuery(dataSource);
+		List<Customer> cust = query.findCustomers(1);
 
 		assertEquals("We got two customers back", cust.size(), 2);
-		Assert.assertEquals("First customer id was assigned correctly", ((Customer)cust.get(0)).getId(), 1);
-		Assert.assertEquals("First customer forename was assigned correctly", ((Customer)cust.get(0)).getForename(), "rod");
-		Assert.assertEquals("Second customer id was assigned correctly", ((Customer)cust.get(1)).getId(), 2);
-		Assert.assertEquals("Second customer forename was assigned correctly", ((Customer)cust.get(1)).getForename(), "juergen");
+		assertEquals("First customer id was assigned correctly", cust.get(0).getId(), 1);
+		assertEquals("First customer forename was assigned correctly", cust.get(0).getForename(), "rod");
+		assertEquals("Second customer id was assigned correctly", cust.get(1).getId(), 2);
+		assertEquals("Second customer forename was assigned correctly", cust.get(1).getForename(), "juergen");
+
+		verify(preparedStatement).setObject(1, 1, Types.NUMERIC);
+		verify(preparedStatement).setObject(2, 1, Types.NUMERIC);
+		verify(resultSet).close();
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
-	public void testNamedParameterUsingInvalidQuestionMarkPlaceHolders() throws SQLException {
+	@Test
+	public void testNamedParameterUsingInvalidQuestionMarkPlaceHolders()
+			throws SQLException {
+		given(
+		connection.prepareStatement(SELECT_ID_FORENAME_WHERE_ID_REUSED_1,
+				ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY)).willReturn(preparedStatement);
 
-		mockConnection.prepareStatement(
-				SELECT_ID_FORENAME_WHERE_ID_REUSED_1, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		class CustomerQuery extends MappingSqlQuery {
+		class CustomerQuery extends MappingSqlQuery<Customer> {
 
 			public CustomerQuery(DataSource ds) {
 				super(ds, SELECT_ID_FORENAME_WHERE_ID_REUSED_1);
@@ -1075,70 +700,34 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			@Override
-			protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
+			protected Customer mapRow(ResultSet rs, int rownum) throws SQLException {
 				Customer cust = new Customer();
 				cust.setId(rs.getInt(COLUMN_NAMES[0]));
 				cust.setForename(rs.getString(COLUMN_NAMES[1]));
 				return cust;
 			}
 
-			public List findCustomers(Integer id1) {
-				Map params = new HashMap();
+			public List<Customer> findCustomers(Integer id1) {
+				Map<String, Integer> params = new HashMap<String, Integer>();
 				params.put("id1", id1);
 				return executeByNamedParam(params);
 			}
 		}
 
-		CustomerQuery query = new CustomerQuery(mockDataSource);
-		try {
-			List cust = query.findCustomers(new Integer(1));
-			fail("Should have caused an InvalidDataAccessApiUsageException");
-		}
-		catch (InvalidDataAccessApiUsageException e){
-		}
-
+		CustomerQuery query = new CustomerQuery(dataSource);
+		thrown.expect(InvalidDataAccessApiUsageException.class);
+		query.findCustomers(1);
 	}
 
+	@Test
 	public void testUpdateCustomers() throws SQLException {
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(1);
-		mockResultSet.updateString(2, "Rod");
-		ctrlResultSet.setVoidCallable();
-		mockResultSet.updateRow();
-		ctrlResultSet.setVoidCallable();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getInt("id");
-		ctrlResultSet.setReturnValue(2);
-		mockResultSet.updateString(2, "Thomas");
-		ctrlResultSet.setVoidCallable();
-		mockResultSet.updateRow();
-		ctrlResultSet.setVoidCallable();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
+		given(resultSet.next()).willReturn(true, true, false);
+		given(resultSet.getInt("id")).willReturn(1, 2);
+		given(connection.prepareStatement(SELECT_ID_FORENAME_WHERE_ID,
+				ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE)
+			).willReturn(preparedStatement);
 
-		mockPreparedStatement.setObject(1, new Integer(2), Types.NUMERIC);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeQuery();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(
-				SELECT_ID_FORENAME_WHERE_ID, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
-		class CustomerUpdateQuery extends UpdatableSqlQuery {
+		class CustomerUpdateQuery extends UpdatableSqlQuery<Customer> {
 
 			public CustomerUpdateQuery(DataSource ds) {
 				super(ds, SELECT_ID_FORENAME_WHERE_ID);
@@ -1147,20 +736,28 @@ public class SqlQueryTests extends AbstractJdbcTests {
 			}
 
 			@Override
-			protected Object updateRow(ResultSet rs, int rownum, Map context) throws SQLException {
-				rs.updateString(2, "" + context.get(new Integer(rs.getInt(COLUMN_NAMES[0]))));
+			protected Customer updateRow(ResultSet rs, int rownum, Map context)
+					throws SQLException {
+				rs.updateString(2, "" + context.get(rs.getInt(COLUMN_NAMES[0])));
 				return null;
 			}
 		}
-		CustomerUpdateQuery query = new CustomerUpdateQuery(mockDataSource);
-		Map values = new HashMap(2);
-		values.put(new Integer(1), "Rod");
-		values.put(new Integer(2), "Thomas");
-		List customers = query.execute(2, values);
+
+		CustomerUpdateQuery query = new CustomerUpdateQuery(dataSource);
+		Map<Integer, String> values = new HashMap<Integer, String>(2);
+		values.put(1, "Rod");
+		values.put(2, "Thomas");
+		query.execute(2, values);
+		verify(resultSet).updateString(2, "Rod");
+		verify(resultSet).updateString(2, "Thomas");
+		verify(resultSet, times(2)).updateRow();
+		verify(preparedStatement).setObject(1, 2, Types.NUMERIC);
+		verify(resultSet).close();
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
-
-	private static class StringQuery extends MappingSqlQuery {
+	private static class StringQuery extends MappingSqlQuery<String> {
 
 		public StringQuery(DataSource ds, String sql) {
 			super(ds, sql);
@@ -1168,13 +765,13 @@ public class SqlQueryTests extends AbstractJdbcTests {
 		}
 
 		@Override
-		protected Object mapRow(ResultSet rs, int rownum) throws SQLException {
+		protected String mapRow(ResultSet rs, int rownum) throws SQLException {
 			return rs.getString(1);
 		}
 
 		public String[] run() {
-			List list = execute();
-			String[] results = (String[]) list.toArray(new String[list.size()]);
+			List<String> list = execute();
+			String[] results = list.toArray(new String[list.size()]);
 			return results;
 		}
 	}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
index 011fe1624b..07b560f386 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
@@ -16,6 +16,12 @@
 
 package org.springframework.jdbc.object;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -24,13 +30,15 @@ import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.easymock.MockControl;
-import org.apache.commons.logging.LogFactory;
+import javax.sql.DataSource;
 
-import org.springframework.jdbc.AbstractJdbcTests;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.springframework.jdbc.JdbcUpdateAffectedIncorrectNumberOfRowsException;
 import org.springframework.jdbc.core.SqlParameter;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 
@@ -39,151 +47,103 @@ import org.springframework.jdbc.support.KeyHolder;
  * @author Thomas Risberg
  * @author Juergen Hoeller
  */
-public class SqlUpdateTests extends AbstractJdbcTests {
+public class SqlUpdateTests {
 
 	private static final String UPDATE =
-		"update seat_status set booking_id = null";
+			"update seat_status set booking_id = null";
 	private static final String UPDATE_INT =
-		"update seat_status set booking_id = null where performance_id = ?";
+			"update seat_status set booking_id = null where performance_id = ?";
 	private static final String UPDATE_INT_INT =
-		"update seat_status set booking_id = null where performance_id = ? and price_band_id = ?";
+			"update seat_status set booking_id = null where performance_id = ? and price_band_id = ?";
 	private static final String UPDATE_NAMED_PARAMETERS =
-		"update seat_status set booking_id = null where performance_id = :perfId and price_band_id = :priceId";
+			"update seat_status set booking_id = null where performance_id = :perfId and price_band_id = :priceId";
 	private static final String UPDATE_STRING =
-		"update seat_status set booking_id = null where name = ?";
+			"update seat_status set booking_id = null where name = ?";
 	private static final String UPDATE_OBJECTS =
-		"update seat_status set booking_id = null where performance_id = ? and price_band_id = ? and name = ? and confirmed = ?";
+			"update seat_status set booking_id = null where performance_id = ? and price_band_id = ? and name = ? and confirmed = ?";
 	private static final String INSERT_GENERATE_KEYS =
-		"insert into show (name) values(?)";
+			"insert into show (name) values(?)";
 
-	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
-	private MockControl ctrlPreparedStatement;
-	private PreparedStatement mockPreparedStatement;
-	private MockControl ctrlResultSet;
-	private ResultSet mockResultSet;
-	private MockControl ctrlResultSetMetaData;
-	private ResultSetMetaData mockResultSetMetaData;
+	private DataSource dataSource;
+	private Connection connection;
+	private PreparedStatement preparedStatement;
+	private ResultSet resultSet;
+	private ResultSetMetaData resultSetMetaData;
 
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class);
-		mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock();
+	@Before
+	public void setUp() throws Exception {
+		dataSource = mock(DataSource.class);
+		connection = mock(Connection.class);
+		preparedStatement = mock(PreparedStatement.class);
+		resultSet = mock(ResultSet.class);
+		resultSetMetaData = mock(ResultSetMetaData.class);
+		given(dataSource.getConnection()).willReturn(connection);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (shouldVerify()) {
-			ctrlPreparedStatement.verify();
-		}
+	@After
+	public void verifyClosed() throws Exception {
+		verify(preparedStatement).close();
+		verify(connection).close();
 	}
 
-	@Override
-	protected void replay() {
-		super.replay();
-		ctrlPreparedStatement.replay();
-	}
-
-
+	@Test
 	public void testUpdate() throws SQLException {
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(1);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(UPDATE);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
+		given(preparedStatement.executeUpdate()).willReturn(1);
+		given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement);
 
 		Updater pc = new Updater();
 		int rowsAffected = pc.run();
+
 		assertEquals(1, rowsAffected);
 	}
 
+	@Test
 	public void testUpdateInt() throws SQLException {
-		mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(1);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(UPDATE_INT);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
+		given(preparedStatement.executeUpdate()).willReturn(1);
+		given(connection.prepareStatement(UPDATE_INT)).willReturn(preparedStatement);
 
 		IntUpdater pc = new IntUpdater();
 		int rowsAffected = pc.run(1);
+
 		assertEquals(1, rowsAffected);
+		verify(preparedStatement).setObject(1, 1, Types.NUMERIC);
 	}
 
+	@Test
 	public void testUpdateIntInt() throws SQLException {
-		mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC);
-		mockPreparedStatement.setObject(2, new Integer(1), Types.NUMERIC);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(1);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(UPDATE_INT_INT);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
+		given(preparedStatement.executeUpdate()).willReturn(1);
+		given(connection.prepareStatement(UPDATE_INT_INT)).willReturn(preparedStatement);
 
 		IntIntUpdater pc = new IntIntUpdater();
 		int rowsAffected = pc.run(1, 1);
+
 		assertEquals(1, rowsAffected);
+		verify(preparedStatement).setObject(1, 1, Types.NUMERIC);
+		verify(preparedStatement).setObject(2, 1, Types.NUMERIC);
 	}
 
+	@Test
 	public void testNamedParameterUpdateWithUnnamedDeclarations() throws SQLException {
 		doTestNamedParameterUpdate(false);
 	}
 
+	@Test
 	public void testNamedParameterUpdateWithNamedDeclarations() throws SQLException {
 		doTestNamedParameterUpdate(true);
 	}
 
-	private void doTestNamedParameterUpdate(final boolean namedDeclarations) throws SQLException {
-		mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC);
-		mockPreparedStatement.setObject(2, new Integer(1), Types.DECIMAL);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(1);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(UPDATE_INT_INT);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
+	private void doTestNamedParameterUpdate(final boolean namedDeclarations)
+			throws SQLException {
+		given(preparedStatement.executeUpdate()).willReturn(1);
+		given(connection.prepareStatement(UPDATE_INT_INT)).willReturn(preparedStatement);
 
 		class NamedParameterUpdater extends SqlUpdate {
-
 			public NamedParameterUpdater() {
 				setSql(UPDATE_NAMED_PARAMETERS);
-				setDataSource(mockDataSource);
+				setDataSource(dataSource);
 				if (namedDeclarations) {
 					declareParameter(new SqlParameter("priceId", Types.DECIMAL));
 					declareParameter(new SqlParameter("perfId", Types.NUMERIC));
@@ -196,9 +156,9 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 			}
 
 			public int run(int performanceId, int type) {
-				Map params = new HashMap();
-				params.put("perfId", new Integer(performanceId));
-				params.put("priceId", new Integer(type));
+				Map<String, Integer> params = new HashMap<String, Integer>();
+				params.put("perfId", performanceId);
+				params.put("priceId", type);
 				return updateByNamedParam(params);
 			}
 		}
@@ -206,245 +166,134 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 		NamedParameterUpdater pc = new NamedParameterUpdater();
 		int rowsAffected = pc.run(1, 1);
 		assertEquals(1, rowsAffected);
+		verify(preparedStatement).setObject(1, 1, Types.NUMERIC);
+		verify(preparedStatement).setObject(2, 1, Types.DECIMAL);
 	}
 
+	@Test
 	public void testUpdateString() throws SQLException {
-		mockPreparedStatement.setString(1, "rod");
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(1);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(UPDATE_STRING);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
+		given(preparedStatement.executeUpdate()).willReturn(1);
+		given(connection.prepareStatement(UPDATE_STRING)).willReturn(preparedStatement);
 
 		StringUpdater pc = new StringUpdater();
 		int rowsAffected = pc.run("rod");
+
 		assertEquals(1, rowsAffected);
+		verify(preparedStatement).setString(1, "rod");
 	}
 
+	@Test
 	public void testUpdateMixed() throws SQLException {
-		mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC);
-		mockPreparedStatement.setObject(2, new Integer(1), Types.NUMERIC, 2);
-		mockPreparedStatement.setString(3, "rod");
-		mockPreparedStatement.setObject(4, Boolean.TRUE, Types.BOOLEAN);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(1);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(UPDATE_OBJECTS);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
+		given(preparedStatement.executeUpdate()).willReturn(1);
+		given(connection.prepareStatement(UPDATE_OBJECTS)).willReturn(preparedStatement);
 
 		MixedUpdater pc = new MixedUpdater();
 		int rowsAffected = pc.run(1, 1, "rod", true);
+
 		assertEquals(1, rowsAffected);
+		verify(preparedStatement).setObject(1, 1, Types.NUMERIC);
+		verify(preparedStatement).setObject(2, 1, Types.NUMERIC, 2);
+		verify(preparedStatement).setString(3, "rod");
+		verify(preparedStatement).setObject(4, Boolean.TRUE, Types.BOOLEAN);
 	}
 
+	@Test
 	public void testUpdateAndGeneratedKeys() throws SQLException {
-		ctrlResultSetMetaData = MockControl.createControl(ResultSetMetaData.class);
-		mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock();
-		mockResultSetMetaData.getColumnCount();
-		ctrlResultSetMetaData.setReturnValue(1);
-		mockResultSetMetaData.getColumnLabel(1);
-		ctrlResultSetMetaData.setReturnValue("1", 2);
-
-		ctrlResultSet = MockControl.createControl(ResultSet.class);
-		mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.getMetaData();
-		ctrlResultSet.setReturnValue(mockResultSetMetaData);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getObject(1);
-		ctrlResultSet.setReturnValue(new Integer(11));
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockPreparedStatement.setString(1, "rod");
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(1);
-		mockPreparedStatement.getGeneratedKeys();
-		ctrlPreparedStatement.setReturnValue(mockResultSet);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(INSERT_GENERATE_KEYS, PreparedStatement.RETURN_GENERATED_KEYS);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-		ctrlResultSet.replay();
-		ctrlResultSetMetaData.replay();
+		given(resultSetMetaData.getColumnCount()).willReturn(1);
+		given(resultSetMetaData.getColumnLabel(1)).willReturn("1");
+		given(resultSet.getMetaData()).willReturn(resultSetMetaData);
+		given(resultSet.next()).willReturn(true, false);
+		given(resultSet.getObject(1)).willReturn(11);
+		given(preparedStatement.executeUpdate()).willReturn(1);
+		given(preparedStatement.getGeneratedKeys()).willReturn(resultSet);
+		given(connection.prepareStatement(INSERT_GENERATE_KEYS,
+				PreparedStatement.RETURN_GENERATED_KEYS)
+			).willReturn(preparedStatement);
 
 		GeneratedKeysUpdater pc = new GeneratedKeysUpdater();
 		KeyHolder generatedKeyHolder = new GeneratedKeyHolder();
 		int rowsAffected = pc.run("rod", generatedKeyHolder);
+
 		assertEquals(1, rowsAffected);
 		assertEquals(1, generatedKeyHolder.getKeyList().size());
 		assertEquals(11, generatedKeyHolder.getKey().intValue());
+		verify(preparedStatement).setString(1, "rod");
+		verify(resultSet).close();
 	}
 
+	@Test
 	public void testUpdateConstructor() throws SQLException {
-		mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC);
-		mockPreparedStatement.setObject(2, new Integer(1), Types.NUMERIC);
-		mockPreparedStatement.setString(3, "rod");
-		mockPreparedStatement.setObject(4, Boolean.TRUE, Types.BOOLEAN);
-		ctrlPreparedStatement.setVoidCallable();
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(1);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(UPDATE_OBJECTS);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
+		given(preparedStatement.executeUpdate()).willReturn(1);
+		given(connection.prepareStatement(UPDATE_OBJECTS)).willReturn(preparedStatement);
 		ConstructorUpdater pc = new ConstructorUpdater();
+
 		int rowsAffected = pc.run(1, 1, "rod", true);
+
 		assertEquals(1, rowsAffected);
+		verify(preparedStatement).setObject(1, 1, Types.NUMERIC);
+		verify(preparedStatement).setObject(2, 1, Types.NUMERIC);
+		verify(preparedStatement).setString(3, "rod");
+		verify(preparedStatement).setObject(4, Boolean.TRUE, Types.BOOLEAN);
 	}
 
+	@Test
 	public void testUnderMaxRows() throws SQLException {
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(3);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(UPDATE);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
+		given(preparedStatement.executeUpdate()).willReturn(3);
+		given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement);
 
 		MaxRowsUpdater pc = new MaxRowsUpdater();
+
 		int rowsAffected = pc.run();
 		assertEquals(3, rowsAffected);
 	}
 
+	@Test
 	public void testMaxRows() throws SQLException {
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(5);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(UPDATE);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
+		given(preparedStatement.executeUpdate()).willReturn(5);
+		given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement);
 
 		MaxRowsUpdater pc = new MaxRowsUpdater();
 		int rowsAffected = pc.run();
+
 		assertEquals(5, rowsAffected);
 	}
 
+	@Test
 	public void testOverMaxRows() throws SQLException {
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(8);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(UPDATE);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
+		given(preparedStatement.executeUpdate()).willReturn(8);
+		given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement);
 
 		MaxRowsUpdater pc = new MaxRowsUpdater();
-		try {
-			int rowsAffected = pc.run();
-			fail("Shouldn't continue when too many rows affected");
-		}
-		catch (JdbcUpdateAffectedIncorrectNumberOfRowsException juaicrex) {
-			// OK
-		}
+
+		thrown.expect(JdbcUpdateAffectedIncorrectNumberOfRowsException.class);
+		pc.run();
 	}
 
+	@Test
 	public void testRequiredRows() throws SQLException {
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(3);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(UPDATE);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
+		given(preparedStatement.executeUpdate()).willReturn(3);
+		given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement);
 
 		RequiredRowsUpdater pc = new RequiredRowsUpdater();
 		int rowsAffected = pc.run();
+
 		assertEquals(3, rowsAffected);
 	}
 
+	@Test
 	public void testNotRequiredRows() throws SQLException {
-		mockPreparedStatement.executeUpdate();
-		ctrlPreparedStatement.setReturnValue(2);
-		if (debugEnabled) {
-			mockPreparedStatement.getWarnings();
-			ctrlPreparedStatement.setReturnValue(null);
-		}
-		mockPreparedStatement.close();
-		ctrlPreparedStatement.setVoidCallable();
-
-		mockConnection.prepareStatement(UPDATE);
-		ctrlConnection.setReturnValue(mockPreparedStatement);
-
-		replay();
-
+		given(preparedStatement.executeUpdate()).willReturn(2);
+		given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement);
+		thrown.expect(JdbcUpdateAffectedIncorrectNumberOfRowsException.class);
 		RequiredRowsUpdater pc = new RequiredRowsUpdater();
-		try {
-			int rowsAffected = pc.run();
-			fail("Shouldn't continue when too many rows affected");
-		}
-		catch (JdbcUpdateAffectedIncorrectNumberOfRowsException juaicrex) {
-			// OK
-		}
+		pc.run();
 	}
 
-
 	private class Updater extends SqlUpdate {
 
 		public Updater() {
 			setSql(UPDATE);
-			setDataSource(mockDataSource);
+			setDataSource(dataSource);
 			compile();
 		}
 
@@ -458,7 +307,7 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 
 		public IntUpdater() {
 			setSql(UPDATE_INT);
-			setDataSource(mockDataSource);
+			setDataSource(dataSource);
 			declareParameter(new SqlParameter(Types.NUMERIC));
 			compile();
 		}
@@ -473,7 +322,7 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 
 		public IntIntUpdater() {
 			setSql(UPDATE_INT_INT);
-			setDataSource(mockDataSource);
+			setDataSource(dataSource);
 			declareParameter(new SqlParameter(Types.NUMERIC));
 			declareParameter(new SqlParameter(Types.NUMERIC));
 			compile();
@@ -489,7 +338,7 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 
 		public StringUpdater() {
 			setSql(UPDATE_STRING);
-			setDataSource(mockDataSource);
+			setDataSource(dataSource);
 			declareParameter(new SqlParameter(Types.VARCHAR));
 			compile();
 		}
@@ -504,7 +353,7 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 
 		public MixedUpdater() {
 			setSql(UPDATE_OBJECTS);
-			setDataSource(mockDataSource);
+			setDataSource(dataSource);
 			declareParameter(new SqlParameter(Types.NUMERIC));
 			declareParameter(new SqlParameter(Types.NUMERIC, 2));
 			declareParameter(new SqlParameter(Types.VARCHAR));
@@ -514,7 +363,7 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 
 		public int run(int performanceId, int type, String name, boolean confirmed) {
 			Object[] params =
-				new Object[] {new Integer(performanceId), new Integer(type), name,
+				new Object[] {performanceId, type, name,
 											new Boolean(confirmed)};
 			return update(params);
 		}
@@ -525,7 +374,7 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 
 		public GeneratedKeysUpdater() {
 			setSql(INSERT_GENERATE_KEYS);
-			setDataSource(mockDataSource);
+			setDataSource(dataSource);
 			declareParameter(new SqlParameter(Types.VARCHAR));
 			setReturnGeneratedKeys(true);
 			compile();
@@ -541,7 +390,7 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 	private class ConstructorUpdater extends SqlUpdate {
 
 		public ConstructorUpdater() {
-			super(mockDataSource, UPDATE_OBJECTS,
+			super(dataSource, UPDATE_OBJECTS,
 					new int[] {Types.NUMERIC, Types.NUMERIC, Types.VARCHAR, Types.BOOLEAN });
 			compile();
 		}
@@ -549,7 +398,7 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 		public int run(int performanceId, int type, String name, boolean confirmed) {
 			Object[] params =
 				new Object[] {
-					new Integer(performanceId), new Integer(type), name, new Boolean(confirmed)};
+					performanceId, type, name, new Boolean(confirmed)};
 			return update(params);
 		}
 	}
@@ -559,7 +408,7 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 
 		public MaxRowsUpdater() {
 			setSql(UPDATE);
-			setDataSource(mockDataSource);
+			setDataSource(dataSource);
 			setMaxRowsAffected(5);
 			compile();
 		}
@@ -574,7 +423,7 @@ public class SqlUpdateTests extends AbstractJdbcTests {
 
 		public RequiredRowsUpdater() {
 			setSql(UPDATE);
-			setDataSource(mockDataSource);
+			setDataSource(dataSource);
 			setRequiredRowsAffected(3);
 			compile();
 		}
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
index 3dae947930..d1bde67770 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
@@ -16,25 +16,37 @@
 
 package org.springframework.jdbc.object;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.startsWith;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import java.math.BigDecimal;
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
-import java.sql.ResultSetMetaData;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.math.BigDecimal;
 
 import javax.sql.DataSource;
 
-import org.easymock.MockControl;
-import org.apache.commons.logging.LogFactory;
-
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.jdbc.AbstractJdbcTests;
 import org.springframework.jdbc.BadSqlGrammarException;
 import org.springframework.jdbc.core.CallableStatementCreator;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -55,707 +67,381 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @author Trevor Cook
  * @author Rod Johnson
  */
-public class StoredProcedureTests extends AbstractJdbcTests {
+public class StoredProcedureTests {
 
-	private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled();
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
-	private MockControl ctrlCallable;
-	private CallableStatement mockCallable;
+	private DataSource dataSource;
+	private Connection connection;
+	private CallableStatement callableStatement;
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
+	private boolean verifyClosedAfter = true;
 
-		ctrlCallable = MockControl.createControl(CallableStatement.class);
-		mockCallable = (CallableStatement) ctrlCallable.getMock();
+	@Before
+	public void setup() throws Exception {
+		dataSource = mock(DataSource.class);
+		connection = mock(Connection.class);
+		callableStatement = mock(CallableStatement.class);
+		given(dataSource.getConnection()).willReturn(connection);
+		given(callableStatement.getConnection()).willReturn(connection);
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (shouldVerify()) {
-			ctrlCallable.verify();
+	@After
+	public void verifyClosed() throws Exception {
+		if(verifyClosedAfter) {
+			verify(callableStatement).close();
+			verify(connection, atLeastOnce()).close();
 		}
 	}
 
-	@Override
-	protected void replay() {
-		super.replay();
-		ctrlCallable.replay();
-	}
-
+	@Test
 	public void testNoSuchStoredProcedure() throws Exception {
-		SQLException sex =
-			new SQLException(
-				"Syntax error or access violation exception",
-				"42000");
-		mockCallable.execute();
-		ctrlCallable.setThrowable(sex);
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
+		SQLException sqlException = new SQLException(
+				"Syntax error or access violation exception", "42000");
+		given(callableStatement.execute()).willThrow(sqlException);
+		given(connection.prepareCall("{call " + NoSuchStoredProcedure.SQL + "()}")).willReturn(
+				callableStatement);
 
-		mockConnection.prepareCall(
-			"{call " + NoSuchStoredProcedure.SQL + "()}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-
-		NoSuchStoredProcedure sproc = new NoSuchStoredProcedure(mockDataSource);
-		try {
-			sproc.execute();
-			fail("Shouldn't succeed in running stored procedure which doesn't exist");
-		} catch (BadSqlGrammarException ex) {
-			// OK
-		}
+		NoSuchStoredProcedure sproc = new NoSuchStoredProcedure(dataSource);
+		thrown.expect(BadSqlGrammarException.class);
+		sproc.execute();
 	}
 
-	private void testAddInvoice(final int amount, final int custid)
-		throws Exception {
-		AddInvoice adder = new AddInvoice(mockDataSource);
+	private void testAddInvoice(final int amount, final int custid) throws Exception {
+		AddInvoice adder = new AddInvoice(dataSource);
 		int id = adder.execute(amount, custid);
 		assertEquals(4, id);
 	}
 
 	private void testAddInvoiceUsingObjectArray(final int amount, final int custid)
-		throws Exception {
-		AddInvoiceUsingObjectArray adder = new AddInvoiceUsingObjectArray(mockDataSource);
+			throws Exception {
+		AddInvoiceUsingObjectArray adder = new AddInvoiceUsingObjectArray(dataSource);
 		int id = adder.execute(amount, custid);
 		assertEquals(5, id);
 	}
 
+	@Test
 	public void testAddInvoices() throws Exception {
-		mockCallable.setObject(1, new Integer(1106), Types.INTEGER);
-		ctrlCallable.setVoidCallable();
-		mockCallable.setObject(2, new Integer(3), Types.INTEGER);
-		ctrlCallable.setVoidCallable();
-		mockCallable.registerOutParameter(3, Types.INTEGER);
-		ctrlCallable.setVoidCallable();
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getObject(3);
-		ctrlCallable.setReturnValue(new Integer(4));
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		mockConnection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
+		given(callableStatement.execute()).willReturn(false);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(callableStatement.getObject(3)).willReturn(4);
+		given(connection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}")
+				).willReturn(callableStatement);
 		testAddInvoice(1106, 3);
-
+		verify(callableStatement).setObject(1, 1106, Types.INTEGER);
+		verify(callableStatement).setObject(2, 3, Types.INTEGER);
+		verify(callableStatement).registerOutParameter(3, Types.INTEGER);
 	}
 
+	@Test
 	public void testAddInvoicesUsingObjectArray() throws Exception {
-		mockCallable.setObject(1, new Integer(1106), Types.INTEGER);
-		ctrlCallable.setVoidCallable();
-		mockCallable.setObject(2, new Integer(4), Types.INTEGER);
-		ctrlCallable.setVoidCallable();
-		mockCallable.registerOutParameter(3, Types.INTEGER);
-		ctrlCallable.setVoidCallable();
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getObject(3);
-		ctrlCallable.setReturnValue(new Integer(5));
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		mockConnection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
+		given(callableStatement.execute()).willReturn(false);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(callableStatement.getObject(3)).willReturn(5);
+		given(connection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}")
+				).willReturn(callableStatement);
 		testAddInvoiceUsingObjectArray(1106, 4);
-
+		verify(callableStatement).setObject(1, 1106, Types.INTEGER);
+		verify(callableStatement).setObject(2, 4, Types.INTEGER);
+		verify(callableStatement).registerOutParameter(3, Types.INTEGER);
 	}
 
+	@Test
 	public void testAddInvoicesWithinTransaction() throws Exception {
-		mockCallable.setObject(1, new Integer(1106), Types.INTEGER);
-		ctrlCallable.setVoidCallable();
-		mockCallable.setObject(2, new Integer(3), Types.INTEGER);
-		ctrlCallable.setVoidCallable();
-		mockCallable.registerOutParameter(3, Types.INTEGER);
-		ctrlCallable.setVoidCallable();
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getObject(3);
-		ctrlCallable.setReturnValue(new Integer(4));
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		mockConnection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-
-		TransactionSynchronizationManager.bindResource(
-			mockDataSource,
-			new ConnectionHolder(mockConnection));
-
+		given(callableStatement.execute()).willReturn(false);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(callableStatement.getObject(3)).willReturn(4);
+		given(connection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}")
+				).willReturn(callableStatement);
+		TransactionSynchronizationManager.bindResource(dataSource, new ConnectionHolder(connection));
 		try {
 			testAddInvoice(1106, 3);
+			verify(callableStatement).setObject(1, 1106, Types.INTEGER);
+			verify(callableStatement).setObject(2, 3, Types.INTEGER);
+			verify(callableStatement).registerOutParameter(3, Types.INTEGER);
+			verify(connection, never()).close();
 		}
 		finally {
-			TransactionSynchronizationManager.unbindResource(mockDataSource);
+			TransactionSynchronizationManager.unbindResource(dataSource);
+			connection.close();
 		}
 	}
 
-
 	/**
-	 * Confirm no connection was used to get metadata.
-	 * Does not use superclass replay mechanism.
+	 * Confirm no connection was used to get metadata. Does not use superclass replay
+	 * mechanism.
+	 *
 	 * @throws Exception
 	 */
-	public void testStoredProcedureConfiguredViaJdbcTemplateWithCustomExceptionTranslator() throws Exception {
-		mockCallable.setObject(1, new Integer(11), Types.INTEGER);
-		ctrlCallable.setVoidCallable(1);
-		mockCallable.registerOutParameter(2, Types.INTEGER);
-		ctrlCallable.setVoidCallable(1);
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(false, 1);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getObject(2);
-		ctrlCallable.setReturnValue(new Integer(5), 1);
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable(1);
-		// Must call this here as we're not using setUp()/tearDown() mechanism
-		ctrlCallable.replay();
-
-		ctrlConnection = MockControl.createControl(Connection.class);
-		mockConnection = (Connection) ctrlConnection.getMock();
-		mockConnection.prepareCall("{call " + StoredProcedureConfiguredViaJdbcTemplate.SQL + "(?, ?)}");
-		ctrlConnection.setReturnValue(mockCallable, 1);
-		mockConnection.close();
-		ctrlConnection.setVoidCallable(1);
-		ctrlConnection.replay();
-
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource localDs = (DataSource) dsControl.getMock();
-		localDs.getConnection();
-		dsControl.setReturnValue(mockConnection, 1);
-		dsControl.replay();
+	@Test
+	public void testStoredProcedureConfiguredViaJdbcTemplateWithCustomExceptionTranslator()
+			throws Exception {
+		given(callableStatement.execute()).willReturn(false);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(callableStatement.getObject(2)).willReturn(5);
+		given(connection.prepareCall("{call " + StoredProcedureConfiguredViaJdbcTemplate.SQL + "(?, ?)}")
+				).willReturn(callableStatement);
 
 		class TestJdbcTemplate extends JdbcTemplate {
+
 			int calls;
+
 			@Override
-			public Map call(CallableStatementCreator csc, List declaredParameters) throws DataAccessException {
+			public Map<String, Object> call(CallableStatementCreator csc,
+					List<SqlParameter> declaredParameters) throws DataAccessException {
 				calls++;
 				return super.call(csc, declaredParameters);
 			}
-
 		}
 		TestJdbcTemplate t = new TestJdbcTemplate();
-		t.setDataSource(localDs);
-		// Will fail without the following, because we're not able to get a connection from the
-		// DataSource here if we need to to create an ExceptionTranslator
+		t.setDataSource(dataSource);
+		// Will fail without the following, because we're not able to get a connection
+		// from the DataSource here if we need to to create an ExceptionTranslator
 		t.setExceptionTranslator(new SQLStateSQLExceptionTranslator());
 		StoredProcedureConfiguredViaJdbcTemplate sp = new StoredProcedureConfiguredViaJdbcTemplate(t);
 
 		assertEquals(sp.execute(11), 5);
 		assertEquals(1, t.calls);
 
-		dsControl.verify();
-		ctrlCallable.verify();
-		ctrlConnection.verify();
+		verify(callableStatement).setObject(1, 11, Types.INTEGER);
+		verify(callableStatement).registerOutParameter(2, Types.INTEGER);
 	}
 
 	/**
 	 * Confirm our JdbcTemplate is used
+	 *
 	 * @throws Exception
 	 */
+	@Test
 	public void testStoredProcedureConfiguredViaJdbcTemplate() throws Exception {
-		mockCallable.setObject(1, new Integer(1106), Types.INTEGER);
-		ctrlCallable.setVoidCallable();
-		mockCallable.registerOutParameter(2, Types.INTEGER);
-		ctrlCallable.setVoidCallable();
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getObject(2);
-		ctrlCallable.setReturnValue(new Integer(4));
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		mockConnection.prepareCall("{call " + StoredProcedureConfiguredViaJdbcTemplate.SQL + "(?, ?)}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
+		given(callableStatement.execute()).willReturn(false);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(callableStatement.getObject(2)).willReturn(4);
+		given(connection.prepareCall("{call " + StoredProcedureConfiguredViaJdbcTemplate.SQL + "(?, ?)}")
+				).willReturn(callableStatement);
 		JdbcTemplate t = new JdbcTemplate();
-		t.setDataSource(mockDataSource);
+		t.setDataSource(dataSource);
 		StoredProcedureConfiguredViaJdbcTemplate sp = new StoredProcedureConfiguredViaJdbcTemplate(t);
-
 		assertEquals(sp.execute(1106), 4);
+		verify(callableStatement).setObject(1, 1106, Types.INTEGER);
+		verify(callableStatement).registerOutParameter(2, Types.INTEGER);
 	}
 
+	@Test
 	public void testNullArg() throws Exception {
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-
-		mockCallable.setNull(1, Types.VARCHAR);
-		ctrlCallable.setVoidCallable();
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		mockConnection.prepareCall("{call " + NullArg.SQL + "(?)}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-		ctrlResultSet.replay();
-
-		NullArg na = new NullArg(mockDataSource);
+		given(callableStatement.execute()).willReturn(false);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(connection.prepareCall("{call " + NullArg.SQL + "(?)}")).willReturn(callableStatement);
+		NullArg na = new NullArg(dataSource);
 		na.execute((String) null);
+		callableStatement.setNull(1, Types.VARCHAR);
 	}
 
+	@Test
 	public void testUnnamedParameter() throws Exception {
-		replay();
-		try {
-			UnnamedParameterStoredProcedure unp =
-				new UnnamedParameterStoredProcedure(mockDataSource);
-			fail("Shouldn't succeed in creating stored procedure with unnamed parameter");
-		} catch (InvalidDataAccessApiUsageException idaauex) {
-			// OK
-		}
+		this.verifyClosedAfter = false;
+		// Shouldn't succeed in creating stored procedure with unnamed parameter
+		thrown.expect(InvalidDataAccessApiUsageException.class);
+		new UnnamedParameterStoredProcedure(dataSource);
 	}
 
+	@Test
 	public void testMissingParameter() throws Exception {
-		replay();
-
-		try {
-			MissingParameterStoredProcedure mp =
-				new MissingParameterStoredProcedure(mockDataSource);
-			mp.execute();
-			fail("Shouldn't succeed in running stored procedure with missing required parameter");
-		} catch (InvalidDataAccessApiUsageException idaauex) {
-			// OK
-		}
+		this.verifyClosedAfter = false;
+		MissingParameterStoredProcedure mp = new MissingParameterStoredProcedure(dataSource);
+		thrown.expect(InvalidDataAccessApiUsageException.class);
+		mp.execute();
+		fail("Shouldn't succeed in running stored procedure with missing required parameter");
 	}
 
+	@Test
 	public void testStoredProcedureExceptionTranslator() throws Exception {
-		SQLException sex =
-			new SQLException(
-				"Syntax error or access violation exception",
-				"42000");
-		mockCallable.execute();
-		ctrlCallable.setThrowable(sex);
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		mockConnection.prepareCall(
-			"{call " + StoredProcedureExceptionTranslator.SQL + "()}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-
-		StoredProcedureExceptionTranslator sproc =
-			new StoredProcedureExceptionTranslator(mockDataSource);
-		try {
-			sproc.execute();
-			fail("Custom exception should be thrown");
-		} catch (CustomDataException ex) {
-			// OK
-		}
-	}
-
-	public void testStoredProcedureWithResultSet() throws Exception {
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(true);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getResultSet();
-		ctrlCallable.setReturnValue(mockResultSet);
-		mockCallable.getMoreResults();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		mockConnection.prepareCall("{call " + StoredProcedureWithResultSet.SQL + "()}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-		ctrlResultSet.replay();
-
-		StoredProcedureWithResultSet sproc = new StoredProcedureWithResultSet(mockDataSource);
+		SQLException sqlException = new SQLException(
+				"Syntax error or access violation exception", "42000");
+		given(callableStatement.execute()).willThrow(sqlException);
+		given(connection.prepareCall("{call " + StoredProcedureExceptionTranslator.SQL + "()}")
+				).willReturn(callableStatement);
+		StoredProcedureExceptionTranslator sproc = new StoredProcedureExceptionTranslator(dataSource);
+		thrown.expect(CustomDataException.class);
 		sproc.execute();
-
-		ctrlResultSet.verify();
-		assertEquals(2, sproc.getCount());
 	}
 
+	@Test
+	public void testStoredProcedureWithResultSet() throws Exception {
+		ResultSet resultSet = mock(ResultSet.class);
+		given(resultSet.next()).willReturn(true, true, false);
+		given(callableStatement.execute()).willReturn(true);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(callableStatement.getResultSet()).willReturn(resultSet);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(connection.prepareCall("{call " + StoredProcedureWithResultSet.SQL + "()}")
+				).willReturn(callableStatement);
+		StoredProcedureWithResultSet sproc = new StoredProcedureWithResultSet(dataSource);
+		sproc.execute();
+		assertEquals(2, sproc.getCount());
+		verify(resultSet).close();
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
 	public void testStoredProcedureWithResultSetMapped() throws Exception {
-		MockControl ctrlResultSet = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock();
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getString(2);
-		ctrlResultSet.setReturnValue("Foo");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(true);
-		mockResultSet.getString(2);
-		ctrlResultSet.setReturnValue("Bar");
-		mockResultSet.next();
-		ctrlResultSet.setReturnValue(false);
-		mockResultSet.close();
-		ctrlResultSet.setVoidCallable();
-
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(true);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getResultSet();
-		ctrlCallable.setReturnValue(mockResultSet);
-		mockCallable.getMoreResults();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		mockConnection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-		ctrlResultSet.replay();
-
-		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(mockDataSource);
-		Map res = sproc.execute();
-
-		ctrlResultSet.verify();
-
-		List rs = (List) res.get("rs");
+		ResultSet resultSet = mock(ResultSet.class);
+		given(resultSet.next()).willReturn(true, true, false);
+		given(resultSet.getString(2)).willReturn("Foo", "Bar");
+		given(callableStatement.execute()).willReturn(true);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(callableStatement.getResultSet()).willReturn(resultSet);
+		given(callableStatement.getMoreResults()).willReturn(false);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}")
+				).willReturn(callableStatement);
+		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(dataSource);
+		Map<String, Object> res = sproc.execute();
+		List<String> rs = (List<String>) res.get("rs");
 		assertEquals(2, rs.size());
 		assertEquals("Foo", rs.get(0));
 		assertEquals("Bar", rs.get(1));
-
+		verify(resultSet).close();
 	}
 
+	@Test
+	@SuppressWarnings("unchecked")
 	public void testStoredProcedureWithUndeclaredResults() throws Exception {
-		MockControl ctrlResultSet1 = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet1 = (ResultSet) ctrlResultSet1.getMock();
-		mockResultSet1.next();
-		ctrlResultSet1.setReturnValue(true);
-		mockResultSet1.getString(2);
-		ctrlResultSet1.setReturnValue("Foo");
-		mockResultSet1.next();
-		ctrlResultSet1.setReturnValue(true);
-		mockResultSet1.getString(2);
-		ctrlResultSet1.setReturnValue("Bar");
-		mockResultSet1.next();
-		ctrlResultSet1.setReturnValue(false);
-		mockResultSet1.close();
-		ctrlResultSet1.setVoidCallable();
+		ResultSet resultSet1 = mock(ResultSet.class);
+		given(resultSet1.next()).willReturn(true, true, false);
+		given(resultSet1.getString(2)).willReturn("Foo", "Bar");
 
-		MockControl ctrlMetaData = MockControl.createControl(ResultSetMetaData.class);
-		ResultSetMetaData mockMetaData = (ResultSetMetaData) ctrlMetaData.getMock();
-		mockMetaData.getColumnCount();
-		ctrlMetaData.setReturnValue(2);
-		mockMetaData.getColumnLabel(1);
-		ctrlMetaData.setReturnValue("spam");
-		mockMetaData.getColumnLabel(2);
-		ctrlMetaData.setReturnValue("eggs");
+		ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class);
+		given(resultSetMetaData.getColumnCount()).willReturn(2);
+		given(resultSetMetaData.getColumnLabel(1)).willReturn("spam");
+		given(resultSetMetaData.getColumnLabel(2)).willReturn("eggs");
 
-		MockControl ctrlResultSet2 = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet2 = (ResultSet) ctrlResultSet2.getMock();
-		mockResultSet2.getMetaData();
-		ctrlResultSet2.setReturnValue(mockMetaData);
-		mockResultSet2.next();
-		ctrlResultSet2.setReturnValue(true);
-		mockResultSet2.getObject(1);
-		ctrlResultSet2.setReturnValue("Spam");
-		mockResultSet2.getObject(2);
-		ctrlResultSet2.setReturnValue("Eggs");
-		mockResultSet2.next();
-		ctrlResultSet2.setReturnValue(false);
-		mockResultSet2.close();
-		ctrlResultSet2.setVoidCallable();
+		ResultSet resultSet2 = mock(ResultSet.class);
+		given(resultSet2.getMetaData()).willReturn(resultSetMetaData);
+		given(resultSet2.next()).willReturn(true, false);
+		given(resultSet2.getObject(1)).willReturn("Spam");
+		given(resultSet2.getObject(2)).willReturn("Eggs");
 
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(true);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getResultSet();
-		ctrlCallable.setReturnValue(mockResultSet1);
-		mockCallable.getMoreResults();
-		ctrlCallable.setReturnValue(true);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getResultSet();
-		ctrlCallable.setReturnValue(mockResultSet2);
-		mockCallable.getMoreResults();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(0);
-		mockCallable.getMoreResults();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
+		given(callableStatement.execute()).willReturn(true);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(callableStatement.getResultSet()).willReturn(resultSet1, resultSet2);
+		given(callableStatement.getMoreResults()).willReturn(true, false, false);
+		given(callableStatement.getUpdateCount()).willReturn(-1, -1, 0, -1);
+		given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}")
+				).willReturn(callableStatement);
 
-		mockConnection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-		ctrlResultSet1.replay();
-		ctrlMetaData.replay();
-		ctrlResultSet2.replay();
-
-		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(mockDataSource);
-		Map res = sproc.execute();
-
-		ctrlResultSet1.verify();
-		ctrlResultSet2.verify();
+		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(dataSource);
+		Map<String, Object> res = sproc.execute();
 
 		assertEquals("incorrect number of returns", 3, res.size());
 
-		List rs1 = (List) res.get("rs");
+		List<String> rs1 = (List<String>) res.get("rs");
 		assertEquals(2, rs1.size());
 		assertEquals("Foo", rs1.get(0));
 		assertEquals("Bar", rs1.get(1));
 
-		List rs2 = (List) res.get("#result-set-2");
+		List<Object> rs2 = (List<Object>) res.get("#result-set-2");
 		assertEquals(1, rs2.size());
 		Object o2 = rs2.get(0);
 		assertTrue("wron type returned for result set 2", o2 instanceof Map);
-		Map m2 = (Map) o2;
+		Map<String, String> m2 = (Map<String, String>) o2;
 		assertEquals("Spam", m2.get("spam"));
 		assertEquals("Eggs", m2.get("eggs"));
 
 		Number n = (Number) res.get("#update-count-1");
 		assertEquals("wrong update count", 0, n.intValue());
+		verify(resultSet1).close();
+		verify(resultSet2).close();
 	}
 
+	@Test
 	public void testStoredProcedureSkippingResultsProcessing() throws Exception {
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(true);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		mockConnection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-
-		JdbcTemplate jdbcTemplate = new JdbcTemplate(mockDataSource);
+		given(callableStatement.execute()).willReturn(true);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}")
+				).willReturn(callableStatement);
+		JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 		jdbcTemplate.setSkipResultsProcessing(true);
-		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(jdbcTemplate);
-		Map res = sproc.execute();
-
+		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(
+				jdbcTemplate);
+		Map<String, Object> res = sproc.execute();
 		assertEquals("incorrect number of returns", 0, res.size());
 	}
 
+	@Test
+	@SuppressWarnings("unchecked")
 	public void testStoredProcedureSkippingUndeclaredResults() throws Exception {
-		MockControl ctrlResultSet1 = MockControl.createControl(ResultSet.class);
-		ResultSet mockResultSet1 = (ResultSet) ctrlResultSet1.getMock();
-		mockResultSet1.next();
-		ctrlResultSet1.setReturnValue(true);
-		mockResultSet1.getString(2);
-		ctrlResultSet1.setReturnValue("Foo");
-		mockResultSet1.next();
-		ctrlResultSet1.setReturnValue(true);
-		mockResultSet1.getString(2);
-		ctrlResultSet1.setReturnValue("Bar");
-		mockResultSet1.next();
-		ctrlResultSet1.setReturnValue(false);
-		mockResultSet1.close();
-		ctrlResultSet1.setVoidCallable();
+		ResultSet resultSet = mock(ResultSet.class);
+		given(resultSet.next()).willReturn(true, true, false);
+		given(resultSet.getString(2)).willReturn("Foo", "Bar");
+		given(callableStatement.execute()).willReturn(true);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(callableStatement.getResultSet()).willReturn(resultSet);
+		given(callableStatement.getMoreResults()).willReturn(true, false);
+		given(callableStatement.getUpdateCount()).willReturn(-1, -1);
+		given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}")
+				).willReturn(callableStatement);
 
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(true);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getResultSet();
-		ctrlCallable.setReturnValue(mockResultSet1);
-		mockCallable.getMoreResults();
-		ctrlCallable.setReturnValue(true);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getMoreResults();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		mockConnection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-		ctrlResultSet1.replay();
-
-		JdbcTemplate jdbcTemplate = new JdbcTemplate(mockDataSource);
+		JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 		jdbcTemplate.setSkipUndeclaredResults(true);
-		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(jdbcTemplate);
-		Map res = sproc.execute();
-
-		ctrlResultSet1.verify();
+		StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(
+				jdbcTemplate);
+		Map<String, Object> res = sproc.execute();
 
 		assertEquals("incorrect number of returns", 1, res.size());
-
-		List rs1 = (List) res.get("rs");
+		List<String> rs1 = (List<String>) res.get("rs");
 		assertEquals(2, rs1.size());
 		assertEquals("Foo", rs1.get(0));
 		assertEquals("Bar", rs1.get(1));
+		verify(resultSet).close();
 	}
 
+	@Test
 	public void testParameterMapper() throws Exception {
-		mockCallable.setString(1, "EasyMock for interface java.sql.Connection");
-		ctrlCallable.setVoidCallable();
-		mockCallable.registerOutParameter(2, Types.VARCHAR);
-		ctrlCallable.setVoidCallable();
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getObject(2);
-		ctrlCallable.setReturnValue("OK");
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
+		given(callableStatement.execute()).willReturn(false);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(callableStatement.getObject(2)).willReturn("OK");
+		given(connection.prepareCall("{call " + ParameterMapperStoredProcedure.SQL + "(?, ?)}")
+				).willReturn(callableStatement);
 
-		mockConnection.prepareCall(
-			"{call " + ParameterMapperStoredProcedure.SQL + "(?, ?)}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-		ParameterMapperStoredProcedure pmsp = new ParameterMapperStoredProcedure(mockDataSource);
-		Map out = pmsp.executeTest();
+		ParameterMapperStoredProcedure pmsp = new ParameterMapperStoredProcedure(dataSource);
+		Map<String, Object> out = pmsp.executeTest();
 		assertEquals("OK", out.get("out"));
+
+		verify(callableStatement).setString(eq(1), startsWith("Mock for Connection"));
+		verify(callableStatement).registerOutParameter(2, Types.VARCHAR);
 	}
 
+	@Test
 	public void testSqlTypeValue() throws Exception {
-		int[] testVal = new int[] {1, 2};
-		mockCallable.getConnection();
-		ctrlCallable.setDefaultReturnValue(mockConnection);
-		mockCallable.setObject(1, testVal, Types.ARRAY);
-		ctrlCallable.setVoidCallable();
-		mockCallable.registerOutParameter(2, Types.VARCHAR);
-		ctrlCallable.setVoidCallable();
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getObject(2);
-		ctrlCallable.setReturnValue("OK");
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
+		int[] testVal = new int[] { 1, 2 };
+		given(callableStatement.execute()).willReturn(false);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(callableStatement.getObject(2)).willReturn("OK");
+		given(connection.prepareCall("{call " + SqlTypeValueStoredProcedure.SQL + "(?, ?)}")
+				).willReturn(callableStatement);
 
-		mockConnection.prepareCall(
-			"{call " + SqlTypeValueStoredProcedure.SQL + "(?, ?)}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-		SqlTypeValueStoredProcedure stvsp = new SqlTypeValueStoredProcedure(mockDataSource);
-		Map out = stvsp.executeTest(testVal);
+		SqlTypeValueStoredProcedure stvsp = new SqlTypeValueStoredProcedure(dataSource);
+		Map<String, Object> out = stvsp.executeTest(testVal);
 		assertEquals("OK", out.get("out"));
+		verify(callableStatement).setObject(1, testVal, Types.ARRAY);
+		verify(callableStatement).registerOutParameter(2, Types.VARCHAR);
 	}
 
+	@Test
 	public void testNumericWithScale() throws Exception {
-		mockCallable.getConnection();
-		ctrlCallable.setDefaultReturnValue(mockConnection);
-		mockCallable.registerOutParameter(1, Types.DECIMAL, 4);
-		ctrlCallable.setVoidCallable();
-		mockCallable.execute();
-		ctrlCallable.setReturnValue(false);
-		mockCallable.getUpdateCount();
-		ctrlCallable.setReturnValue(-1);
-		mockCallable.getObject(1);
-		ctrlCallable.setReturnValue(new BigDecimal("12345.6789"));
-		if (debugEnabled) {
-			mockCallable.getWarnings();
-			ctrlCallable.setReturnValue(null);
-		}
-		mockCallable.close();
-		ctrlCallable.setVoidCallable();
-
-		mockConnection.prepareCall(
-			"{call " + NumericWithScaleStoredProcedure.SQL + "(?)}");
-		ctrlConnection.setReturnValue(mockCallable);
-
-		replay();
-		NumericWithScaleStoredProcedure nwssp = new NumericWithScaleStoredProcedure(mockDataSource);
-		Map out = nwssp.executeTest();
+		given(callableStatement.execute()).willReturn(false);
+		given(callableStatement.getUpdateCount()).willReturn(-1);
+		given(callableStatement.getObject(1)).willReturn(new BigDecimal("12345.6789"));
+		given(connection.prepareCall("{call " + NumericWithScaleStoredProcedure.SQL + "(?)}")
+				).willReturn(callableStatement);
+		NumericWithScaleStoredProcedure nwssp = new NumericWithScaleStoredProcedure(dataSource);
+		Map<String, Object> out = nwssp.executeTest();
 		assertEquals(new BigDecimal("12345.6789"), out.get("out"));
+		verify(callableStatement).registerOutParameter(1, Types.DECIMAL, 4);
 	}
 
-
 	private static class StoredProcedureConfiguredViaJdbcTemplate extends StoredProcedure {
 
 		public static final String SQL = "configured_via_jt";
@@ -769,15 +455,13 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 
 		public int execute(int intIn) {
-			Map in = new HashMap();
-			in.put("intIn", new Integer(intIn));
-			Map out = execute(in);
-			Number intOut = (Number) out.get("intOut");
-			return intOut.intValue();
+			Map<String, Integer> in = new HashMap<String, Integer>();
+			in.put("intIn", intIn);
+			Map<String, Object> out = execute(in);
+			return ((Number) out.get("intOut")).intValue();
 		}
 	}
 
-
 	private static class AddInvoice extends StoredProcedure {
 
 		public static final String SQL = "add_invoice";
@@ -792,12 +476,11 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 
 		public int execute(int amount, int custid) {
-			Map in = new HashMap();
-			in.put("amount", new Integer(amount));
-			in.put("custid", new Integer(custid));
-			Map out = execute(in);
-			Number id = (Number) out.get("newid");
-			return id.intValue();
+			Map<String, Integer> in = new HashMap<String, Integer>();
+			in.put("amount", amount);
+			in.put("custid", custid);
+			Map<String, Object> out = execute(in);
+			return ((Number) out.get("newid")).intValue();
 		}
 	}
 
@@ -815,14 +498,11 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 
 		public int execute(int amount, int custid) {
-			Map out = execute(new Object[] {amount, custid});
-			System.out.println("####### " + out);
-			Number id = (Number) out.get("newid");
-			return id.intValue();
+			Map<String, Object> out = execute(new Object[] { amount, custid });
+			return ((Number) out.get("newid")).intValue();
 		}
 	}
 
-
 	private static class NullArg extends StoredProcedure {
 
 		public static final String SQL = "takes_null";
@@ -835,13 +515,12 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 
 		public void execute(String s) {
-			Map in = new HashMap();
+			Map<String, String> in = new HashMap<String, String>();
 			in.put("ptest", s);
-			Map out = execute(in);
+			execute(in);
 		}
 	}
 
-
 	private static class NoSuchStoredProcedure extends StoredProcedure {
 
 		public static final String SQL = "no_sproc_with_this_name";
@@ -853,11 +532,10 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 
 		public void execute() {
-			execute(new HashMap());
+			execute(new HashMap<String, Object>());
 		}
 	}
 
-
 	private static class UnnamedParameterStoredProcedure extends StoredProcedure {
 
 		public UnnamedParameterStoredProcedure(DataSource ds) {
@@ -866,14 +544,8 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 			compile();
 		}
 
-		public void execute(int id) {
-			Map in = new HashMap();
-			in.put("id", new Integer(id));
-			Map out = execute(in);
-		}
 	}
 
-
 	private static class MissingParameterStoredProcedure extends StoredProcedure {
 
 		public MissingParameterStoredProcedure(DataSource ds) {
@@ -884,11 +556,10 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 
 		public void execute() {
-			execute(new HashMap());
+			execute(new HashMap<String, Object>());
 		}
 	}
 
-
 	private static class StoredProcedureWithResultSet extends StoredProcedure {
 
 		public static final String SQL = "sproc_with_result_set";
@@ -903,7 +574,7 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 
 		public void execute() {
-			execute(new HashMap());
+			execute(new HashMap<String, Object>());
 		}
 
 		public int getCount() {
@@ -911,7 +582,6 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 	}
 
-
 	private static class StoredProcedureWithResultSetMapped extends StoredProcedure {
 
 		public static final String SQL = "sproc_with_result_set";
@@ -919,33 +589,30 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		public StoredProcedureWithResultSetMapped(DataSource ds) {
 			setDataSource(ds);
 			setSql(SQL);
-			declareParameter(
-				new SqlReturnResultSet("rs", new RowMapperImpl()));
+			declareParameter(new SqlReturnResultSet("rs", new RowMapperImpl()));
 			compile();
 		}
 
 		public StoredProcedureWithResultSetMapped(JdbcTemplate jt) {
 			setJdbcTemplate(jt);
 			setSql(SQL);
-			declareParameter(
-				new SqlReturnResultSet("rs", new RowMapperImpl()));
+			declareParameter(new SqlReturnResultSet("rs", new RowMapperImpl()));
 			compile();
 		}
 
-		public Map execute() {
-			Map out = execute(new HashMap());
-			return out;
+		public Map<String, Object> execute() {
+			return execute(new HashMap<String, Object>());
 		}
 
-		private static class RowMapperImpl implements RowMapper {
+		private static class RowMapperImpl implements RowMapper<String> {
+
 			@Override
-			public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
+			public String mapRow(ResultSet rs, int rowNum) throws SQLException {
 				return rs.getString(2);
 			}
 		}
 	}
 
-
 	private static class ParameterMapperStoredProcedure extends StoredProcedure {
 
 		public static final String SQL = "parameter_mapper_sp";
@@ -958,10 +625,8 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 			compile();
 		}
 
-		public Map executeTest() {
-			Map out = null;
-			out = execute(new TestParameterMapper());
-			return out;
+		public Map<String, Object> executeTest() {
+			return execute(new TestParameterMapper());
 		}
 
 		private static class TestParameterMapper implements ParameterMapper {
@@ -970,16 +635,15 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 			}
 
 			@Override
-			public Map createMap(Connection conn) throws SQLException {
-				Map inParms = new HashMap();
-				String testValue = conn.toString();
+			public Map<String, ?> createMap(Connection con) throws SQLException {
+				Map<String, Object> inParms = new HashMap<String, Object>();
+				String testValue = con.toString();
 				inParms.put("in", testValue);
 				return inParms;
 			}
 		}
 	}
 
-
 	private static class SqlTypeValueStoredProcedure extends StoredProcedure {
 
 		public static final String SQL = "sql_type_value_sp";
@@ -992,20 +656,18 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 			compile();
 		}
 
-		public Map executeTest(final int[] inValue) {
-			Map in = new HashMap(1);
+		public Map<String, Object> executeTest(final int[] inValue) {
+			Map<String, AbstractSqlTypeValue> in = new HashMap<String, AbstractSqlTypeValue>();
 			in.put("in", new AbstractSqlTypeValue() {
 				@Override
 				public Object createTypeValue(Connection con, int type, String typeName) {
-					//assertEquals(Connection.class, con.getClass());
-					//assertEquals(Types.ARRAY, type);
-					//assertEquals("NUMBER", typeName);
+					// assertEquals(Connection.class, con.getClass());
+					// assertEquals(Types.ARRAY, type);
+					// assertEquals("NUMBER", typeName);
 					return inValue;
 				}
 			});
-			Map out = null;
-			out = execute(in);
-			return out;
+			return execute(in);
 		}
 	}
 
@@ -1020,15 +682,11 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 			compile();
 		}
 
-		public Map executeTest() {
-			Map in = new HashMap(1);
-			Map out = null;
-			out = execute(in);
-			return out;
+		public Map<String, Object> executeTest() {
+			return execute(new HashMap<String, Object>());
 		}
 	}
 
-
 	private static class StoredProcedureExceptionTranslator extends StoredProcedure {
 
 		public static final String SQL = "no_sproc_with_this_name";
@@ -1037,11 +695,10 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 			setDataSource(ds);
 			setSql(SQL);
 			getJdbcTemplate().setExceptionTranslator(new SQLExceptionTranslator() {
+
 				@Override
-				public DataAccessException translate(
-					String task,
-					String sql,
-					SQLException sqlex) {
+				public DataAccessException translate(String task, String sql,
+						SQLException sqlex) {
 					return new CustomDataException(sql, sqlex);
 				}
 
@@ -1050,11 +707,10 @@ public class StoredProcedureTests extends AbstractJdbcTests {
 		}
 
 		public void execute() {
-			execute(new HashMap());
+			execute(new HashMap<String, Object>());
 		}
 	}
 
-
 	@SuppressWarnings("serial")
 	private static class CustomDataException extends DataAccessException {
 
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java
index bb022964a3..1b24276eb6 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java
@@ -16,6 +16,12 @@
 
 package org.springframework.jdbc.support;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,9 +29,7 @@ import java.sql.Statement;
 
 import javax.sql.DataSource;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-
+import org.junit.Test;
 import org.springframework.jdbc.support.incrementer.HsqlMaxValueIncrementer;
 import org.springframework.jdbc.support.incrementer.MySQLMaxValueIncrementer;
 import org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrementer;
@@ -35,50 +39,26 @@ import org.springframework.jdbc.support.incrementer.PostgreSQLSequenceMaxValueIn
  * @author Juergen Hoeller
  * @since 27.02.2004
  */
-public class DataFieldMaxValueIncrementerTests extends TestCase {
+public class DataFieldMaxValueIncrementerTests {
 
+	private DataSource dataSource = mock(DataSource.class);
+	private Connection connection = mock(Connection.class);
+	private Statement statement = mock(Statement.class);
+	private ResultSet resultSet = mock(ResultSet.class);
+
+	@Test
 	public void testHsqlMaxValueIncrementer() throws SQLException {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		MockControl stmtControl = MockControl.createControl(Statement.class);
-		Statement stmt = (Statement) stmtControl.getMock();
-		MockControl rsControl = MockControl.createControl(ResultSet.class);
-		ResultSet rs = (ResultSet) rsControl.getMock();
-
-		ds.getConnection();
-		dsControl.setReturnValue(con, 2);
-		con.createStatement();
-		conControl.setReturnValue(stmt, 2);
-		stmt.executeUpdate("insert into myseq values(null)");
-		stmtControl.setReturnValue(1, 6);
-		stmt.executeQuery("select max(identity()) from myseq");
-		stmtControl.setReturnValue(rs, 6);
-		rs.next();
-		rsControl.setReturnValue(true, 6);
-		for (long i = 0; i < 6; i++) {
-			rs.getLong(1);
-			rsControl.setReturnValue(i);
-		}
-		rs.close();
-		rsControl.setVoidCallable(6);
-		stmt.executeUpdate("delete from myseq where seq < 2");
-		stmtControl.setReturnValue(1);
-		stmt.executeUpdate("delete from myseq where seq < 5");
-		stmtControl.setReturnValue(1);
-		stmt.close();
-		stmtControl.setVoidCallable(2);
-		con.close();
-		conControl.setVoidCallable(2);
-
-		dsControl.replay();
-		conControl.replay();
-		stmtControl.replay();
-		rsControl.replay();
+		given(dataSource.getConnection()).willReturn(connection);
+		given(connection.createStatement()).willReturn(statement);
+		given(statement.executeUpdate("insert into myseq values(null)")).willReturn(1);
+		given(statement.executeQuery("select max(identity()) from myseq")).willReturn(resultSet);
+		given(resultSet.next()).willReturn(true);
+		given(resultSet.getLong(1)).willReturn(0L, 1L, 2L, 3L, 4L, 5L);
+		given(statement.executeUpdate("delete from myseq where seq < 2")).willReturn(1);
+		given(statement.executeUpdate("delete from myseq where seq < 5")).willReturn(1);
 
 		HsqlMaxValueIncrementer incrementer = new HsqlMaxValueIncrementer();
-		incrementer.setDataSource(ds);
+		incrementer.setDataSource(dataSource);
 		incrementer.setIncrementerName("myseq");
 		incrementer.setColumnName("seq");
 		incrementer.setCacheSize(3);
@@ -90,51 +70,22 @@ public class DataFieldMaxValueIncrementerTests extends TestCase {
 		assertEquals("002", incrementer.nextStringValue());
 		assertEquals(3, incrementer.nextIntValue());
 		assertEquals(4, incrementer.nextLongValue());
-
-		dsControl.verify();
-		conControl.verify();
-		stmtControl.verify();
-		rsControl.verify();
+		verify(resultSet, times(6)).close();
+		verify(statement, times(2)).close();
+		verify(connection, times(2)).close();
 	}
 
+	@Test
 	public void testMySQLMaxValueIncrementer() throws SQLException {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		MockControl stmtControl = MockControl.createControl(Statement.class);
-		Statement stmt = (Statement) stmtControl.getMock();
-		MockControl rsControl = MockControl.createControl(ResultSet.class);
-		ResultSet rs = (ResultSet) rsControl.getMock();
-
-		ds.getConnection();
-		dsControl.setReturnValue(con, 2);
-		con.createStatement();
-		conControl.setReturnValue(stmt, 2);
-		stmt.executeUpdate("update myseq set seq = last_insert_id(seq + 2)");
-		stmtControl.setReturnValue(1, 2);
-		stmt.executeQuery("select last_insert_id()");
-		stmtControl.setReturnValue(rs, 2);
-		rs.next();
-		rsControl.setReturnValue(true, 2);
-		rs.getLong(1);
-		rsControl.setReturnValue(2);
-		rs.getLong(1);
-		rsControl.setReturnValue(4);
-		rs.close();
-		rsControl.setVoidCallable(2);
-		stmt.close();
-		stmtControl.setVoidCallable(2);
-		con.close();
-		conControl.setVoidCallable(2);
-
-		dsControl.replay();
-		conControl.replay();
-		stmtControl.replay();
-		rsControl.replay();
+		given(dataSource.getConnection()).willReturn(connection);
+		given(connection.createStatement()).willReturn(statement);
+		given(statement.executeUpdate("update myseq set seq = last_insert_id(seq + 2)")).willReturn(1);
+		given(statement.executeQuery("select last_insert_id()")).willReturn(resultSet);
+		given(resultSet.next()).willReturn(true);
+		given(resultSet.getLong(1)).willReturn(2L, 4L);
 
 		MySQLMaxValueIncrementer incrementer = new MySQLMaxValueIncrementer();
-		incrementer.setDataSource(ds);
+		incrementer.setDataSource(dataSource);
 		incrementer.setIncrementerName("myseq");
 		incrementer.setColumnName("seq");
 		incrementer.setCacheSize(2);
@@ -146,48 +97,21 @@ public class DataFieldMaxValueIncrementerTests extends TestCase {
 		assertEquals("3", incrementer.nextStringValue());
 		assertEquals(4, incrementer.nextLongValue());
 
-		dsControl.verify();
-		conControl.verify();
-		stmtControl.verify();
-		rsControl.verify();
+		verify(resultSet, times(2)).close();
+		verify(statement, times(2)).close();
+		verify(connection, times(2)).close();
 	}
 
+	@Test
 	public void testPostgreSQLSequenceMaxValueIncrementer() throws SQLException {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		MockControl stmtControl = MockControl.createControl(Statement.class);
-		Statement stmt = (Statement) stmtControl.getMock();
-		MockControl rsControl = MockControl.createControl(ResultSet.class);
-		ResultSet rs = (ResultSet) rsControl.getMock();
-
-		ds.getConnection();
-		dsControl.setReturnValue(con, 2);
-		con.createStatement();
-		conControl.setReturnValue(stmt, 2);
-		stmt.executeQuery("select nextval('myseq')");
-		stmtControl.setReturnValue(rs, 2);
-		rs.next();
-		rsControl.setReturnValue(true, 2);
-		rs.getLong(1);
-		rsControl.setReturnValue(10);
-		rs.getLong(1);
-		rsControl.setReturnValue(12);
-		rs.close();
-		rsControl.setVoidCallable(2);
-		stmt.close();
-		stmtControl.setVoidCallable(2);
-		con.close();
-		conControl.setVoidCallable(2);
-
-		dsControl.replay();
-		conControl.replay();
-		stmtControl.replay();
-		rsControl.replay();
+		given(dataSource.getConnection()).willReturn(connection);
+		given(connection.createStatement()).willReturn(statement);
+		given(statement.executeQuery("select nextval('myseq')")).willReturn(resultSet);
+		given(resultSet.next()).willReturn(true);
+		given(resultSet.getLong(1)).willReturn(10L, 12L);
 
 		PostgreSQLSequenceMaxValueIncrementer incrementer = new PostgreSQLSequenceMaxValueIncrementer();
-		incrementer.setDataSource(ds);
+		incrementer.setDataSource(dataSource);
 		incrementer.setIncrementerName("myseq");
 		incrementer.setPaddingLength(5);
 		incrementer.afterPropertiesSet();
@@ -195,48 +119,21 @@ public class DataFieldMaxValueIncrementerTests extends TestCase {
 		assertEquals("00010", incrementer.nextStringValue());
 		assertEquals(12, incrementer.nextIntValue());
 
-		dsControl.verify();
-		conControl.verify();
-		stmtControl.verify();
-		rsControl.verify();
+		verify(resultSet, times(2)).close();
+		verify(statement, times(2)).close();
+		verify(connection, times(2)).close();
 	}
 
+	@Test
 	public void testOracleSequenceMaxValueIncrementer() throws SQLException {
-		MockControl dsControl = MockControl.createControl(DataSource.class);
-		DataSource ds = (DataSource) dsControl.getMock();
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		MockControl stmtControl = MockControl.createControl(Statement.class);
-		Statement stmt = (Statement) stmtControl.getMock();
-		MockControl rsControl = MockControl.createControl(ResultSet.class);
-		ResultSet rs = (ResultSet) rsControl.getMock();
-
-		ds.getConnection();
-		dsControl.setReturnValue(con, 2);
-		con.createStatement();
-		conControl.setReturnValue(stmt, 2);
-		stmt.executeQuery("select myseq.nextval from dual");
-		stmtControl.setReturnValue(rs, 2);
-		rs.next();
-		rsControl.setReturnValue(true, 2);
-		rs.getLong(1);
-		rsControl.setReturnValue(10);
-		rs.getLong(1);
-		rsControl.setReturnValue(12);
-		rs.close();
-		rsControl.setVoidCallable(2);
-		stmt.close();
-		stmtControl.setVoidCallable(2);
-		con.close();
-		conControl.setVoidCallable(2);
-
-		dsControl.replay();
-		conControl.replay();
-		stmtControl.replay();
-		rsControl.replay();
+		given(dataSource.getConnection()).willReturn(connection);
+		given(connection.createStatement()).willReturn(statement);
+		given(statement.executeQuery("select myseq.nextval from dual")).willReturn(resultSet);
+		given(resultSet.next()).willReturn(true);
+		given(resultSet.getLong(1)).willReturn(10L, 12L);
 
 		OracleSequenceMaxValueIncrementer incrementer = new OracleSequenceMaxValueIncrementer();
-		incrementer.setDataSource(ds);
+		incrementer.setDataSource(dataSource);
 		incrementer.setIncrementerName("myseq");
 		incrementer.setPaddingLength(2);
 		incrementer.afterPropertiesSet();
@@ -244,10 +141,9 @@ public class DataFieldMaxValueIncrementerTests extends TestCase {
 		assertEquals(10, incrementer.nextLongValue());
 		assertEquals("12", incrementer.nextStringValue());
 
-		dsControl.verify();
-		conControl.verify();
-		stmtControl.verify();
-		rsControl.verify();
+		verify(resultSet, times(2)).close();
+		verify(statement, times(2)).close();
+		verify(connection, times(2)).close();
 	}
 
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java
index f4db4d3e66..96140c6c9a 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java
@@ -16,18 +16,19 @@
 
 package org.springframework.jdbc.support;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
 import java.sql.PreparedStatement;
-import java.sql.SQLException;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-
+import org.junit.Test;
 import org.springframework.jdbc.support.lob.DefaultLobHandler;
 import org.springframework.jdbc.support.lob.LobCreator;
 import org.springframework.jdbc.support.lob.LobHandler;
@@ -36,126 +37,77 @@ import org.springframework.jdbc.support.lob.LobHandler;
  * @author Juergen Hoeller
  * @since 17.12.2003
  */
-public class DefaultLobHandlerTests extends TestCase {
+public class DefaultLobHandlerTests {
 
+	private ResultSet rs = mock(ResultSet.class);
+	private PreparedStatement ps = mock(PreparedStatement.class);
+	private LobHandler lobHandler = new DefaultLobHandler();
+	private LobCreator lobCreator = lobHandler.getLobCreator();
+
+	@Test
 	public void testGetBlobAsBytes() throws SQLException {
-		LobHandler lobHandler = new DefaultLobHandler();
-		MockControl rsControl = MockControl.createControl(ResultSet.class);
-		ResultSet rs = (ResultSet) rsControl.getMock();
-		rs.getBytes(1);
-		rsControl.setReturnValue(null);
-		rsControl.replay();
 		lobHandler.getBlobAsBytes(rs, 1);
-		rsControl.verify();
+		verify(rs).getBytes(1);
 	}
 
+	@Test
 	public void testGetBlobAsBinaryStream() throws SQLException {
-		LobHandler lobHandler = new DefaultLobHandler();
-		MockControl rsControl = MockControl.createControl(ResultSet.class);
-		ResultSet rs = (ResultSet) rsControl.getMock();
-		rs.getBinaryStream(1);
-		rsControl.setReturnValue(null);
-		rsControl.replay();
 		lobHandler.getBlobAsBinaryStream(rs, 1);
-		rsControl.verify();
+		verify(rs).getBinaryStream(1);
 	}
 
+	@Test
 	public void testGetClobAsString() throws SQLException {
-		LobHandler lobHandler = new DefaultLobHandler();
-		MockControl rsControl = MockControl.createControl(ResultSet.class);
-		ResultSet rs = (ResultSet) rsControl.getMock();
-		rs.getString(1);
-		rsControl.setReturnValue(null);
-		rsControl.replay();
 		lobHandler.getClobAsString(rs, 1);
-		rsControl.verify();
+		verify(rs).getString(1);
 	}
 
+	@Test
 	public void testGetClobAsAsciiStream() throws SQLException {
-		LobHandler lobHandler = new DefaultLobHandler();
-		MockControl rsControl = MockControl.createControl(ResultSet.class);
-		ResultSet rs = (ResultSet) rsControl.getMock();
-		rs.getAsciiStream(1);
-		rsControl.setReturnValue(null);
-		rsControl.replay();
 		lobHandler.getClobAsAsciiStream(rs, 1);
-		rsControl.verify();
+		verify(rs).getAsciiStream(1);
 	}
 
+	@Test
 	public void testGetClobAsCharacterStream() throws SQLException {
-		LobHandler lobHandler = new DefaultLobHandler();
-		MockControl rsControl = MockControl.createControl(ResultSet.class);
-		ResultSet rs = (ResultSet) rsControl.getMock();
-		rs.getCharacterStream(1);
-		rsControl.setReturnValue(null);
-		rsControl.replay();
 		lobHandler.getClobAsCharacterStream(rs, 1);
-		rsControl.verify();
+		verify(rs).getCharacterStream(1);
 	}
 
+	@Test
 	public void testSetBlobAsBytes() throws SQLException {
-		LobCreator lobCreator = (new DefaultLobHandler()).getLobCreator();
 		byte[] content = "testContent".getBytes();
-
-		MockControl psControl = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement ps = (PreparedStatement) psControl.getMock();
-		ps.setBytes(1, content);
-		psControl.replay();
-
 		lobCreator.setBlobAsBytes(ps, 1, content);
-		psControl.verify();
+		verify(ps).setBytes(1, content);
 	}
 
+	@Test
 	public void testSetBlobAsBinaryStream() throws SQLException, IOException {
-		LobCreator lobCreator = (new DefaultLobHandler()).getLobCreator();
+
 		InputStream bis = new ByteArrayInputStream("testContent".getBytes());
-
-		MockControl psControl = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement ps = (PreparedStatement) psControl.getMock();
-		ps.setBinaryStream(1, bis, 11);
-		psControl.replay();
-
 		lobCreator.setBlobAsBinaryStream(ps, 1, bis, 11);
-		psControl.verify();
+		verify(ps).setBinaryStream(1, bis, 11);
 	}
 
+	@Test
 	public void testSetClobAsString() throws SQLException, IOException {
-		LobCreator lobCreator = (new DefaultLobHandler()).getLobCreator();
 		String content = "testContent";
-
-		MockControl psControl = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement ps = (PreparedStatement) psControl.getMock();
-		ps.setString(1, content);
-		psControl.replay();
-
 		lobCreator.setClobAsString(ps, 1, content);
-		psControl.verify();
+		verify(ps).setString(1, content);
 	}
 
+	@Test
 	public void testSetClobAsAsciiStream() throws SQLException, IOException {
-		LobCreator lobCreator = (new DefaultLobHandler()).getLobCreator();
 		InputStream bis = new ByteArrayInputStream("testContent".getBytes());
-
-		MockControl psControl = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement ps = (PreparedStatement) psControl.getMock();
-		ps.setAsciiStream(1, bis, 11);
-		psControl.replay();
-
 		lobCreator.setClobAsAsciiStream(ps, 1, bis, 11);
-		psControl.verify();
+		verify(ps).setAsciiStream(1, bis, 11);
 	}
 
+	@Test
 	public void testSetClobAsCharacterStream() throws SQLException, IOException {
-		LobCreator lobCreator = (new DefaultLobHandler()).getLobCreator();
 		Reader str = new StringReader("testContent");
-
-		MockControl psControl = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement ps = (PreparedStatement) psControl.getMock();
-		ps.setCharacterStream(1, str, 11);
-		psControl.replay();
-
 		lobCreator.setClobAsCharacterStream(ps, 1, str, 11);
-		psControl.verify();
+		verify(ps).setCharacterStream(1, str, 11);
 	}
 
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java
index a5c23af49c..3e6de69dec 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java
@@ -16,6 +16,10 @@
 
 package org.springframework.jdbc.support;
 
+import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -24,9 +28,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-
+import org.junit.Test;
 import org.springframework.jdbc.support.nativejdbc.CommonsDbcpNativeJdbcExtractor;
 import org.springframework.jdbc.support.nativejdbc.SimpleNativeJdbcExtractor;
 
@@ -34,33 +36,23 @@ import org.springframework.jdbc.support.nativejdbc.SimpleNativeJdbcExtractor;
  * @author Andre Biryukov
  * @author Juergen Hoeller
  */
-public class NativeJdbcExtractorTests extends TestCase {
+public class NativeJdbcExtractorTests {
 
+	@Test
 	public void testSimpleNativeJdbcExtractor() throws SQLException {
 		SimpleNativeJdbcExtractor extractor = new SimpleNativeJdbcExtractor();
 
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		MockControl dbmdControl = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData dbmd = (DatabaseMetaData) dbmdControl.getMock();
-		MockControl con2Control = MockControl.createControl(Connection.class);
-		Connection con2 = (Connection) con2Control.getMock();
-		con.getMetaData();
-		conControl.setReturnValue(dbmd, 2);
-		dbmd.getConnection();
-		dbmdControl.setReturnValue(con2, 2);
-		conControl.replay();
-		dbmdControl.replay();
-		con2Control.replay();
+		Connection con = mock(Connection.class);
+		DatabaseMetaData dbmd = mock(DatabaseMetaData.class);
+		Connection con2 = mock(Connection.class);
+		given(con.getMetaData()).willReturn(dbmd);
+		given(dbmd.getConnection()).willReturn(con2);
 
 		Connection nativeCon = extractor.getNativeConnection(con);
 		assertEquals(con2, nativeCon);
 
-		MockControl stmtControl = MockControl.createControl(Statement.class);
-		Statement stmt = (Statement) stmtControl.getMock();
-		stmt.getConnection();
-		stmtControl.setReturnValue(con);
-		stmtControl.replay();
+		Statement stmt = mock(Statement.class);
+		given(stmt.getConnection()).willReturn(con);
 
 		nativeCon = extractor.getNativeConnectionFromStatement(stmt);
 		assertEquals(con2, nativeCon);
@@ -68,51 +60,29 @@ public class NativeJdbcExtractorTests extends TestCase {
 		Statement nativeStmt = extractor.getNativeStatement(stmt);
 		assertEquals(nativeStmt, stmt);
 
-		MockControl psControl = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement ps = (PreparedStatement) psControl.getMock();
-		psControl.replay();
+		PreparedStatement ps = mock(PreparedStatement.class);
 
 		PreparedStatement nativePs = extractor.getNativePreparedStatement(ps);
 		assertEquals(ps, nativePs);
 
-		MockControl csControl = MockControl.createControl(CallableStatement.class);
-		CallableStatement cs = (CallableStatement) csControl.getMock();
-		MockControl rsControl = MockControl.createControl(ResultSet.class);
-		ResultSet rs = (ResultSet) rsControl.getMock();
-		cs.getResultSet();
-		csControl.setReturnValue(rs);
-		csControl.replay();
-		rsControl.replay();
+		CallableStatement cs = mock(CallableStatement.class);
+		ResultSet rs = mock(ResultSet.class);
+		given(cs.getResultSet()).willReturn(rs);
 
 		CallableStatement nativeCs = extractor.getNativeCallableStatement(cs);
 		assertEquals(cs, nativeCs);
 
 		ResultSet nativeRs = extractor.getNativeResultSet(cs.getResultSet());
 		assertEquals(nativeRs, rs);
-
-		conControl.verify();
-		dbmdControl.verify();
-		con2Control.verify();
-		stmtControl.verify();
-		psControl.verify();
-		csControl.verify();
-		rsControl.verify();
 	}
 
 	public void testCommonsDbcpNativeJdbcExtractor() throws SQLException {
 		CommonsDbcpNativeJdbcExtractor extractor = new CommonsDbcpNativeJdbcExtractor();
 		assertFalse(extractor.isNativeConnectionNecessaryForNativeStatements());
 
-		MockControl conControl = MockControl.createControl(Connection.class);
-		Connection con = (Connection) conControl.getMock();
-		MockControl stmtControl = MockControl.createControl(Statement.class);
-		Statement stmt = (Statement) stmtControl.getMock();
-		con.getMetaData();
-		conControl.setReturnValue(null, 2);
-		stmt.getConnection();
-		stmtControl.setReturnValue(con, 1);
-		conControl.replay();
-		stmtControl.replay();
+		Connection con = mock(Connection.class);
+		Statement stmt = mock(Statement.class);
+		given(stmt.getConnection()).willReturn(con);
 
 		Connection nativeConnection = extractor.getNativeConnection(con);
 		assertEquals(con, nativeConnection);
@@ -121,24 +91,14 @@ public class NativeJdbcExtractorTests extends TestCase {
 		assertEquals(con, nativeConnection);
 		assertEquals(stmt, extractor.getNativeStatement(stmt));
 
-		MockControl psControl = MockControl.createControl(PreparedStatement.class);
-		PreparedStatement ps = (PreparedStatement) psControl.getMock();
-		psControl.replay();
+		PreparedStatement ps = mock(PreparedStatement.class);
 		assertEquals(ps, extractor.getNativePreparedStatement(ps));
 
-		MockControl csControl = MockControl.createControl(CallableStatement.class);
-		CallableStatement cs = (CallableStatement) csControl.getMock();
-		csControl.replay();
+		CallableStatement cs = mock(CallableStatement.class);
 		assertEquals(cs, extractor.getNativePreparedStatement(cs));
 
-		MockControl rsControl = MockControl.createControl(ResultSet.class);
-		ResultSet rs = (ResultSet) rsControl.getMock();
-		rsControl.replay();
+		ResultSet rs = mock(ResultSet.class);
 		assertEquals(rs, extractor.getNativeResultSet(rs));
-
-		conControl.verify();
-		stmtControl.verify();
-		psControl.verify();
 	}
 
 }
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
index d44b0d1a25..e118d922ff 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java
@@ -16,6 +16,16 @@
 
 package org.springframework.jdbc.support;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
@@ -23,26 +33,22 @@ import java.util.Arrays;
 
 import javax.sql.DataSource;
 
-import junit.framework.TestCase;
-
-import org.easymock.MockControl;
+import org.junit.Test;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
 /**
  * Tests for SQLErrorCodes loading.
  *
  * @author Rod Johnson
  * @author Thomas Risberg
  */
-public class SQLErrorCodesFactoryTests extends TestCase {
+public class SQLErrorCodesFactoryTests {
 
 	/**
 	 * Check that a default instance returns empty error codes for an unknown database.
 	 */
+	@Test
 	public void testDefaultInstanceWithNoSuchDatabase() {
 		SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes("xx");
 		assertTrue(sec.getBadSqlGrammarCodes().length == 0);
@@ -52,6 +58,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	/**
 	 * Check that a known database produces recognizable codes.
 	 */
+	@Test
 	public void testDefaultInstanceWithOracle() {
 		SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes("Oracle");
 		assertIsOracle(sec);
@@ -119,6 +126,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 		assertTrue(Arrays.binarySearch(sec.getBadSqlGrammarCodes(), "-204") >= 0);
 	}
 
+	@Test
 	public void testLookupOrder() {
 		class TestSQLErrorCodesFactory extends SQLErrorCodesFactory {
 			private int lookups = 0;
@@ -147,6 +155,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	/**
 	 * Check that user defined error codes take precedence.
 	 */
+	@Test
 	public void testFindUserDefinedCodes() {
 		class TestSQLErrorCodesFactory extends SQLErrorCodesFactory {
 			@Override
@@ -166,6 +175,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 		assertEquals("2", sf.getErrorCodes("Oracle").getBadSqlGrammarCodes()[1]);
 	}
 
+	@Test
 	public void testInvalidUserDefinedCodeFormat() {
 		class TestSQLErrorCodesFactory extends SQLErrorCodesFactory {
 			@Override
@@ -187,6 +197,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	/**
 	 * Check that custom error codes take precedence.
 	 */
+	@Test
 	public void testFindCustomCodes() {
 		class TestSQLErrorCodesFactory extends SQLErrorCodesFactory {
 			@Override
@@ -207,43 +218,27 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 		assertEquals(1, translation.getErrorCodes().length);
 	}
 
+	@Test
 	public void testDataSourceWithNullMetadata() throws Exception {
+		Connection connection = mock(Connection.class);
+		DataSource dataSource = mock(DataSource.class);
+		given(dataSource.getConnection()).willReturn(connection);
 
-		MockControl ctrlConnection = MockControl.createControl(Connection.class);
-		Connection mockConnection = (Connection) ctrlConnection.getMock();
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(null);
-		mockConnection.close();
-		ctrlConnection.setVoidCallable();
-		ctrlConnection.replay();
-
-		MockControl ctrlDataSource = MockControl.createControl(DataSource.class);
-		DataSource mockDataSource = (DataSource) ctrlDataSource.getMock();
-		mockDataSource.getConnection();
-		ctrlDataSource.setDefaultReturnValue(mockConnection);
-		ctrlDataSource.replay();
-
-		SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes(mockDataSource);
+		SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes(dataSource);
 		assertIsEmpty(sec);
 
-		ctrlConnection.verify();
-		ctrlDataSource.verify();
+		verify(connection).close();
 	}
 
+	@Test
 	public void testGetFromDataSourceWithSQLException() throws Exception {
-
 		SQLException expectedSQLException = new SQLException();
 
-		MockControl ctrlDataSource = MockControl.createControl(DataSource.class);
-		DataSource mockDataSource = (DataSource) ctrlDataSource.getMock();
-		mockDataSource.getConnection();
-		ctrlDataSource.setThrowable(expectedSQLException);
-		ctrlDataSource.replay();
+		DataSource dataSource = mock(DataSource.class);
+		given(dataSource.getConnection()).willThrow(expectedSQLException);
 
-		SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes(mockDataSource);
+		SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes(dataSource);
 		assertIsEmpty(sec);
-
-		ctrlDataSource.verify();
 	}
 
 	private void assertIsEmpty(SQLErrorCodes sec) {
@@ -253,25 +248,14 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	}
 
 	private SQLErrorCodes getErrorCodesFromDataSource(String productName, SQLErrorCodesFactory factory) throws Exception {
-		MockControl mdControl = MockControl.createControl(DatabaseMetaData.class);
-		DatabaseMetaData md = (DatabaseMetaData) mdControl.getMock();
-		md.getDatabaseProductName();
-		mdControl.setReturnValue(productName);
-		mdControl.replay();
+		DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class);
+		given(databaseMetaData.getDatabaseProductName()).willReturn(productName);
 
-		MockControl ctrlConnection = MockControl.createControl(Connection.class);
-		Connection mockConnection = (Connection) ctrlConnection.getMock();
-		mockConnection.getMetaData();
-		ctrlConnection.setReturnValue(md);
-		mockConnection.close();
-		ctrlConnection.setVoidCallable();
-		ctrlConnection.replay();
+		Connection connection = mock(Connection.class);
+		given(connection.getMetaData()).willReturn(databaseMetaData);
 
-		MockControl ctrlDataSource = MockControl.createControl(DataSource.class);
-		DataSource mockDataSource = (DataSource) ctrlDataSource.getMock();
-		mockDataSource.getConnection();
-		ctrlDataSource.setDefaultReturnValue(mockConnection);
-		ctrlDataSource.replay();
+		DataSource dataSource = mock(DataSource.class);
+		given(dataSource.getConnection()).willReturn(connection);
 
 		SQLErrorCodesFactory secf = null;
 		if (factory != null) {
@@ -281,33 +265,35 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 			secf = SQLErrorCodesFactory.getInstance();
 		}
 
-		SQLErrorCodes sec = secf.getErrorCodes(mockDataSource);
+		SQLErrorCodes sec = secf.getErrorCodes(dataSource);
 
-		mdControl.verify();
-		ctrlConnection.verify();
-		ctrlDataSource.verify();
 
-		SQLErrorCodes sec2 = secf.getErrorCodes(mockDataSource);
+		SQLErrorCodes sec2 = secf.getErrorCodes(dataSource);
 		assertSame("Cached per DataSource", sec2, sec);
 
+		verify(connection).close();
 		return sec;
 	}
 
+	@Test
 	public void testSQLServerRecognizedFromMetadata() throws Exception {
 		SQLErrorCodes sec = getErrorCodesFromDataSource("MS-SQL", null);
 		assertIsSQLServer(sec);
 	}
 
+	@Test
 	public void testOracleRecognizedFromMetadata() throws Exception {
 		SQLErrorCodes sec = getErrorCodesFromDataSource("Oracle", null);
 		assertIsOracle(sec);
 	}
 
+	@Test
 	public void testHsqlRecognizedFromMetadata() throws Exception {
 		SQLErrorCodes sec = getErrorCodesFromDataSource("HSQL Database Engine", null);
 		assertIsHsql(sec);
 	}
 
+	@Test
 	public void testDB2RecognizedFromMetadata() throws Exception {
 		SQLErrorCodes sec = getErrorCodesFromDataSource("DB2", null);
 		assertIsDB2(sec);
@@ -320,6 +306,7 @@ public class SQLErrorCodesFactoryTests extends TestCase {
 	/**
 	 * Check that wild card database name works.
 	 */
+	@Test
 	public void testWildCardNameRecognized() throws Exception {
 		class WildcardSQLErrorCodesFactory extends SQLErrorCodesFactory {
 			@Override
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java
index 1b415ea8fb..becb786a38 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java
@@ -16,6 +16,11 @@
 
 package org.springframework.jdbc.support.rowset;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
@@ -25,156 +30,172 @@ import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Timestamp;
 
-import junit.framework.TestCase;
-import org.easymock.MockControl;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.jdbc.InvalidResultSetAccessException;
 
 /**
  * @author Thomas Risberg
  */
-public class ResultSetWrappingRowSetTests extends TestCase {
+public class ResultSetWrappingRowSetTests {
 
-	private MockControl rsetControl;
 	private ResultSet rset;
 	private ResultSetWrappingSqlRowSet rowset;
 
-	@Override
+	@Before
 	public void setUp() throws Exception {
-		rsetControl = MockControl.createControl(ResultSet.class);
-		rset = (ResultSet) rsetControl.getMock();
-		rset.getMetaData();
-		rsetControl.setReturnValue(null);
-		rset.getMetaData();
-		rsetControl.setReturnValue(null);
+		rset = mock(ResultSet.class);
+		rowset = new ResultSetWrappingSqlRowSet(rset);
 	}
 
+	@Test
 	public void testGetBigDecimalInt() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getBigDecimal", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getBigDecimal", new Class[] {int.class});
 		doTest(rset, rowset, new Integer(1), BigDecimal.valueOf(1));
 	}
 
+	@Test
 	public void testGetBigDecimalString() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getBigDecimal", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getBigDecimal", new Class[] {String.class});
 		doTest(rset, rowset, "test", BigDecimal.valueOf(1));
 	}
 
+	@Test
 	public void testGetStringInt() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getString", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getString", new Class[] {int.class});
 		doTest(rset, rowset, new Integer(1), "test");
 	}
 
+	@Test
 	public void testGetStringString() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getString", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getString", new Class[] {String.class});
 		doTest(rset, rowset, "test", "test");
 	}
 
+	@Test
 	public void testGetTimestampInt() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getTimestamp", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getTimestamp", new Class[] {int.class});
 		doTest(rset, rowset, new Integer(1), new Timestamp(1234l));
 	}
 
+	@Test
 	public void testGetTimestampString() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getTimestamp", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getTimestamp", new Class[] {String.class});
 		doTest(rset, rowset, "test", new Timestamp(1234l));
 	}
 
+	@Test
 	public void testGetDateInt() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getDate", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getDate", new Class[] {int.class});
 		doTest(rset, rowset, new Integer(1), new Date(1234l));
 	}
 
+	@Test
 	public void testGetDateString() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getDate", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getDate", new Class[] {String.class});
 		doTest(rset, rowset, "test", new Date(1234l));
 	}
 
+	@Test
 	public void testGetTimeInt() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getTime", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getTime", new Class[] {int.class});
 		doTest(rset, rowset, new Integer(1), new Time(1234l));
 	}
 
+	@Test
 	public void testGetTimeString() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getTime", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getTime", new Class[] {String.class});
 		doTest(rset, rowset, "test", new Time(1234l));
 	}
 
+	@Test
 	public void testGetObjectInt() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getObject", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getObject", new Class[] {int.class});
 		doTest(rset, rowset, new Integer(1), new Object());
 	}
 
+	@Test
 	public void testGetObjectString() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getObject", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getObject", new Class[] {String.class});
 		doTest(rset, rowset, "test", new Object());
 	}
 
+	@Test
 	public void testGetIntInt() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getInt", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getInt", new Class[] {int.class});
 		doTest(rset, rowset, new Integer(1), new Integer(1));
 	}
 
+	@Test
 	public void testGetIntString() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getInt", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getInt", new Class[] {String.class});
 		doTest(rset, rowset, "test", new Integer(1));
 	}
 
+	@Test
 	public void testGetFloatInt() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getFloat", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getFloat", new Class[] {int.class});
 		doTest(rset, rowset, new Integer(1), new Float(1));
 	}
 
+	@Test
 	public void testGetFloatString() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getFloat", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getFloat", new Class[] {String.class});
 		doTest(rset, rowset, "test", new Float(1));
 	}
 
+	@Test
 	public void testGetDoubleInt() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getDouble", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getDouble", new Class[] {int.class});
 		doTest(rset, rowset, new Integer(1), new Double(1));
 	}
 
+	@Test
 	public void testGetDoubleString() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getDouble", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getDouble", new Class[] {String.class});
 		doTest(rset, rowset, "test", new Double(1));
 	}
 
+	@Test
 	public void testGetLongInt() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getLong", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getLong", new Class[] {int.class});
 		doTest(rset, rowset, new Integer(1), new Long(1));
 	}
 
+	@Test
 	public void testGetLongString() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getLong", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getLong", new Class[] {String.class});
 		doTest(rset, rowset, "test", new Long(1));
 	}
 
+	@Test
 	public void testGetBooleanInt() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getBoolean", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getBoolean", new Class[] {int.class});
 		doTest(rset, rowset, new Integer(1), new Boolean(true));
 	}
 
+	@Test
 	public void testGetBooleanString() throws Exception {
 		Method rset = ResultSet.class.getDeclaredMethod("getBoolean", new Class[] {int.class});
 		Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getBoolean", new Class[] {String.class});
@@ -183,56 +204,14 @@ public class ResultSetWrappingRowSetTests extends TestCase {
 
 	private void doTest(Method rsetMethod, Method rowsetMethod, Object arg, Object ret) throws Exception {
 		if (arg instanceof String) {
-			Method findMethod = ResultSet.class.getDeclaredMethod("findColumn", new Class[] {String.class});
-			findMethod.invoke(rset, new Object[] {arg});
-			rsetControl.setReturnValue(1);
-			rsetMethod.invoke(rset, new Object[] {1});
+			given(rset.findColumn((String) arg)).willReturn(1);
+			given(rsetMethod.invoke(rset, 1)).willReturn(ret).willThrow(new SQLException("test"));
+		} else {
+			given(rsetMethod.invoke(rset, arg)).willReturn(ret).willThrow(new SQLException("test"));
 		}
-		else {
-			rsetMethod.invoke(rset, new Object[] {arg});
-		}
-		if (ret instanceof Double) {
-			rsetControl.setReturnValue(((Double) ret).doubleValue());
-		}
-		else if (ret instanceof Float) {
-			rsetControl.setReturnValue(((Float) ret).floatValue());
-		}
-		else if (ret instanceof Integer) {
-			rsetControl.setReturnValue(((Integer) ret).intValue());
-		}
-		else if (ret instanceof Short) {
-			rsetControl.setReturnValue(((Short) ret).shortValue());
-		}
-		else if (ret instanceof Long) {
-			rsetControl.setReturnValue(((Long) ret).longValue());
-		}
-		else if (ret instanceof Boolean) {
-			rsetControl.setReturnValue(((Boolean) ret).booleanValue());
-		}
-		else if (ret instanceof Byte) {
-			rsetControl.setReturnValue(((Byte) ret).byteValue());
-		}
-		else {
-			rsetControl.setReturnValue(ret);
-		}
-
-		if (arg instanceof String) {
-			Method findMethod = ResultSet.class.getDeclaredMethod("findColumn", new Class[] {String.class});
-			findMethod.invoke(rset, new Object[] {arg});
-			rsetControl.setReturnValue(1);
-			rsetMethod.invoke(rset, new Object[] {1});
-		}
-		else {
-			rsetMethod.invoke(rset, new Object[] {arg});
-		}
-		rsetControl.setThrowable(new SQLException("test"));
-
-		rsetControl.replay();
-
-		rowset = new ResultSetWrappingSqlRowSet(rset);
-		rowsetMethod.invoke(rowset, new Object[] {arg});
+		rowsetMethod.invoke(rowset, arg);
 		try {
-			rowsetMethod.invoke(rowset, new Object[] {arg});
+			rowsetMethod.invoke(rowset, arg);
 			fail("InvalidResultSetAccessException should have been thrown");
 		}
 		catch (InvocationTargetException ex) {

From b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Tue, 11 Dec 2012 17:35:09 -0800
Subject: [PATCH 31/36] Introduce 'spring-build-junit' subproject

Introduce new 'spring-build-junit' subproject containing shared
JUnit utilities and classes to be used by other test cases. This
project is for internal use within the framework, and therefore
creates no artifacts to be published to any repository.

The initial code includes support for JUnit Assumptions that can
be used to determine when a test should run. Tests can be skipped
based on the running JDK version, logging level or based on specific
'groups' that have activated via a Gradle property.

It is intended that sources within the spring-build-junit project be
folded into spring-core/src/test/java, pending some Gradle work that
will facilitate sharing test output across subprojects; therefore this
commit should be seen as a temporary solution.

Issue: SPR-9984
---
 build.gradle                                  |  30 ++++-
 settings.gradle                               |   1 +
 .../springframework/build/junit/Assume.java   | 111 ++++++++++++++++++
 .../build/junit/JavaVersion.java              |  96 +++++++++++++++
 .../build/junit/TestGroup.java                |  62 ++++++++++
 .../build/junit/JavaVersionTest.java          |  43 +++++++
 .../build/junit/TestGroupTest.java            |  73 ++++++++++++
 7 files changed, 415 insertions(+), 1 deletion(-)
 create mode 100644 spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java
 create mode 100644 spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java
 create mode 100644 spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java
 create mode 100644 spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java
 create mode 100644 spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java

diff --git a/build.gradle b/build.gradle
index d01d0d701b..b2e7af70c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -110,7 +110,7 @@ configure(allprojects.findAll{it.name in ["spring", "spring-jms", "spring-orm",
 	}
 }
 
-configure(subprojects) { subproject ->
+configure(subprojects - project(":spring-build-junit")) { subproject ->
 	apply plugin: "merge"
 	apply from: "${gradleScriptDir}/publish-maven.gradle"
 
@@ -159,6 +159,34 @@ configure(subprojects) { subproject ->
 	}
 }
 
+configure(allprojects - project(":spring-build-junit")) {
+	dependencies {
+		testCompile(project(":spring-build-junit"))
+	}
+
+	eclipse.classpath.file.whenMerged { classpath ->
+		classpath.entries.find{it.path == "/spring-build-junit"}.exported = false
+	}
+
+	test.systemProperties.put("testGroups", properties.get("testGroups"))
+}
+
+project("spring-build-junit") {
+	description = "Build-time JUnit dependencies and utilities"
+
+	// NOTE: This is an internal project and is not published.
+
+	dependencies {
+		compile("commons-logging:commons-logging:1.1.1")
+		compile("junit:junit:${junitVersion}")
+		compile("org.hamcrest:hamcrest-all:1.3")
+		compile("org.easymock:easymock:${easymockVersion}")
+	}
+
+	// Don't actually generate any artifacts
+	configurations.archives.artifacts.clear()
+}
+
 
 project("spring-core") {
 	description = "Spring Core"
diff --git a/settings.gradle b/settings.gradle
index 11ce95641f..8d4e147bcc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,3 +22,4 @@ include "spring-web"
 include "spring-webmvc"
 include "spring-webmvc-portlet"
 include "spring-webmvc-tiles3"
+include "spring-build-junit"
diff --git a/spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java b/spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java
new file mode 100644
index 0000000000..7b916d0b59
--- /dev/null
+++ b/spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java
@@ -0,0 +1,111 @@
+/*
+ * 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.build.junit;
+
+import static org.junit.Assume.assumeFalse;
+
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.junit.internal.AssumptionViolatedException;
+
+/**
+ * Provides utility methods that allow JUnit tests to {@link Assume} certain conditions
+ * hold {@code true}. If the assumption fails, it means the test should be skipped.
+ *
+ * <p>For example, if a set of tests require at least JDK 1.7 it can use
+ * {@code Assume#atLeast(JdkVersion.JAVA_17)} as shown below:
+ *
+ * <pre class="code">
+ * public void MyTests {
+ *
+ *   &#064;BeforeClass
+ *   public static assumptions() {
+ *       Assume.atLeast(JdkVersion.JAVA_17);
+ *   }
+ *
+ *   // ... all the test methods that require at least JDK 1.7
+ * }
+ * </pre>
+ *
+ * If only a single test requires at least JDK 1.7 it can use the
+ * {@code Assume#atLeast(JdkVersion.JAVA_17)} as shown below:
+ *
+ * <pre class="code">
+ * public void MyTests {
+ *
+ *   &#064;Test
+ *   public void requiresJdk17 {
+ *       Assume.atLeast(JdkVersion.JAVA_17);
+ *       // ... perform the actual test
+ *   }
+ * }
+ * </pre>
+ *
+ * In addition to assumptions based on the JDK version, tests can be categorized into
+ * {@link TestGroup}s. Active groups are enabled using the 'testGroups' system property,
+ * usually activated from the gradle command line:
+ * <pre>
+ * gradle test -PtestGroups="performance"
+ * </pre>
+ *
+ * Groups can be specified as a comma separated list of values, or using the pseudo group
+ * 'all'. See {@link TestGroup} for a list of valid groups.
+ *
+ * @author Rob Winch
+ * @author Phillip Webb
+ * @since 3.2
+ * @see #atLeast(JavaVersion)
+ * @see #group(TestGroup)
+ */
+public abstract class Assume {
+
+
+	private static final Set<TestGroup> GROUPS = TestGroup.parse(System.getProperty("testGroups"));
+
+
+	/**
+	 * Assume a minimum {@link JavaVersion} is running.
+	 * @param version the minimum version for the test to run
+	 */
+	public static void atLeast(JavaVersion version) {
+		if (!JavaVersion.runningVersion().isAtLeast(version)) {
+			throw new AssumptionViolatedException("Requires JDK " + version + " but running "
+					+ JavaVersion.runningVersion());
+		}
+	}
+
+	/**
+	 * Assume that a particular {@link TestGroup} has been specified.
+	 * @param group the group that must be specified.
+	 */
+	public static void group(TestGroup group) {
+		if (!GROUPS.contains(group)) {
+			throw new AssumptionViolatedException("Requires unspecified group " + group
+					+ " from " + GROUPS);
+		}
+	}
+
+	/**
+	 * Assume that the specified log is not set to Trace or Debug.
+	 * @param log the log to test
+	 */
+	public static void notLogging(Log log) {
+		assumeFalse(log.isTraceEnabled());
+		assumeFalse(log.isDebugEnabled());
+	}
+}
diff --git a/spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java b/spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java
new file mode 100644
index 0000000000..db9fee370f
--- /dev/null
+++ b/spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java
@@ -0,0 +1,96 @@
+/*
+ * 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.build.junit;
+
+/**
+ * Enumeration of known JDK versions.
+ *
+ * @author Phillip Webb
+ * @see #runningVersion()
+ */
+public enum JavaVersion {
+
+
+	/**
+	 * Java 1.5
+	 */
+	JAVA_15("1.5", 15),
+
+	/**
+	 * Java 1.6
+	 */
+	JAVA_16("1.6", 16),
+
+	/**
+	 * Java 1.7
+	 */
+	JAVA_17("1.7", 17),
+
+	/**
+	 * Java 1.8
+	 */
+	JAVA_18("1.8", 18);
+
+
+	private static final JavaVersion runningVersion = findRunningVersion();
+
+	private static JavaVersion findRunningVersion() {
+		String version = System.getProperty("java.version");
+		for (JavaVersion candidate : values()) {
+			if (version.startsWith(candidate.version)) {
+				return candidate;
+			}
+		}
+		return JavaVersion.JAVA_15;
+	}
+
+
+	private String version;
+
+	private int value;
+
+
+	private JavaVersion(String version, int value) {
+		this.version = version;
+		this.value = value;
+	}
+
+
+	@Override
+	public String toString() {
+		return version;
+	}
+
+	/**
+	 * Determines if the specified version is the same as or greater than this version.
+	 * @param version the version to check
+	 * @return {@code true} if the specified version is at least this version
+	 */
+	public boolean isAtLeast(JavaVersion version) {
+		return this.value >= version.value;
+	}
+
+
+	/**
+	 * Returns the current running JDK version. If the current version cannot be
+	 * determined {@link #JAVA_15} will be returned.
+	 * @return the JDK version
+	 */
+	public static JavaVersion runningVersion() {
+		return runningVersion;
+	}
+}
diff --git a/spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java b/spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java
new file mode 100644
index 0000000000..3be8b83514
--- /dev/null
+++ b/spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java
@@ -0,0 +1,62 @@
+/*
+ * 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.build.junit;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * A test group used to limit when certain tests are run.
+ *
+ * @see Assume#group(TestGroup)
+ * @author Phillip Webb
+ */
+public enum TestGroup {
+
+
+	/**
+	 * Performance related tests that may take a considerable time to run.
+	 */
+	PERFORMANCE;
+
+
+	/**
+	 * Parse the specified comma separates string of groups.
+	 * @param value the comma separated string of groups
+	 * @return a set of groups
+	 */
+	public static Set<TestGroup> parse(String value) {
+		if (value == null || "".equals(value)) {
+			return Collections.emptySet();
+		}
+		if("ALL".equalsIgnoreCase(value)) {
+			return EnumSet.allOf(TestGroup.class);
+		}
+		Set<TestGroup> groups = new HashSet<TestGroup>();
+		for (String group : value.split(",")) {
+			try {
+				groups.add(valueOf(group.trim().toUpperCase()));
+			} catch (IllegalArgumentException e) {
+				throw new IllegalArgumentException("Unable to find test group '" + group.trim()
+						+ "' when parsing '" + value + "'");
+			}
+		}
+		return groups;
+	}
+}
diff --git a/spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java b/spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java
new file mode 100644
index 0000000000..1600d4ca19
--- /dev/null
+++ b/spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java
@@ -0,0 +1,43 @@
+/*
+ * 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.build.junit;
+
+import static org.hamcrest.Matchers.startsWith;
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+/**
+ * Tests for {@link JavaVersion}.
+ *
+ * @author Phillip Webb
+ */
+public class JavaVersionTest {
+
+	@Test
+	public void runningVersion() {
+		assertNotNull(JavaVersion.runningVersion());
+		assertThat(System.getProperty("java.version"), startsWith(JavaVersion.runningVersion().toString()));
+	}
+
+	@Test
+	public void isAtLeast() throws Exception {
+		assertTrue(JavaVersion.JAVA_16.isAtLeast(JavaVersion.JAVA_15));
+		assertTrue(JavaVersion.JAVA_16.isAtLeast(JavaVersion.JAVA_16));
+		assertFalse(JavaVersion.JAVA_16.isAtLeast(JavaVersion.JAVA_17));
+	}
+}
diff --git a/spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java b/spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java
new file mode 100644
index 0000000000..2b30f29931
--- /dev/null
+++ b/spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java
@@ -0,0 +1,73 @@
+/*
+ * 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.build.junit;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+/**
+ * Tests for {@link TestGroup}.
+ *
+ * @author Phillip Webb
+ */
+public class TestGroupTest {
+
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+	@Test
+	public void parseNull() throws Exception {
+		assertThat(TestGroup.parse(null), is(Collections.<TestGroup> emptySet()));
+	}
+
+	@Test
+	public void parseEmptyString() throws Exception {
+		assertThat(TestGroup.parse(""), is(Collections.<TestGroup> emptySet()));
+	}
+
+	@Test
+	public void parseWithSpaces() throws Exception {
+		assertThat(TestGroup.parse("PERFORMANCE,  PERFORMANCE"),
+				is((Set<TestGroup>) EnumSet.of(TestGroup.PERFORMANCE)));
+	}
+
+	@Test
+	public void parseInMixedCase() throws Exception {
+		assertThat(TestGroup.parse("performance,  PERFormaNCE"),
+				is((Set<TestGroup>) EnumSet.of(TestGroup.PERFORMANCE)));
+	}
+
+	@Test
+	public void parseMissing() throws Exception {
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("Unable to find test group 'missing' when parsing 'performance, missing'");
+		TestGroup.parse("performance, missing");
+	}
+
+	@Test
+	public void parseAll() throws Exception {
+		assertThat(TestGroup.parse("all"), is((Set<TestGroup>)EnumSet.allOf(TestGroup.class)));
+	}
+}

From 60032e0012aa0535b9afac4b86833bfc60e5bd5e Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Tue, 11 Dec 2012 18:07:48 -0800
Subject: [PATCH 32/36] Ignore performance-sensitive tests by default

Make use of the new JUnit functionality introduced in the previous
commit to 'Assume' that perfomance- and timing-sensitive tests should
run only when TestGroup.PERFORMANCE is selected, i.e. when
-PtestGroups="performance" has been provided at the Gradle command line.

The net effect is that these tests are now ignored by default, which
will result in far fewer false-negative CI build failures due to
resource contention and other external factors that cause slowdowns.

We will set up a dedicated performance CI build to run these tests on
an isolated machine, etc.

Issue: SPR-9984
---
 .../beans/BeanWrapperTests.java               |  8 ++--
 .../DefaultListableBeanFactoryTests.java      | 39 +++++++------------
 .../AspectJAutoProxyCreatorTests.java         | 21 +++++-----
 .../AnnotationProcessorPerformanceTests.java  | 27 ++++++-------
 .../ApplicationContextExpressionTests.java    |  8 ++--
 .../annotation/EnableSchedulingTests.java     |  8 ++++
 .../GenericConversionServiceTests.java        |  5 +++
 .../expression/spel/PerformanceTests.java     |  7 ++++
 .../web/bind/ServletRequestUtilsTests.java    |  7 ++++
 .../bind/PortletRequestUtilsTests.java        | 29 +++++++++++++-
 ...ansactionalAnnotationIntegrationTests.java |  8 ++++
 11 files changed, 105 insertions(+), 62 deletions(-)

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 930c530961..7da9710417 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
@@ -49,6 +49,8 @@ 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.build.junit.Assume;
+import org.springframework.build.junit.TestGroup;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.support.DefaultConversionService;
@@ -1139,10 +1141,8 @@ public final class BeanWrapperTests {
 
 	@Test
 	public void testLargeMatchingPrimitiveArray() {
-		if (LogFactory.getLog(BeanWrapperTests.class).isTraceEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(LogFactory.getLog(BeanWrapperTests.class));
 
 		PrimitiveArrayBean tb = new PrimitiveArrayBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
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 bc9f1ffba1..35f3420ca0 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
@@ -72,6 +72,8 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.ConstructorDependenciesBean;
 import org.springframework.beans.factory.xml.DependenciesBean;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
+import org.springframework.build.junit.Assume;
+import org.springframework.build.junit.TestGroup;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.support.DefaultConversionService;
@@ -1693,10 +1695,8 @@ public class DefaultListableBeanFactoryTests {
 
 	@Test
 	public void testPrototypeCreationIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(TestBean.class);
 		rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
@@ -1713,10 +1713,8 @@ public class DefaultListableBeanFactoryTests {
 
 	@Test
 	public void testPrototypeCreationWithDependencyCheckIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(LifecycleBean.class);
 		rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
@@ -1759,10 +1757,8 @@ public class DefaultListableBeanFactoryTests {
 	@Test
 	@Ignore  // TODO re-enable when ConstructorResolver TODO sorted out
 	public void testPrototypeCreationWithConstructorArgumentsIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(TestBean.class);
 		rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
@@ -1809,10 +1805,8 @@ public class DefaultListableBeanFactoryTests {
 
 	@Test
 	public void testPrototypeCreationWithResolvedConstructorArgumentsIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(TestBean.class);
 		rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
@@ -1833,10 +1827,8 @@ public class DefaultListableBeanFactoryTests {
 
 	@Test
 	public void testPrototypeCreationWithPropertiesIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(TestBean.class);
 		rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
@@ -1882,10 +1874,8 @@ public class DefaultListableBeanFactoryTests {
 	 */
 	@Test
 	public void testPrototypeCreationWithResolvedPropertiesIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(TestBean.class);
 		rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
@@ -2200,6 +2190,7 @@ public class DefaultListableBeanFactoryTests {
 	 */
 	@Test(timeout=1000)
 	public void testByTypeLookupIsFastEnough() {
+		Assume.group(TestGroup.PERFORMANCE);
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 
 		for (int i = 0; i < 1000; i++) {
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
index 66aa6e0e57..0c2927961d 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 
 import java.lang.reflect.Method;
 
@@ -50,6 +51,8 @@ import org.springframework.beans.factory.config.MethodInvokingFactoryBean;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.build.junit.Assume;
+import org.springframework.build.junit.TestGroup;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
@@ -112,10 +115,8 @@ public final class AspectJAutoProxyCreatorTests {
 
 	@Test
 	public void testAspectsAndAdvisorAppliedToPrototypeIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		ClassPathXmlApplicationContext ac = newContext("aspectsPlusAdvisor.xml");
 		StopWatch sw = new StopWatch();
 		sw.start("Prototype Creation");
@@ -134,10 +135,8 @@ public final class AspectJAutoProxyCreatorTests {
 
 	@Test
 	public void testAspectsAndAdvisorNotAppliedToPrototypeIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		ClassPathXmlApplicationContext ac = newContext("aspectsPlusAdvisor.xml");
 		StopWatch sw = new StopWatch();
 		sw.start("Prototype Creation");
@@ -156,10 +155,8 @@ public final class AspectJAutoProxyCreatorTests {
 
 	@Test
 	public void testAspectsAndAdvisorNotAppliedToManySingletonsIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		GenericApplicationContext ac = new GenericApplicationContext();
 		new XmlBeanDefinitionReader(ac).loadBeanDefinitions(new ClassPathResource(qName("aspectsPlusAdvisor.xml"),
 				getClass()));
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
index e225b5cfe9..12b0a100b7 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
@@ -17,6 +17,7 @@
 package org.springframework.context.annotation;
 
 import static org.junit.Assert.*;
+import static org.junit.Assume.assumeFalse;
 
 import javax.annotation.Resource;
 
@@ -30,6 +31,8 @@ import org.springframework.beans.factory.annotation.Required;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.build.junit.Assume;
+import org.springframework.build.junit.TestGroup;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.util.StopWatch;
 
@@ -44,10 +47,8 @@ public class AnnotationProcessorPerformanceTests {
 
 	@Test
 	public void testPrototypeCreationWithResourcePropertiesIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		GenericApplicationContext ctx = new GenericApplicationContext();
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(ctx);
 		ctx.refresh();
@@ -70,10 +71,8 @@ public class AnnotationProcessorPerformanceTests {
 
 	@Test
 	public void testPrototypeCreationWithOverriddenResourcePropertiesIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		GenericApplicationContext ctx = new GenericApplicationContext();
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(ctx);
 		ctx.refresh();
@@ -97,10 +96,8 @@ public class AnnotationProcessorPerformanceTests {
 
 	@Test
 	public void testPrototypeCreationWithAutowiredPropertiesIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		GenericApplicationContext ctx = new GenericApplicationContext();
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(ctx);
 		ctx.refresh();
@@ -123,10 +120,8 @@ public class AnnotationProcessorPerformanceTests {
 
 	@Test
 	public void testPrototypeCreationWithOverriddenAutowiredPropertiesIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		GenericApplicationContext ctx = new GenericApplicationContext();
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(ctx);
 		ctx.refresh();
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 16eccd8d33..b23b686116 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
@@ -38,6 +38,8 @@ import org.springframework.beans.factory.support.AutowireCandidateQualifier;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.build.junit.Assume;
+import org.springframework.build.junit.TestGroup;
 import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.util.SerializationTestUtils;
@@ -218,10 +220,8 @@ public class ApplicationContextExpressionTests {
 
 	@Test
 	public void prototypeCreationIsFastEnough() {
-		if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) {
-			// Skip this test: Trace logging blows the time limit.
-			return;
-		}
+		Assume.group(TestGroup.PERFORMANCE);
+		Assume.notLogging(factoryLog);
 		GenericApplicationContext ac = new GenericApplicationContext();
 		RootBeanDefinition rbd = new RootBeanDefinition(TestBean.class);
 		rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
index 349c6ec387..d4be14d47b 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
@@ -19,8 +19,11 @@ package org.springframework.scheduling.annotation;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.junit.Before;
 import org.junit.Test;
 
+import org.springframework.build.junit.Assume;
+import org.springframework.build.junit.TestGroup;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -43,6 +46,11 @@ import static org.junit.Assert.*;
  */
 public class EnableSchedulingTests {
 
+	@Before
+	public void setUp() {
+		Assume.group(TestGroup.PERFORMANCE);
+	}
+
 	@Test
 	public void withFixedRateTask() throws InterruptedException {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
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 41333498ba..fadd6933a7 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
@@ -35,6 +35,8 @@ import java.util.UUID;
 
 import org.junit.Test;
 
+import org.springframework.build.junit.Assume;
+import org.springframework.build.junit.TestGroup;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.ConverterNotFoundException;
 import org.springframework.core.convert.TypeDescriptor;
@@ -398,6 +400,7 @@ public class GenericConversionServiceTests {
 
 	@Test
 	public void testPerformance1() {
+		Assume.group(TestGroup.PERFORMANCE);
 		GenericConversionService conversionService = new DefaultConversionService();
 		StopWatch watch = new StopWatch("integer->string conversionPerformance");
 		watch.start("convert 4,000,000 with conversion service");
@@ -415,6 +418,7 @@ public class GenericConversionServiceTests {
 
 	@Test
 	public void testPerformance2() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
 		GenericConversionService conversionService = new DefaultConversionService();
 		StopWatch watch = new StopWatch("list<string> -> list<integer> conversionPerformance");
 		watch.start("convert 4,000,000 with conversion service");
@@ -442,6 +446,7 @@ public class GenericConversionServiceTests {
 
 	@Test
 	public void testPerformance3() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
 		GenericConversionService conversionService = new DefaultConversionService();
 		StopWatch watch = new StopWatch("map<string, string> -> map<string, integer> conversionPerformance");
 		watch.start("convert 4,000,000 with conversion service");
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
index 231a3adff0..0d3efa95dd 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
@@ -19,6 +19,8 @@ package org.springframework.expression.spel;
 import junit.framework.Assert;
 import org.junit.Test;
 
+import org.springframework.build.junit.Assume;
+import org.springframework.build.junit.TestGroup;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
@@ -43,6 +45,8 @@ public class PerformanceTests {
 
 	@Test
 	public void testPerformanceOfPropertyAccess() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		long starttime = 0;
 		long endtime = 0;
 
@@ -89,7 +93,10 @@ public class PerformanceTests {
 		}
 	}
 
+	@Test
 	public void testPerformanceOfMethodAccess() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		long starttime = 0;
 		long endtime = 0;
 
diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java
index 51e2f501d8..cba2d487f2 100644
--- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java
@@ -19,6 +19,8 @@ package org.springframework.web.bind;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
+import org.springframework.build.junit.Assume;
+import org.springframework.build.junit.TestGroup;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.util.StopWatch;
 
@@ -399,6 +401,7 @@ public class ServletRequestUtilsTests {
 
 	@Test
 	public void testGetLongParameterWithDefaultValueHandlingIsFastEnough() {
+		Assume.group(TestGroup.PERFORMANCE);
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		StopWatch sw = new StopWatch();
 		sw.start();
@@ -412,6 +415,7 @@ public class ServletRequestUtilsTests {
 
 	@Test
 	public void testGetFloatParameterWithDefaultValueHandlingIsFastEnough() {
+		Assume.group(TestGroup.PERFORMANCE);
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		StopWatch sw = new StopWatch();
 		sw.start();
@@ -425,6 +429,7 @@ public class ServletRequestUtilsTests {
 
 	@Test
 	public void testGetDoubleParameterWithDefaultValueHandlingIsFastEnough() {
+		Assume.group(TestGroup.PERFORMANCE);
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		StopWatch sw = new StopWatch();
 		sw.start();
@@ -438,6 +443,7 @@ public class ServletRequestUtilsTests {
 
 	@Test
 	public void testGetBooleanParameterWithDefaultValueHandlingIsFastEnough() {
+		Assume.group(TestGroup.PERFORMANCE);
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		StopWatch sw = new StopWatch();
 		sw.start();
@@ -451,6 +457,7 @@ public class ServletRequestUtilsTests {
 
 	@Test
 	public void testGetStringParameterWithDefaultValueHandlingIsFastEnough() {
+		Assume.group(TestGroup.PERFORMANCE);
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		StopWatch sw = new StopWatch();
 		sw.start();
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java
index 3730a69e12..c903e01a66 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java
@@ -18,6 +18,9 @@ package org.springframework.web.portlet.bind;
 
 import junit.framework.TestCase;
 
+import org.junit.Test;
+import org.springframework.build.junit.Assume;
+import org.springframework.build.junit.TestGroup;
 import org.springframework.mock.web.portlet.MockPortletRequest;
 import org.springframework.util.StopWatch;
 
@@ -28,8 +31,9 @@ import static org.junit.Assert.*;
  * @author Juergen Hoeller
  * @author Mark Fisher
  */
-public class PortletRequestUtilsTests extends TestCase {
+public class PortletRequestUtilsTests {
 
+	@Test
 	public void testIntParameter() throws PortletRequestBindingException {
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("param1", "5");
@@ -68,6 +72,7 @@ public class PortletRequestUtilsTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testIntParameters() throws PortletRequestBindingException {
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("param", new String[] {"1", "2", "3"});
@@ -90,9 +95,9 @@ public class PortletRequestUtilsTests extends TestCase {
 		catch (PortletRequestBindingException ex) {
 			// expected
 		}
-
 	}
 
+	@Test
 	public void testLongParameter() throws PortletRequestBindingException {
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("param1", "5");
@@ -131,6 +136,7 @@ public class PortletRequestUtilsTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testLongParameters() throws PortletRequestBindingException {
 		MockPortletRequest request = new MockPortletRequest();
 		request.setParameter("param", new String[] {"1", "2", "3"});
@@ -162,6 +168,7 @@ public class PortletRequestUtilsTests extends TestCase {
 		assertEquals(2, values[1]);
 	}
 
+	@Test
 	public void testFloatParameter() throws PortletRequestBindingException {
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("param1", "5.5");
@@ -200,6 +207,7 @@ public class PortletRequestUtilsTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testFloatParameters() throws PortletRequestBindingException {
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("param", new String[] {"1.5", "2.5", "3"});
@@ -224,6 +232,7 @@ public class PortletRequestUtilsTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testDoubleParameter() throws PortletRequestBindingException {
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("param1", "5.5");
@@ -262,6 +271,7 @@ public class PortletRequestUtilsTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testDoubleParameters() throws PortletRequestBindingException {
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("param", new String[] {"1.5", "2.5", "3"});
@@ -286,6 +296,7 @@ public class PortletRequestUtilsTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testBooleanParameter() throws PortletRequestBindingException {
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("param1", "true");
@@ -319,6 +330,7 @@ public class PortletRequestUtilsTests extends TestCase {
 		assertFalse(PortletRequestUtils.getRequiredBooleanParameter(request, "paramEmpty"));
 	}
 
+	@Test
 	public void testBooleanParameters() throws PortletRequestBindingException {
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("param", new String[] {"true", "yes", "off", "1", "bogus"});
@@ -342,6 +354,7 @@ public class PortletRequestUtilsTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testStringParameter() throws PortletRequestBindingException {
 		MockPortletRequest request = new MockPortletRequest();
 		request.addParameter("param1", "str");
@@ -365,7 +378,9 @@ public class PortletRequestUtilsTests extends TestCase {
 		assertEquals("", PortletRequestUtils.getRequiredStringParameter(request, "paramEmpty"));
 	}
 
+	@Test
 	public void testGetIntParameterWithDefaultValueHandlingIsFastEnough() {
+		Assume.group(TestGroup.PERFORMANCE);
 		MockPortletRequest request = new MockPortletRequest();
 		StopWatch sw = new StopWatch();
 		sw.start();
@@ -376,7 +391,9 @@ public class PortletRequestUtilsTests extends TestCase {
 		assertThat(sw.getTotalTimeMillis(), lessThan(250L));
 	}
 
+	@Test
 	public void testGetLongParameterWithDefaultValueHandlingIsFastEnough() {
+		Assume.group(TestGroup.PERFORMANCE);
 		MockPortletRequest request = new MockPortletRequest();
 		StopWatch sw = new StopWatch();
 		sw.start();
@@ -387,7 +404,9 @@ public class PortletRequestUtilsTests extends TestCase {
 		assertThat(sw.getTotalTimeMillis(), lessThan(250L));
 	}
 
+	@Test
 	public void testGetFloatParameterWithDefaultValueHandlingIsFastEnough() {
+		Assume.group(TestGroup.PERFORMANCE);
 		MockPortletRequest request = new MockPortletRequest();
 		StopWatch sw = new StopWatch();
 		sw.start();
@@ -398,7 +417,9 @@ public class PortletRequestUtilsTests extends TestCase {
 		assertThat(sw.getTotalTimeMillis(), lessThan(350L));
 	}
 
+	@Test
 	public void testGetDoubleParameterWithDefaultValueHandlingIsFastEnough() {
+		Assume.group(TestGroup.PERFORMANCE);
 		MockPortletRequest request = new MockPortletRequest();
 		StopWatch sw = new StopWatch();
 		sw.start();
@@ -409,7 +430,9 @@ public class PortletRequestUtilsTests extends TestCase {
 		assertThat(sw.getTotalTimeMillis(), lessThan(250L));
 	}
 
+	@Test
 	public void testGetBooleanParameterWithDefaultValueHandlingIsFastEnough() {
+		Assume.group(TestGroup.PERFORMANCE);
 		MockPortletRequest request = new MockPortletRequest();
 		StopWatch sw = new StopWatch();
 		sw.start();
@@ -420,7 +443,9 @@ public class PortletRequestUtilsTests extends TestCase {
 		assertThat(sw.getTotalTimeMillis(), lessThan(250L));
 	}
 
+	@Test
 	public void testGetStringParameterWithDefaultValueHandlingIsFastEnough() {
+		Assume.group(TestGroup.PERFORMANCE);
 		MockPortletRequest request = new MockPortletRequest();
 		StopWatch sw = new StopWatch();
 		sw.start();
diff --git a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
index eb715261ea..b2fbd959d2 100644
--- a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
+++ b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
@@ -18,10 +18,13 @@ package org.springframework.scheduling.annotation;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.build.junit.Assume;
+import org.springframework.build.junit.TestGroup;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -48,6 +51,11 @@ import static org.junit.Assert.*;
  */
 public class ScheduledAndTransactionalAnnotationIntegrationTests {
 
+	@Before
+	public void setUp() {
+		Assume.group(TestGroup.PERFORMANCE);
+	}
+
 	@Test
 	public void failsWhenJdkProxyAndScheduledMethodNotPresentOnInterface() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();

From 8472a2b2ab23dbd0a4009296847ee8e1dbee8d45 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 28 Dec 2012 19:32:49 +0100
Subject: [PATCH 33/36] Update Apache license headers for affected sources

---
 .../java/org/springframework/aop/Advisor.java    |  2 +-
 .../aop/AfterReturningAdvice.java                |  2 +-
 .../aop/AopInvocationException.java              |  2 +-
 .../aop/DynamicIntroductionAdvice.java           |  2 +-
 .../springframework/aop/IntroductionAdvisor.java |  2 +-
 .../aop/IntroductionAwareMethodMatcher.java      |  2 +-
 .../springframework/aop/IntroductionInfo.java    |  2 +-
 .../springframework/aop/MethodBeforeAdvice.java  |  2 +-
 .../org/springframework/aop/MethodMatcher.java   |  2 +-
 .../java/org/springframework/aop/Pointcut.java   |  2 +-
 .../org/springframework/aop/PointcutAdvisor.java |  2 +-
 .../aop/ProxyMethodInvocation.java               |  2 +-
 .../springframework/aop/TargetClassAware.java    |  2 +-
 .../org/springframework/aop/TargetSource.java    |  2 +-
 .../org/springframework/aop/TrueClassFilter.java |  2 +-
 .../springframework/aop/TrueMethodMatcher.java   |  2 +-
 .../org/springframework/aop/TruePointcut.java    |  2 +-
 .../aop/aspectj/AspectInstanceFactory.java       |  2 +-
 .../AspectJAdviceParameterNameDiscoverer.java    |  2 +-
 .../aop/aspectj/AspectJAfterAdvice.java          |  2 +-
 .../aop/aspectj/AspectJAopUtils.java             |  2 +-
 .../aop/aspectj/AspectJExpressionPointcut.java   |  2 +-
 .../AspectJExpressionPointcutAdvisor.java        |  2 +-
 .../aop/aspectj/AspectJProxyUtils.java           |  2 +-
 .../aop/aspectj/AspectJWeaverMessageHandler.java |  2 +-
 .../aop/aspectj/DeclareParentsAdvisor.java       |  2 +-
 .../MethodInvocationProceedingJoinPoint.java     |  2 +-
 .../aop/aspectj/RuntimeTestWalker.java           |  2 +-
 .../aop/aspectj/SimpleAspectInstanceFactory.java |  2 +-
 .../aspectj/SingletonAspectInstanceFactory.java  |  2 +-
 .../aop/aspectj/TypePatternClassFilter.java      |  2 +-
 .../AbstractAspectJAdvisorFactory.java           |  2 +-
 .../AnnotationAwareAspectJAutoProxyCreator.java  |  2 +-
 .../annotation/AspectJAdvisorFactory.java        |  2 +-
 .../aop/aspectj/annotation/AspectMetadata.java   |  2 +-
 .../BeanFactoryAspectInstanceFactory.java        |  2 +-
 ...stantiationModelAwarePointcutAdvisorImpl.java |  2 +-
 .../annotation/NotAnAtAspectException.java       |  2 +-
 ...SimpleMetadataAwareAspectInstanceFactory.java |  2 +-
 ...gletonMetadataAwareAspectInstanceFactory.java |  2 +-
 .../AspectJAwareAdvisorAutoProxyCreator.java     |  2 +-
 .../autoproxy/AspectJPrecedenceComparator.java   |  2 +-
 ...InterceptorDrivenBeanDefinitionDecorator.java |  2 +-
 .../springframework/aop/config/AdviceEntry.java  |  2 +-
 .../aop/config/AdvisorComponentDefinition.java   |  2 +-
 .../springframework/aop/config/AdvisorEntry.java |  2 +-
 .../aop/config/AopConfigUtils.java               |  2 +-
 .../aop/config/AopNamespaceHandler.java          |  2 +-
 .../aop/config/AopNamespaceUtils.java            |  2 +-
 .../AspectJAutoProxyBeanDefinitionParser.java    |  2 +-
 .../aop/config/ConfigBeanDefinitionParser.java   |  2 +-
 .../aop/config/PointcutEntry.java                |  2 +-
 .../ScopedProxyBeanDefinitionDecorator.java      |  2 +-
 .../springframework/aop/framework/Advised.java   |  2 +-
 .../aop/framework/AdvisedSupport.java            |  2 +-
 .../aop/framework/AopConfigException.java        |  2 +-
 .../aop/framework/AopContext.java                |  2 +-
 .../springframework/aop/framework/AopProxy.java  |  2 +-
 .../aop/framework/AopProxyFactory.java           |  2 +-
 .../aop/framework/AopProxyUtils.java             |  2 +-
 .../framework/DefaultAdvisorChainFactory.java    |  2 +-
 .../aop/framework/ProxyConfig.java               |  2 +-
 .../aop/framework/ProxyCreatorSupport.java       |  2 +-
 .../aop/framework/ProxyFactoryBean.java          |  2 +-
 .../framework/ReflectiveMethodInvocation.java    |  2 +-
 .../aop/framework/adapter/AdvisorAdapter.java    |  2 +-
 .../adapter/AdvisorAdapterRegistry.java          |  2 +-
 .../adapter/AfterReturningAdviceAdapter.java     |  2 +-
 .../adapter/AfterReturningAdviceInterceptor.java |  2 +-
 .../adapter/DefaultAdvisorAdapterRegistry.java   |  2 +-
 .../adapter/MethodBeforeAdviceAdapter.java       |  2 +-
 .../adapter/MethodBeforeAdviceInterceptor.java   |  2 +-
 .../framework/adapter/ThrowsAdviceAdapter.java   |  2 +-
 .../adapter/ThrowsAdviceInterceptor.java         |  2 +-
 .../adapter/UnknownAdviceTypeException.java      |  2 +-
 .../AbstractAdvisorAutoProxyCreator.java         |  2 +-
 .../aop/framework/autoproxy/AutoProxyUtils.java  |  2 +-
 .../BeanFactoryAdvisorRetrievalHelper.java       |  2 +-
 .../autoproxy/BeanNameAutoProxyCreator.java      |  2 +-
 .../DefaultAdvisorAutoProxyCreator.java          |  2 +-
 .../InfrastructureAdvisorAutoProxyCreator.java   |  2 +-
 .../autoproxy/ProxyCreationContext.java          |  2 +-
 .../framework/autoproxy/TargetSourceCreator.java |  2 +-
 ...tractBeanFactoryBasedTargetSourceCreator.java |  2 +-
 .../target/QuickTargetSourceCreator.java         |  2 +-
 .../AbstractMonitoringInterceptor.java           |  2 +-
 .../interceptor/AbstractTraceInterceptor.java    |  2 +-
 .../ConcurrencyThrottleInterceptor.java          |  2 +-
 .../CustomizableTraceInterceptor.java            |  2 +-
 .../aop/interceptor/DebugInterceptor.java        |  2 +-
 .../aop/interceptor/ExposeBeanNameAdvisors.java  |  2 +-
 .../interceptor/ExposeInvocationInterceptor.java |  2 +-
 .../JamonPerformanceMonitorInterceptor.java      |  2 +-
 .../PerformanceMonitorInterceptor.java           |  2 +-
 .../aop/interceptor/SimpleTraceInterceptor.java  |  2 +-
 .../aop/scope/DefaultScopedObject.java           |  2 +-
 .../springframework/aop/scope/ScopedObject.java  |  2 +-
 .../aop/scope/ScopedProxyFactoryBean.java        |  2 +-
 .../aop/scope/ScopedProxyUtils.java              |  2 +-
 .../AbstractBeanFactoryPointcutAdvisor.java      |  2 +-
 .../aop/support/AbstractExpressionPointcut.java  |  2 +-
 .../support/AbstractGenericPointcutAdvisor.java  |  2 +-
 .../aop/support/AbstractPointcutAdvisor.java     |  2 +-
 .../aop/support/ClassFilters.java                |  2 +-
 .../aop/support/ComposablePointcut.java          |  2 +-
 .../aop/support/ControlFlowPointcut.java         |  2 +-
 .../DefaultBeanFactoryPointcutAdvisor.java       |  2 +-
 .../aop/support/DefaultIntroductionAdvisor.java  |  2 +-
 .../aop/support/DefaultPointcutAdvisor.java      |  2 +-
 ...tePerTargetObjectIntroductionInterceptor.java |  2 +-
 .../DelegatingIntroductionInterceptor.java       |  2 +-
 .../aop/support/DynamicMethodMatcher.java        |  2 +-
 .../support/DynamicMethodMatcherPointcut.java    |  2 +-
 .../aop/support/IntroductionInfoSupport.java     |  2 +-
 .../aop/support/JdkRegexpMethodPointcut.java     |  2 +-
 .../aop/support/MethodMatchers.java              |  2 +-
 .../aop/support/NameMatchMethodPointcut.java     |  2 +-
 .../support/NameMatchMethodPointcutAdvisor.java  |  2 +-
 .../springframework/aop/support/Pointcuts.java   |  2 +-
 .../aop/support/RegexpMethodPointcutAdvisor.java |  2 +-
 .../aop/support/RootClassFilter.java             |  2 +-
 .../aop/support/StaticMethodMatcher.java         |  2 +-
 .../annotation/AnnotationMatchingPointcut.java   |  2 +-
 .../AbstractBeanFactoryBasedTargetSource.java    |  2 +-
 .../target/AbstractLazyCreationTargetSource.java |  2 +-
 .../aop/target/AbstractPoolingTargetSource.java  |  2 +-
 .../aop/target/CommonsPoolTargetSource.java      |  2 +-
 .../aop/target/EmptyTargetSource.java            |  2 +-
 .../aop/target/LazyInitTargetSource.java         |  2 +-
 .../aop/target/PoolingConfig.java                |  2 +-
 .../aop/target/PrototypeTargetSource.java        |  2 +-
 .../aop/target/SimpleBeanTargetSource.java       |  2 +-
 .../aop/target/SingletonTargetSource.java        |  2 +-
 .../aop/target/ThreadLocalTargetSourceStats.java |  2 +-
 .../dynamic/AbstractRefreshableTargetSource.java |  2 +-
 .../BeanFactoryRefreshableTargetSource.java      |  2 +-
 .../aop/target/dynamic/Refreshable.java          |  2 +-
 ...viceParameterNameDiscoverAnnotationTests.java |  2 +-
 ...spectJAdviceParameterNameDiscovererTests.java |  2 +-
 .../aspectj/AspectJExpressionPointcutTests.java  |  2 +-
 .../aspectj/BeanNamePointcutMatchingTests.java   |  2 +-
 ...MethodInvocationProceedingJoinPointTests.java |  2 +-
 ...spectJAdviceParameterNameDiscovererTests.java |  2 +-
 .../TigerAspectJExpressionPointcutTests.java     |  2 +-
 .../aop/aspectj/TypePatternClassFilterTests.java |  2 +-
 .../aspectj/annotation/ArgumentBindingTests.java |  2 +-
 .../annotation/AspectJPointcutAdvisorTests.java  |  2 +-
 .../aspectj/annotation/AspectMetadataTests.java  |  2 +-
 .../annotation/AspectProxyFactoryTests.java      |  2 +-
 .../ReflectiveAspectJAdvisorFactoryTests.java    |  2 +-
 .../AspectJPrecedenceComparatorTests.java        |  2 +-
 .../config/AopNamespaceHandlerEventTests.java    |  2 +-
 .../AopNamespaceHandlerPointcutErrorTests.java   |  2 +-
 .../aop/config/TopLevelAopTagTests.java          |  2 +-
 .../aop/framework/AopProxyUtilsTests.java        |  2 +-
 .../framework/IntroductionBenchmarkTests.java    |  2 +-
 .../aop/framework/MethodInvocationTests.java     |  2 +-
 .../aop/framework/PrototypeTargetTests.java      |  2 +-
 .../aop/framework/ProxyFactoryTests.java         |  2 +-
 .../adapter/ThrowsAdviceInterceptorTests.java    |  2 +-
 .../ConcurrencyThrottleInterceptorTests.java     |  2 +-
 .../CustomizableTraceInterceptorTests.java       |  2 +-
 .../aop/interceptor/DebugInterceptorTests.java   |  2 +-
 .../interceptor/ExposeBeanNameAdvisorsTests.java |  2 +-
 .../ExposeInvocationInterceptorTests.java        |  2 +-
 .../PerformanceMonitorInterceptorTests.java      |  2 +-
 .../interceptor/SimpleTraceInterceptorTests.java |  2 +-
 .../aop/scope/DefaultScopedObjectTests.java      |  2 +-
 .../aop/scope/ScopedProxyAutowireTests.java      |  2 +-
 .../aop/support/AopUtilsTests.java               |  2 +-
 .../aop/support/ClassFiltersTests.java           |  2 +-
 .../aop/support/ComposablePointcutTests.java     |  2 +-
 .../aop/support/ControlFlowPointcutTests.java    |  2 +-
 .../DelegatingIntroductionInterceptorTests.java  |  2 +-
 .../support/JdkRegexpMethodPointcutTests.java    |  2 +-
 .../aop/support/MethodMatchersTests.java         |  2 +-
 .../support/NameMatchMethodPointcutTests.java    |  2 +-
 .../aop/support/PointcutsTests.java              |  2 +-
 ...expMethodPointcutAdvisorIntegrationTests.java |  2 +-
 .../CommonsPoolTargetSourceProxyTests.java       |  2 +-
 .../target/HotSwappableTargetSourceTests.java    |  2 +-
 .../target/LazyCreationTargetSourceTests.java    |  2 +-
 .../aop/target/LazyInitTargetSourceTests.java    |  2 +-
 .../target/PrototypeBasedTargetSourceTests.java  |  2 +-
 .../aop/target/PrototypeTargetSourceTests.java   |  2 +-
 .../aop/target/ThreadLocalTargetSourceTests.java |  2 +-
 .../dynamic/RefreshableTargetSourceTests.java    |  2 +-
 .../test/java/test/aop/CountingBeforeAdvice.java |  2 +-
 .../src/test/java/test/aop/DefaultLockable.java  |  2 +-
 spring-aop/src/test/java/test/aop/Lockable.java  |  2 +-
 .../src/test/java/test/aop/MethodCounter.java    |  2 +-
 .../src/test/java/test/aop/NopInterceptor.java   |  2 +-
 .../test/aop/SerializableNopInterceptor.java     |  2 +-
 .../test/java/test/beans/DerivedTestBean.java    |  2 +-
 .../test/java/test/beans/INestedTestBean.java    |  2 +-
 spring-aop/src/test/java/test/beans/IOther.java  |  2 +-
 .../src/test/java/test/beans/NestedTestBean.java |  2 +-
 spring-aop/src/test/java/test/beans/Person.java  |  2 +-
 .../test/java/test/beans/SerializablePerson.java |  2 +-
 .../src/test/java/test/beans/SideEffectBean.java |  2 +-
 .../src/test/java/test/beans/TestBean.java       |  2 +-
 .../test/java/test/beans/subpkg/DeepBean.java    |  2 +-
 .../parsing/CollectingReaderEventListener.java   |  2 +-
 .../java/test/util/SerializationTestUtils.java   |  2 +-
 .../test/java/test/util/TestResourceUtils.java   |  2 +-
 .../src/test/java/test/util/TimeStamped.java     |  2 +-
 .../aspectj/AbstractBeanConfigurerAspect.aj      |  2 +-
 .../aspectj/AbstractDependencyInjectionAspect.aj |  2 +-
 ...ctInterfaceDrivenDependencyInjectionAspect.aj |  2 +-
 .../aspectj/AnnotationBeanConfigurerAspect.aj    |  2 +-
 .../factory/aspectj/ConfigurableObject.java      |  2 +-
 ...icInterfaceDrivenDependencyInjectionAspect.aj |  2 +-
 .../cache/aspectj/AbstractCacheAspect.aj         |  2 +-
 .../cache/aspectj/AnnotationCacheAspect.aj       |  2 +-
 .../aspectj/AspectJCachingConfiguration.java     |  2 +-
 .../staticmock/AbstractMethodMockingControl.aj   |  2 +-
 ...AnnotationDrivenStaticEntityMockingControl.aj |  2 +-
 .../mock/staticmock/MockStaticEntityMethods.java |  1 +
 .../jpa/aspectj/JpaExceptionTranslatorAspect.aj  | 16 ++++++++++++++++
 .../aspectj/AbstractTransactionAspect.aj         |  2 +-
 .../aspectj/AnnotationTransactionAspect.aj       |  2 +-
 ...spectJTransactionManagementConfiguration.java |  2 +-
 .../AutoProxyWithCodeStyleAspectsTests.java      |  2 +-
 .../aop/aspectj/autoproxy/CodeStyleAspect.aj     |  2 +-
 .../java/org/springframework/beans/Colour.java   |  2 +-
 .../springframework/beans/DerivedTestBean.java   |  2 +-
 .../springframework/beans/INestedTestBean.java   |  2 +-
 .../java/org/springframework/beans/IOther.java   |  2 +-
 .../org/springframework/beans/ITestBean.java     |  2 +-
 .../springframework/beans/IndexedTestBean.java   |  2 +-
 .../springframework/beans/NestedTestBean.java    |  2 +-
 .../java/org/springframework/beans/TestBean.java |  2 +-
 .../aspectj/AbstractBeanConfigurerTests.java     |  2 +-
 .../SpringConfiguredWithAutoProxyingTests.java   |  2 +-
 .../factory/aspectj/XmlBeanConfigurerTests.java  |  2 +-
 .../cache/aspectj/AbstractAnnotationTest.java    |  2 +-
 .../cache/aspectj/AspectJAnnotationTest.java     |  2 +-
 .../config/AnnotatedClassCacheableService.java   |  2 +-
 .../cache/config/CacheableService.java           |  2 +-
 .../cache/config/DefaultCacheableService.java    |  2 +-
 .../cache/config/SomeKeyGenerator.java           |  2 +-
 ...tionDrivenStaticEntityMockingControlTest.java |  2 +-
 .../mock/staticmock/Delegate.java                |  2 +-
 .../springframework/mock/staticmock/Person.java  |  2 +-
 .../mock/staticmock/Person_Roo_Entity.aj         |  2 +-
 .../CallCountingTransactionManager.java          |  2 +-
 .../aspectj/ClassWithPrivateAnnotatedMember.java |  4 +---
 .../ClassWithProtectedAnnotatedMember.java       |  4 +---
 .../transaction/aspectj/ITransactional.java      | 16 ++++++++++++++++
 .../MethodAnnotationOnClassWithNoInterface.java  | 16 ++++++++++++++++
 .../aspectj/TransactionAspectTests.java          |  2 +-
 ...onalAnnotationOnlyOnClassWithNoInterface.java | 16 ++++++++++++++++
 .../beans/BeanInstantiationException.java        |  2 +-
 .../beans/BeanMetadataAttribute.java             |  2 +-
 .../beans/BeanMetadataAttributeAccessor.java     |  2 +-
 .../beans/BeanMetadataElement.java               |  2 +-
 .../org/springframework/beans/BeanWrapper.java   |  2 +-
 .../springframework/beans/BeansException.java    |  2 +-
 .../beans/ConversionNotSupportedException.java   |  2 +-
 .../beans/FatalBeanException.java                |  2 +-
 .../GenericTypeAwarePropertyDescriptor.java      |  2 +-
 .../beans/InvalidPropertyException.java          |  2 +-
 .../org/springframework/beans/Mergeable.java     |  2 +-
 .../beans/MethodInvocationException.java         |  2 +-
 .../beans/MutablePropertyValues.java             |  2 +-
 .../beans/NotReadablePropertyException.java      |  2 +-
 .../beans/NotWritablePropertyException.java      |  2 +-
 .../beans/NullValueInNestedPathException.java    |  2 +-
 .../beans/PropertyAccessException.java           |  2 +-
 .../springframework/beans/PropertyAccessor.java  |  2 +-
 .../beans/PropertyAccessorUtils.java             |  2 +-
 .../beans/PropertyBatchUpdateException.java      |  2 +-
 .../beans/PropertyEditorRegistrar.java           |  2 +-
 .../beans/PropertyEditorRegistry.java            |  2 +-
 .../beans/PropertyEditorRegistrySupport.java     |  2 +-
 .../springframework/beans/PropertyMatches.java   |  2 +-
 .../org/springframework/beans/PropertyValue.java |  2 +-
 .../springframework/beans/PropertyValues.java    |  2 +-
 .../beans/TypeMismatchException.java             |  2 +-
 .../beans/factory/BeanClassLoaderAware.java      |  2 +-
 .../beans/factory/BeanCreationException.java     |  2 +-
 .../factory/BeanCreationNotAllowedException.java |  2 +-
 .../BeanCurrentlyInCreationException.java        |  2 +-
 .../factory/BeanDefinitionStoreException.java    |  2 +-
 .../beans/factory/BeanExpressionException.java   |  2 +-
 .../beans/factory/BeanFactory.java               |  2 +-
 .../beans/factory/BeanFactoryAware.java          |  2 +-
 .../factory/BeanInitializationException.java     |  2 +-
 .../beans/factory/BeanIsAbstractException.java   |  2 +-
 .../factory/BeanIsNotAFactoryException.java      |  2 +-
 .../factory/BeanNotOfRequiredTypeException.java  |  2 +-
 .../factory/CannotLoadBeanClassException.java    |  2 +-
 .../beans/factory/DisposableBean.java            |  2 +-
 .../beans/factory/FactoryBean.java               |  2 +-
 .../FactoryBeanNotInitializedException.java      |  2 +-
 .../beans/factory/HierarchicalBeanFactory.java   |  2 +-
 .../beans/factory/InitializingBean.java          |  2 +-
 .../beans/factory/ListableBeanFactory.java       |  2 +-
 .../beans/factory/ObjectFactory.java             |  2 +-
 .../beans/factory/SmartFactoryBean.java          |  2 +-
 .../factory/UnsatisfiedDependencyException.java  |  2 +-
 .../beans/factory/access/BeanFactoryLocator.java |  2 +-
 .../factory/access/BeanFactoryReference.java     |  2 +-
 .../beans/factory/access/BootstrapException.java |  2 +-
 .../access/SingletonBeanFactoryLocator.java      |  2 +-
 .../factory/access/el/SpringBeanELResolver.java  |  2 +-
 .../annotation/AnnotatedBeanDefinition.java      |  2 +-
 .../beans/factory/annotation/Configurable.java   |  2 +-
 .../beans/factory/annotation/Required.java       |  2 +-
 .../factory/config/AbstractFactoryBean.java      |  2 +-
 .../config/AutowireCapableBeanFactory.java       |  2 +-
 .../beans/factory/config/BeanDefinition.java     |  2 +-
 .../factory/config/BeanDefinitionHolder.java     |  2 +-
 .../factory/config/BeanFactoryPostProcessor.java |  2 +-
 .../beans/factory/config/BeanPostProcessor.java  |  2 +-
 .../beans/factory/config/BeanReference.java      |  2 +-
 .../factory/config/BeanReferenceFactoryBean.java |  2 +-
 .../factory/config/CommonsLogFactoryBean.java    |  2 +-
 .../config/ConfigurableListableBeanFactory.java  |  2 +-
 .../config/ConstructorArgumentValues.java        |  2 +-
 .../factory/config/CustomEditorConfigurer.java   |  2 +-
 .../DestructionAwareBeanPostProcessor.java       |  2 +-
 .../config/FieldRetrievingFactoryBean.java       |  2 +-
 .../InstantiationAwareBeanPostProcessor.java     |  2 +-
 .../beans/factory/config/ListFactoryBean.java    |  2 +-
 .../config/MethodInvokingFactoryBean.java        |  2 +-
 .../config/PreferencesPlaceholderConfigurer.java |  2 +-
 .../factory/config/PropertyPathFactoryBean.java  |  2 +-
 .../config/PropertyPlaceholderConfigurer.java    |  2 +-
 .../factory/config/RuntimeBeanNameReference.java |  2 +-
 .../factory/config/RuntimeBeanReference.java     |  2 +-
 .../beans/factory/config/Scope.java              |  2 +-
 .../config/ServiceLocatorFactoryBean.java        |  2 +-
 .../factory/config/SingletonBeanRegistry.java    |  2 +-
 ...SmartInstantiationAwareBeanPostProcessor.java |  2 +-
 .../beans/factory/config/TypedStringValue.java   |  2 +-
 .../beans/factory/parsing/AliasDefinition.java   |  2 +-
 .../factory/parsing/BeanComponentDefinition.java |  2 +-
 .../parsing/BeanDefinitionParsingException.java  |  2 +-
 .../factory/parsing/ComponentDefinition.java     |  2 +-
 .../parsing/ConstructorArgumentEntry.java        |  2 +-
 .../factory/parsing/FailFastProblemReporter.java |  2 +-
 .../beans/factory/parsing/ImportDefinition.java  |  2 +-
 .../beans/factory/parsing/Location.java          |  2 +-
 .../factory/parsing/NullSourceExtractor.java     |  2 +-
 .../beans/factory/parsing/ParseState.java        |  2 +-
 .../parsing/PassThroughSourceExtractor.java      |  2 +-
 .../beans/factory/parsing/Problem.java           |  2 +-
 .../beans/factory/parsing/ProblemReporter.java   |  2 +-
 .../beans/factory/parsing/PropertyEntry.java     |  2 +-
 .../beans/factory/parsing/QualifierEntry.java    |  2 +-
 .../beans/factory/parsing/SourceExtractor.java   |  2 +-
 .../support/AbstractBeanDefinitionReader.java    |  2 +-
 .../support/AutowireCandidateQualifier.java      |  2 +-
 .../support/AutowireCandidateResolver.java       |  2 +-
 .../beans/factory/support/AutowireUtils.java     |  2 +-
 .../factory/support/BeanDefinitionBuilder.java   |  2 +-
 .../factory/support/BeanDefinitionDefaults.java  |  2 +-
 .../factory/support/BeanDefinitionReader.java    |  2 +-
 .../support/BeanDefinitionReaderUtils.java       |  2 +-
 .../factory/support/BeanDefinitionRegistry.java  |  2 +-
 .../factory/support/BeanDefinitionResource.java  |  2 +-
 .../BeanDefinitionValidationException.java       |  2 +-
 .../factory/support/ChildBeanDefinition.java     |  2 +-
 .../factory/support/ConstructorResolver.java     |  2 +-
 .../factory/support/GenericBeanDefinition.java   |  2 +-
 .../factory/support/InstantiationStrategy.java   |  2 +-
 .../beans/factory/support/LookupOverride.java    |  2 +-
 .../beans/factory/support/ManagedArray.java      |  2 +-
 .../beans/factory/support/ManagedList.java       |  2 +-
 .../beans/factory/support/ManagedMap.java        |  2 +-
 .../beans/factory/support/ManagedProperties.java |  2 +-
 .../beans/factory/support/ManagedSet.java        |  2 +-
 .../beans/factory/support/MethodOverride.java    |  2 +-
 .../beans/factory/support/MethodOverrides.java   |  2 +-
 .../beans/factory/support/MethodReplacer.java    |  2 +-
 .../support/PropertiesBeanDefinitionReader.java  |  2 +-
 .../beans/factory/support/ReplaceOverride.java   |  2 +-
 .../factory/support/SecurityContextProvider.java |  2 +-
 .../support/SimpleSecurityContextProvider.java   |  2 +-
 .../factory/wiring/BeanConfigurerSupport.java    |  2 +-
 .../beans/factory/wiring/BeanWiringInfo.java     |  2 +-
 .../factory/wiring/BeanWiringInfoResolver.java   |  2 +-
 .../xml/AbstractBeanDefinitionParser.java        |  2 +-
 .../xml/AbstractSimpleBeanDefinitionParser.java  |  2 +-
 .../xml/AbstractSingleBeanDefinitionParser.java  |  2 +-
 .../factory/xml/BeanDefinitionDecorator.java     |  2 +-
 .../xml/BeanDefinitionDocumentReader.java        |  2 +-
 .../beans/factory/xml/BeansDtdResolver.java      |  2 +-
 .../xml/DefaultBeanDefinitionDocumentReader.java |  2 +-
 .../factory/xml/DelegatingEntityResolver.java    |  2 +-
 .../factory/xml/DocumentDefaultsDefinition.java  |  2 +-
 .../beans/factory/xml/DocumentLoader.java        |  2 +-
 .../beans/factory/xml/NamespaceHandler.java      |  2 +-
 .../factory/xml/NamespaceHandlerResolver.java    |  2 +-
 .../xml/SimpleConstructorNamespaceHandler.java   |  2 +-
 .../xml/SimplePropertyNamespaceHandler.java      |  2 +-
 .../beans/factory/xml/UtilNamespaceHandler.java  |  2 +-
 .../factory/xml/XmlBeanDefinitionReader.java     |  2 +-
 .../xml/XmlBeanDefinitionStoreException.java     |  2 +-
 .../beans/factory/xml/XmlBeanFactory.java        |  2 +-
 .../beans/propertyeditors/CharacterEditor.java   |  2 +-
 .../beans/propertyeditors/CharsetEditor.java     |  2 +-
 .../beans/propertyeditors/ClassArrayEditor.java  |  2 +-
 .../beans/propertyeditors/ClassEditor.java       |  2 +-
 .../beans/propertyeditors/CurrencyEditor.java    |  2 +-
 .../propertyeditors/CustomBooleanEditor.java     |  2 +-
 .../propertyeditors/CustomCollectionEditor.java  |  2 +-
 .../beans/propertyeditors/CustomDateEditor.java  |  2 +-
 .../beans/propertyeditors/CustomMapEditor.java   |  2 +-
 .../propertyeditors/CustomNumberEditor.java      |  2 +-
 .../beans/propertyeditors/FileEditor.java        |  2 +-
 .../beans/propertyeditors/InputSourceEditor.java |  2 +-
 .../beans/propertyeditors/InputStreamEditor.java |  2 +-
 .../beans/propertyeditors/LocaleEditor.java      |  2 +-
 .../beans/propertyeditors/PatternEditor.java     |  2 +-
 .../beans/propertyeditors/PropertiesEditor.java  |  2 +-
 .../propertyeditors/ResourceBundleEditor.java    |  2 +-
 .../StringArrayPropertyEditor.java               |  2 +-
 .../propertyeditors/StringTrimmerEditor.java     |  2 +-
 .../beans/propertyeditors/TimeZoneEditor.java    |  2 +-
 .../beans/propertyeditors/URIEditor.java         |  2 +-
 .../beans/propertyeditors/URLEditor.java         |  2 +-
 .../beans/propertyeditors/UUIDEditor.java        |  2 +-
 .../support/ArgumentConvertingMethodInvoker.java |  2 +-
 .../beans/support/MutableSortDefinition.java     |  2 +-
 .../beans/support/PagedListHolder.java           |  2 +-
 .../beans/support/PropertyComparator.java        |  2 +-
 .../beans/support/SortDefinition.java            |  2 +-
 .../foo/ComponentBeanDefinitionParserTest.java   |  2 +-
 .../beans/AbstractPropertyValuesTests.java       |  2 +-
 .../springframework/beans/BeanUtilsTests.java    |  2 +-
 .../beans/BeanWrapperAutoGrowingTests.java       |  2 +-
 .../beans/BeanWrapperGenericsTests.java          |  2 +-
 .../beans/ConcurrentBeanWrapperTests.java        |  2 +-
 .../beans/MutablePropertyValuesTests.java        |  2 +-
 ...RequiredAnnotationBeanPostProcessorTests.java |  2 +-
 .../factory/ConcurrentBeanFactoryTests.java      |  2 +-
 .../beans/factory/FactoryBeanLookupTests.java    |  2 +-
 .../beans/factory/FactoryBeanTests.java          |  2 +-
 .../beans/factory/SharedBeanRegistryTests.java   |  2 +-
 .../CustomAutowireConfigurerTests.java           |  2 +-
 .../config/CustomEditorConfigurerTests.java      |  2 +-
 .../config/CustomScopeConfigurerTests.java       |  2 +-
 .../config/FieldRetrievingFactoryBeanTests.java  |  2 +-
 .../config/MethodInvokingFactoryBeanTests.java   |  2 +-
 .../ObjectFactoryCreatingFactoryBeanTests.java   |  2 +-
 .../config/PropertiesFactoryBeanTests.java       |  2 +-
 .../config/PropertyPathFactoryBeanTests.java     |  2 +-
 .../config/ServiceLocatorFactoryBeanTests.java   |  2 +-
 .../beans/factory/config/SimpleScopeTests.java   |  2 +-
 .../beans/factory/config/TestTypes.java          |  2 +-
 .../parsing/CustomProblemReporterTests.java      |  2 +-
 .../parsing/FailFastProblemReporterTests.java    |  2 +-
 .../parsing/PassThroughSourceExtractorTests.java |  2 +-
 .../DefinitionMetadataEqualsHashCodeTests.java   |  2 +-
 .../beans/factory/support/ManagedListTests.java  |  2 +-
 .../beans/factory/support/ManagedSetTests.java   |  2 +-
 .../PropertiesBeanDefinitionReaderTests.java     |  2 +-
 ...lifierAnnotationAutowireBeanFactoryTests.java |  2 +-
 .../security/support/ConstructorBean.java        |  2 +-
 .../security/support/CustomCallbackBean.java     |  2 +-
 .../security/support/CustomFactoryBean.java      |  2 +-
 .../support/security/support/DestroyBean.java    |  2 +-
 .../support/security/support/FactoryBean.java    |  2 +-
 .../support/security/support/InitBean.java       |  2 +-
 .../support/security/support/PropertyBean.java   |  2 +-
 .../wiring/BeanConfigurerSupportTests.java       |  2 +-
 .../factory/xml/AbstractBeanFactoryTests.java    |  2 +-
 .../factory/xml/BeanNameGenerationTests.java     |  2 +-
 .../xml/CollectingReaderEventListener.java       |  2 +-
 .../factory/xml/CollectionMergingTests.java      |  2 +-
 .../factory/xml/ConstructorDependenciesBean.java |  2 +-
 .../beans/factory/xml/CountingFactory.java       |  2 +-
 .../xml/DefaultLifecycleMethodsTests.java        |  2 +-
 .../xml/DelegatingEntityResolverTests.java       |  2 +-
 .../beans/factory/xml/DependenciesBean.java      |  2 +-
 .../beans/factory/xml/DummyReferencer.java       |  2 +-
 .../beans/factory/xml/DuplicateBeanIdTests.java  |  2 +-
 .../beans/factory/xml/EventPublicationTests.java |  2 +-
 .../beans/factory/xml/FactoryMethods.java        |  2 +-
 .../beans/factory/xml/GeneratedNameBean.java     |  2 +-
 .../beans/factory/xml/InstanceFactory.java       |  2 +-
 .../factory/xml/MetadataAttachmentTests.java     |  2 +-
 .../xml/ProfileXmlBeanDefinitionTests.java       |  2 +-
 .../factory/xml/ProtectedLifecycleBean.java      |  2 +-
 .../SimpleConstructorNamespaceHandlerTests.java  |  2 +-
 .../beans/factory/xml/TestBeanCreator.java       |  2 +-
 .../factory/xml/UtilNamespaceHandlerTests.java   |  2 +-
 .../xml/XmlBeanDefinitionReaderTests.java        |  2 +-
 .../factory/xml/XmlListableBeanFactoryTests.java |  2 +-
 .../DefaultNamespaceHandlerResolverTests.java    |  2 +-
 .../beans/propertyeditors/BeanInfoTests.java     |  2 +-
 .../ByteArrayPropertyEditorTests.java            |  2 +-
 .../beans/propertyeditors/CustomEditorTests.java |  2 +-
 .../propertyeditors/PropertiesEditorTests.java   |  2 +-
 .../beans/support/PagedListHolderTests.java      |  2 +-
 .../beans/support/PropertyComparatorTests.java   |  2 +-
 .../test/java/test/beans/BooleanTestBean.java    |  2 +-
 .../src/test/java/test/beans/Colour.java         |  2 +-
 .../test/java/test/beans/DerivedTestBean.java    |  2 +-
 .../src/test/java/test/beans/DummyBean.java      |  2 +-
 .../src/test/java/test/beans/DummyFactory.java   |  2 +-
 .../test/java/test/beans/INestedTestBean.java    |  2 +-
 .../src/test/java/test/beans/IOther.java         |  2 +-
 .../src/test/java/test/beans/LifecycleBean.java  |  2 +-
 .../src/test/java/test/beans/NestedTestBean.java |  2 +-
 .../src/test/java/test/beans/NumberTestBean.java |  2 +-
 .../java/test/beans/PackageLevelVisibleBean.java |  2 +-
 .../src/test/java/test/beans/TestBean.java       |  2 +-
 .../test/java/test/util/TestResourceUtils.java   |  2 +-
 .../mail/MailAuthenticationException.java        |  2 +-
 .../org/springframework/mail/MailException.java  |  2 +-
 .../springframework/mail/MailParseException.java |  2 +-
 .../mail/MailPreparationException.java           |  2 +-
 .../springframework/mail/MailSendException.java  |  2 +-
 .../org/springframework/mail/MailSender.java     |  2 +-
 .../springframework/mail/SimpleMailMessage.java  |  2 +-
 .../javamail/ConfigurableMimeFileTypeMap.java    |  2 +-
 .../mail/javamail/InternetAddressEditor.java     |  2 +-
 .../mail/javamail/JavaMailSender.java            |  2 +-
 .../mail/javamail/JavaMailSenderImpl.java        |  2 +-
 .../mail/javamail/MimeMessageHelper.java         |  2 +-
 .../mail/javamail/MimeMessagePreparator.java     |  2 +-
 .../mail/javamail/SmartMimeMessage.java          |  2 +-
 .../commonj/ScheduledTimerListener.java          |  2 +-
 .../scheduling/commonj/TimerManagerAccessor.java |  2 +-
 .../scheduling/quartz/CronTriggerBean.java       |  2 +-
 .../scheduling/quartz/JobDetailAwareTrigger.java |  2 +-
 .../scheduling/quartz/JobDetailBean.java         |  2 +-
 .../JobMethodInvocationFailedException.java      |  2 +-
 .../quartz/LocalDataSourceJobStore.java          |  2 +-
 .../quartz/LocalTaskExecutorThreadPool.java      |  2 +-
 .../scheduling/quartz/QuartzJobBean.java         |  2 +-
 .../quartz/ResourceLoaderClassLoadHelper.java    |  2 +-
 .../scheduling/quartz/SchedulerFactoryBean.java  |  2 +-
 .../scheduling/quartz/SimpleTriggerBean.java     |  2 +-
 .../scheduling/quartz/SpringBeanJobFactory.java  |  2 +-
 .../FreeMarkerConfigurationFactory.java          |  2 +-
 .../ui/freemarker/FreeMarkerTemplateUtils.java   |  2 +-
 .../ui/velocity/VelocityEngineFactory.java       |  2 +-
 .../java/org/springframework/beans/Colour.java   |  2 +-
 .../springframework/beans/INestedTestBean.java   |  2 +-
 .../java/org/springframework/beans/IOther.java   |  2 +-
 .../springframework/beans/NestedTestBean.java    |  2 +-
 .../java/org/springframework/beans/TestBean.java |  2 +-
 .../javamail/InternetAddressEditorTests.java     |  2 +-
 .../mail/javamail/JavaMailSenderTests.java       |  2 +-
 .../scheduling/quartz/CronTriggerBeanTests.java  |  2 +-
 .../scheduling/quartz/QuartzSupportTests.java    |  2 +-
 .../java/org/springframework/cache/Cache.java    |  2 +-
 .../cache/annotation/Cacheable.java              |  2 +-
 .../cache/interceptor/CacheAspectSupport.java    |  2 +-
 .../cache/support/SimpleValueWrapper.java        |  2 +-
 .../context/ApplicationContext.java              |  2 +-
 .../context/ApplicationContextAware.java         |  2 +-
 .../context/ApplicationContextException.java     |  2 +-
 .../context/ApplicationEvent.java                |  2 +-
 .../context/ApplicationListener.java             |  2 +-
 .../context/HierarchicalMessageSource.java       |  2 +-
 .../org/springframework/context/Lifecycle.java   |  2 +-
 .../springframework/context/MessageSource.java   |  2 +-
 .../context/MessageSourceResolvable.java         |  2 +-
 .../context/NoSuchMessageException.java          |  2 +-
 .../java/org/springframework/context/Phased.java |  2 +-
 .../context/ResourceLoaderAware.java             |  2 +-
 .../access/ContextBeanFactoryReference.java      |  2 +-
 .../access/ContextJndiBeanFactoryLocator.java    |  2 +-
 .../ContextSingletonBeanFactoryLocator.java      |  2 +-
 .../context/access/DefaultLocatorFactory.java    |  2 +-
 .../context/annotation/AutoProxyRegistrar.java   |  2 +-
 .../ClassPathBeanDefinitionScanner.java          |  2 +-
 .../context/annotation/Scope.java                |  2 +-
 .../context/annotation/ScopeMetadata.java        |  2 +-
 .../annotation/ScopeMetadataResolver.java        |  2 +-
 .../context/config/ContextNamespaceHandler.java  |  2 +-
 .../PropertyOverrideBeanDefinitionParser.java    |  2 +-
 .../context/event/ApplicationContextEvent.java   |  2 +-
 .../context/event/ContextClosedEvent.java        |  2 +-
 .../context/event/ContextRefreshedEvent.java     |  2 +-
 .../context/event/ContextStartedEvent.java       |  2 +-
 .../context/event/ContextStoppedEvent.java       |  2 +-
 .../event/EventPublicationInterceptor.java       |  2 +-
 .../event/SimpleApplicationEventMulticaster.java |  2 +-
 .../context/expression/MapAccessor.java          |  2 +-
 .../context/i18n/LocaleContextHolder.java        |  2 +-
 .../context/i18n/SimpleLocaleContext.java        |  2 +-
 .../context/support/AbstractMessageSource.java   |  2 +-
 .../AbstractRefreshableApplicationContext.java   |  2 +-
 ...tractRefreshableConfigApplicationContext.java |  2 +-
 .../support/AbstractXmlApplicationContext.java   |  2 +-
 .../ApplicationContextAwareProcessor.java        |  2 +-
 .../support/ApplicationObjectSupport.java        |  2 +-
 .../support/ContextTypeMatchClassLoader.java     |  2 +-
 .../support/ConversionServiceFactoryBean.java    |  2 +-
 .../support/DefaultMessageSourceResolvable.java  |  2 +-
 .../support/GenericApplicationContext.java       |  2 +-
 .../support/GenericXmlApplicationContext.java    |  2 +-
 .../context/support/MessageSourceAccessor.java   |  2 +-
 .../support/MessageSourceResourceBundle.java     |  2 +-
 .../context/support/SimpleThreadScope.java       |  2 +-
 .../weaving/DefaultContextLoadTimeWeaver.java    |  2 +-
 .../context/weaving/LoadTimeWeaverAware.java     |  2 +-
 .../weaving/LoadTimeWeaverAwareProcessor.java    |  2 +-
 .../AbstractRemoteSlsbInvokerInterceptor.java    |  2 +-
 .../access/AbstractSlsbInvokerInterceptor.java   |  2 +-
 .../ejb/access/EjbAccessException.java           |  2 +-
 .../ejb/access/LocalSlsbInvokerInterceptor.java  |  2 +-
 .../LocalStatelessSessionProxyFactoryBean.java   |  2 +-
 .../SimpleRemoteSlsbInvokerInterceptor.java      |  2 +-
 ...leRemoteStatelessSessionProxyFactoryBean.java |  2 +-
 .../ejb/config/JeeNamespaceHandler.java          |  2 +-
 .../config/JndiLookupBeanDefinitionParser.java   |  2 +-
 ...ocalStatelessSessionBeanDefinitionParser.java |  2 +-
 ...moteStatelessSessionBeanDefinitionParser.java |  2 +-
 .../SpringBeanAutowiringInterceptor.java         |  2 +-
 .../ejb/support/AbstractEnterpriseBean.java      |  2 +-
 .../support/AbstractJmsMessageDrivenBean.java    |  2 +-
 .../ejb/support/AbstractMessageDrivenBean.java   |  2 +-
 .../ejb/support/AbstractSessionBean.java         |  2 +-
 .../ejb/support/AbstractStatefulSessionBean.java |  2 +-
 .../support/AbstractStatelessSessionBean.java    |  2 +-
 .../format/AnnotationFormatterFactory.java       |  2 +-
 .../org/springframework/format/Formatter.java    |  2 +-
 .../format/FormatterRegistrar.java               |  2 +-
 .../format/FormatterRegistry.java                |  2 +-
 .../java/org/springframework/format/Parser.java  |  2 +-
 .../java/org/springframework/format/Printer.java |  2 +-
 .../format/annotation/NumberFormat.java          |  2 +-
 .../format/datetime/joda/JodaTimeContext.java    |  2 +-
 .../datetime/joda/JodaTimeContextHolder.java     |  2 +-
 .../format/number/AbstractNumberFormatter.java   |  2 +-
 .../NumberFormatAnnotationFormatterFactory.java  |  2 +-
 .../FormattingConversionServiceFactoryBean.java  |  2 +-
 .../InstrumentationLoadTimeWeaver.java           |  2 +-
 .../instrument/classloading/LoadTimeWeaver.java  |  2 +-
 .../classloading/ReflectiveLoadTimeWeaver.java   |  2 +-
 .../ResourceOverridingShadowingClassLoader.java  |  2 +-
 .../SimpleInstrumentableClassLoader.java         |  2 +-
 .../classloading/SimpleLoadTimeWeaver.java       |  2 +-
 .../glassfish/GlassFishClassLoaderAdapter.java   |  2 +-
 .../glassfish/GlassFishLoadTimeWeaver.java       |  2 +-
 .../classloading/jboss/JBossMCAdapter.java       |  2 +-
 .../jboss/JBossMCTranslatorAdapter.java          |  2 +-
 .../oc4j/OC4JClassLoaderAdapter.java             |  2 +-
 .../oc4j/OC4JClassPreprocessorAdapter.java       |  2 +-
 .../weblogic/WebLogicClassLoaderAdapter.java     |  2 +-
 .../WebLogicClassPreProcessorAdapter.java        |  2 +-
 .../weblogic/WebLogicLoadTimeWeaver.java         |  2 +-
 .../websphere/WebSphereClassPreDefinePlugin.java |  2 +-
 .../websphere/WebSphereLoadTimeWeaver.java       |  2 +-
 .../org/springframework/jmx/JmxException.java    |  2 +-
 .../jmx/MBeanServerNotFoundException.java        |  2 +-
 .../jmx/access/ConnectorDelegate.java            |  2 +-
 .../jmx/access/InvalidInvocationException.java   |  2 +-
 .../jmx/access/InvocationFailureException.java   |  2 +-
 .../jmx/access/MBeanClientInterceptor.java       |  2 +-
 .../jmx/access/MBeanConnectFailureException.java |  2 +-
 .../jmx/access/MBeanInfoRetrievalException.java  |  2 +-
 .../jmx/access/MBeanProxyFactoryBean.java        |  2 +-
 .../access/NotificationListenerRegistrar.java    |  2 +-
 .../jmx/export/MBeanExportException.java         |  2 +-
 .../jmx/export/MBeanExporter.java                |  2 +-
 .../jmx/export/MBeanExporterListener.java        |  2 +-
 .../export/UnableToRegisterMBeanException.java   |  2 +-
 .../jmx/export/annotation/ManagedMetric.java     |  2 +-
 .../annotation/ManagedOperationParameter.java    |  2 +-
 .../annotation/ManagedOperationParameters.java   |  2 +-
 .../jmx/export/annotation/ManagedResource.java   |  2 +-
 .../assembler/AbstractMBeanInfoAssembler.java    |  2 +-
 .../AutodetectCapableMBeanInfoAssembler.java     |  2 +-
 .../InterfaceBasedMBeanInfoAssembler.java        |  2 +-
 .../jmx/export/assembler/MBeanInfoAssembler.java |  2 +-
 .../assembler/MetadataMBeanInfoAssembler.java    |  2 +-
 .../MethodExclusionMBeanInfoAssembler.java       |  2 +-
 .../MethodNameBasedMBeanInfoAssembler.java       |  2 +-
 .../SimpleReflectiveMBeanInfoAssembler.java      |  2 +-
 .../metadata/InvalidMetadataException.java       |  2 +-
 .../jmx/export/metadata/JmxAttributeSource.java  |  2 +-
 .../jmx/export/metadata/ManagedResource.java     |  2 +-
 .../export/naming/IdentityNamingStrategy.java    |  2 +-
 .../jmx/export/naming/KeyNamingStrategy.java     |  2 +-
 .../export/naming/MetadataNamingStrategy.java    |  2 +-
 .../jmx/export/naming/ObjectNamingStrategy.java  |  2 +-
 .../jmx/export/naming/SelfNaming.java            |  2 +-
 .../ModelMBeanNotificationPublisher.java         |  2 +-
 .../notification/NotificationPublisher.java      |  2 +-
 .../UnableToSendNotificationException.java       |  2 +-
 .../jmx/support/ConnectorServerFactoryBean.java  |  2 +-
 .../springframework/jmx/support/JmxUtils.java    |  2 +-
 .../MBeanServerConnectionFactoryBean.java        |  2 +-
 .../jmx/support/MBeanServerFactoryBean.java      |  2 +-
 .../jmx/support/NotificationListenerHolder.java  |  2 +-
 .../jmx/support/ObjectNameManager.java           |  2 +-
 .../support/WebSphereMBeanServerFactoryBean.java |  2 +-
 .../org/springframework/jndi/JndiCallback.java   |  2 +-
 .../jndi/JndiLocatorDelegate.java                |  2 +-
 .../jndi/JndiLookupFailureException.java         |  2 +-
 .../jndi/JndiObjectTargetSource.java             |  2 +-
 .../org/springframework/jndi/JndiTemplate.java   |  2 +-
 .../springframework/jndi/JndiTemplateEditor.java |  2 +-
 .../jndi/TypeMismatchNamingException.java        |  2 +-
 .../jndi/support/SimpleJndiBeanFactory.java      |  2 +-
 .../remoting/RemoteConnectFailureException.java  |  2 +-
 .../RemoteInvocationFailureException.java        |  2 +-
 .../remoting/RemoteLookupFailureException.java   |  2 +-
 .../remoting/RemoteProxyFailureException.java    |  2 +-
 .../rmi/CodebaseAwareObjectInputStream.java      |  2 +-
 .../remoting/rmi/JndiRmiClientInterceptor.java   |  2 +-
 .../remoting/rmi/JndiRmiProxyFactoryBean.java    |  2 +-
 .../remoting/rmi/JndiRmiServiceExporter.java     |  2 +-
 .../rmi/RemoteInvocationSerializingExporter.java |  2 +-
 .../remoting/rmi/RmiBasedExporter.java           |  2 +-
 .../remoting/rmi/RmiClientInterceptor.java       |  2 +-
 .../remoting/rmi/RmiClientInterceptorUtils.java  |  2 +-
 .../remoting/rmi/RmiInvocationHandler.java       |  2 +-
 .../remoting/rmi/RmiInvocationWrapper.java       |  2 +-
 .../remoting/rmi/RmiProxyFactoryBean.java        |  2 +-
 .../remoting/rmi/RmiRegistryFactoryBean.java     |  2 +-
 .../remoting/rmi/RmiServiceExporter.java         |  2 +-
 .../remoting/soap/SoapFaultException.java        |  2 +-
 .../remoting/support/RemoteAccessor.java         |  2 +-
 .../remoting/support/RemoteExporter.java         |  2 +-
 .../remoting/support/RemoteInvocation.java       |  2 +-
 .../support/RemoteInvocationBasedAccessor.java   |  2 +-
 .../remoting/support/RemoteInvocationResult.java |  2 +-
 .../remoting/support/RemoteInvocationUtils.java  |  2 +-
 .../remoting/support/RemotingSupport.java        |  2 +-
 .../scheduling/SchedulingAwareRunnable.java      |  2 +-
 .../scheduling/SchedulingException.java          |  2 +-
 .../scheduling/SchedulingTaskExecutor.java       |  2 +-
 .../scheduling/TaskScheduler.java                |  2 +-
 .../org/springframework/scheduling/Trigger.java  |  2 +-
 .../scheduling/TriggerContext.java               |  2 +-
 .../scheduling/annotation/AsyncResult.java       |  2 +-
 .../scheduling/annotation/EnableAsync.java       |  2 +-
 .../ConcurrentTaskExecutor.java                  |  2 +-
 .../CustomizableThreadFactory.java               |  2 +-
 .../ThreadPoolTaskExecutor.java                  |  2 +-
 .../concurrent/ConcurrentTaskExecutor.java       |  2 +-
 .../concurrent/ConcurrentTaskScheduler.java      |  2 +-
 .../concurrent/CustomizableThreadFactory.java    |  2 +-
 .../concurrent/ExecutorConfigurationSupport.java |  2 +-
 .../concurrent/ScheduledExecutorFactoryBean.java |  2 +-
 .../concurrent/ScheduledExecutorTask.java        |  2 +-
 .../ThreadPoolExecutorFactoryBean.java           |  2 +-
 .../concurrent/ThreadPoolTaskExecutor.java       |  2 +-
 .../concurrent/ThreadPoolTaskScheduler.java      |  2 +-
 .../AnnotationDrivenBeanDefinitionParser.java    |  2 +-
 .../config/SchedulerBeanDefinitionParser.java    |  2 +-
 .../scheduling/config/TaskNamespaceHandler.java  |  2 +-
 .../support/CronSequenceGenerator.java           |  2 +-
 .../scheduling/support/CronTrigger.java          |  2 +-
 .../scheduling/support/PeriodicTrigger.java      |  2 +-
 .../scheduling/support/TaskUtils.java            |  2 +-
 .../scheduling/timer/DelegatingTimerTask.java    |  2 +-
 .../MethodInvokingTimerTaskFactoryBean.java      |  2 +-
 .../scheduling/timer/ScheduledTimerTask.java     |  2 +-
 .../scheduling/timer/TimerFactoryBean.java       |  2 +-
 .../scheduling/timer/TimerTaskExecutor.java      |  2 +-
 .../scripting/ScriptCompilationException.java    |  2 +-
 .../springframework/scripting/ScriptFactory.java |  2 +-
 .../springframework/scripting/ScriptSource.java  |  2 +-
 .../scripting/bsh/BshScriptFactory.java          |  2 +-
 .../scripting/bsh/BshScriptUtils.java            |  2 +-
 .../scripting/config/LangNamespaceHandler.java   |  2 +-
 .../config/ScriptBeanDefinitionParser.java       |  2 +-
 .../config/ScriptingDefaultsParser.java          |  2 +-
 .../scripting/groovy/GroovyObjectCustomizer.java |  2 +-
 .../scripting/groovy/GroovyScriptFactory.java    |  2 +-
 .../scripting/jruby/JRubyScriptUtils.java        |  2 +-
 .../support/RefreshableScriptTargetSource.java   |  2 +-
 .../scripting/support/ResourceScriptSource.java  |  2 +-
 .../scripting/support/StaticScriptSource.java    |  2 +-
 .../org/springframework/ui/ExtendedModelMap.java |  2 +-
 .../main/java/org/springframework/ui/Model.java  |  2 +-
 .../java/org/springframework/ui/ModelMap.java    |  2 +-
 .../ui/context/HierarchicalThemeSource.java      |  2 +-
 .../org/springframework/ui/context/Theme.java    |  2 +-
 .../springframework/ui/context/ThemeSource.java  |  2 +-
 .../support/ResourceBundleThemeSource.java       |  2 +-
 .../support/UiApplicationContextUtils.java       |  2 +-
 .../validation/AbstractErrors.java               |  2 +-
 .../AbstractPropertyBindingResult.java           |  2 +-
 .../validation/BeanPropertyBindingResult.java    |  2 +-
 .../validation/BindingErrorProcessor.java        |  2 +-
 .../validation/BindingResultUtils.java           |  2 +-
 .../validation/DefaultBindingErrorProcessor.java |  2 +-
 .../org/springframework/validation/Errors.java   |  2 +-
 .../springframework/validation/FieldError.java   |  2 +-
 .../validation/MessageCodesResolver.java         |  2 +-
 .../springframework/validation/ObjectError.java  |  2 +-
 .../validation/ValidationUtils.java              |  2 +-
 .../springframework/validation/Validator.java    |  2 +-
 .../validation/support/BindingAwareModelMap.java |  2 +-
 .../scannable/AutowiredQualifierFooService.java  |  2 +-
 .../java/example/scannable/FooServiceImpl.java   |  2 +-
 .../test/java/example/scannable/MessageBean.java |  2 +-
 .../example/scannable/ScopedProxyTestBean.java   |  2 +-
 .../scannable/ServiceInvocationCounter.java      |  2 +-
 .../test/java/example/scannable/StubFooDao.java  |  2 +-
 .../aop/aspectj/AfterAdviceBindingTests.java     |  2 +-
 .../AfterReturningAdviceBindingTests.java        |  2 +-
 .../aspectj/AfterThrowingAdviceBindingTests.java |  2 +-
 .../aop/aspectj/AroundAdviceBindingTests.java    |  2 +-
 .../aspectj/AspectAndAdvicePrecedenceTests.java  |  2 +-
 .../AspectJExpressionPointcutAdvisorTests.java   |  2 +-
 .../aspectj/BeanNamePointcutAtAspectTests.java   |  2 +-
 .../aop/aspectj/BeanNamePointcutTests.java       |  2 +-
 .../aop/aspectj/BeforeAdviceBindingTests.java    |  2 +-
 .../DeclarationOrderIndependenceTests.java       |  2 +-
 .../aspectj/DeclareParentsDelegateRefTests.java  |  2 +-
 .../aop/aspectj/DeclareParentsTests.java         |  2 +-
 ...ImplicitJPArgumentMatchingAtAspectJTests.java |  2 +-
 .../aspectj/ImplicitJPArgumentMatchingTests.java |  2 +-
 .../aop/aspectj/OverloadedAdviceTests.java       |  2 +-
 .../aop/aspectj/ProceedTests.java                |  2 +-
 .../aspectj/PropertyDependentAspectTests.java    |  2 +-
 .../SharedPointcutWithArgsMismatchTests.java     |  2 +-
 .../aspectj/SubtypeSensitiveMatchingTests.java   |  2 +-
 .../aspectj/TargetPointcutSelectionTests.java    |  2 +-
 ...rgetSelectionOnlyPointcutsAtAspectJTests.java |  2 +-
 ...ThisAndTargetSelectionOnlyPointcutsTests.java |  2 +-
 .../springframework/aop/aspectj/_TestTypes.java  |  2 +-
 .../autoproxy/AnnotationBindingTests.java        |  2 +-
 .../autoproxy/AnnotationPointcutTests.java       |  2 +-
 .../AspectImplementingInterfaceTests.java        |  2 +-
 ...ProxyCreatorAndLazyInitTargetSourceTests.java |  2 +-
 .../autoproxy/AspectJAutoProxyCreatorTests.java  |  2 +-
 .../AtAspectJAnnotationBindingTests.java         |  2 +-
 .../aop/aspectj/autoproxy/_TestTypes.java        |  2 +-
 .../autoproxy/benchmark/BenchmarkTests.java      |  2 +-
 .../aspectj/autoproxy/spr3064/SPR3064Tests.java  |  2 +-
 .../AfterReturningGenericTypeMatchingTests.java  |  2 +-
 .../GenericBridgeMethodMatchingTests.java        |  2 +-
 .../generic/GenericParameterMatchingTests.java   |  2 +-
 .../AopNamespaceHandlerAdviceTypeTests.java      |  2 +-
 .../config/AopNamespaceHandlerArgNamesTests.java |  2 +-
 .../AopNamespaceHandlerReturningTests.java       |  2 +-
 .../config/AopNamespaceHandlerThrowingTests.java |  2 +-
 .../config/MethodLocatingFactoryBeanTests.java   |  2 +-
 .../aop/framework/JdkDynamicProxyTests.java      |  2 +-
 .../aop/framework/ProxyFactoryBeanTests.java     |  2 +-
 .../autoproxy/AdvisorAutoProxyCreatorTests.java  |  2 +-
 .../BeanNameAutoProxyCreatorInitTests.java       |  2 +-
 .../autoproxy/BeanNameAutoProxyCreatorTests.java |  2 +-
 .../aop/scope/ScopedProxyTests.java              |  2 +-
 .../aop/target/CommonsPoolTargetSourceTests.java |  2 +-
 .../java/org/springframework/beans/Colour.java   |  2 +-
 .../springframework/beans/DerivedTestBean.java   |  2 +-
 .../springframework/beans/INestedTestBean.java   |  2 +-
 .../java/org/springframework/beans/IOther.java   |  2 +-
 .../springframework/beans/IndexedTestBean.java   |  2 +-
 .../springframework/beans/NestedTestBean.java    |  2 +-
 .../java/org/springframework/beans/Person.java   |  2 +-
 .../beans/SerializablePerson.java                |  2 +-
 .../java/org/springframework/beans/TestBean.java |  2 +-
 .../beans/factory/AbstractBeanFactoryTests.java  |  2 +-
 .../beans/factory/DummyFactory.java              |  2 +-
 .../springframework/beans/factory/HasMap.java    |  2 +-
 .../beans/factory/LifecycleBean.java             |  2 +-
 .../beans/factory/MustBeInitialized.java         |  2 +-
 .../access/SingletonBeanFactoryLocatorTests.java |  2 +-
 .../beans/factory/access/TestBean.java           |  2 +-
 .../annotation/BridgeMethodAutowiringTests.java  |  2 +-
 .../beans/factory/config/SimpleMapScope.java     |  2 +-
 .../parsing/CollectingReaderEventListener.java   |  2 +-
 .../InjectAnnotationAutowireContextTests.java    |  2 +-
 .../beans/factory/xml/DependenciesBean.java      |  2 +-
 .../LookupMethodWrappedByCglibProxyTests.java    |  2 +-
 .../factory/xml/QualifierAnnotationTests.java    |  2 +-
 .../xml/support/CustomNamespaceHandlerTests.java |  2 +-
 .../config/AnnotatedClassCacheableService.java   |  2 +-
 .../cache/config/CacheableService.java           |  2 +-
 .../cache/config/DefaultCacheableService.java    |  2 +-
 .../cache/config/EnableCachingTests.java         |  2 +-
 .../org/springframework/context/ACATester.java   |  2 +-
 .../context/AbstractApplicationContextTests.java |  2 +-
 .../context/BeanThatBroadcasts.java              |  2 +-
 .../springframework/context/BeanThatListens.java |  2 +-
 .../context/LifecycleContextBean.java            |  2 +-
 .../springframework/context/TestListener.java    |  2 +-
 .../access/ContextBeanFactoryReferenceTests.java |  2 +-
 .../ContextJndiBeanFactoryLocatorTests.java      |  2 +-
 .../ContextSingletonBeanFactoryLocatorTests.java |  2 +-
 .../access/DefaultLocatorFactoryTests.java       |  2 +-
 .../AbstractCircularImportDetectionTests.java    |  2 +-
 .../AnnotationConfigApplicationContextTests.java |  2 +-
 .../AnnotationProcessorPerformanceTests.java     |  2 +-
 .../AnnotationScopeMetadataResolverTests.java    |  2 +-
 .../AsmCircularImportDetectionTests.java         |  2 +-
 ...assPathFactoryBeanDefinitionScannerTests.java |  2 +-
 .../annotation/ComponentScanParserTests.java     |  2 +-
 ...ScanParserWithUserDefinedStrategiesTests.java |  2 +-
 .../ConfigurationClassAndBFPPTests.java          |  2 +-
 ...urationWithFactoryBeanAndAutowiringTests.java |  2 +-
 ...urationWithFactoryBeanAndParametersTests.java |  2 +-
 .../annotation/DestroyMethodInferenceTests.java  |  2 +-
 .../annotation/EnableLoadTimeWeavingTests.java   |  2 +-
 .../annotation/FooServiceDependentConverter.java |  2 +-
 .../NestedConfigurationClassTests.java           |  2 +-
 .../context/annotation/SimpleConfigTests.java    |  2 +-
 .../context/annotation/SimpleScanTests.java      |  2 +-
 .../Spr3775InitDestroyLifecycleTests.java        |  2 +-
 .../context/annotation/Spr6602Tests.java         |  2 +-
 .../annotation/TestBeanNameGenerator.java        |  2 +-
 .../annotation/TestScopeMetadataResolver.java    |  2 +-
 .../AutowiredConfigurationTests.java             |  2 +-
 .../BeanAnnotationAttributePropagationTests.java |  2 +-
 ...ConfigurationClassAspectIntegrationTests.java |  2 +-
 ...ionClassCglibCallbackDeregistrationTests.java |  2 +-
 .../configuration/ImportResourceTests.java       |  2 +-
 .../annotation/configuration/ImportTests.java    |  2 +-
 ...portedConfigurationClassEnhancementTests.java |  2 +-
 .../annotation/configuration/ScopingTests.java   |  2 +-
 .../annotation/configuration/Spr7167Tests.java   |  2 +-
 .../context/annotation/spr8761/Spr8761Tests.java |  2 +-
 .../context/annotation3/StubFooDao.java          |  2 +-
 .../context/annotation5/OtherFooDao.java         |  2 +-
 .../context/conversionservice/Bar.java           |  2 +-
 .../ConversionServiceContextConfigTests.java     |  2 +-
 .../conversionservice/StringToBarConverter.java  |  2 +-
 .../event/ApplicationContextEventTests.java      |  2 +-
 .../event/EventPublicationInterceptorTests.java  |  2 +-
 .../context/event/LifecycleEventTests.java       |  2 +-
 .../ApplicationContextExpressionTests.java       |  2 +-
 .../context/support/Assembler.java               |  2 +-
 .../context/support/AutowiredService.java        |  2 +-
 .../support/BeanFactoryPostProcessorTests.java   |  2 +-
 .../ClassPathXmlApplicationContextTests.java     |  2 +-
 .../ConversionServiceFactoryBeanTests.java       |  2 +-
 .../support/DefaultLifecycleProcessorTests.java  |  2 +-
 .../context/support/LifecycleTestBean.java       |  2 +-
 .../springframework/context/support/Logic.java   |  2 +-
 .../context/support/NoOpAdvice.java              |  2 +-
 ...opertyResourceConfigurerIntegrationTests.java |  2 +-
 ...ropertySourcesPlaceholderConfigurerTests.java |  2 +-
 .../context/support/ResourceConverter.java       |  2 +-
 .../springframework/context/support/Service.java |  2 +-
 .../context/support/SimpleThreadScopeTest.java   |  2 +-
 .../context/support/Spr7283Tests.java            |  2 +-
 .../context/support/Spr7816Tests.java            |  2 +-
 ...StaticApplicationContextMulticasterTests.java |  2 +-
 .../support/StaticApplicationContextTests.java   |  2 +-
 .../support/StaticMessageSourceTests.java        |  2 +-
 .../springframework/context/support/TestIF.java  |  2 +-
 .../springframework/core/task/NoOpRunnable.java  |  2 +-
 .../access/LocalSlsbInvokerInterceptorTests.java |  2 +-
 ...calStatelessSessionProxyFactoryBeanTests.java |  2 +-
 .../SimpleRemoteSlsbInvokerInterceptorTests.java |  2 +-
 ...oteStatelessSessionProxyFactoryBeanTests.java |  2 +-
 .../format/number/CurrencyFormatterTests.java    |  2 +-
 .../format/number/NumberFormattingTests.java     |  2 +-
 ...mattingConversionServiceFactoryBeanTests.java |  2 +-
 .../ReflectiveLoadTimeWeaverTests.java           |  2 +-
 ...ourceOverridingShadowingClassLoaderTests.java |  2 +-
 .../glassfish/GlassFishLoadTimeWeaverTests.java  |  2 +-
 .../springframework/jmx/AbstractJmxTests.java    |  2 +-
 .../jmx/AbstractMBeanServerTests.java            |  2 +-
 .../org/springframework/jmx/IJmxTestBean.java    |  2 +-
 .../org/springframework/jmx/JmxTestBean.java     |  2 +-
 .../jmx/access/MBeanClientInterceptorTests.java  |  2 +-
 .../RemoteMBeanClientInterceptorTestsIgnore.java |  2 +-
 .../jmx/export/CustomEditorConfigurerTests.java  |  2 +-
 .../springframework/jmx/export/DateRange.java    |  2 +-
 .../jmx/export/ExceptionOnInitBean.java          |  2 +-
 .../jmx/export/MBeanExporterOperationsTests.java |  2 +-
 .../jmx/export/NotificationListenerTests.java    |  2 +-
 .../jmx/export/NotificationPublisherTests.java   |  2 +-
 .../PropertyPlaceholderConfigurerTests.java      |  2 +-
 .../jmx/export/TestDynamicMBean.java             |  2 +-
 .../AnnotationMetadataAssemblerTests.java        |  2 +-
 .../export/annotation/AnnotationTestBean.java    |  2 +-
 .../export/annotation/AnnotationTestSubBean.java |  2 +-
 .../annotation/JmxUtilsAnnotationTests.java      |  2 +-
 .../assembler/AbstractJmxAssemblerTests.java     |  2 +-
 ...AbstractMetadataAssemblerAutodetectTests.java |  2 +-
 .../AbstractMetadataAssemblerTests.java          |  2 +-
 .../jmx/export/assembler/ICustomJmxBean.java     |  2 +-
 ...erfaceBasedMBeanInfoAssemblerCustomTests.java |  2 +-
 ...erfaceBasedMBeanInfoAssemblerMappedTests.java |  2 +-
 .../InterfaceBasedMBeanInfoAssemblerTests.java   |  2 +-
 ...hodExclusionMBeanInfoAssemblerComboTests.java |  2 +-
 ...odExclusionMBeanInfoAssemblerMappedTests.java |  2 +-
 ...xclusionMBeanInfoAssemblerNotMappedTests.java |  2 +-
 .../MethodExclusionMBeanInfoAssemblerTests.java  |  2 +-
 ...odNameBasedMBeanInfoAssemblerMappedTests.java |  2 +-
 .../MethodNameBasedMBeanInfoAssemblerTests.java  |  2 +-
 .../assembler/ReflectiveAssemblerTests.java      |  2 +-
 .../export/naming/KeyNamingStrategyTests.java    |  2 +-
 .../PropertiesFileNamingStrategyTests.java       |  2 +-
 .../naming/PropertiesNamingStrategyTests.java    |  2 +-
 .../ModelMBeanNotificationPublisherTests.java    |  2 +-
 .../jmx/support/JmxUtilsTests.java               |  2 +-
 .../MBeanServerConnectionFactoryBeanTests.java   |  2 +-
 .../jndi/JndiObjectFactoryBeanTests.java         |  2 +-
 .../jndi/JndiTemplateEditorTests.java            |  2 +-
 .../springframework/jndi/JndiTemplateTests.java  |  2 +-
 .../jndi/SimpleNamingContextTests.java           |  2 +-
 .../mock/jndi/ExpectedLookupTemplate.java        |  2 +-
 .../mock/jndi/SimpleNamingContext.java           |  2 +-
 .../mock/jndi/SimpleNamingContextBuilder.java    |  2 +-
 .../remoting/rmi/RmiSupportTests.java            |  2 +-
 .../AsyncAnnotationBeanPostProcessorTests.java   |  2 +-
 .../ScheduledExecutorFactoryBeanTests.java       |  2 +-
 .../concurrent/ThreadPoolTaskSchedulerTests.java |  2 +-
 .../ExecutorBeanDefinitionParserTests.java       |  2 +-
 .../scheduling/support/PeriodicTriggerTests.java |  2 +-
 .../scheduling/timer/TimerSupportTests.java      |  2 +-
 .../scheduling/timer/TimerTaskExecutorTests.java |  2 +-
 .../springframework/scripting/ScriptBean.java    |  2 +-
 .../scripting/bsh/BshScriptFactoryTests.java     |  2 +-
 .../scripting/config/OtherTestBean.java          |  2 +-
 .../scripting/config/ScriptingDefaultsTests.java |  2 +-
 .../scripting/groovy/ConcreteMessenger.java      |  2 +-
 .../groovy/GroovyClassLoadingTests.java          |  2 +-
 .../groovy/GroovyScriptFactoryTests.java         |  2 +-
 .../scripting/groovy/TestException.java          |  2 +-
 .../scripting/jruby/JRubyScriptFactoryTests.java |  2 +-
 .../scripting/jruby/WrapperAdder.java            |  2 +-
 .../RefreshableScriptTargetSourceTests.java      |  2 +-
 .../support/ResourceScriptSourceTests.java       |  2 +-
 .../support/ScriptFactoryPostProcessorTests.java |  2 +-
 .../scripting/support/StubMessenger.java         |  2 +-
 .../org/springframework/ui/ModelMapTests.java    |  2 +-
 .../util/SerializationTestUtils.java             |  2 +-
 .../validation/DataBinderFieldAccessTests.java   |  2 +-
 .../validation/DataBinderTests.java              |  2 +-
 .../validation/ValidationUtilsTests.java         |  2 +-
 .../beanvalidation/MethodValidationTests.java    |  2 +-
 .../advice/CountingAfterReturningAdvice.java     |  2 +-
 .../java/test/advice/CountingBeforeAdvice.java   |  2 +-
 .../src/test/java/test/advice/MethodCounter.java |  2 +-
 .../advice/TimestampIntroductionAdvisor.java     |  2 +-
 .../src/test/java/test/beans/CustomScope.java    |  2 +-
 .../src/test/java/test/beans/Employee.java       |  2 +-
 .../src/test/java/test/beans/FactoryMethods.java |  2 +-
 .../src/test/java/test/beans/ITestBean.java      |  2 +-
 .../src/test/java/test/beans/NestedTestBean.java |  2 +-
 .../src/test/java/test/beans/SideEffectBean.java |  2 +-
 .../src/test/java/test/beans/TestBean.java       |  2 +-
 .../java/test/interceptor/NopInterceptor.java    |  2 +-
 .../interceptor/SerializableNopInterceptor.java  |  2 +-
 .../TimestampIntroductionInterceptor.java        |  2 +-
 .../test/java/test/mixin/DefaultLockable.java    |  2 +-
 .../src/test/java/test/mixin/LockMixin.java      |  2 +-
 .../test/java/test/mixin/LockMixinAdvisor.java   |  2 +-
 .../src/test/java/test/mixin/Lockable.java       |  2 +-
 .../test/java/test/mixin/LockedException.java    |  2 +-
 .../src/test/java/test/util/TimeStamped.java     |  2 +-
 .../springframework/core/AttributeAccessor.java  |  2 +-
 .../core/AttributeAccessorSupport.java           |  2 +-
 .../core/BridgeMethodResolver.java               |  2 +-
 .../core/ConfigurableObjectInputStream.java      |  2 +-
 .../springframework/core/ConstantException.java  |  2 +-
 .../org/springframework/core/ControlFlow.java    |  2 +-
 .../org/springframework/core/Conventions.java    |  2 +-
 .../org/springframework/core/ErrorCoded.java     |  2 +-
 .../core/GenericCollectionTypeResolver.java      |  2 +-
 .../core/InfrastructureProxy.java                |  2 +-
 .../org/springframework/core/JdkVersion.java     |  2 +-
 .../core/NestedCheckedException.java             |  2 +-
 .../springframework/core/NestedIOException.java  |  2 +-
 .../core/NestedRuntimeException.java             |  2 +-
 .../java/org/springframework/core/Ordered.java   |  2 +-
 .../core/OverridingClassLoader.java              |  2 +-
 .../core/PrioritizedParameterNameDiscoverer.java |  2 +-
 .../springframework/core/SmartClassLoader.java   |  2 +-
 .../org/springframework/core/SpringVersion.java  |  2 +-
 .../springframework/core/annotation/Order.java   |  2 +-
 .../support/ConversionServiceFactory.java        |  2 +-
 .../convert/support/IdToEntityConverter.java     |  2 +-
 .../convert/support/ObjectToObjectConverter.java |  2 +-
 .../AbstractCachingLabeledEnumResolver.java      |  2 +-
 .../core/enums/AbstractGenericLabeledEnum.java   |  2 +-
 .../core/enums/AbstractLabeledEnum.java          |  2 +-
 .../springframework/core/enums/LabeledEnum.java  |  2 +-
 .../core/enums/LabeledEnumResolver.java          |  2 +-
 .../core/enums/LetterCodedLabeledEnum.java       |  2 +-
 .../core/enums/ShortCodedLabeledEnum.java        |  2 +-
 .../core/enums/StaticLabeledEnum.java            |  2 +-
 .../core/enums/StaticLabeledEnumResolver.java    |  2 +-
 .../core/enums/StringCodedLabeledEnum.java       |  2 +-
 .../core/env/EnvironmentCapable.java             |  2 +-
 .../core/io/ByteArrayResource.java               |  2 +-
 .../core/io/ClassRelativeResourceLoader.java     |  2 +-
 .../core/io/DefaultResourceLoader.java           |  2 +-
 .../core/io/DescriptiveResource.java             |  2 +-
 .../core/io/InputStreamResource.java             |  2 +-
 .../springframework/core/io/ResourceEditor.java  |  2 +-
 .../springframework/core/io/ResourceLoader.java  |  2 +-
 .../core/io/WritableResource.java                |  2 +-
 .../core/io/support/EncodedResource.java         |  2 +-
 .../core/io/support/LocalizedResourceHelper.java |  2 +-
 .../io/support/ResourceArrayPropertyEditor.java  |  2 +-
 .../core/io/support/ResourcePatternUtils.java    |  2 +-
 .../core/serializer/DefaultDeserializer.java     |  2 +-
 .../core/serializer/DefaultSerializer.java       |  2 +-
 .../core/serializer/Deserializer.java            |  2 +-
 .../core/serializer/Serializer.java              |  2 +-
 .../support/SerializationFailedException.java    |  2 +-
 .../core/style/DefaultToStringStyler.java        |  2 +-
 .../core/style/DefaultValueStyler.java           |  2 +-
 .../springframework/core/style/StylerUtils.java  |  2 +-
 .../core/style/ToStringCreator.java              |  2 +-
 .../core/style/ToStringStyler.java               |  2 +-
 .../core/task/AsyncTaskExecutor.java             |  2 +-
 .../core/task/SimpleAsyncTaskExecutor.java       |  2 +-
 .../core/task/SyncTaskExecutor.java              |  2 +-
 .../springframework/core/task/TaskExecutor.java  |  2 +-
 .../core/task/TaskRejectedException.java         |  2 +-
 .../core/task/TaskTimeoutException.java          |  2 +-
 .../task/support/ExecutorServiceAdapter.java     |  2 +-
 .../core/task/support/TaskExecutorAdapter.java   |  2 +-
 .../core/type/AnnotationMetadata.java            |  2 +-
 .../springframework/core/type/ClassMetadata.java |  2 +-
 .../core/type/MethodMetadata.java                |  2 +-
 .../core/type/StandardClassMetadata.java         |  2 +-
 .../type/classreading/MetadataReaderFactory.java |  2 +-
 .../AbstractTypeHierarchyTraversingFilter.java   |  2 +-
 .../core/type/filter/AnnotationTypeFilter.java   |  2 +-
 .../core/type/filter/AssignableTypeFilter.java   |  2 +-
 .../springframework/util/AutoPopulatingList.java |  2 +-
 .../util/CachingMapDecorator.java                |  2 +-
 .../springframework/util/CollectionUtils.java    |  2 +-
 .../springframework/util/CommonsLogWriter.java   |  2 +-
 .../util/ConcurrencyThrottleSupport.java         |  2 +-
 .../util/CustomizableThreadCreator.java          |  2 +-
 .../util/DefaultPropertiesPersister.java         |  2 +-
 .../org/springframework/util/DigestUtils.java    |  2 +-
 .../org/springframework/util/FileCopyUtils.java  |  2 +-
 .../springframework/util/FileSystemUtils.java    |  2 +-
 .../springframework/util/Log4jConfigurer.java    |  2 +-
 .../org/springframework/util/MethodInvoker.java  |  2 +-
 .../org/springframework/util/MultiValueMap.java  |  2 +-
 .../org/springframework/util/NumberUtils.java    |  2 +-
 .../org/springframework/util/ObjectUtils.java    |  2 +-
 .../org/springframework/util/PathMatcher.java    |  2 +-
 .../util/PropertiesPersister.java                |  2 +-
 .../java/org/springframework/util/StopWatch.java |  2 +-
 .../util/SystemPropertyUtils.java                |  2 +-
 .../java/org/springframework/util/TypeUtils.java |  2 +-
 .../util/comparator/BooleanComparator.java       |  2 +-
 .../util/xml/AbstractStaxContentHandler.java     |  2 +-
 .../util/xml/AbstractStaxXMLReader.java          |  2 +-
 .../util/xml/AbstractXMLReader.java              |  2 +-
 .../util/xml/AbstractXMLStreamReader.java        |  2 +-
 .../util/xml/DomContentHandler.java              |  2 +-
 .../org/springframework/util/xml/DomUtils.java   |  2 +-
 .../util/xml/SimpleNamespaceContext.java         |  2 +-
 .../util/xml/SimpleSaxErrorHandler.java          |  2 +-
 .../util/xml/SimpleTransformErrorListener.java   |  2 +-
 .../util/xml/StaxEventXMLReader.java             |  2 +-
 .../org/springframework/util/xml/StaxResult.java |  2 +-
 .../org/springframework/util/xml/StaxSource.java |  2 +-
 .../util/xml/StaxStreamContentHandler.java       |  2 +-
 .../util/xml/StaxStreamXMLReader.java            |  2 +-
 .../util/xml/TransformerUtils.java               |  2 +-
 .../java/org/springframework/beans/Colour.java   |  2 +-
 .../springframework/beans/DerivedTestBean.java   |  2 +-
 .../springframework/beans/INestedTestBean.java   |  2 +-
 .../java/org/springframework/beans/IOther.java   |  2 +-
 .../springframework/beans/NestedTestBean.java    |  2 +-
 .../java/org/springframework/beans/TestBean.java |  2 +-
 .../core/AbstractControlFlowTests.java           |  2 +-
 .../core/AttributeAccessorSupportTests.java      |  2 +-
 .../core/BridgeMethodResolverTests.java          |  2 +-
 .../springframework/core/ConventionsTests.java   |  2 +-
 .../core/DefaultControlFlowTests.java            |  2 +-
 .../core/ExceptionDepthComparatorTests.java      |  2 +-
 .../core/GenericCollectionTypeResolverTests.java |  2 +-
 .../core/Jdk14ControlFlowTests.java              |  2 +-
 ...ariableTableParameterNameDiscovererTests.java |  2 +-
 .../core/NestedExceptionTests.java               |  2 +-
 .../core/OrderComparatorTests.java               |  2 +-
 .../PrioritizedParameterNameDiscovererTests.java |  2 +-
 .../CollectionToCollectionConverterTests.java    |  2 +-
 .../convert/support/DefaultConversionTests.java  |  2 +-
 .../core/enums/LabeledEnumTests.java             |  2 +-
 .../core/env/PropertySourceTests.java            |  2 +-
 ...PathMatchingResourcePatternResolverTests.java |  2 +-
 .../ResourceArrayPropertyEditorTests.java        |  2 +-
 .../core/style/ToStringCreatorTests.java         |  2 +-
 .../core/task/SimpleAsyncTaskExecutorTests.java  |  2 +-
 .../core/type/AssignableTypeFilterTests.java     |  2 +-
 .../core/type/CachingMetadataReaderLeakTest.java |  2 +-
 .../org/springframework/util/AssertTests.java    |  2 +-
 .../util/AutoPopulatingListTests.java            |  2 +-
 .../util/CachingMapDecoratorTests.java           |  2 +-
 .../springframework/util/ClassUtilsTests.java    |  2 +-
 .../util/CollectionUtilsTests.java               |  2 +-
 .../util/FileSystemUtilsTests.java               |  2 +-
 .../util/Log4jConfigurerTests.java               |  2 +-
 .../springframework/util/MethodInvokerTests.java |  2 +-
 .../springframework/util/MockLog4jAppender.java  |  2 +-
 .../util/ReflectionUtilsTests.java               |  2 +-
 .../springframework/util/ResourceUtilsTests.java |  2 +-
 .../util/SerializationUtilsTests.java            |  2 +-
 .../org/springframework/util/StopWatchTests.java |  2 +-
 .../util/xml/AbstractStaxXMLReaderTestCase.java  |  2 +-
 .../util/xml/StaxEventXMLReaderTests.java        |  2 +-
 .../util/xml/StaxStreamXMLReaderTests.java       |  2 +-
 .../expression/AccessException.java              |  2 +-
 .../springframework/expression/BeanResolver.java |  2 +-
 .../expression/ConstructorExecutor.java          |  2 +-
 .../expression/ConstructorResolver.java          |  2 +-
 .../expression/EvaluationException.java          |  2 +-
 .../springframework/expression/Expression.java   |  2 +-
 .../expression/ExpressionException.java          |  2 +-
 .../ExpressionInvocationTargetException.java     |  2 +-
 .../springframework/expression/MethodFilter.java |  2 +-
 .../expression/MethodResolver.java               |  2 +-
 .../springframework/expression/Operation.java    |  2 +-
 .../expression/OperatorOverloader.java           |  2 +-
 .../expression/ParseException.java               |  2 +-
 .../expression/ParserContext.java                |  2 +-
 .../expression/PropertyAccessor.java             |  2 +-
 .../expression/TypeComparator.java               |  2 +-
 .../springframework/expression/TypedValue.java   |  2 +-
 .../common/CompositeStringExpression.java        |  2 +-
 .../expression/common/LiteralExpression.java     |  2 +-
 .../expression/common/TemplateParserContext.java |  2 +-
 .../expression/spel/InternalParseException.java  |  2 +-
 .../expression/spel/SpelEvaluationException.java |  2 +-
 .../expression/spel/SpelParseException.java      |  2 +-
 .../expression/spel/ast/AstUtils.java            |  2 +-
 .../expression/spel/ast/BeanReference.java       |  2 +-
 .../spel/ast/ConstructorReference.java           |  2 +-
 .../expression/spel/ast/FormatHelper.java        |  2 +-
 .../expression/spel/ast/FunctionReference.java   |  2 +-
 .../expression/spel/ast/InlineList.java          |  2 +-
 .../expression/spel/ast/IntLiteral.java          |  2 +-
 .../expression/spel/ast/LongLiteral.java         |  2 +-
 .../expression/spel/ast/Operator.java            |  2 +-
 .../expression/spel/ast/OperatorBetween.java     |  2 +-
 .../expression/spel/ast/OperatorInstanceof.java  |  2 +-
 .../expression/spel/ast/RealLiteral.java         |  2 +-
 .../expression/spel/ast/TypeCode.java            |  2 +-
 .../spel/standard/SpelExpressionParser.java      |  2 +-
 .../expression/spel/standard/Token.java          |  2 +-
 .../spel/support/BooleanTypedValue.java          |  2 +-
 .../spel/support/ReflectionHelper.java           |  2 +-
 .../support/ReflectiveConstructorResolver.java   |  2 +-
 .../spel/support/StandardTypeComparator.java     |  2 +-
 .../spel/support/StandardTypeConverter.java      |  2 +-
 .../spel/support/StandardTypeLocator.java        |  2 +-
 .../expression/spel/ArrayConstructorTests.java   |  2 +-
 .../spel/ConstructorInvocationTests.java         |  2 +-
 .../spel/DefaultComparatorUnitTests.java         |  2 +-
 .../spel/ExpressionLanguageScenarioTests.java    |  2 +-
 .../expression/spel/ExpressionStateTests.java    |  2 +-
 ...xpressionTestsUsingCoreConversionService.java |  2 +-
 .../expression/spel/ListTests.java               |  2 +-
 .../expression/spel/LiteralExpressionTests.java  |  2 +-
 .../expression/spel/MapAccessTests.java          |  2 +-
 .../expression/spel/OperatorOverloaderTests.java |  2 +-
 .../expression/spel/ParsingTests.java            |  2 +-
 .../expression/spel/PerformanceTests.java        |  2 +-
 .../spel/ScenariosForSpringSecurity.java         |  2 +-
 .../expression/spel/SetValueTests.java           |  2 +-
 .../expression/spel/SpelDocumentationTests.java  |  2 +-
 .../expression/spel/SpelUtilities.java           |  2 +-
 .../spel/StandardTypeLocatorTests.java           |  2 +-
 .../spel/TemplateExpressionParsingTests.java     |  2 +-
 .../spel/VariableAndFunctionTests.java           |  2 +-
 .../expression/spel/ast/FormatHelperTests.java   |  2 +-
 .../spel/support/ReflectionHelperTests.java      |  2 +-
 .../spel/support/StandardComponentsTests.java    |  2 +-
 .../spel/testresources/ArrayContainer.java       |  2 +-
 .../tomcat/TomcatInstrumentableClassLoader.java  |  2 +-
 .../instrument/InstrumentationSavingAgent.java   |  2 +-
 .../jdbc/BadSqlGrammarException.java             |  2 +-
 .../jdbc/CannotGetJdbcConnectionException.java   |  2 +-
 .../IncorrectResultSetColumnCountException.java  |  2 +-
 .../jdbc/InvalidResultSetAccessException.java    |  2 +-
 ...teAffectedIncorrectNumberOfRowsException.java |  2 +-
 .../jdbc/LobRetrievalFailureException.java       |  2 +-
 .../jdbc/SQLWarningException.java                |  2 +-
 .../jdbc/UncategorizedSQLException.java          |  2 +-
 .../jdbc/config/SortedResourcesFactoryBean.java  |  2 +-
 .../jdbc/core/BatchPreparedStatementSetter.java  |  2 +-
 .../jdbc/core/BeanPropertyRowMapper.java         |  2 +-
 .../jdbc/core/CallableStatementCallback.java     |  2 +-
 .../jdbc/core/CallableStatementCreator.java      |  2 +-
 .../core/CallableStatementCreatorFactory.java    |  2 +-
 .../jdbc/core/ConnectionCallback.java            |  2 +-
 ...nterruptibleBatchPreparedStatementSetter.java |  2 +-
 .../jdbc/core/JdbcOperations.java                |  2 +-
 .../jdbc/core/ParameterMapper.java               |  2 +-
 .../jdbc/core/PreparedStatementCallback.java     |  2 +-
 .../jdbc/core/PreparedStatementCreator.java      |  2 +-
 .../core/PreparedStatementCreatorFactory.java    |  2 +-
 .../jdbc/core/PreparedStatementSetter.java       |  2 +-
 .../jdbc/core/ResultSetExtractor.java            |  2 +-
 .../core/ResultSetSupportingSqlParameter.java    |  2 +-
 .../jdbc/core/RowCallbackHandler.java            |  2 +-
 .../jdbc/core/RowCountCallbackHandler.java       |  2 +-
 .../org/springframework/jdbc/core/RowMapper.java |  2 +-
 .../jdbc/core/RowMapperResultSetExtractor.java   |  2 +-
 .../jdbc/core/SingleColumnRowMapper.java         |  2 +-
 .../jdbc/core/SqlInOutParameter.java             |  2 +-
 .../springframework/jdbc/core/SqlParameter.java  |  2 +-
 .../jdbc/core/SqlParameterValue.java             |  2 +-
 .../springframework/jdbc/core/SqlProvider.java   |  2 +-
 .../jdbc/core/SqlReturnResultSet.java            |  2 +-
 .../springframework/jdbc/core/SqlReturnType.java |  2 +-
 .../springframework/jdbc/core/SqlTypeValue.java  |  2 +-
 .../jdbc/core/StatementCallback.java             |  2 +-
 .../jdbc/core/StatementCreatorUtils.java         |  2 +-
 .../metadata/CallMetaDataProviderFactory.java    |  2 +-
 .../metadata/GenericCallMetaDataProvider.java    |  2 +-
 .../core/metadata/HsqlTableMetaDataProvider.java |  2 +-
 .../metadata/OracleCallMetaDataProvider.java     |  2 +-
 .../metadata/OracleTableMetaDataProvider.java    |  2 +-
 .../core/metadata/TableMetaDataProvider.java     |  2 +-
 .../namedparam/AbstractSqlParameterSource.java   |  2 +-
 .../core/namedparam/MapSqlParameterSource.java   |  2 +-
 .../namedparam/NamedParameterJdbcDaoSupport.java |  2 +-
 .../namedparam/NamedParameterJdbcOperations.java |  2 +-
 .../namedparam/NamedParameterJdbcTemplate.java   |  2 +-
 .../jdbc/core/namedparam/SqlParameterSource.java |  2 +-
 .../core/namedparam/SqlParameterSourceUtils.java |  2 +-
 .../jdbc/core/simple/AbstractJdbcCall.java       |  2 +-
 .../jdbc/core/simple/AbstractJdbcInsert.java     |  2 +-
 .../ParameterizedBeanPropertyRowMapper.java      |  2 +-
 .../ParameterizedSingleColumnRowMapper.java      |  2 +-
 .../jdbc/core/simple/SimpleJdbcCall.java         |  2 +-
 .../core/simple/SimpleJdbcCallOperations.java    |  2 +-
 .../jdbc/core/simple/SimpleJdbcDaoSupport.java   |  2 +-
 .../jdbc/core/simple/SimpleJdbcInsert.java       |  2 +-
 .../core/simple/SimpleJdbcInsertOperations.java  |  2 +-
 .../jdbc/core/simple/SimpleJdbcOperations.java   |  2 +-
 .../jdbc/core/simple/SimpleJdbcTemplate.java     |  2 +-
 ...nterruptibleBatchPreparedStatementSetter.java |  2 +-
 ...ractLobCreatingPreparedStatementCallback.java |  2 +-
 .../AbstractLobStreamingResultSetExtractor.java  |  2 +-
 .../jdbc/core/support/AbstractSqlTypeValue.java  |  2 +-
 .../core/support/JdbcBeanDefinitionReader.java   |  2 +-
 .../jdbc/core/support/JdbcDaoSupport.java        |  2 +-
 .../jdbc/core/support/SqlLobValue.java           |  2 +-
 .../AbstractDriverBasedDataSource.java           |  2 +-
 .../jdbc/datasource/ConnectionHolder.java        |  2 +-
 .../jdbc/datasource/ConnectionProxy.java         |  2 +-
 .../datasource/DataSourceTransactionManager.java |  2 +-
 .../jdbc/datasource/DriverManagerDataSource.java |  2 +-
 .../IsolationLevelDataSourceAdapter.java         |  2 +-
 .../jdbc/datasource/SimpleDriverDataSource.java  |  2 +-
 .../datasource/SingleConnectionDataSource.java   |  2 +-
 .../jdbc/datasource/SmartDataSource.java         |  2 +-
 .../TransactionAwareDataSourceProxy.java         |  2 +-
 .../UserCredentialsDataSourceAdapter.java        |  2 +-
 .../datasource/WebSphereDataSourceAdapter.java   |  2 +-
 .../DerbyEmbeddedDatabaseConfigurer.java         |  2 +-
 .../embedded/EmbeddedDatabaseConfigurer.java     |  2 +-
 .../embedded/EmbeddedDatabaseFactory.java        |  2 +-
 .../embedded/EmbeddedDatabaseType.java           |  2 +-
 .../embedded/SimpleDriverDataSourceFactory.java  |  2 +-
 .../jdbc/datasource/init/DatabasePopulator.java  |  2 +-
 .../lookup/BeanFactoryDataSourceLookup.java      |  2 +-
 .../jdbc/datasource/lookup/DataSourceLookup.java |  2 +-
 .../lookup/DataSourceLookupFailureException.java |  2 +-
 .../datasource/lookup/JndiDataSourceLookup.java  |  2 +-
 .../datasource/lookup/MapDataSourceLookup.java   |  2 +-
 .../jdbc/object/BatchSqlUpdate.java              |  2 +-
 .../jdbc/object/GenericSqlQuery.java             |  2 +-
 .../jdbc/object/GenericStoredProcedure.java      |  2 +-
 .../object/MappingSqlQueryWithParameters.java    |  2 +-
 .../jdbc/object/RdbmsOperation.java              |  2 +-
 .../org/springframework/jdbc/object/SqlCall.java |  2 +-
 .../springframework/jdbc/object/SqlFunction.java |  2 +-
 .../jdbc/object/SqlOperation.java                |  2 +-
 .../springframework/jdbc/object/SqlQuery.java    |  2 +-
 .../springframework/jdbc/object/SqlUpdate.java   |  2 +-
 .../jdbc/object/StoredProcedure.java             |  2 +-
 .../jdbc/object/UpdatableSqlQuery.java           |  2 +-
 .../AbstractFallbackSQLExceptionTranslator.java  |  2 +-
 .../jdbc/support/DatabaseMetaDataCallback.java   |  2 +-
 .../jdbc/support/JdbcAccessor.java               |  2 +-
 .../springframework/jdbc/support/JdbcUtils.java  |  2 +-
 .../springframework/jdbc/support/KeyHolder.java  |  2 +-
 .../jdbc/support/MetaDataAccessException.java    |  2 +-
 .../SQLErrorCodeSQLExceptionTranslator.java      |  2 +-
 .../support/SQLExceptionSubclassTranslator.java  |  2 +-
 .../jdbc/support/SQLExceptionTranslator.java     |  2 +-
 .../springframework/jdbc/support/SqlValue.java   |  2 +-
 .../AbstractDataFieldMaxValueIncrementer.java    |  2 +-
 .../AbstractSequenceMaxValueIncrementer.java     |  2 +-
 .../incrementer/DerbyMaxValueIncrementer.java    |  2 +-
 .../SybaseAnywhereMaxValueIncrementer.java       |  2 +-
 .../incrementer/SybaseMaxValueIncrementer.java   |  2 +-
 .../jdbc/support/lob/DefaultLobHandler.java      |  2 +-
 .../lob/JtaLobCreatorSynchronization.java        |  2 +-
 .../jdbc/support/lob/LobCreatorUtils.java        |  2 +-
 .../jdbc/support/lob/LobHandler.java             |  2 +-
 .../lob/SpringLobCreatorSynchronization.java     |  2 +-
 .../nativejdbc/C3P0NativeJdbcExtractor.java      |  2 +-
 .../CommonsDbcpNativeJdbcExtractor.java          |  2 +-
 .../nativejdbc/Jdbc4NativeJdbcExtractor.java     |  2 +-
 .../support/nativejdbc/NativeJdbcExtractor.java  |  2 +-
 .../nativejdbc/NativeJdbcExtractorAdapter.java   |  2 +-
 .../OracleJdbc4NativeJdbcExtractor.java          |  2 +-
 .../nativejdbc/SimpleNativeJdbcExtractor.java    |  2 +-
 .../nativejdbc/WebLogicNativeJdbcExtractor.java  |  2 +-
 .../rowset/ResultSetWrappingSqlRowSet.java       |  2 +-
 .../ResultSetWrappingSqlRowSetMetaData.java      |  2 +-
 .../jdbc/support/rowset/SqlRowSet.java           |  2 +-
 .../jdbc/support/rowset/SqlRowSetMetaData.java   |  2 +-
 .../jdbc/support/xml/Jdbc4SqlXmlHandler.java     |  2 +-
 .../SqlXmlFeatureNotImplementedException.java    |  2 +-
 .../jdbc/support/xml/SqlXmlHandler.java          |  2 +-
 .../support/xml/SqlXmlObjectMappingHandler.java  |  2 +-
 .../support/xml/XmlBinaryStreamProvider.java     |  2 +-
 .../support/xml/XmlCharacterStreamProvider.java  |  2 +-
 .../jdbc/support/xml/XmlResultProvider.java      |  2 +-
 .../java/org/springframework/beans/Colour.java   |  2 +-
 .../springframework/beans/INestedTestBean.java   |  2 +-
 .../java/org/springframework/beans/IOther.java   |  2 +-
 .../springframework/beans/NestedTestBean.java    |  2 +-
 .../java/org/springframework/beans/TestBean.java |  2 +-
 .../build/test/hamcrest/Matchers.java            |  2 +-
 .../InitializeDatabaseIntegrationTests.java      |  2 +-
 .../jdbc/core/AbstractRowMapperTests.java        |  2 +-
 .../jdbc/core/BeanPropertyRowMapperTests.java    |  2 +-
 .../jdbc/core/JdbcTemplateTests.java             |  2 +-
 .../jdbc/core/RowMapperTests.java                |  2 +-
 .../jdbc/core/SimpleRowCountCallbackHandler.java |  2 +-
 .../jdbc/core/StatementCreatorUtilsTests.java    |  2 +-
 .../NamedParameterJdbcTemplateTests.java         |  2 +-
 .../namedparam/NamedParameterQueryTests.java     |  2 +-
 .../ParameterizedBeanPropertyRowMapperTests.java |  2 +-
 .../jdbc/core/simple/SimpleJdbcCallTests.java    |  2 +-
 .../jdbc/core/simple/SimpleJdbcInsertTests.java  |  2 +-
 .../core/simple/SimpleJdbcTemplateTests.java     |  2 +-
 .../support/JdbcBeanDefinitionReaderTests.java   |  2 +-
 .../jdbc/core/support/JdbcDaoSupportTests.java   |  2 +-
 .../jdbc/core/support/LobSupportTests.java       |  2 +-
 .../jdbc/core/support/SqlLobValueTests.java      |  2 +-
 .../DataSourceJtaTransactionTests.java           |  2 +-
 .../DataSourceTransactionManagerTests.java       |  2 +-
 .../datasource/DriverManagerDataSourceTests.java |  2 +-
 .../UserCredentialsDataSourceAdapterTests.java   |  2 +-
 .../lookup/BeanFactoryDataSourceLookupTests.java |  2 +-
 .../lookup/JndiDataSourceLookupTests.java        |  2 +-
 .../jdbc/datasource/lookup/StubDataSource.java   |  2 +-
 .../jdbc/object/BatchSqlUpdateTests.java         |  2 +-
 .../jdbc/object/GenericSqlQueryTests.java        |  2 +-
 .../jdbc/object/GenericStoredProcedureTests.java |  2 +-
 .../jdbc/object/RdbmsOperationTests.java         |  2 +-
 .../jdbc/object/SqlQueryTests.java               |  2 +-
 .../jdbc/object/SqlUpdateTests.java              |  2 +-
 .../jdbc/object/StoredProcedureTests.java        |  2 +-
 .../jdbc/support/CustomErrorCodeException.java   |  2 +-
 .../support/CustomSqlExceptionTranslator.java    |  2 +-
 .../DataFieldMaxValueIncrementerTests.java       |  2 +-
 .../jdbc/support/DefaultLobHandlerTests.java     |  2 +-
 .../jdbc/support/KeyHolderTests.java             |  2 +-
 .../jdbc/support/NativeJdbcExtractorTests.java   |  2 +-
 .../SQLErrorCodeSQLExceptionTranslatorTests.java |  2 +-
 .../SQLStateExceptionTranslatorTests.java        |  2 +-
 .../rowset/ResultSetWrappingRowSetTests.java     |  2 +-
 .../jms/IllegalStateException.java               |  2 +-
 .../jms/InvalidClientIDException.java            |  2 +-
 .../jms/InvalidDestinationException.java         |  2 +-
 .../jms/InvalidSelectorException.java            |  2 +-
 .../org/springframework/jms/JmsException.java    |  2 +-
 .../jms/JmsSecurityException.java                |  2 +-
 .../springframework/jms/MessageEOFException.java |  2 +-
 .../jms/MessageFormatException.java              |  2 +-
 .../jms/MessageNotReadableException.java         |  2 +-
 .../jms/MessageNotWriteableException.java        |  2 +-
 .../jms/ResourceAllocationException.java         |  2 +-
 .../jms/TransactionInProgressException.java      |  2 +-
 .../jms/TransactionRolledBackException.java      |  2 +-
 .../jms/UncategorizedJmsException.java           |  2 +-
 .../config/AbstractListenerContainerParser.java  |  2 +-
 .../jms/config/JmsNamespaceHandler.java          |  2 +-
 .../jms/connection/ConnectionFactoryUtils.java   |  2 +-
 .../connection/DelegatingConnectionFactory.java  |  2 +-
 .../jms/connection/JmsResourceHolder.java        |  2 +-
 .../jms/connection/JmsTransactionManager.java    |  2 +-
 .../jms/connection/JmsTransactionManager102.java |  2 +-
 .../jms/connection/SessionProxy.java             |  2 +-
 .../jms/connection/SingleConnectionFactory.java  |  2 +-
 .../connection/SingleConnectionFactory102.java   |  2 +-
 .../jms/connection/SmartConnectionFactory.java   |  2 +-
 .../SynchedLocalTransactionFailedException.java  |  2 +-
 .../TransactionAwareConnectionFactoryProxy.java  |  2 +-
 .../UserCredentialsConnectionFactoryAdapter.java |  2 +-
 .../jms/core/BrowserCallback.java                |  2 +-
 .../springframework/jms/core/JmsOperations.java  |  2 +-
 .../springframework/jms/core/JmsTemplate102.java |  2 +-
 .../springframework/jms/core/MessageCreator.java |  2 +-
 .../jms/core/ProducerCallback.java               |  2 +-
 .../jms/core/SessionCallback.java                |  2 +-
 .../jms/core/support/JmsGatewaySupport.java      |  2 +-
 .../DefaultMessageListenerContainer102.java      |  2 +-
 .../listener/SessionAwareMessageListener.java    |  2 +-
 .../SimpleMessageListenerContainer102.java       |  2 +-
 .../ListenerExecutionFailedException.java        |  2 +-
 .../listener/adapter/MessageListenerAdapter.java |  2 +-
 .../DefaultJmsActivationSpecFactory.java         |  2 +-
 .../endpoint/JmsMessageEndpointFactory.java      |  2 +-
 .../StandardJmsActivationSpecFactory.java        |  2 +-
 .../remoting/JmsInvokerClientInterceptor.java    |  2 +-
 .../jms/remoting/JmsInvokerProxyFactoryBean.java |  2 +-
 .../jms/remoting/JmsInvokerServiceExporter.java  |  2 +-
 .../springframework/jms/support/JmsAccessor.java |  2 +-
 .../springframework/jms/support/JmsUtils.java    |  2 +-
 .../converter/MarshallingMessageConverter.java   |  2 +-
 .../converter/MessageConversionException.java    |  2 +-
 .../converter/SimpleMessageConverter.java        |  2 +-
 .../converter/SimpleMessageConverter102.java     |  2 +-
 .../BeanFactoryDestinationResolver.java          |  2 +-
 .../DestinationResolutionException.java          |  2 +-
 .../support/destination/DestinationResolver.java |  2 +-
 .../destination/DynamicDestinationResolver.java  |  2 +-
 .../destination/JmsDestinationAccessor.java      |  2 +-
 .../java/org/springframework/beans/Colour.java   |  2 +-
 .../springframework/beans/INestedTestBean.java   |  2 +-
 .../java/org/springframework/beans/IOther.java   |  2 +-
 .../springframework/beans/NestedTestBean.java    |  2 +-
 .../java/org/springframework/beans/TestBean.java |  2 +-
 .../core/task/StubTaskExecutor.java              |  2 +-
 .../springframework/jca/StubActivationSpec.java  |  2 +-
 .../springframework/jca/StubResourceAdapter.java |  2 +-
 .../jms/StubConnectionFactory.java               |  2 +-
 .../java/org/springframework/jms/StubQueue.java  |  2 +-
 .../java/org/springframework/jms/StubTopic.java  |  2 +-
 .../jms/config/JmsNamespaceHandlerTests.java     |  2 +-
 .../connection/JmsTransactionManagerTests.java   |  2 +-
 .../jms/connection/TestConnection.java           |  2 +-
 .../jms/connection/TestExceptionListener.java    |  2 +-
 .../jms/core/JmsTemplate102JtaTests.java         |  2 +-
 .../jms/core/JmsTemplate102Tests.java            |  2 +-
 .../jms/core/JmsTemplate102TransactedTests.java  |  2 +-
 .../jms/core/JmsTemplateJtaTests.java            |  2 +-
 .../jms/core/JmsTemplateTests.java               |  2 +-
 .../jms/core/JmsTemplateTransactedTests.java     |  2 +-
 .../jms/core/support/JmsGatewaySupportTests.java |  2 +-
 .../AbstractMessageListenerContainerTests.java   |  2 +-
 .../SimpleMessageListenerContainerTests.java     |  2 +-
 .../adapter/MessageListenerAdapter102Tests.java  |  2 +-
 .../adapter/MessageListenerAdapterTests.java     |  2 +-
 ...veJmsTextMessageReturningMessageDelegate.java |  2 +-
 .../adapter/StubMessageListenerAdapter.java      |  2 +-
 .../adapter/StubMessageListenerAdapter102.java   |  2 +-
 .../DefaultJmsActivationSpecFactoryTests.java    |  2 +-
 .../endpoint/StubJmsActivationSpecFactory.java   |  2 +-
 .../jms/remoting/JmsInvokerTests.java            |  2 +-
 .../support/SimpleMessageConverter102Tests.java  |  2 +-
 .../jms/support/SimpleMessageConverterTests.java |  2 +-
 .../MappingJacksonMessageConverterTests.java     |  2 +-
 .../JndiDestinationResolverTests.java            |  2 +-
 .../CallCountingTransactionManager.java          |  2 +-
 .../mock/web/DelegatingServletInputStream.java   |  2 +-
 .../mock/web/DelegatingServletOutputStream.java  |  2 +-
 .../mock/web/HeaderValueHolder.java              |  2 +-
 .../mock/web/MockFilterConfig.java               |  2 +-
 .../mock/web/MockServletConfig.java              |  2 +-
 .../mock/web/PassThroughFilterChain.java         |  2 +-
 .../ObjectOptimisticLockingFailureException.java |  2 +-
 .../orm/ObjectRetrievalFailureException.java     |  2 +-
 .../hibernate3/AbstractSessionFactoryBean.java   |  2 +-
 .../orm/hibernate3/HibernateCallback.java        |  2 +-
 .../orm/hibernate3/HibernateInterceptor.java     |  2 +-
 .../orm/hibernate3/HibernateJdbcException.java   |  2 +-
 ...HibernateObjectRetrievalFailureException.java |  2 +-
 .../orm/hibernate3/HibernateOperations.java      |  2 +-
 ...bernateOptimisticLockingFailureException.java |  2 +-
 .../orm/hibernate3/HibernateQueryException.java  |  2 +-
 .../orm/hibernate3/HibernateSystemException.java |  2 +-
 .../orm/hibernate3/HibernateTemplate.java        |  2 +-
 .../hibernate3/HibernateTransactionManager.java  |  2 +-
 .../orm/hibernate3/LocalCacheProviderProxy.java  |  2 +-
 .../LocalJtaDataSourceConnectionProvider.java    |  2 +-
 .../orm/hibernate3/LocalRegionFactoryProxy.java  |  2 +-
 .../LocalTransactionManagerLookup.java           |  2 +-
 .../orm/hibernate3/SpringSessionContext.java     |  2 +-
 ...sactionAwareDataSourceConnectionProvider.java |  2 +-
 .../annotation/AnnotationSessionFactoryBean.java |  2 +-
 .../orm/hibernate3/support/AbstractLobType.java  |  2 +-
 .../hibernate3/support/BlobByteArrayType.java    |  2 +-
 .../hibernate3/support/BlobSerializableType.java |  2 +-
 .../orm/hibernate3/support/BlobStringType.java   |  2 +-
 .../orm/hibernate3/support/ClobStringType.java   |  2 +-
 .../hibernate3/support/HibernateDaoSupport.java  |  2 +-
 .../IdTransferringMergeEventListener.java        |  2 +-
 .../support/ScopedBeanInterceptor.java           |  2 +-
 .../orm/ibatis/SqlMapClientCallback.java         |  2 +-
 .../orm/ibatis/SqlMapClientFactoryBean.java      |  2 +-
 .../orm/ibatis/SqlMapClientOperations.java       |  2 +-
 .../orm/ibatis/SqlMapClientTemplate.java         |  2 +-
 .../ibatis/support/AbstractLobTypeHandler.java   |  2 +-
 .../orm/jdo/DefaultJdoDialect.java               |  2 +-
 .../org/springframework/orm/jdo/JdoAccessor.java |  2 +-
 .../org/springframework/orm/jdo/JdoCallback.java |  2 +-
 .../org/springframework/orm/jdo/JdoDialect.java  |  2 +-
 .../springframework/orm/jdo/JdoInterceptor.java  |  2 +-
 .../jdo/JdoObjectRetrievalFailureException.java  |  2 +-
 .../JdoOptimisticLockingFailureException.java    |  2 +-
 .../orm/jdo/JdoResourceFailureException.java     |  2 +-
 .../orm/jdo/JdoSystemException.java              |  2 +-
 .../org/springframework/orm/jdo/JdoTemplate.java |  2 +-
 .../orm/jdo/JdoTransactionManager.java           |  2 +-
 .../orm/jdo/JdoUsageException.java               |  2 +-
 .../jdo/LocalPersistenceManagerFactoryBean.java  |  2 +-
 .../orm/jdo/PersistenceManagerFactoryUtils.java  |  2 +-
 ...ctionAwarePersistenceManagerFactoryProxy.java |  2 +-
 .../orm/jdo/support/JdoDaoSupport.java           |  2 +-
 .../OpenPersistenceManagerInViewFilter.java      |  2 +-
 .../SpringPersistenceManagerProxyBean.java       |  2 +-
 .../jpa/AbstractEntityManagerFactoryBean.java    |  2 +-
 .../orm/jpa/DefaultJpaDialect.java               |  2 +-
 .../orm/jpa/EntityManagerFactoryAccessor.java    |  2 +-
 .../orm/jpa/EntityManagerFactoryInfo.java        |  2 +-
 .../orm/jpa/EntityManagerProxy.java              |  2 +-
 .../orm/jpa/ExtendedEntityManagerCreator.java    |  2 +-
 .../org/springframework/orm/jpa/JpaAccessor.java |  2 +-
 .../org/springframework/orm/jpa/JpaCallback.java |  2 +-
 .../org/springframework/orm/jpa/JpaDialect.java  |  2 +-
 .../springframework/orm/jpa/JpaInterceptor.java  |  2 +-
 .../jpa/JpaObjectRetrievalFailureException.java  |  2 +-
 .../springframework/orm/jpa/JpaOperations.java   |  2 +-
 .../JpaOptimisticLockingFailureException.java    |  2 +-
 .../orm/jpa/JpaSystemException.java              |  2 +-
 .../org/springframework/orm/jpa/JpaTemplate.java |  2 +-
 .../orm/jpa/JpaTransactionManager.java           |  2 +-
 .../orm/jpa/JpaVendorAdapter.java                |  2 +-
 .../orm/jpa/LocalEntityManagerFactoryBean.java   |  2 +-
 .../orm/jpa/SharedEntityManagerCreator.java      |  2 +-
 .../ClassFileTransformerAdapter.java             |  2 +-
 .../persistenceunit/PersistenceUnitManager.java  |  2 +-
 .../PersistenceUnitPostProcessor.java            |  2 +-
 .../orm/jpa/support/JpaDaoSupport.java           |  2 +-
 .../orm/jpa/support/SharedEntityManagerBean.java |  2 +-
 .../orm/jpa/vendor/AbstractJpaVendorAdapter.java |  2 +-
 .../springframework/orm/jpa/vendor/Database.java |  2 +-
 .../jpa/vendor/EclipseLinkJpaVendorAdapter.java  |  2 +-
 .../orm/jpa/vendor/HibernateJpaDialect.java      |  2 +-
 .../vendor/HibernateJpaSessionFactoryBean.java   |  2 +-
 .../jpa/vendor/HibernateJpaVendorAdapter.java    |  2 +-
 .../orm/jpa/vendor/OpenJpaDialect.java           |  2 +-
 .../orm/jpa/vendor/OpenJpaVendorAdapter.java     |  2 +-
 .../orm/jpa/vendor/TopLinkJpaVendorAdapter.java  |  2 +-
 .../java/org/springframework/beans/Colour.java   |  2 +-
 .../springframework/beans/INestedTestBean.java   |  2 +-
 .../java/org/springframework/beans/IOther.java   |  2 +-
 .../springframework/beans/NestedTestBean.java    |  2 +-
 .../java/org/springframework/beans/TestBean.java |  2 +-
 .../beans/factory/config/SimpleMapScope.java     |  2 +-
 .../mock/jndi/ExpectedLookupTemplate.java        |  2 +-
 .../mock/jndi/SimpleNamingContext.java           |  2 +-
 .../mock/jndi/SimpleNamingContextBuilder.java    |  2 +-
 .../hibernate3/HibernateInterceptorTests.java    |  2 +-
 .../hibernate3/HibernateJtaTransactionTests.java |  2 +-
 .../orm/hibernate3/HibernateTemplateTests.java   |  2 +-
 .../HibernateTransactionManagerTests.java        |  2 +-
 .../hibernate3/LocalSessionFactoryBeanTests.java |  2 +-
 .../support/HibernateDaoSupportTests.java        |  2 +-
 .../orm/hibernate3/support/LobTypeTests.java     |  2 +-
 .../support/ScopedBeanInterceptorTests.java      |  2 +-
 .../orm/ibatis/SqlMapClientTests.java            |  2 +-
 .../orm/ibatis/support/LobTypeHandlerTests.java  |  2 +-
 .../orm/jdo/JdoInterceptorTests.java             |  2 +-
 .../orm/jdo/JdoTemplateTests.java                |  2 +-
 .../orm/jdo/JdoTransactionManagerTests.java      |  2 +-
 .../jdo/LocalPersistenceManagerFactoryTests.java |  2 +-
 .../orm/jdo/support/JdoDaoSupportTests.java      |  2 +-
 ...inerEntityManagerFactoryIntegrationTests.java |  2 +-
 .../AbstractEntityManagerFactoryBeanTests.java   |  2 +-
 ...ractEntityManagerFactoryIntegrationTests.java |  2 +-
 ...tionManagedEntityManagerIntegrationTests.java |  2 +-
 ...inerManagedEntityManagerIntegrationTests.java |  2 +-
 .../orm/jpa/DefaultJpaDialectTests.java          |  2 +-
 .../EntityManagerFactoryBeanSupportTests.java    |  2 +-
 .../orm/jpa/EntityManagerFactoryUtilsTests.java  |  2 +-
 .../orm/jpa/JpaInterceptorTests.java             |  2 +-
 .../orm/jpa/JpaTemplateTests.java                |  2 +-
 .../orm/jpa/JpaTransactionManagerTests.java      |  2 +-
 ...alContainerEntityManagerFactoryBeanTests.java |  2 +-
 .../jpa/LocalEntityManagerFactoryBeanTests.java  |  2 +-
 .../orm/jpa/domain/DriversLicense.java           |  2 +-
 .../springframework/orm/jpa/domain/Person.java   |  2 +-
 ...LinkEntityManagerFactoryIntegrationTests.java |  2 +-
 ...nateEntityManagerFactoryIntegrationTests.java |  2 +-
 ...nJpaEntityManagerFactoryIntegrationTests.java |  2 +-
 .../orm/jpa/support/JpaDaoSupportTests.java      |  2 +-
 .../jpa/support/PersistenceInjectionTests.java   |  2 +-
 .../support/SharedEntityManagerFactoryTests.java |  2 +-
 ...LinkEntityManagerFactoryIntegrationTests.java |  2 +-
 ...actDependencyInjectionSpringContextTests.java |  2 +-
 .../test/AbstractSingleSpringContextTests.java   |  2 +-
 .../test/AbstractSpringContextTests.java         |  2 +-
 ...ransactionalDataSourceSpringContextTests.java |  2 +-
 .../AbstractTransactionalSpringContextTests.java |  2 +-
 .../test/ConditionalTestCase.java                |  2 +-
 ...bstractAnnotationAwareTransactionalTests.java |  2 +-
 .../test/annotation/DirtiesContext.java          |  2 +-
 .../test/annotation/IfProfileValue.java          |  2 +-
 .../test/annotation/ProfileValueSource.java      |  2 +-
 .../test/annotation/ProfileValueUtils.java       |  2 +-
 .../test/annotation/Rollback.java                |  2 +-
 .../annotation/SystemProfileValueSource.java     |  2 +-
 .../springframework/test/jdbc/JdbcTestUtils.java |  2 +-
 .../test/jpa/AbstractJpaTests.java               |  2 +-
 .../OrmXmlOverridingShadowingClassLoader.java    |  2 +-
 .../transaction/MockJtaTransaction.java          |  2 +-
 .../springframework/oxm/GenericMarshaller.java   |  2 +-
 .../springframework/oxm/GenericUnmarshaller.java |  2 +-
 .../java/org/springframework/oxm/Marshaller.java |  2 +-
 .../oxm/MarshallingException.java                |  2 +-
 .../oxm/MarshallingFailureException.java         |  2 +-
 .../oxm/UncategorizedMappingException.java       |  2 +-
 .../org/springframework/oxm/Unmarshaller.java    |  2 +-
 .../oxm/UnmarshallingFailureException.java       |  2 +-
 .../oxm/ValidationFailureException.java          |  2 +-
 .../springframework/oxm/XmlMappingException.java |  2 +-
 .../oxm/castor/CastorMappingException.java       |  2 +-
 .../CastorMarshallerBeanDefinitionParser.java    |  2 +-
 .../Jaxb2MarshallerBeanDefinitionParser.java     |  2 +-
 .../JibxMarshallerBeanDefinitionParser.java      |  2 +-
 .../oxm/config/OxmNamespaceHandler.java          |  2 +-
 .../XmlBeansMarshallerBeanDefinitionParser.java  |  2 +-
 .../springframework/oxm/mime/MimeContainer.java  |  2 +-
 .../oxm/support/AbstractMarshaller.java          |  2 +-
 .../oxm/support/MarshallingSource.java           |  2 +-
 .../oxm/support/SaxResourceUtils.java            |  2 +-
 .../oxm/xmlbeans/XmlBeansMarshaller.java         |  2 +-
 .../oxm/xmlbeans/XmlOptionsFactoryBean.java      |  2 +-
 .../oxm/xstream/XStreamUtils.java                |  2 +-
 .../oxm/castor/CastorMarshallerTests.java        |  2 +-
 .../oxm/config/OxmNamespaceHandlerTests.java     |  2 +-
 .../springframework/oxm/jaxb/BinaryObject.java   |  2 +-
 .../org/springframework/oxm/jaxb/Primitives.java |  2 +-
 .../oxm/jaxb/StandardClasses.java                |  2 +-
 .../org/springframework/oxm/jibx/Flights.java    |  2 +-
 .../oxm/xmlbeans/XmlOptionsFactoryBeanTests.java |  2 +-
 .../org/springframework/oxm/xstream/Flight.java  |  2 +-
 .../oxm/xstream/XStreamMarshallerTests.java      |  2 +-
 .../view/tiles/ComponentControllerSupport.java   |  2 +-
 .../web/servlet/view/tiles/TilesConfigurer.java  |  2 +-
 .../web/servlet/view/tiles/TilesJstlView.java    |  2 +-
 .../web/servlet/view/tiles/TilesView.java        |  2 +-
 .../web/struts/ActionServletAwareProcessor.java  |  2 +-
 .../web/struts/ActionSupport.java                |  2 +-
 .../web/struts/AutowiringRequestProcessor.java   |  2 +-
 .../struts/AutowiringTilesRequestProcessor.java  |  2 +-
 .../web/struts/ContextLoaderPlugIn.java          |  2 +-
 .../web/struts/DelegatingActionProxy.java        |  2 +-
 .../web/struts/DelegatingActionUtils.java        |  2 +-
 .../web/struts/DelegatingRequestProcessor.java   |  2 +-
 .../struts/DelegatingTilesRequestProcessor.java  |  2 +-
 .../web/struts/DispatchActionSupport.java        |  2 +-
 .../web/struts/LookupDispatchActionSupport.java  |  2 +-
 .../web/struts/MappingDispatchActionSupport.java |  2 +-
 .../web/struts/SpringBindingActionForm.java      |  2 +-
 .../view/tiles/TestComponentController.java      |  2 +-
 .../web/servlet/view/tiles/TilesViewTests.java   |  2 +-
 .../web/struts/StrutsSupportTests.java           |  2 +-
 .../springframework/web/struts/TestAction.java   |  2 +-
 .../mock/jndi/SimpleNamingContext.java           |  2 +-
 .../mock/jndi/SimpleNamingContextBuilder.java    |  2 +-
 .../mock/web/DelegatingServletInputStream.java   |  2 +-
 .../mock/web/DelegatingServletOutputStream.java  |  2 +-
 .../mock/web/HeaderValueHolder.java              |  2 +-
 .../mock/web/MockExpressionEvaluator.java        |  2 +-
 .../mock/web/MockPageContext.java                |  2 +-
 .../mock/web/portlet/MockPortletConfig.java      |  2 +-
 .../mock/web/portlet/MockPortletContext.java     |  2 +-
 .../mock/web/portlet/MockPortletRequest.java     |  2 +-
 .../mock/web/portlet/MockPortletSession.java     |  2 +-
 ...actDependencyInjectionSpringContextTests.java |  2 +-
 .../test/AbstractSingleSpringContextTests.java   |  2 +-
 .../test/AbstractSpringContextTests.java         |  2 +-
 ...ransactionalDataSourceSpringContextTests.java |  2 +-
 .../AbstractTransactionalSpringContextTests.java |  2 +-
 .../org/springframework/test/AssertThrows.java   |  2 +-
 ...bstractAnnotationAwareTransactionalTests.java |  2 +-
 .../test/annotation/DirtiesContext.java          |  2 +-
 .../test/annotation/ExpectedException.java       |  2 +-
 .../test/annotation/IfProfileValue.java          |  2 +-
 .../test/annotation/NotTransactional.java        |  2 +-
 .../test/annotation/ProfileValueSource.java      |  2 +-
 .../ProfileValueSourceConfiguration.java         |  2 +-
 .../test/annotation/ProfileValueUtils.java       |  2 +-
 .../springframework/test/annotation/Repeat.java  |  2 +-
 .../test/annotation/Rollback.java                |  2 +-
 .../springframework/test/annotation/Timed.java   |  2 +-
 .../test/context/TestContext.java                |  2 +-
 .../test/context/TestExecutionListener.java      |  2 +-
 .../test/context/TestExecutionListeners.java     |  2 +-
 .../AbstractJUnit38SpringContextTests.java       |  2 +-
 ...ctTransactionalJUnit38SpringContextTests.java |  2 +-
 .../context/junit4/SpringJUnit4ClassRunner.java  |  2 +-
 .../statements/RunAfterTestClassCallbacks.java   |  2 +-
 .../statements/RunBeforeTestClassCallbacks.java  |  2 +-
 .../statements/RunBeforeTestMethodCallbacks.java |  2 +-
 .../junit4/statements/SpringFailOnTimeout.java   |  2 +-
 .../context/junit4/statements/SpringRepeat.java  |  2 +-
 .../support/AbstractTestExecutionListener.java   |  2 +-
 ...DependencyInjectionTestExecutionListener.java |  2 +-
 .../DirtiesContextTestExecutionListener.java     |  2 +-
 .../support/GenericPropertiesContextLoader.java  |  2 +-
 .../context/support/GenericXmlContextLoader.java |  2 +-
 .../context/transaction/AfterTransaction.java    |  2 +-
 .../context/transaction/BeforeTransaction.java   |  2 +-
 .../test/jpa/AbstractAspectjJpaTests.java        |  2 +-
 .../test/jpa/AbstractJpaTests.java               |  2 +-
 .../OrmXmlOverridingShadowingClassLoader.java    |  2 +-
 .../test/web/AbstractModelAndViewTests.java      |  2 +-
 .../java/org/springframework/beans/Employee.java |  2 +-
 .../springframework/beans/INestedTestBean.java   |  2 +-
 .../java/org/springframework/beans/IOther.java   |  2 +-
 .../springframework/beans/NestedTestBean.java    |  2 +-
 .../java/org/springframework/beans/TestBean.java |  2 +-
 .../mock/web/MockPageContextTests.java           |  2 +-
 .../AbstractSpr3350SingleSpringContextTests.java |  2 +-
 ...tiesBasedSpr3350SingleSpringContextTests.java |  2 +-
 ...264DependencyInjectionSpringContextTests.java |  2 +-
 .../test/Spr3264SingleSpringContextTests.java    |  2 +-
 .../XmlBasedSpr3350SingleSpringContextTests.java |  2 +-
 .../test/annotation/ProfileValueUtilsTests.java  |  2 +-
 .../context/ClassLevelDirtiesContextTests.java   |  2 +-
 .../test/context/TestContextCacheKeyTests.java   |  2 +-
 .../test/context/TestContextManagerTests.java    |  2 +-
 ...tendingPropertiesAndInheritedLoaderTests.java |  2 +-
 ...onWithPropertiesExtendingPropertiesTests.java |  2 +-
 ...teTransactionalJUnit38SpringContextTests.java |  2 +-
 .../ProfileValueJUnit38SpringContextTests.java   |  2 +-
 ...tePathSpringJUnit4ClassRunnerAppCtxTests.java |  2 +-
 .../AbstractTransactionalSpringRunnerTests.java  |  2 +-
 .../ClassLevelDisabledSpringRunnerTests.java     |  2 +-
 ...ClassLevelTransactionalSpringRunnerTests.java |  2 +-
 ...sourceSpringJUnit4ClassRunnerAppCtxTests.java |  2 +-
 ...eteTransactionalJUnit4SpringContextTests.java |  2 +-
 ...faultContextLoaderClassSpringRunnerTests.java |  2 +-
 ...lbackFalseTransactionalSpringRunnerTests.java |  2 +-
 ...llbackTrueTransactionalSpringRunnerTests.java |  2 +-
 .../EnabledAndIgnoredSpringRunnerTests.java      |  2 +-
 ...CodedProfileValueSourceSpringRunnerTests.java |  2 +-
 ...ethodLevelTransactionalSpringRunnerTests.java |  2 +-
 ...ourcesSpringJUnit4ClassRunnerAppCtxTests.java |  2 +-
 ...sBasedSpringJUnit4ClassRunnerAppCtxTests.java |  2 +-
 ...llbackTrueTransactionalSpringRunnerTests.java |  2 +-
 .../SpringJUnit47ClassRunnerRuleTests.java       |  2 +-
 .../SpringJUnit4ClassRunnerAppCtxTests.java      |  2 +-
 .../context/junit4/SpringJUnit4SuiteTests.java   |  2 +-
 .../TimedTransactionalSpringRunnerTests.java     |  2 +-
 .../test/context/junit4/TrackingRunListener.java |  2 +-
 ...ConfigSpringJUnit4ClassRunnerAppCtxTests.java |  2 +-
 ...ridingDefaultConfigClassesInheritedTests.java |  2 +-
 ...idingExplicitConfigClassesInheritedTests.java |  2 +-
 .../DefaultConfigClassesBaseTests.java           |  2 +-
 .../DefaultConfigClassesInheritedTests.java      |  2 +-
 ...ridingDefaultConfigClassesInheritedTests.java |  2 +-
 ...idingExplicitConfigClassesInheritedTests.java |  2 +-
 ...faultLoaderDefaultConfigClassesBaseTests.java |  2 +-
 ...LoaderDefaultConfigClassesInheritedTests.java |  2 +-
 ...aultLoaderExplicitConfigClassesBaseTests.java |  2 +-
 ...oaderExplicitConfigClassesInheritedTests.java |  2 +-
 .../ExplicitConfigClassesBaseTests.java          |  2 +-
 .../ExplicitConfigClassesInheritedTests.java     |  2 +-
 .../junit4/annotation/PojoAndStringConfig.java   |  2 +-
 .../junit4/orm/domain/DriversLicense.java        |  2 +-
 .../test/context/junit4/orm/domain/Person.java   |  2 +-
 .../junit4/orm/repository/PersonRepository.java  |  2 +-
 .../hibernate/HibernatePersonRepository.java     |  2 +-
 .../junit4/orm/service/PersonService.java        |  2 +-
 .../orm/service/impl/StandardPersonService.java  |  2 +-
 .../junit4/spr6128/AutowiredQualifierTests.java  |  2 +-
 .../AnnotatedFooConfigInnerClassTestCase.java    |  2 +-
 .../AnnotationConfigContextLoaderTests.java      |  2 +-
 .../ContextConfigurationInnerClassTestCase.java  |  2 +-
 .../CustomizedGenericXmlContextLoaderTests.java  |  2 +-
 .../support/FinalConfigInnerClassTestCase.java   |  2 +-
 ...icXmlContextLoaderResourceLocationsTests.java |  2 +-
 ...ltipleStaticConfigurationClassesTestCase.java |  2 +-
 .../NonStaticConfigInnerClassesTestCase.java     |  2 +-
 .../PlainVanillaFooConfigInnerClassTestCase.java |  2 +-
 ...eteTransactionalTestNGSpringContextTests.java |  2 +-
 .../FailingBeforeAndAfterMethodsTests.java       |  2 +-
 ...medTransactionalTestNGSpringContextTests.java |  2 +-
 .../test/transaction/TransactionTestUtils.java   |  2 +-
 .../test/util/subpackage/Person.java             |  2 +-
 .../dao/CannotAcquireLockException.java          |  2 +-
 .../dao/CannotSerializeTransactionException.java |  2 +-
 .../dao/CleanupFailureDataAccessException.java   |  2 +-
 .../dao/ConcurrencyFailureException.java         |  2 +-
 .../springframework/dao/DataAccessException.java |  2 +-
 .../dao/DataAccessResourceFailureException.java  |  2 +-
 .../dao/DataIntegrityViolationException.java     |  2 +-
 .../dao/DataRetrievalFailureException.java       |  2 +-
 .../dao/DeadlockLoserDataAccessException.java    |  2 +-
 .../dao/DuplicateKeyException.java               |  2 +-
 ...orrectUpdateSemanticsDataAccessException.java |  2 +-
 .../dao/InvalidDataAccessApiUsageException.java  |  2 +-
 .../InvalidDataAccessResourceUsageException.java |  2 +-
 .../dao/NonTransientDataAccessException.java     |  2 +-
 .../NonTransientDataAccessResourceException.java |  2 +-
 .../dao/OptimisticLockingFailureException.java   |  2 +-
 .../dao/PermissionDeniedDataAccessException.java |  2 +-
 .../dao/PessimisticLockingFailureException.java  |  2 +-
 .../dao/RecoverableDataAccessException.java      |  2 +-
 .../dao/TransientDataAccessException.java        |  2 +-
 .../TransientDataAccessResourceException.java    |  2 +-
 .../dao/TypeMismatchDataAccessException.java     |  2 +-
 .../dao/UncategorizedDataAccessException.java    |  2 +-
 .../PersistenceExceptionTranslationAdvisor.java  |  2 +-
 .../ChainedPersistenceExceptionTranslator.java   |  2 +-
 .../springframework/dao/support/DaoSupport.java  |  2 +-
 .../dao/support/DataAccessUtils.java             |  2 +-
 ...rsistenceExceptionTranslationInterceptor.java |  2 +-
 .../support/PersistenceExceptionTranslator.java  |  2 +-
 .../jca/cci/CannotCreateRecordException.java     |  2 +-
 .../jca/cci/CannotGetCciConnectionException.java |  2 +-
 .../cci/CciOperationNotSupportedException.java   |  2 +-
 .../jca/cci/InvalidResultSetAccessException.java |  2 +-
 .../jca/cci/RecordTypeNotSupportedException.java |  2 +-
 .../connection/CciLocalTransactionManager.java   |  2 +-
 .../cci/connection/ConnectionFactoryUtils.java   |  2 +-
 .../jca/cci/connection/ConnectionHolder.java     |  2 +-
 .../ConnectionSpecConnectionFactoryAdapter.java  |  2 +-
 .../connection/DelegatingConnectionFactory.java  |  2 +-
 .../connection/NotSupportedRecordFactory.java    |  2 +-
 .../cci/connection/SingleConnectionFactory.java  |  2 +-
 .../TransactionAwareConnectionFactoryProxy.java  |  2 +-
 .../jca/cci/core/CciTemplate.java                |  2 +-
 .../jca/cci/core/ConnectionCallback.java         |  2 +-
 .../jca/cci/core/InteractionCallback.java        |  2 +-
 .../jca/cci/core/RecordCreator.java              |  2 +-
 .../jca/cci/core/RecordExtractor.java            |  2 +-
 .../jca/cci/core/support/CciDaoSupport.java      |  2 +-
 .../jca/cci/core/support/CommAreaRecord.java     |  2 +-
 .../jca/cci/object/MappingCommAreaOperation.java |  2 +-
 .../jca/cci/object/MappingRecordOperation.java   |  2 +-
 .../jca/cci/object/SimpleRecordOperation.java    |  2 +-
 .../jca/context/BootstrapContextAware.java       |  2 +-
 .../context/SpringContextResourceAdapter.java    |  2 +-
 .../endpoint/AbstractMessageEndpointFactory.java |  2 +-
 .../endpoint/GenericMessageEndpointFactory.java  |  2 +-
 .../jca/support/SimpleBootstrapContext.java      |  2 +-
 .../CannotCreateTransactionException.java        |  2 +-
 .../HeuristicCompletionException.java            |  2 +-
 .../IllegalTransactionStateException.java        |  2 +-
 .../InvalidIsolationLevelException.java          |  2 +-
 .../transaction/InvalidTimeoutException.java     |  2 +-
 .../NestedTransactionNotSupportedException.java  |  2 +-
 .../transaction/NoTransactionException.java      |  2 +-
 .../transaction/PlatformTransactionManager.java  |  2 +-
 .../transaction/SavepointManager.java            |  2 +-
 .../transaction/TransactionDefinition.java       |  2 +-
 .../transaction/TransactionException.java        |  2 +-
 ...ansactionSuspensionNotSupportedException.java |  2 +-
 .../transaction/TransactionSystemException.java  |  2 +-
 .../TransactionTimedOutException.java            |  2 +-
 .../transaction/TransactionUsageException.java   |  2 +-
 .../transaction/UnexpectedRollbackException.java |  2 +-
 .../transaction/annotation/Isolation.java        |  2 +-
 .../transaction/annotation/Propagation.java      |  2 +-
 .../annotation/TransactionAnnotationParser.java  |  2 +-
 .../transaction/annotation/Transactional.java    |  2 +-
 .../AnnotationDrivenBeanDefinitionParser.java    |  2 +-
 .../transaction/config/TxNamespaceHandler.java   |  2 +-
 ...FactoryTransactionAttributeSourceAdvisor.java |  2 +-
 .../CompositeTransactionAttributeSource.java     |  2 +-
 .../interceptor/DefaultTransactionAttribute.java |  2 +-
 .../DelegatingTransactionAttribute.java          |  2 +-
 .../MatchAlwaysTransactionAttributeSource.java   |  2 +-
 .../MethodMapTransactionAttributeSource.java     |  2 +-
 .../NameMatchTransactionAttributeSource.java     |  2 +-
 .../interceptor/NoRollbackRuleAttribute.java     |  2 +-
 .../interceptor/RollbackRuleAttribute.java       |  2 +-
 .../RuleBasedTransactionAttribute.java           |  2 +-
 .../interceptor/TransactionAttribute.java        |  2 +-
 .../interceptor/TransactionAttributeEditor.java  |  2 +-
 .../TransactionAttributeSourceAdvisor.java       |  2 +-
 .../TransactionAttributeSourceEditor.java        |  2 +-
 .../TransactionAttributeSourcePointcut.java      |  2 +-
 .../interceptor/TransactionInterceptor.java      |  2 +-
 .../jta/JtaAfterCompletionSynchronization.java   |  2 +-
 .../transaction/jta/JtaTransactionManager.java   |  2 +-
 .../jta/SpringJtaSynchronizationAdapter.java     |  2 +-
 .../transaction/jta/TransactionFactory.java      |  2 +-
 .../jta/WebLogicJtaTransactionManager.java       |  2 +-
 .../jta/WebSphereUowTransactionManager.java      |  2 +-
 .../AbstractPlatformTransactionManager.java      |  2 +-
 .../support/AbstractTransactionStatus.java       |  2 +-
 ...backPreferringPlatformTransactionManager.java |  2 +-
 .../support/DefaultTransactionDefinition.java    |  2 +-
 .../support/DefaultTransactionStatus.java        |  2 +-
 .../support/DelegatingTransactionDefinition.java |  2 +-
 .../support/ResourceHolderSynchronization.java   |  2 +-
 .../support/ResourceTransactionManager.java      |  2 +-
 .../support/SimpleTransactionStatus.java         |  2 +-
 .../transaction/support/TransactionCallback.java |  2 +-
 .../TransactionCallbackWithoutResult.java        |  2 +-
 .../support/TransactionOperations.java           |  2 +-
 .../support/TransactionSynchronization.java      |  2 +-
 .../TransactionSynchronizationManager.java       |  2 +-
 .../support/TransactionSynchronizationUtils.java |  2 +-
 .../transaction/support/TransactionTemplate.java |  2 +-
 .../java/org/springframework/beans/Colour.java   |  2 +-
 .../springframework/beans/DerivedTestBean.java   |  2 +-
 .../springframework/beans/INestedTestBean.java   |  2 +-
 .../java/org/springframework/beans/IOther.java   |  2 +-
 .../springframework/beans/NestedTestBean.java    |  2 +-
 .../java/org/springframework/beans/TestBean.java |  2 +-
 .../parsing/CollectingReaderEventListener.java   |  2 +-
 ...sistenceExceptionTranslationAdvisorTests.java |  2 +-
 ...ceExceptionTranslationPostProcessorTests.java |  2 +-
 ...ainedPersistenceExceptionTranslatorTests.java |  2 +-
 .../dao/support/DataAccessUtilsTests.java        |  2 +-
 .../jca/cci/CciLocalTransactionTests.java        |  2 +-
 .../jca/cci/CciTemplateTests.java                |  2 +-
 .../jca/cci/EisOperationTests.java               |  2 +-
 .../mock/jndi/ExpectedLookupTemplate.java        |  2 +-
 .../mock/jndi/SimpleNamingContext.java           |  2 +-
 .../mock/jndi/SimpleNamingContextBuilder.java    |  2 +-
 .../CallCountingTransactionManager.java          |  2 +-
 .../JndiJtaTransactionManagerTests.java          |  2 +-
 .../transaction/JtaTransactionManagerTests.java  |  2 +-
 ...MockCallbackPreferringTransactionManager.java |  2 +-
 .../transaction/MockJtaTransaction.java          |  2 +-
 .../transaction/TestTransactionManager.java      |  2 +-
 .../transaction/TransactionSupportTests.java     |  2 +-
 .../TxNamespaceHandlerEventTests.java            |  2 +-
 .../transaction/TxNamespaceHandlerTests.java     |  2 +-
 ...nnotationTransactionAttributeSourceTests.java |  2 +-
 .../AnnotationTransactionInterceptorTests.java   |  2 +-
 ...notationTransactionNamespaceHandlerTests.java |  2 +-
 .../EnableTransactionManagementTests.java        |  2 +-
 .../config/AnnotationDrivenTests.java            |  2 +-
 .../transaction/config/TransactionalService.java |  2 +-
 .../AbstractTransactionAspectTests.java          |  2 +-
 .../interceptor/ImplementsNoInterfaces.java      |  2 +-
 .../MapTransactionAttributeSource.java           |  2 +-
 .../interceptor/MyRuntimeException.java          |  2 +-
 .../PlatformTransactionManagerFacade.java        |  2 +-
 .../interceptor/RollbackRuleTests.java           |  2 +-
 .../TransactionAttributeEditorTests.java         |  2 +-
 .../TransactionAttributeSourceAdvisorTests.java  |  2 +-
 .../TransactionAttributeSourceEditorTests.java   |  2 +-
 .../interceptor/TransactionInterceptorTests.java |  2 +-
 .../transaction/jta/MockUOWManager.java          |  2 +-
 .../jta/WebSphereUowTransactionManagerTests.java |  2 +-
 .../JtaTransactionManagerSerializationTests.java |  2 +-
 .../springframework/http/MediaTypeEditor.java    |  2 +-
 .../http/client/ClientHttpRequest.java           |  2 +-
 .../client/HttpComponentsClientHttpRequest.java  |  2 +-
 .../client/InterceptingClientHttpRequest.java    |  2 +-
 .../converter/AbstractHttpMessageConverter.java  |  2 +-
 .../converter/ByteArrayHttpMessageConverter.java |  2 +-
 .../HttpMessageConversionException.java          |  2 +-
 .../HttpMessageNotReadableException.java         |  2 +-
 .../HttpMessageNotWritableException.java         |  2 +-
 .../xml/MarshallingHttpMessageConverter.java     |  2 +-
 .../xml/XmlAwareFormHttpMessageConverter.java    |  2 +-
 .../remoting/caucho/BurlapClientInterceptor.java |  2 +-
 .../caucho/HessianClientInterceptor.java         |  2 +-
 .../remoting/caucho/HessianExporter.java         |  2 +-
 .../AbstractHttpInvokerRequestExecutor.java      |  2 +-
 .../HttpInvokerClientConfiguration.java          |  2 +-
 .../HttpInvokerClientInterceptor.java            |  2 +-
 .../jaxrpc/JaxRpcPortClientInterceptor.java      |  2 +-
 .../jaxrpc/JaxRpcPortProxyFactoryBean.java       |  2 +-
 .../jaxrpc/JaxRpcSoapFaultException.java         |  2 +-
 .../jaxrpc/LocalJaxRpcServiceFactory.java        |  2 +-
 .../jaxrpc/LocalJaxRpcServiceFactoryBean.java    |  2 +-
 .../remoting/jaxrpc/ServletEndpointSupport.java  |  2 +-
 .../remoting/jaxws/JaxWsSoapFaultException.java  |  2 +-
 .../web/HttpMediaTypeException.java              |  2 +-
 .../web/HttpMediaTypeNotAcceptableException.java |  2 +-
 .../springframework/web/HttpRequestHandler.java  |  2 +-
 .../HttpRequestMethodNotSupportedException.java  |  2 +-
 .../web/HttpSessionRequiredException.java        |  2 +-
 .../springframework/web/bind/EscapedErrors.java  |  2 +-
 .../bind/MethodArgumentNotValidException.java    |  2 +-
 .../MissingServletRequestParameterException.java |  2 +-
 .../web/bind/ServletRequestBindingException.java |  2 +-
 .../web/bind/ServletRequestDataBinder.java       |  2 +-
 .../ServletRequestParameterPropertyValues.java   |  2 +-
 .../web/bind/ServletRequestUtils.java            |  2 +-
 ...atisfiedServletRequestParameterException.java |  2 +-
 .../springframework/web/bind/WebDataBinder.java  |  2 +-
 .../web/bind/annotation/CookieValue.java         |  2 +-
 .../web/bind/annotation/ExceptionHandler.java    |  2 +-
 .../web/bind/annotation/InitBinder.java          |  2 +-
 .../web/bind/annotation/MatrixVariable.java      |  2 +-
 .../web/bind/annotation/RequestHeader.java       |  2 +-
 .../web/bind/annotation/RequestParam.java        |  2 +-
 .../web/bind/annotation/RequestPart.java         |  2 +-
 .../web/bind/annotation/SessionAttributes.java   |  2 +-
 .../web/bind/annotation/ValueConstants.java      |  2 +-
 .../HandlerMethodInvocationException.java        |  2 +-
 .../annotation/support/HandlerMethodInvoker.java |  2 +-
 .../bind/support/DefaultDataBinderFactory.java   |  2 +-
 .../web/bind/support/SessionAttributeStore.java  |  2 +-
 .../web/bind/support/SimpleSessionStatus.java    |  2 +-
 .../web/bind/support/WebArgumentResolver.java    |  2 +-
 .../web/bind/support/WebDataBinderFactory.java   |  2 +-
 .../web/bind/support/WebRequestDataBinder.java   |  2 +-
 .../client/HttpMessageConverterExtractor.java    |  2 +-
 .../web/client/ResponseErrorHandler.java         |  2 +-
 .../web/context/WebApplicationContext.java       |  2 +-
 .../request/AbstractRequestAttributesScope.java  |  2 +-
 .../DestructionCallbackBindingListener.java      |  2 +-
 .../context/request/FacesRequestAttributes.java  |  2 +-
 .../web/context/request/FacesWebRequest.java     |  2 +-
 .../web/context/request/NativeWebRequest.java    |  2 +-
 .../web/context/request/RequestAttributes.java   |  2 +-
 .../context/request/RequestContextHolder.java    |  2 +-
 .../context/request/RequestContextListener.java  |  2 +-
 .../web/context/request/RequestScope.java        |  2 +-
 .../web/context/request/SessionScope.java        |  2 +-
 .../web/context/request/WebRequest.java          |  2 +-
 .../context/request/WebRequestInterceptor.java   |  2 +-
 .../support/HttpRequestHandlerServlet.java       |  2 +-
 .../web/context/support/RequestHandledEvent.java |  2 +-
 .../ServletContextParameterFactoryBean.java      |  2 +-
 ...vletContextPropertyPlaceholderConfigurer.java |  2 +-
 .../support/ServletContextPropertySource.java    |  2 +-
 .../ServletContextResourcePatternResolver.java   |  2 +-
 .../web/context/support/ServletContextScope.java |  2 +-
 .../support/ServletRequestHandledEvent.java      |  2 +-
 .../support/SpringBeanAutowiringSupport.java     |  2 +-
 .../support/WebApplicationObjectSupport.java     |  2 +-
 .../web/filter/CompositeFilter.java              |  2 +-
 .../web/filter/GenericFilterBean.java            |  2 +-
 .../web/filter/HiddenHttpMethodFilter.java       |  2 +-
 .../jsf/DelegatingPhaseListenerMulticaster.java  |  2 +-
 .../web/jsf/DelegatingVariableResolver.java      |  2 +-
 .../web/jsf/FacesContextUtils.java               |  2 +-
 .../WebApplicationContextVariableResolver.java   |  2 +-
 .../web/jsf/el/SpringBeanFacesELResolver.java    |  2 +-
 .../el/WebApplicationContextFacesELResolver.java |  2 +-
 .../web/method/HandlerMethodSelector.java        |  2 +-
 ...bstractCookieValueMethodArgumentResolver.java |  2 +-
 .../ExpressionValueMethodArgumentResolver.java   |  2 +-
 .../annotation/InitBinderDataBinderFactory.java  |  2 +-
 .../web/method/annotation/ModelFactory.java      |  2 +-
 .../RequestHeaderMethodArgumentResolver.java     |  2 +-
 .../support/HandlerMethodArgumentResolver.java   |  2 +-
 .../support/HandlerMethodReturnValueHandler.java |  2 +-
 .../MaxUploadSizeExceededException.java          |  2 +-
 .../web/multipart/MultipartException.java        |  2 +-
 .../web/multipart/MultipartFile.java             |  2 +-
 .../web/multipart/MultipartRequest.java          |  2 +-
 .../web/multipart/MultipartResolver.java         |  2 +-
 .../commons/CommonsFileUploadSupport.java        |  2 +-
 .../multipart/commons/CommonsMultipartFile.java  |  2 +-
 .../commons/CommonsMultipartResolver.java        |  2 +-
 .../DefaultMultipartHttpServletRequest.java      |  2 +-
 .../web/multipart/support/MultipartFilter.java   |  2 +-
 .../RequestPartServletServerHttpRequest.java     |  2 +-
 .../support/StringMultipartFileEditor.java       |  2 +-
 .../web/util/HtmlCharacterEntityReferences.java  |  2 +-
 .../org/springframework/web/util/HtmlUtils.java  |  2 +-
 .../web/util/HttpSessionMutexListener.java       |  2 +-
 .../web/util/IntrospectorCleanupListener.java    |  2 +-
 .../web/util/Log4jConfigListener.java            |  2 +-
 .../web/util/NestedServletException.java         |  2 +-
 .../org/springframework/web/util/TagUtils.java   |  2 +-
 .../springframework/web/util/UriTemplate.java    |  2 +-
 .../web/util/WebAppRootListener.java             |  2 +-
 .../org/springframework/web/util/WebUtils.java   |  2 +-
 .../java/org/springframework/beans/Colour.java   |  2 +-
 .../springframework/beans/DerivedTestBean.java   |  2 +-
 .../springframework/beans/INestedTestBean.java   |  2 +-
 .../java/org/springframework/beans/IOther.java   |  2 +-
 .../springframework/beans/NestedTestBean.java    |  2 +-
 .../java/org/springframework/beans/Person.java   |  2 +-
 .../beans/SerializablePerson.java                |  2 +-
 .../java/org/springframework/beans/TestBean.java |  2 +-
 .../beans/factory/DummyFactory.java              |  2 +-
 .../springframework/core/task/MockRunnable.java  |  2 +-
 .../http/MockHttpInputMessage.java               |  2 +-
 .../http/MockHttpOutputMessage.java              |  2 +-
 .../http/client/FreePortScanner.java             |  2 +-
 .../StreamingSimpleHttpRequestFactoryTests.java  |  2 +-
 .../converter/FormHttpMessageConverterTests.java |  2 +-
 .../converter/HttpMessageConverterTests.java     |  2 +-
 .../StringHttpMessageConverterTests.java         |  2 +-
 ...Jaxb2RootElementHttpMessageConverterTest.java |  2 +-
 .../xml/SourceHttpMessageConverterTests.java     |  2 +-
 .../remoting/caucho/CauchoRemotingTests.java     |  2 +-
 .../remoting/jaxws/OrderNotFoundException.java   |  2 +-
 .../remoting/jaxws/OrderServiceImpl.java         |  2 +-
 .../web/client/RestTemplateIntegrationTests.java |  2 +-
 .../web/filter/CompositeFilterTests.java         |  2 +-
 .../web/filter/DelegatingFilterProxyTests.java   |  2 +-
 .../web/filter/HiddenHttpMethodFilterTest.java   |  2 +-
 .../web/jsf/DelegatingPhaseListenerTests.java    |  2 +-
 .../web/jsf/DelegatingVariableResolverTests.java |  2 +-
 .../web/jsf/MockFacesContext.java                |  2 +-
 .../springframework/web/jsf/MockLifecycle.java   |  2 +-
 .../ExceptionHandlerMethodResolverTests.java     |  2 +-
 ...dlerMethodArgumentResolverCompositeTests.java |  2 +-
 ...erMethodReturnValueHandlerCompositeTests.java |  2 +-
 .../support/ModelAndViewContainerTests.java      |  2 +-
 .../web/method/support/StubArgumentResolver.java |  2 +-
 .../method/support/StubReturnValueHandler.java   |  2 +-
 .../web/util/MockLog4jAppender.java              |  2 +-
 .../springframework/web/util/TagUtilsTests.java  |  2 +-
 .../springframework/web/util/UriUtilsTests.java  |  2 +-
 .../web/portlet/GenericPortletBean.java          |  2 +-
 .../web/portlet/HandlerAdapter.java              |  2 +-
 .../web/portlet/HandlerExceptionResolver.java    |  2 +-
 .../web/portlet/HandlerExecutionChain.java       |  2 +-
 .../web/portlet/HandlerInterceptor.java          |  2 +-
 .../web/portlet/HandlerMapping.java              |  2 +-
 .../web/portlet/ModelAndView.java                |  2 +-
 .../portlet/ModelAndViewDefiningException.java   |  2 +-
 .../web/portlet/NoHandlerFoundException.java     |  2 +-
 .../MissingPortletRequestParameterException.java |  2 +-
 .../bind/PortletRequestBindingException.java     |  2 +-
 .../portlet/bind/PortletRequestDataBinder.java   |  2 +-
 .../PortletRequestParameterPropertyValues.java   |  2 +-
 .../web/portlet/bind/PortletRequestUtils.java    |  2 +-
 .../portlet/bind/annotation/ActionMapping.java   |  2 +-
 .../ConfigurablePortletApplicationContext.java   |  2 +-
 .../context/PortletApplicationObjectSupport.java |  2 +-
 .../web/portlet/context/PortletConfigAware.java  |  2 +-
 .../web/portlet/context/PortletContextAware.java |  2 +-
 .../context/PortletContextAwareProcessor.java    |  2 +-
 .../PortletContextResourcePatternResolver.java   |  2 +-
 .../web/portlet/context/PortletContextScope.java |  2 +-
 .../context/PortletRequestAttributes.java        |  2 +-
 .../context/PortletRequestHandledEvent.java      |  2 +-
 .../web/portlet/context/PortletWebRequest.java   |  2 +-
 .../context/StaticPortletApplicationContext.java |  2 +-
 .../AbstractHandlerExceptionResolver.java        |  2 +-
 .../handler/HandlerInterceptorAdapter.java       |  2 +-
 .../portlet/handler/ParameterHandlerMapping.java |  2 +-
 .../handler/ParameterMappingInterceptor.java     |  2 +-
 .../portlet/handler/PortletContentGenerator.java |  2 +-
 .../handler/PortletModeHandlerMapping.java       |  2 +-
 .../PortletModeParameterHandlerMapping.java      |  2 +-
 ...ortletRequestMethodNotSupportedException.java |  2 +-
 .../handler/PortletSessionRequiredException.java |  2 +-
 .../handler/SimpleMappingExceptionResolver.java  |  2 +-
 .../handler/SimplePortletHandlerAdapter.java     |  2 +-
 .../handler/SimplePortletPostProcessor.java      |  2 +-
 .../WebRequestHandlerInterceptorAdapter.java     |  2 +-
 .../CommonsPortletMultipartResolver.java         |  2 +-
 .../multipart/DefaultMultipartActionRequest.java |  2 +-
 .../multipart/PortletMultipartResolver.java      |  2 +-
 .../portlet/mvc/AbstractCommandController.java   |  2 +-
 .../web/portlet/mvc/AbstractController.java      |  2 +-
 .../web/portlet/mvc/AbstractFormController.java  |  2 +-
 .../mvc/AbstractWizardFormController.java        |  2 +-
 .../web/portlet/mvc/BaseCommandController.java   |  2 +-
 .../web/portlet/mvc/Controller.java              |  2 +-
 .../mvc/ParameterizableViewController.java       |  2 +-
 .../portlet/mvc/PortletWrappingController.java   |  2 +-
 .../web/portlet/mvc/ResourceAwareController.java |  2 +-
 .../web/portlet/mvc/SimpleFormController.java    |  2 +-
 .../web/portlet/util/PortletUtils.java           |  2 +-
 .../java/org/springframework/beans/Colour.java   |  2 +-
 .../springframework/beans/DerivedTestBean.java   |  2 +-
 .../springframework/beans/INestedTestBean.java   |  2 +-
 .../java/org/springframework/beans/IOther.java   |  2 +-
 .../springframework/beans/NestedTestBean.java    |  2 +-
 .../java/org/springframework/beans/TestBean.java |  2 +-
 .../beans/factory/AbstractBeanFactoryTests.java  |  2 +-
 .../beans/factory/DummyFactory.java              |  2 +-
 .../beans/factory/LifecycleBean.java             |  2 +-
 .../beans/factory/MustBeInitialized.java         |  2 +-
 .../org/springframework/context/ACATester.java   |  2 +-
 .../context/AbstractApplicationContextTests.java |  2 +-
 .../context/BeanThatBroadcasts.java              |  2 +-
 .../springframework/context/BeanThatListens.java |  2 +-
 .../mock/web/DelegatingServletOutputStream.java  |  2 +-
 .../mock/web/HeaderValueHolder.java              |  2 +-
 .../mock/web/MockMultipartFile.java              |  2 +-
 .../mock/web/portlet/MockActionResponse.java     |  2 +-
 .../mock/web/portlet/MockBaseURL.java            |  2 +-
 .../mock/web/portlet/MockCacheControl.java       |  2 +-
 .../mock/web/portlet/MockClientDataRequest.java  |  2 +-
 .../mock/web/portlet/MockEvent.java              |  2 +-
 .../mock/web/portlet/MockEventRequest.java       |  2 +-
 .../mock/web/portlet/MockEventResponse.java      |  2 +-
 .../mock/web/portlet/MockMimeResponse.java       |  2 +-
 .../web/portlet/MockMultipartActionRequest.java  |  2 +-
 .../mock/web/portlet/MockPortalContext.java      |  2 +-
 .../mock/web/portlet/MockPortletConfig.java      |  2 +-
 .../mock/web/portlet/MockPortletContext.java     |  2 +-
 .../mock/web/portlet/MockPortletRequest.java     |  2 +-
 .../portlet/MockPortletRequestDispatcher.java    |  2 +-
 .../mock/web/portlet/MockPortletResponse.java    |  2 +-
 .../mock/web/portlet/MockPortletSession.java     |  2 +-
 .../mock/web/portlet/MockPortletURL.java         |  2 +-
 .../mock/web/portlet/MockRenderRequest.java      |  2 +-
 .../mock/web/portlet/MockRenderResponse.java     |  2 +-
 .../mock/web/portlet/MockResourceRequest.java    |  2 +-
 .../mock/web/portlet/MockResourceResponse.java   |  2 +-
 .../mock/web/portlet/MockResourceURL.java        |  2 +-
 .../mock/web/portlet/MockStateAwareResponse.java |  2 +-
 .../portlet/ServletWrappingPortletContext.java   |  2 +-
 .../ComplexPortletApplicationContext.java        |  2 +-
 .../web/portlet/GenericPortletBeanTests.java     |  2 +-
 .../bind/PortletRequestDataBinderTests.java      |  2 +-
 ...rtletRequestParameterPropertyValuesTests.java |  2 +-
 .../AbstractXmlWebApplicationContextTests.java   |  2 +-
 .../portlet/context/PortletConfigAwareBean.java  |  2 +-
 .../portlet/context/PortletContextAwareBean.java |  2 +-
 .../PortletContextAwareProcessorTests.java       |  2 +-
 .../portlet/context/PortletWebRequestTests.java  |  2 +-
 .../XmlPortletApplicationContextTests.java       |  2 +-
 .../handler/ParameterHandlerMappingTests.java    |  2 +-
 .../ParameterMappingInterceptorTests.java        |  2 +-
 .../handler/PortletModeHandlerMappingTests.java  |  2 +-
 .../PortletModeParameterHandlerMappingTests.java |  2 +-
 .../SimpleMappingExceptionResolverTests.java     |  2 +-
 .../UserRoleAuthorizationInterceptorTests.java   |  2 +-
 .../web/portlet/mvc/CommandControllerTests.java  |  2 +-
 .../mvc/ParameterizableViewControllerTests.java  |  2 +-
 .../mvc/PortletModeNameViewControllerTests.java  |  2 +-
 .../mvc/PortletWrappingControllerTests.java      |  2 +-
 .../PortletAnnotationControllerTests.java        |  2 +-
 .../web/portlet/util/PortletUtilsTests.java      |  2 +-
 .../web/servlet/HandlerAdapter.java              |  2 +-
 .../web/servlet/HandlerExceptionResolver.java    |  2 +-
 .../web/servlet/HandlerInterceptor.java          |  2 +-
 .../web/servlet/HandlerMapping.java              |  2 +-
 .../web/servlet/LocaleResolver.java              |  2 +-
 .../web/servlet/ModelAndView.java                |  2 +-
 .../servlet/ModelAndViewDefiningException.java   |  2 +-
 .../web/servlet/RequestToViewNameTranslator.java |  2 +-
 .../web/servlet/ResourceServlet.java             |  2 +-
 .../springframework/web/servlet/SmartView.java   |  2 +-
 .../web/servlet/ThemeResolver.java               |  2 +-
 .../web/servlet/ViewRendererServlet.java         |  2 +-
 .../web/servlet/ViewResolver.java                |  2 +-
 ...efaultServletHandlerBeanDefinitionParser.java |  2 +-
 .../web/servlet/config/MvcNamespaceHandler.java  |  2 +-
 .../web/servlet/config/MvcNamespaceUtils.java    |  2 +-
 .../config/ResourcesBeanDefinitionParser.java    |  2 +-
 .../ViewControllerBeanDefinitionParser.java      |  2 +-
 .../DefaultServletHandlerConfigurer.java         |  2 +-
 .../servlet/config/annotation/EnableWebMvc.java  |  2 +-
 .../annotation/ResourceHandlerRegistration.java  |  2 +-
 .../annotation/ResourceHandlerRegistry.java      |  2 +-
 .../annotation/ViewControllerRegistration.java   |  2 +-
 .../annotation/ViewControllerRegistry.java       |  2 +-
 .../AbstractDetectingUrlHandlerMapping.java      |  2 +-
 .../AbstractHandlerExceptionResolver.java        |  2 +-
 .../servlet/handler/AbstractHandlerMapping.java  |  2 +-
 .../AbstractHandlerMethodExceptionResolver.java  |  2 +-
 .../ConversionServiceExposingInterceptor.java    |  2 +-
 .../HandlerExceptionResolverComposite.java       |  2 +-
 .../handler/SimpleServletHandlerAdapter.java     |  2 +-
 .../handler/SimpleServletPostProcessor.java      |  2 +-
 .../servlet/handler/SimpleUrlHandlerMapping.java |  2 +-
 .../servlet/i18n/AcceptHeaderLocaleResolver.java |  2 +-
 .../web/servlet/i18n/CookieLocaleResolver.java   |  2 +-
 .../web/servlet/i18n/FixedLocaleResolver.java    |  2 +-
 .../web/servlet/i18n/SessionLocaleResolver.java  |  2 +-
 .../servlet/mvc/AbstractCommandController.java   |  2 +-
 .../web/servlet/mvc/AbstractController.java      |  2 +-
 .../web/servlet/mvc/AbstractFormController.java  |  2 +-
 .../servlet/mvc/AbstractUrlViewController.java   |  2 +-
 .../mvc/AbstractWizardFormController.java        |  2 +-
 .../web/servlet/mvc/BaseCommandController.java   |  2 +-
 .../servlet/mvc/CancellableFormController.java   |  2 +-
 .../web/servlet/mvc/Controller.java              |  2 +-
 .../web/servlet/mvc/LastModified.java            |  2 +-
 .../mvc/ParameterizableViewController.java       |  2 +-
 .../servlet/mvc/ServletForwardingController.java |  2 +-
 .../servlet/mvc/ServletWrappingController.java   |  2 +-
 .../web/servlet/mvc/SimpleFormController.java    |  2 +-
 .../web/servlet/mvc/WebContentInterceptor.java   |  2 +-
 ...AnnotationMethodHandlerExceptionResolver.java |  2 +-
 .../ResponseStatusExceptionResolver.java         |  2 +-
 .../ServletAnnotationMappingUtils.java           |  2 +-
 .../condition/AbstractNameValueExpression.java   |  2 +-
 .../mvc/condition/AbstractRequestCondition.java  |  2 +-
 .../mvc/condition/HeadersRequestCondition.java   |  2 +-
 .../mvc/condition/MediaTypeExpression.java       |  2 +-
 .../mvc/condition/NameValueExpression.java       |  2 +-
 .../mvc/condition/ParamsRequestCondition.java    |  2 +-
 .../mvc/method/AbstractHandlerMethodAdapter.java |  2 +-
 .../servlet/mvc/method/RequestMappingInfo.java   |  2 +-
 ...ctMessageConverterMethodArgumentResolver.java |  2 +-
 ...ServletCookieValueMethodArgumentResolver.java |  2 +-
 .../ServletWebArgumentResolverAdapter.java       |  2 +-
 .../AbstractUrlMethodNameResolver.java           |  2 +-
 .../mvc/multiaction/MethodNameResolver.java      |  2 +-
 .../NoSuchRequestHandlingMethodException.java    |  2 +-
 .../multiaction/ParameterMethodNameResolver.java |  2 +-
 .../PropertiesMethodNameResolver.java            |  2 +-
 .../AbstractControllerUrlHandlerMapping.java     |  2 +-
 .../AnnotationControllerTypePredicate.java       |  2 +-
 .../ControllerBeanNameHandlerMapping.java        |  2 +-
 .../ControllerClassNameHandlerMapping.java       |  2 +-
 .../servlet/mvc/support/RedirectAttributes.java  |  2 +-
 .../mvc/support/RedirectAttributesModelMap.java  |  2 +-
 .../resource/ResourceHttpRequestHandler.java     |  2 +-
 .../web/servlet/support/BindStatus.java          |  2 +-
 .../servlet/support/JspAwareRequestContext.java  |  2 +-
 .../web/servlet/support/JstlUtils.java           |  2 +-
 .../web/servlet/support/RequestContext.java      |  2 +-
 .../support/RequestDataValueProcessor.java       |  2 +-
 .../web/servlet/support/WebContentGenerator.java |  2 +-
 .../web/servlet/tags/BindErrorsTag.java          |  2 +-
 .../web/servlet/tags/BindTag.java                |  2 +-
 .../web/servlet/tags/EditorAwareTag.java         |  2 +-
 .../web/servlet/tags/EscapeBodyTag.java          |  2 +-
 .../web/servlet/tags/EvalTag.java                |  2 +-
 .../web/servlet/tags/HtmlEscapeTag.java          |  2 +-
 .../web/servlet/tags/HtmlEscapingAwareTag.java   |  2 +-
 .../web/servlet/tags/MessageTag.java             |  2 +-
 .../web/servlet/tags/NestedPathTag.java          |  2 +-
 .../springframework/web/servlet/tags/Param.java  |  2 +-
 .../web/servlet/tags/ParamAware.java             |  2 +-
 .../web/servlet/tags/ParamTag.java               |  2 +-
 .../web/servlet/tags/RequestContextAwareTag.java |  2 +-
 .../web/servlet/tags/ThemeTag.java               |  2 +-
 .../web/servlet/tags/TransformTag.java           |  2 +-
 .../springframework/web/servlet/tags/UrlTag.java |  2 +-
 .../tags/form/AbstractCheckedElementTag.java     |  2 +-
 .../form/AbstractDataBoundFormElementTag.java    |  2 +-
 .../web/servlet/tags/form/AbstractFormTag.java   |  2 +-
 .../tags/form/AbstractHtmlElementBodyTag.java    |  2 +-
 .../tags/form/AbstractHtmlElementTag.java        |  2 +-
 .../tags/form/AbstractHtmlInputElementTag.java   |  2 +-
 .../form/AbstractMultiCheckedElementTag.java     |  2 +-
 .../form/AbstractSingleCheckedElementTag.java    |  2 +-
 .../web/servlet/tags/form/ButtonTag.java         |  2 +-
 .../web/servlet/tags/form/CheckboxTag.java       |  2 +-
 .../web/servlet/tags/form/CheckboxesTag.java     |  2 +-
 .../web/servlet/tags/form/ErrorsTag.java         |  2 +-
 .../web/servlet/tags/form/FormTag.java           |  2 +-
 .../web/servlet/tags/form/HiddenInputTag.java    |  2 +-
 .../web/servlet/tags/form/InputTag.java          |  2 +-
 .../web/servlet/tags/form/LabelTag.java          |  2 +-
 .../web/servlet/tags/form/OptionTag.java         |  2 +-
 .../web/servlet/tags/form/OptionWriter.java      |  2 +-
 .../web/servlet/tags/form/OptionsTag.java        |  2 +-
 .../web/servlet/tags/form/PasswordInputTag.java  |  2 +-
 .../web/servlet/tags/form/RadioButtonTag.java    |  2 +-
 .../web/servlet/tags/form/RadioButtonsTag.java   |  2 +-
 .../web/servlet/tags/form/SelectTag.java         |  2 +-
 .../tags/form/SelectedValueComparator.java       |  2 +-
 .../web/servlet/tags/form/TagIdGenerator.java    |  2 +-
 .../web/servlet/tags/form/TagWriter.java         |  2 +-
 .../web/servlet/tags/form/TextareaTag.java       |  2 +-
 .../web/servlet/tags/form/ValueFormatter.java    |  2 +-
 .../web/servlet/theme/CookieThemeResolver.java   |  2 +-
 .../web/servlet/theme/FixedThemeResolver.java    |  2 +-
 .../web/servlet/theme/SessionThemeResolver.java  |  2 +-
 .../web/servlet/view/AbstractUrlBasedView.java   |  2 +-
 .../web/servlet/view/BeanNameViewResolver.java   |  2 +-
 .../view/DefaultRequestToViewNameTranslator.java |  2 +-
 .../web/servlet/view/InternalResourceView.java   |  2 +-
 .../view/InternalResourceViewResolver.java       |  2 +-
 .../web/servlet/view/JstlView.java               |  2 +-
 .../servlet/view/ResourceBundleViewResolver.java |  2 +-
 .../web/servlet/view/UrlBasedViewResolver.java   |  2 +-
 .../web/servlet/view/XmlViewResolver.java        |  2 +-
 .../view/document/AbstractJExcelView.java        |  2 +-
 .../servlet/view/document/AbstractPdfView.java   |  2 +-
 .../servlet/view/freemarker/FreeMarkerView.java  |  2 +-
 .../ConfigurableJasperReportsView.java           |  2 +-
 .../view/jasperreports/JasperReportsCsvView.java |  2 +-
 .../jasperreports/JasperReportsHtmlView.java     |  2 +-
 .../JasperReportsMultiFormatView.java            |  2 +-
 .../view/jasperreports/JasperReportsPdfView.java |  2 +-
 .../jasperreports/JasperReportsViewResolver.java |  2 +-
 .../view/jasperreports/JasperReportsXlsView.java |  2 +-
 .../tiles2/AbstractSpringPreparerFactory.java    |  2 +-
 .../web/servlet/view/tiles2/TilesConfigurer.java |  2 +-
 .../servlet/view/velocity/VelocityConfig.java    |  2 +-
 .../view/velocity/VelocityConfigurer.java        |  2 +-
 .../view/velocity/VelocityLayoutView.java        |  2 +-
 .../velocity/VelocityLayoutViewResolver.java     |  2 +-
 .../web/servlet/view/velocity/VelocityView.java  |  2 +-
 .../view/velocity/VelocityViewResolver.java      |  2 +-
 .../web/servlet/view/xml/MarshallingView.java    |  2 +-
 .../web/servlet/view/xslt/AbstractXsltView.java  |  2 +-
 .../web/servlet/view/xslt/XsltView.java          |  2 +-
 .../web/servlet/view/xslt/XsltViewResolver.java  |  2 +-
 .../java/org/springframework/beans/Colour.java   |  2 +-
 .../springframework/beans/DerivedTestBean.java   |  2 +-
 .../springframework/beans/INestedTestBean.java   |  2 +-
 .../java/org/springframework/beans/IOther.java   |  2 +-
 .../springframework/beans/NestedTestBean.java    |  2 +-
 .../java/org/springframework/beans/Person.java   |  2 +-
 .../beans/SerializablePerson.java                |  2 +-
 .../java/org/springframework/beans/TestBean.java |  2 +-
 .../beans/factory/DummyFactory.java              |  2 +-
 .../beans/factory/LifecycleBean.java             |  2 +-
 .../beans/factory/MustBeInitialized.java         |  2 +-
 .../beans/factory/access/TestBean.java           |  2 +-
 .../org/springframework/context/ACATester.java   |  2 +-
 .../context/BeanThatBroadcasts.java              |  2 +-
 .../springframework/context/BeanThatListens.java |  2 +-
 .../http/client/FreePortScanner.java             |  2 +-
 .../web/context/AbstractBeanFactoryTests.java    |  2 +-
 .../web/context/ServletConfigAwareBean.java      |  2 +-
 .../web/context/ServletContextAwareBean.java     |  2 +-
 .../servlet/ComplexWebApplicationContext.java    |  2 +-
 .../web/servlet/FlashMapTests.java               |  2 +-
 .../web/servlet/SimpleWebApplicationContext.java |  2 +-
 ...nnotationDrivenBeanDefinitionParserTests.java |  2 +-
 .../annotation/ViewControllerRegistryTests.java  |  2 +-
 .../web/servlet/mvc/mapping/Controller.java      |  2 +-
 .../servlet/mvc/mapping/WelcomeController.java   |  2 +-
 .../annotation/RequestPartIntegrationTests.java  |  2 +-
 .../support/RedirectAttributesModelMapTests.java |  2 +-
 .../RequestDataValueProcessorWrapper.java        |  2 +-
 .../BindTagOutsideDispatcherServletTests.java    |  2 +-
 .../web/servlet/tags/BindTagTests.java           |  2 +-
 ...mlEscapeTagOutsideDispatcherServletTests.java |  2 +-
 .../MessageTagOutsideDispatcherServletTests.java |  2 +-
 .../web/servlet/tags/ParamTagTests.java          |  2 +-
 .../web/servlet/tags/ParamTests.java             |  2 +-
 .../web/servlet/tags/ThemeTagTests.java          |  2 +-
 .../web/servlet/tags/UrlTagTests.java            |  2 +-
 .../web/servlet/tags/form/ButtonTagTests.java    |  2 +-
 .../web/servlet/tags/form/CheckboxTagTests.java  |  2 +-
 .../servlet/tags/form/CheckboxesTagTests.java    |  2 +-
 .../servlet/tags/form/HiddenInputTagTests.java   |  2 +-
 .../web/servlet/tags/form/InputTagTests.java     |  2 +-
 .../web/servlet/tags/form/ItemPet.java           |  2 +-
 .../servlet/tags/form/OptionTagEnumTests.java    |  2 +-
 .../servlet/tags/form/PasswordInputTagTests.java |  2 +-
 .../servlet/tags/form/RadioButtonTagTests.java   |  2 +-
 .../servlet/tags/form/RadioButtonsTagTests.java  |  2 +-
 .../web/servlet/tags/form/SimpleFloatEditor.java |  2 +-
 .../web/servlet/tags/form/TagWriterTests.java    |  2 +-
 .../web/servlet/tags/form/TextareaTagTests.java  |  2 +-
 .../ResourceBundleViewResolverNoCacheTests.java  |  2 +-
 .../freemarker/FreeMarkerConfigurerTests.java    |  2 +-
 ...igurableJasperReportsViewWithStreamTests.java |  2 +-
 ...igurableJasperReportsViewWithWriterTests.java |  2 +-
 .../jasperreports/JasperReportsCsvViewTests.java |  2 +-
 .../JasperReportsMultiFormatViewTests.java       |  2 +-
 ...tsMultiFormatViewWithCustomMappingsTests.java |  2 +-
 .../jasperreports/JasperReportsPdfViewTests.java |  2 +-
 .../jasperreports/JasperReportsXlsViewTests.java |  2 +-
 .../view/velocity/TestVelocityEngine.java        |  2 +-
 .../view/velocity/VelocityConfigurerTests.java   |  2 +-
 ...AopNamespaceHandlerScopeIntegrationTests.java |  2 +-
 .../AdvisorAutoProxyCreatorIntegrationTests.java |  2 +-
 .../EnableCachingIntegrationTests.java           |  2 +-
 ...nitionScannerJsr330ScopeIntegrationTests.java |  2 +-
 .../ltw/ComponentScanningWithLTWTests.java       |  2 +-
 ...anDefinitionScannerScopeIntegrationTests.java |  2 +-
 .../core/env/EnvironmentIntegrationTests.java    |  2 +-
 ...derConfigurerEnvironmentIntegrationTests.java |  2 +-
 .../spel/support/BeanFactoryTypeConverter.java   |  2 +-
 .../expression/spel/support/Spr7538Tests.java    | 16 ++++++++++++++++
 .../CallCountingTransactionManager.java          |  5 +++--
 ...bleTransactionManagementIntegrationTests.java |  2 +-
 .../ProxyAnnotationDiscoveryTests.java           |  2 +-
 .../advice/CountingAfterReturningAdvice.java     |  2 +-
 .../java/test/advice/CountingBeforeAdvice.java   |  2 +-
 src/test/java/test/advice/MethodCounter.java     |  2 +-
 src/test/java/test/beans/Colour.java             |  2 +-
 src/test/java/test/beans/INestedTestBean.java    |  2 +-
 src/test/java/test/beans/IOther.java             |  2 +-
 src/test/java/test/beans/ITestBean.java          |  2 +-
 src/test/java/test/beans/IndexedTestBean.java    |  2 +-
 src/test/java/test/beans/NestedTestBean.java     |  2 +-
 src/test/java/test/beans/Pet.java                |  2 +-
 src/test/java/test/beans/TestBean.java           |  2 +-
 .../java/test/interceptor/NopInterceptor.java    |  2 +-
 .../interceptor/SerializableNopInterceptor.java  |  2 +-
 .../java/test/util/SerializationTestUtils.java   |  2 +-
 2569 files changed, 2646 insertions(+), 2568 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/Advisor.java b/spring-aop/src/main/java/org/springframework/aop/Advisor.java
index 8fe320c032..8959552925 100644
--- a/spring-aop/src/main/java/org/springframework/aop/Advisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/Advisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java b/spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java
index f79397741e..46362c2b13 100644
--- a/spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java b/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java
index 404a1d0845..8c38ff4b81 100644
--- a/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java
+++ b/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java b/spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java
index 37f9cb7500..17f7645e7c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java
index aa49595d51..b576aa4b21 100644
--- a/spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 0ab9dd6b9b..ffefed7eee 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-2007 the original author or authors.
+ * 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.
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 36ac7ea99b..6ba69a833d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java
+++ b/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java b/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java
index cf3c87d2d1..fb8b08e220 100644
--- a/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java
index af2fb26fc1..15526c1fc8 100644
--- a/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/Pointcut.java b/spring-aop/src/main/java/org/springframework/aop/Pointcut.java
index 05addda78b..489e7beb82 100644
--- a/spring-aop/src/main/java/org/springframework/aop/Pointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/Pointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java
index 6fb4d88497..7b7c1e7864 100644
--- a/spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java
index e49c697f3c..935f745de4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java
+++ b/spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java b/spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java
index 53f308b332..e2eccfac57 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/TargetSource.java b/spring-aop/src/main/java/org/springframework/aop/TargetSource.java
index bd3185952f..9633b4b33b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TargetSource.java
@@ -1,5 +1,5 @@
 /*<
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
index 2d09d4f690..248e2f6416 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
index a97872ab32..a8bf94dcae 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
index 4416fe866d..553b0e9d6d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java
index 3c16911977..2f1e7aaa6b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
index 0ef76eba69..42a2c6f729 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java
index 7f869ed80d..fd5b0d64c4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java
index 16308507e1..2155c81cd5 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 c4ddcaab9a..7e101ea57d 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-2010 the original author or authors.
+ * 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.
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 49fa6da5eb..70b6575076 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-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
index 8d80da138c..3463e8cc61 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 c8329e413a..4505e6f330 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 3838c7bda6..27618c9b46 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
index a2e8a6a64c..fbdcf09313 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 4cc0b44f74..fa470759cd 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java
index 3316e76582..40049e978e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
index 58173805d7..7f550a333d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
index 1ae00d2421..adb8c4db37 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
index 92721d5c77..5b3f48bce8 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 62d1414717..9eff81682b 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java
index a85a138ca2..36bf115105 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
index 3aefe815c9..ccf2aa610b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 fecd7b2e2a..81a6c2a3ad 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
index bf1856b6a4..b9863ab67a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java
index c4401b17cc..1c45cbc2f6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 5bea20f88f..bb623b372b 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-2009 the original author or authors.
+ * 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.
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 8478f7390d..ef9014a144 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
index 9f70ed53a0..dbfcbd380e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
index d05e67b5da..0dd176354e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
index e8decbf469..6e58344f80 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java
index 180ea636a3..85e59523a7 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
index b28e6d3e03..374e40290a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java
index dc3b4f9ea8..13be36d8f3 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java b/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java
index 6d97412f9d..3da1f13f0a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java
index b250bf747e..611376efb9 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java
index 9d19ec544b..73ff37197c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
index d9e5b43615..aa3d70d11e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
index f97d8230eb..9f75cba9be 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java
index e1cf5f65f3..10f6327e5c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
index 797b5f6698..0d2daf364f 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 ffc317ce37..3c822cf2da 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-2007 the original author or authors.
+ * 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.
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 63d8711269..e5f89177b6 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java
index 33e09ae1d6..26a45a4657 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java
index ca61dcc557..13a86ecb89 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java
index c002e43a51..80c6690564 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java
index 595eb35c65..9a2e2298e4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
index a602cefe37..5ac4ed7f66 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
index defb0bada9..90eeef7b48 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java
index e8decfcf94..fc7ae7b878 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java
index 4adef07407..e1867efd7e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 257f2f2190..a369f56c82 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
index 5062a916c5..c9ac099b48 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java
index b1f5a6396d..425c3f87c4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java
index 1c69281c70..9eacf479ba 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java
index 07257fecb7..a921e6e509 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java
index 9b6dfa3fd9..9f8f698faf 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
index da5f7025ed..136f004586 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java
index 222a63129d..6fc3cdef5e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java
index 3aebd50484..83d7b8e851 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
index 386d3a75df..687a6d5f8b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
index 32f3d2d44d..69b0bd1cc5 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java
index c0e840b055..e95e513caa 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java
index c9aae651d5..035442282d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java
index b48ae0905e..88a75e877a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 ab056cd688..e417f92df0 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-2008 the original author or authors.
+ * 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.
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 7b517282c8..e91f9db74a 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
index f84bf4f55d..953a751d32 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java
index d48716f9d0..90034eafbb 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java
index 0adb7d7e2a..ce350d651b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java
index 5acae865f4..67f9638ce4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
index 510b6d8da1..c1ef00cbe2 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java
index 9667931793..d972b95cf1 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
index 82db223aa3..0159d307a1 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
index 438fa3cff7..7c29c775bc 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
index 4298008d9b..8f6f3ee479 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 93228b1af7..a5d1f50805 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java
index 4f9b95a919..0a2c2ec8e9 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
index bffad2c4d1..a4ce58d528 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
index 9d25008e91..c5443e7dc3 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
index 8f14116ac8..5ff0f9cba8 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
index fd3f537560..4362c5de10 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java
index ec794cb5fd..e70f502fd1 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java b/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
index cc07afc997..95009495ba 100644
--- a/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
+++ b/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java
index 9e46d230cd..4b7046e359 100644
--- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java
+++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 2193d8b674..34bc7b9b74 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-2009 the original author or authors.
+ * 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.
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 e59267d30f..fdd0253d6e 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-2010 the original author or authors.
+ * 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.
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 938a7cb742..3715a9ca70 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
index dc48762686..74a62a7ba9 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java
index c0fcb7c791..53494a14ce 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
index 4b362c8407..8dc2fb0a3e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 4abb43c8f2..1dea2cb113 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-2007 the original author or authors.
+ * 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.
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 1ec8a01229..b537a6ab8e 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
index 008e9105c9..4de481fcba 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
index 1324847e12..92fb3c4552 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 f9a7e33e5d..e1aad6a170 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
index 64d6651af5..f4b16915f9 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
index ac0199a69e..5eeeea60d6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2087 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
index 53211519e3..c27d1872cf 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java
index 6a6a70c985..9427a647de 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java
index e70530b098..35d765c297 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 1279087de1..c8807f7639 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
index 82409fc009..071da29247 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 75d56678ad..be8b5bca7f 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-2007 the original author or authors.
+ * 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.
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 ddbec48ffe..69389d0bf5 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-2008 the original author or authors.
+ * 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.
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 ef939cfb55..c2f85b5881 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-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java
index 267083cc70..2bfbcb1c32 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 5cc14d909b..1edb2d746b 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
index 955f92ef03..461252e617 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java
index 27209a18ac..6efebf1106 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 9bafe1bd49..acdbbeff88 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-2007 the original author or authors.
+ * 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.
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 8a2d9a6a27..3192fab5fe 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java
index 86259b7abe..6fdd24ef92 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 ccb8b56637..91e1b72ee7 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-2007 the original author or authors.
+ * 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.
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 096fd2f46f..47a35f756e 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
index f6358585e2..193259ba8d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
index 37f5b99d46..dcb6108e87 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java b/spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java
index ddaad78704..c671f024f5 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 ed372d085e..81642f6b2e 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java
index 911eb837f1..14560404c4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
index 844073a5ab..cd2dfb0c0c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java
index 688b891330..f3801a79db 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java
index 865e4fa699..7aba951ee5 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java
index 76c17e3337..f2f894dbec 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java
index 82d16e7fd4..187544e6d8 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java
index 0d523ba87e..5efbb2f893 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java
index 73ec428395..7662195c0f 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
index 630c1e3ea4..cf96bf3f06 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
index 1c30480fbd..ac6dc31a2a 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
index 2af6f16be4..8c84e801b8 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java
index d9769685c5..2b92a5c661 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
index c3e1f0c120..b8c336b0fb 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
index 7ad0b7c768..fea874179e 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
index 6a5a746063..d15b0a11ca 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
index 1627f57d69..88beb1455a 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
index 472b495a50..af55e122a6 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
index c0b30c27e2..93aebbfa67 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java
index 085e8c5d9f..f01d1bb9c6 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
index 9c4b78b54d..08d95808ed 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
index de575c8842..0d86588b8c 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
index fcb34b4012..ba0b767921 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
index 40209c7d7b..3dbd38f98c 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
index 96a22b3353..dca823663d 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
index 5940cd5718..03b971fed0 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
index f4602bf0b5..4e81553444 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
index 64abdd4891..05a0fc327a 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
index 1255baae2a..ddf48d28d8 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
index 77707f16bc..fe72f96325 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
index 0d2edb525a..964fac9efa 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java
index deceb5c215..77aad8e9ff 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
index d13c8e6512..d0cee0780e 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
index fc19053502..170f5b34bc 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
index f514800cfb..ae224b6385 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java
index c36ca5ba68..bf2c45fc2c 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java
index 6732be2f90..6efc651d27 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java
index d968e957ed..9ec42626db 100644
--- a/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
index 83bb13216e..f44b215755 100644
--- a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
index 6090b16b8d..505697408c 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
index 8df910eecb..42992fb57c 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
index b66105de6c..2ca2acd665 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
index e6c08c08f2..6288f7674a 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
index cb812d668d..1b7c8d60b3 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java
index 404fc55d81..0848ab58a9 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 614ba7a532..5b3ceb039b 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
index a36856ddd3..8b89281e76 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
index 72255612df..1ed7cd8430 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
index bab75b7a3d..e52d9b14e0 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java
index 269d585e9d..e70d2c7baa 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
index be9b929475..b3d6ceef18 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java
index 55661a8901..2a584f9a5c 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
index 4283695ba6..984261bcc9 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
index 39325e2dcb..93205fb1b9 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
index 3317694eff..204f3d8abd 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
index 875ba6dc82..c896b9e638 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java
index 3f90fb8aef..3010a4674d 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java b/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java
index d59b8ddd3b..91a49faa0f 100644
--- a/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java
+++ b/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/aop/DefaultLockable.java b/spring-aop/src/test/java/test/aop/DefaultLockable.java
index a7f6c4ac7e..1fddaca9f1 100644
--- a/spring-aop/src/test/java/test/aop/DefaultLockable.java
+++ b/spring-aop/src/test/java/test/aop/DefaultLockable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/aop/Lockable.java b/spring-aop/src/test/java/test/aop/Lockable.java
index 135a991424..039b06e8a7 100644
--- a/spring-aop/src/test/java/test/aop/Lockable.java
+++ b/spring-aop/src/test/java/test/aop/Lockable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/aop/MethodCounter.java b/spring-aop/src/test/java/test/aop/MethodCounter.java
index 745b7289cb..ae673bd168 100644
--- a/spring-aop/src/test/java/test/aop/MethodCounter.java
+++ b/spring-aop/src/test/java/test/aop/MethodCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/aop/NopInterceptor.java b/spring-aop/src/test/java/test/aop/NopInterceptor.java
index fd4d9e9ff6..20b9ece08f 100644
--- a/spring-aop/src/test/java/test/aop/NopInterceptor.java
+++ b/spring-aop/src/test/java/test/aop/NopInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
index 5a21b1d7f0..064df39ab5 100644
--- a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
+++ b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/beans/DerivedTestBean.java b/spring-aop/src/test/java/test/beans/DerivedTestBean.java
index a26ee9b471..225ae1a300 100644
--- a/spring-aop/src/test/java/test/beans/DerivedTestBean.java
+++ b/spring-aop/src/test/java/test/beans/DerivedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/beans/INestedTestBean.java b/spring-aop/src/test/java/test/beans/INestedTestBean.java
index 87bfc26773..56c9d829ee 100644
--- a/spring-aop/src/test/java/test/beans/INestedTestBean.java
+++ b/spring-aop/src/test/java/test/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/beans/IOther.java b/spring-aop/src/test/java/test/beans/IOther.java
index e5b576de3b..f3c6263261 100644
--- a/spring-aop/src/test/java/test/beans/IOther.java
+++ b/spring-aop/src/test/java/test/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/beans/NestedTestBean.java b/spring-aop/src/test/java/test/beans/NestedTestBean.java
index 6855305fb3..edc145ad7d 100644
--- a/spring-aop/src/test/java/test/beans/NestedTestBean.java
+++ b/spring-aop/src/test/java/test/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/beans/Person.java b/spring-aop/src/test/java/test/beans/Person.java
index d1a441945e..974d7d9b77 100644
--- a/spring-aop/src/test/java/test/beans/Person.java
+++ b/spring-aop/src/test/java/test/beans/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/beans/SerializablePerson.java b/spring-aop/src/test/java/test/beans/SerializablePerson.java
index 60fa67417d..3aa60f1fdc 100644
--- a/spring-aop/src/test/java/test/beans/SerializablePerson.java
+++ b/spring-aop/src/test/java/test/beans/SerializablePerson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/beans/SideEffectBean.java b/spring-aop/src/test/java/test/beans/SideEffectBean.java
index 82871af752..621ecbc3a2 100644
--- a/spring-aop/src/test/java/test/beans/SideEffectBean.java
+++ b/spring-aop/src/test/java/test/beans/SideEffectBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/beans/TestBean.java b/spring-aop/src/test/java/test/beans/TestBean.java
index 5c5e4abb23..3f50f93836 100644
--- a/spring-aop/src/test/java/test/beans/TestBean.java
+++ b/spring-aop/src/test/java/test/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java b/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java
index 211e101023..b18646f4d0 100644
--- a/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java
+++ b/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java b/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java
index be5819bb3c..5aa69c1fa8 100644
--- a/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java
+++ b/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/util/SerializationTestUtils.java b/spring-aop/src/test/java/test/util/SerializationTestUtils.java
index 132bd33d4e..e9bc9fee04 100644
--- a/spring-aop/src/test/java/test/util/SerializationTestUtils.java
+++ b/spring-aop/src/test/java/test/util/SerializationTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/util/TestResourceUtils.java b/spring-aop/src/test/java/test/util/TestResourceUtils.java
index 9d764e6b83..b294c1b606 100644
--- a/spring-aop/src/test/java/test/util/TestResourceUtils.java
+++ b/spring-aop/src/test/java/test/util/TestResourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/test/java/test/util/TimeStamped.java b/spring-aop/src/test/java/test/util/TimeStamped.java
index 484d5dda44..4fedb8998b 100644
--- a/spring-aop/src/test/java/test/util/TimeStamped.java
+++ b/spring-aop/src/test/java/test/util/TimeStamped.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj
index 5abf0e2989..760cea9dc1 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 42a27944d4..390e1dc989 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-2008 the original author or authors.
+ * 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.
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 0a7303eca8..5cd0140d46 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-2008 the original author or authors.
+ * 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.
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 06e32f4bfb..5313df9ed1 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java
index 9aca558660..869b7a72d8 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
index d91b05d117..351c11d7d9 100644
--- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj
index ca4d14a66b..a9a6da82e9 100644
--- a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj
index 0687b3c54c..be3957a3a0 100644
--- a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 ec6bda35eb..740ddaddca 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-2011 the original author or authors.
+ * 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.
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 aa6ad3a9cb..e373607d55 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-2010 the original author or authors.
+ * 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.
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 56bf082939..1c50c64bbe 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-2010 the original author or authors.
+ * 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.
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 07aee0364a..913d147b3e 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
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.mock.staticmock;
 
 import java.lang.annotation.ElementType;
diff --git a/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj b/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj
index 491f666992..3594725aae 100644
--- a/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj
@@ -1,3 +1,19 @@
+/*
+ * 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.orm.jpa.aspectj;
 
 import javax.persistence.EntityManager;
diff --git a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj
index 3daa476116..ed0956ef9f 100644
--- a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj
index 36ac0eb2cb..1fe8de9030 100644
--- a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj
+++ b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 54c30a1af0..582de64462 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java
index d5667cd155..e6f8cb8459 100644
--- a/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java
+++ b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/CodeStyleAspect.aj b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/CodeStyleAspect.aj
index 374bc00909..0758d3a403 100644
--- a/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/CodeStyleAspect.aj
+++ b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/CodeStyleAspect.aj
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/beans/Colour.java b/spring-aspects/src/test/java/org/springframework/beans/Colour.java
index 17fd24fec7..a992a2ebfc 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/Colour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java
index 0940539f54..a10846ba95 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java
index c5c4ed5e67..e0ae5f20a3 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/beans/IOther.java b/spring-aspects/src/test/java/org/springframework/beans/IOther.java
index 6a8f74187c..d7fb346185 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/beans/ITestBean.java b/spring-aspects/src/test/java/org/springframework/beans/ITestBean.java
index cdf5ef510d..478999c05d 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/ITestBean.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/ITestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java
index ddb091770e..d7af36ed64 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java
index 0eb8df5c8a..88b450b917 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/beans/TestBean.java b/spring-aspects/src/test/java/org/springframework/beans/TestBean.java
index 7842bbfeac..ac8e5ea485 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java
index b92077767b..73f37a8f9e 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java
index 16e2522d93..1c678ba6b1 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/XmlBeanConfigurerTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/XmlBeanConfigurerTests.java
index 47d3fef664..c5cc835a3d 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/XmlBeanConfigurerTests.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/XmlBeanConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java
index b3f9d4937b..3771a21b9f 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java
index 81a7793fc8..df23767475 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java b/spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
index a6d1b4f7bd..52a1b4265e 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java b/spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java
index 09e2fc4c4b..81dd758d19 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
index 33cc40d0a4..95edbcd9d6 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java b/spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
index 13364bdbd1..b4cc29458b 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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
index 3bd1741699..8c1584fc99 100644
--- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java
+++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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
index 946e33aa01..ad9bac5443 100644
--- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
+++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person.java
index a3b15c59c6..ca98b77f92 100644
--- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person.java
+++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
index 9e13013bb1..a6a62cdbb6 100644
--- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
+++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index 0c0b3cb81c..969cf90a8f 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java
index f718e09385..938265b97c 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
@@ -12,8 +12,6 @@
  * 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.
- *
- * Created on 11 Sep 2006 by Adrian Colyer
  */
 package org.springframework.transaction.aspectj;
 
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java
index 18763dcc74..07abf06c64 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
@@ -12,8 +12,6 @@
  * 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.
- *
- * Created on 11 Sep 2006 by Adrian Colyer
  */
 package org.springframework.transaction.aspectj;
 
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java
index 7e8ef63d16..44c3ea36b3 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java
@@ -1,3 +1,19 @@
+/*
+ * 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.transaction.aspectj;
 
 import org.springframework.transaction.annotation.Transactional;
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java
index 437a1a4f07..3631b05550 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java
@@ -1,3 +1,19 @@
+/*
+ * 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.transaction.aspectj;
 
 import org.springframework.transaction.annotation.Transactional;
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java
index 407a5e2e99..be562b2585 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java
index 93bd225f7c..bca935ce3f 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java
@@ -1,3 +1,19 @@
+/*
+ * 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.transaction.aspectj;
 
 import org.springframework.transaction.annotation.Transactional;
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java b/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java
index 9fbac3fef8..ef170a1baa 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
index 6890b9e706..f806b9f6a5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
index ca62f6fa3c..c683f50ab8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java
index 70b3667bee..6b6229d416 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 070fdbf8de..628ee8e78a 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeansException.java b/spring-beans/src/main/java/org/springframework/beans/BeansException.java
index 2aae901c72..efbed41edf 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeansException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeansException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java b/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java
index fc44cd572d..5151193e8f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java b/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java
index d1d30a5e2f..84fe47bb23 100644
--- a/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 20260432a2..0f0c593162 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java b/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java
index 51ff5161f1..96db41d162 100644
--- a/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/Mergeable.java b/spring-beans/src/main/java/org/springframework/beans/Mergeable.java
index dc142e0f99..cba64d94f8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/Mergeable.java
+++ b/spring-beans/src/main/java/org/springframework/beans/Mergeable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java b/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
index 467c595ed6..e079bb0f56 100644
--- a/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 7a21fbf0e1..390b3f8a12 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java b/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java
index cba93573fe..2001d09eed 100644
--- a/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java b/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java
index 2a5042c94f..de734c28c3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java b/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java
index 6ed4d3c578..f1ad856b3f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
index b2eafd4433..68bdde7412 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 80168252ac..621bae5325 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java
index 9fa559a8e9..9da1ed0658 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 9768d25a26..1919a47122 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java
index c14de75ed1..549334393f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java
index 9eb3af78af..f76df2a2d8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
index 6b3aa68b6d..81854100d4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 9584b49107..82830a198c 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-2008 the original author or authors.
+ * 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.
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 f08d029108..feecaf0e59 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java b/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java
index 6ecb77e16d..8af2c77ff7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
index bac7fc93ba..d1b7c48130 100644
--- a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java
index b27aa6f432..ab584354b8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 bd5998cc7f..2ffe909a94 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java
index cb270e619c..480ff82857 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java
index 9e3d1a5906..050444bb4e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java
index 1ba73bbde0..47a2ec8c14 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java
index f4b5be3df2..b935abfbb4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 0debc41c7d..2d18e67b1a 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java
index 1a7df36df2..a283217c24 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java
index aaace2cf34..c52d0ae766 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java
index 46a99fc5a2..f7020130e8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java
index 43b2bddc75..af47ab3f80 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java
index b853cec073..3b2914e6c9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java b/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java
index e620437b53..772da666e2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java
index 536c2e695c..5554afc2b3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java
index d16bd68551..84763c37f6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java
index 791b30557e..9e8e0e2073 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java
index d48bdba6d7..7e6a347afc 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java
index 420aefb2c0..365bf99bf1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
index 6f8d57ff85..5f5b643f15 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java
index 78640789b0..40f807dd54 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java
index a8e20e049c..143936f7b7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java b/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java
index f700515bec..5a455420d3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java
index ef2e40e34c..b917de2a17 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java
index efe23a7479..35c3d3f51f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java
index 2fb454543e..d2a72bc368 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
index 00fb3e690b..1dc3257819 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 6b439391e9..e97329df74 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java
index 811898742d..7eef126d8d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java
index 205fed0aeb..dc594157ae 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java
index 46ef046864..bb342c7854 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 5939524eea..5c1ad4b751 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-2010 the original author or authors.
+ * 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.
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 2040f6f420..e71eb1a899 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java
index 4102753bfc..b0b4142ec6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
index d14e2f3c0b..c9d442c335 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java
index 47db66447e..8cfbb7645f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java
index 52d03678bc..9739a62f8f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java
index b396d2367b..80c22d87db 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java
index e7c232d97b..bbe7ddf804 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
index ebaa3a44bb..d0e93c8b0c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java
index 956448d332..2dc8ec6fae 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 4d013fae16..1e59e7d134 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
index 9eff79944c..f155dedbdf 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java
index df8cb8447f..76de13907f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
index b0583f5886..31edfa9144 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
index 7eca9097c1..f508e3fff1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java
index 299b588fc6..736868bed3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
index b544f2f1e2..1615a8125f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
index a202e5a958..c1fd6a8e6b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
index 8032c16335..b9b822e2e2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 197c2ad306..bf9474138f 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
index d9c775743d..7477e197cb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
index 55ab063ef6..836098ff8c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java
index 7e299321f0..8777fa61e0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
index 1fb0c2005a..e8f2b72b6c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java
index 2d94806085..79d0234c37 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java
index fe77b35478..13f5a9be56 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 3f79e9ff5a..e4f27fec8b 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java
index d37d64258c..828cdc8257 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
index ff5da625e4..d281d86cd4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java
index 7e3d6b68a2..2d01b986a1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java
index 0f16202654..49c5f9f7b5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java
index b5a99a8890..72357a8cc7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
index 4462ef760f..76f3a2fd8a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java
index e58a4276bb..ffc1cb2a1e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java
index 71a155efe4..9ff54665c7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java
index 6726bbac41..66dfae23d9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java
index 4f9882f293..3c4b68e339 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java
index f11e44e4f9..4611365c07 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java
index 42f1bc82e0..9f78a2909d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java
index 0bbbb4deee..649b17123a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java
index 6d602ea28a..2f940269eb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java
index 4da479b234..e21707376e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java
index 88c2bcf9f4..0b0fe96658 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 615839c213..b07e211d16 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java
index 964f7d83e6..6846390e1b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java
index 3906928b5f..cd2c41e115 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 6ea25abcc6..f8ffd5798b 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
index 2b354882df..6a2cb27e49 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java
index 542f1d5b62..db7ccda800 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 813e8d4b6f..f5d1e77781 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
index 4a13bc1b2d..aa9bbe94e8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
index fd50469024..326e1fb58c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java
index f14db8c8bc..330b699096 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java
index 57f4ddbb80..04e96a7578 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 a09d69dded..b03ca67dcd 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-2008 the original author or authors.
+ * 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.
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 da0103b654..161eae7e99 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-2010 the original author or authors.
+ * 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.
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 d3206fdc99..82fddd2106 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java
index 6be1f2399c..884ee9c3d9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 9c1e9292e2..560943d309 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java
index bac4697f18..e7e7ec7dca 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
index bac7a2a4fc..5c9aa55011 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
index e4459d0296..4529b71441 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
index b947affe43..95b444721b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
index 7efcba3204..654cadc9fc 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 c29fbaaa7d..ecc984a7ce 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
index d336ef8855..fc64caf648 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java
index 0fa1b59046..d3c630491b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
index 8927b9b073..7b7822f0df 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 261ccc0416..e570a24c57 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java
index 6efe58e1e1..ac001c639e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
index 7287049bc3..edb954ae7f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
index 0e129d6e38..e46145f296 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java
index 4ec68342d5..67f32d5d2c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java
index ab648bdbb9..c306cb70bb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
index 9782f086be..91c94990cc 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 99bd416cb9..0bfcb375da 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java
index f86dc30f70..ec5d368740 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java
index b1713f24e8..c5e4d9128a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 ecf5980def..37ef1b4090 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-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
index a833a3c514..d7fcfc9e4d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 c6d9f5140a..9900aa1651 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
index 4450b30bd7..07bfe7afa9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java
index b927112b63..874eeaf034 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java
index 348f4f6dc4..a7ebdb9c57 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java
index 823e3015ce..8da64b6070 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java
index 12e95b0b42..d8ccc41050 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 ab933ffc9b..a7ca4fbd54 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 2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
index 259c592ef7..27d861bcb8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java
index 064ffd30cb..39676dc24d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 c819bbb7a6..16b58500bc 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java
index cba28b0641..ceec57615e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java
index 2ff16bbbae..fb6889226c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
index 6e51f97fe5..aee26b0ded 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java
index 2c87af1f7a..e45a34149e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java
index 42420f9fd0..68ab64d576 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java
index 59dba77c36..a6214171a5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java
index 433e126749..5d5eea0de1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 934fa37bb3..985ba1723c 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
index b78db5ea5e..cbf10da7a4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java
index 03e1d9c8f2..36718b20e9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java
index 81134a6931..14871687de 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java
index 3e3072f0ec..c946c621fb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java
index 2fb351b55f..a57b69eaed 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java
index 982f9438d6..92f47df1f1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java
index efa3908b2d..220f381e88 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java
index 753ba19c5b..25af77b5dd 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java
index 886a1075c9..0c4c971fea 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java
index a608128bee..977c2b0a6c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 19f8bf5393..24467400fa 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-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java
index 716872c5e2..c8875b388b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java
index f05dd43961..da9c1eea94 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java
index 2059c660c4..632f60127c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java
index 84febdf01d..f5ac6d6a48 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java
index be8bf5c69c..c5f9755d85 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java
index fd938eef80..3662903df8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java b/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java
index 486d13ed74..a9ed9984aa 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
index 89490a664a..2c64bf5252 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java b/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java
index 13a81da809..4d7ff96013 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java b/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java
index 950f22cb06..afe74eac66 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java
index 9ad02dade0..406e3b6faa 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
index d85622e12b..b3e62ba2b8 100644
--- a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
+++ b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
index 4132763825..51ea30bb54 100644
--- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 f62d800356..f49f63182c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
index c9966af03b..73bdeaee1c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
index 5825d6a08b..a1752458c4 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
index 8eaac3b46b..95c3fbb8cc 100644
--- a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java b/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java
index 2b114defc7..bc53e02ae2 100644
--- a/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java
index 5696a0ad8c..7c728a55a2 100644
--- a/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
index f3b990fdba..967cd5d2b8 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
index 5b4c200f58..3f7e69e4f4 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 5bb7f93ae0..0a50c2e617 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
index e417ccdba0..c5f365f799 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
index 6afaa8b219..f9295e4ee6 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
index 72073bc190..6691e2401f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java
index ba08ffe4ba..65e6debd15 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
index 0c328ce481..d5569c3fd3 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
index 616b025ad3..a35b1e2948 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
index 88a6f09ef9..8b1a7079c7 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
index e4446440b8..409e3f8325 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
index 5a564500eb..73daf724a3 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
index 44e6abf05e..f7ab438e76 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
index 601e564b63..861cafa68d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java
index e834490226..e9ff4c6a31 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
index 10422ae527..82a35dc064 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java
index 8907294f72..622b7fda5d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java
index 56b9b1fbc6..fe85b49123 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 e0f0875403..2e4025d304 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
index 36745a65c0..ee00efdec9 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
index 22dbf41ba3..22972e96fd 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
index caacb5604f..51e8dd7012 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java
index 72a90473e2..195ad77529 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java
index 1d07565be6..0b65929fdd 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
index 0091998af7..cf72ae3a95 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
index 4296a2f303..4df91dc136 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
index 175ce84f16..41bc80b8ab 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
index f648206980..87a4ec27fc 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
index 1009e9e76b..2c371011e3 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
index cf51e1cdd0..22131ab9ad 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
index 1567bad02f..ded4bb5eae 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
index 35fa49013b..e2a0071022 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
index ce0ba6e7f0..cfe24570a3 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
index 3b552f0762..021f9bb81d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
index 0c0974fd72..72de2d65d1 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
index 8b7d179e9e..6a31f91e1a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
index 0b0a476bca..75bcc94d84 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
index 357dc5d6ce..558e58681a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java
index 00933e788a..6b396933ae 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
index 7cb8a58627..8bed2eeeab 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
index fbc40ca302..d1449fdb0b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
index bd2d837038..58c392ddca 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
index 765c438449..62f4e654b6 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 8ee4c39d63..1623cf3ac5 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java
index 01afc69024..fdf65f88d7 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java
index 6e3f1df422..25ab86c641 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java
index b8757c3e3f..8cb697a755 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 1cd7a54124..33788f98db 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java
index 75af81b55c..231ca93a3d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
index 173fe92642..c031ae52e9 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
index 07d8371b6f..438a4b7e9e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 cf83b0be7c..d042952a88 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-2009 the original author or authors.
+ * 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.
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 49473c6dc5..76baf7366f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
index 9cc4745469..1025fffe40 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java
index eb936a57ef..2b2ee692e6 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java
index 7f4cf0d9fa..a66734f625 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java
index 4bf47d014a..f2d77a2b68 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 c8cf8d7649..ca477008cd 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java
index e2baf25530..b1cc7ee18d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
index 7050c656b9..ef03607658 100644
--- a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
index ab99515279..320759d1b8 100644
--- a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/test/beans/BooleanTestBean.java b/spring-beans/src/test/java/test/beans/BooleanTestBean.java
index c6f32d1f91..4ea2f67d3b 100644
--- a/spring-beans/src/test/java/test/beans/BooleanTestBean.java
+++ b/spring-beans/src/test/java/test/beans/BooleanTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/test/beans/Colour.java b/spring-beans/src/test/java/test/beans/Colour.java
index 5be4dfa761..533d0df36e 100644
--- a/spring-beans/src/test/java/test/beans/Colour.java
+++ b/spring-beans/src/test/java/test/beans/Colour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/test/beans/DerivedTestBean.java b/spring-beans/src/test/java/test/beans/DerivedTestBean.java
index 87133f27d5..c0f63181ab 100644
--- a/spring-beans/src/test/java/test/beans/DerivedTestBean.java
+++ b/spring-beans/src/test/java/test/beans/DerivedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/test/beans/DummyBean.java b/spring-beans/src/test/java/test/beans/DummyBean.java
index 6c83aed209..a8428c7f78 100644
--- a/spring-beans/src/test/java/test/beans/DummyBean.java
+++ b/spring-beans/src/test/java/test/beans/DummyBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/test/beans/DummyFactory.java b/spring-beans/src/test/java/test/beans/DummyFactory.java
index 99f2efc266..60f7966d9a 100644
--- a/spring-beans/src/test/java/test/beans/DummyFactory.java
+++ b/spring-beans/src/test/java/test/beans/DummyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/test/beans/INestedTestBean.java b/spring-beans/src/test/java/test/beans/INestedTestBean.java
index 87bfc26773..56c9d829ee 100644
--- a/spring-beans/src/test/java/test/beans/INestedTestBean.java
+++ b/spring-beans/src/test/java/test/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/test/beans/IOther.java b/spring-beans/src/test/java/test/beans/IOther.java
index e5b576de3b..f3c6263261 100644
--- a/spring-beans/src/test/java/test/beans/IOther.java
+++ b/spring-beans/src/test/java/test/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/test/beans/LifecycleBean.java b/spring-beans/src/test/java/test/beans/LifecycleBean.java
index e0dd4d3e32..cd1dcd6e5e 100644
--- a/spring-beans/src/test/java/test/beans/LifecycleBean.java
+++ b/spring-beans/src/test/java/test/beans/LifecycleBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/test/beans/NestedTestBean.java b/spring-beans/src/test/java/test/beans/NestedTestBean.java
index 6855305fb3..edc145ad7d 100644
--- a/spring-beans/src/test/java/test/beans/NestedTestBean.java
+++ b/spring-beans/src/test/java/test/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/test/beans/NumberTestBean.java b/spring-beans/src/test/java/test/beans/NumberTestBean.java
index e739da4738..cdd80bd27b 100644
--- a/spring-beans/src/test/java/test/beans/NumberTestBean.java
+++ b/spring-beans/src/test/java/test/beans/NumberTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java b/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java
index a77af92d12..eeb4b7325d 100644
--- a/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java
+++ b/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/test/beans/TestBean.java b/spring-beans/src/test/java/test/beans/TestBean.java
index 1ad802cc97..5b94f078b5 100644
--- a/spring-beans/src/test/java/test/beans/TestBean.java
+++ b/spring-beans/src/test/java/test/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/test/java/test/util/TestResourceUtils.java b/spring-beans/src/test/java/test/util/TestResourceUtils.java
index c137adffe4..4843151231 100644
--- a/spring-beans/src/test/java/test/util/TestResourceUtils.java
+++ b/spring-beans/src/test/java/test/util/TestResourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java b/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java
index f7474155f8..d4eb9cc604 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailException.java b/spring-context-support/src/main/java/org/springframework/mail/MailException.java
index bcbdd3cfb1..b254dc9073 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/MailException.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/MailException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java b/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java
index de58b7613a..b6b47f1613 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java b/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java
index 5b77c3825e..b1e99b5591 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java b/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java
index d86944fc16..4820c270a2 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailSender.java b/spring-context-support/src/main/java/org/springframework/mail/MailSender.java
index fb44ac572e..6b87d7bb99 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/MailSender.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/MailSender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
index 1abeaa6a4f..7cc61122bb 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 f3ceba872e..ac683c5243 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java
index 057d6f78e2..2cf0b89671 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java
index bae5d7fb96..7372f62512 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
index ed9151bfdf..257b15b78e 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
index 840320741b..47a115e980 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java
index dd6417b182..9b0f49fc34 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java
index 2e46fa1029..35b3ace313 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java
index 25931464c9..c3e603882d 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
index 2eae87785d..8167f6a709 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 eb1d1b6087..c5e1c070b8 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java
index 0971d96d54..3edec2aacb 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 1da0bb9b10..0a53406577 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java
index 701b5c6ca0..d79bd3f69d 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 2b1f04a48b..c9664b28f8 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-2007 the original author or authors.
+ * 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.
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 e0307f6e25..6e5189e3b0 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-2011 the original author or authors.
+ * 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.
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 7886278857..b2d61536da 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-2011 the original author or authors.
+ * 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.
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 a81e39c83f..5eba86a105 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-2011 the original author or authors.
+ * 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.
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 17940bece4..84db22173a 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-2011 the original author or authors.
+ * 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.
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 06b273eb24..b35bb59ad9 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-2011 the original author or authors.
+ * 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.
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 c6811478ae..a9d837e7da 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java
index d4f050e8a8..574c7695e7 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 acc1e30b21..b2e7a85214 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-2005 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java
index 0ff54aeba0..2e81188968 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/test/java/org/springframework/beans/Colour.java b/spring-context-support/src/test/java/org/springframework/beans/Colour.java
index 17fd24fec7..a992a2ebfc 100644
--- a/spring-context-support/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-context-support/src/test/java/org/springframework/beans/Colour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java
index c5c4ed5e67..e0ae5f20a3 100644
--- a/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/test/java/org/springframework/beans/IOther.java b/spring-context-support/src/test/java/org/springframework/beans/IOther.java
index 6a8f74187c..d7fb346185 100644
--- a/spring-context-support/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-context-support/src/test/java/org/springframework/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
index e136978f9e..412891c439 100644
--- a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/test/java/org/springframework/beans/TestBean.java b/spring-context-support/src/test/java/org/springframework/beans/TestBean.java
index 7a27cf0894..6d71de7576 100644
--- a/spring-context-support/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-context-support/src/test/java/org/springframework/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java
index cd49644c6e..4b397425a5 100644
--- a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java
+++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
index fc5bf4cfc5..51eab98cd6 100644
--- a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
+++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java
index ca7bb45d65..8ccc9c5b69 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
index 855bf68692..af4042c2c9 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 5035789d1e..dbfa1cba84 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java b/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
index 7116955e82..716b840ad0 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 cda9352b52..7c62a21af7 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java b/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java
index 5ff3aaf9e8..3b687a86de 100644
--- a/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java
+++ b/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationContext.java b/spring-context/src/main/java/org/springframework/context/ApplicationContext.java
index 2565e481a3..776e9f492b 100644
--- a/spring-context/src/main/java/org/springframework/context/ApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/ApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java b/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java
index 594af464c0..c8a20ef17e 100644
--- a/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java
+++ b/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java b/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java
index 1068bb9126..2a53416c09 100644
--- a/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java
+++ b/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationEvent.java b/spring-context/src/main/java/org/springframework/context/ApplicationEvent.java
index 464a440af6..e20d12cd85 100644
--- a/spring-context/src/main/java/org/springframework/context/ApplicationEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/ApplicationEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationListener.java b/spring-context/src/main/java/org/springframework/context/ApplicationListener.java
index d79e741cff..a7eea9b5f9 100644
--- a/spring-context/src/main/java/org/springframework/context/ApplicationListener.java
+++ b/spring-context/src/main/java/org/springframework/context/ApplicationListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java b/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java
index 3339abe70e..d03b98774d 100644
--- a/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 b1d00e13f2..cfc101e39b 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/MessageSource.java b/spring-context/src/main/java/org/springframework/context/MessageSource.java
index 62e1f9729b..13f1530b31 100644
--- a/spring-context/src/main/java/org/springframework/context/MessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/MessageSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java b/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java
index d344a6dadf..965a44bbe7 100644
--- a/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java
+++ b/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java b/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java
index 980464d36f..777bd389b7 100644
--- a/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java
+++ b/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/Phased.java b/spring-context/src/main/java/org/springframework/context/Phased.java
index b4b84d86d9..e815988e96 100644
--- a/spring-context/src/main/java/org/springframework/context/Phased.java
+++ b/spring-context/src/main/java/org/springframework/context/Phased.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java b/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java
index c13e5902f3..cf9edd7101 100644
--- a/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java
+++ b/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java b/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
index 4a608ec060..b39ae88590 100644
--- a/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
+++ b/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java b/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java
index 8372bb00b9..54b66347ad 100644
--- a/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java
+++ b/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java b/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java
index 2f9d9d5cc8..57df5694c8 100644
--- a/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java
+++ b/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java b/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java
index 9b55072489..1ac558f538 100644
--- a/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java
+++ b/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 f166faac35..5fcd8a572d 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-2011 the original author or authors.
+ * 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.
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 9b6917c580..b3f9450f98 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Scope.java b/spring-context/src/main/java/org/springframework/context/annotation/Scope.java
index bcb433f5ca..2e556f5187 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Scope.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Scope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java
index 2f67592b0f..a13dfdd193 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java
index 03a8a1306f..04fda90705 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java b/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java
index b095d47d98..1a758b60a9 100644
--- a/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java
index 256ee62064..c7ad16ac50 100644
--- a/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java b/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java
index 822f3667f5..fa84458568 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java
index abd6823838..8db8dc4dc7 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java
index b8f97520a4..d18b3970d2 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java
index d314430eed..5033d7dbb7 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java
index 4e089149c5..98d95a8cef 100644
--- a/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java
+++ b/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java b/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java
index abaddb72b3..ef32c7b6f7 100644
--- a/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
index dcaf8fc14e..2e13855d4a 100644
--- a/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
+++ b/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 ac51785295..155fefbbc1 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-2010 the original author or authors.
+ * 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.
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 6ace399333..2ca6ea2f85 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java b/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java
index b21e35e772..d3848ebe0a 100644
--- a/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java
+++ b/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java
index a7f44dca16..768c963d3b 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
index 547f7519ee..44ba2589d8 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java
index 5e8377c999..138f45526c 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java
index 3f88a900db..1e7681aa0b 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
index a2ce34e6ad..e88b26799c 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
index a872b76b78..ebee90cc03 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java b/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java
index 6930177ded..f81020673d 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java b/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
index 32bb029c0a..95b40263ed 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
index b05eeaa4e7..e668c4e736 100644
--- a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
+++ b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
index a1e4fdabab..7c3d8bcc11 100644
--- a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 5384a333be..e120f667fb 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java b/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java
index e026e5c98f..03fa94a525 100644
--- a/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java
+++ b/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java b/spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java
index 4dd8bce351..8dc2c1ffb3 100644
--- a/spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java
+++ b/spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 6c8cbc99d7..30aad8a078 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
index 4e82ef9cdb..b93c8b2df5 100644
--- a/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java
index 6c87480fe4..0f67d7aba6 100644
--- a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java
+++ b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java
index 58ac5f4254..d2c704f1a5 100644
--- a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
index c80aef379b..1af0997e64 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
index 652205cd52..8a12977c8a 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java b/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java
index e3332791d5..3d555779e9 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
index 789130620c..7a27feafa2 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
index 3058f699aa..c824d4c917 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
index c459d22a9a..ce39ce9a6c 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
index 6bcb775319..de6a45b1fe 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java b/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java
index b5841ca19d..2e106d8ed0 100644
--- a/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java
index 81ea064909..6b616ace25 100644
--- a/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java
index eeb2191cf7..c5caff9ef5 100644
--- a/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java
index 0b1669a407..30469ead50 100644
--- a/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java
index 7349999328..89d5067451 100644
--- a/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
index 801ffcd042..aaa6f7adff 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
index 26bdd8b79b..ecfb7baa98 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
index e87447b648..bbfc158cbb 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java
index edf66f329c..5f4e2770b7 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
index bbd9079b26..49716db834 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
index 2f91d248a4..ee013df6cb 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 0a620e9e8c..fb53938011 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/Formatter.java b/spring-context/src/main/java/org/springframework/format/Formatter.java
index 83d26b13a7..a1bbebc446 100644
--- a/spring-context/src/main/java/org/springframework/format/Formatter.java
+++ b/spring-context/src/main/java/org/springframework/format/Formatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java
index b754a738d1..96059b463b 100644
--- a/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/FormatterRegistry.java b/spring-context/src/main/java/org/springframework/format/FormatterRegistry.java
index 5613c74eb8..eb6d3f130c 100644
--- a/spring-context/src/main/java/org/springframework/format/FormatterRegistry.java
+++ b/spring-context/src/main/java/org/springframework/format/FormatterRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/Parser.java b/spring-context/src/main/java/org/springframework/format/Parser.java
index 276a509305..ed62cc4e10 100644
--- a/spring-context/src/main/java/org/springframework/format/Parser.java
+++ b/spring-context/src/main/java/org/springframework/format/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/Printer.java b/spring-context/src/main/java/org/springframework/format/Printer.java
index c852839858..ce2d5d85a8 100644
--- a/spring-context/src/main/java/org/springframework/format/Printer.java
+++ b/spring-context/src/main/java/org/springframework/format/Printer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java b/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java
index 55de49ff82..e4f1076ea7 100644
--- a/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java
+++ b/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 c15a36eb8c..f80fcd6242 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-2009 the original author or authors.
+ * 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.
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 f1f0a76bfe..85ca71044a 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java b/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java
index ad3c1d4137..da34f935bc 100644
--- a/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java
+++ b/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java
index 00c14d8a7d..2108d9f5ae 100644
--- a/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
index a86ccf2c5f..2dc19dda74 100644
--- a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java
index 8a4422d93e..94316c8f6d 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java
index 74b24b9b90..166f1deb3e 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 9e143d576a..86907d33dd 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java b/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
index 7cf9200abc..3d15f1035c 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java
index b13ba8bd63..e35bd31fcb 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java
index ab17d2a991..a421f0418e 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java
index d5568e3b8d..92b997d615 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
index 2ad5bcf016..eb28f67ddf 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java
index 0777391ad5..a128608d84 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
index b5e1cd4ec3..8325e1b798 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
index d3821e795e..723a947e1a 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
index 06498c5aef..dce5761898 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
index eb6f98b7dc..03b49e1326 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 087872aded..aede3544be 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
index 4197c2f044..6662830c73 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
index 5d952e0a9e..c95684c4d6 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
index 215c8d5735..3312c37778 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/JmxException.java b/spring-context/src/main/java/org/springframework/jmx/JmxException.java
index bbddbc3ec2..b7baa2eb6c 100644
--- a/spring-context/src/main/java/org/springframework/jmx/JmxException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/JmxException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java b/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java
index 231fcfec8d..7c3155f10e 100644
--- a/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java b/spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java
index 7f987272cf..115d0b3d66 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java b/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java
index fb1f10b411..af785e472b 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java b/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java
index a52413179b..e9bf348cc9 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 761996d8ba..36894535ed 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java
index 2e2a9588d2..89354926ee 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java
index b14e4d98d1..fac8f2dc53 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java
index 26fcda79bf..466a4ff8fb 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java b/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java
index c600f1279d..bb0b2021de 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java
index 2d31820e7b..9321cca925 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 9969b74383..9e94a66df3 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java
index 18b0c14b2d..d8a62beea1 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java b/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java
index 821d0cafb4..610078c676 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java
index f6868aeb9f..5adfc012a9 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
index bc8b02d6f3..1ddbd3400f 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java
index 1bef5da10b..8c01f19195 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java
index ef5a2534b5..d5d1f3a774 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
index 07f976c0e9..ce2c24a185 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java
index 1d5233570d..ef345cb710 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java
index 538e247121..e464fa234b 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java
index 32a713b399..1bb200b862 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 0a05442500..320a64790e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 b3ba402b6b..e092c221cd 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-2006 the original author or authors.
+ * 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.
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 a28e57b465..c4467ab58a 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java
index 9fbad2dd3b..25ef5084bd 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java
index 7c6c59c006..2bc8b2663d 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java
index dec9a77ea8..8861079de2 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java
index 93b6d1193f..9fd41123c2 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java
index f183061332..1e9e4ff432 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
index 65efbb76f7..07b459910d 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java
index ba4d86085a..f1d138d38b 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java
index edfe3f81dc..cfbda068c0 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java
index 74fe92ec2b..cf083c7698 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
index 170c1c35d2..1c94273bbb 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java
index 64d4dcbfe1..068b7a5a60 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java
index 7c2c98f0f4..7996ffc953 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 888e7eb1cf..a717b8a1ab 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 9d95040119..1308f35087 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
index 00e0ffba6b..3d9b82bc34 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java
index 304780f693..61b1086a4c 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java b/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java
index bce5672138..bc50838679 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java b/spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java
index f6621a1dee..cf63334eee 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
index 52a2ab42e4..5cd37f3d65 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java b/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java
index 325c4f8170..c7845ec84c 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
index 0f266c64ea..cd7ed96288 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java b/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java
index 9eb73086ab..c168b56217 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
index a2d6b6a04c..5a9bb616b1 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java b/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
index 168edb1bc6..441a113d88 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java b/spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java
index dd4f4e2d27..9607258534 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java b/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java
index 16e1d15cc4..f5ec23bc46 100644
--- a/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java
+++ b/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 a123d72cb6..f565f37edf 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java
index 063c94826a..f0464c4f39 100644
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java
+++ b/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java
index 027ca75078..35fb4af377 100644
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java
+++ b/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java
index 48ba3ccab3..388fe868e6 100644
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java
+++ b/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java
index c1bd8f080f..476123fce0 100644
--- a/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java
+++ b/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java b/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java
index 8e0401d6fb..1bea9c145f 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
index 55461ba33e..8660e2cf5b 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
index 78b9f36a21..b4e884e260 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
index fb2bab26a5..180ba0f563 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
index 3a8c2c5ceb..d4673dbff6 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java
index 265d2f7034..431b4e6a0a 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
index 177b1982e9..ba9d8775d9 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
index 30c18ec60b..1a9d8413a3 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
index d878cb33ba..77ddbaf44f 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
index 5d028402bc..22cac7f71f 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
index ff2687a751..a635a1fa59 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
index 275c8b532b..fee68ce8d7 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
index 6f01f80e33..dcd5f91f85 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java b/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
index 7a3dc51aa4..8523ab97ed 100644
--- a/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
+++ b/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java
index 6956ee370a..2cf59d0d74 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java
index b68a6cfd22..91f87ff65d 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java
index dc83e38c41..afb5dd37d4 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java
index 8bf4bfe4c5..36324bf66f 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java
index e6c7a27e78..3348b7a839 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
index 7ed9e72b6e..05c521c7f0 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java b/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
index fb95016a49..832d489962 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java
index 9efdba4fc2..4dffa2335f 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java
index 4d59efa390..468c207394 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java
index b567413985..deef622f85 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
index b18e7baa58..defd101789 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/Trigger.java b/spring-context/src/main/java/org/springframework/scheduling/Trigger.java
index 06f569011a..4c8d9a1ed7 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/Trigger.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/Trigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java b/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java
index 5ba5980b1b..feeb2ecea6 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
index 4f0ee68183..f657d30680 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
index cc1fa39abd..8d88bf85dd 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java
index ff7760c836..d467243131 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java
index 8fe217f52b..8cfb86f2b3 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
index b24b0935e7..ca237fe1af 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
index bc9cf37b9f..ea5bc9ca89 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
index bd41c76a41..b972db0601 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java
index 6665e3836e..7ac8d4790e 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 92d7d2007d..964872e1d6 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 911ecd9922..40d48ad295 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java
index 6eadb63739..07d8c02199 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 ae9a96ec74..19cd880bbb 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
index 1a7da1d616..31dc69d553 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 4d03d5c57c..e8961e05e3 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java
index 009a163c28..39b86694d2 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java
index be34e5ad19..7f76bfc830 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java b/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
index 12e8aeab07..6ba1d5a552 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 3f5459e61e..b3530ebf78 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-2010 the original author or authors.
+ * 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.
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 09df2374da..eca37982e6 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java b/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
index 07a1803397..b494e4c5ff 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java b/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java
index 4800543853..81c16bc9a5 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java b/spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java
index 677daa138d..6009513692 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java
index 241a96c7cc..389e9a76b9 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java b/spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java
index f1885b9701..90a34dabcf 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java
index 6ddccd151a..c0de9b4eb9 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java
index 42626b4e81..03979dc45a 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java b/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java
index e6a5cf238f..ccb8674500 100644
--- a/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java
+++ b/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 c2d360fa22..2e2f255ae7 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scripting/ScriptSource.java b/spring-context/src/main/java/org/springframework/scripting/ScriptSource.java
index a3ccb89ed4..2e5a37e4d4 100644
--- a/spring-context/src/main/java/org/springframework/scripting/ScriptSource.java
+++ b/spring-context/src/main/java/org/springframework/scripting/ScriptSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 3f079267c6..2d94a16cb8 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-2008 the original author or authors.
+ * 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.
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 6c8f6ea616..d71298e29c 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java b/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
index 8e2b115e54..e66455a8d6 100644
--- a/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 4cde7aa063..eb741dd3fe 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-2011 the original author or authors.
+ * 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.
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 ee87c28678..d0766b95f4 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java
index b8dd3e967a..cb4f5b1c17 100644
--- a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java
+++ b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 d984d10cda..e40871defb 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-2008 the original author or authors.
+ * 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.
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 318b83e1a5..2271d1b53d 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java b/spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java
index 9103452d03..68ba19653f 100644
--- a/spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java
+++ b/spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 c3cce13a7f..23be717eac 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java b/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java
index abacdd4bfa..5afede47a8 100644
--- a/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java
+++ b/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java b/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java
index 4d4f37bb16..b2710d4bde 100644
--- a/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java
+++ b/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ui/Model.java b/spring-context/src/main/java/org/springframework/ui/Model.java
index d68710fc61..4a51e9182c 100644
--- a/spring-context/src/main/java/org/springframework/ui/Model.java
+++ b/spring-context/src/main/java/org/springframework/ui/Model.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ui/ModelMap.java b/spring-context/src/main/java/org/springframework/ui/ModelMap.java
index 28a6a687b5..238b0d9d7a 100644
--- a/spring-context/src/main/java/org/springframework/ui/ModelMap.java
+++ b/spring-context/src/main/java/org/springframework/ui/ModelMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java
index a67f083cd0..e20db315c9 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ui/context/Theme.java b/spring-context/src/main/java/org/springframework/ui/context/Theme.java
index 6dc815ef07..a2ef92602f 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/Theme.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/Theme.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java
index a4a7e8704c..85c676aa06 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
index 4cf80c84c0..a0c195df32 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java b/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java
index e65da9b4bc..e1c5956efa 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 60d1364888..3ab515bc89 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java b/spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
index fb0199e1fc..52c86a2b1f 100644
--- a/spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
+++ b/spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java b/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
index 9043faffd8..dff8bdce9a 100644
--- a/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
+++ b/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java b/spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java
index 6650c3d1c7..4f877a571a 100644
--- a/spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java
+++ b/spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java b/spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java
index 15d0981bfe..ae3c035768 100644
--- a/spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java
+++ b/spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java b/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java
index 64ea2a3727..08fc3b97e5 100644
--- a/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java
+++ b/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/Errors.java b/spring-context/src/main/java/org/springframework/validation/Errors.java
index d21cb1f5d1..bea2a7061b 100644
--- a/spring-context/src/main/java/org/springframework/validation/Errors.java
+++ b/spring-context/src/main/java/org/springframework/validation/Errors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/FieldError.java b/spring-context/src/main/java/org/springframework/validation/FieldError.java
index 2f94663cfb..0c76cc1622 100644
--- a/spring-context/src/main/java/org/springframework/validation/FieldError.java
+++ b/spring-context/src/main/java/org/springframework/validation/FieldError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java b/spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java
index 5fd476817f..d86acd476b 100644
--- a/spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java
+++ b/spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/ObjectError.java b/spring-context/src/main/java/org/springframework/validation/ObjectError.java
index 5b2dd29ee4..ccfab2f926 100644
--- a/spring-context/src/main/java/org/springframework/validation/ObjectError.java
+++ b/spring-context/src/main/java/org/springframework/validation/ObjectError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 0e5004e5bd..9da8e3d26b 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/Validator.java b/spring-context/src/main/java/org/springframework/validation/Validator.java
index f076ea6fe2..d5d1e48ab1 100644
--- a/spring-context/src/main/java/org/springframework/validation/Validator.java
+++ b/spring-context/src/main/java/org/springframework/validation/Validator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java b/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java
index 452867a8b2..b9553992c3 100644
--- a/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java
+++ b/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java b/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java
index 1bf169f777..02fb1e5d2a 100644
--- a/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java
+++ b/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/example/scannable/FooServiceImpl.java b/spring-context/src/test/java/example/scannable/FooServiceImpl.java
index e4941f4bf8..1db44f5bb0 100644
--- a/spring-context/src/test/java/example/scannable/FooServiceImpl.java
+++ b/spring-context/src/test/java/example/scannable/FooServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/example/scannable/MessageBean.java b/spring-context/src/test/java/example/scannable/MessageBean.java
index 9a3311ac19..a4fc2d2614 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java b/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java
index 601722be84..74191d87e5 100644
--- a/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java
+++ b/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java b/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java
index 292b058656..eed10c0783 100644
--- a/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java
+++ b/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/example/scannable/StubFooDao.java b/spring-context/src/test/java/example/scannable/StubFooDao.java
index 052d9cd25e..46daeb1892 100644
--- a/spring-context/src/test/java/example/scannable/StubFooDao.java
+++ b/spring-context/src/test/java/example/scannable/StubFooDao.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
index a241920c66..0e9f634bd4 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
index e85b6cd311..a2f1054e9e 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
index dc32a581db..e57c4df217 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
index 913d173a55..67195904dc 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
index 6eae7b3b64..5b606689ac 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
index 977038a1f0..b88de9c97d 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 4b1d267b61..e43cc57988 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
index 5d5930c80b..53a81f6e5a 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
index 08250b6ff3..4df2dc3633 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
index 0eb1c2192d..07542c3cab 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java
index cde853bf6a..bf495f0736 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
index c3e652a3a3..59a3136fdc 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
index 4740e65677..0e7435362a 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
index fc02024d76..5c942d9ddc 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java
index c5512be61d..4c79347978 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
index 22e729d633..e002a9fa1d 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java
index bc6a0a1b41..5551cbfcb2 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java
index 93fd2a2b59..75e0aeabf0 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
index a31b0be91e..2c597c0f04 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 8b9ab4ea51..f01bf14a47 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
index 5bf6196f59..f71d16605d 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
index 2ae946206e..3a2bc6fda8 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
index 2bb1fb39a6..1490cf357e 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java
index 0829446808..10f054ab9c 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java
index a8247ac352..07f4d5c688 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
index bdf4d1ddc1..361809558b 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java
index 227903bab0..f609c08b3e 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
index 0c2927961d..2dfa414c65 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
index ef61c94dfd..c5b7c8c5cf 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java
index 247e416e1c..8060defdbf 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
index 8d12136b54..a988324a00 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java
index e048453a4f..9d47785b85 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java
index 336523137a..24ce7bcf1f 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java
index 8085f19b22..093a6fe69a 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java
index 9bf5331329..f0f8d6ff04 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java
index f2c174522b..9a0ddffb8f 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java
index 453040fe3d..45bd83f77e 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java
index f7f4d3e812..fed5ac1eb5 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java
index dcb1d9c383..4af0a3b292 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
index 60ec4288f6..753fb3341a 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
index 17103fce2f..911e4d5154 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
index 0bf067154a..d5f1e89c62 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
index e6bf8c37da..83598caf9b 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java
index 0197bb6840..11805c6d5b 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
index 54242e6ffc..da9e177c01 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
index 56b6067394..e47669eaf8 100644
--- a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
index cf6e0789b6..5de96fc526 100644
--- a/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/Colour.java b/spring-context/src/test/java/org/springframework/beans/Colour.java
index 17fd24fec7..a992a2ebfc 100644
--- a/spring-context/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-context/src/test/java/org/springframework/beans/Colour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
index 8ada7848fa..c5360de531 100644
--- a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java
index c5c4ed5e67..e0ae5f20a3 100644
--- a/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/IOther.java b/spring-context/src/test/java/org/springframework/beans/IOther.java
index 6a8f74187c..d7fb346185 100644
--- a/spring-context/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-context/src/test/java/org/springframework/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java
index e44bac1740..9f90cf15bb 100644
--- a/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
index e136978f9e..412891c439 100644
--- a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/Person.java b/spring-context/src/test/java/org/springframework/beans/Person.java
index a78998ad5d..7c66f4b451 100644
--- a/spring-context/src/test/java/org/springframework/beans/Person.java
+++ b/spring-context/src/test/java/org/springframework/beans/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
index 9a2a3193df..dbe365f493 100644
--- a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
+++ b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/TestBean.java b/spring-context/src/test/java/org/springframework/beans/TestBean.java
index 21526c932b..c050b64856 100644
--- a/spring-context/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
index 9c8be8ac4c..b588561321 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
index bd402c3040..f9c4f27382 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java b/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java
index 1c1708eca5..73fe70276e 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java
index 191b3509c7..013a65a0e4 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
index afb3dbe2f1..959861e6b4 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
index 0e8a09a5a7..4b4d698056 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java b/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
index 39fdf5be5b..f54299a03f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 6bb485f835..c69ab5658b 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
index 9901e8feb8..71b565f900 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
index ebd2ad7ea2..496cc1d63b 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 4a32d4582c..d7cf863def 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
index d5c2f1ce3d..28c3bffa8f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java
index 96adebee0f..ed9fbbde83 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java
index 4a1923181f..91d1d7565a 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
index 148c3d2e2b..7a52f76eda 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
index 4d4ea48a61..4c72d9d593 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/cache/config/CacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/CacheableService.java
index 09e2fc4c4b..81dd758d19 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/CacheableService.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/CacheableService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
index b3a19df189..f9f19b4759 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
index 3e9138fd5e..04f232cc84 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/ACATester.java b/spring-context/src/test/java/org/springframework/context/ACATester.java
index e2603726cc..c6a63ddb62 100644
--- a/spring-context/src/test/java/org/springframework/context/ACATester.java
+++ b/spring-context/src/test/java/org/springframework/context/ACATester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 fe8201644b..a720743520 100644
--- a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java
index 8ec1c33a34..f4454c64da 100644
--- a/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java
+++ b/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java
index 9ca20496a3..479ddb33de 100644
--- a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java
+++ b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
index 68664e6a01..69fea0435d 100644
--- a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/TestListener.java b/spring-context/src/test/java/org/springframework/context/TestListener.java
index c4d12a1881..8bcaa6d6c1 100644
--- a/spring-context/src/test/java/org/springframework/context/TestListener.java
+++ b/spring-context/src/test/java/org/springframework/context/TestListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java
index a2eaf26f79..33bdac26e8 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
index eb3bc80d39..e87e602378 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
index e4d3dfbe14..6c63077602 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java b/spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java
index eee36e9d9b..633127e84b 100644
--- a/spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 50ed95df10..bfbc2c9ef6 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
index f82a42fc5c..2397340003 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
index 12b0a100b7..7154230505 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java
index 8e8cf87095..16565d9b1d 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 01e25e8030..61b2612d29 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
index 1f81d31669..1e4deb22f0 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java
index b377f6b437..5a4508b903 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java
index c7237a2f6b..02749a2e51 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
index 3e672f556c..ee826eb33a 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 d79256a53b..81e7b1af66 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java
index 3fc42a1f14..570d2a53aa 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java
index f8613d29ac..7baf82681e 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
index 48ef3c6eaf..9a3ced52d7 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java b/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java
index a52d8cc504..c01fc14cec 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 6c8540be51..c6ea3cb6ac 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
index 176aee5c32..455cdad855 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java
index d3a14c0ab3..22c7cbc824 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
index e661727c40..25b2192cd8 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java
index 68dd81c5af..48780c545f 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java b/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java
index 6bed19ab6e..f57fac7fd8 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java b/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java
index eef18312ba..bde4c67cb0 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 e061bc7edf..2051c97fe0 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java
index da770cb924..f0dcbab8ab 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
index c983ea4e3a..9c94716494 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java
index d198b49180..c18cc981e7 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 7bdf1daac5..9ac6ab319f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
index c27d84c131..78314569d2 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 2d4783496a..b23695db3b 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
index 6be61e22c5..49007b8a34 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java
index 910e71b9c9..02f0fd8e3e 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java
index be87313477..206ac4d8bc 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java
index 1363f45d89..5c53712e5a 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java
index 6e1461dd36..415cf89519 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java b/spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java
index 8094915700..1c8bdb54dd 100644
--- a/spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java
+++ b/spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java b/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java
index c319cde520..1771dd7cf5 100644
--- a/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java
+++ b/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java b/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java
index 654ffa9153..56090d3327 100644
--- a/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java
+++ b/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
index 19a54ec52d..56233a7373 100644
--- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
index 31ca74fa67..4a9a4db08d 100644
--- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
index c6f95b24bb..380f29125d 100644
--- a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 b23b686116..b49857d8cb 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/Assembler.java b/spring-context/src/test/java/org/springframework/context/support/Assembler.java
index 60df14aeb8..26c750cff6 100644
--- a/spring-context/src/test/java/org/springframework/context/support/Assembler.java
+++ b/spring-context/src/test/java/org/springframework/context/support/Assembler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/AutowiredService.java b/spring-context/src/test/java/org/springframework/context/support/AutowiredService.java
index 3ab4a12d95..d7592088c7 100644
--- a/spring-context/src/test/java/org/springframework/context/support/AutowiredService.java
+++ b/spring-context/src/test/java/org/springframework/context/support/AutowiredService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
index 94d465bcda..8c39e53d32 100644
--- a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
index 903ff41532..38939c7fcb 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
index 9ee0025433..49fda87dab 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
index cc345c79e0..4f4e8860e1 100644
--- a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java b/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java
index 24e94a154b..450a7291a5 100644
--- a/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java
+++ b/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/Logic.java b/spring-context/src/test/java/org/springframework/context/support/Logic.java
index 71d169120e..79daad0e29 100644
--- a/spring-context/src/test/java/org/springframework/context/support/Logic.java
+++ b/spring-context/src/test/java/org/springframework/context/support/Logic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java b/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java
index 68f1ce529c..9b4c7ec107 100644
--- a/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java
+++ b/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 e3f9ada36f..39482f71cf 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 bfb2adc69a..3e640d9145 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java b/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java
index 91ff6bd022..3e30e569cc 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/Service.java b/spring-context/src/test/java/org/springframework/context/support/Service.java
index a0be957e75..ee9d5095d7 100644
--- a/spring-context/src/test/java/org/springframework/context/support/Service.java
+++ b/spring-context/src/test/java/org/springframework/context/support/Service.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java b/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java
index 42d89e9254..e03b30eaa6 100644
--- a/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java
+++ b/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
index 73c189e36e..6d82d77d88 100644
--- a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java b/spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java
index 9c7e9a2319..6fb17f353b 100644
--- a/spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
index fc211895ac..9c7ea0ca65 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
index b6f936dd1a..1c63274f19 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
index 8469cbd64f..9fa8ddd436 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/context/support/TestIF.java b/spring-context/src/test/java/org/springframework/context/support/TestIF.java
index 7ee7a9c006..5ce3da22d0 100644
--- a/spring-context/src/test/java/org/springframework/context/support/TestIF.java
+++ b/spring-context/src/test/java/org/springframework/context/support/TestIF.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java b/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java
index 701f7518ee..0dd6ce2cf2 100644
--- a/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java
+++ b/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
index efa2967148..b8206b21a2 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
index 53e414146e..c0a78215bd 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
index ac3d59b47e..c0fa18c2c3 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
index 527babf603..8e03115c1f 100644
--- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java b/spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java
index 4cb1bfdd58..68c5b598f9 100644
--- a/spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java
+++ b/spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
index 556d5a78bd..9503e82067 100644
--- a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
+++ b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
index d501dafa40..ae9aa8be0e 100644
--- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java
index 8abddb5ea3..f39f28b40c 100644
--- a/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java
+++ b/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java
index 506a883136..3cafa8950e 100644
--- a/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java
+++ b/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java
index 7867139ae3..b2efa269c1 100644
--- a/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java
+++ b/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java b/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java
index 3f3580b37d..a213fdd4ac 100644
--- a/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 06122a2a02..12dbf05a50 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java b/spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java
index 0a6ba49035..be001e23c4 100644
--- a/spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java b/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java
index 5268a8d653..d42fbf201b 100644
--- a/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
index 29d2c04037..7842ee328c 100644
--- a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java
index b33a5793aa..7082efec13 100644
--- a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java
+++ b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java
index 67c8adc64b..2c71236d78 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/DateRange.java b/spring-context/src/test/java/org/springframework/jmx/export/DateRange.java
index 5603c43abd..64f3f03b89 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/DateRange.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/DateRange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java b/spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java
index c61cd388aa..a59d950a8d 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
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 716fccfc7c..59740fa0db 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-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
index 3eb6fe9baa..4524412307 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java
index ef79c481c6..a6abda7ed2 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java
index ba05256527..c95000c59d 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java b/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java
index 7ed0f6c7ec..53da8a6582 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java
index e75c9a7ad5..d74787b7f8 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java
index 4d751020b6..191b2f9ae3 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java
index dc9f58375c..9b0982d801 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java
index 675deb0ae3..97b24e29ec 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
index 79da547c13..59b71a58b2 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java
index 968b955a47..68811d712a 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
index 15e5812236..4c7c414d85 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java
index 1d74177d3b..311b7c67a5 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
index 27beb0b470..d4034ed449 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
index 0ada6be575..dc9db0fc5e 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java
index cfe7261990..76b8ad5639 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java
index 53629c55bb..2c2a8618eb 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java
index 2015cbbece..35fe108270 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java
index 9cb85d799d..f037d87bcb 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
index e13a4ff2af..8a49293006 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 b7741897e7..062a45febd 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,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
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 1ae6c75130..2b0bbaeefc 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,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java
index 5e0a4bf984..729e784464 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java
index 28696ff1a1..df11e8b4bb 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java
index 4b0e1a3920..3050b6f8e8 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java
index 4c474100a7..3521619c22 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java
index cfffabaead..14986a1959 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java
index 333d2e5f27..c006f6fab7 100644
--- a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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
diff --git a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
index d53d8366fe..598bc73e8c 100644
--- a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 6244e0fae6..a99ef772f0 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java
index cf2c73b506..b191a7ada5 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java
index bf98aa1adc..4018802475 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 3851c6bbee..23bac25d53 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index 9b3d10470d..7173686606 100644
--- a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
index 5ab0d31377..4e1641b2cd 100644
--- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index 32908a306a..883db7bfd3 100644
--- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
index c92f3d0aca..1c492f3759 100644
--- a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
+++ b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java
index e52582125a..8611615193 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
index 4808b1011a..ee40acf24a 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java
index c17d9f27fa..7320cea1d1 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 6c32a85bd0..74e3d76639 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java
index 8e04507325..5d6aec6f41 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
index 5d210b344a..f45f032382 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
index 4632e4852c..2469e55823 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scripting/ScriptBean.java b/spring-context/src/test/java/org/springframework/scripting/ScriptBean.java
index 95e40c1098..2bc727e4b4 100644
--- a/spring-context/src/test/java/org/springframework/scripting/ScriptBean.java
+++ b/spring-context/src/test/java/org/springframework/scripting/ScriptBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
index 01a4f6a78c..8add303ba8 100644
--- a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java b/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java
index f00e514803..c2648628ea 100644
--- a/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java
+++ b/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java b/spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
index fc19107ced..5e85cc6424 100644
--- a/spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java b/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java
index 4f55dc01f8..030ac6b046 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java
index 132d9211c0..78e61a0607 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 9aa2b1436b..86214124a8 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java b/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java
index 95b21bcda2..389b38d3b6 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 f2899f520e..962e72b766 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java b/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
index 3e0589c7b3..41a3749ca1 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java
index 12b3496757..5a5b72715c 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
index 5303be385a..e1fe7c848e 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
index 7b6b40b258..47b6581727 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java b/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java
index d67f8d47b7..7363033668 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java
+++ b/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 30835d1dff..09a8c6aaa8 100644
--- a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
+++ b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java
index 9ae4f54ec2..b20121d864 100644
--- a/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java
+++ b/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
index 7d00f31184..543999cc89 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 ac5b020c9d..9107bb3a59 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
index 48a9b9bfe9..1c7fe2c708 100644
--- a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java
index 43ac003895..214f797fa0 100644
--- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
index fe373ecc7e..a8a3a01e3a 100644
--- a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
+++ b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
index 89fc45aeb5..5aa37b61e1 100644
--- a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
+++ b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/advice/MethodCounter.java b/spring-context/src/test/java/test/advice/MethodCounter.java
index 8c29886a3d..e0e45d6f14 100644
--- a/spring-context/src/test/java/test/advice/MethodCounter.java
+++ b/spring-context/src/test/java/test/advice/MethodCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java b/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
index 284cfc5193..bdcb2f2c9e 100644
--- a/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
+++ b/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/beans/CustomScope.java b/spring-context/src/test/java/test/beans/CustomScope.java
index 2f63f3cbfe..32de232264 100644
--- a/spring-context/src/test/java/test/beans/CustomScope.java
+++ b/spring-context/src/test/java/test/beans/CustomScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/beans/Employee.java b/spring-context/src/test/java/test/beans/Employee.java
index d93ca6ed60..537a5a8833 100644
--- a/spring-context/src/test/java/test/beans/Employee.java
+++ b/spring-context/src/test/java/test/beans/Employee.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/beans/FactoryMethods.java b/spring-context/src/test/java/test/beans/FactoryMethods.java
index ee25e7042b..8e0f55ce77 100644
--- a/spring-context/src/test/java/test/beans/FactoryMethods.java
+++ b/spring-context/src/test/java/test/beans/FactoryMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/beans/ITestBean.java b/spring-context/src/test/java/test/beans/ITestBean.java
index 81c0e45e3b..242d5e3850 100644
--- a/spring-context/src/test/java/test/beans/ITestBean.java
+++ b/spring-context/src/test/java/test/beans/ITestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/beans/NestedTestBean.java b/spring-context/src/test/java/test/beans/NestedTestBean.java
index 70736e816e..0546fdadeb 100644
--- a/spring-context/src/test/java/test/beans/NestedTestBean.java
+++ b/spring-context/src/test/java/test/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/beans/SideEffectBean.java b/spring-context/src/test/java/test/beans/SideEffectBean.java
index 990989bb19..52b7873717 100644
--- a/spring-context/src/test/java/test/beans/SideEffectBean.java
+++ b/spring-context/src/test/java/test/beans/SideEffectBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/beans/TestBean.java b/spring-context/src/test/java/test/beans/TestBean.java
index 4e6489e168..4b98eab870 100644
--- a/spring-context/src/test/java/test/beans/TestBean.java
+++ b/spring-context/src/test/java/test/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/interceptor/NopInterceptor.java b/spring-context/src/test/java/test/interceptor/NopInterceptor.java
index ccda818994..b1cdf832a4 100644
--- a/spring-context/src/test/java/test/interceptor/NopInterceptor.java
+++ b/spring-context/src/test/java/test/interceptor/NopInterceptor.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
index cec29e2749..d8d179f7e4 100644
--- a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
+++ b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
index 038d1cc6af..eb9789edb3 100644
--- a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
+++ b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/mixin/DefaultLockable.java b/spring-context/src/test/java/test/mixin/DefaultLockable.java
index ec739f29ee..2e84161be9 100644
--- a/spring-context/src/test/java/test/mixin/DefaultLockable.java
+++ b/spring-context/src/test/java/test/mixin/DefaultLockable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/mixin/LockMixin.java b/spring-context/src/test/java/test/mixin/LockMixin.java
index 5894f97a9b..e9463cdc9b 100644
--- a/spring-context/src/test/java/test/mixin/LockMixin.java
+++ b/spring-context/src/test/java/test/mixin/LockMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java b/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java
index 7ee37ed684..50667a7b0d 100644
--- a/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java
+++ b/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/mixin/Lockable.java b/spring-context/src/test/java/test/mixin/Lockable.java
index dd006ad449..a5f6d11146 100644
--- a/spring-context/src/test/java/test/mixin/Lockable.java
+++ b/spring-context/src/test/java/test/mixin/Lockable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/mixin/LockedException.java b/spring-context/src/test/java/test/mixin/LockedException.java
index 1ca010f164..96f46e484e 100644
--- a/spring-context/src/test/java/test/mixin/LockedException.java
+++ b/spring-context/src/test/java/test/mixin/LockedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/test/java/test/util/TimeStamped.java b/spring-context/src/test/java/test/util/TimeStamped.java
index 2de8e381e2..4fedb8998b 100644
--- a/spring-context/src/test/java/test/util/TimeStamped.java
+++ b/spring-context/src/test/java/test/util/TimeStamped.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java b/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java
index b0e4757d4c..27130bce2b 100644
--- a/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java
+++ b/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java b/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java
index a170bb10d7..cf351f42cf 100644
--- a/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java
+++ b/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 ef63695b57..c16cdb39dc 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-2011 the original author or authors.
+ * 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.
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 45ff9c468e..4d48b0449d 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/ConstantException.java b/spring-core/src/main/java/org/springframework/core/ConstantException.java
index 577464fe29..451b46b857 100644
--- a/spring-core/src/main/java/org/springframework/core/ConstantException.java
+++ b/spring-core/src/main/java/org/springframework/core/ConstantException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/ControlFlow.java b/spring-core/src/main/java/org/springframework/core/ControlFlow.java
index 908501d12a..bc754211b5 100644
--- a/spring-core/src/main/java/org/springframework/core/ControlFlow.java
+++ b/spring-core/src/main/java/org/springframework/core/ControlFlow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/Conventions.java b/spring-core/src/main/java/org/springframework/core/Conventions.java
index 035aefd9f7..7ea7c825b0 100644
--- a/spring-core/src/main/java/org/springframework/core/Conventions.java
+++ b/spring-core/src/main/java/org/springframework/core/Conventions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/ErrorCoded.java b/spring-core/src/main/java/org/springframework/core/ErrorCoded.java
index 62849516ae..1425fe8492 100644
--- a/spring-core/src/main/java/org/springframework/core/ErrorCoded.java
+++ b/spring-core/src/main/java/org/springframework/core/ErrorCoded.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 7a243abad7..c3b05e35fe 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java b/spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java
index 19206573a9..18f9028641 100644
--- a/spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java
+++ b/spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 270b276ebc..b66c85b9de 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java b/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java
index 0716a62cb8..8f72b5eab4 100644
--- a/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java
+++ b/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/NestedIOException.java b/spring-core/src/main/java/org/springframework/core/NestedIOException.java
index 536d5c299a..9bd7b88eb1 100644
--- a/spring-core/src/main/java/org/springframework/core/NestedIOException.java
+++ b/spring-core/src/main/java/org/springframework/core/NestedIOException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 4d18861b88..520c8bc9ac 100644
--- a/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java
+++ b/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/Ordered.java b/spring-core/src/main/java/org/springframework/core/Ordered.java
index c949b3958e..fcabe86a24 100644
--- a/spring-core/src/main/java/org/springframework/core/Ordered.java
+++ b/spring-core/src/main/java/org/springframework/core/Ordered.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java b/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java
index 0d4755229d..597a392304 100644
--- a/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
index de3da1b540..e65e88cd21 100644
--- a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
+++ b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java b/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
index 72772d1254..c036f27ad9 100644
--- a/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/SpringVersion.java b/spring-core/src/main/java/org/springframework/core/SpringVersion.java
index 6d80ff886f..38426f1be8 100644
--- a/spring-core/src/main/java/org/springframework/core/SpringVersion.java
+++ b/spring-core/src/main/java/org/springframework/core/SpringVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/annotation/Order.java b/spring-core/src/main/java/org/springframework/core/annotation/Order.java
index 478ce0f619..54f81677db 100644
--- a/spring-core/src/main/java/org/springframework/core/annotation/Order.java
+++ b/spring-core/src/main/java/org/springframework/core/annotation/Order.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
index 56d0f2178d..8a45f037e1 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 2586a4c99a..653712660b 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-2009 the original author or authors.
+ * 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.
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 af44fb8e1b..0448e5824f 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java
index 2cb57adc3a..4a278f92eb 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
index d027948718..cee9535cee 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java
index 6bcdb72ec0..3c2860f74b 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java
index 25b7e5e1ca..dc2325bfac 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java
index b5416df813..7b374a70b0 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
index 0cf2413091..cb70971aab 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 ca74beac92..27a78d1c66 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
index 1fd9da9f03..e6440cc3b6 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java
index b8759f1e02..3d9f78a402 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
index 3eff20f4d2..d0a936effd 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 3c53c71275..e95528fa35 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
index 2f245121ed..d195def969 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java
index 51470f45d9..00f267e443 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java
index ba631801f9..1a390f04ec 100644
--- a/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java b/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
index 2ff0a1f1c3..8385891ea3 100644
--- a/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java b/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
index 4b6e7f1fc0..d9b2405c99 100644
--- a/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 f8a8430c25..0f86c14683 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-2011 the original author or authors.
+ * 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.
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 360c8f9cf7..958746178f 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/io/WritableResource.java b/spring-core/src/main/java/org/springframework/core/io/WritableResource.java
index acb688dad9..72d4fe34ed 100644
--- a/spring-core/src/main/java/org/springframework/core/io/WritableResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/WritableResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 36649fdf18..405a16e2a8 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java b/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java
index 485ddae1f2..57f2645a98 100644
--- a/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java
+++ b/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 02c14657be..12c6fb7aca 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-2011 the original author or authors.
+ * 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.
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 c995946519..9c0c12eecd 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java b/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java
index a247769a7a..f61f697d2f 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java b/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java
index 8e03728e8c..04fe8bed5a 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java b/spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java
index 0219a70e42..f64fbdf762 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/Serializer.java b/spring-core/src/main/java/org/springframework/core/serializer/Serializer.java
index b1e0bb95e0..8af6519524 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/Serializer.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/Serializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java
index 60de9d1e3f..274a6cb055 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java b/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java
index be370e60a1..f81cb4a82e 100644
--- a/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java
+++ b/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java b/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
index 46a3383daf..2e6251c0f5 100644
--- a/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
+++ b/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java b/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java
index 8fc918c0ef..91e09deefb 100644
--- a/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java
+++ b/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 08a90a5fd0..5871f8dfcc 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java b/spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java
index 785ce79c4b..9ae12df5f5 100644
--- a/spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java
+++ b/spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 ece4c3cb26..0a68e74615 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
index 36c9b04ce7..f6b714007e 100644
--- a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
index 054e921ccf..47bebf4676 100644
--- a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
index fe80839acd..fea960e3c6 100644
--- a/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
index d1067fb113..feacf97169 100644
--- a/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
+++ b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
index 4cda4266be..476658bbae 100644
--- a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
+++ b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
index dea77c827f..0c594b93a1 100644
--- a/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
+++ b/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 b5b8ad06f4..bd2df283d7 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java
index 1d50b7846c..beeb7d935a 100644
--- a/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java b/spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java
index 5d80abe5b1..3f64971310 100644
--- a/spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java b/spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java
index 8d6da265fc..17d7bab24c 100644
--- a/spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
index 82ff759897..4ac99d4d4d 100644
--- a/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java b/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java
index fa77bdccf6..e2e010c92f 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 1a218fb70d..82362b5670 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-2011 the original author or authors.
+ * 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.
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 61c795c1d1..8a0d14b6aa 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-2009 the original author or authors.
+ * 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.
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 7d0f457452..82afe352cc 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
index f51c6c8ad3..7a2135fb65 100644
--- a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
+++ b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
index bd6e7dfc1c..d1290588fd 100644
--- a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
+++ b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 5ce5e847f9..5e74473fa9 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java b/spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java
index 76e090ddc7..30bdb0861e 100644
--- a/spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java
+++ b/spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java b/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
index a961f0ff64..56abcec7bc 100644
--- a/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
+++ b/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 97d277208f..0d1a368356 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java b/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java
index 4d691c2803..19f2698c36 100644
--- a/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java
+++ b/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/DigestUtils.java b/spring-core/src/main/java/org/springframework/util/DigestUtils.java
index 0328c0fdd6..a4ca743bf9 100644
--- a/spring-core/src/main/java/org/springframework/util/DigestUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/DigestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java b/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
index 25f7fa9aba..5aac309086 100644
--- a/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/FileSystemUtils.java b/spring-core/src/main/java/org/springframework/util/FileSystemUtils.java
index 41dd4f2c7f..529b4f0178 100644
--- a/spring-core/src/main/java/org/springframework/util/FileSystemUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/FileSystemUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java b/spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java
index fecdbf4a8d..655bc0eaca 100644
--- a/spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java
+++ b/spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 8a9569357c..565a68c696 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/MultiValueMap.java b/spring-core/src/main/java/org/springframework/util/MultiValueMap.java
index 290c2d9f47..a526af78ab 100644
--- a/spring-core/src/main/java/org/springframework/util/MultiValueMap.java
+++ b/spring-core/src/main/java/org/springframework/util/MultiValueMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/NumberUtils.java b/spring-core/src/main/java/org/springframework/util/NumberUtils.java
index 02afc4c860..47f38a0b83 100644
--- a/spring-core/src/main/java/org/springframework/util/NumberUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/NumberUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 11673b77ed..3ec3617418 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/PathMatcher.java b/spring-core/src/main/java/org/springframework/util/PathMatcher.java
index 0910382f7f..0bea9cd808 100644
--- a/spring-core/src/main/java/org/springframework/util/PathMatcher.java
+++ b/spring-core/src/main/java/org/springframework/util/PathMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java b/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java
index 071a69ee80..1e4c3c9711 100644
--- a/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java
+++ b/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 c47c16291f..1f7552b57a 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-2010 the original author or authors.
+ * 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.
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 da03d54dd2..19ee4478e7 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/TypeUtils.java b/spring-core/src/main/java/org/springframework/util/TypeUtils.java
index 0f0125cf41..3733f7cf21 100644
--- a/spring-core/src/main/java/org/springframework/util/TypeUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/TypeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
index 82fa3f7aa6..6fd0c2294b 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java
index a471b24d17..46f4d98ebe 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
index 241205c12a..feeefd6e8e 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java
index e4e8a68da7..300f9ff2fc 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
index c9ff1853e1..e8c8a64348 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java
index 1e3697175d..534cb0077b 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 7614beacd3..44eaedb735 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
index 7eb9b0aedf..c0d966d6eb 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java
index c5d587f7f9..ed06ed8c05 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java
index 8b0dc5eea2..7fd5dffa10 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 04b5eedef2..0d32a3fc08 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxResult.java b/spring-core/src/main/java/org/springframework/util/xml/StaxResult.java
index d0149df845..c001902252 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/StaxResult.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/StaxResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxSource.java b/spring-core/src/main/java/org/springframework/util/xml/StaxSource.java
index 0fcedc8e41..af005ecc14 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/StaxSource.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/StaxSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
index 2ae9bcc559..2241e2f2a9 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 a7dc635476..bca48d1cdb 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java b/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
index d3a202b24c..4b48abd4b9 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/beans/Colour.java b/spring-core/src/test/java/org/springframework/beans/Colour.java
index 17fd24fec7..a992a2ebfc 100644
--- a/spring-core/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-core/src/test/java/org/springframework/beans/Colour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
index 497400a7af..70a3fcfe6b 100644
--- a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java
index c5c4ed5e67..e0ae5f20a3 100644
--- a/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/beans/IOther.java b/spring-core/src/test/java/org/springframework/beans/IOther.java
index 6a8f74187c..d7fb346185 100644
--- a/spring-core/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-core/src/test/java/org/springframework/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
index e136978f9e..412891c439 100644
--- a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/beans/TestBean.java b/spring-core/src/test/java/org/springframework/beans/TestBean.java
index 3fef4caba0..06ad95816d 100644
--- a/spring-core/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-core/src/test/java/org/springframework/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java
index 4df72c3091..56e59e2d99 100644
--- a/spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java
+++ b/spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
index e14e03181e..3a92c77c28 100644
--- a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
+++ b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
index d1f09e0576..b4c32171cf 100644
--- a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/ConventionsTests.java b/spring-core/src/test/java/org/springframework/core/ConventionsTests.java
index a9fb6e6a5f..19d9b264f0 100644
--- a/spring-core/src/test/java/org/springframework/core/ConventionsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ConventionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java
index 8f354e8253..a3929896fc 100644
--- a/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java
+++ b/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
index bb3c798904..5de3f4b6ce 100644
--- a/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
index 1d0b3f7510..c7e2b7e620 100644
--- a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java
index 8acc0645d3..66f1e4f79f 100644
--- a/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java
+++ b/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
index 8a6ba96d62..0580ae54c2 100644
--- a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
+++ b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java b/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
index ddcc26e705..12046e979d 100644
--- a/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
+++ b/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java b/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java
index 602000ac7c..d93649a02a 100644
--- a/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
index 3cf0875625..eea35b88e6 100644
--- a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
+++ b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 96f3fc71df..9e12a26d77 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-2011 the original author or authors.
+ * 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.
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 38f3c835e5..2e4f86cb0c 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
index c9f0eae2a5..04b5ad53a5 100644
--- a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
+++ b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
index f430a29935..7bb57701b7 100644
--- a/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
index 3a6dfe84e5..b494c70810 100644
--- a/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java b/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
index 235d2f5486..19163fa17a 100644
--- a/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 576ab73814..49650303b8 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-2005 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
index b7a6d5c381..57560a2566 100644
--- a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java b/spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java
index 1e99fa0299..0ca007ea2e 100644
--- a/spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java
+++ b/spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
index 63a7b9e694..963b0d961a 100644
--- a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
+++ b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/util/AssertTests.java b/spring-core/src/test/java/org/springframework/util/AssertTests.java
index 59cf2a9261..744b492f61 100644
--- a/spring-core/src/test/java/org/springframework/util/AssertTests.java
+++ b/spring-core/src/test/java/org/springframework/util/AssertTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
index b82a952c26..6eb67d0661 100644
--- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
+++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
index fe70ac344d..4f87898432 100644
--- a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
+++ b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 96146d31a8..39761fb5de 100644
--- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java
index fea68d8ed2..42ac930972 100644
--- a/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
index 94e790d97e..d87212c1ce 100644
--- a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java b/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java
index b71c516c8c..90d40d7b5d 100644
--- a/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java
+++ b/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 356fad6b53..2fa0245aa1 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java
index be48ab08ff..e145195b6b 100644
--- a/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java
+++ b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 512b9af993..d0eb51d285 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java
index 7e47d99f5b..7129e8d23c 100644
--- a/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java b/spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java
index 630568b818..5b9c43c10e 100644
--- a/spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
index 83029423f2..e7d745d416 100644
--- a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
+++ b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 d160d596f7..fab4424ebe 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
index 39e6bd1f35..5a34a003ee 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
index 2552d2b7ac..ba84eadd76 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/AccessException.java b/spring-expression/src/main/java/org/springframework/expression/AccessException.java
index 996a4f1c8b..23c1e57888 100644
--- a/spring-expression/src/main/java/org/springframework/expression/AccessException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/AccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java b/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
index 041e93a294..c95501baa8 100644
--- a/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
+++ b/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java b/spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java
index 260f93e4d8..bb04735237 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java b/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java
index 7338413552..e1892d86c0 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java b/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java
index 5d6761acd5..bca535d26c 100644
--- a/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/Expression.java b/spring-expression/src/main/java/org/springframework/expression/Expression.java
index a353ab005d..fdad75b17f 100644
--- a/spring-expression/src/main/java/org/springframework/expression/Expression.java
+++ b/spring-expression/src/main/java/org/springframework/expression/Expression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
index 93144dc355..ecea713cad 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java
index c531fa139e..a6b11fb26a 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/MethodFilter.java b/spring-expression/src/main/java/org/springframework/expression/MethodFilter.java
index bcc824e5a0..e273125d34 100644
--- a/spring-expression/src/main/java/org/springframework/expression/MethodFilter.java
+++ b/spring-expression/src/main/java/org/springframework/expression/MethodFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 bb92e94fe6..75cdc5eab8 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/Operation.java b/spring-expression/src/main/java/org/springframework/expression/Operation.java
index 27239c862e..01b805905b 100644
--- a/spring-expression/src/main/java/org/springframework/expression/Operation.java
+++ b/spring-expression/src/main/java/org/springframework/expression/Operation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java b/spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java
index ff4a2f7eaf..29c165111b 100644
--- a/spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java
+++ b/spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/ParseException.java b/spring-expression/src/main/java/org/springframework/expression/ParseException.java
index b142121516..e8db01acc0 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ParseException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/ParserContext.java b/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
index a462c35312..a1ae657bc3 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2009 the original author or authors.
+ * 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.
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 041752988e..e14c30ba68 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-2009 the original author or authors.
+ * 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.
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 6b0f61e8ce..1dfb41adc7 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-2009 the original author or authors.
+ * 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.
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 7a4fcef207..67ecb99ad2 100644
--- a/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
+++ b/spring-expression/src/main/java/org/springframework/expression/TypedValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java b/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
index 478841019e..840ad1b854 100644
--- a/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
+++ b/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 c9b3c6041b..ae7713c50f 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java b/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java
index 5df9c134fe..046ed6a901 100644
--- a/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java
+++ b/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
index 2f34515b3a..8a09bf2b92 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java
index 6fbe1c12f9..7c7a3f6f1c 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
index 82231d775a..1935b3ba61 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java
index 7f5bdd6d6a..92eb3036fa 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
index 09e4a0a114..35636fe806 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
index 6558498b85..c6a25931fb 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java
index 3f6a1f45ed..1d3b853e29 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
index 1bc897efcc..db69a05945 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
index e0b2b8d4de..1839d203c4 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java
index 466e03e9d6..cafbd17d28 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java
index c6b1b303af..3d69e3fa10 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
index b629ff54b7..863f1a218f 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java
index d89e5bd6b8..d18695275e 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java
index 86c673429d..bf7d0edc91 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java
index 194db8115d..df2c110319 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java
index c91ccad467..e8a2ac231a 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java
index 7762d75c85..4f69baebca 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java
index 0bc2f0d91a..3f8593c5fe 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java
index 8de2154720..6b407e8d0b 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 33a40425ca..2e6ff92d73 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-2011 the original author or authors.
+ * 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.
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 fb7d4b3136..4342941af8 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-2010 the original author or authors.
+ * 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.
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 1b5a6ddddc..18f29d148b 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-2009 the original author or authors.
+ * 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.
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 1cc1d6f394..483dade31e 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-2011 the original author or authors.
+ * 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.
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 e46c53462f..2a210e3fda 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java
index 6a0a2f9c2a..1667115532 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
index 516e7ce66e..4b1c619c8a 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
index f28c7c295c..cf189ad6a1 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
index ca8a5db519..388d26d026 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
index a7a1856777..32de58c8c5 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
index a9b24b1b38..8071bc198f 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java
index 71055857f8..ba7bca0569 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java
index 16d490bc2c..352b486991 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 d95227dffb..606d4c423f 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
index 604016eb99..703b1b7394 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
index b5ca0a2da5..d2d6b954fe 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
index 0d3efa95dd..029dd2440f 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
index 214af39187..568bdfad27 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
index 8d98cb8bea..5c2a3de1f2 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
index 0216f5c7af..d9b05524a7 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java
index 8c3f134774..a388263851 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
index bdc112a4ef..545e313713 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2008 the original author or authors.
+ * 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.
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 ab4e0dcd84..74fff9810e 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
index d2cd8d9494..59c61a73d1 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java
index 6aa0bafec5..f9afe18d49 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 781d6963a4..85764aa7a2 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java
index ab23d3e157..737b074ff3 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java
index 9047e35b7d..8c90e66722 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 8468afc531..b97b4983e3 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java b/spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java
index f9745823bf..d468e60a8e 100644
--- a/spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java
+++ b/spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
index e7b55177a9..41b0b6f545 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java
index 324030032d..a50f9b8398 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java
index 95a45a79ab..00eaa7dbca 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java
index 29e615413b..64b402d2c7 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java
index d8bb30d76f..1f0db37a03 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java
index ddd3e26632..b6b4499188 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java
index 1dc4f511d3..5374117bdc 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java
index 8d26855fb2..0d7593e434 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java
index 3f593940fb..6569ba893f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
index 4b95acde85..e3aed57b74 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 82576b1df0..dde8067753 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java
index 08410c3be2..8ce3abbf35 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java
index 552daf1bd3..b4175b8602 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
index 8ab1b9c600..279ab5a587 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java
index e09947ebae..04ae1ccacc 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java
index 57af20c86b..2b0eeefa32 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 4cd1e31cd0..8f5a9964cd 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java
index d241a53896..e333c73875 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java
index ec1185db4d..bd82ddf9e9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java
index 2cb5a1f648..ee123ceed9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 6a0a1b944c..7efe962c64 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java
index d8a3ad4a55..462eba3faf 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java
index 44bb3d4e7d..183b8b2b1b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
index cccbd5744a..7c17163747 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java
index 4ee5de64e9..47f1e4f57a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
index 54b71c1829..7aeb9ee31f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java
index 28e61e1884..48ac7c8d3e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java
index dfd334bd88..8ce9453622 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java
index 40ae15e785..9583ec752c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java
index ad9cd72c28..9bdb7f0a9f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 1718c349ed..615ab1ae53 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java
index dba3e8c001..4fdc5b10d3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java
index 708c7e9a07..34b7dbb892 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java
index 4573cb95a5..1120d8f83a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java
index 543ebb3d12..5aeaf7bdf0 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java
index e43a008975..b1de7edda0 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java
index 47c682070a..c786232ca9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 8f11d0bb74..1e6a263ca4 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-2009 the original author or authors.
+ * 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.
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 4693b02067..33087c446c 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-2007 the original author or authors.
+ * 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.
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 17578e80bb..af8281fc6d 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-2011 the original author or authors.
+ * 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.
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 7ae4ecd912..cb6796a2d1 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java
index 340f0fe2ea..119ed0eb1e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 3465522e11..75ba14dc10 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
index 25eaa98b56..0dff1678c4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java
index 9262314c93..f8ff89e479 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
index 7f32e49831..fc7b32f4ef 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
index 9c049300e0..c4ae1b4eef 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
index 8c36763ca2..a7f5c9f7c9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 48b252098c..1abfdea3c2 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
index 2e0b481873..bdba8e4438 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java
index 03f2491b99..b23eb8ca4b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 d9e7072431..7c80a14d0f 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-2011 the original author or authors.
+ * 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.
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 200514aa83..98f0e5991e 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
index 56109fa9c0..5c6e2fe775 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java
index 0f60c5da46..fa82b651b3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 40d805e769..d687dbc2f6 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-2010 the original author or authors.
+ * 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.
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 14fe2622a9..cac760a9cb 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java
index 16a842da18..d091896658 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 095bc99bdf..7d29df8301 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-2008 the original author or authors.
+ * 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.
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 0033f3847a..30950b72d2 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java
index 6b47fc2db3..b22fdee547 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java
index ff1c747995..a4ec41fc06 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java
index 773bb23af8..83d37435ec 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java
index c48c2e46cb..7ef0b32583 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java
index 3cc259f679..83a9aedffc 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java
index 64ddf0d544..d751933913 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
index 12b7af7550..7039eeacc8 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
index 3acae09970..9a83eec356 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java
index 517e8a052f..2cc5f9f909 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
index d93bb083bb..00aedb4c22 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 bc8f6876d3..6ed77ef0c1 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java
index 74eff9a816..1717032fd5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 aa3d5c9e71..9c6ebcfde2 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
index b039303087..5aaf586b3a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java
index cbc85e13cc..30f64d47a2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
index 1791e82fb1..aae634f2ff 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java
index ba6495727e..9d2b41f54e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java
index f55def12cf..93e59f6625 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
index 08b2f590b5..1321c81662 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
index 443b408b7f..cfcaca4db7 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
index 9d6ba9236d..6a3c6c534e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 5969069371..05fad27124 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
index 7e1ea19597..73d54ca46d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 6ea06ebb3d..5e3db7cff4 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
index d8ad816c58..5b786b955a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
index 6debd6f014..58b176721b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
index a88cd6698b..52cdd43016 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
index e40ddac2a4..915b327153 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java
index 55bb0b7493..f4eff425d3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java
index 48afad16aa..203d733368 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java
index 3e4ebc76ed..2a48efaaf5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
index e35c827565..0a4eb32b4b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
index c4898e44b3..039e5c34f5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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
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 c1527f45c3..1cf222e002 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java
index 13511bd2d4..46b0a43964 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
index 8f7c27ad66..6e8355e639 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 9b6fa94dc4..f2d0bb58a0 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java
index 07e30d8b8a..ee70d608d3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java
index a234a256cd..455e884ca7 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java
index 407356f812..2f9cc053ce 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java
index 1da3422648..58f8f3d24b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java
index ccb848b0f7..3b63c0c12b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 67fbec476d..2fc21917c5 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
index 38e93eb90f..90603687a1 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
index 0f5273cd26..7b6d91814c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java
index fa0d270d77..abb9d7e33b 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java
index 385dd7c72d..89940f0cf2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
index c312fc3a51..95f2ee3643 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java
index b4b1031a75..b917ecb95d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java
index 1637b89d29..45d9d57f1c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java
index c3ec69dd31..a3290b8825 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 3284f80ae1..26b528e9f9 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java
index 8543e2b177..87a84c8dc1 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java
index 3dddd11cc2..4cfe714a32 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
index 3fe391dbb6..3fd0d80f68 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java
index fc09144c76..f8796fa214 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 cb3fe5e1d5..39c5245e27 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-2008 the original author or authors.
+ * 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.
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 455b11171e..ec863daff1 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-2011 the original author or authors.
+ * 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.
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 e98865bdeb..eeb20c0000 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java
index 3e09b9776d..6964172e96 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java
index 1b826a4b2b..19c85608c3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java
index 57f332309f..386be938a8 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java
index 17eeee43a2..251a63a0e8 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java
index bfc80b3e7b..a630b206b6 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java
index 9112da11d5..186b28baba 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java
index 731b2320c3..964f31d511 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java
index 412b99bcad..b011339933 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java
index 83b6c52401..7a18b6d71d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java
index cb1a19fef1..2614338bec 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java
index ec831758c8..1446c89436 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java
index 1ac690327a..0d00da4d9f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java
index f0567bc41c..e967966aee 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 ebb2e28ad4..69f10432e4 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-2010 the original author or authors.
+ * 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.
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 0c294bfe69..31d9d9e14e 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-2005 the original author or authors.
+ * 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.
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 c87d829263..88900de919 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-2010 the original author or authors.
+ * 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.
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 9a722a607e..b117177b38 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-2005 the original author or authors.
+ * 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.
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 697f67f3e9..13f0363377 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java
index c32ecfa99e..d84b3a2e2d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 acb78b3c06..2a702794ee 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java
index c1ad737de5..6e55f1ec88 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java
index df915e46c6..8024127509 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java
index 9d899f8057..9cb13d05a2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java
index 49602a6b34..0e22eff12a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/beans/Colour.java b/spring-jdbc/src/test/java/org/springframework/beans/Colour.java
index 17fd24fec7..a992a2ebfc 100644
--- a/spring-jdbc/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-jdbc/src/test/java/org/springframework/beans/Colour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java
index c5c4ed5e67..e0ae5f20a3 100644
--- a/spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/beans/IOther.java b/spring-jdbc/src/test/java/org/springframework/beans/IOther.java
index 6a8f74187c..d7fb346185 100644
--- a/spring-jdbc/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-jdbc/src/test/java/org/springframework/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java
index e136978f9e..412891c439 100644
--- a/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java
index 7a27cf0894..6d71de7576 100644
--- a/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java b/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java
index da69a9831f..7bb3744d60 100644
--- a/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java
+++ b/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
index daa891016e..e6c9fdef47 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
index 996f96f329..aeffd6f6bb 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
index 66eb5b5496..709ca312ec 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
index e0748aef5a..6b9c9840ab 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java
index 14a7d3d0cb..10df5630c6 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java
index 3ed281abfc..2df1848c21 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 7e8631e6ec..00e229ba9d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
index 60bec56817..6564fe5ee7 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 a2d43fdbba..80c7a07f2e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java
index 681376564d..232c3843e5 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
index f027c15564..f858444dbb 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
index 1c763595b6..85b6263e47 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
index 74a4a17c74..5b52d8ac46 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java
index c661c79421..40ce6b18fb 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
index daae639f03..1aefee1e94 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
index f082720f84..feba295516 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
index 513c702bfd..8a7cc64546 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
index 88e6ec73a3..3d6d4d4d17 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
index 02f8f5332d..4d3a05c2bf 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java
index fd3d4a1654..ec33bdeaf1 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java
index 23223fc1d7..221a9e59fb 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java
index f178c5ef2e..1ad38f1457 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java
index 48174456d9..4967756416 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java
index 17276e3aeb..8ffa829bf5 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java
index 9ff252a367..f325d4891f 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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
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 85152b9a86..8540edc8a9 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
index 6b1760ac8b..3280a2edad 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
index 189c59a1a0..d2d0cd82e4 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
index 535dca239e..10a2248c37 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
index 07b560f386..c57e430f67 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
index d1bde67770..6d2ce8106f 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java
index a637cf1ba9..213e6a92d7 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java
index 5fb13c2233..1b84b2c1a9 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java
index 1b24276eb6..6d23a8e828 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java
index 96140c6c9a..14e4d5bf68 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
index 039a938a76..68a0a0d883 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java
index 3e6de69dec..f99ae954dd 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
index 6695bb35af..c2e07ec765 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java
index 681ef8ff16..3578c1e93b 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java
index becb786a38..0594fec1cb 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java b/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java
index 1a01a993da..ce49317988 100644
--- a/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java
index b3901d4dc4..c4d248604a 100644
--- a/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java
index 94bbc43471..500788ff41 100644
--- a/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java
index 4c05894eb1..d701186bd1 100644
--- a/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/JmsException.java b/spring-jms/src/main/java/org/springframework/jms/JmsException.java
index 5572cb415b..9da83d02ec 100644
--- a/spring-jms/src/main/java/org/springframework/jms/JmsException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/JmsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java b/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java
index bbc6f3041e..eec0180b87 100644
--- a/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java b/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java
index 221cce2bae..77cb7fa119 100644
--- a/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java b/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java
index b0fc75475c..90e5fbb253 100644
--- a/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java b/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java
index 1acb0a05ed..dbd04c3b80 100644
--- a/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java b/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java
index dcf41400b8..526ce6f028 100644
--- a/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java b/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java
index fff7028c67..591e6d8abc 100644
--- a/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java b/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java
index 191a74d551..14cfa30b55 100644
--- a/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java b/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java
index a49029e463..28f9fc7aa1 100644
--- a/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 fbc4bbd969..b9531906a4 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
index ebd0259508..9407db27f4 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java b/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java
index 09949d5521..d4642a6bda 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java b/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
index e2c006042b..a668a1d62e 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 77cd02c180..e01bfec1f0 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-2007 the original author or authors.
+ * 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.
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 b8e3e10832..1438b7e777 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-2010 the original author or authors.
+ * 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.
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 cc401957b2..28a683c8f5 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
index 53ee2c0956..5d73a3497c 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java b/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java
index aab270cd03..bf439aee09 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 5b5510dc4e..ed298a1c29 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java
index 6b6cec1b3f..b9097d06a1 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java
index e7ec4ab035..092ad8fd7d 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java b/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java
index 06e060daca..5c273f98cf 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java b/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
index f9ccfb18b9..ccacc0df0b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
index 8f8b782401..2d1cc49b27 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java
index 520c2d1ccd..563503eb07 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
index e313ba705b..152617ee02 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java
index 5b8c2d7b5f..0aa7fbc49f 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java b/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
index d7af5cf71b..3f3d5c14ba 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
index 04904f452f..6541f116a0 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
index cc095d13cd..77c57614e2 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
index bc426fc77a..95314fd3b2 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java
index a6adf5c0b2..f15fb92323 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java b/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java
index e6afb9c1f5..15a39df922 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java
index dc4fcabd7b..758301eb40 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java
index 5b64b616f3..c8e93d6eed 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
index ac915abf7a..3aa313c925 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 ad366c49e1..0f11609876 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
index dace0d10a2..392d02b1fa 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 10e1cec307..7263a4c993 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
index 7da7f052cf..dfc481c0e4 100644
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
+++ b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
index 682d927cbe..1b4cce84d7 100644
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
+++ b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
index 95c9f5a0f7..38dbfe53cf 100644
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 a40b42a3b9..80023bc3d0 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
index 493077a5e8..7f9212a80b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 ab27354c61..9378d21c47 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java
index 9eb8d813a6..c4fa618353 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
index d9be513bca..939bd0f211 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java
index e9ae82c1de..569b9cbedf 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
index 9da3ed1d6b..e3105c223d 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java
index 3fa407b737..e5be7c7297 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
index 0569619c8b..cd32ceae94 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
index a8aaf1a283..f3d39361f8 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java
index b27bf022af..c93c2cd06f 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/beans/Colour.java b/spring-jms/src/test/java/org/springframework/beans/Colour.java
index 17fd24fec7..a992a2ebfc 100644
--- a/spring-jms/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-jms/src/test/java/org/springframework/beans/Colour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java
index c5c4ed5e67..e0ae5f20a3 100644
--- a/spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/beans/IOther.java b/spring-jms/src/test/java/org/springframework/beans/IOther.java
index 6a8f74187c..d7fb346185 100644
--- a/spring-jms/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-jms/src/test/java/org/springframework/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java
index e136978f9e..412891c439 100644
--- a/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/beans/TestBean.java b/spring-jms/src/test/java/org/springframework/beans/TestBean.java
index 7815bf1af3..fd998fd69b 100644
--- a/spring-jms/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-jms/src/test/java/org/springframework/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java b/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java
index ccf756b53e..1ceb66af6d 100644
--- a/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java
+++ b/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java b/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java
index 4aa339db76..b2f8495635 100644
--- a/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java
+++ b/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java b/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java
index 0c70d70dd7..582e5fa7ca 100644
--- a/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java
+++ b/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
index 650c51aa34..8945622e81 100644
--- a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
+++ b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/StubQueue.java b/spring-jms/src/test/java/org/springframework/jms/StubQueue.java
index eca20ea2b4..18d311fa7f 100644
--- a/spring-jms/src/test/java/org/springframework/jms/StubQueue.java
+++ b/spring-jms/src/test/java/org/springframework/jms/StubQueue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/StubTopic.java b/spring-jms/src/test/java/org/springframework/jms/StubTopic.java
index e3b0f1eca6..41e9e2bd04 100644
--- a/spring-jms/src/test/java/org/springframework/jms/StubTopic.java
+++ b/spring-jms/src/test/java/org/springframework/jms/StubTopic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
index b62e9e41bb..ee45f0f90f 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java
index 4e5a4afc03..78c0de6e9f 100644
--- a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java
index b1cd2e2b02..357174c59f 100644
--- a/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java
+++ b/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java
index 16a20d342e..f43f2bee0c 100644
--- a/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java
+++ b/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java
index 41c15ccf2b..cc3d345871 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java
index aa03485dc5..abcb7a7e66 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java
index de630545c5..f83c708198 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java
index 0fea92f956..b23d3a00dc 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
index 7ede7b3a22..500874d8a1 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java
index bfa36dcb5d..61abc8ca67 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
index 2072342bd6..30b71cf182 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java
index 0e51fae693..b225303560 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
index 388fbe86c8..6bd5c57123 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java
index d34c5597d6..a41851b5ec 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
index 6a29626208..8fdf939108 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java
index 3bd333d3b3..89140fac0a 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java
index 218ec707e1..bef54da192 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java
index 324c7bf817..646ee8a694 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java
index 880e535f92..598c5ada29 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java
index cf433e3352..b8a04f7b53 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java b/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java
index 49b1f47f6c..60ee013dc0 100644
--- a/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java
index 861ff0a52b..7d4663a285 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
index 6546fd869d..147987430b 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 63ea2aa3fc..54ca352ea0 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java
index 531ff04c4c..9cdf36ef45 100644
--- a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index 02996e490f..b1862dd893 100644
--- a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
index 573e70e2e9..1b8cf3eeba 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
index c4d9b9ebb3..d580974a60 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
index a6381e92ba..e8f5e91dfb 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java
index 2de79f09c2..99e7722f33 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java
index d8e8abdf5e..be7ebf808e 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
index 1a98d4c657..080b8534ea 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java
index 92d78f342c..efd648ce11 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java
index 806eda51a5..c2306d33af 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java
index ab39d5980b..4475af596a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java
index dd3b144bd3..8bf4dbeffe 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 1cd28725b7..79339de558 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java
index 871d8a4af4..e43e55f4cc 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java
index bab18adca8..37d5fde4f7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 ac627de205..3d142f2256 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java
index a63b93f4db..96d7b3e155 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java
index cdbdd49ec8..0dc209bf5c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
index e4987e2206..040eaee108 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 909161b863..1edc733d3b 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-2009 the original author or authors.
+ * 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.
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 208c88f60d..d3d1e13733 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java
index e48abde632..dcf15059d3 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java
index 31d069a988..17764a5fec 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
index 0a46bc5e9f..06ab8f3b26 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java
index e8d0f2f462..2b46f7ef84 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java
index 1953a84326..0254d3cce5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java
index a1895bdf4f..368dcf5451 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 1e035d7e54..d944ef497d 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
index 93620c30af..e30f1e1f1c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java
index e1df9f74c7..bdfaf07bd7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java
index 8b3d3339fb..ddcf4f5108 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java
index 1638d2e031..3066382286 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
index 9bf08b94d4..bef035c6f7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 a59ed3d9bb..e495fc8a9c 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
index 2328205a9e..ff962c9f5c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java
index d48200c270..fa867d2054 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
index faf8b0e66f..70fb9b68f3 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
index 061e6b9ecc..8d10aadf8f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
index 5dd0b4c607..1379e80b1b 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
index 4c868c7ec2..fce0f2ad19 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
index aa227bcaad..77189f9de7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 9dbf9c5b7e..38d0f7263a 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java
index 890c95dce2..25d466f612 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java
index 4da9c50583..9a21733208 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java
index de2662d6fe..464b011e12 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java
index 129f998b8b..ff105e48ab 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java
index c2e5b8b2e9..66cbf03f08 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java
index 1b7e752999..8e17a03400 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java
index 30a3f2bdee..314d3c2f56 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
index 868ad6050f..d1089705dd 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
index 3ec8e037fd..ce0f61aefc 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 62a1670ff1..412a12087a 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java
index 918007b6a7..128ef3dd97 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
index e0aa2c7685..112a1c5758 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
index 55c5d6b33c..a5d5938cbf 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java
index b0603ebf5a..671a09d0ca 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java
index 81e1362c6a..828cf7b479 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 506cfde95e..6612c08c45 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java
index 16dbe855c9..9176c63791 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
index cdd4f42330..6d20ec34d9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 c71b63f214..63df63e531 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
index 61fd9480a0..3d7c0041be 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
index 9e89098473..bdb38dcd66 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java
index 14419ff144..71aaa4cd66 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
index 0dfd3c9b51..5f9783d2a1 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java
index 4495341ec4..cb4b282a84 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java
index f3b1c81b9a..4606c6258a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
index 6af89c88c9..a75fb9f85a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java
index b1cbfd409d..cdb4830d3d 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java
index 1f0d8db5a0..4bc69e6ad9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java
index 0eaa5a6b61..b3355da5ec 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java
index b69740301c..d4d116179e 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
index be71b0153d..250b5ebfb3 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java
index d853b300fb..1b039f6573 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 714a28fdb9..259c6e3756 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java
index 975f07e106..24151fa6d7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 065431b7ea..0913d234f0 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
index 32133baa82..00f15cfa4c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
index dcc6f13f1a..b96413c512 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java
index e5a8cbd885..c6fff22ae8 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java
index 85e4903555..2828ddd715 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java
index 02bbf299ea..55d1b8b51b 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
index a203d4136a..14864f4d0d 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
index 6f40effd05..18499e412d 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java
index 3bbd6b17df..fbdcd48f53 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
index d2cf726e27..1dd5764059 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 e7faa52d24..1293b335d4 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
index 8a3a5f5348..065cf759a7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
index 0ba1a3ee54..d48a7b762e 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
index 1ab02f213e..e7db382d0e 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java
index 15b59356e6..34fc0d4a1c 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java
index c10bb362ab..36e18be4ef 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/beans/Colour.java b/spring-orm/src/test/java/org/springframework/beans/Colour.java
index 17fd24fec7..a992a2ebfc 100644
--- a/spring-orm/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-orm/src/test/java/org/springframework/beans/Colour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java
index c5c4ed5e67..e0ae5f20a3 100644
--- a/spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/beans/IOther.java b/spring-orm/src/test/java/org/springframework/beans/IOther.java
index 6a8f74187c..d7fb346185 100644
--- a/spring-orm/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-orm/src/test/java/org/springframework/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java
index e136978f9e..412891c439 100644
--- a/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/beans/TestBean.java b/spring-orm/src/test/java/org/springframework/beans/TestBean.java
index 7a27cf0894..6d71de7576 100644
--- a/spring-orm/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-orm/src/test/java/org/springframework/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
index cd4a7ef25f..44cc004f89 100644
--- a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
+++ b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index 9b3d10470d..7173686606 100644
--- a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
index 5ab0d31377..4e1641b2cd 100644
--- a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index 32908a306a..883db7bfd3 100644
--- a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java
index db0b7901ba..ba1415f640 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java
index 7d6a94844b..c44277644b 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java
index 37539cc0a5..680520f6de 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
index 3eff114c3f..707d17b9fe 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
index 0ba20000bf..c87a423c4a 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java
index 50b8d0631e..2f264aa25f 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java
index dc90981e93..3bc4f20b2b 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java
index c6931097ce..0c1a0ed1cd 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java b/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java
index 4e4068ce50..43a44e3498 100644
--- a/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java b/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java
index c0b9717a22..d92b60d3f4 100644
--- a/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java
index b7a1a64631..21fa381178 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java
index 890fdb1f8c..2baf4d205a 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java
index a7ab5fa9e6..6dde6a8c5d 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java
index c5a20a83b1..1bf0d91fbb 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java
index cfbd52a416..20bc73dbfe 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java
index 32b43d0cb6..aac1b766be 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
index 225289d63a..80912a3479 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
index 15148f29c6..8b40e31b1e 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
index e82060c9a0..23f241e5ab 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
index 9d9ac1bb80..391a067a58 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
index d145444a7b..0f7efcafe7 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java
index e88c59dc31..1d4578b372 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
index c9ba5d1d46..137912e5b2 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java
index f2f545dcf9..5f2c0d0aa9 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java
index 41bb035269..4d25da3659 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
index e9ba8b8685..a1a7db067b 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java
index a0ebba76b6..393d316db0 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
index 8371e18766..048eb2d4ae 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java
index da0ad4e138..e2e1564755 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
index 4c5ba65c63..598c07f755 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java
index 67f586adb0..1802b16d2f 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
index 8759b3710b..3a6b77b0d6 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java
index 68e82f5f80..e823e57a32 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java
index 28b03587ab..b2b509f3df 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 4675422aab..7e84430678 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java
index 93072c225f..3296f1f258 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 64e43ed7d4..c3bef0c283 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
index 8cb7fd8744..ec2b9499e5 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java
index b99e20d03f..c71e846dcd 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java
index c775ae95d8..696b9b79cf 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
index 1f0b6123db..a3aa264cec 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
index e45774e1c9..637aa5b794 100644
--- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java b/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java
index 8c9dc686d9..f2403b649a 100644
--- a/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java
+++ b/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
index fa6dd008a0..03a7660153 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java b/spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java
index b13160181e..51a4177881 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java b/spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java
index 825e134aac..662eb69d51 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java
index ee1c07f14c..05ee407f5f 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java
index f6dbf80587..75cb9c1423 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java b/spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java
index f2df990bb4..754888cc14 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java b/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java
index 7bd17b9bd5..5a39918a77 100644
--- a/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java
+++ b/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java b/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java
index c4ec73bc3f..a34cbc6309 100644
--- a/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java
+++ b/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
index b4cb804032..bcd5704c80 100644
--- a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java b/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
index 8bb2d00acb..9cf1ded10a 100644
--- a/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
+++ b/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java
index de79edcd74..e2066af4d9 100644
--- a/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java
+++ b/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java
index ccc8039a8f..77115d08b5 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java
index c66d642fdd..fab56e5e5a 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java
index 85253a810c..9dfb7214d2 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java
index 925558f7ae..dea843c0a2 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
index f7eba5c93b..ceff466c66 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java
index 9986ad58b2..79644134e1 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java
index bdbebf2c8b..e5fbb959ad 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
index 350cdb2b0e..901ff9f053 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
index f39ddfd6d3..02b3014195 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
index dff92dd309..3f38f2c9bf 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
index 6139df1f2a..20be49cece 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
index d3895ebccc..e2f6a3f25b 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java
index 447c425da8..2529b9ca07 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2002-2009 the original author or authors.
+* 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java
index aa99d312e2..a83051b9b0 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
index 6ff085146a..19bf683cae 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java
index 3fb94cddda..0f5dc4c0f1 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
index 9acf232285..f7535781b3 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 983655abf0..cf584efa88 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java b/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
index 9c208afcfb..7fbe4b4745 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java b/spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java
index 98dc0a248f..881a3ca20b 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 6d9604dde8..991d262645 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
index f3e75920be..d5d668bac6 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java
index c2c26b3d46..04f53b6973 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 0c574a4df1..8a7f1f82f1 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java
index 90e8bdf738..38f0387679 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java
index 503b01cc01..7a7a21d39c 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
index 92e98b4d06..5e982d7613 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
index 89e41d3c65..00daa798f4 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
index aa445748bd..422f8d0035 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java
index 0c3b71eca5..4123df65fd 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java
index 0f6698f8db..15037de3a5 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 the original author or authors.
+ * 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.
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
index cf42f1bd78..7979e4d5c5 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java
index d48113b6e1..3bc05c28b3 100644
--- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java
+++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
index 3ac220ce33..4905e411f0 100644
--- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
+++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesJstlView.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesJstlView.java
index 232f1b49ff..cbec367817 100644
--- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesJstlView.java
+++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesJstlView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java
index f46433e040..7e952690ea 100644
--- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java
+++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java
index e2eb6e1fb6..54c46c76a2 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java
index c12b895766..b87823a836 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/AutowiringRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/AutowiringRequestProcessor.java
index f14091729d..27a5368ca3 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/AutowiringRequestProcessor.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/AutowiringRequestProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/AutowiringTilesRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/AutowiringTilesRequestProcessor.java
index 96a24c8c6e..c9df6c8492 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/AutowiringTilesRequestProcessor.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/AutowiringTilesRequestProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
index 74214470d5..d1d68e6995 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
index b43d3f5152..860f79c241 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java
index 32d08f5cf3..79fa122828 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
index 063ad2f9a7..a9ebf4d7c6 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
index b614dd30b0..62ea98fc81 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java
index ff18cff838..b9a0b186de 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java
index 1533d81a10..a6cb4ed109 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java
index b67b34f481..1187c84f9a 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java b/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
index 65bcd408b7..3cb29fb4e9 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java
index 941dd59517..a0499247db 100644
--- a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java
+++ b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java
index 389c18f9b3..34a09a170f 100644
--- a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java
+++ b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java b/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java
index 5e77137f53..ad97b300b5 100644
--- a/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java
+++ b/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java b/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java
index e89fe77b45..caded1a7f3 100644
--- a/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java
+++ b/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
index c71d6e8681..d35fbdc865 100644
--- a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 f21936897b..449c45faca 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
index 66ce8a2b07..f97e60e2eb 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
index 784e160483..2369417030 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java
index a6381e92ba..e8f5e91dfb 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java b/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
index 4894fe4eb9..6b69fdb704 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
index 2ea463ce8d..b492c1fa98 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java
index 985c1e20dc..9d3a878026 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java
index 89dbaf0d74..b1193ff5e1 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
index d6ba452f23..70e90567b0 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java
index 477493f4f0..93800340b8 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
index 83096ddf9f..0ef706abe1 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
index bd83c9eaff..0d5d078480 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java
index c420225a63..d01144ede9 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
index fae16151d2..0f697d115f 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
index bae411345d..af3c68663e 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/AssertThrows.java b/spring-test/src/main/java/org/springframework/test/AssertThrows.java
index b810d3381c..8e56f2e9e6 100644
--- a/spring-test/src/main/java/org/springframework/test/AssertThrows.java
+++ b/spring-test/src/main/java/org/springframework/test/AssertThrows.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
index 7664b0f460..30c08a22cb 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java b/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
index 72ae28bb33..53a9b877e6 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java b/spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java
index 91962ee827..944f3aeaea 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java b/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java
index 322c7a7fd9..c5c718468d 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java b/spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java
index 76983acf72..c853918664 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java
index ee1c07f14c..05ee407f5f 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java
index e21ace4ce7..4e240aa6ea 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java
index 42fc03f1f4..922e34c629 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java b/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
index 7ab7906813..4c3dcd3a91 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java b/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java
index 3498074cb1..bb0bc88cd5 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/Timed.java b/spring-test/src/main/java/org/springframework/test/annotation/Timed.java
index 96729e409e..a78960ce82 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/Timed.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/Timed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 fc64520476..27100be94c 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
index 0b844447e9..0f2ceb73a4 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
index 7a820b42cb..50cfa74474 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
index 81658f379d..732c1e0bf5 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java
index 91dc025aac..9b7fd03ec7 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java b/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
index a01f214f60..5496b4ee63 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java
index f625c3fa5c..c3d6c8f5c7 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java
index 3112cfcc5b..16c6f97d8c 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java
index c35ff65246..92d32ea517 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
index 51b04ce41f..093ae49b10 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java
index e324262158..0aa21888cb 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java
index beaa77ca1a..34dfe47ec7 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java
index ca380e68bd..cb85223717 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 fef3aa74cc..7c78474189 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java
index a4fa110e98..823688797f 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java
index 1fffaebd96..9c636e0e70 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
index 21be2d3da4..bb25f1f8e6 100644
--- a/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
+++ b/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java
index f047b156d3..d36250099d 100644
--- a/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java
+++ b/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java
index 3ccb4000e6..dd55d0e78b 100644
--- a/spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java
+++ b/spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
index 3afa516586..ba959d162f 100644
--- a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java b/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
index 8bb2d00acb..9cf1ded10a 100644
--- a/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java b/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java
index 887adccf10..fefc31e161 100644
--- a/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java
+++ b/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/beans/Employee.java b/spring-test/src/test/java/org/springframework/beans/Employee.java
index 3a47dfd690..9289e45137 100644
--- a/spring-test/src/test/java/org/springframework/beans/Employee.java
+++ b/spring-test/src/test/java/org/springframework/beans/Employee.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java
index c5c4ed5e67..e0ae5f20a3 100644
--- a/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/beans/IOther.java b/spring-test/src/test/java/org/springframework/beans/IOther.java
index 6a8f74187c..d7fb346185 100644
--- a/spring-test/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-test/src/test/java/org/springframework/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
index e136978f9e..412891c439 100644
--- a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/beans/TestBean.java b/spring-test/src/test/java/org/springframework/beans/TestBean.java
index 66e2624f05..3ce93f7c43 100644
--- a/spring-test/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-test/src/test/java/org/springframework/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java
index 5a6c915365..493cdc755d 100644
--- a/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java
+++ b/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
index f02ce34303..06c94aa441 100644
--- a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java
index a8908bfd8f..07b0cf4b5e 100644
--- a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
index 1872385e61..08523c7949 100644
--- a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
index 496bbc1b01..4b3223f4ba 100644
--- a/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java
index 9701ab3364..192d005f4a 100644
--- a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
index 7ec007c016..bb715753af 100644
--- a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java b/spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java
index 613dc3acce..3768b03cb6 100644
--- a/spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java b/spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java
index a504642a92..d765937940 100644
--- a/spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java b/spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java
index 69c5ba2d43..97f303b809 100644
--- a/spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
index 869d41ab27..eb6f44f176 100644
--- a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
index 10f0e1ef41..81f51d459a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
index 70778c7f1c..147679ed5f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
index 85a7c0a244..6cecd0c267 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java
index 419997161e..0e53eef482 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 ebe40daa0a..5ada9b5c61 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java
index a9ce65e0d3..7ae72d581f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
index 78075bc3f3..02c0dcf0fa 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java
index a9284c78f0..4bb3fb5bfa 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 59ad1be4f5..bab1df5ff8 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java
index ad7de4f270..0c06882087 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java
index c51b95cb3f..08f91b536a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java
index cc5ad01ff2..d7bfb8c2cd 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java
index 80366aed5a..ca7b312662 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
index 72a98004de..cea2a29c79 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
index db69a60506..6cc35c641b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
index 75a32cda3a..a77f7239d1 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
index 5c2d39499c..d41dbb5026 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java
index c41eb33238..a662b7b8bf 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java
index 61059c3639..3229df93d5 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
index c65ab7c939..399f6a6103 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
index d8446ea579..2f293d8847 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java
index ad6090ab61..751ec07e92 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java b/spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java
index 2b38752082..4c257540b9 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
index 835398cb1b..219010f12b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java
index 70e1a8dd5c..46dfd6725a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java
index 223c5a6f59..54a9dd26ba 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java
index 8773890968..469e35f8d9 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java
index aed661d838..e426d1e7f3 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java
index db1c4bca19..9f29d9a54a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java
index cfc0a5fd53..26dd5f470e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java
index f2b001e10d..278804817e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java
index 6ba03e1bc4..3cf8f064d0 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java
index b2e4fedb24..b54613b491 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java
index f769cb1a13..c060ea4b55 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java
index da02bb8228..a3d2ecee16 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java
index 6a384d8c6a..54596ae6d2 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
index bd69ae15ff..0208925227 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java
index 464ff84af0..dc06571f19 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java
index 882578a189..c6f765ea95 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java
index 56bd298739..409aade593 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
index bb90b212fd..eac2522cd2 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java
index e8a7c2f5a5..76421e3706 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java
index b6247e4a7e..92602e1527 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
index 47d7dab773..6bdeeee234 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java
index 85da86b3f5..bb2e80b9f3 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java
index d56c24f5e5..9d071b1647 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java
index adaff61eb0..ea0c4e8401 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
index 847dbd97e8..1d930831d0 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java
index 7cde8c0190..1c5d85d605 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
index d8fc57b3f1..bf53acc542 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java
index e9e69e1a19..a9069a1d06 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java
index a8ae4fcc8b..db9d91790c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java
index a569313555..427191bcfc 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
index f395a90a66..0ad8862c2e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
index 09d76fb883..7a2cb97c8f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
index cdc23e35bf..bedd776bce 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java b/spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java
index 3be9e53ca8..d5598c26f5 100644
--- a/spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java
+++ b/spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java b/spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java
index eac5e7b76f..6630477957 100644
--- a/spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java
+++ b/spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2011 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java b/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java
index b9c8aa80e9..82cd00574b 100644
--- a/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java b/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java
index b75a74281e..1e303dd907 100644
--- a/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java
index 4e77ce5a16..b6801d20bc 100644
--- a/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java b/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java
index 4840493054..eda824bb3e 100644
--- a/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
index 4ee94c17ae..bc1c8ce35b 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java b/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java
index c1af3068a7..c7b6c88e36 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java b/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java
index 445e7e5171..ae06fa821f 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java b/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java
index c28811f4cc..4631790d62 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java
index 17592afe47..7b41fe7d55 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java b/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java
index 08de0dbaca..4ec0b72512 100644
--- a/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java
index cec38dc16b..3179a3adc9 100644
--- a/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java
index 7a401c24d3..907f621809 100644
--- a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java
index fc29c8a0c1..f284362602 100644
--- a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java
index 7970724c43..d41930a6d9 100644
--- a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java
index 5bf9e38878..99bdcf324b 100644
--- a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java b/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java
index f42faa26a3..131bbd6fd9 100644
--- a/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java
index ce08465ae4..4ec552b217 100644
--- a/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java b/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java
index 698e3d07d0..a5ab2dc9d8 100644
--- a/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java
index 5c30bd6baf..64e940b522 100644
--- a/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java
index 94f31e0bfb..699d2eca64 100644
--- a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java
index 032abe67f4..592bf859a4 100644
--- a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java
index 875db8c319..fe93de4cae 100644
--- a/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java
index 0b5d532c33..69d5e94cc2 100644
--- a/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java
index 19b5cba0a1..2b8358d678 100644
--- a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java
+++ b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java b/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
index 4310c88371..bdaddb8c55 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java b/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
index cc78d086e5..4b5f6865c7 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 cbfeceb996..d4c086695e 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
index 5cd145bb30..9cf7432c43 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java
index b86d256a62..0c660ce0d6 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java
index 71025dbf6f..d211087b37 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
index d977f44576..252a5255e6 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java
index 8ecf30261d..e6b6646146 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
index 14185f7920..7e3200a3d5 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java b/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java
index 8eefbd7cc8..d0256cb1c7 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 e2061896c8..aa7d38943d 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
index d9860a38ba..482a8dc0c9 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java
index 693345dc62..d6ad87f02b 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
index 532f12c007..78f3b29a71 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
index 24337ad0c0..f01ac83100 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
index 2fb9c1378e..bf1808db81 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
index e9d43f4094..fe391c8805 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
index fed1e44a99..f5b2b5d0ec 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
index 11a9c147c9..d55909ebe0 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
index 70ff9111e9..df138bdc0a 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
index 969a90115d..7145d36b00 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
index fea0d11ac9..f19f6ac2c3 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
index 8dbfd91b21..51ec87b265 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
index 107391e0a2..65cf565287 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
index f69c1137ac..982b43064b 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java
index 638ae9d23a..79612bea39 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
index 006ef3b8b3..413a034ae7 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java
index b7ad70d01c..efbec34e4a 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java
index d256310dfe..326b7f977c 100644
--- a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java
+++ b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
index 8e91d93394..25bac95668 100644
--- a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
index df965959bc..01f27f23ff 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
index 731467a77c..fac5eba990 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java b/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
index ac6ed06d32..d26fea7332 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java
index 76a84a5341..6e6fde8405 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
index bd4910f1ae..1b60ca1606 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java b/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java
index c234ec1a18..b5380bd9d1 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java b/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java
index 5db61b3740..196caa86d2 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java b/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java
index 2e48388152..bf6f4c3967 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java b/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java
index a237550a01..e4831a6660 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java
index 57ebb3804b..40c34d52a6 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java
index 406efe17ac..2c2030f6bc 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java b/spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java
index 1d5a102d42..56cb13e474 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
index df7afdc1c8..5eda8a28d2 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java
index 8facfc5a6c..7bb67d4780 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java
index f3274c2e92..7076fe0f5f 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 8871368899..43518ee930 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java
index e98eb1c4f4..e8e9a351fe 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java
index 5c757474a0..8a6c2e4d46 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java b/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java
index 1a48ca044e..03b4a28af2 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java
index 457eb87d47..e574705c69 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
index 3a140590d5..707207574e 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java
index e6722d469c..cc07a9ae16 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java
index 312169b6fd..856d24ace5 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 4c897e2fd6..07bea12ee5 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java b/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java
index bf4647cb22..28736d0177 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java
index 514dd625e6..551eb287da 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java
index 8837a05eb4..1deed0c720 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 eea06e2706..f505b8bf5c 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java
index c4ef1953f5..32c66e68dd 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
index fbf824f5c5..b67ed6982b 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
index c6745d9d9b..c71f01d681 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
index 9d52c141b5..8fa8be22a3 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
index 2588187ddd..f6748ef890 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 5e7021b0f2..0f605308ad 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
index eeb0046bab..0d45ed9b9c 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java
index 9f6a0bddfd..debf7a9523 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java
index 055d42c797..a7d2abdfed 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
index f253c2a8b5..a5a632411d 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java
index 31c739cbd7..21e8e92baf 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
index 53f78b9a53..4b9314edf7 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
index 75133366d9..11f72759a7 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
index d60cf2f8af..fded50e167 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 47e6773bd4..35f30be7f7 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
index 2026ada3ba..e4ecffce74 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java b/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java
index 50d4cf7c38..aac7f91e5e 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 6381bea66d..d493e950b4 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-2010 the original author or authors.
+ * 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.
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 d622ff9799..de51a5425c 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-2010 the original author or authors.
+ * 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.
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 6d0f16f8ed..ef30ce0af4 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java
index 3b4a4c10da..1e2f4455c9 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java
index f3d62a4b82..6a1f9decf0 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
index b7e77b6f60..f1a63abc11 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java
index 8b73072267..9569dc1098 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
index 30bfd66a02..4bc84fb392 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java
index 7dab8d5618..b9e668fc57 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java
index c2188a108f..760d7b6951 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
index 85be9f8bca..fd6f184304 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java
index 0ba452e84f..98841f3cbe 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java
index 0083f2dd24..e3168e1b7b 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java
index 1d576966b5..bc1ffbc820 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 c9600ca0a1..bfb35698bc 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-2009 the original author or authors.
+ * 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.
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 c18ee98515..7b20382104 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java
index f7f429a798..b31eab96af 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
index 8d7df115f9..47d8319af6 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/beans/Colour.java b/spring-tx/src/test/java/org/springframework/beans/Colour.java
index 17fd24fec7..a992a2ebfc 100644
--- a/spring-tx/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-tx/src/test/java/org/springframework/beans/Colour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
index 8ada7848fa..c5360de531 100644
--- a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java
index c5c4ed5e67..e0ae5f20a3 100644
--- a/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/beans/IOther.java b/spring-tx/src/test/java/org/springframework/beans/IOther.java
index 6a8f74187c..d7fb346185 100644
--- a/spring-tx/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-tx/src/test/java/org/springframework/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
index e136978f9e..412891c439 100644
--- a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/beans/TestBean.java b/spring-tx/src/test/java/org/springframework/beans/TestBean.java
index 7a27cf0894..6d71de7576 100644
--- a/spring-tx/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-tx/src/test/java/org/springframework/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
index c1be3a5745..ea1ad34afd 100644
--- a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
+++ b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java
index 9142a73b5b..c7c1970cc3 100644
--- a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java
+++ b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java
index 2bd949d3ad..fb6259de93 100644
--- a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java
+++ b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java b/spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java
index 5cd19f8f02..9998d9af65 100644
--- a/spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java
+++ b/spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java b/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java
index bdab740fba..74953d4d37 100644
--- a/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java
+++ b/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
index ce88bbf03d..2038b8ecc0 100644
--- a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
+++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
index f8a7250621..ddbdc80069 100644
--- a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
+++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
index a7e40c6bf4..4e5a3281d4 100644
--- a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
+++ b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index 9b3d10470d..7173686606 100644
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
index 5ab0d31377..4e1641b2cd 100644
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
index 32908a306a..883db7bfd3 100644
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index 02996e490f..b1862dd893 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
index ecacf398aa..11566aeee7 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
index b2522b08a8..8bb6181200 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java
index 7c25061054..df1604401f 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java
index de79edcd74..e2066af4d9 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
index 579e1a815f..67f965a650 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
index e29ecca39f..2e42257b42 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java
index e76730f727..38c7e20d22 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
index 72f1bdac10..7808f43b99 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
index 16f29f90f6..7caafe92c2 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java
index a38057e108..21c5f5374f 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 564887d424..0f0deca866 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-2008 the original author or authors.
+ * 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.
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 11eff8c216..417859b43e 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
index 5768b1bd9b..d6a79128d0 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java b/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java
index 4ae36b3c1d..f7ecfb89c0 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
index ffad95f811..7a818f701b 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java
index 75e100602f..302026a7aa 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java
index 7c2eed8ac9..e21ded175d 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java
index 1e804de132..4778f5925d 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java
index a6cc819e62..0970132a94 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java
index d1884954fd..0a45d64be4 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java
index f32779ef36..327675aaa2 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java
index 81364f12b4..bfd9071cdc 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
index ff21ee0a8b..5aa4746542 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
index a9f3775b94..9b41bc3997 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java
index 7eaad371bf..aed9bdb27f 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
index 5f9d5ba630..12c70ed91c 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
index 7f699d8e90..99f791a532 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java b/spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java
index 7c1bfcfdc8..eac003d0c8 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 55a3f5188d..7137365507 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-2011 the original author or authors.
+ * 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.
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 ab13bc68c7..3e833d4459 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-2011 the original author or authors.
+ * 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.
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 de141afc41..9d39760479 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-2011 the original author or authors.
+ * 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.
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 c95a20c430..680225e928 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-2011 the original author or authors.
+ * 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.
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 23543c384f..f1ddc0080f 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-2010 the original author or authors.
+ * 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.
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 600082bfe4..a27bef02c4 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-2009 the original author or authors.
+ * 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.
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 4b7b747d2f..6271a198da 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-2009 the original author or authors.
+ * 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.
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 5c2cebb357..d8f8f33f97 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java
index ae0c080131..189bf9b218 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 1aee1d6a05..87cddf189f 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
index 9b819edc8d..28b6bd5087 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
index e02fb1e230..ff89f1bb86 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
index 55ffc30c63..5aba1cb154 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
index 7dd174260b..5a024973ea 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java
index 2177d0d297..7e894a53e4 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 7f6c8eeb64..18668f5300 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java
index 7a754e198b..373b301dc7 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java
index 9f6a53ef8b..610168c678 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java
index 1242cad121..9087aaf209 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java
index f6ef74740f..9713e21d21 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java
index 4a27d8b7a4..35d8afa8c5 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
index 1e642e3755..4a3d34185b 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java
index cf2cb7d221..65ff59c815 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 b9f2357dca..f41a2b8f92 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java
index 2c015834c3..0434e6174b 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java b/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
index 1f76983228..f76aad06fb 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 97be285920..a70b37386c 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java b/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java
index 84880225b5..448bd4eddf 100644
--- a/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java
+++ b/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java b/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
index 10863f82fc..67144395e2 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
index 7161989057..4d685333ca 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java
index d27a5dd628..24a69ad9eb 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java
index 2c28431a4c..240f29d8c2 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
index 83c0660e5a..2b59850fbc 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java
index febc333f2b..fa5d2c6746 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java
index 1bb0351ea6..0745e9494f 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
index 8adf208b32..4adf614f9a 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java
index d48e3d611d..175750c027 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
index a071859af9..7f469a4318 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java
index 760fd840ff..90191f1d8d 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java
index 3608d9c7e4..2f6096168e 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/MatrixVariable.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/MatrixVariable.java
index 73b1ab5682..1f29473baa 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/MatrixVariable.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/MatrixVariable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java
index 24ade7d0fd..9d094d75d3 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java
index 0782b22a67..43032ba598 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
index a6e90fb981..a299313dce 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java
index 6ea979dea5..04d7d8cb09 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java
index 3d2717c4c1..fda9ae23dd 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java
index b6c07ee59a..98ad9992b3 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java
index f9ea11e44b..4e77885aba 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
index 92b78c1721..bab588d5a4 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java b/spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java
index db5ce0aef9..47a9b103c7 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java b/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java
index 7eac9e58e9..f9d1d7c102 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java
index 6faa10fddc..143edb28e4 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java
index d10d7c81dd..03f13d86ff 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
index 3b14991df2..bc870ea5d5 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
index 31bc57888c..b4232ff47c 100644
--- a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
+++ b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java
index de03dc3669..39ddfe4dd1 100644
--- a/spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
index 5529a0dbb0..b9585787d8 100644
--- a/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java
index e65e7a7505..155eadeb7e 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java b/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
index 46dc423438..27202c36be 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
index 42615d3401..8570211fa3 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
index 839c13b5a6..f921d2a541 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java
index 820f57a2a1..2b0df14d95 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java
index b7c201f7fc..8286de1beb 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
index 20fe615e23..8cf39688a3 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 207e6a6c26..6c8ff6de88 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java
index a92085dfb7..b95814a00e 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java b/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java
index dedc298753..19bcb0d772 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 f45ef255aa..cce42d4c5f 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java b/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java
index 2ffa1e99fe..1a5089bd96 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
index c01de6e6fc..34df1b1de1 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java b/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
index 685a057142..343aad71c5 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
index fec95de6ff..6af3d80863 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java
index 97a9e86073..ea6cda9767 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 4dc22c2449..d5c3cdbf1c 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-2011 the original author or authors.
+ * 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.
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 e1e54b6b21..8ce1a65392 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
index 59b043910f..180645580f 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java
index 37e5d2519d..a2eca47b11 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java b/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java
index 7a64224ce0..15af5f435d 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 a0ef9e29fc..9aa2547d62 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-2010 the original author or authors.
+ * 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.
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 b85cb1e23e..a3551ff767 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
index 9864566193..816a52c3c1 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java b/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
index 45a76d97a0..5d9ea1a0d3 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
index 84c41caa59..d554e05cf5 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java
index f044157f48..4b3b4858bf 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 eb9edbaf16..3c2519f5a6 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-2006 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java
index 7dcaf3ebfc..949f0042e4 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
index cb4af40c70..be9f6888af 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
index f1ae54882d..712e50f341 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 c0ea3fc345..4d93eff7f2 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java
index 4f25d7633b..07c44b32a8 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
index 083e6fe5e5..92a2aa88d1 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java
index c7520687e1..b00f6e46d8 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java
index 5cac3e8eb6..ee5672cfa4 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java
index 57a622118e..e7b46bdb6a 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 79a49c1cad..e2a7b7d798 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-2011 the original author or authors.
+ * 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.
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 4b77ba622e..d97fe876d1 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-2011 the original author or authors.
+ * 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.
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 94aa67671e..36eb573b57 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-2005 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java
index 6aec889ab6..c4a74bdd0d 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 632e9fb472..86f73591a4 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java
index ed1ce75a97..f24bb2207d 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 93e0ee5b65..3fd05f9151 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-2007 the original author or authors.
+ * 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.
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 c50df92d4b..e05e110a7d 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-2011 the original author or authors.
+ * 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.
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 677613a61a..ae9ae6ecf1 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-2011 the original author or authors.
+ * 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.
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 92e20f3044..25f743befc 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-2011 the original author or authors.
+ * 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.
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 ab995b112f..ee0a9b7f65 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-2011 the original author or authors.
+ * 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.
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 ad002782ae..b78ad775f9 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
index 2d8c260ef6..1329c78232 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java
index 7d8e8dff17..9b6b909283 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
index 3d7c91cee0..0fc4ee78e8 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 23e9a81f66..2c93058c5b 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
index cb0367c2e2..ab7a710147 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java b/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
index 0d0e7de648..bf0ed911b4 100644
--- a/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java b/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java
index 6ee0c08626..0ca9e35d32 100644
--- a/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java b/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java
index 81d3e0f597..adeddf78af 100644
--- a/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java
+++ b/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/util/TagUtils.java b/spring-web/src/main/java/org/springframework/web/util/TagUtils.java
index cf8d45148c..ee9daf8fea 100644
--- a/spring-web/src/main/java/org/springframework/web/util/TagUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/TagUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 6682a0a009..a8699042e9 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java b/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
index 437216a969..832ea24d31 100644
--- a/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 0a901294a0..c7acf09502 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/beans/Colour.java b/spring-web/src/test/java/org/springframework/beans/Colour.java
index 17fd24fec7..a992a2ebfc 100644
--- a/spring-web/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-web/src/test/java/org/springframework/beans/Colour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
index 8ada7848fa..c5360de531 100644
--- a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java
index c5c4ed5e67..e0ae5f20a3 100644
--- a/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/beans/IOther.java b/spring-web/src/test/java/org/springframework/beans/IOther.java
index 6a8f74187c..d7fb346185 100644
--- a/spring-web/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-web/src/test/java/org/springframework/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
index e136978f9e..412891c439 100644
--- a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/beans/Person.java b/spring-web/src/test/java/org/springframework/beans/Person.java
index a78998ad5d..7c66f4b451 100644
--- a/spring-web/src/test/java/org/springframework/beans/Person.java
+++ b/spring-web/src/test/java/org/springframework/beans/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
index 9a2a3193df..dbe365f493 100644
--- a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
+++ b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/beans/TestBean.java b/spring-web/src/test/java/org/springframework/beans/TestBean.java
index e553f31f5b..1fc36aba37 100644
--- a/spring-web/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-web/src/test/java/org/springframework/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java
index f3d6eedefe..6fc7e36aa9 100644
--- a/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ b/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java b/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java
index a826a9c207..3ee1f452da 100644
--- a/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java
+++ b/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java b/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java
index 43dc47e3c6..18412ce33c 100644
--- a/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java
+++ b/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java b/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java
index 75f5db49b2..c8dfbfc079 100644
--- a/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java
+++ b/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java b/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java
index 113f3d4910..83add2ceaf 100644
--- a/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java
+++ b/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java
index 6adeed5eca..ccb91450a4 100644
--- a/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
index 7f1110d6ef..2344269b63 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java
index 803bd80d24..d29b2b7129 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
index 3f5171390d..2af8ea3816 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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/Jaxb2RootElementHttpMessageConverterTest.java
index e2545123fe..2f12bc988b 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/Jaxb2RootElementHttpMessageConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 a273cfffab..afafe13a36 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
index 17369efaa5..6617a787d5 100644
--- a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
+++ b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
index 6fec403c7e..de4b1e9f14 100644
--- a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
+++ b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java
index 4cd69cbb41..b109cdcd6d 100644
--- a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java
+++ b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
index 8c8686df69..a02fcae95b 100644
--- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java
index d55954f32e..200546dd02 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2004, 2005 Acegi Technology Pty Limited
- * Copyright 2006-2012 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java
index 69df4dd5f1..5af02f2cbe 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java
@@ -1,6 +1,6 @@
 /*
  * Copyright 2004, 2005 Acegi Technology Pty Limited
- * Copyright 2006-2012 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java
index d1af1f1fcc..2793790da6 100644
--- a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java
+++ b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ${YEAR} the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
index 0138ccd067..d74bf8a6ae 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
index 0eefcba0c7..ad49f664d1 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
index 7faee579e7..485f1a757e 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java
index 0ab7d46b39..a9e9b97e48 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
index 4ac6a73348..ba216f20bf 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java
index 4b700225e8..f93d915eca 100644
--- a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java
index 9acab34ec6..2fcd856e62 100644
--- a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 bd0c80565c..3e09c5e523 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java
index 918894fb5f..2110548d81 100644
--- a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java
+++ b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java b/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java
index 0320b88612..ca63af0236 100644
--- a/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java
+++ b/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java b/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java
index d2eab76bc3..1baf35219c 100644
--- a/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java
+++ b/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
index 3803551a63..9fb45c609a 100644
--- a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
index 0439504c8c..29585bb05d 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
index a7763c7a35..13b981b941 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
index e1aa117b1c..9785904d11 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java
index b3a1a4ecc1..c43b889215 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 74e7157d45..80c64e2954 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java
index ee051a334e..d741971ca5 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
index e41af64b5c..388d0ec21d 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java
index 74478d3376..fb6f8521b4 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
index 0893d4be7f..5ff78ab1e5 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java
index 64fefc1f73..758794d754 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java
index 693c33643b..630f2e89b7 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java
index 3ac235dcaf..69cc5ff3d3 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java
index 776731753d..88a495abf5 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java
index 32420d02e4..358fc9370e 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java
index 269b7ce045..43eef92bef 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java
index f8dbdbdc3e..12c490b777 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java
index bd56e6bda2..a6572e537f 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
index 2f074204e9..0007c187e4 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java
index 7e64034a49..d3fcbb4ce3 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java
index 5b0b1e40ae..b11a4707e4 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
index 07e60b45ad..b9df018158 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java
index 100b3fb0a7..dd2bb54909 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
index 6564db90d1..5dd52cfd49 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 e0a6eb783d..6a7e1c83db 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java
index 4d3c6e5277..cf52db05c3 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
index e1dfa25f9a..fe6348dd6d 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 ce44602bb6..d1c1b2ad2a 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-2009 the original author or authors.
+ * 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.
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 db031e1717..64365dfa48 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
index e5ae5a0095..9c3bff5f2a 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java
index 235a25f8fb..ae24f49208 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
index 5d9f1c4b15..dc7166db01 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java
index b23756f87c..4ac0d32e41 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
index 9c9391c498..2957d73aed 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java
index 5b2f7745d0..e53dcb0b6d 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java
index 53ead92e54..7037f83126 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java
index 7c4b8687e3..0911834e61 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 2be0716c96..5025a024e0 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
index f727716bb3..5ef81bb0ae 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
index bdab9c3380..c9cde4b1b0 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
index 9fb40675df..6026dd17b4 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
index c8b8b268f7..0489721509 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
index a2b8184f9a..a46f14b9b1 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
index b2a607f4e2..2cb58beffd 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java
index 233ba4fb86..dca2fd1717 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
index dc4b3c2288..271906d4a2 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
index edf58821fc..b901b5314e 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
index bd7971d5bb..e9f98b1cac 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
index ebb1bcc83f..d1d1451e59 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
index 8f93ba48af..38bfb5075e 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
index fa2dcb2606..ab4818effa 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
index db95e9edea..f8a1df3d20 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java
index 2839a209c3..3d679dccff 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java
index 47e5f5e345..980afcd3e9 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
index 6195038690..d9dae6dcdb 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java
index 17fd24fec7..a992a2ebfc 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
index 8ada7848fa..c5360de531 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java
index c5c4ed5e67..e0ae5f20a3 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java
index 6a8f74187c..d7fb346185 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
index e136978f9e..412891c439 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java
index 7a27cf0894..6d71de7576 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
index 9c8be8ac4c..b588561321 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java
index f3d6eedefe..6fc7e36aa9 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java
index 191b3509c7..013a65a0e4 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
index 17fd214598..b9a7925ad8 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java
index 2a624d5c97..7fa8a8263d 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
index fe8201644b..a720743520 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java
index bd15215911..f316363682 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java
index a4c79b2e2c..ab40da4b89 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
index c4d9b9ebb3..d580974a60 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
index a6381e92ba..e8f5e91dfb 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
index dbcfa62be3..7d154808d3 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java
index 2f5c773e0c..423cbb0c34 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java
index fcdc50acdc..28662358c0 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java
index cac1a83d5f..109133a2b6 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
index 8fa396de4d..beccbcf59a 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java
index c2c82febae..daa15e5156 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java
index af4725dea7..d29d7865c4 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java
index f7c846e028..1114d0081b 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java
index cbfb70bca1..0a48975f69 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
index 54201b8ec8..e269a621e1 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java
index 8731438d70..824df6f70d 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java
index 8d9157e1d2..cf7f48bb17 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java
index a37c747e12..902991ab98 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java
index d5dab011ce..2cbefb79c1 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
index 5ba423ed0e..f4e0dc98fd 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java
index 9fe6d6315f..513a6c8c9c 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java
index e589e6a103..963ae040f2 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java
index 53deff0916..89fe6a5b17 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java
index 672a51dcb7..8b9ed2e41a 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java
index 7f70be9a05..e359b0b52c 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java
index e889d92314..5878e7b96e 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java
index 00a267b1d8..4c7f45279b 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java
index 12b7fd4a39..a0cf72f022 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
index 6d2f6d74fa..93ddad81d0 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
index bb7e68319c..8a7150757a 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
index 0bed2747f1..6cb7e3ae5f 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java
index e0256a341d..7028c8bb33 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
index 128f169bb8..f4a1eeae4a 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java
index 765e4c6552..a40f0d47c0 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 13fafe991a..8aeeb819b5 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java
index 58118d7711..a5186f3b65 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java
index 405bc5d9fe..0773459f5e 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java
index 28b89a96cf..2f526c27e8 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java
index 5ae9880292..e52c722b2c 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
index 61a42a0257..9ec0c1be3b 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java
index f260a37505..b942d1dfb3 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java
index 4c071f7402..dea0e2c82a 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java
index d1b9f80628..26e4d9600f 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java
index 09206812b0..6cfd9440f4 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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 a1bd2834d9..e00e74589a 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java
index ef70c03718..873b7a5fad 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
index f68e3b8d2d..96080dd6c9 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java
index dc35d85acd..3cb40f68cf 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java
index af1d41ae3e..1f2f9a8d62 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java
index 93490aa461..2058bbb224 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
index c1bc5ab676..072476b61d 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java
index 66903c3b91..c291a8e74b 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-20011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
index 056fa247bc..db4ae5973d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java
index f200ccb119..1340775876 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 0b59d5f6d3..3ed6dbf357 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-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
index daf05bcf7e..791e169a01 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 bed0733813..d580afe766 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-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
index b07d4d5082..d58ea7de6a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
index 08bd4f6abd..ffb22c02f5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java
index d0a503ca37..7c47cd3aa8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 d280c8229c..b286661489 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java
index 209c1bc092..31539c1653 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 c44619e313..39c0cbd8b1 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-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java
index db6f31186c..dbc4ad5f3d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java
index 8e2429af86..e6a50cc2df 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java
index 68f0220540..d842b4d689 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
index 2b4af21e86..d1d887700b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 a0defb43f1..abf53b4e2c 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-2010 the original author or authors.
+ * 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.
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 8a05cf7382..97df07e544 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-2010 the original author or authors.
+ * 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.
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 d218be939c..e580aea38b 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java
index eaae024b2b..6b6f5d1acf 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
index 2daa59c476..178569b4c4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java
index b406d284ae..8ce3914180 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
index 914c9cfaa3..96fdcaf4e0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java
index 155aa38536..bc3b1738ce 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
index 9cbbadf4f1..fcc284989f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java
index 9cbc2c1489..c06bb4eeff 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 a86ed1ddb7..fdef487e48 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-2010 the original author or authors.
+ * 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.
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 0e74e57384..ea079c4938 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-2009 the original author or authors.
+ * 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.
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 4501a8fe37..5a4c7d9248 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
index f9b8cbc344..f7349c93de 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
index f9e1e7c393..8716f20cef 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
index 9f149b1949..e72e011c7a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
index e3ca75d02d..663786ff29 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java
index b581ca2b38..abef0a7ff7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 551c790d53..661bb62ac7 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-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
index 66f5bcae6a..94c7d03723 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
index a2abd43715..f56590f469 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 66f7b3990f..de1bdd57c7 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java
index fad6bb9dc9..6c4731ff1f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
index a6d5775463..a0ef16cc32 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
index f3a3939a10..da72de2f51 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java
index 8033b21fe8..14b1e82caa 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java
index 0b40a12d04..a53836a7a4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
index b34b7f9923..2f47edaa25 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java
index 87d6a01901..1bd9ef8970 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java
index b02d72d3cd..654062ed95 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
index 6ed540dcdd..8ca1b33a3d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
index f8365a1470..c5493d0ec6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 c96e356e60..73607f6d7f 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-2007 the original author or authors.
+ * 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.
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 79c8bf3851..10dffda157 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java
index c589641dde..030c2dca2c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
index 604bea9b6c..50a20e51b9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
index d4c6cccab3..d204e33e89 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java
index a7580c500a..0d58e8c134 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
index 62bbc4ebc7..5c0282f527 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
index dd050ca81c..3915ffc761 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 5328d5e799..921ecb249a 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-2011 the original author or authors.
+ * 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.
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 20b4ee8381..3ece7e8d73 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java
index 9df8949dac..986d9a4fe9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java
index 83a01ea56a..6bb9c81872 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 66d6e51009..294d4e6ed1 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-2011 the original author or authors.
+ * 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.
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 d6bce0d482..9824b80e0e 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-2011 the original author or authors.
+ * 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.
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 765ed74a64..6d0e3941e6 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-2011 the original author or authors.
+ * 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.
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 f271cfe479..14c74c6077 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java
index ee09382f23..8d3d77acd9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java
index 54a4e2265e..5513dddae0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java
index 444b45dce5..ed781d99c7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java
index 4df1b6acff..d67f3019f8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java
index 5dc2d264fa..00917177e8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 8c5d93844d..bd9405b65b 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
index ed43904a3f..3cbcb08a8f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 40f7aa68d5..7c4f94535f 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java
index c824754eb1..dfa46ec0ec 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java
index 6977c4e559..168781491f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java
index 34a3e0a2e8..4b8f9b33c5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
index daeaa970c5..d23b050cbc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java
index 27c0e25bbc..6db27a10d4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 4c1ca19ef1..0a928be3a4 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-2011 the original author or authors.
+ * 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.
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 e78a6ac549..c5f9e6a3e3 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
index 4b44bd9832..69d5cefe80 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 34d44b5c72..f568f36213 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-2008 the original author or authors.
+ * 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.
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 e5a7464621..3f586a9446 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
index a8ca8ca256..6dd24b7826 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 3cc1b41fca..7f759e8c97 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java
index 28e5aa5722..cf037fc115 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
index 0b6e91eb02..f5b45233e1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java
index 05fd7845a3..290c70f2a9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
index 73cf45267f..2c0056def4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
index dbf878f047..6ec63b58c8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
index 578c9e69ce..8e61045810 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
index 6e72f1f91d..05db5eb70a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
index c195208d98..a3a0c4c7f5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
index bc3ee3b24f..1f8ddd2843 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java
index d37d05a9eb..8909c3598d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java
index 32df5d7412..a99f4378bb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
index 8b222e3d3a..a0b62747ea 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
index 8e8091f5ff..b02021fbb6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java
index 370a842360..182247bf6f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
index 90f8b3ae56..a0379d8800 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
index 0bdaef89ce..370bf19688 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
index cebf23c64f..a1035d4da1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
index b526096c23..a0d569a509 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
index 08200ab8d9..67f62f3d36 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
index f0e48baaae..a31cc1ebe6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
index 5b70045309..6316ac8b3c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
index d1d3dcf9ed..1718b08fea 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
index be41b85a6e..5c431cc735 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
index 71ca75cd65..9d26dc554a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
index db85b752d2..d3468aed0b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
index 51a846808f..6244a2d537 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
index 29d6e93376..50cd7447ee 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
index 60a00ffe32..c05a446887 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 4b776488ad..f827631d62 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
index b1d32e4b86..7a6de1dd26 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
index a451f8840e..514d9400ab 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 474f9c913a..f8dd7f28e8 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
index 278887344a..3e9ee381ce 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
index 1c47096591..062b4900d4 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 02712da246..0c57b8dd9b 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 6ee579519a..02b5b9b7a8 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
index facbde6d24..3d4dc77995 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java
index 90033186c9..e95064e4f9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
index c840f3e847..e0afe0f431 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 63c41341ee..8446f9f2b1 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java
index 8062d17c57..ae4185f86f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
index a316367172..b4d2d914f8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
index c2ac715ca8..09539fbbb8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java
index c10ac1ee02..70ae90264b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 12ab0f5fea..2666098734 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-2005 the original author or authors.
+ * 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.
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 2c6bdee435..75aae57b61 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-2006 the original author or authors.
+ * 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.
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 766058f463..686f7a2708 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-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java
index 757a42aadf..9e17d98f8f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 066242271d..a8ca84e664 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
index c73b81cc18..9ffb54e7b7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 b19385c107..83c2bb55c2 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-2010 the original author or authors.
+ * 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.
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 9b50d346d6..cd55f05377 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
index 164f51b2b5..7906b33f04 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 22e6a1fafc..2726e0537c 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-2009 the original author or authors.
+ * 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.
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 f9b4a77e31..56a3a3effb 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-2009 the original author or authors.
+ * 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.
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 68ecc69edb..59b45a8a80 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 0050f40313..2ce37aeea3 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-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
index 34bc3071cf..8940255709 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
index 6773d689c8..643231404a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java
index 6ace4da3fe..f2a579bef6 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java
index 61ba6142ef..f8297f3b14 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java
index b6bc188d17..83ac59115c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 54cbae7e85..00bb4439fb 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java
index 4d7199e71e..f10937f2e2 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 d496d56fd0..f646898b93 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java
index 712b7ca740..33ae346f0a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
index 84fe7d1d03..ef4faaf2e0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 6f1e2b9b0c..050aad09cf 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java
index f8b7c47592..9bffdadf10 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java
index 1eaf045c1f..5d547a639e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java
index 0933aeb57c..65493af17c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 8678b62e58..873421473e 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java
index 5a8081c30b..d094d75e9f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 d0eec2ea82..11ce8c62d8 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 dd68939008..c08daa0a85 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 2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java
index 1db1ef7da7..24a6d018db 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
index 7fad0bf329..9753b9b576 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 cb731e19de..8ba15e391c 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-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/Colour.java b/spring-webmvc/src/test/java/org/springframework/beans/Colour.java
index 17fd24fec7..a992a2ebfc 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/Colour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
index 8ada7848fa..c5360de531 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java
index c5c4ed5e67..e0ae5f20a3 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/IOther.java b/spring-webmvc/src/test/java/org/springframework/beans/IOther.java
index 6a8f74187c..d7fb346185 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
index e136978f9e..412891c439 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/Person.java b/spring-webmvc/src/test/java/org/springframework/beans/Person.java
index a78998ad5d..7c66f4b451 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/Person.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
index 9a2a3193df..dbe365f493 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java
index 7a27cf0894..6d71de7576 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java
index f3d6eedefe..6fc7e36aa9 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java
index 191b3509c7..013a65a0e4 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
index 17fd214598..b9a7925ad8 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java
index 3a77af2f71..ac3b91c5ff 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc/src/test/java/org/springframework/context/ACATester.java
index 2a624d5c97..7fa8a8263d 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/ACATester.java
+++ b/spring-webmvc/src/test/java/org/springframework/context/ACATester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java
index bd15215911..f316363682 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java
+++ b/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java b/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java
index a4c79b2e2c..ab40da4b89 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java
+++ b/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java b/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java
index 113f3d4910..83add2ceaf 100644
--- a/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java
+++ b/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
index 2e0e3a0d3c..161475869f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java
index 018dd1cfeb..7276af86ae 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java
index 2272378104..9363468268 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 17bbabaa3d..1e44c2f815 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java
index dba9624609..f9ad57ba05 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
index 85a0756fb7..dbbb25fe5a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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 c55aeb7d0c..3f72adf22e 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java
index 888cdfe9b2..0695958fa7 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java
index 53cb85a215..e8025b835a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java
index b8fa5d7e66..eb05fe9bba 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
index 43c8c22dd6..3d77c29237 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
index 43c83b7ef4..8a0518c560 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
index 2fcc677126..4d5b846832 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java
index 976fcb923e..95a8e0ddf0 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
index 6f22532bdc..9876450099 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java
index 3795717267..5ac42a02d0 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
index 8148682f0f..3c5f120759 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
index bff2b1eef9..fc6321a2c4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java
index 49d305cc4e..4231d24ad2 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
index 9beea85f11..d0113f95fe 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
index 3937e95dc1..edabd11d4f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
index ebe0e344a2..1d299c222a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
index 77e0a6fa31..70aae8f0e4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
index b0baea7884..055580d5a3 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
index 26828da7bd..60beaccb6d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
index 878b666d1a..7ca869480b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java
index c2fcc67a0d..e3cd3eab0d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
index cfb6528ae7..7144652045 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
index 50485dec42..c4787c0105 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
index 12652ed2e6..bcb5eeebaf 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
index de6e902eb2..93f6a04080 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java
index 127656b978..fd2674f9ab 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java
index 82de492c30..9c64ac0e26 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
index 2fc7c3100e..4684b5b659 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java
index 56feded2d6..654378cf36 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java
index 8b49f3ba55..962b3fa33c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
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
index 046d3cfc55..3f248d1931 100644
--- 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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
index 349f455f3e..2c509c4973 100644
--- 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java
index 09cb2aa70b..7b32ec733c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
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
index 093afd7853..bbb12663c2 100644
--- 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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
index b7b1e9ebea..0ad16202a3 100644
--- 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java
index 6fbf2076b6..0ab3e04aaf 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java
index 2f09e9bf0f..4b3b6f0cd6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java
index 92f0b4c4bf..63c320b73f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java
index bf51bed1c7..69f8ea613a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
index 231ae393a2..7472033a36 100644
--- a/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
+++ b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
index 93a34f1466..74ff0825e6 100644
--- a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
+++ b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java b/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java
index 01155d3f3b..0f0fc64ac8 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-2011 the original author or authors.
+ * 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.
diff --git a/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
index 89964f2e85..b213a2a4e0 100644
--- a/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
+++ b/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java
index 194c455f21..baa911c8f2 100644
--- a/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java
+++ b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
index 9ee6eb4a8c..e0712b69c6 100644
--- a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
+++ b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java
index ee65521d4d..f30afd1ca1 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-2010 the original author or authors.
+ * 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.
diff --git a/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java b/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java
index 8901024548..8028a4cf0f 100644
--- a/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java
+++ b/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java b/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java
index e095fd1e56..366f338f11 100644
--- a/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java
+++ b/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java b/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java
index 0ddec74625..5fe702c3be 100644
--- a/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java
+++ b/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java
@@ -1,3 +1,19 @@
+/*
+ * 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.expression.spel.support;
 
 import java.lang.reflect.Method;
diff --git a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
index 943a9e1e1b..ff94b0dd22 100644
--- a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
@@ -1,6 +1,5 @@
-package org.springframework.transaction;
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
@@ -15,6 +14,8 @@ package org.springframework.transaction;
  * limitations under the License.
  */
 
+package org.springframework.transaction;
+
 
 
 import org.springframework.transaction.support.AbstractPlatformTransactionManager;
diff --git a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
index ced09c321f..d4f33e642e 100644
--- a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
+++ b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java b/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java
index 26bc6fdb19..a3b509d8a7 100644
--- a/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java
+++ b/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/advice/CountingAfterReturningAdvice.java b/src/test/java/test/advice/CountingAfterReturningAdvice.java
index fe373ecc7e..a8a3a01e3a 100644
--- a/src/test/java/test/advice/CountingAfterReturningAdvice.java
+++ b/src/test/java/test/advice/CountingAfterReturningAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/advice/CountingBeforeAdvice.java b/src/test/java/test/advice/CountingBeforeAdvice.java
index 89fc45aeb5..5aa37b61e1 100644
--- a/src/test/java/test/advice/CountingBeforeAdvice.java
+++ b/src/test/java/test/advice/CountingBeforeAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/advice/MethodCounter.java b/src/test/java/test/advice/MethodCounter.java
index 8c29886a3d..e0e45d6f14 100644
--- a/src/test/java/test/advice/MethodCounter.java
+++ b/src/test/java/test/advice/MethodCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/beans/Colour.java b/src/test/java/test/beans/Colour.java
index 5be4dfa761..533d0df36e 100644
--- a/src/test/java/test/beans/Colour.java
+++ b/src/test/java/test/beans/Colour.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/beans/INestedTestBean.java b/src/test/java/test/beans/INestedTestBean.java
index 1023dbbc13..2b63908467 100644
--- a/src/test/java/test/beans/INestedTestBean.java
+++ b/src/test/java/test/beans/INestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/beans/IOther.java b/src/test/java/test/beans/IOther.java
index 80fe4e8498..f0c6aa7bf4 100644
--- a/src/test/java/test/beans/IOther.java
+++ b/src/test/java/test/beans/IOther.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/beans/ITestBean.java b/src/test/java/test/beans/ITestBean.java
index c452bdc1dd..0434b6ad11 100644
--- a/src/test/java/test/beans/ITestBean.java
+++ b/src/test/java/test/beans/ITestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/beans/IndexedTestBean.java b/src/test/java/test/beans/IndexedTestBean.java
index 951b732346..160681e556 100644
--- a/src/test/java/test/beans/IndexedTestBean.java
+++ b/src/test/java/test/beans/IndexedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/beans/NestedTestBean.java b/src/test/java/test/beans/NestedTestBean.java
index 610931b50c..c6d1acd27b 100644
--- a/src/test/java/test/beans/NestedTestBean.java
+++ b/src/test/java/test/beans/NestedTestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/beans/Pet.java b/src/test/java/test/beans/Pet.java
index b62b5c8bf3..f81ac4f092 100644
--- a/src/test/java/test/beans/Pet.java
+++ b/src/test/java/test/beans/Pet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/beans/TestBean.java b/src/test/java/test/beans/TestBean.java
index d237316c8a..b76f12a75e 100644
--- a/src/test/java/test/beans/TestBean.java
+++ b/src/test/java/test/beans/TestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/interceptor/NopInterceptor.java b/src/test/java/test/interceptor/NopInterceptor.java
index ccda818994..b1cdf832a4 100644
--- a/src/test/java/test/interceptor/NopInterceptor.java
+++ b/src/test/java/test/interceptor/NopInterceptor.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/interceptor/SerializableNopInterceptor.java b/src/test/java/test/interceptor/SerializableNopInterceptor.java
index f33e0d1e1b..d2fbdc584a 100644
--- a/src/test/java/test/interceptor/SerializableNopInterceptor.java
+++ b/src/test/java/test/interceptor/SerializableNopInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/src/test/java/test/util/SerializationTestUtils.java b/src/test/java/test/util/SerializationTestUtils.java
index 132bd33d4e..e9bc9fee04 100644
--- a/src/test/java/test/util/SerializationTestUtils.java
+++ b/src/test/java/test/util/SerializationTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.

From 9c2046c3ee6a1c3699346bf7bdea27b483be2b86 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 28 Dec 2012 15:00:00 +0100
Subject: [PATCH 34/36] Update main source and target JDK compatibility

Update source and target compatibility from 1.5 to 1.6, meaning that
@Override is now allowed on implementations of interface methods within
main classes.

Issue: SPR-10130
---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index b2e7af70c6..7cc210cf45 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,8 +33,8 @@ configure(allprojects) {
 	group = "org.springframework"
 
 	compileJava {
-		sourceCompatibility=1.5
-		targetCompatibility=1.5
+		sourceCompatibility=1.6
+		targetCompatibility=1.6
 	}
 	compileTestJava {
 		sourceCompatibility=1.7

From 3b40ce76bf751d788f57064bb692ceb8804a58af Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 28 Dec 2012 14:00:16 +0100
Subject: [PATCH 35/36] Add @Override annotations to main sources

Issue: SPR-10130
---
 .../org/springframework/aop/TargetSource.java |   1 +
 .../springframework/aop/TrueClassFilter.java  |   1 +
 .../aop/TrueMethodMatcher.java                |   3 +
 .../org/springframework/aop/TruePointcut.java |   2 +
 .../aop/aspectj/AbstractAspectJAdvice.java    |   4 +
 .../AspectJAdviceParameterNameDiscoverer.java |   2 +
 .../aop/aspectj/AspectJAfterAdvice.java       |   3 +
 .../aspectj/AspectJAfterReturningAdvice.java  |   3 +
 .../aspectj/AspectJAfterThrowingAdvice.java   |   3 +
 .../aop/aspectj/AspectJAroundAdvice.java      |   3 +
 .../aspectj/AspectJExpressionPointcut.java    |  20 ++++
 .../AspectJExpressionPointcutAdvisor.java     |   1 +
 .../aspectj/AspectJMethodBeforeAdvice.java    |   3 +
 .../aop/aspectj/AspectJPointcutAdvisor.java   |   4 +
 .../aspectj/AspectJWeaverMessageHandler.java  |   4 +
 .../aop/aspectj/DeclareParentsAdvisor.java    |   6 +
 .../MethodInvocationProceedingJoinPoint.java  |  28 +++++
 .../aop/aspectj/RuntimeTestWalker.java        |   9 ++
 .../aspectj/SimpleAspectInstanceFactory.java  |   3 +
 .../SingletonAspectInstanceFactory.java       |   3 +
 .../aop/aspectj/TypePatternClassFilter.java   |   1 +
 .../AbstractAspectJAdvisorFactory.java        |   4 +
 .../BeanFactoryAspectInstanceFactory.java     |   4 +
 ...ntiationModelAwarePointcutAdvisorImpl.java |  11 ++
 ...ngletonAspectInstanceFactoryDecorator.java |   4 +
 .../ReflectiveAspectJAdvisorFactory.java      |   7 ++
 ...pleMetadataAwareAspectInstanceFactory.java |   1 +
 ...tonMetadataAwareAspectInstanceFactory.java |   1 +
 .../AspectJAwareAdvisorAutoProxyCreator.java  |   2 +
 .../AspectJPrecedenceComparator.java          |   1 +
 ...erceptorDrivenBeanDefinitionDecorator.java |   1 +
 .../config/AdvisorComponentDefinition.java    |   2 +
 .../aop/config/AopNamespaceHandler.java       |   1 +
 .../AspectJAutoProxyBeanDefinitionParser.java |   1 +
 .../config/ConfigBeanDefinitionParser.java    |   1 +
 .../aop/config/MethodLocatingFactoryBean.java |   4 +
 .../config/PointcutComponentDefinition.java   |   2 +
 .../ScopedProxyBeanDefinitionDecorator.java   |   1 +
 ...BeanFactoryAwareAspectInstanceFactory.java |   4 +
 .../SpringConfiguredBeanDefinitionParser.java |   1 +
 .../AbstractAdvisingBeanPostProcessor.java    |   4 +
 .../AbstractSingletonProxyFactoryBean.java    |   5 +
 .../aop/framework/AdvisedSupport.java         |  19 ++++
 .../aop/framework/CglibAopProxy.java          |  13 +++
 .../framework/DefaultAdvisorChainFactory.java |   1 +
 .../aop/framework/DefaultAopProxyFactory.java |   1 +
 .../aop/framework/JdkDynamicAopProxy.java     |   3 +
 .../aop/framework/ProxyFactoryBean.java       |   7 ++
 .../framework/ReflectiveMethodInvocation.java |  11 ++
 .../AdvisorAdapterRegistrationManager.java    |   2 +
 .../adapter/AfterReturningAdviceAdapter.java  |   2 +
 .../AfterReturningAdviceInterceptor.java      |   1 +
 .../DefaultAdvisorAdapterRegistry.java        |   3 +
 .../adapter/MethodBeforeAdviceAdapter.java    |   2 +
 .../MethodBeforeAdviceInterceptor.java        |   1 +
 .../adapter/ThrowsAdviceAdapter.java          |   2 +
 .../adapter/ThrowsAdviceInterceptor.java      |   1 +
 .../autoproxy/AbstractAutoProxyCreator.java   |  11 ++
 .../DefaultAdvisorAutoProxyCreator.java       |   1 +
 ...ctBeanFactoryBasedTargetSourceCreator.java |   3 +
 .../interceptor/AbstractTraceInterceptor.java |   1 +
 .../AsyncExecutionAspectSupport.java          |   1 +
 .../AsyncExecutionInterceptor.java            |   3 +
 .../ConcurrencyThrottleInterceptor.java       |   1 +
 .../interceptor/ExposeBeanNameAdvisors.java   |   2 +
 .../ExposeInvocationInterceptor.java          |   2 +
 .../aop/scope/DefaultScopedObject.java        |   2 +
 .../aop/scope/ScopedProxyFactoryBean.java     |   4 +
 .../AbstractBeanFactoryPointcutAdvisor.java   |   2 +
 .../support/AbstractExpressionPointcut.java   |   1 +
 .../AbstractGenericPointcutAdvisor.java       |   1 +
 .../aop/support/AbstractPointcutAdvisor.java  |   2 +
 .../support/AbstractRegexpMethodPointcut.java |   1 +
 .../aop/support/ClassFilters.java             |   2 +
 .../aop/support/ComposablePointcut.java       |   2 +
 .../aop/support/ControlFlowPointcut.java      |   6 +
 .../DefaultBeanFactoryPointcutAdvisor.java    |   1 +
 .../support/DefaultIntroductionAdvisor.java   |   7 ++
 .../aop/support/DefaultPointcutAdvisor.java   |   1 +
 ...erTargetObjectIntroductionInterceptor.java |   1 +
 .../DelegatingIntroductionInterceptor.java    |   1 +
 .../aop/support/DynamicMethodMatcher.java     |   2 +
 .../support/DynamicMethodMatcherPointcut.java |   2 +
 .../aop/support/IntroductionInfoSupport.java  |   1 +
 .../aop/support/MethodMatchers.java           |   8 ++
 .../aop/support/NameMatchMethodPointcut.java  |   1 +
 .../NameMatchMethodPointcutAdvisor.java       |   1 +
 .../aop/support/Pointcuts.java                |   2 +
 .../support/RegexpMethodPointcutAdvisor.java  |   1 +
 .../aop/support/RootClassFilter.java          |   1 +
 .../aop/support/StaticMethodMatcher.java      |   2 +
 .../support/StaticMethodMatcherPointcut.java  |   2 +
 .../StaticMethodMatcherPointcutAdvisor.java   |   4 +
 .../annotation/AnnotationClassFilter.java     |   1 +
 .../AnnotationMatchingPointcut.java           |   2 +
 .../annotation/AnnotationMethodMatcher.java   |   1 +
 .../AbstractBeanFactoryBasedTargetSource.java |   4 +
 .../AbstractLazyCreationTargetSource.java     |   4 +
 .../target/AbstractPoolingTargetSource.java   |   2 +
 .../aop/target/CommonsPoolTargetSource.java   |   8 ++
 .../aop/target/EmptyTargetSource.java         |   4 +
 .../aop/target/HotSwappableTargetSource.java  |   4 +
 .../aop/target/LazyInitTargetSource.java      |   1 +
 .../aop/target/PrototypeTargetSource.java     |   1 +
 .../aop/target/SimpleBeanTargetSource.java    |   1 +
 .../aop/target/SingletonTargetSource.java     |   4 +
 .../aop/target/ThreadLocalTargetSource.java   |   5 +
 .../AbstractRefreshableTargetSource.java      |   7 ++
 .../beans/AbstractPropertyAccessor.java       |   9 ++
 .../beans/BeanMetadataAttribute.java          |   1 +
 .../beans/BeanMetadataAttributeAccessor.java  |   1 +
 .../beans/BeanWrapperImpl.java                |  17 +++
 .../beans/DirectFieldAccessor.java            |   4 +
 .../beans/ExtendedBeanInfo.java               |   9 ++
 .../beans/ExtendedBeanInfoFactory.java        |   2 +
 .../beans/MethodInvocationException.java      |   1 +
 .../beans/MutablePropertyValues.java          |   5 +
 .../beans/PropertyEditorRegistrySupport.java  |   3 +
 .../beans/TypeConverterSupport.java           |   3 +
 .../beans/TypeMismatchException.java          |   1 +
 .../access/SingletonBeanFactoryLocator.java   |   3 +
 .../AnnotatedGenericBeanDefinition.java       |   1 +
 .../AnnotationBeanWiringInfoResolver.java     |   1 +
 .../AutowiredAnnotationBeanPostProcessor.java |   3 +
 .../annotation/CustomAutowireConfigurer.java  |   3 +
 ...nitDestroyAnnotationBeanPostProcessor.java |   5 +
 ...erAnnotationAutowireCandidateResolver.java |   3 +
 .../RequiredAnnotationBeanPostProcessor.java  |   3 +
 .../factory/config/AbstractFactoryBean.java   |   8 ++
 .../factory/config/BeanDefinitionHolder.java  |   1 +
 .../config/BeanReferenceFactoryBean.java      |   6 +
 .../factory/config/CommonsLogFactoryBean.java |   4 +
 .../config/ConstructorArgumentValues.java     |   1 +
 .../config/CustomEditorConfigurer.java        |   4 +
 .../factory/config/CustomScopeConfigurer.java |   3 +
 .../factory/config/DeprecatedBeanWarner.java  |   1 +
 .../config/FieldRetrievingFactoryBean.java    |   6 +
 ...ntiationAwareBeanPostProcessorAdapter.java |   8 ++
 .../config/MethodInvokingFactoryBean.java     |   6 +
 .../ObjectFactoryCreatingFactoryBean.java     |   1 +
 .../config/PlaceholderConfigurerSupport.java  |   2 +
 .../PreferencesPlaceholderConfigurer.java     |   1 +
 .../factory/config/PropertiesFactoryBean.java |   4 +
 .../config/PropertyPathFactoryBean.java       |   5 +
 .../config/PropertyPlaceholderConfigurer.java |   2 +
 .../config/PropertyResourceConfigurer.java    |   2 +
 .../config/ProviderCreatingFactoryBean.java   |   1 +
 .../config/RuntimeBeanNameReference.java      |   2 +
 .../factory/config/RuntimeBeanReference.java  |   2 +
 .../config/ServiceLocatorFactoryBean.java     |   6 +
 .../factory/config/TypedStringValue.java      |   1 +
 .../parsing/AbstractComponentDefinition.java  |   4 +
 .../factory/parsing/AliasDefinition.java      |   1 +
 .../parsing/BeanComponentDefinition.java      |   5 +
 .../parsing/CompositeComponentDefinition.java |   2 +
 .../parsing/EmptyReaderEventListener.java     |   4 +
 .../parsing/FailFastProblemReporter.java      |   3 +
 .../factory/parsing/ImportDefinition.java     |   1 +
 .../factory/parsing/NullSourceExtractor.java  |   1 +
 .../parsing/PassThroughSourceExtractor.java   |   1 +
 .../AbstractAutowireCapableBeanFactory.java   |  19 ++++
 .../support/AbstractBeanDefinition.java       |  25 ++++
 .../support/AbstractBeanDefinitionReader.java |   8 ++
 .../factory/support/AbstractBeanFactory.java  |  42 +++++++
 .../beans/factory/support/AutowireUtils.java  |   3 +
 .../support/BeanDefinitionResource.java       |   2 +
 ...CglibSubclassingInstantiationStrategy.java |   3 +
 .../factory/support/ChildBeanDefinition.java  |   2 +
 .../factory/support/ConstructorResolver.java  |   3 +
 .../support/DefaultBeanNameGenerator.java     |   1 +
 .../support/DefaultListableBeanFactory.java   |  21 ++++
 .../support/DefaultSingletonBeanRegistry.java |   5 +
 .../support/DisposableBeanAdapter.java        |   6 +
 .../support/FactoryBeanRegistrySupport.java   |   2 +
 .../support/GenericBeanDefinition.java        |   2 +
 .../beans/factory/support/ManagedList.java    |   3 +
 .../beans/factory/support/ManagedMap.java     |   3 +
 .../factory/support/ManagedProperties.java    |   3 +
 .../beans/factory/support/ManagedSet.java     |   3 +
 .../beans/factory/support/MethodOverride.java |   1 +
 .../PropertiesBeanDefinitionReader.java       |   1 +
 .../factory/support/RootBeanDefinition.java   |   2 +
 .../SimpleAutowireCandidateResolver.java      |   2 +
 .../support/SimpleBeanDefinitionRegistry.java |   7 ++
 .../support/SimpleInstantiationStrategy.java  |   6 +
 .../SimpleSecurityContextProvider.java        |   1 +
 .../support/StaticListableBeanFactory.java    |  19 ++++
 .../factory/wiring/BeanConfigurerSupport.java |   3 +
 .../ClassNameBeanWiringInfoResolver.java      |   1 +
 .../xml/AbstractBeanDefinitionParser.java     |   1 +
 .../beans/factory/xml/BeansDtdResolver.java   |   1 +
 .../DefaultBeanDefinitionDocumentReader.java  |   2 +
 .../factory/xml/DefaultDocumentLoader.java    |   1 +
 .../xml/DefaultNamespaceHandlerResolver.java  |   1 +
 .../factory/xml/DelegatingEntityResolver.java |   1 +
 .../xml/DocumentDefaultsDefinition.java       |   1 +
 .../factory/xml/NamespaceHandlerSupport.java  |   2 +
 .../factory/xml/PluggableSchemaResolver.java  |   1 +
 .../SimpleConstructorNamespaceHandler.java    |   3 +
 .../xml/SimplePropertyNamespaceHandler.java   |   3 +
 .../factory/xml/UtilNamespaceHandler.java     |   1 +
 .../factory/xml/XmlBeanDefinitionReader.java  |   1 +
 .../beans/support/MutableSortDefinition.java  |   3 +
 .../beans/support/PropertyComparator.java     |   1 +
 .../support/ResourceEditorRegistrar.java      |   1 +
 .../cache/ehcache/EhCacheCache.java           |   6 +
 .../cache/ehcache/EhCacheFactoryBean.java     |   5 +
 .../ehcache/EhCacheManagerFactoryBean.java    |   5 +
 .../cache/jcache/JCacheCache.java             |   6 +
 .../jcache/JCacheManagerFactoryBean.java      |   6 +
 .../TransactionAwareCacheDecorator.java       |   6 +
 .../TransactionAwareCacheManagerProxy.java    |   3 +
 .../mail/SimpleMailMessage.java               |  11 ++
 .../javamail/ConfigurableMimeFileTypeMap.java |   1 +
 .../mail/javamail/JavaMailSenderImpl.java     |   8 ++
 .../mail/javamail/MimeMailMessage.java        |  11 ++
 .../mail/javamail/MimeMessageHelper.java      |   4 +
 .../commonj/DelegatingTimerListener.java      |   1 +
 .../scheduling/commonj/DelegatingWork.java    |   3 +
 .../commonj/TimerManagerAccessor.java         |   5 +
 .../commonj/TimerManagerFactoryBean.java      |   4 +
 .../commonj/TimerManagerTaskScheduler.java    |   9 ++
 .../commonj/WorkManagerTaskExecutor.java      |  10 ++
 .../quartz/AdaptableJobFactory.java           |   1 +
 .../scheduling/quartz/CronTriggerBean.java    |   3 +
 .../quartz/CronTriggerFactoryBean.java        |   5 +
 .../scheduling/quartz/DelegatingJob.java      |   1 +
 .../scheduling/quartz/JobDetailBean.java      |   3 +
 .../quartz/JobDetailFactoryBean.java          |   6 +
 .../quartz/LocalDataSourceJobStore.java       |   4 +
 .../quartz/LocalTaskExecutorThreadPool.java   |   5 +
 .../MethodInvokingJobDetailFactoryBean.java   |   7 ++
 .../scheduling/quartz/QuartzJobBean.java      |   1 +
 .../quartz/ResourceLoaderClassLoadHelper.java |   5 +
 .../scheduling/quartz/SchedulerAccessor.java  |   1 +
 .../quartz/SchedulerAccessorBean.java         |   2 +
 .../quartz/SchedulerFactoryBean.java          |  13 +++
 .../quartz/SimpleThreadPoolTaskExecutor.java  |   7 ++
 .../scheduling/quartz/SimpleTriggerBean.java  |   3 +
 .../quartz/SimpleTriggerFactoryBean.java      |   5 +
 .../quartz/SpringBeanJobFactory.java          |   1 +
 .../FreeMarkerConfigurationFactoryBean.java   |   4 +
 .../ui/freemarker/SpringTemplateLoader.java   |   4 +
 .../ui/velocity/CommonsLoggingLogSystem.java  |   2 +
 .../velocity/VelocityEngineFactoryBean.java   |   4 +
 .../AbstractCachingConfiguration.java         |   1 +
 .../CachingConfigurationSelector.java         |   1 +
 .../SpringCacheAnnotationParser.java          |   1 +
 .../cache/concurrent/ConcurrentMapCache.java  |   6 +
 .../ConcurrentMapCacheFactoryBean.java        |   5 +
 .../concurrent/ConcurrentMapCacheManager.java |   2 +
 ...tationDrivenCacheBeanDefinitionParser.java |   1 +
 .../cache/config/CacheNamespaceHandler.java   |   1 +
 .../AbstractFallbackCacheOperationSource.java |   1 +
 ...eanFactoryCacheOperationSourceAdvisor.java |   1 +
 .../cache/interceptor/CacheAspectSupport.java |   1 +
 .../cache/interceptor/CacheInterceptor.java   |   2 +
 .../CacheOperationSourcePointcut.java         |   1 +
 .../CompositeCacheOperationSource.java        |   1 +
 .../interceptor/DefaultKeyGenerator.java      |   1 +
 .../NameMatchCacheOperationSource.java        |   1 +
 .../cache/support/AbstractCacheManager.java   |   3 +
 .../cache/support/CompositeCacheManager.java  |   3 +
 .../cache/support/NoOpCacheManager.java       |   8 ++
 .../cache/support/SimpleValueWrapper.java     |   1 +
 .../ConfigurableApplicationContext.java       |   2 +
 .../access/ContextBeanFactoryReference.java   |   2 +
 .../access/ContextJndiBeanFactoryLocator.java |   1 +
 .../annotation/AdviceModeImportSelector.java  |   1 +
 .../AnnotationBeanNameGenerator.java          |   1 +
 .../AnnotationConfigBeanDefinitionParser.java |   1 +
 .../AnnotationScopeMetadataResolver.java      |   1 +
 .../annotation/AspectJAutoProxyRegistrar.java |   1 +
 .../annotation/AutoProxyRegistrar.java        |   1 +
 ...athScanningCandidateComponentProvider.java |   2 +
 .../CommonAnnotationBeanPostProcessor.java    |   4 +
 .../ComponentScanBeanDefinitionParser.java    |   1 +
 ...onfigurationClassBeanDefinitionReader.java |   1 +
 .../ConfigurationClassEnhancer.java           |   5 +
 .../annotation/ConfigurationClassParser.java  |   2 +
 .../ConfigurationClassPostProcessor.java      |   9 ++
 .../Jsr330ScopeMetadataResolver.java          |   1 +
 .../LoadTimeWeavingConfiguration.java         |   2 +
 .../annotation/MBeanExportConfiguration.java  |   2 +
 .../ScannedGenericBeanDefinition.java         |   1 +
 .../config/ContextNamespaceHandler.java       |   1 +
 .../SpringConfiguredBeanDefinitionParser.java |   1 +
 .../AbstractApplicationEventMulticaster.java  |   6 +
 .../event/EventPublicationInterceptor.java    |   3 +
 .../GenericApplicationListenerAdapter.java    |   4 +
 .../SimpleApplicationEventMulticaster.java    |   2 +
 .../event/SourceFilteringListener.java        |   4 +
 .../BeanExpressionContextAccessor.java        |   5 +
 .../expression/BeanFactoryAccessor.java       |   5 +
 .../expression/BeanFactoryResolver.java       |   1 +
 .../expression/EnvironmentAccessor.java       |   5 +
 .../context/expression/MapAccessor.java       |   5 +
 .../StandardBeanExpressionResolver.java       |   4 +
 .../context/i18n/SimpleLocaleContext.java     |   1 +
 .../support/AbstractApplicationContext.java   |  52 +++++++++
 .../support/AbstractMessageSource.java        |   5 +
 ...ctRefreshableConfigApplicationContext.java |   2 +
 .../ApplicationContextAwareProcessor.java     |   4 +
 .../support/ApplicationObjectSupport.java     |   1 +
 .../support/ContextTypeMatchClassLoader.java  |   1 +
 .../support/ConversionServiceFactoryBean.java |   4 +
 .../support/DefaultLifecycleProcessor.java    |   8 ++
 .../DefaultMessageSourceResolvable.java       |   3 +
 .../support/DelegatingMessageSource.java      |   5 +
 .../support/GenericApplicationContext.java    |   7 ++
 .../context/support/LiveBeansView.java        |   2 +
 .../PropertySourcesPlaceholderConfigurer.java |   2 +
 ...ReloadableResourceBundleMessageSource.java |   1 +
 .../support/ResourceBundleMessageSource.java  |   2 +
 .../context/support/SimpleThreadScope.java    |   5 +
 .../weaving/AspectJWeavingEnabler.java        |   5 +
 .../weaving/DefaultContextLoadTimeWeaver.java |   5 +
 .../weaving/LoadTimeWeaverAwareProcessor.java |   3 +
 .../AbstractSlsbInvokerInterceptor.java       |   1 +
 ...LocalStatelessSessionProxyFactoryBean.java |   4 +
 .../SimpleRemoteSlsbInvokerInterceptor.java   |   1 +
 ...emoteStatelessSessionProxyFactoryBean.java |   4 +
 .../ejb/config/JeeNamespaceHandler.java       |   1 +
 .../ejb/support/AbstractEnterpriseBean.java   |   1 +
 .../support/AbstractMessageDrivenBean.java    |   1 +
 .../ejb/support/AbstractSessionBean.java      |   2 +
 .../support/AbstractStatelessSessionBean.java |   2 +
 .../format/datetime/DateFormatter.java        |   2 +
 .../datetime/DateFormatterRegistrar.java      |   7 ++
 ...eTimeFormatAnnotationFormatterFactory.java |   4 +
 .../joda/DateTimeFormatterFactoryBean.java    |   4 +
 .../format/datetime/joda/DateTimeParser.java  |   1 +
 ...eTimeFormatAnnotationFormatterFactory.java |   4 +
 .../datetime/joda/JodaTimeConverters.java     |  10 ++
 .../joda/JodaTimeFormatterRegistrar.java      |   1 +
 .../joda/MillisecondInstantPrinter.java       |   1 +
 .../datetime/joda/ReadableInstantPrinter.java |   1 +
 .../datetime/joda/ReadablePartialPrinter.java |   1 +
 .../number/AbstractNumberFormatter.java       |   2 +
 .../format/number/CurrencyFormatter.java      |   2 +
 ...umberFormatAnnotationFormatterFactory.java |   4 +
 .../format/number/NumberFormatter.java        |   1 +
 .../format/number/PercentFormatter.java       |   1 +
 .../support/FormattingConversionService.java  |  15 +++
 ...ormattingConversionServiceFactoryBean.java |   5 +
 .../InstrumentationLoadTimeWeaver.java        |   4 +
 .../ReflectiveLoadTimeWeaver.java             |   3 +
 ...esourceOverridingShadowingClassLoader.java |   2 +
 .../classloading/SimpleLoadTimeWeaver.java    |   3 +
 .../glassfish/ClassTransformerAdapter.java    |   1 +
 .../glassfish/GlassFishLoadTimeWeaver.java    |   3 +
 .../jboss/JBossLoadTimeWeaver.java            |   3 +
 .../classloading/jboss/JBossMCAdapter.java    |   2 +
 .../jboss/JBossMCTranslatorAdapter.java       |   1 +
 .../jboss/JBossModulesAdapter.java            |   2 +
 .../oc4j/OC4JClassPreprocessorAdapter.java    |   1 +
 .../classloading/oc4j/OC4JLoadTimeWeaver.java |   3 +
 .../WebLogicClassPreProcessorAdapter.java     |   1 +
 .../weblogic/WebLogicLoadTimeWeaver.java      |   3 +
 .../WebSphereClassPreDefinePlugin.java        |   1 +
 .../websphere/WebSphereLoadTimeWeaver.java    |   3 +
 .../jmx/access/MBeanClientInterceptor.java    |   4 +
 .../jmx/access/MBeanProxyFactoryBean.java     |   3 +
 .../access/NotificationListenerRegistrar.java |   2 +
 .../jmx/export/MBeanExporter.java             |   9 ++
 .../jmx/export/NotificationListenerBean.java  |   1 +
 .../AnnotationJmxAttributeSource.java         |   8 ++
 .../assembler/AbstractMBeanInfoAssembler.java |   1 +
 .../InterfaceBasedMBeanInfoAssembler.java     |   2 +
 .../assembler/MetadataMBeanInfoAssembler.java |   2 +
 .../export/naming/IdentityNamingStrategy.java |   1 +
 .../jmx/export/naming/KeyNamingStrategy.java  |   2 +
 .../export/naming/MetadataNamingStrategy.java |   2 +
 .../ModelMBeanNotificationPublisher.java      |   1 +
 .../support/ConnectorServerFactoryBean.java   |   5 +
 .../MBeanServerConnectionFactoryBean.java     |   6 +
 .../jmx/support/MBeanServerFactoryBean.java   |   5 +
 .../WebSphereMBeanServerFactoryBean.java      |   4 +
 .../jndi/JndiObjectFactoryBean.java           |   5 +
 .../jndi/JndiObjectLocator.java               |   1 +
 .../jndi/JndiObjectTargetSource.java          |   4 +
 .../springframework/jndi/JndiTemplate.java    |   4 +
 .../jndi/support/SimpleJndiBeanFactory.java   |  10 ++
 .../rmi/JndiRmiClientInterceptor.java         |   1 +
 .../remoting/rmi/JndiRmiProxyFactoryBean.java |   4 +
 .../remoting/rmi/JndiRmiServiceExporter.java  |   2 +
 .../RemoteInvocationSerializingExporter.java  |   1 +
 .../remoting/rmi/RmiClientInterceptor.java    |   1 +
 .../remoting/rmi/RmiInvocationWrapper.java    |   2 +
 .../remoting/rmi/RmiProxyFactoryBean.java     |   3 +
 .../remoting/rmi/RmiRegistryFactoryBean.java  |   5 +
 .../remoting/rmi/RmiServiceExporter.java      |   2 +
 .../DefaultRemoteInvocationExecutor.java      |   1 +
 .../DefaultRemoteInvocationFactory.java       |   1 +
 .../RemoteInvocationTraceInterceptor.java     |   1 +
 .../remoting/support/RemotingSupport.java     |   1 +
 .../support/SimpleHttpServerFactoryBean.java  |   5 +
 .../support/UrlBasedRemoteAccessor.java       |   1 +
 .../AbstractAsyncConfiguration.java           |   1 +
 .../annotation/AsyncAnnotationAdvisor.java    |   3 +
 .../AsyncAnnotationBeanPostProcessor.java     |   1 +
 .../AsyncConfigurationSelector.java           |   1 +
 .../scheduling/annotation/AsyncResult.java    |   5 +
 .../ScheduledAnnotationBeanPostProcessor.java |   8 ++
 .../ConcurrentTaskExecutor.java               |   5 +
 .../CustomizableThreadFactory.java            |   1 +
 .../ThreadPoolTaskExecutor.java               |   8 ++
 .../concurrent/ConcurrentTaskExecutor.java    |   5 +
 .../concurrent/ConcurrentTaskScheduler.java   |   6 +
 .../concurrent/CustomizableThreadFactory.java |   1 +
 .../ExecutorConfigurationSupport.java         |   3 +
 .../concurrent/ForkJoinPoolFactoryBean.java   |   5 +
 .../concurrent/ReschedulingRunnable.java      |   7 ++
 .../ScheduledExecutorFactoryBean.java         |   4 +
 .../ThreadPoolExecutorFactoryBean.java        |   4 +
 .../concurrent/ThreadPoolTaskExecutor.java    |   6 +
 .../concurrent/ThreadPoolTaskScheduler.java   |  13 +++
 .../AnnotationDrivenBeanDefinitionParser.java |   1 +
 .../config/ScheduledTaskRegistrar.java        |   2 +
 .../config/TaskExecutorFactoryBean.java       |   6 +
 .../config/TaskNamespaceHandler.java          |   1 +
 .../scheduling/support/CronTrigger.java       |   1 +
 .../DelegatingErrorHandlingRunnable.java      |   1 +
 .../support/MethodInvokingRunnable.java       |   3 +
 .../scheduling/support/PeriodicTrigger.java   |   1 +
 .../support/ScheduledMethodRunnable.java      |   1 +
 .../support/SimpleTriggerContext.java         |   3 +
 .../scheduling/support/TaskUtils.java         |   2 +
 .../MethodInvokingTimerTaskFactoryBean.java   |   3 +
 .../scheduling/timer/TimerFactoryBean.java    |   6 +
 .../scheduling/timer/TimerTaskExecutor.java   |   8 ++
 .../scripting/bsh/BshScriptFactory.java       |   7 ++
 .../scripting/bsh/BshScriptUtils.java         |   1 +
 .../config/LangNamespaceHandler.java          |   1 +
 .../config/ScriptingDefaultsParser.java       |   1 +
 .../scripting/groovy/GroovyScriptFactory.java |   8 ++
 .../scripting/jruby/JRubyScriptFactory.java   |   7 ++
 .../scripting/jruby/JRubyScriptUtils.java     |   1 +
 .../support/ResourceScriptSource.java         |   3 +
 .../support/ScriptFactoryPostProcessor.java   |   5 +
 .../scripting/support/StaticScriptSource.java |   3 +
 .../springframework/ui/ExtendedModelMap.java  |   1 +
 .../support/DelegatingThemeSource.java        |   3 +
 .../support/ResourceBundleThemeSource.java    |   3 +
 .../ui/context/support/SimpleTheme.java       |   2 +
 .../validation/AbstractBindingResult.java     |  17 +++
 .../validation/AbstractErrors.java            |  22 ++++
 .../validation/BindException.java             |  39 +++++++
 .../validation/DataBinder.java                |   6 +
 .../DefaultBindingErrorProcessor.java         |   2 +
 .../DefaultMessageCodesResolver.java          |   4 +
 .../BeanValidationPostProcessor.java          |   3 +
 .../beanvalidation/CustomValidatorBean.java   |   1 +
 .../LocalValidatorFactoryBean.java            |   7 ++
 .../LocaleContextMessageInterpolator.java     |   2 +
 .../MessageSourceResourceBundleLocator.java   |   1 +
 .../MethodValidationInterceptor.java          |   1 +
 .../MethodValidationPostProcessor.java        |   1 +
 .../SpringConstraintValidatorFactory.java     |   1 +
 .../SpringValidatorAdapter.java               |   8 ++
 .../core/AttributeAccessorSupport.java        |   5 +
 .../core/ControlFlowFactory.java              |   3 +
 .../core/ExceptionDepthComparator.java        |   1 +
 ...lVariableTableParameterNameDiscoverer.java |   2 +
 .../springframework/core/OrderComparator.java |   1 +
 .../PrioritizedParameterNameDiscoverer.java   |   2 +
 .../core/SimpleAliasRegistry.java             |   4 +
 .../converter/ConvertingComparator.java       |   4 +
 .../support/ArrayToArrayConverter.java        |   3 +
 .../support/ArrayToCollectionConverter.java   |   3 +
 .../support/ArrayToObjectConverter.java       |   3 +
 .../support/ArrayToStringConverter.java       |   3 +
 .../support/CharacterToNumberFactory.java     |   2 +
 .../support/CollectionToArrayConverter.java   |   3 +
 .../CollectionToCollectionConverter.java      |   3 +
 .../support/CollectionToObjectConverter.java  |   3 +
 .../support/CollectionToStringConverter.java  |   3 +
 .../support/EnumToStringConverter.java        |   2 +
 .../FallbackObjectToStringConverter.java      |   3 +
 .../support/GenericConversionService.java     |  17 +++
 .../convert/support/IdToEntityConverter.java  |   3 +
 .../convert/support/MapToMapConverter.java    |   3 +
 .../support/NumberToCharacterConverter.java   |   1 +
 .../NumberToNumberConverterFactory.java       |   3 +
 .../support/ObjectToArrayConverter.java       |   3 +
 .../support/ObjectToCollectionConverter.java  |   3 +
 .../support/ObjectToObjectConverter.java      |   3 +
 .../support/ObjectToStringConverter.java      |   1 +
 .../support/PropertiesToStringConverter.java  |   1 +
 .../support/StringToArrayConverter.java       |   3 +
 .../support/StringToBooleanConverter.java     |   1 +
 .../support/StringToCharacterConverter.java   |   1 +
 .../support/StringToCollectionConverter.java  |   3 +
 .../support/StringToEnumConverterFactory.java |   2 +
 .../support/StringToLocaleConverter.java      |   1 +
 .../StringToNumberConverterFactory.java       |   2 +
 .../support/StringToPropertiesConverter.java  |   1 +
 .../support/StringToUUIDConverter.java        |   1 +
 .../AbstractCachingLabeledEnumResolver.java   |   4 +
 .../enums/AbstractGenericLabeledEnum.java     |   1 +
 .../core/enums/AbstractLabeledEnum.java       |   2 +
 .../core/enums/LabeledEnum.java               |   2 +
 .../core/enums/LetterCodedLabeledEnum.java    |   1 +
 .../core/enums/ShortCodedLabeledEnum.java     |   1 +
 .../core/enums/StaticLabeledEnum.java         |   2 +
 .../core/enums/StringCodedLabeledEnum.java    |   1 +
 .../core/env/AbstractEnvironment.java         |  28 +++++
 .../core/env/AbstractPropertyResolver.java    |  15 +++
 .../core/env/EnumerablePropertySource.java    |   1 +
 .../core/env/MutablePropertySources.java      |   3 +
 .../env/PropertySourcesPropertyResolver.java  |   4 +
 .../core/env/ReadOnlySystemAttributesMap.java |  12 ++
 .../core/io/AbstractResource.java             |  10 ++
 .../core/io/ByteArrayResource.java            |   2 +
 .../core/io/ClassPathResource.java            |   2 +
 .../core/io/ClassRelativeResourceLoader.java  |   2 +
 .../core/io/DefaultResourceLoader.java        |   3 +
 .../core/io/DescriptiveResource.java          |   2 +
 .../core/io/FileSystemResource.java           |   4 +
 .../core/io/FileSystemResourceLoader.java     |   1 +
 .../core/io/InputStreamResource.java          |   2 +
 .../springframework/core/io/UrlResource.java  |   2 +
 .../springframework/core/io/VfsResource.java  |   2 +
 .../PathMatchingResourcePatternResolver.java  |   4 +
 .../core/serializer/DefaultDeserializer.java  |   1 +
 .../core/serializer/DefaultSerializer.java    |   1 +
 .../support/DeserializingConverter.java       |   1 +
 .../support/SerializingConverter.java         |   1 +
 .../core/style/DefaultToStringStyler.java     |   5 +
 .../core/style/DefaultValueStyler.java        |   1 +
 .../core/task/SimpleAsyncTaskExecutor.java    |   5 +
 .../core/task/SyncTaskExecutor.java           |   1 +
 .../core/task/TaskExecutor.java               |   1 +
 .../support/ConcurrentExecutorAdapter.java    |   1 +
 .../task/support/ExecutorServiceAdapter.java  |   6 +
 .../task/support/TaskExecutorAdapter.java     |   4 +
 .../core/type/StandardAnnotationMetadata.java |   9 ++
 .../core/type/StandardClassMetadata.java      |  12 ++
 .../core/type/StandardMethodMetadata.java     |   7 ++
 .../AnnotationAttributesReadingVisitor.java   |   6 +
 .../AnnotationMetadataReadingVisitor.java     |   9 ++
 .../ClassMetadataReadingVisitor.java          |  21 ++++
 .../MethodMetadataReadingVisitor.java         |   7 ++
 .../classreading/SimpleMetadataReader.java    |   3 +
 .../SimpleMetadataReaderFactory.java          |   2 +
 .../AbstractClassTestingTypeFilter.java       |   1 +
 ...AbstractTypeHierarchyTraversingFilter.java |   1 +
 .../core/type/filter/AspectJTypeFilter.java   |   1 +
 .../springframework/util/AntPathMatcher.java  |   8 ++
 .../util/AutoPopulatingList.java              |  24 ++++
 .../util/CachingMapDecorator.java             |  12 ++
 .../springframework/util/CollectionUtils.java |  20 ++++
 .../util/CompositeIterator.java               |   3 +
 .../util/ConcurrentReferenceHashMap.java      |  16 +++
 .../util/DefaultPropertiesPersister.java      |   7 ++
 .../util/LinkedMultiValueMap.java             |  17 +++
 .../util/PropertyPlaceholderHelper.java       |   1 +
 .../springframework/util/ReflectionUtils.java |   6 +
 .../util/SystemPropertyUtils.java             |   1 +
 .../util/WeakReferenceMonitor.java            |   1 +
 .../util/comparator/BooleanComparator.java    |   1 +
 .../util/comparator/ComparableComparator.java |   1 +
 .../util/comparator/CompoundComparator.java   |   1 +
 .../util/comparator/InstanceComparator.java   |   1 +
 .../util/comparator/InvertibleComparator.java |   1 +
 .../util/comparator/NullSafeComparator.java   |   1 +
 .../util/xml/AbstractStaxContentHandler.java  |  10 ++
 .../util/xml/AbstractStaxXMLReader.java       |   6 +
 .../util/xml/AbstractXMLReader.java           |  12 ++
 .../util/xml/AbstractXMLStreamReader.java     |  21 ++++
 .../util/xml/DomContentHandler.java           |  11 ++
 .../util/xml/SimpleNamespaceContext.java      |   3 +
 .../util/xml/SimpleSaxErrorHandler.java       |   3 +
 .../xml/SimpleTransformErrorListener.java     |   3 +
 .../util/xml/StaxEventContentHandler.java     |   6 +
 .../util/xml/StaxEventXMLReader.java          |   6 +
 .../util/xml/StaxStreamContentHandler.java    |   1 +
 .../util/xml/StaxStreamXMLReader.java         |   6 +
 .../util/xml/XMLEventStreamReader.java        |  24 ++++
 .../util/xml/XMLEventStreamWriter.java        |  32 ++++++
 .../expression/ParserContext.java             |   3 +
 .../common/CompositeStringExpression.java     |  23 ++++
 .../expression/common/LiteralExpression.java  |  23 ++++
 .../common/TemplateAwareExpressionParser.java |   5 +
 .../common/TemplateParserContext.java         |   3 +
 .../spel/InternalParseException.java          |   1 +
 .../expression/spel/ast/Indexer.java          |  15 +++
 .../expression/spel/ast/MethodReference.java  |   3 +
 .../expression/spel/ast/OpMinus.java          |   1 +
 .../spel/ast/PropertyOrFieldReference.java    |   3 +
 .../expression/spel/ast/SpelNodeImpl.java     |  10 ++
 .../expression/spel/ast/ValueRef.java         |   6 +
 .../spel/ast/VariableReference.java           |   3 +
 .../spel/standard/SpelExpression.java         |  23 ++++
 .../ReflectiveConstructorExecutor.java        |   1 +
 .../ReflectiveConstructorResolver.java        |   2 +
 .../support/ReflectiveMethodExecutor.java     |   1 +
 .../support/ReflectiveMethodResolver.java     |   2 +
 .../support/ReflectivePropertyAccessor.java   |  10 ++
 .../support/StandardEvaluationContext.java    |  11 ++
 .../support/StandardOperatorOverloader.java   |   2 +
 .../spel/support/StandardTypeComparator.java  |   2 +
 .../spel/support/StandardTypeConverter.java   |   2 +
 .../spel/support/StandardTypeLocator.java     |   1 +
 .../jdbc/config/JdbcNamespaceHandler.java     |   1 +
 .../config/SortedResourcesFactoryBean.java    |   2 +
 .../jdbc/core/ArgPreparedStatementSetter.java |   2 +
 .../core/ArgTypePreparedStatementSetter.java  |   2 +
 .../jdbc/core/BatchUpdateUtils.java           |   2 +
 .../jdbc/core/BeanPropertyRowMapper.java      |   1 +
 .../core/CallableStatementCreatorFactory.java |   3 +
 .../jdbc/core/ColumnMapRowMapper.java         |   1 +
 .../jdbc/core/JdbcTemplate.java               |  84 ++++++++++++++
 .../core/PreparedStatementCreatorFactory.java |   4 +
 .../jdbc/core/RowCountCallbackHandler.java    |   1 +
 .../core/RowMapperResultSetExtractor.java     |   1 +
 .../jdbc/core/SingleColumnRowMapper.java      |   1 +
 .../core/SqlRowSetResultSetExtractor.java     |   3 +
 .../metadata/CallMetaDataProviderFactory.java |   1 +
 .../metadata/GenericCallMetaDataProvider.java |  20 ++++
 .../GenericTableMetaDataProvider.java         |  14 +++
 .../TableMetaDataProviderFactory.java         |   1 +
 .../AbstractSqlParameterSource.java           |   2 +
 .../BeanPropertySqlParameterSource.java       |   2 +
 .../namedparam/MapSqlParameterSource.java     |   2 +
 .../NamedParameterBatchUpdateUtils.java       |   2 +
 .../NamedParameterJdbcTemplate.java           |  31 +++++
 .../jdbc/core/simple/AbstractJdbcInsert.java  |   4 +
 .../jdbc/core/simple/SimpleJdbcCall.java      |  19 ++++
 .../jdbc/core/simple/SimpleJdbcInsert.java    |  16 +++
 .../jdbc/core/simple/SimpleJdbcTemplate.java  |  36 ++++++
 ...rruptibleBatchPreparedStatementSetter.java |   3 +
 ...tLobCreatingPreparedStatementCallback.java |   1 +
 ...bstractLobStreamingResultSetExtractor.java |   1 +
 .../core/support/AbstractSqlTypeValue.java    |   1 +
 .../support/JdbcBeanDefinitionReader.java     |   1 +
 .../jdbc/core/support/SqlLobValue.java        |   2 +
 .../jdbc/datasource/AbstractDataSource.java   |   7 ++
 .../AbstractDriverBasedDataSource.java        |   2 +
 .../DataSourceTransactionManager.java         |   3 +
 .../jdbc/datasource/DelegatingDataSource.java |  10 ++
 .../JdbcTransactionObjectSupport.java         |   4 +
 .../LazyConnectionDataSourceProxy.java        |   1 +
 .../datasource/SimpleConnectionHandle.java    |   2 +
 .../SingleConnectionDataSource.java           |   3 +
 .../TransactionAwareDataSourceProxy.java      |   1 +
 .../AbstractEmbeddedDatabaseConfigurer.java   |   1 +
 .../DerbyEmbeddedDatabaseConfigurer.java      |   2 +
 .../embedded/EmbeddedDatabaseFactory.java     |  10 ++
 .../embedded/EmbeddedDatabaseFactoryBean.java |   5 +
 .../H2EmbeddedDatabaseConfigurer.java         |   1 +
 .../HsqlEmbeddedDatabaseConfigurer.java       |   1 +
 .../embedded/OutputStreamFactory.java         |   1 +
 .../SimpleDriverDataSourceFactory.java        |   6 +
 .../init/CompositeDatabasePopulator.java      |   1 +
 .../init/DataSourceInitializer.java           |   2 +
 .../init/ResourceDatabasePopulator.java       |   1 +
 .../lookup/AbstractRoutingDataSource.java     |   3 +
 .../lookup/BeanFactoryDataSourceLookup.java   |   2 +
 .../lookup/JndiDataSourceLookup.java          |   1 +
 .../lookup/MapDataSourceLookup.java           |   1 +
 .../lookup/SingleDataSourceLookup.java        |   1 +
 .../jdbc/object/BatchSqlUpdate.java           |   2 +
 .../jdbc/object/GenericSqlQuery.java          |   2 +
 .../object/MappingSqlQueryWithParameters.java |   1 +
 .../jdbc/object/RdbmsOperation.java           |   1 +
 .../jdbc/object/UpdatableSqlQuery.java        |   1 +
 ...bstractFallbackSQLExceptionTranslator.java |   1 +
 ...CustomSQLExceptionTranslatorRegistrar.java |   1 +
 .../support/DatabaseStartupValidator.java     |   1 +
 .../jdbc/support/GeneratedKeyHolder.java      |   3 +
 .../jdbc/support/JdbcAccessor.java            |   1 +
 .../jdbc/support/JdbcUtils.java               |   1 +
 .../AbstractDataFieldMaxValueIncrementer.java |   4 +
 .../jdbc/support/lob/AbstractLobHandler.java  |   5 +
 .../jdbc/support/lob/DefaultLobHandler.java   |  12 ++
 .../lob/JtaLobCreatorSynchronization.java     |   2 +
 .../jdbc/support/lob/LobCreator.java          |   1 +
 .../jdbc/support/lob/OracleLobHandler.java    |  17 +++
 .../jdbc/support/lob/PassThroughBlob.java     |  11 ++
 .../jdbc/support/lob/PassThroughClob.java     |  13 +++
 .../NativeJdbcExtractorAdapter.java           |   9 ++
 .../rowset/ResultSetWrappingSqlRowSet.java    |  50 ++++++++
 .../ResultSetWrappingSqlRowSetMetaData.java   |  16 +++
 .../jdbc/support/xml/Jdbc4SqlXmlHandler.java  |  15 +++
 .../org/springframework/jms/JmsException.java |   1 +
 .../AbstractListenerContainerParser.java      |   1 +
 .../config/JcaListenerContainerParser.java    |   1 +
 .../config/JmsListenerContainerParser.java    |   1 +
 .../jms/config/JmsNamespaceHandler.java       |   1 +
 .../jms/connection/CachedMessageConsumer.java |  10 ++
 .../jms/connection/CachedMessageProducer.java |  24 ++++
 .../connection/CachingConnectionFactory.java  |   3 +
 .../connection/ChainedExceptionListener.java  |   1 +
 .../connection/ConnectionFactoryUtils.java    |  18 +++
 .../DelegatingConnectionFactory.java          |   8 ++
 .../jms/connection/JmsTransactionManager.java |  13 +++
 .../connection/JmsTransactionManager102.java  |   3 +
 .../connection/SingleConnectionFactory.java   |  10 ++
 .../SingleConnectionFactory102.java           |   2 +
 ...ransactionAwareConnectionFactoryProxy.java |   8 ++
 ...erCredentialsConnectionFactoryAdapter.java |   7 ++
 .../springframework/jms/core/JmsTemplate.java |  48 ++++++++
 .../jms/core/JmsTemplate102.java              |  11 ++
 .../jms/core/support/JmsGatewaySupport.java   |   1 +
 .../AbstractJmsListeningContainer.java        |   8 ++
 ...stractPollingMessageListenerContainer.java |   5 +
 .../DefaultMessageListenerContainer.java      |   2 +
 .../DefaultMessageListenerContainer102.java   |   6 +
 .../SimpleMessageListenerContainer.java       |   4 +
 .../SimpleMessageListenerContainer102.java    |   4 +
 .../adapter/MessageListenerAdapter.java       |   3 +
 .../adapter/MessageListenerAdapter102.java    |   2 +
 .../DefaultJmsActivationSpecFactory.java      |   3 +
 .../endpoint/JmsMessageEndpointFactory.java   |   3 +
 .../endpoint/JmsMessageEndpointManager.java   |   1 +
 .../StandardJmsActivationSpecFactory.java     |   1 +
 .../remoting/JmsInvokerClientInterceptor.java |   2 +
 .../remoting/JmsInvokerProxyFactoryBean.java  |   5 +
 .../remoting/JmsInvokerServiceExporter.java   |   2 +
 .../jms/support/JmsAccessor.java              |   1 +
 .../MappingJacksonMessageConverter.java       |   2 +
 .../MarshallingMessageConverter.java          |   3 +
 .../converter/SimpleMessageConverter.java     |   2 +
 .../converter/SimpleMessageConverter102.java  |   1 +
 .../BeanFactoryDestinationResolver.java       |   2 +
 .../DynamicDestinationResolver.java           |   1 +
 .../destination/JndiDestinationResolver.java  |   3 +
 .../HibernateExceptionTranslator.java         |   1 +
 .../HibernateTransactionManager.java          |   3 +
 .../hibernate4/LocalSessionFactoryBean.java   |   6 +
 .../orm/hibernate4/SpringSessionContext.java  |   1 +
 .../SpringSessionSynchronization.java         |   8 ++
 .../support/OpenSessionInViewInterceptor.java |   4 +
 .../AbstractSessionFactoryBean.java           |   5 +
 .../FilterDefinitionFactoryBean.java          |   5 +
 .../orm/hibernate3/HibernateAccessor.java     |   2 +
 .../HibernateExceptionTranslator.java         |   1 +
 .../orm/hibernate3/HibernateInterceptor.java  |   1 +
 .../orm/hibernate3/HibernateTemplate.java     | 107 ++++++++++++++++++
 .../HibernateTransactionManager.java          |   5 +
 .../hibernate3/LocalCacheProviderProxy.java   |   5 +
 .../LocalDataSourceConnectionProvider.java    |   5 +
 .../hibernate3/LocalRegionFactoryProxy.java   |   8 ++
 .../hibernate3/LocalSessionFactoryBean.java   |   5 +
 .../LocalTransactionManagerLookup.java        |   3 +
 .../orm/hibernate3/SpringSessionContext.java  |   1 +
 .../SpringSessionSynchronization.java         |   8 ++
 .../hibernate3/SpringTransactionFactory.java  |   6 +
 .../orm/hibernate3/TypeDefinitionBean.java    |   2 +
 .../AnnotationSessionFactoryBean.java         |   1 +
 .../hibernate3/support/AbstractLobType.java   |   9 ++
 .../hibernate3/support/BlobByteArrayType.java |   2 +
 .../support/BlobSerializableType.java         |   2 +
 .../hibernate3/support/BlobStringType.java    |   2 +
 .../hibernate3/support/ClobStringType.java    |   2 +
 .../support/OpenSessionInViewInterceptor.java |   4 +
 .../orm/ibatis/SqlMapClientFactoryBean.java   |   4 +
 .../orm/ibatis/SqlMapClientTemplate.java      |  29 +++++
 .../support/AbstractLobTypeHandler.java       |   4 +
 .../support/BlobByteArrayTypeHandler.java     |   1 +
 .../support/BlobSerializableTypeHandler.java  |   1 +
 .../ibatis/support/ClobStringTypeHandler.java |   1 +
 .../orm/jdo/DefaultJdoDialect.java            |   9 ++
 .../springframework/orm/jdo/JdoAccessor.java  |   1 +
 .../orm/jdo/JdoInterceptor.java               |   1 +
 .../springframework/orm/jdo/JdoTemplate.java  |  57 ++++++++++
 .../orm/jdo/JdoTransactionManager.java        |   4 +
 .../LocalPersistenceManagerFactoryBean.java   |   7 ++
 .../jdo/PersistenceManagerFactoryUtils.java   |   1 +
 ...onAwarePersistenceManagerFactoryProxy.java |   5 +
 ...enPersistenceManagerInViewInterceptor.java |   3 +
 .../SpringPersistenceManagerProxyBean.java    |   5 +
 .../StandardPersistenceManagerProxyBean.java  |   3 +
 .../jpa/AbstractEntityManagerFactoryBean.java |  18 +++
 .../orm/jpa/DefaultJpaDialect.java            |  10 ++
 .../orm/jpa/EntityManagerFactoryAccessor.java |   1 +
 .../orm/jpa/EntityManagerFactoryUtils.java    |   1 +
 .../orm/jpa/ExtendedEntityManagerCreator.java |   2 +
 .../springframework/orm/jpa/JpaAccessor.java  |   1 +
 .../orm/jpa/JpaInterceptor.java               |   1 +
 .../springframework/orm/jpa/JpaTemplate.java  |  29 +++++
 .../orm/jpa/JpaTransactionManager.java        |   5 +
 ...ocalContainerEntityManagerFactoryBean.java |   2 +
 .../orm/jpa/SharedEntityManagerCreator.java   |   2 +
 .../ClassFileTransformerAdapter.java          |   1 +
 .../DefaultPersistenceUnitManager.java        |   6 +
 .../MutablePersistenceUnitInfo.java           |  15 +++
 .../OpenEntityManagerInViewInterceptor.java   |   4 +
 ...ersistenceAnnotationBeanPostProcessor.java |   9 ++
 .../jpa/support/SharedEntityManagerBean.java  |   4 +
 .../jpa/vendor/AbstractJpaVendorAdapter.java  |   6 +
 .../vendor/EclipseLinkJpaVendorAdapter.java   |   1 +
 .../orm/jpa/vendor/HibernateJpaDialect.java   |   2 +
 .../HibernateJpaSessionFactoryBean.java       |   3 +
 .../jpa/vendor/HibernateJpaVendorAdapter.java |   1 +
 .../orm/jpa/vendor/OpenJpaDialect.java        |   5 +
 .../orm/jpa/vendor/OpenJpaVendorAdapter.java  |   1 +
 .../jpa/vendor/TopLinkJpaVendorAdapter.java   |   1 +
 .../oxm/castor/CastorMarshaller.java          |   3 +
 .../oxm/config/OxmNamespaceHandler.java       |   1 +
 .../oxm/jaxb/Jaxb2Marshaller.java             |  13 +++
 .../oxm/jibx/JibxMarshaller.java              |   2 +
 .../oxm/support/AbstractMarshaller.java       |   2 +
 .../oxm/support/MarshallingSource.java        |  14 +++
 .../oxm/xmlbeans/XmlBeansMarshaller.java      |   1 +
 .../oxm/xmlbeans/XmlOptionsFactoryBean.java   |   3 +
 .../oxm/xstream/XStreamMarshaller.java        |   3 +
 .../servlet/view/tiles/TilesConfigurer.java   |   1 +
 .../struts/ActionServletAwareProcessor.java   |   3 +
 .../web/struts/ContextLoaderPlugIn.java       |   3 +
 .../MockMvcClientHttpRequestFactory.java      |   1 +
 .../web/client/MockRestServiceServer.java     |   1 +
 .../RequestMatcherClientHttpRequest.java      |   3 +
 .../client/match/ContentRequestMatchers.java  |   5 +
 .../client/match/JsonPathRequestMatchers.java |   1 +
 .../client/match/MockRestRequestMatchers.java |   7 ++
 .../client/match/XpathRequestMatchers.java    |   1 +
 .../response/DefaultResponseCreator.java      |   1 +
 .../test/web/servlet/DefaultMvcResult.java    |   9 ++
 .../test/web/servlet/MockMvc.java             |   3 +
 .../web/servlet/TestDispatcherServlet.java    |   2 +
 .../web/servlet/request/MockAsyncContext.java |  13 +++
 .../MockHttpServletRequestBuilder.java        |   3 +
 .../request/MockMvcRequestBuilders.java       |   1 +
 .../Servlet3MockHttpServletRequest.java       |   9 ++
 ...rvlet3MockMultipartHttpServletRequest.java |   9 ++
 .../servlet/result/ContentResultMatchers.java |   8 ++
 .../servlet/result/CookieResultMatchers.java  |  15 +++
 .../result/FlashAttributeResultMatchers.java  |   4 +
 .../servlet/result/HandlerResultMatchers.java |   4 +
 .../servlet/result/HeaderResultMatchers.java  |   3 +
 .../result/JsonPathResultMatchers.java        |   5 +
 .../servlet/result/MockMvcResultHandlers.java |   2 +
 .../servlet/result/MockMvcResultMatchers.java |   2 +
 .../servlet/result/ModelResultMatchers.java   |  11 ++
 .../servlet/result/PrintingResultHandler.java |   1 +
 .../servlet/result/RequestResultMatchers.java |   8 ++
 .../servlet/result/StatusResultMatchers.java  |   5 +
 .../servlet/result/ViewResultMatchers.java    |   2 +
 .../servlet/result/XpathResultMatchers.java   |  10 ++
 .../servlet/setup/DefaultMockMvcBuilder.java  |   1 +
 .../setup/PatternMappingFilterProxy.java      |   3 +
 .../setup/StandaloneMockMvcBuilder.java       |   2 +
 .../setup/StubWebApplicationContext.java      |  48 ++++++++
 .../mock/http/MockHttpInputMessage.java       |   2 +
 .../mock/http/MockHttpOutputMessage.java      |   2 +
 .../http/client/MockClientHttpRequest.java    |   3 +
 .../http/client/MockClientHttpResponse.java   |   4 +
 .../mock/jndi/ExpectedLookupTemplate.java     |   1 +
 .../mock/jndi/SimpleNamingContext.java        |  36 ++++++
 .../mock/jndi/SimpleNamingContextBuilder.java |   2 +
 .../web/DelegatingServletInputStream.java     |   2 +
 .../web/DelegatingServletOutputStream.java    |   3 +
 .../mock/web/MockBodyContent.java             |  28 +++++
 .../mock/web/MockExpressionEvaluator.java     |   3 +
 .../mock/web/MockFilterChain.java             |   4 +
 .../mock/web/MockFilterConfig.java            |   4 +
 .../mock/web/MockHttpServletRequest.java      |  54 +++++++++
 .../mock/web/MockHttpServletResponse.java     |  38 +++++++
 .../mock/web/MockHttpSession.java             |  17 +++
 .../mock/web/MockJspWriter.java               |  26 +++++
 .../mock/web/MockMultipartFile.java           |   8 ++
 .../web/MockMultipartHttpServletRequest.java  |   9 ++
 .../mock/web/MockPageContext.java             |  27 +++++
 .../mock/web/MockRequestDispatcher.java       |   2 +
 .../mock/web/MockServletConfig.java           |   4 +
 .../mock/web/MockServletContext.java          |  25 ++++
 .../mock/web/PassThroughFilterChain.java      |   1 +
 .../mock/web/portlet/MockActionResponse.java  |   7 ++
 .../mock/web/portlet/MockBaseURL.java         |   9 ++
 .../mock/web/portlet/MockCacheControl.java    |   8 ++
 .../web/portlet/MockClientDataRequest.java    |   7 ++
 .../mock/web/portlet/MockEvent.java           |   3 +
 .../mock/web/portlet/MockEventRequest.java    |   2 +
 .../mock/web/portlet/MockEventResponse.java   |   1 +
 .../mock/web/portlet/MockMimeResponse.java    |  16 +++
 .../portlet/MockMultipartActionRequest.java   |   6 +
 .../mock/web/portlet/MockPortalContext.java   |   5 +
 .../mock/web/portlet/MockPortletConfig.java   |  11 ++
 .../mock/web/portlet/MockPortletContext.java  |  20 ++++
 .../web/portlet/MockPortletPreferences.java   |   9 ++
 .../mock/web/portlet/MockPortletRequest.java  |  38 +++++++
 .../portlet/MockPortletRequestDispatcher.java |   3 +
 .../mock/web/portlet/MockPortletResponse.java |   7 ++
 .../mock/web/portlet/MockPortletSession.java  |  18 +++
 .../mock/web/portlet/MockPortletURL.java      |   5 +
 .../mock/web/portlet/MockRenderRequest.java   |   1 +
 .../mock/web/portlet/MockRenderResponse.java  |   2 +
 .../mock/web/portlet/MockResourceRequest.java |   4 +
 .../web/portlet/MockResourceResponse.java     |   1 +
 .../mock/web/portlet/MockResourceURL.java     |   3 +
 .../web/portlet/MockStateAwareResponse.java   |  11 ++
 .../ServletWrappingPortletContext.java        |  20 ++++
 ...DependencyInjectionSpringContextTests.java |   1 +
 .../AbstractSingleSpringContextTests.java     |   3 +
 ...sactionalDataSourceSpringContextTests.java |   1 +
 ...stractTransactionalSpringContextTests.java |   2 +
 .../test/ConditionalTestCase.java             |   1 +
 ...ractAnnotationAwareTransactionalTests.java |   1 +
 .../annotation/SystemProfileValueSource.java  |   1 +
 .../AbstractJUnit38SpringContextTests.java    |   2 +
 .../AbstractJUnit4SpringContextTests.java     |   1 +
 .../support/AbstractContextLoader.java        |   2 +
 .../AbstractDelegatingSmartContextLoader.java |   4 +
 .../support/AbstractGenericContextLoader.java |   2 +
 .../AbstractTestExecutionListener.java        |   5 +
 .../AnnotationConfigContextLoader.java        |   1 +
 .../support/DelegatingSmartContextLoader.java |   2 +
 .../AbstractTestNGSpringContextTests.java     |   2 +
 .../TransactionalTestExecutionListener.java   |   1 +
 .../web/AbstractGenericWebContextLoader.java  |   2 +
 .../web/AnnotationConfigWebContextLoader.java |   1 +
 .../web/GenericXmlWebContextLoader.java       |   1 +
 .../web/ServletTestExecutionListener.java     |   3 +
 .../web/WebDelegatingSmartContextLoader.java  |   2 +
 .../test/jpa/AbstractJpaTests.java            |   4 +
 ...ersistenceExceptionTranslationAdvisor.java |   2 +
 ...enceExceptionTranslationPostProcessor.java |   1 +
 ...ChainedPersistenceExceptionTranslator.java |   1 +
 .../dao/support/DaoSupport.java               |   1 +
 ...stenceExceptionTranslationInterceptor.java |   3 +
 .../CciLocalTransactionManager.java           |   2 +
 .../DelegatingConnectionFactory.java          |   7 ++
 .../connection/NotSupportedRecordFactory.java |   2 +
 .../connection/SingleConnectionFactory.java   |   2 +
 ...ransactionAwareConnectionFactoryProxy.java |   1 +
 .../jca/cci/core/CciTemplate.java             |  10 ++
 .../jca/cci/core/support/CommAreaRecord.java  |   6 +
 .../jca/cci/object/EisOperation.java          |   1 +
 .../cci/object/MappingRecordOperation.java    |   2 +
 .../BootstrapContextAwareProcessor.java       |   2 +
 .../ResourceAdapterApplicationContext.java    |   1 +
 .../context/SpringContextResourceAdapter.java |   5 +
 .../AbstractMessageEndpointFactory.java       |   5 +
 .../GenericMessageEndpointFactory.java        |   1 +
 .../GenericMessageEndpointManager.java        |   8 ++
 .../support/LocalConnectionFactoryBean.java   |   4 +
 .../support/ResourceAdapterFactoryBean.java   |   5 +
 .../jca/support/SimpleBootstrapContext.java   |   3 +
 .../jca/work/DelegatingWork.java              |   2 +
 .../jca/work/SimpleTaskWorkManager.java       |   8 ++
 .../jca/work/WorkManagerTaskExecutor.java     |  13 +++
 ...actTransactionManagementConfiguration.java |   1 +
 .../Ejb3TransactionAnnotationParser.java      |   1 +
 .../SpringTransactionAnnotationParser.java    |   1 +
 .../AnnotationDrivenBeanDefinitionParser.java |   1 +
 .../config/TxNamespaceHandler.java            |   1 +
 ...actFallbackTransactionAttributeSource.java |   1 +
 ...toryTransactionAttributeSourceAdvisor.java |   1 +
 .../CompositeTransactionAttributeSource.java  |   1 +
 .../DefaultTransactionAttribute.java          |   2 +
 .../DelegatingTransactionAttribute.java       |   2 +
 ...MatchAlwaysTransactionAttributeSource.java |   1 +
 .../MethodMapTransactionAttributeSource.java  |   3 +
 .../NameMatchTransactionAttributeSource.java  |   1 +
 .../interceptor/TransactionAspectSupport.java |   2 +
 .../TransactionAttributeSourceAdvisor.java    |   2 +
 .../TransactionAttributeSourcePointcut.java   |   1 +
 .../interceptor/TransactionInterceptor.java   |   2 +
 .../TransactionProxyFactoryBean.java          |   1 +
 .../JtaAfterCompletionSynchronization.java    |   2 +
 .../jta/JtaTransactionManager.java            |   3 +
 .../transaction/jta/JtaTransactionObject.java |   2 +
 .../jta/ManagedTransactionAdapter.java        |   7 ++
 .../jta/SimpleTransactionFactory.java         |   2 +
 .../jta/SpringJtaSynchronizationAdapter.java  |   2 +
 .../jta/UserTransactionAdapter.java           |   6 +
 .../jta/WebSphereUowTransactionManager.java   |   2 +
 .../AbstractPlatformTransactionManager.java   |   3 +
 .../support/AbstractTransactionStatus.java    |   8 ++
 .../support/DefaultTransactionDefinition.java |   5 +
 .../support/DefaultTransactionStatus.java     |   1 +
 .../DelegatingTransactionDefinition.java      |   5 +
 .../support/ResourceHolderSupport.java        |   3 +
 .../ResourceHolderSynchronization.java        |   7 ++
 .../support/SimpleTransactionStatus.java      |   1 +
 .../TransactionCallbackWithoutResult.java     |   1 +
 .../TransactionSynchronizationAdapter.java    |   8 ++
 .../support/TransactionTemplate.java          |   2 +
 .../org/springframework/http/HttpHeaders.java |  17 +++
 .../org/springframework/http/MediaType.java   |   3 +
 .../client/AbstractClientHttpRequest.java     |   3 +
 ...stractClientHttpRequestFactoryWrapper.java |   1 +
 .../client/AbstractClientHttpResponse.java    |   1 +
 .../BufferingClientHttpRequestWrapper.java    |   2 +
 .../BufferingClientHttpResponseWrapper.java   |   6 +
 .../http/client/ClientHttpResponse.java       |   1 +
 .../http/client/CommonsClientHttpRequest.java |   2 +
 .../CommonsClientHttpRequestFactory.java      |   2 +
 .../client/CommonsClientHttpResponse.java     |   5 +
 .../HttpComponentsClientHttpRequest.java      |   2 +
 ...ttpComponentsClientHttpRequestFactory.java |   2 +
 .../HttpComponentsClientHttpResponse.java     |   5 +
 .../client/InterceptingClientHttpRequest.java |   3 +
 .../SimpleBufferingClientHttpRequest.java     |   2 +
 .../SimpleClientHttpRequestFactory.java       |   1 +
 .../http/client/SimpleClientHttpResponse.java |   5 +
 .../SimpleStreamingClientHttpRequest.java     |   2 +
 .../client/support/HttpRequestWrapper.java    |   3 +
 .../http/client/support/ProxyFactoryBean.java |   4 +
 .../AbstractHttpMessageConverter.java         |   5 +
 .../BufferedImageHttpMessageConverter.java    |   5 +
 .../converter/FormHttpMessageConverter.java   |   7 ++
 .../json/Jackson2ObjectMapperFactoryBean.java |   4 +
 .../json/JacksonObjectMapperFactoryBean.java  |   4 +
 .../MappingJackson2HttpMessageConverter.java  |   2 +
 .../MappingJacksonHttpMessageConverter.java   |   2 +
 .../Jaxb2CollectionHttpMessageConverter.java  |   2 +
 .../http/server/ServerHttpResponse.java       |   1 +
 .../http/server/ServletServerHttpRequest.java |   4 +
 .../server/ServletServerHttpResponse.java     |   4 +
 .../caucho/BurlapClientInterceptor.java       |   1 +
 .../remoting/caucho/BurlapExporter.java       |   1 +
 .../caucho/BurlapProxyFactoryBean.java        |   3 +
 .../caucho/BurlapServiceExporter.java         |   1 +
 .../caucho/HessianClientInterceptor.java      |   1 +
 .../remoting/caucho/HessianExporter.java      |   1 +
 .../caucho/HessianProxyFactoryBean.java       |   3 +
 .../caucho/HessianServiceExporter.java        |   1 +
 .../caucho/SimpleBurlapServiceExporter.java   |   1 +
 .../caucho/SimpleHessianServiceExporter.java  |   1 +
 .../AbstractHttpInvokerRequestExecutor.java   |   2 +
 .../HttpInvokerClientInterceptor.java         |   2 +
 .../HttpInvokerProxyFactoryBean.java          |   3 +
 .../HttpInvokerServiceExporter.java           |   1 +
 .../SimpleHttpInvokerServiceExporter.java     |   1 +
 .../jaxrpc/JaxRpcPortClientInterceptor.java   |   2 +
 .../jaxrpc/JaxRpcPortProxyFactoryBean.java    |   4 +
 .../jaxrpc/LocalJaxRpcServiceFactoryBean.java |   4 +
 .../jaxrpc/ServletEndpointSupport.java        |   2 +
 .../jaxws/AbstractJaxWsServiceExporter.java   |   3 +
 .../jaxws/JaxWsPortClientInterceptor.java     |   3 +
 .../jaxws/JaxWsPortProxyFactoryBean.java      |   3 +
 .../jaxws/LocalJaxWsServiceFactoryBean.java   |   4 +
 .../SpringServletContainerInitializer.java    |   1 +
 ...ractMappingContentNegotiationStrategy.java |   1 +
 .../web/accept/ContentNegotiationManager.java |   3 +
 .../ContentNegotiationManagerFactoryBean.java |   5 +
 .../FixedContentNegotiationStrategy.java      |   1 +
 .../HeaderContentNegotiationStrategy.java     |   1 +
 ...MappingMediaTypeFileExtensionResolver.java |   2 +
 .../web/bind/EscapedErrors.java               |  29 +++++
 .../support/HandlerMethodResolver.java        |   1 +
 .../ConfigurableWebBindingInitializer.java    |   1 +
 .../support/DefaultDataBinderFactory.java     |   1 +
 .../support/DefaultSessionAttributeStore.java |   3 +
 .../web/bind/support/SimpleSessionStatus.java |   2 +
 .../client/DefaultResponseErrorHandler.java   |   2 +
 .../client/HttpMessageConverterExtractor.java |   1 +
 .../web/client/RestTemplate.java              |  39 +++++++
 .../AbstractContextLoaderInitializer.java     |   1 +
 .../ConfigurableWebApplicationContext.java    |   1 +
 .../web/context/ContextCleanupListener.java   |   2 +
 .../web/context/ContextLoaderListener.java    |   2 +
 .../AbstractRequestAttributesScope.java       |   4 +
 .../DestructionCallbackBindingListener.java   |   2 +
 .../request/FacesRequestAttributes.java       |   8 ++
 .../web/context/request/FacesWebRequest.java  |  20 ++++
 ...g4jNestedDiagnosticContextInterceptor.java |   4 +
 .../request/RequestContextListener.java       |   2 +
 .../web/context/request/RequestScope.java     |   1 +
 .../request/ServletRequestAttributes.java     |   8 ++
 .../context/request/ServletWebRequest.java    |  20 ++++
 .../web/context/request/SessionScope.java     |   1 +
 .../CallableProcessingInterceptorAdapter.java |   5 +
 ...redResultProcessingInterceptorAdapter.java |   5 +
 .../async/NoSupportAsyncWebRequest.java       |   7 ++
 .../async/StandardServletAsyncWebRequest.java |  11 ++
 .../request/async/WebAsyncManager.java        |   7 ++
 ...tractRefreshableWebApplicationContext.java |   7 ++
 .../support/GenericWebApplicationContext.java |  10 ++
 .../ServletContextAttributeExporter.java      |   1 +
 .../ServletContextAttributeFactoryBean.java   |   4 +
 .../support/ServletContextAwareProcessor.java |   2 +
 .../support/ServletContextFactoryBean.java    |   4 +
 .../ServletContextParameterFactoryBean.java   |   4 +
 ...tContextPropertyPlaceholderConfigurer.java |   1 +
 .../support/ServletContextResource.java       |   3 +
 .../context/support/ServletContextScope.java  |   6 +
 .../support/StandardServletEnvironment.java   |   1 +
 .../support/StaticWebApplicationContext.java  |  10 ++
 .../support/WebApplicationContextUtils.java   |   5 +
 .../support/WebApplicationObjectSupport.java  |   1 +
 .../web/filter/CompositeFilter.java           |   4 +
 .../web/filter/DelegatingFilterProxy.java     |   1 +
 .../web/filter/GenericFilterBean.java         |   6 +
 .../web/filter/OncePerRequestFilter.java      |   1 +
 .../DelegatingPhaseListenerMulticaster.java   |   3 +
 .../web/method/ControllerAdviceBean.java      |   1 +
 .../web/method/HandlerMethodSelector.java     |   1 +
 ...ractCookieValueMethodArgumentResolver.java |   1 +
 ...tractNamedValueMethodArgumentResolver.java |   1 +
 .../AbstractWebArgumentResolverAdapter.java   |   2 +
 .../ErrorsMethodArgumentResolver.java         |   2 +
 .../ExceptionHandlerMethodResolver.java       |   1 +
 ...ExpressionValueMethodArgumentResolver.java |   1 +
 .../method/annotation/MapMethodProcessor.java |   4 +
 .../ModelAttributeMethodProcessor.java        |   4 +
 .../annotation/ModelMethodProcessor.java      |   4 +
 ...equestHeaderMapMethodArgumentResolver.java |   2 +
 .../RequestHeaderMethodArgumentResolver.java  |   1 +
 ...RequestParamMapMethodArgumentResolver.java |   2 +
 .../RequestParamMethodArgumentResolver.java   |   1 +
 .../SessionStatusMethodArgumentResolver.java  |   2 +
 ...andlerMethodArgumentResolverComposite.java |   2 +
 ...dlerMethodReturnValueHandlerComposite.java |   2 +
 .../commons/CommonsMultipartFile.java         |   8 ++
 .../commons/CommonsMultipartResolver.java     |   4 +
 .../AbstractMultipartHttpServletRequest.java  |   7 ++
 .../DefaultMultipartHttpServletRequest.java   |   2 +
 .../StandardMultipartHttpServletRequest.java  |  10 ++
 .../StandardServletMultipartResolver.java     |   3 +
 .../web/util/HierarchicalUriComponents.java   |  20 ++++
 .../web/util/HttpSessionMutexListener.java    |   2 +
 .../web/util/IntrospectorCleanupListener.java |   2 +
 .../web/util/Log4jConfigListener.java         |   2 +
 .../web/util/UriComponents.java               |   2 +
 .../web/util/UriComponentsBuilder.java        |  12 ++
 .../web/util/WebAppRootListener.java          |   2 +
 .../web/portlet/FrameworkPortlet.java         |   1 +
 .../web/portlet/GenericPortletBean.java       |   2 +
 ...tRefreshablePortletApplicationContext.java |   7 ++
 .../PortletApplicationContextUtils.java       |   3 +
 .../PortletApplicationObjectSupport.java      |   1 +
 .../context/PortletContextAwareProcessor.java |   2 +
 .../context/PortletContextResource.java       |   3 +
 .../portlet/context/PortletContextScope.java  |   6 +
 .../context/PortletRequestAttributes.java     |   8 ++
 .../portlet/context/PortletWebRequest.java    |  20 ++++
 .../StaticPortletApplicationContext.java      |  10 ++
 .../AbstractHandlerExceptionResolver.java     |   3 +
 .../handler/AbstractHandlerMapping.java       |   2 +
 .../handler/HandlerInterceptorAdapter.java    |  10 ++
 .../handler/SimplePortletHandlerAdapter.java  |   6 +
 .../handler/SimplePortletPostProcessor.java   |  16 +++
 .../WebRequestHandlerInterceptorAdapter.java  |  10 ++
 .../CommonsPortletMultipartResolver.java      |   4 +
 .../DefaultMultipartActionRequest.java        |   6 +
 .../web/portlet/mvc/AbstractController.java   |   2 +
 .../mvc/PortletModeNameViewController.java    |   2 +
 .../mvc/PortletWrappingController.java        |  17 +++
 .../mvc/SimpleControllerHandlerAdapter.java   |   6 +
 .../AnnotationMethodHandlerAdapter.java       |   7 ++
 ...otationMethodHandlerExceptionResolver.java |   1 +
 .../DefaultAnnotationHandlerMapping.java      |  16 +++
 .../tiles3/AbstractSpringPreparerFactory.java |   1 +
 .../servlet/view/tiles3/TilesConfigurer.java  |   3 +
 .../web/servlet/DispatcherServlet.java        |   1 +
 .../springframework/web/servlet/FlashMap.java |   1 +
 .../web/servlet/FrameworkServlet.java         |   1 +
 .../web/servlet/HttpServletBean.java          |   2 +
 .../AnnotationDrivenBeanDefinitionParser.java |   1 +
 ...ultServletHandlerBeanDefinitionParser.java |   1 +
 .../InterceptorsBeanDefinitionParser.java     |   1 +
 .../servlet/config/MvcNamespaceHandler.java   |   1 +
 .../config/ResourcesBeanDefinitionParser.java |   1 +
 .../ViewControllerBeanDefinitionParser.java   |   1 +
 .../WebMvcConfigurationSupport.java           |   4 +
 .../annotation/WebMvcConfigurerAdapter.java   |  13 +++
 .../annotation/WebMvcConfigurerComposite.java |  13 +++
 .../AbstractHandlerExceptionResolver.java     |   2 +
 .../handler/AbstractHandlerMapping.java       |   2 +
 .../handler/AbstractHandlerMethodMapping.java |   3 +
 .../HandlerExceptionResolverComposite.java    |   2 +
 .../handler/HandlerInterceptorAdapter.java    |   4 +
 .../handler/SimpleServletHandlerAdapter.java  |   3 +
 .../handler/SimpleServletPostProcessor.java   |   9 ++
 .../WebRequestHandlerInterceptorAdapter.java  |   4 +
 .../i18n/AcceptHeaderLocaleResolver.java      |   2 +
 .../servlet/i18n/CookieLocaleResolver.java    |   2 +
 .../web/servlet/i18n/FixedLocaleResolver.java |   2 +
 .../servlet/i18n/SessionLocaleResolver.java   |   2 +
 .../web/servlet/mvc/AbstractController.java   |   1 +
 .../mvc/HttpRequestHandlerAdapter.java        |   3 +
 .../mvc/ServletForwardingController.java      |   1 +
 .../mvc/ServletWrappingController.java        |   7 ++
 .../mvc/SimpleControllerHandlerAdapter.java   |   3 +
 .../servlet/mvc/WebContentInterceptor.java    |   3 +
 .../AnnotationMethodHandlerAdapter.java       |   6 +
 ...otationMethodHandlerExceptionResolver.java |   1 +
 .../DefaultAnnotationHandlerMapping.java      |   1 +
 .../AbstractMediaTypeExpression.java          |   3 +
 .../AbstractNameValueExpression.java          |   3 +
 .../condition/CompositeRequestCondition.java  |   3 +
 .../condition/ConsumesRequestCondition.java   |   3 +
 .../condition/HeadersRequestCondition.java    |   3 +
 .../mvc/condition/ParamsRequestCondition.java |   3 +
 .../condition/PatternsRequestCondition.java   |   3 +
 .../condition/ProducesRequestCondition.java   |   3 +
 .../mvc/condition/RequestConditionHolder.java |   3 +
 .../RequestMethodsRequestCondition.java       |   3 +
 .../method/AbstractHandlerMethodAdapter.java  |   4 +
 .../mvc/method/RequestMappingInfo.java        |   3 +
 .../RequestMappingInfoHandlerMapping.java     |   1 +
 .../AsyncTaskMethodReturnValueHandler.java    |   2 +
 .../CallableMethodReturnValueHandler.java     |   2 +
 ...eferredResultMethodReturnValueHandler.java |   2 +
 .../ExceptionHandlerExceptionResolver.java    |   2 +
 .../annotation/HttpEntityMethodProcessor.java |   4 +
 ...trixVariableMapMethodArgumentResolver.java |   2 +
 .../MatrixVariableMethodArgumentResolver.java |   1 +
 .../ModelAndViewMethodReturnValueHandler.java |   2 +
 ...dViewResolverMethodReturnValueHandler.java |   2 +
 ...PathVariableMapMethodArgumentResolver.java |   2 +
 .../PathVariableMethodArgumentResolver.java   |   1 +
 ...irectAttributesMethodArgumentResolver.java |   2 +
 .../RequestMappingHandlerAdapter.java         |   4 +
 .../RequestPartMethodArgumentResolver.java    |   2 +
 .../RequestResponseBodyMethodProcessor.java   |   4 +
 .../ServletInvocableHandlerMethod.java        |   1 +
 .../ServletRequestMethodArgumentResolver.java |   2 +
 ...ServletResponseMethodArgumentResolver.java |   2 +
 ...mponentsBuilderMethodArgumentResolver.java |   2 +
 .../ViewMethodReturnValueHandler.java         |   2 +
 .../ViewNameMethodReturnValueHandler.java     |   2 +
 .../AbstractUrlMethodNameResolver.java        |   1 +
 .../multiaction/MultiActionController.java    |   1 +
 .../ParameterMethodNameResolver.java          |   1 +
 .../PropertiesMethodNameResolver.java         |   1 +
 .../mvc/support/RedirectAttributes.java       |   4 +
 .../support/RedirectAttributesModelMap.java   |   9 ++
 .../DefaultServletHttpRequestHandler.java     |   2 +
 .../resource/ResourceHttpRequestHandler.java  |   2 +
 .../support/AbstractFlashMapManager.java      |   2 +
 .../support/SessionFlashMapManager.java       |   2 +
 .../web/servlet/tags/BindTag.java             |   1 +
 .../web/servlet/tags/EscapeBodyTag.java       |   2 +
 .../web/servlet/tags/EvalTag.java             |   5 +
 .../web/servlet/tags/NestedPathTag.java       |   2 +
 .../servlet/tags/RequestContextAwareTag.java  |   2 +
 .../web/servlet/tags/UrlTag.java              |   1 +
 .../form/AbstractDataBoundFormElementTag.java |   1 +
 .../tags/form/AbstractHtmlElementBodyTag.java |   2 +
 .../tags/form/AbstractHtmlElementTag.java     |   1 +
 .../web/servlet/tags/form/ButtonTag.java      |   1 +
 .../web/servlet/tags/form/SelectTag.java      |   1 +
 .../servlet/theme/CookieThemeResolver.java    |   2 +
 .../web/servlet/theme/FixedThemeResolver.java |   2 +
 .../servlet/theme/SessionThemeResolver.java   |   2 +
 .../view/AbstractCachingViewResolver.java     |   1 +
 .../servlet/view/AbstractUrlBasedView.java    |   1 +
 .../web/servlet/view/AbstractView.java        |   3 +
 .../servlet/view/BeanNameViewResolver.java    |   2 +
 .../view/ContentNegotiatingViewResolver.java  |   5 +
 .../DefaultRequestToViewNameTranslator.java   |   1 +
 .../web/servlet/view/RedirectView.java        |   1 +
 .../view/ResourceBundleViewResolver.java      |   3 +
 .../servlet/view/UrlBasedViewResolver.java    |   1 +
 .../web/servlet/view/XmlViewResolver.java     |   3 +
 .../view/freemarker/FreeMarkerConfigurer.java |   4 +
 .../view/freemarker/FreeMarkerView.java       |   4 +
 .../tiles2/AbstractSpringPreparerFactory.java |   1 +
 .../SpringTilesApplicationContextFactory.java |   2 +
 .../servlet/view/tiles2/TilesConfigurer.java  |   3 +
 .../view/velocity/VelocityConfigurer.java     |   3 +
 1256 files changed, 5716 insertions(+)

diff --git a/spring-aop/src/main/java/org/springframework/aop/TargetSource.java b/spring-aop/src/main/java/org/springframework/aop/TargetSource.java
index 9633b4b33b..8e5ccc1fa6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TargetSource.java
@@ -39,6 +39,7 @@ public interface TargetSource extends TargetClassAware {
 	 * target class.
 	 * @return the type of targets returned by this {@link TargetSource}
 	 */
+	@Override
 	Class<?> getTargetClass();
 
 	/**
diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
index 248e2f6416..1d622196f7 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java
@@ -34,6 +34,7 @@ class TrueClassFilter implements ClassFilter, Serializable {
 	private TrueClassFilter() {
 	}
 
+	@Override
 	public boolean matches(Class clazz) {
 		return true;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
index a8bf94dcae..b4722cdf00 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java
@@ -35,14 +35,17 @@ class TrueMethodMatcher implements MethodMatcher, Serializable {
 	private TrueMethodMatcher() {
 	}
 
+	@Override
 	public boolean isRuntime() {
 		return false;
 	}
 
+	@Override
 	public boolean matches(Method method, Class targetClass) {
 		return true;
 	}
 
+	@Override
 	public boolean matches(Method method, Class targetClass, Object[] args) {
 		// Should never be invoked as isRuntime returns false.
 		throw new UnsupportedOperationException();
diff --git a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
index 553b0e9d6d..1a44c2ac26 100644
--- a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java
@@ -34,10 +34,12 @@ class TruePointcut implements Pointcut, Serializable {
 	private TruePointcut() {
 	}
 
+	@Override
 	public ClassFilter getClassFilter() {
 		return ClassFilter.TRUE;
 	}
 
+	@Override
 	public MethodMatcher getMethodMatcher() {
 		return MethodMatcher.TRUE;
 	}
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..3a6436c7f8 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
@@ -203,6 +203,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		return this.aspectInstanceFactory.getAspectClassLoader();
 	}
 
+	@Override
 	public int getOrder() {
 		return this.aspectInstanceFactory.getOrder();
 	}
@@ -212,6 +213,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		this.aspectName = name;
 	}
 
+	@Override
 	public String getAspectName() {
 		return this.aspectName;
 	}
@@ -223,6 +225,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		this.declarationOrder = order;
 	}
 
+	@Override
 	public int getDeclarationOrder() {
 		return this.declarationOrder;
 	}
@@ -678,6 +681,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 			this.adviceMethod = adviceMethod;
 		}
 
+		@Override
 		public boolean matches(Method method, Class targetClass) {
 			return !this.adviceMethod.equals(method);
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
index 42a2c6f729..0fbeed07b8 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java
@@ -222,6 +222,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	 * @param method the target {@link Method}
 	 * @return the parameter names
 	 */
+	@Override
 	public String[] getParameterNames(Method method) {
 		this.argumentTypes = method.getParameterTypes();
 		this.numberOfRemainingUnboundArguments = this.argumentTypes.length;
@@ -309,6 +310,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	 * @throws UnsupportedOperationException if
 	 * {@link #setRaiseExceptions(boolean) raiseExceptions} has been set to {@code true}
 	 */
+	@Override
 	public String[] getParameterNames(Constructor ctor) {
 		if (this.raiseExceptions) {
 			throw new UnsupportedOperationException("An advice method can never be a constructor");
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java
index fd5b0d64c4..c6669af251 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java
@@ -37,6 +37,7 @@ public class AspectJAfterAdvice extends AbstractAspectJAdvice implements MethodI
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
 
+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();
@@ -46,10 +47,12 @@ public class AspectJAfterAdvice extends AbstractAspectJAdvice implements MethodI
 		}
 	}
 
+	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}
 
+	@Override
 	public boolean isAfterAdvice() {
 		return true;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java
index 2f9396c230..ae3cec974d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java
@@ -40,10 +40,12 @@ public class AspectJAfterReturningAdvice extends AbstractAspectJAdvice implement
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
 
+	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}
 
+	@Override
 	public boolean isAfterAdvice() {
 		return true;
 	}
@@ -53,6 +55,7 @@ public class AspectJAfterReturningAdvice extends AbstractAspectJAdvice implement
 		setReturningNameNoCheck(name);
 	}
 
+	@Override
 	public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable {
 		if (shouldInvokeOnReturnValueOf(method, returnValue)) {
 			invokeAdviceMethod(getJoinPointMatch(), returnValue, null);
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java
index 6b9b611b96..da9e10ed4d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java
@@ -37,10 +37,12 @@ public class AspectJAfterThrowingAdvice extends AbstractAspectJAdvice implements
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
 
+	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}
 
+	@Override
 	public boolean isAfterAdvice() {
 		return true;
 	}
@@ -50,6 +52,7 @@ public class AspectJAfterThrowingAdvice extends AbstractAspectJAdvice implements
 		setThrowingNameNoCheck(name);
 	}
 
+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
index 3048103a10..d0a3b1375e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
@@ -41,10 +41,12 @@ public class AspectJAroundAdvice extends AbstractAspectJAdvice implements Method
 		super(aspectJAroundAdviceMethod, pointcut, aif);
 	}
 
+	@Override
 	public boolean isBeforeAdvice() {
 		return false;
 	}
 
+	@Override
 	public boolean isAfterAdvice() {
 		return false;
 	}
@@ -55,6 +57,7 @@ public class AspectJAroundAdvice extends AbstractAspectJAdvice implements Method
 	}
 
 
+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		if (!(mi instanceof ProxyMethodInvocation)) {
 			throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);
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 7e101ea57d..2f92de4f8f 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
@@ -155,16 +155,19 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		this.pointcutParameterTypes = types;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
 
+	@Override
 	public ClassFilter getClassFilter() {
 		checkReadyToMatch();
 		return this;
 	}
 
+	@Override
 	public MethodMatcher getMethodMatcher() {
 		checkReadyToMatch();
 		return this;
@@ -244,6 +247,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		return this.pointcutExpression;
 	}
 
+	@Override
 	public boolean matches(Class targetClass) {
 		checkReadyToMatch();
 		try {
@@ -267,6 +271,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		}
 	}
 
+	@Override
 	public boolean matches(Method method, Class targetClass, boolean beanHasIntroductions) {
 		checkReadyToMatch();
 		Method targetMethod = AopUtils.getMostSpecificMethod(method, targetClass);
@@ -287,15 +292,18 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		}
 	}
 
+	@Override
 	public boolean matches(Method method, Class targetClass) {
 		return matches(method, targetClass, false);
 	}
 
+	@Override
 	public boolean isRuntime() {
 		checkReadyToMatch();
 		return this.pointcutExpression.mayNeedDynamicTest();
 	}
 
+	@Override
 	public boolean matches(Method method, Class targetClass, Object[] args) {
 		checkReadyToMatch();
 		ShadowMatch shadowMatch = getShadowMatch(AopUtils.getMostSpecificMethod(method, targetClass), method);
@@ -506,10 +514,12 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 
 		private static final String BEAN_DESIGNATOR_NAME = "bean";
 
+		@Override
 		public String getDesignatorName() {
 			return BEAN_DESIGNATOR_NAME;
 		}
 
+		@Override
 		public ContextBasedMatcher parse(String expression) {
 			return new BeanNameContextMatcher(expression);
 		}
@@ -531,22 +541,27 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 			this.expressionPattern = new NamePattern(expression);
 		}
 
+		@Override
 		public boolean couldMatchJoinPointsInType(Class someClass) {
 			return (contextMatch(someClass) == FuzzyBoolean.YES);
 		}
 
+		@Override
 		public boolean couldMatchJoinPointsInType(Class someClass, MatchingContext context) {
 			return (contextMatch(someClass) == FuzzyBoolean.YES);
 		}
 
+		@Override
 		public boolean matchesDynamically(MatchingContext context) {
 			return true;
 		}
 
+		@Override
 		public FuzzyBoolean matchesStatically(MatchingContext context) {
 			return contextMatch(null);
 		}
 
+		@Override
 		public boolean mayNeedDynamicTest() {
 			return false;
 		}
@@ -611,18 +626,22 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 			this.other = other;
 		}
 
+		@Override
 		public boolean alwaysMatches() {
 			return primary.alwaysMatches();
 		}
 
+		@Override
 		public boolean maybeMatches() {
 			return primary.maybeMatches();
 		}
 
+		@Override
 		public boolean neverMatches() {
 			return primary.neverMatches();
 		}
 
+		@Override
 		public JoinPointMatch matchesJoinPoint(Object thisObject,
 				Object targetObject, Object[] args) {
 			try {
@@ -632,6 +651,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 			}
 		}
 
+		@Override
 		public void setMatchingContext(MatchingContext aMatchContext) {
 			primary.setMatchingContext(aMatchContext);
 			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..5354360cd4 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
@@ -31,6 +31,7 @@ public class AspectJExpressionPointcutAdvisor extends AbstractGenericPointcutAdv
 	private final AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
 
 
+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java
index 503119714f..31a849ae86 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java
@@ -35,14 +35,17 @@ public class AspectJMethodBeforeAdvice extends AbstractAspectJAdvice implements
 		super(aspectJBeforeAdviceMethod, pointcut, aif);
 	}
 
+	@Override
 	public void before(Method method, Object[] args, Object target) throws Throwable {
 		invokeAdviceMethod(getJoinPointMatch(), null, null);
 	}
 
+	@Override
 	public boolean isBeforeAdvice() {
 		return true;
 	}
 
+	@Override
 	public boolean isAfterAdvice() {
 		return false;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
index 2b8950a0e6..f92b2300bb 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
@@ -56,18 +56,22 @@ public class AspectJPointcutAdvisor implements PointcutAdvisor, Ordered {
 	}
 
 
+	@Override
 	public boolean isPerInstance() {
 		return true;
 	}
 
+	@Override
 	public Advice getAdvice() {
 		return this.advice;
 	}
 
+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
 
+	@Override
 	public int getOrder() {
 		if (this.order != null) {
 			return this.order;
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 4505e6f330..c6e568b7d8 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
@@ -48,6 +48,7 @@ public class AspectJWeaverMessageHandler implements IMessageHandler {
 	private static final Log LOGGER = LogFactory.getLog("AspectJ Weaver");
 
 
+	@Override
 	public boolean handleMessage(IMessage message) throws AbortException {
 		Kind messageKind = message.getKind();
 
@@ -93,15 +94,18 @@ public class AspectJWeaverMessageHandler implements IMessageHandler {
 		return AJ_ID + aMessage.getMessage();
 	}
 
+	@Override
 	public boolean isIgnoring(Kind messageKind) {
 		// We want to see everything, and allow configuration of log levels dynamically.
 		return false;
 	}
 
+	@Override
 	public void dontIgnore(Kind messageKind) {
 		// We weren't ignoring anything anyway...
 	}
 
+	@Override
 	public void ignore(Kind kind) {
 		// We weren't ignoring anything anyway...
 	}
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..0d1a84247b 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
@@ -77,6 +77,7 @@ public class DeclareParentsAdvisor implements IntroductionAdvisor {
 
 		// Excludes methods implemented.
 		ClassFilter exclusion = new ClassFilter() {
+			@Override
 			public boolean matches(Class clazz) {
 				return !(introducedInterface.isAssignableFrom(clazz));
 			}
@@ -87,22 +88,27 @@ public class DeclareParentsAdvisor implements IntroductionAdvisor {
 	}
 
 
+	@Override
 	public ClassFilter getClassFilter() {
 		return this.typePatternClassFilter;
 	}
 
+	@Override
 	public void validateInterfaces() throws IllegalArgumentException {
 		// Do nothing
 	}
 
+	@Override
 	public boolean isPerInstance() {
 		return true;
 	}
 
+	@Override
 	public Advice getAdvice() {
 		return this.advice;
 	}
 
+	@Override
 	public Class[] getInterfaces() {
 		return new Class[] {this.introducedInterface};
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
index fbdcf09313..952706078e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java
@@ -72,14 +72,17 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 		this.methodInvocation = methodInvocation;
 	}
 
+	@Override
 	public void set$AroundClosure(AroundClosure aroundClosure) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Object proceed() throws Throwable {
 		return this.methodInvocation.invocableClone().proceed();
 	}
 
+	@Override
 	public Object proceed(Object[] arguments) throws Throwable {
 		Assert.notNull(arguments, "Argument array passed to proceed cannot be null");
 		if (arguments.length != this.methodInvocation.getArguments().length) {
@@ -94,6 +97,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 	/**
 	 * Returns the Spring AOP proxy. Cannot be {@code null}.
 	 */
+	@Override
 	public Object getThis() {
 		return this.methodInvocation.getProxy();
 	}
@@ -101,10 +105,12 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 	/**
 	 * Returns the Spring AOP target. May be {@code null} if there is no target.
 	 */
+	@Override
 	public Object getTarget() {
 		return this.methodInvocation.getThis();
 	}
 
+	@Override
 	public Object[] getArgs() {
 		if (this.defensiveCopyOfArgs == null) {
 			Object[] argsSource = this.methodInvocation.getArguments();
@@ -114,6 +120,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 		return this.defensiveCopyOfArgs;
 	}
 
+	@Override
 	public Signature getSignature() {
 		if (this.signature == null) {
 			this.signature = new MethodSignatureImpl();
@@ -121,6 +128,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 		return signature;
 	}
 
+	@Override
 	public SourceLocation getSourceLocation() {
 		if (this.sourceLocation == null) {
 			this.sourceLocation = new SourceLocationImpl();
@@ -128,23 +136,28 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 		return this.sourceLocation;
 	}
 
+	@Override
 	public String getKind() {
 		return ProceedingJoinPoint.METHOD_EXECUTION;
 	}
 
+	@Override
 	public int getId() {
 		// TODO: It's just an adapter but returning 0 might still have side effects...
 		return 0;
 	}
 
+	@Override
 	public JoinPoint.StaticPart getStaticPart() {
 		return this;
 	}
 
+	@Override
 	public String toShortString() {
 		return "execution(" + getSignature().toShortString() + ")";
 	}
 
+	@Override
 	public String toLongString() {
 		return "execution(" + getSignature().toLongString() + ")";
 	}
@@ -161,34 +174,42 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 
 		private volatile String[] parameterNames;
 
+		@Override
 		public String getName() {
 			return methodInvocation.getMethod().getName();
 		}
 
+		@Override
 		public int getModifiers() {
 			return methodInvocation.getMethod().getModifiers();
 		}
 
+		@Override
 		public Class getDeclaringType() {
 			return methodInvocation.getMethod().getDeclaringClass();
 		}
 
+		@Override
 		public String getDeclaringTypeName() {
 			return methodInvocation.getMethod().getDeclaringClass().getName();
 		}
 
+		@Override
 		public Class getReturnType() {
 			return methodInvocation.getMethod().getReturnType();
 		}
 
+		@Override
 		public Method getMethod() {
 			return methodInvocation.getMethod();
 		}
 
+		@Override
 		public Class[] getParameterTypes() {
 			return methodInvocation.getMethod().getParameterTypes();
 		}
 
+		@Override
 		public String[] getParameterNames() {
 			if (this.parameterNames == null) {
 				this.parameterNames = (new LocalVariableTableParameterNameDiscoverer()).getParameterNames(getMethod());
@@ -196,14 +217,17 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 			return this.parameterNames;
 		}
 
+		@Override
 		public Class[] getExceptionTypes() {
 			return methodInvocation.getMethod().getExceptionTypes();
 		}
 
+		@Override
 		public String toShortString() {
 			return toString(false, false, false, false);
 		}
 
+		@Override
 		public String toLongString() {
 			return toString(true, true, true, true);
 		}
@@ -267,6 +291,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 	 */
 	private class SourceLocationImpl implements SourceLocation {
 
+		@Override
 		public Class getWithinType() {
 			if (methodInvocation.getThis() == null) {
 				throw new UnsupportedOperationException("No source location joinpoint available: target is null");
@@ -274,14 +299,17 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 			return methodInvocation.getThis().getClass();
 		}
 
+		@Override
 		public String getFileName() {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public int getLine() {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public int getColumn() {
 			throw new UnsupportedOperationException();
 		}
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..7d52c03615 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
@@ -106,35 +106,44 @@ class RuntimeTestWalker {
 		protected static final int AT_TARGET_VAR = 4;
 		protected static final int AT_ANNOTATION_VAR = 8;
 
+		@Override
 		public void visit(And e) {
 			e.getLeft().accept(this);
 			e.getRight().accept(this);
 		}
 
+		@Override
 		public void visit(Or e) {
 			e.getLeft().accept(this);
 			e.getRight().accept(this);
 		}
 
+		@Override
 		public void visit(Not e) {
 			e.getBody().accept(this);
 		}
 
+		@Override
 		public void visit(Instanceof i) {
 		}
 
+		@Override
 		public void visit(Literal literal) {
 		}
 
+		@Override
 		public void visit(Call call) {
 		}
 
+		@Override
 		public void visit(FieldGetCall fieldGetCall) {
 		}
 
+		@Override
 		public void visit(HasAnnotation hasAnnotation) {
 		}
 
+		@Override
 		public void visit(MatchingContextBasedTest matchingContextTest) {
 		}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java
index 40049e978e..dfb36d6a72 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java
@@ -49,6 +49,7 @@ public class SimpleAspectInstanceFactory implements AspectInstanceFactory {
 	}
 
 
+	@Override
 	public final Object getAspectInstance() {
 		try {
 			return this.aspectClass.newInstance();
@@ -61,6 +62,7 @@ public class SimpleAspectInstanceFactory implements AspectInstanceFactory {
 		}
 	}
 
+	@Override
 	public ClassLoader getAspectClassLoader() {
 		return this.aspectClass.getClassLoader();
 	}
@@ -73,6 +75,7 @@ public class SimpleAspectInstanceFactory implements AspectInstanceFactory {
 	 * @see org.springframework.core.Ordered
 	 * @see #getOrderForAspectClass
 	 */
+	@Override
 	public int getOrder() {
 		return getOrderForAspectClass(this.aspectClass);
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
index 7f550a333d..1e8f723efb 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java
@@ -44,10 +44,12 @@ public class SingletonAspectInstanceFactory implements AspectInstanceFactory {
 	}
 
 
+	@Override
 	public final Object getAspectInstance() {
 		return this.aspectInstance;
 	}
 
+	@Override
 	public ClassLoader getAspectClassLoader() {
 		return this.aspectInstance.getClass().getClassLoader();
 	}
@@ -60,6 +62,7 @@ public class SingletonAspectInstanceFactory implements AspectInstanceFactory {
 	 * @see org.springframework.core.Ordered
 	 * @see #getOrderForAspectClass
 	 */
+	@Override
 	public int getOrder() {
 		if (this.aspectInstance instanceof Ordered) {
 			return ((Ordered) this.aspectInstance).getOrder();
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
index adb8c4db37..f2893fc583 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java
@@ -93,6 +93,7 @@ public class TypePatternClassFilter implements ClassFilter {
 	 * @return whether the advice should apply to this candidate target class
 	 * @throws IllegalStateException if no {@link #setTypePattern(String)} has been set
 	 */
+	@Override
 	public boolean matches(Class clazz) {
 		if (this.aspectJTypePatternMatcher == null) {
 			throw new IllegalStateException("No 'typePattern' has been set via ctor/setter.");
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
index 5b3f48bce8..add6c5fac2 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
@@ -111,6 +111,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 	 * is that aspects written in the code-style (AspectJ language) also have the annotation present
 	 * when compiled by ajc with the -1.5 flag, yet they cannot be consumed by Spring AOP.
 	 */
+	@Override
 	public boolean isAspect(Class<?> clazz) {
 		return (hasAspectAnnotation(clazz) && !compiledByAjc(clazz));
 	}
@@ -135,6 +136,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 		return false;
 	}
 
+	@Override
 	public void validate(Class<?> aspectClass) throws AopConfigException {
 		// If the parent has the annotation and isn't abstract it's an error
 		if (aspectClass.getSuperclass().getAnnotation(Aspect.class) != null &&
@@ -309,6 +311,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 	 */
 	private static class AspectJAnnotationParameterNameDiscoverer implements ParameterNameDiscoverer {
 
+		@Override
 		public String[] getParameterNames(Method method) {
 			if (method.getParameterTypes().length == 0) {
 				return new String[0];
@@ -330,6 +333,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 			}
 		}
 
+		@Override
 		public String[] getParameterNames(Constructor ctor) {
 			throw new UnsupportedOperationException("Spring AOP cannot handle constructor advice");
 		}
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..855af77216 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
@@ -72,10 +72,12 @@ public class BeanFactoryAspectInstanceFactory implements MetadataAwareAspectInst
 	}
 
 
+	@Override
 	public Object getAspectInstance() {
 		return this.beanFactory.getBean(this.name);
 	}
 
+	@Override
 	public ClassLoader getAspectClassLoader() {
 		if (this.beanFactory instanceof ConfigurableBeanFactory) {
 			return ((ConfigurableBeanFactory) this.beanFactory).getBeanClassLoader();
@@ -85,6 +87,7 @@ public class BeanFactoryAspectInstanceFactory implements MetadataAwareAspectInst
 		}
 	}
 
+	@Override
 	public AspectMetadata getAspectMetadata() {
 		return this.aspectMetadata;
 	}
@@ -99,6 +102,7 @@ public class BeanFactoryAspectInstanceFactory implements MetadataAwareAspectInst
 	 * @see org.springframework.core.Ordered
 	 * @see org.springframework.core.annotation.Order
 	 */
+	@Override
 	public int getOrder() {
 		Class<?> type = this.beanFactory.getType(this.name);
 		if (type != null) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
index b9863ab67a..2d16ece7c5 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java
@@ -97,6 +97,7 @@ class InstantiationModelAwarePointcutAdvisorImpl
 	 * The pointcut for Spring AOP to use. Actual behaviour of the pointcut will change
 	 * depending on the state of the advice.
 	 */
+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
@@ -106,6 +107,7 @@ class InstantiationModelAwarePointcutAdvisorImpl
 	 * are much richer. In AspectJ terminology, all a return of {@code true}
 	 * means here is that the aspect is not a SINGLETON.
 	 */
+	@Override
 	public boolean isPerInstance() {
 		return (getAspectMetadata().getAjType().getPerClause().getKind() != PerClauseKind.SINGLETON);
 	}
@@ -120,6 +122,7 @@ class InstantiationModelAwarePointcutAdvisorImpl
 	/**
 	 * Lazily instantiate advice if necessary.
 	 */
+	@Override
 	public synchronized Advice getAdvice() {
 		if (this.instantiatedAdvice == null) {
 			this.instantiatedAdvice = instantiateAdvice(this.declaredPointcut);
@@ -127,10 +130,12 @@ class InstantiationModelAwarePointcutAdvisorImpl
 		return this.instantiatedAdvice;
 	}
 
+	@Override
 	public boolean isLazy() {
 		return this.lazy;
 	}
 
+	@Override
 	public synchronized boolean isAdviceInstantiated() {
 		return (this.instantiatedAdvice != null);
 	}
@@ -149,18 +154,22 @@ class InstantiationModelAwarePointcutAdvisorImpl
 		return this.declaredPointcut;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.aspectInstanceFactory.getOrder();
 	}
 
+	@Override
 	public String getAspectName() {
 		return this.aspectName;
 	}
 
+	@Override
 	public int getDeclarationOrder() {
 		return this.declarationOrder;
 	}
 
+	@Override
 	public boolean isBeforeAdvice() {
 		if (this.isBeforeAdvice == null) {
 			determineAdviceType();
@@ -168,6 +177,7 @@ class InstantiationModelAwarePointcutAdvisorImpl
 		return this.isBeforeAdvice;
 	}
 
+	@Override
 	public boolean isAfterAdvice() {
 		if (this.isAfterAdvice == null) {
 			determineAdviceType();
@@ -245,6 +255,7 @@ class InstantiationModelAwarePointcutAdvisorImpl
 					this.preInstantiationPointcut.getMethodMatcher().matches(method, targetClass);
 		}
 
+		@Override
 		public boolean matches(Method method, Class targetClass, Object[] args) {
 			// This can match only on declared pointcut.
 			return (isAspectMaterialized() && this.declaredPointcut.matches(method, targetClass));
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..23df015c5c 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
@@ -42,6 +42,7 @@ public class LazySingletonAspectInstanceFactoryDecorator implements MetadataAwar
 	}
 
 
+	@Override
 	public synchronized Object getAspectInstance() {
 		if (this.materialized == null) {
 			synchronized (this) {
@@ -57,14 +58,17 @@ public class LazySingletonAspectInstanceFactoryDecorator implements MetadataAwar
 		return (this.materialized != null);
 	}
 
+	@Override
 	public ClassLoader getAspectClassLoader() {
 		return this.maaif.getAspectClassLoader();
 	}
 
+	@Override
 	public AspectMetadata getAspectMetadata() {
 		return this.maaif.getAspectMetadata();
 	}
 
+	@Override
 	public int getOrder() {
 		return this.maaif.getOrder();
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
index f8d684bc3b..35ed1e2847 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java
@@ -75,6 +75,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 				new InstanceComparator<Annotation>(
 						Around.class, Before.class, After.class, AfterReturning.class, AfterThrowing.class),
 				new Converter<Method, Annotation>() {
+					@Override
 					public Annotation convert(Method method) {
 						AspectJAnnotation<?> annotation = AbstractAspectJAdvisorFactory.findAspectJAnnotationOnMethod(method);
 						return annotation == null ? null : annotation.getAnnotation();
@@ -82,6 +83,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 				}));
 		comparator.addComparator(new ConvertingComparator<Method, String>(
 				new Converter<Method, String>() {
+					@Override
 					public String convert(Method method) {
 						return method.getName();
 					}
@@ -90,6 +92,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	}
 
 
+	@Override
 	public List<Advisor> getAdvisors(MetadataAwareAspectInstanceFactory maaif) {
 		final Class<?> aspectClass = maaif.getAspectMetadata().getAspectClass();
 		final String aspectName = maaif.getAspectMetadata().getAspectName();
@@ -128,6 +131,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	private List<Method> getAdvisorMethods(Class<?> aspectClass) {
 		final List<Method> methods = new LinkedList<Method>();
 		ReflectionUtils.doWithMethods(aspectClass, new ReflectionUtils.MethodCallback() {
+			@Override
 			public void doWith(Method method) throws IllegalArgumentException {
 				// Exclude pointcuts
 				if (AnnotationUtils.getAnnotation(method, Pointcut.class) == null) {
@@ -164,6 +168,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	}
 
 
+	@Override
 	public Advisor getAdvisor(Method candidateAdviceMethod, MetadataAwareAspectInstanceFactory aif,
 			int declarationOrderInAspect, String aspectName) {
 
@@ -191,6 +196,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	}
 
 
+	@Override
 	public Advice getAdvice(Method candidateAdviceMethod, AspectJExpressionPointcut ajexp,
 			MetadataAwareAspectInstanceFactory aif, int declarationOrderInAspect, String aspectName) {
 
@@ -272,6 +278,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 
 		public SyntheticInstantiationAdvisor(final MetadataAwareAspectInstanceFactory aif) {
 			super(aif.getAspectMetadata().getPerClausePointcut(), new MethodBeforeAdvice() {
+				@Override
 				public void before(Method method, Object[] args, Object target) {
 					// Simply instantiate the aspect
 					aif.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..70ff5e6532 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
@@ -45,6 +45,7 @@ public class SimpleMetadataAwareAspectInstanceFactory extends SimpleAspectInstan
 	}
 
 
+	@Override
 	public final AspectMetadata getAspectMetadata() {
 		return this.metadata;
 	}
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..31f1e18f27 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
@@ -47,6 +47,7 @@ public class SingletonMetadataAwareAspectInstanceFactory extends SingletonAspect
 	}
 
 
+	@Override
 	public final AspectMetadata getAspectMetadata() {
 		return this.metadata;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
index dbfcbd380e..847b1932af 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
@@ -131,11 +131,13 @@ public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProx
 			this.comparator = comparator;
 		}
 
+		@Override
 		public int compareTo(Object obj) {
 			Advisor otherAdvisor = ((PartiallyComparableAdvisorHolder) obj).advisor;
 			return this.comparator.compare(this.advisor, otherAdvisor);
 		}
 
+		@Override
 		public int fallbackCompareTo(Object obj) {
 			return 0;
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
index 0dd176354e..2e2134675b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java
@@ -76,6 +76,7 @@ class AspectJPrecedenceComparator implements Comparator {
 	}
 
 
+	@Override
 	public int compare(Object o1, Object o2) {
 		if (!(o1 instanceof Advisor && o2 instanceof Advisor)) {
 			throw new IllegalArgumentException(
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
index 6e58344f80..65169d1a8d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java
@@ -58,6 +58,7 @@ import org.springframework.util.StringUtils;
  */
 public abstract class AbstractInterceptorDrivenBeanDefinitionDecorator implements BeanDefinitionDecorator {
 
+	@Override
 	public final BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definitionHolder, ParserContext parserContext) {
 		BeanDefinitionRegistry registry = parserContext.getRegistry();
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
index 374e40290a..bd86b2ea2e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java
@@ -91,6 +91,7 @@ public class AdvisorComponentDefinition extends AbstractComponentDefinition {
 	}
 
 
+	@Override
 	public String getName() {
 		return this.advisorBeanName;
 	}
@@ -110,6 +111,7 @@ public class AdvisorComponentDefinition extends AbstractComponentDefinition {
 		return this.beanReferences;
 	}
 
+	@Override
 	public Object getSource() {
 		return this.advisorDefinition.getSource();
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java
index 611376efb9..459c394219 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java
@@ -59,6 +59,7 @@ public class AopNamespaceHandler extends NamespaceHandlerSupport {
 	 * '{@code config}', '{@code spring-configured}', '{@code aspectj-autoproxy}'
 	 * and '{@code scoped-proxy}' tags.
 	 */
+	@Override
 	public void init() {
 		// In 2.0 XSD as well as in 2.1 XSD.
 		registerBeanDefinitionParser("config", new ConfigBeanDefinitionParser());
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
index aa3d70d11e..95371f59b7 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java
@@ -37,6 +37,7 @@ import org.springframework.beans.factory.xml.ParserContext;
  */
 class AspectJAutoProxyBeanDefinitionParser implements BeanDefinitionParser {
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		AopNamespaceUtils.registerAspectJAnnotationAutoProxyCreatorIfNecessary(parserContext, element);
 		extendBeanDefinition(element, parserContext);
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
index 9f75cba9be..c7cb6735d6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
@@ -95,6 +95,7 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 	private ParseState parseState = new ParseState();
 
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		CompositeComponentDefinition compositeDef =
 				new CompositeComponentDefinition(element.getTagName(), parserContext.extractSource(element));
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java
index 5891bc8455..e827eef1f0 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java
@@ -57,6 +57,7 @@ public class MethodLocatingFactoryBean implements FactoryBean<Method>, BeanFacto
 		this.methodName = methodName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (!StringUtils.hasText(this.targetBeanName)) {
 			throw new IllegalArgumentException("Property 'targetBeanName' is required");
@@ -78,14 +79,17 @@ public class MethodLocatingFactoryBean implements FactoryBean<Method>, BeanFacto
 	}
 
 
+	@Override
 	public Method getObject() throws Exception {
 		return this.method;
 	}
 
+	@Override
 	public Class<Method> getObjectType() {
 		return Method.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java b/spring-aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java
index cd1c0f9f59..23827f914e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java
@@ -46,6 +46,7 @@ public class PointcutComponentDefinition extends AbstractComponentDefinition {
 	}
 
 
+	@Override
 	public String getName() {
 		return this.pointcutBeanName;
 	}
@@ -60,6 +61,7 @@ public class PointcutComponentDefinition extends AbstractComponentDefinition {
 		return new BeanDefinition[] {this.pointcutDefinition};
 	}
 
+	@Override
 	public Object getSource() {
 		return this.pointcutDefinition.getSource();
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
index 0d2daf364f..0acf968b51 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java
@@ -39,6 +39,7 @@ class ScopedProxyBeanDefinitionDecorator implements BeanDefinitionDecorator {
 	private static final String PROXY_TARGET_CLASS = "proxy-target-class";
 
 
+	@Override
 	public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
 		boolean proxyTargetClass = true;
 		if (node instanceof Element) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java
index 6ffc8c8868..9c08b0258a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java
@@ -47,6 +47,7 @@ public class SimpleBeanFactoryAwareAspectInstanceFactory implements AspectInstan
 		this.aspectBeanName = aspectBeanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 		if (!StringUtils.hasText(this.aspectBeanName)) {
@@ -59,10 +60,12 @@ public class SimpleBeanFactoryAwareAspectInstanceFactory implements AspectInstan
 	 * Look up the aspect bean from the {@link BeanFactory} and returns it.
 	 * @see #setAspectBeanName
 	 */
+	@Override
 	public Object getAspectInstance() {
 		return this.beanFactory.getBean(this.aspectBeanName);
 	}
 
+	@Override
 	public ClassLoader getAspectClassLoader() {
 		if (this.beanFactory instanceof ConfigurableBeanFactory) {
 			return ((ConfigurableBeanFactory) this.beanFactory).getBeanClassLoader();
@@ -72,6 +75,7 @@ public class SimpleBeanFactoryAwareAspectInstanceFactory implements AspectInstan
 		}
 	}
 
+	@Override
 	public int getOrder() {
 		if (this.beanFactory.isSingleton(this.aspectBeanName) &&
 				this.beanFactory.isTypeMatch(this.aspectBeanName, Ordered.class)) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java
index 36c2a9c911..06bbf9b614 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java
@@ -50,6 +50,7 @@ class SpringConfiguredBeanDefinitionParser implements BeanDefinitionParser {
 			"org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect";
 
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		if (!parserContext.getRegistry().containsBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME)) {
 			RootBeanDefinition def = new RootBeanDefinition();
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 9e6baee932..f65ae62508 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
@@ -50,6 +50,7 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig
 	private final Map<String, Boolean> eligibleBeans = new ConcurrentHashMap<String, Boolean>(64);
 
 
+	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 	}
@@ -58,15 +59,18 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyConfig
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
 
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) {
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) {
 		if (bean instanceof AopInfrastructureBean) {
 			// Ignore AOP infrastructure such as scoped proxies.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java
index 18d8d25d15..4e640d0477 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java
@@ -122,6 +122,7 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 		this.proxyClassLoader = classLoader;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		if (this.proxyClassLoader == null) {
 			this.proxyClassLoader = classLoader;
@@ -129,6 +130,7 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.target == null) {
 			throw new IllegalArgumentException("Property 'target' is required");
@@ -190,6 +192,7 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 	}
 
 
+	@Override
 	public Object getObject() {
 		if (this.proxy == null) {
 			throw new FactoryBeanNotInitializedException();
@@ -197,6 +200,7 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 		return this.proxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		if (this.proxy != null) {
 			return this.proxy.getClass();
@@ -213,6 +217,7 @@ public abstract class AbstractSingletonProxyFactoryBean extends ProxyConfig
 		return null;
 	}
 
+	@Override
 	public final boolean isSingleton() {
 		return true;
 	}
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..5cf6828d66 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
@@ -137,10 +137,12 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		setTargetSource(new SingletonTargetSource(target));
 	}
 
+	@Override
 	public void setTargetSource(TargetSource targetSource) {
 		this.targetSource = (targetSource != null ? targetSource : EMPTY_TARGET_SOURCE);
 	}
 
+	@Override
 	public TargetSource getTargetSource() {
 		return this.targetSource;
 	}
@@ -162,14 +164,17 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		this.targetSource = EmptyTargetSource.forClass(targetClass);
 	}
 
+	@Override
 	public Class<?> getTargetClass() {
 		return this.targetSource.getTargetClass();
 	}
 
+	@Override
 	public void setPreFiltered(boolean preFiltered) {
 		this.preFiltered = preFiltered;
 	}
 
+	@Override
 	public boolean isPreFiltered() {
 		return this.preFiltered;
 	}
@@ -228,10 +233,12 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		return this.interfaces.remove(intf);
 	}
 
+	@Override
 	public Class[] getProxiedInterfaces() {
 		return this.interfaces.toArray(new Class[this.interfaces.size()]);
 	}
 
+	@Override
 	public boolean isInterfaceProxied(Class intf) {
 		for (Class proxyIntf : this.interfaces) {
 			if (intf.isAssignableFrom(proxyIntf)) {
@@ -242,15 +249,18 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}
 
 
+	@Override
 	public final Advisor[] getAdvisors() {
 		return this.advisorArray;
 	}
 
+	@Override
 	public void addAdvisor(Advisor advisor) {
 		int pos = this.advisors.size();
 		addAdvisor(pos, advisor);
 	}
 
+	@Override
 	public void addAdvisor(int pos, Advisor advisor) throws AopConfigException {
 		if (advisor instanceof IntroductionAdvisor) {
 			validateIntroductionAdvisor((IntroductionAdvisor) advisor);
@@ -258,6 +268,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		addAdvisorInternal(pos, advisor);
 	}
 
+	@Override
 	public boolean removeAdvisor(Advisor advisor) {
 		int index = indexOf(advisor);
 		if (index == -1) {
@@ -269,6 +280,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		}
 	}
 
+	@Override
 	public void removeAdvisor(int index) throws AopConfigException {
 		if (isFrozen()) {
 			throw new AopConfigException("Cannot remove Advisor: Configuration is frozen.");
@@ -292,11 +304,13 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		adviceChanged();
 	}
 
+	@Override
 	public int indexOf(Advisor advisor) {
 		Assert.notNull(advisor, "Advisor must not be null");
 		return this.advisors.indexOf(advisor);
 	}
 
+	@Override
 	public boolean replaceAdvisor(Advisor a, Advisor b) throws AopConfigException {
 		Assert.notNull(a, "Advisor a must not be null");
 		Assert.notNull(b, "Advisor b must not be null");
@@ -388,6 +402,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}
 
 
+	@Override
 	public void addAdvice(Advice advice) throws AopConfigException {
 		int pos = this.advisors.size();
 		addAdvice(pos, advice);
@@ -396,6 +411,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	/**
 	 * Cannot add introductions this way unless the advice implements IntroductionInfo.
 	 */
+	@Override
 	public void addAdvice(int pos, Advice advice) throws AopConfigException {
 		Assert.notNull(advice, "Advice must not be null");
 		if (advice instanceof IntroductionInfo) {
@@ -412,6 +428,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		}
 	}
 
+	@Override
 	public boolean removeAdvice(Advice advice) throws AopConfigException {
 		int index = indexOf(advice);
 		if (index == -1) {
@@ -423,6 +440,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		}
 	}
 
+	@Override
 	public int indexOf(Advice advice) {
 		Assert.notNull(advice, "Advice must not be null");
 		for (int i = 0; i < this.advisors.size(); i++) {
@@ -554,6 +572,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	}
 
 
+	@Override
 	public String toProxyConfigString() {
 		return toString();
 	}
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..6ee9f6d450 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
@@ -146,10 +146,12 @@ final class CglibAopProxy implements AopProxy, Serializable {
 	}
 
 
+	@Override
 	public Object getProxy() {
 		return getProxy(null);
 	}
 
+	@Override
 	public Object getProxy(ClassLoader classLoader) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Creating CGLIB proxy: target source is " + this.advised.getTargetSource());
@@ -386,6 +388,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.target = target;
 		}
 
+		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
 			Object retVal = methodProxy.invoke(this.target, args);
 			return processReturnType(proxy, this.target, method, retVal);
@@ -405,6 +408,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.target = target;
 		}
 
+		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
 			Object oldProxy = null;
 			try {
@@ -432,6 +436,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.targetSource = targetSource;
 		}
 
+		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
 			Object target = this.targetSource.getTarget();
 			try {
@@ -456,6 +461,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.targetSource = targetSource;
 		}
 
+		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
 			Object oldProxy = null;
 			Object target = this.targetSource.getTarget();
@@ -485,6 +491,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.target = target;
 		}
 
+		@Override
 		public Object loadObject() {
 			return this.target;
 		}
@@ -502,6 +509,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.advised = advised;
 		}
 
+		@Override
 		public Object loadObject() throws Exception {
 			return this.advised;
 		}
@@ -520,6 +528,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.advised = advised;
 		}
 
+		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) {
 			Object other = args[0];
 			if (proxy == other) {
@@ -552,6 +561,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.advised = advised;
 		}
 
+		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) {
 			return CglibAopProxy.class.hashCode() * 13 + this.advised.getTargetSource().hashCode();
 		}
@@ -575,6 +585,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.targetClass = targetClass;
 		}
 
+		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
 			MethodInvocation invocation = new CglibMethodInvocation(proxy, this.target, method, args,
 					this.targetClass, this.adviceChain, methodProxy);
@@ -598,6 +609,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 			this.advised = advised;
 		}
 
+		@Override
 		public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
 			Object oldProxy = null;
 			boolean setProxyContext = false;
@@ -754,6 +766,7 @@ final class CglibAopProxy implements AopProxy, Serializable {
 		 * DynamicUnadvisedInterceptor already considers this.</dd>
 		 * </dl>
 		 */
+		@Override
 		public int accept(Method method) {
 			if (AopUtils.isFinalizeMethod(method)) {
 				logger.debug("Found finalize() method - using NO_OVERRIDE");
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
index 90eeef7b48..3eef11bd9b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java
@@ -46,6 +46,7 @@ import org.springframework.aop.support.MethodMatchers;
 @SuppressWarnings("serial")
 public class DefaultAdvisorChainFactory implements AdvisorChainFactory, Serializable {
 
+	@Override
 	public List<Object> getInterceptorsAndDynamicInterceptionAdvice(
 			Advised config, Method method, Class targetClass) {
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
index 8b95e3303b..5d3640677a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java
@@ -49,6 +49,7 @@ import org.springframework.aop.SpringProxy;
 public class DefaultAopProxyFactory implements AopProxyFactory, Serializable {
 
 
+	@Override
 	public AopProxy createAopProxy(AdvisedSupport config) throws AopConfigException {
 		if (config.isOptimize() || config.isProxyTargetClass() || hasNoUserSuppliedProxyInterfaces(config)) {
 			Class targetClass = config.getTargetClass();
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..ad36cd8934 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
@@ -106,10 +106,12 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
 	}
 
 
+	@Override
 	public Object getProxy() {
 		return getProxy(ClassUtils.getDefaultClassLoader());
 	}
 
+	@Override
 	public Object getProxy(ClassLoader classLoader) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Creating JDK dynamic proxy: target source is " + this.advised.getTargetSource());
@@ -147,6 +149,7 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
 	 * <p>Callers will see exactly the exception thrown by the target,
 	 * unless a hook method throws an exception.
 	 */
+	@Override
 	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 		MethodInvocation invocation;
 		Object oldProxy = null;
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..7e62678340 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
@@ -218,12 +218,14 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 		this.classLoaderConfigured = (classLoader != null);
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		if (!this.classLoaderConfigured) {
 			this.proxyClassLoader = classLoader;
 		}
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 		checkInterceptorNames();
@@ -237,6 +239,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 	 * {@code getObject()} for a proxy.
 	 * @return a fresh AOP proxy reflecting the current state of this factory
 	 */
+	@Override
 	public Object getObject() throws BeansException {
 		initializeAdvisorChain();
 		if (isSingleton()) {
@@ -257,6 +260,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 	 * a single one), the target bean type, or the TargetSource's target class.
 	 * @see org.springframework.aop.TargetSource#getTargetClass
 	 */
+	@Override
 	public Class<?> getObjectType() {
 		synchronized (this) {
 			if (this.singletonInstance != null) {
@@ -278,6 +282,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 		}
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return this.singleton;
 	}
@@ -638,10 +643,12 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
 			return beanName;
 		}
 
+		@Override
 		public Advice getAdvice() {
 			throw new UnsupportedOperationException("Cannot invoke methods: " + this.message);
 		}
 
+		@Override
 		public boolean isPerInstance() {
 			throw new UnsupportedOperationException("Cannot invoke methods: " + this.message);
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
index c9ac099b48..8556823d92 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java
@@ -114,14 +114,17 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	}
 
 
+	@Override
 	public final Object getProxy() {
 		return this.proxy;
 	}
 
+	@Override
 	public final Object getThis() {
 		return this.target;
 	}
 
+	@Override
 	public final AccessibleObject getStaticPart() {
 		return this.method;
 	}
@@ -131,19 +134,23 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	 * May or may not correspond with a method invoked on an underlying
 	 * implementation of that interface.
 	 */
+	@Override
 	public final Method getMethod() {
 		return this.method;
 	}
 
+	@Override
 	public final Object[] getArguments() {
 		return (this.arguments != null ? this.arguments : new Object[0]);
 	}
 
+	@Override
 	public void setArguments(Object[] arguments) {
 		this.arguments = arguments;
 	}
 
 
+	@Override
 	public Object proceed() throws Throwable {
 		//	We start with an index of -1 and increment early.
 		if (this.currentInterceptorIndex == this.interceptorsAndDynamicMethodMatchers.size() - 1) {
@@ -192,6 +199,7 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	 * current interceptor index.
 	 * @see java.lang.Object#clone()
 	 */
+	@Override
 	public MethodInvocation invocableClone() {
 		Object[] cloneArguments = null;
 		if (this.arguments != null) {
@@ -210,6 +218,7 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	 * current interceptor index.
 	 * @see java.lang.Object#clone()
 	 */
+	@Override
 	public MethodInvocation invocableClone(Object[] arguments) {
 		// Force initialization of the user attributes Map,
 		// for having a shared Map reference in the clone.
@@ -230,6 +239,7 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 	}
 
 
+	@Override
 	public void setUserAttribute(String key, Object value) {
 		if (value != null) {
 			if (this.userAttributes == null) {
@@ -244,6 +254,7 @@ public class ReflectiveMethodInvocation implements ProxyMethodInvocation, Clonea
 		}
 	}
 
+	@Override
 	public Object getUserAttribute(String key) {
 		return (this.userAttributes != null ? this.userAttributes.get(key) : null);
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java
index bd3ebe7d57..5ff96dcd12 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java
@@ -48,10 +48,12 @@ public class AdvisorAdapterRegistrationManager implements BeanPostProcessor {
 	}
 
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 		if (bean instanceof AdvisorAdapter){
 			this.advisorAdapterRegistry.registerAdvisorAdapter((AdvisorAdapter) bean);
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java
index a921e6e509..de562f4fbe 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java
@@ -34,10 +34,12 @@ import org.springframework.aop.AfterReturningAdvice;
 @SuppressWarnings("serial")
 class AfterReturningAdviceAdapter implements AdvisorAdapter, Serializable {
 
+	@Override
 	public boolean supportsAdvice(Advice advice) {
 		return (advice instanceof AfterReturningAdvice);
 	}
 
+	@Override
 	public MethodInterceptor getInterceptor(Advisor advisor) {
 		AfterReturningAdvice advice = (AfterReturningAdvice) advisor.getAdvice();
 		return new AfterReturningAdviceInterceptor(advice);
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java
index 9f8f698faf..5e0bd1d23d 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java
@@ -47,6 +47,7 @@ public class AfterReturningAdviceInterceptor implements MethodInterceptor, After
 		this.advice = advice;
 	}
 
+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		Object retVal = mi.proceed();
 		this.advice.afterReturning(retVal, mi.getMethod(), mi.getArguments(), mi.getThis());
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
index 136f004586..0925b818af 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java
@@ -53,6 +53,7 @@ public class DefaultAdvisorAdapterRegistry implements AdvisorAdapterRegistry, Se
 	}
 
 
+	@Override
 	public Advisor wrap(Object adviceObject) throws UnknownAdviceTypeException {
 		if (adviceObject instanceof Advisor) {
 			return (Advisor) adviceObject;
@@ -74,6 +75,7 @@ public class DefaultAdvisorAdapterRegistry implements AdvisorAdapterRegistry, Se
 		throw new UnknownAdviceTypeException(advice);
 	}
 
+	@Override
 	public MethodInterceptor[] getInterceptors(Advisor advisor) throws UnknownAdviceTypeException {
 		List<MethodInterceptor> interceptors = new ArrayList<MethodInterceptor>(3);
 		Advice advice = advisor.getAdvice();
@@ -91,6 +93,7 @@ public class DefaultAdvisorAdapterRegistry implements AdvisorAdapterRegistry, Se
 		return interceptors.toArray(new MethodInterceptor[interceptors.size()]);
 	}
 
+	@Override
 	public void registerAdvisorAdapter(AdvisorAdapter adapter) {
 		this.adapters.add(adapter);
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java
index 6fc3cdef5e..57e0e16af7 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java
@@ -34,10 +34,12 @@ import org.springframework.aop.MethodBeforeAdvice;
 @SuppressWarnings("serial")
 class MethodBeforeAdviceAdapter implements AdvisorAdapter, Serializable {
 
+	@Override
 	public boolean supportsAdvice(Advice advice) {
 		return (advice instanceof MethodBeforeAdvice);
 	}
 
+	@Override
 	public MethodInterceptor getInterceptor(Advisor advisor) {
 		MethodBeforeAdvice advice = (MethodBeforeAdvice) advisor.getAdvice();
 		return new MethodBeforeAdviceInterceptor(advice);
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java
index 83d7b8e851..8b3fd0ce20 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java
@@ -46,6 +46,7 @@ public class MethodBeforeAdviceInterceptor implements MethodInterceptor, Seriali
 		this.advice = advice;
 	}
 
+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		this.advice.before(mi.getMethod(), mi.getArguments(), mi.getThis() );
 		return mi.proceed();
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
index 687a6d5f8b..822b789b54 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java
@@ -34,10 +34,12 @@ import org.springframework.aop.ThrowsAdvice;
 @SuppressWarnings("serial")
 class ThrowsAdviceAdapter implements AdvisorAdapter, Serializable {
 
+	@Override
 	public boolean supportsAdvice(Advice advice) {
 		return (advice instanceof ThrowsAdvice);
 	}
 
+	@Override
 	public MethodInterceptor getInterceptor(Advisor advisor) {
 		return new ThrowsAdviceInterceptor(advisor.getAdvice());
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
index 69b0bd1cc5..de2767be2c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
@@ -119,6 +119,7 @@ public class ThrowsAdviceInterceptor implements MethodInterceptor, AfterAdvice {
 		return handler;
 	}
 
+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();
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 06010d6710..db4f429198 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
@@ -155,6 +155,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	  this.order = order;
 	}
 
+	@Override
 	public final int getOrder() {
 	  return this.order;
 	}
@@ -232,12 +233,14 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 		this.classLoaderConfigured = (classLoader != null);
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		if (!this.classLoaderConfigured) {
 			this.proxyClassLoader = classLoader;
 		}
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -251,21 +254,25 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	}
 
 
+	@Override
 	public Class<?> predictBeanType(Class<?> beanClass, String beanName) {
 		Object cacheKey = getCacheKey(beanClass, beanName);
 		return this.proxyTypes.get(cacheKey);
 	}
 
+	@Override
 	public Constructor<?>[] determineCandidateConstructors(Class<?> beanClass, String beanName) throws BeansException {
 		return null;
 	}
 
+	@Override
 	public Object getEarlyBeanReference(Object bean, String beanName) throws BeansException {
 		Object cacheKey = getCacheKey(bean.getClass(), beanName);
 		this.earlyProxyReferences.put(cacheKey, Boolean.TRUE);
 		return wrapIfNecessary(bean, beanName, cacheKey);
 	}
 
+	@Override
 	public Object postProcessBeforeInstantiation(Class<?> beanClass, String beanName) throws BeansException {
 		Object cacheKey = getCacheKey(beanClass, beanName);
 
@@ -296,16 +303,19 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 		return null;
 	}
 
+	@Override
 	public boolean postProcessAfterInstantiation(Object bean, String beanName) {
 		return true;
 	}
 
+	@Override
 	public PropertyValues postProcessPropertyValues(
 			PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) {
 
 		return pvs;
 	}
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) {
 		return bean;
 	}
@@ -315,6 +325,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyConfig
 	 * identified as one to proxy by the subclass.
 	 * @see #getAdvicesAndAdvisorsForBean
 	 */
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 		if (bean != null) {
 			Object cacheKey = getCacheKey(bean.getClass(), beanName);
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
index 953a751d32..044c7bbc11 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java
@@ -79,6 +79,7 @@ public class DefaultAdvisorAutoProxyCreator extends AbstractAdvisorAutoProxyCrea
 		return this.advisorBeanNamePrefix;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		// If no infrastructure bean name prefix has been set, override it.
 		if (this.advisorBeanNamePrefix == null) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
index c1ef00cbe2..3735ba06e7 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
@@ -66,6 +66,7 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
 			new HashMap<String, DefaultListableBeanFactory>();
 
 
+	@Override
 	public final void setBeanFactory(BeanFactory beanFactory) {
 		if (!(beanFactory instanceof ConfigurableBeanFactory)) {
 			throw new IllegalStateException("Cannot do auto-TargetSource creation with a BeanFactory " +
@@ -86,6 +87,7 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
 	// Implementation of the TargetSourceCreator interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public final TargetSource getTargetSource(Class<?> beanClass, String beanName) {
 		AbstractBeanFactoryBasedTargetSource targetSource =
 				createBeanFactoryBasedTargetSource(beanClass, beanName);
@@ -159,6 +161,7 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
 	 * Destroys the internal BeanFactory on shutdown of the TargetSourceCreator.
 	 * @see #getInternalBeanFactoryForBean
 	 */
+	@Override
 	public void destroy() {
 		synchronized (this.internalBeanFactories) {
 			for (DefaultListableBeanFactory bf : this.internalBeanFactories.values()) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
index 7c29c775bc..1ba6dca904 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java
@@ -105,6 +105,7 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser
 	 * to the {@code invokeUnderTrace} method for handling.
 	 * @see #invokeUnderTrace(org.aopalliance.intercept.MethodInvocation, org.apache.commons.logging.Log)
 	 */
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		Log logger = getLoggerForInvocation(invocation);
 		if (isInterceptorEnabled(invocation, logger)) {
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 96237b86d1..f94b575806 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
@@ -80,6 +80,7 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
 	/**
 	 * Set the {@link BeanFactory} to be used when looking up executors by qualifier.
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		this.beanFactory = beanFactory;
 	}
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 792639b1c6..7730f54426 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
@@ -75,9 +75,11 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport
 	 * @return {@link Future} if the original method returns {@code Future}; {@code null}
 	 * otherwise.
 	 */
+	@Override
 	public Object invoke(final MethodInvocation invocation) throws Throwable {
 		Future<?> result = this.determineAsyncExecutor(invocation.getMethod()).submit(
 				new Callable<Object>() {
+					@Override
 					public Object call() throws Exception {
 						try {
 							Object result = invocation.proceed();
@@ -113,6 +115,7 @@ public class AsyncExecutionInterceptor extends AsyncExecutionAspectSupport
 		return null;
 	}
 
+	@Override
 	public int getOrder() {
 		return Ordered.HIGHEST_PRECEDENCE;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
index 8f6f3ee479..ad57e4c635 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java
@@ -47,6 +47,7 @@ public class ConcurrencyThrottleInterceptor extends ConcurrencyThrottleSupport
 		setConcurrencyLimit(1);
 	}
 
+	@Override
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		beforeAccess();
 		try {
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
index a4ce58d528..78479765ca 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java
@@ -109,6 +109,7 @@ public abstract class ExposeBeanNameAdvisors {
 			this.beanName = beanName;
 		}
 
+		@Override
 		public Object invoke(MethodInvocation mi) throws Throwable {
 			if (!(mi instanceof ProxyMethodInvocation)) {
 				throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);
@@ -142,6 +143,7 @@ public abstract class ExposeBeanNameAdvisors {
 			return super.invoke(mi);
 		}
 
+		@Override
 		public String getBeanName() {
 			return this.beanName;
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
index c5443e7dc3..9f9d887e7a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java
@@ -84,6 +84,7 @@ public class ExposeInvocationInterceptor implements MethodInterceptor, Ordered,
 	private ExposeInvocationInterceptor() {
 	}
 
+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		MethodInvocation oldInvocation = invocation.get();
 		invocation.set(mi);
@@ -95,6 +96,7 @@ public class ExposeInvocationInterceptor implements MethodInterceptor, Ordered,
 		}
 	}
 
+	@Override
 	public int getOrder() {
 		return Ordered.HIGHEST_PRECEDENCE + 1;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java b/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
index 95009495ba..337c660022 100644
--- a/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
+++ b/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java
@@ -55,10 +55,12 @@ public class DefaultScopedObject implements ScopedObject, Serializable {
 	}
 
 
+	@Override
 	public Object getTargetObject() {
 		return this.beanFactory.getBean(this.targetBeanName);
 	}
 
+	@Override
 	public void removeFromScope() {
 		this.beanFactory.destroyScopedBean(this.targetBeanName);
 	}
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..a0c6fee7b6 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
@@ -78,6 +78,7 @@ public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean<O
 		this.scopedTargetSource.setTargetBeanName(targetBeanName);
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (!(beanFactory instanceof ConfigurableBeanFactory)) {
 			throw new IllegalStateException("Not running in a ConfigurableBeanFactory: " + beanFactory);
@@ -111,6 +112,7 @@ public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean<O
 	}
 
 
+	@Override
 	public Object getObject() {
 		if (this.proxy == null) {
 			throw new FactoryBeanNotInitializedException();
@@ -118,6 +120,7 @@ public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean<O
 		return this.proxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		if (this.proxy != null) {
 			return this.proxy.getClass();
@@ -128,6 +131,7 @@ public class ScopedProxyFactoryBean extends ProxyConfig implements FactoryBean<O
 		return null;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..e46ee28c26 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
@@ -69,6 +69,7 @@ public abstract class AbstractBeanFactoryPointcutAdvisor extends AbstractPointcu
 		return this.adviceBeanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -79,6 +80,7 @@ public abstract class AbstractBeanFactoryPointcutAdvisor extends AbstractPointcu
 		}
 	}
 
+	@Override
 	public Advice getAdvice() {
 		synchronized (this.adviceMonitor) {
 			if (this.advice == null && this.adviceBeanName != null) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
index 74a62a7ba9..535b70a1e6 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java
@@ -83,6 +83,7 @@ public abstract class AbstractExpressionPointcut implements ExpressionPointcut,
 	/**
 	 * Return this pointcut's expression.
 	 */
+	@Override
 	public String getExpression() {
 		return this.expression;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java
index 53494a14ce..f3a9137b15 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java
@@ -39,6 +39,7 @@ public abstract class AbstractGenericPointcutAdvisor extends AbstractPointcutAdv
 		this.advice = advice;
 	}
 
+	@Override
 	public Advice getAdvice() {
 		return this.advice;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
index 8dc2fb0a3e..06f9b9dc64 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
@@ -44,6 +44,7 @@ public abstract class AbstractPointcutAdvisor implements PointcutAdvisor, Ordere
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		if (this.order != null) {
 			return this.order;
@@ -55,6 +56,7 @@ public abstract class AbstractPointcutAdvisor implements PointcutAdvisor, Ordere
 		return Ordered.LOWEST_PRECEDENCE;
 	}
 
+	@Override
 	public boolean isPerInstance() {
 		return true;
 	}
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..c5aa32ada5 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
@@ -124,6 +124,7 @@ public abstract class AbstractRegexpMethodPointcut extends StaticMethodMatcherPo
 	 * of the target class as well as against the method's declaring class,
 	 * plus the name of the method.
 	 */
+	@Override
 	public boolean matches(Method method, Class targetClass) {
 		return ((targetClass != null && matchesPattern(targetClass.getName() + "." + method.getName())) ||
 				matchesPattern(method.getDeclaringClass().getName() + "." + method.getName()));
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..bde74d3a27 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
@@ -96,6 +96,7 @@ public abstract class ClassFilters {
 			this.filters = filters;
 		}
 
+		@Override
 		public boolean matches(Class clazz) {
 			for (int i = 0; i < this.filters.length; i++) {
 				if (this.filters[i].matches(clazz)) {
@@ -130,6 +131,7 @@ public abstract class ClassFilters {
 			this.filters = filters;
 		}
 
+		@Override
 		public boolean matches(Class clazz) {
 			for (int i = 0; i < this.filters.length; i++) {
 				if (!this.filters[i].matches(clazz)) {
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..4d2747c148 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
@@ -170,10 +170,12 @@ public class ComposablePointcut implements Pointcut, Serializable {
 	}
 
 
+	@Override
 	public ClassFilter getClassFilter() {
 		return this.classFilter;
 	}
 
+	@Override
 	public MethodMatcher getMethodMatcher() {
 		return this.methodMatcher;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
index 4de481fcba..bc1e153bdf 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java
@@ -71,6 +71,7 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher
 	/**
 	 * Subclasses can override this for greater filtering (and performance).
 	 */
+	@Override
 	public boolean matches(Class clazz) {
 		return true;
 	}
@@ -79,14 +80,17 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher
 	 * Subclasses can override this if it's possible to filter out
 	 * some candidate classes.
 	 */
+	@Override
 	public boolean matches(Method method, Class targetClass) {
 		return true;
 	}
 
+	@Override
 	public boolean isRuntime() {
 		return true;
 	}
 
+	@Override
 	public boolean matches(Method method, Class targetClass, Object[] args) {
 		++this.evaluations;
 		ControlFlow cflow = ControlFlowFactory.createControlFlow();
@@ -101,10 +105,12 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher
 	}
 
 
+	@Override
 	public ClassFilter getClassFilter() {
 		return this;
 	}
 
+	@Override
 	public MethodMatcher getMethodMatcher() {
 		return this;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
index 92fb3c4552..bcfef02343 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java
@@ -47,6 +47,7 @@ public class DefaultBeanFactoryPointcutAdvisor extends AbstractBeanFactoryPointc
 		this.pointcut = (pointcut != null ? pointcut : Pointcut.TRUE);
 	}
 
+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
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..11bdcf5207 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
@@ -102,10 +102,12 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil
 		this.interfaces.add(intf);
 	}
 
+	@Override
 	public Class[] getInterfaces() {
 		return this.interfaces.toArray(new Class[this.interfaces.size()]);
 	}
 
+	@Override
 	public void validateInterfaces() throws IllegalArgumentException {
 		for (Class ifc : this.interfaces) {
 			if (this.advice instanceof DynamicIntroductionAdvice &&
@@ -121,23 +123,28 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
 
 
+	@Override
 	public Advice getAdvice() {
 		return this.advice;
 	}
 
+	@Override
 	public boolean isPerInstance() {
 		return true;
 	}
 
+	@Override
 	public ClassFilter getClassFilter() {
 		return this;
 	}
 
+	@Override
 	public boolean matches(Class clazz) {
 		return true;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
index f4b16915f9..7dabc1a006 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java
@@ -77,6 +77,7 @@ public class DefaultPointcutAdvisor extends AbstractGenericPointcutAdvisor imple
 		this.pointcut = (pointcut != null ? pointcut : Pointcut.TRUE);
 	}
 
+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
index 5eeeea60d6..a17e2734f5 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java
@@ -83,6 +83,7 @@ public class DelegatePerTargetObjectIntroductionInterceptor extends Introduction
 	 * behaviour in around advice. However, subclasses should invoke this
 	 * method, which handles introduced interfaces and forwarding to the target.
 	 */
+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		if (isMethodOnIntroducedInterface(mi)) {
 			Object delegate = getIntroductionDelegateFor(mi.getThis());
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
index c27d1872cf..45f90dbef7 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java
@@ -99,6 +99,7 @@ public class DelegatingIntroductionInterceptor extends IntroductionInfoSupport
 	 * behaviour in around advice. However, subclasses should invoke this
 	 * method, which handles introduced interfaces and forwarding to the target.
 	 */
+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		if (isMethodOnIntroducedInterface(mi)) {
 			// Using the following method rather than direct reflection, we
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java
index 9427a647de..78b230d8f0 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java
@@ -26,6 +26,7 @@ import org.springframework.aop.MethodMatcher;
  */
 public abstract class DynamicMethodMatcher implements MethodMatcher {
 
+	@Override
 	public final boolean isRuntime() {
 		return true;
 	}
@@ -34,6 +35,7 @@ public abstract class DynamicMethodMatcher implements MethodMatcher {
 	 * Can override to add preconditions for dynamic matching. This implementation
 	 * always returns true.
 	 */
+	@Override
 	public boolean matches(Method method, Class<?> targetClass) {
 		return true;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java
index 35d765c297..df3963dc85 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java
@@ -30,10 +30,12 @@ import org.springframework.aop.Pointcut;
  */
 public abstract class DynamicMethodMatcherPointcut extends DynamicMethodMatcher implements Pointcut {
 
+	@Override
 	public ClassFilter getClassFilter() {
 		return ClassFilter.TRUE;
 	}
 
+	@Override
 	public final MethodMatcher getMethodMatcher() {
 		return this;
 	}
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..e10c0c9921 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
@@ -59,6 +59,7 @@ public class IntroductionInfoSupport implements IntroductionInfo, Serializable {
 		this.publishedInterfaces.remove(intf);
 	}
 
+	@Override
 	public Class[] getInterfaces() {
 		return this.publishedInterfaces.toArray(new Class[this.publishedInterfaces.size()]);
 	}
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..160496c074 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
@@ -112,11 +112,13 @@ public abstract class MethodMatchers {
 			this.mm2 = mm2;
 		}
 
+		@Override
 		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));
 		}
 
+		@Override
 		public boolean matches(Method method, Class targetClass) {
 			return (matchesClass1(targetClass) && this.mm1.matches(method, targetClass)) ||
 					(matchesClass2(targetClass) && this.mm2.matches(method, targetClass));
@@ -130,10 +132,12 @@ public abstract class MethodMatchers {
 			return true;
 		}
 
+		@Override
 		public boolean isRuntime() {
 			return this.mm1.isRuntime() || this.mm2.isRuntime();
 		}
 
+		@Override
 		public boolean matches(Method method, Class targetClass, Object[] args) {
 			return this.mm1.matches(method, targetClass, args) || this.mm2.matches(method, targetClass, args);
 		}
@@ -216,19 +220,23 @@ public abstract class MethodMatchers {
 			this.mm2 = mm2;
 		}
 
+		@Override
 		public boolean matches(Method method, Class targetClass, boolean hasIntroductions) {
 			return MethodMatchers.matches(this.mm1, method, targetClass, hasIntroductions) &&
 					MethodMatchers.matches(this.mm2, method, targetClass, hasIntroductions);
 		}
 
+		@Override
 		public boolean matches(Method method, Class targetClass) {
 			return this.mm1.matches(method, targetClass) && this.mm2.matches(method, targetClass);
 		}
 
+		@Override
 		public boolean isRuntime() {
 			return this.mm1.isRuntime() || this.mm2.isRuntime();
 		}
 
+		@Override
 		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
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..26ffedaf5a 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
@@ -77,6 +77,7 @@ public class NameMatchMethodPointcut extends StaticMethodMatcherPointcut impleme
 	}
 
 
+	@Override
 	public boolean matches(Method method, Class targetClass) {
 		for (String mappedName : this.mappedNames) {
 			if (mappedName.equals(method.getName()) || isMatch(method.getName(), mappedName)) {
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..375ecdeac7 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
@@ -85,6 +85,7 @@ public class NameMatchMethodPointcutAdvisor extends AbstractGenericPointcutAdvis
 	}
 
 
+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java
index 2bfbcb1c32..957f5d319e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java
@@ -96,6 +96,7 @@ public abstract class Pointcuts {
 
 		public static SetterPointcut INSTANCE = new SetterPointcut();
 
+		@Override
 		public boolean matches(Method method, Class targetClass) {
 			return method.getName().startsWith("set") &&
 				method.getParameterTypes().length == 1 &&
@@ -116,6 +117,7 @@ public abstract class Pointcuts {
 
 		public static GetterPointcut INSTANCE = new GetterPointcut();
 
+		@Override
 		public boolean matches(Method method, Class targetClass) {
 			return method.getName().startsWith("get") &&
 				method.getParameterTypes().length == 0;
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..177fe9b277 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
@@ -116,6 +116,7 @@ public class RegexpMethodPointcutAdvisor extends AbstractGenericPointcutAdvisor
 	/**
 	 * Initialize the singleton Pointcut held within this Advisor.
 	 */
+	@Override
 	public Pointcut getPointcut() {
 		synchronized (this.pointcutMonitor) {
 			if (this.pointcut == null) {
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
index 461252e617..c232b2826b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java
@@ -35,6 +35,7 @@ public class RootClassFilter implements ClassFilter, Serializable {
 		this.clazz = clazz;
 	}
 
+	@Override
 	public boolean matches(Class candidate) {
 		return clazz.isAssignableFrom(candidate);
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java
index 6efebf1106..8bb1d74d73 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java
@@ -26,10 +26,12 @@ import org.springframework.aop.MethodMatcher;
  */
 public abstract class StaticMethodMatcher implements MethodMatcher {
 
+	@Override
 	public final boolean isRuntime() {
 		return false;
 	}
 
+	@Override
 	public final boolean matches(Method method, Class<?> targetClass, Object[] args) {
 		// should never be invoked because isRuntime() returns false
 		throw new UnsupportedOperationException("Illegal MethodMatcher usage");
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcut.java
index 7e96730e37..1f0917877c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcut.java
@@ -43,11 +43,13 @@ public abstract class StaticMethodMatcherPointcut extends StaticMethodMatcher im
 		this.classFilter = classFilter;
 	}
 
+	@Override
 	public ClassFilter getClassFilter() {
 		return this.classFilter;
 	}
 
 
+	@Override
 	public final MethodMatcher getMethodMatcher() {
 		return this;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java
index 921129c89b..3b0c382072 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java
@@ -63,6 +63,7 @@ public abstract class StaticMethodMatcherPointcutAdvisor extends StaticMethodMat
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
@@ -71,14 +72,17 @@ public abstract class StaticMethodMatcherPointcutAdvisor extends StaticMethodMat
 		this.advice = advice;
 	}
 
+	@Override
 	public Advice getAdvice() {
 		return this.advice;
 	}
 
+	@Override
 	public boolean isPerInstance() {
 		return true;
 	}
 
+	@Override
 	public Pointcut getPointcut() {
 		return this;
 	}
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..d3a84e3a73 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
@@ -59,6 +59,7 @@ public class AnnotationClassFilter implements ClassFilter {
 	}
 
 
+	@Override
 	public boolean matches(Class clazz) {
 		return (this.checkInherited ?
 				(AnnotationUtils.findAnnotation(clazz, this.annotationType) != null) :
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..46c6f69e3e 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
@@ -90,10 +90,12 @@ public class AnnotationMatchingPointcut implements Pointcut {
 	}
 
 
+	@Override
 	public ClassFilter getClassFilter() {
 		return this.classFilter;
 	}
 
+	@Override
 	public MethodMatcher getMethodMatcher() {
 		return this.methodMatcher;
 	}
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..9b557473ff 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
@@ -47,6 +47,7 @@ public class AnnotationMethodMatcher extends StaticMethodMatcher {
 	}
 
 
+	@Override
 	public boolean matches(Method method, Class targetClass) {
 		if (method.isAnnotationPresent(this.annotationType)) {
 			return true;
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..0928b54b89 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
@@ -105,6 +105,7 @@ public abstract class AbstractBeanFactoryBasedTargetSource
 	 * Set the owning BeanFactory. We need to save a reference so that we can
 	 * use the {@code getBean} method on every invocation.
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (this.targetBeanName == null) {
 			throw new IllegalStateException("Property'targetBeanName' is required");
@@ -120,6 +121,7 @@ public abstract class AbstractBeanFactoryBasedTargetSource
 	}
 
 
+	@Override
 	public synchronized Class<?> getTargetClass() {
 		if (this.targetClass == null && this.beanFactory != null) {
 			// Determine type of the target bean.
@@ -137,10 +139,12 @@ public abstract class AbstractBeanFactoryBasedTargetSource
 		return this.targetClass;
 	}
 
+	@Override
 	public boolean isStatic() {
 		return false;
 	}
 
+	@Override
 	public void releaseTarget(Object target) throws Exception {
 		// Nothing to do here.
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java
index 6fdd24ef92..97f3ae8732 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java
@@ -64,10 +64,12 @@ public abstract class AbstractLazyCreationTargetSource implements TargetSource {
 	 * a meaningful value when the target is still {@code null}.
 	 * @see #isInitialized()
 	 */
+	@Override
 	public synchronized Class<?> getTargetClass() {
 		return (this.lazyTarget != null ? this.lazyTarget.getClass() : null);
 	}
 
+	@Override
 	public boolean isStatic() {
 		return false;
 	}
@@ -77,6 +79,7 @@ public abstract class AbstractLazyCreationTargetSource implements TargetSource {
 	 * creating it on-the-fly if it doesn't exist already.
 	 * @see #createObject()
 	 */
+	@Override
 	public synchronized Object getTarget() throws Exception {
 		if (this.lazyTarget == null) {
 			logger.debug("Initializing lazy target object");
@@ -85,6 +88,7 @@ public abstract class AbstractLazyCreationTargetSource implements TargetSource {
 		return this.lazyTarget;
 	}
 
+	@Override
 	public void releaseTarget(Object target) throws Exception {
 		// nothing to do
 	}
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..c0bef77145 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
@@ -68,6 +68,7 @@ public abstract class AbstractPoolingTargetSource extends AbstractPrototypeBased
 	/**
 	 * Return the maximum size of the pool.
 	 */
+	@Override
 	public int getMaxSize() {
 		return this.maxSize;
 	}
@@ -97,6 +98,7 @@ public abstract class AbstractPoolingTargetSource extends AbstractPrototypeBased
 	 * @throws Exception we may need to deal with checked exceptions from pool
 	 * APIs, so we're forgiving with our exception signature
 	 */
+	@Override
 	public abstract Object getTarget() throws Exception;
 
 	/**
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..08f16258a1 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
@@ -252,10 +252,12 @@ public class CommonsPoolTargetSource extends AbstractPoolingTargetSource
 		this.pool.returnObject(target);
 	}
 
+	@Override
 	public int getActiveCount() throws UnsupportedOperationException {
 		return this.pool.getNumActive();
 	}
 
+	@Override
 	public int getIdleCount() throws UnsupportedOperationException {
 		return this.pool.getNumIdle();
 	}
@@ -264,6 +266,7 @@ public class CommonsPoolTargetSource extends AbstractPoolingTargetSource
 	/**
 	 * Closes the underlying {@code ObjectPool} when destroying this object.
 	 */
+	@Override
 	public void destroy() throws Exception {
 		logger.debug("Closing Commons ObjectPool");
 		this.pool.close();
@@ -274,21 +277,26 @@ public class CommonsPoolTargetSource extends AbstractPoolingTargetSource
 	// Implementation of org.apache.commons.pool.PoolableObjectFactory interface
 	//----------------------------------------------------------------------------
 
+	@Override
 	public Object makeObject() throws BeansException {
 		return newPrototypeInstance();
 	}
 
+	@Override
 	public void destroyObject(Object obj) throws Exception {
 		destroyPrototypeInstance(obj);
 	}
 
+	@Override
 	public boolean validateObject(Object obj) {
 		return true;
 	}
 
+	@Override
 	public void activateObject(Object obj) {
 	}
 
+	@Override
 	public void passivateObject(Object obj) {
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
index 193259ba8d..826917a561 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
@@ -89,6 +89,7 @@ public class EmptyTargetSource implements TargetSource, Serializable {
 	/**
 	 * Always returns the specified target Class, or {@code null} if none.
 	 */
+	@Override
 	public Class<?> getTargetClass() {
 		return this.targetClass;
 	}
@@ -96,6 +97,7 @@ public class EmptyTargetSource implements TargetSource, Serializable {
 	/**
 	 * Always returns {@code true}.
 	 */
+	@Override
 	public boolean isStatic() {
 		return this.isStatic;
 	}
@@ -103,6 +105,7 @@ public class EmptyTargetSource implements TargetSource, Serializable {
 	/**
 	 * Always returns {@code null}.
 	 */
+	@Override
 	public Object getTarget() {
 		return null;
 	}
@@ -110,6 +113,7 @@ public class EmptyTargetSource implements TargetSource, Serializable {
 	/**
 	 * Nothing to release.
 	 */
+	@Override
 	public void releaseTarget(Object target) {
 	}
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java
index 14c32af6e2..8948bb3699 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java
@@ -59,18 +59,22 @@ public class HotSwappableTargetSource implements TargetSource, Serializable {
 	 * Return the type of the current target object.
 	 * <p>The returned type should usually be constant across all target objects.
 	 */
+	@Override
 	public synchronized Class<?> getTargetClass() {
 		return this.target.getClass();
 	}
 
+	@Override
 	public final boolean isStatic() {
 		return false;
 	}
 
+	@Override
 	public synchronized Object getTarget() {
 		return this.target;
 	}
 
+	@Override
 	public void releaseTarget(Object target) {
 		// nothing to do
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
index dcb6108e87..bad59acf1b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
@@ -62,6 +62,7 @@ public class LazyInitTargetSource extends AbstractBeanFactoryBasedTargetSource {
 	private Object target;
 
 
+	@Override
 	public synchronized Object getTarget() throws BeansException {
 		if (this.target == null) {
 			this.target = getBeanFactory().getBean(getTargetBeanName());
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..a404a93234 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
@@ -37,6 +37,7 @@ public class PrototypeTargetSource extends AbstractPrototypeBasedTargetSource {
 	 * Obtain a new prototype instance for every call.
 	 * @see #newPrototypeInstance()
 	 */
+	@Override
 	public Object getTarget() throws BeansException {
 		return newPrototypeInstance();
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java
index 14560404c4..805f1a0562 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java
@@ -30,6 +30,7 @@ package org.springframework.aop.target;
 @SuppressWarnings("serial")
 public class SimpleBeanTargetSource extends AbstractBeanFactoryBasedTargetSource {
 
+	@Override
 	public Object getTarget() throws Exception {
 		return getBeanFactory().getBean(getTargetBeanName());
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
index cd2dfb0c0c..439e59509a 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
@@ -55,18 +55,22 @@ public class SingletonTargetSource implements TargetSource, Serializable {
 	}
 
 
+	@Override
 	public Class<?> getTargetClass() {
 		return this.target.getClass();
 	}
 
+	@Override
 	public Object getTarget() {
 		return this.target;
 	}
 
+	@Override
 	public void releaseTarget(Object target) {
 		// nothing to do
 	}
 
+	@Override
 	public boolean isStatic() {
 		return true;
 	}
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..af22df411d 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
@@ -75,6 +75,7 @@ public class ThreadLocalTargetSource extends AbstractPrototypeBasedTargetSource
 	 * We look for a target held in a ThreadLocal. If we don't find one,
 	 * we create one and bind it to the thread. No synchronization is required.
 	 */
+	@Override
 	public Object getTarget() throws BeansException {
 		++this.invocationCount;
 		Object target = this.targetInThread.get();
@@ -102,6 +103,7 @@ public class ThreadLocalTargetSource extends AbstractPrototypeBasedTargetSource
 	 * Dispose of targets if necessary; clear ThreadLocal.
 	 * @see #destroyPrototypeInstance
 	 */
+	@Override
 	public void destroy() {
 		logger.debug("Destroying ThreadLocalTargetSource bindings");
 		synchronized (this.targetSet) {
@@ -115,14 +117,17 @@ public class ThreadLocalTargetSource extends AbstractPrototypeBasedTargetSource
 	}
 
 
+	@Override
 	public int getInvocationCount() {
 		return this.invocationCount;
 	}
 
+	@Override
 	public int getHitCount() {
 		return this.hitCount;
 	}
 
+	@Override
 	public int getObjectCount() {
 		synchronized (this.targetSet) {
 			return this.targetSet.size();
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java
index 7aba951ee5..c96c21e193 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java
@@ -63,6 +63,7 @@ public abstract class AbstractRefreshableTargetSource implements TargetSource, R
 	}
 
 
+	@Override
 	public synchronized Class<?> getTargetClass() {
 		if (this.targetObject == null) {
 			refresh();
@@ -73,10 +74,12 @@ public abstract class AbstractRefreshableTargetSource implements TargetSource, R
 	/**
 	 * Not static.
 	 */
+	@Override
 	public boolean isStatic() {
 		return false;
 	}
 
+	@Override
 	public final synchronized Object getTarget() {
 		if ((refreshCheckDelayElapsed() && requiresRefresh()) || this.targetObject == null) {
 			refresh();
@@ -87,10 +90,12 @@ public abstract class AbstractRefreshableTargetSource implements TargetSource, R
 	/**
 	 * No need to release target.
 	 */
+	@Override
 	public void releaseTarget(Object object) {
 	}
 
 
+	@Override
 	public final synchronized void refresh() {
 		logger.debug("Attempting to refresh target");
 
@@ -101,10 +106,12 @@ public abstract class AbstractRefreshableTargetSource implements TargetSource, R
 		logger.debug("Target refreshed successfully");
 	}
 
+	@Override
 	public synchronized long getRefreshCount() {
 		return this.refreshCount;
 	}
 
+	@Override
 	public synchronized long getLastRefreshTime() {
 		return this.lastRefreshTime;
 	}
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..8be616c7dd 100644
--- a/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/AbstractPropertyAccessor.java
@@ -36,31 +36,38 @@ public abstract class AbstractPropertyAccessor extends TypeConverterSupport impl
 	private boolean extractOldValueForEditor = false;
 
 
+	@Override
 	public void setExtractOldValueForEditor(boolean extractOldValueForEditor) {
 		this.extractOldValueForEditor = extractOldValueForEditor;
 	}
 
+	@Override
 	public boolean isExtractOldValueForEditor() {
 		return this.extractOldValueForEditor;
 	}
 
 
+	@Override
 	public void setPropertyValue(PropertyValue pv) throws BeansException {
 		setPropertyValue(pv.getName(), pv.getValue());
 	}
 
+	@Override
 	public void setPropertyValues(Map<?, ?> map) throws BeansException {
 		setPropertyValues(new MutablePropertyValues(map));
 	}
 
+	@Override
 	public void setPropertyValues(PropertyValues pvs) throws BeansException {
 		setPropertyValues(pvs, false, false);
 	}
 
+	@Override
 	public void setPropertyValues(PropertyValues pvs, boolean ignoreUnknown) throws BeansException {
 		setPropertyValues(pvs, ignoreUnknown, false);
 	}
 
+	@Override
 	public void setPropertyValues(PropertyValues pvs, boolean ignoreUnknown, boolean ignoreInvalid)
 			throws BeansException {
 
@@ -118,6 +125,7 @@ public abstract class AbstractPropertyAccessor extends TypeConverterSupport impl
 	 * @throws PropertyAccessException if the property was valid but the
 	 * accessor method failed
 	 */
+	@Override
 	public abstract Object getPropertyValue(String propertyName) throws BeansException;
 
 	/**
@@ -129,6 +137,7 @@ public abstract class AbstractPropertyAccessor extends TypeConverterSupport impl
 	 * @throws PropertyAccessException if the property was valid but the
 	 * accessor method failed or a type mismatch occured
 	 */
+	@Override
 	public abstract void setPropertyValue(String propertyName, Object value) throws BeansException;
 
 }
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
index f806b9f6a5..366256452c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
@@ -69,6 +69,7 @@ public class BeanMetadataAttribute implements BeanMetadataElement {
 		this.source = source;
 	}
 
+	@Override
 	public Object getSource() {
 		return this.source;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
index c683f50ab8..d08a8fa341 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java
@@ -40,6 +40,7 @@ public class BeanMetadataAttributeAccessor extends AttributeAccessorSupport impl
 		this.source = source;
 	}
 
+	@Override
 	public Object getSource() {
 		return this.source;
 	}
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 bac8df4ce6..705d4a7ac7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
+++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
@@ -219,10 +219,12 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 		setIntrospectionClass(object.getClass());
 	}
 
+	@Override
 	public final Object getWrappedInstance() {
 		return this.object;
 	}
 
+	@Override
 	public final Class getWrappedClass() {
 		return (this.object != null ? this.object.getClass() : null);
 	}
@@ -257,6 +259,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 	 * enables auto-growth of collection elements when accessing an out-of-bounds index.
 	 * <p>Default is "false" on a plain BeanWrapper.
 	 */
+	@Override
 	public void setAutoGrowNestedPaths(boolean autoGrowNestedPaths) {
 		this.autoGrowNestedPaths = autoGrowNestedPaths;
 	}
@@ -264,6 +267,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 	/**
 	 * Return whether "auto-growing" of nested paths has been activated.
 	 */
+	@Override
 	public boolean isAutoGrowNestedPaths() {
 		return this.autoGrowNestedPaths;
 	}
@@ -272,6 +276,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 	 * Specify a limit for array and collection auto-growing.
 	 * <p>Default is unlimited on a plain BeanWrapper.
 	 */
+	@Override
 	public void setAutoGrowCollectionLimit(int autoGrowCollectionLimit) {
 		this.autoGrowCollectionLimit = autoGrowCollectionLimit;
 	}
@@ -279,6 +284,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 	/**
 	 * Return the limit for array and collection auto-growing.
 	 */
+	@Override
 	public int getAutoGrowCollectionLimit() {
 		return this.autoGrowCollectionLimit;
 	}
@@ -324,10 +330,12 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 	}
 
 
+	@Override
 	public PropertyDescriptor[] getPropertyDescriptors() {
 		return getCachedIntrospectionResults().getPropertyDescriptors();
 	}
 
+	@Override
 	public PropertyDescriptor getPropertyDescriptor(String propertyName) throws BeansException {
 		PropertyDescriptor pd = getPropertyDescriptorInternal(propertyName);
 		if (pd == null) {
@@ -378,6 +386,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 		return null;
 	}
 
+	@Override
 	public TypeDescriptor getPropertyTypeDescriptor(String propertyName) throws BeansException {
 		try {
 			BeanWrapperImpl nestedBw = getBeanWrapperForPropertyPath(propertyName);
@@ -402,6 +411,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 		return null;
 	}
 
+	@Override
 	public boolean isReadableProperty(String propertyName) {
 		try {
 			PropertyDescriptor pd = getPropertyDescriptorInternal(propertyName);
@@ -422,6 +432,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 		return false;
 	}
 
+	@Override
 	public boolean isWritableProperty(String propertyName) {
 		try {
 			PropertyDescriptor pd = getPropertyDescriptorInternal(propertyName);
@@ -711,6 +722,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 			if (!Modifier.isPublic(readMethod.getDeclaringClass().getModifiers()) && !readMethod.isAccessible()) {
 				if (System.getSecurityManager() != null) {
 					AccessController.doPrivileged(new PrivilegedAction<Object>() {
+						@Override
 						public Object run() {
 							readMethod.setAccessible(true);
 							return null;
@@ -726,6 +738,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 			if (System.getSecurityManager() != null) {
 				try {
 					value = AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+						@Override
 						public Object run() throws Exception {
 							return readMethod.invoke(object, (Object[]) null);
 						}
@@ -1062,6 +1075,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 									!readMethod.isAccessible()) {
 								if (System.getSecurityManager()!= null) {
 									AccessController.doPrivileged(new PrivilegedAction<Object>() {
+										@Override
 										public Object run() {
 											readMethod.setAccessible(true);
 											return null;
@@ -1075,6 +1089,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 							try {
 								if (System.getSecurityManager() != null) {
 									oldValue = AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+										@Override
 										public Object run() throws Exception {
 											return readMethod.invoke(object);
 										}
@@ -1104,6 +1119,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 				if (!Modifier.isPublic(writeMethod.getDeclaringClass().getModifiers()) && !writeMethod.isAccessible()) {
 					if (System.getSecurityManager()!= null) {
 						AccessController.doPrivileged(new PrivilegedAction<Object>() {
+							@Override
 							public Object run() {
 								writeMethod.setAccessible(true);
 								return null;
@@ -1118,6 +1134,7 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 				if (System.getSecurityManager() != null) {
 					try {
 						AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+							@Override
 							public Object run() throws Exception {
 								writeMethod.invoke(object, value);
 								return null;
diff --git a/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java b/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java
index d7913aa906..9e6c67703c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java
@@ -59,6 +59,7 @@ public class DirectFieldAccessor extends AbstractPropertyAccessor {
 		Assert.notNull(target, "Target object must not be null");
 		this.target = target;
 		ReflectionUtils.doWithFields(this.target.getClass(), new ReflectionUtils.FieldCallback() {
+			@Override
 			public void doWith(Field field) {
 				if (fieldMap.containsKey(field.getName())) {
 					// ignore superclass declarations of fields already found in a subclass
@@ -74,10 +75,12 @@ public class DirectFieldAccessor extends AbstractPropertyAccessor {
 	}
 
 
+	@Override
 	public boolean isReadableProperty(String propertyName) throws BeansException {
 		return this.fieldMap.containsKey(propertyName);
 	}
 
+	@Override
 	public boolean isWritableProperty(String propertyName) throws BeansException {
 		return this.fieldMap.containsKey(propertyName);
 	}
@@ -91,6 +94,7 @@ public class DirectFieldAccessor extends AbstractPropertyAccessor {
 		return null;
 	}
 
+	@Override
 	public TypeDescriptor getPropertyTypeDescriptor(String propertyName) throws BeansException {
 		Field field = this.fieldMap.get(propertyName);
 		if (field != null) {
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 856e62c031..caf47703a4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
+++ b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java
@@ -217,35 +217,43 @@ class ExtendedBeanInfo implements BeanInfo {
 	 * method found during construction.
 	 * @see #ExtendedBeanInfo(BeanInfo)
 	 */
+	@Override
 	public PropertyDescriptor[] getPropertyDescriptors() {
 		return this.propertyDescriptors.toArray(
 				new PropertyDescriptor[this.propertyDescriptors.size()]);
 	}
 
+	@Override
 	public BeanInfo[] getAdditionalBeanInfo() {
 		return delegate.getAdditionalBeanInfo();
 	}
 
+	@Override
 	public BeanDescriptor getBeanDescriptor() {
 		return delegate.getBeanDescriptor();
 	}
 
+	@Override
 	public int getDefaultEventIndex() {
 		return delegate.getDefaultEventIndex();
 	}
 
+	@Override
 	public int getDefaultPropertyIndex() {
 		return delegate.getDefaultPropertyIndex();
 	}
 
+	@Override
 	public EventSetDescriptor[] getEventSetDescriptors() {
 		return delegate.getEventSetDescriptors();
 	}
 
+	@Override
 	public Image getIcon(int iconKind) {
 		return delegate.getIcon(iconKind);
 	}
 
+	@Override
 	public MethodDescriptor[] getMethodDescriptors() {
 		return delegate.getMethodDescriptors();
 	}
@@ -655,6 +663,7 @@ class PropertyDescriptorUtils {
  */
 class PropertyDescriptorComparator implements Comparator<PropertyDescriptor> {
 
+	@Override
 	public int compare(PropertyDescriptor desc1, PropertyDescriptor desc2) {
 		String left = desc1.getName();
 		String right = desc2.getName();
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 7e46211922..6908cc06b6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfoFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfoFactory.java
@@ -40,6 +40,7 @@ public class ExtendedBeanInfoFactory implements Ordered, BeanInfoFactory {
 	/**
 	 * Return a new {@link ExtendedBeanInfo} for the given bean class.
 	 */
+	@Override
 	public BeanInfo getBeanInfo(Class<?> beanClass) throws IntrospectionException {
 		return supports(beanClass) ?
 				new ExtendedBeanInfo(Introspector.getBeanInfo(beanClass)) : null;
@@ -58,6 +59,7 @@ public class ExtendedBeanInfoFactory implements Ordered, BeanInfoFactory {
 		return false;
 	}
 
+	@Override
 	public int getOrder() {
 		return Ordered.LOWEST_PRECEDENCE;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java b/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
index e079bb0f56..e82daabbcb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java
@@ -42,6 +42,7 @@ public class MethodInvocationException extends PropertyAccessException {
 		super(propertyChangeEvent, "Property '" + propertyChangeEvent.getPropertyName() + "' threw exception", cause);
 	}
 
+	@Override
 	public String getErrorCode() {
 		return ERROR_CODE;
 	}
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..56bf9bb374 100644
--- a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
+++ b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java
@@ -244,10 +244,12 @@ public class MutablePropertyValues implements PropertyValues, Serializable {
 	}
 
 
+	@Override
 	public PropertyValue[] getPropertyValues() {
 		return this.propertyValueList.toArray(new PropertyValue[this.propertyValueList.size()]);
 	}
 
+	@Override
 	public PropertyValue getPropertyValue(String propertyName) {
 		for (PropertyValue pv : this.propertyValueList) {
 			if (pv.getName().equals(propertyName)) {
@@ -257,6 +259,7 @@ public class MutablePropertyValues implements PropertyValues, Serializable {
 		return null;
 	}
 
+	@Override
 	public PropertyValues changesSince(PropertyValues old) {
 		MutablePropertyValues changes = new MutablePropertyValues();
 		if (old == this) {
@@ -278,11 +281,13 @@ public class MutablePropertyValues implements PropertyValues, Serializable {
 		return changes;
 	}
 
+	@Override
 	public boolean contains(String propertyName) {
 		return (getPropertyValue(propertyName) != null ||
 				(this.processedProperties != null && this.processedProperties.contains(propertyName)));
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return this.propertyValueList.isEmpty();
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
index 81854100d4..b598879b3e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java
@@ -269,10 +269,12 @@ public class PropertyEditorRegistrySupport implements PropertyEditorRegistry {
 	// Management of custom editors
 	//---------------------------------------------------------------------
 
+	@Override
 	public void registerCustomEditor(Class<?> requiredType, PropertyEditor propertyEditor) {
 		registerCustomEditor(requiredType, null, propertyEditor);
 	}
 
+	@Override
 	public void registerCustomEditor(Class<?> requiredType, String propertyPath, PropertyEditor propertyEditor) {
 		if (requiredType == null && propertyPath == null) {
 			throw new IllegalArgumentException("Either requiredType or propertyPath is required");
@@ -319,6 +321,7 @@ public class PropertyEditorRegistrySupport implements PropertyEditorRegistry {
 		return (this.sharedEditors != null && this.sharedEditors.contains(propertyEditor));
 	}
 
+	@Override
 	public PropertyEditor findCustomEditor(Class<?> requiredType, String propertyPath) {
 		Class<?> requiredTypeToUse = requiredType;
 		if (propertyPath != null) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeConverterSupport.java b/spring-beans/src/main/java/org/springframework/beans/TypeConverterSupport.java
index 61fb062afe..ec1f5a2b4c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/TypeConverterSupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/TypeConverterSupport.java
@@ -35,16 +35,19 @@ public abstract class TypeConverterSupport extends PropertyEditorRegistrySupport
 	TypeConverterDelegate typeConverterDelegate;
 
 
+	@Override
 	public <T> T convertIfNecessary(Object value, Class<T> requiredType) throws TypeMismatchException {
 		return doConvert(value, requiredType, null, null);
 	}
 
+	@Override
 	public <T> T convertIfNecessary(Object value, Class<T> requiredType, MethodParameter methodParam)
 			throws TypeMismatchException {
 
 		return doConvert(value, requiredType, methodParam, null);
 	}
 
+	@Override
 	public <T> T convertIfNecessary(Object value, Class<T> requiredType, Field field)
 			throws TypeMismatchException {
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
index d1b7c48130..83883a31a1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
+++ b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java
@@ -107,6 +107,7 @@ public class TypeMismatchException extends PropertyAccessException {
 		return this.requiredType;
 	}
 
+	@Override
 	public String getErrorCode() {
 		return ERROR_CODE;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
index 1dc3257819..c9536c7729 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java
@@ -349,6 +349,7 @@ public class SingletonBeanFactoryLocator implements BeanFactoryLocator {
 		this.resourceLocation = resourceLocation;
 	}
 
+	@Override
 	public BeanFactoryReference useBeanFactory(String factoryKey) throws BeansException {
 		synchronized (this.bfgInstancesByKey) {
 			BeanFactoryGroup bfg = this.bfgInstancesByKey.get(this.resourceLocation);
@@ -500,11 +501,13 @@ public class SingletonBeanFactoryLocator implements BeanFactoryLocator {
 			this.groupContextRef = groupContext;
 		}
 
+		@Override
 		public BeanFactory getFactory() {
 			return this.beanFactory;
 		}
 
 		// Note that it's legal to call release more than once!
+		@Override
 		public void release() throws FatalBeanException {
 			synchronized (bfgInstancesByKey) {
 				BeanFactory savedRef = this.groupContextRef;
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..9cbd62ccf5 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
@@ -71,6 +71,7 @@ public class AnnotatedGenericBeanDefinition extends GenericBeanDefinition implem
 	}
 
 
+	@Override
 	public final AnnotationMetadata getMetadata() {
 		 return this.metadata;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java
index ef1a2e4b63..8729b095a9 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java
@@ -36,6 +36,7 @@ import org.springframework.util.ClassUtils;
  */
 public class AnnotationBeanWiringInfoResolver implements BeanWiringInfoResolver {
 
+	@Override
 	public BeanWiringInfo resolveWiringInfo(Object beanInstance) {
 		Assert.notNull(beanInstance, "Bean instance must not be null");
 		Configurable annotation = beanInstance.getClass().getAnnotation(Configurable.class);
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 e1f0e2f392..6a0442c3d0 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
@@ -199,10 +199,12 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 	  this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 	  return this.order;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		if (!(beanFactory instanceof ConfigurableListableBeanFactory)) {
 			throw new IllegalArgumentException(
@@ -212,6 +214,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean
 	}
 
 
+	@Override
 	public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
 		if (beanType != null) {
 			InjectionMetadata metadata = findAutowiringMetadata(beanType);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java
index 91bc3b5bfe..106997fe76 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java
@@ -59,10 +59,12 @@ public class CustomAutowireConfigurer implements BeanFactoryPostProcessor, BeanC
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 	}
@@ -82,6 +84,7 @@ public class CustomAutowireConfigurer implements BeanFactoryPostProcessor, BeanC
 	}
 
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 		if (this.customQualifierTypes != null) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
index 74a5e59d24..2bc1537f9a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
@@ -112,11 +112,13 @@ public class InitDestroyAnnotationBeanPostProcessor
 	  this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 	  return this.order;
 	}
 
 
+	@Override
 	public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
 		if (beanType != null) {
 			LifecycleMetadata metadata = findLifecycleMetadata(beanType);
@@ -124,6 +126,7 @@ public class InitDestroyAnnotationBeanPostProcessor
 		}
 	}
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		LifecycleMetadata metadata = findLifecycleMetadata(bean.getClass());
 		try {
@@ -138,10 +141,12 @@ public class InitDestroyAnnotationBeanPostProcessor
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 		return bean;
 	}
 
+	@Override
 	public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException {
 		LifecycleMetadata metadata = findLifecycleMetadata(bean.getClass());
 		try {
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..2a7f122f9d 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
@@ -126,6 +126,7 @@ public class QualifierAnnotationAutowireCandidateResolver implements AutowireCan
 		this.valueAnnotationType = valueAnnotationType;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -143,6 +144,7 @@ public class QualifierAnnotationAutowireCandidateResolver implements AutowireCan
 	 * attribute does not match.
 	 * @see Qualifier
 	 */
+	@Override
 	public boolean isAutowireCandidate(BeanDefinitionHolder bdHolder, DependencyDescriptor descriptor) {
 		if (!bdHolder.getBeanDefinition().isAutowireCandidate()) {
 			// if explicitly false, do not proceed with qualifier check
@@ -293,6 +295,7 @@ public class QualifierAnnotationAutowireCandidateResolver implements AutowireCan
 	 * Determine whether the given dependency carries a value annotation.
 	 * @see Value
 	 */
+	@Override
 	public Object getSuggestedValue(DependencyDescriptor descriptor) {
 		Object value = findValue(descriptor.getAnnotations());
 		if (value == null) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
index 862dbd6fa6..19f3035a36 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java
@@ -116,6 +116,7 @@ public class RequiredAnnotationBeanPostProcessor extends InstantiationAwareBeanP
 		return this.requiredAnnotationType;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (beanFactory instanceof ConfigurableListableBeanFactory) {
 			this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
@@ -126,11 +127,13 @@ public class RequiredAnnotationBeanPostProcessor extends InstantiationAwareBeanP
 	  this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 	  return this.order;
 	}
 
 
+	@Override
 	public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
 	}
 
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..2dda2ca735 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
@@ -84,14 +84,17 @@ public abstract class AbstractFactoryBean<T>
 		this.singleton = singleton;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return this.singleton;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -124,6 +127,7 @@ public abstract class AbstractFactoryBean<T>
 	/**
 	 * Eagerly create the singleton instance, if necessary.
 	 */
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		if (isSingleton()) {
 			this.initialized = true;
@@ -138,6 +142,7 @@ public abstract class AbstractFactoryBean<T>
 	 * @see #createInstance()
 	 * @see #getEarlySingletonInterfaces()
 	 */
+	@Override
 	public final T getObject() throws Exception {
 		if (isSingleton()) {
 			return (this.initialized ? this.singletonInstance : getEarlySingletonInstance());
@@ -181,6 +186,7 @@ public abstract class AbstractFactoryBean<T>
 	 * Destroy the singleton instance, if any.
 	 * @see #destroyInstance(Object)
 	 */
+	@Override
 	public void destroy() throws Exception {
 		if (isSingleton()) {
 			destroyInstance(this.singletonInstance);
@@ -193,6 +199,7 @@ public abstract class AbstractFactoryBean<T>
 	 * interface, for a consistent offering of abstract template methods.
 	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
 	 */
+	@Override
 	public abstract Class<?> getObjectType();
 
 	/**
@@ -241,6 +248,7 @@ public abstract class AbstractFactoryBean<T>
 	 */
 	private class EarlySingletonInvocationHandler implements InvocationHandler {
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			if (ReflectionUtils.isEqualsMethod(method)) {
 				// Only consider equal when proxies are identical.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
index c9d442c335..0f8148f060 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java
@@ -108,6 +108,7 @@ public class BeanDefinitionHolder implements BeanMetadataElement {
 	 * Expose the bean definition's source object.
 	 * @see BeanDefinition#getSource()
 	 */
+	@Override
 	public Object getSource() {
 		return this.beanDefinition.getSource();
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java
index bbe7ddf804..f637b891e1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java
@@ -65,6 +65,7 @@ public class BeanReferenceFactoryBean implements SmartFactoryBean, BeanFactoryAw
 		this.targetBeanName = targetBeanName;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 		if (this.targetBeanName == null) {
@@ -76,6 +77,7 @@ public class BeanReferenceFactoryBean implements SmartFactoryBean, BeanFactoryAw
 	}
 
 
+	@Override
 	public Object getObject() throws BeansException {
 		if (this.beanFactory == null) {
 			throw new FactoryBeanNotInitializedException();
@@ -83,6 +85,7 @@ public class BeanReferenceFactoryBean implements SmartFactoryBean, BeanFactoryAw
 		return this.beanFactory.getBean(this.targetBeanName);
 	}
 
+	@Override
 	public Class getObjectType() {
 		if (this.beanFactory == null) {
 			return null;
@@ -90,6 +93,7 @@ public class BeanReferenceFactoryBean implements SmartFactoryBean, BeanFactoryAw
 		return this.beanFactory.getType(this.targetBeanName);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		if (this.beanFactory == null) {
 			throw new FactoryBeanNotInitializedException();
@@ -97,6 +101,7 @@ public class BeanReferenceFactoryBean implements SmartFactoryBean, BeanFactoryAw
 		return this.beanFactory.isSingleton(this.targetBeanName);
 	}
 
+	@Override
 	public boolean isPrototype() {
 		if (this.beanFactory == null) {
 			throw new FactoryBeanNotInitializedException();
@@ -104,6 +109,7 @@ public class BeanReferenceFactoryBean implements SmartFactoryBean, BeanFactoryAw
 		return this.beanFactory.isPrototype(this.targetBeanName);
 	}
 
+	@Override
 	public boolean isEagerInit() {
 		return false;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
index d0e93c8b0c..c49cb6db32 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java
@@ -53,20 +53,24 @@ public class CommonsLogFactoryBean implements FactoryBean<Log>, InitializingBean
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.log == null) {
 			throw new IllegalArgumentException("'logName' is required");
 		}
 	}
 
+	@Override
 	public Log getObject() {
 		return this.log;
 	}
 
+	@Override
 	public Class<? extends Log> getObjectType() {
 		return (this.log != null ? this.log.getClass() : Log.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..795ef04a5c 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
@@ -519,6 +519,7 @@ public class ConstructorArgumentValues {
 			this.source = source;
 		}
 
+		@Override
 		public Object getSource() {
 			return this.source;
 		}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
index f155dedbdf..b10c74c78b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
@@ -119,6 +119,7 @@ public class CustomEditorConfigurer implements BeanFactoryPostProcessor, BeanCla
 	  this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 	  return this.order;
 	}
@@ -161,11 +162,13 @@ public class CustomEditorConfigurer implements BeanFactoryPostProcessor, BeanCla
 		this.ignoreUnresolvableEditors = ignoreUnresolvableEditors;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 	}
 
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 		if (this.propertyEditorRegistrars != null) {
@@ -234,6 +237,7 @@ public class CustomEditorConfigurer implements BeanFactoryPostProcessor, BeanCla
 			this.sharedEditor = sharedEditor;
 		}
 
+		@Override
 		public void registerCustomEditors(PropertyEditorRegistry registry) {
 			if (!(registry instanceof PropertyEditorRegistrySupport)) {
 				throw new IllegalArgumentException("Cannot registered shared editor " +
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java
index 130387e552..ebd4f3236c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java
@@ -65,15 +65,18 @@ public class CustomScopeConfigurer implements BeanFactoryPostProcessor, BeanClas
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 	}
 
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 		if (this.scopes != null) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/DeprecatedBeanWarner.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DeprecatedBeanWarner.java
index 815173b6be..893e4c2016 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DeprecatedBeanWarner.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DeprecatedBeanWarner.java
@@ -52,6 +52,7 @@ public class DeprecatedBeanWarner implements BeanFactoryPostProcessor {
 	}
 
 
+	@Override
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 		if (isLogEnabled()) {
 			String[] beanNames = beanFactory.getBeanDefinitionNames();
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
index 31edfa9144..b5471cb4e1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java
@@ -142,15 +142,18 @@ public class FieldRetrievingFactoryBean
 	 * nor "targetField" have been specified.
 	 * This allows for concise bean definitions with just an id/name.
 	 */
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = StringUtils.trimAllWhitespace(BeanFactoryUtils.originalBeanName(beanName));
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws ClassNotFoundException, NoSuchFieldException {
 		if (this.targetClass != null && this.targetObject != null) {
 			throw new IllegalArgumentException("Specify either targetClass or targetObject, not both");
@@ -191,6 +194,7 @@ public class FieldRetrievingFactoryBean
 	}
 
 
+	@Override
 	public Object getObject() throws IllegalAccessException {
 		if (this.fieldObject == null) {
 			throw new FactoryBeanNotInitializedException();
@@ -206,10 +210,12 @@ public class FieldRetrievingFactoryBean
 		}
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return (this.fieldObject != null ? this.fieldObject.getType() : null);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return false;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
index 49eeaaf532..b21ac39b30 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
@@ -39,26 +39,32 @@ import org.springframework.beans.PropertyValues;
  */
 public abstract class InstantiationAwareBeanPostProcessorAdapter implements SmartInstantiationAwareBeanPostProcessor {
 
+	@Override
 	public Class<?> predictBeanType(Class<?> beanClass, String beanName) {
 		return null;
 	}
 
+	@Override
 	public Constructor<?>[] determineCandidateConstructors(Class<?> beanClass, String beanName) throws BeansException {
 		return null;
 	}
 
+	@Override
 	public Object getEarlyBeanReference(Object bean, String beanName) throws BeansException {
 		return bean;
 	}
 
+	@Override
 	public Object postProcessBeforeInstantiation(Class<?> beanClass, String beanName) throws BeansException {
 		return null;
 	}
 
+	@Override
 	public boolean postProcessAfterInstantiation(Object bean, String beanName) throws BeansException {
 		return true;
 	}
 
+	@Override
 	public PropertyValues postProcessPropertyValues(
 			PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName)
 			throws BeansException {
@@ -66,10 +72,12 @@ public abstract class InstantiationAwareBeanPostProcessorAdapter implements Smar
 		return pvs;
 	}
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 		return bean;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
index 1615a8125f..0e6ad68f07 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java
@@ -110,10 +110,12 @@ public class MethodInvokingFactoryBean extends ArgumentConvertingMethodInvoker
 		this.singleton = singleton;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return this.singleton;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
@@ -123,6 +125,7 @@ public class MethodInvokingFactoryBean extends ArgumentConvertingMethodInvoker
 		return ClassUtils.forName(className, this.beanClassLoader);
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (beanFactory instanceof ConfigurableBeanFactory) {
 			this.beanFactory = (ConfigurableBeanFactory) beanFactory;
@@ -145,6 +148,7 @@ public class MethodInvokingFactoryBean extends ArgumentConvertingMethodInvoker
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		prepare();
 		if (this.singleton) {
@@ -178,6 +182,7 @@ public class MethodInvokingFactoryBean extends ArgumentConvertingMethodInvoker
 	 * to "true", otherwise returns the value returned from invoking the
 	 * specified method on the fly.
 	 */
+	@Override
 	public Object getObject() throws Exception {
 		if (this.singleton) {
 			if (!this.initialized) {
@@ -196,6 +201,7 @@ public class MethodInvokingFactoryBean extends ArgumentConvertingMethodInvoker
 	 * Return the type of object that this FactoryBean creates,
 	 * or {@code null} if not known in advance.
 	 */
+	@Override
 	public Class<?> getObjectType() {
 		if (!isPrepared()) {
 			// Not fully initialized yet -> return null to indicate "not known yet".
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java
index 710eeddae6..5c3ed77257 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBean.java
@@ -143,6 +143,7 @@ public class ObjectFactoryCreatingFactoryBean extends AbstractFactoryBean<Object
 			this.targetBeanName = targetBeanName;
 		}
 
+		@Override
 		public Object getObject() throws BeansException {
 			return this.beanFactory.getBean(this.targetBeanName);
 		}
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..55be5e0c94 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
@@ -174,6 +174,7 @@ public abstract class PlaceholderConfigurerSupport extends PropertyResourceConfi
 	 * @see #setLocations
 	 * @see org.springframework.core.io.ResourceEditor
 	 */
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -186,6 +187,7 @@ public abstract class PlaceholderConfigurerSupport extends PropertyResourceConfi
 	 * @see #setLocations
 	 * @see org.springframework.core.io.ResourceEditor
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
index c1fd6a8e6b..c8de04029b 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java
@@ -74,6 +74,7 @@ public class PreferencesPlaceholderConfigurer extends PropertyPlaceholderConfigu
 	 * This implementation eagerly fetches the Preferences instances
 	 * for the required system and user tree nodes.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		this.systemPrefs = (this.systemTreePath != null) ?
 				Preferences.systemRoot().node(this.systemTreePath) : Preferences.systemRoot();
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..31005c1d15 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
@@ -59,17 +59,20 @@ public class PropertiesFactoryBean extends PropertiesLoaderSupport
 		this.singleton = singleton;
 	}
 
+	@Override
 	public final boolean isSingleton() {
 		return this.singleton;
 	}
 
 
+	@Override
 	public final void afterPropertiesSet() throws IOException {
 		if (this.singleton) {
 			this.singletonInstance = createProperties();
 		}
 	}
 
+	@Override
 	public final Properties getObject() throws IOException {
 		if (this.singleton) {
 			return this.singletonInstance;
@@ -79,6 +82,7 @@ public class PropertiesFactoryBean extends PropertiesLoaderSupport
 		}
 	}
 
+	@Override
 	public Class<Properties> getObjectType() {
 		return Properties.class;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
index b9b822e2e2..4b8703abf0 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java
@@ -147,11 +147,13 @@ public class PropertyPathFactoryBean implements FactoryBean<Object>, BeanNameAwa
 	 * "targetBeanName" nor "propertyPath" have been specified.
 	 * This allows for concise bean definitions with just an id/name.
 	 */
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = StringUtils.trimAllWhitespace(BeanFactoryUtils.originalBeanName(beanName));
 	}
 
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 
@@ -190,6 +192,7 @@ public class PropertyPathFactoryBean implements FactoryBean<Object>, BeanNameAwa
 	}
 
 
+	@Override
 	public Object getObject() throws BeansException {
 		BeanWrapper target = this.targetBeanWrapper;
 		if (target != null) {
@@ -208,6 +211,7 @@ public class PropertyPathFactoryBean implements FactoryBean<Object>, BeanNameAwa
 		return target.getPropertyValue(this.propertyPath);
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return this.resultType;
 	}
@@ -218,6 +222,7 @@ public class PropertyPathFactoryBean implements FactoryBean<Object>, BeanNameAwa
 	 * for each call, so we have to assume that we're not returning the
 	 * same object for each {@link #getObject()} call.
 	 */
+	@Override
 	public boolean isSingleton() {
 		return false;
 	}
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..c9d39f3bf5 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
@@ -251,6 +251,7 @@ public class PropertyPlaceholderConfigurer extends PlaceholderConfigurerSupport
 			this.resolver = new PropertyPlaceholderConfigurerResolver(props);
 		}
 
+		@Override
 		public String resolveStringValue(String strVal) throws BeansException {
 			String value = this.helper.replacePlaceholders(strVal, this.resolver);
 			return (value.equals(nullValue) ? null : value);
@@ -266,6 +267,7 @@ public class PropertyPlaceholderConfigurer extends PlaceholderConfigurerSupport
 			this.props = props;
 		}
 
+		@Override
 		public String resolvePlaceholder(String placeholderName) {
 			return PropertyPlaceholderConfigurer.this.resolvePlaceholder(placeholderName, props, systemPropertiesMode);
 		}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyResourceConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyResourceConfigurer.java
index 8da5a7772b..c58bc9a90f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyResourceConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyResourceConfigurer.java
@@ -63,6 +63,7 @@ public abstract class PropertyResourceConfigurer extends PropertiesLoaderSupport
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
@@ -73,6 +74,7 @@ public abstract class PropertyResourceConfigurer extends PropertiesLoaderSupport
 	 * {@linkplain #processProperties process} properties against the given bean factory.
 	 * @throws BeanInitializationException if any properties cannot be loaded
 	 */
+	@Override
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 		try {
 			Properties mergedProps = mergeProperties();
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
index b64f38ffe2..c0d2537042 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
@@ -88,6 +88,7 @@ public class ProviderCreatingFactoryBean extends AbstractFactoryBean<Provider> {
 			this.targetBeanName = targetBeanName;
 		}
 
+		@Override
 		public Object get() throws BeansException {
 			return this.beanFactory.getBean(this.targetBeanName);
 		}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
index 7477e197cb..2e078aeb48 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java
@@ -44,6 +44,7 @@ public class RuntimeBeanNameReference implements BeanReference {
 		this.beanName = beanName;
 	}
 
+	@Override
 	public String getBeanName() {
 		return this.beanName;
 	}
@@ -56,6 +57,7 @@ public class RuntimeBeanNameReference implements BeanReference {
 		this.source = source;
 	}
 
+	@Override
 	public Object getSource() {
 		return this.source;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
index 836098ff8c..dd3648e3cc 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java
@@ -61,6 +61,7 @@ public class RuntimeBeanReference implements BeanReference {
 	}
 
 
+	@Override
 	public String getBeanName() {
 		return this.beanName;
 	}
@@ -81,6 +82,7 @@ public class RuntimeBeanReference implements BeanReference {
 		this.source = source;
 	}
 
+	@Override
 	public Object getSource() {
 		return this.source;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
index e8f2b72b6c..ef91b2b749 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java
@@ -246,6 +246,7 @@ public class ServiceLocatorFactoryBean implements FactoryBean<Object>, BeanFacto
 		this.serviceMappings = serviceMappings;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		if (!(beanFactory instanceof ListableBeanFactory)) {
 			throw new FatalBeanException(
@@ -254,6 +255,7 @@ public class ServiceLocatorFactoryBean implements FactoryBean<Object>, BeanFacto
 		this.beanFactory = (ListableBeanFactory) beanFactory;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.serviceLocatorInterface == null) {
 			throw new IllegalArgumentException("Property 'serviceLocatorInterface' is required");
@@ -323,14 +325,17 @@ public class ServiceLocatorFactoryBean implements FactoryBean<Object>, BeanFacto
 	}
 
 
+	@Override
 	public Object getObject() {
 		return this.proxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return this.serviceLocatorInterface;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -341,6 +346,7 @@ public class ServiceLocatorFactoryBean implements FactoryBean<Object>, BeanFacto
 	 */
 	private class ServiceLocatorInvocationHandler implements InvocationHandler {
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			if (ReflectionUtils.isEqualsMethod(method)) {
 				// Only consider equal when proxies are identical.
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..a9ff4fdbfb 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
@@ -171,6 +171,7 @@ public class TypedStringValue implements BeanMetadataElement {
 		this.source = source;
 	}
 
+	@Override
 	public Object getSource() {
 		return this.source;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java
index 24a03a757f..0ae0a3f87a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java
@@ -35,6 +35,7 @@ public abstract class AbstractComponentDefinition implements ComponentDefinition
 	/**
 	 * Delegates to {@link #getName}.
 	 */
+	@Override
 	public String getDescription() {
 		return getName();
 	}
@@ -42,6 +43,7 @@ public abstract class AbstractComponentDefinition implements ComponentDefinition
 	/**
 	 * Returns an empty array.
 	 */
+	@Override
 	public BeanDefinition[] getBeanDefinitions() {
 		return new BeanDefinition[0];
 	}
@@ -49,6 +51,7 @@ public abstract class AbstractComponentDefinition implements ComponentDefinition
 	/**
 	 * Returns an empty array.
 	 */
+	@Override
 	public BeanDefinition[] getInnerBeanDefinitions() {
 		return new BeanDefinition[0];
 	}
@@ -56,6 +59,7 @@ public abstract class AbstractComponentDefinition implements ComponentDefinition
 	/**
 	 * Returns an empty array.
 	 */
+	@Override
 	public BeanReference[] getBeanReferences() {
 		return new BeanReference[0];
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java
index 828cdc8257..06d037c5d7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java
@@ -73,6 +73,7 @@ public class AliasDefinition implements BeanMetadataElement {
 		return this.alias;
 	}
 
+	@Override
 	public final Object getSource() {
 		return this.source;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
index d281d86cd4..2b88d82765 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java
@@ -94,22 +94,27 @@ public class BeanComponentDefinition extends BeanDefinitionHolder implements Com
 	}
 
 
+	@Override
 	public String getName() {
 		return getBeanName();
 	}
 
+	@Override
 	public String getDescription() {
 		return getShortDescription();
 	}
 
+	@Override
 	public BeanDefinition[] getBeanDefinitions() {
 		return new BeanDefinition[] {getBeanDefinition()};
 	}
 
+	@Override
 	public BeanDefinition[] getInnerBeanDefinitions() {
 		return this.innerBeanDefinitions;
 	}
 
+	@Override
 	public BeanReference[] getBeanReferences() {
 		return this.beanReferences;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/CompositeComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/CompositeComponentDefinition.java
index e8589d0889..019fa6e3f5 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/CompositeComponentDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/CompositeComponentDefinition.java
@@ -51,10 +51,12 @@ public class CompositeComponentDefinition extends AbstractComponentDefinition {
 	}
 
 
+	@Override
 	public String getName() {
 		return this.name;
 	}
 
+	@Override
 	public Object getSource() {
 		return this.source;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/EmptyReaderEventListener.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/EmptyReaderEventListener.java
index b5d49c09a1..cf3b61e2a8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/EmptyReaderEventListener.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/EmptyReaderEventListener.java
@@ -25,18 +25,22 @@ package org.springframework.beans.factory.parsing;
  */
 public class EmptyReaderEventListener implements ReaderEventListener {
 
+	@Override
 	public void defaultsRegistered(DefaultsDefinition defaultsDefinition) {
 		// no-op
 	}
 
+	@Override
 	public void componentRegistered(ComponentDefinition componentDefinition) {
 		// no-op
 	}
 
+	@Override
 	public void aliasRegistered(AliasDefinition aliasDefinition) {
 		// no-op
 	}
 
+	@Override
 	public void importProcessed(ImportDefinition importDefinition) {
 		// no-op
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
index 76f3a2fd8a..859d611f14 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java
@@ -55,6 +55,7 @@ public class FailFastProblemReporter implements ProblemReporter {
 	 * that has occurred.
 	 * @param problem the source of the error
 	 */
+	@Override
 	public void fatal(Problem problem) {
 		throw new BeanDefinitionParsingException(problem);
 	}
@@ -64,6 +65,7 @@ public class FailFastProblemReporter implements ProblemReporter {
 	 * that has occurred.
 	 * @param problem the source of the error
 	 */
+	@Override
 	public void error(Problem problem) {
 		throw new BeanDefinitionParsingException(problem);
 	}
@@ -72,6 +74,7 @@ public class FailFastProblemReporter implements ProblemReporter {
 	 * Writes the supplied {@link Problem} to the {@link Log} at {@code WARN} level.
 	 * @param problem the source of the warning
 	 */
+	@Override
 	public void warning(Problem problem) {
 		this.logger.warn(problem, problem.getRootCause());
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java
index ffc1cb2a1e..85eea69610 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java
@@ -77,6 +77,7 @@ public class ImportDefinition implements BeanMetadataElement {
 		return this.actualResources;
 	}
 
+	@Override
 	public final Object getSource() {
 		return this.source;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java
index 66dfae23d9..3e3fa62524 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java
@@ -33,6 +33,7 @@ public class NullSourceExtractor implements SourceExtractor {
 	/**
 	 * This implementation simply returns {@code null} for any input.
 	 */
+	@Override
 	public Object extractSource(Object sourceCandidate, Resource definitionResource) {
 		return null;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java
index 4611365c07..a9f56dbfbb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java
@@ -39,6 +39,7 @@ public class PassThroughSourceExtractor implements SourceExtractor {
 	 * @param sourceCandidate the source metadata
 	 * @return the supplied {@code sourceCandidate}
 	 */
+	@Override
 	public Object extractSource(Object sourceCandidate, Resource definingResource) {
 		return sourceCandidate;
 	}
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 c112676ea1..4bb0f75145 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
@@ -280,6 +280,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	// Typical methods for creating and populating external bean instances
 	//-------------------------------------------------------------------------
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T createBean(Class<T> beanClass) throws BeansException {
 		// Use prototype bean definition, to avoid registering bean as dependent bean.
@@ -289,6 +290,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		return (T) createBean(beanClass.getName(), bd, null);
 	}
 
+	@Override
 	public void autowireBean(Object existingBean) {
 		// Use non-singleton bean definition, to avoid registering bean as dependent bean.
 		RootBeanDefinition bd = new RootBeanDefinition(ClassUtils.getUserClass(existingBean));
@@ -299,6 +301,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		populateBean(bd.getBeanClass().getName(), bd, bw);
 	}
 
+	@Override
 	public Object configureBean(Object existingBean, String beanName) throws BeansException {
 		markBeanAsCreated(beanName);
 		BeanDefinition mbd = getMergedBeanDefinition(beanName);
@@ -320,6 +323,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		return initializeBean(beanName, existingBean, bd);
 	}
 
+	@Override
 	public Object resolveDependency(DependencyDescriptor descriptor, String beanName) throws BeansException {
 		return resolveDependency(descriptor, beanName, null, null);
 	}
@@ -329,6 +333,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	// Specialized methods for fine-grained control over the bean lifecycle
 	//-------------------------------------------------------------------------
 
+	@Override
 	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);
@@ -336,6 +341,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		return createBean(beanClass.getName(), bd, null);
 	}
 
+	@Override
 	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);
@@ -350,6 +356,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 			if (System.getSecurityManager() != null) {
 				bean = AccessController.doPrivileged(new PrivilegedAction<Object>() {
 
+					@Override
 					public Object run() {
 						return getInstantiationStrategy().instantiate(bd, null, parent);
 					}
@@ -364,6 +371,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		}
 	}
 
+	@Override
 	public void autowireBeanProperties(Object existingBean, int autowireMode, boolean dependencyCheck)
 			throws BeansException {
 
@@ -379,6 +387,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		populateBean(bd.getBeanClass().getName(), bd, bw);
 	}
 
+	@Override
 	public void applyBeanPropertyValues(Object existingBean, String beanName) throws BeansException {
 		markBeanAsCreated(beanName);
 		BeanDefinition bd = getMergedBeanDefinition(beanName);
@@ -387,10 +396,12 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		applyPropertyValues(beanName, bd, bw, bd.getPropertyValues());
 	}
 
+	@Override
 	public Object initializeBean(Object existingBean, String beanName) {
 		return initializeBean(beanName, existingBean, null);
 	}
 
+	@Override
 	public Object applyBeanPostProcessorsBeforeInitialization(Object existingBean, String beanName)
 			throws BeansException {
 
@@ -404,6 +415,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		return result;
 	}
 
+	@Override
 	public Object applyBeanPostProcessorsAfterInitialization(Object existingBean, String beanName)
 			throws BeansException {
 
@@ -510,6 +522,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 						"' to allow for resolving potential circular references");
 			}
 			addSingletonFactory(beanName, new ObjectFactory() {
+				@Override
 				public Object getObject() throws BeansException {
 					return getEarlyBeanReference(beanName, mbd, bean);
 				}
@@ -695,6 +708,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 				// @Bean methods, there may be parameters present.
 				ReflectionUtils.doWithMethods(fbClass,
 					new ReflectionUtils.MethodCallback() {
+						@Override
 						public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
 							if (method.getName().equals(factoryMethodName) &&
 									FactoryBean.class.isAssignableFrom(method.getReturnType())) {
@@ -995,6 +1009,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 			final BeanFactory parent = this;
 			if (System.getSecurityManager() != null) {
 				beanInstance = AccessController.doPrivileged(new PrivilegedAction<Object>() {
+					@Override
 					public Object run() {
 						return getInstantiationStrategy().instantiate(mbd, beanName, parent);
 					}
@@ -1464,6 +1479,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	protected Object initializeBean(final String beanName, final Object bean, RootBeanDefinition mbd) {
 		if (System.getSecurityManager() != null) {
 			AccessController.doPrivileged(new PrivilegedAction<Object>() {
+				@Override
 				public Object run() {
 					invokeAwareMethods(beanName, bean);
 					return null;
@@ -1531,6 +1547,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 			if (System.getSecurityManager() != null) {
 				try {
 					AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+						@Override
 						public Object run() throws Exception {
 							((InitializingBean) bean).afterPropertiesSet();
 							return null;
@@ -1588,6 +1605,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 
 		if (System.getSecurityManager() != null) {
 			AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+				@Override
 				public Object run() throws Exception {
 					ReflectionUtils.makeAccessible(initMethod);
 					return null;
@@ -1595,6 +1613,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 			});
 			try {
 				AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+					@Override
 					public Object run() throws Exception {
 						initMethod.invoke(bean);
 						return null;
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..3d1895aa78 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
@@ -386,10 +386,12 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 		return (Class) beanClassObject;
 	}
 
+	@Override
 	public void setBeanClassName(String beanClassName) {
 		this.beanClass = beanClassName;
 	}
 
+	@Override
 	public String getBeanClassName() {
 		Object beanClassObject = this.beanClass;
 		if (beanClassObject instanceof Class) {
@@ -429,6 +431,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	 * @see #SCOPE_SINGLETON
 	 * @see #SCOPE_PROTOTYPE
 	 */
+	@Override
 	public void setScope(String scope) {
 		this.scope = scope;
 		this.singleton = SCOPE_SINGLETON.equals(scope) || SCOPE_DEFAULT.equals(scope);
@@ -438,6 +441,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	/**
 	 * Return the name of the target scope for the bean.
 	 */
+	@Override
 	public String getScope() {
 		return this.scope;
 	}
@@ -467,6 +471,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	 * returned from all calls.
 	 * @see #SCOPE_SINGLETON
 	 */
+	@Override
 	public boolean isSingleton() {
 		return this.singleton;
 	}
@@ -476,6 +481,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	 * returned for each call.
 	 * @see #SCOPE_PROTOTYPE
 	 */
+	@Override
 	public boolean isPrototype() {
 		return this.prototype;
 	}
@@ -494,6 +500,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	 * Return whether this bean is "abstract", i.e. not meant to be instantiated
 	 * itself but rather just serving as parent for concrete child bean definitions.
 	 */
+	@Override
 	public boolean isAbstract() {
 		return this.abstractFlag;
 	}
@@ -503,6 +510,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	 * <p>If {@code false}, the bean will get instantiated on startup by bean
 	 * factories that perform eager initialization of singletons.
 	 */
+	@Override
 	public void setLazyInit(boolean lazyInit) {
 		this.lazyInit = lazyInit;
 	}
@@ -511,6 +519,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	 * Return whether this bean should be lazily initialized, i.e. not
 	 * eagerly instantiated on startup. Only applicable to a singleton bean.
 	 */
+	@Override
 	public boolean isLazyInit() {
 		return this.lazyInit;
 	}
@@ -591,6 +600,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	 * constructor arguments. This property should just be necessary for other kinds
 	 * of dependencies like statics (*ugh*) or database preparation on startup.
 	 */
+	@Override
 	public void setDependsOn(String[] dependsOn) {
 		this.dependsOn = dependsOn;
 	}
@@ -598,6 +608,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	/**
 	 * Return the bean names that this bean depends on.
 	 */
+	@Override
 	public String[] getDependsOn() {
 		return this.dependsOn;
 	}
@@ -605,6 +616,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	/**
 	 * Set whether this bean is a candidate for getting autowired into some other bean.
 	 */
+	@Override
 	public void setAutowireCandidate(boolean autowireCandidate) {
 		this.autowireCandidate = autowireCandidate;
 	}
@@ -612,6 +624,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	/**
 	 * Return whether this bean is a candidate for getting autowired into some other bean.
 	 */
+	@Override
 	public boolean isAutowireCandidate() {
 		return this.autowireCandidate;
 	}
@@ -621,6 +634,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	 * If this value is true for exactly one bean among multiple
 	 * matching candidates, it will serve as a tie-breaker.
 	 */
+	@Override
 	public void setPrimary(boolean primary) {
 		this.primary = primary;
 	}
@@ -630,6 +644,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	 * If this value is true for exactly one bean among multiple
 	 * matching candidates, it will serve as a tie-breaker.
 	 */
+	@Override
 	public boolean isPrimary() {
 		return this.primary;
 	}
@@ -724,6 +739,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	/**
 	 * Return constructor argument values for this bean (never {@code null}).
 	 */
+	@Override
 	public ConstructorArgumentValues getConstructorArgumentValues() {
 		return this.constructorArgumentValues;
 	}
@@ -745,6 +761,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	/**
 	 * Return property values for this bean (never {@code null}).
 	 */
+	@Override
 	public MutablePropertyValues getPropertyValues() {
 		return this.propertyValues;
 	}
@@ -766,18 +783,22 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	}
 
 
+	@Override
 	public void setFactoryBeanName(String factoryBeanName) {
 		this.factoryBeanName = factoryBeanName;
 	}
 
+	@Override
 	public String getFactoryBeanName() {
 		return this.factoryBeanName;
 	}
 
+	@Override
 	public void setFactoryMethodName(String factoryMethodName) {
 		this.factoryMethodName = factoryMethodName;
 	}
 
+	@Override
 	public String getFactoryMethodName() {
 		return this.factoryMethodName;
 	}
@@ -874,6 +895,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	/**
 	 * Return the role hint for this {@code BeanDefinition}.
 	 */
+	@Override
 	public int getRole() {
 		return this.role;
 	}
@@ -886,6 +908,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 		this.description = description;
 	}
 
+	@Override
 	public String getDescription() {
 		return this.description;
 	}
@@ -913,6 +936,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 		this.resource = new DescriptiveResource(resourceDescription);
 	}
 
+	@Override
 	public String getResourceDescription() {
 		return (this.resource != null ? this.resource.getDescription() : null);
 	}
@@ -924,6 +948,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 		this.resource = new BeanDefinitionResource(originatingBd);
 	}
 
+	@Override
 	public BeanDefinition getOriginatingBeanDefinition() {
 		return (this.resource instanceof BeanDefinitionResource ?
 				((BeanDefinitionResource) this.resource).getBeanDefinition() : null);
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..3f81a2a2b0 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
@@ -102,6 +102,7 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
 		return this.registry;
 	}
 
+	@Override
 	public final BeanDefinitionRegistry getRegistry() {
 		return this.registry;
 	}
@@ -121,6 +122,7 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
 		this.resourceLoader = resourceLoader;
 	}
 
+	@Override
 	public ResourceLoader getResourceLoader() {
 		return this.resourceLoader;
 	}
@@ -136,6 +138,7 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
 		this.beanClassLoader = beanClassLoader;
 	}
 
+	@Override
 	public ClassLoader getBeanClassLoader() {
 		return this.beanClassLoader;
 	}
@@ -149,6 +152,7 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
 		this.environment = environment;
 	}
 
+	@Override
 	public Environment getEnvironment() {
 		return this.environment;
 	}
@@ -162,11 +166,13 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
 		this.beanNameGenerator = (beanNameGenerator != null ? beanNameGenerator : new DefaultBeanNameGenerator());
 	}
 
+	@Override
 	public BeanNameGenerator getBeanNameGenerator() {
 		return this.beanNameGenerator;
 	}
 
 
+	@Override
 	public int loadBeanDefinitions(Resource... resources) throws BeanDefinitionStoreException {
 		Assert.notNull(resources, "Resource array must not be null");
 		int counter = 0;
@@ -176,6 +182,7 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
 		return counter;
 	}
 
+	@Override
 	public int loadBeanDefinitions(String location) throws BeanDefinitionStoreException {
 		return loadBeanDefinitions(location, null);
 	}
@@ -236,6 +243,7 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
 		}
 	}
 
+	@Override
 	public int loadBeanDefinitions(String... locations) throws BeanDefinitionStoreException {
 		Assert.notNull(locations, "Location array must not be null");
 		int counter = 0;
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 8db728ae57..1d73ee4734 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
@@ -190,14 +190,17 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	// Implementation of BeanFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public Object getBean(String name) throws BeansException {
 		return doGetBean(name, null, null, false);
 	}
 
+	@Override
 	public <T> T getBean(String name, Class<T> requiredType) throws BeansException {
 		return doGetBean(name, requiredType, null, false);
 	}
 
+	@Override
 	public Object getBean(String name, Object... args) throws BeansException {
 		return doGetBean(name, null, args, false);
 	}
@@ -290,6 +293,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 			// Create bean instance.
 			if (mbd.isSingleton()) {
 				sharedInstance = getSingleton(beanName, new ObjectFactory<Object>() {
+					@Override
 					public Object getObject() throws BeansException {
 						try {
 							return createBean(beanName, mbd, args);
@@ -327,6 +331,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 				}
 				try {
 					Object scopedInstance = scope.get(beanName, new ObjectFactory<Object>() {
+						@Override
 						public Object getObject() throws BeansException {
 							beforePrototypeCreation(beanName);
 							try {
@@ -364,6 +369,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		return (T) bean;
 	}
 
+	@Override
 	public boolean containsBean(String name) {
 		String beanName = transformedBeanName(name);
 		if (containsSingleton(beanName) || containsBeanDefinition(beanName)) {
@@ -374,6 +380,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		return (parentBeanFactory != null && parentBeanFactory.containsBean(originalBeanName(name)));
 	}
 
+	@Override
 	public boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
 		String beanName = transformedBeanName(name);
 
@@ -419,6 +426,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		}
 	}
 
+	@Override
 	public boolean isPrototype(String name) throws NoSuchBeanDefinitionException {
 		String beanName = transformedBeanName(name);
 
@@ -443,6 +451,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 				final FactoryBean<?> factoryBean = (FactoryBean<?>) getBean(FACTORY_BEAN_PREFIX + beanName);
 				if (System.getSecurityManager() != null) {
 					return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+						@Override
 						public Boolean run() {
 							return ((factoryBean instanceof SmartFactoryBean && ((SmartFactoryBean<?>) factoryBean).isPrototype()) ||
 									!factoryBean.isSingleton());
@@ -460,6 +469,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		}
 	}
 
+	@Override
 	public boolean isTypeMatch(String name, Class<?> targetType) throws NoSuchBeanDefinitionException {
 		String beanName = transformedBeanName(name);
 		Class<?> typeToMatch = (targetType != null ? targetType : Object.class);
@@ -531,6 +541,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		}
 	}
 
+	@Override
 	public Class<?> getType(String name) throws NoSuchBeanDefinitionException {
 		String beanName = transformedBeanName(name);
 
@@ -621,10 +632,12 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	// Implementation of HierarchicalBeanFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public BeanFactory getParentBeanFactory() {
 		return this.parentBeanFactory;
 	}
 
+	@Override
 	public boolean containsLocalBean(String name) {
 		String beanName = transformedBeanName(name);
 		return ((containsSingleton(beanName) || containsBeanDefinition(beanName)) &&
@@ -636,6 +649,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	// Implementation of ConfigurableBeanFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public void setParentBeanFactory(BeanFactory parentBeanFactory) {
 		if (this.parentBeanFactory != null && this.parentBeanFactory != parentBeanFactory) {
 			throw new IllegalStateException("Already associated with parent BeanFactory: " + this.parentBeanFactory);
@@ -643,46 +657,57 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		this.parentBeanFactory = parentBeanFactory;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = (beanClassLoader != null ? beanClassLoader : ClassUtils.getDefaultClassLoader());
 	}
 
+	@Override
 	public ClassLoader getBeanClassLoader() {
 		return this.beanClassLoader;
 	}
 
+	@Override
 	public void setTempClassLoader(ClassLoader tempClassLoader) {
 		this.tempClassLoader = tempClassLoader;
 	}
 
+	@Override
 	public ClassLoader getTempClassLoader() {
 		return this.tempClassLoader;
 	}
 
+	@Override
 	public void setCacheBeanMetadata(boolean cacheBeanMetadata) {
 		this.cacheBeanMetadata = cacheBeanMetadata;
 	}
 
+	@Override
 	public boolean isCacheBeanMetadata() {
 		return this.cacheBeanMetadata;
 	}
 
+	@Override
 	public void setBeanExpressionResolver(BeanExpressionResolver resolver) {
 		this.beanExpressionResolver = resolver;
 	}
 
+	@Override
 	public BeanExpressionResolver getBeanExpressionResolver() {
 		return this.beanExpressionResolver;
 	}
 
+	@Override
 	public void setConversionService(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public ConversionService getConversionService() {
 		return this.conversionService;
 	}
 
+	@Override
 	public void addPropertyEditorRegistrar(PropertyEditorRegistrar registrar) {
 		Assert.notNull(registrar, "PropertyEditorRegistrar must not be null");
 		this.propertyEditorRegistrars.add(registrar);
@@ -695,12 +720,14 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		return this.propertyEditorRegistrars;
 	}
 
+	@Override
 	public void registerCustomEditor(Class<?> requiredType, Class<? extends PropertyEditor> propertyEditorClass) {
 		Assert.notNull(requiredType, "Required type must not be null");
 		Assert.isAssignable(PropertyEditor.class, propertyEditorClass);
 		this.customEditors.put(requiredType, propertyEditorClass);
 	}
 
+	@Override
 	public void copyRegisteredEditorsTo(PropertyEditorRegistry registry) {
 		registerCustomEditors(registry);
 	}
@@ -712,6 +739,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		return this.customEditors;
 	}
 
+	@Override
 	public void setTypeConverter(TypeConverter typeConverter) {
 		this.typeConverter = typeConverter;
 	}
@@ -724,6 +752,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		return this.typeConverter;
 	}
 
+	@Override
 	public TypeConverter getTypeConverter() {
 		TypeConverter customConverter = getCustomTypeConverter();
 		if (customConverter != null) {
@@ -738,11 +767,13 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		}
 	}
 
+	@Override
 	public void addEmbeddedValueResolver(StringValueResolver valueResolver) {
 		Assert.notNull(valueResolver, "StringValueResolver must not be null");
 		this.embeddedValueResolvers.add(valueResolver);
 	}
 
+	@Override
 	public String resolveEmbeddedValue(String value) {
 		String result = value;
 		for (StringValueResolver resolver : this.embeddedValueResolvers) {
@@ -751,6 +782,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		return result;
 	}
 
+	@Override
 	public void addBeanPostProcessor(BeanPostProcessor beanPostProcessor) {
 		Assert.notNull(beanPostProcessor, "BeanPostProcessor must not be null");
 		this.beanPostProcessors.remove(beanPostProcessor);
@@ -763,6 +795,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		}
 	}
 
+	@Override
 	public int getBeanPostProcessorCount() {
 		return this.beanPostProcessors.size();
 	}
@@ -795,6 +828,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		return this.hasDestructionAwareBeanPostProcessors;
 	}
 
+	@Override
 	public void registerScope(String scopeName, Scope scope) {
 		Assert.notNull(scopeName, "Scope identifier must not be null");
 		Assert.notNull(scope, "Scope must not be null");
@@ -804,10 +838,12 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		this.scopes.put(scopeName, scope);
 	}
 
+	@Override
 	public String[] getRegisteredScopeNames() {
 		return StringUtils.toStringArray(this.scopes.keySet());
 	}
 
+	@Override
 	public Scope getRegisteredScope(String scopeName) {
 		Assert.notNull(scopeName, "Scope identifier must not be null");
 		return this.scopes.get(scopeName);
@@ -833,6 +869,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 				AccessController.getContext());
 	}
 
+	@Override
 	public void copyConfigurationFrom(ConfigurableBeanFactory otherFactory) {
 		Assert.notNull(otherFactory, "BeanFactory must not be null");
 		setBeanClassLoader(otherFactory.getBeanClassLoader());
@@ -866,6 +903,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 	 * @throws NoSuchBeanDefinitionException if there is no bean with the given name
 	 * @throws BeanDefinitionStoreException in case of an invalid bean definition
 	 */
+	@Override
 	public BeanDefinition getMergedBeanDefinition(String name) throws BeansException {
 		String beanName = transformedBeanName(name);
 
@@ -877,6 +915,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		return getMergedLocalBeanDefinition(beanName);
 	}
 
+	@Override
 	public boolean isFactoryBean(String name) throws NoSuchBeanDefinitionException {
 		String beanName = transformedBeanName(name);
 
@@ -959,6 +998,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		}
 	}
 
+	@Override
 	public void destroyBean(String beanName, Object beanInstance) {
 		destroyBean(beanName, beanInstance, getMergedLocalBeanDefinition(beanName));
 	}
@@ -974,6 +1014,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 		new DisposableBeanAdapter(beanInstance, beanName, mbd, getBeanPostProcessors(), getAccessControlContext()).destroy();
 	}
 
+	@Override
 	public void destroyScopedBean(String beanName) {
 		RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName);
 		if (mbd.isSingleton() || mbd.isPrototype()) {
@@ -1246,6 +1287,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 			}
 			if (System.getSecurityManager() != null) {
 				return AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>() {
+					@Override
 					public Class<?> run() throws Exception {
 						return doResolveBeanClass(mbd, typesToMatch);
 					}
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..140e11569c 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
@@ -51,6 +51,7 @@ abstract class AutowireUtils {
 	 */
 	public static void sortConstructors(Constructor[] constructors) {
 		Arrays.sort(constructors, new Comparator<Constructor>() {
+			@Override
 			public int compare(Constructor c1, Constructor c2) {
 				boolean p1 = Modifier.isPublic(c1.getModifiers());
 				boolean p2 = Modifier.isPublic(c2.getModifiers());
@@ -73,6 +74,7 @@ abstract class AutowireUtils {
 	 */
 	public static void sortFactoryMethods(Method[] factoryMethods) {
 		Arrays.sort(factoryMethods, new Comparator<Method>() {
+			@Override
 			public int compare(Method fm1, Method fm2) {
 				boolean p1 = Modifier.isPublic(fm1.getModifiers());
 				boolean p2 = Modifier.isPublic(fm2.getModifiers());
@@ -162,6 +164,7 @@ abstract class AutowireUtils {
 			this.objectFactory = objectFactory;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			String methodName = method.getName();
 			if (methodName.equals("equals")) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java
index 330b699096..7de75a1be6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java
@@ -64,11 +64,13 @@ class BeanDefinitionResource extends AbstractResource {
 		return false;
 	}
 
+	@Override
 	public InputStream getInputStream() throws IOException {
 		throw new FileNotFoundException(
 				"Resource cannot be opened because it points to " + getDescription());
 	}
 
+	@Override
 	public String getDescription() {
 		return "BeanDefinition defined in " + this.beanDefinition.getResourceDescription();
 	}
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..8c802f09d2 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
@@ -153,6 +153,7 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 		 */
 		private class LookupOverrideMethodInterceptor extends CglibIdentitySupport implements MethodInterceptor {
 
+			@Override
 			public Object intercept(Object obj, Method method, Object[] args, MethodProxy mp) throws Throwable {
 				// Cast is safe, as CallbackFilter filters are used selectively.
 				LookupOverride lo = (LookupOverride) beanDefinition.getMethodOverrides().getOverride(method);
@@ -167,6 +168,7 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 		 */
 		private class ReplaceOverrideMethodInterceptor extends CglibIdentitySupport implements MethodInterceptor {
 
+			@Override
 			public Object intercept(Object obj, Method method, Object[] args, MethodProxy mp) throws Throwable {
 				ReplaceOverride ro = (ReplaceOverride) beanDefinition.getMethodOverrides().getOverride(method);
 				// TODO could cache if a singleton for minor performance optimization
@@ -181,6 +183,7 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 		 */
 		private class CallbackFilterImpl extends CglibIdentitySupport implements CallbackFilter {
 
+			@Override
 			public int accept(Method method) {
 				MethodOverride methodOverride = beanDefinition.getMethodOverrides().getOverride(method);
 				if (logger.isTraceEnabled()) {
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..cbc43acfbe 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
@@ -132,10 +132,12 @@ public class ChildBeanDefinition extends AbstractBeanDefinition {
 	}
 
 
+	@Override
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
 
+	@Override
 	public String getParentName() {
 		return this.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 161eae7e99..994c0d6e95 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
@@ -270,6 +270,7 @@ class ConstructorResolver {
 				final Constructor ctorToUse = constructorToUse;
 				final Object[] argumentsToUse = argsToUse;
 				beanInstance = AccessController.doPrivileged(new PrivilegedAction<Object>() {
+					@Override
 					public Object run() {
 						return beanFactory.getInstantiationStrategy().instantiate(
 								mbd, beanName, beanFactory, ctorToUse, argumentsToUse);
@@ -402,6 +403,7 @@ class ConstructorResolver {
 			final Class factoryClazz = factoryClass;
 			if (System.getSecurityManager() != null) {
 				rawCandidates = AccessController.doPrivileged(new PrivilegedAction<Method[]>() {
+					@Override
 					public Method[] run() {
 						return (mbd.isNonPublicAccessAllowed() ?
 								ReflectionUtils.getAllDeclaredMethods(factoryClazz) : factoryClazz.getMethods());
@@ -560,6 +562,7 @@ class ConstructorResolver {
 				final Method factoryMethod = factoryMethodToUse;
 				final Object[] args = argsToUse;
 				beanInstance = AccessController.doPrivileged(new PrivilegedAction<Object>() {
+					@Override
 					public Object run() {
 						return beanFactory.getInstantiationStrategy().instantiate(
 								mbd, beanName, beanFactory, fb, factoryMethod, args);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultBeanNameGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultBeanNameGenerator.java
index 065c4e2163..79c213cbc3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultBeanNameGenerator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultBeanNameGenerator.java
@@ -27,6 +27,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
  */
 public class DefaultBeanNameGenerator implements BeanNameGenerator {
 
+	@Override
 	public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
 		return BeanDefinitionReaderUtils.generateBeanName(definition, registry);
 	}
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 824caaaec5..cb2e9fe4df 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
@@ -215,6 +215,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			if (System.getSecurityManager() != null) {
 				final BeanFactory target = this;
 				AccessController.doPrivileged(new PrivilegedAction<Object>() {
+					@Override
 					public Object run() {
 						((BeanFactoryAware) autowireCandidateResolver).setBeanFactory(target);
 						return null;
@@ -253,6 +254,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	// Implementation of ListableBeanFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public <T> T getBean(Class<T> requiredType) throws BeansException {
 		Assert.notNull(requiredType, "Required type must not be null");
 		String[] beanNames = getBeanNamesForType(requiredType);
@@ -285,10 +287,12 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		return this.beanDefinitionMap.containsKey(beanName);
 	}
 
+	@Override
 	public int getBeanDefinitionCount() {
 		return this.beanDefinitionMap.size();
 	}
 
+	@Override
 	public String[] getBeanDefinitionNames() {
 		synchronized (this.beanDefinitionMap) {
 			if (this.frozenBeanDefinitionNames != null) {
@@ -300,10 +304,12 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		}
 	}
 
+	@Override
 	public String[] getBeanNamesForType(Class<?> type) {
 		return getBeanNamesForType(type, true, true);
 	}
 
+	@Override
 	public String[] getBeanNamesForType(Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {
 		if (!isConfigurationFrozen()  || type == null || !allowEagerInit) {
 			return doGetBeanNamesForType(type, includeNonSingletons, allowEagerInit);
@@ -407,10 +413,12 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		return (factoryBeanName != null && isFactoryBean(factoryBeanName) && !containsSingleton(factoryBeanName));
 	}
 
+	@Override
 	public <T> Map<String, T> getBeansOfType(Class<T> type) throws BeansException {
 		return getBeansOfType(type, true, true);
 	}
 
+	@Override
 	public <T> Map<String, T> getBeansOfType(Class<T> type, boolean includeNonSingletons, boolean allowEagerInit)
 			throws BeansException {
 
@@ -441,6 +449,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		return result;
 	}
 
+	@Override
 	public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> annotationType) {
 		Set<String> beanNames = new LinkedHashSet<String>(getBeanDefinitionCount());
 		beanNames.addAll(Arrays.asList(getBeanDefinitionNames()));
@@ -460,6 +469,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	 * 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).
 	 */
+	@Override
 	public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType) {
 		A ann = null;
 		Class<?> beanType = getType(beanName);
@@ -483,6 +493,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	// Implementation of ConfigurableListableBeanFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public void registerResolvableDependency(Class<?> dependencyType, Object autowiredValue) {
 		Assert.notNull(dependencyType, "Type must not be null");
 		if (autowiredValue != null) {
@@ -492,6 +503,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		}
 	}
 
+	@Override
 	public boolean isAutowireCandidate(String beanName, DependencyDescriptor descriptor)
 			throws NoSuchBeanDefinitionException {
 
@@ -552,6 +564,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		return bd;
 	}
 
+	@Override
 	public void freezeConfiguration() {
 		this.configurationFrozen = true;
 		synchronized (this.beanDefinitionMap) {
@@ -559,6 +572,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		}
 	}
 
+	@Override
 	public boolean isConfigurationFrozen() {
 		return this.configurationFrozen;
 	}
@@ -573,6 +587,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		return (this.configurationFrozen || super.isBeanEligibleForMetadataCaching(beanName));
 	}
 
+	@Override
 	public void preInstantiateSingletons() throws BeansException {
 		if (this.logger.isInfoEnabled()) {
 			this.logger.info("Pre-instantiating singletons in " + this);
@@ -591,6 +606,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 					boolean isEagerInit;
 					if (System.getSecurityManager() != null && factory instanceof SmartFactoryBean) {
 						isEagerInit = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+							@Override
 							public Boolean run() {
 								return ((SmartFactoryBean<?>) factory).isEagerInit();
 							}
@@ -616,6 +632,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	// Implementation of BeanDefinitionRegistry interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public void registerBeanDefinition(String beanName, BeanDefinition beanDefinition)
 			throws BeanDefinitionStoreException {
 
@@ -657,6 +674,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		resetBeanDefinition(beanName);
 	}
 
+	@Override
 	public void removeBeanDefinition(String beanName) throws NoSuchBeanDefinitionException {
 		Assert.hasText(beanName, "'beanName' must not be empty");
 
@@ -717,6 +735,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	// Dependency resolution functionality
 	//---------------------------------------------------------------------
 
+	@Override
 	public Object resolveDependency(DependencyDescriptor descriptor, String beanName,
 			Set<String> autowiredBeanNames, TypeConverter typeConverter) throws BeansException  {
 
@@ -1032,6 +1051,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			this.beanName = beanName;
 		}
 
+		@Override
 		public Object getObject() throws BeansException {
 			return doResolveDependency(this.descriptor, this.descriptor.getDependencyType(), this.beanName, null, null);
 		}
@@ -1047,6 +1067,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			super(descriptor, beanName);
 		}
 
+		@Override
 		public Object get() throws BeansException {
 			return getObject();
 		}
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..a087466cb4 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
@@ -117,6 +117,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 	private final Map<String, Set<String>> dependenciesForBeanMap = new ConcurrentHashMap<String, Set<String>>(64);
 
 
+	@Override
 	public void registerSingleton(String beanName, Object singletonObject) throws IllegalStateException {
 		Assert.notNull(beanName, "'beanName' must not be null");
 		synchronized (this.singletonObjects) {
@@ -163,6 +164,7 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 		}
 	}
 
+	@Override
 	public Object getSingleton(String beanName) {
 		return getSingleton(beanName, true);
 	}
@@ -270,16 +272,19 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 		}
 	}
 
+	@Override
 	public boolean containsSingleton(String beanName) {
 		return (this.singletonObjects.containsKey(beanName));
 	}
 
+	@Override
 	public String[] getSingletonNames() {
 		synchronized (this.singletonObjects) {
 			return StringUtils.toStringArray(this.registeredSingletons);
 		}
 	}
 
+	@Override
 	public int getSingletonCount() {
 		synchronized (this.singletonObjects) {
 			return this.registeredSingletons.size();
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 990438597f..e5186e4334 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
@@ -203,10 +203,12 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 	}
 
 
+	@Override
 	public void run() {
 		destroy();
 	}
 
+	@Override
 	public void destroy() {
 		if (this.beanPostProcessors != null && !this.beanPostProcessors.isEmpty()) {
 			for (DestructionAwareBeanPostProcessor processor : this.beanPostProcessors) {
@@ -221,6 +223,7 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 			try {
 				if (System.getSecurityManager() != null) {
 					AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+						@Override
 						public Object run() throws Exception {
 							((DisposableBean) bean).destroy();
 							return null;
@@ -258,6 +261,7 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 		try {
 			if (System.getSecurityManager() != null) {
 				return AccessController.doPrivileged(new PrivilegedAction<Method>() {
+					@Override
 					public Method run() {
 						return findDestroyMethod();
 					}
@@ -298,6 +302,7 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 		try {
 			if (System.getSecurityManager() != null) {
 				AccessController.doPrivileged(new PrivilegedAction<Object>() {
+					@Override
 					public Object run() {
 						ReflectionUtils.makeAccessible(destroyMethod);
 						return null;
@@ -305,6 +310,7 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 				});
 				try {
 					AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+						@Override
 						public Object run() throws Exception {
 							destroyMethod.invoke(bean, args);
 							return 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..286765a80d 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
@@ -56,6 +56,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
 		try {
 			if (System.getSecurityManager() != null) {
 				return AccessController.doPrivileged(new PrivilegedAction<Class>() {
+					@Override
 					public Class run() {
 						return factoryBean.getObjectType();
 					}
@@ -129,6 +130,7 @@ public abstract class FactoryBeanRegistrySupport extends DefaultSingletonBeanReg
 				AccessControlContext acc = getAccessControlContext();
 				try {
 					object = AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+						@Override
 						public Object run() throws Exception {
 								return factory.getObject();
 							}
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..5953236d6c 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
@@ -66,10 +66,12 @@ public class GenericBeanDefinition extends AbstractBeanDefinition {
 	}
 
 
+	@Override
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
 
+	@Override
 	public String getParentName() {
 		return this.parentName;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
index 5c9aa55011..d01b649bca 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java
@@ -57,6 +57,7 @@ public class ManagedList<E> extends ArrayList<E> implements Mergeable, BeanMetad
 		this.source = source;
 	}
 
+	@Override
 	public Object getSource() {
 		return this.source;
 	}
@@ -83,10 +84,12 @@ public class ManagedList<E> extends ArrayList<E> implements Mergeable, BeanMetad
 		this.mergeEnabled = mergeEnabled;
 	}
 
+	@Override
 	public boolean isMergeEnabled() {
 		return this.mergeEnabled;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public List<E> merge(Object parent) {
 		if (!this.mergeEnabled) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
index 4529b71441..4646766596 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java
@@ -58,6 +58,7 @@ public class ManagedMap<K, V> extends LinkedHashMap<K, V> implements Mergeable,
 		this.source = source;
 	}
 
+	@Override
 	public Object getSource() {
 		return this.source;
 	}
@@ -98,10 +99,12 @@ public class ManagedMap<K, V> extends LinkedHashMap<K, V> implements Mergeable,
 		this.mergeEnabled = mergeEnabled;
 	}
 
+	@Override
 	public boolean isMergeEnabled() {
 		return this.mergeEnabled;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Object merge(Object parent) {
 		if (!this.mergeEnabled) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
index 95b444721b..dadaac3e0c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java
@@ -45,6 +45,7 @@ public class ManagedProperties extends Properties implements Mergeable, BeanMeta
 		this.source = source;
 	}
 
+	@Override
 	public Object getSource() {
 		return this.source;
 	}
@@ -57,11 +58,13 @@ public class ManagedProperties extends Properties implements Mergeable, BeanMeta
 		this.mergeEnabled = mergeEnabled;
 	}
 
+	@Override
 	public boolean isMergeEnabled() {
 		return this.mergeEnabled;
 	}
 
 
+	@Override
 	public Object merge(Object parent) {
 		if (!this.mergeEnabled) {
 			throw new IllegalStateException("Not allowed to merge when the 'mergeEnabled' property is set to 'false'");
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
index 654cadc9fc..570963c17a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java
@@ -56,6 +56,7 @@ public class ManagedSet<E> extends LinkedHashSet<E> implements Mergeable, BeanMe
 		this.source = source;
 	}
 
+	@Override
 	public Object getSource() {
 		return this.source;
 	}
@@ -82,10 +83,12 @@ public class ManagedSet<E> extends LinkedHashSet<E> implements Mergeable, BeanMe
 		this.mergeEnabled = mergeEnabled;
 	}
 
+	@Override
 	public boolean isMergeEnabled() {
 		return this.mergeEnabled;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Set<E> merge(Object parent) {
 		if (!this.mergeEnabled) {
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..96f41279f2 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
@@ -83,6 +83,7 @@ public abstract class MethodOverride implements BeanMetadataElement {
 		this.source = source;
 	}
 
+	@Override
 	public Object getSource() {
 		return this.source;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
index 7b7822f0df..51e4209de4 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
@@ -204,6 +204,7 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader
 	 * @throws BeanDefinitionStoreException in case of loading or parsing errors
 	 * @see #loadBeanDefinitions(org.springframework.core.io.Resource, String)
 	 */
+	@Override
 	public int loadBeanDefinitions(Resource resource) throws BeanDefinitionStoreException {
 		return loadBeanDefinitions(new EncodedResource(resource), null);
 	}
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 7eaba17a54..d400b01cac 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
@@ -241,10 +241,12 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
 	}
 
 
+	@Override
 	public String getParentName() {
 		return null;
 	}
 
+	@Override
 	public void setParentName(String parentName) {
 		if (parentName != null) {
 			throw new IllegalArgumentException("Root bean cannot be changed into a child bean with parent reference");
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
index 735def6654..8d23469022 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
@@ -37,10 +37,12 @@ public class SimpleAutowireCandidateResolver implements AutowireCandidateResolve
 	 * <p>To be considered a candidate the bean's <em>autowire-candidate</em>
 	 * attribute must not have been set to 'false'.
 	 */
+	@Override
 	public boolean isAutowireCandidate(BeanDefinitionHolder bdHolder, DependencyDescriptor descriptor) {
 		return bdHolder.getBeanDefinition().isAutowireCandidate();
 	}
 
+	@Override
 	public Object getSuggestedValue(DependencyDescriptor descriptor) {
 		return null;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleBeanDefinitionRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleBeanDefinitionRegistry.java
index 8a42fc233e..b792c6cda8 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleBeanDefinitionRegistry.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleBeanDefinitionRegistry.java
@@ -40,6 +40,7 @@ public class SimpleBeanDefinitionRegistry extends SimpleAliasRegistry implements
 	private final Map<String, BeanDefinition> beanDefinitionMap = new ConcurrentHashMap<String, BeanDefinition>(64);
 
 
+	@Override
 	public void registerBeanDefinition(String beanName, BeanDefinition beanDefinition)
 			throws BeanDefinitionStoreException {
 
@@ -48,12 +49,14 @@ public class SimpleBeanDefinitionRegistry extends SimpleAliasRegistry implements
 		this.beanDefinitionMap.put(beanName, beanDefinition);
 	}
 
+	@Override
 	public void removeBeanDefinition(String beanName) throws NoSuchBeanDefinitionException {
 		if (this.beanDefinitionMap.remove(beanName) == null) {
 			throw new NoSuchBeanDefinitionException(beanName);
 		}
 	}
 
+	@Override
 	public BeanDefinition getBeanDefinition(String beanName) throws NoSuchBeanDefinitionException {
 		BeanDefinition bd = this.beanDefinitionMap.get(beanName);
 		if (bd == null) {
@@ -62,18 +65,22 @@ public class SimpleBeanDefinitionRegistry extends SimpleAliasRegistry implements
 		return bd;
 	}
 
+	@Override
 	public boolean containsBeanDefinition(String beanName) {
 		return this.beanDefinitionMap.containsKey(beanName);
 	}
 
+	@Override
 	public String[] getBeanDefinitionNames() {
 		return StringUtils.toStringArray(this.beanDefinitionMap.keySet());
 	}
 
+	@Override
 	public int getBeanDefinitionCount() {
 		return this.beanDefinitionMap.size();
 	}
 
+	@Override
 	public boolean isBeanNameInUse(String beanName) {
 		return isAlias(beanName) || containsBeanDefinition(beanName);
 	}
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..4dd5a1a1ca 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
@@ -55,6 +55,7 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy {
 	}
 
 
+	@Override
 	public Object instantiate(RootBeanDefinition beanDefinition, String beanName, BeanFactory owner) {
 		// Don't override the class with CGLIB if no overrides.
 		if (beanDefinition.getMethodOverrides().isEmpty()) {
@@ -69,6 +70,7 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy {
 					try {
 						if (System.getSecurityManager() != null) {
 							constructorToUse = AccessController.doPrivileged(new PrivilegedExceptionAction<Constructor>() {
+								@Override
 								public Constructor run() throws Exception {
 									return clazz.getDeclaredConstructor((Class[]) null);
 								}
@@ -105,6 +107,7 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy {
 				"Method Injection not supported in SimpleInstantiationStrategy");
 	}
 
+	@Override
 	public Object instantiate(RootBeanDefinition beanDefinition, String beanName, BeanFactory owner,
 			final Constructor<?> ctor, Object[] args) {
 
@@ -112,6 +115,7 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy {
 			if (System.getSecurityManager() != null) {
 				// use own privileged to change accessibility (when security is on)
 				AccessController.doPrivileged(new PrivilegedAction<Object>() {
+					@Override
 					public Object run() {
 						ReflectionUtils.makeAccessible(ctor);
 						return null;
@@ -138,12 +142,14 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy {
 				"Method Injection not supported in SimpleInstantiationStrategy");
 	}
 
+	@Override
 	public Object instantiate(RootBeanDefinition beanDefinition, String beanName, BeanFactory owner,
 			Object factoryBean, final Method factoryMethod, Object[] args) {
 
 		try {
 			if (System.getSecurityManager() != null) {
 				AccessController.doPrivileged(new PrivilegedAction<Object>() {
+					@Override
 					public Object run() {
 						ReflectionUtils.makeAccessible(factoryMethod);
 						return null;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
index edb954ae7f..15aed4c50d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
@@ -51,6 +51,7 @@ public class SimpleSecurityContextProvider implements SecurityContextProvider {
 	}
 
 
+	@Override
 	public AccessControlContext getAccessControlContext() {
 		return (this.acc != null ? acc : AccessController.getContext());
 	}
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 3e8784b181..f7a91be9e4 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
@@ -75,6 +75,7 @@ public class StaticListableBeanFactory implements ListableBeanFactory {
 	// Implementation of BeanFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public Object getBean(String name) throws BeansException {
 		String beanName = BeanFactoryUtils.transformedBeanName(name);
 		Object bean = this.beans.get(beanName);
@@ -103,6 +104,7 @@ public class StaticListableBeanFactory implements ListableBeanFactory {
 		}
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T getBean(String name, Class<T> requiredType) throws BeansException {
 		Object bean = getBean(name);
@@ -112,6 +114,7 @@ public class StaticListableBeanFactory implements ListableBeanFactory {
 		return (T) bean;
 	}
 
+	@Override
 	public <T> T getBean(Class<T> requiredType) throws BeansException {
 		String[] beanNames = getBeanNamesForType(requiredType);
 		if (beanNames.length == 1) {
@@ -122,6 +125,7 @@ public class StaticListableBeanFactory implements ListableBeanFactory {
 		}
 	}
 
+	@Override
 	public Object getBean(String name, Object... args) throws BeansException {
 		if (args != null) {
 			throw new UnsupportedOperationException(
@@ -130,16 +134,19 @@ public class StaticListableBeanFactory implements ListableBeanFactory {
 		return getBean(name);
 	}
 
+	@Override
 	public boolean containsBean(String name) {
 		return this.beans.containsKey(name);
 	}
 
+	@Override
 	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());
 	}
 
+	@Override
 	public boolean isPrototype(String name) throws NoSuchBeanDefinitionException {
 		Object bean = getBean(name);
 		// In case of FactoryBean, return prototype status of created object.
@@ -147,11 +154,13 @@ public class StaticListableBeanFactory implements ListableBeanFactory {
 				(bean instanceof FactoryBean && !((FactoryBean) bean).isSingleton()));
 	}
 
+	@Override
 	public boolean isTypeMatch(String name, Class targetType) throws NoSuchBeanDefinitionException {
 		Class type = getType(name);
 		return (targetType == null || (type != null && targetType.isAssignableFrom(type)));
 	}
 
+	@Override
 	public Class<?> getType(String name) throws NoSuchBeanDefinitionException {
 		String beanName = BeanFactoryUtils.transformedBeanName(name);
 
@@ -168,6 +177,7 @@ public class StaticListableBeanFactory implements ListableBeanFactory {
 		return bean.getClass();
 	}
 
+	@Override
 	public String[] getAliases(String name) {
 		return new String[0];
 	}
@@ -177,22 +187,27 @@ public class StaticListableBeanFactory implements ListableBeanFactory {
 	// Implementation of ListableBeanFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public boolean containsBeanDefinition(String name) {
 		return this.beans.containsKey(name);
 	}
 
+	@Override
 	public int getBeanDefinitionCount() {
 		return this.beans.size();
 	}
 
+	@Override
 	public String[] getBeanDefinitionNames() {
 		return StringUtils.toStringArray(this.beans.keySet());
 	}
 
+	@Override
 	public String[] getBeanNamesForType(Class type) {
 		return getBeanNamesForType(type, true, true);
 	}
 
+	@Override
 	public String[] getBeanNamesForType(Class type, boolean includeNonSingletons, boolean includeFactoryBeans) {
 		boolean isFactoryType = (type != null && FactoryBean.class.isAssignableFrom(type));
 		List<String> matches = new ArrayList<String>();
@@ -215,10 +230,12 @@ public class StaticListableBeanFactory implements ListableBeanFactory {
 		return StringUtils.toStringArray(matches);
 	}
 
+	@Override
 	public <T> Map<String, T> getBeansOfType(Class<T> type) throws BeansException {
 		return getBeansOfType(type, true, true);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> Map<String, T> getBeansOfType(Class<T> type, boolean includeNonSingletons, boolean includeFactoryBeans)
 			throws BeansException {
@@ -255,6 +272,7 @@ public class StaticListableBeanFactory implements ListableBeanFactory {
 		return matches;
 	}
 
+	@Override
 	public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> annotationType)
 			throws BeansException {
 
@@ -267,6 +285,7 @@ public class StaticListableBeanFactory implements ListableBeanFactory {
 		return results;
 	}
 
+	@Override
 	public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType) {
 		return AnnotationUtils.findAnnotation(getType(beanName), annotationType);
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
index e46145f296..3be2b8b2fb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java
@@ -72,6 +72,7 @@ public class BeanConfigurerSupport implements BeanFactoryAware, InitializingBean
 	/**
 	 * Set the {@link BeanFactory} in which this aspect must configure beans.
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (!(beanFactory instanceof ConfigurableListableBeanFactory)) {
 			throw new IllegalArgumentException(
@@ -96,6 +97,7 @@ public class BeanConfigurerSupport implements BeanFactoryAware, InitializingBean
 	/**
 	 * Check that a {@link BeanFactory} has been set.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		Assert.notNull(this.beanFactory, "BeanFactory must be set");
 	}
@@ -104,6 +106,7 @@ public class BeanConfigurerSupport implements BeanFactoryAware, InitializingBean
 	 * Release references to the {@link BeanFactory} and
 	 * {@link BeanWiringInfoResolver} when the container is destroyed.
 	 */
+	@Override
 	public void destroy() {
 		this.beanFactory = null;
 		this.beanWiringInfoResolver = null;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolver.java
index 4ba5a99d43..e4d13eb1e6 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolver.java
@@ -31,6 +31,7 @@ import org.springframework.util.ClassUtils;
  */
 public class ClassNameBeanWiringInfoResolver implements BeanWiringInfoResolver {
 
+	@Override
 	public BeanWiringInfo resolveWiringInfo(Object beanInstance) {
 		Assert.notNull(beanInstance, "Bean instance must not be null");
 		return new BeanWiringInfo(ClassUtils.getUserClass(beanInstance).getName(), true);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
index 91c94990cc..38dba2c10e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
@@ -55,6 +55,7 @@ public abstract class AbstractBeanDefinitionParser implements BeanDefinitionPars
 	/** Constant for the name attribute */
 	public static final String NAME_ATTRIBUTE = "name";
 
+	@Override
 	public final BeanDefinition parse(Element element, ParserContext parserContext) {
 		AbstractBeanDefinition definition = parseInternal(element, parserContext);
 		if (definition != null && !parserContext.isNested()) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
index d7fcfc9e4d..6f3386cb86 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
@@ -50,6 +50,7 @@ public class BeansDtdResolver implements EntityResolver {
 	private static final Log logger = LogFactory.getLog(BeansDtdResolver.class);
 
 
+	@Override
 	public InputSource resolveEntity(String publicId, String systemId) throws IOException {
 		if (logger.isTraceEnabled()) {
 			logger.trace("Trying to resolve XML entity with public ID [" + publicId +
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 9900aa1651..81497416aa 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
@@ -91,6 +91,7 @@ public class DefaultBeanDefinitionDocumentReader implements BeanDefinitionDocume
 	 * {@code <beans/>} element with a {@code profile} attribute present.
 	 * @see #doRegisterBeanDefinitions
 	 */
+	@Override
 	public void setEnvironment(Environment environment) {
 		this.environment = environment;
 	}
@@ -102,6 +103,7 @@ public class DefaultBeanDefinitionDocumentReader implements BeanDefinitionDocume
 	 * <p>Opens a DOM Document; then initializes the default settings
 	 * specified at the {@code <beans/>} level; then parses the contained bean definitions.
 	 */
+	@Override
 	public void registerBeanDefinitions(Document doc, XmlReaderContext readerContext) {
 		this.readerContext = readerContext;
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
index d057cf7e51..e7910e0ea3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
@@ -64,6 +64,7 @@ public class DefaultDocumentLoader implements DocumentLoader {
 	 * Load the {@link Document} at the supplied {@link InputSource} using the standard JAXP-configured
 	 * XML parser.
 	 */
+	@Override
 	public Document loadDocument(InputSource inputSource, EntityResolver entityResolver,
 			ErrorHandler errorHandler, int validationMode, boolean namespaceAware) throws Exception {
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java
index 6699253594..fd7d64cc8c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java
@@ -109,6 +109,7 @@ public class DefaultNamespaceHandlerResolver implements NamespaceHandlerResolver
 	 * @param namespaceUri the relevant namespace URI
 	 * @return the located {@link NamespaceHandler}, or {@code null} if none found
 	 */
+	@Override
 	public NamespaceHandler resolve(String namespaceUri) {
 		Map<String, Object> handlerMappings = getHandlerMappings();
 		Object handlerOrClassName = handlerMappings.get(namespaceUri);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
index 07bfe7afa9..c6f8daff90 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java
@@ -76,6 +76,7 @@ public class DelegatingEntityResolver implements EntityResolver {
 	}
 
 
+	@Override
 	public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
 		if (systemId != null) {
 			if (systemId.endsWith(DTD_SUFFIX)) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java
index 874eeaf034..ba31c92aaa 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java
@@ -153,6 +153,7 @@ public class DocumentDefaultsDefinition implements DefaultsDefinition {
 		this.source = source;
 	}
 
+	@Override
 	public Object getSource() {
 		return this.source;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerSupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerSupport.java
index 1ad13daf09..217773c986 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerSupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerSupport.java
@@ -69,6 +69,7 @@ public abstract class NamespaceHandlerSupport implements NamespaceHandler {
 	 * Parses the supplied {@link Element} by delegating to the {@link BeanDefinitionParser} that is
 	 * registered for that {@link Element}.
 	 */
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		return findParserForElement(element, parserContext).parse(element, parserContext);
 	}
@@ -91,6 +92,7 @@ public abstract class NamespaceHandlerSupport implements NamespaceHandler {
 	 * Decorates the supplied {@link Node} by delegating to the {@link BeanDefinitionDecorator} that
 	 * is registered to handle that {@link Node}.
 	 */
+	@Override
 	public BeanDefinitionHolder decorate(
 			Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
index 8c0d2e77a0..6cfefe7559 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
@@ -100,6 +100,7 @@ public class PluggableSchemaResolver implements EntityResolver {
 		this.schemaMappingsLocation = schemaMappingsLocation;
 	}
 
+	@Override
 	public InputSource resolveEntity(String publicId, String systemId) throws IOException {
 		if (logger.isTraceEnabled()) {
 			logger.trace("Trying to resolve XML entity with public id [" + publicId +
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 a7ca4fbd54..02aef0f045 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
@@ -59,15 +59,18 @@ public class SimpleConstructorNamespaceHandler implements NamespaceHandler {
 	private static final String REF_SUFFIX = "-ref";
 	private static final String DELIMITER_PREFIX = "_";
 
+	@Override
 	public void init() {
 	}
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		parserContext.getReaderContext().error(
 				"Class [" + getClass().getName() + "] does not support custom elements.", element);
 		return null;
 	}
 
+	@Override
 	public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
 		if (node instanceof Attr) {
 			Attr attr = (Attr) node;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
index 27d861bcb8..e6716d2900 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java
@@ -52,15 +52,18 @@ public class SimplePropertyNamespaceHandler implements NamespaceHandler {
 	private static final String REF_SUFFIX = "-ref";
 
 
+	@Override
 	public void init() {
 	}
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		parserContext.getReaderContext().error(
 				"Class [" + getClass().getName() + "] does not support custom elements.", element);
 		return null;
 	}
 
+	@Override
 	public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
 		if (node instanceof Attr) {
 			Attr attr = (Attr) node;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java
index 39676dc24d..4d33f236ce 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java
@@ -45,6 +45,7 @@ public class UtilNamespaceHandler extends NamespaceHandlerSupport {
 	private static final String SCOPE_ATTRIBUTE = "scope";
 
 
+	@Override
 	public void init() {
 		registerBeanDefinitionParser("constant", new ConstantBeanDefinitionParser());
 		registerBeanDefinitionParser("property-path", new PropertyPathBeanDefinitionParser());
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..0021ed45b0 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
@@ -298,6 +298,7 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
 	 * @return the number of bean definitions found
 	 * @throws BeanDefinitionStoreException in case of loading or parsing errors
 	 */
+	@Override
 	public int loadBeanDefinitions(Resource resource) throws BeanDefinitionStoreException {
 		return loadBeanDefinitions(new EncodedResource(resource));
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
index 2c64bf5252..4f59e4d30e 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java
@@ -104,6 +104,7 @@ public class MutableSortDefinition implements SortDefinition, Serializable {
 		}
 	}
 
+	@Override
 	public String getProperty() {
 		return this.property;
 	}
@@ -115,6 +116,7 @@ public class MutableSortDefinition implements SortDefinition, Serializable {
 		this.ignoreCase = ignoreCase;
 	}
 
+	@Override
 	public boolean isIgnoreCase() {
 		return this.ignoreCase;
 	}
@@ -126,6 +128,7 @@ public class MutableSortDefinition implements SortDefinition, Serializable {
 		this.ascending = ascending;
 	}
 
+	@Override
 	public boolean isAscending() {
 		return this.ascending;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java b/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java
index afe74eac66..bbea12861a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java
@@ -72,6 +72,7 @@ public class PropertyComparator implements Comparator {
 	}
 
 
+	@Override
 	public int compare(Object o1, Object o2) {
 		Object v1 = getPropertyValue(o1);
 		Object v2 = getPropertyValue(o2);
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..2db246e47d 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
@@ -106,6 +106,7 @@ public class ResourceEditorRegistrar implements PropertyEditorRegistrar {
 	 * @see org.springframework.beans.propertyeditors.ClassArrayEditor
 	 * @see org.springframework.core.io.support.ResourceArrayPropertyEditor
 	 */
+	@Override
 	public void registerCustomEditors(PropertyEditorRegistry registry) {
 		ResourceEditor baseEditor = new ResourceEditor(this.resourceLoader, this.propertyResolver);
 		doRegisterEditor(registry, Resource.class, baseEditor);
diff --git a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java
index eb02a84e2a..fa28b2913c 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java
@@ -49,27 +49,33 @@ public class EhCacheCache implements Cache {
 	}
 
 
+	@Override
 	public String getName() {
 		return this.cache.getName();
 	}
 
+	@Override
 	public Ehcache getNativeCache() {
 		return this.cache;
 	}
 
+	@Override
 	public ValueWrapper get(Object key) {
 		Element element = this.cache.get(key);
 		return (element != null ? new SimpleValueWrapper(element.getObjectValue()) : null);
 	}
 
+	@Override
 	public void put(Object key, Object value) {
 		this.cache.put(new Element(key, value));
 	}
 
+	@Override
 	public void evict(Object key) {
 		this.cache.remove(key);
 	}
 
+	@Override
 	public void clear() {
 		this.cache.removeAll();
 	}
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 fc2ad00022..4088855bd3 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
@@ -296,11 +296,13 @@ public class EhCacheFactoryBean implements FactoryBean<Ehcache>, BeanNameAware,
 		this.disabled = disabled;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		this.beanName = name;
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws CacheException, IOException {
 		// If no CacheManager given, fetch the default.
 		if (this.cacheManager == null) {
@@ -393,6 +395,7 @@ public class EhCacheFactoryBean implements FactoryBean<Ehcache>, BeanNameAware,
 	}
 
 
+	@Override
 	public Ehcache getObject() {
 		return this.cache;
 	}
@@ -402,6 +405,7 @@ public class EhCacheFactoryBean implements FactoryBean<Ehcache>, BeanNameAware,
 	 * {@link #getObject()} based on logic in {@link #createCache()} and
 	 * {@link #decorateCache(Ehcache)} as orchestrated by {@link #afterPropertiesSet()}.
 	 */
+	@Override
 	public Class<? extends Ehcache> getObjectType() {
 		if (this.cache != null) {
 			return this.cache.getClass();
@@ -420,6 +424,7 @@ public class EhCacheFactoryBean implements FactoryBean<Ehcache>, BeanNameAware,
 		return Cache.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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 8ae68321dc..a2d378c4b9 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
@@ -96,6 +96,7 @@ public class EhCacheManagerFactoryBean implements FactoryBean<CacheManager>, Ini
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws IOException, CacheException {
 		logger.info("Initializing EHCache CacheManager");
 		if (this.configLocation != null) {
@@ -116,19 +117,23 @@ public class EhCacheManagerFactoryBean implements FactoryBean<CacheManager>, Ini
 	}
 
 
+	@Override
 	public CacheManager getObject() {
 		return this.cacheManager;
 	}
 
+	@Override
 	public Class<? extends CacheManager> getObjectType() {
 		return (this.cacheManager != null ? this.cacheManager.getClass() : CacheManager.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
 
 
+	@Override
 	public void destroy() {
 		logger.info("Shutting down EHCache CacheManager");
 		this.cacheManager.shutdown();
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..8b0a731c4e 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
@@ -64,10 +64,12 @@ public class JCacheCache implements Cache {
 	}
 
 
+	@Override
 	public String getName() {
 		return this.cache.getName();
 	}
 
+	@Override
 	public javax.cache.Cache<?,?> getNativeCache() {
 		return this.cache;
 	}
@@ -76,22 +78,26 @@ public class JCacheCache implements Cache {
 		return this.allowNullValues;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public ValueWrapper get(Object key) {
 		Object value = this.cache.get(key);
 		return (value != null ? new SimpleValueWrapper(fromStoreValue(value)) : null);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void put(Object key, Object value) {
 		this.cache.put(key, toStoreValue(value));
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void evict(Object key) {
 		this.cache.remove(key);
 	}
 
+	@Override
 	public void clear() {
 		this.cache.removeAll();
 	}
diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheManagerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheManagerFactoryBean.java
index b43c1d75b8..0bf1c5cb6c 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheManagerFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheManagerFactoryBean.java
@@ -53,10 +53,12 @@ public class JCacheManagerFactoryBean
 		this.cacheManagerName = cacheManagerName;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		this.cacheManager = (this.beanClassLoader != null ?
 				Caching.getCacheManager(this.beanClassLoader, this.cacheManagerName) :
@@ -64,19 +66,23 @@ public class JCacheManagerFactoryBean
 	}
 
 
+	@Override
 	public CacheManager getObject() {
 		return this.cacheManager;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return (this.cacheManager != null ? this.cacheManager.getClass() : CacheManager.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
 
 
+	@Override
 	public void destroy() {
 		this.cacheManager.shutdown();
 	}
diff --git a/spring-context-support/src/main/java/org/springframework/cache/transaction/TransactionAwareCacheDecorator.java b/spring-context-support/src/main/java/org/springframework/cache/transaction/TransactionAwareCacheDecorator.java
index 7b7ac52f97..abda2b7caf 100644
--- a/spring-context-support/src/main/java/org/springframework/cache/transaction/TransactionAwareCacheDecorator.java
+++ b/spring-context-support/src/main/java/org/springframework/cache/transaction/TransactionAwareCacheDecorator.java
@@ -47,18 +47,22 @@ public class TransactionAwareCacheDecorator implements Cache {
 	}
 
 
+	@Override
 	public String getName() {
 		return this.targetCache.getName();
 	}
 
+	@Override
 	public Object getNativeCache() {
 		return this.targetCache.getNativeCache();
 	}
 
+	@Override
 	public ValueWrapper get(Object key) {
 		return this.targetCache.get(key);
 	}
 
+	@Override
 	public void put(final Object key, final Object value) {
 		if (TransactionSynchronizationManager.isSynchronizationActive()) {
 			TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
@@ -73,6 +77,7 @@ public class TransactionAwareCacheDecorator implements Cache {
 		}
 	}
 
+	@Override
 	public void evict(final Object key) {
 		if (TransactionSynchronizationManager.isSynchronizationActive()) {
 			TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
@@ -87,6 +92,7 @@ public class TransactionAwareCacheDecorator implements Cache {
 		}
 	}
 
+	@Override
 	public void clear() {
 		this.targetCache.clear();
 	}
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..2813c0d334 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
@@ -65,6 +65,7 @@ public class TransactionAwareCacheManagerProxy implements CacheManager, Initiali
 		this.targetCacheManager = targetCacheManager;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.targetCacheManager == null) {
 			throw new IllegalStateException("'targetCacheManager' is required");
@@ -72,10 +73,12 @@ public class TransactionAwareCacheManagerProxy implements CacheManager, Initiali
 	}
 
 
+	@Override
 	public Cache getCache(String name) {
 		return new TransactionAwareCacheDecorator(this.targetCacheManager.getCache(name));
 	}
 
+	@Override
 	public Collection<String> getCacheNames() {
 		return this.targetCacheManager.getCacheNames();
 	}
diff --git a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
index 7cc61122bb..65dc4d08ee 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java
@@ -89,6 +89,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 	}
 
 
+	@Override
 	public void setFrom(String from) {
 		this.from = from;
 	}
@@ -97,6 +98,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 		return this.from;
 	}
 
+	@Override
 	public void setReplyTo(String replyTo) {
 		this.replyTo = replyTo;
 	}
@@ -105,10 +107,12 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 		return replyTo;
 	}
 
+	@Override
 	public void setTo(String to) {
 		this.to = new String[] {to};
 	}
 
+	@Override
 	public void setTo(String[] to) {
 		this.to = to;
 	}
@@ -117,10 +121,12 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 		return this.to;
 	}
 
+	@Override
 	public void setCc(String cc) {
 		this.cc = new String[] {cc};
 	}
 
+	@Override
 	public void setCc(String[] cc) {
 		this.cc = cc;
 	}
@@ -129,10 +135,12 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 		return cc;
 	}
 
+	@Override
 	public void setBcc(String bcc) {
 		this.bcc = new String[] {bcc};
 	}
 
+	@Override
 	public void setBcc(String[] bcc) {
 		this.bcc = bcc;
 	}
@@ -141,6 +149,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 		return bcc;
 	}
 
+	@Override
 	public void setSentDate(Date sentDate) {
 		this.sentDate = sentDate;
 	}
@@ -149,6 +158,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 		return sentDate;
 	}
 
+	@Override
 	public void setSubject(String subject) {
 		this.subject = subject;
 	}
@@ -157,6 +167,7 @@ public class SimpleMailMessage implements MailMessage, Serializable {
 		return this.subject;
 	}
 
+	@Override
 	public void setText(String text) {
 		this.text = text;
 	}
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..803e1f5be1 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
@@ -101,6 +101,7 @@ public class ConfigurableMimeFileTypeMap extends FileTypeMap implements Initiali
 	/**
 	 * Creates the final merged mapping set.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		getFileTypeMap();
 	}
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
index 257b15b78e..3993d28ee0 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
@@ -292,10 +292,12 @@ public class JavaMailSenderImpl implements JavaMailSender {
 	// Implementation of MailSender
 	//---------------------------------------------------------------------
 
+	@Override
 	public void send(SimpleMailMessage simpleMessage) throws MailException {
 		send(new SimpleMailMessage[] { simpleMessage });
 	}
 
+	@Override
 	public void send(SimpleMailMessage[] simpleMessages) throws MailException {
 		List<MimeMessage> mimeMessages = new ArrayList<MimeMessage>(simpleMessages.length);
 		for (SimpleMailMessage simpleMessage : simpleMessages) {
@@ -319,10 +321,12 @@ public class JavaMailSenderImpl implements JavaMailSender {
 	 * @see #setDefaultEncoding
 	 * @see #setDefaultFileTypeMap
 	 */
+	@Override
 	public MimeMessage createMimeMessage() {
 		return new SmartMimeMessage(getSession(), getDefaultEncoding(), getDefaultFileTypeMap());
 	}
 
+	@Override
 	public MimeMessage createMimeMessage(InputStream contentStream) throws MailException {
 		try {
 			return new MimeMessage(getSession(), contentStream);
@@ -332,18 +336,22 @@ public class JavaMailSenderImpl implements JavaMailSender {
 		}
 	}
 
+	@Override
 	public void send(MimeMessage mimeMessage) throws MailException {
 		send(new MimeMessage[] {mimeMessage});
 	}
 
+	@Override
 	public void send(MimeMessage[] mimeMessages) throws MailException {
 		doSend(mimeMessages, null);
 	}
 
+	@Override
 	public void send(MimeMessagePreparator mimeMessagePreparator) throws MailException {
 		send(new MimeMessagePreparator[] { mimeMessagePreparator });
 	}
 
+	@Override
 	public void send(MimeMessagePreparator[] mimeMessagePreparators) throws MailException {
 		try {
 			List<MimeMessage> mimeMessages = new ArrayList<MimeMessage>(mimeMessagePreparators.length);
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java
index 242f0e5f27..c9f9e32cb9 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java
@@ -73,6 +73,7 @@ public class MimeMailMessage implements MailMessage {
 	}
 
 
+	@Override
 	public void setFrom(String from) throws MailParseException {
 		try {
 			this.helper.setFrom(from);
@@ -82,6 +83,7 @@ public class MimeMailMessage implements MailMessage {
 		}
 	}
 
+	@Override
 	public void setReplyTo(String replyTo) throws MailParseException {
 		try {
 			this.helper.setReplyTo(replyTo);
@@ -91,6 +93,7 @@ public class MimeMailMessage implements MailMessage {
 		}
 	}
 
+	@Override
 	public void setTo(String to) throws MailParseException {
 		try {
 			this.helper.setTo(to);
@@ -100,6 +103,7 @@ public class MimeMailMessage implements MailMessage {
 		}
 	}
 
+	@Override
 	public void setTo(String[] to) throws MailParseException {
 		try {
 			this.helper.setTo(to);
@@ -109,6 +113,7 @@ public class MimeMailMessage implements MailMessage {
 		}
 	}
 
+	@Override
 	public void setCc(String cc) throws MailParseException {
 		try {
 			this.helper.setCc(cc);
@@ -118,6 +123,7 @@ public class MimeMailMessage implements MailMessage {
 		}
 	}
 
+	@Override
 	public void setCc(String[] cc) throws MailParseException {
 		try {
 			this.helper.setCc(cc);
@@ -127,6 +133,7 @@ public class MimeMailMessage implements MailMessage {
 		}
 	}
 
+	@Override
 	public void setBcc(String bcc) throws MailParseException {
 		try {
 			this.helper.setBcc(bcc);
@@ -136,6 +143,7 @@ public class MimeMailMessage implements MailMessage {
 		}
 	}
 
+	@Override
 	public void setBcc(String[] bcc) throws MailParseException {
 		try {
 			this.helper.setBcc(bcc);
@@ -145,6 +153,7 @@ public class MimeMailMessage implements MailMessage {
 		}
 	}
 
+	@Override
 	public void setSentDate(Date sentDate) throws MailParseException {
 		try {
 			this.helper.setSentDate(sentDate);
@@ -154,6 +163,7 @@ public class MimeMailMessage implements MailMessage {
 		}
 	}
 
+	@Override
 	public void setSubject(String subject) throws MailParseException {
 		try {
 			this.helper.setSubject(subject);
@@ -163,6 +173,7 @@ public class MimeMailMessage implements MailMessage {
 		}
 	}
 
+	@Override
 	public void setText(String text) throws MailParseException {
 		try {
 			this.helper.setText(text);
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
index 47a115e980..245fb23c78 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java
@@ -1082,15 +1082,19 @@ public class MimeMessageHelper {
 		final InputStreamSource inputStreamSource, final String contentType, final String name) {
 
 		return new DataSource() {
+			@Override
 			public InputStream getInputStream() throws IOException {
 				return inputStreamSource.getInputStream();
 			}
+			@Override
 			public OutputStream getOutputStream() {
 				throw new UnsupportedOperationException("Read-only javax.activation.DataSource");
 			}
+			@Override
 			public String getContentType() {
 				return contentType;
 			}
+			@Override
 			public String getName() {
 				return name;
 			}
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java
index 853ea465f2..5e08cd6abd 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java
@@ -47,6 +47,7 @@ public class DelegatingTimerListener implements TimerListener {
 	/**
 	 * Delegates execution to the underlying Runnable.
 	 */
+	@Override
 	public void timerExpired(Timer timer) {
 		this.runnable.run();
 	}
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java
index 6566dc7892..a6657fdc98 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java
@@ -57,6 +57,7 @@ public class DelegatingWork implements Work {
 	/**
 	 * Delegates execution to the underlying Runnable.
 	 */
+	@Override
 	public void run() {
 		this.delegate.run();
 	}
@@ -66,6 +67,7 @@ public class DelegatingWork implements Work {
 	 * {@link org.springframework.scheduling.SchedulingAwareRunnable#isLongLived()},
 	 * if available.
 	 */
+	@Override
 	public boolean isDaemon() {
 		return (this.delegate instanceof SchedulingAwareRunnable &&
 				((SchedulingAwareRunnable) this.delegate).isLongLived());
@@ -75,6 +77,7 @@ public class DelegatingWork implements Work {
 	 * This implementation is empty, since we expect the Runnable
 	 * to terminate based on some specific shutdown signal.
 	 */
+	@Override
 	public void release() {
 	}
 
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
index 8167f6a709..728350db8e 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
@@ -95,6 +95,7 @@ public abstract class TimerManagerAccessor extends JndiLocatorSupport
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws NamingException {
 		if (this.timerManager == null) {
 			if (this.timerManagerName == null) {
@@ -117,6 +118,7 @@ public abstract class TimerManagerAccessor extends JndiLocatorSupport
 	 * Resumes the underlying TimerManager (if not shared).
 	 * @see commonj.timers.TimerManager#resume()
 	 */
+	@Override
 	public void start() {
 		if (!this.shared) {
 			this.timerManager.resume();
@@ -127,6 +129,7 @@ public abstract class TimerManagerAccessor extends JndiLocatorSupport
 	 * Suspends the underlying TimerManager (if not shared).
 	 * @see commonj.timers.TimerManager#suspend()
 	 */
+	@Override
 	public void stop() {
 		if (!this.shared) {
 			this.timerManager.suspend();
@@ -139,6 +142,7 @@ public abstract class TimerManagerAccessor extends JndiLocatorSupport
 	 * @see commonj.timers.TimerManager#isSuspending()
 	 * @see commonj.timers.TimerManager#isStopping()
 	 */
+	@Override
 	public boolean isRunning() {
 		return (!this.timerManager.isSuspending() && !this.timerManager.isStopping());
 	}
@@ -152,6 +156,7 @@ public abstract class TimerManagerAccessor extends JndiLocatorSupport
 	 * Stops the underlying TimerManager (if not shared).
 	 * @see commonj.timers.TimerManager#stop()
 	 */
+	@Override
 	public void destroy() {
 		// Stop the entire TimerManager, if necessary.
 		if (!this.shared) {
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java
index e46cbdba70..1f4c3251d6 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java
@@ -76,6 +76,7 @@ public class TimerManagerFactoryBean extends TimerManagerAccessor
 	// Implementation of InitializingBean interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public void afterPropertiesSet() throws NamingException {
 		super.afterPropertiesSet();
 		if (this.scheduledTimerListeners != null) {
@@ -105,15 +106,18 @@ public class TimerManagerFactoryBean extends TimerManagerAccessor
 	// Implementation of FactoryBean interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public TimerManager getObject() {
 		return getTimerManager();
 	}
 
+	@Override
 	public Class<? extends TimerManager> getObjectType() {
 		TimerManager timerManager = getTimerManager();
 		return (timerManager != null ? timerManager.getClass() : TimerManager.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..3801e703c0 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
@@ -52,10 +52,12 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T
 	}
 
 
+	@Override
 	public ScheduledFuture schedule(Runnable task, Trigger trigger) {
 		return new ReschedulingTimerListener(errorHandlingTask(task, true), trigger).schedule();
 	}
 
+	@Override
 	public ScheduledFuture schedule(Runnable task, Date startTime) {
 		TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, false));
 		Timer timer = getTimerManager().schedule(futureTask, startTime);
@@ -63,6 +65,7 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T
 		return futureTask;
 	}
 
+	@Override
 	public ScheduledFuture scheduleAtFixedRate(Runnable task, Date startTime, long period) {
 		TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, true));
 		Timer timer = getTimerManager().scheduleAtFixedRate(futureTask, startTime, period);
@@ -70,6 +73,7 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T
 		return futureTask;
 	}
 
+	@Override
 	public ScheduledFuture scheduleAtFixedRate(Runnable task, long period) {
 		TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, true));
 		Timer timer = getTimerManager().scheduleAtFixedRate(futureTask, 0, period);
@@ -77,6 +81,7 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T
 		return futureTask;
 	}
 
+	@Override
 	public ScheduledFuture scheduleWithFixedDelay(Runnable task, Date startTime, long delay) {
 		TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, true));
 		Timer timer = getTimerManager().schedule(futureTask, startTime, delay);
@@ -84,6 +89,7 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T
 		return futureTask;
 	}
 
+	@Override
 	public ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay) {
 		TimerScheduledFuture futureTask = new TimerScheduledFuture(errorHandlingTask(task, true));
 		Timer timer = getTimerManager().schedule(futureTask, 0, delay);
@@ -113,6 +119,7 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T
 			this.timer = timer;
 		}
 
+		@Override
 		public void timerExpired(Timer timer) {
 			runAndReset();
 		}
@@ -125,10 +132,12 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T
 			return result;
 		}
 
+		@Override
 		public long getDelay(TimeUnit unit) {
 			return unit.convert(System.currentTimeMillis() - this.timer.getScheduledExecutionTime(), TimeUnit.MILLISECONDS);
 		}
 
+		@Override
 		public int compareTo(Delayed other) {
 			if (this == other) {
 				return 0;
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..2c9ce17a49 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
@@ -109,6 +109,7 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 		this.workListener = workListener;
 	}
 
+	@Override
 	public void afterPropertiesSet() throws NamingException {
 		if (this.workManager == null) {
 			if (this.workManagerName == null) {
@@ -123,6 +124,7 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 	// Implementation of the Spring SchedulingTaskExecutor interface
 	//-------------------------------------------------------------------------
 
+	@Override
 	public void execute(Runnable task) {
 		Assert.state(this.workManager != null, "No WorkManager specified");
 		Work work = new DelegatingWork(task);
@@ -142,16 +144,19 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 		}
 	}
 
+	@Override
 	public void execute(Runnable task, long startTimeout) {
 		execute(task);
 	}
 
+	@Override
 	public Future<?> submit(Runnable task) {
 		FutureTask<Object> future = new FutureTask<Object>(task, null);
 		execute(future);
 		return future;
 	}
 
+	@Override
 	public <T> Future<T> submit(Callable<T> task) {
 		FutureTask<T> future = new FutureTask<T>(task);
 		execute(future);
@@ -161,6 +166,7 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 	/**
 	 * This task executor prefers short-lived work units.
 	 */
+	@Override
 	public boolean prefersShortLivedTasks() {
 		return true;
 	}
@@ -170,24 +176,28 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 	// Implementation of the CommonJ WorkManager interface
 	//-------------------------------------------------------------------------
 
+	@Override
 	public WorkItem schedule(Work work)
 			throws WorkException, IllegalArgumentException {
 
 		return this.workManager.schedule(work);
 	}
 
+	@Override
 	public WorkItem schedule(Work work, WorkListener workListener)
 			throws WorkException, IllegalArgumentException {
 
 		return this.workManager.schedule(work, workListener);
 	}
 
+	@Override
 	public boolean waitForAll(Collection workItems, long timeout)
 			throws InterruptedException, IllegalArgumentException {
 
 		return this.workManager.waitForAll(workItems, timeout);
 	}
 
+	@Override
 	public Collection waitForAny(Collection workItems, long timeout)
 			throws InterruptedException, IllegalArgumentException {
 
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..931c560749 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
@@ -50,6 +50,7 @@ public class AdaptableJobFactory implements JobFactory {
 	/**
 	 * Quartz 1.x version of newJob: contains actual implementation code.
 	 */
+	@Override
 	public Job newJob(TriggerFiredBundle bundle) throws SchedulerException {
 		try {
 			Object jobObject = createJobInstance(bundle);
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..00988a7749 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
@@ -139,15 +139,18 @@ public class CronTriggerBean extends CronTrigger
 		this.jobDetail = jobDetail;
 	}
 
+	@Override
 	public JobDetail getJobDetail() {
 		return this.jobDetail;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		if (this.startDelay > 0) {
 			setStartTime(new Date(System.currentTimeMillis() + this.startDelay));
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..66741456fd 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
@@ -191,11 +191,13 @@ public class CronTriggerFactoryBean implements FactoryBean<CronTrigger>, BeanNam
 		this.misfireInstruction = constants.asNumber(constantName).intValue();
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.name == null) {
 			this.name = this.beanName;
@@ -265,14 +267,17 @@ public class CronTriggerFactoryBean implements FactoryBean<CronTrigger>, BeanNam
 	}
 
 
+	@Override
 	public CronTrigger getObject() {
 		return this.cronTrigger;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return CronTrigger.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/DelegatingJob.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/DelegatingJob.java
index bcec0e566a..942f40b39a 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/DelegatingJob.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/DelegatingJob.java
@@ -60,6 +60,7 @@ public class DelegatingJob implements Job {
 	/**
 	 * Delegates execution to the underlying Runnable.
 	 */
+	@Override
 	public void execute(JobExecutionContext context) throws JobExecutionException {
 		this.delegate.run();
 	}
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..43998ffcdb 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
@@ -115,10 +115,12 @@ public class JobDetailBean extends JobDetail
 		}
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 	}
@@ -144,6 +146,7 @@ public class JobDetailBean extends JobDetail
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getName() == null) {
 			setName(this.beanName);
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..8f177da433 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
@@ -139,10 +139,12 @@ public class JobDetailFactoryBean
 		this.description = description;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 	}
@@ -168,6 +170,7 @@ public class JobDetailFactoryBean
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.name == null) {
 			this.name = this.beanName;
@@ -215,14 +218,17 @@ public class JobDetailFactoryBean
 	}
 
 
+	@Override
 	public JobDetail getObject() {
 		return this.jobDetail;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return JobDetail.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..1c0939a006 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
@@ -101,10 +101,12 @@ public class LocalDataSourceJobStore extends JobStoreCMT {
 		DBConnectionManager.getInstance().addConnectionProvider(
 				TX_DATA_SOURCE_PREFIX + getInstanceName(),
 				new ConnectionProvider() {
+					@Override
 					public Connection getConnection() throws SQLException {
 						// Return a transactional Connection, if any.
 						return DataSourceUtils.doGetConnection(dataSource);
 					}
+					@Override
 					public void shutdown() {
 						// Do nothing - a Spring-managed DataSource has its own lifecycle.
 					}
@@ -124,10 +126,12 @@ public class LocalDataSourceJobStore extends JobStoreCMT {
 		DBConnectionManager.getInstance().addConnectionProvider(
 				NON_TX_DATA_SOURCE_PREFIX + getInstanceName(),
 				new ConnectionProvider() {
+					@Override
 					public Connection getConnection() throws SQLException {
 						// Always return a non-transactional Connection.
 						return nonTxDataSourceToUse.getConnection();
 					}
+					@Override
 					public void shutdown() {
 						// Do nothing - a Spring-managed DataSource has its own lifecycle.
 					}
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..9614f1d1a4 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
@@ -47,6 +47,7 @@ public class LocalTaskExecutorThreadPool implements ThreadPool {
 	}
 
 
+	@Override
 	public void initialize() throws SchedulerConfigException {
 		// Absolutely needs thread-bound TaskExecutor to initialize.
 		this.taskExecutor = SchedulerFactoryBean.getConfigTimeTaskExecutor();
@@ -57,14 +58,17 @@ public class LocalTaskExecutorThreadPool implements ThreadPool {
 		}
 	}
 
+	@Override
 	public void shutdown(boolean waitForJobsToComplete) {
 	}
 
+	@Override
 	public int getPoolSize() {
 		return -1;
 	}
 
 
+	@Override
 	public boolean runInThread(Runnable runnable) {
 		if (runnable == null) {
 			return false;
@@ -79,6 +83,7 @@ public class LocalTaskExecutorThreadPool implements ThreadPool {
 		}
 	}
 
+	@Override
 	public int blockForAvailableThreads() {
 		// The present implementation always returns 1, making Quartz (1.6)
 		// always schedule any tasks that it feels like scheduling.
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..5d6a8a867d 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
@@ -176,14 +176,17 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod
 		this.jobListenerNames = names;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -194,6 +197,7 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws ClassNotFoundException, NoSuchMethodException {
 		prepare();
 
@@ -272,14 +276,17 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod
 	}
 
 
+	@Override
 	public JobDetail getObject() {
 		return this.jobDetail;
 	}
 
+	@Override
 	public Class<? extends JobDetail> getObjectType() {
 		return (this.jobDetail != null ? this.jobDetail.getClass() : JobDetail.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..bdeb1e749a 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
@@ -95,6 +95,7 @@ public abstract class QuartzJobBean implements Job {
 	 * values, and delegates to {@code executeInternal} afterwards.
 	 * @see #executeInternal
 	 */
+	@Override
 	public final void execute(JobExecutionContext context) throws JobExecutionException {
 		try {
 			// Reflectively adapting to differences between Quartz 1.x and Quartz 2.0...
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..54dd55760b 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
@@ -62,6 +62,7 @@ public class ResourceLoaderClassLoadHelper implements ClassLoadHelper {
 	}
 
 
+	@Override
 	public void initialize() {
 		if (this.resourceLoader == null) {
 			this.resourceLoader = SchedulerFactoryBean.getConfigTimeResourceLoader();
@@ -71,6 +72,7 @@ public class ResourceLoaderClassLoadHelper implements ClassLoadHelper {
 		}
 	}
 
+	@Override
 	public Class loadClass(String name) throws ClassNotFoundException {
 		return this.resourceLoader.getClassLoader().loadClass(name);
 	}
@@ -80,6 +82,7 @@ public class ResourceLoaderClassLoadHelper implements ClassLoadHelper {
 		return loadClass(name);
 	}
 
+	@Override
 	public URL getResource(String name) {
 		Resource resource = this.resourceLoader.getResource(name);
 		try {
@@ -94,6 +97,7 @@ public class ResourceLoaderClassLoadHelper implements ClassLoadHelper {
 		}
 	}
 
+	@Override
 	public InputStream getResourceAsStream(String name) {
 		Resource resource = this.resourceLoader.getResource(name);
 		try {
@@ -108,6 +112,7 @@ public class ResourceLoaderClassLoadHelper implements ClassLoadHelper {
 		}
 	}
 
+	@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..020c3f141c 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
@@ -238,6 +238,7 @@ public abstract class SchedulerAccessor implements ResourceLoaderAware {
 		this.transactionManager = transactionManager;
 	}
 
+	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.resourceLoader = resourceLoader;
 	}
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..edf2941060 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
@@ -73,11 +73,13 @@ public class SchedulerAccessorBean extends SchedulerAccessor implements BeanFact
 		return this.scheduler;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws SchedulerException {
 		if (this.scheduler == null) {
 			if (this.schedulerName != null) {
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 84db22173a..cb266ad6a3 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
@@ -369,6 +369,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
 	 * the scheduler will start after the context is refreshed and after the
 	 * start delay, if any.
 	 */
+	@Override
 	public boolean isAutoStartup() {
 		return this.autoStartup;
 	}
@@ -387,6 +388,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
 	/**
 	 * Return the phase in which this scheduler will be started and stopped.
 	 */
+	@Override
 	public int getPhase() {
 		return this.phase;
 	}
@@ -426,12 +428,14 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
 	}
 
 
+	@Override
 	public void setBeanName(String name) {
 		if (this.schedulerName == null) {
 			this.schedulerName = name;
 		}
 	}
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 	}
@@ -441,6 +445,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
 	// Implementation of InitializingBean interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		if (this.dataSource == null && this.nonTransactionalDataSource != null) {
 			this.dataSource = this.nonTransactionalDataSource;
@@ -689,14 +694,17 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
 		return this.scheduler;
 	}
 
+	@Override
 	public Scheduler getObject() {
 		return this.scheduler;
 	}
 
+	@Override
 	public Class<? extends Scheduler> getObjectType() {
 		return (this.scheduler != null) ? this.scheduler.getClass() : Scheduler.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -706,6 +714,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
 	// Implementation of Lifecycle interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public void start() throws SchedulingException {
 		if (this.scheduler != null) {
 			try {
@@ -717,6 +726,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
 		}
 	}
 
+	@Override
 	public void stop() throws SchedulingException {
 		if (this.scheduler != null) {
 			try {
@@ -728,11 +738,13 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
 		}
 	}
 
+	@Override
 	public void stop(Runnable callback) throws SchedulingException {
 		stop();
 		callback.run();
 	}
 
+	@Override
 	public boolean isRunning() throws SchedulingException {
 		if (this.scheduler != null) {
 			try {
@@ -754,6 +766,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
 	 * Shut down the Quartz scheduler on bean factory shutdown,
 	 * stopping all scheduled jobs.
 	 */
+	@Override
 	public void destroy() throws SchedulerException {
 		logger.info("Shutting down Quartz Scheduler");
 		this.scheduler.shutdown(this.waitForJobsToCompleteOnShutdown);
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java
index de51892481..e87c4c173e 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java
@@ -59,11 +59,13 @@ public class SimpleThreadPoolTaskExecutor extends SimpleThreadPool
 		this.waitForJobsToCompleteOnShutdown = waitForJobsToCompleteOnShutdown;
 	}
 
+	@Override
 	public void afterPropertiesSet() throws SchedulerConfigException {
 		initialize();
 	}
 
 
+	@Override
 	public void execute(Runnable task) {
 		Assert.notNull(task, "Runnable must not be null");
 		if (!runInThread(task)) {
@@ -71,16 +73,19 @@ public class SimpleThreadPoolTaskExecutor extends SimpleThreadPool
 		}
 	}
 
+	@Override
 	public void execute(Runnable task, long startTimeout) {
 		execute(task);
 	}
 
+	@Override
 	public Future<?> submit(Runnable task) {
 		FutureTask<Object> future = new FutureTask<Object>(task, null);
 		execute(future);
 		return future;
 	}
 
+	@Override
 	public <T> Future<T> submit(Callable<T> task) {
 		FutureTask<T> future = new FutureTask<T>(task);
 		execute(future);
@@ -90,11 +95,13 @@ public class SimpleThreadPoolTaskExecutor extends SimpleThreadPool
 	/**
 	 * This task executor prefers short-lived work units.
 	 */
+	@Override
 	public boolean prefersShortLivedTasks() {
 		return true;
 	}
 
 
+	@Override
 	public void destroy() {
 		shutdown(this.waitForJobsToCompleteOnShutdown);
 	}
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..37f480e3e4 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
@@ -144,15 +144,18 @@ public class SimpleTriggerBean extends SimpleTrigger
 		this.jobDetail = jobDetail;
 	}
 
+	@Override
 	public JobDetail getJobDetail() {
 		return this.jobDetail;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws ParseException {
 		if (getName() == null) {
 			setName(this.beanName);
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..31896c7ff4 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
@@ -195,11 +195,13 @@ public class SimpleTriggerFactoryBean implements FactoryBean<SimpleTrigger>, Bea
 		this.misfireInstruction = constants.asNumber(constantName).intValue();
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws ParseException {
 		if (this.name == null) {
 			this.name = this.beanName;
@@ -266,14 +268,17 @@ public class SimpleTriggerFactoryBean implements FactoryBean<SimpleTrigger>, Bea
 	}
 
 
+	@Override
 	public SimpleTrigger getObject() {
 		return this.simpleTrigger;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return SimpleTrigger.class;
 	}
 
+	@Override
 	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..6ffed1af47 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
@@ -63,6 +63,7 @@ public class SpringBeanJobFactory extends AdaptableJobFactory implements Schedul
 		this.ignoredUnknownProperties = ignoredUnknownProperties;
 	}
 
+	@Override
 	public void setSchedulerContext(SchedulerContext schedulerContext) {
 		this.schedulerContext = schedulerContext;
 	}
diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBean.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBean.java
index cf1652b5b6..6536778dfa 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBean.java
@@ -56,19 +56,23 @@ public class FreeMarkerConfigurationFactoryBean extends FreeMarkerConfigurationF
 	private Configuration configuration;
 
 
+	@Override
 	public void afterPropertiesSet() throws IOException, TemplateException {
 		this.configuration = createConfiguration();
 	}
 
 
+	@Override
 	public Configuration getObject() {
 		return this.configuration;
 	}
 
+	@Override
 	public Class<? extends Configuration> getObjectType() {
 		return Configuration.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..f157080704 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
@@ -63,6 +63,7 @@ public class SpringTemplateLoader implements TemplateLoader {
 		}
 	}
 
+	@Override
 	public Object findTemplateSource(String name) throws IOException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Looking for FreeMarker template with name [" + name + "]");
@@ -71,6 +72,7 @@ public class SpringTemplateLoader implements TemplateLoader {
 		return (resource.exists() ? resource : null);
 	}
 
+	@Override
 	public Reader getReader(Object templateSource, String encoding) throws IOException {
 		Resource resource = (Resource) templateSource;
 		try {
@@ -85,6 +87,7 @@ public class SpringTemplateLoader implements TemplateLoader {
 	}
 
 
+	@Override
 	public long getLastModified(Object templateSource) {
 		Resource resource = (Resource) templateSource;
 		try {
@@ -99,6 +102,7 @@ public class SpringTemplateLoader implements TemplateLoader {
 		}
 	}
 
+	@Override
 	public void closeTemplateSource(Object templateSource) throws IOException {
 	}
 
diff --git a/spring-context-support/src/main/java/org/springframework/ui/velocity/CommonsLoggingLogSystem.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/CommonsLoggingLogSystem.java
index 160516db63..454ef1adbb 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/velocity/CommonsLoggingLogSystem.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/velocity/CommonsLoggingLogSystem.java
@@ -40,9 +40,11 @@ public class CommonsLoggingLogSystem implements LogSystem {
 
 	private static final Log logger = LogFactory.getLog(VelocityEngine.class);
 
+	@Override
 	public void init(RuntimeServices runtimeServices) {
 	}
 
+	@Override
 	public void logVelocityMessage(int type, String msg) {
 		switch (type) {
 			case ERROR_ID:
diff --git a/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactoryBean.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactoryBean.java
index 8d25492aa6..6552690d78 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactoryBean.java
@@ -53,19 +53,23 @@ public class VelocityEngineFactoryBean extends VelocityEngineFactory
 	private VelocityEngine velocityEngine;
 
 
+	@Override
 	public void afterPropertiesSet() throws IOException, VelocityException {
 		this.velocityEngine = createVelocityEngine();
 	}
 
 
+	@Override
 	public VelocityEngine getObject() {
 		return this.velocityEngine;
 	}
 
+	@Override
 	public Class<? extends VelocityEngine> getObjectType() {
 		return VelocityEngine.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..222d3308f4 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
@@ -50,6 +50,7 @@ public abstract class AbstractCachingConfiguration implements ImportAware {
 	@Autowired(required=false)
 	private Collection<CachingConfigurer> cachingConfigurers;
 
+	@Override
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		this.enableCaching = AnnotationAttributes.fromMap(
 				importMetadata.getAnnotationAttributes(EnableCaching.class.getName(), false));
diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
index 33c4a120a7..b4fb7e5c83 100644
--- a/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
+++ b/spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java
@@ -39,6 +39,7 @@ public class CachingConfigurationSelector extends AdviceModeImportSelector<Enabl
 	 * @return {@link ProxyCachingConfiguration} or {@code AspectJCacheConfiguration} for
 	 * {@code PROXY} and {@code ASPECTJ} values of {@link EnableCaching#mode()}, respectively
 	 */
+	@Override
 	public String[] selectImports(AdviceMode adviceMode) {
 		switch (adviceMode) {
 			case PROXY:
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 9114dfc633..6ad41bb3d9 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
@@ -40,6 +40,7 @@ import org.springframework.util.ObjectUtils;
 @SuppressWarnings("serial")
 public class SpringCacheAnnotationParser implements CacheAnnotationParser, Serializable {
 
+	@Override
 	public Collection<CacheOperation> parseCacheAnnotations(AnnotatedElement ae) {
 		Collection<CacheOperation> ops = null;
 
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..7780357153 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
@@ -83,10 +83,12 @@ public class ConcurrentMapCache implements Cache {
 	}
 
 
+	@Override
 	public String getName() {
 		return this.name;
 	}
 
+	@Override
 	public ConcurrentMap getNativeCache() {
 		return this.store;
 	}
@@ -95,19 +97,23 @@ public class ConcurrentMapCache implements Cache {
 		return this.allowNullValues;
 	}
 
+	@Override
 	public ValueWrapper get(Object key) {
 		Object value = this.store.get(key);
 		return (value != null ? new SimpleValueWrapper(fromStoreValue(value)) : null);
 	}
 
+	@Override
 	public void put(Object key, Object value) {
 		this.store.put(key, toStoreValue(value));
 	}
 
+	@Override
 	public void evict(Object key) {
 		this.store.remove(key);
 	}
 
+	@Override
 	public void clear() {
 		this.store.clear();
 	}
diff --git a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheFactoryBean.java b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheFactoryBean.java
index 26b242310b..e36426f54f 100644
--- a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheFactoryBean.java
@@ -74,26 +74,31 @@ public class ConcurrentMapCacheFactoryBean
 		this.allowNullValues = allowNullValues;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		if (!StringUtils.hasLength(this.name)) {
 			setName(beanName);
 		}
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		this.cache = (this.store != null ? new ConcurrentMapCache(this.name, this.store, this.allowNullValues) :
 				new ConcurrentMapCache(this.name, this.allowNullValues));
 	}
 
 
+	@Override
 	public ConcurrentMapCache getObject() {
 		return this.cache;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return ConcurrentMapCache.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java
index 7a0067a329..35371d92d4 100644
--- a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java
+++ b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java
@@ -71,10 +71,12 @@ public class ConcurrentMapCacheManager implements CacheManager {
 		}
 	}
 
+	@Override
 	public Collection<String> getCacheNames() {
 		return Collections.unmodifiableSet(this.cacheMap.keySet());
 	}
 
+	@Override
 	public Cache getCache(String name) {
 		Cache cache = this.cacheMap.get(name);
 		if (cache == null && this.dynamic) {
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..7a6ecc9d1a 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
@@ -53,6 +53,7 @@ class AnnotationDrivenCacheBeanDefinitionParser implements BeanDefinitionParser
 	 * {@link AopNamespaceUtils#registerAutoProxyCreatorIfNecessary
 	 * register an AutoProxyCreator} with the container as necessary.
 	 */
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		String mode = element.getAttribute("mode");
 		if ("aspectj".equals(mode)) {
diff --git a/spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java b/spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java
index 40100245f3..be44366e17 100644
--- a/spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java
@@ -51,6 +51,7 @@ public class CacheNamespaceHandler extends NamespaceHandlerSupport {
 		return def;
 	}
 
+	@Override
 	public void init() {
 		registerBeanDefinitionParser("annotation-driven", new AnnotationDrivenCacheBeanDefinitionParser());
 		registerBeanDefinitionParser("advice", new CacheAdviceParser());
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..11dc537f03 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
@@ -84,6 +84,7 @@ public abstract class AbstractFallbackCacheOperationSource implements CacheOpera
 	 * @return {@link CacheOperation} for this method, or {@code null} if the method
 	 * is not cacheable
 	 */
+	@Override
 	public Collection<CacheOperation> getCacheOperations(Method method, Class<?> targetClass) {
 		// First, see if we have a cached value.
 		Object cacheKey = getCacheKey(method, targetClass);
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java b/spring-context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java
index a8d4a51e7b..55a746f44f 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/BeanFactoryCacheOperationSourceAdvisor.java
@@ -57,6 +57,7 @@ public class BeanFactoryCacheOperationSourceAdvisor extends AbstractBeanFactoryP
 		this.pointcut.setClassFilter(classFilter);
 	}
 
+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
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 7c62a21af7..3ebe8e0606 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
@@ -128,6 +128,7 @@ public abstract class CacheAspectSupport implements InitializingBean {
 		return this.keyGenerator;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.cacheManager == null) {
 			throw new IllegalStateException("'cacheManager' is required");
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java
index 9358a5b07c..7cea0341a6 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java
@@ -49,10 +49,12 @@ public class CacheInterceptor extends CacheAspectSupport implements MethodInterc
 		}
 	}
 
+	@Override
 	public Object invoke(final MethodInvocation invocation) throws Throwable {
 		Method method = invocation.getMethod();
 
 		Invoker aopAllianceInvoker = new Invoker() {
+			@Override
 			public Object invoke() {
 				try {
 					return invocation.proceed();
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSourcePointcut.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSourcePointcut.java
index 8210297a23..58548bb799 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSourcePointcut.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationSourcePointcut.java
@@ -33,6 +33,7 @@ import org.springframework.util.ObjectUtils;
 @SuppressWarnings("serial")
 abstract class CacheOperationSourcePointcut extends StaticMethodMatcherPointcut implements Serializable {
 
+	@Override
 	public boolean matches(Method method, Class<?> targetClass) {
 		CacheOperationSource cas = getCacheOperationSource();
 		return (cas != null && !CollectionUtils.isEmpty(cas.getCacheOperations(method, targetClass)));
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java
index a604ba266a..6f4438b32c 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java
@@ -52,6 +52,7 @@ public class CompositeCacheOperationSource implements CacheOperationSource, Seri
 		return this.cacheOperationSources;
 	}
 
+	@Override
 	public Collection<CacheOperation> getCacheOperations(Method method, Class<?> targetClass) {
 		Collection<CacheOperation> ops = null;
 
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..a12b04a0c4 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
@@ -36,6 +36,7 @@ public class DefaultKeyGenerator implements KeyGenerator {
 	public static final int NO_PARAM_KEY = 0;
 	public static final int NULL_PARAM_KEY = 53;
 
+	@Override
 	public Object generate(Object target, Method method, Object... params) {
 		if (params.length == 1) {
 			return (params[0] == null ? NULL_PARAM_KEY : params[0]);
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
index 69f22ec49f..3137501a89 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
@@ -71,6 +71,7 @@ public class NameMatchCacheOperationSource implements CacheOperationSource, Seri
 		this.nameMap.put(methodName, ops);
 	}
 
+	@Override
 	public Collection<CacheOperation> getCacheOperations(Method method, Class<?> targetClass) {
 		// look for direct name match
 		String methodName = method.getName();
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 5d301d85f4..8d0f00bbf1 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
@@ -43,6 +43,7 @@ public abstract class AbstractCacheManager implements CacheManager, Initializing
 	private Set<String> cacheNames = new LinkedHashSet<String>(16);
 
 
+	@Override
 	public void afterPropertiesSet() {
 		Collection<? extends Cache> caches = loadCaches();
 		Assert.notEmpty(caches, "loadCaches must not return an empty Collection");
@@ -71,10 +72,12 @@ public abstract class AbstractCacheManager implements CacheManager, Initializing
 	}
 
 
+	@Override
 	public Cache getCache(String name) {
 		return this.cacheMap.get(name);
 	}
 
+	@Override
 	public Collection<String> getCacheNames() {
 		return Collections.unmodifiableSet(this.cacheNames);
 	}
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..4434909fc2 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
@@ -59,6 +59,7 @@ public class CompositeCacheManager implements InitializingBean, CacheManager {
 		this.fallbackToNoOpCache = fallbackToNoOpCache;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.fallbackToNoOpCache) {
 			this.cacheManagers.add(new NoOpCacheManager());
@@ -66,6 +67,7 @@ public class CompositeCacheManager implements InitializingBean, CacheManager {
 	}
 
 
+	@Override
 	public Cache getCache(String name) {
 		for (CacheManager cacheManager : this.cacheManagers) {
 			Cache cache = cacheManager.getCache(name);
@@ -76,6 +78,7 @@ public class CompositeCacheManager implements InitializingBean, CacheManager {
 		return null;
 	}
 
+	@Override
 	public Collection<String> getCacheNames() {
 		List<String> names = new ArrayList<String>();
 		for (CacheManager manager : this.cacheManagers) {
diff --git a/spring-context/src/main/java/org/springframework/cache/support/NoOpCacheManager.java b/spring-context/src/main/java/org/springframework/cache/support/NoOpCacheManager.java
index dc3203e6cf..f8ffe0e729 100644
--- a/spring-context/src/main/java/org/springframework/cache/support/NoOpCacheManager.java
+++ b/spring-context/src/main/java/org/springframework/cache/support/NoOpCacheManager.java
@@ -48,6 +48,7 @@ public class NoOpCacheManager implements CacheManager {
 	 * This implementation always returns a {@link Cache} implementation that will not store items.
 	 * Additionally, the request cache will be remembered by the manager for consistency.
 	 */
+	@Override
 	public Cache getCache(String name) {
 		Cache cache = this.caches.get(name);
 		if (cache == null) {
@@ -63,6 +64,7 @@ public class NoOpCacheManager implements CacheManager {
 	/**
 	 * This implementation returns the name of the caches previously requested.
 	 */
+	@Override
 	public Collection<String> getCacheNames() {
 		synchronized (this.cacheNames) {
 			return Collections.unmodifiableSet(this.cacheNames);
@@ -78,24 +80,30 @@ public class NoOpCacheManager implements CacheManager {
 			this.name = name;
 		}
 
+		@Override
 		public void clear() {
 		}
 
+		@Override
 		public void evict(Object key) {
 		}
 
+		@Override
 		public ValueWrapper get(Object key) {
 			return null;
 		}
 
+		@Override
 		public String getName() {
 			return this.name;
 		}
 
+		@Override
 		public Object getNativeCache() {
 			return null;
 		}
 
+		@Override
 		public void put(Object key, Object value) {
 		}
 	}
diff --git a/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java b/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java
index 3b687a86de..b248902038 100644
--- a/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java
+++ b/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java
@@ -42,6 +42,7 @@ public class SimpleValueWrapper implements ValueWrapper {
 	/**
 	 * Simply returns the value as given at construction time.
 	 */
+	@Override
 	public Object get() {
 		return this.value;
 	}
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..09048cbe1f 100644
--- a/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java
@@ -100,6 +100,7 @@ public interface ConfigurableApplicationContext extends ApplicationContext, Life
 	/**
 	 * Return the Environment for this application context in configurable form.
 	 */
+	@Override
 	ConfigurableEnvironment getEnvironment();
 
 	/**
@@ -158,6 +159,7 @@ public interface ConfigurableApplicationContext extends ApplicationContext, Life
 	 * <p>This method can be called multiple times without side effects: Subsequent
 	 * {@code close} calls on an already closed context will be ignored.
 	 */
+	@Override
 	void close();
 
 	/**
diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java b/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
index b39ae88590..f978a3db42 100644
--- a/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
+++ b/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java
@@ -48,6 +48,7 @@ public class ContextBeanFactoryReference implements BeanFactoryReference {
 	}
 
 
+	@Override
 	public BeanFactory getFactory() {
 		if (this.applicationContext == null) {
 			throw new IllegalStateException(
@@ -56,6 +57,7 @@ public class ContextBeanFactoryReference implements BeanFactoryReference {
 		return this.applicationContext;
 	}
 
+	@Override
 	public void release() {
 		if (this.applicationContext != null) {
 			ApplicationContext savedCtx;
diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java b/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java
index 54b66347ad..fe9493824b 100644
--- a/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java
+++ b/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java
@@ -57,6 +57,7 @@ public class ContextJndiBeanFactoryLocator extends JndiLocatorSupport implements
 	 * will be created from the combined resources.
 	 * @see #createBeanFactory
 	 */
+	@Override
 	public BeanFactoryReference useBeanFactory(String factoryKey) throws BeansException {
 		try {
 			String beanFactoryPath = lookup(factoryKey, String.class);
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..826214448b 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
@@ -65,6 +65,7 @@ public abstract class AdviceModeImportSelector<A extends Annotation> implements
 	 * on the importing {@code @Configuration} class or if {@link #selectImports(AdviceMode)}
 	 * returns {@code null}
 	 */
+	@Override
 	public final String[] selectImports(AnnotationMetadata importingClassMetadata) {
 		Class<?> annoType = GenericTypeResolver.resolveTypeArgument(this.getClass(), AdviceModeImportSelector.class);
 
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..00d2f9810d 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
@@ -64,6 +64,7 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
 	private static final String COMPONENT_ANNOTATION_CLASSNAME = "org.springframework.stereotype.Component";
 
 
+	@Override
 	public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
 		if (definition instanceof AnnotatedBeanDefinition) {
 			String beanName = determineBeanNameFromAnnotation((AnnotatedBeanDefinition) definition);
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigBeanDefinitionParser.java
index c25b536f93..e386246b53 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigBeanDefinitionParser.java
@@ -38,6 +38,7 @@ import org.springframework.beans.factory.xml.ParserContext;
  */
 public class AnnotationConfigBeanDefinitionParser implements BeanDefinitionParser {
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		Object source = parserContext.extractSource(element);
 
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
index f678425ea8..79556e6aff 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
@@ -73,6 +73,7 @@ public class AnnotationScopeMetadataResolver implements ScopeMetadataResolver {
 	}
 
 
+	@Override
 	public ScopeMetadata resolveScopeMetadata(BeanDefinition definition) {
 		ScopeMetadata metadata = new ScopeMetadata();
 		if (definition instanceof AnnotatedBeanDefinition) {
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AspectJAutoProxyRegistrar.java b/spring-context/src/main/java/org/springframework/context/annotation/AspectJAutoProxyRegistrar.java
index aedbbbe28e..5b3c522d8f 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AspectJAutoProxyRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AspectJAutoProxyRegistrar.java
@@ -39,6 +39,7 @@ class AspectJAutoProxyRegistrar implements ImportBeanDefinitionRegistrar {
 	 * of the @{@link EnableAspectJAutoProxy#proxyTargetClass()} attribute on the importing
 	 * {@code @Configuration} class.
 	 */
+	@Override
 	public void registerBeanDefinitions(
 			AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
 
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..e0fde7df8f 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
@@ -56,6 +56,7 @@ public class AutoProxyRegistrar implements ImportBeanDefinitionRegistrar {
 	 * {@code proxyTargetClass} attributes, the APC can be registered and configured all
 	 * the same.
 	 */
+	@Override
 	public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
 		boolean candidateFound = false;
 		Set<String> annoTypes = importingClassMetadata.getAnnotationTypes();
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..5e1dd4b18a 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
@@ -117,6 +117,7 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
 	 * @see org.springframework.core.io.support.ResourcePatternResolver
 	 * @see org.springframework.core.io.support.PathMatchingResourcePatternResolver
 	 */
+	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader);
 		this.metadataReaderFactory = new CachingMetadataReaderFactory(resourceLoader);
@@ -157,6 +158,7 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
 		this.environment = environment;
 	}
 
+	@Override
 	public final Environment getEnvironment() {
 		return this.environment;
 	}
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 a105e147f7..e381c9ce71 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
@@ -269,6 +269,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 		this.resourceFactory = resourceFactory;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		Assert.notNull(beanFactory, "BeanFactory must not be null");
 		this.beanFactory = beanFactory;
@@ -287,14 +288,17 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 		}
 	}
 
+	@Override
 	public Object postProcessBeforeInstantiation(Class<?> beanClass, String beanName) throws BeansException {
 		return null;
 	}
 
+	@Override
 	public boolean postProcessAfterInstantiation(Object bean, String beanName) throws BeansException {
 		return true;
 	}
 
+	@Override
 	public PropertyValues postProcessPropertyValues(
 			PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeansException {
 
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..bf2db85ed9 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
@@ -75,6 +75,7 @@ public class ComponentScanBeanDefinitionParser implements BeanDefinitionParser {
 	private static final String FILTER_EXPRESSION_ATTRIBUTE = "expression";
 
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		String[] basePackages = StringUtils.tokenizeToStringArray(element.getAttribute(BASE_PACKAGE_ATTRIBUTE),
 				ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
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 e41aca1728..b30a04694e 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
@@ -318,6 +318,7 @@ class ConfigurationClassBeanDefinitionReader {
 			this.annotationMetadata = original.annotationMetadata;
 		}
 
+		@Override
 		public AnnotationMetadata getMetadata() {
 			return this.annotationMetadata;
 		}
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 99678159d3..f75157fc16 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
@@ -56,6 +56,7 @@ class ConfigurationClassEnhancer {
 		DisposableBeanMethodInterceptor.class, NoOp.class };
 
 	private static final CallbackFilter CALLBACK_FILTER = new CallbackFilter() {
+		@Override
 		public int accept(Method candidateMethod) {
 			// Set up the callback filter to return the index of the BeanMethodInterceptor when
 			// handling a @Bean-annotated method; otherwise, return index of the NoOp callback.
@@ -168,6 +169,7 @@ class ConfigurationClassEnhancer {
 			this.beanName = beanName;
 		}
 
+		@Override
 		public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable {
 			return beanFactory.getBean(beanName);
 		}
@@ -183,6 +185,7 @@ class ConfigurationClassEnhancer {
 	 */
 	private static class DisposableBeanMethodInterceptor implements MethodInterceptor {
 
+		@Override
 		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?
@@ -213,6 +216,7 @@ class ConfigurationClassEnhancer {
 			GetObjectMethodInterceptor.class, NoOp.class };
 
 		private static final CallbackFilter CALLBACK_FITLER = new CallbackFilter() {
+			@Override
 			public int accept(Method method) {
 				return method.getName().equals("getObject") ? 0 : 1;
 			}
@@ -234,6 +238,7 @@ class ConfigurationClassEnhancer {
 		 * invoking the super implementation of the proxied method i.e., the actual
 		 * {@code @Bean} method.
 		 */
+		@Override
 		public Object intercept(Object enhancedConfigInstance, Method beanMethod, Object[] beanMethodArgs,
 					MethodProxy cglibMethodProxy) throws Throwable {
 
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 2901e5cea0..7bb0e7f1f3 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
@@ -413,6 +413,7 @@ class ConfigurationClassParser {
 			this.imports.put(importedClass, importingClass);
 		}
 
+		@Override
 		public String getImportingClassFor(String importedClass) {
 			return this.imports.get(importedClass);
 		}
@@ -426,6 +427,7 @@ class ConfigurationClassParser {
 		public boolean contains(Object elem) {
 			ConfigurationClass configClass = (ConfigurationClass) elem;
 			Comparator<ConfigurationClass> comparator = new Comparator<ConfigurationClass>() {
+				@Override
 				public int compare(ConfigurationClass first, ConfigurationClass second) {
 					return first.getMetadata().getClassName().equals(second.getMetadata().getClassName()) ? 0 : 1;
 				}
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..ab10dfda19 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
@@ -183,16 +183,19 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 		this.importBeanNameGenerator = beanNameGenerator;
 	}
 
+	@Override
 	public void setEnvironment(Environment environment) {
 		Assert.notNull(environment, "Environment must not be null");
 		this.environment = environment;
 	}
 
+	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		Assert.notNull(resourceLoader, "ResourceLoader must not be null");
 		this.resourceLoader = resourceLoader;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 		if (!this.setMetadataReaderFactoryCalled) {
@@ -204,6 +207,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 	/**
 	 * Derive further bean definitions from the configuration classes in the registry.
 	 */
+	@Override
 	public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) {
 		RootBeanDefinition iabpp = new RootBeanDefinition(ImportAwareBeanPostProcessor.class);
 		iabpp.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
@@ -227,6 +231,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 	 * Prepare the Configuration classes for servicing bean requests at runtime
 	 * by replacing them with CGLIB-enhanced subclasses.
 	 */
+	@Override
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
 		int factoryId = System.identityHashCode(beanFactory);
 		if (this.factoriesPostProcessed.contains(factoryId)) {
@@ -373,10 +378,12 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 
 		private BeanFactory beanFactory;
 
+		@Override
 		public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 			this.beanFactory = beanFactory;
 		}
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 			if (bean instanceof ImportAware) {
 				ImportRegistry importRegistry = this.beanFactory.getBean(IMPORT_REGISTRY_BEAN_NAME, ImportRegistry.class);
@@ -399,10 +406,12 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 			return bean;
 		}
 
+		@Override
 		public int getOrder() {
 			return Ordered.HIGHEST_PRECEDENCE;
 		}
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
index 8549d97f8e..072951d075 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
@@ -81,6 +81,7 @@ public class Jsr330ScopeMetadataResolver implements ScopeMetadataResolver {
 	}
 
 
+	@Override
 	public ScopeMetadata resolveScopeMetadata(BeanDefinition definition) {
 		ScopeMetadata metadata = new ScopeMetadata();
 		metadata.setScopeName(BeanDefinition.SCOPE_PROTOTYPE);
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..26cd32ab49 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
@@ -52,6 +52,7 @@ public class LoadTimeWeavingConfiguration implements ImportAware, BeanClassLoade
 
 	private ClassLoader beanClassLoader;
 
+	@Override
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		this.enableLTW = MetadataUtils.attributesFor(importMetadata, EnableLoadTimeWeaving.class);
 		Assert.notNull(this.enableLTW,
@@ -59,6 +60,7 @@ public class LoadTimeWeavingConfiguration implements ImportAware, BeanClassLoade
 				importMetadata.getClassName());
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 	}
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..d2f0bb2b5b 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
@@ -56,6 +56,7 @@ public class MBeanExportConfiguration implements ImportAware, BeanFactoryAware {
 	private BeanFactory beanFactory;
 
 
+	@Override
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		Map<String, Object> map = importMetadata.getAnnotationAttributes(EnableMBeanExport.class.getName());
 		this.attributes = AnnotationAttributes.fromMap(map);
@@ -63,6 +64,7 @@ public class MBeanExportConfiguration implements ImportAware, BeanFactoryAware {
 				"importing class " + importMetadata.getClassName());
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		this.beanFactory = beanFactory;
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ScannedGenericBeanDefinition.java b/spring-context/src/main/java/org/springframework/context/annotation/ScannedGenericBeanDefinition.java
index b5afe9f6de..7ed9bed6fe 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ScannedGenericBeanDefinition.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ScannedGenericBeanDefinition.java
@@ -61,6 +61,7 @@ public class ScannedGenericBeanDefinition extends GenericBeanDefinition implemen
 	}
 
 
+	@Override
 	public final AnnotationMetadata getMetadata() {
 		return this.metadata;
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java b/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java
index 1a758b60a9..f85d09d0ab 100644
--- a/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java
@@ -30,6 +30,7 @@ import org.springframework.context.annotation.ComponentScanBeanDefinitionParser;
  */
 public class ContextNamespaceHandler extends NamespaceHandlerSupport {
 
+	@Override
 	public void init() {
 		registerBeanDefinitionParser("property-placeholder", new PropertyPlaceholderBeanDefinitionParser());
 		registerBeanDefinitionParser("property-override", new PropertyOverrideBeanDefinitionParser());
diff --git a/spring-context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java
index 98e3c3a025..322d8e6289 100644
--- a/spring-context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java
@@ -43,6 +43,7 @@ class SpringConfiguredBeanDefinitionParser implements BeanDefinitionParser {
 			"org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect";
 
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		if (!parserContext.getRegistry().containsBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME)) {
 			RootBeanDefinition def = new RootBeanDefinition();
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..35a3ed3288 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
@@ -58,6 +58,7 @@ public abstract class AbstractApplicationEventMulticaster implements Application
 	private BeanFactory beanFactory;
 
 
+	@Override
 	public void addApplicationListener(ApplicationListener listener) {
 		synchronized (this.defaultRetriever) {
 			this.defaultRetriever.applicationListeners.add(listener);
@@ -65,6 +66,7 @@ public abstract class AbstractApplicationEventMulticaster implements Application
 		}
 	}
 
+	@Override
 	public void addApplicationListenerBean(String listenerBeanName) {
 		synchronized (this.defaultRetriever) {
 			this.defaultRetriever.applicationListenerBeans.add(listenerBeanName);
@@ -72,6 +74,7 @@ public abstract class AbstractApplicationEventMulticaster implements Application
 		}
 	}
 
+	@Override
 	public void removeApplicationListener(ApplicationListener listener) {
 		synchronized (this.defaultRetriever) {
 			this.defaultRetriever.applicationListeners.remove(listener);
@@ -79,6 +82,7 @@ public abstract class AbstractApplicationEventMulticaster implements Application
 		}
 	}
 
+	@Override
 	public void removeApplicationListenerBean(String listenerBeanName) {
 		synchronized (this.defaultRetriever) {
 			this.defaultRetriever.applicationListenerBeans.remove(listenerBeanName);
@@ -86,6 +90,7 @@ public abstract class AbstractApplicationEventMulticaster implements Application
 		}
 	}
 
+	@Override
 	public void removeAllListeners() {
 		synchronized (this.defaultRetriever) {
 			this.defaultRetriever.applicationListeners.clear();
@@ -94,6 +99,7 @@ public abstract class AbstractApplicationEventMulticaster implements Application
 		}
 	}
 
+	@Override
 	public final void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java b/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java
index ef32c7b6f7..0ff440e34c 100644
--- a/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java
@@ -77,10 +77,12 @@ public class EventPublicationInterceptor
 		}
 	}
 
+	@Override
 	public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
 		this.applicationEventPublisher = applicationEventPublisher;
 	}
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		if (this.applicationEventClassConstructor == null) {
 			throw new IllegalArgumentException("applicationEventClass is required");
@@ -88,6 +90,7 @@ public class EventPublicationInterceptor
 	}
 
 
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		Object retVal = invocation.proceed();
 
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..26fd7dcc58 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
@@ -46,11 +46,13 @@ public class GenericApplicationListenerAdapter implements SmartApplicationListen
 	}
 
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void onApplicationEvent(ApplicationEvent event) {
 		this.delegate.onApplicationEvent(event);
 	}
 
+	@Override
 	public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
 		Class typeArg = GenericTypeResolver.resolveTypeArgument(this.delegate.getClass(), ApplicationListener.class);
 		if (typeArg == null || typeArg.equals(ApplicationEvent.class)) {
@@ -62,10 +64,12 @@ public class GenericApplicationListenerAdapter implements SmartApplicationListen
 		return (typeArg == null || typeArg.isAssignableFrom(eventType));
 	}
 
+	@Override
 	public boolean supportsSourceType(Class<?> sourceType) {
 		return true;
 	}
 
+	@Override
 	public int getOrder() {
 		return (this.delegate instanceof Ordered ? ((Ordered) this.delegate).getOrder() : Ordered.LOWEST_PRECEDENCE);
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
index 2e13855d4a..ebbdae71dc 100644
--- a/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
+++ b/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java
@@ -81,12 +81,14 @@ public class SimpleApplicationEventMulticaster extends AbstractApplicationEventM
 	}
 
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void multicastEvent(final ApplicationEvent event) {
 		for (final ApplicationListener listener : getApplicationListeners(event)) {
 			Executor executor = getTaskExecutor();
 			if (executor != null) {
 				executor.execute(new Runnable() {
+					@Override
 					@SuppressWarnings("unchecked")
 					public void run() {
 						listener.onApplicationEvent(event);
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..ff1f4bb2d1 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
@@ -63,20 +63,24 @@ public class SourceFilteringListener implements SmartApplicationListener {
 	}
 
 
+	@Override
 	public void onApplicationEvent(ApplicationEvent event) {
 		if (event.getSource() == this.source) {
 			onApplicationEventInternal(event);
 		}
 	}
 
+	@Override
 	public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
 		return (this.delegate == null || this.delegate.supportsEventType(eventType));
 	}
 
+	@Override
 	public boolean supportsSourceType(Class<?> sourceType) {
 		return sourceType.isInstance(this.source);
 	}
 
+	@Override
 	public int getOrder() {
 		return (this.delegate != null ? this.delegate.getOrder() : Ordered.LOWEST_PRECEDENCE);
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java
index e81c929e81..167a8f8e10 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java
@@ -32,22 +32,27 @@ import org.springframework.expression.TypedValue;
  */
 public class BeanExpressionContextAccessor implements PropertyAccessor {
 
+	@Override
 	public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 		return ((BeanExpressionContext) target).containsObject(name);
 	}
 
+	@Override
 	public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 		return new TypedValue(((BeanExpressionContext) target).getObject(name));
 	}
 
+	@Override
 	public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 		return false;
 	}
 
+	@Override
 	public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException {
 		throw new AccessException("Beans in a BeanFactory are read-only");
 	}
 
+	@Override
 	public Class[] getSpecificTargetClasses() {
 		return new Class[] {BeanExpressionContext.class};
 	}
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..0aa3414679 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
@@ -32,22 +32,27 @@ import org.springframework.expression.TypedValue;
  */
 public class BeanFactoryAccessor implements PropertyAccessor {
 
+	@Override
 	public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 		return (((BeanFactory) target).containsBean(name));
 	}
 
+	@Override
 	public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 		return new TypedValue(((BeanFactory) target).getBean(name));
 	}
 
+	@Override
 	public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 		return false;
 	}
 
+	@Override
 	public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException {
 		throw new AccessException("Beans in a BeanFactory are read-only");
 	}
 
+	@Override
 	public Class[] getSpecificTargetClasses() {
 		return new Class[] {BeanFactory.class};
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java b/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java
index ff4aaaa78d..0c09e42113 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java
@@ -39,6 +39,7 @@ public class BeanFactoryResolver implements BeanResolver {
 		this.beanFactory = beanFactory;
 	}
 
+	@Override
 	public Object resolve(EvaluationContext context, String beanName) throws AccessException {
 		try {
 			return this.beanFactory.getBean(beanName);
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..3995136a7c 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
@@ -31,6 +31,7 @@ import org.springframework.expression.TypedValue;
  */
 public class EnvironmentAccessor implements PropertyAccessor {
 
+	@Override
 	public Class<?>[] getSpecificTargetClasses() {
 		return new Class[] { Environment.class };
 	}
@@ -39,6 +40,7 @@ public class EnvironmentAccessor implements PropertyAccessor {
 	 * Can read any {@link Environment}, thus always returns true.
 	 * @return true
 	 */
+	@Override
 	public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 		return true;
 	}
@@ -47,6 +49,7 @@ public class EnvironmentAccessor implements PropertyAccessor {
 	 * Access the given target object by resolving the given property name against the given target
 	 * environment.
 	 */
+	@Override
 	public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 		return new TypedValue(((Environment)target).getProperty(name));
 	}
@@ -55,6 +58,7 @@ public class EnvironmentAccessor implements PropertyAccessor {
 	 * Read only.
 	 * @return false
 	 */
+	@Override
 	public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 		return false;
 	}
@@ -62,6 +66,7 @@ public class EnvironmentAccessor implements PropertyAccessor {
 	/**
 	 * Read only. No-op.
 	 */
+	@Override
 	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..7f4de09daf 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
@@ -33,11 +33,13 @@ import org.springframework.expression.TypedValue;
  */
 public class MapAccessor implements PropertyAccessor {
 
+	@Override
 	public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 		Map map = (Map) target;
 		return map.containsKey(name);
 	}
 
+	@Override
 	public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 		Map map = (Map) target;
 		Object value = map.get(name);
@@ -47,16 +49,19 @@ public class MapAccessor implements PropertyAccessor {
 		return new TypedValue(value);
 	}
 
+	@Override
 	public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 		return true;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException {
 		Map map = (Map) target;
 		map.put(name, newValue);
 	}
 
+	@Override
 	public Class[] getSpecificTargetClasses() {
 		return new Class[] {Map.class};
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java b/spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java
index fff09d2da4..b2cecd883e 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java
@@ -66,12 +66,15 @@ public class StandardBeanExpressionResolver implements BeanExpressionResolver {
 			new ConcurrentHashMap<BeanExpressionContext, StandardEvaluationContext>(8);
 
 	private final ParserContext beanExpressionParserContext = new ParserContext() {
+		@Override
 		public boolean isTemplate() {
 			return true;
 		}
+		@Override
 		public String getExpressionPrefix() {
 			return expressionPrefix;
 		}
+		@Override
 		public String getExpressionSuffix() {
 			return expressionSuffix;
 		}
@@ -109,6 +112,7 @@ public class StandardBeanExpressionResolver implements BeanExpressionResolver {
 	}
 
 
+	@Override
 	public Object evaluate(String value, BeanExpressionContext evalContext) throws BeansException {
 		if (!StringUtils.hasLength(value)) {
 			return value;
diff --git a/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java b/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java
index d3848ebe0a..de1246bf0b 100644
--- a/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java
+++ b/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java
@@ -42,6 +42,7 @@ public class SimpleLocaleContext implements LocaleContext {
 		this.locale = locale;
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locale;
 	}
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..8a9001cb00 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
@@ -240,14 +240,17 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * of the context bean if the context is itself defined as a bean.
 	 * @param id the unique id of the context
 	 */
+	@Override
 	public void setId(String id) {
 		this.id = id;
 	}
 
+	@Override
 	public String getId() {
 		return this.id;
 	}
 
+	@Override
 	public String getApplicationName() {
 		return "";
 	}
@@ -266,6 +269,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * Return a friendly name for this context.
 	 * @return a display name for this context (never {@code null})
 	 */
+	@Override
 	public String getDisplayName() {
 		return this.displayName;
 	}
@@ -274,6 +278,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * Return the parent context, or {@code null} if there is no parent
 	 * (that is, this context is the root of the context hierarchy).
 	 */
+	@Override
 	public ApplicationContext getParent() {
 		return this.parent;
 	}
@@ -283,6 +288,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * <p>If {@code null}, a new environment will be initialized via
 	 * {@link #createEnvironment()}.
 	 */
+	@Override
 	public ConfigurableEnvironment getEnvironment() {
 		if (this.environment == null) {
 			this.environment = createEnvironment();
@@ -298,6 +304,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * should be performed <em>before</em> {@link #refresh()}.
 	 * @see org.springframework.context.support.AbstractApplicationContext#createEnvironment
 	 */
+	@Override
 	public void setEnvironment(ConfigurableEnvironment environment) {
 		this.environment = environment;
 	}
@@ -307,6 +314,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * if already available.
 	 * @see #getBeanFactory()
 	 */
+	@Override
 	public AutowireCapableBeanFactory getAutowireCapableBeanFactory() throws IllegalStateException {
 		return getBeanFactory();
 	}
@@ -314,6 +322,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	/**
 	 * Return the timestamp (ms) when this context was first loaded.
 	 */
+	@Override
 	public long getStartupDate() {
 		return this.startupDate;
 	}
@@ -326,6 +335,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * @param event the event to publish (may be application-specific or a
 	 * standard framework event)
 	 */
+	@Override
 	public void publishEvent(ApplicationEvent event) {
 		Assert.notNull(event, "Event must not be null");
 		if (logger.isTraceEnabled()) {
@@ -394,6 +404,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * its environment is an instance of {@link ConfigurableEnvironment}.
 	 * @see ConfigurableEnvironment#merge(ConfigurableEnvironment)
 	 */
+	@Override
 	public void setParent(ApplicationContext parent) {
 		this.parent = parent;
 		if (parent != null) {
@@ -404,6 +415,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 		}
 	}
 
+	@Override
 	public void addBeanFactoryPostProcessor(BeanFactoryPostProcessor beanFactoryPostProcessor) {
 		this.beanFactoryPostProcessors.add(beanFactoryPostProcessor);
 	}
@@ -417,6 +429,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 		return this.beanFactoryPostProcessors;
 	}
 
+	@Override
 	public void addApplicationListener(ApplicationListener<?> listener) {
 		if (this.applicationEventMulticaster != null) {
 			this.applicationEventMulticaster.addApplicationListener(listener);
@@ -442,6 +455,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 		return new StandardEnvironment();
 	}
 
+	@Override
 	public void refresh() throws BeansException, IllegalStateException {
 		synchronized (this.startupShutdownMonitor) {
 			// Prepare this context for refreshing.
@@ -971,6 +985,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * @see #close()
 	 * @see #doClose()
 	 */
+	@Override
 	public void registerShutdownHook() {
 		if (this.shutdownHook == null) {
 			// No shutdown hook registered yet.
@@ -994,6 +1009,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * @see #close()
 	 * @see org.springframework.beans.factory.access.SingletonBeanFactoryLocator
 	 */
+	@Override
 	public void destroy() {
 		close();
 	}
@@ -1005,6 +1021,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * @see #doClose()
 	 * @see #registerShutdownHook()
 	 */
+	@Override
 	public void close() {
 		synchronized (this.startupShutdownMonitor) {
 			doClose();
@@ -1102,6 +1119,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 		// For subclasses: do nothing by default.
 	}
 
+	@Override
 	public boolean isActive() {
 		synchronized (this.activeMonitor) {
 			return this.active;
@@ -1113,42 +1131,52 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	// Implementation of BeanFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public Object getBean(String name) throws BeansException {
 		return getBeanFactory().getBean(name);
 	}
 
+	@Override
 	public <T> T getBean(String name, Class<T> requiredType) throws BeansException {
 		return getBeanFactory().getBean(name, requiredType);
 	}
 
+	@Override
 	public <T> T getBean(Class<T> requiredType) throws BeansException {
 		return getBeanFactory().getBean(requiredType);
 	}
 
+	@Override
 	public Object getBean(String name, Object... args) throws BeansException {
 		return getBeanFactory().getBean(name, args);
 	}
 
+	@Override
 	public boolean containsBean(String name) {
 		return getBeanFactory().containsBean(name);
 	}
 
+	@Override
 	public boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
 		return getBeanFactory().isSingleton(name);
 	}
 
+	@Override
 	public boolean isPrototype(String name) throws NoSuchBeanDefinitionException {
 		return getBeanFactory().isPrototype(name);
 	}
 
+	@Override
 	public boolean isTypeMatch(String name, Class<?> targetType) throws NoSuchBeanDefinitionException {
 		return getBeanFactory().isTypeMatch(name, targetType);
 	}
 
+	@Override
 	public Class<?> getType(String name) throws NoSuchBeanDefinitionException {
 		return getBeanFactory().getType(name);
 	}
 
+	@Override
 	public String[] getAliases(String name) {
 		return getBeanFactory().getAliases(name);
 	}
@@ -1158,42 +1186,51 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	// Implementation of ListableBeanFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public boolean containsBeanDefinition(String beanName) {
 		return getBeanFactory().containsBeanDefinition(beanName);
 	}
 
+	@Override
 	public int getBeanDefinitionCount() {
 		return getBeanFactory().getBeanDefinitionCount();
 	}
 
+	@Override
 	public String[] getBeanDefinitionNames() {
 		return getBeanFactory().getBeanDefinitionNames();
 	}
 
+	@Override
 	public String[] getBeanNamesForType(Class<?> type) {
 		return getBeanFactory().getBeanNamesForType(type);
 	}
 
+	@Override
 	public String[] getBeanNamesForType(Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {
 		return getBeanFactory().getBeanNamesForType(type, includeNonSingletons, allowEagerInit);
 	}
 
+	@Override
 	public <T> Map<String, T> getBeansOfType(Class<T> type) throws BeansException {
 		return getBeanFactory().getBeansOfType(type);
 	}
 
+	@Override
 	public <T> Map<String, T> getBeansOfType(Class<T> type, boolean includeNonSingletons, boolean allowEagerInit)
 			throws BeansException {
 
 		return getBeanFactory().getBeansOfType(type, includeNonSingletons, allowEagerInit);
 	}
 
+	@Override
 	public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> annotationType)
 			throws BeansException {
 
 		return getBeanFactory().getBeansWithAnnotation(annotationType);
 	}
 
+	@Override
 	public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType) {
 		return getBeanFactory().findAnnotationOnBean(beanName, annotationType);
 	}
@@ -1203,10 +1240,12 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	// Implementation of HierarchicalBeanFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public BeanFactory getParentBeanFactory() {
 		return getParent();
 	}
 
+	@Override
 	public boolean containsLocalBean(String name) {
 		return getBeanFactory().containsLocalBean(name);
 	}
@@ -1226,14 +1265,17 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	// Implementation of MessageSource interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public String getMessage(String code, Object args[], String defaultMessage, Locale locale) {
 		return getMessageSource().getMessage(code, args, defaultMessage, locale);
 	}
 
+	@Override
 	public String getMessage(String code, Object args[], Locale locale) throws NoSuchMessageException {
 		return getMessageSource().getMessage(code, args, locale);
 	}
 
+	@Override
 	public String getMessage(MessageSourceResolvable resolvable, Locale locale) throws NoSuchMessageException {
 		return getMessageSource().getMessage(resolvable, locale);
 	}
@@ -1265,6 +1307,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	// Implementation of ResourcePatternResolver interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public Resource[] getResources(String locationPattern) throws IOException {
 		return this.resourcePatternResolver.getResources(locationPattern);
 	}
@@ -1274,16 +1317,19 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	// Implementation of Lifecycle interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public void start() {
 		getLifecycleProcessor().start();
 		publishEvent(new ContextStartedEvent(this));
 	}
 
+	@Override
 	public void stop() {
 		getLifecycleProcessor().stop();
 		publishEvent(new ContextStoppedEvent(this));
 	}
 
+	@Override
 	public boolean isRunning() {
 		return getLifecycleProcessor().isRunning();
 	}
@@ -1325,6 +1371,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 	 * @see #refreshBeanFactory()
 	 * @see #closeBeanFactory()
 	 */
+	@Override
 	public abstract ConfigurableListableBeanFactory getBeanFactory() throws IllegalStateException;
 
 
@@ -1363,10 +1410,12 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 			this.beanPostProcessorTargetCount = beanPostProcessorTargetCount;
 		}
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) {
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String beanName) {
 			if (bean != null && !(bean instanceof BeanPostProcessor) &&
 					this.beanFactory.getBeanPostProcessorCount() < this.beanPostProcessorTargetCount) {
@@ -1389,16 +1438,19 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 
 		private final Map<String, Boolean> singletonNames = new ConcurrentHashMap<String, Boolean>(64);
 
+		@Override
 		public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
 			if (beanDefinition.isSingleton()) {
 				this.singletonNames.put(beanName, Boolean.TRUE);
 			}
 		}
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) {
 			return bean;
 		}
 
+		@Override
 		public Object postProcessAfterInitialization(Object bean, String beanName) {
 			if (bean instanceof ApplicationListener) {
 				// potentially not detected as a listener by getBeanNamesForType retrieval
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java
index 768c963d3b..87209ec95a 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java
@@ -67,10 +67,12 @@ public abstract class AbstractMessageSource extends MessageSourceSupport impleme
 	private boolean useCodeAsDefaultMessage = false;
 
 
+	@Override
 	public void setParentMessageSource(MessageSource parent) {
 		this.parentMessageSource = parent;
 	}
 
+	@Override
 	public MessageSource getParentMessageSource() {
 		return this.parentMessageSource;
 	}
@@ -109,6 +111,7 @@ public abstract class AbstractMessageSource extends MessageSourceSupport impleme
 	}
 
 
+	@Override
 	public final String getMessage(String code, Object[] args, String defaultMessage, Locale locale) {
 		String msg = getMessageInternal(code, args, locale);
 		if (msg != null) {
@@ -123,6 +126,7 @@ public abstract class AbstractMessageSource extends MessageSourceSupport impleme
 		return renderDefaultMessage(defaultMessage, args, locale);
 	}
 
+	@Override
 	public final String getMessage(String code, Object[] args, Locale locale) throws NoSuchMessageException {
 		String msg = getMessageInternal(code, args, locale);
 		if (msg != null) {
@@ -135,6 +139,7 @@ public abstract class AbstractMessageSource extends MessageSourceSupport impleme
 		throw new NoSuchMessageException(code, locale);
 	}
 
+	@Override
 	public final String getMessage(MessageSourceResolvable resolvable, Locale locale)
 			throws NoSuchMessageException {
 
diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java
index 138f45526c..3004d68c22 100644
--- a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java
@@ -133,6 +133,7 @@ public abstract class AbstractRefreshableConfigApplicationContext extends Abstra
 	 * Sets the id of this context to the bean name by default,
 	 * for cases where the context instance is itself defined as a bean.
 	 */
+	@Override
 	public void setBeanName(String name) {
 		if (!this.setIdCalled) {
 			super.setId(name);
@@ -144,6 +145,7 @@ public abstract class AbstractRefreshableConfigApplicationContext extends Abstra
 	 * Triggers {@link #refresh()} if not refreshed in the concrete context's
 	 * constructor already.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		if (!isActive()) {
 			refresh();
diff --git a/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
index e88b26799c..2a521b3b64 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java
@@ -70,6 +70,7 @@ class ApplicationContextAwareProcessor implements BeanPostProcessor {
 	}
 
 
+	@Override
 	public Object postProcessBeforeInitialization(final Object bean, String beanName) throws BeansException {
 		AccessControlContext acc = null;
 
@@ -82,6 +83,7 @@ class ApplicationContextAwareProcessor implements BeanPostProcessor {
 
 		if (acc != null) {
 			AccessController.doPrivileged(new PrivilegedAction<Object>() {
+				@Override
 				public Object run() {
 					invokeAwareInterfaces(bean);
 					return null;
@@ -119,6 +121,7 @@ class ApplicationContextAwareProcessor implements BeanPostProcessor {
 		}
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) {
 		return bean;
 	}
@@ -132,6 +135,7 @@ class ApplicationContextAwareProcessor implements BeanPostProcessor {
 			this.beanFactory = beanFactory;
 		}
 
+		@Override
 		public String resolveStringValue(String strVal) {
 			return this.beanFactory.resolveEmbeddedValue(strVal);
 		}
diff --git a/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
index ebee90cc03..e3bb18e49c 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java
@@ -56,6 +56,7 @@ public abstract class ApplicationObjectSupport implements ApplicationContextAwar
 	private MessageSourceAccessor messageSourceAccessor;
 
 
+	@Override
 	public final void setApplicationContext(ApplicationContext context) throws BeansException {
 		if (context == null && !isContextRequired()) {
 			// Reset internal context state.
diff --git a/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java b/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java
index f81020673d..9cdff9d621 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java
@@ -63,6 +63,7 @@ class ContextTypeMatchClassLoader extends DecoratingClassLoader implements Smart
 		return new ContextOverridingClassLoader(getParent()).loadClass(name);
 	}
 
+	@Override
 	public boolean isClassReloadable(Class clazz) {
 		return (clazz.getClassLoader() instanceof ContextOverridingClassLoader);
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java b/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
index 95b40263ed..5cf2e81746 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java
@@ -64,6 +64,7 @@ public class ConversionServiceFactoryBean implements FactoryBean<ConversionServi
 		this.converters = converters;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		this.conversionService = createConversionService();
 		ConversionServiceFactory.registerConverters(this.converters, this.conversionService);
@@ -82,14 +83,17 @@ public class ConversionServiceFactoryBean implements FactoryBean<ConversionServi
 
 	// implementing FactoryBean
 
+	@Override
 	public ConversionService getObject() {
 		return this.conversionService;
 	}
 
+	@Override
 	public Class<? extends ConversionService> getObjectType() {
 		return GenericConversionService.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java b/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
index 025f4cfb96..a443d13b8b 100644
--- a/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
@@ -68,6 +68,7 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
 		this.timeoutPerShutdownPhase = timeoutPerShutdownPhase;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		Assert.isInstanceOf(ConfigurableListableBeanFactory.class, beanFactory);
 		this.beanFactory = (ConfigurableListableBeanFactory) beanFactory;
@@ -85,6 +86,7 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
 	 * declared as a dependency of another bean will be started before
 	 * the dependent bean regardless of the declared phase.
 	 */
+	@Override
 	public void start() {
 		startBeans(false);
 		this.running = true;
@@ -99,21 +101,25 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
 	 * declared as dependent on another bean will be stopped before
 	 * the dependency bean regardless of the declared phase.
 	 */
+	@Override
 	public void stop() {
 		stopBeans();
 		this.running = false;
 	}
 
+	@Override
 	public void onRefresh() {
 		startBeans(true);
 		this.running = true;
 	}
 
+	@Override
 	public void onClose() {
 		stopBeans();
 		this.running = false;
 	}
 
+	@Override
 	public boolean isRunning() {
 		return this.running;
 	}
@@ -221,6 +227,7 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
 						}
 						countDownBeanNames.add(beanName);
 						((SmartLifecycle) bean).stop(new Runnable() {
+							@Override
 							public void run() {
 								latch.countDown();
 								countDownBeanNames.remove(beanName);
@@ -389,6 +396,7 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
 			this.bean = bean;
 		}
 
+		@Override
 		public int compareTo(LifecycleGroupMember other) {
 			int thisOrder = getPhase(this.bean);
 			int otherOrder = getPhase(other.bean);
diff --git a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
index e668c4e736..e688b5009d 100644
--- a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
+++ b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java
@@ -96,6 +96,7 @@ public class DefaultMessageSourceResolvable implements MessageSourceResolvable,
 	}
 
 
+	@Override
 	public String[] getCodes() {
 		return this.codes;
 	}
@@ -108,10 +109,12 @@ public class DefaultMessageSourceResolvable implements MessageSourceResolvable,
 		return (this.codes != null && this.codes.length > 0) ? this.codes[this.codes.length - 1] : null;
 	}
 
+	@Override
 	public Object[] getArguments() {
 		return this.arguments;
 	}
 
+	@Override
 	public String getDefaultMessage() {
 		return this.defaultMessage;
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java
index c42e38d5ea..7ca94b6400 100644
--- a/spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java
@@ -39,15 +39,18 @@ public class DelegatingMessageSource extends MessageSourceSupport implements Hie
 	private MessageSource parentMessageSource;
 
 
+	@Override
 	public void setParentMessageSource(MessageSource parent) {
 		this.parentMessageSource = parent;
 	}
 
+	@Override
 	public MessageSource getParentMessageSource() {
 		return this.parentMessageSource;
 	}
 
 
+	@Override
 	public String getMessage(String code, Object[] args, String defaultMessage, Locale locale) {
 		if (this.parentMessageSource != null) {
 			return this.parentMessageSource.getMessage(code, args, defaultMessage, locale);
@@ -57,6 +60,7 @@ public class DelegatingMessageSource extends MessageSourceSupport implements Hie
 		}
 	}
 
+	@Override
 	public String getMessage(String code, Object[] args, Locale locale) throws NoSuchMessageException {
 		if (this.parentMessageSource != null) {
 			return this.parentMessageSource.getMessage(code, args, locale);
@@ -66,6 +70,7 @@ public class DelegatingMessageSource extends MessageSourceSupport implements Hie
 		}
 	}
 
+	@Override
 	public String getMessage(MessageSourceResolvable resolvable, Locale locale) throws NoSuchMessageException {
 		if (this.parentMessageSource != null) {
 			return this.parentMessageSource.getMessage(resolvable, locale);
diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
index 7c3d8bcc11..01f175abe3 100644
--- a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
+++ b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
@@ -286,32 +286,39 @@ public class GenericApplicationContext extends AbstractApplicationContext implem
 	// Implementation of BeanDefinitionRegistry
 	//---------------------------------------------------------------------
 
+	@Override
 	public void registerBeanDefinition(String beanName, BeanDefinition beanDefinition)
 			throws BeanDefinitionStoreException {
 
 		this.beanFactory.registerBeanDefinition(beanName, beanDefinition);
 	}
 
+	@Override
 	public void removeBeanDefinition(String beanName) throws NoSuchBeanDefinitionException {
 		this.beanFactory.removeBeanDefinition(beanName);
 	}
 
+	@Override
 	public BeanDefinition getBeanDefinition(String beanName) throws NoSuchBeanDefinitionException {
 		return this.beanFactory.getBeanDefinition(beanName);
 	}
 
+	@Override
 	public boolean isBeanNameInUse(String beanName) {
 		return this.beanFactory.isBeanNameInUse(beanName);
 	}
 
+	@Override
 	public void registerAlias(String beanName, String alias) {
 		this.beanFactory.registerAlias(beanName, alias);
 	}
 
+	@Override
 	public void removeAlias(String alias) {
 		this.beanFactory.removeAlias(alias);
 	}
 
+	@Override
 	public boolean isAlias(String beanName) {
 		return this.beanFactory.isAlias(beanName);
 	}
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..bf20ae1017 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
@@ -93,6 +93,7 @@ public class LiveBeansView implements LiveBeansViewMBean, ApplicationContextAwar
 
 	private ConfigurableApplicationContext applicationContext;
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
 		Assert.isTrue(applicationContext instanceof ConfigurableApplicationContext,
 				"ApplicationContext does not implement ConfigurableApplicationContext");
@@ -105,6 +106,7 @@ public class LiveBeansView implements LiveBeansViewMBean, ApplicationContextAwar
 	 * finding all active ApplicationContexts through {@link #findApplicationContexts()},
 	 * then delegating to {@link #generateJson(java.util.Set)}.
 	 */
+	@Override
 	public String getSnapshotAsJson() {
 		Set<ConfigurableApplicationContext> contexts;
 		if (this.applicationContext != null) {
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..d39c7d3d5b 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
@@ -98,6 +98,7 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
 	 * @see #setPropertySources
 	 * @see #postProcessBeanFactory
 	 */
+	@Override
 	public void setEnvironment(Environment environment) {
 		this.environment = environment;
 	}
@@ -163,6 +164,7 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
 		propertyResolver.setValueSeparator(this.valueSeparator);
 
 		StringValueResolver valueResolver = new StringValueResolver() {
+			@Override
 			public String resolveStringValue(String strVal) {
 				String resolved = ignoreUnresolvablePlaceholders ?
 						propertyResolver.resolvePlaceholders(strVal) :
diff --git a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
index e428c760b9..14b831c098 100644
--- a/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java
@@ -250,6 +250,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractMessageSource
 	 * @see org.springframework.core.io.DefaultResourceLoader
 	 * @see org.springframework.context.ResourceLoaderAware
 	 */
+	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.resourceLoader = (resourceLoader != null ? resourceLoader : new DefaultResourceLoader());
 	}
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 eeca86a108..b11f8b2649 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
@@ -223,6 +223,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement
 		return (this.bundleClassLoader != null ? this.bundleClassLoader : this.beanClassLoader);
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = (classLoader != null ? classLoader : ClassUtils.getDefaultClassLoader());
 	}
@@ -431,6 +432,7 @@ public class ResourceBundleMessageSource extends AbstractMessageSource implement
 				try {
 					stream = AccessController.doPrivileged(
 							new PrivilegedExceptionAction<InputStream>() {
+								@Override
 								public InputStream run() throws IOException {
 									InputStream is = null;
 									if (reloadFlag) {
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..0feb05443e 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
@@ -55,6 +55,7 @@ public class SimpleThreadScope implements Scope {
 				}
 			};
 
+	@Override
 	public Object get(String name, ObjectFactory objectFactory) {
 		Map<String, Object> scope = threadScope.get();
 		Object object = scope.get(name);
@@ -65,20 +66,24 @@ public class SimpleThreadScope implements Scope {
 		return object;
 	}
 
+	@Override
 	public Object remove(String name) {
 		Map<String, Object> scope = threadScope.get();
 		return scope.remove(name);
 	}
 
+	@Override
 	public void registerDestructionCallback(String name, Runnable callback) {
 		logger.warn("SimpleThreadScope does not support descruction callbacks. " +
 				"Consider using a RequestScope in a Web environment.");
 	}
 
+	@Override
 	public Object resolveContextualObject(String key) {
 		return null;
 	}
 
+	@Override
 	public String getConversationId() {
 		return Thread.currentThread().getName();
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/weaving/AspectJWeavingEnabler.java b/spring-context/src/main/java/org/springframework/context/weaving/AspectJWeavingEnabler.java
index e659b94179..069509d259 100644
--- a/spring-context/src/main/java/org/springframework/context/weaving/AspectJWeavingEnabler.java
+++ b/spring-context/src/main/java/org/springframework/context/weaving/AspectJWeavingEnabler.java
@@ -50,18 +50,22 @@ public class AspectJWeavingEnabler
 	public static final String ASPECTJ_AOP_XML_RESOURCE = "META-INF/aop.xml";
 
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
 
+	@Override
 	public void setLoadTimeWeaver(LoadTimeWeaver loadTimeWeaver) {
 		this.loadTimeWeaver = loadTimeWeaver;
 	}
 
+	@Override
 	public int getOrder() {
 		return HIGHEST_PRECEDENCE;
 	}
 
+	@Override
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 		enableAspectJWeaving(this.loadTimeWeaver, this.beanClassLoader);
 	}
@@ -95,6 +99,7 @@ public class AspectJWeavingEnabler
 			this.delegate = delegate;
 		}
 
+		@Override
 		public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
 				ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
 
diff --git a/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
index b93c8b2df5..93f82eefae 100644
--- a/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
@@ -70,6 +70,7 @@ public class DefaultContextLoadTimeWeaver implements LoadTimeWeaver, BeanClassLo
 		setBeanClassLoader(beanClassLoader);
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		LoadTimeWeaver serverSpecificLoadTimeWeaver = createServerSpecificLoadTimeWeaver(classLoader);
 		if (serverSpecificLoadTimeWeaver != null) {
@@ -130,6 +131,7 @@ public class DefaultContextLoadTimeWeaver implements LoadTimeWeaver, BeanClassLo
 		return null;
 	}
 
+	@Override
 	public void destroy() {
 		if (this.loadTimeWeaver instanceof InstrumentationLoadTimeWeaver) {
 			logger.info("Removing all registered transformers for class loader: " +
@@ -139,14 +141,17 @@ public class DefaultContextLoadTimeWeaver implements LoadTimeWeaver, BeanClassLo
 	}
 
 
+	@Override
 	public void addTransformer(ClassFileTransformer transformer) {
 		this.loadTimeWeaver.addTransformer(transformer);
 	}
 
+	@Override
 	public ClassLoader getInstrumentableClassLoader() {
 		return this.loadTimeWeaver.getInstrumentableClassLoader();
 	}
 
+	@Override
 	public ClassLoader getThrowawayClassLoader() {
 		return this.loadTimeWeaver.getThrowawayClassLoader();
 	}
diff --git a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java
index d2c704f1a5..7509b8beff 100644
--- a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java
@@ -81,11 +81,13 @@ public class LoadTimeWeaverAwareProcessor implements BeanPostProcessor, BeanFact
 	}
 
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		if (bean instanceof LoadTimeWeaverAware) {
 			LoadTimeWeaver ltw = this.loadTimeWeaver;
@@ -100,6 +102,7 @@ public class LoadTimeWeaverAwareProcessor implements BeanPostProcessor, BeanFact
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String name) {
 		return bean;
 	}
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
index 8a12977c8a..77e88a8c42 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java
@@ -183,6 +183,7 @@ public abstract class AbstractSlsbInvokerInterceptor extends JndiObjectLocator
 	 * Prepares the thread context if necessar, and delegates to
 	 * {@link #invokeInContext}.
 	 */
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		Context ctx = (this.exposeAccessContext ? getJndiTemplate().getContext() : null);
 		try {
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
index c824d4c917..ca4d245ff4 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java
@@ -77,6 +77,7 @@ public class LocalStatelessSessionProxyFactoryBean extends LocalSlsbInvokerInter
 		return this.businessInterface;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
@@ -91,14 +92,17 @@ public class LocalStatelessSessionProxyFactoryBean extends LocalSlsbInvokerInter
 	}
 
 
+	@Override
 	public Object getObject() {
 		return this.proxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return this.businessInterface;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
index ce39ce9a6c..89bc055415 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java
@@ -171,6 +171,7 @@ public class SimpleRemoteSlsbInvokerInterceptor extends AbstractRemoteSlsbInvoke
 	/**
 	 * Remove the cached session bean instance, if necessary.
 	 */
+	@Override
 	public void destroy() {
 		if (this.cacheSessionBean) {
 			synchronized (this.beanInstanceMonitor) {
diff --git a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
index de6a45b1fe..ff40f71ba4 100644
--- a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java
@@ -91,6 +91,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBean extends SimpleRemoteSl
 		return this.businessInterface;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
@@ -105,14 +106,17 @@ public class SimpleRemoteStatelessSessionProxyFactoryBean extends SimpleRemoteSl
 	}
 
 
+	@Override
 	public Object getObject() {
 		return this.proxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return this.businessInterface;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java b/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java
index 2e106d8ed0..0cbdc2ff8d 100644
--- a/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java
@@ -27,6 +27,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  */
 public class JeeNamespaceHandler extends NamespaceHandlerSupport {
 
+	@Override
 	public void init() {
 		registerBeanDefinitionParser("jndi-lookup", new JndiLookupBeanDefinitionParser());
 		registerBeanDefinitionParser("local-slsb", new LocalStatelessSessionBeanDefinitionParser());
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
index aaa6f7adff..729a0a991e 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java
@@ -187,6 +187,7 @@ public abstract class AbstractEnterpriseBean implements EnterpriseBean {
 			this.beanFactoryReference = beanFactoryReference;
 		}
 
+		@Override
 		public void released() {
 			this.beanFactoryReference.release();
 		}
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
index bbfc158cbb..897bec18f8 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java
@@ -57,6 +57,7 @@ public abstract class AbstractMessageDrivenBean extends AbstractEnterpriseBean
 	 * Required lifecycle method. Sets the MessageDriven context.
 	 * @param messageDrivenContext MessageDrivenContext
 	 */
+	@Override
 	public void setMessageDrivenContext(MessageDrivenContext messageDrivenContext) {
 		this.messageDrivenContext = messageDrivenContext;
 	}
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java
index 5f4e2770b7..1a4a065746 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java
@@ -42,6 +42,7 @@ public abstract class AbstractSessionBean extends AbstractEnterpriseBean impleme
 	 * Set the session context for this EJB.
 	 * <p><b>When overriding this method, be sure to invoke this form of it first.</b>
 	 */
+	@Override
 	public void setSessionContext(SessionContext sessionContext) {
 		this.sessionContext = sessionContext;
 	}
@@ -50,6 +51,7 @@ public abstract class AbstractSessionBean extends AbstractEnterpriseBean impleme
 	 * Convenience method for subclasses, returning the EJB session context
 	 * saved on initialization ({@link #setSessionContext}).
 	 */
+	@Override
 	public final SessionContext getSessionContext() {
 		return this.sessionContext;
 	}
diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
index ee013df6cb..554b5b6405 100644
--- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
+++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java
@@ -85,6 +85,7 @@ public abstract class AbstractStatelessSessionBean extends AbstractSessionBean {
 	 * This method always throws an exception, as it should not be invoked by the EJB container.
 	 * @see javax.ejb.SessionBean#ejbActivate()
 	 */
+	@Override
 	public void ejbActivate() throws EJBException {
 		throw new IllegalStateException("ejbActivate must not be invoked on a stateless session bean");
 	}
@@ -93,6 +94,7 @@ public abstract class AbstractStatelessSessionBean extends AbstractSessionBean {
 	 * This method always throws an exception, as it should not be invoked by the EJB container.
 	 * @see javax.ejb.SessionBean#ejbPassivate()
 	 */
+	@Override
 	public void ejbPassivate() throws EJBException {
 		throw new IllegalStateException("ejbPassivate must not be invoked on a stateless session bean");
 	}
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..15b913b3ad 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
@@ -145,10 +145,12 @@ public class DateFormatter implements Formatter<Date> {
 	}
 
 
+	@Override
 	public String print(Date date, Locale locale) {
 		return getDateFormat(locale).format(date);
 	}
 
+	@Override
 	public Date parse(String text, Locale locale) throws ParseException {
 		return getDateFormat(locale).parse(text);
 	}
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 eb413a6ea7..e9591ac152 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
@@ -43,6 +43,7 @@ public class DateFormatterRegistrar implements FormatterRegistrar {
 	private DateFormatter dateFormatter = new DateFormatter();
 
 
+	@Override
 	public void registerFormatters(FormatterRegistry registry) {
 		addDateConverters(registry);
 		registry.addFormatter(dateFormatter);
@@ -76,6 +77,7 @@ public class DateFormatterRegistrar implements FormatterRegistrar {
 
 
 	private static class DateToLongConverter implements Converter<Date, Long> {
+		@Override
 		public Long convert(Date source) {
 			return source.getTime();
 		}
@@ -83,6 +85,7 @@ public class DateFormatterRegistrar implements FormatterRegistrar {
 
 
 	private static class DateToCalendarConverter implements Converter<Date, Calendar> {
+		@Override
 		public Calendar convert(Date source) {
 			Calendar calendar = Calendar.getInstance();
 			calendar.setTime(source);
@@ -92,6 +95,7 @@ public class DateFormatterRegistrar implements FormatterRegistrar {
 
 
 	private static class CalendarToDateConverter implements Converter<Calendar, Date> {
+		@Override
 		public Date convert(Calendar source) {
 			return source.getTime();
 		}
@@ -99,6 +103,7 @@ public class DateFormatterRegistrar implements FormatterRegistrar {
 
 
 	private static class CalendarToLongConverter implements Converter<Calendar, Long> {
+		@Override
 		public Long convert(Calendar source) {
 			return source.getTime().getTime();
 		}
@@ -106,6 +111,7 @@ public class DateFormatterRegistrar implements FormatterRegistrar {
 
 
 	private static class LongToDateConverter implements Converter<Long, Date> {
+		@Override
 		public Date convert(Long source) {
 			return new Date(source);
 		}
@@ -116,6 +122,7 @@ public class DateFormatterRegistrar implements FormatterRegistrar {
 
 		private DateToCalendarConverter dateToCalendarConverter = new DateToCalendarConverter();
 
+		@Override
 		public Calendar convert(Long source) {
 			return dateToCalendarConverter.convert(new Date(source));
 		}
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..bd7928ba55 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
@@ -55,18 +55,22 @@ public class DateTimeFormatAnnotationFormatterFactory implements
 	private StringValueResolver embeddedValueResolver;
 
 
+	@Override
 	public void setEmbeddedValueResolver(StringValueResolver resolver) {
 		this.embeddedValueResolver = resolver;
 	}
 
+	@Override
 	public Set<Class<?>> getFieldTypes() {
 		return FIELD_TYPES;
 	}
 
+	@Override
 	public Printer<?> getPrinter(DateTimeFormat annotation, Class<?> fieldType) {
 		return getFormatter(annotation, fieldType);
 	}
 
+	@Override
 	public Parser<?> getParser(DateTimeFormat annotation, Class<?> fieldType) {
 		return getFormatter(annotation, fieldType);
 	}
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..b7010b8924 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
@@ -39,18 +39,22 @@ public class DateTimeFormatterFactoryBean extends DateTimeFormatterFactory
 	private DateTimeFormatter dateTimeFormatter;
 
 
+	@Override
 	public void afterPropertiesSet() {
 		this.dateTimeFormatter = createDateTimeFormatter();
 	}
 
+	@Override
 	public DateTimeFormatter getObject() {
 		return this.dateTimeFormatter;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return DateTimeFormatter.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java
index 48f8d46c42..8dd1903870 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java
@@ -42,6 +42,7 @@ public final class DateTimeParser implements Parser<DateTime> {
 		this.formatter = formatter;
 	}
 
+	@Override
 	public DateTime parse(String text, Locale locale) throws ParseException {
 		return JodaTimeContextHolder.getFormatter(this.formatter, locale).parseDateTime(text);
 	}
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..f161939942 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
@@ -71,10 +71,12 @@ public class JodaDateTimeFormatAnnotationFormatterFactory
 	private StringValueResolver embeddedValueResolver;
 
 
+	@Override
 	public final Set<Class<?>> getFieldTypes() {
 		return FIELD_TYPES;
 	}
 
+	@Override
 	public void setEmbeddedValueResolver(StringValueResolver resolver) {
 		this.embeddedValueResolver = resolver;
 	}
@@ -83,6 +85,7 @@ public class JodaDateTimeFormatAnnotationFormatterFactory
 		return (this.embeddedValueResolver != null ? this.embeddedValueResolver.resolveStringValue(value) : value);
 	}
 
+	@Override
 	public Printer<?> getPrinter(DateTimeFormat annotation, Class<?> fieldType) {
 		DateTimeFormatter formatter = getFormatter(annotation, fieldType);
 		if (ReadableInstant.class.isAssignableFrom(fieldType)) {
@@ -99,6 +102,7 @@ public class JodaDateTimeFormatAnnotationFormatterFactory
 		return new MillisecondInstantPrinter(formatter);
 	}
 
+	@Override
 	public Parser<DateTime> getParser(DateTimeFormat annotation, Class<?> fieldType) {
 		return new DateTimeParser(getFormatter(annotation, fieldType));
 	}
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 6943ad4241..ef214dccb8 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
@@ -63,6 +63,7 @@ final class JodaTimeConverters {
 	 * @see DateTimeParser
 	 **/
 	private static class DateTimeToLocalDateConverter implements Converter<DateTime, LocalDate> {
+		@Override
 		public LocalDate convert(DateTime source) {
 			return source.toLocalDate();
 		}
@@ -73,6 +74,7 @@ final class JodaTimeConverters {
 	 * @see DateTimeParser
 	 */
 	private static class DateTimeToLocalTimeConverter implements Converter<DateTime, LocalTime> {
+		@Override
 		public LocalTime convert(DateTime source) {
 			return source.toLocalTime();
 		}
@@ -83,6 +85,7 @@ final class JodaTimeConverters {
 	 * @see DateTimeParser
 	 */
 	private static class DateTimeToLocalDateTimeConverter implements Converter<DateTime, LocalDateTime> {
+		@Override
 		public LocalDateTime convert(DateTime source) {
 			return source.toLocalDateTime();
 		}
@@ -93,6 +96,7 @@ final class JodaTimeConverters {
 	 * @see DateTimeParser
 	 */
 	private static class DateTimeToDateMidnightConverter implements Converter<DateTime, DateMidnight> {
+		@Override
 		public DateMidnight convert(DateTime source) {
 			return source.toDateMidnight();
 		}
@@ -103,6 +107,7 @@ final class JodaTimeConverters {
 	 * @see DateTimeParser
 	 */
 	private static class DateTimeToInstantConverter implements Converter<DateTime, Instant> {
+		@Override
 		public Instant convert(DateTime source) {
 			return source.toInstant();
 		}
@@ -113,6 +118,7 @@ final class JodaTimeConverters {
 	 * @see DateTimeParser
 	 */
 	private static class DateTimeToMutableDateTimeConverter implements Converter<DateTime, MutableDateTime> {
+		@Override
 		public MutableDateTime convert(DateTime source) {
 			return source.toMutableDateTime();
 		}
@@ -123,6 +129,7 @@ final class JodaTimeConverters {
 	 * @see DateTimeParser
 	 */
 	private static class DateTimeToDateConverter implements Converter<DateTime, Date> {
+		@Override
 		public Date convert(DateTime source) {
 			return source.toDate();
 		}
@@ -133,6 +140,7 @@ final class JodaTimeConverters {
 	 * @see DateTimeParser
 	 */
 	private static class DateTimeToCalendarConverter implements Converter<DateTime, Calendar> {
+		@Override
 		public Calendar convert(DateTime source) {
 			return source.toGregorianCalendar();
 		}
@@ -143,6 +151,7 @@ final class JodaTimeConverters {
 	 * @see DateTimeParser
 	 */
 	private static class DateTimeToLongConverter implements Converter<DateTime, Long> {
+		@Override
 		public Long convert(DateTime source) {
 			return source.getMillis();
 		}
@@ -154,6 +163,7 @@ final class JodaTimeConverters {
 	 * @see JodaDateTimeFormatAnnotationFormatterFactory
 	 */
 	private static class CalendarToReadableInstantConverter implements Converter<Calendar, ReadableInstant> {
+		@Override
 		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 51d9f9684b..fbf01be973 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
@@ -149,6 +149,7 @@ public class JodaTimeFormatterRegistrar implements FormatterRegistrar {
 		this.formatters.put(Type.DATE_TIME, formatter);
 	}
 
+	@Override
 	public void registerFormatters(FormatterRegistry registry) {
 		JodaTimeConverters.registerConverters(registry);
 
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java
index d7b22e71f0..319463877c 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java
@@ -40,6 +40,7 @@ public final class MillisecondInstantPrinter implements Printer<Long> {
 		this.formatter = formatter;
 	}
 
+	@Override
 	public String print(Long instant, Locale locale) {
 		return JodaTimeContextHolder.getFormatter(this.formatter, locale).print(instant);
 	}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java
index 8cf404fcad..09d62b2532 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java
@@ -40,6 +40,7 @@ public final class ReadableInstantPrinter implements Printer<ReadableInstant> {
 		this.formatter = formatter;
 	}
 
+	@Override
 	public String print(ReadableInstant instant, Locale locale) {
 		return JodaTimeContextHolder.getFormatter(this.formatter, locale).print(instant);
 	}
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java
index 9ad97c2058..50a871ed50 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java
@@ -41,6 +41,7 @@ public final class ReadablePartialPrinter implements Printer<ReadablePartial> {
 		this.formatter = formatter;
 	}
 
+	@Override
 	public String print(ReadablePartial partial, Locale locale) {
 		return JodaTimeContextHolder.getFormatter(this.formatter, locale).print(partial);
 	}
diff --git a/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java b/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java
index da34f935bc..aa9e85177a 100644
--- a/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java
+++ b/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java
@@ -44,10 +44,12 @@ public abstract class AbstractNumberFormatter implements Formatter<Number> {
 		this.lenient = lenient;
 	}
 
+	@Override
 	public String print(Number number, Locale locale) {
 		return getNumberFormat(locale).format(number);
 	}
 
+	@Override
 	public Number parse(String text, Locale locale) throws ParseException {
 		NumberFormat format = getNumberFormat(locale);
 		ParsePosition position = new ParsePosition(0);
diff --git a/spring-context/src/main/java/org/springframework/format/number/CurrencyFormatter.java b/spring-context/src/main/java/org/springframework/format/number/CurrencyFormatter.java
index c540d74d38..00bf1303a1 100644
--- a/spring-context/src/main/java/org/springframework/format/number/CurrencyFormatter.java
+++ b/spring-context/src/main/java/org/springframework/format/number/CurrencyFormatter.java
@@ -75,6 +75,7 @@ public class CurrencyFormatter extends AbstractNumberFormatter {
 	}
 
 
+	@Override
 	public BigDecimal parse(String text, Locale locale) throws ParseException {
 		BigDecimal decimal = (BigDecimal) super.parse(text, locale);
 		if (decimal != null) {
@@ -88,6 +89,7 @@ public class CurrencyFormatter extends AbstractNumberFormatter {
 		return decimal;
 	}
 
+	@Override
 	protected NumberFormat getNumberFormat(Locale locale) {
 		DecimalFormat format = (DecimalFormat) NumberFormat.getCurrencyInstance(locale);
 		format.setParseBigDecimal(true);
diff --git a/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java
index 2108d9f5ae..a20cf4120a 100644
--- a/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java
+++ b/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java
@@ -59,11 +59,13 @@ public class NumberFormatAnnotationFormatterFactory
 		this.fieldTypes = Collections.unmodifiableSet(rawFieldTypes);
 	}
 
+	@Override
 	public final Set<Class<?>> getFieldTypes() {
 		return this.fieldTypes;
 	}
 
 
+	@Override
 	public void setEmbeddedValueResolver(StringValueResolver resolver) {
 		this.embeddedValueResolver = resolver;
 	}
@@ -73,10 +75,12 @@ public class NumberFormatAnnotationFormatterFactory
 	}
 
 
+	@Override
 	public Printer<Number> getPrinter(NumberFormat annotation, Class<?> fieldType) {
 		return configureFormatterFrom(annotation);
 	}
 
+	@Override
 	public Parser<Number> getParser(NumberFormat annotation, Class<?> fieldType) {
 		return configureFormatterFrom(annotation);
 	}
diff --git a/spring-context/src/main/java/org/springframework/format/number/NumberFormatter.java b/spring-context/src/main/java/org/springframework/format/number/NumberFormatter.java
index 1854a2e9d0..cee5a62a37 100644
--- a/spring-context/src/main/java/org/springframework/format/number/NumberFormatter.java
+++ b/spring-context/src/main/java/org/springframework/format/number/NumberFormatter.java
@@ -65,6 +65,7 @@ public class NumberFormatter extends AbstractNumberFormatter {
 	}
 
 
+	@Override
 	public NumberFormat getNumberFormat(Locale locale) {
 		NumberFormat format = NumberFormat.getInstance(locale);
 		if (!(format instanceof DecimalFormat)) {
diff --git a/spring-context/src/main/java/org/springframework/format/number/PercentFormatter.java b/spring-context/src/main/java/org/springframework/format/number/PercentFormatter.java
index 6e9cb946ef..719b77dd39 100644
--- a/spring-context/src/main/java/org/springframework/format/number/PercentFormatter.java
+++ b/spring-context/src/main/java/org/springframework/format/number/PercentFormatter.java
@@ -34,6 +34,7 @@ import java.util.Locale;
  */
 public class PercentFormatter extends AbstractNumberFormatter {
 
+	@Override
 	protected NumberFormat getNumberFormat(Locale locale) {
 		NumberFormat format = NumberFormat.getPercentInstance(locale);
 		if (format instanceof DecimalFormat) {
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 345131a5aa..4346e46ef9 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
@@ -59,11 +59,13 @@ public class FormattingConversionService extends GenericConversionService
 			new ConcurrentHashMap<AnnotationConverterKey, GenericConverter>(64);
 
 
+	@Override
 	public void setEmbeddedValueResolver(StringValueResolver resolver) {
 		this.embeddedValueResolver = resolver;
 	}
 
 
+	@Override
 	public void addFormatter(Formatter<?> formatter) {
 		Class<?> fieldType = GenericTypeResolver.resolveTypeArgument(formatter.getClass(), Formatter.class);
 		if (fieldType == null) {
@@ -73,16 +75,19 @@ public class FormattingConversionService extends GenericConversionService
 		addFormatterForFieldType(fieldType, formatter);
 	}
 
+	@Override
 	public void addFormatterForFieldType(Class<?> fieldType, Formatter<?> formatter) {
 		addConverter(new PrinterConverter(fieldType, formatter, this));
 		addConverter(new ParserConverter(fieldType, formatter, this));
 	}
 
+	@Override
 	public void addFormatterForFieldType(Class<?> fieldType, Printer<?> printer, Parser<?> parser) {
 		addConverter(new PrinterConverter(fieldType, printer, this));
 		addConverter(new ParserConverter(fieldType, parser, this));
 	}
 
+	@Override
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void addFormatterForFieldAnnotation(AnnotationFormatterFactory annotationFormatterFactory) {
 		final Class<? extends Annotation> annotationType = (Class<? extends Annotation>)
@@ -120,10 +125,12 @@ public class FormattingConversionService extends GenericConversionService
 			this.conversionService = conversionService;
 		}
 
+		@Override
 		public Set<ConvertiblePair> getConvertibleTypes() {
 			return Collections.singleton(new ConvertiblePair(this.fieldType, String.class));
 		}
 
+		@Override
 		@SuppressWarnings("unchecked")
 		public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 			if (source == null) {
@@ -159,10 +166,12 @@ public class FormattingConversionService extends GenericConversionService
 			this.conversionService = conversionService;
 		}
 
+		@Override
 		public Set<ConvertiblePair> getConvertibleTypes() {
 			return Collections.singleton(new ConvertiblePair(String.class, this.fieldType));
 		}
 
+		@Override
 		public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 			String text = (String) source;
 			if (!StringUtils.hasText(text)) {
@@ -206,14 +215,17 @@ public class FormattingConversionService extends GenericConversionService
 			this.fieldType = fieldType;
 		}
 
+		@Override
 		public Set<ConvertiblePair> getConvertibleTypes() {
 			return Collections.singleton(new ConvertiblePair(fieldType, String.class));
 		}
 
+		@Override
 		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			return sourceType.hasAnnotation(annotationType);
 		}
 
+		@Override
 		@SuppressWarnings("unchecked")
 		public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 			AnnotationConverterKey converterKey =
@@ -250,14 +262,17 @@ public class FormattingConversionService extends GenericConversionService
 			this.fieldType = fieldType;
 		}
 
+		@Override
 		public Set<ConvertiblePair> getConvertibleTypes() {
 			return Collections.singleton(new ConvertiblePair(String.class, fieldType));
 		}
 
+		@Override
 		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			return targetType.hasAnnotation(annotationType);
 		}
 
+		@Override
 		@SuppressWarnings("unchecked")
 		public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 			AnnotationConverterKey converterKey =
diff --git a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
index 2dc19dda74..8a464ce05e 100644
--- a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java
@@ -124,11 +124,13 @@ public class FormattingConversionServiceFactoryBean
 		this.registerDefaultFormatters = registerDefaultFormatters;
 	}
 
+	@Override
 	public void setEmbeddedValueResolver(StringValueResolver embeddedValueResolver) {
 		this.embeddedValueResolver = embeddedValueResolver;
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		this.conversionService = new DefaultFormattingConversionService(this.embeddedValueResolver, this.registerDefaultFormatters);
 		ConversionServiceFactory.registerConverters(this.converters, this.conversionService);
@@ -171,14 +173,17 @@ public class FormattingConversionServiceFactoryBean
 	}
 
 
+	@Override
 	public FormattingConversionService getObject() {
 		return this.conversionService;
 	}
 
+	@Override
 	public Class<? extends FormattingConversionService> getObjectType() {
 		return FormattingConversionService.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java
index 94316c8f6d..54a3571064 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java
@@ -78,6 +78,7 @@ public class InstrumentationLoadTimeWeaver implements LoadTimeWeaver {
 	}
 
 
+	@Override
 	public void addTransformer(ClassFileTransformer transformer) {
 		Assert.notNull(transformer, "Transformer must not be null");
 		FilteringClassFileTransformer actualTransformer =
@@ -97,6 +98,7 @@ public class InstrumentationLoadTimeWeaver implements LoadTimeWeaver {
 	 * JVM in this way, so the instrumentable class loader will always be the
 	 * current loader.
 	 */
+	@Override
 	public ClassLoader getInstrumentableClassLoader() {
 		return this.classLoader;
 	}
@@ -104,6 +106,7 @@ public class InstrumentationLoadTimeWeaver implements LoadTimeWeaver {
 	/**
 	 * This implementation always returns a {@link SimpleThrowawayClassLoader}.
 	 */
+	@Override
 	public ClassLoader getThrowawayClassLoader() {
 		return new SimpleThrowawayClassLoader(getInstrumentableClassLoader());
 	}
@@ -171,6 +174,7 @@ public class InstrumentationLoadTimeWeaver implements LoadTimeWeaver {
 			this.targetClassLoader = targetClassLoader;
 		}
 
+		@Override
 		public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
 				ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
 
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 86907d33dd..646066db59 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
@@ -117,15 +117,18 @@ public class ReflectiveLoadTimeWeaver implements LoadTimeWeaver {
 	}
 
 
+	@Override
 	public void addTransformer(ClassFileTransformer transformer) {
 		Assert.notNull(transformer, "Transformer must not be null");
 		ReflectionUtils.invokeMethod(this.addTransformerMethod, this.classLoader, new Object[] {transformer});
 	}
 
+	@Override
 	public ClassLoader getInstrumentableClassLoader() {
 		return this.classLoader;
 	}
 
+	@Override
 	public ClassLoader getThrowawayClassLoader() {
 		if (this.getThrowawayClassLoaderMethod != null) {
 			return (ClassLoader) ReflectionUtils.invokeMethod(this.getThrowawayClassLoaderMethod, this.classLoader,
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java b/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
index 3d15f1035c..47bb8dc30b 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java
@@ -36,9 +36,11 @@ import org.springframework.util.Assert;
 public class ResourceOverridingShadowingClassLoader extends ShadowingClassLoader {
 
 	private static final Enumeration<URL> EMPTY_URL_ENUMERATION = new Enumeration<URL>() {
+		@Override
 		public boolean hasMoreElements() {
 			return false;
 		}
+		@Override
 		public URL nextElement() {
 			throw new UnsupportedOperationException("Should not be called. I am empty.");
 		}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java
index a421f0418e..d95b3d9821 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java
@@ -62,10 +62,12 @@ public class SimpleLoadTimeWeaver implements LoadTimeWeaver {
 	}
 
 
+	@Override
 	public void addTransformer(ClassFileTransformer transformer) {
 		this.classLoader.addTransformer(transformer);
 	}
 
+	@Override
 	public ClassLoader getInstrumentableClassLoader() {
 		return this.classLoader;
 	}
@@ -73,6 +75,7 @@ public class SimpleLoadTimeWeaver implements LoadTimeWeaver {
 	/**
 	 * This implementation builds a {@link SimpleThrowawayClassLoader}.
 	 */
+	@Override
 	public ClassLoader getThrowawayClassLoader() {
 		return new SimpleThrowawayClassLoader(getInstrumentableClassLoader());
 	}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/ClassTransformerAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/ClassTransformerAdapter.java
index 36d5d1751e..2fd924ed53 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/ClassTransformerAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/ClassTransformerAdapter.java
@@ -42,6 +42,7 @@ class ClassTransformerAdapter implements ClassTransformer {
 		this.classFileTransformer = classFileTransformer;
 	}
 
+	@Override
 	public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
 			ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
 
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
index eb28f67ddf..205ed59c2a 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java
@@ -59,14 +59,17 @@ public class GlassFishLoadTimeWeaver implements LoadTimeWeaver {
 	}
 
 
+	@Override
 	public void addTransformer(ClassFileTransformer transformer) {
 		this.classLoader.addTransformer(transformer);
 	}
 
+	@Override
 	public ClassLoader getInstrumentableClassLoader() {
 		return this.classLoader.getClassLoader();
 	}
 
+	@Override
 	public ClassLoader getThrowawayClassLoader() {
 		return this.classLoader.getThrowawayClassLoader();
 	}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
index 260d1d4885..939114249f 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
@@ -72,14 +72,17 @@ public class JBossLoadTimeWeaver implements LoadTimeWeaver {
 	}
 
 
+	@Override
 	public void addTransformer(ClassFileTransformer transformer) {
 		this.adapter.addTransformer(transformer);
 	}
 
+	@Override
 	public ClassLoader getInstrumentableClassLoader() {
 		return this.adapter.getInstrumentableClassLoader();
 	}
 
+	@Override
 	public ClassLoader getThrowawayClassLoader() {
 		return new SimpleThrowawayClassLoader(getInstrumentableClassLoader());
 	}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java
index a128608d84..fe262717be 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java
@@ -127,6 +127,7 @@ class JBossMCAdapter implements JBossClassLoaderAdapter {
 		}
 	}
 
+	@Override
 	public void addTransformer(ClassFileTransformer transformer) {
 		InvocationHandler adapter = new JBossMCTranslatorAdapter(transformer);
 		Object adapterInstance = Proxy.newProxyInstance(this.translatorClass.getClassLoader(),
@@ -139,6 +140,7 @@ class JBossMCAdapter implements JBossClassLoaderAdapter {
 		}
 	}
 
+	@Override
 	public ClassLoader getInstrumentableClassLoader() {
 		return classLoader;
 	}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
index 8325e1b798..220d6ceb3d 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
@@ -43,6 +43,7 @@ class JBossMCTranslatorAdapter implements InvocationHandler {
 		this.transformer = transformer;
 	}
 
+	@Override
 	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 		String name = method.getName();
 
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossModulesAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossModulesAdapter.java
index f9ba2b6204..ac3e17645f 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossModulesAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossModulesAdapter.java
@@ -57,6 +57,7 @@ class JBossModulesAdapter implements JBossClassLoaderAdapter {
 		}
 	}
 
+	@Override
 	public void addTransformer(ClassFileTransformer transformer) {
 		try {
 			addTransformer.invoke(delegatingTransformer, transformer);
@@ -65,6 +66,7 @@ class JBossModulesAdapter implements JBossClassLoaderAdapter {
 		}
 	}
 
+	@Override
 	public ClassLoader getInstrumentableClassLoader() {
 		return classLoader;
 	}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
index dce5761898..725aa5529b 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
@@ -43,6 +43,7 @@ class OC4JClassPreprocessorAdapter implements InvocationHandler {
 		this.transformer = transformer;
 	}
 
+	@Override
 	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 		String name = method.getName();
 
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
index 1e71d0cdbb..761629a6b9 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JLoadTimeWeaver.java
@@ -62,6 +62,7 @@ public class OC4JLoadTimeWeaver implements LoadTimeWeaver {
 	}
 
 
+	@Override
 	public void addTransformer(ClassFileTransformer transformer) {
 		Assert.notNull(transformer, "Transformer must not be null");
 		// Since OC4J 10.1.3's PolicyClassLoader is going to be removed,
@@ -69,10 +70,12 @@ public class OC4JLoadTimeWeaver implements LoadTimeWeaver {
 		this.classLoader.addTransformer(transformer);
 	}
 
+	@Override
 	public ClassLoader getInstrumentableClassLoader() {
 		return this.classLoader.getClassLoader();
 	}
 
+	@Override
 	public ClassLoader getThrowawayClassLoader() {
 		return this.classLoader.getThrowawayClassLoader();
 	}
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 aede3544be..e0c2f310b0 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
@@ -49,6 +49,7 @@ class WebLogicClassPreProcessorAdapter implements InvocationHandler {
 		this.loader = loader;
 	}
 
+	@Override
 	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 		String name = method.getName();
 
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
index 6662830c73..087b47d735 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java
@@ -58,14 +58,17 @@ public class WebLogicLoadTimeWeaver implements LoadTimeWeaver {
 	}
 
 
+	@Override
 	public void addTransformer(ClassFileTransformer transformer) {
 		this.classLoader.addTransformer(transformer);
 	}
 
+	@Override
 	public ClassLoader getInstrumentableClassLoader() {
 		return this.classLoader.getClassLoader();
 	}
 
+	@Override
 	public ClassLoader getThrowawayClassLoader() {
 		return this.classLoader.getThrowawayClassLoader();
 	}
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
index c95684c4d6..5662febce0 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
@@ -58,6 +58,7 @@ class WebSphereClassPreDefinePlugin implements InvocationHandler {
 	}
 
 
+	@Override
 	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 		String name = method.getName();
 		if ("equals".equals(name)) {
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
index 3312c37778..55c6f863ef 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
@@ -55,14 +55,17 @@ public class WebSphereLoadTimeWeaver implements LoadTimeWeaver {
 	}
 
 
+	@Override
 	public void addTransformer(ClassFileTransformer transformer) {
 		this.classLoader.addTransformer(transformer);
 	}
 
+	@Override
 	public ClassLoader getInstrumentableClassLoader() {
 		return this.classLoader.getClassLoader();
 	}
 
+	@Override
 	public ClassLoader getThrowawayClassLoader() {
 		return this.classLoader.getThrowawayClassLoader();
 	}
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..86c95431c1 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
@@ -227,6 +227,7 @@ public class MBeanClientInterceptor
 		return this.managementInterface;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 	}
@@ -236,6 +237,7 @@ public class MBeanClientInterceptor
 	 * Prepares the {@code MBeanServerConnection} if the "connectOnStartup"
 	 * is turned on (which it is by default).
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		if (this.server != null && this.refreshOnConnectFailure) {
 			throw new IllegalArgumentException("'refreshOnConnectFailure' does not work when setting " +
@@ -342,6 +344,7 @@ public class MBeanClientInterceptor
 	 * @see #doInvoke
 	 * @see #handleConnectFailure
 	 */
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		// Lazily connect to MBeanServer if necessary.
 		synchronized (this.preparationMonitor) {
@@ -604,6 +607,7 @@ public class MBeanClientInterceptor
 	}
 
 
+	@Override
 	public void destroy() {
 		this.connector.close();
 	}
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java
index 466a4ff8fb..022a3a01f6 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java
@@ -94,14 +94,17 @@ public class MBeanProxyFactoryBean extends MBeanClientInterceptor
 	}
 
 
+	@Override
 	public Object getObject() {
 		return this.mbeanProxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return this.proxyInterface;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java b/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java
index bb0b2021de..913136578b 100644
--- a/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java
+++ b/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java
@@ -112,6 +112,7 @@ public class NotificationListenerRegistrar extends NotificationListenerHolder
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getNotificationListener() == null) {
 			throw new IllegalArgumentException("Property 'notificationListener' is required");
@@ -153,6 +154,7 @@ public class NotificationListenerRegistrar extends NotificationListenerHolder
 	/**
 	 * Unregisters the specified {@code NotificationListener}.
 	 */
+	@Override
 	public void destroy() {
 		try {
 			if (this.actualObjectNames != null) {
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..e9a73da2ff 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
@@ -371,6 +371,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 				notificationListeners.toArray(new NotificationListenerBean[notificationListeners.size()]);
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
@@ -383,6 +384,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	 * @see #setBeans
 	 * @see #setAutodetect
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (beanFactory instanceof ListableBeanFactory) {
 			this.beanFactory = (ListableBeanFactory) beanFactory;
@@ -402,6 +404,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	 * {@code ApplicationContext}.
 	 * @see #registerBeans()
 	 */
+	@Override
 	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.
@@ -425,6 +428,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	 * Unregisters all beans that this exported has exposed via JMX
 	 * when the enclosing {@code ApplicationContext} is destroyed.
 	 */
+	@Override
 	public void destroy() {
 		logger.info("Unregistering JMX-exposed beans on shutdown");
 		unregisterNotificationListeners();
@@ -436,6 +440,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	// Implementation of MBeanExportOperations interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public ObjectName registerManagedResource(Object managedResource) throws MBeanExportException {
 		Assert.notNull(managedResource, "Managed resource must not be null");
 		ObjectName objectName;
@@ -452,6 +457,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 		return objectName;
 	}
 
+	@Override
 	public void registerManagedResource(Object managedResource, ObjectName objectName) throws MBeanExportException {
 		Assert.notNull(managedResource, "Managed resource must not be null");
 		Assert.notNull(objectName, "ObjectName must not be null");
@@ -471,6 +477,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 		}
 	}
 
+	@Override
 	public void unregisterManagedResource(ObjectName objectName) {
 		Assert.notNull(objectName, "ObjectName must not be null");
 		doUnregister(objectName);
@@ -840,6 +847,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	 */
 	private void autodetectBeans(final AutodetectCapableMBeanInfoAssembler assembler) {
 		autodetect(new AutodetectCallback() {
+			@Override
 			public boolean include(Class beanClass, String beanName) {
 				return assembler.includeBean(beanClass, beanName);
 			}
@@ -852,6 +860,7 @@ public class MBeanExporter extends MBeanRegistrationSupport
 	 */
 	private void autodetectMBeans() {
 		autodetect(new AutodetectCallback() {
+			@Override
 			public boolean include(Class beanClass, String beanName) {
 				return isMBean(beanClass);
 			}
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/NotificationListenerBean.java b/spring-context/src/main/java/org/springframework/jmx/export/NotificationListenerBean.java
index 10a1226891..b82366aa17 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/NotificationListenerBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/NotificationListenerBean.java
@@ -61,6 +61,7 @@ public class NotificationListenerBean extends NotificationListenerHolder impleme
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getNotificationListener() == null) {
 			throw new IllegalArgumentException("Property 'notificationListener' is required");
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..fece173a26 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
@@ -52,11 +52,13 @@ public class AnnotationJmxAttributeSource implements JmxAttributeSource, BeanFac
 	private StringValueResolver embeddedValueResolver;
 
 
+	@Override
 	public void setBeanFactory(final BeanFactory beanFactory) {
 		if (beanFactory instanceof ConfigurableBeanFactory) {
 			// Not using EmbeddedValueResolverAware in order to avoid a spring-context dependency:
 			// ConfigurableBeanFactory and its resolveEmbeddedValue live in the spring-beans module.
 			this.embeddedValueResolver = new StringValueResolver() {
+				@Override
 				public String resolveStringValue(String strVal) {
 					return ((ConfigurableBeanFactory) beanFactory).resolveEmbeddedValue(strVal);
 				}
@@ -65,6 +67,7 @@ public class AnnotationJmxAttributeSource implements JmxAttributeSource, BeanFac
 	}
 
 
+	@Override
 	public ManagedResource getManagedResource(Class<?> beanClass) throws InvalidMetadataException {
 		org.springframework.jmx.export.annotation.ManagedResource ann =
 				beanClass.getAnnotation(org.springframework.jmx.export.annotation.ManagedResource.class);
@@ -83,6 +86,7 @@ public class AnnotationJmxAttributeSource implements JmxAttributeSource, BeanFac
 		return managedResource;
 	}
 
+	@Override
 	public ManagedAttribute getManagedAttribute(Method method) throws InvalidMetadataException {
 		org.springframework.jmx.export.annotation.ManagedAttribute ann =
 				AnnotationUtils.findAnnotation(method, org.springframework.jmx.export.annotation.ManagedAttribute.class);
@@ -97,6 +101,7 @@ public class AnnotationJmxAttributeSource implements JmxAttributeSource, BeanFac
 		return managedAttribute;
 	}
 
+	@Override
 	public ManagedMetric getManagedMetric(Method method) throws InvalidMetadataException {
 		org.springframework.jmx.export.annotation.ManagedMetric ann =
 				AnnotationUtils.findAnnotation(method, org.springframework.jmx.export.annotation.ManagedMetric.class);
@@ -108,6 +113,7 @@ public class AnnotationJmxAttributeSource implements JmxAttributeSource, BeanFac
 		return managedMetric;
 	}
 
+	@Override
 	public ManagedOperation getManagedOperation(Method method) throws InvalidMetadataException {
 		Annotation ann = AnnotationUtils.findAnnotation(method, org.springframework.jmx.export.annotation.ManagedOperation.class);
 		if (ann == null) {
@@ -118,6 +124,7 @@ public class AnnotationJmxAttributeSource implements JmxAttributeSource, BeanFac
 		return op;
 	}
 
+	@Override
 	public ManagedOperationParameter[] getManagedOperationParameters(Method method)
 			throws InvalidMetadataException {
 
@@ -139,6 +146,7 @@ public class AnnotationJmxAttributeSource implements JmxAttributeSource, BeanFac
 		return result;
 	}
 
+	@Override
 	public ManagedNotification[] getManagedNotifications(Class<?> clazz) throws InvalidMetadataException {
 		ManagedNotifications notificationsAnn = clazz.getAnnotation(ManagedNotifications.class);
 		if(notificationsAnn == null) {
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
index ce2c24a185..244e6a5966 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
@@ -59,6 +59,7 @@ public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler {
 	 * @see #getNotificationInfo(Object, String)
 	 * @see #populateMBeanDescriptor(javax.management.Descriptor, Object, String)
 	 */
+	@Override
 	public ModelMBeanInfo getMBeanInfo(Object managedBean, String beanKey) throws JMException {
 		checkManagedBean(managedBean);
 		ModelMBeanInfo info = new ModelMBeanInfoSupport(
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java
index e464fa234b..3f91e7fdfa 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java
@@ -109,11 +109,13 @@ public class InterfaceBasedMBeanInfoAssembler extends AbstractConfigurableMBeanI
 		this.interfaceMappings = mappings;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.interfaceMappings != null) {
 			this.resolvedInterfaceMappings = resolveInterfaceMappings(this.interfaceMappings);
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 320a64790e..e20ad95df8 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
@@ -88,6 +88,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 		this.attributeSource = attributeSource;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.attributeSource == null) {
 			throw new IllegalArgumentException("Property 'attributeSource' is required");
@@ -114,6 +115,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
 	 * @param beanClass the class of the bean
 	 * @param beanName the name of the bean in the bean factory
 	 */
+	@Override
 	public boolean includeBean(Class<?> beanClass, String beanName) {
 		return (this.attributeSource.getManagedResource(getClassToExpose(beanClass)) != null);
 	}
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java
index 1e9e4ff432..ea29cc1737 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java
@@ -47,6 +47,7 @@ public class IdentityNamingStrategy implements ObjectNamingStrategy {
 	 * Returns an instance of {@code ObjectName} based on the identity
 	 * of the managed resource.
 	 */
+	@Override
 	public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException {
 		String domain = ClassUtils.getPackageName(managedBean.getClass());
 		Hashtable keys = new Hashtable();
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
index 07b459910d..fd0f36cbba 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java
@@ -108,6 +108,7 @@ public class KeyNamingStrategy implements ObjectNamingStrategy, InitializingBean
 	 * used for {@code ObjectName} resolution.
 	 * @throws IOException
 	 */
+	@Override
 	public void afterPropertiesSet() throws IOException {
 		this.mergedMappings = new Properties();
 
@@ -129,6 +130,7 @@ public class KeyNamingStrategy implements ObjectNamingStrategy, InitializingBean
 	 * Attempts to retrieve the {@code ObjectName} via the given key, trying to
 	 * find a mapped value in the mappings first.
 	 */
+	@Override
 	public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException {
 		String objectName = null;
 		if (this.mergedMappings != null) {
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java
index f1d138d38b..f574256ef0 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java
@@ -94,6 +94,7 @@ public class MetadataNamingStrategy implements ObjectNamingStrategy, Initializin
 		this.defaultDomain = defaultDomain;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.attributeSource == null) {
 			throw new IllegalArgumentException("Property 'attributeSource' is required");
@@ -105,6 +106,7 @@ public class MetadataNamingStrategy implements ObjectNamingStrategy, Initializin
 	 * Reads the {@code ObjectName} from the source-level metadata associated
 	 * with the managed resource's {@code Class}.
 	 */
+	@Override
 	public ObjectName getObjectName(Object managedBean, String beanKey) throws MalformedObjectNameException {
 		Class managedClass = AopUtils.getTargetClass(managedBean);
 		ManagedResource mr = this.attributeSource.getManagedResource(managedClass);
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
index 1c94273bbb..3d4e11ff7d 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java
@@ -85,6 +85,7 @@ public class ModelMBeanNotificationPublisher implements NotificationPublisher {
 	 * @throws IllegalArgumentException if the supplied {@code notification} is {@code null}
 	 * @throws UnableToSendNotificationException if the supplied {@code notification} could not be sent
 	 */
+	@Override
 	public void sendNotification(Notification notification) {
 		Assert.notNull(notification, "Notification must not be null");
 		replaceNotificationSourceIfNecessary(notification);
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..5a4d05a7fb 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
@@ -142,6 +142,7 @@ public class ConnectorServerFactoryBean extends MBeanRegistrationSupport
 	 * with the {@code MBeanServer}
 	 * @throws IOException if there is a problem starting the connector server
 	 */
+	@Override
 	public void afterPropertiesSet() throws JMException, IOException {
 		if (this.server == null) {
 			this.server = JmxUtils.locateMBeanServer();
@@ -200,14 +201,17 @@ public class ConnectorServerFactoryBean extends MBeanRegistrationSupport
 	}
 
 
+	@Override
 	public JMXConnectorServer getObject() {
 		return this.connectorServer;
 	}
 
+	@Override
 	public Class<? extends JMXConnectorServer> getObjectType() {
 		return (this.connectorServer != null ? this.connectorServer.getClass() : JMXConnectorServer.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -218,6 +222,7 @@ public class ConnectorServerFactoryBean extends MBeanRegistrationSupport
 	 * Automatically called on {@code ApplicationContext} shutdown.
 	 * @throws IOException if there is an error stopping the connector server
 	 */
+	@Override
 	public void destroy() throws IOException {
 		if (logger.isInfoEnabled()) {
 			logger.info("Stopping JMX connector server: " + this.connectorServer);
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
index 3d9b82bc34..5c923b1903 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java
@@ -101,6 +101,7 @@ public class MBeanServerConnectionFactoryBean
 		this.connectOnStartup = connectOnStartup;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
@@ -110,6 +111,7 @@ public class MBeanServerConnectionFactoryBean
 	 * Creates a {@code JMXConnector} for the given settings
 	 * and exposes the associated {@code MBeanServerConnection}.
 	 */
+	@Override
 	public void afterPropertiesSet() throws IOException {
 		if (this.serviceUrl == null) {
 			throw new IllegalArgumentException("Property 'serviceUrl' is required");
@@ -146,14 +148,17 @@ public class MBeanServerConnectionFactoryBean
 	}
 
 
+	@Override
 	public MBeanServerConnection getObject() {
 		return this.connection;
 	}
 
+	@Override
 	public Class<? extends MBeanServerConnection> getObjectType() {
 		return (this.connection != null ? this.connection.getClass() : MBeanServerConnection.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -162,6 +167,7 @@ public class MBeanServerConnectionFactoryBean
 	/**
 	 * Closes the underlying {@code JMXConnector}.
 	 */
+	@Override
 	public void destroy() throws IOException {
 		if (this.connectorTargetSource == null || this.connectorTargetSource.isInitialized()) {
 			this.connector.close();
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java
index 61b1086a4c..9bbfe08c85 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java
@@ -118,6 +118,7 @@ public class MBeanServerFactoryBean implements FactoryBean<MBeanServer>, Initial
 	/**
 	 * Creates the {@code MBeanServer} instance.
 	 */
+	@Override
 	public void afterPropertiesSet() throws MBeanServerNotFoundException {
 		// Try to locate existing MBeanServer, if desired.
 		if (this.locateExistingServerIfPossible || this.agentId != null) {
@@ -179,14 +180,17 @@ public class MBeanServerFactoryBean implements FactoryBean<MBeanServer>, Initial
 	}
 
 
+	@Override
 	public MBeanServer getObject() {
 		return this.server;
 	}
 
+	@Override
 	public Class<? extends MBeanServer> getObjectType() {
 		return (this.server != null ? this.server.getClass() : MBeanServer.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -195,6 +199,7 @@ public class MBeanServerFactoryBean implements FactoryBean<MBeanServer>, Initial
 	/**
 	 * Unregisters the {@code MBeanServer} instance, if necessary.
 	 */
+	@Override
 	public void destroy() {
 		if (this.newlyRegistered) {
 			MBeanServerFactory.releaseMBeanServer(this.server);
diff --git a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
index 5cd37f3d65..1cd564b193 100644
--- a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java
@@ -55,6 +55,7 @@ public class WebSphereMBeanServerFactoryBean implements FactoryBean<MBeanServer>
 	private MBeanServer mbeanServer;
 
 
+	@Override
 	public void afterPropertiesSet() throws MBeanServerNotFoundException {
 		try {
 			/*
@@ -80,14 +81,17 @@ public class WebSphereMBeanServerFactoryBean implements FactoryBean<MBeanServer>
 	}
 
 
+	@Override
 	public MBeanServer getObject() {
 		return this.mbeanServer;
 	}
 
+	@Override
 	public Class<? extends MBeanServer> getObjectType() {
 		return (this.mbeanServer != null ? this.mbeanServer.getClass() : MBeanServer.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..1648ad3edb 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectFactoryBean.java
@@ -155,6 +155,7 @@ public class JndiObjectFactoryBean extends JndiObjectLocator implements FactoryB
 		this.defaultObject = defaultObject;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
@@ -228,10 +229,12 @@ public class JndiObjectFactoryBean extends JndiObjectLocator implements FactoryB
 	/**
 	 * Return the singleton JNDI object.
 	 */
+	@Override
 	public Object getObject() {
 		return this.jndiObject;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		if (this.proxyInterfaces != null) {
 			if (this.proxyInterfaces.length == 1) {
@@ -249,6 +252,7 @@ public class JndiObjectFactoryBean extends JndiObjectLocator implements FactoryB
 		}
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -323,6 +327,7 @@ public class JndiObjectFactoryBean extends JndiObjectLocator implements FactoryB
 			this.jndiTemplate = jndiTemplate;
 		}
 
+		@Override
 		public Object invoke(MethodInvocation invocation) throws Throwable {
 			Context ctx = (isEligible(invocation.getMethod()) ? this.jndiTemplate.getContext() : null);
 			try {
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
index 4f8a148588..50327e4545 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
@@ -85,6 +85,7 @@ public abstract class JndiObjectLocator extends JndiLocatorSupport implements In
 		return this.expectedType;
 	}
 
+	@Override
 	public void afterPropertiesSet() throws IllegalArgumentException, NamingException {
 		if (!StringUtils.hasLength(getJndiName())) {
 			throw new IllegalArgumentException("Property 'jndiName' is required");
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
index 5a9bb616b1..7202531de1 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java
@@ -105,6 +105,7 @@ public class JndiObjectTargetSource extends JndiObjectLocator implements TargetS
 	}
 
 
+	@Override
 	public Class<?> getTargetClass() {
 		if (this.cachedObject != null) {
 			return this.cachedObject.getClass();
@@ -117,10 +118,12 @@ public class JndiObjectTargetSource extends JndiObjectLocator implements TargetS
 		}
 	}
 
+	@Override
 	public boolean isStatic() {
 		return (this.cachedObject != null);
 	}
 
+	@Override
 	public Object getTarget() {
 		try {
 			if (this.lookupOnStartup || !this.cache) {
@@ -140,6 +143,7 @@ public class JndiObjectTargetSource extends JndiObjectLocator implements TargetS
 		}
 	}
 
+	@Override
 	public void releaseTarget(Object target) {
 	}
 
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java b/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
index 441a113d88..35f964fde8 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java
@@ -150,6 +150,7 @@ public class JndiTemplate {
 			logger.debug("Looking up JNDI object with name [" + name + "]");
 		}
 		return execute(new JndiCallback<Object>() {
+			@Override
 			public Object doInContext(Context ctx) throws NamingException {
 				Object located = ctx.lookup(name);
 				if (located == null) {
@@ -194,6 +195,7 @@ public class JndiTemplate {
 			logger.debug("Binding JNDI object with name [" + name + "]");
 		}
 		execute(new JndiCallback<Object>() {
+			@Override
 			public Object doInContext(Context ctx) throws NamingException {
 				ctx.bind(name, object);
 				return null;
@@ -213,6 +215,7 @@ public class JndiTemplate {
 			logger.debug("Rebinding JNDI object with name [" + name + "]");
 		}
 		execute(new JndiCallback<Object>() {
+			@Override
 			public Object doInContext(Context ctx) throws NamingException {
 				ctx.rebind(name, object);
 				return null;
@@ -230,6 +233,7 @@ public class JndiTemplate {
 			logger.debug("Unbinding JNDI object with name [" + name + "]");
 		}
 		execute(new JndiCallback<Object>() {
+			@Override
 			public Object doInContext(Context ctx) throws NamingException {
 				ctx.unbind(name);
 				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..555e1f4b91 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
@@ -100,10 +100,12 @@ public class SimpleJndiBeanFactory extends JndiLocatorSupport implements BeanFac
 	//---------------------------------------------------------------------
 
 
+	@Override
 	public Object getBean(String name) throws BeansException {
 		return getBean(name, Object.class);
 	}
 
+	@Override
 	public <T> T getBean(String name, Class<T> requiredType) throws BeansException {
 		try {
 			if (isSingleton(name)) {
@@ -124,10 +126,12 @@ public class SimpleJndiBeanFactory extends JndiLocatorSupport implements BeanFac
 		}
 	}
 
+	@Override
 	public <T> T getBean(Class<T> requiredType) throws BeansException {
 		return getBean(requiredType.getSimpleName(), requiredType);
 	}
 
+	@Override
 	public Object getBean(String name, Object... args) throws BeansException {
 		if (args != null) {
 			throw new UnsupportedOperationException(
@@ -136,6 +140,7 @@ public class SimpleJndiBeanFactory extends JndiLocatorSupport implements BeanFac
 		return getBean(name);
 	}
 
+	@Override
 	public boolean containsBean(String name) {
 		if (this.singletonObjects.containsKey(name) || this.resourceTypes.containsKey(name)) {
 			return true;
@@ -149,19 +154,23 @@ public class SimpleJndiBeanFactory extends JndiLocatorSupport implements BeanFac
 		}
 	}
 
+	@Override
 	public boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
 		return this.shareableResources.contains(name);
 	}
 
+	@Override
 	public boolean isPrototype(String name) throws NoSuchBeanDefinitionException {
 		return !this.shareableResources.contains(name);
 	}
 
+	@Override
 	public boolean isTypeMatch(String name, Class targetType) throws NoSuchBeanDefinitionException {
 		Class type = getType(name);
 		return (targetType == null || (type != null && targetType.isAssignableFrom(type)));
 	}
 
+	@Override
 	public Class<?> getType(String name) throws NoSuchBeanDefinitionException {
 		try {
 			return doGetType(name);
@@ -174,6 +183,7 @@ public class SimpleJndiBeanFactory extends JndiLocatorSupport implements BeanFac
 		}
 	}
 
+	@Override
 	public String[] getAliases(String name) {
 		return new String[0];
 	}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
index 8660e2cf5b..d0be75a7b8 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java
@@ -267,6 +267,7 @@ public class JndiRmiClientInterceptor extends JndiObjectLocator implements Metho
 	 * @see java.rmi.ConnectIOException
 	 * @see java.rmi.NoSuchObjectException
 	 */
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		Object stub = null;
 		try {
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
index b4e884e260..645251429c 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java
@@ -69,6 +69,7 @@ public class JndiRmiProxyFactoryBean extends JndiRmiClientInterceptor
 	private Object serviceProxy;
 
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
@@ -83,14 +84,17 @@ public class JndiRmiProxyFactoryBean extends JndiRmiClientInterceptor
 	}
 
 
+	@Override
 	public Object getObject() {
 		return this.serviceProxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return getServiceInterface();
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
index 180ba0f563..d3e50819f1 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java
@@ -101,6 +101,7 @@ public class JndiRmiServiceExporter extends RmiBasedExporter implements Initiali
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws NamingException, RemoteException {
 		prepare();
 	}
@@ -137,6 +138,7 @@ public class JndiRmiServiceExporter extends RmiBasedExporter implements Initiali
 	/**
 	 * Unbind the RMI service from JNDI on bean factory shutdown.
 	 */
+	@Override
 	public void destroy() throws NamingException, NoSuchObjectException {
 		if (logger.isInfoEnabled()) {
 			logger.info("Unbinding RMI service from JNDI location [" + this.jndiName + "]");
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
index d4673dbff6..6e0c08466a 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
@@ -94,6 +94,7 @@ public abstract class RemoteInvocationSerializingExporter extends RemoteInvocati
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		prepare();
 	}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
index ba9d8775d9..f019c3644e 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java
@@ -253,6 +253,7 @@ public class RmiClientInterceptor extends RemoteInvocationBasedAccessor
 	 * @see java.rmi.ConnectIOException
 	 * @see java.rmi.NoSuchObjectException
 	 */
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		Remote stub = getStub();
 		try {
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
index 22cac7f71f..b5d2da6159 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java
@@ -57,6 +57,7 @@ class RmiInvocationWrapper implements RmiInvocationHandler {
 	 * Exposes the exporter's service interface, if any, as target interface.
 	 * @see RmiBasedExporter#getServiceInterface()
 	 */
+	@Override
 	public String getTargetInterfaceName() {
 		Class ifc = this.rmiExporter.getServiceInterface();
 		return (ifc != null ? ifc.getName() : null);
@@ -66,6 +67,7 @@ class RmiInvocationWrapper implements RmiInvocationHandler {
 	 * Delegates the actual invocation handling to the RMI exporter.
 	 * @see RmiBasedExporter#invoke(org.springframework.remoting.support.RemoteInvocation, Object)
 	 */
+	@Override
 	public Object invoke(RemoteInvocation invocation)
 		throws RemoteException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
 
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
index a635a1fa59..ef88378589 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java
@@ -73,14 +73,17 @@ public class RmiProxyFactoryBean extends RmiClientInterceptor implements Factory
 	}
 
 
+	@Override
 	public Object getObject() {
 		return this.serviceProxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return getServiceInterface();
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
index fee68ce8d7..0a6ded9114 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java
@@ -149,6 +149,7 @@ public class RmiRegistryFactoryBean implements FactoryBean<Registry>, Initializi
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		// Check socket factories for registry.
 		if (this.clientSocketFactory instanceof RMIServerSocketFactory) {
@@ -282,14 +283,17 @@ public class RmiRegistryFactoryBean implements FactoryBean<Registry>, Initializi
 	}
 
 
+	@Override
 	public Registry getObject() throws Exception {
 		return this.registry;
 	}
 
+	@Override
 	public Class<? extends Registry> getObjectType() {
 		return (this.registry != null ? this.registry.getClass() : Registry.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -299,6 +303,7 @@ public class RmiRegistryFactoryBean implements FactoryBean<Registry>, Initializi
 	 * Unexport the RMI registry on bean factory shutdown,
 	 * provided that this bean actually created a registry.
 	 */
+	@Override
 	public void destroy() throws RemoteException {
 		if (this.created) {
 			logger.info("Unexporting RMI registry");
diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
index dcd5f91f85..49429b36d8 100644
--- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
+++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java
@@ -225,6 +225,7 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws RemoteException {
 		prepare();
 	}
@@ -424,6 +425,7 @@ public class RmiServiceExporter extends RmiBasedExporter implements Initializing
 	/**
 	 * Unbind the RMI service from the registry on bean factory shutdown.
 	 */
+	@Override
 	public void destroy() throws RemoteException {
 		if (logger.isInfoEnabled()) {
 			logger.info("Unbinding RMI service '" + this.serviceName +
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java b/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java
index 303ed12b6f..7d8a49f623 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java
@@ -30,6 +30,7 @@ import org.springframework.util.Assert;
  */
 public class DefaultRemoteInvocationExecutor implements RemoteInvocationExecutor {
 
+	@Override
 	public Object invoke(RemoteInvocation invocation, Object targetObject)
 			throws NoSuchMethodException, IllegalAccessException, InvocationTargetException{
 
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java b/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java
index a1baffb853..9d32dbbed5 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java
@@ -27,6 +27,7 @@ import org.aopalliance.intercept.MethodInvocation;
  */
 public class DefaultRemoteInvocationFactory implements RemoteInvocationFactory {
 
+	@Override
 	public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) {
 		return new RemoteInvocation(methodInvocation);
 	}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java
index d66fe1228d..03fe329f9e 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java
@@ -67,6 +67,7 @@ public class RemoteInvocationTraceInterceptor implements MethodInterceptor {
 	}
 
 
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		Method method = invocation.getMethod();
 		if (logger.isDebugEnabled()) {
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java b/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
index 832d489962..02f31ba803 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java
@@ -37,6 +37,7 @@ public abstract class RemotingSupport implements BeanClassLoaderAware {
 	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
 
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java
index 192d5e3fe6..8aa6921f42 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java
@@ -143,6 +143,7 @@ public class SimpleHttpServerFactoryBean implements FactoryBean<HttpServer>, Ini
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws IOException {
 		InetSocketAddress address = (this.hostname != null ?
 				new InetSocketAddress(this.hostname, this.port) : new InetSocketAddress(this.port));
@@ -167,18 +168,22 @@ public class SimpleHttpServerFactoryBean implements FactoryBean<HttpServer>, Ini
 		this.server.start();
 	}
 
+	@Override
 	public HttpServer getObject() {
 		return this.server;
 	}
 
+	@Override
 	public Class<? extends HttpServer> getObjectType() {
 		return (this.server != null ? this.server.getClass() : HttpServer.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
 
+	@Override
 	public void destroy() {
 		logger.info("Stopping HttpServer");
 		this.server.stop(this.shutdownDelay);
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java
index bec4866618..fba31eae21 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java
@@ -46,6 +46,7 @@ public abstract class UrlBasedRemoteAccessor extends RemoteAccessor implements I
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getServiceUrl() == null) {
 			throw new IllegalArgumentException("Property 'serviceUrl' is required");
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..2f8703dc69 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
@@ -40,6 +40,7 @@ public abstract class AbstractAsyncConfiguration implements ImportAware {
 	protected AnnotationAttributes enableAsync;
 	protected Executor executor;
 
+	@Override
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		this.enableAsync = AnnotationAttributes.fromMap(
 				importMetadata.getAnnotationAttributes(EnableAsync.class.getName(), false));
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 873740c21c..21613bc066 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
@@ -91,6 +91,7 @@ public class AsyncAnnotationAdvisor extends AbstractPointcutAdvisor implements B
 	/**
 	 * Set the {@code BeanFactory} to be used when looking up executors by qualifier.
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		this.beanFactory = beanFactory;
 		delegateBeanFactory(beanFactory);
@@ -127,10 +128,12 @@ public class AsyncAnnotationAdvisor extends AbstractPointcutAdvisor implements B
 	}
 
 
+	@Override
 	public Advice getAdvice() {
 		return this.advice;
 	}
 
+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
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 f4c7d65125..63c7ee012e 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
@@ -74,6 +74,7 @@ public class AsyncAnnotationBeanPostProcessor extends AbstractAdvisingBeanPostPr
 		this.executor = executor;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		AsyncAnnotationAdvisor advisor = (this.executor != null ?
 				new AsyncAnnotationAdvisor(this.executor) : new AsyncAnnotationAdvisor());
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..38e975167c 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
@@ -37,6 +37,7 @@ public class AsyncConfigurationSelector extends AdviceModeImportSelector<EnableA
 	 * @return {@link ProxyAsyncConfiguration} or {@code AspectJAsyncConfiguration} for
 	 * {@code PROXY} and {@code ASPECTJ} values of {@link EnableAsync#mode()}, respectively
 	 */
+	@Override
 	public String[] selectImports(AdviceMode adviceMode) {
 		switch (adviceMode) {
 			case PROXY:
diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
index f657d30680..913c77ed11 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
@@ -40,22 +40,27 @@ public class AsyncResult<V> implements Future<V> {
 		this.value = value;
 	}
 
+	@Override
 	public boolean cancel(boolean mayInterruptIfRunning) {
 		return false;
 	}
 
+	@Override
 	public boolean isCancelled() {
 		return false;
 	}
 
+	@Override
 	public boolean isDone() {
 		return true;
 	}
 
+	@Override
 	public V get() {
 		return this.value;
 	}
 
+	@Override
 	public V get(long timeout, TimeUnit unit) {
 		return this.value;
 	}
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 f5f236d2f9..74b6bc6216 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
@@ -89,25 +89,31 @@ public class ScheduledAnnotationBeanPostProcessor
 		this.scheduler = scheduler;
 	}
 
+	@Override
 	public void setEmbeddedValueResolver(StringValueResolver resolver) {
 		this.embeddedValueResolver = resolver;
 	}
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 	}
 
+	@Override
 	public int getOrder() {
 		return LOWEST_PRECEDENCE;
 	}
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) {
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(final Object bean, String beanName) {
 		final Class<?> targetClass = AopUtils.getTargetClass(bean);
 		ReflectionUtils.doWithMethods(targetClass, new MethodCallback() {
+			@Override
 			public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
 				Scheduled annotation = AnnotationUtils.getAnnotation(method, Scheduled.class);
 				if (annotation != null) {
@@ -164,6 +170,7 @@ public class ScheduledAnnotationBeanPostProcessor
 		return bean;
 	}
 
+	@Override
 	public void onApplicationEvent(ContextRefreshedEvent event) {
 		if (event.getApplicationContext() != this.applicationContext) {
 			return;
@@ -203,6 +210,7 @@ public class ScheduledAnnotationBeanPostProcessor
 		this.registrar.afterPropertiesSet();
 	}
 
+	@Override
 	public void destroy() throws Exception {
 		if (this.registrar != null) {
 			this.registrar.destroy();
diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java
index d467243131..7277bc9362 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java
@@ -102,6 +102,7 @@ public class ConcurrentTaskExecutor implements SchedulingTaskExecutor, Executor
 	 * Delegates to the specified JSR-166 backport concurrent executor.
 	 * @see edu.emory.mathcs.backport.java.util.concurrent.Executor#execute(Runnable)
 	 */
+	@Override
 	public void execute(Runnable task) {
 		try {
 			this.concurrentExecutor.execute(task);
@@ -112,16 +113,19 @@ public class ConcurrentTaskExecutor implements SchedulingTaskExecutor, Executor
 		}
 	}
 
+	@Override
 	public void execute(Runnable task, long startTimeout) {
 		execute(task);
 	}
 
+	@Override
 	public Future<?> submit(Runnable task) {
 		FutureTask<Object> future = new FutureTask<Object>(task, null);
 		execute(future);
 		return future;
 	}
 
+	@Override
 	public <T> Future<T> submit(Callable<T> task) {
 		FutureTask<T> future = new FutureTask<T>(task);
 		execute(future);
@@ -131,6 +135,7 @@ public class ConcurrentTaskExecutor implements SchedulingTaskExecutor, Executor
 	/**
 	 * This task executor prefers short-lived work units.
 	 */
+	@Override
 	public boolean prefersShortLivedTasks() {
 		return true;
 	}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java
index 8cfb86f2b3..79a2652550 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java
@@ -54,6 +54,7 @@ public class CustomizableThreadFactory extends CustomizableThreadCreator impleme
 	}
 
 
+	@Override
 	public Thread newThread(Runnable runnable) {
 		return createThread(runnable);
 	}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
index ca237fe1af..821dabc32d 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java
@@ -238,6 +238,7 @@ public class ThreadPoolTaskExecutor extends CustomizableThreadFactory
 		this.threadNamePrefixSet = true;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		this.beanName = name;
 	}
@@ -247,6 +248,7 @@ public class ThreadPoolTaskExecutor extends CustomizableThreadFactory
 	 * Calls {@code initialize()} after the container applied all property values.
 	 * @see #initialize()
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		initialize();
 	}
@@ -306,6 +308,7 @@ public class ThreadPoolTaskExecutor extends CustomizableThreadFactory
 	 * @see edu.emory.mathcs.backport.java.util.concurrent.Executor#execute(Runnable)
 	 * @see org.springframework.core.task.TaskExecutor#execute(Runnable)
 	 */
+	@Override
 	public void execute(Runnable task) {
 		Executor executor = getThreadPoolExecutor();
 		try {
@@ -316,16 +319,19 @@ public class ThreadPoolTaskExecutor extends CustomizableThreadFactory
 		}
 	}
 
+	@Override
 	public void execute(Runnable task, long startTimeout) {
 		execute(task);
 	}
 
+	@Override
 	public Future<?> submit(Runnable task) {
 		FutureTask<Object> future = new FutureTask<Object>(task, null);
 		execute(future);
 		return future;
 	}
 
+	@Override
 	public <T> Future<T> submit(Callable<T> task) {
 		FutureTask<T> future = new FutureTask<T>(task);
 		execute(future);
@@ -335,6 +341,7 @@ public class ThreadPoolTaskExecutor extends CustomizableThreadFactory
 	/**
 	 * This task executor prefers short-lived work units.
 	 */
+	@Override
 	public boolean prefersShortLivedTasks() {
 		return true;
 	}
@@ -362,6 +369,7 @@ public class ThreadPoolTaskExecutor extends CustomizableThreadFactory
 	 * the task executor instance.
 	 * @see #shutdown()
 	 */
+	@Override
 	public void destroy() {
 		shutdown();
 	}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
index ea5bc9ca89..3427652bfd 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java
@@ -87,18 +87,22 @@ public class ConcurrentTaskExecutor implements SchedulingTaskExecutor {
 	}
 
 
+	@Override
 	public void execute(Runnable task) {
 		this.adaptedExecutor.execute(task);
 	}
 
+	@Override
 	public void execute(Runnable task, long startTimeout) {
 		this.adaptedExecutor.execute(task, startTimeout);
 	}
 
+	@Override
 	public Future<?> submit(Runnable task) {
 		return this.adaptedExecutor.submit(task);
 	}
 
+	@Override
 	public <T> Future<T> submit(Callable<T> task) {
 		return this.adaptedExecutor.submit(task);
 	}
@@ -106,6 +110,7 @@ public class ConcurrentTaskExecutor implements SchedulingTaskExecutor {
 	/**
 	 * This task executor prefers short-lived work units.
 	 */
+	@Override
 	public boolean prefersShortLivedTasks() {
 		return true;
 	}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
index b972db0601..97fc81496a 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
@@ -116,6 +116,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T
 	}
 
 
+	@Override
 	public ScheduledFuture schedule(Runnable task, Trigger trigger) {
 		try {
 			ErrorHandler errorHandler =
@@ -127,6 +128,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T
 		}
 	}
 
+	@Override
 	public ScheduledFuture schedule(Runnable task, Date startTime) {
 		long initialDelay = startTime.getTime() - System.currentTimeMillis();
 		try {
@@ -138,6 +140,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T
 		}
 	}
 
+	@Override
 	public ScheduledFuture scheduleAtFixedRate(Runnable task, Date startTime, long period) {
 		long initialDelay = startTime.getTime() - System.currentTimeMillis();
 		try {
@@ -149,6 +152,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T
 		}
 	}
 
+	@Override
 	public ScheduledFuture scheduleAtFixedRate(Runnable task, long period) {
 		try {
 			return this.scheduledExecutor.scheduleAtFixedRate(
@@ -159,6 +163,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T
 		}
 	}
 
+	@Override
 	public ScheduledFuture scheduleWithFixedDelay(Runnable task, Date startTime, long delay) {
 		long initialDelay = startTime.getTime() - System.currentTimeMillis();
 		try {
@@ -170,6 +175,7 @@ public class ConcurrentTaskScheduler extends ConcurrentTaskExecutor implements T
 		}
 	}
 
+	@Override
 	public ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay) {
 		try {
 			return this.scheduledExecutor.scheduleWithFixedDelay(
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java
index 7ac8d4790e..090eac7b50 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java
@@ -51,6 +51,7 @@ public class CustomizableThreadFactory extends CustomizableThreadCreator impleme
 	}
 
 
+	@Override
 	public Thread newThread(Runnable runnable) {
 		return createThread(runnable);
 	}
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 964872e1d6..c237883e4e 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
@@ -95,6 +95,7 @@ public abstract class ExecutorConfigurationSupport extends CustomizableThreadFac
 		this.waitForTasksToCompleteOnShutdown = waitForJobsToCompleteOnShutdown;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		this.beanName = name;
 	}
@@ -104,6 +105,7 @@ public abstract class ExecutorConfigurationSupport extends CustomizableThreadFac
 	 * Calls {@code initialize()} after the container applied all property values.
 	 * @see #initialize()
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		initialize();
 	}
@@ -138,6 +140,7 @@ public abstract class ExecutorConfigurationSupport extends CustomizableThreadFac
 	 * the task executor instance.
 	 * @see #shutdown()
 	 */
+	@Override
 	public void destroy() {
 		shutdown();
 	}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java
index fe30fd108b..5c184f313e 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ForkJoinPoolFactoryBean.java
@@ -82,25 +82,30 @@ public class ForkJoinPoolFactoryBean implements FactoryBean<ForkJoinPool>, Initi
 		this.asyncMode = asyncMode;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		this.forkJoinPool =
 				new ForkJoinPool(this.parallelism, this.threadFactory, this.uncaughtExceptionHandler, this.asyncMode);
 	}
 
 
+	@Override
 	public ForkJoinPool getObject() {
 		return this.forkJoinPool;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return ForkJoinPool.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
 
 
+	@Override
 	public void destroy() {
 		this.forkJoinPool.shutdown();
 	}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java
index fba41f0778..ff199f1609 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java
@@ -89,24 +89,28 @@ class ReschedulingRunnable extends DelegatingErrorHandlingRunnable implements Sc
 	}
 
 
+	@Override
 	public boolean cancel(boolean mayInterruptIfRunning) {
 		synchronized (this.triggerContextMonitor) {
 			return this.currentFuture.cancel(mayInterruptIfRunning);
 		}
 	}
 
+	@Override
 	public boolean isCancelled() {
 		synchronized (this.triggerContextMonitor) {
 			return this.currentFuture.isCancelled();
 		}
 	}
 
+	@Override
 	public boolean isDone() {
 		synchronized (this.triggerContextMonitor) {
 			return this.currentFuture.isDone();
 		}
 	}
 
+	@Override
 	public Object get() throws InterruptedException, ExecutionException {
 		ScheduledFuture curr;
 		synchronized (this.triggerContextMonitor) {
@@ -115,6 +119,7 @@ class ReschedulingRunnable extends DelegatingErrorHandlingRunnable implements Sc
 		return curr.get();
 	}
 
+	@Override
 	public Object get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
 		ScheduledFuture curr;
 		synchronized (this.triggerContextMonitor) {
@@ -123,6 +128,7 @@ class ReschedulingRunnable extends DelegatingErrorHandlingRunnable implements Sc
 		return curr.get(timeout, unit);
 	}
 
+	@Override
 	public long getDelay(TimeUnit unit) {
 		ScheduledFuture curr;
 		synchronized (this.triggerContextMonitor) {
@@ -131,6 +137,7 @@ class ReschedulingRunnable extends DelegatingErrorHandlingRunnable implements Sc
 		return curr.getDelay(unit);
 	}
 
+	@Override
 	public int compareTo(Delayed other) {
 		if (this == other) {
 			return 0;
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..4b5e4b6a25 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
@@ -122,6 +122,7 @@ public class ScheduledExecutorFactoryBean extends ExecutorConfigurationSupport
 	}
 
 
+	@Override
 	protected ExecutorService initializeExecutor(
 			ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) {
 
@@ -198,14 +199,17 @@ public class ScheduledExecutorFactoryBean extends ExecutorConfigurationSupport
 	}
 
 
+	@Override
 	public ScheduledExecutorService getObject() {
 		return this.exposedExecutor;
 	}
 
+	@Override
 	public Class<? extends ScheduledExecutorService> getObjectType() {
 		return (this.exposedExecutor != null ? this.exposedExecutor.getClass() : ScheduledExecutorService.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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 19cd880bbb..4c4c92e6ee 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
@@ -133,6 +133,7 @@ public class ThreadPoolExecutorFactoryBean extends ExecutorConfigurationSupport
 	}
 
 
+	@Override
 	protected ExecutorService initializeExecutor(
 			ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) {
 
@@ -170,14 +171,17 @@ public class ThreadPoolExecutorFactoryBean extends ExecutorConfigurationSupport
 	}
 
 
+	@Override
 	public ExecutorService getObject() throws Exception {
 		return this.exposedExecutor;
 	}
 
+	@Override
 	public Class<? extends ExecutorService> getObjectType() {
 		return (this.exposedExecutor != null ? this.exposedExecutor.getClass() : ExecutorService.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
index 31dc69d553..6674768af7 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java
@@ -176,6 +176,7 @@ public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport impleme
 	}
 
 
+	@Override
 	protected ExecutorService initializeExecutor(
 			ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) {
 
@@ -236,6 +237,7 @@ public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport impleme
 	}
 
 
+	@Override
 	public void execute(Runnable task) {
 		Executor executor = getThreadPoolExecutor();
 		try {
@@ -246,10 +248,12 @@ public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport impleme
 		}
 	}
 
+	@Override
 	public void execute(Runnable task, long startTimeout) {
 		execute(task);
 	}
 
+	@Override
 	public Future<?> submit(Runnable task) {
 		ExecutorService executor = getThreadPoolExecutor();
 		try {
@@ -260,6 +264,7 @@ public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport impleme
 		}
 	}
 
+	@Override
 	public <T> Future<T> submit(Callable<T> task) {
 		ExecutorService executor = getThreadPoolExecutor();
 		try {
@@ -273,6 +278,7 @@ public class ThreadPoolTaskExecutor extends ExecutorConfigurationSupport impleme
 	/**
 	 * This task executor prefers short-lived work units.
 	 */
+	@Override
 	public boolean prefersShortLivedTasks() {
 		return true;
 	}
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..01c05d6bc4 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
@@ -76,6 +76,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 		this.errorHandler = errorHandler;
 	}
 
+	@Override
 	protected ExecutorService initializeExecutor(
 			ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) {
 
@@ -113,6 +114,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 
 	// SchedulingTaskExecutor implementation
 
+	@Override
 	public void execute(Runnable task) {
 		Executor executor = getScheduledExecutor();
 		try {
@@ -123,10 +125,12 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 		}
 	}
 
+	@Override
 	public void execute(Runnable task, long startTimeout) {
 		execute(task);
 	}
 
+	@Override
 	public Future<?> submit(Runnable task) {
 		ExecutorService executor = getScheduledExecutor();
 		try {
@@ -137,6 +141,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 		}
 	}
 
+	@Override
 	public <T> Future<T> submit(Callable<T> task) {
 		ExecutorService executor = getScheduledExecutor();
 		try {
@@ -150,6 +155,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 		}
 	}
 
+	@Override
 	public boolean prefersShortLivedTasks() {
 		return true;
 	}
@@ -157,6 +163,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 
 	// TaskScheduler implementation
 
+	@Override
 	public ScheduledFuture schedule(Runnable task, Trigger trigger) {
 		ScheduledExecutorService executor = getScheduledExecutor();
 		try {
@@ -169,6 +176,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 		}
 	}
 
+	@Override
 	public ScheduledFuture schedule(Runnable task, Date startTime) {
 		ScheduledExecutorService executor = getScheduledExecutor();
 		long initialDelay = startTime.getTime() - System.currentTimeMillis();
@@ -180,6 +188,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 		}
 	}
 
+	@Override
 	public ScheduledFuture scheduleAtFixedRate(Runnable task, Date startTime, long period) {
 		ScheduledExecutorService executor = getScheduledExecutor();
 		long initialDelay = startTime.getTime() - System.currentTimeMillis();
@@ -191,6 +200,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 		}
 	}
 
+	@Override
 	public ScheduledFuture scheduleAtFixedRate(Runnable task, long period) {
 		ScheduledExecutorService executor = getScheduledExecutor();
 		try {
@@ -201,6 +211,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 		}
 	}
 
+	@Override
 	public ScheduledFuture scheduleWithFixedDelay(Runnable task, Date startTime, long delay) {
 		ScheduledExecutorService executor = getScheduledExecutor();
 		long initialDelay = startTime.getTime() - System.currentTimeMillis();
@@ -212,6 +223,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 		}
 	}
 
+	@Override
 	public ScheduledFuture scheduleWithFixedDelay(Runnable task, long delay) {
 		ScheduledExecutorService executor = getScheduledExecutor();
 		try {
@@ -238,6 +250,7 @@ public class ThreadPoolTaskScheduler extends ExecutorConfigurationSupport
 			this.errorHandler = errorHandler;
 		}
 
+		@Override
 		public V call() throws Exception {
 			try {
 				return delegate.call();
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java
index 39b86694d2..7900b9988e 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java
@@ -69,6 +69,7 @@ public class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParse
 			AnnotationConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME;
 
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		Object source = parserContext.extractSource(element);
 
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 592fd033c1..8198caeb67 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
@@ -278,6 +278,7 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean
 	 * Schedule all registered tasks against the underlying {@linkplain
 	 * #setTaskScheduler(TaskScheduler) task scheduler}.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		long now = System.currentTimeMillis();
 
@@ -325,6 +326,7 @@ public class ScheduledTaskRegistrar implements InitializingBean, DisposableBean
 		}
 	}
 
+	@Override
 	public void destroy() {
 		for (ScheduledFuture<?> future : this.scheduledFutures) {
 			future.cancel(true);
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..39b1b55668 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
@@ -67,11 +67,13 @@ public class TaskExecutorFactoryBean implements
 		this.keepAliveSeconds = keepAliveSeconds;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		Class<?> executorClass = (shouldUseBackport() ?
 				getClass().getClassLoader().loadClass("org.springframework.scheduling.backportconcurrent.ThreadPoolTaskExecutor") :
@@ -145,10 +147,12 @@ public class TaskExecutorFactoryBean implements
 	}
 
 
+	@Override
 	public TaskExecutor getObject() {
 		return this.target;
 	}
 
+	@Override
 	public Class<? extends TaskExecutor> getObjectType() {
 		if (this.target != null) {
 			return this.target.getClass();
@@ -156,11 +160,13 @@ public class TaskExecutorFactoryBean implements
 		return (!shouldUseBackport() ? ThreadPoolTaskExecutor.class : TaskExecutor.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
 
 
+	@Override
 	public void destroy() throws Exception {
 		if (this.target instanceof DisposableBean) {
 			((DisposableBean) this.target).destroy();
diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java b/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
index 6ba1d5a552..4d86209219 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java
@@ -26,6 +26,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  */
 public class TaskNamespaceHandler extends NamespaceHandlerSupport {
 
+	@Override
 	public void init() {
 		this.registerBeanDefinitionParser("annotation-driven", new AnnotationDrivenBeanDefinitionParser());
 		this.registerBeanDefinitionParser("executor", new ExecutorBeanDefinitionParser());
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 eca37982e6..40e5c1792f 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
@@ -55,6 +55,7 @@ public class CronTrigger implements Trigger {
 	}
 
 
+	@Override
 	public Date nextExecutionTime(TriggerContext triggerContext) {
 		Date date = triggerContext.lastCompletionTime();
 		if (date != null) {
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/DelegatingErrorHandlingRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/support/DelegatingErrorHandlingRunnable.java
index 34cd55286e..667933911c 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/DelegatingErrorHandlingRunnable.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/DelegatingErrorHandlingRunnable.java
@@ -48,6 +48,7 @@ public class DelegatingErrorHandlingRunnable implements Runnable {
 		this.errorHandler = errorHandler;
 	}
 
+	@Override
 	public void run() {
 		try {
 			this.delegate.run();
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java
index 142b832e3c..a3d755625a 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java
@@ -46,6 +46,7 @@ public class MethodInvokingRunnable extends ArgumentConvertingMethodInvoker
 	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
 
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
@@ -55,11 +56,13 @@ public class MethodInvokingRunnable extends ArgumentConvertingMethodInvoker
 		return ClassUtils.forName(className, this.beanClassLoader);
 	}
 
+	@Override
 	public void afterPropertiesSet() throws ClassNotFoundException, NoSuchMethodException {
 		prepare();
 	}
 
 
+	@Override
 	public void run() {
 		try {
 			invoke();
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java b/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
index b494e4c5ff..f2e5a4fb0d 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java
@@ -94,6 +94,7 @@ public class PeriodicTrigger implements Trigger {
 	/**
 	 * Returns the time after which a task should run again.
 	 */
+	@Override
 	public Date nextExecutionTime(TriggerContext triggerContext) {
 		if (triggerContext.lastScheduledExecutionTime() == null) {
 			return new Date(System.currentTimeMillis() + this.initialDelay);
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java
index 5b7b9350fb..165ab45fc6 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java
@@ -58,6 +58,7 @@ public class ScheduledMethodRunnable implements Runnable {
 	}
 
 
+	@Override
 	public void run() {
 		try {
 			ReflectionUtils.makeAccessible(this.method);
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java b/spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java
index 650d95ea73..d68534b3ab 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java
@@ -48,14 +48,17 @@ public class SimpleTriggerContext implements TriggerContext {
 	}
 
 
+	@Override
 	public Date lastScheduledExecutionTime() {
 		return this.lastScheduledExecutionTime;
 	}
 
+	@Override
 	public Date lastActualExecutionTime() {
 		return this.lastActualExecutionTime;
 	}
 
+	@Override
 	public Date lastCompletionTime() {
 		return this.lastCompletionTime;
 	}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java b/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java
index 81c16bc9a5..6f2dd2c18c 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java
@@ -90,6 +90,7 @@ public abstract class TaskUtils {
 
 		private final Log logger = LogFactory.getLog(LoggingErrorHandler.class);
 
+		@Override
 		public void handleError(Throwable t) {
 			if (logger.isErrorEnabled()) {
 				logger.error("Unexpected error occurred in scheduled task.", t);
@@ -104,6 +105,7 @@ public abstract class TaskUtils {
 	 */
 	static class PropagatingErrorHandler extends LoggingErrorHandler {
 
+		@Override
 		public void handleError(Throwable t) {
 			super.handleError(t);
 			ReflectionUtils.rethrowRuntimeException(t);
diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java
index 389e9a76b9..1b9c978c38 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java
@@ -53,14 +53,17 @@ public class MethodInvokingTimerTaskFactoryBean extends MethodInvokingRunnable i
 	}
 
 
+	@Override
 	public TimerTask getObject() {
 		return this.timerTask;
 	}
 
+	@Override
 	public Class<TimerTask> getObjectType() {
 		return TimerTask.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java
index c0de9b4eb9..18faa7926f 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java
@@ -88,11 +88,13 @@ public class TimerFactoryBean implements FactoryBean<Timer>, BeanNameAware, Init
 		this.daemon = daemon;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		logger.info("Initializing Timer");
 		this.timer = createTimer(this.beanName, this.daemon);
@@ -144,14 +146,17 @@ public class TimerFactoryBean implements FactoryBean<Timer>, BeanNameAware, Init
 	}
 
 
+	@Override
 	public Timer getObject() {
 		return this.timer;
 	}
 
+	@Override
 	public Class<? extends Timer> getObjectType() {
 		return Timer.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -161,6 +166,7 @@ public class TimerFactoryBean implements FactoryBean<Timer>, BeanNameAware, Init
 	 * Cancel the Timer on bean factory shutdown, stopping all scheduled tasks.
 	 * @see java.util.Timer#cancel()
 	 */
+	@Override
 	public void destroy() {
 		logger.info("Cancelling Timer");
 		this.timer.cancel();
diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java
index 03979dc45a..af24b3ba18 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java
@@ -96,11 +96,13 @@ public class TimerTaskExecutor implements SchedulingTaskExecutor, BeanNameAware,
 		this.delay = delay;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.timer == null) {
 			logger.info("Initializing Timer");
@@ -141,21 +143,25 @@ public class TimerTaskExecutor implements SchedulingTaskExecutor, BeanNameAware,
 	 * wrapping it in a {@link DelegatingTimerTask}.
 	 * @param task the task to be executed
 	 */
+	@Override
 	public void execute(Runnable task) {
 		getTimer().schedule(new DelegatingTimerTask(task), this.delay);
 	}
 
+	@Override
 	public void execute(Runnable task, long startTimeout) {
 		long actualDelay = (startTimeout < this.delay ? startTimeout : this.delay);
 		getTimer().schedule(new DelegatingTimerTask(task), actualDelay);
 	}
 
+	@Override
 	public Future<?> submit(Runnable task) {
 		FutureTask<Object> future = new FutureTask<Object>(task, null);
 		execute(future);
 		return future;
 	}
 
+	@Override
 	public <T> Future<T> submit(Callable<T> task) {
 		FutureTask<T> future = new FutureTask<T>(task);
 		execute(future);
@@ -165,6 +171,7 @@ public class TimerTaskExecutor implements SchedulingTaskExecutor, BeanNameAware,
 	/**
 	 * This task executor prefers short-lived work units.
 	 */
+	@Override
 	public boolean prefersShortLivedTasks() {
 		return true;
 	}
@@ -174,6 +181,7 @@ public class TimerTaskExecutor implements SchedulingTaskExecutor, BeanNameAware,
 	 * Cancel the {@link Timer} on bean factory shutdown, stopping all scheduled tasks.
 	 * @see java.util.Timer#cancel()
 	 */
+	@Override
 	public void destroy() {
 		if (this.timerInternal) {
 			logger.info("Cancelling Timer");
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..f22a9a50a8 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
@@ -84,15 +84,18 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 		this.scriptInterfaces = scriptInterfaces;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
 
 
+	@Override
 	public String getScriptSourceLocator() {
 		return this.scriptSourceLocator;
 	}
 
+	@Override
 	public Class[] getScriptInterfaces() {
 		return this.scriptInterfaces;
 	}
@@ -100,6 +103,7 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 	/**
 	 * BeanShell scripts do require a config interface.
 	 */
+	@Override
 	public boolean requiresConfigInterface() {
 		return true;
 	}
@@ -108,6 +112,7 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 	 * Load and parse the BeanShell script via {@link BshScriptUtils}.
 	 * @see BshScriptUtils#createBshObject(String, Class[], ClassLoader)
 	 */
+	@Override
 	public Object getScriptedObject(ScriptSource scriptSource, Class[] actualInterfaces)
 			throws IOException, ScriptCompilationException {
 
@@ -159,6 +164,7 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 		}
 	}
 
+	@Override
 	public Class getScriptedObjectType(ScriptSource scriptSource)
 			throws IOException, ScriptCompilationException {
 
@@ -177,6 +183,7 @@ public class BshScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 		}
 	}
 
+	@Override
 	public boolean requiresScriptedObjectRefresh(ScriptSource scriptSource) {
 		synchronized (this.scriptClassMonitor) {
 			return (scriptSource.isModified() || this.wasModifiedForTypeCheck);
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..1ad320493c 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
@@ -173,6 +173,7 @@ public abstract class BshScriptUtils {
 			this.xt = xt;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			if (ReflectionUtils.isEqualsMethod(method)) {
 				return (isProxyForSameBshObject(args[0]));
diff --git a/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java b/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
index e66455a8d6..b7888faa78 100644
--- a/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java
@@ -39,6 +39,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  */
 public class LangNamespaceHandler extends NamespaceHandlerSupport {
 
+	@Override
 	public void init() {
 		registerScriptBeanDefinitionParser("groovy", "org.springframework.scripting.groovy.GroovyScriptFactory");
 		registerScriptBeanDefinitionParser("jruby", "org.springframework.scripting.jruby.JRubyScriptFactory");
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..b545262486 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
@@ -35,6 +35,7 @@ public class ScriptingDefaultsParser implements BeanDefinitionParser {
 	private static final String PROXY_TARGET_CLASS_ATTRIBUTE = "proxy-target-class";
 
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		BeanDefinition bd =
 				LangNamespaceUtils.registerScriptFactoryPostProcessorIfNecessary(parserContext.getRegistry());
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..85bebc5731 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
@@ -99,12 +99,14 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
 	}
 
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		if (beanFactory instanceof ConfigurableListableBeanFactory) {
 			((ConfigurableListableBeanFactory) beanFactory).ignoreDependencyType(MetaClass.class);
 		}
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.groovyClassLoader = new GroovyClassLoader(classLoader);
 	}
@@ -122,6 +124,7 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
 	}
 
 
+	@Override
 	public String getScriptSourceLocator() {
 		return this.scriptSourceLocator;
 	}
@@ -131,6 +134,7 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
 	 * hence we don't need to explicitly expose interfaces here.
 	 * @return {@code null} always
 	 */
+	@Override
 	public Class[] getScriptInterfaces() {
 		return null;
 	}
@@ -139,6 +143,7 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
 	 * Groovy scripts do not need a config interface,
 	 * since they expose their setters as public methods.
 	 */
+	@Override
 	public boolean requiresConfigInterface() {
 		return false;
 	}
@@ -148,6 +153,7 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
 	 * Loads and parses the Groovy script via the GroovyClassLoader.
 	 * @see groovy.lang.GroovyClassLoader
 	 */
+	@Override
 	public Object getScriptedObject(ScriptSource scriptSource, Class[] actualInterfaces)
 			throws IOException, ScriptCompilationException {
 
@@ -189,6 +195,7 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
 		}
 	}
 
+	@Override
 	public Class getScriptedObjectType(ScriptSource scriptSource)
 			throws IOException, ScriptCompilationException {
 
@@ -218,6 +225,7 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
 		}
 	}
 
+	@Override
 	public boolean requiresScriptedObjectRefresh(ScriptSource scriptSource) {
 		synchronized (this.scriptClassMonitor) {
 			return (scriptSource.isModified() || this.wasModifiedForTypeCheck);
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..81a785e222 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
@@ -67,15 +67,18 @@ public class JRubyScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 	}
 
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
 
 
+	@Override
 	public String getScriptSourceLocator() {
 		return this.scriptSourceLocator;
 	}
 
+	@Override
 	public Class[] getScriptInterfaces() {
 		return this.scriptInterfaces;
 	}
@@ -83,6 +86,7 @@ public class JRubyScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 	/**
 	 * JRuby scripts do require a config interface.
 	 */
+	@Override
 	public boolean requiresConfigInterface() {
 		return true;
 	}
@@ -91,6 +95,7 @@ public class JRubyScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 	 * Load and parse the JRuby script via JRubyScriptUtils.
 	 * @see JRubyScriptUtils#createJRubyObject(String, Class[], ClassLoader)
 	 */
+	@Override
 	public Object getScriptedObject(ScriptSource scriptSource, Class[] actualInterfaces)
 			throws IOException, ScriptCompilationException {
 		try {
@@ -108,12 +113,14 @@ public class JRubyScriptFactory implements ScriptFactory, BeanClassLoaderAware {
 		}
 	}
 
+	@Override
 	public Class getScriptedObjectType(ScriptSource scriptSource)
 			throws IOException, ScriptCompilationException {
 
 		return null;
 	}
 
+	@Override
 	public boolean requiresScriptedObjectRefresh(ScriptSource scriptSource) {
 		return scriptSource.isModified();
 	}
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 2271d1b53d..1aecc365a8 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
@@ -161,6 +161,7 @@ public abstract class JRubyScriptUtils {
 			this.ruby = ruby;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			if (ReflectionUtils.isEqualsMethod(method)) {
 				return (isProxyForSameRubyObject(args[0]));
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 23be717eac..ea4ee583d2 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
@@ -74,6 +74,7 @@ public class ResourceScriptSource implements ScriptSource {
 		return this.resource;
 	}
 
+	@Override
 	public String getScriptAsString() throws IOException {
 		synchronized (this.lastModifiedMonitor) {
 			this.lastModified = retrieveLastModifiedTime();
@@ -86,6 +87,7 @@ public class ResourceScriptSource implements ScriptSource {
 		return FileCopyUtils.copyToString(reader);
 	}
 
+	@Override
 	public boolean isModified() {
 		synchronized (this.lastModifiedMonitor) {
 			return (this.lastModified < 0 || retrieveLastModifiedTime() > this.lastModified);
@@ -108,6 +110,7 @@ public class ResourceScriptSource implements ScriptSource {
 		}
 	}
 
+	@Override
 	public String suggestedClassName() {
 		return StringUtils.stripFilenameExtension(getResource().getFilename());
 	}
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..84ea6a9d27 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
@@ -200,10 +200,12 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces
 		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,10 +228,12 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces
 		}
 	}
 
+	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.resourceLoader = resourceLoader;
 	}
 
+	@Override
 	public int getOrder() {
 		return Integer.MIN_VALUE;
 	}
@@ -570,6 +574,7 @@ public class ScriptFactoryPostProcessor extends InstantiationAwareBeanPostProces
 	/**
 	 * 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/scripting/support/StaticScriptSource.java b/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java
index 5afede47a8..dbd937a0f0 100644
--- a/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java
+++ b/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java
@@ -68,15 +68,18 @@ public class StaticScriptSource implements ScriptSource {
 	}
 
 
+	@Override
 	public synchronized String getScriptAsString() {
 		this.modified = false;
 		return this.script;
 	}
 
+	@Override
 	public synchronized boolean isModified() {
 		return this.modified;
 	}
 
+	@Override
 	public String suggestedClassName() {
 		return this.className;
 	}
diff --git a/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java b/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java
index b2710d4bde..c7b6ffbb14 100644
--- a/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java
+++ b/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java
@@ -59,6 +59,7 @@ public class ExtendedModelMap extends ModelMap implements Model {
 		return this;
 	}
 
+	@Override
 	public Map<String, Object> asMap() {
 		return this;
 	}
diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java
index 789e0132cd..75caa42182 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java
@@ -36,15 +36,18 @@ public class DelegatingThemeSource implements HierarchicalThemeSource {
 	private ThemeSource parentThemeSource;
 
 
+	@Override
 	public void setParentThemeSource(ThemeSource parentThemeSource) {
 		this.parentThemeSource = parentThemeSource;
 	}
 
+	@Override
 	public ThemeSource getParentThemeSource() {
 		return parentThemeSource;
 	}
 
 
+	@Override
 	public Theme getTheme(String themeName) {
 		if (this.parentThemeSource != null) {
 			return this.parentThemeSource.getTheme(themeName);
diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
index a0c195df32..c595af8cf2 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java
@@ -53,6 +53,7 @@ public class ResourceBundleThemeSource implements HierarchicalThemeSource {
 	private final Map<String, Theme> themeCache = new HashMap<String, Theme>();
 
 
+	@Override
 	public void setParentThemeSource(ThemeSource parent) {
 		this.parentThemeSource = parent;
 
@@ -65,6 +66,7 @@ public class ResourceBundleThemeSource implements HierarchicalThemeSource {
 		}
 	}
 
+	@Override
 	public ThemeSource getParentThemeSource() {
 		return this.parentThemeSource;
 	}
@@ -93,6 +95,7 @@ public class ResourceBundleThemeSource implements HierarchicalThemeSource {
 	 * @see #setBasenamePrefix
 	 * @see #createMessageSource
 	 */
+	@Override
 	public Theme getTheme(String themeName) {
 		if (themeName == null) {
 			return null;
diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java b/spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java
index 47910c9995..37d14c5115 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java
@@ -47,10 +47,12 @@ public class SimpleTheme implements Theme {
 	}
 
 
+	@Override
 	public final String getName() {
 		return this.name;
 	}
 
+	@Override
 	public final MessageSource getMessageSource() {
 		return this.messageSource;
 	}
diff --git a/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java b/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java
index 65ead97598..5d33eb37ec 100644
--- a/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java
+++ b/spring-context/src/main/java/org/springframework/validation/AbstractBindingResult.java
@@ -84,15 +84,18 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 	// Implementation of the Errors interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public String getObjectName() {
 		return this.objectName;
 	}
 
 
+	@Override
 	public void reject(String errorCode, Object[] errorArgs, String defaultMessage) {
 		addError(new ObjectError(getObjectName(), resolveMessageCodes(errorCode), errorArgs, defaultMessage));
 	}
 
+	@Override
 	public void rejectValue(String field, String errorCode, Object[] errorArgs, String defaultMessage) {
 		if ("".equals(getNestedPath()) && !StringUtils.hasLength(field)) {
 			// We're at the top of the nested object hierarchy,
@@ -109,10 +112,12 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 		addError(fe);
 	}
 
+	@Override
 	public void addError(ObjectError error) {
 		this.errors.add(error);
 	}
 
+	@Override
 	public void addAllErrors(Errors errors) {
 		if (!errors.getObjectName().equals(getObjectName())) {
 			throw new IllegalArgumentException("Errors object needs to have same object name");
@@ -120,10 +125,12 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 		this.errors.addAll(errors.getAllErrors());
 	}
 
+	@Override
 	public String[] resolveMessageCodes(String errorCode) {
 		return getMessageCodesResolver().resolveMessageCodes(errorCode, getObjectName());
 	}
 
+	@Override
 	public String[] resolveMessageCodes(String errorCode, String field) {
 		Class<?> fieldType = getFieldType(field);
 		return getMessageCodesResolver().resolveMessageCodes(
@@ -146,6 +153,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 		return Collections.unmodifiableList(this.errors);
 	}
 
+	@Override
 	public List<ObjectError> getGlobalErrors() {
 		List<ObjectError> result = new LinkedList<ObjectError>();
 		for (ObjectError objectError : this.errors) {
@@ -166,6 +174,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 		return null;
 	}
 
+	@Override
 	public List<FieldError> getFieldErrors() {
 		List<FieldError> result = new LinkedList<FieldError>();
 		for (ObjectError objectError : this.errors) {
@@ -212,6 +221,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 		return null;
 	}
 
+	@Override
 	public Object getFieldValue(String field) {
 		FieldError fieldError = getFieldError(field);
 		// Use rejected value in case of error, current bean property value else.
@@ -262,6 +272,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 	 * @see org.springframework.web.servlet.tags.BindTag
 	 * @see org.springframework.web.servlet.mvc.SimpleFormController
 	 */
+	@Override
 	public Map<String, Object> getModel() {
 		Map<String, Object> model = new LinkedHashMap<String, Object>(2);
 		// Mapping from name to target object.
@@ -271,6 +282,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 		return model;
 	}
 
+	@Override
 	public Object getRawFieldValue(String field) {
 		return getActualFieldValue(fixedField(field));
 	}
@@ -280,6 +292,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 	 * {@link #getPropertyEditorRegistry() PropertyEditorRegistry}'s
 	 * editor lookup facility, if available.
 	 */
+	@Override
 	public PropertyEditor findEditor(String field, Class<?> valueType) {
 		PropertyEditorRegistry editorRegistry = getPropertyEditorRegistry();
 		if (editorRegistry != null) {
@@ -297,6 +310,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 	/**
 	 * This implementation returns {@code null}.
 	 */
+	@Override
 	public PropertyEditorRegistry getPropertyEditorRegistry() {
 		return null;
 	}
@@ -307,6 +321,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 	 * detected to target a disallowed field.
 	 * @see DataBinder#setAllowedFields
 	 */
+	@Override
 	public void recordSuppressedField(String field) {
 		this.suppressedFields.add(field);
 	}
@@ -317,6 +332,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 	 * disallowed fields.
 	 * @see DataBinder#setAllowedFields
 	 */
+	@Override
 	public String[] getSuppressedFields() {
 		return StringUtils.toStringArray(this.suppressedFields);
 	}
@@ -349,6 +365,7 @@ public abstract class AbstractBindingResult extends AbstractErrors implements Bi
 	/**
 	 * Return the wrapped target object.
 	 */
+	@Override
 	public abstract Object getTarget();
 
 	/**
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..18c566644c 100644
--- a/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java
+++ b/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java
@@ -41,20 +41,24 @@ public abstract class AbstractErrors implements Errors, Serializable {
 	private final Stack<String> nestedPathStack = new Stack<String>();
 
 
+	@Override
 	public void setNestedPath(String nestedPath) {
 		doSetNestedPath(nestedPath);
 		this.nestedPathStack.clear();
 	}
 
+	@Override
 	public String getNestedPath() {
 		return this.nestedPath;
 	}
 
+	@Override
 	public void pushNestedPath(String subPath) {
 		this.nestedPathStack.push(getNestedPath());
 		doSetNestedPath(getNestedPath() + subPath);
 	}
 
+	@Override
 	public void popNestedPath() throws IllegalArgumentException {
 		try {
 			String formerNestedPath = this.nestedPathStack.pop();
@@ -106,31 +110,38 @@ public abstract class AbstractErrors implements Errors, Serializable {
 	}
 
 
+	@Override
 	public void reject(String errorCode) {
 		reject(errorCode, null, null);
 	}
 
+	@Override
 	public void reject(String errorCode, String defaultMessage) {
 		reject(errorCode, null, defaultMessage);
 	}
 
+	@Override
 	public void rejectValue(String field, String errorCode) {
 		rejectValue(field, errorCode, null, null);
 	}
 
+	@Override
 	public void rejectValue(String field, String errorCode, String defaultMessage) {
 		rejectValue(field, errorCode, null, defaultMessage);
 	}
 
 
+	@Override
 	public boolean hasErrors() {
 		return !getAllErrors().isEmpty();
 	}
 
+	@Override
 	public int getErrorCount() {
 		return getAllErrors().size();
 	}
 
+	@Override
 	public List<ObjectError> getAllErrors() {
 		List<ObjectError> result = new LinkedList<ObjectError>();
 		result.addAll(getGlobalErrors());
@@ -138,40 +149,49 @@ public abstract class AbstractErrors implements Errors, Serializable {
 		return Collections.unmodifiableList(result);
 	}
 
+	@Override
 	public boolean hasGlobalErrors() {
 		return (getGlobalErrorCount() > 0);
 	}
 
+	@Override
 	public int getGlobalErrorCount() {
 		return getGlobalErrors().size();
 	}
 
+	@Override
 	public ObjectError getGlobalError() {
 		List<ObjectError> globalErrors = getGlobalErrors();
 		return (!globalErrors.isEmpty() ? globalErrors.get(0) : null);
 	}
 
+	@Override
 	public boolean hasFieldErrors() {
 		return (getFieldErrorCount() > 0);
 	}
 
+	@Override
 	public int getFieldErrorCount() {
 		return getFieldErrors().size();
 	}
 
+	@Override
 	public FieldError getFieldError() {
 		List<FieldError> fieldErrors = getFieldErrors();
 		return (!fieldErrors.isEmpty() ? fieldErrors.get(0) : null);
 	}
 
+	@Override
 	public boolean hasFieldErrors(String field) {
 		return (getFieldErrorCount(field) > 0);
 	}
 
+	@Override
 	public int getFieldErrorCount(String field) {
 		return getFieldErrors(field).size();
 	}
 
+	@Override
 	public List<FieldError> getFieldErrors(String field) {
 		List<FieldError> fieldErrors = getFieldErrors();
 		List<FieldError> result = new LinkedList<FieldError>();
@@ -184,12 +204,14 @@ public abstract class AbstractErrors implements Errors, Serializable {
 		return Collections.unmodifiableList(result);
 	}
 
+	@Override
 	public FieldError getFieldError(String field) {
 		List<FieldError> fieldErrors = getFieldErrors(field);
 		return (!fieldErrors.isEmpty() ? fieldErrors.get(0) : null);
 	}
 
 
+	@Override
 	public Class<?> getFieldType(String field) {
 		Object value = getFieldValue(field);
 		if (value != null) {
diff --git a/spring-context/src/main/java/org/springframework/validation/BindException.java b/spring-context/src/main/java/org/springframework/validation/BindException.java
index e7896996b3..fc3e8e00fa 100644
--- a/spring-context/src/main/java/org/springframework/validation/BindException.java
+++ b/spring-context/src/main/java/org/springframework/validation/BindException.java
@@ -77,161 +77,200 @@ public class BindException extends Exception implements BindingResult {
 	}
 
 
+	@Override
 	public String getObjectName() {
 		return this.bindingResult.getObjectName();
 	}
 
+	@Override
 	public void setNestedPath(String nestedPath) {
 		this.bindingResult.setNestedPath(nestedPath);
 	}
 
+	@Override
 	public String getNestedPath() {
 		return this.bindingResult.getNestedPath();
 	}
 
+	@Override
 	public void pushNestedPath(String subPath) {
 		this.bindingResult.pushNestedPath(subPath);
 	}
 
+	@Override
 	public void popNestedPath() throws IllegalStateException {
 		this.bindingResult.popNestedPath();
 	}
 
 
+	@Override
 	public void reject(String errorCode) {
 		this.bindingResult.reject(errorCode);
 	}
 
+	@Override
 	public void reject(String errorCode, String defaultMessage) {
 		this.bindingResult.reject(errorCode, defaultMessage);
 	}
 
+	@Override
 	public void reject(String errorCode, Object[] errorArgs, String defaultMessage) {
 		this.bindingResult.reject(errorCode, errorArgs, defaultMessage);
 	}
 
+	@Override
 	public void rejectValue(String field, String errorCode) {
 		this.bindingResult.rejectValue(field, errorCode);
 	}
 
+	@Override
 	public void rejectValue(String field, String errorCode, String defaultMessage) {
 		this.bindingResult.rejectValue(field, errorCode, defaultMessage);
 	}
 
+	@Override
 	public void rejectValue(String field, String errorCode, Object[] errorArgs, String defaultMessage) {
 		this.bindingResult.rejectValue(field, errorCode, errorArgs, defaultMessage);
 	}
 
+	@Override
 	public void addAllErrors(Errors errors) {
 		this.bindingResult.addAllErrors(errors);
 	}
 
 
+	@Override
 	public boolean hasErrors() {
 		return this.bindingResult.hasErrors();
 	}
 
+	@Override
 	public int getErrorCount() {
 		return this.bindingResult.getErrorCount();
 	}
 
+	@Override
 	public List<ObjectError> getAllErrors() {
 		return this.bindingResult.getAllErrors();
 	}
 
+	@Override
 	public boolean hasGlobalErrors() {
 		return this.bindingResult.hasGlobalErrors();
 	}
 
+	@Override
 	public int getGlobalErrorCount() {
 		return this.bindingResult.getGlobalErrorCount();
 	}
 
+	@Override
 	public List<ObjectError> getGlobalErrors() {
 		return this.bindingResult.getGlobalErrors();
 	}
 
+	@Override
 	public ObjectError getGlobalError() {
 		return this.bindingResult.getGlobalError();
 	}
 
+	@Override
 	public boolean hasFieldErrors() {
 		return this.bindingResult.hasFieldErrors();
 	}
 
+	@Override
 	public int getFieldErrorCount() {
 		return this.bindingResult.getFieldErrorCount();
 	}
 
+	@Override
 	public List<FieldError> getFieldErrors() {
 		return this.bindingResult.getFieldErrors();
 	}
 
+	@Override
 	public FieldError getFieldError() {
 		return this.bindingResult.getFieldError();
 	}
 
+	@Override
 	public boolean hasFieldErrors(String field) {
 		return this.bindingResult.hasFieldErrors(field);
 	}
 
+	@Override
 	public int getFieldErrorCount(String field) {
 		return this.bindingResult.getFieldErrorCount(field);
 	}
 
+	@Override
 	public List<FieldError> getFieldErrors(String field) {
 		return this.bindingResult.getFieldErrors(field);
 	}
 
+	@Override
 	public FieldError getFieldError(String field) {
 		return this.bindingResult.getFieldError(field);
 	}
 
+	@Override
 	public Object getFieldValue(String field) {
 		return this.bindingResult.getFieldValue(field);
 	}
 
+	@Override
 	public Class<?> getFieldType(String field) {
 		return this.bindingResult.getFieldType(field);
 	}
 
+	@Override
 	public Object getTarget() {
 		return this.bindingResult.getTarget();
 	}
 
+	@Override
 	public Map<String, Object> getModel() {
 		return this.bindingResult.getModel();
 	}
 
+	@Override
 	public Object getRawFieldValue(String field) {
 		return this.bindingResult.getRawFieldValue(field);
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public PropertyEditor findEditor(String field, Class valueType) {
 		return this.bindingResult.findEditor(field, valueType);
 	}
 
+	@Override
 	public PropertyEditorRegistry getPropertyEditorRegistry() {
 		return this.bindingResult.getPropertyEditorRegistry();
 	}
 
+	@Override
 	public void addError(ObjectError error) {
 		this.bindingResult.addError(error);
 	}
 
+	@Override
 	public String[] resolveMessageCodes(String errorCode) {
 		return this.bindingResult.resolveMessageCodes(errorCode);
 	}
 
+	@Override
 	public String[] resolveMessageCodes(String errorCode, String field) {
 		return this.bindingResult.resolveMessageCodes(errorCode, field);
 	}
 
+	@Override
 	public void recordSuppressedField(String field) {
 		this.bindingResult.recordSuppressedField(field);
 	}
 
+	@Override
 	public String[] getSuppressedFields() {
 		return this.bindingResult.getSuppressedFields();
 	}
diff --git a/spring-context/src/main/java/org/springframework/validation/DataBinder.java b/spring-context/src/main/java/org/springframework/validation/DataBinder.java
index a9d5d83587..791668470a 100644
--- a/spring-context/src/main/java/org/springframework/validation/DataBinder.java
+++ b/spring-context/src/main/java/org/springframework/validation/DataBinder.java
@@ -532,28 +532,34 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
 		return this.conversionService;
 	}
 
+	@Override
 	public void registerCustomEditor(Class<?> requiredType, PropertyEditor propertyEditor) {
 		getPropertyEditorRegistry().registerCustomEditor(requiredType, propertyEditor);
 	}
 
+	@Override
 	public void registerCustomEditor(Class<?> requiredType, String field, PropertyEditor propertyEditor) {
 		getPropertyEditorRegistry().registerCustomEditor(requiredType, field, propertyEditor);
 	}
 
+	@Override
 	public PropertyEditor findCustomEditor(Class<?> requiredType, String propertyPath) {
 		return getPropertyEditorRegistry().findCustomEditor(requiredType, propertyPath);
 	}
 
+	@Override
 	public <T> T convertIfNecessary(Object value, Class<T> requiredType) throws TypeMismatchException {
 		return getTypeConverter().convertIfNecessary(value, requiredType);
 	}
 
+	@Override
 	public <T> T convertIfNecessary(Object value, Class<T> requiredType, MethodParameter methodParam)
 			throws TypeMismatchException {
 
 		return getTypeConverter().convertIfNecessary(value, requiredType, methodParam);
 	}
 
+	@Override
 	public <T> T convertIfNecessary(Object value, Class<T> requiredType, Field field)
 			throws TypeMismatchException {
 
diff --git a/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java b/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java
index 08fc3b97e5..e1ae7d4b5d 100644
--- a/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java
+++ b/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java
@@ -52,6 +52,7 @@ public class DefaultBindingErrorProcessor implements BindingErrorProcessor {
 	public static final String MISSING_FIELD_ERROR_CODE = "required";
 
 
+	@Override
 	public void processMissingFieldError(String missingField, BindingResult bindingResult) {
 		// Create field error with code "required".
 		String fixedField = bindingResult.getNestedPath() + missingField;
@@ -62,6 +63,7 @@ public class DefaultBindingErrorProcessor implements BindingErrorProcessor {
 				codes, arguments, "Field '" + fixedField + "' is required"));
 	}
 
+	@Override
 	public void processPropertyAccessException(PropertyAccessException ex, BindingResult bindingResult) {
 		// Create field error with the exceptions's code, e.g. "typeMismatch".
 		String field = ex.getPropertyName();
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..4973f1e480 100644
--- a/spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
+++ b/spring-context/src/main/java/org/springframework/validation/DefaultMessageCodesResolver.java
@@ -131,6 +131,7 @@ public class DefaultMessageCodesResolver implements MessageCodesResolver, Serial
 	}
 
 
+	@Override
 	public String[] resolveMessageCodes(String errorCode, String objectName) {
 		return resolveMessageCodes(errorCode, objectName, "", null);
 	}
@@ -144,6 +145,7 @@ public class DefaultMessageCodesResolver implements MessageCodesResolver, Serial
 	 * details on the generated codes.
 	 * @return the list of codes
 	 */
+	@Override
 	public String[] resolveMessageCodes(String errorCode, String objectName, String field, Class<?> fieldType) {
 		Set<String> codeList = new LinkedHashSet<String>();
 		List<String> fieldList = new ArrayList<String>();
@@ -220,6 +222,7 @@ public class DefaultMessageCodesResolver implements MessageCodesResolver, Serial
 		 * {@code errorCode + "." + object name + "." + field}
 		 */
 		PREFIX_ERROR_CODE {
+			@Override
 			public String format(String errorCode, String objectName, String field) {
 				return toDelimitedString(errorCode, objectName, field);
 			}
@@ -230,6 +233,7 @@ public class DefaultMessageCodesResolver implements MessageCodesResolver, Serial
 		 * {@code object name + "." + field + "." + errorCode}
 		 */
 		POSTFIX_ERROR_CODE {
+			@Override
 			public String format(String errorCode, String objectName, String field) {
 				return toDelimitedString(objectName, field, errorCode);
 			}
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java
index 899207cb5a..d88ab54298 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java
@@ -72,6 +72,7 @@ public class BeanValidationPostProcessor implements BeanPostProcessor, Initializ
 		this.afterInitialization = afterInitialization;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.validator == null) {
 			this.validator = Validation.buildDefaultValidatorFactory().getValidator();
@@ -79,6 +80,7 @@ public class BeanValidationPostProcessor implements BeanPostProcessor, Initializ
 	}
 
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		if (!this.afterInitialization) {
 			doValidate(bean);
@@ -86,6 +88,7 @@ public class BeanValidationPostProcessor implements BeanPostProcessor, Initializ
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 		if (this.afterInitialization) {
 			doValidate(bean);
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java
index 2001e78aee..1648ebc340 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java
@@ -65,6 +65,7 @@ public class CustomValidatorBean extends SpringValidatorAdapter implements Valid
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.validatorFactory == null) {
 			this.validatorFactory = Validation.buildDefaultValidatorFactory();
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..48e3372dd3 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
@@ -171,11 +171,13 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter
 		return this.validationPropertyMap;
 	}
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 	}
 
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void afterPropertiesSet() {
 		@SuppressWarnings("rawtypes")
@@ -222,22 +224,27 @@ public class LocalValidatorFactoryBean extends SpringValidatorAdapter
 	}
 
 
+	@Override
 	public Validator getValidator() {
 		return this.validatorFactory.getValidator();
 	}
 
+	@Override
 	public ValidatorContext usingContext() {
 		return this.validatorFactory.usingContext();
 	}
 
+	@Override
 	public MessageInterpolator getMessageInterpolator() {
 		return this.validatorFactory.getMessageInterpolator();
 	}
 
+	@Override
 	public TraversableResolver getTraversableResolver() {
 		return this.validatorFactory.getTraversableResolver();
 	}
 
+	@Override
 	public ConstraintValidatorFactory getConstraintValidatorFactory() {
 		return this.validatorFactory.getConstraintValidatorFactory();
 	}
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java
index 06c897fc16..afaf2d047a 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java
@@ -45,10 +45,12 @@ public class LocaleContextMessageInterpolator implements MessageInterpolator {
 	}
 
 
+	@Override
 	public String interpolate(String message, Context context) {
 		return this.targetInterpolator.interpolate(message, context, LocaleContextHolder.getLocale());
 	}
 
+	@Override
 	public String interpolate(String message, Context context, Locale locale) {
 		return this.targetInterpolator.interpolate(message, context, locale);
 	}
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java
index 83c538e38c..9f17fab589 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java
@@ -48,6 +48,7 @@ public class MessageSourceResourceBundleLocator implements ResourceBundleLocator
 		this.messageSource = messageSource;
 	}
 
+	@Override
 	public ResourceBundle getResourceBundle(Locale locale) {
 		return new MessageSourceResourceBundle(this.messageSource, locale);
 	}
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
index 58cd161175..b2e06ed05c 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java
@@ -83,6 +83,7 @@ public class MethodValidationInterceptor implements MethodInterceptor {
 	}
 
 
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		Class[] groups = determineValidationGroups(invocation);
 		Set<MethodConstraintViolation<Object>> result = this.validator.validateAllParameters(
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..de7450ed6f 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
@@ -96,6 +96,7 @@ public class MethodValidationPostProcessor extends AbstractAdvisingBeanPostProce
 		this.validator = validatorFactory.getValidator();
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		Pointcut pointcut = new AnnotationMatchingPointcut(this.validatedAnnotationType, true);
 		Advice advice = (this.validator != null ? new MethodValidationInterceptor(this.validator) :
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java
index e619287cff..878e7bb6d0 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java
@@ -46,6 +46,7 @@ public class SpringConstraintValidatorFactory implements ConstraintValidatorFact
 	}
 
 
+	@Override
 	public <T extends ConstraintValidator<?, ?>> T getInstance(Class<T> key) {
 		return this.beanFactory.createBean(key);
 	}
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
index 1a51c37bb9..99e9802234 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
@@ -81,14 +81,17 @@ public class SpringValidatorAdapter implements SmartValidator, javax.validation.
 	// Implementation of Spring Validator interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public boolean supports(Class<?> clazz) {
 		return true;
 	}
 
+	@Override
 	public void validate(Object target, Errors errors) {
 		processConstraintViolations(this.targetValidator.validate(target), errors);
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public void validate(Object target, Errors errors, Object... validationHints) {
 		Set<Class> groups = new LinkedHashSet<Class>();
@@ -191,24 +194,29 @@ public class SpringValidatorAdapter implements SmartValidator, javax.validation.
 	// Implementation of JSR-303 Validator interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public <T> Set<ConstraintViolation<T>> validate(T object, Class<?>... groups) {
 		return this.targetValidator.validate(object, groups);
 	}
 
+	@Override
 	public <T> Set<ConstraintViolation<T>> validateProperty(T object, String propertyName, Class<?>... groups) {
 		return this.targetValidator.validateProperty(object, propertyName, groups);
 	}
 
+	@Override
 	public <T> Set<ConstraintViolation<T>> validateValue(
 			Class<T> beanType, String propertyName, Object value, Class<?>... groups) {
 
 		return this.targetValidator.validateValue(beanType, propertyName, value, groups);
 	}
 
+	@Override
 	public BeanDescriptor getConstraintsForClass(Class<?> clazz) {
 		return this.targetValidator.getConstraintsForClass(clazz);
 	}
 
+	@Override
 	public <T> T unwrap(Class<T> type) {
 		return this.targetValidator.unwrap(type);
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java b/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java
index cf351f42cf..dbbe1aff51 100644
--- a/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java
+++ b/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java
@@ -39,6 +39,7 @@ public abstract class AttributeAccessorSupport implements AttributeAccessor, Ser
 	private final Map<String, Object> attributes = new LinkedHashMap<String, Object>(0);
 
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		Assert.notNull(name, "Name must not be null");
 		if (value != null) {
@@ -49,21 +50,25 @@ public abstract class AttributeAccessorSupport implements AttributeAccessor, Ser
 		}
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		Assert.notNull(name, "Name must not be null");
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Object removeAttribute(String name) {
 		Assert.notNull(name, "Name must not be null");
 		return this.attributes.remove(name);
 	}
 
+	@Override
 	public boolean hasAttribute(String name) {
 		Assert.notNull(name, "Name must not be null");
 		return this.attributes.containsKey(name);
 	}
 
+	@Override
 	public String[] attributeNames() {
 		return this.attributes.keySet().toArray(new String[this.attributes.size()]);
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java b/spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java
index 6430ff7fb2..e47f72eaeb 100644
--- a/spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java
@@ -61,6 +61,7 @@ public abstract class ControlFlowFactory {
 		/**
 		 * Searches for class name match in a StackTraceElement.
 		 */
+		@Override
 		public boolean under(Class clazz) {
 			Assert.notNull(clazz, "Class must not be null");
 			String className = clazz.getName();
@@ -76,6 +77,7 @@ public abstract class ControlFlowFactory {
 		 * Searches for class name match plus method name match
 		 * in a StackTraceElement.
 		 */
+		@Override
 		public boolean under(Class clazz, String methodName) {
 			Assert.notNull(clazz, "Class must not be null");
 			Assert.notNull(methodName, "Method name must not be null");
@@ -93,6 +95,7 @@ public abstract class ControlFlowFactory {
 		 * Leave it up to the caller to decide what matches.
 		 * Caller must understand stack trace format, so there's less abstraction.
 		 */
+		@Override
 		public boolean underToken(String token) {
 			if (token == null) {
 				return false;
diff --git a/spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java b/spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java
index 53e3425f36..ffe9c45cce 100644
--- a/spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java
+++ b/spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java
@@ -55,6 +55,7 @@ public class ExceptionDepthComparator implements Comparator<Class<? extends Thro
 	}
 
 
+	@Override
 	public int compare(Class<? extends Throwable> o1, Class<? extends Throwable> o2) {
 		int depth1 = getDepth(o1, this.targetException, 0);
 		int depth2 = getDepth(o2, this.targetException, 0);
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 588472532c..6732f58b52 100644
--- a/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
+++ b/spring-core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
@@ -64,6 +64,7 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD
 			new ConcurrentHashMap<Class<?>, Map<Member, String[]>>(32);
 
 
+	@Override
 	public String[] getParameterNames(Method method) {
 		Class<?> declaringClass = method.getDeclaringClass();
 		Map<Member, String[]> map = this.parameterNamesCache.get(declaringClass);
@@ -78,6 +79,7 @@ public class LocalVariableTableParameterNameDiscoverer implements ParameterNameD
 		return null;
 	}
 
+	@Override
 	public String[] getParameterNames(Constructor<?> ctor) {
 		Class<?> declaringClass = ctor.getDeclaringClass();
 		Map<Member, String[]> map = this.parameterNamesCache.get(declaringClass);
diff --git a/spring-core/src/main/java/org/springframework/core/OrderComparator.java b/spring-core/src/main/java/org/springframework/core/OrderComparator.java
index 16158ca1ad..51408c7441 100644
--- a/spring-core/src/main/java/org/springframework/core/OrderComparator.java
+++ b/spring-core/src/main/java/org/springframework/core/OrderComparator.java
@@ -43,6 +43,7 @@ public class OrderComparator implements Comparator<Object> {
 	public static final OrderComparator INSTANCE = new OrderComparator();
 
 
+	@Override
 	public int compare(Object o1, Object o2) {
 		boolean p1 = (o1 instanceof PriorityOrdered);
 		boolean p2 = (o2 instanceof PriorityOrdered);
diff --git a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
index e65e88cd21..8d883eddd3 100644
--- a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
+++ b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java
@@ -48,6 +48,7 @@ public class PrioritizedParameterNameDiscoverer implements ParameterNameDiscover
 	}
 
 
+	@Override
 	public String[] getParameterNames(Method method) {
 		for (ParameterNameDiscoverer pnd : this.parameterNameDiscoverers) {
 			String[] result = pnd.getParameterNames(method);
@@ -58,6 +59,7 @@ public class PrioritizedParameterNameDiscoverer implements ParameterNameDiscover
 		return null;
 	}
 
+	@Override
 	public String[] getParameterNames(Constructor ctor) {
 		for (ParameterNameDiscoverer pnd : this.parameterNameDiscoverers) {
 			String[] result = pnd.getParameterNames(ctor);
diff --git a/spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java b/spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java
index 24b33f7683..82fe66159b 100644
--- a/spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java
+++ b/spring-core/src/main/java/org/springframework/core/SimpleAliasRegistry.java
@@ -41,6 +41,7 @@ public class SimpleAliasRegistry implements AliasRegistry {
 	private final Map<String, String> aliasMap = new ConcurrentHashMap<String, String>(16);
 
 
+	@Override
 	public void registerAlias(String name, String alias) {
 		Assert.hasText(name, "'name' must not be empty");
 		Assert.hasText(alias, "'alias' must not be empty");
@@ -68,6 +69,7 @@ public class SimpleAliasRegistry implements AliasRegistry {
 		return true;
 	}
 
+	@Override
 	public void removeAlias(String alias) {
 		String name = this.aliasMap.remove(alias);
 		if (name == null) {
@@ -75,10 +77,12 @@ public class SimpleAliasRegistry implements AliasRegistry {
 		}
 	}
 
+	@Override
 	public boolean isAlias(String name) {
 		return this.aliasMap.containsKey(name);
 	}
 
+	@Override
 	public String[] getAliases(String name) {
 		List<String> result = new ArrayList<String>();
 		synchronized (this.aliasMap) {
diff --git a/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java b/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java
index 3e2d741523..31c511282f 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/converter/ConvertingComparator.java
@@ -77,6 +77,7 @@ public class ConvertingComparator<S, T> implements Comparator<S> {
 	}
 
 
+	@Override
 	public int compare(S o1, S o2) {
 		T c1 = this.converter.convert(o1);
 		T c2 = this.converter.convert(o2);
@@ -94,6 +95,7 @@ public class ConvertingComparator<S, T> implements Comparator<S> {
 			Comparator<K> comparator) {
 		return new ConvertingComparator<Map.Entry<K,V>, K>(comparator, new Converter<Map.Entry<K, V>, K>() {
 
+			@Override
 			public K convert(Map.Entry<K, V> source) {
 				return source.getKey();
 			}
@@ -111,6 +113,7 @@ public class ConvertingComparator<S, T> implements Comparator<S> {
 			Comparator<V> comparator) {
 		return new ConvertingComparator<Map.Entry<K,V>, V>(comparator, new Converter<Map.Entry<K, V>, V>() {
 
+			@Override
 			public V convert(Map.Entry<K, V> source) {
 				return source.getValue();
 			}
@@ -135,6 +138,7 @@ public class ConvertingComparator<S, T> implements Comparator<S> {
 			this.targetType = targetType;
 		}
 
+		@Override
 		public T convert(S source) {
 			return this.conversionService.convert(source, this.targetType);
 		}
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..0fb2f4de17 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
@@ -45,14 +45,17 @@ final class ArrayToArrayConverter implements ConditionalGenericConverter {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object[].class, Object[].class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return this.helperConverter.matches(sourceType, targetType);
 	}
 
+	@Override
 	public Object convert(Object source, TypeDescriptor sourceType,
 			TypeDescriptor targetType) {
 		if ((conversionService instanceof GenericConversionService)
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..9ee37f783d 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
@@ -44,15 +44,18 @@ final class ArrayToCollectionConverter implements ConditionalGenericConverter {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object[].class, Collection.class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return ConversionUtils.canConvertElements(
 				sourceType.getElementTypeDescriptor(), targetType.getElementTypeDescriptor(), this.conversionService);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (source == null) {
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..5f69e0e638 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
@@ -38,14 +38,17 @@ final class ArrayToObjectConverter implements ConditionalGenericConverter {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object[].class, Object.class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return ConversionUtils.canConvertElements(sourceType.getElementTypeDescriptor(), targetType, this.conversionService);
 	}
 
+	@Override
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (source == null) {
 			return null;
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..548872c0a6 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
@@ -40,14 +40,17 @@ final class ArrayToStringConverter implements ConditionalGenericConverter {
 		this.helperConverter = new CollectionToStringConverter(conversionService);
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object[].class, String.class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return this.helperConverter.matches(sourceType, targetType);
 	}
 
+	@Override
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return this.helperConverter.convert(Arrays.asList(ObjectUtils.toObjectArray(source)), sourceType, targetType);
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java
index 8f9642b0fb..f698500020 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java
@@ -40,6 +40,7 @@ import org.springframework.util.NumberUtils;
  */
 final class CharacterToNumberFactory implements ConverterFactory<Character, Number> {
 
+	@Override
 	public <T extends Number> Converter<Character, T> getConverter(Class<T> targetType) {
 		return new CharacterToNumber<T>(targetType);
 	}
@@ -52,6 +53,7 @@ final class CharacterToNumberFactory implements ConverterFactory<Character, Numb
 			this.targetType = targetType;
 		}
 
+		@Override
 		public T convert(Character source) {
 			return NumberUtils.convertNumberToTargetClass((short) source.charValue(), this.targetType);
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToArrayConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToArrayConverter.java
index d616eeb094..53da33c064 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToArrayConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToArrayConverter.java
@@ -44,14 +44,17 @@ final class CollectionToArrayConverter implements ConditionalGenericConverter {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Collection.class, Object[].class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return ConversionUtils.canConvertElements(sourceType.getElementTypeDescriptor(), targetType.getElementTypeDescriptor(), this.conversionService);
 	}
 
+	@Override
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (source == null) {
 			return null;
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..6fcd271feb 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
@@ -44,15 +44,18 @@ final class CollectionToCollectionConverter implements ConditionalGenericConvert
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Collection.class, Collection.class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return ConversionUtils.canConvertElements(
 				sourceType.getElementTypeDescriptor(), targetType.getElementTypeDescriptor(), this.conversionService);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (source == null) {
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java
index b9913ef6b4..bf4b591922 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java
@@ -38,14 +38,17 @@ final class CollectionToObjectConverter implements ConditionalGenericConverter {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Collection.class, Object.class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return ConversionUtils.canConvertElements(sourceType.getElementTypeDescriptor(), targetType, this.conversionService);
 	}
 
+	@Override
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (source == null) {
 			return null;
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToStringConverter.java
index 02b9d0eb77..428f399051 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToStringConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToStringConverter.java
@@ -40,14 +40,17 @@ final class CollectionToStringConverter implements ConditionalGenericConverter {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Collection.class, String.class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return ConversionUtils.canConvertElements(sourceType.getElementTypeDescriptor(), targetType, this.conversionService);
 	}
 
+	@Override
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (source == null) {
 			return null;
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/EnumToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/EnumToStringConverter.java
index e391b75bb3..bfd1762d96 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/EnumToStringConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/EnumToStringConverter.java
@@ -37,6 +37,7 @@ final class EnumToStringConverter implements Converter<Enum<?>, String>, Conditi
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		for (Class<?> interfaceType : ClassUtils.getAllInterfacesForClass(sourceType.getType())) {
 			if (conversionService.canConvert(TypeDescriptor.valueOf(interfaceType), targetType)) {
@@ -46,6 +47,7 @@ final class EnumToStringConverter implements Converter<Enum<?>, String>, Conditi
 		return true;
 	}
 
+	@Override
 	public String convert(Enum<?> source) {
 		return source.name();
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/FallbackObjectToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/FallbackObjectToStringConverter.java
index 071ad3b647..767a0acb46 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/FallbackObjectToStringConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/FallbackObjectToStringConverter.java
@@ -35,10 +35,12 @@ import org.springframework.core.convert.converter.ConditionalGenericConverter;
  */
 final class FallbackObjectToStringConverter implements ConditionalGenericConverter {
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object.class, String.class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		Class<?> sourceClass = sourceType.getObjectType();
 		if (String.class.equals(sourceClass)) {
@@ -48,6 +50,7 @@ final class FallbackObjectToStringConverter implements ConditionalGenericConvert
 			ObjectToObjectConverter.hasValueOfMethodOrConstructor(sourceClass, String.class);
 	}
 
+	@Override
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return (source != null ? source.toString() : null);
 	}
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..c20f852af7 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
@@ -79,6 +79,7 @@ public class GenericConversionService implements ConfigurableConversionService {
 
 	// implementing ConverterRegistry
 
+	@Override
 	public void addConverter(Converter<?, ?> converter) {
 		GenericConverter.ConvertiblePair typeInfo = getRequiredTypeInfo(converter, Converter.class);
 		Assert.notNull(typeInfo, "Unable to the determine sourceType <S> and targetType " +
@@ -86,16 +87,19 @@ public class GenericConversionService implements ConfigurableConversionService {
 		addConverter(new ConverterAdapter(typeInfo, converter));
 	}
 
+	@Override
 	public void addConverter(Class<?> sourceType, Class<?> targetType, Converter<?, ?> converter) {
 		GenericConverter.ConvertiblePair typeInfo = new GenericConverter.ConvertiblePair(sourceType, targetType);
 		addConverter(new ConverterAdapter(typeInfo, converter));
 	}
 
+	@Override
 	public void addConverter(GenericConverter converter) {
 		this.converters.add(converter);
 		invalidateCache();
 	}
 
+	@Override
 	public void addConverterFactory(ConverterFactory<?, ?> converterFactory) {
 		GenericConverter.ConvertiblePair typeInfo = getRequiredTypeInfo(converterFactory, ConverterFactory.class);
 		if (typeInfo == null) {
@@ -106,6 +110,7 @@ public class GenericConversionService implements ConfigurableConversionService {
 		addConverter(new ConverterFactoryAdapter(typeInfo, converterFactory));
 	}
 
+	@Override
 	public void removeConvertible(Class<?> sourceType, Class<?> targetType) {
 		this.converters.remove(sourceType, targetType);
 		invalidateCache();
@@ -113,6 +118,7 @@ public class GenericConversionService implements ConfigurableConversionService {
 
 	// implementing ConversionService
 
+	@Override
 	public boolean canConvert(Class<?> sourceType, Class<?> targetType) {
 		Assert.notNull(targetType, "The targetType to convert to cannot be null");
 		return canConvert(sourceType != null ?
@@ -120,6 +126,7 @@ public class GenericConversionService implements ConfigurableConversionService {
 				TypeDescriptor.valueOf(targetType));
 	}
 
+	@Override
 	public boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		Assert.notNull(targetType,"The targetType to convert to cannot be null");
 		if (sourceType == null) {
@@ -148,12 +155,14 @@ public class GenericConversionService implements ConfigurableConversionService {
 		return (converter == NO_OP_CONVERTER);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T convert(Object source, Class<T> targetType) {
 		Assert.notNull(targetType,"The targetType to convert to cannot be null");
 		return (T) convert(source, TypeDescriptor.forObject(source), TypeDescriptor.valueOf(targetType));
 	}
 
+	@Override
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		Assert.notNull(targetType,"The targetType to convert to cannot be null");
 		if (sourceType == null) {
@@ -308,10 +317,12 @@ public class GenericConversionService implements ConfigurableConversionService {
 		}
 
 
+		@Override
 		public Set<ConvertiblePair> getConvertibleTypes() {
 			return Collections.singleton(this.typeInfo);
 		}
 
+		@Override
 		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			if(!this.typeInfo.getTargetType().equals(targetType.getObjectType())) {
 				return false;
@@ -322,6 +333,7 @@ public class GenericConversionService implements ConfigurableConversionService {
 			return true;
 		}
 
+		@Override
 		public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 			if (source == null) {
 				return convertNullSource(sourceType, targetType);
@@ -354,10 +366,12 @@ public class GenericConversionService implements ConfigurableConversionService {
 		}
 
 
+		@Override
 		public Set<ConvertiblePair> getConvertibleTypes() {
 			return Collections.singleton(this.typeInfo);
 		}
 
+		@Override
 		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			boolean matches = true;
 			if (this.converterFactory instanceof ConditionalConverter) {
@@ -372,6 +386,7 @@ public class GenericConversionService implements ConfigurableConversionService {
 			return matches;
 		}
 
+		@Override
 		public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 			if (source == null) {
 				return convertNullSource(sourceType, targetType);
@@ -617,10 +632,12 @@ public class GenericConversionService implements ConfigurableConversionService {
 		}
 
 
+		@Override
 		public Set<ConvertiblePair> getConvertibleTypes() {
 			return null;
 		}
 
+		@Override
 		public Object convert(Object source, TypeDescriptor sourceType,
 				TypeDescriptor targetType) {
 			return source;
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..e80bd599cd 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
@@ -45,15 +45,18 @@ final class IdToEntityConverter implements ConditionalGenericConverter {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object.class, Object.class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		Method finder = getFinder(targetType.getType());
 		return finder != null && this.conversionService.canConvert(sourceType, TypeDescriptor.valueOf(finder.getParameterTypes()[0]));
 	}
 
+	@Override
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (source == null) {
 			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..eadacf3071 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
@@ -46,14 +46,17 @@ final class MapToMapConverter implements ConditionalGenericConverter {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Map.class, Map.class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return canConvertKey(sourceType, targetType) && canConvertValue(sourceType, targetType);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (source == null) {
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/NumberToCharacterConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/NumberToCharacterConverter.java
index b272abc6fa..11090a0d11 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/NumberToCharacterConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/NumberToCharacterConverter.java
@@ -34,6 +34,7 @@ import org.springframework.core.convert.converter.Converter;
  */
 final class NumberToCharacterConverter implements Converter<Number, Character> {
 
+	@Override
 	public Character convert(Number source) {
 		return (char) source.shortValue();
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java
index 240880d67f..b98af70e31 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/NumberToNumberConverterFactory.java
@@ -43,10 +43,12 @@ import org.springframework.util.NumberUtils;
 final class NumberToNumberConverterFactory implements ConverterFactory<Number, Number>,
 		ConditionalConverter {
 
+	@Override
 	public <T extends Number> Converter<Number, T> getConverter(Class<T> targetType) {
 		return new NumberToNumber<T>(targetType);
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return !sourceType.equals(targetType);
 	}
@@ -59,6 +61,7 @@ final class NumberToNumberConverterFactory implements ConverterFactory<Number, N
 			this.targetType = targetType;
 		}
 
+		@Override
 		public T convert(Number source) {
 			return NumberUtils.convertNumberToTargetClass(source, this.targetType);
 		}
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..99c2a4fd1d 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
@@ -39,14 +39,17 @@ final class ObjectToArrayConverter implements ConditionalGenericConverter {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object.class, Object[].class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return ConversionUtils.canConvertElements(sourceType, targetType.getElementTypeDescriptor(), this.conversionService);
 	}
 
+	@Override
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (source == null) {
 			return null;
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..63a348ecb2 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
@@ -41,14 +41,17 @@ final class ObjectToCollectionConverter implements ConditionalGenericConverter {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object.class, Collection.class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return ConversionUtils.canConvertElements(sourceType, targetType.getElementTypeDescriptor(), this.conversionService);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (source == null) {
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..e1273221b8 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
@@ -43,10 +43,12 @@ import org.springframework.util.ReflectionUtils;
  */
 final class ObjectToObjectConverter implements ConditionalGenericConverter {
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object.class, Object.class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (sourceType.getType().equals(targetType.getType())) {
 			// no conversion required
@@ -55,6 +57,7 @@ final class ObjectToObjectConverter implements ConditionalGenericConverter {
 		return hasValueOfMethodOrConstructor(targetType.getType(), sourceType.getType());
 	}
 
+	@Override
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (source == null) {
 			return null;
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..4b3604ed5d 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
@@ -25,6 +25,7 @@ import org.springframework.core.convert.converter.Converter;
  */
 final class ObjectToStringConverter implements Converter<Object, String> {
 
+	@Override
 	public String convert(Object source) {
 		return source.toString();
 	}
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..4ccb387a9b 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
@@ -31,6 +31,7 @@ import org.springframework.core.convert.converter.Converter;
  */
 final class PropertiesToStringConverter implements Converter<Properties, String> {
 
+	@Override
 	public String convert(Properties source) {
 		try {
 			ByteArrayOutputStream os = new ByteArrayOutputStream();
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToArrayConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToArrayConverter.java
index 4bf32af3e8..0fa7696dd6 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToArrayConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToArrayConverter.java
@@ -40,14 +40,17 @@ final class StringToArrayConverter implements ConditionalGenericConverter {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(String.class, Object[].class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return this.conversionService.canConvert(sourceType, targetType.getElementTypeDescriptor());
 	}
 
+	@Override
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (source == null) {
 			return null;
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java
index 1e23ee61bb..d5dc90cf70 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java
@@ -46,6 +46,7 @@ final class StringToBooleanConverter implements Converter<String, Boolean> {
 		falseValues.add("0");
 	}
 
+	@Override
 	public Boolean convert(String source) {
 		String value = source.trim();
 		if ("".equals(value)) {
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java
index 3e3791642a..83477f5d78 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java
@@ -26,6 +26,7 @@ import org.springframework.core.convert.converter.Converter;
  */
 final class StringToCharacterConverter implements Converter<String, Character> {
 
+	@Override
 	public Character convert(String source) {
 		if (source.length() == 0) {
 			return null;
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..35d6083c92 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
@@ -41,10 +41,12 @@ final class StringToCollectionConverter implements ConditionalGenericConverter {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(String.class, Collection.class));
 	}
 
+	@Override
 	public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (targetType.getElementTypeDescriptor() != null) {
 			return this.conversionService.canConvert(sourceType, targetType.getElementTypeDescriptor());
@@ -53,6 +55,7 @@ final class StringToCollectionConverter implements ConditionalGenericConverter {
 		}
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		if (source == null) {
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 62cf4748ea..e47748942b 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
@@ -28,6 +28,7 @@ import org.springframework.core.convert.converter.ConverterFactory;
 @SuppressWarnings({ "unchecked", "rawtypes" })
 final class StringToEnumConverterFactory implements ConverterFactory<String, Enum> {
 
+	@Override
 	public <T extends Enum> Converter<String, T> getConverter(Class<T> targetType) {
 		return new StringToEnum(targetType);
 	}
@@ -40,6 +41,7 @@ final class StringToEnumConverterFactory implements ConverterFactory<String, Enu
 			this.enumType = enumType;
 		}
 
+		@Override
 		public T convert(String source) {
 			if (source.length() == 0) {
 				// It's an empty enum identifier: reset the enum value to null.
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java
index 3ca91385f4..7fea4b148b 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java
@@ -29,6 +29,7 @@ import org.springframework.util.StringUtils;
  */
 final class StringToLocaleConverter implements Converter<String, Locale> {
 
+	@Override
 	public Locale convert(String source) {
 		return StringUtils.parseLocaleString(source);
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java
index 8bb0d6460b..17fc6975ed 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java
@@ -40,6 +40,7 @@ import org.springframework.util.NumberUtils;
  */
 final class StringToNumberConverterFactory implements ConverterFactory<String, Number> {
 
+	@Override
 	public <T extends Number> Converter<String, T> getConverter(Class<T> targetType) {
 		return new StringToNumber<T>(targetType);
 	}
@@ -52,6 +53,7 @@ final class StringToNumberConverterFactory implements ConverterFactory<String, N
 			this.targetType = targetType;
 		}
 
+		@Override
 		public T convert(String source) {
 			if (source.length() == 0) {
 				return null;
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToPropertiesConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToPropertiesConverter.java
index e97cae67ef..4e97c8f1f2 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToPropertiesConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToPropertiesConverter.java
@@ -30,6 +30,7 @@ import org.springframework.core.convert.converter.Converter;
  */
 final class StringToPropertiesConverter implements Converter<String, Properties> {
 
+	@Override
 	public Properties convert(String source) {
 		try {
 			Properties props = new Properties();
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..b97335a83b 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
@@ -29,6 +29,7 @@ import org.springframework.util.StringUtils;
  */
 final class StringToUUIDConverter implements Converter<String, UUID> {
 
+	@Override
 	public UUID convert(String source) {
 		if(StringUtils.hasLength(source)) {
 			return UUID.fromString(source.trim());
diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java
index 4a278f92eb..94c3e969b9 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java
@@ -50,15 +50,18 @@ public abstract class AbstractCachingLabeledEnumResolver implements LabeledEnumR
 	private final LabeledEnumCache labeledEnumCache = new LabeledEnumCache();
 
 
+	@Override
 	public Set<LabeledEnum> getLabeledEnumSet(Class type) throws IllegalArgumentException {
 		return new TreeSet<LabeledEnum>(getLabeledEnumMap(type).values());
 	}
 
+	@Override
 	public Map<Comparable, LabeledEnum> getLabeledEnumMap(Class type) throws IllegalArgumentException {
 		Assert.notNull(type, "No type specified");
 		return this.labeledEnumCache.get(type);
 	}
 
+	@Override
 	public LabeledEnum getLabeledEnumByCode(Class type, Comparable code) throws IllegalArgumentException {
 		Assert.notNull(code, "No enum code specified");
 		Map<Comparable, LabeledEnum> typeEnums = getLabeledEnumMap(type);
@@ -72,6 +75,7 @@ public abstract class AbstractCachingLabeledEnumResolver implements LabeledEnumR
 		return codedEnum;
 	}
 
+	@Override
 	public LabeledEnum getLabeledEnumByLabel(Class type, String label) throws IllegalArgumentException {
 		Map<Comparable, LabeledEnum> typeEnums = getLabeledEnumMap(type);
 		for (LabeledEnum value : typeEnums.values()) {
diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
index cee9535cee..329d01721a 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java
@@ -43,6 +43,7 @@ public abstract class AbstractGenericLabeledEnum extends AbstractLabeledEnum {
 	}
 
 
+	@Override
 	public String getLabel() {
 		if (this.label != null) {
 			return label;
diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java
index 3c2860f74b..dedc90eaef 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java
@@ -35,12 +35,14 @@ public abstract class AbstractLabeledEnum implements LabeledEnum {
 	protected AbstractLabeledEnum() {
 	}
 
+	@Override
 	public Class getType() {
 		// Could be coded as getClass().isAnonymousClass() on JDK 1.5
 		boolean isAnonymous = (getClass().getDeclaringClass() == null && getClass().getName().indexOf('$') != -1);
 		return (isAnonymous ? getClass().getSuperclass() : getClass());
 	}
 
+	@Override
 	public int compareTo(Object obj) {
 		if (!(obj instanceof LabeledEnum)) {
 			throw new ClassCastException("You may only compare LabeledEnums");
diff --git a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java
index dc2325bfac..4e45ee35e2 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java
@@ -67,6 +67,7 @@ public interface LabeledEnum extends Comparable, Serializable {
 	 * Shared Comparator instance that sorts enumerations by {@code CODE_ORDER}.
 	 */
 	Comparator CODE_ORDER = new Comparator() {
+		@Override
 		public int compare(Object o1, Object o2) {
 			Comparable c1 = ((LabeledEnum) o1).getCode();
 			Comparable c2 = ((LabeledEnum) o2).getCode();
@@ -78,6 +79,7 @@ public interface LabeledEnum extends Comparable, Serializable {
 	 * Shared Comparator instance that sorts enumerations by {@code LABEL_ORDER}.
 	 */
 	Comparator LABEL_ORDER = new Comparator() {
+		@Override
 		public int compare(Object o1, Object o2) {
 			LabeledEnum e1 = (LabeledEnum) o1;
 			LabeledEnum e2 = (LabeledEnum) o2;
diff --git a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
index cb70971aab..5cee8e480b 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java
@@ -52,6 +52,7 @@ public class LetterCodedLabeledEnum extends AbstractGenericLabeledEnum {
 	}
 
 
+	@Override
 	public Comparable getCode() {
 		return code;
 	}
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..1e1fd291cd 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
@@ -49,6 +49,7 @@ public class ShortCodedLabeledEnum extends AbstractGenericLabeledEnum {
 	}
 
 
+	@Override
 	public Comparable getCode() {
 		return code;
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
index e6440cc3b6..85d04f7276 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java
@@ -73,10 +73,12 @@ public abstract class StaticLabeledEnum extends AbstractLabeledEnum {
 		}
 	}
 
+	@Override
 	public Comparable getCode() {
 		return code;
 	}
 
+	@Override
 	public String getLabel() {
 		return label;
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
index d0a936effd..296c8e8054 100644
--- a/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
+++ b/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java
@@ -53,6 +53,7 @@ public class StringCodedLabeledEnum extends AbstractGenericLabeledEnum {
 	}
 
 
+	@Override
 	public Comparable getCode() {
 		return this.code;
 	}
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..1079167915 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
@@ -214,6 +214,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 	// Implementation of ConfigurableEnvironment interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public String[] getActiveProfiles() {
 		return StringUtils.toStringArray(doGetActiveProfiles());
 	}
@@ -236,6 +237,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 		return this.activeProfiles;
 	}
 
+	@Override
 	public void setActiveProfiles(String... profiles) {
 		Assert.notNull(profiles, "Profile array must not be null");
 		this.activeProfiles.clear();
@@ -245,6 +247,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 		}
 	}
 
+	@Override
 	public void addActiveProfile(String profile) {
 		if (this.logger.isDebugEnabled()) {
 			this.logger.debug(format("Activating profile '%s'", profile));
@@ -255,6 +258,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 	}
 
 
+	@Override
 	public String[] getDefaultProfiles() {
 		return StringUtils.toStringArray(doGetDefaultProfiles());
 	}
@@ -288,6 +292,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 	 * @see #AbstractEnvironment()
 	 * @see #getReservedDefaultProfiles()
 	 */
+	@Override
 	public void setDefaultProfiles(String... profiles) {
 		Assert.notNull(profiles, "Profile array must not be null");
 		this.defaultProfiles.clear();
@@ -297,6 +302,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 		}
 	}
 
+	@Override
 	public boolean acceptsProfiles(String... profiles) {
 		Assert.notEmpty(profiles, "Must specify at least one profile");
 		for (String profile : profiles) {
@@ -337,10 +343,12 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 				"Invalid profile [" + profile + "]: must not begin with the ! operator");
 	}
 
+	@Override
 	public MutablePropertySources getPropertySources() {
 		return this.propertySources;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Map<String, Object> getSystemEnvironment() {
 		Map<String, ?> systemEnvironment;
@@ -369,6 +377,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 		return (Map<String, Object>) systemEnvironment;
 	}
 
+	@Override
 	@SuppressWarnings({"unchecked", "rawtypes"})
 	public Map<String, Object> getSystemProperties() {
 		Map systemProperties;
@@ -397,6 +406,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 		return systemProperties;
 	}
 
+	@Override
 	public void merge(ConfigurableEnvironment parent) {
 		for (PropertySource<?> ps : parent.getPropertySources()) {
 			if (!this.propertySources.contains(ps.getName())) {
@@ -419,74 +429,92 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 	// Implementation of ConfigurablePropertyResolver interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public boolean containsProperty(String key) {
 		return this.propertyResolver.containsProperty(key);
 	}
 
+	@Override
 	public String getProperty(String key) {
 		return this.propertyResolver.getProperty(key);
 	}
 
+	@Override
 	public String getProperty(String key, String defaultValue) {
 		return this.propertyResolver.getProperty(key, defaultValue);
 	}
 
+	@Override
 	public <T> T getProperty(String key, Class<T> targetType) {
 		return this.propertyResolver.getProperty(key, targetType);
 	}
 
+	@Override
 	public <T> T getProperty(String key, Class<T> targetType, T defaultValue) {
 		return this.propertyResolver.getProperty(key, targetType, defaultValue);
 	};
 
+	@Override
 	public <T> Class<T> getPropertyAsClass(String key, Class<T> targetType) {
 		return this.propertyResolver.getPropertyAsClass(key, targetType);
 	}
 
+	@Override
 	public String getRequiredProperty(String key) throws IllegalStateException {
 		return this.propertyResolver.getRequiredProperty(key);
 	}
 
+	@Override
 	public <T> T getRequiredProperty(String key, Class<T> targetType) throws IllegalStateException {
 		return this.propertyResolver.getRequiredProperty(key, targetType);
 	}
 
+	@Override
 	public void setRequiredProperties(String... requiredProperties) {
 		this.propertyResolver.setRequiredProperties(requiredProperties);
 	}
 
+	@Override
 	public void validateRequiredProperties() throws MissingRequiredPropertiesException {
 		this.propertyResolver.validateRequiredProperties();
 	}
 
+	@Override
 	public String resolvePlaceholders(String text) {
 		return this.propertyResolver.resolvePlaceholders(text);
 	}
 
+	@Override
 	public String resolveRequiredPlaceholders(String text) throws IllegalArgumentException {
 		return this.propertyResolver.resolveRequiredPlaceholders(text);
 	}
 
+	@Override
 	public void setIgnoreUnresolvableNestedPlaceholders(boolean ignoreUnresolvableNestedPlaceholders) {
 		this.propertyResolver.setIgnoreUnresolvableNestedPlaceholders(ignoreUnresolvableNestedPlaceholders);
 	}
 
+	@Override
 	public void setConversionService(ConfigurableConversionService conversionService) {
 		this.propertyResolver.setConversionService(conversionService);
 	}
 
+	@Override
 	public ConfigurableConversionService getConversionService() {
 		return this.propertyResolver.getConversionService();
 	}
 
+	@Override
 	public void setPlaceholderPrefix(String placeholderPrefix) {
 		this.propertyResolver.setPlaceholderPrefix(placeholderPrefix);
 	}
 
+	@Override
 	public void setPlaceholderSuffix(String placeholderSuffix) {
 		this.propertyResolver.setPlaceholderSuffix(placeholderSuffix);
 	}
 
+	@Override
 	public void setValueSeparator(String valueSeparator) {
 		this.propertyResolver.setValueSeparator(valueSeparator);
 	}
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..77bf33ab21 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
@@ -53,30 +53,36 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
 
 	private final Set<String> requiredProperties = new LinkedHashSet<String>();
 
+	@Override
 	public ConfigurableConversionService getConversionService() {
 		return this.conversionService;
 	}
 
+	@Override
 	public void setConversionService(ConfigurableConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+	@Override
 	public String getProperty(String key, String defaultValue) {
 		String value = getProperty(key);
 		return value == null ? defaultValue : value;
 	}
 
+	@Override
 	public <T> T getProperty(String key, Class<T> targetType, T defaultValue) {
 		T value = getProperty(key, targetType);
 		return value == null ? defaultValue : value;
 	}
 
+	@Override
 	public void setRequiredProperties(String... requiredProperties) {
 		for (String key : requiredProperties) {
 			this.requiredProperties.add(key);
 		}
 	}
 
+	@Override
 	public void validateRequiredProperties() {
 		MissingRequiredPropertiesException ex = new MissingRequiredPropertiesException();
 		for (String key : this.requiredProperties) {
@@ -89,6 +95,7 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
 		}
 	}
 
+	@Override
 	public String getRequiredProperty(String key) throws IllegalStateException {
 		String value = getProperty(key);
 		if (value == null) {
@@ -97,6 +104,7 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
 		return value;
 	}
 
+	@Override
 	public <T> T getRequiredProperty(String key, Class<T> valueType) throws IllegalStateException {
 		T value = getProperty(key, valueType);
 		if (value == null) {
@@ -109,6 +117,7 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
 	 * {@inheritDoc} The default is "${".
 	 * @see org.springframework.util.SystemPropertyUtils#PLACEHOLDER_PREFIX
 	 */
+	@Override
 	public void setPlaceholderPrefix(String placeholderPrefix) {
 		this.placeholderPrefix = placeholderPrefix;
 	}
@@ -117,6 +126,7 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
 	 * {@inheritDoc} The default is "}".
 	 * @see org.springframework.util.SystemPropertyUtils#PLACEHOLDER_SUFFIX
 	 */
+	@Override
 	public void setPlaceholderSuffix(String placeholderSuffix) {
 		this.placeholderSuffix = placeholderSuffix;
 	}
@@ -125,10 +135,12 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
 	 * {@inheritDoc} The default is ":".
 	 * @see org.springframework.util.SystemPropertyUtils#VALUE_SEPARATOR
 	 */
+	@Override
 	public void setValueSeparator(String valueSeparator) {
 		this.valueSeparator = valueSeparator;
 	}
 
+	@Override
 	public String resolvePlaceholders(String text) {
 		if (nonStrictHelper == null) {
 			nonStrictHelper = createPlaceholderHelper(true);
@@ -136,6 +148,7 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
 		return doResolvePlaceholders(text, nonStrictHelper);
 	}
 
+	@Override
 	public String resolveRequiredPlaceholders(String text) throws IllegalArgumentException {
 		if (strictHelper == null) {
 			strictHelper = createPlaceholderHelper(false);
@@ -148,6 +161,7 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
 	 * <p>The default value for this implementation is {@code false}.
 	 * @since 3.2
 	 */
+	@Override
 	public void setIgnoreUnresolvableNestedPlaceholders(boolean ignoreUnresolvableNestedPlaceholders) {
 		this.ignoreUnresolvableNestedPlaceholders = ignoreUnresolvableNestedPlaceholders;
 	}
@@ -172,6 +186,7 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe
 
 	private String doResolvePlaceholders(String text, PropertyPlaceholderHelper helper) {
 		return helper.replacePlaceholders(text, new PlaceholderResolver() {
+			@Override
 			public String resolvePlaceholder(String placeholderName) {
 				return getProperty(placeholderName);
 			}
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..117b3f12d9 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
@@ -65,6 +65,7 @@ public abstract class EnumerablePropertySource<T> extends PropertySource<T> {
 	 * the {@link #getPropertyNames()} array.
 	 * @param name the property to find
 	 */
+	@Override
 	public boolean containsProperty(String name) {
 		Assert.notNull(name, "property name must not be null");
 		for (String candidate : this.getPropertyNames()) {
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..0a7c14120f 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
@@ -74,15 +74,18 @@ public class MutablePropertySources implements PropertySources {
 	}
 
 
+	@Override
 	public boolean contains(String name) {
 		return this.propertySourceList.contains(PropertySource.named(name));
 	}
 
+	@Override
 	public PropertySource<?> get(String name) {
 		int index = this.propertySourceList.indexOf(PropertySource.named(name));
 		return index == -1 ? null : this.propertySourceList.get(index);
 	}
 
+	@Override
 	public Iterator<PropertySource<?>> iterator() {
 		return this.propertySourceList.iterator();
 	}
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..08d482ba03 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
@@ -43,6 +43,7 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
 		this.propertySources = propertySources;
 	}
 
+	@Override
 	public boolean containsProperty(String key) {
 		for (PropertySource<?> propertySource : this.propertySources) {
 			if (propertySource.containsProperty(key)) {
@@ -52,6 +53,7 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
 		return false;
 	}
 
+	@Override
 	public String getProperty(String key) {
 		if (logger.isTraceEnabled()) {
 			logger.trace(format("getProperty(\"%s\") (implicit targetType [String])", key));
@@ -59,6 +61,7 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
 		return this.getProperty(key, String.class);
 	}
 
+	@Override
 	public <T> T getProperty(String key, Class<T> targetValueType) {
 		boolean debugEnabled = logger.isDebugEnabled();
 		if (logger.isTraceEnabled()) {
@@ -95,6 +98,7 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
 		return null;
 	}
 
+	@Override
 	public <T> Class<T> getPropertyAsClass(String key, Class<T> targetValueType) {
 		boolean debugEnabled = logger.isDebugEnabled();
 		if (logger.isTraceEnabled()) {
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 df310c6002..f4f99c930c 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
@@ -35,6 +35,7 @@ import org.springframework.util.Assert;
  */
 abstract class ReadOnlySystemAttributesMap implements Map<String, String> {
 
+	@Override
 	public boolean containsKey(Object key) {
 		return get(key) != null;
 	}
@@ -43,6 +44,7 @@ abstract class ReadOnlySystemAttributesMap implements Map<String, String> {
 	 * @param key the name of the system attribute to retrieve
 	 * @throws IllegalArgumentException if given key is non-String
 	 */
+	@Override
 	public String get(Object key) {
 		Assert.isInstanceOf(String.class, key,
 			String.format("expected key [%s] to be of type String, got %s",
@@ -51,6 +53,7 @@ abstract class ReadOnlySystemAttributesMap implements Map<String, String> {
 		return this.getSystemAttribute((String) key);
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return false;
 	}
@@ -64,38 +67,47 @@ abstract class ReadOnlySystemAttributesMap implements Map<String, String> {
 
 	// Unsupported
 
+	@Override
 	public int size() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public String put(String key, String value) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public boolean containsValue(Object value) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public String remove(Object key) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void clear() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Set<String> keySet() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void putAll(Map<? extends String, ? extends String> m) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Collection<String> values() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Set<Entry<String, String>> entrySet() {
 		throw new UnsupportedOperationException();
 	}
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..8dd0e7d57a 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
@@ -46,6 +46,7 @@ public abstract class AbstractResource implements Resource {
 	 * falling back to whether an InputStream can be opened.
 	 * This will cover both directories and content resources.
 	 */
+	@Override
 	public boolean exists() {
 		// Try file existence: can we find the file in the file system?
 		try {
@@ -67,6 +68,7 @@ public abstract class AbstractResource implements Resource {
 	/**
 	 * This implementation always returns {@code true}.
 	 */
+	@Override
 	public boolean isReadable() {
 		return true;
 	}
@@ -74,6 +76,7 @@ public abstract class AbstractResource implements Resource {
 	/**
 	 * This implementation always returns {@code false}.
 	 */
+	@Override
 	public boolean isOpen() {
 		return false;
 	}
@@ -82,6 +85,7 @@ public abstract class AbstractResource implements Resource {
 	 * This implementation throws a FileNotFoundException, assuming
 	 * that the resource cannot be resolved to a URL.
 	 */
+	@Override
 	public URL getURL() throws IOException {
 		throw new FileNotFoundException(getDescription() + " cannot be resolved to URL");
 	}
@@ -90,6 +94,7 @@ public abstract class AbstractResource implements Resource {
 	 * This implementation builds a URI based on the URL returned
 	 * by {@link #getURL()}.
 	 */
+	@Override
 	public URI getURI() throws IOException {
 		URL url = getURL();
 		try {
@@ -104,6 +109,7 @@ public abstract class AbstractResource implements Resource {
 	 * This implementation throws a FileNotFoundException, assuming
 	 * that the resource cannot be resolved to an absolute file path.
 	 */
+	@Override
 	public File getFile() throws IOException {
 		throw new FileNotFoundException(getDescription() + " cannot be resolved to absolute file path");
 	}
@@ -115,6 +121,7 @@ public abstract class AbstractResource implements Resource {
 	 * @see #getInputStream()
 	 * @throws IllegalStateException if {@link #getInputStream()} returns null.
 	 */
+	@Override
 	public long contentLength() throws IOException {
 		InputStream is = this.getInputStream();
 		Assert.state(is != null, "resource input stream must not be null");
@@ -141,6 +148,7 @@ public abstract class AbstractResource implements Resource {
 	 * if available.
 	 * @see #getFileForLastModifiedCheck()
 	 */
+	@Override
 	public long lastModified() throws IOException {
 		long lastModified = getFileForLastModifiedCheck().lastModified();
 		if (lastModified == 0L) {
@@ -165,6 +173,7 @@ public abstract class AbstractResource implements Resource {
 	 * This implementation throws a FileNotFoundException, assuming
 	 * that relative resources cannot be created for this resource.
 	 */
+	@Override
 	public Resource createRelative(String relativePath) throws IOException {
 		throw new FileNotFoundException("Cannot create a relative resource for " + getDescription());
 	}
@@ -173,6 +182,7 @@ public abstract class AbstractResource implements Resource {
 	 * This implementation always returns {@code null},
 	 * assuming that this resource type does not have a filename.
 	 */
+	@Override
 	public String getFilename() {
 		return null;
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
index d195def969..b9709e3808 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java
@@ -93,6 +93,7 @@ public class ByteArrayResource extends AbstractResource {
 	 * underlying byte array.
 	 * @see java.io.ByteArrayInputStream
 	 */
+	@Override
 	public InputStream getInputStream() throws IOException {
 		return new ByteArrayInputStream(this.byteArray);
 	}
@@ -100,6 +101,7 @@ public class ByteArrayResource extends AbstractResource {
 	/**
 	 * This implementation returns the passed-in description, if any.
 	 */
+	@Override
 	public String getDescription() {
 		return this.description;
 	}
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 e881d4034c..f14f22613a 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
@@ -145,6 +145,7 @@ public class ClassPathResource extends AbstractFileResolvingResource {
 	 * @see java.lang.ClassLoader#getResourceAsStream(String)
 	 * @see java.lang.Class#getResourceAsStream(String)
 	 */
+	@Override
 	public InputStream getInputStream() throws IOException {
 		InputStream is;
 		if (this.clazz != null) {
@@ -203,6 +204,7 @@ public class ClassPathResource extends AbstractFileResolvingResource {
 	/**
 	 * This implementation returns a description that includes the class path location.
 	 */
+	@Override
 	public String getDescription() {
 		StringBuilder builder = new StringBuilder("class path resource [");
 
diff --git a/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java
index 00f267e443..bcf88fa127 100644
--- a/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java
@@ -43,6 +43,7 @@ public class ClassRelativeResourceLoader extends DefaultResourceLoader {
 		setClassLoader(clazz.getClassLoader());
 	}
 
+	@Override
 	protected Resource getResourceByPath(String path) {
 		return new ClassRelativeContextResource(path, this.clazz);
 	}
@@ -61,6 +62,7 @@ public class ClassRelativeResourceLoader extends DefaultResourceLoader {
 			this.clazz = clazz;
 		}
 
+		@Override
 		public String getPathWithinContext() {
 			return getPath();
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java
index 1a390f04ec..09e5e908b0 100644
--- a/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java
@@ -79,11 +79,13 @@ public class DefaultResourceLoader implements ResourceLoader {
 	 * ClassPathResource objects created by this resource loader.
 	 * @see ClassPathResource
 	 */
+	@Override
 	public ClassLoader getClassLoader() {
 		return (this.classLoader != null ? this.classLoader : ClassUtils.getDefaultClassLoader());
 	}
 
 
+	@Override
 	public Resource getResource(String location) {
 		Assert.notNull(location, "Location must not be null");
 		if (location.startsWith(CLASSPATH_URL_PREFIX)) {
@@ -128,6 +130,7 @@ public class DefaultResourceLoader implements ResourceLoader {
 			super(path, classLoader);
 		}
 
+		@Override
 		public String getPathWithinContext() {
 			return getPath();
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java b/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
index 8385891ea3..7202147922 100644
--- a/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java
@@ -54,11 +54,13 @@ public class DescriptiveResource extends AbstractResource {
 		return false;
 	}
 
+	@Override
 	public InputStream getInputStream() throws IOException {
 		throw new FileNotFoundException(
 				getDescription() + " cannot be opened because it does not point to a readable resource");
 	}
 
+	@Override
 	public String getDescription() {
 		return this.description;
 	}
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..e47ee5390f 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
@@ -109,6 +109,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso
 	 * This implementation opens a FileInputStream for the underlying file.
 	 * @see java.io.FileInputStream
 	 */
+	@Override
 	public InputStream getInputStream() throws IOException {
 		return new FileInputStream(this.file);
 	}
@@ -172,6 +173,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso
 	 * path of the file.
 	 * @see java.io.File#getAbsolutePath()
 	 */
+	@Override
 	public String getDescription() {
 		return "file [" + this.file.getAbsolutePath() + "]";
 	}
@@ -185,6 +187,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso
 	 * @see java.io.File#canWrite()
 	 * @see java.io.File#isDirectory()
 	 */
+	@Override
 	public boolean isWritable() {
 		return (this.file.canWrite() && !this.file.isDirectory());
 	}
@@ -193,6 +196,7 @@ public class FileSystemResource extends AbstractResource implements WritableReso
 	 * This implementation opens a FileOutputStream for the underlying file.
 	 * @see java.io.FileOutputStream
 	 */
+	@Override
 	public OutputStream getOutputStream() throws IOException {
 		return new FileOutputStream(this.file);
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/io/FileSystemResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/FileSystemResourceLoader.java
index d811d91f80..f1ef298c26 100644
--- a/spring-core/src/main/java/org/springframework/core/io/FileSystemResourceLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/io/FileSystemResourceLoader.java
@@ -65,6 +65,7 @@ public class FileSystemResourceLoader extends DefaultResourceLoader {
 			super(path);
 		}
 
+		@Override
 		public String getPathWithinContext() {
 			return getPath();
 		}
diff --git a/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java b/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
index d9b2405c99..3a37cac97a 100644
--- a/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java
@@ -88,6 +88,7 @@ public class InputStreamResource extends AbstractResource {
 	 * This implementation throws IllegalStateException if attempting to
 	 * read the underlying stream multiple times.
 	 */
+	@Override
 	public InputStream getInputStream() throws IOException, IllegalStateException {
 		if (this.read) {
 			throw new IllegalStateException("InputStream has already been read - " +
@@ -100,6 +101,7 @@ public class InputStreamResource extends AbstractResource {
 	/**
 	 * This implementation returns the passed-in description, if any.
 	 */
+	@Override
 	public String getDescription() {
 		return this.description;
 	}
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..0a94c76ba5 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
@@ -118,6 +118,7 @@ public class UrlResource extends AbstractFileResolvingResource {
 	 * @see java.net.URLConnection#setUseCaches(boolean)
 	 * @see java.net.URLConnection#getInputStream()
 	 */
+	@Override
 	public InputStream getInputStream() throws IOException {
 		URLConnection con = this.url.openConnection();
 		ResourceUtils.useCachesIfNecessary(con);
@@ -196,6 +197,7 @@ public class UrlResource extends AbstractFileResolvingResource {
 	/**
 	 * This implementation returns a description that includes the URL.
 	 */
+	@Override
 	public String getDescription() {
 		return "URL [" + this.url + "]";
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/io/VfsResource.java b/spring-core/src/main/java/org/springframework/core/io/VfsResource.java
index 4877d0ad7b..2b492ab0b9 100644
--- a/spring-core/src/main/java/org/springframework/core/io/VfsResource.java
+++ b/spring-core/src/main/java/org/springframework/core/io/VfsResource.java
@@ -46,6 +46,7 @@ public class VfsResource extends AbstractResource {
 	}
 
 
+	@Override
 	public InputStream getInputStream() throws IOException {
 		return VfsUtils.getInputStream(this.resource);
 	}
@@ -114,6 +115,7 @@ public class VfsResource extends AbstractResource {
 		return VfsUtils.getName(this.resource);
 	}
 
+	@Override
 	public String getDescription() {
 		return this.resource.toString();
 	}
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 9b2f8493b6..3b5238da86 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
@@ -231,6 +231,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 	 * Return the ClassLoader that this pattern resolver works with
 	 * (never {@code null}).
 	 */
+	@Override
 	public ClassLoader getClassLoader() {
 		return getResourceLoader().getClassLoader();
 	}
@@ -253,10 +254,12 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 	}
 
 
+	@Override
 	public Resource getResource(String location) {
 		return getResourceLoader().getResource(location);
 	}
 
+	@Override
 	public Resource[] getResources(String locationPattern) throws IOException {
 		Assert.notNull(locationPattern, "Location pattern must not be null");
 		if (locationPattern.startsWith(CLASSPATH_ALL_URL_PREFIX)) {
@@ -674,6 +677,7 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
 			this.rootPath = (rootPath.length() == 0 || rootPath.endsWith("/") ? rootPath : rootPath + "/");
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			String methodName = method.getName();
 			if (Object.class.equals(method.getDeclaringClass())) {
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java b/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java
index f61f697d2f..66a91b3836 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java
@@ -34,6 +34,7 @@ public class DefaultDeserializer implements Deserializer<Object> {
 	/**
 	 * Reads the input stream and deserializes into an object.
 	 */
+	@Override
 	public Object deserialize(InputStream inputStream) throws IOException {
 		ObjectInputStream objectInputStream = new ObjectInputStream(inputStream);
 		try {
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java b/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java
index 04fe8bed5a..6146ee018c 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java
@@ -34,6 +34,7 @@ public class DefaultSerializer implements Serializer<Object> {
 	 * Writes the source object to an output stream using Java Serialization.
 	 * The source object must implement {@link Serializable}.
 	 */
+	@Override
 	public void serialize(Object object, OutputStream outputStream) throws IOException {
 		if (!(object instanceof Serializable)) {
 			throw new IllegalArgumentException(getClass().getSimpleName() + " requires a Serializable payload " +
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java b/spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java
index 200206113d..49cb0c9627 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java
@@ -52,6 +52,7 @@ public class DeserializingConverter implements Converter<byte[], Object> {
 	}
 
 
+	@Override
 	public Object convert(byte[] source) {
 		ByteArrayInputStream byteStream = new ByteArrayInputStream(source);
 		try {
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..042bf74390 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
@@ -55,6 +55,7 @@ public class SerializingConverter implements Converter<Object, byte[]> {
 	/**
 	 * Serializes the source object and returns the byte array result.
 	 */
+	@Override
 	public byte[] convert(Object source) {
 		ByteArrayOutputStream byteStream = new ByteArrayOutputStream(128);
 		try  {
diff --git a/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java b/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java
index f81cb4a82e..97a6ce23ce 100644
--- a/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java
+++ b/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java
@@ -52,6 +52,7 @@ public class DefaultToStringStyler implements ToStringStyler {
 	}
 
 
+	@Override
 	public void styleStart(StringBuilder buffer, Object obj) {
 		if (!obj.getClass().isArray()) {
 			buffer.append('[').append(ClassUtils.getShortName(obj.getClass()));
@@ -70,10 +71,12 @@ public class DefaultToStringStyler implements ToStringStyler {
 		buffer.append(ObjectUtils.getIdentityHexString(obj));
 	}
 
+	@Override
 	public void styleEnd(StringBuilder buffer, Object o) {
 		buffer.append(']');
 	}
 
+	@Override
 	public void styleField(StringBuilder buffer, String fieldName, Object value) {
 		styleFieldStart(buffer, fieldName);
 		styleValue(buffer, value);
@@ -87,10 +90,12 @@ public class DefaultToStringStyler implements ToStringStyler {
 	protected void styleFieldEnd(StringBuilder buffer, String fieldName) {
 	}
 
+	@Override
 	public void styleValue(StringBuilder buffer, Object value) {
 		buffer.append(this.valueStyler.style(value));
 	}
 
+	@Override
 	public void styleFieldSeparator(StringBuilder buffer) {
 		buffer.append(',');
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java b/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
index 2e6251c0f5..a0063b2374 100644
--- a/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
+++ b/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java
@@ -48,6 +48,7 @@ public class DefaultValueStyler implements ValueStyler {
 	private static final String ARRAY = "array";
 
 
+	@Override
 	public String style(Object value) {
 		if (value == null) {
 			return NULL;
diff --git a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
index f6b714007e..21622a29cc 100644
--- a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java
@@ -144,6 +144,7 @@ public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator implement
 	 * if configured (through the superclass's settings).
 	 * @see #doExecute(Runnable)
 	 */
+	@Override
 	public void execute(Runnable task) {
 		execute(task, TIMEOUT_INDEFINITE);
 	}
@@ -157,6 +158,7 @@ public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator implement
 	 * @see #TIMEOUT_IMMEDIATE
 	 * @see #doExecute(Runnable)
 	 */
+	@Override
 	public void execute(Runnable task, long startTimeout) {
 		Assert.notNull(task, "Runnable must not be null");
 		if (isThrottleActive() && startTimeout > TIMEOUT_IMMEDIATE) {
@@ -168,12 +170,14 @@ public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator implement
 		}
 	}
 
+	@Override
 	public Future<?> submit(Runnable task) {
 		FutureTask<Object> future = new FutureTask<Object>(task, null);
 		execute(future, TIMEOUT_INDEFINITE);
 		return future;
 	}
 
+	@Override
 	public <T> Future<T> submit(Callable<T> task) {
 		FutureTask<T> future = new FutureTask<T>(task);
 		execute(future, TIMEOUT_INDEFINITE);
@@ -225,6 +229,7 @@ public class SimpleAsyncTaskExecutor extends CustomizableThreadCreator implement
 			this.target = target;
 		}
 
+		@Override
 		public void run() {
 			try {
 				this.target.run();
diff --git a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
index 47bebf4676..64f8c7934e 100644
--- a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java
@@ -44,6 +44,7 @@ public class SyncTaskExecutor implements TaskExecutor, Serializable {
 	 * invocation of it's {@link Runnable#run() run()} method.
 	 * @throws IllegalArgumentException if the given {@code task} is {@code null}
 	 */
+	@Override
 	public void execute(Runnable task) {
 		Assert.notNull(task, "Runnable must not be null");
 		task.run();
diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
index fea960e3c6..bf8b9f910e 100644
--- a/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
+++ b/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java
@@ -45,6 +45,7 @@ public interface TaskExecutor extends Executor {
 	 * @param task the {@code Runnable} to execute (never {@code null})
 	 * @throws TaskRejectedException if the given task was not accepted
 	 */
+	@Override
 	void execute(Runnable task);
 
 }
diff --git a/spring-core/src/main/java/org/springframework/core/task/support/ConcurrentExecutorAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/ConcurrentExecutorAdapter.java
index 2acf1a281f..0ed48c4f67 100644
--- a/spring-core/src/main/java/org/springframework/core/task/support/ConcurrentExecutorAdapter.java
+++ b/spring-core/src/main/java/org/springframework/core/task/support/ConcurrentExecutorAdapter.java
@@ -50,6 +50,7 @@ public class ConcurrentExecutorAdapter implements Executor {
 	}
 
 
+	@Override
 	public void execute(Runnable command) {
 		this.taskExecutor.execute(command);
 	}
diff --git a/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
index 0c594b93a1..393ecee66d 100644
--- a/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
+++ b/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
@@ -57,29 +57,35 @@ public class ExecutorServiceAdapter extends AbstractExecutorService {
 	}
 
 
+	@Override
 	public void execute(Runnable task) {
 		this.taskExecutor.execute(task);
 	}
 
+	@Override
 	public void shutdown() {
 		throw new IllegalStateException(
 				"Manual shutdown not supported - ExecutorServiceAdapter is dependent on an external lifecycle");
 	}
 
+	@Override
 	public List<Runnable> shutdownNow() {
 		throw new IllegalStateException(
 				"Manual shutdown not supported - ExecutorServiceAdapter is dependent on an external lifecycle");
 	}
 
+	@Override
 	public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
 		throw new IllegalStateException(
 				"Manual shutdown not supported - ExecutorServiceAdapter is dependent on an external lifecycle");
 	}
 
+	@Override
 	public boolean isShutdown() {
 		return false;
 	}
 
+	@Override
 	public boolean isTerminated() {
 		return false;
 	}
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..9247995065 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
@@ -59,6 +59,7 @@ public class TaskExecutorAdapter implements AsyncTaskExecutor {
 	 * Delegates to the specified JDK 1.5 concurrent executor.
 	 * @see java.util.concurrent.Executor#execute(Runnable)
 	 */
+	@Override
 	public void execute(Runnable task) {
 		try {
 			this.concurrentExecutor.execute(task);
@@ -69,10 +70,12 @@ public class TaskExecutorAdapter implements AsyncTaskExecutor {
 		}
 	}
 
+	@Override
 	public void execute(Runnable task, long startTimeout) {
 		execute(task);
 	}
 
+	@Override
 	public Future<?> submit(Runnable task) {
 		try {
 			if (this.concurrentExecutor instanceof ExecutorService) {
@@ -90,6 +93,7 @@ public class TaskExecutorAdapter implements AsyncTaskExecutor {
 		}
 	}
 
+	@Override
 	public <T> Future<T> submit(Callable<T> task) {
 		try {
 			if (this.concurrentExecutor instanceof ExecutorService) {
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..a0f5c2a46b 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
@@ -64,6 +64,7 @@ public class StandardAnnotationMetadata extends StandardClassMetadata implements
 	}
 
 
+	@Override
 	public Set<String> getAnnotationTypes() {
 		Set<String> types = new LinkedHashSet<String>();
 		Annotation[] anns = getIntrospectedClass().getAnnotations();
@@ -73,6 +74,7 @@ public class StandardAnnotationMetadata extends StandardClassMetadata implements
 		return types;
 	}
 
+	@Override
 	public Set<String> getMetaAnnotationTypes(String annotationType) {
 		Annotation[] anns = getIntrospectedClass().getAnnotations();
 		for (Annotation ann : anns) {
@@ -91,6 +93,7 @@ public class StandardAnnotationMetadata extends StandardClassMetadata implements
 		return null;
 	}
 
+	@Override
 	public boolean hasAnnotation(String annotationType) {
 		Annotation[] anns = getIntrospectedClass().getAnnotations();
 		for (Annotation ann : anns) {
@@ -101,6 +104,7 @@ public class StandardAnnotationMetadata extends StandardClassMetadata implements
 		return false;
 	}
 
+	@Override
 	public boolean hasMetaAnnotation(String annotationType) {
 		Annotation[] anns = getIntrospectedClass().getAnnotations();
 		for (Annotation ann : anns) {
@@ -119,6 +123,7 @@ public class StandardAnnotationMetadata extends StandardClassMetadata implements
 		return false;
 	}
 
+	@Override
 	public boolean isAnnotated(String annotationType) {
 		Annotation[] anns = getIntrospectedClass().getAnnotations();
 		for (Annotation ann : anns) {
@@ -134,10 +139,12 @@ public class StandardAnnotationMetadata extends StandardClassMetadata implements
 		return false;
 	}
 
+	@Override
 	public Map<String, Object> getAnnotationAttributes(String annotationType) {
 		return this.getAnnotationAttributes(annotationType, false);
 	}
 
+	@Override
 	public Map<String, Object> getAnnotationAttributes(String annotationType, boolean classValuesAsString) {
 		Annotation[] anns = getIntrospectedClass().getAnnotations();
 		for (Annotation ann : anns) {
@@ -155,6 +162,7 @@ public class StandardAnnotationMetadata extends StandardClassMetadata implements
 		return null;
 	}
 
+	@Override
 	public boolean hasAnnotatedMethods(String annotationType) {
 		Method[] methods = getIntrospectedClass().getDeclaredMethods();
 		for (Method method : methods) {
@@ -174,6 +182,7 @@ public class StandardAnnotationMetadata extends StandardClassMetadata implements
 		return false;
 	}
 
+	@Override
 	public Set<MethodMetadata> getAnnotatedMethods(String annotationType) {
 		Method[] methods = getIntrospectedClass().getDeclaredMethods();
 		Set<MethodMetadata> annotatedMethods = new LinkedHashSet<MethodMetadata>();
diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
index 4ac99d4d4d..1b62d91c46 100644
--- a/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
+++ b/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java
@@ -50,50 +50,61 @@ public class StandardClassMetadata implements ClassMetadata {
 	}
 
 
+	@Override
 	public String getClassName() {
 		return this.introspectedClass.getName();
 	}
 
+	@Override
 	public boolean isInterface() {
 		return this.introspectedClass.isInterface();
 	}
 
+	@Override
 	public boolean isAbstract() {
 		return Modifier.isAbstract(this.introspectedClass.getModifiers());
 	}
 
+	@Override
 	public boolean isConcrete() {
 		return !(isInterface() || isAbstract());
 	}
 
+	@Override
 	public boolean isFinal() {
 		return Modifier.isFinal(this.introspectedClass.getModifiers());
 	}
 
+	@Override
 	public boolean isIndependent() {
 		return (!hasEnclosingClass() ||
 				(this.introspectedClass.getDeclaringClass() != null &&
 						Modifier.isStatic(this.introspectedClass.getModifiers())));
 	}
 
+	@Override
 	public boolean hasEnclosingClass() {
 		return (this.introspectedClass.getEnclosingClass() != null);
 	}
 
+	@Override
 	public String getEnclosingClassName() {
 		Class enclosingClass = this.introspectedClass.getEnclosingClass();
 		return (enclosingClass != null ? enclosingClass.getName() : null);
 	}
 
+	@Override
 	public boolean hasSuperClass() {
 		return (this.introspectedClass.getSuperclass() != null);
 	}
 
+	@Override
 	public String getSuperClassName() {
 		Class superClass = this.introspectedClass.getSuperclass();
 		return (superClass != null ? superClass.getName() : null);
 	}
 
+	@Override
 	public String[] getInterfaceNames() {
 		Class[] ifcs = this.introspectedClass.getInterfaces();
 		String[] ifcNames = new String[ifcs.length];
@@ -103,6 +114,7 @@ public class StandardClassMetadata implements ClassMetadata {
 		return ifcNames;
 	}
 
+	@Override
 	public String[] getMemberClassNames() {
 		LinkedHashSet<String> memberClassNames = new LinkedHashSet<String>();
 		for (Class<?> nestedClass : this.introspectedClass.getDeclaredClasses()) {
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..4ba2beed94 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
@@ -68,26 +68,32 @@ public class StandardMethodMetadata implements MethodMetadata {
 	}
 
 
+	@Override
 	public String getMethodName() {
 		return this.introspectedMethod.getName();
 	}
 
+	@Override
 	public String getDeclaringClassName() {
 		return this.introspectedMethod.getDeclaringClass().getName();
 	}
 
+	@Override
 	public boolean isStatic() {
 		return Modifier.isStatic(this.introspectedMethod.getModifiers());
 	}
 
+	@Override
 	public boolean isFinal() {
 		return Modifier.isFinal(this.introspectedMethod.getModifiers());
 	}
 
+	@Override
 	public boolean isOverridable() {
 		return (!isStatic() && !isFinal() && !Modifier.isPrivate(this.introspectedMethod.getModifiers()));
 	}
 
+	@Override
 	public boolean isAnnotated(String annotationType) {
 		Annotation[] anns = this.introspectedMethod.getAnnotations();
 		for (Annotation ann : anns) {
@@ -103,6 +109,7 @@ public class StandardMethodMetadata implements MethodMetadata {
 		return false;
 	}
 
+	@Override
 	public Map<String, Object> getAnnotationAttributes(String annotationType) {
 		Annotation[] anns = this.introspectedMethod.getAnnotations();
 		for (Annotation ann : anns) {
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 cdf49fd6b6..a90f8e30ee 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
@@ -58,10 +58,12 @@ abstract class AbstractRecursiveAnnotationVisitor extends AnnotationVisitor {
 	}
 
 
+	@Override
 	public void visit(String attributeName, Object attributeValue) {
 		this.attributes.put(attributeName, attributeValue);
 	}
 
+	@Override
 	public AnnotationVisitor visitAnnotation(String attributeName, String asmTypeDescriptor) {
 		String annotationType = Type.getType(asmTypeDescriptor).getClassName();
 		AnnotationAttributes nestedAttributes = new AnnotationAttributes();
@@ -69,10 +71,12 @@ abstract class AbstractRecursiveAnnotationVisitor extends AnnotationVisitor {
 		return new RecursiveAnnotationAttributesVisitor(annotationType, nestedAttributes, this.classLoader);
 	}
 
+	@Override
 	public AnnotationVisitor visitArray(String attributeName) {
 		return new RecursiveAnnotationArrayVisitor(attributeName, this.attributes, this.classLoader);
 	}
 
+	@Override
 	public void visitEnum(String attributeName, String asmTypeDescriptor, String attributeValue) {
 		Object valueToUse = attributeValue;
 		try {
@@ -134,6 +138,7 @@ final class RecursiveAnnotationArrayVisitor extends AbstractRecursiveAnnotationV
 		return new RecursiveAnnotationAttributesVisitor(annotationType, nestedAttributes, this.classLoader);
 	}
 
+	@Override
 	public void visitEnd() {
 		if (!this.allNestedAttributes.isEmpty()) {
 			this.attributes.put(this.attributeName, this.allNestedAttributes.toArray(
@@ -160,6 +165,7 @@ class RecursiveAnnotationAttributesVisitor extends AbstractRecursiveAnnotationVi
 	}
 
 
+	@Override
 	public final void visitEnd() {
 		try {
 			Class<?> annotationClass = this.classLoader.loadClass(this.annotationType);
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..bcc982f96e 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
@@ -74,18 +74,22 @@ final class AnnotationMetadataReadingVisitor extends ClassMetadataReadingVisitor
 	}
 
 
+	@Override
 	public Set<String> getAnnotationTypes() {
 		return this.annotationSet;
 	}
 
+	@Override
 	public Set<String> getMetaAnnotationTypes(String annotationType) {
 		return this.metaAnnotationMap.get(annotationType);
 	}
 
+	@Override
 	public boolean hasAnnotation(String annotationType) {
 		return this.annotationSet.contains(annotationType);
 	}
 
+	@Override
 	public boolean hasMetaAnnotation(String metaAnnotationType) {
 		Collection<Set<String>> allMetaTypes = this.metaAnnotationMap.values();
 		for (Set<String> metaTypes : allMetaTypes) {
@@ -96,14 +100,17 @@ final class AnnotationMetadataReadingVisitor extends ClassMetadataReadingVisitor
 		return false;
 	}
 
+	@Override
 	public boolean isAnnotated(String annotationType) {
 		return this.attributeMap.containsKey(annotationType);
 	}
 
+	@Override
 	public AnnotationAttributes getAnnotationAttributes(String annotationType) {
 		return getAnnotationAttributes(annotationType, false);
 	}
 
+	@Override
 	public AnnotationAttributes getAnnotationAttributes(String annotationType, boolean classValuesAsString) {
 		return getAnnotationAttributes(annotationType, classValuesAsString, false);
 	}
@@ -169,10 +176,12 @@ final class AnnotationMetadataReadingVisitor extends ClassMetadataReadingVisitor
 		return result;
 	}
 
+	@Override
 	public boolean hasAnnotatedMethods(String annotationType) {
 		return this.methodMetadataMap.containsKey(annotationType);
 	}
 
+	@Override
 	public Set<MethodMetadata> getAnnotatedMethods(String annotationType) {
 		List<MethodMetadata> list = this.methodMetadataMap.get(annotationType);
 		if (CollectionUtils.isEmpty(list)) {
diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java b/spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
index 45785bc8a3..0d78fc2737 100644
--- a/spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
+++ b/spring-core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
@@ -67,6 +67,7 @@ class ClassMetadataReadingVisitor extends ClassVisitor implements ClassMetadata
 	}
 
 
+	@Override
 	public void visit(int version, int access, String name, String signature, String supername, String[] interfaces) {
 		this.className = ClassUtils.convertResourcePathToClassName(name);
 		this.isInterface = ((access & Opcodes.ACC_INTERFACE) != 0);
@@ -81,10 +82,12 @@ class ClassMetadataReadingVisitor extends ClassVisitor implements ClassMetadata
 		}
 	}
 
+	@Override
 	public void visitOuterClass(String owner, String name, String desc) {
 		this.enclosingClassName = ClassUtils.convertResourcePathToClassName(owner);
 	}
 
+	@Override
 	public void visitInnerClass(String name, String outerName, String innerName, int access) {
 		if (outerName != null) {
 			String fqName = ClassUtils.convertResourcePathToClassName(name);
@@ -99,78 +102,96 @@ class ClassMetadataReadingVisitor extends ClassVisitor implements ClassMetadata
 		}
 	}
 
+	@Override
 	public void visitSource(String source, String debug) {
 		// no-op
 	}
 
+	@Override
 	public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
 		// no-op
 		return new EmptyAnnotationVisitor();
 	}
 
+	@Override
 	public void visitAttribute(Attribute attr) {
 		// no-op
 	}
 
+	@Override
 	public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
 		// no-op
 		return new EmptyFieldVisitor();
 	}
 
+	@Override
 	public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
 		// no-op
 		return new EmptyMethodVisitor();
 	}
 
+	@Override
 	public void visitEnd() {
 		// no-op
 	}
 
 
+	@Override
 	public String getClassName() {
 		return this.className;
 	}
 
+	@Override
 	public boolean isInterface() {
 		return this.isInterface;
 	}
 
+	@Override
 	public boolean isAbstract() {
 		return this.isAbstract;
 	}
 
+	@Override
 	public boolean isConcrete() {
 		return !(this.isInterface || this.isAbstract);
 	}
 
+	@Override
 	public boolean isFinal() {
 		return this.isFinal;
 	}
 
+	@Override
 	public boolean isIndependent() {
 		return (this.enclosingClassName == null || this.independentInnerClass);
 	}
 
+	@Override
 	public boolean hasEnclosingClass() {
 		return (this.enclosingClassName != null);
 	}
 
+	@Override
 	public String getEnclosingClassName() {
 		return this.enclosingClassName;
 	}
 
+	@Override
 	public boolean hasSuperClass() {
 		return (this.superClassName != null);
 	}
 
+	@Override
 	public String getSuperClassName() {
 		return this.superClassName;
 	}
 
+	@Override
 	public String[] getInterfaceNames() {
 		return this.interfaces;
 	}
 
+	@Override
 	public String[] getMemberClassNames() {
 		return this.memberClassNames.toArray(new String[this.memberClassNames.size()]);
 	}
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 4cae5b5829..450dabb604 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
@@ -70,30 +70,37 @@ final class MethodMetadataReadingVisitor extends MethodVisitor implements Method
 		return new AnnotationAttributesReadingVisitor(className, this.attributeMap, null, this.classLoader);
 	}
 
+	@Override
 	public String getMethodName() {
 		return this.name;
 	}
 
+	@Override
 	public boolean isStatic() {
 		return ((this.access & Opcodes.ACC_STATIC) != 0);
 	}
 
+	@Override
 	public boolean isFinal() {
 		return ((this.access & Opcodes.ACC_FINAL) != 0);
 	}
 
+	@Override
 	public boolean isOverridable() {
 		return (!isStatic() && !isFinal() && ((this.access & Opcodes.ACC_PRIVATE) == 0));
 	}
 
+	@Override
 	public boolean isAnnotated(String annotationType) {
 		return this.attributeMap.containsKey(annotationType);
 	}
 
+	@Override
 	public AnnotationAttributes getAnnotationAttributes(String annotationType) {
 		return this.attributeMap.get(annotationType);
 	}
 
+	@Override
 	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 b2bf4405da..17964636ef 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,14 +64,17 @@ final class SimpleMetadataReader implements MetadataReader {
 		this.resource = resource;
 	}
 
+	@Override
 	public Resource getResource() {
 		return this.resource;
 	}
 
+	@Override
 	public ClassMetadata getClassMetadata() {
 		return this.classMetadata;
 	}
 
+	@Override
 	public AnnotationMetadata getAnnotationMetadata() {
 		return this.annotationMetadata;
 	}
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..9719ddd57e 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
@@ -70,12 +70,14 @@ public class SimpleMetadataReaderFactory implements MetadataReaderFactory {
 	}
 
 
+	@Override
 	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));
 	}
 
+	@Override
 	public MetadataReader getMetadataReader(Resource resource) throws IOException {
 		return new SimpleMetadataReader(resource, this.resourceLoader.getClassLoader());
 	}
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..9ddf225895 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
@@ -35,6 +35,7 @@ import org.springframework.core.type.classreading.MetadataReader;
  */
 public abstract class AbstractClassTestingTypeFilter implements TypeFilter {
 
+	@Override
 	public final boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
 			throws IOException {
 
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..1ae2eef2ee 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
@@ -47,6 +47,7 @@ public abstract class AbstractTypeHierarchyTraversingFilter implements TypeFilte
 	}
 
 
+	@Override
 	public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
 			throws IOException {
 
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..dc584ea443 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
@@ -60,6 +60,7 @@ public class AspectJTypeFilter implements TypeFilter {
 	}
 
 
+	@Override
 	public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
 			throws IOException {
 
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 bbceda14dc..2953f306fe 100644
--- a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
+++ b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
@@ -67,14 +67,17 @@ public class AntPathMatcher implements PathMatcher {
 	}
 
 
+	@Override
 	public boolean isPattern(String path) {
 		return (path.indexOf('*') != -1 || path.indexOf('?') != -1);
 	}
 
+	@Override
 	public boolean match(String pattern, String path) {
 		return doMatch(pattern, path, true, null);
 	}
 
+	@Override
 	public boolean matchStart(String pattern, String path) {
 		return doMatch(pattern, path, false, null);
 	}
@@ -245,6 +248,7 @@ public class AntPathMatcher implements PathMatcher {
 	 * <p>Assumes that {@link #match} returns {@code true} for '{@code pattern}' and '{@code path}', but
 	 * does <strong>not</strong> enforce this.
 	 */
+	@Override
 	public String extractPathWithinPattern(String pattern, String path) {
 		String[] patternParts = StringUtils.tokenizeToStringArray(pattern, this.pathSeparator);
 		String[] pathParts = StringUtils.tokenizeToStringArray(path, this.pathSeparator);
@@ -275,6 +279,7 @@ public class AntPathMatcher implements PathMatcher {
 		return builder.toString();
 	}
 
+	@Override
 	public Map<String, String> extractUriTemplateVariables(String pattern, String path) {
 		Map<String, String> variables = new LinkedHashMap<String, String>();
 		boolean result = doMatch(pattern, path, true, variables);
@@ -301,6 +306,7 @@ public class AntPathMatcher implements PathMatcher {
 	 * @return the combination of the two patterns
 	 * @throws IllegalArgumentException when the two patterns cannot be combined
 	 */
+	@Override
 	public String combine(String pattern1, String pattern2) {
 		if (!StringUtils.hasText(pattern1) && !StringUtils.hasText(pattern2)) {
 			return "";
@@ -379,6 +385,7 @@ public class AntPathMatcher implements PathMatcher {
 	 * @param path the full path to use for comparison
 	 * @return a comparator capable of sorting patterns in order of explicitness
 	 */
+	@Override
 	public Comparator<String> getPatternComparator(String path) {
 		return new AntPatternComparator(path);
 	}
@@ -392,6 +399,7 @@ public class AntPathMatcher implements PathMatcher {
 			this.path = path;
 		}
 
+		@Override
 		public int compare(String pattern1, String pattern2) {
 			if (pattern1 == null && pattern2 == null) {
 				return 0;
diff --git a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
index 7a2135fb65..d58e0acd81 100644
--- a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
+++ b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java
@@ -92,30 +92,37 @@ public class AutoPopulatingList<E> implements List<E>, Serializable {
 	}
 
 
+	@Override
 	public void add(int index, E element) {
 		this.backingList.add(index, element);
 	}
 
+	@Override
 	public boolean add(E o) {
 		return this.backingList.add(o);
 	}
 
+	@Override
 	public boolean addAll(Collection<? extends E> c) {
 		return this.backingList.addAll(c);
 	}
 
+	@Override
 	public boolean addAll(int index, Collection<? extends E> c) {
 		return this.backingList.addAll(index, c);
 	}
 
+	@Override
 	public void clear() {
 		this.backingList.clear();
 	}
 
+	@Override
 	public boolean contains(Object o) {
 		return this.backingList.contains(o);
 	}
 
+	@Override
 	public boolean containsAll(Collection c) {
 		return this.backingList.containsAll(c);
 	}
@@ -124,6 +131,7 @@ public class AutoPopulatingList<E> implements List<E>, Serializable {
 	 * Get the element at the supplied index, creating it if there is
 	 * no element at that index.
 	 */
+	@Override
 	public E get(int index) {
 		int backingListSize = this.backingList.size();
 		E element = null;
@@ -144,62 +152,77 @@ public class AutoPopulatingList<E> implements List<E>, Serializable {
 		return element;
 	}
 
+	@Override
 	public int indexOf(Object o) {
 		return this.backingList.indexOf(o);
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return this.backingList.isEmpty();
 	}
 
+	@Override
 	public Iterator<E> iterator() {
 		return this.backingList.iterator();
 	}
 
+	@Override
 	public int lastIndexOf(Object o) {
 		return this.backingList.lastIndexOf(o);
 	}
 
+	@Override
 	public ListIterator<E> listIterator() {
 		return this.backingList.listIterator();
 	}
 
+	@Override
 	public ListIterator<E> listIterator(int index) {
 		return this.backingList.listIterator(index);
 	}
 
+	@Override
 	public E remove(int index) {
 		return this.backingList.remove(index);
 	}
 
+	@Override
 	public boolean remove(Object o) {
 		return this.backingList.remove(o);
 	}
 
+	@Override
 	public boolean removeAll(Collection<?> c) {
 		return this.backingList.removeAll(c);
 	}
 
+	@Override
 	public boolean retainAll(Collection<?> c) {
 		return this.backingList.retainAll(c);
 	}
 
+	@Override
 	public E set(int index, E element) {
 		return this.backingList.set(index, element);
 	}
 
+	@Override
 	public int size() {
 		return this.backingList.size();
 	}
 
+	@Override
 	public List<E> subList(int fromIndex, int toIndex) {
 		return this.backingList.subList(fromIndex, toIndex);
 	}
 
+	@Override
 	public Object[] toArray() {
 		return this.backingList.toArray();
 	}
 
+	@Override
 	public <T> T[] toArray(T[] a) {
 		return this.backingList.toArray(a);
 	}
@@ -259,6 +282,7 @@ public class AutoPopulatingList<E> implements List<E>, Serializable {
 			this.elementClass = elementClass;
 		}
 
+		@Override
 		public E createElement(int index) {
 			try {
 				return this.elementClass.newInstance();
diff --git a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
index d1290588fd..963babc1e0 100644
--- a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
+++ b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java
@@ -117,18 +117,22 @@ public abstract class CachingMapDecorator<K, V> implements Map<K, V>, Serializab
 	}
 
 
+	@Override
 	public int size() {
 		return this.targetMap.size();
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return this.targetMap.isEmpty();
 	}
 
+	@Override
 	public boolean containsKey(Object key) {
 		return this.targetMap.containsKey(key);
 	}
 
+	@Override
 	public boolean containsValue(Object value) {
 		Object valueToCheck = (value != null ? value : NULL_VALUE);
 		if (this.synchronize) {
@@ -153,6 +157,7 @@ public abstract class CachingMapDecorator<K, V> implements Map<K, V>, Serializab
 		return false;
 	}
 
+	@Override
 	public V remove(Object key) {
 		return unwrapReturnValue(this.targetMap.remove(key));
 	}
@@ -166,14 +171,17 @@ public abstract class CachingMapDecorator<K, V> implements Map<K, V>, Serializab
 		return (returnValue == NULL_VALUE ? null : (V) returnValue);
 	}
 
+	@Override
 	public void putAll(Map<? extends K, ? extends V> map) {
 		this.targetMap.putAll(map);
 	}
 
+	@Override
 	public void clear() {
 		this.targetMap.clear();
 	}
 
+	@Override
 	public Set<K> keySet() {
 		if (this.synchronize) {
 			synchronized (this.targetMap) {
@@ -185,6 +193,7 @@ public abstract class CachingMapDecorator<K, V> implements Map<K, V>, Serializab
 		}
 	}
 
+	@Override
 	public Collection<V> values() {
 		if (this.synchronize) {
 			synchronized (this.targetMap) {
@@ -213,6 +222,7 @@ public abstract class CachingMapDecorator<K, V> implements Map<K, V>, Serializab
 		return values;
 	}
 
+	@Override
 	public Set<Map.Entry<K, V>> entrySet() {
 		if (this.synchronize) {
 			synchronized (this.targetMap) {
@@ -248,6 +258,7 @@ public abstract class CachingMapDecorator<K, V> implements Map<K, V>, Serializab
 	 * reference.
 	 * @see #useWeakValue(Object, Object)
 	 */
+	@Override
 	public V put(K key, V value) {
 		Object newValue = value;
 		if (value == null) {
@@ -280,6 +291,7 @@ public abstract class CachingMapDecorator<K, V> implements Map<K, V>, Serializab
 	 * Consider overriding this method to synchronize it, if desired.
 	 * @see #create(Object)
 	 */
+	@Override
 	@SuppressWarnings("unchecked")
 	public V get(Object key) {
 		Object value = this.targetMap.get(key);
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..a16d5fecd4 100644
--- a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
@@ -370,14 +370,17 @@ public abstract class CollectionUtils {
 			this.enumeration = enumeration;
 		}
 
+		@Override
 		public boolean hasNext() {
 			return this.enumeration.hasMoreElements();
 		}
 
+		@Override
 		public E next() {
 			return this.enumeration.nextElement();
 		}
 
+		@Override
 		public void remove() throws UnsupportedOperationException {
 			throw new UnsupportedOperationException("Not supported");
 		}
@@ -396,6 +399,7 @@ public abstract class CollectionUtils {
 			this.map = map;
 		}
 
+		@Override
 		public void add(K key, V value) {
 			List<V> values = this.map.get(key);
 			if (values == null) {
@@ -405,23 +409,27 @@ public abstract class CollectionUtils {
 			values.add(value);
 		}
 
+		@Override
 		public V getFirst(K key) {
 			List<V> values = this.map.get(key);
 			return (values != null ? values.get(0) : null);
 		}
 
+		@Override
 		public void set(K key, V value) {
 			List<V> values = new LinkedList<V>();
 			values.add(value);
 			this.map.put(key, values);
 		}
 
+		@Override
 		public void setAll(Map<K, V> values) {
 			for (Entry<K, V> entry : values.entrySet()) {
 				set(entry.getKey(), entry.getValue());
 			}
 		}
 
+		@Override
 		public Map<K, V> toSingleValueMap() {
 			LinkedHashMap<K, V> singleValueMap = new LinkedHashMap<K,V>(this.map.size());
 			for (Entry<K, List<V>> entry : map.entrySet()) {
@@ -430,50 +438,62 @@ public abstract class CollectionUtils {
 			return singleValueMap;
 		}
 
+		@Override
 		public int size() {
 			return this.map.size();
 		}
 
+		@Override
 		public boolean isEmpty() {
 			return this.map.isEmpty();
 		}
 
+		@Override
 		public boolean containsKey(Object key) {
 			return this.map.containsKey(key);
 		}
 
+		@Override
 		public boolean containsValue(Object value) {
 			return this.map.containsValue(value);
 		}
 
+		@Override
 		public List<V> get(Object key) {
 			return this.map.get(key);
 		}
 
+		@Override
 		public List<V> put(K key, List<V> value) {
 			return this.map.put(key, value);
 		}
 
+		@Override
 		public List<V> remove(Object key) {
 			return this.map.remove(key);
 		}
 
+		@Override
 		public void putAll(Map<? extends K, ? extends List<V>> m) {
 			this.map.putAll(m);
 		}
 
+		@Override
 		public void clear() {
 			this.map.clear();
 		}
 
+		@Override
 		public Set<K> keySet() {
 			return this.map.keySet();
 		}
 
+		@Override
 		public Collection<List<V>> values() {
 			return this.map.values();
 		}
 
+		@Override
 		public Set<Entry<K, List<V>>> entrySet() {
 			return this.map.entrySet();
 		}
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 1e70018f5c..7279368496 100644
--- a/spring-core/src/main/java/org/springframework/util/CompositeIterator.java
+++ b/spring-core/src/main/java/org/springframework/util/CompositeIterator.java
@@ -48,6 +48,7 @@ public class CompositeIterator<E> implements Iterator<E> {
 		iterators.add(iterator);
 	}
 
+	@Override
 	public boolean hasNext() {
 		inUse = true;
 		for (Iterator<Iterator<E>> it = iterators.iterator(); it.hasNext();) {
@@ -58,6 +59,7 @@ public class CompositeIterator<E> implements Iterator<E> {
 		return false;
 	}
 
+	@Override
 	public E next() {
 		inUse = true;
 		for (Iterator<Iterator<E>> it = iterators.iterator(); it.hasNext();) {
@@ -69,6 +71,7 @@ public class CompositeIterator<E> implements Iterator<E> {
 		throw new NoSuchElementException("Exhaused all iterators");
 	}
 
+	@Override
 	public void remove() {
 		throw new UnsupportedOperationException("Remove is not supported");
 	}
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..c638f14a5d 100644
--- a/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
+++ b/spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
@@ -249,6 +249,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
 		return put(key, value, true);
 	}
 
+	@Override
 	public V putIfAbsent(K key, V value) {
 		return put(key, value, false);
 	}
@@ -284,6 +285,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
 		});
 	}
 
+	@Override
 	public boolean remove(Object key, final Object value) {
 		return doTask(key, new Task<Boolean>(TaskOption.RESTRUCTURE_AFTER, TaskOption.SKIP_IF_EMPTY) {
 			@Override
@@ -297,6 +299,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
 		});
 	}
 
+	@Override
 	public boolean replace(K key, final V oldValue, final V newValue) {
 		return doTask(key, new Task<Boolean>(TaskOption.RESTRUCTURE_BEFORE, TaskOption.SKIP_IF_EMPTY) {
 			@Override
@@ -310,6 +313,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
 		});
 	}
 
+	@Override
 	public V replace(K key, final V value) {
 		return doTask(key, new Task<V>(TaskOption.RESTRUCTURE_BEFORE, TaskOption.SKIP_IF_EMPTY) {
 			@Override
@@ -667,14 +671,17 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
 			this.value = value;
 		}
 
+		@Override
 		public K getKey() {
 			return this.key;
 		}
 
+		@Override
 		public V getValue() {
 			return this.value;
 		}
 
+		@Override
 		public V setValue(V value) {
 			V previous = this.value;
 			this.value = value;
@@ -836,11 +843,13 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
 			moveToNextSegment();
 		}
 
+		@Override
 		public boolean hasNext() {
 			getNextIfNecessary();
 			return this.next != null;
 		}
 
+		@Override
 		public Entry<K, V> next() {
 			getNextIfNecessary();
 			if (this.next == null) {
@@ -886,6 +895,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
 			}
 		}
 
+		@Override
 		public void remove() {
 			Assert.state(this.last != null);
 			ConcurrentReferenceHashMap.this.remove(this.last.getKey());
@@ -955,14 +965,17 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
 			this.nextReference = next;
 		}
 
+		@Override
 		public int getHash() {
 			return this.hash;
 		}
 
+		@Override
 		public Reference<K, V> getNext() {
 			return this.nextReference;
 		}
 
+		@Override
 		public void release() {
 			enqueue();
 			clear();
@@ -987,14 +1000,17 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V> implemen
 			this.nextReference = next;
 		}
 
+		@Override
 		public int getHash() {
 			return this.hash;
 		}
 
+		@Override
 		public Reference<K, V> getNext() {
 			return this.nextReference;
 		}
 
+		@Override
 		public void release() {
 			enqueue();
 			clear();
diff --git a/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java b/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java
index 19f2698c36..3cceeeace7 100644
--- a/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java
+++ b/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java
@@ -75,10 +75,12 @@ public class DefaultPropertiesPersister implements PropertiesPersister {
 			ClassUtils.hasMethod(Properties.class, "store", new Class[] {Writer.class, String.class});
 
 
+	@Override
 	public void load(Properties props, InputStream is) throws IOException {
 		props.load(is);
 	}
 
+	@Override
 	public void load(Properties props, Reader reader) throws IOException {
 		if (loadFromReaderAvailable) {
 			// On JDK 1.6+
@@ -157,10 +159,12 @@ public class DefaultPropertiesPersister implements PropertiesPersister {
 	}
 
 
+	@Override
 	public void store(Properties props, OutputStream os, String header) throws IOException {
 		props.store(os, header);
 	}
 
+	@Override
 	public void store(Properties props, Writer writer, String header) throws IOException {
 		if (storeToWriterAvailable) {
 			// On JDK 1.6+
@@ -227,6 +231,7 @@ public class DefaultPropertiesPersister implements PropertiesPersister {
 	}
 
 
+	@Override
 	public void loadFromXml(Properties props, InputStream is) throws IOException {
 		try {
 			props.loadFromXML(is);
@@ -236,6 +241,7 @@ public class DefaultPropertiesPersister implements PropertiesPersister {
 		}
 	}
 
+	@Override
 	public void storeToXml(Properties props, OutputStream os, String header) throws IOException {
 		try {
 			props.storeToXML(os, header);
@@ -245,6 +251,7 @@ public class DefaultPropertiesPersister implements PropertiesPersister {
 		}
 	}
 
+	@Override
 	public void storeToXml(Properties props, OutputStream os, String header, String encoding) throws IOException {
 		try {
 			props.storeToXML(os, header, encoding);
diff --git a/spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java b/spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
index 730047f7d1..5ba90a2d62 100644
--- a/spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
+++ b/spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
@@ -70,6 +70,7 @@ public class LinkedMultiValueMap<K, V> implements MultiValueMap<K, V>, Serializa
 
 	// MultiValueMap implementation
 
+	@Override
 	public void add(K key, V value) {
 		List<V> values = this.targetMap.get(key);
 		if (values == null) {
@@ -79,23 +80,27 @@ public class LinkedMultiValueMap<K, V> implements MultiValueMap<K, V>, Serializa
 		values.add(value);
 	}
 
+	@Override
 	public V getFirst(K key) {
 		List<V> values = this.targetMap.get(key);
 		return (values != null ? values.get(0) : null);
 	}
 
+	@Override
 	public void set(K key, V value) {
 		List<V> values = new LinkedList<V>();
 		values.add(value);
 		this.targetMap.put(key, values);
 	}
 
+	@Override
 	public void setAll(Map<K, V> values) {
 		for (Entry<K, V> entry : values.entrySet()) {
 			set(entry.getKey(), entry.getValue());
 		}
 	}
 
+	@Override
 	public Map<K, V> toSingleValueMap() {
 		LinkedHashMap<K, V> singleValueMap = new LinkedHashMap<K,V>(this.targetMap.size());
 		for (Entry<K, List<V>> entry : targetMap.entrySet()) {
@@ -107,50 +112,62 @@ public class LinkedMultiValueMap<K, V> implements MultiValueMap<K, V>, Serializa
 
 	// Map implementation
 
+	@Override
 	public int size() {
 		return this.targetMap.size();
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return this.targetMap.isEmpty();
 	}
 
+	@Override
 	public boolean containsKey(Object key) {
 		return this.targetMap.containsKey(key);
 	}
 
+	@Override
 	public boolean containsValue(Object value) {
 		return this.targetMap.containsValue(value);
 	}
 
+	@Override
 	public List<V> get(Object key) {
 		return this.targetMap.get(key);
 	}
 
+	@Override
 	public List<V> put(K key, List<V> value) {
 		return this.targetMap.put(key, value);
 	}
 
+	@Override
 	public List<V> remove(Object key) {
 		return this.targetMap.remove(key);
 	}
 
+	@Override
 	public void putAll(Map<? extends K, ? extends List<V>> m) {
 		this.targetMap.putAll(m);
 	}
 
+	@Override
 	public void clear() {
 		this.targetMap.clear();
 	}
 
+	@Override
 	public Set<K> keySet() {
 		return this.targetMap.keySet();
 	}
 
+	@Override
 	public Collection<List<V>> values() {
 		return this.targetMap.values();
 	}
 
+	@Override
 	public Set<Entry<K, List<V>>> entrySet() {
 		return this.targetMap.entrySet();
 	}
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..99d666e5a5 100644
--- a/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java
+++ b/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java
@@ -107,6 +107,7 @@ public class PropertyPlaceholderHelper {
 	public String replacePlaceholders(String value, final Properties properties) {
 		Assert.notNull(properties, "Argument 'properties' must not be null.");
 		return replacePlaceholders(value, new PlaceholderResolver() {
+			@Override
 			public String resolvePlaceholder(String placeholderName) {
 				return properties.getProperty(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..0edaeca2d3 100644
--- a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java
@@ -494,6 +494,7 @@ public abstract class ReflectionUtils {
 	public static Method[] getAllDeclaredMethods(Class<?> leafClass) throws IllegalArgumentException {
 		final List<Method> methods = new ArrayList<Method>(32);
 		doWithMethods(leafClass, new MethodCallback() {
+			@Override
 			public void doWith(Method method) {
 				methods.add(method);
 			}
@@ -509,6 +510,7 @@ public abstract class ReflectionUtils {
 	public static Method[] getUniqueDeclaredMethods(Class<?> leafClass) throws IllegalArgumentException {
 		final List<Method> methods = new ArrayList<Method>(32);
 		doWithMethods(leafClass, new MethodCallback() {
+			@Override
 			public void doWith(Method method) {
 				boolean knownSignature = false;
 				Method methodBeingOverriddenWithCovariantReturnType = null;
@@ -597,6 +599,7 @@ public abstract class ReflectionUtils {
 					+ "] must be same or subclass as source class [" + src.getClass().getName() + "]");
 		}
 		doWithFields(src.getClass(), new FieldCallback() {
+			@Override
 			public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException {
 				makeAccessible(field);
 				Object srcValue = field.get(src);
@@ -663,6 +666,7 @@ public abstract class ReflectionUtils {
 	 */
 	public static FieldFilter COPYABLE_FIELDS = new FieldFilter() {
 
+		@Override
 		public boolean matches(Field field) {
 			return !(Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers()));
 		}
@@ -674,6 +678,7 @@ public abstract class ReflectionUtils {
 	 */
 	public static MethodFilter NON_BRIDGED_METHODS = new MethodFilter() {
 
+		@Override
 		public boolean matches(Method method) {
 			return !method.isBridge();
 		}
@@ -686,6 +691,7 @@ public abstract class ReflectionUtils {
 	 */
 	public static MethodFilter USER_DECLARED_METHODS = new MethodFilter() {
 
+		@Override
 		public boolean matches(Method method) {
 			return (!method.isBridge() && method.getDeclaringClass() != Object.class);
 		}
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..72f8712ff0 100644
--- a/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java
@@ -89,6 +89,7 @@ public abstract class SystemPropertyUtils {
 			this.text = text;
 		}
 
+		@Override
 		public String resolvePlaceholder(String placeholderName) {
 			try {
 				String propVal = System.getProperty(placeholderName);
diff --git a/spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java b/spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java
index ad2e01c5ef..bf6accc6ae 100644
--- a/spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java
+++ b/spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java
@@ -132,6 +132,7 @@ public class WeakReferenceMonitor {
 	 */
 	private static class MonitoringProcess implements Runnable {
 
+		@Override
 		public void run() {
 			logger.debug("Starting reference monitor thread");
 			// Check if there are any tracked entries left.
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
index 6fd0c2294b..ec68351e79 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java
@@ -59,6 +59,7 @@ public final class BooleanComparator implements Comparator<Boolean>, Serializabl
 	}
 
 
+	@Override
 	public int compare(Boolean v1, Boolean v2) {
 		return (v1 ^ v2) ? ((v1 ^ this.trueLow) ? 1 : -1) : 0;
 	}
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/ComparableComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/ComparableComparator.java
index 40e4e7af93..b8b27418cb 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/ComparableComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/ComparableComparator.java
@@ -32,6 +32,7 @@ public class ComparableComparator<T extends Comparable<T>> implements Comparator
 	@SuppressWarnings("rawtypes")
 	public static final ComparableComparator INSTANCE = new ComparableComparator();
 
+	@Override
 	public int compare(T o1, T o2) {
 		return o1.compareTo(o2);
 	}
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java
index ba56bd54d1..20652a3288 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/CompoundComparator.java
@@ -162,6 +162,7 @@ public class CompoundComparator<T> implements Comparator<T>, Serializable {
 		return this.comparators.size();
 	}
 
+	@Override
 	public int compare(T o1, T o2) {
 		Assert.state(this.comparators.size() > 0,
 				"No sort definitions have been added to this CompoundComparator to compare");
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..b9c6161038 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
@@ -52,6 +52,7 @@ public class InstanceComparator<T> implements Comparator<T> {
 	}
 
 
+	@Override
 	public int compare(T o1, T o2) {
 		int i1 = getOrder(o1);
 		int i2 = getOrder(o2);
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
index f78e56ff5d..9a9f5f9c19 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/InvertibleComparator.java
@@ -84,6 +84,7 @@ public class InvertibleComparator<T> implements Comparator<T>, Serializable {
 	}
 
 
+	@Override
 	public int compare(T o1, T o2) {
 		int result = this.comparator.compare(o1, o2);
 		if (result != 0) {
diff --git a/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java
index 1171bdc1d3..ebff3488c2 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/NullSafeComparator.java
@@ -86,6 +86,7 @@ public class NullSafeComparator<T> implements Comparator<T> {
 	}
 
 
+	@Override
 	public int compare(T o1, T o2) {
 		if (o1 == o2) {
 			return 0;
diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java
index 46f4d98ebe..f494b88592 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java
@@ -37,6 +37,7 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
 
 	private boolean namespaceContextChanged = false;
 
+	@Override
 	public final void startDocument() throws SAXException {
 		namespaceContext.clear();
 		namespaceContextChanged = false;
@@ -50,6 +51,7 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
 
 	protected abstract void startDocumentInternal() throws XMLStreamException;
 
+	@Override
 	public final void endDocument() throws SAXException {
 		namespaceContext.clear();
 		namespaceContextChanged = false;
@@ -68,6 +70,7 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
 	 *
 	 * @see SimpleNamespaceContext#bindNamespaceUri(String,String)
 	 */
+	@Override
 	public final void startPrefixMapping(String prefix, String uri) {
 		namespaceContext.bindNamespaceUri(prefix, uri);
 		namespaceContextChanged = true;
@@ -78,11 +81,13 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
 	 *
 	 * @see SimpleNamespaceContext#removeBinding(String)
 	 */
+	@Override
 	public final void endPrefixMapping(String prefix) {
 		namespaceContext.removeBinding(prefix);
 		namespaceContextChanged = true;
 	}
 
+	@Override
 	public final void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
 		try {
 			startElementInternal(toQName(uri, qName), atts, namespaceContextChanged ? namespaceContext : null);
@@ -96,6 +101,7 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
 	protected abstract void startElementInternal(QName name, Attributes atts, SimpleNamespaceContext namespaceContext)
 			throws XMLStreamException;
 
+	@Override
 	public final void endElement(String uri, String localName, String qName) throws SAXException {
 		try {
 			endElementInternal(toQName(uri, qName), namespaceContextChanged ? namespaceContext : null);
@@ -109,6 +115,7 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
 	protected abstract void endElementInternal(QName name, SimpleNamespaceContext namespaceContext)
 			throws XMLStreamException;
 
+	@Override
 	public final void characters(char ch[], int start, int length) throws SAXException {
 		try {
 			charactersInternal(ch, start, length);
@@ -120,6 +127,7 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
 
 	protected abstract void charactersInternal(char[] ch, int start, int length) throws XMLStreamException;
 
+	@Override
 	public final void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
 		try {
 			ignorableWhitespaceInternal(ch, start, length);
@@ -131,6 +139,7 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
 
 	protected abstract void ignorableWhitespaceInternal(char[] ch, int start, int length) throws XMLStreamException;
 
+	@Override
 	public final void processingInstruction(String target, String data) throws SAXException {
 		try {
 			processingInstructionInternal(target, data);
@@ -142,6 +151,7 @@ abstract class AbstractStaxContentHandler implements ContentHandler {
 
 	protected abstract void processingInstructionInternal(String target, String data) throws XMLStreamException;
 
+	@Override
 	public final void skippedEntity(String name) throws SAXException {
 		try {
 			skippedEntityInternal(name);
diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
index feeefd6e8e..25dc97b299 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
@@ -134,6 +134,7 @@ abstract class AbstractStaxXMLReader extends AbstractXMLReader {
 	 * @param ignored is ignored
 	 * @throws SAXException a SAX exception, possibly wrapping a {@code XMLStreamException}
 	 */
+	@Override
 	public final void parse(InputSource ignored) throws SAXException {
 		parse();
 	}
@@ -144,6 +145,7 @@ abstract class AbstractStaxXMLReader extends AbstractXMLReader {
 	 * @param ignored is ignored
 	 * @throws SAXException A SAX exception, possibly wrapping a {@code XMLStreamException}
 	 */
+	@Override
 	public final void parse(String ignored) throws SAXException {
 		parse();
 	}
@@ -217,18 +219,22 @@ abstract class AbstractStaxXMLReader extends AbstractXMLReader {
 			this.location = location;
 		}
 
+		@Override
 		public String getPublicId() {
 			return location.getPublicId();
 		}
 
+		@Override
 		public String getSystemId() {
 			return location.getSystemId();
 		}
 
+		@Override
 		public int getLineNumber() {
 			return location.getLineNumber();
 		}
 
+		@Override
 		public int getColumnNumber() {
 			return location.getColumnNumber();
 		}
diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java
index 300f9ff2fc..7b24a3c1c2 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java
@@ -48,34 +48,42 @@ abstract class AbstractXMLReader implements XMLReader {
 
 	private LexicalHandler lexicalHandler;
 
+	@Override
 	public ContentHandler getContentHandler() {
 		return contentHandler;
 	}
 
+	@Override
 	public void setContentHandler(ContentHandler contentHandler) {
 		this.contentHandler = contentHandler;
 	}
 
+	@Override
 	public void setDTDHandler(DTDHandler dtdHandler) {
 		this.dtdHandler = dtdHandler;
 	}
 
+	@Override
 	public DTDHandler getDTDHandler() {
 		return dtdHandler;
 	}
 
+	@Override
 	public EntityResolver getEntityResolver() {
 		return entityResolver;
 	}
 
+	@Override
 	public void setEntityResolver(EntityResolver entityResolver) {
 		this.entityResolver = entityResolver;
 	}
 
+	@Override
 	public ErrorHandler getErrorHandler() {
 		return errorHandler;
 	}
 
+	@Override
 	public void setErrorHandler(ErrorHandler errorHandler) {
 		this.errorHandler = errorHandler;
 	}
@@ -90,6 +98,7 @@ abstract class AbstractXMLReader implements XMLReader {
 	 * @throws org.xml.sax.SAXNotRecognizedException
 	 *          always
 	 */
+	@Override
 	public boolean getFeature(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
 		throw new SAXNotRecognizedException(name);
 	}
@@ -99,6 +108,7 @@ abstract class AbstractXMLReader implements XMLReader {
 	 *
 	 * @throws SAXNotRecognizedException always
 	 */
+	@Override
 	public void setFeature(String name, boolean value) throws SAXNotRecognizedException, SAXNotSupportedException {
 		throw new SAXNotRecognizedException(name);
 	}
@@ -107,6 +117,7 @@ abstract class AbstractXMLReader implements XMLReader {
 	 * Throws a {@code SAXNotRecognizedException} exception when the given property does not signify a lexical
 	 * handler. The property name for a lexical handler is {@code http://xml.org/sax/properties/lexical-handler}.
 	 */
+	@Override
 	public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
 		if ("http://xml.org/sax/properties/lexical-handler".equals(name)) {
 			return lexicalHandler;
@@ -120,6 +131,7 @@ abstract class AbstractXMLReader implements XMLReader {
 	 * Throws a {@code SAXNotRecognizedException} exception when the given property does not signify a lexical
 	 * handler. The property name for a lexical handler is {@code http://xml.org/sax/properties/lexical-handler}.
 	 */
+	@Override
 	public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException {
 		if ("http://xml.org/sax/properties/lexical-handler".equals(name)) {
 			lexicalHandler = (LexicalHandler) value;
diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
index e8c8a64348..6335ea156f 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java
@@ -31,6 +31,7 @@ import org.springframework.util.Assert;
  */
 abstract class AbstractXMLStreamReader implements XMLStreamReader {
 
+	@Override
 	public String getElementText() throws XMLStreamException {
 		if (getEventType() != XMLStreamConstants.START_ELEMENT) {
 			throw new XMLStreamException("parser must be on START_ELEMENT to read next text", getLocation());
@@ -61,18 +62,22 @@ abstract class AbstractXMLStreamReader implements XMLStreamReader {
 		return builder.toString();
 	}
 
+	@Override
 	public String getAttributeLocalName(int index) {
 		return getAttributeName(index).getLocalPart();
 	}
 
+	@Override
 	public String getAttributeNamespace(int index) {
 		return getAttributeName(index).getNamespaceURI();
 	}
 
+	@Override
 	public String getAttributePrefix(int index) {
 		return getAttributeName(index).getPrefix();
 	}
 
+	@Override
 	public String getNamespaceURI() {
 		int eventType = getEventType();
 		if (eventType == XMLStreamConstants.START_ELEMENT || eventType == XMLStreamConstants.END_ELEMENT) {
@@ -83,11 +88,13 @@ abstract class AbstractXMLStreamReader implements XMLStreamReader {
 		}
 	}
 
+	@Override
 	public String getNamespaceURI(String prefix) {
 		Assert.notNull(prefix, "No prefix given");
 		return getNamespaceContext().getNamespaceURI(prefix);
 	}
 
+	@Override
 	public boolean hasText() {
 		int eventType = getEventType();
 		return eventType == XMLStreamConstants.SPACE || eventType == XMLStreamConstants.CHARACTERS ||
@@ -95,6 +102,7 @@ abstract class AbstractXMLStreamReader implements XMLStreamReader {
 				eventType == XMLStreamConstants.ENTITY_REFERENCE;
 	}
 
+	@Override
 	public String getPrefix() {
 		int eventType = getEventType();
 		if (eventType == XMLStreamConstants.START_ELEMENT || eventType == XMLStreamConstants.END_ELEMENT) {
@@ -105,27 +113,33 @@ abstract class AbstractXMLStreamReader implements XMLStreamReader {
 		}
 	}
 
+	@Override
 	public boolean hasName() {
 		int eventType = getEventType();
 		return eventType == XMLStreamConstants.START_ELEMENT || eventType == XMLStreamConstants.END_ELEMENT;
 	}
 
+	@Override
 	public boolean isWhiteSpace() {
 		return getEventType() == XMLStreamConstants.SPACE;
 	}
 
+	@Override
 	public boolean isStartElement() {
 		return getEventType() == XMLStreamConstants.START_ELEMENT;
 	}
 
+	@Override
 	public boolean isEndElement() {
 		return getEventType() == XMLStreamConstants.END_ELEMENT;
 	}
 
+	@Override
 	public boolean isCharacters() {
 		return getEventType() == XMLStreamConstants.CHARACTERS;
 	}
 
+	@Override
 	public int nextTag() throws XMLStreamException {
 		int eventType = next();
 		while (eventType == XMLStreamConstants.CHARACTERS && isWhiteSpace() ||
@@ -139,6 +153,7 @@ abstract class AbstractXMLStreamReader implements XMLStreamReader {
 		return eventType;
 	}
 
+	@Override
 	public void require(int expectedType, String namespaceURI, String localName) throws XMLStreamException {
 		int eventType = getEventType();
 		if (eventType != expectedType) {
@@ -146,6 +161,7 @@ abstract class AbstractXMLStreamReader implements XMLStreamReader {
 		}
 	}
 
+	@Override
 	public String getAttributeValue(String namespaceURI, String localName) {
 		for (int i = 0; i < getAttributeCount(); i++) {
 			QName name = getAttributeName(i);
@@ -157,18 +173,22 @@ abstract class AbstractXMLStreamReader implements XMLStreamReader {
 		return null;
 	}
 
+	@Override
 	public boolean hasNext() throws XMLStreamException {
 		return getEventType() != END_DOCUMENT;
 	}
 
+	@Override
 	public String getLocalName() {
 		return getName().getLocalPart();
 	}
 
+	@Override
 	public char[] getTextCharacters() {
 		return getText().toCharArray();
 	}
 
+	@Override
 	public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length)
 			throws XMLStreamException {
 		char[] source = getTextCharacters();
@@ -177,6 +197,7 @@ abstract class AbstractXMLStreamReader implements XMLStreamReader {
 		return length;
 	}
 
+	@Override
 	public int getTextLength() {
 		return getText().length();
 	}
diff --git a/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java
index 534cb0077b..5a8d92aa85 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java
@@ -72,6 +72,7 @@ class DomContentHandler implements ContentHandler {
 		}
 	}
 
+	@Override
 	public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
 		Node parent = getParent();
 		Element element = document.createElementNS(uri, qName);
@@ -87,10 +88,12 @@ class DomContentHandler implements ContentHandler {
 		elements.add(element);
 	}
 
+	@Override
 	public void endElement(String uri, String localName, String qName) throws SAXException {
 		elements.remove(elements.size() - 1);
 	}
 
+	@Override
 	public void characters(char ch[], int start, int length) throws SAXException {
 		String data = new String(ch, start, length);
 		Node parent = getParent();
@@ -104,6 +107,7 @@ class DomContentHandler implements ContentHandler {
 		}
 	}
 
+	@Override
 	public void processingInstruction(String target, String data) throws SAXException {
 		Node parent = getParent();
 		ProcessingInstruction pi = document.createProcessingInstruction(target, data);
@@ -114,24 +118,31 @@ class DomContentHandler implements ContentHandler {
 	 * Unsupported
 	 */
 
+	@Override
 	public void setDocumentLocator(Locator locator) {
 	}
 
+	@Override
 	public void startDocument() throws SAXException {
 	}
 
+	@Override
 	public void endDocument() throws SAXException {
 	}
 
+	@Override
 	public void startPrefixMapping(String prefix, String uri) throws SAXException {
 	}
 
+	@Override
 	public void endPrefixMapping(String prefix) throws SAXException {
 	}
 
+	@Override
 	public void ignorableWhitespace(char ch[], int start, int length) throws SAXException {
 	}
 
+	@Override
 	public void skippedEntity(String name) throws SAXException {
 	}
 }
diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
index c0d966d6eb..2908fa9148 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java
@@ -43,6 +43,7 @@ public class SimpleNamespaceContext implements NamespaceContext {
 
 	private String defaultNamespaceUri = "";
 
+	@Override
 	public String getNamespaceURI(String prefix) {
 		Assert.notNull(prefix, "prefix is null");
 		if (XMLConstants.XML_NS_PREFIX.equals(prefix)) {
@@ -60,11 +61,13 @@ public class SimpleNamespaceContext implements NamespaceContext {
 		return "";
 	}
 
+	@Override
 	public String getPrefix(String namespaceUri) {
 		List prefixes = getPrefixesInternal(namespaceUri);
 		return prefixes.isEmpty() ? null : (String) prefixes.get(0);
 	}
 
+	@Override
 	public Iterator getPrefixes(String namespaceUri) {
 		return getPrefixesInternal(namespaceUri).iterator();
 	}
diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java
index ed06ed8c05..3d0227db1c 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java
@@ -43,14 +43,17 @@ public class SimpleSaxErrorHandler implements ErrorHandler {
 	}
 
 
+	@Override
 	public void warning(SAXParseException ex) throws SAXException {
 		logger.warn("Ignored XML validation warning", ex);
 	}
 
+	@Override
 	public void error(SAXParseException ex) throws SAXException {
 		throw ex;
 	}
 
+	@Override
 	public void fatalError(SAXParseException ex) throws SAXException {
 		throw ex;
 	}
diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java
index 7fd5dffa10..cab7670a92 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java
@@ -43,14 +43,17 @@ public class SimpleTransformErrorListener implements ErrorListener {
 	}
 
 
+	@Override
 	public void warning(TransformerException ex) throws TransformerException {
 		logger.warn("XSLT transformation warning", ex);
 	}
 
+	@Override
 	public void error(TransformerException ex) throws TransformerException {
 		logger.error("XSLT transformation error", ex);
 	}
 
+	@Override
 	public void fatalError(TransformerException ex) throws TransformerException {
 		throw ex;
 	}
diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java
index 686ff1a634..54505a587c 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/StaxEventContentHandler.java
@@ -71,6 +71,7 @@ class StaxEventContentHandler extends AbstractStaxContentHandler {
 		this.eventConsumer = consumer;
 	}
 
+	@Override
 	public void setDocumentLocator(Locator locator) {
 		if (locator != null) {
 			this.eventFactory.setLocation(new LocatorLocationAdapter(locator));
@@ -168,22 +169,27 @@ class StaxEventContentHandler extends AbstractStaxContentHandler {
 			this.locator = locator;
 		}
 
+		@Override
 		public int getLineNumber() {
 			return this.locator.getLineNumber();
 		}
 
+		@Override
 		public int getColumnNumber() {
 			return this.locator.getColumnNumber();
 		}
 
+		@Override
 		public int getCharacterOffset() {
 			return -1;
 		}
 
+		@Override
 		public String getPublicId() {
 			return this.locator.getPublicId();
 		}
 
+		@Override
 		public String getSystemId() {
 			return this.locator.getSystemId();
 		}
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..9607d29f23 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
@@ -170,26 +170,32 @@ class StaxEventXMLReader extends AbstractStaxXMLReader {
 			final Location location = event.getLocation();
 			getContentHandler().setDocumentLocator(new Locator2() {
 
+				@Override
 				public int getColumnNumber() {
 					return location != null ? location.getColumnNumber() : -1;
 				}
 
+				@Override
 				public int getLineNumber() {
 					return location != null ? location.getLineNumber() : -1;
 				}
 
+				@Override
 				public String getPublicId() {
 					return location != null ? location.getPublicId() : null;
 				}
 
+				@Override
 				public String getSystemId() {
 					return location != null ? location.getSystemId() : null;
 				}
 
+				@Override
 				public String getXMLVersion() {
 					return xmlVersion;
 				}
 
+				@Override
 				public String getEncoding() {
 					return encoding;
 				}
diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
index 2241e2f2a9..284f69d0ac 100644
--- a/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
+++ b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java
@@ -49,6 +49,7 @@ class StaxStreamContentHandler extends AbstractStaxContentHandler {
 		this.streamWriter = streamWriter;
 	}
 
+	@Override
 	public void setDocumentLocator(Locator locator) {
 	}
 
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..4bba7a6974 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
@@ -144,26 +144,32 @@ class StaxStreamXMLReader extends AbstractStaxXMLReader {
 
 			getContentHandler().setDocumentLocator(new Locator2() {
 
+				@Override
 				public int getColumnNumber() {
 					return location != null ? location.getColumnNumber() : -1;
 				}
 
+				@Override
 				public int getLineNumber() {
 					return location != null ? location.getLineNumber() : -1;
 				}
 
+				@Override
 				public String getPublicId() {
 					return location != null ? location.getPublicId() : null;
 				}
 
+				@Override
 				public String getSystemId() {
 					return location != null ? location.getSystemId() : null;
 				}
 
+				@Override
 				public String getXMLVersion() {
 					return xmlVersion;
 				}
 
+				@Override
 				public String getEncoding() {
 					return encoding;
 				}
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..59ce5f0091 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
@@ -49,6 +49,7 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 		event = eventReader.nextEvent();
 	}
 
+	@Override
 	public boolean isStandalone() {
 		if (event.isStartDocument()) {
 			return ((StartDocument) event).isStandalone();
@@ -58,6 +59,7 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 		}
 	}
 
+	@Override
 	public String getVersion() {
 		if (event.isStartDocument()) {
 			return ((StartDocument) event).getVersion();
@@ -67,10 +69,12 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 		}
 	}
 
+	@Override
 	public int getTextStart() {
 		return 0;
 	}
 
+	@Override
 	public String getText() {
 		if (event.isCharacters()) {
 			return event.asCharacters().getData();
@@ -83,6 +87,7 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 		}
 	}
 
+	@Override
 	public String getPITarget() {
 		if (event.isProcessingInstruction()) {
 			return ((ProcessingInstruction) event).getTarget();
@@ -92,6 +97,7 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 		}
 	}
 
+	@Override
 	public String getPIData() {
 		if (event.isProcessingInstruction()) {
 			return ((ProcessingInstruction) event).getData();
@@ -101,6 +107,7 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 		}
 	}
 
+	@Override
 	public int getNamespaceCount() {
 		Iterator namespaces;
 		if (event.isStartElement()) {
@@ -115,6 +122,7 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 		return countIterator(namespaces);
 	}
 
+	@Override
 	public NamespaceContext getNamespaceContext() {
 		if (event.isStartElement()) {
 			return event.asStartElement().getNamespaceContext();
@@ -124,6 +132,7 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 		}
 	}
 
+	@Override
 	public QName getName() {
 		if (event.isStartElement()) {
 			return event.asStartElement().getName();
@@ -136,22 +145,27 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 		}
 	}
 
+	@Override
 	public Location getLocation() {
 		return event.getLocation();
 	}
 
+	@Override
 	public int getEventType() {
 		return event.getEventType();
 	}
 
+	@Override
 	public String getEncoding() {
 		return null;
 	}
 
+	@Override
 	public String getCharacterEncodingScheme() {
 		return null;
 	}
 
+	@Override
 	public int getAttributeCount() {
 		if (!event.isStartElement()) {
 			throw new IllegalStateException();
@@ -160,43 +174,53 @@ class XMLEventStreamReader extends AbstractXMLStreamReader {
 		return countIterator(attributes);
 	}
 
+	@Override
 	public void close() throws XMLStreamException {
 		eventReader.close();
 	}
 
+	@Override
 	public QName getAttributeName(int index) {
 		return getAttribute(index).getName();
 	}
 
+	@Override
 	public String getAttributeType(int index) {
 		return getAttribute(index).getDTDType();
 	}
 
+	@Override
 	public String getAttributeValue(int index) {
 		return getAttribute(index).getValue();
 	}
 
+	@Override
 	public String getNamespacePrefix(int index) {
 		return getNamespace(index).getPrefix();
 	}
 
+	@Override
 	public String getNamespaceURI(int index) {
 		return getNamespace(index).getNamespaceURI();
 	}
 
+	@Override
 	public Object getProperty(String name) throws IllegalArgumentException {
 		return eventReader.getProperty(name);
 	}
 
+	@Override
 	public boolean isAttributeSpecified(int index) {
 		return getAttribute(index).isSpecified();
 	}
 
+	@Override
 	public int next() throws XMLStreamException {
 		event = eventReader.nextEvent();
 		return event.getEventType();
 	}
 
+	@Override
 	public boolean standaloneSet() {
 		if (event.isStartDocument()) {
 			return ((StartDocument) event).standaloneSet();
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..8c9e3ad0fb 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
@@ -56,65 +56,80 @@ class XMLEventStreamWriter implements XMLStreamWriter {
 		this.eventFactory = eventFactory;
 	}
 
+	@Override
 	public NamespaceContext getNamespaceContext() {
 		return eventWriter.getNamespaceContext();
 	}
 
+	@Override
 	public String getPrefix(String uri) throws XMLStreamException {
 		return eventWriter.getPrefix(uri);
 	}
 
+	@Override
 	public void setPrefix(String prefix, String uri) throws XMLStreamException {
 		eventWriter.setPrefix(prefix, uri);
 	}
 
+	@Override
 	public void setDefaultNamespace(String uri) throws XMLStreamException {
 		eventWriter.setDefaultNamespace(uri);
 	}
 
+	@Override
 	public void setNamespaceContext(NamespaceContext context) throws XMLStreamException {
 		eventWriter.setNamespaceContext(context);
 	}
 
+	@Override
 	public void writeStartDocument() throws XMLStreamException {
 		eventWriter.add(eventFactory.createStartDocument());
 	}
 
+	@Override
 	public void writeStartDocument(String version) throws XMLStreamException {
 		eventWriter.add(eventFactory.createStartDocument(DEFAULT_ENCODING, version));
 	}
 
+	@Override
 	public void writeStartDocument(String encoding, String version) throws XMLStreamException {
 		eventWriter.add(eventFactory.createStartDocument(encoding, version));
 	}
 
+	@Override
 	public void writeStartElement(String localName) throws XMLStreamException {
 		writeStartElement(eventFactory.createStartElement(new QName(localName), null, null));
 	}
 
+	@Override
 	public void writeStartElement(String namespaceURI, String localName) throws XMLStreamException {
 		writeStartElement(eventFactory.createStartElement(new QName(namespaceURI, localName), null, null));
 	}
 
+	@Override
 	public void writeStartElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
 		writeStartElement(eventFactory.createStartElement(new QName(namespaceURI, localName, prefix), null, null));
 	}
 
+	@Override
 	public void writeEmptyElement(String localName) throws XMLStreamException {
 		writeStartElement(localName);
 		writeEndElement();
 	}
 
+	@Override
 	public void writeEmptyElement(String namespaceURI, String localName) throws XMLStreamException {
 		writeStartElement(namespaceURI, localName);
 		writeEndElement();
 	}
 
+	@Override
 	public void writeEmptyElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
 		writeStartElement(prefix, localName, namespaceURI);
 		writeEndElement();
 	}
 
+	@Override
 	public void writeEndElement() throws XMLStreamException {
 		int last = endElements.size() - 1;
 		EndElement lastEndElement = endElements.get(last);
@@ -122,71 +137,88 @@ class XMLEventStreamWriter implements XMLStreamWriter {
 		endElements.remove(last);
 	}
 
+	@Override
 	public void writeAttribute(String localName, String value) throws XMLStreamException {
 		eventWriter.add(eventFactory.createAttribute(localName, value));
 	}
 
+	@Override
 	public void writeAttribute(String namespaceURI, String localName, String value) throws XMLStreamException {
 		eventWriter.add(eventFactory.createAttribute(new QName(namespaceURI, localName), value));
 	}
 
+	@Override
 	public void writeAttribute(String prefix, String namespaceURI, String localName, String value)
 			throws XMLStreamException {
 		eventWriter.add(eventFactory.createAttribute(prefix, namespaceURI, localName, value));
 	}
 
+	@Override
 	public void writeNamespace(String prefix, String namespaceURI) throws XMLStreamException {
 		writeNamespace(eventFactory.createNamespace(prefix, namespaceURI));
 	}
 
+	@Override
 	public void writeDefaultNamespace(String namespaceURI) throws XMLStreamException {
 		writeNamespace(eventFactory.createNamespace(namespaceURI));
 	}
 
+	@Override
 	public void writeCharacters(String text) throws XMLStreamException {
 		eventWriter.add(eventFactory.createCharacters(text));
 	}
 
+	@Override
 	public void writeCharacters(char[] text, int start, int len) throws XMLStreamException {
 		eventWriter.add(eventFactory.createCharacters(new String(text, start, len)));
 	}
 
+	@Override
 	public void writeCData(String data) throws XMLStreamException {
 		eventWriter.add(eventFactory.createCData(data));
 	}
 
+	@Override
 	public void writeComment(String data) throws XMLStreamException {
 		eventWriter.add(eventFactory.createComment(data));
 	}
 
+	@Override
 	public void writeProcessingInstruction(String target) throws XMLStreamException {
 		eventWriter.add(eventFactory.createProcessingInstruction(target, ""));
 	}
 
+	@Override
 	public void writeProcessingInstruction(String target, String data) throws XMLStreamException {
 		eventWriter.add(eventFactory.createProcessingInstruction(target, data));
 	}
 
+	@Override
 	public void writeDTD(String dtd) throws XMLStreamException {
 		eventWriter.add(eventFactory.createDTD(dtd));
 	}
 
+	@Override
 	public void writeEntityRef(String name) throws XMLStreamException {
 		eventWriter.add(eventFactory.createEntityReference(name, null));
 	}
 
+	@Override
 	public void writeEndDocument() throws XMLStreamException {
 		eventWriter.add(eventFactory.createEndDocument());
 	}
 
+	@Override
 	public Object getProperty(String name) throws IllegalArgumentException {
 		throw new IllegalArgumentException();
 	}
 
+	@Override
 	public void flush() throws XMLStreamException {
 		eventWriter.flush();
 	}
 
+	@Override
 	public void close() throws XMLStreamException {
 		eventWriter.close();
 	}
diff --git a/spring-expression/src/main/java/org/springframework/expression/ParserContext.java b/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
index a1ae657bc3..1b69a293d7 100644
--- a/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
+++ b/spring-expression/src/main/java/org/springframework/expression/ParserContext.java
@@ -62,14 +62,17 @@ public interface ParserContext {
 	 */
 	public static final ParserContext TEMPLATE_EXPRESSION = new ParserContext() {
 
+		@Override
 		public String getExpressionPrefix() {
 			return "#{";
 		}
 
+		@Override
 		public String getExpressionSuffix() {
 			return "}";
 		}
 
+		@Override
 		public boolean isTemplate() {
 			return true;
 		}
diff --git a/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java b/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
index 840ad1b854..a24a545479 100644
--- a/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
+++ b/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java
@@ -50,10 +50,12 @@ public class CompositeStringExpression implements Expression {
 	}
 
 
+	@Override
 	public final String getExpressionString() {
 		return this.expressionString;
 	}
 
+	@Override
 	public String getValue() throws EvaluationException {
 		StringBuilder sb = new StringBuilder();
 		for (Expression expression : this.expressions) {
@@ -65,6 +67,7 @@ public class CompositeStringExpression implements Expression {
 		return sb.toString();
 	}
 
+	@Override
 	public String getValue(Object rootObject) throws EvaluationException {
 		StringBuilder sb = new StringBuilder();
 		for (Expression expression : this.expressions) {
@@ -76,6 +79,7 @@ public class CompositeStringExpression implements Expression {
 		return sb.toString();
 	}
 
+	@Override
 	public String getValue(EvaluationContext context) throws EvaluationException {
 		StringBuilder sb = new StringBuilder();
 		for (Expression expression : this.expressions) {
@@ -87,6 +91,7 @@ public class CompositeStringExpression implements Expression {
 		return sb.toString();
 	}
 
+	@Override
 	public String getValue(EvaluationContext context, Object rootObject) throws EvaluationException {
 		StringBuilder sb = new StringBuilder();
 		for (Expression expression : this.expressions) {
@@ -98,36 +103,44 @@ public class CompositeStringExpression implements Expression {
 		return sb.toString();
 	}
 
+	@Override
 	public Class getValueType(EvaluationContext context) {
 		return String.class;
 	}
 
+	@Override
 	public Class getValueType() {
 		return String.class;
 	}
 
+	@Override
 	public TypeDescriptor getValueTypeDescriptor(EvaluationContext context) {
 		return TypeDescriptor.valueOf(String.class);
 	}
 
+	@Override
 	public TypeDescriptor getValueTypeDescriptor() {
 		return TypeDescriptor.valueOf(String.class);
 	}
 
+	@Override
 	public void setValue(EvaluationContext context, Object value) throws EvaluationException {
 		throw new EvaluationException(this.expressionString, "Cannot call setValue on a composite expression");
 	}
 
+	@Override
 	public <T> T getValue(EvaluationContext context, Class<T> expectedResultType) throws EvaluationException {
 		Object value = getValue(context);
 		return ExpressionUtils.convert(context, value, expectedResultType);
 	}
 
+	@Override
 	public <T> T getValue(Class<T> expectedResultType) throws EvaluationException {
 		Object value = getValue();
 		return ExpressionUtils.convert(null, value, expectedResultType);
 	}
 
+	@Override
 	public boolean isWritable(EvaluationContext context) {
 		return false;
 	}
@@ -137,45 +150,55 @@ public class CompositeStringExpression implements Expression {
 	}
 
 
+	@Override
 	public <T> T getValue(Object rootObject, Class<T> desiredResultType) throws EvaluationException {
 		Object value = getValue(rootObject);
 		return ExpressionUtils.convert(null, value, desiredResultType);
 	}
 
+	@Override
 	public <T> T getValue(EvaluationContext context, Object rootObject, Class<T> desiredResultType)
 			throws EvaluationException {
 		Object value = getValue(context,rootObject);
 		return ExpressionUtils.convert(context, value, desiredResultType);
 	}
 
+	@Override
 	public Class getValueType(Object rootObject) throws EvaluationException {
 		return String.class;
 	}
 
+	@Override
 	public Class getValueType(EvaluationContext context, Object rootObject) throws EvaluationException {
 		return String.class;
 	}
 
+	@Override
 	public TypeDescriptor getValueTypeDescriptor(Object rootObject) throws EvaluationException {
 		return TypeDescriptor.valueOf(String.class);
 	}
 
+	@Override
 	public TypeDescriptor getValueTypeDescriptor(EvaluationContext context, Object rootObject) throws EvaluationException {
 		return TypeDescriptor.valueOf(String.class);
 	}
 
+	@Override
 	public boolean isWritable(EvaluationContext context, Object rootObject) throws EvaluationException {
 		return false;
 	}
 
+	@Override
 	public void setValue(EvaluationContext context, Object rootObject, Object value) throws EvaluationException {
 		throw new EvaluationException(this.expressionString, "Cannot call setValue on a composite expression");
 	}
 
+	@Override
 	public boolean isWritable(Object rootObject) throws EvaluationException {
 		return false;
 	}
 
+	@Override
 	public void setValue(Object rootObject, Object value) throws EvaluationException {
 		throw new EvaluationException(this.expressionString, "Cannot call setValue on a composite expression");
 	}
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..ea6742ae07 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
@@ -41,98 +41,121 @@ public class LiteralExpression implements Expression {
 	}
 
 
+	@Override
 	public final String getExpressionString() {
 		return this.literalValue;
 	}
 
+	@Override
 	public String getValue() {
 		return this.literalValue;
 	}
 
+	@Override
 	public String getValue(EvaluationContext context) {
 		return this.literalValue;
 	}
 
+	@Override
 	public String getValue(Object rootObject) {
 		return this.literalValue;
 	}
 
+	@Override
 	public Class getValueType(EvaluationContext context) {
 		return String.class;
 	}
 
+	@Override
 	public TypeDescriptor getValueTypeDescriptor(EvaluationContext context) {
 		return TypeDescriptor.valueOf(String.class);
 	}
 
+	@Override
 	public TypeDescriptor getValueTypeDescriptor() {
 		return TypeDescriptor.valueOf(String.class);
 	}
 
+	@Override
 	public void setValue(EvaluationContext context, Object value) throws EvaluationException {
 		throw new EvaluationException(literalValue, "Cannot call setValue() on a LiteralExpression");
 	}
 
+	@Override
 	public <T> T getValue(EvaluationContext context, Class<T> expectedResultType) throws EvaluationException {
 		Object value = getValue(context);
 		return ExpressionUtils.convert(context, value, expectedResultType);
 	}
 
+	@Override
 	public <T> T getValue(Class<T> expectedResultType) throws EvaluationException {
 		Object value = getValue();
 		return ExpressionUtils.convert(null, value, expectedResultType);
 	}
 
+	@Override
 	public boolean isWritable(EvaluationContext context) {
 		return false;
 	}
 
+	@Override
 	public Class getValueType() {
 		return String.class;
 	}
 
+	@Override
 	public <T> T getValue(Object rootObject, Class<T> desiredResultType) throws EvaluationException {
 		Object value = getValue(rootObject);
 		return ExpressionUtils.convert(null, value, desiredResultType);
 	}
 
+	@Override
 	public String getValue(EvaluationContext context, Object rootObject) throws EvaluationException {
 		return this.literalValue;
 	}
 
+	@Override
 	public <T> T getValue(EvaluationContext context, Object rootObject, Class<T> desiredResultType) throws EvaluationException {
 		Object value = getValue(context, rootObject);
 		return ExpressionUtils.convert(null, value, desiredResultType);
 	}
 
+	@Override
 	public Class getValueType(Object rootObject) throws EvaluationException {
 		return String.class;
 	}
 
+	@Override
 	public Class getValueType(EvaluationContext context, Object rootObject) throws EvaluationException {
 		return String.class;
 	}
 
+	@Override
 	public TypeDescriptor getValueTypeDescriptor(Object rootObject) throws EvaluationException {
 		return TypeDescriptor.valueOf(String.class);
 	}
 
+	@Override
 	public TypeDescriptor getValueTypeDescriptor(EvaluationContext context, Object rootObject) throws EvaluationException {
 		return TypeDescriptor.valueOf(String.class);
 	}
 
+	@Override
 	public boolean isWritable(EvaluationContext context, Object rootObject) throws EvaluationException {
 		return false;
 	}
 
+	@Override
 	public void setValue(EvaluationContext context, Object rootObject, Object value) throws EvaluationException {
 		throw new EvaluationException(literalValue, "Cannot call setValue() on a LiteralExpression");
 	}
 
+	@Override
 	public boolean isWritable(Object rootObject) throws EvaluationException {
 		return false;
 	}
 
+	@Override
 	public void setValue(Object rootObject, Object value) throws EvaluationException {
 		throw new EvaluationException(literalValue, "Cannot call setValue() on a LiteralExpression");
 	}
diff --git a/spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java
index 5c2752d6fd..8f2620aec9 100644
--- a/spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java
+++ b/spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java
@@ -40,22 +40,27 @@ public abstract class TemplateAwareExpressionParser implements ExpressionParser
 	 * Default ParserContext instance for non-template expressions.
 	 */
 	private static final ParserContext NON_TEMPLATE_PARSER_CONTEXT = new ParserContext() {
+		@Override
 		public String getExpressionPrefix() {
 			return null;
 		}
+		@Override
 		public String getExpressionSuffix() {
 			return null;
 		}
+		@Override
 		public boolean isTemplate() {
 			return false;
 		}
 	};
 
 
+	@Override
 	public Expression parseExpression(String expressionString) throws ParseException {
 		return parseExpression(expressionString, NON_TEMPLATE_PARSER_CONTEXT);
 	}
 
+	@Override
 	public Expression parseExpression(String expressionString, ParserContext context) throws ParseException {
 		if (context == null) {
 			context = NON_TEMPLATE_PARSER_CONTEXT;
diff --git a/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java b/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java
index 046ed6a901..768e567b5a 100644
--- a/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java
+++ b/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java
@@ -50,14 +50,17 @@ public class TemplateParserContext implements ParserContext {
 	}
 
 
+	@Override
 	public final boolean isTemplate() {
 		return true;
 	}
 
+	@Override
 	public final String getExpressionPrefix() {
 		return this.expressionPrefix;
 	}
 
+	@Override
 	public final String getExpressionSuffix() {
 		return this.expressionSuffix;
 	}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
index 8a09bf2b92..5a712417eb 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
@@ -32,6 +32,7 @@ public class InternalParseException extends RuntimeException {
 		super(cause);
 	}
 
+	@Override
 	public SpelParseException getCause() {
 		return (SpelParseException) super.getCause();
 	}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
index f061326251..a2b166ab8f 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Indexer.java
@@ -105,16 +105,19 @@ public class Indexer extends SpelNodeImpl {
 			this.typeDescriptor = typeDescriptor;
 		}
 
+		@Override
 		public TypedValue getValue() {
 			Object arrayElement = accessArrayElement(this.array, this.idx);
 			return new TypedValue(arrayElement, this.typeDescriptor.elementTypeDescriptor(arrayElement));
 		}
 
+		@Override
 		public void setValue(Object newValue) {
 			setArrayElement(this.typeConverter, this.array, this.idx, newValue,
 					this.typeDescriptor.getElementTypeDescriptor().getType());
 		}
 
+		@Override
 		public boolean isWritable() {
 			return true;
 		}
@@ -139,11 +142,13 @@ public class Indexer extends SpelNodeImpl {
 			this.mapEntryTypeDescriptor = mapEntryTypeDescriptor;
 		}
 
+		@Override
 		public TypedValue getValue() {
 			Object value = this.map.get(this.key);
 			return new TypedValue(value, this.mapEntryTypeDescriptor.getMapValueTypeDescriptor(value));
 		}
 
+		@Override
 		public void setValue(Object newValue) {
 			if (this.mapEntryTypeDescriptor.getMapValueTypeDescriptor() != null) {
 				newValue = this.typeConverter.convertValue(newValue, TypeDescriptor.forObject(newValue),
@@ -152,6 +157,7 @@ public class Indexer extends SpelNodeImpl {
 			this.map.put(this.key, newValue);
 		}
 
+		@Override
 		public boolean isWritable() {
 			return true;
 		}
@@ -176,6 +182,7 @@ public class Indexer extends SpelNodeImpl {
 			this.td = targetObjectTypeDescriptor;
 		}
 
+		@Override
 		public TypedValue getValue() {
 			Class<?> targetObjectRuntimeClass = getObjectClass(targetObject);
 			try {
@@ -209,6 +216,7 @@ public class Indexer extends SpelNodeImpl {
 					this.td.toString());
 		}
 
+		@Override
 		public void setValue(Object newValue) {
 			Class<?> contextObjectClass = getObjectClass(targetObject);
 			try {
@@ -238,6 +246,7 @@ public class Indexer extends SpelNodeImpl {
 			}
 		}
 
+		@Override
 		public boolean isWritable() {
 			return true;
 		}
@@ -266,6 +275,7 @@ public class Indexer extends SpelNodeImpl {
 			this.growCollection = growCollection;
 		}
 
+		@Override
 		public TypedValue getValue() {
 			if (this.index >= this.collection.size()) {
 				if (this.growCollection) {
@@ -290,6 +300,7 @@ public class Indexer extends SpelNodeImpl {
 			throw new IllegalStateException("Failed to find indexed element " + this.index + ": " + this.collection);
 		}
 
+		@Override
 		public void setValue(Object newValue) {
 			if (this.index >= this.collection.size()) {
 				if (this.growCollection) {
@@ -314,6 +325,7 @@ public class Indexer extends SpelNodeImpl {
 			}
 		}
 
+		@Override
 		public boolean isWritable() {
 			return true;
 		}
@@ -334,6 +346,7 @@ public class Indexer extends SpelNodeImpl {
 			this.td = td;
 		}
 
+		@Override
 		public TypedValue getValue() {
 			if (this.index >= this.target.length()) {
 				throw new SpelEvaluationException(getStartPosition(), SpelMessage.STRING_INDEX_OUT_OF_BOUNDS,
@@ -342,11 +355,13 @@ public class Indexer extends SpelNodeImpl {
 			return new TypedValue(String.valueOf(this.target.charAt(this.index)));
 		}
 
+		@Override
 		public void setValue(Object newValue) {
 			throw new SpelEvaluationException(getStartPosition(), SpelMessage.INDEXING_NOT_SUPPORTED_FOR_TYPE,
 					this.td.toString());
 		}
 
+		@Override
 		public boolean isWritable() {
 			return true;
 		}
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..e1cfa078e2 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
@@ -66,6 +66,7 @@ public class MethodReference extends SpelNodeImpl {
 			this.arguments = arguments;
 		}
 
+		@Override
 		public TypedValue getValue() {
 			MethodExecutor executorToUse = cachedExecutor;
 			if (executorToUse != null) {
@@ -103,10 +104,12 @@ public class MethodReference extends SpelNodeImpl {
 			}
 		}
 
+		@Override
 		public void setValue(Object newValue) {
 			throw new IllegalAccessError();
 		}
 
+		@Override
 		public boolean isWritable() {
 			return false;
 		}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
index c8eeb2b0f7..1afb3b28c4 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMinus.java
@@ -93,6 +93,7 @@ public class OpMinus extends Operator {
 		}
 		return super.toStringAST();
 	}
+	@Override
 	public SpelNodeImpl getRightOperand() {
 		if (children.length<2) {return null;}
 		return children[1];
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..043a57e6fd 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
@@ -83,14 +83,17 @@ public class PropertyOrFieldReference extends SpelNodeImpl {
 			this.isAutoGrowNullReferences = isAutoGrowNullReferences;
 		}
 
+		@Override
 		public TypedValue getValue() {
 			return ref.getValueInternal(contextObject,eContext,isAutoGrowNullReferences);
 		}
 
+		@Override
 		public void setValue(Object newValue) {
 			ref.writeProperty(contextObject,eContext, ref.name, newValue);
 		}
 
+		@Override
 		public boolean isWritable() {
 			return true;
 		}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java
index 109de5fdc1..46229f646e 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/SpelNodeImpl.java
@@ -88,6 +88,7 @@ public abstract class SpelNodeImpl implements SpelNode {
 		return false;
 	}
 
+	@Override
 	public final Object getValue(ExpressionState expressionState) throws EvaluationException {
 		if (expressionState != null) {
 			return getValueInternal(expressionState).getValue();
@@ -97,6 +98,7 @@ public abstract class SpelNodeImpl implements SpelNode {
 		}
 	}
 
+	@Override
 	public final TypedValue getTypedValue(ExpressionState expressionState) throws EvaluationException {
 		if (expressionState != null) {
 			return getValueInternal(expressionState);
@@ -107,22 +109,27 @@ public abstract class SpelNodeImpl implements SpelNode {
 	}
 
 	// by default Ast nodes are not writable
+	@Override
 	public boolean isWritable(ExpressionState expressionState) throws EvaluationException {
 		return false;
 	}
 
+	@Override
 	public void setValue(ExpressionState expressionState, Object newValue) throws EvaluationException {
 		throw new SpelEvaluationException(getStartPosition(), SpelMessage.SETVALUE_NOT_SUPPORTED, getClass());
 	}
 
+	@Override
 	public SpelNode getChild(int index) {
 		return children[index];
 	}
 
+	@Override
 	public int getChildCount() {
 		return children.length;
 	}
 
+	@Override
 	public Class<?> getObjectClass(Object obj) {
 		if (obj == null) {
 			return null;
@@ -136,12 +143,15 @@ public abstract class SpelNodeImpl implements SpelNode {
 
 	public abstract TypedValue getValueInternal(ExpressionState expressionState) throws EvaluationException;
 
+	@Override
 	public abstract String toStringAST();
 
+	@Override
 	public int getStartPosition() {
 		return (pos>>16);
 	}
 
+	@Override
 	public int getEndPosition() {
 		return (pos&0xffff);
 	}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ValueRef.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ValueRef.java
index a373ed3868..c4fa571b85 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ValueRef.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ValueRef.java
@@ -40,10 +40,12 @@ public interface ValueRef {
 
 		static NullValueRef instance = new NullValueRef();
 
+		@Override
 		public TypedValue getValue() {
 			return TypedValue.NULL;
 		}
 
+		@Override
 		public void setValue(Object newValue) {
 			// The exception position '0' isn't right but the overhead of creating
 			// instances of this per node (where the node is solely for error reporting)
@@ -51,6 +53,7 @@ public interface ValueRef {
 			throw new SpelEvaluationException(0,SpelMessage.NOT_ASSIGNABLE,"null");
 		}
 
+		@Override
 		public boolean isWritable() {
 			return false;
 		}
@@ -70,15 +73,18 @@ public interface ValueRef {
 			this.node = node;
 		}
 
+		@Override
 		public TypedValue getValue() {
 			return typedValue;
 		}
 
+		@Override
 		public void setValue(Object newValue) {
 			throw new SpelEvaluationException(
 					node.pos, SpelMessage.NOT_ASSIGNABLE, node.toStringAST());
 		}
 
+		@Override
 		public boolean isWritable() {
 			return false;
 		}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java
index 785d317cac..3c33992070 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java
@@ -55,14 +55,17 @@ public class VariableReference extends SpelNodeImpl {
 			this.eContext = evaluationContext;
 		}
 
+		@Override
 		public TypedValue getValue() {
 			return value;
 		}
 
+		@Override
 		public void setValue(Object newValue) {
 			eContext.setVariable(name, newValue);
 		}
 
+		@Override
 		public boolean isWritable() {
 			return true;
 		}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
index ac52f98a55..dfefb5516d 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
@@ -62,56 +62,67 @@ public class SpelExpression implements Expression {
 
 	// implementing Expression
 
+	@Override
 	public Object getValue() throws EvaluationException {
 		ExpressionState expressionState = new ExpressionState(getEvaluationContext(), configuration);
 		return ast.getValue(expressionState);
 	}
 
+	@Override
 	public Object getValue(Object rootObject) throws EvaluationException {
 		ExpressionState expressionState = new ExpressionState(getEvaluationContext(), toTypedValue(rootObject), configuration);
 		return ast.getValue(expressionState);
 	}
 
+	@Override
 	public <T> T getValue(Class<T> expectedResultType) throws EvaluationException {
 		ExpressionState expressionState = new ExpressionState(getEvaluationContext(), configuration);
 		TypedValue typedResultValue = ast.getTypedValue(expressionState);
 		return ExpressionUtils.convertTypedValue(expressionState.getEvaluationContext(), typedResultValue, expectedResultType);
 	}
 
+	@Override
 	public <T> T getValue(Object rootObject, Class<T> expectedResultType) throws EvaluationException {
 		ExpressionState expressionState = new ExpressionState(getEvaluationContext(), toTypedValue(rootObject), configuration);
 		TypedValue typedResultValue = ast.getTypedValue(expressionState);
 		return ExpressionUtils.convertTypedValue(expressionState.getEvaluationContext(), typedResultValue, expectedResultType);
 	}
 
+	@Override
 	public Object getValue(EvaluationContext context) throws EvaluationException {
 		Assert.notNull(context, "The EvaluationContext is required");
 		return ast.getValue(new ExpressionState(context, configuration));
 	}
 
+	@Override
 	public Object getValue(EvaluationContext context, Object rootObject) throws EvaluationException {
 		Assert.notNull(context, "The EvaluationContext is required");
 		return ast.getValue(new ExpressionState(context, toTypedValue(rootObject), configuration));
 	}
 
+	@Override
 	public <T> T getValue(EvaluationContext context, Class<T> expectedResultType) throws EvaluationException {
 		TypedValue typedResultValue = ast.getTypedValue(new ExpressionState(context, configuration));
 		return ExpressionUtils.convertTypedValue(context, typedResultValue, expectedResultType);
 	}
 
+	@Override
 	public <T> T getValue(EvaluationContext context, Object rootObject, Class<T> expectedResultType) throws EvaluationException {
 		TypedValue typedResultValue = ast.getTypedValue(new ExpressionState(context, toTypedValue(rootObject), configuration));
 		return ExpressionUtils.convertTypedValue(context, typedResultValue, expectedResultType);
 	}
 
+	@Override
 	public Class<?> getValueType() throws EvaluationException {
 		return getValueType(getEvaluationContext());
 	}
 
+	@Override
 	public Class<?> getValueType(Object rootObject) throws EvaluationException {
 		return getValueType(getEvaluationContext(), rootObject);
 	}
 
+	@Override
 	public Class<?> getValueType(EvaluationContext context) throws EvaluationException {
 		Assert.notNull(context, "The EvaluationContext is required");
 		ExpressionState eState = new ExpressionState(context, configuration);
@@ -119,60 +130,72 @@ public class SpelExpression implements Expression {
 		return typeDescriptor != null ? typeDescriptor.getType() : null;
 	}
 
+	@Override
 	public Class<?> getValueType(EvaluationContext context, Object rootObject) throws EvaluationException {
 		ExpressionState eState = new ExpressionState(context, toTypedValue(rootObject), configuration);
 		TypeDescriptor typeDescriptor = ast.getValueInternal(eState).getTypeDescriptor();
 		return typeDescriptor != null ? typeDescriptor.getType() : null;
 	}
 
+	@Override
 	public TypeDescriptor getValueTypeDescriptor() throws EvaluationException {
 		return getValueTypeDescriptor(getEvaluationContext());
 	}
 
+	@Override
 	public TypeDescriptor getValueTypeDescriptor(Object rootObject) throws EvaluationException {
 		ExpressionState eState = new ExpressionState(getEvaluationContext(), toTypedValue(rootObject), configuration);
 		return ast.getValueInternal(eState).getTypeDescriptor();
 	}
 
+	@Override
 	public TypeDescriptor getValueTypeDescriptor(EvaluationContext context) throws EvaluationException {
 		Assert.notNull(context, "The EvaluationContext is required");
 		ExpressionState eState = new ExpressionState(context, configuration);
 		return ast.getValueInternal(eState).getTypeDescriptor();
 	}
 
+	@Override
 	public TypeDescriptor getValueTypeDescriptor(EvaluationContext context, Object rootObject) throws EvaluationException {
 		Assert.notNull(context, "The EvaluationContext is required");
 		ExpressionState eState = new ExpressionState(context, toTypedValue(rootObject), configuration);
 		return ast.getValueInternal(eState).getTypeDescriptor();
 	}
 
+	@Override
 	public String getExpressionString() {
 		return expression;
 	}
 
+	@Override
 	public boolean isWritable(EvaluationContext context) throws EvaluationException {
 		Assert.notNull(context, "The EvaluationContext is required");
 		return ast.isWritable(new ExpressionState(context, configuration));
 	}
 
+	@Override
 	public boolean isWritable(Object rootObject) throws EvaluationException {
 		return ast.isWritable(new ExpressionState(getEvaluationContext(), toTypedValue(rootObject), configuration));
 	}
 
+	@Override
 	public boolean isWritable(EvaluationContext context, Object rootObject) throws EvaluationException {
 		Assert.notNull(context, "The EvaluationContext is required");
 		return ast.isWritable(new ExpressionState(context, toTypedValue(rootObject), configuration));
 	}
 
+	@Override
 	public void setValue(EvaluationContext context, Object value) throws EvaluationException {
 		Assert.notNull(context, "The EvaluationContext is required");
 		ast.setValue(new ExpressionState(context, configuration), value);
 	}
 
+	@Override
 	public void setValue(Object rootObject, Object value) throws EvaluationException {
 		ast.setValue(new ExpressionState(getEvaluationContext(), toTypedValue(rootObject), configuration), value);
 	}
 
+	@Override
 	public void setValue(EvaluationContext context, Object rootObject, Object value) throws EvaluationException {
 		Assert.notNull(context, "The EvaluationContext is required");
 		ast.setValue(new ExpressionState(context, toTypedValue(rootObject), configuration), value);
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java
index 6c1d3c5a17..b6bd630f4b 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java
@@ -54,6 +54,7 @@ class ReflectiveConstructorExecutor implements ConstructorExecutor {
 		this.argsRequiringConversion = argsRequiringConversion;
 	}
 
+	@Override
 	public TypedValue execute(EvaluationContext context, Object... arguments) throws AccessException {
 		try {
 			if (arguments != null) {
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..36d48cbf87 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
@@ -49,6 +49,7 @@ public class ReflectiveConstructorResolver implements ConstructorResolver {
 	 * registered type converter.
 	 * </ol>
 	 */
+	@Override
 	public ConstructorExecutor resolve(EvaluationContext context, String typename, List<TypeDescriptor> argumentTypes)
 			throws AccessException {
 
@@ -58,6 +59,7 @@ public class ReflectiveConstructorResolver implements ConstructorResolver {
 			Constructor[] ctors = type.getConstructors();
 
 			Arrays.sort(ctors, new Comparator<Constructor>() {
+				@Override
 				public int compare(Constructor c1, Constructor c2) {
 					int c1pl = c1.getParameterTypes().length;
 					int c2pl = c2.getParameterTypes().length;
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
index a54dbac7bc..96defb2687 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
@@ -55,6 +55,7 @@ class ReflectiveMethodExecutor implements MethodExecutor {
 	}
 
 
+	@Override
 	public TypedValue execute(EvaluationContext context, Object target, Object... arguments) throws AccessException {
 		try {
 			if (arguments != 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 c086771cbe..2d0ac51a2b 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
@@ -86,6 +86,7 @@ public class ReflectiveMethodResolver implements MethodResolver {
 	 * according to the registered type converter.
 	 * </ol>
 	 */
+	@Override
 	public MethodExecutor resolve(EvaluationContext context, Object targetObject, String name,
 			List<TypeDescriptor> argumentTypes) throws AccessException {
 
@@ -111,6 +112,7 @@ public class ReflectiveMethodResolver implements MethodResolver {
 			}
 
 			Arrays.sort(methods, new Comparator<Method>() {
+				@Override
 				public int compare(Method m1, Method m2) {
 					int m1pl = m1.getParameterTypes().length;
 					int m2pl = m2.getParameterTypes().length;
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 6e112b0e01..013959bf95 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
@@ -56,10 +56,12 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
 	/**
 	 * @return null which means this is a general purpose accessor
 	 */
+	@Override
 	public Class<?>[] getSpecificTargetClasses() {
 		return null;
 	}
 
+	@Override
 	public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 		if (target == null) {
 			return false;
@@ -94,6 +96,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
 		return false;
 	}
 
+	@Override
 	public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 		if (target == null) {
 			throw new AccessException("Cannot read property of null target");
@@ -160,6 +163,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
 		throw new AccessException("Neither getter nor field found for property '" + name + "'");
 	}
 
+	@Override
 	public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
 		if (target == null) {
 			return false;
@@ -189,6 +193,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
 		return false;
 	}
 
+	@Override
 	public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException {
 		if (target == null) {
 			throw new AccessException("Cannot write property on null target");
@@ -497,10 +502,12 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
 			}
 		}
 
+		@Override
 		public Class[] getSpecificTargetClasses() {
 			throw new UnsupportedOperationException("Should not be called on an OptimalPropertyAccessor");
 		}
 
+		@Override
 		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 			if (target == null) {
 				return false;
@@ -524,6 +531,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
 			}
 		}
 
+		@Override
 		public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 			if (this.member instanceof Method) {
 				try {
@@ -552,10 +560,12 @@ public class ReflectivePropertyAccessor implements PropertyAccessor {
 			throw new AccessException("Neither getter nor field found for property '" + name + "'");
 		}
 
+		@Override
 		public boolean canWrite(EvaluationContext context, Object target, String name) {
 			throw new UnsupportedOperationException("Should not be called on an OptimalPropertyAccessor");
 		}
 
+		@Override
 		public void write(EvaluationContext context, Object target, String name, Object newValue) {
 			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..ce03b4927c 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
@@ -89,6 +89,7 @@ public class StandardEvaluationContext implements EvaluationContext {
 		this.rootObject = (rootObject != null ? new TypedValue(rootObject) : TypedValue.NULL);
 	}
 
+	@Override
 	public TypedValue getRootObject() {
 		return this.rootObject;
 	}
@@ -103,6 +104,7 @@ public class StandardEvaluationContext implements EvaluationContext {
 		return this.constructorResolvers.remove(resolver);
 	}
 
+	@Override
 	public List<ConstructorResolver> getConstructorResolvers() {
 		ensureConstructorResolversInitialized();
 		return this.constructorResolvers;
@@ -123,6 +125,7 @@ public class StandardEvaluationContext implements EvaluationContext {
 		return this.methodResolvers.remove(methodResolver);
 	}
 
+	@Override
 	public List<MethodResolver> getMethodResolvers() {
 		ensureMethodResolversInitialized();
 		return this.methodResolvers;
@@ -132,6 +135,7 @@ public class StandardEvaluationContext implements EvaluationContext {
 		this.beanResolver = beanResolver;
 	}
 
+	@Override
 	public BeanResolver getBeanResolver() {
 		return this.beanResolver;
 	}
@@ -150,6 +154,7 @@ public class StandardEvaluationContext implements EvaluationContext {
 		return this.propertyAccessors.remove(accessor);
 	}
 
+	@Override
 	public List<PropertyAccessor> getPropertyAccessors() {
 		ensurePropertyAccessorsInitialized();
 		return this.propertyAccessors;
@@ -165,6 +170,7 @@ public class StandardEvaluationContext implements EvaluationContext {
 		this.typeLocator = typeLocator;
 	}
 
+	@Override
 	public TypeLocator getTypeLocator() {
 		if (this.typeLocator == null) {
 			 this.typeLocator = new StandardTypeLocator();
@@ -177,6 +183,7 @@ public class StandardEvaluationContext implements EvaluationContext {
 		this.typeConverter = typeConverter;
 	}
 
+	@Override
 	public TypeConverter getTypeConverter() {
 		if (this.typeConverter == null) {
 			 this.typeConverter = new StandardTypeConverter();
@@ -189,6 +196,7 @@ public class StandardEvaluationContext implements EvaluationContext {
 		this.typeComparator = typeComparator;
 	}
 
+	@Override
 	public TypeComparator getTypeComparator() {
 		return this.typeComparator;
 	}
@@ -198,10 +206,12 @@ public class StandardEvaluationContext implements EvaluationContext {
 		this.operatorOverloader = operatorOverloader;
 	}
 
+	@Override
 	public OperatorOverloader getOperatorOverloader() {
 		return this.operatorOverloader;
 	}
 
+	@Override
 	public void setVariable(String name, Object value) {
 		this.variables.put(name, value);
 	}
@@ -214,6 +224,7 @@ public class StandardEvaluationContext implements EvaluationContext {
 		this.variables.put(name, method);
 	}
 
+	@Override
 	public Object lookupVariable(String name) {
 		return this.variables.get(name);
 	}
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardOperatorOverloader.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardOperatorOverloader.java
index 5b42d0a010..322f7ab422 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardOperatorOverloader.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardOperatorOverloader.java
@@ -26,11 +26,13 @@ import org.springframework.expression.OperatorOverloader;
  */
 public class StandardOperatorOverloader implements OperatorOverloader {
 
+	@Override
 	public boolean overridesOperation(Operation operation, Object leftOperand, Object rightOperand)
 			throws EvaluationException {
 		return false;
 	}
 
+	@Override
 	public Object operate(Operation operation, Object leftOperand, Object rightOperand) throws EvaluationException {
 		throw new EvaluationException("No operation overloaded by default");
 	}
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..92aafb28bc 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
@@ -29,6 +29,7 @@ import org.springframework.expression.spel.SpelMessage;
  */
 public class StandardTypeComparator implements TypeComparator {
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public int compare(Object left, Object right) throws SpelEvaluationException {
 		// If one is null, check if the other is
@@ -72,6 +73,7 @@ public class StandardTypeComparator implements TypeComparator {
 		throw new SpelEvaluationException(SpelMessage.NOT_COMPARABLE, left.getClass(), right.getClass());
 	}
 
+	@Override
 	public boolean canCompare(Object left, Object right) {
 		if (left == null || right == null) {
 			return true;
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..0500dde5d5 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
@@ -57,10 +57,12 @@ public class StandardTypeConverter implements TypeConverter {
 	}
 
 
+	@Override
 	public boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType) {
 		return this.conversionService.canConvert(sourceType, targetType);
 	}
 
+	@Override
 	public Object convertValue(Object value, TypeDescriptor sourceType, TypeDescriptor targetType) {
 		try {
 			return this.conversionService.convert(value, sourceType, targetType);
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..319985fe8a 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
@@ -59,6 +59,7 @@ public class StandardTypeLocator implements TypeLocator {
 	 * @return the class object for the type
 	 * @throws EvaluationException if the type cannot be found
 	 */
+	@Override
 	public Class<?> findType(String typename) throws EvaluationException {
 		String nameToLookup = typename;
 		try {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/config/JdbcNamespaceHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/JdbcNamespaceHandler.java
index 3674dfbaa7..663d8d7ff0 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/config/JdbcNamespaceHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/config/JdbcNamespaceHandler.java
@@ -26,6 +26,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  */
 public class JdbcNamespaceHandler extends NamespaceHandlerSupport {
 
+	@Override
 	public void init() {
 		registerBeanDefinitionParser("embedded-database", new EmbeddedDatabaseBeanDefinitionParser());
 		registerBeanDefinitionParser("initialize-database", new InitializeDatabaseBeanDefinitionParser());
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java
index 6569ba893f..6f20b20a9e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java
@@ -59,6 +59,7 @@ public class SortedResourcesFactoryBean extends AbstractFactoryBean<Resource[]>
 	}
 
 
+	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader);
 	}
@@ -76,6 +77,7 @@ public class SortedResourcesFactoryBean extends AbstractFactoryBean<Resource[]>
 			List<Resource> resources = new ArrayList<Resource>(
 					Arrays.asList(this.resourcePatternResolver.getResources(location)));
 			Collections.sort(resources, new Comparator<Resource>() {
+				@Override
 				public int compare(Resource r1, Resource r2) {
 					try {
 						return r1.getURL().toString().compareTo(r2.getURL().toString());
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgPreparedStatementSetter.java
index 19b5ec0d49..236cdb9f71 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgPreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgPreparedStatementSetter.java
@@ -39,6 +39,7 @@ class ArgPreparedStatementSetter implements PreparedStatementSetter, ParameterDi
 	}
 
 
+	@Override
 	public void setValues(PreparedStatement ps) throws SQLException {
 		if (this.args != null) {
 			for (int i = 0; i < this.args.length; i++) {
@@ -66,6 +67,7 @@ class ArgPreparedStatementSetter implements PreparedStatementSetter, ParameterDi
 		}
 	}
 
+	@Override
 	public void cleanupParameters() {
 		StatementCreatorUtils.cleanupParameters(this.args);
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgTypePreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgTypePreparedStatementSetter.java
index 235ed6b0f5..d0e3daab21 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgTypePreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgTypePreparedStatementSetter.java
@@ -52,6 +52,7 @@ class ArgTypePreparedStatementSetter implements PreparedStatementSetter, Paramet
 	}
 
 
+	@Override
 	public void setValues(PreparedStatement ps) throws SQLException {
 		int parameterPosition = 1;
 		if (this.args != null) {
@@ -97,6 +98,7 @@ class ArgTypePreparedStatementSetter implements PreparedStatementSetter, Paramet
 		StatementCreatorUtils.setParameterValue(ps, parameterPosition, argType, argValue);
 	}
 
+	@Override
 	public void cleanupParameters() {
 		StatementCreatorUtils.cleanupParameters(this.args);
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
index 2785e6a1b7..85e044d19a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
@@ -33,11 +33,13 @@ public abstract class BatchUpdateUtils {
 				sql,
 				new BatchPreparedStatementSetter() {
 
+					@Override
 					public void setValues(PreparedStatement ps, int i) throws SQLException {
 						Object[] values = batchValues.get(i);
 						setStatementParameters(values, ps, columnTypes);
 					}
 
+					@Override
 					public int getBatchSize() {
 						return batchValues.size();
 					}
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..74dbd6ce7f 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
@@ -228,6 +228,7 @@ public class BeanPropertyRowMapper<T> implements RowMapper<T> {
 	 * <p>Utilizes public setters and result set metadata.
 	 * @see java.sql.ResultSetMetaData
 	 */
+	@Override
 	public T mapRow(ResultSet rs, int rowNumber) throws SQLException {
 		Assert.state(this.mappedClass != null, "Mapped class was not specified");
 		T mappedObject = BeanUtils.instantiate(this.mappedClass);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
index 279ab5a587..c4cdb8ab26 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java
@@ -150,6 +150,7 @@ public class CallableStatementCreatorFactory {
 			this.inParameters = inParams;
 		}
 
+		@Override
 		public CallableStatement createCallableStatement(Connection con) throws SQLException {
 			// If we were given a ParameterMapper, we must let the mapper do its thing to create the Map.
 			if (this.inParameterMapper != null) {
@@ -218,10 +219,12 @@ public class CallableStatementCreatorFactory {
 			return cs;
 		}
 
+		@Override
 		public String getSql() {
 			return callString;
 		}
 
+		@Override
 		public void cleanupParameters() {
 			if (this.inParameters != null) {
 				StatementCreatorUtils.cleanupParameters(this.inParameters.values());
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java
index 103333fe98..1a0ac8277f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ColumnMapRowMapper.java
@@ -47,6 +47,7 @@ import org.springframework.util.LinkedCaseInsensitiveMap;
  */
 public class ColumnMapRowMapper implements RowMapper<Map<String, Object>> {
 
+	@Override
 	public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
 		ResultSetMetaData rsmd = rs.getMetaData();
 		int columnCount = rsmd.getColumnCount();
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 3f0085cebf..713b723728 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
@@ -325,6 +325,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 	// Methods dealing with a plain java.sql.Connection
 	//-------------------------------------------------------------------------
 
+	@Override
 	public <T> T execute(ConnectionCallback<T> action) throws DataAccessException {
 		Assert.notNull(action, "Callback object must not be null");
 
@@ -376,6 +377,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 	// Methods dealing with static SQL (java.sql.Statement)
 	//-------------------------------------------------------------------------
 
+	@Override
 	public <T> T execute(StatementCallback<T> action) throws DataAccessException {
 		Assert.notNull(action, "Callback object must not be null");
 
@@ -412,15 +414,18 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		}
 	}
 
+	@Override
 	public void execute(final String sql) throws DataAccessException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing SQL statement [" + sql + "]");
 		}
 		class ExecuteStatementCallback implements StatementCallback<Object>, SqlProvider {
+			@Override
 			public Object doInStatement(Statement stmt) throws SQLException {
 				stmt.execute(sql);
 				return null;
 			}
+			@Override
 			public String getSql() {
 				return sql;
 			}
@@ -428,6 +433,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		execute(new ExecuteStatementCallback());
 	}
 
+	@Override
 	public <T> T query(final String sql, final ResultSetExtractor<T> rse) throws DataAccessException {
 		Assert.notNull(sql, "SQL must not be null");
 		Assert.notNull(rse, "ResultSetExtractor must not be null");
@@ -435,6 +441,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 			logger.debug("Executing SQL query [" + sql + "]");
 		}
 		class QueryStatementCallback implements StatementCallback<T>, SqlProvider {
+			@Override
 			public T doInStatement(Statement stmt) throws SQLException {
 				ResultSet rs = null;
 				try {
@@ -449,6 +456,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 					JdbcUtils.closeResultSet(rs);
 				}
 			}
+			@Override
 			public String getSql() {
 				return sql;
 			}
@@ -456,55 +464,67 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		return execute(new QueryStatementCallback());
 	}
 
+	@Override
 	public void query(String sql, RowCallbackHandler rch) throws DataAccessException {
 		query(sql, new RowCallbackHandlerResultSetExtractor(rch));
 	}
 
+	@Override
 	public <T> List<T> query(String sql, RowMapper<T> rowMapper) throws DataAccessException {
 		return query(sql, new RowMapperResultSetExtractor<T>(rowMapper));
 	}
 
+	@Override
 	public Map<String, Object> queryForMap(String sql) throws DataAccessException {
 		return queryForObject(sql, getColumnMapRowMapper());
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, RowMapper<T> rowMapper) throws DataAccessException {
 		List<T> results = query(sql, rowMapper);
 		return DataAccessUtils.requiredSingleResult(results);
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, Class<T> requiredType) throws DataAccessException {
 		return queryForObject(sql, getSingleColumnRowMapper(requiredType));
 	}
 
+	@Override
 	public long queryForLong(String sql) throws DataAccessException {
 		Number number = queryForObject(sql, Long.class);
 		return (number != null ? number.longValue() : 0);
 	}
 
+	@Override
 	public int queryForInt(String sql) throws DataAccessException {
 		Number number = queryForObject(sql, Integer.class);
 		return (number != null ? number.intValue() : 0);
 	}
 
+	@Override
 	public <T> List<T> queryForList(String sql, Class<T> elementType) throws DataAccessException {
 		return query(sql, getSingleColumnRowMapper(elementType));
 	}
 
+	@Override
 	public List<Map<String, Object>> queryForList(String sql) throws DataAccessException {
 		return query(sql, getColumnMapRowMapper());
 	}
 
+	@Override
 	public SqlRowSet queryForRowSet(String sql) throws DataAccessException {
 		return query(sql, new SqlRowSetResultSetExtractor());
 	}
 
+	@Override
 	public int update(final String sql) throws DataAccessException {
 		Assert.notNull(sql, "SQL must not be null");
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing SQL update [" + sql + "]");
 		}
 		class UpdateStatementCallback implements StatementCallback<Integer>, SqlProvider {
+			@Override
 			public Integer doInStatement(Statement stmt) throws SQLException {
 				int rows = stmt.executeUpdate(sql);
 				if (logger.isDebugEnabled()) {
@@ -512,6 +532,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 				}
 				return rows;
 			}
+			@Override
 			public String getSql() {
 				return sql;
 			}
@@ -519,6 +540,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		return execute(new UpdateStatementCallback());
 	}
 
+	@Override
 	public int[] batchUpdate(final String[] sql) throws DataAccessException {
 		Assert.notEmpty(sql, "SQL array must not be empty");
 		if (logger.isDebugEnabled()) {
@@ -526,6 +548,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		}
 		class BatchUpdateStatementCallback implements StatementCallback<int[]>, SqlProvider {
 			private String currSql;
+			@Override
 			public int[] doInStatement(Statement stmt) throws SQLException, DataAccessException {
 				int[] rowsAffected = new int[sql.length];
 				if (JdbcUtils.supportsBatchUpdates(stmt.getConnection())) {
@@ -548,6 +571,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 				}
 				return rowsAffected;
 			}
+			@Override
 			public String getSql() {
 				return this.currSql;
 			}
@@ -560,6 +584,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 	// Methods dealing with prepared statements
 	//-------------------------------------------------------------------------
 
+	@Override
 	public <T> T execute(PreparedStatementCreator psc, PreparedStatementCallback<T> action)
 			throws DataAccessException {
 
@@ -611,6 +636,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		}
 	}
 
+	@Override
 	public <T> T execute(String sql, PreparedStatementCallback<T> action) throws DataAccessException {
 		return execute(new SimplePreparedStatementCreator(sql), action);
 	}
@@ -635,6 +661,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		logger.debug("Executing prepared SQL query");
 
 		return execute(psc, new PreparedStatementCallback<T>() {
+			@Override
 			public T doInPreparedStatement(PreparedStatement ps) throws SQLException {
 				ResultSet rs = null;
 				try {
@@ -658,66 +685,82 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		});
 	}
 
+	@Override
 	public <T> T query(PreparedStatementCreator psc, ResultSetExtractor<T> rse) throws DataAccessException {
 		return query(psc, null, rse);
 	}
 
+	@Override
 	public <T> T query(String sql, PreparedStatementSetter pss, ResultSetExtractor<T> rse) throws DataAccessException {
 		return query(new SimplePreparedStatementCreator(sql), pss, rse);
 	}
 
+	@Override
 	public <T> T query(String sql, Object[] args, int[] argTypes, ResultSetExtractor<T> rse) throws DataAccessException {
 		return query(sql, newArgTypePreparedStatementSetter(args, argTypes), rse);
 	}
 
+	@Override
 	public <T> T query(String sql, Object[] args, ResultSetExtractor<T> rse) throws DataAccessException {
 		return query(sql, newArgPreparedStatementSetter(args), rse);
 	}
 
+	@Override
 	public <T> T query(String sql, ResultSetExtractor<T> rse, Object... args) throws DataAccessException {
 		return query(sql, newArgPreparedStatementSetter(args), rse);
 	}
 
+	@Override
 	public void query(PreparedStatementCreator psc, RowCallbackHandler rch) throws DataAccessException {
 		query(psc, new RowCallbackHandlerResultSetExtractor(rch));
 	}
 
+	@Override
 	public void query(String sql, PreparedStatementSetter pss, RowCallbackHandler rch) throws DataAccessException {
 		query(sql, pss, new RowCallbackHandlerResultSetExtractor(rch));
 	}
 
+	@Override
 	public void query(String sql, Object[] args, int[] argTypes, RowCallbackHandler rch) throws DataAccessException {
 		query(sql, newArgTypePreparedStatementSetter(args, argTypes), rch);
 	}
 
+	@Override
 	public void query(String sql, Object[] args, RowCallbackHandler rch) throws DataAccessException {
 		query(sql, newArgPreparedStatementSetter(args), rch);
 	}
 
+	@Override
 	public void query(String sql, RowCallbackHandler rch, Object... args) throws DataAccessException {
 		query(sql, newArgPreparedStatementSetter(args), rch);
 	}
 
+	@Override
 	public <T> List<T> query(PreparedStatementCreator psc, RowMapper<T> rowMapper) throws DataAccessException {
 		return query(psc, new RowMapperResultSetExtractor<T>(rowMapper));
 	}
 
+	@Override
 	public <T> List<T> query(String sql, PreparedStatementSetter pss, RowMapper<T> rowMapper) throws DataAccessException {
 		return query(sql, pss, new RowMapperResultSetExtractor<T>(rowMapper));
 	}
 
+	@Override
 	public <T> List<T> query(String sql, Object[] args, int[] argTypes, RowMapper<T> rowMapper) throws DataAccessException {
 		return query(sql, args, argTypes, new RowMapperResultSetExtractor<T>(rowMapper));
 	}
 
+	@Override
 	public <T> List<T> query(String sql, Object[] args, RowMapper<T> rowMapper) throws DataAccessException {
 		return query(sql, args, new RowMapperResultSetExtractor<T>(rowMapper));
 	}
 
+	@Override
 	public <T> List<T> query(String sql, RowMapper<T> rowMapper, Object... args) throws DataAccessException {
 		return query(sql, args, new RowMapperResultSetExtractor<T>(rowMapper));
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, Object[] args, int[] argTypes, RowMapper<T> rowMapper)
 			throws DataAccessException {
 
@@ -725,82 +768,100 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		return DataAccessUtils.requiredSingleResult(results);
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, Object[] args, RowMapper<T> rowMapper) throws DataAccessException {
 		List<T> results = query(sql, args, new RowMapperResultSetExtractor<T>(rowMapper, 1));
 		return DataAccessUtils.requiredSingleResult(results);
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, RowMapper<T> rowMapper, Object... args) throws DataAccessException {
 		List<T> results = query(sql, args, new RowMapperResultSetExtractor<T>(rowMapper, 1));
 		return DataAccessUtils.requiredSingleResult(results);
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, Object[] args, int[] argTypes, Class<T> requiredType)
 			throws DataAccessException {
 
 		return queryForObject(sql, args, argTypes, getSingleColumnRowMapper(requiredType));
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, Object[] args, Class<T> requiredType) throws DataAccessException {
 		return queryForObject(sql, args, getSingleColumnRowMapper(requiredType));
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, Class<T> requiredType, Object... args) throws DataAccessException {
 		return queryForObject(sql, args, getSingleColumnRowMapper(requiredType));
 	}
 
+	@Override
 	public Map<String, Object> queryForMap(String sql, Object[] args, int[] argTypes) throws DataAccessException {
 		return queryForObject(sql, args, argTypes, getColumnMapRowMapper());
 	}
 
+	@Override
 	public Map<String, Object> queryForMap(String sql, Object... args) throws DataAccessException {
 		return queryForObject(sql, args, getColumnMapRowMapper());
 	}
 
+	@Override
 	public long queryForLong(String sql, Object[] args, int[] argTypes) throws DataAccessException {
 		Number number = queryForObject(sql, args, argTypes, Long.class);
 		return (number != null ? number.longValue() : 0);
 	}
 
+	@Override
 	public long queryForLong(String sql, Object... args) throws DataAccessException {
 		Number number = queryForObject(sql, args, Long.class);
 		return (number != null ? number.longValue() : 0);
 	}
 
+	@Override
 	public int queryForInt(String sql, Object[] args, int[] argTypes) throws DataAccessException {
 		Number number = queryForObject(sql, args, argTypes, Integer.class);
 		return (number != null ? number.intValue() : 0);
 	}
 
+	@Override
 	public int queryForInt(String sql, Object... args) throws DataAccessException {
 		Number number = queryForObject(sql, args, Integer.class);
 		return (number != null ? number.intValue() : 0);
 	}
 
+	@Override
 	public <T> List<T> queryForList(String sql, Object[] args, int[] argTypes, Class<T> elementType) throws DataAccessException {
 		return query(sql, args, argTypes, getSingleColumnRowMapper(elementType));
 	}
 
+	@Override
 	public <T> List<T> queryForList(String sql, Object[] args, Class<T> elementType) throws DataAccessException {
 		return query(sql, args, getSingleColumnRowMapper(elementType));
 	}
 
+	@Override
 	public <T> List<T> queryForList(String sql, Class<T> elementType, Object... args) throws DataAccessException {
 		return query(sql, args, getSingleColumnRowMapper(elementType));
 	}
 
+	@Override
 	public List<Map<String, Object>> queryForList(String sql, Object[] args, int[] argTypes) throws DataAccessException {
 		return query(sql, args, argTypes, getColumnMapRowMapper());
 	}
 
+	@Override
 	public List<Map<String, Object>> queryForList(String sql, Object... args) throws DataAccessException {
 		return query(sql, args, getColumnMapRowMapper());
 	}
 
+	@Override
 	public SqlRowSet queryForRowSet(String sql, Object[] args, int[] argTypes) throws DataAccessException {
 		return query(sql, args, argTypes, new SqlRowSetResultSetExtractor());
 	}
 
+	@Override
 	public SqlRowSet queryForRowSet(String sql, Object... args) throws DataAccessException {
 		return query(sql, args, new SqlRowSetResultSetExtractor());
 	}
@@ -810,6 +871,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 
 		logger.debug("Executing prepared SQL update");
 		return execute(psc, new PreparedStatementCallback<Integer>() {
+			@Override
 			public Integer doInPreparedStatement(PreparedStatement ps) throws SQLException {
 				try {
 					if (pss != null) {
@@ -830,10 +892,12 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		});
 	}
 
+	@Override
 	public int update(PreparedStatementCreator psc) throws DataAccessException {
 		return update(psc, (PreparedStatementSetter) null);
 	}
 
+	@Override
 	public int update(final PreparedStatementCreator psc, final KeyHolder generatedKeyHolder)
 			throws DataAccessException {
 
@@ -841,6 +905,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		logger.debug("Executing SQL update and returning generated keys");
 
 		return execute(psc, new PreparedStatementCallback<Integer>() {
+			@Override
 			public Integer doInPreparedStatement(PreparedStatement ps) throws SQLException {
 				int rows = ps.executeUpdate();
 				List<Map<String, Object>> generatedKeys = generatedKeyHolder.getKeyList();
@@ -864,24 +929,29 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		});
 	}
 
+	@Override
 	public int update(String sql, PreparedStatementSetter pss) throws DataAccessException {
 		return update(new SimplePreparedStatementCreator(sql), pss);
 	}
 
+	@Override
 	public int update(String sql, Object[] args, int[] argTypes) throws DataAccessException {
 		return update(sql, newArgTypePreparedStatementSetter(args, argTypes));
 	}
 
+	@Override
 	public int update(String sql, Object... args) throws DataAccessException {
 		return update(sql, newArgPreparedStatementSetter(args));
 	}
 
+	@Override
 	public int[] batchUpdate(String sql, final BatchPreparedStatementSetter pss) throws DataAccessException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing SQL batch update [" + sql + "]");
 		}
 
 		return execute(sql, new PreparedStatementCallback<int[]>() {
+			@Override
 			public int[] doInPreparedStatement(PreparedStatement ps) throws SQLException {
 				try {
 					int batchSize = pss.getBatchSize();
@@ -923,10 +993,12 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		});
 	}
 
+	@Override
 	public int[] batchUpdate(String sql, List<Object[]> batchArgs) {
 		return batchUpdate(sql, batchArgs, new int[0]);
 	}
 
+	@Override
 	public int[] batchUpdate(String sql, List<Object[]> batchArgs, int[] argTypes) {
 		return BatchUpdateUtils.executeBatchUpdate(sql, batchArgs, argTypes, this);
 	}
@@ -937,11 +1009,13 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 	 *
 	 * Contribution by Nicolas Fabre
 	 */
+	@Override
 	public <T> int[][] batchUpdate(String sql, final Collection<T> batchArgs, final int batchSize, final ParameterizedPreparedStatementSetter<T> pss) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing SQL batch update [" + sql + "] with a batch size of " + batchSize);
 		}
 		return execute(sql, new PreparedStatementCallback<int[][]>() {
+			@Override
 			public int[][] doInPreparedStatement(PreparedStatement ps) throws SQLException {
 				List<int[]> rowsAffected = new ArrayList<int[]>();
 				try {
@@ -988,6 +1062,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 	// Methods dealing with callable statements
 	//-------------------------------------------------------------------------
 
+	@Override
 	public <T> T execute(CallableStatementCreator csc, CallableStatementCallback<T> action)
 			throws DataAccessException {
 
@@ -1038,10 +1113,12 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 		}
 	}
 
+	@Override
 	public <T> T execute(String callString, CallableStatementCallback<T> action) throws DataAccessException {
 		return execute(new SimpleCallableStatementCreator(callString), action);
 	}
 
+	@Override
 	public Map<String, Object> call(CallableStatementCreator csc, List<SqlParameter> declaredParameters)
 			throws DataAccessException {
 
@@ -1062,6 +1139,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 			}
 		}
 		return execute(csc, new CallableStatementCallback<Map<String, Object>>() {
+			@Override
 			public Map<String, Object> doInCallableStatement(CallableStatement cs) throws SQLException {
 				boolean retVal = cs.execute();
 				int updateCount = cs.getUpdateCount();
@@ -1369,6 +1447,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 			this.target = target;
 		}
 
+		@Override
 		@SuppressWarnings("rawtypes")
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on ConnectionProxy interface coming in...
@@ -1434,10 +1513,12 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 			this.sql = sql;
 		}
 
+		@Override
 		public PreparedStatement createPreparedStatement(Connection con) throws SQLException {
 			return con.prepareStatement(this.sql);
 		}
 
+		@Override
 		public String getSql() {
 			return this.sql;
 		}
@@ -1456,10 +1537,12 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 			this.callString = callString;
 		}
 
+		@Override
 		public CallableStatement createCallableStatement(Connection con) throws SQLException {
 			return con.prepareCall(this.callString);
 		}
 
+		@Override
 		public String getSql() {
 			return this.callString;
 		}
@@ -1479,6 +1562,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
 			this.rch = rch;
 		}
 
+		@Override
 		public Object extractData(ResultSet rs) throws SQLException {
 			while (rs.next()) {
 				this.rch.processRow(rs);
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 7efe962c64..d8cda78e1d 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
@@ -224,6 +224,7 @@ public class PreparedStatementCreatorFactory {
 			}
 		}
 
+		@Override
 		public PreparedStatement createPreparedStatement(Connection con) throws SQLException {
 			PreparedStatement ps = null;
 			if (generatedKeysColumnNames != null || returnGeneratedKeys) {
@@ -252,6 +253,7 @@ public class PreparedStatementCreatorFactory {
 			return ps;
 		}
 
+		@Override
 		public void setValues(PreparedStatement ps) throws SQLException {
 			// Determine PreparedStatement to pass to custom types.
 			PreparedStatement psToUse = ps;
@@ -300,10 +302,12 @@ public class PreparedStatementCreatorFactory {
 			}
 		}
 
+		@Override
 		public String getSql() {
 			return sql;
 		}
 
+		@Override
 		public void cleanupParameters() {
 			StatementCreatorUtils.cleanupParameters(this.parameters);
 		}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
index 7aeb9ee31f..376810bf26 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java
@@ -69,6 +69,7 @@ public class RowCountCallbackHandler implements RowCallbackHandler {
 	 * by overriding the {@code processRow(ResultSet, int)} method.
 	 * @see #processRow(java.sql.ResultSet, int)
 	 */
+	@Override
 	public final void processRow(ResultSet rs) throws SQLException {
 		if (this.rowCount == 0) {
 			ResultSetMetaData rsmd = rs.getMetaData();
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java
index 8ce9453622..98043f57b8 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java
@@ -85,6 +85,7 @@ public class RowMapperResultSetExtractor<T> implements ResultSetExtractor<List<T
 	}
 
 
+	@Override
 	public List<T> extractData(ResultSet rs) throws SQLException {
 		List<T> results = (this.rowsExpected > 0 ? new ArrayList<T>(this.rowsExpected) : new ArrayList<T>());
 		int rowNum = 0;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java
index 9583ec752c..2597b09743 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java
@@ -78,6 +78,7 @@ public class SingleColumnRowMapper<T> implements RowMapper<T> {
 	 * @see #getColumnValue(java.sql.ResultSet, int, Class)
 	 * @see #convertValueToRequiredType(Object, Class)
 	 */
+	@Override
 	@SuppressWarnings("unchecked")
 	public T mapRow(ResultSet rs, int rowNum) throws SQLException {
 		// Validate column count.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java
index 38efce95b6..a0db5625a4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlRowSetResultSetExtractor.java
@@ -58,6 +58,7 @@ public class SqlRowSetResultSetExtractor implements ResultSetExtractor<SqlRowSet
 	}
 
 
+	@Override
 	public SqlRowSet extractData(ResultSet rs) throws SQLException {
 		return createSqlRowSet(rs);
 	}
@@ -120,6 +121,7 @@ public class SqlRowSetResultSetExtractor implements ResultSetExtractor<SqlRowSet
 			}
 		}
 
+		@Override
 		public CachedRowSet createCachedRowSet() throws SQLException {
 			return this.rowSetFactory.createCachedRowSet();
 		}
@@ -131,6 +133,7 @@ public class SqlRowSetResultSetExtractor implements ResultSetExtractor<SqlRowSet
 	 */
 	private static class SunCachedRowSetFactory implements CachedRowSetFactory {
 
+		@Override
 		public CachedRowSet createCachedRowSet() throws SQLException {
 			return new com.sun.rowset.CachedRowSetImpl();
 		}
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..03ef8f9d38 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
@@ -69,6 +69,7 @@ public class CallMetaDataProviderFactory {
 	static public CallMetaDataProvider createMetaDataProvider(DataSource dataSource, final CallMetaDataContext context) {
 		try {
 			return (CallMetaDataProvider) JdbcUtils.extractDatabaseMetaData(dataSource, new DatabaseMetaDataCallback() {
+				@Override
 				public Object processMetaData(DatabaseMetaData databaseMetaData) throws SQLException, MetaDataAccessException {
 					String databaseProductName = JdbcUtils.commonDatabaseName(databaseMetaData.getDatabaseProductName());
 					boolean accessProcedureColumnMetaData = context.isAccessCallParameterMetaData();
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..f7e1009864 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
@@ -68,6 +68,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 	}
 
 
+	@Override
 	public void initializeWithMetaData(DatabaseMetaData databaseMetaData) throws SQLException {
 		try {
 			setSupportsCatalogsInProcedureCalls(databaseMetaData.supportsCatalogsInProcedureCalls());
@@ -95,6 +96,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 		}
 	}
 
+	@Override
 	public void initializeWithProcedureColumnMetaData(DatabaseMetaData databaseMetaData, String catalogName,
 			String schemaName, String procedureName) throws SQLException {
 
@@ -102,10 +104,12 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 		processProcedureColumns(databaseMetaData, catalogName, schemaName,  procedureName);
 	}
 
+	@Override
 	public List<CallParameterMetaData> getCallParameterMetaData() {
 		return this.callParameterMetaData;
 	}
 
+	@Override
 	public String procedureNameToUse(String procedureName) {
 		if (procedureName == null) {
 			return null;
@@ -121,6 +125,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 		}
 	}
 
+	@Override
 	public String catalogNameToUse(String catalogName) {
 		if (catalogName == null) {
 			return null;
@@ -136,6 +141,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 		}
 	}
 
+	@Override
 	public String schemaNameToUse(String schemaName) {
 		if (schemaName == null) {
 			return null;
@@ -151,6 +157,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 		}
 	}
 
+	@Override
 	public String metaDataCatalogNameToUse(String catalogName) {
 		if (isSupportsCatalogsInProcedureCalls()) {
 			return catalogNameToUse(catalogName);
@@ -160,6 +167,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 		}
 	}
 
+	@Override
 	public String metaDataSchemaNameToUse(String schemaName) {
 		if (isSupportsSchemasInProcedureCalls()) {
 			return schemaNameToUse(schemaName);
@@ -169,6 +177,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 		}
 	}
 
+	@Override
 	public String parameterNameToUse(String parameterName) {
 		if (parameterName == null) {
 			return null;
@@ -184,38 +193,47 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 		}
 	}
 
+	@Override
 	public boolean byPassReturnParameter(String parameterName) {
 		return false;
 	}
 
+	@Override
 	public SqlParameter createDefaultOutParameter(String parameterName, CallParameterMetaData meta) {
 		return new SqlOutParameter(parameterName, meta.getSqlType());
 	}
 
+	@Override
 	public SqlParameter createDefaultInOutParameter(String parameterName, CallParameterMetaData meta) {
 		return new SqlInOutParameter(parameterName, meta.getSqlType());
 	}
 
+	@Override
 	public SqlParameter createDefaultInParameter(String parameterName, CallParameterMetaData meta) {
 		return new SqlParameter(parameterName, meta.getSqlType());
 	}
 
+	@Override
 	public String getUserName() {
 		return this.userName;
 	}
 
+	@Override
 	public boolean isReturnResultSetSupported() {
 		return true;
 	}
 
+	@Override
 	public boolean isRefCursorSupported() {
 		return false;
 	}
 
+	@Override
 	public int getRefCursorSqlType() {
 		return Types.OTHER;
 	}
 
+	@Override
 	public boolean isProcedureColumnMetaDataUsed() {
 		return this.procedureColumnMetaDataUsed;
 	}
@@ -231,6 +249,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 	/**
 	 * Does the database support the use of catalog name in procedure calls
 	 */
+	@Override
 	public boolean isSupportsCatalogsInProcedureCalls() {
 		return this.supportsCatalogsInProcedureCalls;
 	}
@@ -245,6 +264,7 @@ public class GenericCallMetaDataProvider implements CallMetaDataProvider {
 	/**
 	 * Does the database support the use of schema name in procedure calls
 	 */
+	@Override
 	public boolean isSupportsSchemasInProcedureCalls() {
 		return this.supportsSchemasInProcedureCalls;
 	}
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 138518660a..009eacc47c 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
@@ -113,22 +113,27 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 		return this.storesLowerCaseIdentifiers;
 	}
 
+	@Override
 	public boolean isTableColumnMetaDataUsed() {
 		return this.tableColumnMetaDataUsed;
 	}
 
+	@Override
 	public List<TableParameterMetaData> getTableParameterMetaData() {
 		return this.insertParameterMetaData;
 	}
 
+	@Override
 	public boolean isGetGeneratedKeysSupported() {
 		return this.getGeneratedKeysSupported;
 	}
 
+	@Override
 	public boolean isGetGeneratedKeysSimulated(){
 		return false;
 	}
 
+	@Override
 	public String getSimpleQueryForGetGeneratedKey(String tableName, String keyColumnName) {
 		return null;
 	}
@@ -147,10 +152,12 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 		this.generatedKeysColumnNameArraySupported = generatedKeysColumnNameArraySupported;
 	}
 
+	@Override
 	public boolean isGeneratedKeysColumnNameArraySupported() {
 		return this.generatedKeysColumnNameArraySupported;
 	}
 
+	@Override
 	public void setNativeJdbcExtractor(NativeJdbcExtractor nativeJdbcExtractor) {
 		this.nativeJdbcExtractor = nativeJdbcExtractor;
 	}
@@ -160,6 +167,7 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 	}
 
 
+	@Override
 	public void initializeWithMetaData(DatabaseMetaData databaseMetaData) throws SQLException {
 		try {
 			if (databaseMetaData.supportsGetGeneratedKeys()) {
@@ -214,6 +222,7 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 
 	}
 
+	@Override
 	public void initializeWithTableColumnMetaData(DatabaseMetaData databaseMetaData, String catalogName,
 			String schemaName, String tableName) throws SQLException {
 
@@ -221,6 +230,7 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 		locateTableAndProcessMetaData(databaseMetaData, catalogName, schemaName, tableName);
 	}
 
+	@Override
 	public String tableNameToUse(String tableName) {
 		if (tableName == null) {
 			return null;
@@ -236,6 +246,7 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 		}
 	}
 
+	@Override
 	public String catalogNameToUse(String catalogName) {
 		if (catalogName == null) {
 			return null;
@@ -251,6 +262,7 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 		}
 	}
 
+	@Override
 	public String schemaNameToUse(String schemaName) {
 		if (schemaName == null) {
 			return null;
@@ -266,10 +278,12 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider {
 		}
 	}
 
+	@Override
 	public String metaDataCatalogNameToUse(String catalogName) {
 		return catalogNameToUse(catalogName);
 	}
 
+	@Override
 	public String metaDataSchemaNameToUse(String schemaName) {
 		if (schemaName == null) {
 			return schemaNameToUse(getDefaultSchema());
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..b6f67e2394 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
@@ -62,6 +62,7 @@ public class TableMetaDataProviderFactory {
 		try {
 			return (TableMetaDataProvider) JdbcUtils.extractDatabaseMetaData(dataSource,
 					new DatabaseMetaDataCallback() {
+						@Override
 						public Object processMetaData(DatabaseMetaData databaseMetaData) throws SQLException {
 							String databaseProductName =
 									JdbcUtils.commonDatabaseName(databaseMetaData.getDatabaseProductName());
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java
index f8ff89e479..79526492fb 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java
@@ -61,6 +61,7 @@ public abstract class AbstractSqlParameterSource implements SqlParameterSource {
 	 * @return the SQL type of the parameter,
 	 * or {@code TYPE_UNKNOWN} if not registered
 	 */
+	@Override
 	public int getSqlType(String paramName) {
 		Assert.notNull(paramName, "Parameter name must not be null");
 		Integer sqlType = this.sqlTypes.get(paramName);
@@ -76,6 +77,7 @@ public abstract class AbstractSqlParameterSource implements SqlParameterSource {
 	 * @return the type name of the parameter,
 	 * or {@code null} if not registered
 	 */
+	@Override
 	public String getTypeName(String paramName) {
 		Assert.notNull(paramName, "Parameter name must not be null");
 		return this.typeNames.get(paramName);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java
index 76062a8c6b..8c54ebac4d 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java
@@ -55,10 +55,12 @@ public class BeanPropertySqlParameterSource extends AbstractSqlParameterSource {
 	}
 
 
+	@Override
 	public boolean hasValue(String paramName) {
 		return this.beanWrapper.isReadableProperty(paramName);
 	}
 
+	@Override
 	public Object getValue(String paramName) throws IllegalArgumentException {
 		try {
 			return this.beanWrapper.getPropertyValue(paramName);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
index fc7b32f4ef..1212c42c24 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java
@@ -149,10 +149,12 @@ public class MapSqlParameterSource extends AbstractSqlParameterSource {
 	}
 
 
+	@Override
 	public boolean hasValue(String paramName) {
 		return this.values.containsKey(paramName);
 	}
 
+	@Override
 	public Object getValue(String paramName) {
 		if (!hasValue(paramName)) {
 			throw new IllegalArgumentException("No value registered for key '" + paramName + "'");
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java
index 8f43da6bb8..64dcdc2630 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java
@@ -41,12 +41,14 @@ public class NamedParameterBatchUpdateUtils extends BatchUpdateUtils {
 				sqlToUse,
 				new BatchPreparedStatementSetter() {
 
+					@Override
 					public void setValues(PreparedStatement ps, int i) throws SQLException {
 						Object[] values = NamedParameterUtils.buildValueArray(parsedSql, batchArgs[i], null);
 						int[] columnTypes = NamedParameterUtils.buildSqlTypeArray(parsedSql, batchArgs[i]);
 						setStatementParameters(values, ps, columnTypes);
 					}
 
+					@Override
 					public int getBatchSize() {
 						return batchArgs.length;
 					}
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 1abfdea3c2..882b965134 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
@@ -105,6 +105,7 @@ public class NamedParameterJdbcTemplate implements NamedParameterJdbcOperations
 	 * Expose the classic Spring JdbcTemplate to allow invocation of
 	 * less commonly used methods.
 	 */
+	@Override
 	public JdbcOperations getJdbcOperations() {
 		return this.classicJdbcTemplate;
 	}
@@ -125,54 +126,63 @@ public class NamedParameterJdbcTemplate implements NamedParameterJdbcOperations
 	}
 
 
+	@Override
 	public <T> T execute(String sql, SqlParameterSource paramSource, PreparedStatementCallback<T> action)
 			throws DataAccessException {
 
 		return getJdbcOperations().execute(getPreparedStatementCreator(sql, paramSource), action);
 	}
 
+	@Override
 	public <T> T execute(String sql, Map<String, ?> paramMap, PreparedStatementCallback<T> action)
 			throws DataAccessException {
 
 		return execute(sql, new MapSqlParameterSource(paramMap), action);
 	}
 
+	@Override
 	public <T> T query(String sql, SqlParameterSource paramSource, ResultSetExtractor<T> rse)
 			throws DataAccessException {
 
 		return getJdbcOperations().query(getPreparedStatementCreator(sql, paramSource), rse);
 	}
 
+	@Override
 	public <T> T query(String sql, Map<String, ?> paramMap, ResultSetExtractor<T> rse)
 			throws DataAccessException {
 
 		return query(sql, new MapSqlParameterSource(paramMap), rse);
 	}
 
+	@Override
 	public void query(String sql, SqlParameterSource paramSource, RowCallbackHandler rch)
 			throws DataAccessException {
 
 		getJdbcOperations().query(getPreparedStatementCreator(sql, paramSource), rch);
 	}
 
+	@Override
 	public void query(String sql, Map<String, ?> paramMap, RowCallbackHandler rch)
 			throws DataAccessException {
 
 		query(sql, new MapSqlParameterSource(paramMap), rch);
 	}
 
+	@Override
 	public <T> List<T> query(String sql, SqlParameterSource paramSource, RowMapper<T> rowMapper)
 			throws DataAccessException {
 
 		return getJdbcOperations().query(getPreparedStatementCreator(sql, paramSource), rowMapper);
 	}
 
+	@Override
 	public <T> List<T> query(String sql, Map<String, ?> paramMap, RowMapper<T> rowMapper)
 			throws DataAccessException {
 
 		return query(sql, new MapSqlParameterSource(paramMap), rowMapper);
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, SqlParameterSource paramSource, RowMapper<T> rowMapper)
 			throws DataAccessException {
 
@@ -180,97 +190,116 @@ public class NamedParameterJdbcTemplate implements NamedParameterJdbcOperations
 		return DataAccessUtils.requiredSingleResult(results);
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, Map<String, ?> paramMap, RowMapper<T>rowMapper)
 			throws DataAccessException {
 
 		return queryForObject(sql, new MapSqlParameterSource(paramMap), rowMapper);
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, SqlParameterSource paramSource, Class<T> requiredType)
 			throws DataAccessException {
 
 		return queryForObject(sql, paramSource, new SingleColumnRowMapper<T>(requiredType));
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, Map<String, ?> paramMap, Class<T> requiredType)
 			throws DataAccessException {
 
 		return queryForObject(sql, paramMap, new SingleColumnRowMapper<T>(requiredType));
 	}
 
+	@Override
 	public Map<String, Object> queryForMap(String sql, SqlParameterSource paramSource) throws DataAccessException {
 		return queryForObject(sql, paramSource, new ColumnMapRowMapper());
 	}
 
+	@Override
 	public Map<String, Object> queryForMap(String sql, Map<String, ?> paramMap) throws DataAccessException {
 		return queryForObject(sql, paramMap, new ColumnMapRowMapper());
 	}
 
+	@Override
 	public long queryForLong(String sql, SqlParameterSource paramSource) throws DataAccessException {
 		Number number = queryForObject(sql, paramSource, Long.class);
 		return (number != null ? number.longValue() : 0);
 	}
 
+	@Override
 	public long queryForLong(String sql, Map<String, ?> paramMap) throws DataAccessException {
 		return queryForLong(sql, new MapSqlParameterSource(paramMap));
 	}
 
+	@Override
 	public int queryForInt(String sql, SqlParameterSource paramSource) throws DataAccessException {
 		Number number = queryForObject(sql, paramSource, Integer.class);
 		return (number != null ? number.intValue() : 0);
 	}
 
+	@Override
 	public int queryForInt(String sql, Map<String, ?> paramMap) throws DataAccessException {
 		return queryForInt(sql, new MapSqlParameterSource(paramMap));
 	}
 
+	@Override
 	public <T> List<T> queryForList(String sql, SqlParameterSource paramSource, Class<T> elementType)
 			throws DataAccessException {
 
 		return query(sql, paramSource, new SingleColumnRowMapper<T>(elementType));
 	}
 
+	@Override
 	public <T> List<T> queryForList(String sql, Map<String, ?> paramMap, Class<T> elementType)
 			throws DataAccessException {
 
 		return queryForList(sql, new MapSqlParameterSource(paramMap), elementType);
 	}
 
+	@Override
 	public List<Map<String, Object>> queryForList(String sql, SqlParameterSource paramSource)
 			throws DataAccessException {
 
 		return query(sql, paramSource, new ColumnMapRowMapper());
 	}
 
+	@Override
 	public List<Map<String, Object>> queryForList(String sql, Map<String, ?> paramMap)
 			throws DataAccessException {
 
 		return queryForList(sql, new MapSqlParameterSource(paramMap));
 	}
 
+	@Override
 	public SqlRowSet queryForRowSet(String sql, SqlParameterSource paramSource) throws DataAccessException {
 		return getJdbcOperations().query(
 				getPreparedStatementCreator(sql, paramSource), new SqlRowSetResultSetExtractor());
 	}
 
+	@Override
 	public SqlRowSet queryForRowSet(String sql, Map<String, ?> paramMap) throws DataAccessException {
 		return queryForRowSet(sql, new MapSqlParameterSource(paramMap));
 	}
 
+	@Override
 	public int update(String sql, SqlParameterSource paramSource) throws DataAccessException {
 		return getJdbcOperations().update(getPreparedStatementCreator(sql, paramSource));
 	}
 
+	@Override
 	public int update(String sql, Map<String, ?> paramMap) throws DataAccessException {
 		return update(sql, new MapSqlParameterSource(paramMap));
 	}
 
+	@Override
 	public int update(String sql, SqlParameterSource paramSource, KeyHolder generatedKeyHolder)
 			throws DataAccessException {
 
 		return update(sql, paramSource, generatedKeyHolder, null);
 	}
 
+	@Override
 	public int update(
 			String sql, SqlParameterSource paramSource, KeyHolder generatedKeyHolder, String[] keyColumnNames)
 			throws DataAccessException {
@@ -289,6 +318,7 @@ public class NamedParameterJdbcTemplate implements NamedParameterJdbcOperations
 		return getJdbcOperations().update(pscf.newPreparedStatementCreator(params), generatedKeyHolder);
 	}
 
+	@Override
 	public int[] batchUpdate(String sql, Map<String, ?>[] batchValues) {
 		SqlParameterSource[] batchArgs = new SqlParameterSource[batchValues.length];
 		int i = 0;
@@ -299,6 +329,7 @@ public class NamedParameterJdbcTemplate implements NamedParameterJdbcOperations
 		return batchUpdate(sql, batchArgs);
 	}
 
+	@Override
 	public int[] batchUpdate(String sql, SqlParameterSource[] batchArgs) {
 		ParsedSql parsedSql = this.getParsedSql(sql);
 		return NamedParameterBatchUpdateUtils.executeBatchUpdateWithNamedParameters(parsedSql, batchArgs, getJdbcOperations());
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 98f0e5991e..730a11e5f1 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
@@ -444,6 +444,7 @@ public abstract class AbstractJdbcInsert {
 		if (this.tableMetaDataContext.isGetGeneratedKeysSupported()) {
 			jdbcTemplate.update(
 					new PreparedStatementCreator() {
+						@Override
 						public PreparedStatement createPreparedStatement(Connection con) throws SQLException {
 							PreparedStatement ps = prepareStatementForGeneratedKeys(con);
 							setParameterValues(ps, values, getInsertTypes());
@@ -483,6 +484,7 @@ public abstract class AbstractJdbcInsert {
 			}
 			else {
 				jdbcTemplate.execute(new ConnectionCallback() {
+					@Override
 					public Object doInConnection(Connection con) throws SQLException, DataAccessException {
 						// Do the insert
 						PreparedStatement ps = null;
@@ -592,11 +594,13 @@ public abstract class AbstractJdbcInsert {
 				getInsertString(),
 				new BatchPreparedStatementSetter() {
 
+					@Override
 					public void setValues(PreparedStatement ps, int i) throws SQLException {
 						List<Object> values = batchValues[i];
 						setParameterValues(ps, values, getInsertTypes());
 					}
 
+					@Override
 					public int getBatchSize() {
 						return batchValues.length;
 					}
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 d687dbc2f6..a05e16e5cb 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
@@ -79,33 +79,39 @@ public class SimpleJdbcCall extends AbstractJdbcCall implements SimpleJdbcCallOp
 	}
 
 
+	@Override
 	public SimpleJdbcCall withProcedureName(String procedureName) {
 		setProcedureName(procedureName);
 		setFunction(false);
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcCall withFunctionName(String functionName) {
 		setProcedureName(functionName);
 		setFunction(true);
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcCall withSchemaName(String schemaName) {
 		setSchemaName(schemaName);
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcCall withCatalogName(String catalogName) {
 		setCatalogName(catalogName);
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcCall withReturnValue() {
 		setReturnValueRequired(true);
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcCall declareParameters(SqlParameter... sqlParameters) {
 		for (SqlParameter sqlParameter : sqlParameters) {
 			if (sqlParameter != null) {
@@ -115,11 +121,13 @@ public class SimpleJdbcCall extends AbstractJdbcCall implements SimpleJdbcCallOp
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcCall useInParameterNames(String... inParameterNames) {
 		setInParameterNames(new HashSet<String>(Arrays.asList(inParameterNames)));
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcCall returningResultSet(String parameterName, RowMapper rowMapper) {
 		addDeclaredRowMapper(parameterName, rowMapper);
 		return this;
@@ -128,55 +136,66 @@ public class SimpleJdbcCall extends AbstractJdbcCall implements SimpleJdbcCallOp
 	/**
 	 * @deprecated in favor of {@link #returningResultSet(String, org.springframework.jdbc.core.RowMapper)}
 	 */
+   @Override
    @Deprecated
 	public SimpleJdbcCall returningResultSet(String parameterName, ParameterizedRowMapper rowMapper) {
 		addDeclaredRowMapper(parameterName, rowMapper);
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcCall withoutProcedureColumnMetaDataAccess() {
 		setAccessCallParameterMetaData(false);
 		return this;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T executeFunction(Class<T> returnType, Object... args) {
 		return (T) doExecute(args).get(getScalarOutParameterName());
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T executeFunction(Class<T> returnType, Map<String, ?> args) {
 		return (T) doExecute(args).get(getScalarOutParameterName());
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T executeFunction(Class<T> returnType, SqlParameterSource args) {
 		return (T) doExecute(args).get(getScalarOutParameterName());
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T executeObject(Class<T> returnType, Object... args) {
 		return (T) doExecute(args).get(getScalarOutParameterName());
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T executeObject(Class<T> returnType, Map<String, ?> args) {
 		return (T) doExecute(args).get(getScalarOutParameterName());
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T executeObject(Class<T> returnType, SqlParameterSource args) {
 		return (T) doExecute(args).get(getScalarOutParameterName());
 	}
 
+	@Override
 	public Map<String, Object> execute(Object... args) {
 		return doExecute(args);
 	}
 
+	@Override
 	public Map<String, Object> execute(Map<String, ?> args) {
 		return doExecute(args);
 	}
 
+	@Override
 	public Map<String, Object> execute(SqlParameterSource parameterSource) {
 		return doExecute(parameterSource);
 	}
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 7d29df8301..e83f25ff92 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
@@ -70,74 +70,90 @@ public class SimpleJdbcInsert extends AbstractJdbcInsert implements SimpleJdbcIn
 	}
 
 
+	@Override
 	public SimpleJdbcInsert withTableName(String tableName) {
 		setTableName(tableName);
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcInsert withSchemaName(String schemaName) {
 		setSchemaName(schemaName);
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcInsert withCatalogName(String catalogName) {
 		setCatalogName(catalogName);
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcInsert usingColumns(String... columnNames) {
 		setColumnNames(Arrays.asList(columnNames));
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcInsert usingGeneratedKeyColumns(String... columnNames) {
 		setGeneratedKeyNames(columnNames);
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcInsertOperations withoutTableColumnMetaDataAccess() {
 		setAccessTableColumnMetaData(false);
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcInsertOperations includeSynonymsForTableColumnMetaData() {
 		setOverrideIncludeSynonymsDefault(true);
 		return this;
 	}
 
+	@Override
 	public SimpleJdbcInsertOperations useNativeJdbcExtractorForMetaData(NativeJdbcExtractor nativeJdbcExtractor) {
 		setNativeJdbcExtractor(nativeJdbcExtractor);
 		return this;
 	}
 
+	@Override
 	public int execute(Map<String, Object> args) {
 		return doExecute(args);
 	}
 
+	@Override
 	public int execute(SqlParameterSource parameterSource) {
 		return doExecute(parameterSource);
 	}
 
+	@Override
 	public Number executeAndReturnKey(Map<String, Object> args) {
 		return doExecuteAndReturnKey(args);
 	}
 
+	@Override
 	public Number executeAndReturnKey(SqlParameterSource parameterSource) {
 		return doExecuteAndReturnKey(parameterSource);
 	}
 
+	@Override
 	public KeyHolder executeAndReturnKeyHolder(Map<String, Object> args) {
 		return doExecuteAndReturnKeyHolder(args);
 	}
 
+	@Override
 	public KeyHolder executeAndReturnKeyHolder(SqlParameterSource parameterSource) {
 		return doExecuteAndReturnKeyHolder(parameterSource);
 	}
 
+	@Override
 	public int[] executeBatch(Map<String, Object>[] batch) {
 		return doExecuteBatch(batch);
 	}
 
+	@Override
 	public int[] executeBatch(SqlParameterSource[] batch) {
 		return doExecuteBatch(batch);
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java
index a4ec41fc06..78e85682bd 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java
@@ -91,6 +91,7 @@ public class SimpleJdbcTemplate implements SimpleJdbcOperations {
 	 * Expose the classic Spring JdbcTemplate to allow invocation of
 	 * less commonly used methods.
 	 */
+	@Override
 	public JdbcOperations getJdbcOperations() {
 		return this.namedParameterJdbcOperations.getJdbcOperations();
 	}
@@ -99,172 +100,207 @@ public class SimpleJdbcTemplate implements SimpleJdbcOperations {
 	 * Expose the Spring NamedParameterJdbcTemplate to allow invocation of
 	 * less commonly used methods.
 	 */
+	@Override
 	public NamedParameterJdbcOperations getNamedParameterJdbcOperations() {
 		return this.namedParameterJdbcOperations;
 	}
 
 
+	@Override
 	public int queryForInt(String sql, Map<String, ?> args) throws DataAccessException {
 		return getNamedParameterJdbcOperations().queryForInt(sql, args);
 	}
 
+	@Override
 	public int queryForInt(String sql, SqlParameterSource args) throws DataAccessException {
 		return getNamedParameterJdbcOperations().queryForInt(sql, args);
 	}
 
+	@Override
 	public int queryForInt(String sql, Object... args) throws DataAccessException {
 		return (ObjectUtils.isEmpty(args) ?
 					getJdbcOperations().queryForInt(sql) :
 					getJdbcOperations().queryForInt(sql, getArguments(args)));
 	}
 
+	@Override
 	public long queryForLong(String sql, Map<String, ?> args) throws DataAccessException {
 		return getNamedParameterJdbcOperations().queryForLong(sql, args);
 	}
 
+	@Override
 	public long queryForLong(String sql, SqlParameterSource args) throws DataAccessException {
 		return getNamedParameterJdbcOperations().queryForLong(sql, args);
 	}
 
+	@Override
 	public long queryForLong(String sql, Object... args) throws DataAccessException {
 		return (ObjectUtils.isEmpty(args) ?
 					getJdbcOperations().queryForLong(sql) :
 					getJdbcOperations().queryForLong(sql, getArguments(args)));
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, Class<T> requiredType, Map<String, ?> args) throws DataAccessException {
 		return getNamedParameterJdbcOperations().queryForObject(sql, args, requiredType);
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, Class<T> requiredType, SqlParameterSource args)
 			throws DataAccessException {
 		return getNamedParameterJdbcOperations().queryForObject(sql, args, requiredType);
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, Class<T> requiredType, Object... args) throws DataAccessException {
 		return (ObjectUtils.isEmpty(args) ?
 				getJdbcOperations().queryForObject(sql, requiredType) :
 				getJdbcOperations().queryForObject(sql, getArguments(args), requiredType));
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, RowMapper<T> rm, Map<String, ?> args) throws DataAccessException {
 		return getNamedParameterJdbcOperations().queryForObject(sql, args, rm);
 	}
 
+	@Override
 	@Deprecated
 	public <T> T queryForObject(String sql, ParameterizedRowMapper<T> rm, Map<String, ?> args) throws DataAccessException {
 		return queryForObject(sql, (RowMapper<T>) rm, args);
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, RowMapper<T> rm, SqlParameterSource args)
 			throws DataAccessException {
 		return getNamedParameterJdbcOperations().queryForObject(sql, args, rm);
 	}
 
+	@Override
 	@Deprecated
 	public <T> T queryForObject(String sql, ParameterizedRowMapper<T> rm, SqlParameterSource args)
 			throws DataAccessException {
 		return queryForObject(sql, (RowMapper<T>) rm, args);
 	}
 
+	@Override
 	public <T> T queryForObject(String sql, RowMapper<T> rm, Object... args) throws DataAccessException {
 		return (ObjectUtils.isEmpty(args) ?
 				getJdbcOperations().queryForObject(sql, rm):
 				getJdbcOperations().queryForObject(sql, getArguments(args), rm));
 	}
 
+	@Override
 	@Deprecated
 	public <T> T queryForObject(String sql, ParameterizedRowMapper<T> rm, Object... args) throws DataAccessException {
 		return queryForObject(sql, (RowMapper<T>) rm, args);
 	}
 
+	@Override
 	public <T> List<T> query(String sql, RowMapper<T> rm, Map<String, ?> args) throws DataAccessException {
 		return getNamedParameterJdbcOperations().query(sql, args, rm);
 	}
 
+	@Override
 	@Deprecated
 	public <T> List<T> query(String sql, ParameterizedRowMapper<T> rm, Map<String, ?> args) throws DataAccessException {
 		return query(sql, (RowMapper<T>) rm, args);
 	}
 
+	@Override
 	public <T> List<T> query(String sql, RowMapper<T> rm, SqlParameterSource args)
 			throws DataAccessException {
 		return getNamedParameterJdbcOperations().query(sql, args, rm);
 	}
 
+	@Override
 	@Deprecated
 	public <T> List<T> query(String sql, ParameterizedRowMapper<T> rm, SqlParameterSource args)
 			throws DataAccessException {
 		return query(sql, (RowMapper<T>) rm, args);
 	}
 
+	@Override
 	public <T> List<T> query(String sql, RowMapper<T> rm, Object... args) throws DataAccessException {
 		return (ObjectUtils.isEmpty(args) ?
 				getJdbcOperations().query(sql, rm) :
 				getJdbcOperations().query(sql, getArguments(args), rm));
 	}
 
+	@Override
 	@Deprecated
 	public <T> List<T> query(String sql, ParameterizedRowMapper<T> rm, Object... args) throws DataAccessException {
 		return query(sql, (RowMapper<T>) rm, args);
 	}
 
+	@Override
 	public Map<String, Object> queryForMap(String sql, Map<String, ?> args) throws DataAccessException {
 		return getNamedParameterJdbcOperations().queryForMap(sql, args);
 	}
 
+	@Override
 	public Map<String, Object> queryForMap(String sql, SqlParameterSource args)
 			throws DataAccessException {
 		return getNamedParameterJdbcOperations().queryForMap(sql, args);
 	}
 
+	@Override
 	public Map<String, Object> queryForMap(String sql, Object... args) throws DataAccessException {
 		return (ObjectUtils.isEmpty(args) ?
 				getJdbcOperations().queryForMap(sql) :
 				getJdbcOperations().queryForMap(sql, getArguments(args)));
 	}
 
+	@Override
 	public List<Map<String, Object>> queryForList(String sql, Map<String, ?> args) throws DataAccessException {
 		return getNamedParameterJdbcOperations().queryForList(sql, args);
 	}
 
+	@Override
 	public List<Map<String, Object>> queryForList(String sql, SqlParameterSource args)
 			throws DataAccessException {
 		return getNamedParameterJdbcOperations().queryForList(sql, args);
 	}
 
+	@Override
 	public List<Map<String, Object>> queryForList(String sql, Object... args) throws DataAccessException {
 		return (ObjectUtils.isEmpty(args) ?
 				getJdbcOperations().queryForList(sql) :
 				getJdbcOperations().queryForList(sql, getArguments(args)));
 	}
 
+	@Override
 	public int update(String sql, Map<String, ?> args) throws DataAccessException {
 		return getNamedParameterJdbcOperations().update(sql, args);
 	}
 
+	@Override
 	public int update(String sql, SqlParameterSource args) throws DataAccessException {
 		return getNamedParameterJdbcOperations().update(sql, args);
 	}
 
+	@Override
 	public int update(String sql, Object ... args) throws DataAccessException {
 		return (ObjectUtils.isEmpty(args) ?
 				getJdbcOperations().update(sql) :
 				getJdbcOperations().update(sql, getArguments(args)));
 	}
 
+	@Override
 	public int[] batchUpdate(String sql, List<Object[]> batchArgs) {
 		return batchUpdate(sql, batchArgs, new int[0]);
 	}
 
+	@Override
 	public int[] batchUpdate(String sql, List<Object[]> batchArgs, int[] argTypes) {
 		return BatchUpdateUtils.executeBatchUpdate(sql, batchArgs, argTypes, getJdbcOperations());
 	}
 
+	@Override
 	public int[] batchUpdate(String sql, Map<String, ?>[] batchValues) {
 		return getNamedParameterJdbcOperations().batchUpdate(sql, batchValues);
 	}
 
+	@Override
 	public int[] batchUpdate(String sql, SqlParameterSource[] batchArgs) {
 		return getNamedParameterJdbcOperations().batchUpdate(sql, batchArgs);
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java
index 83d37435ec..7fb5e6d1c2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java
@@ -40,6 +40,7 @@ public abstract class AbstractInterruptibleBatchPreparedStatementSetter
 	 * This implementation calls {@link #setValuesIfAvailable}
 	 * and sets this instance's exhaustion flag accordingly.
 	 */
+	@Override
 	public final void setValues(PreparedStatement ps, int i) throws SQLException {
 		this.exhausted = !setValuesIfAvailable(ps, i);
 	}
@@ -47,6 +48,7 @@ public abstract class AbstractInterruptibleBatchPreparedStatementSetter
 	/**
 	 * This implementation return this instance's current exhaustion flag.
 	 */
+	@Override
 	public final boolean isBatchExhausted(int i) {
 		return this.exhausted;
 	}
@@ -55,6 +57,7 @@ public abstract class AbstractInterruptibleBatchPreparedStatementSetter
 	 * This implementation returns {@code Integer.MAX_VALUE}.
 	 * Can be overridden in subclasses to lower the maximum batch size.
 	 */
+	@Override
 	public int getBatchSize() {
 		return Integer.MAX_VALUE;
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java
index 7ef0b32583..4b511bc735 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java
@@ -66,6 +66,7 @@ public abstract class AbstractLobCreatingPreparedStatementCallback implements Pr
 	}
 
 
+	@Override
 	public final Integer doInPreparedStatement(PreparedStatement ps) throws SQLException, DataAccessException {
 		LobCreator lobCreator = this.lobHandler.getLobCreator();
 		try {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java
index 83a9aedffc..4a15e97fd4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java
@@ -64,6 +64,7 @@ public abstract class AbstractLobStreamingResultSetExtractor implements ResultSe
 	 * @see #streamData
 	 * @see org.springframework.jdbc.LobRetrievalFailureException
 	 */
+	@Override
 	public final Object extractData(ResultSet rs) throws SQLException, DataAccessException {
 		if (!rs.next()) {
 			handleNoRowFound();
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java
index d751933913..67f325c8d5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java
@@ -52,6 +52,7 @@ import org.springframework.jdbc.core.SqlTypeValue;
  */
 public abstract class AbstractSqlTypeValue implements SqlTypeValue {
 
+	@Override
 	public final void setTypeValue(PreparedStatement ps, int paramIndex, int sqlType, String typeName)
 			throws SQLException {
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
index 7039eeacc8..bdcd1c3073 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java
@@ -107,6 +107,7 @@ public class JdbcBeanDefinitionReader {
 		Assert.notNull(this.jdbcTemplate, "Not fully configured - specify DataSource or JdbcTemplate");
 		final Properties props = new Properties();
 		this.jdbcTemplate.query(sql, new RowCallbackHandler() {
+			@Override
 			public void processRow(ResultSet rs) throws SQLException {
 				String beanName = rs.getString(1);
 				String property = rs.getString(2);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java
index 2cc5f9f909..8e46d42b75 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java
@@ -168,6 +168,7 @@ public class SqlLobValue implements DisposableSqlTypeValue {
 	/**
 	 * Set the specified content via the LobCreator.
 	 */
+	@Override
 	public void setTypeValue(PreparedStatement ps, int paramIndex, int sqlType, String typeName)
 			throws SQLException {
 		if (sqlType == Types.BLOB) {
@@ -208,6 +209,7 @@ public class SqlLobValue implements DisposableSqlTypeValue {
 	/**
 	 * Close the LobCreator, if any.
 	 */
+	@Override
 	public void cleanup() {
 		this.lobCreator.close();
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java
index 0674c79b47..63d9ddff38 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java
@@ -45,6 +45,7 @@ public abstract class AbstractDataSource implements DataSource {
 	/**
 	 * Returns 0, indicating the default system timeout is to be used.
 	 */
+	@Override
 	public int getLoginTimeout() throws SQLException {
 		return 0;
 	}
@@ -52,6 +53,7 @@ public abstract class AbstractDataSource implements DataSource {
 	/**
 	 * Setting a login timeout is not supported.
 	 */
+	@Override
 	public void setLoginTimeout(int timeout) throws SQLException {
 		throw new UnsupportedOperationException("setLoginTimeout");
 	}
@@ -59,6 +61,7 @@ public abstract class AbstractDataSource implements DataSource {
 	/**
 	 * LogWriter methods are not supported.
 	 */
+	@Override
 	public PrintWriter getLogWriter() {
 		throw new UnsupportedOperationException("getLogWriter");
 	}
@@ -66,6 +69,7 @@ public abstract class AbstractDataSource implements DataSource {
 	/**
 	 * LogWriter methods are not supported.
 	 */
+	@Override
 	public void setLogWriter(PrintWriter pw) throws SQLException {
 		throw new UnsupportedOperationException("setLogWriter");
 	}
@@ -75,6 +79,7 @@ public abstract class AbstractDataSource implements DataSource {
 	// Implementation of JDBC 4.0's Wrapper interface
 	//---------------------------------------------------------------------
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T unwrap(Class<T> iface) throws SQLException {
 		if (iface.isInstance(this)) {
@@ -84,6 +89,7 @@ public abstract class AbstractDataSource implements DataSource {
 				"] cannot be unwrapped as [" + iface.getName() + "]");
 	}
 
+	@Override
 	public boolean isWrapperFor(Class<?> iface) throws SQLException {
 		return iface.isInstance(this);
 	}
@@ -93,6 +99,7 @@ public abstract class AbstractDataSource implements DataSource {
 	// Implementation of JDBC 4.1's getParentLogger method
 	//---------------------------------------------------------------------
 
+	@Override
 	public Logger getParentLogger() {
 		return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
index 00aedb4c22..6cb804406e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java
@@ -115,6 +115,7 @@ public abstract class AbstractDriverBasedDataSource extends AbstractDataSource {
 	 * @see #setUsername
 	 * @see #setPassword
 	 */
+	@Override
 	public Connection getConnection() throws SQLException {
 		return getConnectionFromDriver(getUsername(), getPassword());
 	}
@@ -124,6 +125,7 @@ public abstract class AbstractDriverBasedDataSource extends AbstractDataSource {
 	 * using the given username and password.
 	 * @see #getConnectionFromDriver(String, String)
 	 */
+	@Override
 	public Connection getConnection(String username, String password) throws SQLException {
 		return getConnectionFromDriver(username, password);
 	}
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 9c6ebcfde2..8b54f1b66f 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
@@ -162,6 +162,7 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan
 		return this.dataSource;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getDataSource() == null) {
 			throw new IllegalArgumentException("Property 'dataSource' is required");
@@ -169,6 +170,7 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan
 	}
 
 
+	@Override
 	public Object getResourceFactory() {
 		return getDataSource();
 	}
@@ -364,6 +366,7 @@ public class DataSourceTransactionManager extends AbstractPlatformTransactionMan
 			getConnectionHolder().setRollbackOnly();
 		}
 
+		@Override
 		public boolean isRollbackOnly() {
 			return getConnectionHolder().isRollbackOnly();
 		}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java
index a4c162dde8..3adef83c81 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java
@@ -73,6 +73,7 @@ public class DelegatingDataSource implements DataSource, InitializingBean {
 		return this.targetDataSource;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getTargetDataSource() == null) {
 			throw new IllegalArgumentException("Property 'targetDataSource' is required");
@@ -80,26 +81,32 @@ public class DelegatingDataSource implements DataSource, InitializingBean {
 	}
 
 
+	@Override
 	public Connection getConnection() throws SQLException {
 		return getTargetDataSource().getConnection();
 	}
 
+	@Override
 	public Connection getConnection(String username, String password) throws SQLException {
 		return getTargetDataSource().getConnection(username, password);
 	}
 
+	@Override
 	public PrintWriter getLogWriter() throws SQLException {
 		return getTargetDataSource().getLogWriter();
 	}
 
+	@Override
 	public void setLogWriter(PrintWriter out) throws SQLException {
 		getTargetDataSource().setLogWriter(out);
 	}
 
+	@Override
 	public int getLoginTimeout() throws SQLException {
 		return getTargetDataSource().getLoginTimeout();
 	}
 
+	@Override
 	public void setLoginTimeout(int seconds) throws SQLException {
 		getTargetDataSource().setLoginTimeout(seconds);
 	}
@@ -109,6 +116,7 @@ public class DelegatingDataSource implements DataSource, InitializingBean {
 	// Implementation of JDBC 4.0's Wrapper interface
 	//---------------------------------------------------------------------
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T unwrap(Class<T> iface) throws SQLException {
 		if (iface.isInstance(this)) {
@@ -117,6 +125,7 @@ public class DelegatingDataSource implements DataSource, InitializingBean {
 		return getTargetDataSource().unwrap(iface);
 	}
 
+	@Override
 	public boolean isWrapperFor(Class<?> iface) throws SQLException {
 		return (iface.isInstance(this) || getTargetDataSource().isWrapperFor(iface));
 	}
@@ -126,6 +135,7 @@ public class DelegatingDataSource implements DataSource, InitializingBean {
 	// Implementation of JDBC 4.1's getParentLogger method
 	//---------------------------------------------------------------------
 
+	@Override
 	public Logger getParentLogger() {
 		return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java
index 57cd94160b..d2f6e55ae9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java
@@ -87,6 +87,7 @@ public abstract class JdbcTransactionObjectSupport implements SavepointManager,
 		return this.savepointAllowed;
 	}
 
+	@Override
 	public void flush() {
 		// no-op
 	}
@@ -100,6 +101,7 @@ public abstract class JdbcTransactionObjectSupport implements SavepointManager,
 	 * This implementation creates a JDBC 3.0 Savepoint and returns it.
 	 * @see java.sql.Connection#setSavepoint
 	 */
+	@Override
 	public Object createSavepoint() throws TransactionException {
 		ConnectionHolder conHolder = getConnectionHolderForSavepoint();
 		try {
@@ -124,6 +126,7 @@ public abstract class JdbcTransactionObjectSupport implements SavepointManager,
 	 * This implementation rolls back to the given JDBC 3.0 Savepoint.
 	 * @see java.sql.Connection#rollback(java.sql.Savepoint)
 	 */
+	@Override
 	public void rollbackToSavepoint(Object savepoint) throws TransactionException {
 		try {
 			getConnectionHolderForSavepoint().getConnection().rollback((Savepoint) savepoint);
@@ -137,6 +140,7 @@ public abstract class JdbcTransactionObjectSupport implements SavepointManager,
 	 * This implementation releases the given JDBC 3.0 Savepoint.
 	 * @see java.sql.Connection#releaseSavepoint
 	 */
+	@Override
 	public void releaseSavepoint(Object savepoint) throws TransactionException {
 		try {
 			getConnectionHolderForSavepoint().getConnection().releaseSavepoint((Savepoint) savepoint);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
index f6ddc15b34..c4a82f071c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
@@ -274,6 +274,7 @@ public class LazyConnectionDataSourceProxy extends DelegatingDataSource {
 			this.password = password;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on ConnectionProxy interface coming in...
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java
index ed37136a92..4172971e4a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java
@@ -44,6 +44,7 @@ public class SimpleConnectionHandle implements ConnectionHandle {
 	/**
 	 * Return the specified Connection as-is.
 	 */
+	@Override
 	public Connection getConnection() {
 		return this.connection;
 	}
@@ -52,6 +53,7 @@ public class SimpleConnectionHandle implements ConnectionHandle {
 	 * This implementation is empty, as we're using a standard
 	 * Connection handle that does not have to be released.
 	 */
+	@Override
 	public void releaseConnection(Connection con) {
 	}
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java
index 9d2b41f54e..c8a72e95e6 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java
@@ -213,6 +213,7 @@ public class SingleConnectionDataSource extends DriverManagerDataSource
 	/**
 	 * This is a single Connection: Do not close it when returning to the "pool".
 	 */
+	@Override
 	public boolean shouldClose(Connection con) {
 		synchronized (this.connectionMonitor) {
 			return (con != this.connection && con != this.target);
@@ -225,6 +226,7 @@ public class SingleConnectionDataSource extends DriverManagerDataSource
 	 * <p>As this bean implements DisposableBean, a bean factory will
 	 * automatically invoke this on destruction of its cached singletons.
 	 */
+	@Override
 	public void destroy() {
 		synchronized (this.connectionMonitor) {
 			closeConnection();
@@ -314,6 +316,7 @@ public class SingleConnectionDataSource extends DriverManagerDataSource
 			this.target = target;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on ConnectionProxy interface coming in...
 
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
index 1321c81662..8fc76ea690 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java
@@ -174,6 +174,7 @@ public class TransactionAwareDataSourceProxy extends DelegatingDataSource {
 			this.targetDataSource = targetDataSource;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on ConnectionProxy interface coming in...
 
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..3516d4b164 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
@@ -35,6 +35,7 @@ abstract class AbstractEmbeddedDatabaseConfigurer implements EmbeddedDatabaseCon
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
+	@Override
 	public void shutdown(DataSource dataSource, String databaseName) {
 		try {
 			Connection connection = dataSource.getConnection();
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..962b2dff6e 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
@@ -69,6 +69,7 @@ final class DerbyEmbeddedDatabaseConfigurer implements EmbeddedDatabaseConfigure
 	private DerbyEmbeddedDatabaseConfigurer() {
 	}
 
+	@Override
 	public void configureConnectionProperties(ConnectionProperties properties, String databaseName) {
 		properties.setDriverClass(EmbeddedDriver.class);
 		properties.setUrl(String.format(URL_TEMPLATE, databaseName, "create=true"));
@@ -76,6 +77,7 @@ final class DerbyEmbeddedDatabaseConfigurer implements EmbeddedDatabaseConfigure
 		properties.setPassword("");
 	}
 
+	@Override
 	public void shutdown(DataSource dataSource, String databaseName) {
 		try {
 			new EmbeddedDriver().connect(
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 5e3db7cff4..5254361ea1 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
@@ -172,44 +172,54 @@ public class EmbeddedDatabaseFactory {
 			this.dataSource = dataSource;
 		}
 
+		@Override
 		public Connection getConnection() throws SQLException {
 			return this.dataSource.getConnection();
 		}
 
+		@Override
 		public Connection getConnection(String username, String password) throws SQLException {
 			return this.dataSource.getConnection(username, password);
 		}
 
+		@Override
 		public PrintWriter getLogWriter() throws SQLException {
 			return this.dataSource.getLogWriter();
 		}
 
+		@Override
 		public void setLogWriter(PrintWriter out) throws SQLException {
 			this.dataSource.setLogWriter(out);
 		}
 
+		@Override
 		public int getLoginTimeout() throws SQLException {
 			return this.dataSource.getLoginTimeout();
 		}
 
+		@Override
 		public void setLoginTimeout(int seconds) throws SQLException {
 			this.dataSource.setLoginTimeout(seconds);
 		}
 
+		@Override
 		public <T> T unwrap(Class<T> iface) throws SQLException {
 			return this.dataSource.unwrap(iface);
 		}
 
+		@Override
 		public boolean isWrapperFor(Class<?> iface) throws SQLException {
 			return this.dataSource.isWrapperFor(iface);
 		}
 
 		// getParentLogger() is required for JDBC 4.1 compatibility
+		@Override
 		@SuppressWarnings("unused")
 		public Logger getParentLogger() {
 			return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
 		}
 
+		@Override
 		public void shutdown() {
 			shutdownDatabase();
 		}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java
index a58d84a75d..f04758765a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java
@@ -54,10 +54,12 @@ public class EmbeddedDatabaseFactoryBean extends EmbeddedDatabaseFactory
 		this.databaseCleaner = databaseCleaner;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		initDatabase();
 	}
 
+	@Override
 	public void destroy() {
 		if (this.databaseCleaner != null) {
 			DatabasePopulatorUtils.execute(this.databaseCleaner, getDataSource());
@@ -66,14 +68,17 @@ public class EmbeddedDatabaseFactoryBean extends EmbeddedDatabaseFactory
 	}
 
 
+	@Override
 	public DataSource getObject() {
 		return getDataSource();
 	}
 
+	@Override
 	public Class<? extends DataSource> getObjectType() {
 		return DataSource.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java
index d7fc50bf7a..d5775369c4 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java
@@ -52,6 +52,7 @@ final class H2EmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigu
 		this.driverClass = driverClass;
 	}
 
+	@Override
 	public void configureConnectionProperties(ConnectionProperties properties, String databaseName) {
 		properties.setDriverClass(this.driverClass);
 		properties.setUrl(String.format("jdbc:h2:mem:%s;DB_CLOSE_DELAY=-1", databaseName));
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java
index 298cf37db0..e65fe30e78 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java
@@ -52,6 +52,7 @@ final class HsqlEmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfi
 		this.driverClass = driverClass;
 	}
 
+	@Override
 	public void configureConnectionProperties(ConnectionProperties properties, String databaseName) {
 		properties.setDriverClass(this.driverClass);
 		properties.setUrl("jdbc:hsqldb:mem:" + databaseName);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.java
index 848501e7e4..8aaaad91f5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.java
@@ -33,6 +33,7 @@ public class OutputStreamFactory {
 	 */
 	public static OutputStream getNoopOutputStream() {
 		return new OutputStream() {
+			@Override
 			public void write(int b) throws IOException {
 				// ignore the output
 			}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
index 58b176721b..309d776534 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java
@@ -33,26 +33,32 @@ final class SimpleDriverDataSourceFactory implements DataSourceFactory {
 
 	private final SimpleDriverDataSource dataSource = new SimpleDriverDataSource();
 
+	@Override
 	public ConnectionProperties getConnectionProperties() {
 		return new ConnectionProperties() {
+			@Override
 			public void setDriverClass(Class<? extends Driver> driverClass) {
 				dataSource.setDriverClass(driverClass);
 			}
 
+			@Override
 			public void setUrl(String url) {
 				dataSource.setUrl(url);
 			}
 
+			@Override
 			public void setUsername(String username) {
 				dataSource.setUsername(username);
 			}
 
+			@Override
 			public void setPassword(String password) {
 				dataSource.setPassword(password);
 			}
 		};
 	}
 
+	@Override
 	public DataSource getDataSource() {
 		return this.dataSource;
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java
index 143317b694..740065ce32 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java
@@ -50,6 +50,7 @@ public class CompositeDatabasePopulator implements DatabasePopulator {
 	}
 
 
+	@Override
 	public void populate(Connection connection) throws SQLException {
 		for (DatabasePopulator populator : this.populators) {
 			populator.populate(connection);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DataSourceInitializer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DataSourceInitializer.java
index 96f795ca76..aa2a104a47 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DataSourceInitializer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DataSourceInitializer.java
@@ -78,6 +78,7 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean {
 	/**
 	 * Use the populator to set up data in the data source.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		if (this.databasePopulator != null && this.enabled) {
 			DatabasePopulatorUtils.execute(this.databasePopulator, this.dataSource);
@@ -87,6 +88,7 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean {
 	/**
 	 * Use the populator to clean up data in the data source.
 	 */
+	@Override
 	public void destroy() {
 		if (this.databaseCleaner != null && this.enabled) {
 			DatabasePopulatorUtils.execute(this.databaseCleaner, 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..1f615026cb 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
@@ -129,6 +129,7 @@ public class ResourceDatabasePopulator implements DatabasePopulator {
 	}
 
 
+	@Override
 	public void populate(Connection connection) throws SQLException {
 		for (Resource script : this.scripts) {
 			executeSqlScript(connection, applyEncodingIfNecessary(script), this.continueOnError, this.ignoreFailedDrops);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
index f42cbb72f8..610c9e6309 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/AbstractRoutingDataSource.java
@@ -107,6 +107,7 @@ public abstract class AbstractRoutingDataSource extends AbstractDataSource imple
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.targetDataSources == null) {
 			throw new IllegalArgumentException("Property 'targetDataSources' is required");
@@ -158,10 +159,12 @@ public abstract class AbstractRoutingDataSource extends AbstractDataSource imple
 	}
 
 
+	@Override
 	public Connection getConnection() throws SQLException {
 		return determineTargetDataSource().getConnection();
 	}
 
+	@Override
 	public Connection getConnection(String username, String password) throws SQLException {
 		return determineTargetDataSource().getConnection(username, password);
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
index 915b327153..f4dbbaf5a2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java
@@ -62,11 +62,13 @@ public class BeanFactoryDataSourceLookup implements DataSourceLookup, BeanFactor
 	}
 
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
 
+	@Override
 	public DataSource getDataSource(String dataSourceName) throws DataSourceLookupFailureException {
 		Assert.state(this.beanFactory != null, "BeanFactory is required");
 		try {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java
index 2a48efaaf5..96677aa2e7 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java
@@ -39,6 +39,7 @@ public class JndiDataSourceLookup extends JndiLocatorSupport implements DataSour
 		setResourceRef(true);
 	}
 
+	@Override
 	public DataSource getDataSource(String dataSourceName) throws DataSourceLookupFailureException {
 		try {
 			return lookup(dataSourceName, DataSource.class);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
index 0a4eb32b4b..e392303e79 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java
@@ -98,6 +98,7 @@ public class MapDataSourceLookup implements DataSourceLookup {
 		this.dataSources.put(dataSourceName, dataSource);
 	}
 
+	@Override
 	public DataSource getDataSource(String dataSourceName) throws DataSourceLookupFailureException {
 		Assert.notNull(dataSourceName, "DataSource name must not be null");
 		DataSource dataSource = this.dataSources.get(dataSourceName);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/SingleDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/SingleDataSourceLookup.java
index 3443a713a8..10acc19b77 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/SingleDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/SingleDataSourceLookup.java
@@ -42,6 +42,7 @@ public class SingleDataSourceLookup implements DataSourceLookup {
 	}
 
 
+	@Override
 	public DataSource getDataSource(String dataSourceName) {
 		return this.dataSource;
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
index 039e5c34f5..6372990866 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java
@@ -184,9 +184,11 @@ public class BatchSqlUpdate extends SqlUpdate {
 		int[] rowsAffected = getJdbcTemplate().batchUpdate(
 				getSql(),
 				new BatchPreparedStatementSetter() {
+					@Override
 					public int getBatchSize() {
 						return parameterQueue.size();
 					}
+					@Override
 					public void setValues(PreparedStatement ps, int index) throws SQLException {
 						Object[] params = parameterQueue.removeFirst();
 						newPreparedStatementSetter(params).setValues(ps);
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..3b0b7342bf 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
@@ -37,11 +37,13 @@ public class GenericSqlQuery extends SqlQuery {
 					"'org.springframework.jdbc.core.RowMapper'");
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
 		Assert.notNull(rowMapperClass, "The 'rowMapperClass' property is required");
 	}
 
+	@Override
 	protected RowMapper newRowMapper(Object[] parameters, Map context) {
 		try {
 			return (RowMapper) rowMapperClass.newInstance();
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
index 6e8355e639..37db4a54ce 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
@@ -111,6 +111,7 @@ public abstract class MappingSqlQueryWithParameters<T> extends SqlQuery<T> {
 			this.context = context;
 		}
 
+		@Override
 		public T mapRow(ResultSet rs, int rowNum) throws SQLException {
 			return MappingSqlQueryWithParameters.this.mapRow(rs, rowNum, this.params, this.context);
 		}
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..6067251bac 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
@@ -313,6 +313,7 @@ public abstract class RdbmsOperation implements InitializingBean {
 	/**
 	 * Ensures compilation if used in a bean factory.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		compile();
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
index 90603687a1..3ceb131d7f 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java
@@ -94,6 +94,7 @@ public abstract class UpdatableSqlQuery<T> extends SqlQuery<T> {
 			this.context = context;
 		}
 
+		@Override
 		public T mapRow(ResultSet rs, int rowNum) throws SQLException {
 			T result = updateRow(rs, rowNum, this.context);
 			rs.updateRow();
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
index 7b6d91814c..6e4c548eab 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java
@@ -60,6 +60,7 @@ public abstract class AbstractFallbackSQLExceptionTranslator implements SQLExcep
 	 * Pre-checks the arguments, calls {@link #doTranslate}, and invokes the
 	 * {@link #getFallbackTranslator() fallback translator} if necessary.
 	 */
+	@Override
 	public DataAccessException translate(String task, String sql, SQLException ex) {
 		Assert.notNull(ex, "Cannot translate a null SQLException");
 		if (task == null) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrar.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrar.java
index 668022162d..2faaaba18e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrar.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/CustomSQLExceptionTranslatorRegistrar.java
@@ -48,6 +48,7 @@ public class CustomSQLExceptionTranslatorRegistrar implements InitializingBean {
 		this.translators.putAll(translators);
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		for (String dbName : this.translators.keySet()) {
 			CustomSQLExceptionTranslatorRegistry.getInstance().registerTranslator(dbName, this.translators.get(dbName));
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java
index acc95ccac7..836501d418 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java
@@ -93,6 +93,7 @@ public class DatabaseStartupValidator implements InitializingBean {
 	 * from the specified DataSource, with the specified interval between
 	 * checks, until the specified timeout.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		if (this.dataSource == null) {
 			throw new IllegalArgumentException("dataSource is required");
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java
index a624e3fa3d..dd6a311505 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java
@@ -57,6 +57,7 @@ public class GeneratedKeyHolder implements KeyHolder {
 	}
 
 
+	@Override
 	public Number getKey() throws InvalidDataAccessApiUsageException, DataRetrievalFailureException {
 		if (this.keyList.size() == 0) {
 			return null;
@@ -83,6 +84,7 @@ public class GeneratedKeyHolder implements KeyHolder {
 		}
 	}
 
+	@Override
 	public Map<String, Object> getKeys() throws InvalidDataAccessApiUsageException {
 		if (this.keyList.size() == 0) {
 			return null;
@@ -94,6 +96,7 @@ public class GeneratedKeyHolder implements KeyHolder {
 		return this.keyList.get(0);
 	}
 
+	@Override
 	public List<Map<String, Object>> getKeyList() {
 		return this.keyList;
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java
index 89940f0cf2..f383a4d833 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java
@@ -129,6 +129,7 @@ public abstract class JdbcAccessor implements InitializingBean {
 	 * Eagerly initialize the exception translator, if demanded,
 	 * creating a default one for the specified DataSource if none set.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		if (getDataSource() == null) {
 			throw new IllegalArgumentException("Property 'dataSource' is required");
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
index 95f2ee3643..8e682e1315 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
@@ -319,6 +319,7 @@ public abstract class JdbcUtils {
 
 		return extractDatabaseMetaData(dataSource,
 				new DatabaseMetaDataCallback() {
+					@Override
 					public Object processMetaData(DatabaseMetaData dbmd) throws SQLException, MetaDataAccessException {
 						try {
 							Method method = DatabaseMetaData.class.getMethod(metaDataMethodName, (Class[]) null);
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
index 3fd0d80f68..933c166a62 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java
@@ -107,6 +107,7 @@ public abstract class AbstractDataFieldMaxValueIncrementer implements DataFieldM
 		return this.paddingLength;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.dataSource == null) {
 			throw new IllegalArgumentException("Property 'dataSource' is required");
@@ -117,14 +118,17 @@ public abstract class AbstractDataFieldMaxValueIncrementer implements DataFieldM
 	}
 
 
+	@Override
 	public int nextIntValue() throws DataAccessException {
 		return (int) getNextKey();
 	}
 
+	@Override
 	public long nextLongValue() throws DataAccessException {
 		return getNextKey();
 	}
 
+	@Override
 	public String nextStringValue() throws DataAccessException {
 		String s = Long.toString(getNextKey());
 		int len = s.length();
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java
index 737a582459..efd9824bcb 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java
@@ -33,22 +33,27 @@ import java.sql.SQLException;
  */
 public abstract class AbstractLobHandler implements LobHandler {
 
+	@Override
 	public byte[] getBlobAsBytes(ResultSet rs, String columnName) throws SQLException {
 		return getBlobAsBytes(rs, rs.findColumn(columnName));
 	}
 
+	@Override
 	public InputStream getBlobAsBinaryStream(ResultSet rs, String columnName) throws SQLException {
 		return getBlobAsBinaryStream(rs, rs.findColumn(columnName));
 	}
 
+	@Override
 	public String getClobAsString(ResultSet rs, String columnName) throws SQLException {
 		return getClobAsString(rs, rs.findColumn(columnName));
 	}
 
+	@Override
 	public InputStream getClobAsAsciiStream(ResultSet rs, String columnName) throws SQLException {
 		return getClobAsAsciiStream(rs, rs.findColumn(columnName));
 	}
 
+	@Override
 	public Reader getClobAsCharacterStream(ResultSet rs, String columnName) throws SQLException {
 		return getClobAsCharacterStream(rs, rs.findColumn(columnName));
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java
index 6964172e96..f95b5492f9 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java
@@ -113,6 +113,7 @@ public class DefaultLobHandler extends AbstractLobHandler {
 	}
 
 
+	@Override
 	public byte[] getBlobAsBytes(ResultSet rs, int columnIndex) throws SQLException {
 		logger.debug("Returning BLOB as bytes");
 		if (this.wrapAsLob) {
@@ -124,6 +125,7 @@ public class DefaultLobHandler extends AbstractLobHandler {
 		}
 	}
 
+	@Override
 	public InputStream getBlobAsBinaryStream(ResultSet rs, int columnIndex) throws SQLException {
 		logger.debug("Returning BLOB as binary stream");
 		if (this.wrapAsLob) {
@@ -135,6 +137,7 @@ public class DefaultLobHandler extends AbstractLobHandler {
 		}
 	}
 
+	@Override
 	public String getClobAsString(ResultSet rs, int columnIndex) throws SQLException {
 		logger.debug("Returning CLOB as string");
 		if (this.wrapAsLob) {
@@ -146,6 +149,7 @@ public class DefaultLobHandler extends AbstractLobHandler {
 		}
 	}
 
+	@Override
 	public InputStream getClobAsAsciiStream(ResultSet rs, int columnIndex) throws SQLException {
 		logger.debug("Returning CLOB as ASCII stream");
 		if (this.wrapAsLob) {
@@ -157,6 +161,7 @@ public class DefaultLobHandler extends AbstractLobHandler {
 		}
 	}
 
+	@Override
 	public Reader getClobAsCharacterStream(ResultSet rs, int columnIndex) throws SQLException {
 		logger.debug("Returning CLOB as character stream");
 		if (this.wrapAsLob) {
@@ -168,6 +173,7 @@ public class DefaultLobHandler extends AbstractLobHandler {
 		}
 	}
 
+	@Override
 	public LobCreator getLobCreator() {
 		return new DefaultLobCreator();
 	}
@@ -179,6 +185,7 @@ public class DefaultLobHandler extends AbstractLobHandler {
 	 */
 	protected class DefaultLobCreator implements LobCreator {
 
+		@Override
 		public void setBlobAsBytes(PreparedStatement ps, int paramIndex, byte[] content)
 				throws SQLException {
 
@@ -207,6 +214,7 @@ public class DefaultLobHandler extends AbstractLobHandler {
 			}
 		}
 
+		@Override
 		public void setBlobAsBinaryStream(
 				PreparedStatement ps, int paramIndex, InputStream binaryStream, int contentLength)
 				throws SQLException {
@@ -236,6 +244,7 @@ public class DefaultLobHandler extends AbstractLobHandler {
 			}
 		}
 
+		@Override
 		public void setClobAsString(PreparedStatement ps, int paramIndex, String content)
 				throws SQLException {
 
@@ -264,6 +273,7 @@ public class DefaultLobHandler extends AbstractLobHandler {
 			}
 		}
 
+		@Override
 		public void setClobAsAsciiStream(
 				PreparedStatement ps, int paramIndex, InputStream asciiStream, int contentLength)
 				throws SQLException {
@@ -295,6 +305,7 @@ public class DefaultLobHandler extends AbstractLobHandler {
 			}
 		}
 
+		@Override
 		public void setClobAsCharacterStream(
 				PreparedStatement ps, int paramIndex, Reader characterStream, int contentLength)
 				throws SQLException {
@@ -324,6 +335,7 @@ public class DefaultLobHandler extends AbstractLobHandler {
 			}
 		}
 
+		@Override
 		public void close() {
 			// nothing to do here
 		}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java
index 19c85608c3..80ae5d1ea6 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java
@@ -46,6 +46,7 @@ public class JtaLobCreatorSynchronization implements Synchronization {
 		this.lobCreator = lobCreator;
 	}
 
+	@Override
 	public void beforeCompletion() {
 		// Close the LobCreator early if possible, to avoid issues with strict JTA
 		// implementations that issue warnings when doing JDBC operations after
@@ -54,6 +55,7 @@ public class JtaLobCreatorSynchronization implements Synchronization {
 		this.lobCreator.close();
 	}
 
+	@Override
 	public void afterCompletion(int status) {
 		if (!this.beforeCompletionCalled) {
 			// beforeCompletion not called before (probably because of JTA rollback).
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreator.java
index ad0e3719e3..8bee169c79 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreator.java
@@ -135,6 +135,7 @@ public interface LobCreator extends Closeable {
 	 * been executed or the affected O/R mapping sessions have been flushed.
 	 * Otherwise, the database resources for the temporary BLOBs might stay allocated.
 	 */
+	@Override
 	void close();
 
 }
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
index 5399cf9c91..d67f00685a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/OracleLobHandler.java
@@ -211,6 +211,7 @@ public class OracleLobHandler extends AbstractLobHandler {
 	}
 
 
+	@Override
 	public byte[] getBlobAsBytes(ResultSet rs, int columnIndex) throws SQLException {
 		logger.debug("Returning Oracle BLOB as bytes");
 		Blob blob = rs.getBlob(columnIndex);
@@ -220,6 +221,7 @@ public class OracleLobHandler extends AbstractLobHandler {
 		return retVal;
 	}
 
+	@Override
 	public InputStream getBlobAsBinaryStream(ResultSet rs, int columnIndex) throws SQLException {
 		logger.debug("Returning Oracle BLOB as binary stream");
 		Blob blob = rs.getBlob(columnIndex);
@@ -229,6 +231,7 @@ public class OracleLobHandler extends AbstractLobHandler {
 		return retVal;
 	}
 
+	@Override
 	public String getClobAsString(ResultSet rs, int columnIndex) throws SQLException {
 		logger.debug("Returning Oracle CLOB as string");
 		Clob clob = rs.getClob(columnIndex);
@@ -238,6 +241,7 @@ public class OracleLobHandler extends AbstractLobHandler {
 		return retVal;
 	}
 
+	@Override
 	public InputStream getClobAsAsciiStream(ResultSet rs, int columnIndex) throws SQLException {
 		logger.debug("Returning Oracle CLOB as ASCII stream");
 		Clob clob = rs.getClob(columnIndex);
@@ -247,6 +251,7 @@ public class OracleLobHandler extends AbstractLobHandler {
 		return retVal;
 	}
 
+	@Override
 	public Reader getClobAsCharacterStream(ResultSet rs, int columnIndex) throws SQLException {
 		logger.debug("Returning Oracle CLOB as character stream");
 		Clob clob = rs.getClob(columnIndex);
@@ -256,6 +261,7 @@ public class OracleLobHandler extends AbstractLobHandler {
 		return retVal;
 	}
 
+	@Override
 	public LobCreator getLobCreator() {
 		return new OracleLobCreator();
 	}
@@ -368,11 +374,13 @@ public class OracleLobHandler extends AbstractLobHandler {
 
 		private final List createdLobs = new LinkedList();
 
+		@Override
 		public void setBlobAsBytes(PreparedStatement ps, int paramIndex, final byte[] content)
 				throws SQLException {
 
 			if (content != null) {
 				Blob blob = (Blob) createLob(ps, false, new LobCallback() {
+					@Override
 					public void populateLob(Object lob) throws Exception {
 						Method methodToInvoke = lob.getClass().getMethod("getBinaryOutputStream");
 						OutputStream out = (OutputStream) methodToInvoke.invoke(lob);
@@ -390,12 +398,14 @@ public class OracleLobHandler extends AbstractLobHandler {
 			}
 		}
 
+		@Override
 		public void setBlobAsBinaryStream(
 				PreparedStatement ps, int paramIndex, final InputStream binaryStream, int contentLength)
 				throws SQLException {
 
 			if (binaryStream != null) {
 				Blob blob = (Blob) createLob(ps, false, new LobCallback() {
+					@Override
 					public void populateLob(Object lob) throws Exception {
 						Method methodToInvoke = lob.getClass().getMethod("getBinaryOutputStream", (Class[]) null);
 						OutputStream out = (OutputStream) methodToInvoke.invoke(lob, (Object[]) null);
@@ -413,11 +423,13 @@ public class OracleLobHandler extends AbstractLobHandler {
 			}
 		}
 
+		@Override
 		public void setClobAsString(PreparedStatement ps, int paramIndex, final String content)
 			throws SQLException {
 
 			if (content != null) {
 				Clob clob = (Clob) createLob(ps, true, new LobCallback() {
+					@Override
 					public void populateLob(Object lob) throws Exception {
 						Method methodToInvoke = lob.getClass().getMethod("getCharacterOutputStream", (Class[]) null);
 						Writer writer = (Writer) methodToInvoke.invoke(lob, (Object[]) null);
@@ -435,12 +447,14 @@ public class OracleLobHandler extends AbstractLobHandler {
 			}
 		}
 
+		@Override
 		public void setClobAsAsciiStream(
 				PreparedStatement ps, int paramIndex, final InputStream asciiStream, int contentLength)
 			throws SQLException {
 
 			if (asciiStream != null) {
 				Clob clob = (Clob) createLob(ps, true, new LobCallback() {
+					@Override
 					public void populateLob(Object lob) throws Exception {
 						Method methodToInvoke = lob.getClass().getMethod("getAsciiOutputStream", (Class[]) null);
 						OutputStream out = (OutputStream) methodToInvoke.invoke(lob, (Object[]) null);
@@ -458,12 +472,14 @@ public class OracleLobHandler extends AbstractLobHandler {
 			}
 		}
 
+		@Override
 		public void setClobAsCharacterStream(
 				PreparedStatement ps, int paramIndex, final Reader characterStream, int contentLength)
 			throws SQLException {
 
 			if (characterStream != null) {
 				Clob clob = (Clob) createLob(ps, true, new LobCallback() {
+					@Override
 					public void populateLob(Object lob) throws Exception {
 						Method methodToInvoke = lob.getClass().getMethod("getCharacterOutputStream", (Class[]) null);
 						Writer writer = (Writer) methodToInvoke.invoke(lob, (Object[]) null);
@@ -554,6 +570,7 @@ public class OracleLobHandler extends AbstractLobHandler {
 		/**
 		 * Free all temporary BLOBs and CLOBs created by this creator.
 		 */
+		@Override
 		public void close() {
 			try {
 				for (Iterator it = this.createdLobs.iterator(); it.hasNext();) {
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
index 822b3e48cd..8a6bdbccd5 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
@@ -49,47 +49,58 @@ class PassThroughBlob implements Blob {
 	}
 
 
+	@Override
 	public long length() throws SQLException {
 		return this.contentLength;
 	}
 
+	@Override
 	public InputStream getBinaryStream() throws SQLException {
 		return (this.content != null ? new ByteArrayInputStream(this.content) : this.binaryStream);
 	}
 
 
+	@Override
 	public InputStream getBinaryStream(long pos, long length) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public OutputStream setBinaryStream(long pos) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public byte[] getBytes(long pos, int length) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public int setBytes(long pos, byte[] bytes) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public int setBytes(long pos, byte[] bytes, int offset, int len) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public long position(byte pattern[], long start) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public long position(Blob pattern, long start) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void truncate(long len) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void free() throws SQLException {
 		// no-op
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
index 1effc342b0..be2d61bcd2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
@@ -64,10 +64,12 @@ class PassThroughClob implements Clob {
 	}
 
 
+	@Override
 	public long length() throws SQLException {
 		return this.contentLength;
 	}
 
+	@Override
 	public Reader getCharacterStream() throws SQLException {
 		try {
 			if (this.content != null) {
@@ -85,6 +87,7 @@ class PassThroughClob implements Clob {
 		}
 	}
 
+	@Override
 	public InputStream getAsciiStream() throws SQLException {
 		try {
 			if (this.content != null) {
@@ -107,42 +110,52 @@ class PassThroughClob implements Clob {
 	}
 
 
+	@Override
 	public Reader getCharacterStream(long pos, long length) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Writer setCharacterStream(long pos) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public OutputStream setAsciiStream(long pos) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public String getSubString(long pos, int length) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public int setString(long pos, String str) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public int setString(long pos, String str, int offset, int len) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public long position(String searchstr, long start) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public long position(Clob searchstr, long start) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void truncate(long len) throws SQLException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void free() throws SQLException {
 		// no-op
 	}
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java
index 2614338bec..60d859b715 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java
@@ -61,6 +61,7 @@ public abstract class NativeJdbcExtractorAdapter implements NativeJdbcExtractor
 	/**
 	 * Return {@code false} by default.
 	 */
+	@Override
 	public boolean isNativeConnectionNecessaryForNativeStatements() {
 		return false;
 	}
@@ -68,6 +69,7 @@ public abstract class NativeJdbcExtractorAdapter implements NativeJdbcExtractor
 	/**
 	 * Return {@code false} by default.
 	 */
+	@Override
 	public boolean isNativeConnectionNecessaryForNativePreparedStatements() {
 		return false;
 	}
@@ -75,6 +77,7 @@ public abstract class NativeJdbcExtractorAdapter implements NativeJdbcExtractor
 	/**
 	 * Return {@code false} by default.
 	 */
+	@Override
 	public boolean isNativeConnectionNecessaryForNativeCallableStatements() {
 		return false;
 	}
@@ -91,6 +94,7 @@ public abstract class NativeJdbcExtractorAdapter implements NativeJdbcExtractor
 	 * @see org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy
 	 * @see org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy
 	 */
+	@Override
 	public Connection getNativeConnection(Connection con) throws SQLException {
 		if (con == null) {
 			return null;
@@ -128,6 +132,7 @@ public abstract class NativeJdbcExtractorAdapter implements NativeJdbcExtractor
 	 * @see #getNativeConnection
 	 * @see Statement#getConnection
 	 */
+	@Override
 	public Connection getNativeConnectionFromStatement(Statement stmt) throws SQLException {
 		if (stmt == null) {
 			return null;
@@ -138,6 +143,7 @@ public abstract class NativeJdbcExtractorAdapter implements NativeJdbcExtractor
 	/**
 	 * Not able to unwrap: return passed-in Statement.
 	 */
+	@Override
 	public Statement getNativeStatement(Statement stmt) throws SQLException {
 		return stmt;
 	}
@@ -145,6 +151,7 @@ public abstract class NativeJdbcExtractorAdapter implements NativeJdbcExtractor
 	/**
 	 * Not able to unwrap: return passed-in PreparedStatement.
 	 */
+	@Override
 	public PreparedStatement getNativePreparedStatement(PreparedStatement ps) throws SQLException {
 		return ps;
 	}
@@ -152,6 +159,7 @@ public abstract class NativeJdbcExtractorAdapter implements NativeJdbcExtractor
 	/**
 	 * Not able to unwrap: return passed-in CallableStatement.
 	 */
+	@Override
 	public CallableStatement getNativeCallableStatement(CallableStatement cs) throws SQLException {
 		return cs;
 	}
@@ -159,6 +167,7 @@ public abstract class NativeJdbcExtractorAdapter implements NativeJdbcExtractor
 	/**
 	 * Not able to unwrap: return passed-in ResultSet.
 	 */
+	@Override
 	public ResultSet getNativeResultSet(ResultSet rs) throws SQLException {
 		return rs;
 	}
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..96d66dfbfd 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
@@ -125,6 +125,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSetMetaData#getCatalogName(int)
 	 */
+	@Override
 	public final SqlRowSetMetaData getMetaData() {
 		return this.rowSetMetaData;
 	}
@@ -132,6 +133,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#findColumn(String)
 	 */
+	@Override
 	public int findColumn(String columnLabel) throws InvalidResultSetAccessException {
 		Integer columnIndex = this.columnLabelMap.get(columnLabel);
 		if (columnIndex != null) {
@@ -153,6 +155,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getBigDecimal(int)
 	 */
+	@Override
 	public BigDecimal getBigDecimal(int columnIndex) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getBigDecimal(columnIndex);
@@ -165,6 +168,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getBigDecimal(String)
 	 */
+	@Override
 	public BigDecimal getBigDecimal(String columnLabel) throws InvalidResultSetAccessException {
 		return getBigDecimal(findColumn(columnLabel));
 	}
@@ -172,6 +176,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getBoolean(int)
 	 */
+	@Override
 	public boolean getBoolean(int columnIndex) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getBoolean(columnIndex);
@@ -184,6 +189,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getBoolean(String)
 	 */
+	@Override
 	public boolean getBoolean(String columnLabel) throws InvalidResultSetAccessException {
 		return getBoolean(findColumn(columnLabel));
 	}
@@ -191,6 +197,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getByte(int)
 	 */
+	@Override
 	public byte getByte(int columnIndex) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getByte(columnIndex);
@@ -203,6 +210,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getByte(String)
 	 */
+	@Override
 	public byte getByte(String columnLabel) throws InvalidResultSetAccessException {
 		return getByte(findColumn(columnLabel));
 	}
@@ -210,6 +218,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getDate(int, java.util.Calendar)
 	 */
+	@Override
 	public Date getDate(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getDate(columnIndex, cal);
@@ -222,6 +231,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getDate(int)
 	 */
+	@Override
 	public Date getDate(int columnIndex) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getDate(columnIndex);
@@ -233,6 +243,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getDate(String, java.util.Calendar)
 	 */
+	@Override
 	public Date getDate(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
 		return getDate(findColumn(columnLabel), cal);
 	}
@@ -240,6 +251,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getDate(String)
 	 */
+	@Override
 	public Date getDate(String columnLabel) throws InvalidResultSetAccessException {
 		return getDate(findColumn(columnLabel));
 	}
@@ -247,6 +259,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getDouble(int)
 	 */
+	@Override
 	public double getDouble(int columnIndex) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getDouble(columnIndex);
@@ -259,6 +272,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getDouble(String)
 	 */
+	@Override
 	public double getDouble(String columnLabel) throws InvalidResultSetAccessException {
 		return getDouble(findColumn(columnLabel));
 	}
@@ -266,6 +280,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getFloat(int)
 	 */
+	@Override
 	public float getFloat(int columnIndex) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getFloat(columnIndex);
@@ -278,12 +293,14 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getFloat(String)
 	 */
+	@Override
 	public float getFloat(String columnLabel) throws InvalidResultSetAccessException {
 		return getFloat(findColumn(columnLabel));
 	}
 	/**
 	 * @see java.sql.ResultSet#getInt(int)
 	 */
+	@Override
 	public int getInt(int columnIndex) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getInt(columnIndex);
@@ -296,6 +313,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getInt(String)
 	 */
+	@Override
 	public int getInt(String columnLabel) throws InvalidResultSetAccessException {
 		return getInt(findColumn(columnLabel));
 	}
@@ -303,6 +321,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getLong(int)
 	 */
+	@Override
 	public long getLong(int columnIndex) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getLong(columnIndex);
@@ -315,6 +334,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getLong(String)
 	 */
+	@Override
 	public long getLong(String columnLabel) throws InvalidResultSetAccessException {
 		return getLong(findColumn(columnLabel));
 	}
@@ -322,6 +342,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getObject(int, java.util.Map)
 	 */
+	@Override
 	public Object getObject(int i,  Map<String, Class<?>> map) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getObject(i, map);
@@ -334,6 +355,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getObject(int)
 	 */
+	@Override
 	public Object getObject(int columnIndex) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getObject(columnIndex);
@@ -346,6 +368,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getObject(String, java.util.Map)
 	 */
+	@Override
 	public Object getObject(String columnLabel,  Map<String, Class<?>> map) throws InvalidResultSetAccessException {
 		return getObject(findColumn(columnLabel), map);
 	}
@@ -353,6 +376,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getObject(String)
 	 */
+	@Override
 	public Object getObject(String columnLabel) throws InvalidResultSetAccessException {
 		return getObject(findColumn(columnLabel));
 	}
@@ -360,6 +384,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getShort(int)
 	 */
+	@Override
 	public short getShort(int columnIndex) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getShort(columnIndex);
@@ -372,6 +397,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getShort(String)
 	 */
+	@Override
 	public short getShort(String columnLabel) throws InvalidResultSetAccessException {
 		return getShort(findColumn(columnLabel));
 	}
@@ -379,6 +405,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getString(int)
 	 */
+	@Override
 	public String getString(int columnIndex) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getString(columnIndex);
@@ -391,6 +418,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getString(String)
 	 */
+	@Override
 	public String getString(String columnLabel) throws InvalidResultSetAccessException {
 		return getString(findColumn(columnLabel));
 	}
@@ -398,6 +426,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getTime(int, java.util.Calendar)
 	 */
+	@Override
 	public Time getTime(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getTime(columnIndex, cal);
@@ -410,6 +439,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getTime(int)
 	 */
+	@Override
 	public Time getTime(int columnIndex) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getTime(columnIndex);
@@ -422,6 +452,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getTime(String, java.util.Calendar)
 	 */
+	@Override
 	public Time getTime(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
 		return getTime(findColumn(columnLabel), cal);
 	}
@@ -429,6 +460,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getTime(String)
 	 */
+	@Override
 	public Time getTime(String columnLabel) throws InvalidResultSetAccessException {
 		return getTime(findColumn(columnLabel));
 	}
@@ -436,6 +468,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getTimestamp(int, java.util.Calendar)
 	 */
+	@Override
 	public Timestamp getTimestamp(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getTimestamp(columnIndex, cal);
@@ -448,6 +481,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getTimestamp(int)
 	 */
+	@Override
 	public Timestamp getTimestamp(int columnIndex) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getTimestamp(columnIndex);
@@ -460,6 +494,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getTimestamp(String, java.util.Calendar)
 	 */
+	@Override
 	public Timestamp getTimestamp(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
 		return getTimestamp(findColumn(columnLabel), cal);
 	}
@@ -467,6 +502,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getTimestamp(String)
 	 */
+	@Override
 	public Timestamp getTimestamp(String columnLabel) throws InvalidResultSetAccessException {
 		return getTimestamp(findColumn(columnLabel));
 	}
@@ -477,6 +513,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#absolute(int)
 	 */
+	@Override
 	public boolean absolute(int row) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.absolute(row);
@@ -489,6 +526,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#afterLast()
 	 */
+	@Override
 	public void afterLast() throws InvalidResultSetAccessException {
 		try {
 			this.resultSet.afterLast();
@@ -501,6 +539,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#beforeFirst()
 	 */
+	@Override
 	public void beforeFirst() throws InvalidResultSetAccessException {
 		try {
 			this.resultSet.beforeFirst();
@@ -513,6 +552,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#first()
 	 */
+	@Override
 	public boolean first() throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.first();
@@ -525,6 +565,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#getRow()
 	 */
+	@Override
 	public int getRow() throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.getRow();
@@ -537,6 +578,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#isAfterLast()
 	 */
+	@Override
 	public boolean isAfterLast() throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.isAfterLast();
@@ -549,6 +591,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#isBeforeFirst()
 	 */
+	@Override
 	public boolean isBeforeFirst() throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.isBeforeFirst();
@@ -561,6 +604,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#isFirst()
 	 */
+	@Override
 	public boolean isFirst() throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.isFirst();
@@ -573,6 +617,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#isLast()
 	 */
+	@Override
 	public boolean isLast() throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.isLast();
@@ -585,6 +630,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#last()
 	 */
+	@Override
 	public boolean last() throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.last();
@@ -597,6 +643,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#next()
 	 */
+	@Override
 	public boolean next() throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.next();
@@ -609,6 +656,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#previous()
 	 */
+	@Override
 	public boolean previous() throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.previous();
@@ -621,6 +669,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#relative(int)
 	 */
+	@Override
 	public boolean relative(int rows) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.relative(rows);
@@ -633,6 +682,7 @@ public class ResultSetWrappingSqlRowSet implements SqlRowSet {
 	/**
 	 * @see java.sql.ResultSet#wasNull()
 	 */
+	@Override
 	public boolean wasNull() throws InvalidResultSetAccessException {
 		try {
 			return this.resultSet.wasNull();
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..cf5f83dac5 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
@@ -55,6 +55,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 	}
 
 
+	@Override
 	public String getCatalogName(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.getCatalogName(column);
@@ -64,6 +65,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public String getColumnClassName(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.getColumnClassName(column);
@@ -73,6 +75,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public int getColumnCount() throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.getColumnCount();
@@ -82,6 +85,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public String[] getColumnNames() throws InvalidResultSetAccessException {
 		if (this.columnNames == null) {
 			this.columnNames = new String[getColumnCount()];
@@ -92,6 +96,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		return this.columnNames;
 	}
 
+	@Override
 	public int getColumnDisplaySize(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.getColumnDisplaySize(column);
@@ -101,6 +106,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public String getColumnLabel(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.getColumnLabel(column);
@@ -110,6 +116,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public String getColumnName(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.getColumnName(column);
@@ -119,6 +126,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public int getColumnType(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.getColumnType(column);
@@ -128,6 +136,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public String getColumnTypeName(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.getColumnTypeName(column);
@@ -137,6 +146,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public int getPrecision(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.getPrecision(column);
@@ -146,6 +156,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public int getScale(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.getScale(column);
@@ -155,6 +166,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public String getSchemaName(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.getSchemaName(column);
@@ -164,6 +176,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public String getTableName(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.getTableName(column);
@@ -173,6 +186,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public boolean isCaseSensitive(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.isCaseSensitive(column);
@@ -182,6 +196,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public boolean isCurrency(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.isCurrency(column);
@@ -191,6 +206,7 @@ public class ResultSetWrappingSqlRowSetMetaData implements SqlRowSetMetaData {
 		}
 	}
 
+	@Override
 	public boolean isSigned(int column) throws InvalidResultSetAccessException {
 		try {
 			return this.resultSetMetaData.isSigned(column);
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..ed9d66190c 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
@@ -50,35 +50,43 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler {
 	// Convenience methods for accessing XML content
 	//-------------------------------------------------------------------------
 
+	@Override
 	public String getXmlAsString(ResultSet rs, String columnName) throws SQLException {
 		return rs.getSQLXML(columnName).getString();
 	}
 
+	@Override
 	public String getXmlAsString(ResultSet rs, int columnIndex) throws SQLException {
 		return rs.getSQLXML(columnIndex).getString();
 	}
 
+	@Override
 	public InputStream getXmlAsBinaryStream(ResultSet rs, String columnName) throws SQLException {
 		return rs.getSQLXML(columnName).getBinaryStream();
 	}
 
+	@Override
 	public InputStream getXmlAsBinaryStream(ResultSet rs, int columnIndex) throws SQLException {
 		return rs.getSQLXML(columnIndex).getBinaryStream();
 	}
 
+	@Override
 	public Reader getXmlAsCharacterStream(ResultSet rs, String columnName) throws SQLException {
 		return rs.getSQLXML(columnName).getCharacterStream();
 	}
 
+	@Override
 	public Reader getXmlAsCharacterStream(ResultSet rs, int columnIndex) throws SQLException {
 		return rs.getSQLXML(columnIndex).getCharacterStream();
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Source getXmlAsSource(ResultSet rs, String columnName, Class sourceClass) throws SQLException {
 		return rs.getSQLXML(columnName).getSource(sourceClass != null ? sourceClass : DOMSource.class);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Source getXmlAsSource(ResultSet rs, int columnIndex, Class sourceClass) throws SQLException {
 		return rs.getSQLXML(columnIndex).getSource(sourceClass != null ? sourceClass : DOMSource.class);
@@ -89,6 +97,7 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler {
 	// Convenience methods for building XML content
 	//-------------------------------------------------------------------------
 
+	@Override
 	public SqlXmlValue newSqlXmlValue(final String value) {
 		return new AbstractJdbc4SqlXmlValue() {
 			@Override
@@ -98,6 +107,7 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler {
 		};
 	}
 
+	@Override
 	public SqlXmlValue newSqlXmlValue(final XmlBinaryStreamProvider provider) {
 		return new AbstractJdbc4SqlXmlValue() {
 			@Override
@@ -107,6 +117,7 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler {
 		};
 	}
 
+	@Override
 	public SqlXmlValue newSqlXmlValue(final XmlCharacterStreamProvider provider) {
 		return new AbstractJdbc4SqlXmlValue() {
 			@Override
@@ -116,6 +127,7 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler {
 		};
 	}
 
+	@Override
 	public SqlXmlValue newSqlXmlValue(final Class resultClass, final XmlResultProvider provider) {
 		return new AbstractJdbc4SqlXmlValue() {
 			@Override
@@ -126,6 +138,7 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler {
 		};
 	}
 
+	@Override
 	public SqlXmlValue newSqlXmlValue(final Document document) {
 		return new AbstractJdbc4SqlXmlValue() {
 			@Override
@@ -143,6 +156,7 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler {
 
 		private SQLXML xmlObject;
 
+		@Override
 		public void setValue(PreparedStatement ps, int paramIndex) throws SQLException {
 			this.xmlObject = ps.getConnection().createSQLXML();
 			try {
@@ -154,6 +168,7 @@ public class Jdbc4SqlXmlHandler implements SqlXmlHandler {
 			ps.setSQLXML(paramIndex, this.xmlObject);
 		}
 
+		@Override
 		public void cleanup() {
 			try {
 				this.xmlObject.free();
diff --git a/spring-jms/src/main/java/org/springframework/jms/JmsException.java b/spring-jms/src/main/java/org/springframework/jms/JmsException.java
index 9da83d02ec..b2d3a6f442 100644
--- a/spring-jms/src/main/java/org/springframework/jms/JmsException.java
+++ b/spring-jms/src/main/java/org/springframework/jms/JmsException.java
@@ -80,6 +80,7 @@ public abstract class JmsException extends NestedRuntimeException {
 	 * if there is one.
 	 * @see javax.jms.JMSException#getLinkedException()
 	 */
+	@Override
 	public String getMessage() {
 		String message = super.getMessage();
 		Throwable cause = getCause();
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
index 9407db27f4..a69e172348 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java
@@ -88,6 +88,7 @@ abstract class AbstractListenerContainerParser implements BeanDefinitionParser {
 	protected static final String PREFETCH_ATTRIBUTE = "prefetch";
 
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		CompositeComponentDefinition compositeDef =
 			new CompositeComponentDefinition(element.getTagName(), parserContext.extractSource(element));
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..327c15b3e9 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
@@ -37,6 +37,7 @@ class JcaListenerContainerParser extends AbstractListenerContainerParser {
 	private static final String ACTIVATION_SPEC_FACTORY_ATTRIBUTE = "activation-spec-factory";
 
 
+	@Override
 	protected BeanDefinition parseContainer(Element listenerEle, Element containerEle, ParserContext parserContext) {
 		RootBeanDefinition containerDef = new RootBeanDefinition();
 		containerDef.setSource(parserContext.extractSource(containerEle));
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..68787b5f05 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
@@ -50,6 +50,7 @@ class JmsListenerContainerParser extends AbstractListenerContainerParser {
 	private static final String RECEIVE_TIMEOUT_ATTRIBUTE = "receive-timeout";
 
 
+	@Override
 	protected BeanDefinition parseContainer(Element listenerEle, Element containerEle, ParserContext parserContext) {
 		RootBeanDefinition containerDef = new RootBeanDefinition();
 		containerDef.setSource(parserContext.extractSource(containerEle));
diff --git a/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java b/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java
index d4642a6bda..7b78bd093b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java
@@ -28,6 +28,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  */
 public class JmsNamespaceHandler extends NamespaceHandlerSupport {
 
+	@Override
 	public void init() {
 		registerBeanDefinitionParser("listener-container", new JmsListenerContainerParser());
 		registerBeanDefinitionParser("jca-listener-container", new JcaListenerContainerParser());
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java
index 83393ec5af..7d138c7cdd 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java
@@ -42,42 +42,52 @@ class CachedMessageConsumer implements MessageConsumer, QueueReceiver, TopicSubs
 	}
 
 
+	@Override
 	public String getMessageSelector() throws JMSException {
 		return this.target.getMessageSelector();
 	}
 
+	@Override
 	public Queue getQueue() throws JMSException {
 		return (this.target instanceof QueueReceiver ? ((QueueReceiver) this.target).getQueue() : null);
 	}
 
+	@Override
 	public Topic getTopic() throws JMSException {
 		return (this.target instanceof TopicSubscriber ? ((TopicSubscriber) this.target).getTopic() : null);
 	}
 
+	@Override
 	public boolean getNoLocal() throws JMSException {
 		return (this.target instanceof TopicSubscriber && ((TopicSubscriber) this.target).getNoLocal());
 	}
 
+	@Override
 	public MessageListener getMessageListener() throws JMSException {
 		return this.target.getMessageListener();
 	}
 
+	@Override
 	public void setMessageListener(MessageListener messageListener) throws JMSException {
 		this.target.setMessageListener(messageListener);
 	}
 
+	@Override
 	public Message receive() throws JMSException {
 		return this.target.receive();
 	}
 
+	@Override
 	public Message receive(long timeout) throws JMSException {
 		return this.target.receive(timeout);
 	}
 
+	@Override
 	public Message receiveNoWait() throws JMSException {
 		return this.target.receiveNoWait();
 	}
 
+	@Override
 	public void close() throws JMSException {
 		// It's a cached MessageConsumer...
 	}
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java
index 34726e78bb..d879e587c7 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java
@@ -55,6 +55,7 @@ class CachedMessageProducer implements MessageProducer, QueueSender, TopicPublis
 	}
 
 
+	@Override
 	public void setDisableMessageID(boolean disableMessageID) throws JMSException {
 		if (this.originalDisableMessageID == null) {
 			this.originalDisableMessageID = Boolean.valueOf(this.target.getDisableMessageID());
@@ -62,10 +63,12 @@ class CachedMessageProducer implements MessageProducer, QueueSender, TopicPublis
 		this.target.setDisableMessageID(disableMessageID);
 	}
 
+	@Override
 	public boolean getDisableMessageID() throws JMSException {
 		return this.target.getDisableMessageID();
 	}
 
+	@Override
 	public void setDisableMessageTimestamp(boolean disableMessageTimestamp) throws JMSException {
 		if (this.originalDisableMessageTimestamp == null) {
 			this.originalDisableMessageTimestamp = Boolean.valueOf(this.target.getDisableMessageTimestamp());
@@ -73,86 +76,107 @@ class CachedMessageProducer implements MessageProducer, QueueSender, TopicPublis
 		this.target.setDisableMessageTimestamp(disableMessageTimestamp);
 	}
 
+	@Override
 	public boolean getDisableMessageTimestamp() throws JMSException {
 		return this.target.getDisableMessageTimestamp();
 	}
 
+	@Override
 	public void setDeliveryMode(int deliveryMode) {
 		this.deliveryMode = deliveryMode;
 	}
 
+	@Override
 	public int getDeliveryMode() {
 		return this.deliveryMode;
 	}
 
+	@Override
 	public void setPriority(int priority) {
 		this.priority = priority;
 	}
 
+	@Override
 	public int getPriority() {
 		return this.priority;
 	}
 
+	@Override
 	public void setTimeToLive(long timeToLive) {
 		this.timeToLive = timeToLive;
 	}
 
+	@Override
 	public long getTimeToLive() {
 		return this.timeToLive;
 	}
 
+	@Override
 	public Destination getDestination() throws JMSException {
 		return this.target.getDestination();
 	}
 
+	@Override
 	public Queue getQueue() throws JMSException {
 		return (Queue) this.target.getDestination();
 	}
 
+	@Override
 	public Topic getTopic() throws JMSException {
 		return (Topic) this.target.getDestination();
 	}
 
+	@Override
 	public void send(Message message) throws JMSException {
 		this.target.send(message, this.deliveryMode, this.priority, this.timeToLive);
 	}
 
+	@Override
 	public void send(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
 		this.target.send(message, deliveryMode, priority, timeToLive);
 	}
 
+	@Override
 	public void send(Destination destination, Message message) throws JMSException {
 		this.target.send(destination, message, this.deliveryMode, this.priority, this.timeToLive);
 	}
 
+	@Override
 	public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
 		this.target.send(destination, message, deliveryMode, priority, timeToLive);
 	}
 
+	@Override
 	public void send(Queue queue, Message message) throws JMSException {
 		this.target.send(queue, message, this.deliveryMode, this.priority, this.timeToLive);
 	}
 
+	@Override
 	public void send(Queue queue, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
 		this.target.send(queue, message, deliveryMode, priority, timeToLive);
 	}
 
+	@Override
 	public void publish(Message message) throws JMSException {
 		this.target.send(message, this.deliveryMode, this.priority, this.timeToLive);
 	}
 
+	@Override
 	public void publish(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
 		this.target.send(message, deliveryMode, priority, timeToLive);
 	}
 
+	@Override
 	public void publish(Topic topic, Message message) throws JMSException {
 		this.target.send(topic, message, this.deliveryMode, this.priority, this.timeToLive);
 	}
 
+	@Override
 	public void publish(Topic topic, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
 		this.target.send(topic, message, deliveryMode, priority, timeToLive);
 	}
 
+	@Override
 	public void close() throws JMSException {
 		// It's a cached MessageProducer... reset properties only.
 		if (this.originalDisableMessageID != null) {
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..9e0229c58e 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
@@ -176,6 +176,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
 	/**
 	 * Resets the Session cache as well.
 	 */
+	@Override
 	public void resetConnection() {
 		this.active = false;
 		synchronized (this.cachedSessions) {
@@ -202,6 +203,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
 	/**
 	 * Checks for a cached Session for the given mode.
 	 */
+	@Override
 	protected Session getSession(Connection con, Integer mode) throws JMSException {
 		LinkedList<Session> sessionList;
 		synchronized (this.cachedSessions) {
@@ -279,6 +281,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory {
 			this.sessionList = sessionList;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			String methodName = method.getName();
 			if (methodName.equals("equals")) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java b/spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java
index fc8f481e4b..d94cdadb63 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java
@@ -52,6 +52,7 @@ public class ChainedExceptionListener implements ExceptionListener {
 	}
 
 
+	@Override
 	public void onException(JMSException ex) {
 		for (ExceptionListener listener : this.delegates) {
 			listener.onException(ex);
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java b/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
index a668a1d62e..72f0497453 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java
@@ -136,18 +136,23 @@ public abstract class ConnectionFactoryUtils {
 			throws JMSException {
 
 		return doGetTransactionalSession(cf, new ResourceFactory() {
+			@Override
 			public Session getSession(JmsResourceHolder holder) {
 				return holder.getSession(Session.class, existingCon);
 			}
+			@Override
 			public Connection getConnection(JmsResourceHolder holder) {
 				return (existingCon != null ? existingCon : holder.getConnection());
 			}
+			@Override
 			public Connection createConnection() throws JMSException {
 				return cf.createConnection();
 			}
+			@Override
 			public Session createSession(Connection con) throws JMSException {
 				return con.createSession(synchedLocalTransactionAllowed, Session.AUTO_ACKNOWLEDGE);
 			}
+			@Override
 			public boolean isSynchedLocalTransactionAllowed() {
 				return synchedLocalTransactionAllowed;
 			}
@@ -173,18 +178,23 @@ public abstract class ConnectionFactoryUtils {
 			throws JMSException {
 
 		return (QueueSession) doGetTransactionalSession(cf, new ResourceFactory() {
+			@Override
 			public Session getSession(JmsResourceHolder holder) {
 				return holder.getSession(QueueSession.class, existingCon);
 			}
+			@Override
 			public Connection getConnection(JmsResourceHolder holder) {
 				return (existingCon != null ? existingCon : holder.getConnection(QueueConnection.class));
 			}
+			@Override
 			public Connection createConnection() throws JMSException {
 				return cf.createQueueConnection();
 			}
+			@Override
 			public Session createSession(Connection con) throws JMSException {
 				return ((QueueConnection) con).createQueueSession(synchedLocalTransactionAllowed, Session.AUTO_ACKNOWLEDGE);
 			}
+			@Override
 			public boolean isSynchedLocalTransactionAllowed() {
 				return synchedLocalTransactionAllowed;
 			}
@@ -210,18 +220,23 @@ public abstract class ConnectionFactoryUtils {
 			throws JMSException {
 
 		return (TopicSession) doGetTransactionalSession(cf, new ResourceFactory() {
+			@Override
 			public Session getSession(JmsResourceHolder holder) {
 				return holder.getSession(TopicSession.class, existingCon);
 			}
+			@Override
 			public Connection getConnection(JmsResourceHolder holder) {
 				return (existingCon != null ? existingCon : holder.getConnection(TopicConnection.class));
 			}
+			@Override
 			public Connection createConnection() throws JMSException {
 				return cf.createTopicConnection();
 			}
+			@Override
 			public Session createSession(Connection con) throws JMSException {
 				return ((TopicConnection) con).createTopicSession(synchedLocalTransactionAllowed, Session.AUTO_ACKNOWLEDGE);
 			}
+			@Override
 			public boolean isSynchedLocalTransactionAllowed() {
 				return synchedLocalTransactionAllowed;
 			}
@@ -395,10 +410,12 @@ public abstract class ConnectionFactoryUtils {
 			this.transacted = transacted;
 		}
 
+		@Override
 		protected boolean shouldReleaseBeforeCompletion() {
 			return !this.transacted;
 		}
 
+		@Override
 		protected void processResourceAfterCommit(JmsResourceHolder resourceHolder) {
 			try {
 				resourceHolder.commitAll();
@@ -408,6 +425,7 @@ public abstract class ConnectionFactoryUtils {
 			}
 		}
 
+		@Override
 		protected void releaseResource(JmsResourceHolder resourceHolder, Object resourceKey) {
 			resourceHolder.closeAll();
 		}
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..85a1a589de 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
@@ -85,6 +85,7 @@ public class DelegatingConnectionFactory
 		this.shouldStopConnections = shouldStopConnections;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getTargetConnectionFactory() == null) {
 			throw new IllegalArgumentException("'targetConnectionFactory' is required");
@@ -92,14 +93,17 @@ public class DelegatingConnectionFactory
 	}
 
 
+	@Override
 	public Connection createConnection() throws JMSException {
 		return getTargetConnectionFactory().createConnection();
 	}
 
+	@Override
 	public Connection createConnection(String username, String password) throws JMSException {
 		return getTargetConnectionFactory().createConnection(username, password);
 	}
 
+	@Override
 	public QueueConnection createQueueConnection() throws JMSException {
 		ConnectionFactory cf = getTargetConnectionFactory();
 		if (cf instanceof QueueConnectionFactory) {
@@ -114,6 +118,7 @@ public class DelegatingConnectionFactory
 		}
 	}
 
+	@Override
 	public QueueConnection createQueueConnection(String username, String password) throws JMSException {
 		ConnectionFactory cf = getTargetConnectionFactory();
 		if (cf instanceof QueueConnectionFactory) {
@@ -128,6 +133,7 @@ public class DelegatingConnectionFactory
 		}
 	}
 
+	@Override
 	public TopicConnection createTopicConnection() throws JMSException {
 		ConnectionFactory cf = getTargetConnectionFactory();
 		if (cf instanceof TopicConnectionFactory) {
@@ -142,6 +148,7 @@ public class DelegatingConnectionFactory
 		}
 	}
 
+	@Override
 	public TopicConnection createTopicConnection(String username, String password) throws JMSException {
 		ConnectionFactory cf = getTargetConnectionFactory();
 		if (cf instanceof TopicConnectionFactory) {
@@ -156,6 +163,7 @@ public class DelegatingConnectionFactory
 		}
 	}
 
+	@Override
 	public boolean shouldStop(Connection con) {
 		return this.shouldStopConnections;
 	}
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..3587b13582 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
@@ -146,6 +146,7 @@ public class JmsTransactionManager extends AbstractPlatformTransactionManager
 	/**
 	 * Make sure the ConnectionFactory has been set.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		if (getConnectionFactory() == null) {
 			throw new IllegalArgumentException("Property 'connectionFactory' is required");
@@ -153,10 +154,12 @@ public class JmsTransactionManager extends AbstractPlatformTransactionManager
 	}
 
 
+	@Override
 	public Object getResourceFactory() {
 		return getConnectionFactory();
 	}
 
+	@Override
 	protected Object doGetTransaction() {
 		JmsTransactionObject txObject = new JmsTransactionObject();
 		txObject.setResourceHolder(
@@ -164,11 +167,13 @@ public class JmsTransactionManager extends AbstractPlatformTransactionManager
 		return txObject;
 	}
 
+	@Override
 	protected boolean isExistingTransaction(Object transaction) {
 		JmsTransactionObject txObject = (JmsTransactionObject) transaction;
 		return (txObject.getResourceHolder() != null);
 	}
 
+	@Override
 	protected void doBegin(Object transaction, TransactionDefinition definition) {
 		if (definition.getIsolationLevel() != TransactionDefinition.ISOLATION_DEFAULT) {
 			throw new InvalidIsolationLevelException("JMS does not support an isolation level concept");
@@ -204,17 +209,20 @@ public class JmsTransactionManager extends AbstractPlatformTransactionManager
 		}
 	}
 
+	@Override
 	protected Object doSuspend(Object transaction) {
 		JmsTransactionObject txObject = (JmsTransactionObject) transaction;
 		txObject.setResourceHolder(null);
 		return TransactionSynchronizationManager.unbindResource(getConnectionFactory());
 	}
 
+	@Override
 	protected void doResume(Object transaction, Object suspendedResources) {
 		JmsResourceHolder conHolder = (JmsResourceHolder) suspendedResources;
 		TransactionSynchronizationManager.bindResource(getConnectionFactory(), conHolder);
 	}
 
+	@Override
 	protected void doCommit(DefaultTransactionStatus status) {
 		JmsTransactionObject txObject = (JmsTransactionObject) status.getTransaction();
 		Session session = txObject.getResourceHolder().getSession();
@@ -232,6 +240,7 @@ public class JmsTransactionManager extends AbstractPlatformTransactionManager
 		}
 	}
 
+	@Override
 	protected void doRollback(DefaultTransactionStatus status) {
 		JmsTransactionObject txObject = (JmsTransactionObject) status.getTransaction();
 		Session session = txObject.getResourceHolder().getSession();
@@ -246,11 +255,13 @@ public class JmsTransactionManager extends AbstractPlatformTransactionManager
 		}
 	}
 
+	@Override
 	protected void doSetRollbackOnly(DefaultTransactionStatus status) {
 		JmsTransactionObject txObject = (JmsTransactionObject) status.getTransaction();
 		txObject.getResourceHolder().setRollbackOnly();
 	}
 
+	@Override
 	protected void doCleanupAfterCompletion(Object transaction) {
 		JmsTransactionObject txObject = (JmsTransactionObject) transaction;
 		TransactionSynchronizationManager.unbindResource(getConnectionFactory());
@@ -302,10 +313,12 @@ public class JmsTransactionManager extends AbstractPlatformTransactionManager
 			return this.resourceHolder;
 		}
 
+		@Override
 		public boolean isRollbackOnly() {
 			return this.resourceHolder.isRollbackOnly();
 		}
 
+		@Override
 		public void flush() {
 			// no-op
 		}
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
index 5d73a3497c..0ba0243708 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java
@@ -100,6 +100,7 @@ public class JmsTransactionManager102 extends JmsTransactionManager {
 	 * the specified destination type: QueueConnectionFactory for queues,
 	 * and TopicConnectionFactory for topics.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
 
@@ -127,6 +128,7 @@ public class JmsTransactionManager102 extends JmsTransactionManager {
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected Connection createConnection() throws JMSException {
 		if (isPubSubDomain()) {
 			return ((TopicConnectionFactory) getConnectionFactory()).createTopicConnection();
@@ -139,6 +141,7 @@ public class JmsTransactionManager102 extends JmsTransactionManager {
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected Session createSession(Connection con) throws JMSException {
 		if (isPubSubDomain()) {
 			return ((TopicConnection) con).createTopicSession(true, Session.AUTO_ACKNOWLEDGE);
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..974c2923fd 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
@@ -212,6 +212,7 @@ public class SingleConnectionFactory
 	/**
 	 * Make sure a Connection or ConnectionFactory has been set.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		if (this.connection == null && getTargetConnectionFactory() == null) {
 			throw new IllegalArgumentException("Connection or 'targetConnectionFactory' is required");
@@ -219,6 +220,7 @@ public class SingleConnectionFactory
 	}
 
 
+	@Override
 	public Connection createConnection() throws JMSException {
 		synchronized (this.connectionMonitor) {
 			if (this.connection == null) {
@@ -228,11 +230,13 @@ public class SingleConnectionFactory
 		}
 	}
 
+	@Override
 	public Connection createConnection(String username, String password) throws JMSException {
 		throw new javax.jms.IllegalStateException(
 				"SingleConnectionFactory does not support custom username and password");
 	}
 
+	@Override
 	public QueueConnection createQueueConnection() throws JMSException {
 		Connection con;
 		synchronized (this.connectionMonitor) {
@@ -246,11 +250,13 @@ public class SingleConnectionFactory
 		return ((QueueConnection) con);
 	}
 
+	@Override
 	public QueueConnection createQueueConnection(String username, String password) throws JMSException {
 		throw new javax.jms.IllegalStateException(
 				"SingleConnectionFactory does not support custom username and password");
 	}
 
+	@Override
 	public TopicConnection createTopicConnection() throws JMSException {
 		Connection con;
 		synchronized (this.connectionMonitor) {
@@ -264,6 +270,7 @@ public class SingleConnectionFactory
 		return ((TopicConnection) con);
 	}
 
+	@Override
 	public TopicConnection createTopicConnection(String username, String password) throws JMSException {
 		throw new javax.jms.IllegalStateException(
 				"SingleConnectionFactory does not support custom username and password");
@@ -297,6 +304,7 @@ public class SingleConnectionFactory
 	/**
 	 * Exception listener callback that renews the underlying single Connection.
 	 */
+	@Override
 	public void onException(JMSException ex) {
 		logger.warn("Encountered a JMSException - resetting the underlying JMS Connection", ex);
 		resetConnection();
@@ -308,6 +316,7 @@ public class SingleConnectionFactory
 	 * <p>As this bean implements DisposableBean, a bean factory will
 	 * automatically invoke this on destruction of its cached singletons.
 	 */
+	@Override
 	public void destroy() {
 		resetConnection();
 	}
@@ -469,6 +478,7 @@ public class SingleConnectionFactory
 			this.target = target;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			if (method.getName().equals("equals")) {
 				// Only consider equal when proxies are identical.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java
index b9097d06a1..e832baa960 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java
@@ -93,6 +93,7 @@ public class SingleConnectionFactory102 extends SingleConnectionFactory {
 	 * the specified destination type: QueueConnectionFactory for queues,
 	 * TopicConnectionFactory for topics.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
 
@@ -119,6 +120,7 @@ public class SingleConnectionFactory102 extends SingleConnectionFactory {
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected Connection doCreateConnection() throws JMSException {
 		if (isPubSubDomain()) {
 			return ((TopicConnectionFactory) getTargetConnectionFactory()).createTopicConnection();
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java b/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
index ccacc0df0b..de2b64c1fa 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java
@@ -136,16 +136,19 @@ public class TransactionAwareConnectionFactoryProxy
 	}
 
 
+	@Override
 	public Connection createConnection() throws JMSException {
 		Connection targetConnection = this.targetConnectionFactory.createConnection();
 		return getTransactionAwareConnectionProxy(targetConnection);
 	}
 
+	@Override
 	public Connection createConnection(String username, String password) throws JMSException {
 		Connection targetConnection = this.targetConnectionFactory.createConnection(username, password);
 		return getTransactionAwareConnectionProxy(targetConnection);
 	}
 
+	@Override
 	public QueueConnection createQueueConnection() throws JMSException {
 		if (!(this.targetConnectionFactory instanceof QueueConnectionFactory)) {
 			throw new javax.jms.IllegalStateException("'targetConnectionFactory' is no QueueConnectionFactory");
@@ -155,6 +158,7 @@ public class TransactionAwareConnectionFactoryProxy
 		return (QueueConnection) getTransactionAwareConnectionProxy(targetConnection);
 	}
 
+	@Override
 	public QueueConnection createQueueConnection(String username, String password) throws JMSException {
 		if (!(this.targetConnectionFactory instanceof QueueConnectionFactory)) {
 			throw new javax.jms.IllegalStateException("'targetConnectionFactory' is no QueueConnectionFactory");
@@ -164,6 +168,7 @@ public class TransactionAwareConnectionFactoryProxy
 		return (QueueConnection) getTransactionAwareConnectionProxy(targetConnection);
 	}
 
+	@Override
 	public TopicConnection createTopicConnection() throws JMSException {
 		if (!(this.targetConnectionFactory instanceof TopicConnectionFactory)) {
 			throw new javax.jms.IllegalStateException("'targetConnectionFactory' is no TopicConnectionFactory");
@@ -173,6 +178,7 @@ public class TransactionAwareConnectionFactoryProxy
 		return (TopicConnection) getTransactionAwareConnectionProxy(targetConnection);
 	}
 
+	@Override
 	public TopicConnection createTopicConnection(String username, String password) throws JMSException {
 		if (!(this.targetConnectionFactory instanceof TopicConnectionFactory)) {
 			throw new javax.jms.IllegalStateException("'targetConnectionFactory' is no TopicConnectionFactory");
@@ -216,6 +222,7 @@ public class TransactionAwareConnectionFactoryProxy
 			this.target = target;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on ConnectionProxy interface coming in...
 
@@ -288,6 +295,7 @@ public class TransactionAwareConnectionFactoryProxy
 			this.target = target;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on SessionProxy interface coming in...
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
index 2d1cc49b27..83ec1aa55e 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java
@@ -104,6 +104,7 @@ public class UserCredentialsConnectionFactoryAdapter
 		this.password = password;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.targetConnectionFactory == null) {
 			throw new IllegalArgumentException("Property 'targetConnectionFactory' is required");
@@ -141,6 +142,7 @@ public class UserCredentialsConnectionFactoryAdapter
 	 * username and password (i.e. values of the bean properties) else.
 	 * @see #doCreateConnection
 	 */
+	@Override
 	public final Connection createConnection() throws JMSException {
 		JmsUserCredentials threadCredentials = this.threadBoundCredentials.get();
 		if (threadCredentials != null) {
@@ -154,6 +156,7 @@ public class UserCredentialsConnectionFactoryAdapter
 	/**
 	 * Delegate the call straight to the target ConnectionFactory.
 	 */
+	@Override
 	public Connection createConnection(String username, String password) throws JMSException {
 		return doCreateConnection(username, password);
 	}
@@ -186,6 +189,7 @@ public class UserCredentialsConnectionFactoryAdapter
 	 * username and password (i.e. values of the bean properties) else.
 	 * @see #doCreateQueueConnection
 	 */
+	@Override
 	public final QueueConnection createQueueConnection() throws JMSException {
 		JmsUserCredentials threadCredentials = this.threadBoundCredentials.get();
 		if (threadCredentials != null) {
@@ -199,6 +203,7 @@ public class UserCredentialsConnectionFactoryAdapter
 	/**
 	 * Delegate the call straight to the target QueueConnectionFactory.
 	 */
+	@Override
 	public QueueConnection createQueueConnection(String username, String password) throws JMSException {
 		return doCreateQueueConnection(username, password);
 	}
@@ -235,6 +240,7 @@ public class UserCredentialsConnectionFactoryAdapter
 	 * username and password (i.e. values of the bean properties) else.
 	 * @see #doCreateTopicConnection
 	 */
+	@Override
 	public final TopicConnection createTopicConnection() throws JMSException {
 		JmsUserCredentials threadCredentials = this.threadBoundCredentials.get();
 		if (threadCredentials != null) {
@@ -248,6 +254,7 @@ public class UserCredentialsConnectionFactoryAdapter
 	/**
 	 * Delegate the call straight to the target TopicConnectionFactory.
 	 */
+	@Override
 	public TopicConnection createTopicConnection(String username, String password) throws JMSException {
 		return doCreateTopicConnection(username, password);
 	}
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..4f8d0e17af 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
@@ -427,6 +427,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	// JmsOperations execute methods
 	//-------------------------------------------------------------------------
 
+	@Override
 	public <T> T execute(SessionCallback<T> action) throws JmsException {
 		return execute(action, false);
 	}
@@ -474,6 +475,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 		}
 	}
 
+	@Override
 	public <T> T execute(ProducerCallback<T> action) throws JmsException {
 		String defaultDestinationName = getDefaultDestinationName();
 		if (defaultDestinationName != null) {
@@ -484,9 +486,11 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 		}
 	}
 
+	@Override
 	public <T> T execute(final Destination destination, final ProducerCallback<T> action) throws JmsException {
 		Assert.notNull(action, "Callback object must not be null");
 		return execute(new SessionCallback<T>() {
+			@Override
 			public T doInJms(Session session) throws JMSException {
 				MessageProducer producer = createProducer(session, destination);
 				try {
@@ -499,9 +503,11 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 		}, false);
 	}
 
+	@Override
 	public <T> T execute(final String destinationName, final ProducerCallback<T> action) throws JmsException {
 		Assert.notNull(action, "Callback object must not be null");
 		return execute(new SessionCallback<T>() {
+			@Override
 			public T doInJms(Session session) throws JMSException {
 				Destination destination = resolveDestinationName(session, destinationName);
 				MessageProducer producer = createProducer(session, destination);
@@ -520,6 +526,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	// Convenience methods for sending messages
 	//-------------------------------------------------------------------------
 
+	@Override
 	public void send(MessageCreator messageCreator) throws JmsException {
 		Destination defaultDestination = getDefaultDestination();
 		if (defaultDestination != null) {
@@ -530,8 +537,10 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 		}
 	}
 
+	@Override
 	public void send(final Destination destination, final MessageCreator messageCreator) throws JmsException {
 		execute(new SessionCallback<Object>() {
+			@Override
 			public Object doInJms(Session session) throws JMSException {
 				doSend(session, destination, messageCreator);
 				return null;
@@ -539,8 +548,10 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 		}, false);
 	}
 
+	@Override
 	public void send(final String destinationName, final MessageCreator messageCreator) throws JmsException {
 		execute(new SessionCallback<Object>() {
+			@Override
 			public Object doInJms(Session session) throws JMSException {
 				Destination destination = resolveDestinationName(session, destinationName);
 				doSend(session, destination, messageCreator);
@@ -598,6 +609,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	// Convenience methods for sending auto-converted messages
 	//-------------------------------------------------------------------------
 
+	@Override
 	public void convertAndSend(Object message) throws JmsException {
 		Destination defaultDestination = getDefaultDestination();
 		if (defaultDestination != null) {
@@ -608,22 +620,27 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 		}
 	}
 
+	@Override
 	public void convertAndSend(Destination destination, final Object message) throws JmsException {
 		send(destination, new MessageCreator() {
+			@Override
 			public Message createMessage(Session session) throws JMSException {
 				return getRequiredMessageConverter().toMessage(message, session);
 			}
 		});
 	}
 
+	@Override
 	public void convertAndSend(String destinationName, final Object message) throws JmsException {
 		send(destinationName, new MessageCreator() {
+			@Override
 			public Message createMessage(Session session) throws JMSException {
 				return getRequiredMessageConverter().toMessage(message, session);
 			}
 		});
 	}
 
+	@Override
 	public void convertAndSend(Object message, MessagePostProcessor postProcessor) throws JmsException {
 		Destination defaultDestination = getDefaultDestination();
 		if (defaultDestination != null) {
@@ -634,11 +651,13 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 		}
 	}
 
+	@Override
 	public void convertAndSend(
 			Destination destination, final Object message, final MessagePostProcessor postProcessor)
 			throws JmsException {
 
 		send(destination, new MessageCreator() {
+			@Override
 			public Message createMessage(Session session) throws JMSException {
 				Message msg = getRequiredMessageConverter().toMessage(message, session);
 				return postProcessor.postProcessMessage(msg);
@@ -646,11 +665,13 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 		});
 	}
 
+	@Override
 	public void convertAndSend(
 			String destinationName, final Object message, final MessagePostProcessor postProcessor)
 		throws JmsException {
 
 		send(destinationName, new MessageCreator() {
+			@Override
 			public Message createMessage(Session session) throws JMSException {
 				Message msg = getRequiredMessageConverter().toMessage(message, session);
 				return postProcessor.postProcessMessage(msg);
@@ -663,6 +684,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	// Convenience methods for receiving messages
 	//-------------------------------------------------------------------------
 
+	@Override
 	public Message receive() throws JmsException {
 		Destination defaultDestination = getDefaultDestination();
 		if (defaultDestination != null) {
@@ -673,14 +695,17 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 		}
 	}
 
+	@Override
 	public Message receive(Destination destination) throws JmsException {
 		return receiveSelected(destination, null);
 	}
 
+	@Override
 	public Message receive(String destinationName) throws JmsException {
 		return receiveSelected(destinationName, null);
 	}
 
+	@Override
 	public Message receiveSelected(String messageSelector) throws JmsException {
 		Destination defaultDestination = getDefaultDestination();
 		if (defaultDestination != null) {
@@ -691,16 +716,20 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 		}
 	}
 
+	@Override
 	public Message receiveSelected(final Destination destination, final String messageSelector) throws JmsException {
 		return execute(new SessionCallback<Message>() {
+			@Override
 			public Message doInJms(Session session) throws JMSException {
 				return doReceive(session, destination, messageSelector);
 			}
 		}, true);
 	}
 
+	@Override
 	public Message receiveSelected(final String destinationName, final String messageSelector) throws JmsException {
 		return execute(new SessionCallback<Message>() {
+			@Override
 			public Message doInJms(Session session) throws JMSException {
 				Destination destination = resolveDestinationName(session, destinationName);
 				return doReceive(session, destination, messageSelector);
@@ -783,26 +812,32 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	// Convenience methods for receiving auto-converted messages
 	//-------------------------------------------------------------------------
 
+	@Override
 	public Object receiveAndConvert() throws JmsException {
 		return doConvertFromMessage(receive());
 	}
 
+	@Override
 	public Object receiveAndConvert(Destination destination) throws JmsException {
 		return doConvertFromMessage(receive(destination));
 	}
 
+	@Override
 	public Object receiveAndConvert(String destinationName) throws JmsException {
 		return doConvertFromMessage(receive(destinationName));
 	}
 
+	@Override
 	public Object receiveSelectedAndConvert(String messageSelector) throws JmsException {
 		return doConvertFromMessage(receiveSelected(messageSelector));
 	}
 
+	@Override
 	public Object receiveSelectedAndConvert(Destination destination, String messageSelector) throws JmsException {
 		return doConvertFromMessage(receiveSelected(destination, messageSelector));
 	}
 
+	@Override
 	public Object receiveSelectedAndConvert(String destinationName, String messageSelector) throws JmsException {
 		return doConvertFromMessage(receiveSelected(destinationName, messageSelector));
 	}
@@ -829,6 +864,7 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	// Convenience methods for browsing messages
 	//-------------------------------------------------------------------------
 
+	@Override
 	public <T> T browse(BrowserCallback<T> action) throws JmsException {
 		Queue defaultQueue = getDefaultQueue();
 		if (defaultQueue != null) {
@@ -839,14 +875,17 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 		}
 	}
 
+	@Override
 	public <T> T browse(Queue queue, BrowserCallback<T> action) throws JmsException {
 		return browseSelected(queue, null, action);
 	}
 
+	@Override
 	public <T> T browse(String queueName, BrowserCallback<T> action) throws JmsException {
 		return browseSelected(queueName, null, action);
 	}
 
+	@Override
 	public <T> T browseSelected(String messageSelector, BrowserCallback<T> action) throws JmsException {
 		Queue defaultQueue = getDefaultQueue();
 		if (defaultQueue != null) {
@@ -857,11 +896,13 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 		}
 	}
 
+	@Override
 	public <T> T browseSelected(final Queue queue, final String messageSelector, final BrowserCallback<T> action)
 			throws JmsException {
 
 		Assert.notNull(action, "Callback object must not be null");
 		return execute(new SessionCallback<T>() {
+			@Override
 			public T doInJms(Session session) throws JMSException {
 				QueueBrowser browser = createBrowser(session, queue, messageSelector);
 				try {
@@ -874,11 +915,13 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 		}, true);
 	}
 
+	@Override
 	public <T> T browseSelected(final String queueName, final String messageSelector, final BrowserCallback<T> action)
 			throws JmsException {
 
 		Assert.notNull(action, "Callback object must not be null");
 		return execute(new SessionCallback<T>() {
+			@Override
 			public T doInJms(Session session) throws JMSException {
 				Queue queue = (Queue) getDestinationResolver().resolveDestinationName(session, queueName, false);
 				QueueBrowser browser = createBrowser(session, queue, messageSelector);
@@ -1019,22 +1062,27 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
 	 */
 	private class JmsTemplateResourceFactory implements ConnectionFactoryUtils.ResourceFactory {
 
+		@Override
 		public Connection getConnection(JmsResourceHolder holder) {
 			return JmsTemplate.this.getConnection(holder);
 		}
 
+		@Override
 		public Session getSession(JmsResourceHolder holder) {
 			return JmsTemplate.this.getSession(holder);
 		}
 
+		@Override
 		public Connection createConnection() throws JMSException {
 			return JmsTemplate.this.createConnection();
 		}
 
+		@Override
 		public Session createSession(Connection con) throws JMSException {
 			return JmsTemplate.this.createSession(con);
 		}
 
+		@Override
 		public boolean isSynchedLocalTransactionAllowed() {
 			return JmsTemplate.this.isSessionTransacted();
 		}
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java
index 0aa7fbc49f..57062933e5 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java
@@ -111,6 +111,7 @@ public class JmsTemplate102 extends JmsTemplate {
 	 * @see org.springframework.jms.support.destination.DynamicDestinationResolver
 	 * @see org.springframework.jms.support.converter.SimpleMessageConverter102
 	 */
+	@Override
 	protected void initDefaultStrategies() {
 		setMessageConverter(new SimpleMessageConverter102());
 	}
@@ -121,6 +122,7 @@ public class JmsTemplate102 extends JmsTemplate {
 	 * the specified destination type: QueueConnectionFactory for queues,
 	 * and TopicConnectionFactory for topics.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
 
@@ -149,6 +151,7 @@ public class JmsTemplate102 extends JmsTemplate {
 	 * This implementation overrides the superclass method to accept either
 	 * a QueueConnection or a TopicConnection, depending on the domain.
 	 */
+	@Override
 	protected Connection getConnection(JmsResourceHolder holder) {
 		return holder.getConnection(isPubSubDomain() ? (Class) TopicConnection.class : QueueConnection.class);
 	}
@@ -157,6 +160,7 @@ public class JmsTemplate102 extends JmsTemplate {
 	 * This implementation overrides the superclass method to accept either
 	 * a QueueSession or a TopicSession, depending on the domain.
 	 */
+	@Override
 	protected Session getSession(JmsResourceHolder holder) {
 		return holder.getSession(isPubSubDomain() ? (Class) TopicSession.class : QueueSession.class);
 	}
@@ -164,6 +168,7 @@ public class JmsTemplate102 extends JmsTemplate {
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected Connection createConnection() throws JMSException {
 		if (isPubSubDomain()) {
 			return ((TopicConnectionFactory) getConnectionFactory()).createTopicConnection();
@@ -176,6 +181,7 @@ public class JmsTemplate102 extends JmsTemplate {
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected Session createSession(Connection con) throws JMSException {
 		if (isPubSubDomain()) {
 			return ((TopicConnection) con).createTopicSession(isSessionTransacted(), getSessionAcknowledgeMode());
@@ -188,6 +194,7 @@ public class JmsTemplate102 extends JmsTemplate {
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected MessageProducer doCreateProducer(Session session, Destination destination) throws JMSException {
 		if (isPubSubDomain()) {
 			return ((TopicSession) session).createPublisher((Topic) destination);
@@ -200,6 +207,7 @@ public class JmsTemplate102 extends JmsTemplate {
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected MessageConsumer createConsumer(Session session, Destination destination, String messageSelector)
 			throws JMSException {
 
@@ -211,6 +219,7 @@ public class JmsTemplate102 extends JmsTemplate {
 		}
 	}
 
+	@Override
 	protected QueueBrowser createBrowser(Session session, Queue queue, String messageSelector)
 			throws JMSException {
 
@@ -225,6 +234,7 @@ public class JmsTemplate102 extends JmsTemplate {
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected void doSend(MessageProducer producer, Message message) throws JMSException {
 		if (isPubSubDomain()) {
 			if (isExplicitQosEnabled()) {
@@ -250,6 +260,7 @@ public class JmsTemplate102 extends JmsTemplate {
 	 * The best we can do here is to check the setting on the template.
 	 * @see #getSessionAcknowledgeMode()
 	 */
+	@Override
 	protected boolean isClientAcknowledge(Session session) throws JMSException {
 		return (getSessionAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE);
 	}
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
index 95314fd3b2..277e7ed893 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
@@ -96,6 +96,7 @@ public abstract class JmsGatewaySupport implements InitializingBean {
 		return this.jmsTemplate;
 	}
 
+	@Override
 	public final void afterPropertiesSet() throws IllegalArgumentException, BeanInitializationException {
 		if (this.jmsTemplate == null) {
 			throw new IllegalArgumentException("'connectionFactory' or 'jmsTemplate' is required");
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..f7170925bb 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
@@ -113,6 +113,7 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess
 		this.autoStartup = autoStartup;
 	}
 
+	@Override
 	public boolean isAutoStartup() {
 		return this.autoStartup;
 	}
@@ -131,10 +132,12 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess
 	/**
 	 * Return the phase in which this container will be started and stopped.
 	 */
+	@Override
 	public int getPhase() {
 		return this.phase;
 	}
 
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -169,6 +172,7 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess
 	 * Calls {@link #shutdown()} when the BeanFactory destroys the container instance.
 	 * @see #shutdown()
 	 */
+	@Override
 	public void destroy() {
 		shutdown();
 	}
@@ -260,6 +264,7 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess
 	 * @throws JmsException if starting failed
 	 * @see #doStart
 	 */
+	@Override
 	public void start() throws JmsException {
 		try {
 			doStart();
@@ -298,6 +303,7 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess
 	 * @throws JmsException if stopping failed
 	 * @see #doStop
 	 */
+	@Override
 	public void stop() throws JmsException {
 		try {
 			doStop();
@@ -307,6 +313,7 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess
 		}
 	}
 
+	@Override
 	public void stop(Runnable callback) {
 		this.stop();
 		callback.run();
@@ -335,6 +342,7 @@ public abstract class AbstractJmsListeningContainer extends JmsDestinationAccess
 	 * @see #stop()
 	 * @see #runningAllowed()
 	 */
+	@Override
 	public final boolean isRunning() {
 		synchronized (this.lifecycleMonitor) {
 			return (this.running && runningAllowed());
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
index e899ca12cd..e5db170e73 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractPollingMessageListenerContainer.java
@@ -509,14 +509,17 @@ public abstract class AbstractPollingMessageListenerContainer extends AbstractMe
 	 */
 	private class MessageListenerContainerResourceFactory implements ConnectionFactoryUtils.ResourceFactory {
 
+		@Override
 		public Connection getConnection(JmsResourceHolder holder) {
 			return AbstractPollingMessageListenerContainer.this.getConnection(holder);
 		}
 
+		@Override
 		public Session getSession(JmsResourceHolder holder) {
 			return AbstractPollingMessageListenerContainer.this.getSession(holder);
 		}
 
+		@Override
 		public Connection createConnection() throws JMSException {
 			if (AbstractPollingMessageListenerContainer.this.sharedConnectionEnabled()) {
 				Connection sharedCon = AbstractPollingMessageListenerContainer.this.getSharedConnection();
@@ -527,10 +530,12 @@ public abstract class AbstractPollingMessageListenerContainer extends AbstractMe
 			}
 		}
 
+		@Override
 		public Session createSession(Connection con) throws JMSException {
 			return AbstractPollingMessageListenerContainer.this.createSession(con);
 		}
 
+		@Override
 		public boolean isSynchedLocalTransactionAllowed() {
 			return AbstractPollingMessageListenerContainer.this.isSessionTransacted();
 		}
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 91b15c319d..e192103d42 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
@@ -947,6 +947,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
 
 		private volatile boolean idle = true;
 
+		@Override
 		public void run() {
 			synchronized (lifecycleMonitor) {
 				activeInvokerCount++;
@@ -1123,6 +1124,7 @@ public class DefaultMessageListenerContainer extends AbstractPollingMessageListe
 			this.session = null;
 		}
 
+		@Override
 		public boolean isLongLived() {
 			return (maxMessagesPerTask < 0);
 		}
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java
index f15fb92323..e8d350ef4d 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java
@@ -50,6 +50,7 @@ public class DefaultMessageListenerContainer102 extends DefaultMessageListenerCo
 	 * This implementation overrides the superclass method to accept either
 	 * a QueueConnection or a TopicConnection, depending on the domain.
 	 */
+	@Override
 	protected Connection getConnection(JmsResourceHolder holder) {
 		return holder.getConnection(isPubSubDomain() ? TopicConnection.class : QueueConnection.class);
 	}
@@ -58,6 +59,7 @@ public class DefaultMessageListenerContainer102 extends DefaultMessageListenerCo
 	 * This implementation overrides the superclass method to accept either
 	 * a QueueSession or a TopicSession, depending on the domain.
 	 */
+	@Override
 	protected Session getSession(JmsResourceHolder holder) {
 		return holder.getSession(isPubSubDomain() ? TopicSession.class : QueueSession.class);
 	}
@@ -65,6 +67,7 @@ public class DefaultMessageListenerContainer102 extends DefaultMessageListenerCo
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected Connection createConnection() throws JMSException {
 		if (isPubSubDomain()) {
 			return ((TopicConnectionFactory) getConnectionFactory()).createTopicConnection();
@@ -77,6 +80,7 @@ public class DefaultMessageListenerContainer102 extends DefaultMessageListenerCo
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected Session createSession(Connection con) throws JMSException {
 		if (isPubSubDomain()) {
 			return ((TopicConnection) con).createTopicSession(isSessionTransacted(), getSessionAcknowledgeMode());
@@ -89,6 +93,7 @@ public class DefaultMessageListenerContainer102 extends DefaultMessageListenerCo
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected MessageConsumer createConsumer(Session session, Destination destination) throws JMSException {
 		if (isPubSubDomain()) {
 			if (isSubscriptionDurable()) {
@@ -110,6 +115,7 @@ public class DefaultMessageListenerContainer102 extends DefaultMessageListenerCo
 	 * JMS 1.1's Session {@code getAcknowledgeMode()} method.
 	 * The best we can do here is to check the setting on the listener container.
 	 */
+	@Override
 	protected boolean isClientAcknowledge(Session session) throws JMSException {
 		return (getSessionAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE);
 	}
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..2a503cc754 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
@@ -240,6 +240,7 @@ public class SimpleMessageListenerContainer extends AbstractMessageListenerConta
 	 * shared connection and its sessions and consumers.
 	 * @param ex the reported connection exception
 	 */
+	@Override
 	public void onException(JMSException ex) {
 		// First invoke the user-specific ExceptionListener, if any.
 		invokeExceptionListener(ex);
@@ -301,8 +302,10 @@ public class SimpleMessageListenerContainer extends AbstractMessageListenerConta
 
 		if (this.taskExecutor != null) {
 			consumer.setMessageListener(new MessageListener() {
+				@Override
 				public void onMessage(final Message message) {
 					taskExecutor.execute(new Runnable() {
+						@Override
 						public void run() {
 							processMessage(message, session);
 						}
@@ -312,6 +315,7 @@ public class SimpleMessageListenerContainer extends AbstractMessageListenerConta
 		}
 		else {
 			consumer.setMessageListener(new MessageListener() {
+				@Override
 				public void onMessage(Message message) {
 					processMessage(message, session);
 				}
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java
index 758301eb40..5e19ab4c29 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java
@@ -47,6 +47,7 @@ public class SimpleMessageListenerContainer102 extends SimpleMessageListenerCont
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected Connection createConnection() throws JMSException {
 		if (isPubSubDomain()) {
 			return ((TopicConnectionFactory) getConnectionFactory()).createTopicConnection();
@@ -59,6 +60,7 @@ public class SimpleMessageListenerContainer102 extends SimpleMessageListenerCont
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected Session createSession(Connection con) throws JMSException {
 		if (isPubSubDomain()) {
 			return ((TopicConnection) con).createTopicSession(isSessionTransacted(), getSessionAcknowledgeMode());
@@ -71,6 +73,7 @@ public class SimpleMessageListenerContainer102 extends SimpleMessageListenerCont
 	/**
 	 * This implementation overrides the superclass method to use JMS 1.0.2 API.
 	 */
+	@Override
 	protected MessageConsumer createConsumer(Session session, Destination destination) throws JMSException {
 		if (isPubSubDomain()) {
 			if (isSubscriptionDurable()) {
@@ -92,6 +95,7 @@ public class SimpleMessageListenerContainer102 extends SimpleMessageListenerCont
 	 * JMS 1.1's Session {@code getAcknowledgeMode()} method.
 	 * The best we can do here is to check the setting on the listener container.
 	 */
+	@Override
 	protected boolean isClientAcknowledge(Session session) throws JMSException {
 		return (getSessionAcknowledgeMode() == Session.CLIENT_ACKNOWLEDGE);
 	}
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
index 3aa313c925..23ead10e33 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java
@@ -301,6 +301,7 @@ public class MessageListenerAdapter
 	 * @see #handleListenerException
 	 * @see #onMessage(javax.jms.Message, javax.jms.Session)
 	 */
+	@Override
 	public void onMessage(Message message) {
 		try {
 			onMessage(message, null);
@@ -319,6 +320,7 @@ public class MessageListenerAdapter
 	 * @param session the JMS session to operate on
 	 * @throws JMSException if thrown by JMS API methods
 	 */
+	@Override
 	@SuppressWarnings("unchecked")
 	public void onMessage(Message message, Session session) throws JMSException {
 		// Check whether the delegate is a MessageListener impl itself.
@@ -361,6 +363,7 @@ public class MessageListenerAdapter
 		}
 	}
 
+	@Override
 	public String getSubscriptionName() {
 		Object delegate = getDelegate();
 		if (delegate != this && delegate instanceof SubscriptionNameProvider) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102.java
index 8d15d9b640..50f25c1eb6 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102.java
@@ -69,6 +69,7 @@ public class MessageListenerAdapter102 extends MessageListenerAdapter {
 	 * @see #setMessageConverter
 	 * @see org.springframework.jms.support.converter.SimpleMessageConverter102
 	 */
+	@Override
 	protected void initDefaultStrategies() {
 		setMessageConverter(new SimpleMessageConverter102());
 	}
@@ -78,6 +79,7 @@ public class MessageListenerAdapter102 extends MessageListenerAdapter {
 	 * <p>Uses the JMS pub-sub API if the given destination is a topic,
 	 * else uses the JMS queue API.
 	 */
+	@Override
 	protected void sendResponse(Session session, Destination destination, Message response) throws JMSException {
 		MessageProducer producer = null;
 		try {
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..c0e008f560 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
@@ -72,6 +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.
 	 */
+	@Override
 	protected Class determineActivationSpecClass(ResourceAdapter adapter) {
 		String adapterClassName = adapter.getClass().getName();
 
@@ -131,6 +132,7 @@ public class DefaultJmsActivationSpecFactory extends StandardJmsActivationSpecFa
 	 * "maxMessagesPerSessions"/"maxMessages", respectively
 	 * (following ActiveMQ's and JORAM's naming conventions).
 	 */
+	@Override
 	protected void populateActivationSpecProperties(BeanWrapper bw, JmsActivationSpecConfig config) {
 		super.populateActivationSpecProperties(bw, config);
 		if (config.getMaxConcurrency() > 0) {
@@ -168,6 +170,7 @@ public class DefaultJmsActivationSpecFactory extends StandardJmsActivationSpecFa
 	 * ActivationSpec property named "useRAManagedTransaction", if available
 	 * (following ActiveMQ's naming conventions).
 	 */
+	@Override
 	protected void applyAcknowledgeMode(BeanWrapper bw, int ackMode) {
 		if (ackMode == Session.SESSION_TRANSACTED && bw.isWritableProperty("useRAManagedTransaction")) {
 			// ActiveMQ
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
index 392d02b1fa..3441aacf2b 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java
@@ -59,6 +59,7 @@ public class JmsMessageEndpointFactory extends AbstractMessageEndpointFactory  {
 	/**
 	 * Creates a concrete JMS message endpoint, internal to this factory.
 	 */
+	@Override
 	protected AbstractMessageEndpoint createEndpointInternal() throws UnavailableException {
 		return new JmsMessageEndpoint();
 	}
@@ -69,6 +70,7 @@ public class JmsMessageEndpointFactory extends AbstractMessageEndpointFactory  {
 	 */
 	private class JmsMessageEndpoint extends AbstractMessageEndpoint implements MessageListener {
 
+		@Override
 		public void onMessage(Message message) {
 			boolean applyDeliveryCalls = !hasBeforeDeliveryBeenCalled();
 			if (applyDeliveryCalls) {
@@ -102,6 +104,7 @@ public class JmsMessageEndpointFactory extends AbstractMessageEndpointFactory  {
 			}
 		}
 
+		@Override
 		protected ClassLoader getEndpointClassLoader() {
 			return messageListener.getClass().getClassLoader();
 		}
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
index 052fe9ec61..2bf01afad5 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
@@ -128,6 +128,7 @@ public class JmsMessageEndpointManager extends GenericMessageEndpointManager {
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws ResourceException {
 		if (this.messageListenerSet) {
 			setMessageEndpointFactory(this.endpointFactory);
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..62ac11d7d2 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
@@ -91,6 +91,7 @@ public class StandardJmsActivationSpecFactory implements JmsActivationSpecFactor
 	}
 
 
+	@Override
 	public ActivationSpec createActivationSpec(ResourceAdapter adapter, JmsActivationSpecConfig config) {
 		Class activationSpecClassToUse = this.activationSpecClass;
 		if (activationSpecClassToUse == null) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
index dfc481c0e4..66c1d79490 100644
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
+++ b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java
@@ -180,6 +180,7 @@ public class JmsInvokerClientInterceptor implements MethodInterceptor, Initializ
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getConnectionFactory() == null) {
 			throw new IllegalArgumentException("Property 'connectionFactory' is required");
@@ -190,6 +191,7 @@ public class JmsInvokerClientInterceptor implements MethodInterceptor, Initializ
 	}
 
 
+	@Override
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		if (AopUtils.isToStringMethod(methodInvocation.getMethod())) {
 			return "JMS invoker proxy for queue [" + this.queue + "]";
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
index 1b4cce84d7..0bfe3407af 100644
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
+++ b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java
@@ -64,10 +64,12 @@ public class JmsInvokerProxyFactoryBean extends JmsInvokerClientInterceptor
 		this.serviceInterface = serviceInterface;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		super.afterPropertiesSet();
 		if (this.serviceInterface == null) {
@@ -77,14 +79,17 @@ public class JmsInvokerProxyFactoryBean extends JmsInvokerClientInterceptor
 	}
 
 
+	@Override
 	public Object getObject() {
 		return this.serviceProxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return this.serviceInterface;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
index 38dbfe53cf..8d5ba01cea 100644
--- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java
@@ -89,11 +89,13 @@ public class JmsInvokerServiceExporter extends RemoteInvocationBasedExporter
 		this.ignoreInvalidRequests = ignoreInvalidRequests;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		this.proxy = getProxyForService();
 	}
 
 
+	@Override
 	public void onMessage(Message requestMessage, Session session) throws JMSException {
 		RemoteInvocation invocation = readRemoteInvocation(requestMessage);
 		if (invocation != 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..70b06ad033 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
@@ -147,6 +147,7 @@ public abstract class JmsAccessor implements InitializingBean {
 		return this.sessionAcknowledgeMode;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getConnectionFactory() == null) {
 			throw new IllegalArgumentException("Property 'connectionFactory' is required");
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..976daf69c1 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
@@ -146,6 +146,7 @@ public class MappingJacksonMessageConverter implements MessageConverter {
 	}
 
 
+	@Override
 	public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
 		Message message;
 		try {
@@ -167,6 +168,7 @@ public class MappingJacksonMessageConverter implements MessageConverter {
 		return message;
 	}
 
+	@Override
 	public Object fromMessage(Message message) throws JMSException, MessageConversionException {
 		try {
 			JavaType targetJavaType = getJavaTypeForMessage(message);
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..9cdaaae362 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
@@ -132,6 +132,7 @@ public class MarshallingMessageConverter implements MessageConverter, Initializi
 		this.targetType = targetType;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		Assert.notNull(this.marshaller, "Property 'marshaller' is required");
 		Assert.notNull(this.unmarshaller, "Property 'unmarshaller' is required");
@@ -145,6 +146,7 @@ public class MarshallingMessageConverter implements MessageConverter, Initializi
 	 * @see #marshalToTextMessage
 	 * @see #marshalToBytesMessage
 	 */
+	@Override
 	public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
 		try {
 			switch (this.targetType) {
@@ -169,6 +171,7 @@ public class MarshallingMessageConverter implements MessageConverter, Initializi
 	 * @see #unmarshalFromTextMessage
 	 * @see #unmarshalFromBytesMessage
 	 */
+	@Override
 	public Object fromMessage(Message message) throws JMSException, MessageConversionException {
 		try {
 			if (message instanceof TextMessage) {
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
index 939bd0f211..fd5e4be5a0 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java
@@ -56,6 +56,7 @@ public class SimpleMessageConverter implements MessageConverter {
 	 * @see #createMessageForMap
 	 * @see #createMessageForSerializable
 	 */
+	@Override
 	public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
 		if (object instanceof Message) {
 			return (Message) object;
@@ -89,6 +90,7 @@ public class SimpleMessageConverter implements MessageConverter {
 	 * @see #extractMapFromMessage
 	 * @see #extractSerializableFromMessage
 	 */
+	@Override
 	public Object fromMessage(Message message) throws JMSException, MessageConversionException {
 		if (message instanceof TextMessage) {
 			return extractStringFromMessage((TextMessage) message);
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java
index 569b9cbedf..a8d7d2f5c9 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java
@@ -50,6 +50,7 @@ public class SimpleMessageConverter102 extends SimpleMessageConverter {
 	 * JMS 1.1 and is therefore not available on a JMS 1.0.2 provider.
 	 * @see javax.jms.BytesMessage#getBodyLength()
 	 */
+	@Override
 	protected byte[] extractByteArrayFromMessage(BytesMessage message) throws JMSException {
 		ByteArrayOutputStream baos = new ByteArrayOutputStream(BUFFER_SIZE);
 		byte[] buffer = new byte[BUFFER_SIZE];
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
index e3105c223d..73591a51eb 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java
@@ -63,11 +63,13 @@ public class BeanFactoryDestinationResolver implements DestinationResolver, Bean
 	}
 
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
 
+	@Override
 	public Destination resolveDestinationName(Session session, String destinationName, boolean pubSubDomain)
 			throws JMSException {
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
index f3d39361f8..7f6450fffe 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java
@@ -54,6 +54,7 @@ public class DynamicDestinationResolver implements DestinationResolver {
 	 * @see #resolveTopic(javax.jms.Session, String)
 	 * @see #resolveQueue(javax.jms.Session, String)
 	 */
+	@Override
 	public Destination resolveDestinationName(Session session, String destinationName, boolean pubSubDomain)
 			throws JMSException {
 
diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java
index b9bf560e8e..5ed8476495 100644
--- a/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java
+++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/JndiDestinationResolver.java
@@ -98,6 +98,7 @@ public class JndiDestinationResolver extends JndiLocatorSupport implements Cachi
 	}
 
 
+	@Override
 	public Destination resolveDestinationName(Session session, String destinationName, boolean pubSubDomain)
 			throws JMSException {
 
@@ -150,10 +151,12 @@ public class JndiDestinationResolver extends JndiLocatorSupport implements Cachi
 	}
 
 
+	@Override
 	public void removeFromCache(String destinationName) {
 		this.destinationCache.remove(destinationName);
 	}
 
+	@Override
 	public void clearCache() {
 		this.destinationCache.clear();
 	}
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateExceptionTranslator.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateExceptionTranslator.java
index 4801a5afbc..7223e8d7da 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateExceptionTranslator.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateExceptionTranslator.java
@@ -38,6 +38,7 @@ import org.springframework.dao.support.PersistenceExceptionTranslator;
  */
 public class HibernateExceptionTranslator implements PersistenceExceptionTranslator {
 
+	@Override
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		if (ex instanceof HibernateException) {
 			return convertHibernateAccessException((HibernateException) ex);
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 ddde103c1d..f0bc322e26 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
@@ -242,6 +242,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 		this.hibernateManagedSession = hibernateManagedSession;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getSessionFactory() == null) {
 			throw new IllegalArgumentException("Property 'sessionFactory' is required");
@@ -262,6 +263,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 	}
 
 
+	@Override
 	public Object getResourceFactory() {
 		return getSessionFactory();
 	}
@@ -652,6 +654,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 			}
 		}
 
+		@Override
 		public boolean isRollbackOnly() {
 			return this.sessionHolder.isRollbackOnly() ||
 					(hasConnectionHolder() && getConnectionHolder().isRollbackOnly());
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 dea7f1a139..ab24c96150 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
@@ -268,11 +268,13 @@ public class LocalSessionFactoryBean extends HibernateExceptionTranslator
 		this.jtaTransactionManager = jtaTransactionManager;
 	}
 
+	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader);
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws IOException {
 		LocalSessionFactoryBuilder sfb = new LocalSessionFactoryBuilder(this.dataSource, this.resourcePatternResolver);
 
@@ -385,19 +387,23 @@ public class LocalSessionFactoryBean extends HibernateExceptionTranslator
 	}
 
 
+	@Override
 	public SessionFactory getObject() {
 		return this.sessionFactory;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return (this.sessionFactory != null ? this.sessionFactory.getClass() : SessionFactory.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
 
 
+	@Override
 	public void destroy() {
 		this.sessionFactory.close();
 	}
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..1dfd5aa866 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
@@ -62,6 +62,7 @@ public class SpringSessionContext implements CurrentSessionContext {
 	/**
 	 * Retrieve the Spring-managed Session for the current thread, if any.
 	 */
+	@Override
 	public Session currentSession() throws HibernateException {
 		Object value = TransactionSynchronizationManager.getResource(this.sessionFactory);
 		if (value instanceof Session) {
diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java
index a831617d9c..9f48f5f010 100644
--- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java
+++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/SpringSessionSynchronization.java
@@ -52,10 +52,12 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 	}
 
 
+	@Override
 	public int getOrder() {
 		return SessionFactoryUtils.SESSION_SYNCHRONIZATION_ORDER;
 	}
 
+	@Override
 	public void suspend() {
 		if (this.holderActive) {
 			TransactionSynchronizationManager.unbindResource(this.sessionFactory);
@@ -64,12 +66,14 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 		}
 	}
 
+	@Override
 	public void resume() {
 		if (this.holderActive) {
 			TransactionSynchronizationManager.bindResource(this.sessionFactory, this.sessionHolder);
 		}
 	}
 
+	@Override
 	public void flush() {
 		try {
 			SessionFactoryUtils.logger.debug("Flushing Hibernate Session on explicit request");
@@ -80,6 +84,7 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 		}
 	}
 
+	@Override
 	public void beforeCommit(boolean readOnly) throws DataAccessException {
 		if (!readOnly) {
 			Session session = getCurrentSession();
@@ -97,6 +102,7 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 		}
 	}
 
+	@Override
 	public void beforeCompletion() {
 		Session session = this.sessionHolder.getSession();
 		if (this.sessionHolder.getPreviousFlushMode() != null) {
@@ -107,9 +113,11 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 		session.disconnect();
 	}
 
+	@Override
 	public void afterCommit() {
 	}
 
+	@Override
 	public void afterCompletion(int status) {
 		try {
 			if (status != STATUS_COMMITTED) {
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..4d82160eb7 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
@@ -95,6 +95,7 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 	 * {@code HibernateAccessor} and bind it to the thread via the
 	 * {@link org.springframework.transaction.support.TransactionSynchronizationManager}.
 	 */
+	@Override
 	public void preHandle(WebRequest request) throws DataAccessException {
 
 		String participateAttributeName = getParticipateAttributeName();
@@ -123,6 +124,7 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 		}
 	}
 
+	@Override
 	public void postHandle(WebRequest request, ModelMap model) {
 	}
 
@@ -130,6 +132,7 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 	 * Unbind the Hibernate {@code Session} from the thread and close it).
 	 * @see org.springframework.transaction.support.TransactionSynchronizationManager
 	 */
+	@Override
 	public void afterCompletion(WebRequest request, Exception ex) throws DataAccessException {
 		if (!decrementParticipateCount(request)) {
 			SessionHolder sessionHolder =
@@ -156,6 +159,7 @@ public class OpenSessionInViewInterceptor implements AsyncWebRequestInterceptor
 		return true;
 	}
 
+	@Override
 	public void afterConcurrentHandlingStarted(WebRequest request) {
 		if (!decrementParticipateCount(request)) {
 			TransactionSynchronizationManager.unbindResource(getSessionFactory());
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java
index 4475af596a..2a53432f81 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java
@@ -184,6 +184,7 @@ public abstract class AbstractSessionFactoryBean extends HibernateExceptionTrans
 	 * @see #buildSessionFactory()
 	 * @see #wrapSessionFactoryIfNecessary
 	 */
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		SessionFactory rawSf = buildSessionFactory();
 		this.sessionFactory = wrapSessionFactoryIfNecessary(rawSf);
@@ -219,6 +220,7 @@ public abstract class AbstractSessionFactoryBean extends HibernateExceptionTrans
 	/**
 	 * Close the SessionFactory on bean factory shutdown.
 	 */
+	@Override
 	public void destroy() throws HibernateException {
 		logger.info("Closing Hibernate SessionFactory");
 		try {
@@ -233,14 +235,17 @@ public abstract class AbstractSessionFactoryBean extends HibernateExceptionTrans
 	/**
 	 * Return the singleton SessionFactory.
 	 */
+	@Override
 	public SessionFactory getObject() {
 		return this.sessionFactory;
 	}
 
+	@Override
 	public Class<? extends SessionFactory> getObjectType() {
 		return (this.sessionFactory != null ? this.sessionFactory.getClass() : SessionFactory.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..0f401001db 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
@@ -137,26 +137,31 @@ public class FilterDefinitionFactoryBean implements FactoryBean<FilterDefinition
 	 * the FilterDefinitionFactoryBean will be used.
 	 * @see #setFilterName
 	 */
+	@Override
 	public void setBeanName(String name) {
 		if (this.filterName == null) {
 			this.filterName = name;
 		}
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		this.filterDefinition =
 				new FilterDefinition(this.filterName, this.defaultFilterCondition, this.parameterTypeMap);
 	}
 
 
+	@Override
 	public FilterDefinition getObject() {
 		return this.filterDefinition;
 	}
 
+	@Override
 	public Class<FilterDefinition> getObjectType() {
 		return FilterDefinition.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..fb0dc74444 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
@@ -305,10 +305,12 @@ public abstract class HibernateAccessor implements InitializingBean, BeanFactory
 	 * bean names. It does not need to be set for any other mode of operation.
 	 * @see #setEntityInterceptorBeanName
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getSessionFactory() == null) {
 			throw new IllegalArgumentException("Property 'sessionFactory' is required");
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java
index 60e298cccf..0c54690470 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java
@@ -63,6 +63,7 @@ public class HibernateExceptionTranslator implements PersistenceExceptionTransla
 	}
 
 
+	@Override
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		if (ex instanceof HibernateException) {
 			return convertHibernateAccessException((HibernateException) ex);
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..a5ca4902a7 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
@@ -86,6 +86,7 @@ public class HibernateInterceptor extends HibernateAccessor implements MethodInt
 	}
 
 
+	@Override
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		Session session = getSession();
 		SessionHolder sessionHolder =
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..f833ab890e 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
@@ -335,10 +335,12 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	}
 
 
+	@Override
 	public <T> T execute(HibernateCallback<T> action) throws DataAccessException {
 		return doExecute(action, false, false);
 	}
 
+	@Override
 	public List executeFind(HibernateCallback<?> action) throws DataAccessException {
 		Object result = doExecute(action, false, false);
 		if (result != null && !(result instanceof List)) {
@@ -502,14 +504,17 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	// Convenience methods for loading individual objects
 	//-------------------------------------------------------------------------
 
+	@Override
 	public <T> T get(Class<T> entityClass, Serializable id) throws DataAccessException {
 		return get(entityClass, id, null);
 	}
 
+	@Override
 	public <T> T get(final Class<T> entityClass, final Serializable id, final LockMode lockMode)
 			throws DataAccessException {
 
 		return executeWithNativeSession(new HibernateCallback<T>() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public T doInHibernate(Session session) throws HibernateException {
 				if (lockMode != null) {
@@ -522,14 +527,17 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public Object get(String entityName, Serializable id) throws DataAccessException {
 		return get(entityName, id, null);
 	}
 
+	@Override
 	public Object get(final String entityName, final Serializable id, final LockMode lockMode)
 			throws DataAccessException {
 
 		return executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				if (lockMode != null) {
 					return session.get(entityName, id, lockMode);
@@ -541,14 +549,17 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public <T> T load(Class<T> entityClass, Serializable id) throws DataAccessException {
 		return load(entityClass, id, null);
 	}
 
+	@Override
 	public <T> T load(final Class<T> entityClass, final Serializable id, final LockMode lockMode)
 			throws DataAccessException {
 
 		return executeWithNativeSession(new HibernateCallback<T>() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public T doInHibernate(Session session) throws HibernateException {
 				if (lockMode != null) {
@@ -561,14 +572,17 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public Object load(String entityName, Serializable id) throws DataAccessException {
 		return load(entityName, id, null);
 	}
 
+	@Override
 	public Object load(final String entityName, final Serializable id, final LockMode lockMode)
 			throws DataAccessException {
 
 		return executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				if (lockMode != null) {
 					return session.load(entityName, id, lockMode);
@@ -580,8 +594,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public <T> List<T> loadAll(final Class<T> entityClass) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<List<T>>() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public List<T> doInHibernate(Session session) throws HibernateException {
 				Criteria criteria = session.createCriteria(entityClass);
@@ -592,8 +608,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void load(final Object entity, final Serializable id) throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				session.load(entity, id);
 				return null;
@@ -601,12 +619,15 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void refresh(final Object entity) throws DataAccessException {
 		refresh(entity, null);
 	}
 
+	@Override
 	public void refresh(final Object entity, final LockMode lockMode) throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				if (lockMode != null) {
 					session.refresh(entity, lockMode);
@@ -619,16 +640,20 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public boolean contains(final Object entity) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<Boolean>() {
+			@Override
 			public Boolean doInHibernate(Session session) {
 				return session.contains(entity);
 			}
 		});
 	}
 
+	@Override
 	public void evict(final Object entity) throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				session.evict(entity);
 				return null;
@@ -636,6 +661,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void initialize(Object proxy) throws DataAccessException {
 		try {
 			Hibernate.initialize(proxy);
@@ -645,6 +671,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		}
 	}
 
+	@Override
 	public Filter enableFilter(String filterName) throws IllegalStateException {
 		Session session = SessionFactoryUtils.getSession(getSessionFactory(), false);
 		Filter filter = session.getEnabledFilter(filterName);
@@ -659,8 +686,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	// Convenience methods for storing individual objects
 	//-------------------------------------------------------------------------
 
+	@Override
 	public void lock(final Object entity, final LockMode lockMode) throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				session.lock(entity, lockMode);
 				return null;
@@ -668,10 +697,12 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void lock(final String entityName, final Object entity, final LockMode lockMode)
 			throws DataAccessException {
 
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				session.lock(entityName, entity, lockMode);
 				return null;
@@ -679,8 +710,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public Serializable save(final Object entity) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<Serializable>() {
+			@Override
 			public Serializable doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				return session.save(entity);
@@ -688,8 +721,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public Serializable save(final String entityName, final Object entity) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<Serializable>() {
+			@Override
 			public Serializable doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				return session.save(entityName, entity);
@@ -697,12 +732,15 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void update(Object entity) throws DataAccessException {
 		update(entity, null);
 	}
 
+	@Override
 	public void update(final Object entity, final LockMode lockMode) throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				session.update(entity);
@@ -714,14 +752,17 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void update(String entityName, Object entity) throws DataAccessException {
 		update(entityName, entity, null);
 	}
 
+	@Override
 	public void update(final String entityName, final Object entity, final LockMode lockMode)
 			throws DataAccessException {
 
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				session.update(entityName, entity);
@@ -733,8 +774,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void saveOrUpdate(final Object entity) throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				session.saveOrUpdate(entity);
@@ -743,8 +786,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void saveOrUpdate(final String entityName, final Object entity) throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				session.saveOrUpdate(entityName, entity);
@@ -753,8 +798,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void saveOrUpdateAll(final Collection entities) throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				for (Object entity : entities) {
@@ -765,10 +812,12 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void replicate(final Object entity, final ReplicationMode replicationMode)
 			throws DataAccessException {
 
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				session.replicate(entity, replicationMode);
@@ -777,10 +826,12 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void replicate(final String entityName, final Object entity, final ReplicationMode replicationMode)
 			throws DataAccessException {
 
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				session.replicate(entityName, entity, replicationMode);
@@ -789,8 +840,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void persist(final Object entity) throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				session.persist(entity);
@@ -799,8 +852,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void persist(final String entityName, final Object entity) throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				session.persist(entityName, entity);
@@ -809,8 +864,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public <T> T merge(final T entity) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<T>() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public T doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
@@ -819,8 +876,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public <T> T merge(final String entityName, final T entity) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<T>() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public T doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
@@ -829,12 +888,15 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void delete(Object entity) throws DataAccessException {
 		delete(entity, null);
 	}
 
+	@Override
 	public void delete(final Object entity, final LockMode lockMode) throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				if (lockMode != null) {
@@ -846,14 +908,17 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void delete(String entityName, Object entity) throws DataAccessException {
 		delete(entityName, entity, null);
 	}
 
+	@Override
 	public void delete(final String entityName, final Object entity, final LockMode lockMode)
 			throws DataAccessException {
 
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				if (lockMode != null) {
@@ -865,8 +930,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void deleteAll(final Collection entities) throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				checkWriteOperationAllowed(session);
 				for (Object entity : entities) {
@@ -877,8 +944,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void flush() throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) throws HibernateException {
 				session.flush();
 				return null;
@@ -886,8 +955,10 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void clear() throws DataAccessException {
 		executeWithNativeSession(new HibernateCallback<Object>() {
+			@Override
 			public Object doInHibernate(Session session) {
 				session.clear();
 				return null;
@@ -900,16 +971,20 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	// Convenience finder methods for HQL strings
 	//-------------------------------------------------------------------------
 
+	@Override
 	public List find(String queryString) throws DataAccessException {
 		return find(queryString, (Object[]) null);
 	}
 
+	@Override
 	public List find(String queryString, Object value) throws DataAccessException {
 		return find(queryString, new Object[] {value});
 	}
 
+	@Override
 	public List find(final String queryString, final Object... values) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<List>() {
+			@Override
 			public List doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -923,12 +998,14 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public List findByNamedParam(String queryString, String paramName, Object value)
 			throws DataAccessException {
 
 		return findByNamedParam(queryString, new String[] {paramName}, new Object[] {value});
 	}
 
+	@Override
 	public List findByNamedParam(final String queryString, final String[] paramNames, final Object[] values)
 			throws DataAccessException {
 
@@ -936,6 +1013,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 			throw new IllegalArgumentException("Length of paramNames array must match length of values array");
 		}
 		return executeWithNativeSession(new HibernateCallback<List>() {
+			@Override
 			public List doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -949,10 +1027,12 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public List findByValueBean(final String queryString, final Object valueBean)
 			throws DataAccessException {
 
 		return executeWithNativeSession(new HibernateCallback<List>() {
+			@Override
 			public List doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -967,16 +1047,20 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	// Convenience finder methods for named queries
 	//-------------------------------------------------------------------------
 
+	@Override
 	public List findByNamedQuery(String queryName) throws DataAccessException {
 		return findByNamedQuery(queryName, (Object[]) null);
 	}
 
+	@Override
 	public List findByNamedQuery(String queryName, Object value) throws DataAccessException {
 		return findByNamedQuery(queryName, new Object[] {value});
 	}
 
+	@Override
 	public List findByNamedQuery(final String queryName, final Object... values) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<List>() {
+			@Override
 			public List doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.getNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -990,12 +1074,14 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public List findByNamedQueryAndNamedParam(String queryName, String paramName, Object value)
 			throws DataAccessException {
 
 		return findByNamedQueryAndNamedParam(queryName, new String[] {paramName}, new Object[] {value});
 	}
 
+	@Override
 	public List findByNamedQueryAndNamedParam(
 			final String queryName, final String[] paramNames, final Object[] values)
 			throws DataAccessException {
@@ -1004,6 +1090,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 			throw new IllegalArgumentException("Length of paramNames array must match length of values array");
 		}
 		return executeWithNativeSession(new HibernateCallback<List>() {
+			@Override
 			public List doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.getNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -1017,10 +1104,12 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public List findByNamedQueryAndValueBean(final String queryName, final Object valueBean)
 			throws DataAccessException {
 
 		return executeWithNativeSession(new HibernateCallback<List>() {
+			@Override
 			public List doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.getNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -1035,15 +1124,18 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	// Convenience finder methods for detached criteria
 	//-------------------------------------------------------------------------
 
+	@Override
 	public List findByCriteria(DetachedCriteria criteria) throws DataAccessException {
 		return findByCriteria(criteria, -1, -1);
 	}
 
+	@Override
 	public List findByCriteria(final DetachedCriteria criteria, final int firstResult, final int maxResults)
 			throws DataAccessException {
 
 		Assert.notNull(criteria, "DetachedCriteria must not be null");
 		return executeWithNativeSession(new HibernateCallback<List>() {
+			@Override
 			public List doInHibernate(Session session) throws HibernateException {
 				Criteria executableCriteria = criteria.getExecutableCriteria(session);
 				prepareCriteria(executableCriteria);
@@ -1058,24 +1150,29 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public List findByExample(Object exampleEntity) throws DataAccessException {
 		return findByExample(null, exampleEntity, -1, -1);
 	}
 
+	@Override
 	public List findByExample(String entityName, Object exampleEntity) throws DataAccessException {
 		return findByExample(entityName, exampleEntity, -1, -1);
 	}
 
+	@Override
 	public List findByExample(Object exampleEntity, int firstResult, int maxResults) throws DataAccessException {
 		return findByExample(null, exampleEntity, firstResult, maxResults);
 	}
 
+	@Override
 	public List findByExample(
 			final String entityName, final Object exampleEntity, final int firstResult, final int maxResults)
 			throws DataAccessException {
 
 		Assert.notNull(exampleEntity, "Example entity must not be null");
 		return executeWithNativeSession(new HibernateCallback<List>() {
+			@Override
 			public List doInHibernate(Session session) throws HibernateException {
 				Criteria executableCriteria = (entityName != null ?
 						session.createCriteria(entityName) : session.createCriteria(exampleEntity.getClass()));
@@ -1097,16 +1194,20 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 	// Convenience query methods for iteration and bulk updates/deletes
 	//-------------------------------------------------------------------------
 
+	@Override
 	public Iterator iterate(String queryString) throws DataAccessException {
 		return iterate(queryString, (Object[]) null);
 	}
 
+	@Override
 	public Iterator iterate(String queryString, Object value) throws DataAccessException {
 		return iterate(queryString, new Object[] {value});
 	}
 
+	@Override
 	public Iterator iterate(final String queryString, final Object... values) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<Iterator>() {
+			@Override
 			public Iterator doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -1120,6 +1221,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		});
 	}
 
+	@Override
 	public void closeIterator(Iterator it) throws DataAccessException {
 		try {
 			Hibernate.close(it);
@@ -1129,16 +1231,20 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 		}
 	}
 
+	@Override
 	public int bulkUpdate(String queryString) throws DataAccessException {
 		return bulkUpdate(queryString, (Object[]) null);
 	}
 
+	@Override
 	public int bulkUpdate(String queryString, Object value) throws DataAccessException {
 		return bulkUpdate(queryString, new Object[] {value});
 	}
 
+	@Override
 	public int bulkUpdate(final String queryString, final Object... values) throws DataAccessException {
 		return executeWithNativeSession(new HibernateCallback<Integer>() {
+			@Override
 			public Integer doInHibernate(Session session) throws HibernateException {
 				Query queryObject = session.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -1261,6 +1367,7 @@ public class HibernateTemplate extends HibernateAccessor implements HibernateOpe
 			this.target = target;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on Session interface coming in...
 
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 d3d1e13733..813d5ea2f4 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
@@ -395,10 +395,12 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 	 * bean names. It does not need to be set for any other mode of operation.
 	 * @see #setEntityInterceptorBeanName
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getSessionFactory() == null) {
 			throw new IllegalArgumentException("Property 'sessionFactory' is required");
@@ -422,6 +424,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 	}
 
 
+	@Override
 	public Object getResourceFactory() {
 		return getSessionFactory();
 	}
@@ -882,11 +885,13 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
 			}
 		}
 
+		@Override
 		public boolean isRollbackOnly() {
 			return this.sessionHolder.isRollbackOnly() ||
 					(hasConnectionHolder() && getConnectionHolder().isRollbackOnly());
 		}
 
+		@Override
 		public void flush() {
 			try {
 				this.sessionHolder.getSession().flush();
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java
index dcf15059d3..ed1f18d1d5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java
@@ -47,22 +47,27 @@ public class LocalCacheProviderProxy implements CacheProvider {
 	}
 
 
+	@Override
 	public Cache buildCache(String regionName, Properties properties) throws CacheException {
 		return this.cacheProvider.buildCache(regionName, properties);
 	}
 
+	@Override
 	public long nextTimestamp() {
 		return this.cacheProvider.nextTimestamp();
 	}
 
+	@Override
 	public void start(Properties properties) throws CacheException {
 		this.cacheProvider.start(properties);
 	}
 
+	@Override
 	public void stop() {
 		this.cacheProvider.stop();
 	}
 
+	@Override
 	public boolean isMinimalPutsEnabledByDefault() {
 		return this.cacheProvider.isMinimalPutsEnabledByDefault();
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java
index 43d4264ff8..17c2312b1d 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalDataSourceConnectionProvider.java
@@ -44,6 +44,7 @@ public class LocalDataSourceConnectionProvider implements ConnectionProvider {
 	private DataSource dataSourceToUse;
 
 
+	@Override
 	public void configure(Properties props) throws HibernateException {
 		this.dataSource = LocalSessionFactoryBean.getConfigTimeDataSource();
 		// absolutely needs thread-bound DataSource to initialize
@@ -78,6 +79,7 @@ public class LocalDataSourceConnectionProvider implements ConnectionProvider {
 	 * This implementation delegates to the underlying DataSource.
 	 * @see javax.sql.DataSource#getConnection()
 	 */
+	@Override
 	public Connection getConnection() throws SQLException {
 		try {
 			return this.dataSourceToUse.getConnection();
@@ -92,6 +94,7 @@ public class LocalDataSourceConnectionProvider implements ConnectionProvider {
 	 * This implementation calls {@link DataSourceUtils#doCloseConnection},
 	 * checking against a {@link org.springframework.jdbc.datasource.SmartDataSource}.
 	 */
+	@Override
 	public void closeConnection(Connection con) throws SQLException {
 		try {
 			DataSourceUtils.doCloseConnection(con, this.dataSourceToUse);
@@ -106,6 +109,7 @@ public class LocalDataSourceConnectionProvider implements ConnectionProvider {
 	 * This implementation does nothing:
 	 * We're dealing with an externally managed DataSource.
 	 */
+	@Override
 	public void close() {
 	}
 
@@ -114,6 +118,7 @@ public class LocalDataSourceConnectionProvider implements ConnectionProvider {
 	 * to receive the same Connection within a transaction, not even when
 	 * dealing with a JNDI DataSource.
 	 */
+	@Override
 	public boolean supportsAggressiveRelease() {
 		return false;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
index 06ab8f3b26..b517807708 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
@@ -70,14 +70,17 @@ public class LocalRegionFactoryProxy implements RegionFactory {
 	}
 
 
+	@Override
 	public void start(Settings settings, Properties properties) throws CacheException {
 		this.regionFactory.start(settings, properties);
 	}
 
+	@Override
 	public void stop() {
 		this.regionFactory.stop();
 	}
 
+	@Override
 	public boolean isMinimalPutsEnabledByDefault() {
 		return this.regionFactory.isMinimalPutsEnabledByDefault();
 	}
@@ -92,28 +95,33 @@ public class LocalRegionFactoryProxy implements RegionFactory {
 		}
 	}
 
+	@Override
 	public long nextTimestamp() {
 		return this.regionFactory.nextTimestamp();
 	}
 
+	@Override
 	public EntityRegion buildEntityRegion(String regionName, Properties properties, CacheDataDescription metadata)
 			throws CacheException {
 
 		return this.regionFactory.buildEntityRegion(regionName, properties, metadata);
 	}
 
+	@Override
 	public CollectionRegion buildCollectionRegion(String regionName, Properties properties,
 			CacheDataDescription metadata) throws CacheException {
 
 		return this.regionFactory.buildCollectionRegion(regionName, properties, metadata);
 	}
 
+	@Override
 	public QueryResultsRegion buildQueryResultsRegion(String regionName, Properties properties)
 			throws CacheException {
 
 		return this.regionFactory.buildQueryResultsRegion(regionName, properties);
 	}
 
+	@Override
 	public TimestampsRegion buildTimestampsRegion(String regionName, Properties properties)
 			throws CacheException {
 
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..ae924eecba 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
@@ -540,6 +540,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 		this.schemaUpdate = schemaUpdate;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 	}
@@ -939,6 +940,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 			hibernateTemplate.setFlushMode(HibernateTemplate.FLUSH_NEVER);
 			hibernateTemplate.execute(
 				new HibernateCallback<Object>() {
+					@Override
 					public Object doInHibernate(Session session) throws HibernateException, SQLException {
 						@SuppressWarnings("deprecation")
 						Connection con = session.connection();
@@ -984,6 +986,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 			hibernateTemplate.setFlushMode(HibernateTemplate.FLUSH_NEVER);
 			hibernateTemplate.execute(
 				new HibernateCallback<Object>() {
+					@Override
 					public Object doInHibernate(Session session) throws HibernateException, SQLException {
 						@SuppressWarnings("deprecation")
 						Connection con = session.connection();
@@ -1021,6 +1024,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 		HibernateTemplate hibernateTemplate = new HibernateTemplate(sessionFactory);
 		hibernateTemplate.execute(
 			new HibernateCallback<Object>() {
+				@Override
 				public Object doInHibernate(Session session) throws HibernateException, SQLException {
 					@SuppressWarnings("deprecation")
 					Connection con = session.connection();
@@ -1058,6 +1062,7 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
 			HibernateTemplate hibernateTemplate = new HibernateTemplate(sessionFactory);
 			hibernateTemplate.execute(
 				new HibernateCallback<Object>() {
+					@Override
 					public Object doInHibernate(Session session) throws HibernateException, SQLException {
 						@SuppressWarnings("deprecation")
 						Connection con = session.connection();
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java
index 2b46f7ef84..37781de5a0 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java
@@ -58,14 +58,17 @@ public class LocalTransactionManagerLookup implements TransactionManagerLookup {
 		this.transactionManager = tm;
 	}
 
+	@Override
 	public TransactionManager getTransactionManager(Properties props) {
 		return this.transactionManager;
 	}
 
+	@Override
 	public String getUserTransactionName() {
 		return null;
 	}
 
+	@Override
 	public Object getTransactionIdentifier(Transaction transaction) {
 		return transaction;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java
index 0254d3cce5..0e33b32458 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java
@@ -56,6 +56,7 @@ public class SpringSessionContext implements CurrentSessionContext {
 	/**
 	 * Retrieve the Spring-managed Session for the current thread, if any.
 	 */
+	@Override
 	public Session currentSession() throws HibernateException {
 		try {
 			return (org.hibernate.classic.Session) SessionFactoryUtils.doGetSession(this.sessionFactory, false);
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java
index 240ebcbcc9..eeb7c2c7c1 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java
@@ -106,10 +106,12 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 	}
 
 
+	@Override
 	public int getOrder() {
 		return SessionFactoryUtils.SESSION_SYNCHRONIZATION_ORDER;
 	}
 
+	@Override
 	public void suspend() {
 		if (this.holderActive) {
 			TransactionSynchronizationManager.unbindResource(this.sessionFactory);
@@ -118,12 +120,14 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 		}
 	}
 
+	@Override
 	public void resume() {
 		if (this.holderActive) {
 			TransactionSynchronizationManager.bindResource(this.sessionFactory, this.sessionHolder);
 		}
 	}
 
+	@Override
 	public void flush() {
 		try {
 			SessionFactoryUtils.logger.debug("Flushing Hibernate Session on explicit request");
@@ -134,6 +138,7 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 		}
 	}
 
+	@Override
 	public void beforeCommit(boolean readOnly) throws DataAccessException {
 		if (!readOnly) {
 			Session session = getCurrentSession();
@@ -160,6 +165,7 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 		return SessionFactoryUtils.convertHibernateAccessException(ex);
 	}
 
+	@Override
 	public void beforeCompletion() {
 		if (this.jtaTransaction != null) {
 			// Typically in case of a suspended JTA transaction:
@@ -214,9 +220,11 @@ class SpringSessionSynchronization implements TransactionSynchronization, Ordere
 		}
 	}
 
+	@Override
 	public void afterCommit() {
 	}
 
+	@Override
 	public void afterCompletion(int status) {
 		try {
 			if (!this.hibernateTransactionCompletion || !this.newSession) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java
index 068d1f9e6b..e5e41eecb2 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java
@@ -46,25 +46,31 @@ public class SpringTransactionFactory implements TransactionFactory {
 	 * However, for Spring's resource management (in particular for
 	 * HibernateTransactionManager), "on_close" is the better default.
 	 */
+	@Override
 	public ConnectionReleaseMode getDefaultReleaseMode() {
 		return ConnectionReleaseMode.ON_CLOSE;
 	}
 
+	@Override
 	public Transaction createTransaction(JDBCContext jdbcContext, Context transactionContext) {
 		return new JDBCTransaction(jdbcContext, transactionContext);
 	}
 
+	@Override
 	public void configure(Properties props) {
 	}
 
+	@Override
 	public boolean isTransactionManagerRequired() {
 		return false;
 	}
 
+	@Override
 	public boolean areCallbacksLocalToHibernateTransactions() {
 		return true;
 	}
 
+	@Override
 	public boolean isTransactionInProgress(
 			JDBCContext jdbcContext, Context transactionContext, Transaction transaction) {
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java
index 68140afdf8..aac6fadc59 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java
@@ -111,12 +111,14 @@ public class TypeDefinitionBean implements BeanNameAware, InitializingBean {
 	 * the TypeDefinitionBean will be used.
 	 * @see #setTypeName
 	 */
+	@Override
 	public void setBeanName(String name) {
 		if (this.typeName == null) {
 			this.typeName = name;
 		}
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.typeName == null) {
 			throw new IllegalArgumentException("typeName is required");
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 d944ef497d..4b7e8859d1 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
@@ -150,6 +150,7 @@ public class AnnotationSessionFactoryBean extends LocalSessionFactoryBean implem
 		this.entityTypeFilters = entityTypeFilters;
 	}
 
+	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader);
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
index e30f1e1f1c..58bea92d6a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java
@@ -87,6 +87,7 @@ public abstract class AbstractLobType implements UserType {
 	/**
 	 * This implementation returns false.
 	 */
+	@Override
 	public boolean isMutable() {
 		return false;
 	}
@@ -95,6 +96,7 @@ public abstract class AbstractLobType implements UserType {
 	 * This implementation delegates to the Hibernate EqualsHelper.
 	 * @see org.hibernate.util.EqualsHelper#equals
 	 */
+	@Override
 	public boolean equals(Object x, Object y) throws HibernateException {
 		return EqualsHelper.equals(x, y);
 	}
@@ -102,6 +104,7 @@ public abstract class AbstractLobType implements UserType {
 	/**
 	 * This implementation returns the hashCode of the given objectz.
 	 */
+	@Override
 	public int hashCode(Object x) throws HibernateException {
 		return x.hashCode();
 	}
@@ -109,6 +112,7 @@ public abstract class AbstractLobType implements UserType {
 	/**
 	 * This implementation returns the passed-in value as-is.
 	 */
+	@Override
 	public Object deepCopy(Object value) throws HibernateException {
 		return value;
 	}
@@ -116,6 +120,7 @@ public abstract class AbstractLobType implements UserType {
 	/**
 	 * This implementation returns the passed-in value as-is.
 	 */
+	@Override
 	public Serializable disassemble(Object value) throws HibernateException {
 		return (Serializable) value;
 	}
@@ -123,6 +128,7 @@ public abstract class AbstractLobType implements UserType {
 	/**
 	 * This implementation returns the passed-in value as-is.
 	 */
+	@Override
 	public Object assemble(Serializable cached, Object owner) throws HibernateException {
 		return cached;
 	}
@@ -130,6 +136,7 @@ public abstract class AbstractLobType implements UserType {
 	/**
 	 * This implementation returns the passed-in original as-is.
 	 */
+	@Override
 	public Object replace(Object original, Object target, Object owner) throws HibernateException {
 		return original;
 	}
@@ -140,6 +147,7 @@ public abstract class AbstractLobType implements UserType {
 	 * passing in the LobHandler of this type.
 	 * @see #nullSafeGetInternal
 	 */
+	@Override
 	public final Object nullSafeGet(ResultSet rs, String[] names, Object owner)
 			throws HibernateException, SQLException {
 
@@ -162,6 +170,7 @@ public abstract class AbstractLobType implements UserType {
 	 * LobHandler of this type.
 	 * @see #nullSafeSetInternal
 	 */
+	@Override
 	public final void nullSafeSet(PreparedStatement st, Object value, int index)
 			throws HibernateException, SQLException {
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java
index bdfaf07bd7..a29ddc8068 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java
@@ -60,10 +60,12 @@ public class BlobByteArrayType extends AbstractLobType  {
 		super(lobHandler, jtaTransactionManager);
 	}
 
+	@Override
 	public int[] sqlTypes() {
 		return new int[] {Types.BLOB};
 	}
 
+	@Override
 	public Class returnedClass() {
 		return byte[].class;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java
index ddcf4f5108..3b560b94f3 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java
@@ -76,10 +76,12 @@ public class BlobSerializableType extends AbstractLobType {
 		super(lobHandler, jtaTransactionManager);
 	}
 
+	@Override
 	public int[] sqlTypes() {
 		return new int[] {Types.BLOB};
 	}
 
+	@Override
 	public Class returnedClass() {
 		return Serializable.class;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java
index 3066382286..5f00c63ba4 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java
@@ -66,10 +66,12 @@ public class BlobStringType extends AbstractLobType {
 		super(lobHandler, jtaTransactionManager);
 	}
 
+	@Override
 	public int[] sqlTypes() {
 		return new int[] {Types.BLOB};
 	}
 
+	@Override
 	public Class returnedClass() {
 		return String.class;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
index bef035c6f7..97814b3fd7 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java
@@ -62,10 +62,12 @@ public class ClobStringType extends AbstractLobType {
 		super(lobHandler, jtaTransactionManager);
 	}
 
+	@Override
 	public int[] sqlTypes() {
 		return new int[] {Types.CLOB};
 	}
 
+	@Override
 	public Class returnedClass() {
 		return String.class;
 	}
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..9daf211d50 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
@@ -144,6 +144,7 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 	 * {@link TransactionSynchronizationManager}.
 	 * @see org.springframework.orm.hibernate3.SessionFactoryUtils#getSession
 	 */
+	@Override
 	public void preHandle(WebRequest request) throws DataAccessException {
 
 		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
@@ -189,6 +190,7 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 	 * assuming that service layer transactions have flushed their changes on commit.
 	 * @see #setFlushMode
 	 */
+	@Override
 	public void postHandle(WebRequest request, ModelMap model) throws DataAccessException {
 		if (isSingleSession()) {
 			// Only potentially flush in single session mode.
@@ -210,6 +212,7 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 	 * been opened during the current request (in deferred close mode).
 	 * @see org.springframework.transaction.support.TransactionSynchronizationManager
 	 */
+	@Override
 	public void afterCompletion(WebRequest request, Exception ex) throws DataAccessException {
 		if (!decrementParticipateCount(request)) {
 			if (isSingleSession()) {
@@ -226,6 +229,7 @@ public class OpenSessionInViewInterceptor extends HibernateAccessor implements A
 		}
 	}
 
+	@Override
 	public void afterConcurrentHandlingStarted(WebRequest request) {
 		if (!decrementParticipateCount(request)) {
 			if (isSingleSession()) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
index 8d10aadf8f..6af4d7e500 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java
@@ -282,6 +282,7 @@ public class SqlMapClientFactoryBean implements FactoryBean<SqlMapClient>, Initi
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		if (this.lobHandler != null) {
 			// Make given LobHandler available for SqlMapClient configuration.
@@ -382,14 +383,17 @@ public class SqlMapClientFactoryBean implements FactoryBean<SqlMapClient>, Initi
 	}
 
 
+	@Override
 	public SqlMapClient getObject() {
 		return this.sqlMapClient;
 	}
 
+	@Override
 	public Class<? extends SqlMapClient> getObjectType() {
 		return (this.sqlMapClient != null ? this.sqlMapClient.getClass() : SqlMapClient.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
index fce0f2ad19..ddcf1f198a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java
@@ -261,73 +261,87 @@ public class SqlMapClientTemplate extends JdbcAccessor implements SqlMapClientOp
 	}
 
 
+	@Override
 	public Object queryForObject(String statementName) throws DataAccessException {
 		return queryForObject(statementName, null);
 	}
 
+	@Override
 	public Object queryForObject(final String statementName, final Object parameterObject)
 			throws DataAccessException {
 
 		return execute(new SqlMapClientCallback<Object>() {
+			@Override
 			public Object doInSqlMapClient(SqlMapExecutor executor) throws SQLException {
 				return executor.queryForObject(statementName, parameterObject);
 			}
 		});
 	}
 
+	@Override
 	public Object queryForObject(
 			final String statementName, final Object parameterObject, final Object resultObject)
 			throws DataAccessException {
 
 		return execute(new SqlMapClientCallback<Object>() {
+			@Override
 			public Object doInSqlMapClient(SqlMapExecutor executor) throws SQLException {
 				return executor.queryForObject(statementName, parameterObject, resultObject);
 			}
 		});
 	}
 
+	@Override
 	public List queryForList(String statementName) throws DataAccessException {
 		return queryForList(statementName, null);
 	}
 
+	@Override
 	public List queryForList(final String statementName, final Object parameterObject)
 			throws DataAccessException {
 
 		return execute(new SqlMapClientCallback<List>() {
+			@Override
 			public List doInSqlMapClient(SqlMapExecutor executor) throws SQLException {
 				return executor.queryForList(statementName, parameterObject);
 			}
 		});
 	}
 
+	@Override
 	public List queryForList(String statementName, int skipResults, int maxResults)
 			throws DataAccessException {
 
 		return queryForList(statementName, null, skipResults, maxResults);
 	}
 
+	@Override
 	public List queryForList(
 			final String statementName, final Object parameterObject, final int skipResults, final int maxResults)
 			throws DataAccessException {
 
 		return execute(new SqlMapClientCallback<List>() {
+			@Override
 			public List doInSqlMapClient(SqlMapExecutor executor) throws SQLException {
 				return executor.queryForList(statementName, parameterObject, skipResults, maxResults);
 			}
 		});
 	}
 
+	@Override
 	public void queryWithRowHandler(String statementName, RowHandler rowHandler)
 			throws DataAccessException {
 
 		queryWithRowHandler(statementName, null, rowHandler);
 	}
 
+	@Override
 	public void queryWithRowHandler(
 			final String statementName, final Object parameterObject, final RowHandler rowHandler)
 			throws DataAccessException {
 
 		execute(new SqlMapClientCallback<Object>() {
+			@Override
 			public Object doInSqlMapClient(SqlMapExecutor executor) throws SQLException {
 				executor.queryWithRowHandler(statementName, parameterObject, rowHandler);
 				return null;
@@ -335,56 +349,67 @@ public class SqlMapClientTemplate extends JdbcAccessor implements SqlMapClientOp
 		});
 	}
 
+	@Override
 	public Map queryForMap(
 			final String statementName, final Object parameterObject, final String keyProperty)
 			throws DataAccessException {
 
 		return execute(new SqlMapClientCallback<Map>() {
+			@Override
 			public Map doInSqlMapClient(SqlMapExecutor executor) throws SQLException {
 				return executor.queryForMap(statementName, parameterObject, keyProperty);
 			}
 		});
 	}
 
+	@Override
 	public Map queryForMap(
 			final String statementName, final Object parameterObject, final String keyProperty, final String valueProperty)
 			throws DataAccessException {
 
 		return execute(new SqlMapClientCallback<Map>() {
+			@Override
 			public Map doInSqlMapClient(SqlMapExecutor executor) throws SQLException {
 				return executor.queryForMap(statementName, parameterObject, keyProperty, valueProperty);
 			}
 		});
 	}
 
+	@Override
 	public Object insert(String statementName) throws DataAccessException {
 		return insert(statementName, null);
 	}
 
+	@Override
 	public Object insert(final String statementName, final Object parameterObject)
 			throws DataAccessException {
 
 		return execute(new SqlMapClientCallback<Object>() {
+			@Override
 			public Object doInSqlMapClient(SqlMapExecutor executor) throws SQLException {
 				return executor.insert(statementName, parameterObject);
 			}
 		});
 	}
 
+	@Override
 	public int update(String statementName) throws DataAccessException {
 		return update(statementName, null);
 	}
 
+	@Override
 	public int update(final String statementName, final Object parameterObject)
 			throws DataAccessException {
 
 		return execute(new SqlMapClientCallback<Integer>() {
+			@Override
 			public Integer doInSqlMapClient(SqlMapExecutor executor) throws SQLException {
 				return executor.update(statementName, parameterObject);
 			}
 		});
 	}
 
+	@Override
 	public void update(String statementName, Object parameterObject, int requiredRowsAffected)
 			throws DataAccessException {
 
@@ -395,20 +420,24 @@ public class SqlMapClientTemplate extends JdbcAccessor implements SqlMapClientOp
 		}
 	}
 
+	@Override
 	public int delete(String statementName) throws DataAccessException {
 		return delete(statementName, null);
 	}
 
+	@Override
 	public int delete(final String statementName, final Object parameterObject)
 			throws DataAccessException {
 
 		return execute(new SqlMapClientCallback<Integer>() {
+			@Override
 			public Integer doInSqlMapClient(SqlMapExecutor executor) throws SQLException {
 				return executor.delete(statementName, parameterObject);
 			}
 		});
 	}
 
+	@Override
 	public void delete(String statementName, Object parameterObject, int requiredRowsAffected)
 			throws DataAccessException {
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
index 77189f9de7..5f2a3600d1 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java
@@ -91,6 +91,7 @@ public abstract class AbstractLobTypeHandler extends BaseTypeHandler {
 	 * LobHandler of this type.
 	 * @see #setParameterInternal
 	 */
+	@Override
 	public final void setParameter(PreparedStatement ps, int i, Object parameter, String jdbcType)
 			throws SQLException {
 
@@ -116,6 +117,7 @@ public abstract class AbstractLobTypeHandler extends BaseTypeHandler {
 	 * @see #getResult(java.sql.ResultSet, String)
 	 * @see java.sql.ResultSet#findColumn
 	 */
+	@Override
 	public final Object getResult(ResultSet rs, String columnName) throws SQLException {
 		return getResult(rs, rs.findColumn(columnName));
 	}
@@ -125,6 +127,7 @@ public abstract class AbstractLobTypeHandler extends BaseTypeHandler {
 	 * passing in the LobHandler of this type.
 	 * @see #getResultInternal
 	 */
+	@Override
 	public final Object getResult(ResultSet rs, int columnIndex) throws SQLException {
 		try {
 			return getResultInternal(rs, columnIndex, this.lobHandler);
@@ -139,6 +142,7 @@ public abstract class AbstractLobTypeHandler extends BaseTypeHandler {
 	 * This implementation always throws a SQLException:
 	 * retrieving LOBs from a CallableStatement is not supported.
 	 */
+	@Override
 	public Object getResult(CallableStatement cs, int columnIndex) throws SQLException {
 		throw new SQLException("Retrieving LOBs from a CallableStatement is not supported");
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
index 5d90a2249a..7c2b79c966 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
@@ -70,6 +70,7 @@ public class BlobByteArrayTypeHandler extends AbstractLobTypeHandler {
 		return lobHandler.getBlobAsBytes(rs, index);
 	}
 
+	@Override
 	public Object valueOf(String s) {
 		return s.getBytes();
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
index 509670dc03..0f38e310a5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
@@ -106,6 +106,7 @@ public class BlobSerializableTypeHandler extends AbstractLobTypeHandler {
 		}
 	}
 
+	@Override
 	public Object valueOf(String s) {
 		return s;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
index aad5ac0174..aed761462b 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
@@ -73,6 +73,7 @@ public class ClobStringTypeHandler extends AbstractLobTypeHandler {
 		return lobHandler.getClobAsString(rs, index);
 	}
 
+	@Override
 	public Object valueOf(String s) {
 		return s;
 	}
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 38d0f7263a..348ca0811d 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
@@ -128,6 +128,7 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 	 * @see javax.jdo.Transaction#begin
 	 * @see org.springframework.transaction.InvalidIsolationLevelException
 	 */
+	@Override
 	public Object beginTransaction(Transaction transaction, TransactionDefinition definition)
 			throws JDOException, SQLException, TransactionException {
 
@@ -145,6 +146,7 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 	 * does not require any cleanup.
 	 * @see #beginTransaction
 	 */
+	@Override
 	public void cleanupTransaction(Object transactionData) {
 	}
 
@@ -169,6 +171,7 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 	 * @see org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractor
 	 * @see org.springframework.jdbc.datasource.DataSourceUtils#releaseConnection
 	 */
+	@Override
 	public ConnectionHandle getJdbcConnection(PersistenceManager pm, boolean readOnly)
 			throws JDOException, SQLException {
 
@@ -183,6 +186,7 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 	 * {@code Connection.close} here.
 	 * @see java.sql.Connection#close()
 	 */
+	@Override
 	public void releaseJdbcConnection(ConnectionHandle conHandle, PersistenceManager pm)
 			throws JDOException, SQLException {
 	}
@@ -193,6 +197,7 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 	 * "javax.persistence.query.timeout", assuming that JDO providers are often
 	 * JPA providers as well.
 	 */
+	@Override
 	public void applyQueryTimeout(Query query, int remainingTimeInSeconds) throws JDOException {
 		if (setTimeoutMillisMethod != null) {
 			ReflectionUtils.invokeMethod(setTimeoutMillisMethod, query, remainingTimeInSeconds);
@@ -216,6 +221,7 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 	 * @see org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor
 	 * @see #translateException
 	 */
+	@Override
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		if (ex instanceof JDOException) {
 			return translateException((JDOException) ex);
@@ -227,6 +233,7 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 	 * This implementation delegates to PersistenceManagerFactoryUtils.
 	 * @see PersistenceManagerFactoryUtils#convertJdoAccessException
 	 */
+	@Override
 	public DataAccessException translateException(JDOException ex) {
 		if (getJdbcExceptionTranslator() != null && ex.getCause() instanceof SQLException) {
 			return getJdbcExceptionTranslator().translate("JDO operation: " + ex.getMessage(),
@@ -262,10 +269,12 @@ public class DefaultJdoDialect implements JdoDialect, PersistenceExceptionTransl
 			this.persistenceManager = persistenceManager;
 		}
 
+		@Override
 		public Connection getConnection() {
 			return (Connection) this.persistenceManager.getDataStoreConnection();
 		}
 
+		@Override
 		public void releaseConnection(Connection con) {
 			JdbcUtils.closeConnection(con);
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java
index 25d466f612..00e35acded 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java
@@ -131,6 +131,7 @@ public abstract class JdoAccessor implements InitializingBean {
 	 * Eagerly initialize the JDO dialect, creating a default one
 	 * for the specified PersistenceManagerFactory if none set.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		if (getPersistenceManagerFactory() == null) {
 			throw new IllegalArgumentException("Property 'persistenceManagerFactory' is required");
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java
index ff105e48ab..1c7229d79b 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java
@@ -90,6 +90,7 @@ public class JdoInterceptor extends JdoAccessor implements MethodInterceptor {
 	}
 
 
+	@Override
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		boolean existingTransaction = false;
 		PersistenceManager pm = PersistenceManagerFactoryUtils.getPersistenceManager(getPersistenceManagerFactory(), true);
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
index ce0f61aefc..c2d5ddf405 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java
@@ -175,10 +175,12 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 	}
 
 
+	@Override
 	public <T> T execute(JdoCallback<T> action) throws DataAccessException {
 		return execute(action, isExposeNativePersistenceManager());
 	}
 
+	@Override
 	public Collection executeFind(JdoCallback<?> action) throws DataAccessException {
 		Object result = execute(action, isExposeNativePersistenceManager());
 		if (result != null && !(result instanceof Collection)) {
@@ -262,24 +264,30 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 	// Convenience methods for load, save, delete
 	//-------------------------------------------------------------------------
 
+	@Override
 	public Object getObjectById(final Object objectId) throws DataAccessException {
 		return execute(new JdoCallback<Object>() {
+			@Override
 			public Object doInJdo(PersistenceManager pm) throws JDOException {
 				return pm.getObjectById(objectId, true);
 			}
 		}, true);
 	}
 
+	@Override
 	public <T> T getObjectById(final Class<T> entityClass, final Object idValue) throws DataAccessException {
 		return execute(new JdoCallback<T>() {
+			@Override
 			public T doInJdo(PersistenceManager pm) throws JDOException {
 				return pm.getObjectById(entityClass, idValue);
 			}
 		}, true);
 	}
 
+	@Override
 	public void evict(final Object entity) throws DataAccessException {
 		execute(new JdoCallback<Object>() {
+			@Override
 			public Object doInJdo(PersistenceManager pm) throws JDOException {
 				pm.evict(entity);
 				return null;
@@ -287,8 +295,10 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public void evictAll(final Collection entities) throws DataAccessException {
 		execute(new JdoCallback<Object>() {
+			@Override
 			public Object doInJdo(PersistenceManager pm) throws JDOException {
 				pm.evictAll(entities);
 				return null;
@@ -296,8 +306,10 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public void evictAll() throws DataAccessException {
 		execute(new JdoCallback<Object>() {
+			@Override
 			public Object doInJdo(PersistenceManager pm) throws JDOException {
 				pm.evictAll();
 				return null;
@@ -305,8 +317,10 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public void refresh(final Object entity) throws DataAccessException {
 		execute(new JdoCallback<Object>() {
+			@Override
 			public Object doInJdo(PersistenceManager pm) throws JDOException {
 				pm.refresh(entity);
 				return null;
@@ -314,8 +328,10 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public void refreshAll(final Collection entities) throws DataAccessException {
 		execute(new JdoCallback<Object>() {
+			@Override
 			public Object doInJdo(PersistenceManager pm) throws JDOException {
 				pm.refreshAll(entities);
 				return null;
@@ -323,8 +339,10 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public void refreshAll() throws DataAccessException {
 		execute(new JdoCallback<Object>() {
+			@Override
 			public Object doInJdo(PersistenceManager pm) throws JDOException {
 				pm.refreshAll();
 				return null;
@@ -332,24 +350,30 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public <T> T makePersistent(final T entity) throws DataAccessException {
 		return execute(new JdoCallback<T>() {
+			@Override
 			public T doInJdo(PersistenceManager pm) throws JDOException {
 				return pm.makePersistent(entity);
 			}
 		}, true);
 	}
 
+	@Override
 	public <T> Collection<T> makePersistentAll(final Collection<T> entities) throws DataAccessException {
 		return execute(new JdoCallback<Collection<T>>() {
+			@Override
 			public Collection<T> doInJdo(PersistenceManager pm) throws JDOException {
 				return pm.makePersistentAll(entities);
 			}
 		}, true);
 	}
 
+	@Override
 	public void deletePersistent(final Object entity) throws DataAccessException {
 		execute(new JdoCallback<Object>() {
+			@Override
 			public Object doInJdo(PersistenceManager pm) throws JDOException {
 				pm.deletePersistent(entity);
 				return null;
@@ -357,8 +381,10 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public void deletePersistentAll(final Collection entities) throws DataAccessException {
 		execute(new JdoCallback<Object>() {
+			@Override
 			public Object doInJdo(PersistenceManager pm) throws JDOException {
 				pm.deletePersistentAll(entities);
 				return null;
@@ -366,24 +392,30 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public <T> T detachCopy(final T entity) {
 		return execute(new JdoCallback<T>() {
+			@Override
 			public T doInJdo(PersistenceManager pm) throws JDOException {
 				return pm.detachCopy(entity);
 			}
 		}, true);
 	}
 
+	@Override
 	public <T> Collection<T> detachCopyAll(final Collection<T> entities) {
 		return execute(new JdoCallback<Collection<T>>() {
+			@Override
 			public Collection<T> doInJdo(PersistenceManager pm) throws JDOException {
 				return pm.detachCopyAll(entities);
 			}
 		}, true);
 	}
 
+	@Override
 	public void flush() throws DataAccessException {
 		execute(new JdoCallback<Object>() {
+			@Override
 			public Object doInJdo(PersistenceManager pm) throws JDOException {
 				pm.flush();
 				return null;
@@ -396,18 +428,22 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 	// Convenience finder methods
 	//-------------------------------------------------------------------------
 
+	@Override
 	public <T> Collection<T> find(Class<T> entityClass) throws DataAccessException {
 		return find(entityClass, null, null);
 	}
 
+	@Override
 	public <T> Collection<T> find(Class<T> entityClass, String filter) throws DataAccessException {
 		return find(entityClass, filter, null);
 	}
 
+	@Override
 	public <T> Collection<T> find(final Class<T> entityClass, final String filter, final String ordering)
 			throws DataAccessException {
 
 		return execute(new JdoCallback<Collection<T>>() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public Collection<T> doInJdo(PersistenceManager pm) throws JDOException {
 				Query query = (filter != null ? pm.newQuery(entityClass, filter) : pm.newQuery(entityClass));
@@ -420,17 +456,20 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public <T> Collection<T> find(Class<T> entityClass, String filter, String parameters, Object... values)
 			throws DataAccessException {
 
 		return find(entityClass, filter, parameters, values, null);
 	}
 
+	@Override
 	public <T> Collection<T> find(
 			final Class<T> entityClass, final String filter, final String parameters, final Object[] values,
 			final String ordering) throws DataAccessException {
 
 		return execute(new JdoCallback<Collection<T>>() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public Collection<T> doInJdo(PersistenceManager pm) throws JDOException {
 				Query query = pm.newQuery(entityClass, filter);
@@ -444,6 +483,7 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public <T> Collection<T> find(
 			Class<T> entityClass, String filter, String parameters, Map<String, ?> values)
 			throws DataAccessException {
@@ -451,11 +491,13 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		return find(entityClass, filter, parameters, values, null);
 	}
 
+	@Override
 	public <T> Collection<T> find(
 			final Class<T> entityClass, final String filter, final String parameters,
 			final Map<String, ?> values, final String ordering) throws DataAccessException {
 
 		return execute(new JdoCallback<Collection<T>>() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public Collection<T> doInJdo(PersistenceManager pm) throws JDOException {
 				Query query = pm.newQuery(entityClass, filter);
@@ -469,8 +511,10 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public Collection find(final String language, final Object queryObject) throws DataAccessException {
 		return execute(new JdoCallback<Collection>() {
+			@Override
 			public Collection doInJdo(PersistenceManager pm) throws JDOException {
 				Query query = pm.newQuery(language, queryObject);
 				prepareQuery(query);
@@ -479,8 +523,10 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public Collection find(final String queryString) throws DataAccessException {
 		return execute(new JdoCallback<Collection>() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public Collection doInJdo(PersistenceManager pm) throws JDOException {
 				Query query = pm.newQuery(queryString);
@@ -490,8 +536,10 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public Collection find(final String queryString, final Object... values) throws DataAccessException {
 		return execute(new JdoCallback<Collection>() {
+			@Override
 			public Collection doInJdo(PersistenceManager pm) throws JDOException {
 				Query query = pm.newQuery(queryString);
 				prepareQuery(query);
@@ -500,8 +548,10 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public Collection find(final String queryString, final Map<String, ?> values) throws DataAccessException {
 		return execute(new JdoCallback<Collection>() {
+			@Override
 			public Collection doInJdo(PersistenceManager pm) throws JDOException {
 				Query query = pm.newQuery(queryString);
 				prepareQuery(query);
@@ -510,10 +560,12 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public <T> Collection<T> findByNamedQuery(final Class<T> entityClass, final String queryName)
 			throws DataAccessException {
 
 		return execute(new JdoCallback<Collection<T>>() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public Collection<T> doInJdo(PersistenceManager pm) throws JDOException {
 				Query query = pm.newNamedQuery(entityClass, queryName);
@@ -523,10 +575,12 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public <T> Collection<T> findByNamedQuery(final Class<T> entityClass, final String queryName, final Object... values)
 			throws DataAccessException {
 
 		return execute(new JdoCallback<Collection<T>>() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public Collection<T> doInJdo(PersistenceManager pm) throws JDOException {
 				Query query = pm.newNamedQuery(entityClass, queryName);
@@ -536,11 +590,13 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 		}, true);
 	}
 
+	@Override
 	public <T> Collection<T> findByNamedQuery(
 			final Class<T> entityClass, final String queryName, final Map<String, ?> values)
 			throws DataAccessException {
 
 		return execute(new JdoCallback<Collection<T>>() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public Collection<T> doInJdo(PersistenceManager pm) throws JDOException {
 				Query query = pm.newNamedQuery(entityClass, queryName);
@@ -585,6 +641,7 @@ public class JdoTemplate extends JdoAccessor implements JdoOperations {
 			this.target = target;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on PersistenceManager interface (or provider-specific extension) coming in...
 
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..52876dfab1 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
@@ -232,6 +232,7 @@ public class JdoTransactionManager extends AbstractPlatformTransactionManager
 	 * for the specified PersistenceManagerFactory if none set.
 	 * Auto-detect the PersistenceManagerFactory's DataSource, if any.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		if (getPersistenceManagerFactory() == null) {
 			throw new IllegalArgumentException("Property 'persistenceManagerFactory' is required");
@@ -256,6 +257,7 @@ public class JdoTransactionManager extends AbstractPlatformTransactionManager
 	}
 
 
+	@Override
 	public Object getResourceFactory() {
 		return getPersistenceManagerFactory();
 	}
@@ -571,11 +573,13 @@ public class JdoTransactionManager extends AbstractPlatformTransactionManager
 			}
 		}
 
+		@Override
 		public boolean isRollbackOnly() {
 			Transaction tx = this.persistenceManagerHolder.getPersistenceManager().currentTransaction();
 			return tx.getRollbackOnly();
 		}
 
+		@Override
 		public void flush() {
 			try {
 				this.persistenceManagerHolder.getPersistenceManager().flush();
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
index 112a1c5758..a1e63ca4a2 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java
@@ -196,6 +196,7 @@ public class LocalPersistenceManagerFactoryBean implements FactoryBean<Persisten
 		this.jdoDialect = jdoDialect;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 	}
@@ -207,6 +208,7 @@ public class LocalPersistenceManagerFactoryBean implements FactoryBean<Persisten
 	 * @throws IOException if the properties could not be loaded from the given location
 	 * @throws JDOException in case of JDO initialization errors
 	 */
+	@Override
 	public void afterPropertiesSet() throws IllegalArgumentException, IOException, JDOException {
 		if (this.persistenceManagerFactoryName != null) {
 			if (this.configLocation != null || !this.jdoPropertyMap.isEmpty()) {
@@ -275,15 +277,18 @@ public class LocalPersistenceManagerFactoryBean implements FactoryBean<Persisten
 	/**
 	 * Return the singleton PersistenceManagerFactory.
 	 */
+	@Override
 	public PersistenceManagerFactory getObject() {
 		return this.persistenceManagerFactory;
 	}
 
+	@Override
 	public Class<? extends PersistenceManagerFactory> getObjectType() {
 		return (this.persistenceManagerFactory != null ?
 			this.persistenceManagerFactory.getClass() : PersistenceManagerFactory.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -298,6 +303,7 @@ public class LocalPersistenceManagerFactoryBean implements FactoryBean<Persisten
 	 * @see JdoDialect#translateException
 	 * @see PersistenceManagerFactoryUtils#convertJdoAccessException
 	 */
+	@Override
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		if (ex instanceof JDOException) {
 			if (this.jdoDialect != null) {
@@ -314,6 +320,7 @@ public class LocalPersistenceManagerFactoryBean implements FactoryBean<Persisten
 	/**
 	 * Close the PersistenceManagerFactory on bean factory shutdown.
 	 */
+	@Override
 	public void destroy() {
 		logger.info("Closing JDO PersistenceManagerFactory");
 		this.persistenceManagerFactory.close();
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
index a5d5938cbf..1ab46c234e 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java
@@ -304,6 +304,7 @@ public abstract class PersistenceManagerFactoryUtils {
 			this.newPersistenceManager = newPersistenceManager;
 		}
 
+		@Override
 		public int getOrder() {
 			return PERSISTENCE_MANAGER_SYNCHRONIZATION_ORDER;
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java
index 671a09d0ca..91b7b0abc5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java
@@ -122,14 +122,17 @@ public class TransactionAwarePersistenceManagerFactoryProxy implements FactoryBe
 	}
 
 
+	@Override
 	public PersistenceManagerFactory getObject() {
 		return this.proxy;
 	}
 
+	@Override
 	public Class<? extends PersistenceManagerFactory> getObjectType() {
 		return PersistenceManagerFactory.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -142,6 +145,7 @@ public class TransactionAwarePersistenceManagerFactoryProxy implements FactoryBe
 	 */
 	private class PersistenceManagerFactoryInvocationHandler implements InvocationHandler {
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on PersistenceManagerFactory interface coming in...
 
@@ -188,6 +192,7 @@ public class TransactionAwarePersistenceManagerFactoryProxy implements FactoryBe
 			this.persistenceManagerFactory = pmf;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on PersistenceManager interface coming in...
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewInterceptor.java
index 021b272152..0275567792 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewInterceptor.java
@@ -89,6 +89,7 @@ public class OpenPersistenceManagerInViewInterceptor implements WebRequestInterc
 	}
 
 
+	@Override
 	public void preHandle(WebRequest request) throws DataAccessException {
 		if (TransactionSynchronizationManager.hasResource(getPersistenceManagerFactory())) {
 			// Do not modify the PersistenceManager: just mark the request accordingly.
@@ -106,9 +107,11 @@ public class OpenPersistenceManagerInViewInterceptor implements WebRequestInterc
 		}
 	}
 
+	@Override
 	public void postHandle(WebRequest request, ModelMap model) {
 	}
 
+	@Override
 	public void afterCompletion(WebRequest request, Exception ex) throws DataAccessException {
 		String participateAttributeName = getParticipateAttributeName();
 		Integer count = (Integer) request.getAttribute(participateAttributeName, WebRequest.SCOPE_REQUEST);
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java
index 9176c63791..1923d01efa 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java
@@ -144,6 +144,7 @@ public class SpringPersistenceManagerProxyBean implements FactoryBean<Persistenc
 		return this.allowCreate;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getPersistenceManagerFactory() == null) {
 			throw new IllegalArgumentException("Property 'persistenceManagerFactory' is required");
@@ -158,14 +159,17 @@ public class SpringPersistenceManagerProxyBean implements FactoryBean<Persistenc
 	}
 
 
+	@Override
 	public PersistenceManager getObject() {
 		return this.proxy;
 	}
 
+	@Override
 	public Class<? extends PersistenceManager> getObjectType() {
 		return getPersistenceManagerInterface();
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -177,6 +181,7 @@ public class SpringPersistenceManagerProxyBean implements FactoryBean<Persistenc
 	 */
 	private class PersistenceManagerInvocationHandler implements InvocationHandler {
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on PersistenceManager interface coming in...
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/StandardPersistenceManagerProxyBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/StandardPersistenceManagerProxyBean.java
index 835642d3d5..bbdbeaefbb 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/StandardPersistenceManagerProxyBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/StandardPersistenceManagerProxyBean.java
@@ -57,14 +57,17 @@ public class StandardPersistenceManagerProxyBean implements FactoryBean<Persiste
 	}
 
 
+	@Override
 	public PersistenceManager getObject() {
 		return this.proxy;
 	}
 
+	@Override
 	public Class<? extends PersistenceManager> getObjectType() {
 		return (this.proxy != null ? this.proxy.getClass() : PersistenceManager.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
index 6d20ec34d9..aa4bd5ef93 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java
@@ -142,6 +142,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 		this.persistenceProvider = persistenceProvider;
 	}
 
+	@Override
 	public PersistenceProvider getPersistenceProvider() {
 		return this.persistenceProvider;
 	}
@@ -157,6 +158,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 		this.persistenceUnitName = persistenceUnitName;
 	}
 
+	@Override
 	public String getPersistenceUnitName() {
 		return this.persistenceUnitName;
 	}
@@ -223,6 +225,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 		this.entityManagerInterface = emInterface;
 	}
 
+	@Override
 	public Class<? extends EntityManager> getEntityManagerInterface() {
 		return this.entityManagerInterface;
 	}
@@ -238,6 +241,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 		this.jpaDialect = jpaDialect;
 	}
 
+	@Override
 	public JpaDialect getJpaDialect() {
 		return this.jpaDialect;
 	}
@@ -260,23 +264,28 @@ public abstract class AbstractEntityManagerFactoryBean implements
 		return this.jpaVendorAdapter;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
 
+	@Override
 	public ClassLoader getBeanClassLoader() {
 		return this.beanClassLoader;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		this.beanName = name;
 	}
 
 
+	@Override
 	public final void afterPropertiesSet() throws PersistenceException {
 		if (this.jpaVendorAdapter != null) {
 			if (this.persistenceProvider == null) {
@@ -399,19 +408,23 @@ public abstract class AbstractEntityManagerFactoryBean implements
 	 * @see JpaDialect#translateExceptionIfPossible
 	 * @see EntityManagerFactoryUtils#convertJpaAccessExceptionIfPossible
 	 */
+	@Override
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		return (this.jpaDialect != null ? this.jpaDialect.translateExceptionIfPossible(ex) :
 				EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(ex));
 	}
 
+	@Override
 	public EntityManagerFactory getNativeEntityManagerFactory() {
 		return this.nativeEntityManagerFactory;
 	}
 
+	@Override
 	public PersistenceUnitInfo getPersistenceUnitInfo() {
 		return null;
 	}
 
+	@Override
 	public DataSource getDataSource() {
 		return null;
 	}
@@ -420,14 +433,17 @@ public abstract class AbstractEntityManagerFactoryBean implements
 	/**
 	 * Return the singleton EntityManagerFactory.
 	 */
+	@Override
 	public EntityManagerFactory getObject() {
 		return this.entityManagerFactory;
 	}
 
+	@Override
 	public Class<? extends EntityManagerFactory> getObjectType() {
 		return (this.entityManagerFactory != null ? this.entityManagerFactory.getClass() : EntityManagerFactory.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -436,6 +452,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 	/**
 	 * Close the EntityManagerFactory on bean factory shutdown.
 	 */
+	@Override
 	public void destroy() {
 		if (logger.isInfoEnabled()) {
 			logger.info("Closing JPA EntityManagerFactory for persistence unit '" + getPersistenceUnitName() + "'");
@@ -499,6 +516,7 @@ public abstract class AbstractEntityManagerFactoryBean implements
 			this.entityManagerFactoryBean = emfb;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			try {
 				if (method.getName().equals("equals")) {
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..5e211a011f 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
@@ -60,6 +60,7 @@ public class DefaultJpaDialect implements JpaDialect, Serializable {
 	 * @see org.springframework.transaction.InvalidIsolationLevelException
 	 * @see #cleanupTransaction
 	 */
+	@Override
 	public Object beginTransaction(EntityManager entityManager, TransactionDefinition definition)
 			throws PersistenceException, SQLException, TransactionException {
 
@@ -72,6 +73,7 @@ public class DefaultJpaDialect implements JpaDialect, Serializable {
 		return null;
 	}
 
+	@Override
 	public Object prepareTransaction(EntityManager entityManager, boolean readOnly, String name)
 			throws PersistenceException {
 
@@ -83,6 +85,7 @@ public class DefaultJpaDialect implements JpaDialect, Serializable {
 	 * implementation does not require any cleanup.
 	 * @see #beginTransaction
 	 */
+	@Override
 	public void cleanupTransaction(Object transactionData) {
 	}
 
@@ -90,6 +93,7 @@ public class DefaultJpaDialect implements JpaDialect, Serializable {
 	 * This implementation always returns {@code null},
 	 * indicating that no JDBC Connection can be provided.
 	 */
+	@Override
 	public ConnectionHandle getJdbcConnection(EntityManager entityManager, boolean readOnly)
 			throws PersistenceException, SQLException {
 
@@ -104,6 +108,7 @@ public class DefaultJpaDialect implements JpaDialect, Serializable {
 	 * {@code Connection.close()} (or some other method with similar effect) here.
 	 * @see java.sql.Connection#close()
 	 */
+	@Override
 	public void releaseJdbcConnection(ConnectionHandle conHandle, EntityManager em)
 			throws PersistenceException, SQLException {
 	}
@@ -117,23 +122,28 @@ public class DefaultJpaDialect implements JpaDialect, Serializable {
 	 * This implementation delegates to EntityManagerFactoryUtils.
 	 * @see EntityManagerFactoryUtils#convertJpaAccessExceptionIfPossible
 	 */
+	@Override
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		return EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(ex);
 	}
 
 
+	@Override
 	public boolean supportsEntityManagerFactoryPlusOperations() {
 		return false;
 	}
 
+	@Override
 	public boolean supportsEntityManagerPlusOperations() {
 		return false;
 	}
 
+	@Override
 	public EntityManagerFactoryPlusOperations getEntityManagerFactoryPlusOperations(EntityManagerFactory rawEntityManager) {
 		throw new UnsupportedOperationException(getClass().getName() + " does not support EntityManagerFactoryPlusOperations");
 	}
 
+	@Override
 	public EntityManagerPlusOperations getEntityManagerPlusOperations(EntityManager rawEntityManager) {
 		throw new UnsupportedOperationException(getClass().getName() + " does not support EntityManagerPlusOperations");
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
index 3d7c0041be..a7bba4d678 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java
@@ -129,6 +129,7 @@ public abstract class EntityManagerFactoryAccessor implements BeanFactoryAware {
 	 * Falls back to a default EntityManagerFactory bean if no persistence unit specified.
 	 * @see #setPersistenceUnitName
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		if (getEntityManagerFactory() == null) {
 			if (!(beanFactory instanceof ListableBeanFactory)) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
index 9419950001..4b36277563 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java
@@ -372,6 +372,7 @@ public abstract class EntityManagerFactoryUtils {
 			this.newEntityManager = newEm;
 		}
 
+		@Override
 		public int getOrder() {
 			return ENTITY_MANAGER_SYNCHRONIZATION_ORDER;
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
index 5f9783d2a1..5612eedf81 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java
@@ -309,6 +309,7 @@ public abstract class ExtendedEntityManagerCreator {
 			}
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on EntityManager interface coming in...
 
@@ -452,6 +453,7 @@ public abstract class ExtendedEntityManagerCreator {
 			this.exceptionTranslator = exceptionTranslator;
 		}
 
+		@Override
 		public int getOrder() {
 			return EntityManagerFactoryUtils.ENTITY_MANAGER_SYNCHRONIZATION_ORDER + 1;
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java
index cb4b282a84..a749dd0de8 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java
@@ -112,6 +112,7 @@ public abstract class JpaAccessor extends EntityManagerFactoryAccessor implement
 	 * Eagerly initialize the JPA dialect, creating a default one
 	 * for the specified EntityManagerFactory if none set.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		EntityManagerFactory emf = getEntityManagerFactory();
 		if (emf == null && getEntityManager() == null) {
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java
index cdb4830d3d..4cf05816e6 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java
@@ -85,6 +85,7 @@ public class JpaInterceptor extends JpaAccessor implements MethodInterceptor {
 	}
 
 
+	@Override
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		// Determine current EntityManager: either the transactional one
 		// managed by the factory or a temporary one for the given invocation.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java
index 1b039f6573..1773402303 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java
@@ -146,10 +146,12 @@ public class JpaTemplate extends JpaAccessor implements JpaOperations {
 	}
 
 
+	@Override
 	public <T> T execute(JpaCallback<T> action) throws DataAccessException {
 		return execute(action, isExposeNativeEntityManager());
 	}
 
+	@Override
 	public List executeFind(JpaCallback<?> action) throws DataAccessException {
 		Object result = execute(action, isExposeNativeEntityManager());
 		if (!(result instanceof List)) {
@@ -229,32 +231,40 @@ public class JpaTemplate extends JpaAccessor implements JpaOperations {
 	// Convenience methods for load, save, delete
 	//-------------------------------------------------------------------------
 
+	@Override
 	public <T> T find(final Class<T> entityClass, final Object id) throws DataAccessException {
 		return execute(new JpaCallback<T>() {
+			@Override
 			public T doInJpa(EntityManager em) throws PersistenceException {
 				return em.find(entityClass, id);
 			}
 		}, true);
 	}
 
+	@Override
 	public <T> T getReference(final Class<T> entityClass, final Object id) throws DataAccessException {
 		return execute(new JpaCallback<T>() {
+			@Override
 			public T doInJpa(EntityManager em) throws PersistenceException {
 				return em.getReference(entityClass, id);
 			}
 		}, true);
 	}
 
+	@Override
 	public boolean contains(final Object entity) throws DataAccessException {
 		return execute(new JpaCallback<Boolean>() {
+			@Override
 			public Boolean doInJpa(EntityManager em) throws PersistenceException {
 				return em.contains(entity);
 			}
 		}, true);
 	}
 
+	@Override
 	public void refresh(final Object entity) throws DataAccessException {
 		execute(new JpaCallback<Object>() {
+			@Override
 			public Object doInJpa(EntityManager em) throws PersistenceException {
 				em.refresh(entity);
 				return null;
@@ -262,8 +272,10 @@ public class JpaTemplate extends JpaAccessor implements JpaOperations {
 		}, true);
 	}
 
+	@Override
 	public void persist(final Object entity) throws DataAccessException {
 		execute(new JpaCallback<Object>() {
+			@Override
 			public Object doInJpa(EntityManager em) throws PersistenceException {
 				em.persist(entity);
 				return null;
@@ -271,16 +283,20 @@ public class JpaTemplate extends JpaAccessor implements JpaOperations {
 		}, true);
 	}
 
+	@Override
 	public <T> T merge(final T entity) throws DataAccessException {
 		return execute(new JpaCallback<T>() {
+			@Override
 			public T doInJpa(EntityManager em) throws PersistenceException {
 				return em.merge(entity);
 			}
 		}, true);
 	}
 
+	@Override
 	public void remove(final Object entity) throws DataAccessException {
 		execute(new JpaCallback<Object>() {
+			@Override
 			public Object doInJpa(EntityManager em) throws PersistenceException {
 				em.remove(entity);
 				return null;
@@ -288,8 +304,10 @@ public class JpaTemplate extends JpaAccessor implements JpaOperations {
 		}, true);
 	}
 
+	@Override
 	public void flush() throws DataAccessException {
 		execute(new JpaCallback<Object>() {
+			@Override
 			public Object doInJpa(EntityManager em) throws PersistenceException {
 				em.flush();
 				return null;
@@ -302,12 +320,15 @@ public class JpaTemplate extends JpaAccessor implements JpaOperations {
 	// Convenience finder methods
 	//-------------------------------------------------------------------------
 
+	@Override
 	public List find(String queryString) throws DataAccessException {
 		return find(queryString, (Object[]) null);
 	}
 
+	@Override
 	public List find(final String queryString, final Object... values) throws DataAccessException {
 		return execute(new JpaCallback<List>() {
+			@Override
 			public List doInJpa(EntityManager em) throws PersistenceException {
 				Query queryObject = em.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -321,8 +342,10 @@ public class JpaTemplate extends JpaAccessor implements JpaOperations {
 		});
 	}
 
+	@Override
 	public List findByNamedParams(final String queryString, final Map<String, ?> params) throws DataAccessException {
 		return execute(new JpaCallback<List>() {
+			@Override
 			public List doInJpa(EntityManager em) throws PersistenceException {
 				Query queryObject = em.createQuery(queryString);
 				prepareQuery(queryObject);
@@ -336,12 +359,15 @@ public class JpaTemplate extends JpaAccessor implements JpaOperations {
 		});
 	}
 
+	@Override
 	public List findByNamedQuery(String queryName) throws DataAccessException {
 		return findByNamedQuery(queryName, (Object[]) null);
 	}
 
+	@Override
 	public List findByNamedQuery(final String queryName, final Object... values) throws DataAccessException {
 		return execute(new JpaCallback<List>() {
+			@Override
 			public List doInJpa(EntityManager em) throws PersistenceException {
 				Query queryObject = em.createNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -355,10 +381,12 @@ public class JpaTemplate extends JpaAccessor implements JpaOperations {
 		});
 	}
 
+	@Override
 	public List findByNamedQueryAndNamedParams(final String queryName, final Map<String, ?> params)
 			throws DataAccessException {
 
 		return execute(new JpaCallback<List>() {
+			@Override
 			public List doInJpa(EntityManager em) throws PersistenceException {
 				Query queryObject = em.createNamedQuery(queryName);
 				prepareQuery(queryObject);
@@ -408,6 +436,7 @@ public class JpaTemplate extends JpaAccessor implements JpaOperations {
 			this.target = target;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on EntityManager interface (or provider-specific extension) coming in...
 
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..05de1ea092 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
@@ -282,6 +282,7 @@ public class JpaTransactionManager extends AbstractPlatformTransactionManager
 	 * Falls back to a default EntityManagerFactory bean if no persistence unit specified.
 	 * @see #setPersistenceUnitName
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		if (getEntityManagerFactory() == null) {
 			if (!(beanFactory instanceof ListableBeanFactory)) {
@@ -298,6 +299,7 @@ public class JpaTransactionManager extends AbstractPlatformTransactionManager
 	 * for the specified EntityManagerFactory if none set.
 	 * Auto-detect the EntityManagerFactory's DataSource, if any.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		if (getEntityManagerFactory() == null) {
 			throw new IllegalArgumentException("'entityManagerFactory' or 'persistenceUnitName' is required");
@@ -316,6 +318,7 @@ public class JpaTransactionManager extends AbstractPlatformTransactionManager
 	}
 
 
+	@Override
 	public Object getResourceFactory() {
 		return getEntityManagerFactory();
 	}
@@ -653,11 +656,13 @@ public class JpaTransactionManager extends AbstractPlatformTransactionManager
 			}
 		}
 
+		@Override
 		public boolean isRollbackOnly() {
 			EntityTransaction tx = this.entityManagerHolder.getEntityManager().getTransaction();
 			return tx.getRollbackOnly();
 		}
 
+		@Override
 		public void flush() {
 			try {
 				this.entityManagerHolder.getEntityManager().flush();
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..284f443b0d 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
@@ -240,10 +240,12 @@ public class LocalContainerEntityManagerFactoryBean extends AbstractEntityManage
 	 * @see org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver
 	 * @see org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader
 	 */
+	@Override
 	public void setLoadTimeWeaver(LoadTimeWeaver loadTimeWeaver) {
 		this.internalPersistenceUnitManager.setLoadTimeWeaver(loadTimeWeaver);
 	}
 
+	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.internalPersistenceUnitManager.setResourceLoader(resourceLoader);
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
index 00f15cfa4c..2075ffe256 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
@@ -152,6 +152,7 @@ public abstract class SharedEntityManagerCreator {
 			}
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on EntityManager interface coming in...
 
@@ -287,6 +288,7 @@ public abstract class SharedEntityManagerCreator {
 			this.em = em;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on Query interface coming in...
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
index b96413c512..f75450d8c3 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java
@@ -48,6 +48,7 @@ class ClassFileTransformerAdapter implements ClassFileTransformer {
 	}
 
 
+	@Override
 	public byte[] transform(
 			ClassLoader loader, String className, Class<?> classBeingRedefined,
 			ProtectionDomain protectionDomain, byte[] classfileBuffer) {
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..48b90436d7 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
@@ -322,6 +322,7 @@ public class DefaultPersistenceUnitManager
 	 * @see org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver
 	 * @see org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader
 	 */
+	@Override
 	public void setLoadTimeWeaver(LoadTimeWeaver loadTimeWeaver) {
 		this.loadTimeWeaver = loadTimeWeaver;
 	}
@@ -334,11 +335,13 @@ public class DefaultPersistenceUnitManager
 		return this.loadTimeWeaver;
 	}
 
+	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader);
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.loadTimeWeaver == null && InstrumentationLoadTimeWeaver.isInstrumentationAvailable()) {
 			this.loadTimeWeaver = new InstrumentationLoadTimeWeaver(this.resourcePatternResolver.getClassLoader());
@@ -542,6 +545,7 @@ public class DefaultPersistenceUnitManager
 	}
 
 
+	@Override
 	public PersistenceUnitInfo obtainDefaultPersistenceUnitInfo() {
 		if (this.persistenceUnitInfoNames.isEmpty()) {
 			throw new IllegalStateException("No persistence units parsed from " +
@@ -559,6 +563,7 @@ public class DefaultPersistenceUnitManager
 		return pui;
 	}
 
+	@Override
 	public PersistenceUnitInfo obtainPersistenceUnitInfo(String persistenceUnitName) {
 		PersistenceUnitInfo pui = this.persistenceUnitInfos.remove(persistenceUnitName);
 		if (pui == null) {
@@ -606,6 +611,7 @@ public class DefaultPersistenceUnitManager
 			return this.target;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			if (method.getName().equals("getSharedCacheMode")) {
 				return Enum.valueOf(this.sharedCacheModeEnum, this.target.getSharedCacheModeName());
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
index dd2da772a9..7c774be110 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
@@ -72,6 +72,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 		this.persistenceUnitName = persistenceUnitName;
 	}
 
+	@Override
 	public String getPersistenceUnitName() {
 		return this.persistenceUnitName;
 	}
@@ -80,6 +81,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 		this.persistenceProviderClassName = persistenceProviderClassName;
 	}
 
+	@Override
 	public String getPersistenceProviderClassName() {
 		return this.persistenceProviderClassName;
 	}
@@ -88,6 +90,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 		this.transactionType = transactionType;
 	}
 
+	@Override
 	public PersistenceUnitTransactionType getTransactionType() {
 		if (this.transactionType != null) {
 			return this.transactionType;
@@ -102,6 +105,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 		this.jtaDataSource = jtaDataSource;
 	}
 
+	@Override
 	public DataSource getJtaDataSource() {
 		return this.jtaDataSource;
 	}
@@ -110,6 +114,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 		this.nonJtaDataSource = nonJtaDataSource;
 	}
 
+	@Override
 	public DataSource getNonJtaDataSource() {
 		return this.nonJtaDataSource;
 	}
@@ -118,6 +123,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 		this.mappingFileNames.add(mappingFileName);
 	}
 
+	@Override
 	public List<String> getMappingFileNames() {
 		return this.mappingFileNames;
 	}
@@ -126,6 +132,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 		this.jarFileUrls.add(jarFileUrl);
 	}
 
+	@Override
 	public List<URL> getJarFileUrls() {
 		return this.jarFileUrls;
 	}
@@ -134,6 +141,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 		this.persistenceUnitRootUrl = persistenceUnitRootUrl;
 	}
 
+	@Override
 	public URL getPersistenceUnitRootUrl() {
 		return this.persistenceUnitRootUrl;
 	}
@@ -142,6 +150,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 		this.managedClassNames.add(managedClassName);
 	}
 
+	@Override
 	public List<String> getManagedClassNames() {
 		return this.managedClassNames;
 	}
@@ -150,6 +159,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 		this.excludeUnlistedClasses = excludeUnlistedClasses;
 	}
 
+	@Override
 	public boolean excludeUnlistedClasses() {
 		return this.excludeUnlistedClasses;
 	}
@@ -165,6 +175,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 		this.properties = properties;
 	}
 
+	@Override
 	public Properties getProperties() {
 		return this.properties;
 	}
@@ -177,6 +188,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 		return this.persistenceXMLSchemaVersion;
 	}
 
+	@Override
 	public void setPersistenceProviderPackageName(String persistenceProviderPackageName) {
 		this.persistenceProviderPackageName = persistenceProviderPackageName;
 	}
@@ -190,6 +202,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 	 * This implementation returns the default ClassLoader.
 	 * @see org.springframework.util.ClassUtils#getDefaultClassLoader()
 	 */
+	@Override
 	public ClassLoader getClassLoader() {
 		return ClassUtils.getDefaultClassLoader();
 	}
@@ -197,6 +210,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 	/**
 	 * This implementation throws an UnsupportedOperationException.
 	 */
+	@Override
 	public void addTransformer(ClassTransformer classTransformer) {
 		throw new UnsupportedOperationException("addTransformer not supported");
 	}
@@ -204,6 +218,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 	/**
 	 * This implementation throws an UnsupportedOperationException.
 	 */
+	@Override
 	public ClassLoader getNewTempClassLoader() {
 		throw new UnsupportedOperationException("getNewTempClassLoader not supported");
 	}
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..80a0581561 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
@@ -73,6 +73,7 @@ public class OpenEntityManagerInViewInterceptor extends EntityManagerFactoryAcce
 	public static final String PARTICIPATE_SUFFIX = ".PARTICIPATE";
 
 
+	@Override
 	public void preHandle(WebRequest request) throws DataAccessException {
 
 		String participateAttributeName = getParticipateAttributeName();
@@ -106,9 +107,11 @@ public class OpenEntityManagerInViewInterceptor extends EntityManagerFactoryAcce
 		}
 	}
 
+	@Override
 	public void postHandle(WebRequest request, ModelMap model) {
 	}
 
+	@Override
 	public void afterCompletion(WebRequest request, Exception ex) throws DataAccessException {
 		if (!decrementParticipateCount(request)) {
 			EntityManagerHolder emHolder = (EntityManagerHolder)
@@ -134,6 +137,7 @@ public class OpenEntityManagerInViewInterceptor extends EntityManagerFactoryAcce
 		return true;
 	}
 
+	@Override
 	public void afterConcurrentHandlingStarted(WebRequest request) {
 		if (!decrementParticipateCount(request)) {
 			TransactionSynchronizationManager.unbindResource(getEntityManagerFactory());
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 ac9c408f02..9927ac7a2f 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
@@ -306,10 +306,12 @@ public class PersistenceAnnotationBeanPostProcessor
 	  this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 	  return this.order;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (beanFactory instanceof ListableBeanFactory) {
 			this.beanFactory = (ListableBeanFactory) beanFactory;
@@ -317,6 +319,7 @@ public class PersistenceAnnotationBeanPostProcessor
 	}
 
 
+	@Override
 	public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
 		if (beanType != null) {
 			InjectionMetadata metadata = findPersistenceMetadata(beanType);
@@ -324,14 +327,17 @@ public class PersistenceAnnotationBeanPostProcessor
 		}
 	}
 
+	@Override
 	public Object postProcessBeforeInstantiation(Class<?> beanClass, String beanName) throws BeansException {
 		return null;
 	}
 
+	@Override
 	public boolean postProcessAfterInstantiation(Object bean, String beanName) throws BeansException {
 		return true;
 	}
 
+	@Override
 	public PropertyValues postProcessPropertyValues(
 			PropertyValues pvs, PropertyDescriptor[] pds, Object bean, String beanName) throws BeansException {
 
@@ -345,14 +351,17 @@ public class PersistenceAnnotationBeanPostProcessor
 		return pvs;
 	}
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 		return bean;
 	}
 
+	@Override
 	public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException {
 		EntityManager emToClose = this.extendedEntityManagersToClose.remove(bean);
 		EntityManagerFactoryUtils.closeEntityManager(emToClose);
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
index 14864f4d0d..7b2cf600df 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java
@@ -73,6 +73,7 @@ public class SharedEntityManagerBean extends EntityManagerFactoryAccessor
 	}
 
 
+	@Override
 	public final void afterPropertiesSet() {
 		EntityManagerFactory emf = getEntityManagerFactory();
 		if (emf == null) {
@@ -105,14 +106,17 @@ public class SharedEntityManagerBean extends EntityManagerFactoryAccessor
 	}
 
 
+	@Override
 	public EntityManager getObject() {
 		return this.shared;
 	}
 
+	@Override
 	public Class<? extends EntityManager> getObjectType() {
 		return (this.entityManagerInterface != null ? this.entityManagerInterface : EntityManager.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
index 18499e412d..99041f2dc9 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java
@@ -110,22 +110,27 @@ public abstract class AbstractJpaVendorAdapter implements JpaVendorAdapter {
 	}
 
 
+	@Override
 	public String getPersistenceProviderRootPackage() {
 		return null;
 	}
 
+	@Override
 	public Map<String, ?> getJpaPropertyMap() {
 		return null;
 	}
 
+	@Override
 	public JpaDialect getJpaDialect() {
 		return null;
 	}
 
+	@Override
 	public Class<? extends EntityManagerFactory> getEntityManagerFactoryInterface() {
 		return EntityManagerFactory.class;
 	}
 
+	@Override
 	public Class<? extends EntityManager> getEntityManagerInterface() {
 		return EntityManager.class;
 	}
@@ -134,6 +139,7 @@ public abstract class AbstractJpaVendorAdapter implements JpaVendorAdapter {
 	 * Post-process the EntityManagerFactory after it has been initialized.
 	 * @param emf the EntityManagerFactory to process
 	 */
+	@Override
 	public void postProcessEntityManagerFactory(EntityManagerFactory emf) {
 	}
 
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
index 1dd5764059..6bfc37c0a8 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java
@@ -56,6 +56,7 @@ public class EclipseLinkJpaVendorAdapter extends AbstractJpaVendorAdapter {
 	private final JpaDialect jpaDialect = new EclipseLinkJpaDialect();
 
 
+	@Override
 	public PersistenceProvider getPersistenceProvider() {
 		return this.persistenceProvider;
 	}
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..cfb86f8fcc 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
@@ -153,6 +153,7 @@ public class HibernateJpaDialect extends DefaultJpaDialect {
 			this.session = session;
 		}
 
+		@Override
 		public Connection getConnection() {
 			try {
 				if (connectionMethod == null) {
@@ -166,6 +167,7 @@ public class HibernateJpaDialect extends DefaultJpaDialect {
 			}
 		}
 
+		@Override
 		public void releaseConnection(Connection con) {
 			JdbcUtils.closeConnection(con);
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
index 065cf759a7..511cd91c58 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
@@ -39,16 +39,19 @@ import org.springframework.util.Assert;
  */
 public class HibernateJpaSessionFactoryBean extends EntityManagerFactoryAccessor implements FactoryBean<SessionFactory> {
 
+	@Override
 	public SessionFactory getObject() {
 		EntityManagerFactory emf = getEntityManagerFactory();
 		Assert.isInstanceOf(HibernateEntityManagerFactory.class, emf);
 		return ((HibernateEntityManagerFactory) emf).getSessionFactory();
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return SessionFactory.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
index d48a7b762e..37c636c363 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java
@@ -59,6 +59,7 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter {
 	private final JpaDialect jpaDialect = new HibernateJpaDialect();
 
 
+	@Override
 	public PersistenceProvider getPersistenceProvider() {
 		return this.persistenceProvider;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
index e7db382d0e..45f572716a 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java
@@ -88,6 +88,7 @@ public class OpenJpaDialect extends DefaultJpaDialect {
 			this.entityManager = entityManager;
 		}
 
+		@Override
 		public Object createSavepoint() throws TransactionException {
 			this.savepointCounter++;
 			String savepointName = ConnectionHolder.SAVEPOINT_NAME_PREFIX + this.savepointCounter;
@@ -95,10 +96,12 @@ public class OpenJpaDialect extends DefaultJpaDialect {
 			return savepointName;
 		}
 
+		@Override
 		public void rollbackToSavepoint(Object savepoint) throws TransactionException {
 			this.entityManager.rollbackToSavepoint((String) savepoint);
 		}
 
+		@Override
 		public void releaseSavepoint(Object savepoint) throws TransactionException {
 			this.entityManager.releaseSavepoint((String) savepoint);
 		}
@@ -120,10 +123,12 @@ public class OpenJpaDialect extends DefaultJpaDialect {
 			this.entityManager = entityManager;
 		}
 
+		@Override
 		public Connection getConnection() {
 			return (Connection) this.entityManager.getConnection();
 		}
 
+		@Override
 		public void releaseConnection(Connection con) {
 			JdbcUtils.closeConnection(con);
 		}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java
index 34fc0d4a1c..17cda4d8a1 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java
@@ -48,6 +48,7 @@ public class OpenJpaVendorAdapter extends AbstractJpaVendorAdapter {
 	private final OpenJpaDialect jpaDialect = new OpenJpaDialect();
 
 
+	@Override
 	public PersistenceProvider getPersistenceProvider() {
 		return this.persistenceProvider;
 	}
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java
index 36e18be4ef..6b6572c0b5 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java
@@ -51,6 +51,7 @@ public class TopLinkJpaVendorAdapter extends AbstractJpaVendorAdapter {
 	private final JpaDialect jpaDialect = new TopLinkJpaDialect();
 
 
+	@Override
 	public PersistenceProvider getPersistenceProvider() {
 		return this.persistenceProvider;
 	}
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 0405e8272e..dd3e82dfab 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
@@ -380,10 +380,12 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
 		this.clearCollections = clearCollections;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.classLoader = classLoader;
 	}
 
+	@Override
 	public final void afterPropertiesSet() throws CastorMappingException, IOException {
 		if (logger.isInfoEnabled()) {
 			if (!ObjectUtils.isEmpty(this.mappingLocations)) {
@@ -448,6 +450,7 @@ public class CastorMarshaller extends AbstractMarshaller implements Initializing
 	/**
 	 * Returns {@code true} for all classes, i.e. Castor supports arbitrary classes.
 	 */
+	@Override
 	public boolean supports(Class<?> clazz) {
 		return true;
 	}
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
index 19bf683cae..c11bc0bdd5 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
@@ -27,6 +27,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  */
 public class OxmNamespaceHandler extends NamespaceHandlerSupport {
 
+	@Override
 	public void init() {
 		registerBeanDefinitionParser("jaxb2-marshaller", new Jaxb2MarshallerBeanDefinitionParser());
 		registerBeanDefinitionParser("jibx-marshaller", new JibxMarshallerBeanDefinitionParser());
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 956c003233..a210bc582b 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
@@ -376,14 +376,17 @@ public class Jaxb2Marshaller
 		this.checkForXmlRootElement = checkForXmlRootElement;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
 
+	@Override
 	public void setResourceLoader(ResourceLoader resourceLoader) {
 		this.resourceLoader = resourceLoader;
 	}
 
+	@Override
 	public final void afterPropertiesSet() throws Exception {
 		boolean hasContextPath = StringUtils.hasLength(this.contextPath);
 		boolean hasClassesToBeBound = !ObjectUtils.isEmpty(this.classesToBeBound);
@@ -513,6 +516,7 @@ public class Jaxb2Marshaller
 	}
 
 
+	@Override
 	public boolean supports(Class<?> clazz) {
 		if (this.supportJaxbElementClass && JAXBElement.class.isAssignableFrom(clazz)) {
 			return true;
@@ -520,6 +524,7 @@ public class Jaxb2Marshaller
 		return supportsInternal(clazz, this.checkForXmlRootElement);
 	}
 
+	@Override
 	public boolean supports(Type genericType) {
 		if (genericType instanceof ParameterizedType) {
 			ParameterizedType parameterizedType = (ParameterizedType) genericType;
@@ -609,10 +614,12 @@ public class Jaxb2Marshaller
 
 	// Marshalling
 
+	@Override
 	public void marshal(Object graph, Result result) throws XmlMappingException {
 		marshal(graph, result, null);
 	}
 
+	@Override
 	public void marshal(Object graph, Result result, MimeContainer mimeContainer) throws XmlMappingException {
 		try {
 			Marshaller marshaller = createMarshaller();
@@ -694,10 +701,12 @@ public class Jaxb2Marshaller
 
 	// Unmarshalling
 
+	@Override
 	public Object unmarshal(Source source) throws XmlMappingException {
 		return unmarshal(source, null);
 	}
 
+	@Override
 	public Object unmarshal(Source source, MimeContainer mimeContainer) throws XmlMappingException {
 		try {
 			Unmarshaller unmarshaller = createUnmarshaller();
@@ -915,18 +924,22 @@ public class Jaxb2Marshaller
 			this.length = length;
 		}
 
+		@Override
 		public InputStream getInputStream() throws IOException {
 			return new ByteArrayInputStream(this.data, this.offset, this.length);
 		}
 
+		@Override
 		public OutputStream getOutputStream() throws IOException {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
 		public String getContentType() {
 			return this.contentType;
 		}
 
+		@Override
 		public String getName() {
 			return "ByteArrayDataSource";
 		}
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..b374b52f09 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
@@ -200,6 +200,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe
 		this.docTypeInternalSubset = docTypeInternalSubset;
 	}
 
+	@Override
 	public void afterPropertiesSet() throws JiBXException {
 		if (this.targetClass != null) {
 			if (StringUtils.hasLength(this.bindingName)) {
@@ -228,6 +229,7 @@ public class JibxMarshaller extends AbstractMarshaller implements InitializingBe
 	}
 
 
+	@Override
 	public boolean supports(Class<?> clazz) {
 		Assert.notNull(clazz, "'clazz' must not be null");
 		if (this.targetClass != null) {
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..d42cb72a49 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
@@ -88,6 +88,7 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	 * @see #marshalSaxResult(Object, javax.xml.transform.sax.SAXResult)
 	 * @see #marshalStreamResult(Object, javax.xml.transform.stream.StreamResult)
 	 */
+	@Override
 	public final void marshal(Object graph, Result result) throws IOException, XmlMappingException {
 		if (result instanceof DOMResult) {
 			marshalDomResult(graph, (DOMResult) result);
@@ -120,6 +121,7 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller {
 	 * @see #unmarshalSaxSource(javax.xml.transform.sax.SAXSource)
 	 * @see #unmarshalStreamSource(javax.xml.transform.stream.StreamSource)
 	 */
+	@Override
 	public final Object unmarshal(Source source) throws IOException, XmlMappingException {
 		if (source instanceof DOMSource) {
 			return unmarshalDomSource((DOMSource) source);
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java b/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
index 7fbe4b4745..24e239c733 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java
@@ -124,34 +124,42 @@ public class MarshallingSource extends SAXSource {
 			this.content = content;
 		}
 
+		@Override
 		public void setContentHandler(ContentHandler contentHandler) {
 			this.contentHandler = contentHandler;
 		}
 
+		@Override
 		public ContentHandler getContentHandler() {
 			return this.contentHandler;
 		}
 
+		@Override
 		public void setDTDHandler(DTDHandler dtdHandler) {
 			this.dtdHandler = dtdHandler;
 		}
 
+		@Override
 		public DTDHandler getDTDHandler() {
 			return this.dtdHandler;
 		}
 
+		@Override
 		public void setEntityResolver(EntityResolver entityResolver) {
 			this.entityResolver = entityResolver;
 		}
 
+		@Override
 		public EntityResolver getEntityResolver() {
 			return this.entityResolver;
 		}
 
+		@Override
 		public void setErrorHandler(ErrorHandler errorHandler) {
 			this.errorHandler = errorHandler;
 		}
 
+		@Override
 		public ErrorHandler getErrorHandler() {
 			return this.errorHandler;
 		}
@@ -160,14 +168,17 @@ public class MarshallingSource extends SAXSource {
 			return this.lexicalHandler;
 		}
 
+		@Override
 		public boolean getFeature(String name) throws SAXNotRecognizedException {
 			throw new SAXNotRecognizedException(name);
 		}
 
+		@Override
 		public void setFeature(String name, boolean value) throws SAXNotRecognizedException {
 			throw new SAXNotRecognizedException(name);
 		}
 
+		@Override
 		public Object getProperty(String name) throws SAXNotRecognizedException {
 			if ("http://xml.org/sax/properties/lexical-handler".equals(name)) {
 				return lexicalHandler;
@@ -177,6 +188,7 @@ public class MarshallingSource extends SAXSource {
 			}
 		}
 
+		@Override
 		public void setProperty(String name, Object value) throws SAXNotRecognizedException {
 			if ("http://xml.org/sax/properties/lexical-handler".equals(name)) {
 				this.lexicalHandler = (LexicalHandler) value;
@@ -186,10 +198,12 @@ public class MarshallingSource extends SAXSource {
 			}
 		}
 
+		@Override
 		public void parse(InputSource input) throws SAXException {
 			parse();
 		}
 
+		@Override
 		public void parse(String systemId) throws SAXException {
 			parse();
 		}
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..83a4639363 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
@@ -117,6 +117,7 @@ public class XmlBeansMarshaller extends AbstractMarshaller {
 	/**
 	 * This implementation returns true if the given class is an implementation of {@link XmlObject}.
 	 */
+	@Override
 	public boolean supports(Class<?> clazz) {
 		return XmlObject.class.isAssignableFrom(clazz);
 	}
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
index d5d668bac6..ca092b2172 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java
@@ -58,14 +58,17 @@ public class XmlOptionsFactoryBean implements FactoryBean<XmlOptions> {
 	}
 
 
+	@Override
 	public XmlOptions getObject() {
 		return this.xmlOptions;
 	}
 
+	@Override
 	public Class<? extends XmlOptions> getObjectType() {
 		return XmlOptions.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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 b53c20a5b9..b2717b0411 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
@@ -357,11 +357,13 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin
 		this.supportedClasses = supportedClasses;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.classLoader = classLoader;
 	}
 
 
+	@Override
 	public final void afterPropertiesSet() throws Exception {
 		customizeXStream(getXStream());
 	}
@@ -375,6 +377,7 @@ public class XStreamMarshaller extends AbstractMarshaller implements Initializin
 	}
 
 
+	@Override
 	public boolean supports(Class clazz) {
 		if (ObjectUtils.isEmpty(this.supportedClasses)) {
 			return true;
diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
index 4905e411f0..184d4195e5 100644
--- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
+++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java
@@ -111,6 +111,7 @@ public class TilesConfigurer extends WebApplicationObjectSupport implements Init
 	 * @throws DefinitionsFactoryException if an error occurs
 	 * @see #createDefinitionsFactory
 	 */
+	@Override
 	public void afterPropertiesSet() throws DefinitionsFactoryException {
 		logger.debug("TilesConfigurer: initializion started");
 
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java
index 54c46c76a2..320a17a7d9 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java
@@ -52,6 +52,7 @@ class ActionServletAwareProcessor implements DestructionAwareBeanPostProcessor {
 	}
 
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) {
 		if (bean instanceof Action) {
 			((Action) bean).setServlet(this.actionServlet);
@@ -59,10 +60,12 @@ class ActionServletAwareProcessor implements DestructionAwareBeanPostProcessor {
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) {
 		return bean;
 	}
 
+	@Override
 	public void postProcessBeforeDestruction(Object bean, String beanName) {
 		if (bean instanceof Action) {
 			((Action) bean).setServlet(null);
diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
index d1d68e6995..3b6912b51e 100644
--- a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
+++ b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java
@@ -213,6 +213,7 @@ public class ContextLoaderPlugIn implements PlugIn {
 	/**
 	 * Create the ActionServlet's WebApplicationContext.
 	 */
+	@Override
 	public final void init(ActionServlet actionServlet, ModuleConfig moduleConfig) throws ServletException {
 		long startTime = System.currentTimeMillis();
 		if (logger.isInfoEnabled()) {
@@ -345,6 +346,7 @@ public class ContextLoaderPlugIn implements PlugIn {
 		}
 		wac.addBeanFactoryPostProcessor(
 				new BeanFactoryPostProcessor() {
+					@Override
 					public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
 						beanFactory.addBeanPostProcessor(new ActionServletAwareProcessor(getActionServlet()));
 						beanFactory.ignoreDependencyType(ActionServlet.class);
@@ -385,6 +387,7 @@ public class ContextLoaderPlugIn implements PlugIn {
 	 * Close the WebApplicationContext of the ActionServlet.
 	 * @see org.springframework.context.ConfigurableApplicationContext#close()
 	 */
+	@Override
 	public void destroy() {
 		getServletContext().log("Closing WebApplicationContext of Struts ActionServlet '" +
 				getServletName() + "', module '" + getModulePrefix() + "'");
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..bad3d49090 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
@@ -49,6 +49,7 @@ public class MockMvcClientHttpRequestFactory implements ClientHttpRequestFactory
 		this.mockMvc = mockMvc;
 	}
 
+	@Override
 	public ClientHttpRequest createRequest(final URI uri, final HttpMethod httpMethod) throws IOException {
 		return new MockClientHttpRequest(httpMethod, uri) {
 
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..bb821063df 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
@@ -184,6 +184,7 @@ public class MockRestServiceServer {
 
 		private Iterator<RequestMatcherClientHttpRequest> requestIterator;
 
+		@Override
 		public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
 			Assert.notNull(uri, "'uri' must not be null");
 			Assert.notNull(httpMethod, "'httpMethod' must not be null");
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..aa923c7b66 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
@@ -45,17 +45,20 @@ class RequestMatcherClientHttpRequest extends MockClientHttpRequest implements R
 		this.requestMatchers.add(requestMatcher);
 	}
 
+	@Override
 	public ResponseActions andExpect(RequestMatcher requestMatcher) {
 		Assert.notNull(requestMatcher, "RequestMatcher is required");
 		this.requestMatchers.add(requestMatcher);
 		return this;
 	}
 
+	@Override
 	public void andRespond(ResponseCreator responseCreator) {
 		Assert.notNull(responseCreator, "ResponseCreator is required");
 		this.responseCreator = responseCreator;
 	}
 
+	@Override
 	public ClientHttpResponse executeInternal() throws IOException {
 
 		if (this.requestMatchers.isEmpty()) {
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 5b89cef1a7..dcb5576bab 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
@@ -64,6 +64,7 @@ public class ContentRequestMatchers {
 	 */
 	public RequestMatcher contentType(final MediaType expectedContentType) {
 		return new RequestMatcher() {
+			@Override
 			public void match(ClientHttpRequest request) throws IOException, AssertionError {
 				MediaType actualContentType = request.getHeaders().getContentType();
 				assertTrue("Content type not set", actualContentType != null);
@@ -77,6 +78,7 @@ public class ContentRequestMatchers {
 	 */
 	public RequestMatcher string(final Matcher<? super String> matcher) {
 		return new RequestMatcher() {
+			@Override
 			public void match(ClientHttpRequest request) throws IOException, AssertionError {
 				MockClientHttpRequest mockRequest = (MockClientHttpRequest) request;
 				assertThat("Request content", mockRequest.getBodyAsString(), matcher);
@@ -89,6 +91,7 @@ public class ContentRequestMatchers {
 	 */
 	public RequestMatcher string(final String expectedContent) {
 		return new RequestMatcher() {
+			@Override
 			public void match(ClientHttpRequest request) throws IOException, AssertionError {
 				MockClientHttpRequest mockRequest = (MockClientHttpRequest) request;
 				assertEquals("Request content", expectedContent, mockRequest.getBodyAsString());
@@ -101,6 +104,7 @@ public class ContentRequestMatchers {
 	 */
 	public RequestMatcher bytes(final byte[] expectedContent) {
 		return new RequestMatcher() {
+			@Override
 			public void match(ClientHttpRequest request) throws IOException, AssertionError {
 				MockClientHttpRequest mockRequest = (MockClientHttpRequest) request;
 				assertEquals("Request content", expectedContent, mockRequest.getBodyAsBytes());
@@ -157,6 +161,7 @@ public class ContentRequestMatchers {
 	 */
 	private abstract static class AbstractXmlRequestMatcher implements RequestMatcher {
 
+		@Override
 		public final void match(ClientHttpRequest request) throws IOException, AssertionError {
 			try {
 				MockClientHttpRequest mockRequest = (MockClientHttpRequest) request;
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..14be640a32 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
@@ -118,6 +118,7 @@ public class JsonPathRequestMatchers {
 	 */
 	private abstract static class AbstractJsonPathRequestMatcher implements RequestMatcher {
 
+		@Override
 		public final void match(ClientHttpRequest request) throws IOException, AssertionError {
 			try {
 				MockClientHttpRequest mockRequest = (MockClientHttpRequest) request;
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..4f7df08790 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
@@ -59,6 +59,7 @@ public abstract class MockRestRequestMatchers {
 	 */
 	public static RequestMatcher anything() {
 		return new RequestMatcher() {
+			@Override
 			public void match(ClientHttpRequest request) throws AssertionError {
 			}
 		};
@@ -73,6 +74,7 @@ public abstract class MockRestRequestMatchers {
 	public static RequestMatcher requestTo(final Matcher<String> matcher) {
 		Assert.notNull(matcher, "'matcher' must not be null");
 		return new RequestMatcher() {
+			@Override
 			public void match(ClientHttpRequest request) throws IOException, AssertionError {
 				assertThat("Request URI", request.getURI().toString(), matcher);
 			}
@@ -88,6 +90,7 @@ public abstract class MockRestRequestMatchers {
 	public static RequestMatcher requestTo(final String expectedUri) {
 		Assert.notNull(expectedUri, "'uri' must not be null");
 		return new RequestMatcher() {
+			@Override
 			public void match(ClientHttpRequest request) throws IOException, AssertionError {
 				assertEquals("Request URI", expectedUri, request.getURI().toString());
 			}
@@ -103,6 +106,7 @@ public abstract class MockRestRequestMatchers {
 	public static RequestMatcher method(final HttpMethod method) {
 		Assert.notNull(method, "'method' must not be null");
 		return new RequestMatcher() {
+			@Override
 			public void match(ClientHttpRequest request) throws AssertionError {
 				AssertionErrors.assertEquals("Unexpected HttpMethod", method, request.getMethod());
 			}
@@ -118,6 +122,7 @@ public abstract class MockRestRequestMatchers {
 	public static RequestMatcher requestTo(final URI uri) {
 		Assert.notNull(uri, "'uri' must not be null");
 		return new RequestMatcher() {
+			@Override
 			public void match(ClientHttpRequest request) throws IOException, AssertionError {
 				AssertionErrors.assertEquals("Unexpected request", uri, request.getURI());
 			}
@@ -129,6 +134,7 @@ public abstract class MockRestRequestMatchers {
 	 */
 	public static RequestMatcher header(final String name, final Matcher<? super String>... matchers) {
 		return new RequestMatcher() {
+			@Override
 			public void match(ClientHttpRequest request) {
 				assertHeaderValueCount(name, request.getHeaders(), matchers.length);
 				for (int i = 0 ; i < matchers.length; i++) {
@@ -143,6 +149,7 @@ public abstract class MockRestRequestMatchers {
 	 */
 	public static RequestMatcher header(final String name, final String... expectedValues) {
 		return new RequestMatcher() {
+			@Override
 			public void match(ClientHttpRequest request) {
 				assertHeaderValueCount(name, request.getHeaders(), expectedValues.length);
 				for (int i = 0 ; i < expectedValues.length; i++) {
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..f983235be9 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
@@ -185,6 +185,7 @@ public class XpathRequestMatchers {
 	 */
 	private abstract static class AbstractXpathRequestMatcher implements RequestMatcher {
 
+		@Override
 		public final void match(ClientHttpRequest request) throws IOException, AssertionError {
 			try {
 				MockClientHttpRequest mockRequest = (MockClientHttpRequest) request;
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..3f2be1ae4c 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
@@ -56,6 +56,7 @@ public class DefaultResponseCreator implements ResponseCreator {
 		this.statusCode = statusCode;
 	}
 
+	@Override
 	public ClientHttpResponse createResponse(ClientHttpRequest request) throws IOException {
 		MockClientHttpResponse response;
 		if (this.contentResource != null ){
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..e9951189be 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
@@ -61,14 +61,17 @@ class DefaultMvcResult implements MvcResult {
 		this.mockResponse = response;
 	}
 
+	@Override
 	public MockHttpServletResponse getResponse() {
 		return mockResponse;
 	}
 
+	@Override
 	public MockHttpServletRequest getRequest() {
 		return mockRequest;
 	}
 
+	@Override
 	public Object getHandler() {
 		return this.handler;
 	}
@@ -77,6 +80,7 @@ class DefaultMvcResult implements MvcResult {
 		this.handler = handler;
 	}
 
+	@Override
 	public HandlerInterceptor[] getInterceptors() {
 		return this.interceptors;
 	}
@@ -85,6 +89,7 @@ class DefaultMvcResult implements MvcResult {
 		this.interceptors = interceptors;
 	}
 
+	@Override
 	public Exception getResolvedException() {
 		return this.resolvedException;
 	}
@@ -93,6 +98,7 @@ class DefaultMvcResult implements MvcResult {
 		this.resolvedException = resolvedException;
 	}
 
+	@Override
 	public ModelAndView getModelAndView() {
 		return this.modelAndView;
 	}
@@ -101,6 +107,7 @@ class DefaultMvcResult implements MvcResult {
 		this.modelAndView = mav;
 	}
 
+	@Override
 	public FlashMap getFlashMap() {
 		return RequestContextUtils.getOutputFlashMap(mockRequest);
 	}
@@ -109,10 +116,12 @@ class DefaultMvcResult implements MvcResult {
 		this.asyncResult = asyncResult;
 	}
 
+	@Override
 	public Object getAsyncResult() {
 		return getAsyncResult(-1);
 	}
 
+	@Override
 	public Object getAsyncResult(long timeout) {
 		// MockHttpServletRequest type doesn't have async methods
 		HttpServletRequest request = this.mockRequest;
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 a074ff6d14..bf700fecfb 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
@@ -137,16 +137,19 @@ public final class MockMvc {
 
 		return new ResultActions() {
 
+			@Override
 			public ResultActions andExpect(ResultMatcher matcher) throws Exception {
 				matcher.match(mvcResult);
 				return this;
 			}
 
+			@Override
 			public ResultActions andDo(ResultHandler printer) throws Exception {
 				printer.handle(mvcResult);
 				return this;
 			}
 
+			@Override
 			public MvcResult andReturn() {
 				return mvcResult;
 			}
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..96389241c0 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
@@ -73,12 +73,14 @@ final class TestDispatcherServlet extends DispatcherServlet {
 		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(servletRequest);
 
 		asyncManager.registerCallableInterceptor(KEY, new CallableProcessingInterceptorAdapter() {
+			@Override
 			public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object value) throws Exception {
 				getMvcResult(servletRequest).setAsyncResult(value);
 				asyncResultLatch.countDown();
 			}
 		});
 		asyncManager.registerDeferredResultInterceptor(KEY, new DeferredResultProcessingInterceptorAdapter() {
+			@Override
 			public <T> void postProcess(NativeWebRequest request, DeferredResult<T> result, Object value) throws Exception {
 				getMvcResult(servletRequest).setAsyncResult(value);
 				asyncResultLatch.countDown();
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockAsyncContext.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockAsyncContext.java
index e6d97658c7..753d63db5b 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockAsyncContext.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockAsyncContext.java
@@ -58,14 +58,17 @@ class MockAsyncContext implements AsyncContext {
 		this.response = (HttpServletResponse) response;
 	}
 
+	@Override
 	public ServletRequest getRequest() {
 		return this.request;
 	}
 
+	@Override
 	public ServletResponse getResponse() {
 		return this.response;
 	}
 
+	@Override
 	public boolean hasOriginalRequestAndResponse() {
 		return (this.request instanceof MockHttpServletRequest) && (this.response instanceof MockHttpServletResponse);
 	}
@@ -74,18 +77,22 @@ class MockAsyncContext implements AsyncContext {
 		return this.dispatchedPath;
 	}
 
+	@Override
 	public void dispatch() {
 		dispatch(this.request.getRequestURI());
  	}
 
+	@Override
 	public void dispatch(String path) {
 		dispatch(null, path);
 	}
 
+	@Override
 	public void dispatch(ServletContext context, String path) {
 		this.dispatchedPath = path;
 	}
 
+	@Override
 	public void complete() {
 		Servlet3MockHttpServletRequest mockRequest = WebUtils.getNativeRequest(request, Servlet3MockHttpServletRequest.class);
 		if (mockRequest != null) {
@@ -101,6 +108,7 @@ class MockAsyncContext implements AsyncContext {
 		}
 	}
 
+	@Override
 	public void start(Runnable runnable) {
 		runnable.run();
 	}
@@ -109,22 +117,27 @@ class MockAsyncContext implements AsyncContext {
 		return this.listeners;
 	}
 
+	@Override
 	public void addListener(AsyncListener listener) {
 		this.listeners.add(listener);
 	}
 
+	@Override
 	public void addListener(AsyncListener listener, ServletRequest request, ServletResponse response) {
 		this.listeners.add(listener);
 	}
 
+	@Override
 	public <T extends AsyncListener> T createListener(Class<T> clazz) throws ServletException {
 		return BeanUtils.instantiateClass(clazz);
 	}
 
+	@Override
 	public long getTimeout() {
 		return this.timeout;
 	}
 
+	@Override
 	public void setTimeout(long timeout) {
 		this.timeout = timeout;
 	}
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..bf00e3271d 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
@@ -432,6 +432,7 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable
 	 * {@inheritDoc}
 	 * @return always returns {@code true}.
 	 */
+	@Override
 	public boolean isMergeEnabled() {
 		return true;
 	}
@@ -443,6 +444,7 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable
 	 * @param parent the parent {@code RequestBuilder} to inherit properties from
 	 * @return the result of the merge
 	 */
+	@Override
 	public Object merge(Object parent) {
 		if (parent == null) {
 			return this;
@@ -546,6 +548,7 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable
 	/**
 	 * Build a {@link MockHttpServletRequest}.
 	 */
+	@Override
 	public final MockHttpServletRequest buildRequest(ServletContext servletContext) {
 
 		MockHttpServletRequest request = createServletRequest(servletContext);
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 da96fd9cd2..0ded2474cb 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
@@ -124,6 +124,7 @@ public abstract class MockMvcRequestBuilders {
 	 */
 	public static RequestBuilder asyncDispatch(final MvcResult mvcResult) {
 		return new RequestBuilder() {
+			@Override
 			public MockHttpServletRequest buildRequest(ServletContext servletContext) {
 				MockHttpServletRequest request = mvcResult.getRequest();
 				Method method = ReflectionUtils.findMethod(request.getClass(), "setAsyncStarted", boolean.class);
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockHttpServletRequest.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockHttpServletRequest.java
index ec4fafd59a..4a8a5c48cb 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockHttpServletRequest.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockHttpServletRequest.java
@@ -50,20 +50,24 @@ class Servlet3MockHttpServletRequest extends MockHttpServletRequest {
 		super(servletContext);
 	}
 
+	@Override
 	public boolean isAsyncSupported() {
 		return true;
 	}
 
+	@Override
 	public AsyncContext startAsync() {
 		return startAsync(this, null);
 	}
 
+	@Override
 	public AsyncContext startAsync(ServletRequest request, ServletResponse response) {
 		this.asyncStarted = true;
 		this.asyncContext = new MockAsyncContext(request, response);
 		return this.asyncContext;
 	}
 
+	@Override
 	public AsyncContext getAsyncContext() {
 		return this.asyncContext;
 	}
@@ -72,10 +76,12 @@ class Servlet3MockHttpServletRequest extends MockHttpServletRequest {
 		this.asyncContext = asyncContext;
 	}
 
+	@Override
 	public DispatcherType getDispatcherType() {
 		return DispatcherType.REQUEST;
 	}
 
+	@Override
 	public boolean isAsyncStarted() {
 		return this.asyncStarted;
 	}
@@ -88,14 +94,17 @@ class Servlet3MockHttpServletRequest extends MockHttpServletRequest {
 		this.parts.put(part.getName(), part);
 	}
 
+	@Override
 	public Part getPart(String key) throws IOException, IllegalStateException, ServletException {
 		return this.parts.get(key);
 	}
 
+	@Override
 	public Collection<Part> getParts() throws IOException, IllegalStateException, ServletException {
 		return this.parts.values();
 	}
 
+	@Override
 	public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
 		throw new UnsupportedOperationException();
 	}
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockMultipartHttpServletRequest.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockMultipartHttpServletRequest.java
index ef27070151..ed09b572ae 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockMultipartHttpServletRequest.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockMultipartHttpServletRequest.java
@@ -45,20 +45,24 @@ class Servlet3MockMultipartHttpServletRequest extends MockMultipartHttpServletRe
 	private Map<String, Part> parts = new HashMap<String, Part>();
 
 
+	@Override
 	public boolean isAsyncSupported() {
 		return true;
 	}
 
+	@Override
 	public AsyncContext startAsync() {
 		return startAsync(this, null);
 	}
 
+	@Override
 	public AsyncContext startAsync(ServletRequest request, ServletResponse response) {
 		this.asyncStarted = true;
 		this.asyncContext = new MockAsyncContext(request, response);
 		return this.asyncContext;
 	}
 
+	@Override
 	public AsyncContext getAsyncContext() {
 		return this.asyncContext;
 	}
@@ -67,10 +71,12 @@ class Servlet3MockMultipartHttpServletRequest extends MockMultipartHttpServletRe
 		this.asyncContext = asyncContext;
 	}
 
+	@Override
 	public DispatcherType getDispatcherType() {
 		return DispatcherType.REQUEST;
 	}
 
+	@Override
 	public boolean isAsyncStarted() {
 		return this.asyncStarted;
 	}
@@ -83,14 +89,17 @@ class Servlet3MockMultipartHttpServletRequest extends MockMultipartHttpServletRe
 		this.parts.put(part.getName(), part);
 	}
 
+	@Override
 	public Part getPart(String key) throws IOException, IllegalStateException, ServletException {
 		return this.parts.get(key);
 	}
 
+	@Override
 	public Collection<Part> getParts() throws IOException, IllegalStateException, ServletException {
 		return this.parts.values();
 	}
 
+	@Override
 	public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
 		throw new UnsupportedOperationException();
 	}
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
index b39875baaa..33b65a90f8 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
@@ -65,6 +65,7 @@ public class ContentResultMatchers {
 	 */
 	public ResultMatcher contentType(final MediaType contentType) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String actual = result.getResponse().getContentType();
 				assertTrue("Content type not set", actual != null);
@@ -79,6 +80,7 @@ public class ContentResultMatchers {
 	 */
 	public ResultMatcher encoding(final String characterEncoding) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				String actual = result.getResponse().getCharacterEncoding();
 				assertEquals("Character encoding", characterEncoding, actual);
@@ -95,6 +97,7 @@ public class ContentResultMatchers {
 	 */
 	public ResultMatcher string(final Matcher<? super String> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				assertThat("Response content", result.getResponse().getContentAsString(), matcher);
 			}
@@ -106,6 +109,7 @@ public class ContentResultMatchers {
 	 */
 	public ResultMatcher string(final String expectedContent) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				assertEquals("Response content", expectedContent, result.getResponse().getContentAsString());
 			}
@@ -117,6 +121,7 @@ public class ContentResultMatchers {
 	 */
 	public ResultMatcher bytes(final byte[] expectedContent) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				assertEquals("Response content", expectedContent, result.getResponse().getContentAsByteArray());
 			}
@@ -137,6 +142,7 @@ public class ContentResultMatchers {
 	 */
 	public ResultMatcher xml(final String xmlContent) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				xmlHelper.assertXmlEqual(xmlContent, content);
@@ -150,6 +156,7 @@ public class ContentResultMatchers {
 	 */
 	public ResultMatcher node(final Matcher<? super Node> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				xmlHelper.assertNode(content, matcher);
@@ -165,6 +172,7 @@ public class ContentResultMatchers {
 	 */
 	public ResultMatcher source(final Matcher<? super Source> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				xmlHelper.assertSource(content, matcher);
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
index 338777882a..967a361c20 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java
@@ -49,6 +49,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher value(final String name, final Matcher<? super String> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertTrue("Response cookie not found: " + name, cookie != null);
@@ -62,6 +63,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher value(final String name, final String expectedValue) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertTrue("Response cookie not found: " + name, cookie != null);
@@ -76,6 +78,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher exists(final String name) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertTrue("No cookie with name: " + name, cookie != null);
@@ -89,6 +92,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher doesNotExist(final String name) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertTrue("Unexpected cookie with name " + name, cookie == null);
@@ -101,6 +105,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher maxAge(final String name, final Matcher<? super Integer> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertTrue("No cookie with name: " + name, cookie != null);
@@ -114,6 +119,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher maxAge(final String name, final int maxAge) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertTrue("No cookie with name: " + name, cookie != null);
@@ -127,6 +133,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher path(final String name, final Matcher<? super String> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertThat("Response cookie path", cookie.getPath(), matcher);
@@ -136,6 +143,7 @@ public class CookieResultMatchers {
 
 	public ResultMatcher path(final String name, final String path) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertEquals("Response cookie path", path, cookie.getPath());
@@ -148,6 +156,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher domain(final String name, final Matcher<? super String> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertThat("Response cookie domain", cookie.getDomain(), matcher);
@@ -160,6 +169,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher domain(final String name, final String domain) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertEquals("Response cookie domain", domain, cookie.getDomain());
@@ -172,6 +182,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher comment(final String name, final Matcher<? super String> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertThat("Response cookie comment", cookie.getComment(), matcher);
@@ -184,6 +195,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher comment(final String name, final String comment) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertEquals("Response cookie comment", comment, cookie.getComment());
@@ -196,6 +208,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher version(final String name, final Matcher<? super Integer> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertThat("Response cookie version", cookie.getVersion(), matcher);
@@ -208,6 +221,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher version(final String name, final int version) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertEquals("Response cookie version", version, cookie.getVersion());
@@ -220,6 +234,7 @@ public class CookieResultMatchers {
 	 */
 	public ResultMatcher secure(final String name, final boolean secure) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				Cookie cookie = result.getResponse().getCookie(name);
 				assertEquals("Response cookie secure", secure, cookie.getSecure());
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
index 61c2f37df6..f591a18307 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java
@@ -45,6 +45,7 @@ public class FlashAttributeResultMatchers {
 	 */
 	public <T> ResultMatcher attribute(final String name, final Matcher<T> matcher) {
 		return new ResultMatcher() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public void match(MvcResult result) throws Exception {
 				assertThat("Flash attribute", (T) result.getFlashMap().get(name), matcher);
@@ -57,6 +58,7 @@ public class FlashAttributeResultMatchers {
 	 */
 	public <T> ResultMatcher attribute(final String name, final Object value) {
 		return new ResultMatcher() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public void match(MvcResult result) throws Exception {
 				assertEquals("Flash attribute", value, result.getFlashMap().get(name));
@@ -69,6 +71,7 @@ public class FlashAttributeResultMatchers {
 	 */
 	public <T> ResultMatcher attributeExists(final String... names) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				for (String name : names) {
 					assertTrue("Flash attribute [" + name + "] does not exist", result.getFlashMap().get(name) != null);
@@ -82,6 +85,7 @@ public class FlashAttributeResultMatchers {
 	 */
 	public <T> ResultMatcher attributeCount(final int count) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				assertEquals("FlashMap size", count, result.getFlashMap().size());
 			}
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
index bcd5ea75ae..502199fbd5 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java
@@ -52,6 +52,7 @@ public class HandlerResultMatchers {
 	 */
 	public ResultMatcher handlerType(final Class<?> type) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				Object handler = result.getHandler();
 				assertTrue("No handler: ", handler != null);
@@ -73,6 +74,7 @@ public class HandlerResultMatchers {
 	 */
 	public ResultMatcher methodName(final Matcher<? super String> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				Object handler = assertHandlerMethod(result);
 				assertThat("HandlerMethod", ((HandlerMethod) handler).getMethod().getName(), matcher);
@@ -88,6 +90,7 @@ public class HandlerResultMatchers {
 	 */
 	public ResultMatcher methodName(final String name) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				Object handler = assertHandlerMethod(result);
 				assertEquals("HandlerMethod", name, ((HandlerMethod) handler).getMethod().getName());
@@ -103,6 +106,7 @@ public class HandlerResultMatchers {
 	 */
 	public ResultMatcher method(final Method method) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				Object handler = assertHandlerMethod(result);
 				assertEquals("HandlerMethod", method, ((HandlerMethod) handler).getMethod());
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java
index 5acee2dbd7..5e0f5b2a1d 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java
@@ -45,6 +45,7 @@ public class HeaderResultMatchers {
 	 */
 	public ResultMatcher string(final String name, final Matcher<? super String> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				assertThat("Response header", result.getResponse().getHeader(name), matcher);
 			}
@@ -56,6 +57,7 @@ public class HeaderResultMatchers {
 	 */
 	public ResultMatcher string(final String name, final String value) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				assertEquals("Response header", value, result.getResponse().getHeader(name));
 			}
@@ -67,6 +69,7 @@ public class HeaderResultMatchers {
 	 */
 	public ResultMatcher longValue(final String name, final long value) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				assertEquals("Response header " + name, value, Long.parseLong(result.getResponse().getHeader(name)));
 			}
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
index 0d68d365ac..17e9803808 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java
@@ -49,6 +49,7 @@ public class JsonPathResultMatchers {
 	 */
 	public <T> ResultMatcher value(final Matcher<T> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				jsonPathHelper.assertValue(content, matcher);
@@ -61,6 +62,7 @@ public class JsonPathResultMatchers {
 	 */
 	public ResultMatcher value(final Object expectedValue) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				jsonPathHelper.assertValue(result.getResponse().getContentAsString(), expectedValue);
 			}
@@ -72,6 +74,7 @@ public class JsonPathResultMatchers {
 	 */
 	public ResultMatcher exists() {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				jsonPathHelper.exists(content);
@@ -84,6 +87,7 @@ public class JsonPathResultMatchers {
 	 */
 	public ResultMatcher doesNotExist() {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				jsonPathHelper.doesNotExist(content);
@@ -96,6 +100,7 @@ public class JsonPathResultMatchers {
 	 */
 	public ResultMatcher isArray() {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				jsonPathHelper.assertValueIsArray(content);
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java
index cb491c9537..cfe96ca518 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java
@@ -49,11 +49,13 @@ public abstract class MockMvcResultHandlers {
 		public ConsolePrintingResultHandler() {
 			super(new ResultValuePrinter() {
 
+				@Override
 				public void printHeading(String heading) {
 					System.out.println();
 					System.out.println(String.format("%20s:", heading));
 				}
 
+				@Override
 				public void printValue(String label, Object value) {
 					if (value != null && value.getClass().isArray()) {
 						value = CollectionUtils.arrayToList(value);
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
index fb34c36ffd..1549719598 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java
@@ -81,6 +81,7 @@ public abstract class MockMvcResultMatchers {
 	 */
 	public static ResultMatcher forwardedUrl(final String expectedUrl) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				assertEquals("Forwarded URL", expectedUrl, result.getResponse().getForwardedUrl());
 			}
@@ -92,6 +93,7 @@ public abstract class MockMvcResultMatchers {
 	 */
 	public static ResultMatcher redirectedUrl(final String expectedUrl) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				assertEquals("Redirected URL", expectedUrl, result.getResponse().getRedirectedUrl());
 			}
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..012812f74c 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
@@ -50,6 +50,7 @@ public class ModelResultMatchers {
 	 */
 	public <T> ResultMatcher attribute(final String name, final Matcher<T> matcher) {
 		return new ResultMatcher() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public void match(MvcResult result) throws Exception {
 				ModelAndView mav = getModelAndView(result);
@@ -63,6 +64,7 @@ public class ModelResultMatchers {
 	 */
 	public ResultMatcher attribute(final String name, final Object value) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				ModelAndView mav = getModelAndView(result);
 				assertEquals("Model attribute '" + name + "'", value, mav.getModel().get(name));
@@ -75,6 +77,7 @@ public class ModelResultMatchers {
 	 */
 	public ResultMatcher attributeExists(final String... names) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				ModelAndView mav = getModelAndView(result);
 				for (String name : names) {
@@ -89,6 +92,7 @@ public class ModelResultMatchers {
 	 */
 	public ResultMatcher attributeErrorCount(final String name, final int expectedCount) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				ModelAndView mav = getModelAndView(result);
 				Errors errors = getBindingResult(mav, name);
@@ -103,6 +107,7 @@ public class ModelResultMatchers {
 	 */
 	public ResultMatcher attributeHasErrors(final String... names) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult mvcResult) throws Exception {
 				ModelAndView mav = getModelAndView(mvcResult);
 				for (String name : names) {
@@ -118,6 +123,7 @@ public class ModelResultMatchers {
 	 */
 	public ResultMatcher attributeHasNoErrors(final String... names) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult mvcResult) throws Exception {
 				ModelAndView mav = getModelAndView(mvcResult);
 				for (String name : names) {
@@ -133,6 +139,7 @@ public class ModelResultMatchers {
 	 */
 	public ResultMatcher attributeHasFieldErrors(final String name, final String... fieldNames) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult mvcResult) throws Exception {
 				ModelAndView mav = getModelAndView(mvcResult);
 				BindingResult result = getBindingResult(mav, name);
@@ -150,6 +157,7 @@ public class ModelResultMatchers {
 	 */
 	public <T> ResultMatcher errorCount(final int expectedCount) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				int actualCount = getErrorCount(getModelAndView(result).getModelMap());
 				assertEquals("Binding/validation error count", expectedCount, actualCount);
@@ -162,6 +170,7 @@ public class ModelResultMatchers {
 	 */
 	public <T> ResultMatcher hasErrors() {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				int count = getErrorCount(getModelAndView(result).getModelMap());
 				assertTrue("Expected binding/validation errors", count != 0);
@@ -174,6 +183,7 @@ public class ModelResultMatchers {
 	 */
 	public <T> ResultMatcher hasNoErrors() {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				ModelAndView mav = getModelAndView(result);
 				for (Object value : mav.getModel().values()) {
@@ -191,6 +201,7 @@ public class ModelResultMatchers {
 	 */
 	public <T> ResultMatcher size(final int size) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				ModelAndView mav = getModelAndView(result);
 				int actual = 0;
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..3796841d6a 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
@@ -71,6 +71,7 @@ public class PrintingResultHandler implements ResultHandler {
 	/**
 	 * Print {@link MvcResult} details to the "standard" output stream.
 	 */
+	@Override
 	public final void handle(MvcResult result) throws Exception {
 
 		this.printer.printHeading("MockHttpServletRequest");
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
index 15990939ee..cf929d5efe 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java
@@ -59,6 +59,7 @@ public class RequestResultMatchers {
 	 */
 	public ResultMatcher asyncStarted() {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				HttpServletRequest request = result.getRequest();
 				assertEquals("Async started", true, request.isAsyncStarted());
@@ -72,6 +73,7 @@ public class RequestResultMatchers {
 	 */
 	public ResultMatcher asyncNotStarted() {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				HttpServletRequest request = result.getRequest();
 				assertEquals("Async started", false, request.isAsyncStarted());
@@ -84,6 +86,7 @@ public class RequestResultMatchers {
 	 */
 	public <T> ResultMatcher asyncResult(final Matcher<T> matcher) {
 		return new ResultMatcher() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public void match(MvcResult result) {
 				HttpServletRequest request = result.getRequest();
@@ -101,6 +104,7 @@ public class RequestResultMatchers {
 	 */
 	public <T> ResultMatcher asyncResult(final Object expectedResult) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				HttpServletRequest request = result.getRequest();
 				assertEquals("Async started", true, request.isAsyncStarted());
@@ -114,6 +118,7 @@ public class RequestResultMatchers {
 	 */
 	public <T> ResultMatcher attribute(final String name, final Matcher<T> matcher) {
 		return new ResultMatcher() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public void match(MvcResult result) {
 				T value = (T) result.getRequest().getAttribute(name);
@@ -127,6 +132,7 @@ public class RequestResultMatchers {
 	 */
 	public <T> ResultMatcher attribute(final String name, final Object expectedValue) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				assertEquals("Request attribute", expectedValue, result.getRequest().getAttribute(name));
 			}
@@ -138,6 +144,7 @@ public class RequestResultMatchers {
 	 */
 	public <T> ResultMatcher sessionAttribute(final String name, final Matcher<T> matcher) {
 		return new ResultMatcher() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public void match(MvcResult result) {
 				T value = (T) result.getRequest().getSession().getAttribute(name);
@@ -151,6 +158,7 @@ public class RequestResultMatchers {
 	 */
 	public <T> ResultMatcher sessionAttribute(final String name, final Object value) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				assertEquals("Request attribute", value, result.getRequest().getSession().getAttribute(name));
 			}
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
index 88c4083b6c..b8549bca3b 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
@@ -46,6 +46,7 @@ public class StatusResultMatchers {
 	 */
 	public ResultMatcher is(final Matcher<Integer> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				assertThat("Response status", result.getResponse().getStatus(), matcher);
 			}
@@ -57,6 +58,7 @@ public class StatusResultMatchers {
 	 */
 	public ResultMatcher is(final int status) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				assertEquals("Response status", status, result.getResponse().getStatus());
 			}
@@ -69,6 +71,7 @@ public class StatusResultMatchers {
 	 */
 	public ResultMatcher reason(final Matcher<? super String> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				assertThat("Response status reason", result.getResponse().getErrorMessage(), matcher);
 			}
@@ -80,6 +83,7 @@ public class StatusResultMatchers {
 	 */
 	public ResultMatcher reason(final String reason) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				assertEquals("Response status reason", reason, result.getResponse().getErrorMessage());
 			}
@@ -545,6 +549,7 @@ public class StatusResultMatchers {
 	 */
 	private ResultMatcher matcher(final HttpStatus status) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) {
 				assertEquals("Status", status.value(), result.getResponse().getStatus());
 			}
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java
index f2f5217dfa..c665d7a1d0 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java
@@ -44,6 +44,7 @@ public class ViewResultMatchers {
 	 */
 	public ResultMatcher name(final Matcher<? super String> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				ModelAndView mav = result.getModelAndView();
 				assertTrue("No ModelAndView found", mav != null);
@@ -57,6 +58,7 @@ public class ViewResultMatchers {
 	 */
 	public ResultMatcher name(final String expectedViewName) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				ModelAndView mav = result.getModelAndView();
 				assertTrue("No ModelAndView found", mav != null);
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
index 5e7a75368e..36cdf5fc86 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java
@@ -63,6 +63,7 @@ public class XpathResultMatchers {
 	 */
 	public ResultMatcher node(final Matcher<? super Node> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				xpathHelper.assertNode(content, matcher);
@@ -75,6 +76,7 @@ public class XpathResultMatchers {
 	 */
 	public ResultMatcher exists() {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				xpathHelper.exists(content);
@@ -87,6 +89,7 @@ public class XpathResultMatchers {
 	 */
 	public ResultMatcher doesNotExist() {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				xpathHelper.doesNotExist(content);
@@ -100,6 +103,7 @@ public class XpathResultMatchers {
 	 */
 	public ResultMatcher nodeCount(final Matcher<Integer> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				xpathHelper.assertNodeCount(content, matcher);
@@ -112,6 +116,7 @@ public class XpathResultMatchers {
 	 */
 	public ResultMatcher nodeCount(final int expectedCount) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				xpathHelper.assertNodeCount(content, expectedCount);
@@ -125,6 +130,7 @@ public class XpathResultMatchers {
 	 */
 	public ResultMatcher string(final Matcher<? super String> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				xpathHelper.assertString(content, matcher);
@@ -137,6 +143,7 @@ public class XpathResultMatchers {
 	 */
 	public ResultMatcher string(final String expectedValue) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				xpathHelper.assertString(content, expectedValue);
@@ -150,6 +157,7 @@ public class XpathResultMatchers {
 	 */
 	public ResultMatcher number(final Matcher<? super Double> matcher) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				xpathHelper.assertNumber(content, matcher);
@@ -162,6 +170,7 @@ public class XpathResultMatchers {
 	 */
 	public ResultMatcher number(final Double expectedValue) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				xpathHelper.assertNumber(content, expectedValue);
@@ -174,6 +183,7 @@ public class XpathResultMatchers {
 	 */
 	public ResultMatcher booleanValue(final Boolean value) {
 		return new ResultMatcher() {
+			@Override
 			public void match(MvcResult result) throws Exception {
 				String content = result.getResponse().getContentAsString();
 				xpathHelper.assertBoolean(content, value);
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
index a97b38aeee..57c7d019d0 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java
@@ -181,6 +181,7 @@ public class DefaultMockMvcBuilder<Self extends MockMvcBuilder> extends MockMvcB
 	/**
 	 * Build a {@link MockMvc} instance.
 	 */
+	@Override
 	public final MockMvc build() {
 
 		initWebAppContext(this.webAppContext);
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
index b582b3b68c..29e2845be3 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java
@@ -84,6 +84,7 @@ final class PatternMappingFilterProxy implements Filter {
 		}
 	}
 
+	@Override
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain)
 			throws IOException, ServletException {
 
@@ -119,10 +120,12 @@ final class PatternMappingFilterProxy implements Filter {
 		return false;
 	}
 
+	@Override
 	public void init(FilterConfig filterConfig) throws ServletException {
 		this.delegate.init(filterConfig);
 	}
 
+	@Override
 	public void destroy() {
 		this.delegate.destroy();
 	}
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
index b9597c196e..c7035767e8 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java
@@ -267,6 +267,7 @@ public class StandaloneMockMvcBuilder extends DefaultMockMvcBuilder<StandaloneMo
 		return this;
 	}
 
+	@Override
 	protected void initWebAppContext(WebApplicationContext cxt) {
 		StubWebApplicationContext mockCxt = (StubWebApplicationContext) cxt;
 		registerMvcSingletons(mockCxt);
@@ -412,6 +413,7 @@ public class StandaloneMockMvcBuilder extends DefaultMockMvcBuilder<StandaloneMo
 			this.view = view;
 		}
 
+		@Override
 		public View resolveViewName(String viewName, Locale locale) throws Exception {
 			return this.view;
 		}
diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
index 2856d586cd..b4598b39b2 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java
@@ -89,10 +89,12 @@ class StubWebApplicationContext implements WebApplicationContext {
 	/**
 	 * Returns an instance that can initialize {@link ApplicationContextAware} beans.
 	 */
+	@Override
 	public AutowireCapableBeanFactory getAutowireCapableBeanFactory() throws IllegalStateException {
 		return this.beanFactory;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
@@ -101,26 +103,32 @@ class StubWebApplicationContext implements WebApplicationContext {
 	// Implementation of ApplicationContext interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public String getId() {
 		return this.id;
 	}
 
+	@Override
 	public String getApplicationName() {
 		return "";
 	}
 
+	@Override
 	public String getDisplayName() {
 		return this.displayName;
 	}
 
+	@Override
 	public long getStartupDate() {
 		return this.startupDate;
 	}
 
+	@Override
 	public ApplicationContext getParent() {
 		return null;
 	}
 
+	@Override
 	public Environment getEnvironment() {
 		return this.environment ;
 	}
@@ -140,42 +148,52 @@ class StubWebApplicationContext implements WebApplicationContext {
 	// Implementation of BeanFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public Object getBean(String name) throws BeansException {
 		return this.beanFactory.getBean(name);
 	}
 
+	@Override
 	public <T> T getBean(String name, Class<T> requiredType) throws BeansException {
 		return this.beanFactory.getBean(name, requiredType);
 	}
 
+	@Override
 	public <T> T getBean(Class<T> requiredType) throws BeansException {
 		return this.beanFactory.getBean(requiredType);
 	}
 
+	@Override
 	public Object getBean(String name, Object... args) throws BeansException {
 		return this.beanFactory.getBean(name, args);
 	}
 
+	@Override
 	public boolean containsBean(String name) {
 		return this.beanFactory.containsBean(name);
 	}
 
+	@Override
 	public boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
 		return this.beanFactory.isSingleton(name);
 	}
 
+	@Override
 	public boolean isPrototype(String name) throws NoSuchBeanDefinitionException {
 		return this.beanFactory.isPrototype(name);
 	}
 
+	@Override
 	public boolean isTypeMatch(String name, Class<?> targetType) throws NoSuchBeanDefinitionException {
 		return this.beanFactory.isTypeMatch(name, targetType);
 	}
 
+	@Override
 	public Class<?> getType(String name) throws NoSuchBeanDefinitionException {
 		return this.beanFactory.getType(name);
 	}
 
+	@Override
 	public String[] getAliases(String name) {
 		return this.beanFactory.getAliases(name);
 	}
@@ -184,42 +202,51 @@ class StubWebApplicationContext implements WebApplicationContext {
 	// Implementation of ListableBeanFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public boolean containsBeanDefinition(String beanName) {
 		return this.beanFactory.containsBeanDefinition(beanName);
 	}
 
+	@Override
 	public int getBeanDefinitionCount() {
 		return this.beanFactory.getBeanDefinitionCount();
 	}
 
+	@Override
 	public String[] getBeanDefinitionNames() {
 		return this.beanFactory.getBeanDefinitionNames();
 	}
 
+	@Override
 	public String[] getBeanNamesForType(Class<?> type) {
 		return this.beanFactory.getBeanNamesForType(type);
 	}
 
+	@Override
 	public String[] getBeanNamesForType(Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {
 		return this.beanFactory.getBeanNamesForType(type, includeNonSingletons, allowEagerInit);
 	}
 
+	@Override
 	public <T> Map<String, T> getBeansOfType(Class<T> type) throws BeansException {
 		return this.beanFactory.getBeansOfType(type);
 	}
 
+	@Override
 	public <T> Map<String, T> getBeansOfType(Class<T> type, boolean includeNonSingletons, boolean allowEagerInit)
 			throws BeansException {
 
 		return this.beanFactory.getBeansOfType(type, includeNonSingletons, allowEagerInit);
 	}
 
+	@Override
 	public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> annotationType)
 			throws BeansException {
 
 		return this.beanFactory.getBeansWithAnnotation(annotationType);
 	}
 
+	@Override
 	public <A extends Annotation> A findAnnotationOnBean(String beanName, Class<A> annotationType) {
 		return this.beanFactory.findAnnotationOnBean(beanName, annotationType);
 	}
@@ -228,10 +255,12 @@ class StubWebApplicationContext implements WebApplicationContext {
 	// Implementation of HierarchicalBeanFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public BeanFactory getParentBeanFactory() {
 		return null;
 	}
 
+	@Override
 	public boolean containsLocalBean(String name) {
 		return this.beanFactory.containsBean(name);
 	}
@@ -240,14 +269,17 @@ class StubWebApplicationContext implements WebApplicationContext {
 	// Implementation of MessageSource interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public String getMessage(String code, Object args[], String defaultMessage, Locale locale) {
 		return this.messageSource.getMessage(code, args, defaultMessage, locale);
 	}
 
+	@Override
 	public String getMessage(String code, Object args[], Locale locale) throws NoSuchMessageException {
 		return this.messageSource.getMessage(code, args, locale);
 	}
 
+	@Override
 	public String getMessage(MessageSourceResolvable resolvable, Locale locale) throws NoSuchMessageException {
 		return this.messageSource.getMessage(resolvable, locale);
 	}
@@ -256,10 +288,12 @@ class StubWebApplicationContext implements WebApplicationContext {
 	// Implementation of ResourceLoader interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public ClassLoader getClassLoader() {
 		return null;
 	}
 
+	@Override
 	public Resource getResource(String location) {
 		return this.resourcePatternResolver.getResource(location);
 	}
@@ -268,9 +302,11 @@ class StubWebApplicationContext implements WebApplicationContext {
 	// Other
 	//---------------------------------------------------------------------
 
+	@Override
 	public void publishEvent(ApplicationEvent event) {
 	}
 
+	@Override
 	public Resource[] getResources(String locationPattern) throws IOException {
 		return this.resourcePatternResolver.getResources(locationPattern);
 	}
@@ -283,6 +319,7 @@ class StubWebApplicationContext implements WebApplicationContext {
 	 */
 	private class StubBeanFactory extends StaticListableBeanFactory implements AutowireCapableBeanFactory {
 
+		@Override
 		public Object initializeBean(Object existingBean, String beanName) throws BeansException {
 			if (existingBean instanceof ApplicationContextAware) {
 				((ApplicationContextAware) existingBean).setApplicationContext(StubWebApplicationContext.this);
@@ -290,50 +327,61 @@ class StubWebApplicationContext implements WebApplicationContext {
 			return existingBean;
 		}
 
+		@Override
 		public <T> T createBean(Class<T> beanClass) throws BeansException {
 			throw new UnsupportedOperationException("Bean creation is not supported");
 		}
 
+		@Override
 		@SuppressWarnings("rawtypes")
 		public Object createBean(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
 			throw new UnsupportedOperationException("Bean creation is not supported");
 		}
 
+		@Override
 		@SuppressWarnings("rawtypes")
 		public Object autowire(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
 			return null;
 		}
 
+		@Override
 		public void autowireBean(Object existingBean) throws BeansException {
 			throw new UnsupportedOperationException("Autowiring is not supported");
 		}
 
+		@Override
 		public void autowireBeanProperties(Object existingBean, int autowireMode, boolean dependencyCheck) throws BeansException {
 			throw new UnsupportedOperationException("Autowiring is not supported");
 		}
 
+		@Override
 		public Object configureBean(Object existingBean, String beanName) throws BeansException {
 			throw new UnsupportedOperationException("Configuring a bean is not supported");
 		}
 
+		@Override
 		public Object resolveDependency(DependencyDescriptor descriptor, String beanName) throws BeansException {
 			throw new UnsupportedOperationException("Dependency resolution is not supported");
 		}
 
+		@Override
 		public Object resolveDependency(DependencyDescriptor descriptor, String beanName, Set<String> autowiredBeanNames,
 				TypeConverter typeConverter) throws BeansException {
 			throw new UnsupportedOperationException("Dependency resolution is not supported");
 		}
 
+		@Override
 		public void applyBeanPropertyValues(Object existingBean, String beanName) throws BeansException {
 			throw new UnsupportedOperationException("Bean property initialization is not supported");
 		}
 
+		@Override
 		public Object applyBeanPostProcessorsBeforeInitialization(Object existingBean, String beanName)
 				throws BeansException {
 			throw new UnsupportedOperationException("Post processing is not supported");
 		}
 
+		@Override
 		public Object applyBeanPostProcessorsAfterInitialization(Object existingBean, String beanName)
 				throws BeansException {
 			throw new UnsupportedOperationException("Post processing is not supported");
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..7e62e827fe 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
@@ -45,10 +45,12 @@ public class MockHttpInputMessage implements HttpInputMessage {
 		this.body = body;
 	}
 
+	@Override
 	public HttpHeaders getHeaders() {
 		return this.headers;
 	}
 
+	@Override
 	public InputStream getBody() throws IOException {
 		return this.body;
 	}
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..8f31f553bb 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
@@ -42,6 +42,7 @@ public class MockHttpOutputMessage implements HttpOutputMessage {
 	/**
 	 * Return the headers.
 	 */
+	@Override
 	public HttpHeaders getHeaders() {
 		return this.headers;
 	}
@@ -49,6 +50,7 @@ public class MockHttpOutputMessage implements HttpOutputMessage {
 	/**
 	 * Return the body content.
 	 */
+	@Override
 	public OutputStream getBody() throws IOException {
 		return this.body;
 	}
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..c6896d277c 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
@@ -56,6 +56,7 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie
 		this.uri = uri;
 	}
 
+	@Override
 	public URI getURI() {
 		return this.uri;
 	}
@@ -64,6 +65,7 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie
 		this.uri = uri;
 	}
 
+	@Override
 	public HttpMethod getMethod() {
 		return this.httpMethod;
 	}
@@ -85,6 +87,7 @@ public class MockClientHttpRequest extends MockHttpOutputMessage implements Clie
 	 * configured {@link #setResponse(ClientHttpResponse) response}.
 	 * @see #executeInternal()
 	 */
+	@Override
 	public final ClientHttpResponse execute() throws IOException {
 		this.executed = true;
 		return executeInternal();
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..64b229e558 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
@@ -52,18 +52,22 @@ public class MockClientHttpResponse extends MockHttpInputMessage implements Clie
 		this.status = statusCode;
 	}
 
+	@Override
 	public HttpStatus getStatusCode() throws IOException {
 		return this.status;
 	}
 
+	@Override
 	public int getRawStatusCode() throws IOException {
 		return this.status.value();
 	}
 
+	@Override
 	public String getStatusText() throws IOException {
 		return this.status.getReasonPhrase();
 	}
 
+	@Override
 	public void close() {
 	}
 
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
index b19aaf5c54..7bffe4de13 100644
--- a/spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
@@ -67,6 +67,7 @@ public class ExpectedLookupTemplate extends JndiTemplate {
 	 * object provided in the constructor. If the name is unexpected, a
 	 * respective NamingException gets thrown.
 	 */
+	@Override
 	public Object lookup(String name) throws NamingException {
 		Object object = this.jndiObjects.get(name);
 		if (object == null) {
diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
index d35fbdc865..4e1641b2cd 100644
--- a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java
@@ -91,6 +91,7 @@ public class SimpleNamingContext implements Context {
 
 	// Actual implementations of Context methods follow
 
+	@Override
 	public NamingEnumeration<NameClassPair> list(String root) throws NamingException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Listing name/class pairs under [" + root + "]");
@@ -98,6 +99,7 @@ public class SimpleNamingContext implements Context {
 		return new NameClassPairEnumeration(this, root);
 	}
 
+	@Override
 	public NamingEnumeration<Binding> listBindings(String root) throws NamingException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Listing bindings under [" + root + "]");
@@ -111,6 +113,7 @@ public class SimpleNamingContext implements Context {
 	 * Will be used by any standard InitialContext JNDI lookups.
 	 * @throws javax.naming.NameNotFoundException if the object could not be found
 	 */
+	@Override
 	public Object lookup(String lookupName) throws NameNotFoundException {
 		String name = this.root + lookupName;
 		if (logger.isDebugEnabled()) {
@@ -136,6 +139,7 @@ public class SimpleNamingContext implements Context {
 		return found;
 	}
 
+	@Override
 	public Object lookupLink(String name) throws NameNotFoundException {
 		return lookup(name);
 	}
@@ -147,6 +151,7 @@ public class SimpleNamingContext implements Context {
 	 * Use SimpleNamingContextBuilder to set up JNDI bindings then.
 	 * @see org.springframework.mock.jndi.SimpleNamingContextBuilder#bind
 	 */
+	@Override
 	public void bind(String name, Object obj) {
 		if (logger.isInfoEnabled()) {
 			logger.info("Static JNDI binding: [" + this.root + name + "] = [" + obj + "]");
@@ -154,6 +159,7 @@ public class SimpleNamingContext implements Context {
 		this.boundObjects.put(this.root + name, obj);
 	}
 
+	@Override
 	public void unbind(String name) {
 		if (logger.isInfoEnabled()) {
 			logger.info("Static JNDI remove: [" + this.root + name + "]");
@@ -161,16 +167,19 @@ public class SimpleNamingContext implements Context {
 		this.boundObjects.remove(this.root + name);
 	}
 
+	@Override
 	public void rebind(String name, Object obj) {
 		bind(name, obj);
 	}
 
+	@Override
 	public void rename(String oldName, String newName) throws NameNotFoundException {
 		Object obj = lookup(oldName);
 		unbind(oldName);
 		bind(newName, obj);
 	}
 
+	@Override
 	public Context createSubcontext(String name) {
 		String subcontextName = this.root + name;
 		if (!subcontextName.endsWith("/")) {
@@ -181,84 +190,104 @@ public class SimpleNamingContext implements Context {
 		return subcontext;
 	}
 
+	@Override
 	public void destroySubcontext(String name) {
 		unbind(name);
 	}
 
+	@Override
 	public String composeName(String name, String prefix) {
 		return prefix + name;
 	}
 
+	@Override
 	public Hashtable<String, Object> getEnvironment() {
 		return this.environment;
 	}
 
+	@Override
 	public Object addToEnvironment(String propName, Object propVal) {
 		return this.environment.put(propName, propVal);
 	}
 
+	@Override
 	public Object removeFromEnvironment(String propName) {
 		return this.environment.remove(propName);
 	}
 
+	@Override
 	public void close() {
 	}
 
 
 	// Unsupported methods follow: no support for javax.naming.Name
 
+	@Override
 	public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Object lookup(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Object lookupLink(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void bind(Name name, Object obj) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void unbind(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void rebind(Name name, Object obj) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void rename(Name oldName, Name newName) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Context createSubcontext(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public void destroySubcontext(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public String getNameInNamespace() throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public NameParser getNameParser(Name name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public NameParser getNameParser(String name) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
 
+	@Override
 	public Name composeName(Name name, Name prefix) throws NamingException {
 		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
 	}
@@ -298,22 +327,27 @@ public class SimpleNamingContext implements Context {
 
 		protected abstract T createObject(String strippedName, Object obj);
 
+		@Override
 		public boolean hasMore() {
 			return this.iterator.hasNext();
 		}
 
+		@Override
 		public T next() {
 			return this.iterator.next();
 		}
 
+		@Override
 		public boolean hasMoreElements() {
 			return this.iterator.hasNext();
 		}
 
+		@Override
 		public T nextElement() {
 			return this.iterator.next();
 		}
 
+		@Override
 		public void close() {
 		}
 	}
@@ -325,6 +359,7 @@ public class SimpleNamingContext implements Context {
 			super(context, root);
 		}
 
+		@Override
 		protected NameClassPair createObject(String strippedName, Object obj) {
 			return new NameClassPair(strippedName, obj.getClass().getName());
 		}
@@ -337,6 +372,7 @@ public class SimpleNamingContext implements Context {
 			super(context, root);
 		}
 
+		@Override
 		protected Binding createObject(String strippedName, Object obj) {
 			return new Binding(strippedName, obj);
 		}
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 449c45faca..883db7bfd3 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
@@ -192,6 +192,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 	 * creating a new SimpleNamingContext instance.
 	 * @see SimpleNamingContext
 	 */
+	@Override
 	public InitialContextFactory createInitialContextFactory(Hashtable<?,?> environment) {
 		if (activated == null && environment != null) {
 			Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY);
@@ -225,6 +226,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder
 
 		// Default case...
 		return new InitialContextFactory() {
+			@Override
 			@SuppressWarnings("unchecked")
 			public Context getInitialContext(Hashtable<?,?> environment) {
 				return new SimpleNamingContext("", boundObjects, (Hashtable<String, Object>) environment);
diff --git a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
index f97e60e2eb..1b8cf3eeba 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java
@@ -54,10 +54,12 @@ public class DelegatingServletInputStream extends ServletInputStream {
 	}
 
 
+	@Override
 	public int read() throws IOException {
 		return this.sourceStream.read();
 	}
 
+	@Override
 	public void close() throws IOException {
 		super.close();
 		this.sourceStream.close();
diff --git a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
index 2369417030..d580974a60 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java
@@ -54,15 +54,18 @@ public class DelegatingServletOutputStream extends ServletOutputStream {
 	}
 
 
+	@Override
 	public void write(int b) throws IOException {
 		this.targetStream.write(b);
 	}
 
+	@Override
 	public void flush() throws IOException {
 		super.flush();
 		this.targetStream.flush();
 	}
 
+	@Override
 	public void close() throws IOException {
 		super.close();
 		this.targetStream.close();
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java b/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java
index 3fb6ca7703..61aa61c0e8 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java
@@ -77,14 +77,17 @@ public class MockBodyContent extends BodyContent {
 	}
 
 
+	@Override
 	public Reader getReader() {
 		return new StringReader(this.content);
 	}
 
+	@Override
 	public String getString() {
 		return this.content;
 	}
 
+	@Override
 	public void writeOut(Writer writer) throws IOException {
 		writer.write(this.content);
 	}
@@ -94,102 +97,127 @@ public class MockBodyContent extends BodyContent {
 	// Delegating implementations of JspWriter's abstract methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void clear() throws IOException {
 		getEnclosingWriter().clear();
 	}
 
+	@Override
 	public void clearBuffer() throws IOException {
 		getEnclosingWriter().clearBuffer();
 	}
 
+	@Override
 	public void close() throws IOException {
 		getEnclosingWriter().close();
 	}
 
+	@Override
 	public int getRemaining() {
 		return getEnclosingWriter().getRemaining();
 	}
 
+	@Override
 	public void newLine() throws IOException {
 		getEnclosingWriter().println();
 	}
 
+	@Override
 	public void write(char value[], int offset, int length) throws IOException {
 		getEnclosingWriter().write(value, offset, length);
 	}
 
+	@Override
 	public void print(boolean value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(char value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(char[] value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(double value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(float value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(int value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(long value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(Object value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void print(String value) throws IOException {
 		getEnclosingWriter().print(value);
 	}
 
+	@Override
 	public void println() throws IOException {
 		getEnclosingWriter().println();
 	}
 
+	@Override
 	public void println(boolean value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(char value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(char[] value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(double value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(float value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(int value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(long value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(Object value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
 
+	@Override
 	public void println(String value) throws IOException {
 		getEnclosingWriter().println(value);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java b/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
index 6b69fdb704..f1c08e2774 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java
@@ -56,18 +56,21 @@ public class MockExpressionEvaluator extends ExpressionEvaluator {
 		this.pageContext = pageContext;
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Expression parseExpression(final String expression, final Class expectedType,
 			final FunctionMapper functionMapper) throws ELException {
 
 		return new Expression() {
 
+			@Override
 			public Object evaluate(VariableResolver variableResolver) throws ELException {
 				return doEvaluate(expression, expectedType, functionMapper);
 			}
 		};
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Object evaluate(String expression, Class expectedType, VariableResolver variableResolver,
 			FunctionMapper functionMapper) throws ELException {
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockFilterChain.java b/spring-test/src/main/java/org/springframework/mock/web/MockFilterChain.java
index a80a2fb454..503c51f901 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockFilterChain.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockFilterChain.java
@@ -119,6 +119,7 @@ public class MockFilterChain implements FilterChain {
 	 * Invoke registered {@link Filter}s and/or {@link Servlet} also saving the
 	 * request and response.
 	 */
+	@Override
 	public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
@@ -162,15 +163,18 @@ public class MockFilterChain implements FilterChain {
 			this.delegateServlet = servlet;
 		}
 
+		@Override
 		public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
 				throws IOException, ServletException {
 
 			this.delegateServlet.service(request, response);
 		}
 
+		@Override
 		public void init(FilterConfig filterConfig) throws ServletException {
 		}
 
+		@Override
 		public void destroy() {
 		}
 
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java b/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java
index 34cafd55fc..2de79f09c2 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java
@@ -79,10 +79,12 @@ public class MockFilterConfig implements FilterConfig {
 	}
 
 
+	@Override
 	public String getFilterName() {
 		return filterName;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return servletContext;
 	}
@@ -92,11 +94,13 @@ public class MockFilterConfig implements FilterConfig {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
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 441a53e4ce..044d382d45 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
@@ -283,20 +283,24 @@ public class MockHttpServletRequest implements HttpServletRequest {
 	// ServletRequest interface
 	// ---------------------------------------------------------------------
 
+	@Override
 	public Object getAttribute(String name) {
 		checkActive();
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		checkActive();
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
 
+	@Override
 	public void setCharacterEncoding(String characterEncoding) {
 		this.characterEncoding = characterEncoding;
 		updateContentTypeHeader();
@@ -316,6 +320,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.content = content;
 	}
 
+	@Override
 	public int getContentLength() {
 		return (this.content != null ? this.content.length : -1);
 	}
@@ -332,10 +337,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public ServletInputStream getInputStream() {
 		if (this.content != null) {
 			return new DelegatingServletInputStream(new ByteArrayInputStream(this.content));
@@ -455,21 +462,25 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.parameters.clear();
 	}
 
+	@Override
 	public String getParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		String[] arr = this.parameters.get(name);
 		return (arr != null && arr.length > 0 ? arr[0] : null);
 	}
 
+	@Override
 	public Enumeration<String> getParameterNames() {
 		return Collections.enumeration(this.parameters.keySet());
 	}
 
+	@Override
 	public String[] getParameterValues(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.parameters.get(name);
 	}
 
+	@Override
 	public Map<String, String[]> getParameterMap() {
 		return Collections.unmodifiableMap(this.parameters);
 	}
@@ -478,6 +489,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.protocol = protocol;
 	}
 
+	@Override
 	public String getProtocol() {
 		return this.protocol;
 	}
@@ -486,6 +498,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.scheme = scheme;
 	}
 
+	@Override
 	public String getScheme() {
 		return this.scheme;
 	}
@@ -494,6 +507,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.serverName = serverName;
 	}
 
+	@Override
 	public String getServerName() {
 		return this.serverName;
 	}
@@ -502,10 +516,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.serverPort = serverPort;
 	}
 
+	@Override
 	public int getServerPort() {
 		return this.serverPort;
 	}
 
+	@Override
 	public BufferedReader getReader() throws UnsupportedEncodingException {
 		if (this.content != null) {
 			InputStream sourceStream = new ByteArrayInputStream(this.content);
@@ -522,6 +538,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remoteAddr = remoteAddr;
 	}
 
+	@Override
 	public String getRemoteAddr() {
 		return this.remoteAddr;
 	}
@@ -530,10 +547,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remoteHost = remoteHost;
 	}
 
+	@Override
 	public String getRemoteHost() {
 		return this.remoteHost;
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		checkActive();
 		Assert.notNull(name, "Attribute name must not be null");
@@ -545,6 +564,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		checkActive();
 		Assert.notNull(name, "Attribute name must not be null");
@@ -579,10 +599,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.locales.addAll(locales);
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locales.get(0);
 	}
 
+	@Override
 	public Enumeration<Locale> getLocales() {
 		return Collections.enumeration(this.locales);
 	}
@@ -591,14 +613,17 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.secure = secure;
 	}
 
+	@Override
 	public boolean isSecure() {
 		return this.secure;
 	}
 
+	@Override
 	public RequestDispatcher getRequestDispatcher(String path) {
 		return new MockRequestDispatcher(path);
 	}
 
+	@Override
 	public String getRealPath(String path) {
 		return this.servletContext.getRealPath(path);
 	}
@@ -607,6 +632,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remotePort = remotePort;
 	}
 
+	@Override
 	public int getRemotePort() {
 		return this.remotePort;
 	}
@@ -615,6 +641,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.localName = localName;
 	}
 
+	@Override
 	public String getLocalName() {
 		return this.localName;
 	}
@@ -623,6 +650,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.localAddr = localAddr;
 	}
 
+	@Override
 	public String getLocalAddr() {
 		return this.localAddr;
 	}
@@ -631,6 +659,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.localPort = localPort;
 	}
 
+	@Override
 	public int getLocalPort() {
 		return this.localPort;
 	}
@@ -643,6 +672,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.authType = authType;
 	}
 
+	@Override
 	public String getAuthType() {
 		return this.authType;
 	}
@@ -651,6 +681,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.cookies = cookies;
 	}
 
+	@Override
 	public Cookie[] getCookies() {
 		return this.cookies;
 	}
@@ -699,6 +730,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public long getDateHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		Object value = (header != null ? header.getValue() : null);
@@ -717,20 +749,24 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public String getHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		return (header != null ? header.getStringValue() : null);
 	}
 
+	@Override
 	public Enumeration<String> getHeaders(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		return Collections.enumeration(header != null ? header.getStringValues() : new LinkedList<String>());
 	}
 
+	@Override
 	public Enumeration<String> getHeaderNames() {
 		return Collections.enumeration(this.headers.keySet());
 	}
 
+	@Override
 	public int getIntHeader(String name) {
 		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
 		Object value = (header != null ? header.getValue() : null);
@@ -752,6 +788,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.method = method;
 	}
 
+	@Override
 	public String getMethod() {
 		return this.method;
 	}
@@ -760,10 +797,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.pathInfo = pathInfo;
 	}
 
+	@Override
 	public String getPathInfo() {
 		return this.pathInfo;
 	}
 
+	@Override
 	public String getPathTranslated() {
 		return (this.pathInfo != null ? getRealPath(this.pathInfo) : null);
 	}
@@ -772,6 +811,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.contextPath = contextPath;
 	}
 
+	@Override
 	public String getContextPath() {
 		return this.contextPath;
 	}
@@ -780,6 +820,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.queryString = queryString;
 	}
 
+	@Override
 	public String getQueryString() {
 		return this.queryString;
 	}
@@ -788,6 +829,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.remoteUser = remoteUser;
 	}
 
+	@Override
 	public String getRemoteUser() {
 		return this.remoteUser;
 	}
@@ -796,6 +838,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.userRoles.add(role);
 	}
 
+	@Override
 	public boolean isUserInRole(String role) {
 		return (this.userRoles.contains(role) || (this.servletContext instanceof MockServletContext && ((MockServletContext) this.servletContext).getDeclaredRoles().contains(
 			role)));
@@ -805,6 +848,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.userPrincipal = userPrincipal;
 	}
 
+	@Override
 	public Principal getUserPrincipal() {
 		return this.userPrincipal;
 	}
@@ -813,6 +857,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionId = requestedSessionId;
 	}
 
+	@Override
 	public String getRequestedSessionId() {
 		return this.requestedSessionId;
 	}
@@ -821,10 +866,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestURI = requestURI;
 	}
 
+	@Override
 	public String getRequestURI() {
 		return this.requestURI;
 	}
 
+	@Override
 	public StringBuffer getRequestURL() {
 		StringBuffer url = new StringBuffer(this.scheme);
 		url.append("://").append(this.serverName).append(':').append(this.serverPort);
@@ -836,6 +883,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.servletPath = servletPath;
 	}
 
+	@Override
 	public String getServletPath() {
 		return this.servletPath;
 	}
@@ -848,6 +896,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		}
 	}
 
+	@Override
 	public HttpSession getSession(boolean create) {
 		checkActive();
 		// Reset session if invalidated.
@@ -861,6 +910,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		return this.session;
 	}
 
+	@Override
 	public HttpSession getSession() {
 		return getSession(true);
 	}
@@ -869,6 +919,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionIdValid = requestedSessionIdValid;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdValid() {
 		return this.requestedSessionIdValid;
 	}
@@ -877,6 +928,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionIdFromCookie = requestedSessionIdFromCookie;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdFromCookie() {
 		return this.requestedSessionIdFromCookie;
 	}
@@ -885,10 +937,12 @@ public class MockHttpServletRequest implements HttpServletRequest {
 		this.requestedSessionIdFromURL = requestedSessionIdFromURL;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdFromURL() {
 		return this.requestedSessionIdFromURL;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdFromUrl() {
 		return isRequestedSessionIdFromURL();
 	}
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 c86e95a93a..5a2b7fd1aa 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
@@ -136,6 +136,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.writerAccessAllowed;
 	}
 
+	@Override
 	public void setCharacterEncoding(String characterEncoding) {
 		this.characterEncoding = characterEncoding;
 		this.charset = true;
@@ -152,10 +153,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
 
+	@Override
 	public ServletOutputStream getOutputStream() {
 		if (!this.outputStreamAccessAllowed) {
 			throw new IllegalStateException("OutputStream access not allowed");
@@ -163,6 +166,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.outputStream;
 	}
 
+	@Override
 	public PrintWriter getWriter() throws UnsupportedEncodingException {
 		if (!this.writerAccessAllowed) {
 			throw new IllegalStateException("Writer access not allowed");
@@ -186,6 +190,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 				this.content.toString(this.characterEncoding) : this.content.toString();
 	}
 
+	@Override
 	public void setContentLength(int contentLength) {
 		this.contentLength = contentLength;
 		doAddHeaderValue(CONTENT_LENGTH_HEADER, contentLength, true);
@@ -195,6 +200,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return this.contentLength;
 	}
 
+	@Override
 	public void setContentType(String contentType) {
 		this.contentType = contentType;
 		if (contentType != null) {
@@ -208,22 +214,27 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public void setBufferSize(int bufferSize) {
 		this.bufferSize = bufferSize;
 	}
 
+	@Override
 	public int getBufferSize() {
 		return this.bufferSize;
 	}
 
+	@Override
 	public void flushBuffer() {
 		setCommitted(true);
 	}
 
+	@Override
 	public void resetBuffer() {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot reset buffer - response is already committed");
@@ -242,10 +253,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		this.committed = committed;
 	}
 
+	@Override
 	public boolean isCommitted() {
 		return this.committed;
 	}
 
+	@Override
 	public void reset() {
 		resetBuffer();
 		this.characterEncoding = null;
@@ -258,10 +271,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		this.errorMessage = null;
 	}
 
+	@Override
 	public void setLocale(Locale locale) {
 		this.locale = locale;
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locale;
 	}
@@ -271,6 +286,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	// HttpServletResponse interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public void addCookie(Cookie cookie) {
 		Assert.notNull(cookie, "Cookie must not be null");
 		this.cookies.add(cookie);
@@ -290,6 +306,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return null;
 	}
 
+	@Override
 	public boolean containsHeader(String name) {
 		return (HeaderValueHolder.getByName(this.headers, name) != null);
 	}
@@ -365,6 +382,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * The default implementation returns the given URL String as-is.
 	 * <p>Can be overridden in subclasses, appending a session id or the like.
 	 */
+	@Override
 	public String encodeURL(String url) {
 		return url;
 	}
@@ -377,18 +395,22 @@ public class MockHttpServletResponse implements HttpServletResponse {
 	 * override the common {@link #encodeURL} method instead, applying
 	 * to redirect URLs as well as to general URLs.
 	 */
+	@Override
 	public String encodeRedirectURL(String url) {
 		return encodeURL(url);
 	}
 
+	@Override
 	public String encodeUrl(String url) {
 		return encodeURL(url);
 	}
 
+	@Override
 	public String encodeRedirectUrl(String url) {
 		return encodeRedirectURL(url);
 	}
 
+	@Override
 	public void sendError(int status, String errorMessage) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot set error status - response is already committed");
@@ -398,6 +420,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		setCommitted(true);
 	}
 
+	@Override
 	public void sendError(int status) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot set error status - response is already committed");
@@ -406,6 +429,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		setCommitted(true);
 	}
 
+	@Override
 	public void sendRedirect(String url) throws IOException {
 		if (isCommitted()) {
 			throw new IllegalStateException("Cannot send redirect - response is already committed");
@@ -420,26 +444,32 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		return getHeader(LOCATION_HEADER);
 	}
 
+	@Override
 	public void setDateHeader(String name, long value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addDateHeader(String name, long value) {
 		addHeaderValue(name, value);
 	}
 
+	@Override
 	public void setHeader(String name, String value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addHeader(String name, String value) {
 		addHeaderValue(name, value);
 	}
 
+	@Override
 	public void setIntHeader(String name, int value) {
 		setHeaderValue(name, value);
 	}
 
+	@Override
 	public void addIntHeader(String name, int value) {
 		addHeaderValue(name, value);
 	}
@@ -487,10 +517,12 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		}
 	}
 
+	@Override
 	public void setStatus(int status) {
 		this.status = status;
 	}
 
+	@Override
 	public void setStatus(int status, String errorMessage) {
 		this.status = status;
 		this.errorMessage = errorMessage;
@@ -553,12 +585,14 @@ public class MockHttpServletResponse implements HttpServletResponse {
 			super(out);
 		}
 
+		@Override
 		public void write(int b) throws IOException {
 			super.write(b);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void flush() throws IOException {
 			super.flush();
 			setCommitted(true);
@@ -576,24 +610,28 @@ public class MockHttpServletResponse implements HttpServletResponse {
 			super(out, true);
 		}
 
+		@Override
 		public void write(char buf[], int off, int len) {
 			super.write(buf, off, len);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void write(String s, int off, int len) {
 			super.write(s, off, len);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void write(int c) {
 			super.write(c);
 			super.flush();
 			setCommittedIfBufferSizeExceeded();
 		}
 
+		@Override
 		public void flush() {
 			super.flush();
 			setCommitted(true);
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java
index 1855230d2c..82a89b61a3 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java
@@ -98,10 +98,12 @@ public class MockHttpSession implements HttpSession {
 		this.id = (id != null ? id : Integer.toString(nextId++));
 	}
 
+	@Override
 	public long getCreationTime() {
 		return this.creationTime;
 	}
 
+	@Override
 	public String getId() {
 		return this.id;
 	}
@@ -111,43 +113,53 @@ public class MockHttpSession implements HttpSession {
 		this.isNew = false;
 	}
 
+	@Override
 	public long getLastAccessedTime() {
 		return this.lastAccessedTime;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
 
+	@Override
 	public void setMaxInactiveInterval(int interval) {
 		this.maxInactiveInterval = interval;
 	}
 
+	@Override
 	public int getMaxInactiveInterval() {
 		return this.maxInactiveInterval;
 	}
 
+	@Override
 	public HttpSessionContext getSessionContext() {
 		throw new UnsupportedOperationException("getSessionContext");
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Object getValue(String name) {
 		return getAttribute(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	public String[] getValueNames() {
 		return this.attributes.keySet().toArray(new String[this.attributes.size()]);
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		Assert.notNull(name, "Attribute name must not be null");
 		if (value != null) {
@@ -161,10 +173,12 @@ public class MockHttpSession implements HttpSession {
 		}
 	}
 
+	@Override
 	public void putValue(String name, Object value) {
 		setAttribute(name, value);
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		Object value = this.attributes.remove(name);
@@ -173,6 +187,7 @@ public class MockHttpSession implements HttpSession {
 		}
 	}
 
+	@Override
 	public void removeValue(String name) {
 		removeAttribute(name);
 	}
@@ -197,6 +212,7 @@ public class MockHttpSession implements HttpSession {
 	 *
 	 * @throws IllegalStateException if this method is called on an already invalidated session
 	 */
+	@Override
 	public void invalidate() {
 		if (this.invalid) {
 			throw new IllegalStateException("The session has already been invalidated");
@@ -215,6 +231,7 @@ public class MockHttpSession implements HttpSession {
 		this.isNew = value;
 	}
 
+	@Override
 	public boolean isNew() {
 		return this.isNew;
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java b/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java
index 1d5bf928bf..4dfb1e7971 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java
@@ -82,6 +82,7 @@ public class MockJspWriter extends JspWriter {
 	}
 
 
+	@Override
 	public void clear() throws IOException {
 		if (this.response.isCommitted()) {
 			throw new IOException("Response already committed");
@@ -89,101 +90,126 @@ public class MockJspWriter extends JspWriter {
 		this.response.resetBuffer();
 	}
 
+	@Override
 	public void clearBuffer() throws IOException {
 	}
 
+	@Override
 	public void flush() throws IOException {
 		this.response.flushBuffer();
 	}
 
+	@Override
 	public void close() throws IOException {
 		flush();
 	}
 
+	@Override
 	public int getRemaining() {
 		return Integer.MAX_VALUE;
 	}
 
+	@Override
 	public void newLine() throws IOException {
 		getTargetWriter().println();
 	}
 
+	@Override
 	public void write(char value[], int offset, int length) throws IOException {
 		getTargetWriter().write(value, offset, length);
 	}
 
+	@Override
 	public void print(boolean value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(char value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(char[] value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(double value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(float value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(int value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(long value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(Object value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void print(String value) throws IOException {
 		getTargetWriter().print(value);
 	}
 
+	@Override
 	public void println() throws IOException {
 		getTargetWriter().println();
 	}
 
+	@Override
 	public void println(boolean value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(char value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(char[] value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(double value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(float value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(int value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(long value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(Object value) throws IOException {
 		getTargetWriter().println(value);
 	}
 
+	@Override
 	public void println(String value) throws IOException {
 		getTargetWriter().println(value);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartFile.java b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartFile.java
index fb57d1f1fc..7cff3fd2bd 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartFile.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartFile.java
@@ -96,34 +96,42 @@ public class MockMultipartFile implements MultipartFile {
 		this(name, originalFilename, contentType, FileCopyUtils.copyToByteArray(contentStream));
 	}
 
+	@Override
 	public String getName() {
 		return this.name;
 	}
 
+	@Override
 	public String getOriginalFilename() {
 		return this.originalFilename;
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return (this.content.length == 0);
 	}
 
+	@Override
 	public long getSize() {
 		return this.content.length;
 	}
 
+	@Override
 	public byte[] getBytes() throws IOException {
 		return this.content;
 	}
 
+	@Override
 	public InputStream getInputStream() throws IOException {
 		return new ByteArrayInputStream(this.content);
 	}
 
+	@Override
 	public void transferTo(File dest) throws IOException, IllegalStateException {
 		FileCopyUtils.copy(this.content, dest);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
index b01c4fdcf8..0d3f64f0c6 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
@@ -66,14 +66,17 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
 		this.multipartFiles.add(file.getName(), file);
 	}
 
+	@Override
 	public Iterator<String> getFileNames() {
 		return this.multipartFiles.keySet().iterator();
 	}
 
+	@Override
 	public MultipartFile getFile(String name) {
 		return this.multipartFiles.getFirst(name);
 	}
 
+	@Override
 	public List<MultipartFile> getFiles(String name) {
 		List<MultipartFile> multipartFiles = this.multipartFiles.get(name);
 		if (multipartFiles != null) {
@@ -84,14 +87,17 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
 		}
 	}
 
+	@Override
 	public Map<String, MultipartFile> getFileMap() {
 		return this.multipartFiles.toSingleValueMap();
 	}
 
+	@Override
 	public MultiValueMap<String, MultipartFile> getMultiFileMap() {
 		return new LinkedMultiValueMap<String, MultipartFile>(this.multipartFiles);
 	}
 
+	@Override
 	public String getMultipartContentType(String paramOrFileName) {
 		MultipartFile file = getFile(paramOrFileName);
 		if (file != null) {
@@ -102,10 +108,12 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
 		}
 	}
 
+	@Override
 	public HttpMethod getRequestMethod() {
 		return HttpMethod.valueOf(getMethod());
 	}
 
+	@Override
 	public HttpHeaders getRequestHeaders() {
 		HttpHeaders headers = new HttpHeaders();
 		Enumeration<String> headerNames = getHeaderNames();
@@ -116,6 +124,7 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl
 		return headers;
 	}
 
+	@Override
 	public HttpHeaders getMultipartHeaders(String paramOrFileName) {
 		String contentType = getMultipartContentType(paramOrFileName);
 		if (contentType != null) {
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
index b492c1fa98..72202495b7 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
@@ -126,6 +126,7 @@ public class MockPageContext extends PageContext {
 	}
 
 
+	@Override
 	public void initialize(
 			Servlet servlet, ServletRequest request, ServletResponse response,
 			String errorPageURL, boolean needsSession, int bufferSize, boolean autoFlush) {
@@ -133,9 +134,11 @@ public class MockPageContext extends PageContext {
 		throw new UnsupportedOperationException("Use appropriate constructor");
 	}
 
+	@Override
 	public void release() {
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		Assert.notNull(name, "Attribute name must not be null");
 		if (value != null) {
@@ -146,6 +149,7 @@ public class MockPageContext extends PageContext {
 		}
 	}
 
+	@Override
 	public void setAttribute(String name, Object value, int scope) {
 		Assert.notNull(name, "Attribute name must not be null");
 		switch (scope) {
@@ -166,11 +170,13 @@ public class MockPageContext extends PageContext {
 		}
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Object getAttribute(String name, int scope) {
 		Assert.notNull(name, "Attribute name must not be null");
 		switch (scope) {
@@ -188,6 +194,7 @@ public class MockPageContext extends PageContext {
 		}
 	}
 
+	@Override
 	public Object findAttribute(String name) {
 		Object value = getAttribute(name);
 		if (value == null) {
@@ -202,6 +209,7 @@ public class MockPageContext extends PageContext {
 		return value;
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		this.removeAttribute(name, PageContext.PAGE_SCOPE);
@@ -210,6 +218,7 @@ public class MockPageContext extends PageContext {
 		this.removeAttribute(name, PageContext.APPLICATION_SCOPE);
 	}
 
+	@Override
 	public void removeAttribute(String name, int scope) {
 		Assert.notNull(name, "Attribute name must not be null");
 		switch (scope) {
@@ -230,6 +239,7 @@ public class MockPageContext extends PageContext {
 		}
 	}
 
+	@Override
 	public int getAttributesScope(String name) {
 		if (getAttribute(name) != null) {
 			return PAGE_SCOPE;
@@ -252,6 +262,7 @@ public class MockPageContext extends PageContext {
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Enumeration<String> getAttributeNamesInScope(int scope) {
 		switch (scope) {
@@ -269,6 +280,7 @@ public class MockPageContext extends PageContext {
 		}
 	}
 
+	@Override
 	public JspWriter getOut() {
 		if (this.out == null) {
 			this.out = new MockJspWriter(this.response);
@@ -276,54 +288,67 @@ public class MockPageContext extends PageContext {
 		return this.out;
 	}
 
+	@Override
 	public ExpressionEvaluator getExpressionEvaluator() {
 		return new MockExpressionEvaluator(this);
 	}
 
+	@Override
 	public ELContext getELContext() {
 		return null;
 	}
 
+	@Override
 	public VariableResolver getVariableResolver() {
 		return null;
 	}
 
+	@Override
 	public HttpSession getSession() {
 		return this.request.getSession();
 	}
 
+	@Override
 	public Object getPage() {
 		return this;
 	}
 
+	@Override
 	public ServletRequest getRequest() {
 		return this.request;
 	}
 
+	@Override
 	public ServletResponse getResponse() {
 		return this.response;
 	}
 
+	@Override
 	public Exception getException() {
 		return null;
 	}
 
+	@Override
 	public ServletConfig getServletConfig() {
 		return this.servletConfig;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
 
+	@Override
 	public void forward(String path) throws ServletException, IOException {
 		this.request.getRequestDispatcher(path).forward(this.request, this.response);
 	}
 
+	@Override
 	public void include(String path) throws ServletException, IOException {
 		this.request.getRequestDispatcher(path).include(this.request, this.response);
 	}
 
+	@Override
 	public void include(String path, boolean flush) throws ServletException, IOException {
 		this.request.getRequestDispatcher(path).include(this.request, this.response);
 		if (flush) {
@@ -341,10 +366,12 @@ public class MockPageContext extends PageContext {
 		return ((MockHttpServletResponse) this.response).getContentAsString();
 	}
 
+	@Override
 	public void handlePageException(Exception ex) throws ServletException, IOException {
 		throw new ServletException("Page exception", ex);
 	}
 
+	@Override
 	public void handlePageException(Throwable ex) throws ServletException, IOException {
 		throw new ServletException("Page exception", ex);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockRequestDispatcher.java b/spring-test/src/main/java/org/springframework/mock/web/MockRequestDispatcher.java
index 88660bb3ae..e43172c198 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockRequestDispatcher.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockRequestDispatcher.java
@@ -55,6 +55,7 @@ public class MockRequestDispatcher implements RequestDispatcher {
 	}
 
 
+	@Override
 	public void forward(ServletRequest request, ServletResponse response) {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
@@ -67,6 +68,7 @@ public class MockRequestDispatcher implements RequestDispatcher {
 		}
 	}
 
+	@Override
 	public void include(ServletRequest request, ServletResponse response) {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java
index c62ec1520d..d8e8abdf5e 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java
@@ -78,10 +78,12 @@ public class MockServletConfig implements ServletConfig {
 	}
 
 
+	@Override
 	public String getServletName() {
 		return this.servletName;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
@@ -91,11 +93,13 @@ public class MockServletConfig implements ServletConfig {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
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 562179ceac..3b4fea3217 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
@@ -195,6 +195,7 @@ public class MockServletContext implements ServletContext {
 	}
 
 	/* This is a Servlet API 2.5 method. */
+	@Override
 	public String getContextPath() {
 		return this.contextPath;
 	}
@@ -203,6 +204,7 @@ public class MockServletContext implements ServletContext {
 		this.contexts.put(contextPath, context);
 	}
 
+	@Override
 	public ServletContext getContext(String contextPath) {
 		if (this.contextPath.equals(contextPath)) {
 			return this;
@@ -214,6 +216,7 @@ public class MockServletContext implements ServletContext {
 		this.majorVersion = majorVersion;
 	}
 
+	@Override
 	public int getMajorVersion() {
 		return this.majorVersion;
 	}
@@ -222,6 +225,7 @@ public class MockServletContext implements ServletContext {
 		this.minorVersion = minorVersion;
 	}
 
+	@Override
 	public int getMinorVersion() {
 		return this.minorVersion;
 	}
@@ -242,10 +246,12 @@ public class MockServletContext implements ServletContext {
 		return this.effectiveMinorVersion;
 	}
 
+	@Override
 	public String getMimeType(String filePath) {
 		return MimeTypeResolver.getMimeType(filePath);
 	}
 
+	@Override
 	public Set<String> getResourcePaths(String path) {
 		String actualPath = (path.endsWith("/") ? path : path + "/");
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(actualPath));
@@ -271,6 +277,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public URL getResource(String path) throws MalformedURLException {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		if (!resource.exists()) {
@@ -288,6 +295,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public InputStream getResourceAsStream(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		if (!resource.exists()) {
@@ -302,6 +310,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public RequestDispatcher getRequestDispatcher(String path) {
 		if (!path.startsWith("/")) {
 			throw new IllegalArgumentException("RequestDispatcher path at ServletContext level must start with '/'");
@@ -309,6 +318,7 @@ public class MockServletContext implements ServletContext {
 		return new MockRequestDispatcher(path);
 	}
 
+	@Override
 	public RequestDispatcher getNamedDispatcher(String path) {
 		return this.namedRequestDispatchers.get(path);
 	}
@@ -366,30 +376,37 @@ public class MockServletContext implements ServletContext {
 		registerNamedDispatcher(this.defaultServletName, new MockRequestDispatcher(this.defaultServletName));
 	}
 
+	@Override
 	public Servlet getServlet(String name) {
 		return null;
 	}
 
+	@Override
 	public Enumeration<Servlet> getServlets() {
 		return Collections.enumeration(new HashSet<Servlet>());
 	}
 
+	@Override
 	public Enumeration<String> getServletNames() {
 		return Collections.enumeration(new HashSet<String>());
 	}
 
+	@Override
 	public void log(String message) {
 		logger.info(message);
 	}
 
+	@Override
 	public void log(Exception ex, String message) {
 		logger.info(message, ex);
 	}
 
+	@Override
 	public void log(String message, Throwable ex) {
 		logger.info(message, ex);
 	}
 
+	@Override
 	public String getRealPath(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		try {
@@ -401,15 +418,18 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public String getServerInfo() {
 		return "MockServletContext";
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
@@ -428,15 +448,18 @@ public class MockServletContext implements ServletContext {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return Collections.enumeration(this.attributes.keySet());
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		Assert.notNull(name, "Attribute name must not be null");
 		if (value != null) {
@@ -447,6 +470,7 @@ public class MockServletContext implements ServletContext {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		Assert.notNull(name, "Attribute name must not be null");
 		this.attributes.remove(name);
@@ -456,6 +480,7 @@ public class MockServletContext implements ServletContext {
 		this.servletContextName = servletContextName;
 	}
 
+	@Override
 	public String getServletContextName() {
 		return this.servletContextName;
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java b/spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java
index b3484a0a83..1a98d4c657 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java
@@ -73,6 +73,7 @@ public class PassThroughFilterChain implements FilterChain {
 	/**
 	 * Pass the call on to the Filter/Servlet.
 	 */
+	@Override
 	public void doFilter(ServletRequest request, ServletResponse response) throws ServletException, IOException {
 		if (this.filter != null) {
 			this.filter.doFilter(request, response, this.nextFilterChain);
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionResponse.java
index bec6687887..2f5c773e0c 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionResponse.java
@@ -59,6 +59,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 	}
 
 
+	@Override
 	public void setWindowState(WindowState windowState) throws WindowStateException {
 		if (this.redirectedUrl != null) {
 			throw new IllegalStateException("Cannot set WindowState after sendRedirect has been called");
@@ -67,6 +68,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 		this.redirectAllowed = false;
 	}
 
+	@Override
 	public void setPortletMode(PortletMode portletMode) throws PortletModeException {
 		if (this.redirectedUrl != null) {
 			throw new IllegalStateException("Cannot set PortletMode after sendRedirect has been called");
@@ -75,6 +77,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 		this.redirectAllowed = false;
 	}
 
+	@Override
 	public void setRenderParameters(Map<String, String[]> parameters) {
 		if (this.redirectedUrl != null) {
 			throw new IllegalStateException("Cannot set render parameters after sendRedirect has been called");
@@ -83,6 +86,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 		this.redirectAllowed = false;
 	}
 
+	@Override
 	public void setRenderParameter(String key, String value) {
 		if (this.redirectedUrl != null) {
 			throw new IllegalStateException("Cannot set render parameters after sendRedirect has been called");
@@ -91,6 +95,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 		this.redirectAllowed = false;
 	}
 
+	@Override
 	public void setRenderParameter(String key, String[] values) {
 		if (this.redirectedUrl != null) {
 			throw new IllegalStateException("Cannot set render parameters after sendRedirect has been called");
@@ -99,6 +104,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 		this.redirectAllowed = false;
 	}
 
+	@Override
 	public void sendRedirect(String location) throws IOException {
 		if (!this.redirectAllowed) {
 			throw new IllegalStateException(
@@ -108,6 +114,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action
 		this.redirectedUrl = location;
 	}
 
+	@Override
 	public void sendRedirect(String location, String renderUrlParamName) throws IOException {
 		sendRedirect(location);
 		if (renderUrlParamName != null) {
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockBaseURL.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockBaseURL.java
index aad992058b..fcdc50acdc 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockBaseURL.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockBaseURL.java
@@ -56,18 +56,21 @@ public abstract class MockBaseURL implements BaseURL {
 	// BaseURL methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void setParameter(String key, String value) {
 		Assert.notNull(key, "Parameter key must be null");
 		Assert.notNull(value, "Parameter value must not be null");
 		this.parameters.put(key, new String[] {value});
 	}
 
+	@Override
 	public void setParameter(String key, String[] values) {
 		Assert.notNull(key, "Parameter key must be null");
 		Assert.notNull(values, "Parameter values must not be null");
 		this.parameters.put(key, values);
 	}
 
+	@Override
 	public void setParameters(Map<String, String[]> parameters) {
 		Assert.notNull(parameters, "Parameters Map must not be null");
 		this.parameters.clear();
@@ -87,10 +90,12 @@ public abstract class MockBaseURL implements BaseURL {
 		return this.parameters.get(name);
 	}
 
+	@Override
 	public Map<String, String[]> getParameterMap() {
 		return Collections.unmodifiableMap(this.parameters);
 	}
 
+	@Override
 	public void setSecure(boolean secure) throws PortletSecurityException {
 		this.secure = secure;
 	}
@@ -99,14 +104,17 @@ public abstract class MockBaseURL implements BaseURL {
 		return this.secure;
 	}
 
+	@Override
 	public void write(Writer out) throws IOException {
 		out.write(toString());
 	}
 
+	@Override
 	public void write(Writer out, boolean escapeXML) throws IOException {
 		out.write(toString());
 	}
 
+	@Override
 	public void addProperty(String key, String value) {
 		String[] values = this.properties.get(key);
 		if (values != null) {
@@ -117,6 +125,7 @@ public abstract class MockBaseURL implements BaseURL {
 		}
 	}
 
+	@Override
 	public void setProperty(String key, String value) {
 		this.properties.put(key, new String[] {value});
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockCacheControl.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockCacheControl.java
index 0ee9fbeb7c..cac1a83d5f 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockCacheControl.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockCacheControl.java
@@ -35,34 +35,42 @@ public class MockCacheControl implements CacheControl {
 	private boolean useCachedContent = false;
 
 
+	@Override
 	public int getExpirationTime() {
 		return this.expirationTime;
 	}
 
+	@Override
 	public void setExpirationTime(int time) {
 		this.expirationTime = time;
 	}
 
+	@Override
 	public boolean isPublicScope() {
 		return this.publicScope;
 	}
 
+	@Override
 	public void setPublicScope(boolean publicScope) {
 		this.publicScope = publicScope;
 	}
 
+	@Override
 	public String getETag() {
 		return this.etag;
 	}
 
+	@Override
 	public void setETag(String token) {
 		this.etag = token;
 	}
 
+	@Override
 	public boolean useCachedContent() {
 		return this.useCachedContent;
 	}
 
+	@Override
 	public void setUseCachedContent(boolean useCachedContent) {
 		this.useCachedContent = useCachedContent;
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockClientDataRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
index 8f36c3a764..8fa396de4d 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
@@ -76,6 +76,7 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD
 		this.content = content;
 	}
 
+	@Override
 	public InputStream getPortletInputStream() throws IOException {
 		if (this.content != null) {
 			return new ByteArrayInputStream(this.content);
@@ -85,10 +86,12 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD
 		}
 	}
 
+	@Override
 	public void setCharacterEncoding(String characterEncoding) {
 		this.characterEncoding = characterEncoding;
 	}
 
+	@Override
 	public BufferedReader getReader() throws UnsupportedEncodingException {
 		if (this.content != null) {
 			InputStream sourceStream = new ByteArrayInputStream(this.content);
@@ -101,6 +104,7 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD
 		}
 	}
 
+	@Override
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
@@ -109,10 +113,12 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD
 		this.contentType = contentType;
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
 
+	@Override
 	public int getContentLength() {
 		return (this.content != null ? content.length : -1);
 	}
@@ -121,6 +127,7 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD
 		this.method = method;
 	}
 
+	@Override
 	public String getMethod() {
 		return this.method;
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEvent.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEvent.java
index 0dc7efaba8..c2c82febae 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEvent.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEvent.java
@@ -73,14 +73,17 @@ public class MockEvent implements Event {
 	}
 
 
+	@Override
 	public QName getQName() {
 		return this.name;
 	}
 
+	@Override
 	public String getName() {
 		return this.name.getLocalPart();
 	}
 
+	@Override
 	public Serializable getValue() {
 		return this.value;
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventRequest.java
index 2406f18d01..af4725dea7 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventRequest.java
@@ -73,6 +73,7 @@ public class MockEventRequest extends MockPortletRequest implements EventRequest
 		return EVENT_PHASE;
 	}
 
+	@Override
 	public Event getEvent() {
 		return this.event;
 	}
@@ -81,6 +82,7 @@ public class MockEventRequest extends MockPortletRequest implements EventRequest
 		this.method = method;
 	}
 
+	@Override
 	public String getMethod() {
 		return this.method;
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventResponse.java
index 1a00e8b2d5..f7c846e028 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventResponse.java
@@ -27,6 +27,7 @@ import javax.portlet.EventResponse;
  */
 public class MockEventResponse extends MockStateAwareResponse implements EventResponse {
 
+	@Override
 	public void setRenderParameters(EventRequest request) {
 		setRenderParameters(request.getParameterMap());
 	}
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..cbfb70bca1 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
@@ -101,6 +101,7 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 	// RenderResponse methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void setContentType(String contentType) {
 		if (this.request != null) {
 			Enumeration<String> supportedTypes = this.request.getResponseContentTypes();
@@ -112,6 +113,7 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 		this.contentType = contentType;
 	}
 
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
@@ -120,10 +122,12 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 		this.characterEncoding = characterEncoding;
 	}
 
+	@Override
 	public String getCharacterEncoding() {
 		return this.characterEncoding;
 	}
 
+	@Override
 	public PrintWriter getWriter() throws UnsupportedEncodingException {
 		if (this.writer == null) {
 			Writer targetWriter = (this.characterEncoding != null
@@ -150,18 +154,22 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 		this.locale = locale;
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locale;
 	}
 
+	@Override
 	public void setBufferSize(int bufferSize) {
 		this.bufferSize = bufferSize;
 	}
 
+	@Override
 	public int getBufferSize() {
 		return this.bufferSize;
 	}
 
+	@Override
 	public void flushBuffer() {
 		if (this.writer != null) {
 			this.writer.flush();
@@ -177,6 +185,7 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 		this.committed = true;
 	}
 
+	@Override
 	public void resetBuffer() {
 		if (this.committed) {
 			throw new IllegalStateException("Cannot reset buffer - response is already committed");
@@ -188,10 +197,12 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 		this.committed = committed;
 	}
 
+	@Override
 	public boolean isCommitted() {
 		return this.committed;
 	}
 
+	@Override
 	public void reset() {
 		resetBuffer();
 		this.characterEncoding = null;
@@ -199,22 +210,27 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons
 		this.locale = null;
 	}
 
+	@Override
 	public OutputStream getPortletOutputStream() throws IOException {
 		return this.outputStream;
 	}
 
+	@Override
 	public PortletURL createRenderURL() {
 		return new MockPortletURL(getPortalContext(), MockPortletURL.URL_TYPE_RENDER);
 	}
 
+	@Override
 	public PortletURL createActionURL() {
 		return new MockPortletURL(getPortalContext(), MockPortletURL.URL_TYPE_ACTION);
 	}
 
+	@Override
 	public ResourceURL createResourceURL() {
 		return new MockResourceURL();
 	}
 
+	@Override
 	public CacheControl getCacheControl() {
 		return this.cacheControl;
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
index 7df8b547b0..54201b8ec8 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
@@ -56,14 +56,17 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul
 		this.multipartFiles.add(file.getName(), file);
 	}
 
+	@Override
 	public Iterator<String> getFileNames() {
 		return this.multipartFiles.keySet().iterator();
 	}
 
+	@Override
 	public MultipartFile getFile(String name) {
 		return this.multipartFiles.getFirst(name);
 	}
 
+	@Override
 	public List<MultipartFile> getFiles(String name) {
 		List<MultipartFile> multipartFiles = this.multipartFiles.get(name);
 		if (multipartFiles != null) {
@@ -74,14 +77,17 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul
 		}
 	}
 
+	@Override
 	public Map<String, MultipartFile> getFileMap() {
 		return this.multipartFiles.toSingleValueMap();
 	}
 
+	@Override
 	public MultiValueMap<String, MultipartFile> getMultiFileMap() {
 		return new LinkedMultiValueMap<String, MultipartFile>(this.multipartFiles);
 	}
 
+	@Override
 	public String getMultipartContentType(String paramOrFileName) {
 		MultipartFile file = getFile(paramOrFileName);
 		if (file != null) {
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortalContext.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortalContext.java
index 949d077b9a..8731438d70 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortalContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortalContext.java
@@ -74,6 +74,7 @@ public class MockPortalContext implements PortalContext {
 	}
 
 
+	@Override
 	public String getPortalInfo() {
 		return "MockPortal/1.0";
 	}
@@ -82,18 +83,22 @@ public class MockPortalContext implements PortalContext {
 		this.properties.put(name, value);
 	}
 
+	@Override
 	public String getProperty(String name) {
 		return this.properties.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getPropertyNames() {
 		return Collections.enumeration(this.properties.keySet());
 	}
 
+	@Override
 	public Enumeration<PortletMode> getSupportedPortletModes() {
 		return Collections.enumeration(this.portletModes);
 	}
 
+	@Override
 	public Enumeration<WindowState> getSupportedWindowStates() {
 		return Collections.enumeration(this.windowStates);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java
index 9d3a878026..cf7f48bb17 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java
@@ -96,10 +96,12 @@ public class MockPortletConfig implements PortletConfig {
 	}
 
 
+	@Override
 	public String getPortletName() {
 		return this.portletName;
 	}
 
+	@Override
 	public PortletContext getPortletContext() {
 		return this.portletContext;
 	}
@@ -109,6 +111,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.resourceBundles.put(locale, resourceBundle);
 	}
 
+	@Override
 	public ResourceBundle getResourceBundle(Locale locale) {
 		Assert.notNull(locale, "Locale must not be null");
 		return this.resourceBundles.get(locale);
@@ -119,11 +122,13 @@ public class MockPortletConfig implements PortletConfig {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
@@ -132,6 +137,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.publicRenderParameterNames.add(name);
 	}
 
+	@Override
 	public Enumeration<String> getPublicRenderParameterNames() {
 		return Collections.enumeration(this.publicRenderParameterNames);
 	}
@@ -140,6 +146,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.defaultNamespace = defaultNamespace;
 	}
 
+	@Override
 	public String getDefaultNamespace() {
 		return this.defaultNamespace;
 	}
@@ -148,6 +155,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.publishingEventQNames.add(name);
 	}
 
+	@Override
 	public Enumeration<QName> getPublishingEventQNames() {
 		return Collections.enumeration(this.publishingEventQNames);
 	}
@@ -156,6 +164,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.processingEventQNames.add(name);
 	}
 
+	@Override
 	public Enumeration<QName> getProcessingEventQNames() {
 		return Collections.enumeration(this.processingEventQNames);
 	}
@@ -164,6 +173,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.supportedLocales.add(locale);
 	}
 
+	@Override
 	public Enumeration<Locale> getSupportedLocales() {
 		return Collections.enumeration(this.supportedLocales);
 	}
@@ -176,6 +186,7 @@ public class MockPortletConfig implements PortletConfig {
 		this.containerRuntimeOptions.put(key, values);
 	}
 
+	@Override
 	public Map<String, String[]> getContainerRuntimeOptions() {
 		return Collections.unmodifiableMap(this.containerRuntimeOptions);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java
index b1193ff5e1..7d4ec1c904 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java
@@ -126,10 +126,12 @@ public class MockPortletContext implements PortletContext {
 	}
 
 
+	@Override
 	public String getServerInfo() {
 		return "MockPortal/1.0";
 	}
 
+	@Override
 	public PortletRequestDispatcher getRequestDispatcher(String path) {
 		if (!path.startsWith("/")) {
 			throw new IllegalArgumentException(
@@ -138,10 +140,12 @@ public class MockPortletContext implements PortletContext {
 		return new MockPortletRequestDispatcher(path);
 	}
 
+	@Override
 	public PortletRequestDispatcher getNamedDispatcher(String path) {
 		return null;
 	}
 
+	@Override
 	public InputStream getResourceAsStream(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		try {
@@ -153,18 +157,22 @@ public class MockPortletContext implements PortletContext {
 		}
 	}
 
+	@Override
 	public int getMajorVersion() {
 		return 2;
 	}
 
+	@Override
 	public int getMinorVersion() {
 		return 0;
 	}
 
+	@Override
 	public String getMimeType(String filePath) {
 		return MimeTypeResolver.getMimeType(filePath);
 	}
 
+	@Override
 	public String getRealPath(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		try {
@@ -176,6 +184,7 @@ public class MockPortletContext implements PortletContext {
 		}
 	}
 
+	@Override
 	public Set<String> getResourcePaths(String path) {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		try {
@@ -194,6 +203,7 @@ public class MockPortletContext implements PortletContext {
 		}
 	}
 
+	@Override
 	public URL getResource(String path) throws MalformedURLException {
 		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
 		try {
@@ -205,14 +215,17 @@ public class MockPortletContext implements PortletContext {
 		}
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return new Vector<String>(this.attributes.keySet()).elements();
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		if (value != null) {
 			this.attributes.put(name, value);
@@ -222,6 +235,7 @@ public class MockPortletContext implements PortletContext {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		this.attributes.remove(name);
 	}
@@ -231,19 +245,23 @@ public class MockPortletContext implements PortletContext {
 		this.initParameters.put(name, value);
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		Assert.notNull(name, "Parameter name must not be null");
 		return this.initParameters.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getInitParameterNames() {
 		return Collections.enumeration(this.initParameters.keySet());
 	}
 
+	@Override
 	public void log(String message) {
 		logger.info(message);
 	}
 
+	@Override
 	public void log(String message, Throwable t) {
 		logger.info(message, t);
 	}
@@ -252,6 +270,7 @@ public class MockPortletContext implements PortletContext {
 		this.portletContextName = portletContextName;
 	}
 
+	@Override
 	public String getPortletContextName() {
 		return this.portletContextName;
 	}
@@ -260,6 +279,7 @@ public class MockPortletContext implements PortletContext {
 		this.containerRuntimeOptions.add(key);
 	}
 
+	@Override
 	public Enumeration<String> getContainerRuntimeOptions() {
 		return Collections.enumeration(this.containerRuntimeOptions);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletPreferences.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletPreferences.java
index 92ee6c0a46..fc281fc16b 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletPreferences.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletPreferences.java
@@ -56,27 +56,32 @@ public class MockPortletPreferences implements PortletPreferences {
 		}
 	}
 
+	@Override
 	public boolean isReadOnly(String key) {
 		Assert.notNull(key, "Key must not be null");
 		return this.readOnly.contains(key);
 	}
 
+	@Override
 	public String getValue(String key, String def) {
 		Assert.notNull(key, "Key must not be null");
 		String[] values = this.preferences.get(key);
 		return (values != null && values.length > 0 ? values[0] : def);
 	}
 
+	@Override
 	public String[] getValues(String key, String[] def) {
 		Assert.notNull(key, "Key must not be null");
 		String[] values = this.preferences.get(key);
 		return (values != null && values.length > 0 ? values : def);
 	}
 
+	@Override
 	public void setValue(String key, String value) throws ReadOnlyException {
 		setValues(key, new String[] {value});
 	}
 
+	@Override
 	public void setValues(String key, String[] values) throws ReadOnlyException {
 		Assert.notNull(key, "Key must not be null");
 		if (isReadOnly(key)) {
@@ -85,14 +90,17 @@ public class MockPortletPreferences implements PortletPreferences {
 		this.preferences.put(key, values);
 	}
 
+	@Override
 	public Enumeration<String> getNames() {
 		return Collections.enumeration(this.preferences.keySet());
 	}
 
+	@Override
 	public Map<String, String[]> getMap() {
 		return Collections.unmodifiableMap(this.preferences);
 	}
 
+	@Override
 	public void reset(String key) throws ReadOnlyException {
 		Assert.notNull(key, "Key must not be null");
 		if (isReadOnly(key)) {
@@ -105,6 +113,7 @@ public class MockPortletPreferences implements PortletPreferences {
 		this.preferencesValidator = preferencesValidator;
 	}
 
+	@Override
 	public void store() throws IOException, ValidatorException {
 		if (this.preferencesValidator != null) {
 			this.preferencesValidator.validate(this);
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
index 70e90567b0..921510b3c5 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java
@@ -174,10 +174,12 @@ public class MockPortletRequest implements PortletRequest {
 	// PortletRequest methods
 	// ---------------------------------------------------------------------
 
+	@Override
 	public boolean isWindowStateAllowed(WindowState windowState) {
 		return CollectionUtils.contains(this.portalContext.getSupportedWindowStates(), windowState);
 	}
 
+	@Override
 	public boolean isPortletModeAllowed(PortletMode portletMode) {
 		return CollectionUtils.contains(this.portalContext.getSupportedPortletModes(), portletMode);
 	}
@@ -187,6 +189,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.portletMode = portletMode;
 	}
 
+	@Override
 	public PortletMode getPortletMode() {
 		return this.portletMode;
 	}
@@ -196,6 +199,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.windowState = windowState;
 	}
 
+	@Override
 	public WindowState getWindowState() {
 		return this.windowState;
 	}
@@ -205,6 +209,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.portletPreferences = preferences;
 	}
 
+	@Override
 	public PortletPreferences getPreferences() {
 		return this.portletPreferences;
 	}
@@ -217,10 +222,12 @@ public class MockPortletRequest implements PortletRequest {
 		}
 	}
 
+	@Override
 	public PortletSession getPortletSession() {
 		return getPortletSession(true);
 	}
 
+	@Override
 	public PortletSession getPortletSession(boolean create) {
 		checkActive();
 		// Reset session if invalidated.
@@ -266,21 +273,25 @@ public class MockPortletRequest implements PortletRequest {
 		}
 	}
 
+	@Override
 	public String getProperty(String key) {
 		Assert.notNull(key, "Property key must not be null");
 		List<String> list = this.properties.get(key);
 		return (list != null && list.size() > 0 ? list.get(0) : null);
 	}
 
+	@Override
 	public Enumeration<String> getProperties(String key) {
 		Assert.notNull(key, "property key must not be null");
 		return Collections.enumeration(this.properties.get(key));
 	}
 
+	@Override
 	public Enumeration<String> getPropertyNames() {
 		return Collections.enumeration(this.properties.keySet());
 	}
 
+	@Override
 	public PortalContext getPortalContext() {
 		return this.portalContext;
 	}
@@ -289,6 +300,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.authType = authType;
 	}
 
+	@Override
 	public String getAuthType() {
 		return this.authType;
 	}
@@ -297,6 +309,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.contextPath = contextPath;
 	}
 
+	@Override
 	public String getContextPath() {
 		return this.contextPath;
 	}
@@ -305,6 +318,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.remoteUser = remoteUser;
 	}
 
+	@Override
 	public String getRemoteUser() {
 		return this.remoteUser;
 	}
@@ -313,6 +327,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.userPrincipal = userPrincipal;
 	}
 
+	@Override
 	public Principal getUserPrincipal() {
 		return this.userPrincipal;
 	}
@@ -321,15 +336,18 @@ public class MockPortletRequest implements PortletRequest {
 		this.userRoles.add(role);
 	}
 
+	@Override
 	public boolean isUserInRole(String role) {
 		return this.userRoles.contains(role);
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		checkActive();
 		return this.attributes.get(name);
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		checkActive();
 		return new Vector<String>(this.attributes.keySet()).elements();
@@ -370,19 +388,23 @@ public class MockPortletRequest implements PortletRequest {
 		}
 	}
 
+	@Override
 	public String getParameter(String name) {
 		String[] arr = this.parameters.get(name);
 		return (arr != null && arr.length > 0 ? arr[0] : null);
 	}
 
+	@Override
 	public Enumeration<String> getParameterNames() {
 		return Collections.enumeration(this.parameters.keySet());
 	}
 
+	@Override
 	public String[] getParameterValues(String name) {
 		return this.parameters.get(name);
 	}
 
+	@Override
 	public Map<String, String[]> getParameterMap() {
 		return Collections.unmodifiableMap(this.parameters);
 	}
@@ -391,10 +413,12 @@ public class MockPortletRequest implements PortletRequest {
 		this.secure = secure;
 	}
 
+	@Override
 	public boolean isSecure() {
 		return this.secure;
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		checkActive();
 		if (value != null) {
@@ -405,11 +429,13 @@ public class MockPortletRequest implements PortletRequest {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		checkActive();
 		this.attributes.remove(name);
 	}
 
+	@Override
 	public String getRequestedSessionId() {
 		PortletSession session = this.getPortletSession();
 		return (session != null ? session.getId() : null);
@@ -419,6 +445,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.requestedSessionIdValid = requestedSessionIdValid;
 	}
 
+	@Override
 	public boolean isRequestedSessionIdValid() {
 		return this.requestedSessionIdValid;
 	}
@@ -431,10 +458,12 @@ public class MockPortletRequest implements PortletRequest {
 		this.responseContentTypes.add(0, responseContentType);
 	}
 
+	@Override
 	public String getResponseContentType() {
 		return this.responseContentTypes.get(0);
 	}
 
+	@Override
 	public Enumeration<String> getResponseContentTypes() {
 		return Collections.enumeration(this.responseContentTypes);
 	}
@@ -447,10 +476,12 @@ public class MockPortletRequest implements PortletRequest {
 		this.locales.add(0, locale);
 	}
 
+	@Override
 	public Locale getLocale() {
 		return this.locales.get(0);
 	}
 
+	@Override
 	public Enumeration<Locale> getLocales() {
 		return Collections.enumeration(this.locales);
 	}
@@ -459,6 +490,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.scheme = scheme;
 	}
 
+	@Override
 	public String getScheme() {
 		return this.scheme;
 	}
@@ -467,6 +499,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.serverName = serverName;
 	}
 
+	@Override
 	public String getServerName() {
 		return this.serverName;
 	}
@@ -475,6 +508,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.serverPort = serverPort;
 	}
 
+	@Override
 	public int getServerPort() {
 		return this.serverPort;
 	}
@@ -483,6 +517,7 @@ public class MockPortletRequest implements PortletRequest {
 		this.windowID = windowID;
 	}
 
+	@Override
 	public String getWindowID() {
 		return this.windowID;
 	}
@@ -491,10 +526,12 @@ public class MockPortletRequest implements PortletRequest {
 		this.cookies = cookies;
 	}
 
+	@Override
 	public Cookie[] getCookies() {
 		return this.cookies;
 	}
 
+	@Override
 	public Map<String, String[]> getPrivateParameterMap() {
 		if (!this.publicParameterNames.isEmpty()) {
 			Map<String, String[]> filtered = new LinkedHashMap<String, String[]>();
@@ -510,6 +547,7 @@ public class MockPortletRequest implements PortletRequest {
 		}
 	}
 
+	@Override
 	public Map<String, String[]> getPublicParameterMap() {
 		if (!this.publicParameterNames.isEmpty()) {
 			Map<String, String[]> filtered = new LinkedHashMap<String, String[]>();
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
index ca8695f90e..5ba423ed0e 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
@@ -53,10 +53,12 @@ public class MockPortletRequestDispatcher implements PortletRequestDispatcher {
 	}
 
 
+	@Override
 	public void include(RenderRequest request, RenderResponse response) throws PortletException, IOException {
 		include((PortletRequest) request, (PortletResponse) response);
 	}
 
+	@Override
 	public void include(PortletRequest request, PortletResponse response) throws PortletException, IOException {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
@@ -69,6 +71,7 @@ public class MockPortletRequestDispatcher implements PortletRequestDispatcher {
 		}
 	}
 
+	@Override
 	public void forward(PortletRequest request, PortletResponse response) throws PortletException, IOException {
 		Assert.notNull(request, "Request must not be null");
 		Assert.notNull(response, "Response must not be null");
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletResponse.java
index b556209fcd..9fe6d6315f 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletResponse.java
@@ -85,6 +85,7 @@ public class MockPortletResponse implements PortletResponse {
 	// PortletResponse methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void addProperty(String key, String value) {
 		Assert.notNull(key, "Property key must not be null");
 		String[] oldArr = this.properties.get(key);
@@ -99,6 +100,7 @@ public class MockPortletResponse implements PortletResponse {
 		}
 	}
 
+	@Override
 	public void setProperty(String key, String value) {
 		Assert.notNull(key, "Property key must not be null");
 		this.properties.put(key, new String[] {value});
@@ -119,6 +121,7 @@ public class MockPortletResponse implements PortletResponse {
 		return this.properties.get(key);
 	}
 
+	@Override
 	public String encodeURL(String path) {
 		return path;
 	}
@@ -127,10 +130,12 @@ public class MockPortletResponse implements PortletResponse {
 		this.namespace = namespace;
 	}
 
+	@Override
 	public String getNamespace() {
 		return this.namespace;
 	}
 
+	@Override
 	public void addProperty(Cookie cookie) {
 		Assert.notNull(cookie, "Cookie must not be null");
 		this.cookies.add(cookie);
@@ -150,6 +155,7 @@ public class MockPortletResponse implements PortletResponse {
 		return null;
 	}
 
+	@Override
 	public void addProperty(String key, Element value) {
 		Assert.notNull(key, "Property key must not be null");
 		Element[] oldArr = this.xmlProperties.get(key);
@@ -180,6 +186,7 @@ public class MockPortletResponse implements PortletResponse {
 		return this.xmlProperties.get(key);
 	}
 
+	@Override
 	public Element createElement(String tagName) throws DOMException {
 		if (this.xmlDocument == null) {
 			try {
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java
index 93800340b8..431ad08ce3 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java
@@ -77,10 +77,12 @@ public class MockPortletSession implements PortletSession {
 	}
 
 
+	@Override
 	public Object getAttribute(String name) {
 		return this.portletAttributes.get(name);
 	}
 
+	@Override
 	public Object getAttribute(String name, int scope) {
 		if (scope == PortletSession.PORTLET_SCOPE) {
 			return this.portletAttributes.get(name);
@@ -91,10 +93,12 @@ public class MockPortletSession implements PortletSession {
 		return null;
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames() {
 		return new Vector<String>(this.portletAttributes.keySet()).elements();
 	}
 
+	@Override
 	public Enumeration<String> getAttributeNames(int scope) {
 		if (scope == PortletSession.PORTLET_SCOPE) {
 			return new Vector<String>(this.portletAttributes.keySet()).elements();
@@ -105,10 +109,12 @@ public class MockPortletSession implements PortletSession {
 		return null;
 	}
 
+	@Override
 	public long getCreationTime() {
 		return this.creationTime;
 	}
 
+	@Override
 	public String getId() {
 		return this.id;
 	}
@@ -118,10 +124,12 @@ public class MockPortletSession implements PortletSession {
 		setNew(false);
 	}
 
+	@Override
 	public long getLastAccessedTime() {
 		return this.lastAccessedTime;
 	}
 
+	@Override
 	public int getMaxInactiveInterval() {
 		return this.maxInactiveInterval;
 	}
@@ -147,6 +155,7 @@ public class MockPortletSession implements PortletSession {
 		}
 	}
 
+	@Override
 	public void invalidate() {
 		this.invalid = true;
 		clearAttributes();
@@ -160,14 +169,17 @@ public class MockPortletSession implements PortletSession {
 		this.isNew = value;
 	}
 
+	@Override
 	public boolean isNew() {
 		return this.isNew;
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		this.portletAttributes.remove(name);
 	}
 
+	@Override
 	public void removeAttribute(String name, int scope) {
 		if (scope == PortletSession.PORTLET_SCOPE) {
 			this.portletAttributes.remove(name);
@@ -177,6 +189,7 @@ public class MockPortletSession implements PortletSession {
 		}
 	}
 
+	@Override
 	public void setAttribute(String name, Object value) {
 		if (value != null) {
 			this.portletAttributes.put(name, value);
@@ -186,6 +199,7 @@ public class MockPortletSession implements PortletSession {
 		}
 	}
 
+	@Override
 	public void setAttribute(String name, Object value, int scope) {
 		if (scope == PortletSession.PORTLET_SCOPE) {
 			if (value != null) {
@@ -205,18 +219,22 @@ public class MockPortletSession implements PortletSession {
 		}
 	}
 
+	@Override
 	public void setMaxInactiveInterval(int interval) {
 		this.maxInactiveInterval = interval;
 	}
 
+	@Override
 	public PortletContext getPortletContext() {
 		return this.portletContext;
 	}
 
+	@Override
 	public Map<String, Object> getAttributeMap() {
 		return Collections.unmodifiableMap(this.portletAttributes);
 	}
 
+	@Override
 	public Map<String, Object> getAttributeMap(int scope) {
 		if (scope == PortletSession.PORTLET_SCOPE) {
 			return Collections.unmodifiableMap(this.portletAttributes);
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletURL.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletURL.java
index 12abdf57c9..53deff0916 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletURL.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletURL.java
@@ -69,6 +69,7 @@ public class MockPortletURL extends MockBaseURL implements PortletURL {
 	// PortletURL methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void setWindowState(WindowState windowState) throws WindowStateException {
 		if (!CollectionUtils.contains(this.portalContext.getSupportedWindowStates(), windowState)) {
 			throw new WindowStateException("WindowState not supported", windowState);
@@ -76,10 +77,12 @@ public class MockPortletURL extends MockBaseURL implements PortletURL {
 		this.windowState = windowState;
 	}
 
+	@Override
 	public WindowState getWindowState() {
 		return this.windowState;
 	}
 
+	@Override
 	public void setPortletMode(PortletMode portletMode) throws PortletModeException {
 		if (!CollectionUtils.contains(this.portalContext.getSupportedPortletModes(), portletMode)) {
 			throw new PortletModeException("PortletMode not supported", portletMode);
@@ -87,10 +90,12 @@ public class MockPortletURL extends MockBaseURL implements PortletURL {
 		this.portletMode = portletMode;
 	}
 
+	@Override
 	public PortletMode getPortletMode() {
 		return this.portletMode;
 	}
 
+	@Override
 	public void removePublicRenderParameter(String name) {
 		this.parameters.remove(name);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderRequest.java
index d86ba7f2ad..672a51dcb7 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderRequest.java
@@ -86,6 +86,7 @@ public class MockRenderRequest extends MockPortletRequest implements RenderReque
 		return RENDER_PHASE;
 	}
 
+	@Override
 	public String getETag() {
 		return getProperty(RenderRequest.ETAG);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderResponse.java
index a2feeb3726..7f70be9a05 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderResponse.java
@@ -69,6 +69,7 @@ public class MockRenderResponse extends MockMimeResponse implements RenderRespon
 	// RenderResponse methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void setTitle(String title) {
 		this.title = title;
 	}
@@ -77,6 +78,7 @@ public class MockRenderResponse extends MockMimeResponse implements RenderRespon
 		return this.title;
 	}
 
+	@Override
 	public void setNextPossiblePortletModes(Collection<PortletMode> portletModes) {
 		this.nextPossiblePortletModes = portletModes;
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceRequest.java
index 7cce4ba3c6..e889d92314 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceRequest.java
@@ -97,6 +97,7 @@ public class MockResourceRequest extends MockClientDataRequest implements Resour
 		this.resourceID = resourceID;
 	}
 
+	@Override
 	public String getResourceID() {
 		return this.resourceID;
 	}
@@ -105,10 +106,12 @@ public class MockResourceRequest extends MockClientDataRequest implements Resour
 		this.cacheability = cacheLevel;
 	}
 
+	@Override
 	public String getCacheability() {
 		return this.cacheability;
 	}
 
+	@Override
 	public String getETag() {
 		return getProperty(RenderRequest.ETAG);
 	}
@@ -121,6 +124,7 @@ public class MockResourceRequest extends MockClientDataRequest implements Resour
 		this.privateRenderParameterMap.put(key, values);
 	}
 
+	@Override
 	public Map<String, String[]> getPrivateRenderParameterMap() {
 		return Collections.unmodifiableMap(this.privateRenderParameterMap);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceResponse.java
index 297a19682e..00a267b1d8 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceResponse.java
@@ -29,6 +29,7 @@ public class MockResourceResponse extends MockMimeResponse implements ResourceRe
 	private int contentLength = 0;
 
 
+	@Override
 	public void setContentLength(int len) {
 		this.contentLength = len;
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceURL.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceURL.java
index cce36b18d5..12b7fd4a39 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceURL.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceURL.java
@@ -36,6 +36,7 @@ public class MockResourceURL extends MockBaseURL implements ResourceURL {
 	// ResourceURL methods
 	//---------------------------------------------------------------------
 
+	@Override
 	public void setResourceID(String resourceID) {
 		this.resourceID = resourceID;
 	}
@@ -44,10 +45,12 @@ public class MockResourceURL extends MockBaseURL implements ResourceURL {
 		return this.resourceID;
 	}
 
+	@Override
 	public void setCacheability(String cacheLevel) {
 		this.cacheability = cacheLevel;
 	}
 
+	@Override
 	public String getCacheability() {
 		return this.cacheability;
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
index 6853658447..6d2f6d74fa 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
@@ -68,6 +68,7 @@ public class MockStateAwareResponse extends MockPortletResponse implements State
 	}
 
 
+	@Override
 	public void setWindowState(WindowState windowState) throws WindowStateException {
 		if (!CollectionUtils.contains(getPortalContext().getSupportedWindowStates(), windowState)) {
 			throw new WindowStateException("WindowState not supported", windowState);
@@ -75,10 +76,12 @@ public class MockStateAwareResponse extends MockPortletResponse implements State
 		this.windowState = windowState;
 	}
 
+	@Override
 	public WindowState getWindowState() {
 		return this.windowState;
 	}
 
+	@Override
 	public void setPortletMode(PortletMode portletMode) throws PortletModeException {
 		if (!CollectionUtils.contains(getPortalContext().getSupportedPortletModes(), portletMode)) {
 			throw new PortletModeException("PortletMode not supported", portletMode);
@@ -86,22 +89,26 @@ public class MockStateAwareResponse extends MockPortletResponse implements State
 		this.portletMode = portletMode;
 	}
 
+	@Override
 	public PortletMode getPortletMode() {
 		return this.portletMode;
 	}
 
+	@Override
 	public void setRenderParameters(Map<String, String[]> parameters) {
 		Assert.notNull(parameters, "Parameters Map must not be null");
 		this.renderParameters.clear();
 		this.renderParameters.putAll(parameters);
 	}
 
+	@Override
 	public void setRenderParameter(String key, String value) {
 		Assert.notNull(key, "Parameter key must not be null");
 		Assert.notNull(value, "Parameter value must not be null");
 		this.renderParameters.put(key, new String[] {value});
 	}
 
+	@Override
 	public void setRenderParameter(String key, String[] values) {
 		Assert.notNull(key, "Parameter key must not be null");
 		Assert.notNull(values, "Parameter values must not be null");
@@ -123,18 +130,22 @@ public class MockStateAwareResponse extends MockPortletResponse implements State
 		return this.renderParameters.keySet().iterator();
 	}
 
+	@Override
 	public Map<String, String[]> getRenderParameterMap() {
 		return Collections.unmodifiableMap(this.renderParameters);
 	}
 
+	@Override
 	public void removePublicRenderParameter(String name) {
 		this.renderParameters.remove(name);
 	}
 
+	@Override
 	public void setEvent(QName name, Serializable value) {
 		this.events.put(name, value);
 	}
 
+	@Override
 	public void setEvent(String name, Serializable value) {
 		this.events.put(new QName(name), value);
 	}
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
index 8a88066c93..924188660a 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
@@ -59,85 +59,105 @@ public class ServletWrappingPortletContext implements PortletContext {
 	}
 
 
+	@Override
 	public String getServerInfo() {
 		return this.servletContext.getServerInfo();
 	}
 
+	@Override
 	public PortletRequestDispatcher getRequestDispatcher(String path) {
 		return null;
 	}
 
+	@Override
 	public PortletRequestDispatcher getNamedDispatcher(String name) {
 		return null;
 	}
 
+	@Override
 	public InputStream getResourceAsStream(String path) {
 		return this.servletContext.getResourceAsStream(path);
 	}
 
+	@Override
 	public int getMajorVersion() {
 		return 2;
 	}
 
+	@Override
 	public int getMinorVersion() {
 		return 0;
 	}
 
+	@Override
 	public String getMimeType(String file) {
 		return this.servletContext.getMimeType(file);
 	}
 
+	@Override
 	public String getRealPath(String path) {
 		return this.servletContext.getRealPath(path);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Set<String> getResourcePaths(String path) {
 		return this.servletContext.getResourcePaths(path);
 	}
 
+	@Override
 	public URL getResource(String path) throws MalformedURLException {
 		return this.servletContext.getResource(path);
 	}
 
+	@Override
 	public Object getAttribute(String name) {
 		return this.servletContext.getAttribute(name);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Enumeration<String> getAttributeNames() {
 		return this.servletContext.getAttributeNames();
 	}
 
+	@Override
 	public String getInitParameter(String name) {
 		return this.servletContext.getInitParameter(name);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public Enumeration<String> getInitParameterNames() {
 		return this.servletContext.getInitParameterNames();
 	}
 
+	@Override
 	public void log(String msg) {
 		this.servletContext.log(msg);
 	}
 
+	@Override
 	public void log(String message, Throwable throwable) {
 		this.servletContext.log(message, throwable);
 	}
 
+	@Override
 	public void removeAttribute(String name) {
 		this.servletContext.removeAttribute(name);
 	}
 
+	@Override
 	public void setAttribute(String name, Object object) {
 		this.servletContext.setAttribute(name, object);
 	}
 
+	@Override
 	public String getPortletContextName() {
 		return this.servletContext.getServletContextName();
 	}
 
+	@Override
 	public Enumeration<String> getContainerRuntimeOptions() {
 		return Collections.enumeration(new HashSet<String>());
 	}
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
index 0ef706abe1..502bcc7892 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
@@ -173,6 +173,7 @@ public abstract class AbstractDependencyInjectionSpringContextTests extends Abst
 	 * message will be written to the log.
 	 * @see #injectDependencies()
 	 */
+	@Override
 	protected void prepareTestInstance() throws Exception {
 		if (getApplicationContext() == null) {
 			if (this.logger.isInfoEnabled()) {
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
index 0d5d078480..c565383da3 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
@@ -95,6 +95,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	 * This implementation is final. Override {@code onSetUp} for custom behavior.
 	 * @see #onSetUp()
 	 */
+	@Override
 	protected final void setUp() throws Exception {
 		// lazy load, in case getApplicationContext() has not yet been called.
 		if (this.applicationContext == null) {
@@ -136,6 +137,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	 * custom behavior.
 	 * @see #onTearDown()
 	 */
+	@Override
 	protected final void tearDown() throws Exception {
 		onTearDown();
 	}
@@ -168,6 +170,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon
 	 * {@code contextKey()} returns.
 	 * @see #getConfigLocations()
 	 */
+	@Override
 	protected ConfigurableApplicationContext loadContext(Object key) throws Exception {
 		return loadContextLocations((String[]) key);
 	}
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
index 0f697d115f..73c9f14560 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
@@ -121,6 +121,7 @@ public abstract class AbstractTransactionalDataSourceSpringContextTests
 	 * cleared, as a defensive measure against accidental <i>permanent</i> wiping of a database.
 	 * @see org.springframework.test.AbstractTransactionalSpringContextTests#setComplete()
 	 */
+	@Override
 	protected final void setComplete() {
 		if (this.zappedTables) {
 			throw new IllegalStateException("Cannot set complete after deleting tables");
diff --git a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
index af3c68663e..ea0784db7e 100644
--- a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
@@ -187,6 +187,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe
 	 * @throws Exception simply let any exception propagate
 	 * @see #onTearDown()
 	 */
+	@Override
 	protected void onSetUp() throws Exception {
 		this.complete = !this.isRollback();
 
@@ -250,6 +251,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe
 	 * @throws Exception simply let any exception propagate
 	 * @see #onSetUp()
 	 */
+	@Override
 	protected void onTearDown() throws Exception {
 		// Call onTearDownInTransaction and end transaction if the transaction
 		// is still active.
diff --git a/spring-test/src/main/java/org/springframework/test/ConditionalTestCase.java b/spring-test/src/main/java/org/springframework/test/ConditionalTestCase.java
index a8448f228c..223d3e629c 100644
--- a/spring-test/src/main/java/org/springframework/test/ConditionalTestCase.java
+++ b/spring-test/src/main/java/org/springframework/test/ConditionalTestCase.java
@@ -66,6 +66,7 @@ public abstract class ConditionalTestCase extends TestCase {
 		super(name);
 	}
 
+	@Override
 	public void runBare() throws Throwable {
 		// getName will return the name of the method being run
 		if (isDisabledInThisEnvironment(getName())) {
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
index 30c08a22cb..00e59c8226 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
@@ -174,6 +174,7 @@ public abstract class AbstractAnnotationAwareTransactionalTests extends
 
 		// Let JUnit handle execution. We're just changing the state of the test class first.
 		runTestTimed(new TestExecutionCallback() {
+			@Override
 			public void run() throws Throwable {
 				try {
 					AbstractAnnotationAwareTransactionalTests.super.runBare();
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/SystemProfileValueSource.java b/spring-test/src/main/java/org/springframework/test/annotation/SystemProfileValueSource.java
index f806acc1ff..7bd17b9bd5 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/SystemProfileValueSource.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/SystemProfileValueSource.java
@@ -50,6 +50,7 @@ public class SystemProfileValueSource implements ProfileValueSource {
 	 * system properties.
 	 * @see System#getProperty(String)
 	 */
+	@Override
 	public String get(String key) {
 		Assert.hasText(key, "'key' must not be empty");
 		return System.getProperty(key);
diff --git a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
index 732c1e0bf5..ccafb33693 100644
--- a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
+++ b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
@@ -177,6 +177,7 @@ public abstract class AbstractJUnit38SpringContextTests extends TestCase impleme
 	 * Sets the {@link ApplicationContext} to be used by this test instance,
 	 * provided via {@link ApplicationContextAware} semantics.
 	 */
+	@Override
 	public final void setApplicationContext(final ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 	}
@@ -215,6 +216,7 @@ public abstract class AbstractJUnit38SpringContextTests extends TestCase impleme
 
 		runTestTimed(new TestExecutionCallback() {
 
+			@Override
 			public void run() throws Throwable {
 				runManaged(testMethod);
 			}
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..6b99c6a108 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
@@ -80,6 +80,7 @@ public abstract class AbstractJUnit4SpringContextTests implements ApplicationCon
 	 * Set the {@link ApplicationContext} to be used by this test instance,
 	 * provided via {@link ApplicationContextAware} semantics.
 	 */
+	@Override
 	public final void setApplicationContext(final ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 	}
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 0928ff4c9e..9bd7032351 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
@@ -86,6 +86,7 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
 	 * @since 3.1
 	 * @see #processLocations(Class, String...)
 	 */
+	@Override
 	public void processContextConfiguration(ContextConfigurationAttributes configAttributes) {
 		String[] processedLocations = processLocations(configAttributes.getDeclaringClass(),
 			configAttributes.getLocations());
@@ -174,6 +175,7 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
 	 * @see org.springframework.test.context.ContextLoader#processLocations(Class, String...)
 	 * @see #processContextConfiguration(ContextConfigurationAttributes)
 	 */
+	@Override
 	public final String[] processLocations(Class<?> clazz, String... locations) {
 		return (ObjectUtils.isEmpty(locations) && isGenerateDefaultLocations()) ? generateDefaultLocations(clazz)
 				: modifyLocations(clazz, locations);
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..f0dc37fe67 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
@@ -142,6 +142,7 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte
 	 * context configuration; or if both candidate loaders detect defaults for the
 	 * supplied context configuration
 	 */
+	@Override
 	public void processContextConfiguration(final ContextConfigurationAttributes configAttributes) {
 
 		Assert.notNull(configAttributes, "configAttributes must not be null");
@@ -236,6 +237,7 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte
 	 * @throws IllegalStateException if neither candidate loader is capable of loading an
 	 * {@code ApplicationContext} from the supplied merged context configuration
 	 */
+	@Override
 	public ApplicationContext loadContext(MergedContextConfiguration mergedConfig) throws Exception {
 		Assert.notNull(mergedConfig, "mergedConfig must not be null");
 
@@ -268,6 +270,7 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte
 	 * {@link #processContextConfiguration(ContextConfigurationAttributes)} instead.
 	 * @throws UnsupportedOperationException
 	 */
+	@Override
 	public final String[] processLocations(Class<?> clazz, String... locations) {
 		throw new UnsupportedOperationException("DelegatingSmartContextLoaders do not support the ContextLoader SPI. "
 				+ "Call processContextConfiguration(ContextConfigurationAttributes) instead.");
@@ -279,6 +282,7 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte
 	 * {@link #loadContext(MergedContextConfiguration)} instead.
 	 * @throws UnsupportedOperationException
 	 */
+	@Override
 	public final ApplicationContext loadContext(String... locations) throws Exception {
 		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/AbstractGenericContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
index c4b9b4dca7..eb42b471a0 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java
@@ -90,6 +90,7 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	 * @see GenericApplicationContext
 	 * @since 3.1
 	 */
+	@Override
 	public final ConfigurableApplicationContext loadContext(MergedContextConfiguration mergedConfig) throws Exception {
 		if (logger.isDebugEnabled()) {
 			logger.debug(String.format("Loading ApplicationContext for merged context configuration [%s].",
@@ -142,6 +143,7 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	 * @see #loadContext(MergedContextConfiguration)
 	 * @since 2.5
 	 */
+	@Override
 	public final ConfigurableApplicationContext loadContext(String... locations) throws Exception {
 		if (logger.isDebugEnabled()) {
 			logger.debug(String.format("Loading ApplicationContext for locations [%s].",
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java
index 34dfe47ec7..2f349cbc96 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java
@@ -34,6 +34,7 @@ public abstract class AbstractTestExecutionListener implements TestExecutionList
 	 * The default implementation is <em>empty</em>. Can be overridden by
 	 * subclasses as necessary.
 	 */
+	@Override
 	public void beforeTestClass(TestContext testContext) throws Exception {
 		/* no-op */
 	}
@@ -42,6 +43,7 @@ public abstract class AbstractTestExecutionListener implements TestExecutionList
 	 * The default implementation is <em>empty</em>. Can be overridden by
 	 * subclasses as necessary.
 	 */
+	@Override
 	public void prepareTestInstance(TestContext testContext) throws Exception {
 		/* no-op */
 	}
@@ -50,6 +52,7 @@ public abstract class AbstractTestExecutionListener implements TestExecutionList
 	 * The default implementation is <em>empty</em>. Can be overridden by
 	 * subclasses as necessary.
 	 */
+	@Override
 	public void beforeTestMethod(TestContext testContext) throws Exception {
 		/* no-op */
 	}
@@ -58,6 +61,7 @@ public abstract class AbstractTestExecutionListener implements TestExecutionList
 	 * The default implementation is <em>empty</em>. Can be overridden by
 	 * subclasses as necessary.
 	 */
+	@Override
 	public void afterTestMethod(TestContext testContext) throws Exception {
 		/* no-op */
 	}
@@ -66,6 +70,7 @@ public abstract class AbstractTestExecutionListener implements TestExecutionList
 	 * The default implementation is <em>empty</em>. Can be overridden by
 	 * subclasses as necessary.
 	 */
+	@Override
 	public void afterTestClass(TestContext testContext) throws Exception {
 		/* no-op */
 	}
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
index 39e76f6e1a..29a26c5e25 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
@@ -74,6 +74,7 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
 	 * @see #isGenerateDefaultLocations()
 	 * @see #detectDefaultConfigurationClasses(Class)
 	 */
+	@Override
 	public void processContextConfiguration(ContextConfigurationAttributes configAttributes) {
 		if (ObjectUtils.isEmpty(configAttributes.getClasses()) && isGenerateDefaultLocations()) {
 			Class<?>[] defaultConfigClasses = detectDefaultConfigurationClasses(configAttributes.getDeclaringClass());
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java
index 32442fe3ec..108c66f014 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java
@@ -36,10 +36,12 @@ public class DelegatingSmartContextLoader extends AbstractDelegatingSmartContext
 	private final SmartContextLoader annotationConfigLoader = new AnnotationConfigContextLoader();
 
 
+	@Override
 	protected SmartContextLoader getXmlLoader() {
 		return this.xmlLoader;
 	}
 
+	@Override
 	protected SmartContextLoader getAnnotationConfigLoader() {
 		return this.annotationConfigLoader;
 	}
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..e8cbecc271 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
@@ -99,6 +99,7 @@ public abstract class AbstractTestNGSpringContextTests implements IHookable, App
 	 *
 	 * @param applicationContext the applicationContext to set
 	 */
+	@Override
 	public final void setApplicationContext(ApplicationContext applicationContext) {
 		this.applicationContext = applicationContext;
 	}
@@ -151,6 +152,7 @@ public abstract class AbstractTestNGSpringContextTests implements IHookable, App
 	 * @see org.testng.IHookable#run(org.testng.IHookCallBack,
 	 * org.testng.ITestResult)
 	 */
+	@Override
 	public void run(IHookCallBack callBack, ITestResult testResult) {
 		callBack.runTestMethod(testResult);
 
diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
index 5535fa974f..eab92252fb 100644
--- a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
@@ -153,6 +153,7 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis
 		if (transactionAttribute != null) {
 			transactionAttribute = new DelegatingTransactionAttribute(transactionAttribute) {
 
+				@Override
 				public String getName() {
 					return testMethod.getName();
 				}
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
index f344ae2eee..4cb8897f87 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/AbstractGenericWebContextLoader.java
@@ -92,6 +92,7 @@ public abstract class AbstractGenericWebContextLoader extends AbstractContextLoa
 	 * @see org.springframework.test.context.SmartContextLoader#loadContext(MergedContextConfiguration)
 	 * @see GenericWebApplicationContext
 	 */
+	@Override
 	public final ConfigurableApplicationContext loadContext(MergedContextConfiguration mergedConfig) throws Exception {
 
 		if (!(mergedConfig instanceof WebMergedContextConfiguration)) {
@@ -216,6 +217,7 @@ public abstract class AbstractGenericWebContextLoader extends AbstractContextLoa
 	 * @see org.springframework.test.context.ContextLoader#loadContext(java.lang.String[])
 	 * @throws UnsupportedOperationException
 	 */
+	@Override
 	public final ApplicationContext loadContext(String... locations) throws Exception {
 		throw new UnsupportedOperationException(
 			"AbstractGenericWebContextLoader does not support the loadContext(String... locations) method");
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java
index 05acb46366..e82a63807d 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java
@@ -75,6 +75,7 @@ public class AnnotationConfigWebContextLoader extends AbstractGenericWebContextL
 	 * @see #isGenerateDefaultLocations()
 	 * @see #detectDefaultConfigurationClasses(Class)
 	 */
+	@Override
 	public void processContextConfiguration(ContextConfigurationAttributes configAttributes) {
 		if (ObjectUtils.isEmpty(configAttributes.getClasses()) && isGenerateDefaultLocations()) {
 			Class<?>[] defaultConfigClasses = detectDefaultConfigurationClasses(configAttributes.getDeclaringClass());
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/GenericXmlWebContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/web/GenericXmlWebContextLoader.java
index 0bf295e054..d172fed883 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/GenericXmlWebContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/GenericXmlWebContextLoader.java
@@ -41,6 +41,7 @@ public class GenericXmlWebContextLoader extends AbstractGenericWebContextLoader
 	/**
 	 * Returns &quot;{@code -context.xml}&quot;.
 	 */
+	@Override
 	protected String getResourceSuffix() {
 		return "-context.xml";
 	}
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 01302bb110..215b363ae2 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
@@ -69,6 +69,7 @@ public class ServletTestExecutionListener extends AbstractTestExecutionListener
 	 * @see TestExecutionListener#prepareTestInstance(TestContext)
 	 * @see #setUpRequestContextIfNecessary(TestContext)
 	 */
+	@Override
 	public void prepareTestInstance(TestContext testContext) throws Exception {
 		setUpRequestContextIfNecessary(testContext);
 	}
@@ -80,6 +81,7 @@ public class ServletTestExecutionListener extends AbstractTestExecutionListener
 	 * @see TestExecutionListener#beforeTestMethod(TestContext)
 	 * @see #setUpRequestContextIfNecessary(TestContext)
 	 */
+	@Override
 	public void beforeTestMethod(TestContext testContext) throws Exception {
 		setUpRequestContextIfNecessary(testContext);
 	}
@@ -91,6 +93,7 @@ public class ServletTestExecutionListener extends AbstractTestExecutionListener
 	 *
 	 * @see TestExecutionListener#afterTestMethod(TestContext)
 	 */
+	@Override
 	public void afterTestMethod(TestContext testContext) throws Exception {
 		if (logger.isDebugEnabled()) {
 			logger.debug(String.format("Resetting RequestContextHolder for test context %s.", testContext));
diff --git a/spring-test/src/main/java/org/springframework/test/context/web/WebDelegatingSmartContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/web/WebDelegatingSmartContextLoader.java
index fa561c00a7..9dc43968aa 100644
--- a/spring-test/src/main/java/org/springframework/test/context/web/WebDelegatingSmartContextLoader.java
+++ b/spring-test/src/main/java/org/springframework/test/context/web/WebDelegatingSmartContextLoader.java
@@ -37,10 +37,12 @@ public class WebDelegatingSmartContextLoader extends AbstractDelegatingSmartCont
 	private final SmartContextLoader annotationConfigLoader = new AnnotationConfigWebContextLoader();
 
 
+	@Override
 	protected SmartContextLoader getXmlLoader() {
 		return this.xmlLoader;
 	}
 
+	@Override
 	protected SmartContextLoader getAnnotationConfigLoader() {
 		return this.annotationConfigLoader;
 	}
diff --git a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
index ba959d162f..4e27b65b4c 100644
--- a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
+++ b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java
@@ -330,6 +330,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 			this.ltw = ltw;
 		}
 
+		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 			if (bean instanceof LocalContainerEntityManagerFactoryBean) {
 				((LocalContainerEntityManagerFactoryBean) bean).setLoadTimeWeaver(this.ltw);
@@ -350,6 +351,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 			this.shadowingClassLoader = shadowingClassLoader;
 		}
 
+		@Override
 		public void addTransformer(ClassFileTransformer transformer) {
 			try {
 				Method addClassFileTransformer =
@@ -362,10 +364,12 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio
 			}
 		}
 
+		@Override
 		public ClassLoader getInstrumentableClassLoader() {
 			return this.shadowingClassLoader;
 		}
 
+		@Override
 		public ClassLoader getThrowawayClassLoader() {
 			// Be sure to copy the same resource overrides and same class file transformers:
 			// We want the throwaway class loader to behave like the instrumentable class loader.
diff --git a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java
index 2b8358d678..4aaab8b137 100644
--- a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java
+++ b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java
@@ -73,10 +73,12 @@ public class PersistenceExceptionTranslationAdvisor extends AbstractPointcutAdvi
 	}
 
 
+	@Override
 	public Advice getAdvice() {
 		return this.advice;
 	}
 
+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
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..b8588a878b 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
@@ -77,6 +77,7 @@ public class PersistenceExceptionTranslationPostProcessor extends AbstractAdvisi
 		this.repositoryAnnotationType = repositoryAnnotationType;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (!(beanFactory instanceof ListableBeanFactory)) {
 			throw new IllegalArgumentException(
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java b/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
index bdaddb8c55..d86c5aeb11 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java
@@ -53,6 +53,7 @@ public class ChainedPersistenceExceptionTranslator implements PersistenceExcepti
 	}
 
 
+	@Override
 	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		for (PersistenceExceptionTranslator pet : this.delegates) {
 			DataAccessException translatedDex = pet.translateExceptionIfPossible(ex);
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java b/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
index 4b5f6865c7..91e29d1113 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
@@ -39,6 +39,7 @@ public abstract class DaoSupport implements InitializingBean {
 	protected final Log logger = LogFactory.getLog(getClass());
 
 
+	@Override
 	public final void afterPropertiesSet() throws IllegalArgumentException, BeanInitializationException {
 		// Let abstract subclasses check their configuration.
 		checkDaoConfig();
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
index 9cf7432c43..b486dccdfa 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java
@@ -107,6 +107,7 @@ public class PersistenceExceptionTranslationInterceptor
 		this.alwaysTranslate = alwaysTranslate;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		if (this.persistenceExceptionTranslator == null) {
 			// No explicit exception translator specified - perform autodetection.
@@ -119,6 +120,7 @@ public class PersistenceExceptionTranslationInterceptor
 		}
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.persistenceExceptionTranslator == null) {
 			throw new IllegalArgumentException("Property 'persistenceExceptionTranslator' is required");
@@ -150,6 +152,7 @@ public class PersistenceExceptionTranslationInterceptor
 	}
 
 
+	@Override
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();
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..93404bd98e 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
@@ -109,6 +109,7 @@ public class CciLocalTransactionManager extends AbstractPlatformTransactionManag
 		return this.connectionFactory;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getConnectionFactory() == null) {
 			throw new IllegalArgumentException("Property 'connectionFactory' is required");
@@ -116,6 +117,7 @@ public class CciLocalTransactionManager extends AbstractPlatformTransactionManag
 	}
 
 
+	@Override
 	public Object getResourceFactory() {
 		return getConnectionFactory();
 	}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
index f01ac83100..5bc218d461 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java
@@ -60,6 +60,7 @@ public class DelegatingConnectionFactory implements ConnectionFactory, Initializ
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (getTargetConnectionFactory() == null) {
 			throw new IllegalArgumentException("Property 'targetConnectionFactory' is required");
@@ -67,26 +68,32 @@ public class DelegatingConnectionFactory implements ConnectionFactory, Initializ
 	}
 
 
+	@Override
 	public Connection getConnection() throws ResourceException {
 		return getTargetConnectionFactory().getConnection();
 	}
 
+	@Override
 	public Connection getConnection(ConnectionSpec connectionSpec) throws ResourceException {
 		return getTargetConnectionFactory().getConnection(connectionSpec);
 	}
 
+	@Override
 	public RecordFactory getRecordFactory() throws ResourceException {
 		return getTargetConnectionFactory().getRecordFactory();
 	}
 
+	@Override
 	public ResourceAdapterMetaData getMetaData() throws ResourceException {
 		return getTargetConnectionFactory().getMetaData();
 	}
 
+	@Override
 	public Reference getReference() throws NamingException {
 		return getTargetConnectionFactory().getReference();
 	}
 
+	@Override
 	public void setReference(Reference reference) {
 		getTargetConnectionFactory().setReference(reference);
 	}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
index bf1808db81..ed843edeed 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java
@@ -41,10 +41,12 @@ import javax.resource.cci.RecordFactory;
  */
 public class NotSupportedRecordFactory implements RecordFactory {
 
+	@Override
 	public MappedRecord createMappedRecord(String name) throws ResourceException {
 		throw new NotSupportedException("The RecordFactory facility is not supported by the connector");
 	}
 
+	@Override
 	public IndexedRecord createIndexedRecord(String name) throws ResourceException {
 		throw new NotSupportedException("The RecordFactory facility is not supported by the connector");
 	}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
index fe391c8805..40a50b80dd 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java
@@ -129,6 +129,7 @@ public class SingleConnectionFactory extends DelegatingConnectionFactory impleme
 	 * <p>As this bean implements DisposableBean, a bean factory will
 	 * automatically invoke this on destruction of its cached singletons.
 	 */
+	@Override
 	public void destroy() {
 		resetConnection();
 	}
@@ -228,6 +229,7 @@ public class SingleConnectionFactory extends DelegatingConnectionFactory impleme
 			this.target = target;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			if (method.getName().equals("equals")) {
 				// Only consider equal when proxies are identical.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
index f5b2b5d0ec..7fd30b3a9b 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java
@@ -128,6 +128,7 @@ public class TransactionAwareConnectionFactoryProxy extends DelegatingConnection
 			this.connectionFactory = cf;
 		}
 
+		@Override
 		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 			// Invocation on Connection interface coming in...
 
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
index d55909ebe0..4bd46036ca 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java
@@ -187,6 +187,7 @@ public class CciTemplate implements CciOperations {
 	}
 
 
+	@Override
 	public <T> T execute(ConnectionCallback<T> action) throws DataAccessException {
 		Assert.notNull(action, "Callback object must not be null");
 		Connection con = ConnectionFactoryUtils.getConnection(getConnectionFactory(), getConnectionSpec());
@@ -207,9 +208,11 @@ public class CciTemplate implements CciOperations {
 		}
 	}
 
+	@Override
 	public <T> T execute(final InteractionCallback<T> action) throws DataAccessException {
 		Assert.notNull(action, "Callback object must not be null");
 		return execute(new ConnectionCallback<T>() {
+			@Override
 			public T doInConnection(Connection connection, ConnectionFactory connectionFactory)
 					throws ResourceException, SQLException, DataAccessException {
 				Interaction interaction = connection.createInteraction();
@@ -223,24 +226,29 @@ public class CciTemplate implements CciOperations {
 		});
 	}
 
+	@Override
 	public Record execute(InteractionSpec spec, Record inputRecord) throws DataAccessException {
 		return doExecute(spec, inputRecord, null, new SimpleRecordExtractor());
 	}
 
+	@Override
 	public void execute(InteractionSpec spec, Record inputRecord, Record outputRecord) throws DataAccessException {
 		doExecute(spec, inputRecord, outputRecord, null);
 	}
 
+	@Override
 	public Record execute(InteractionSpec spec, RecordCreator inputCreator) throws DataAccessException {
 		return doExecute(spec, createRecord(inputCreator), null, new SimpleRecordExtractor());
 	}
 
+	@Override
 	public <T> T execute(InteractionSpec spec, Record inputRecord, RecordExtractor<T> outputExtractor)
 			throws DataAccessException {
 
 		return doExecute(spec, inputRecord, null, outputExtractor);
 	}
 
+	@Override
 	public <T> T execute(InteractionSpec spec, RecordCreator inputCreator, RecordExtractor<T> outputExtractor)
 			throws DataAccessException {
 
@@ -263,6 +271,7 @@ public class CciTemplate implements CciOperations {
 			final RecordExtractor<T> outputExtractor) throws DataAccessException {
 
 		return execute(new InteractionCallback<T>() {
+			@Override
 			public T doInInteraction(Interaction interaction, ConnectionFactory connectionFactory)
 					throws ResourceException, SQLException, DataAccessException {
 				Record outputRecordToUse = outputRecord;
@@ -421,6 +430,7 @@ public class CciTemplate implements CciOperations {
 
 	private static class SimpleRecordExtractor implements RecordExtractor<Record> {
 
+		@Override
 		public Record extractData(Record record) {
 			return record;
 		}
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
index 982b43064b..b9989c945a 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java
@@ -59,27 +59,33 @@ public class CommAreaRecord implements Record, Streamable {
 	}
 
 
+	@Override
 	public void setRecordName(String recordName) {
 		this.recordName=recordName;
 	}
 
+	@Override
 	public String getRecordName() {
 		return recordName;
 	}
 
+	@Override
 	public void setRecordShortDescription(String recordShortDescription) {
 		this.recordShortDescription=recordShortDescription;
 	}
 
+	@Override
 	public String getRecordShortDescription() {
 		return recordShortDescription;
 	}
 
 
+	@Override
 	public void read(InputStream in) throws IOException {
 		this.bytes = FileCopyUtils.copyToByteArray(in);
 	}
 
+	@Override
 	public void write(OutputStream out) throws IOException {
 		out.write(this.bytes);
 		out.flush();
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java
index 9602e9a625..36c8810c23 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java
@@ -82,6 +82,7 @@ public abstract class EisOperation implements InitializingBean {
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		this.cciTemplate.afterPropertiesSet();
 
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
index 413a034ae7..c792c2af1f 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java
@@ -129,6 +129,7 @@ public abstract class MappingRecordOperation extends EisOperation {
 			this.inputObject = inObject;
 		}
 
+		@Override
 		public Record createRecord(RecordFactory recordFactory) throws ResourceException, DataAccessException {
 			return createInputRecord(recordFactory, this.inputObject);
 		}
@@ -141,6 +142,7 @@ public abstract class MappingRecordOperation extends EisOperation {
 	 */
 	protected class RecordExtractorImpl implements RecordExtractor {
 
+		@Override
 		public Object extractData(Record record) throws ResourceException, SQLException, DataAccessException {
 			return extractOutputData(record);
 		}
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java
index 5fa12422f5..97ff0bdfb6 100644
--- a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java
+++ b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java
@@ -46,6 +46,7 @@ class BootstrapContextAwareProcessor implements BeanPostProcessor {
 	}
 
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		if (this.bootstrapContext != null && bean instanceof BootstrapContextAware) {
 			((BootstrapContextAware) bean).setBootstrapContext(this.bootstrapContext);
@@ -53,6 +54,7 @@ class BootstrapContextAwareProcessor implements BeanPostProcessor {
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 		return bean;
 	}
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java b/spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java
index 72303b4c32..60c3861729 100644
--- a/spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java
+++ b/spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java
@@ -60,6 +60,7 @@ public class ResourceAdapterApplicationContext extends GenericApplicationContext
 
 		// JCA WorkManager resolved lazily - may not be available.
 		beanFactory.registerResolvableDependency(WorkManager.class, new ObjectFactory<WorkManager>() {
+			@Override
 			public WorkManager getObject() {
 				return bootstrapContext.getWorkManager();
 			}
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
index 25bac95668..82d317b4ae 100644
--- a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
@@ -156,6 +156,7 @@ public class SpringContextResourceAdapter implements ResourceAdapter {
 	 * This implementation loads a Spring ApplicationContext through the
 	 * {@link #createApplicationContext} template method.
 	 */
+	@Override
 	public void start(BootstrapContext bootstrapContext) throws ResourceAdapterInternalException {
 		if (logger.isInfoEnabled()) {
 			logger.info("Starting SpringContextResourceAdapter with BootstrapContext: " + bootstrapContext);
@@ -200,6 +201,7 @@ public class SpringContextResourceAdapter implements ResourceAdapter {
 	/**
 	 * This implementation closes the Spring ApplicationContext.
 	 */
+	@Override
 	public void stop() {
 		logger.info("Stopping SpringContextResourceAdapter");
 		this.applicationContext.close();
@@ -209,6 +211,7 @@ public class SpringContextResourceAdapter implements ResourceAdapter {
 	/**
 	 * This implementation always throws a NotSupportedException.
 	 */
+	@Override
 	public void endpointActivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec)
 			throws ResourceException {
 
@@ -218,12 +221,14 @@ public class SpringContextResourceAdapter implements ResourceAdapter {
 	/**
 	 * This implementation does nothing.
 	 */
+	@Override
 	public void endpointDeactivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec) {
 	}
 
 	/**
 	 * This implementation always returns {@code null}.
 	 */
+	@Override
 	public XAResource[] getXAResources(ActivationSpec[] activationSpecs) throws ResourceException {
 		return null;
 	}
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
index 01f27f23ff..208a1f85bf 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java
@@ -123,6 +123,7 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
 	 * @see #setTransactionManager
 	 * @see #setTransactionFactory
 	 */
+	@Override
 	public boolean isDeliveryTransacted(Method method) throws NoSuchMethodException {
 		return (this.transactionFactory != null);
 	}
@@ -132,6 +133,7 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
 	 * <p>This implementation delegates to {@link #createEndpointInternal()},
 	 * initializing the endpoint's XAResource before the endpoint gets invoked.
 	 */
+	@Override
 	public MessageEndpoint createEndpoint(XAResource xaResource) throws UnavailableException {
 		AbstractMessageEndpoint endpoint = createEndpointInternal();
 		endpoint.initXAResource(xaResource);
@@ -189,6 +191,7 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
 		 * concrete endpoint method should call {@code beforeDelivery} and its
 		 * sibling {@link #afterDelivery()} explicitly, as part of its own processing.
 		 */
+		@Override
 		public void beforeDelivery(Method method) throws ResourceException {
 			this.beforeDeliveryCalled = true;
 			try {
@@ -236,6 +239,7 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
 		 * to call this method after invoking the concrete endpoint. See the
 		 * explanation in {@link #beforeDelivery}'s javadoc.
 		 */
+		@Override
 		public void afterDelivery() throws ResourceException {
 			this.beforeDeliveryCalled = false;
 			Thread.currentThread().setContextClassLoader(this.previousContextClassLoader);
@@ -248,6 +252,7 @@ public abstract class AbstractMessageEndpointFactory implements MessageEndpointF
 			}
 		}
 
+		@Override
 		public void release() {
 			try {
 				this.transactionDelegate.setRollbackOnly();
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
index fac5eba990..575e3e6e8c 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java
@@ -94,6 +94,7 @@ public class GenericMessageEndpointFactory extends AbstractMessageEndpointFactor
 	 */
 	private class GenericMessageEndpoint extends AbstractMessageEndpoint implements MethodInterceptor {
 
+		@Override
 		public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 			boolean applyDeliveryCalls = !hasBeforeDeliveryBeenCalled();
 			if (applyDeliveryCalls) {
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
index 56682b49fd..3d85df8936 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
@@ -224,6 +224,7 @@ public class GenericMessageEndpointManager implements SmartLifecycle, Initializi
 	 * Return the value for the 'autoStartup' property.	If "true", this
 	 * endpoint manager will start upon a ContextRefreshedEvent.
 	 */
+	@Override
 	public boolean isAutoStartup() {
 		return this.autoStartup;
 	}
@@ -242,6 +243,7 @@ public class GenericMessageEndpointManager implements SmartLifecycle, Initializi
 	/**
 	 * Return the phase in which this endpoint manager will be started and stopped.
 	 */
+	@Override
 	public int getPhase() {
 		return this.phase;
 	}
@@ -250,6 +252,7 @@ public class GenericMessageEndpointManager implements SmartLifecycle, Initializi
 	 * Prepares the message endpoint, and automatically activates it
 	 * if the "autoStartup" flag is set to "true".
 	 */
+	@Override
 	public void afterPropertiesSet() throws ResourceException {
 		if (getResourceAdapter() == null) {
 			throw new IllegalArgumentException("Property 'resourceAdapter' is required");
@@ -274,6 +277,7 @@ public class GenericMessageEndpointManager implements SmartLifecycle, Initializi
 	/**
 	 * Activates the configured message endpoint.
 	 */
+	@Override
 	public void start() {
 		synchronized (this.lifecycleMonitor) {
 			if (!this.running) {
@@ -291,6 +295,7 @@ public class GenericMessageEndpointManager implements SmartLifecycle, Initializi
 	/**
 	 * Deactivates the configured message endpoint.
 	 */
+	@Override
 	public void stop() {
 		synchronized (this.lifecycleMonitor) {
 			if (this.running) {
@@ -300,6 +305,7 @@ public class GenericMessageEndpointManager implements SmartLifecycle, Initializi
 		}
 	}
 
+	@Override
 	public void stop(Runnable callback) {
 		synchronized (this.lifecycleMonitor) {
 			this.stop();
@@ -310,6 +316,7 @@ public class GenericMessageEndpointManager implements SmartLifecycle, Initializi
 	/**
 	 * Return whether the configured message endpoint is currently active.
 	 */
+	@Override
 	public boolean isRunning() {
 		synchronized (this.lifecycleMonitor) {
 			return this.running;
@@ -319,6 +326,7 @@ public class GenericMessageEndpointManager implements SmartLifecycle, Initializi
 	/**
 	 * Deactivates the message endpoint, preparing it for shutdown.
 	 */
+	@Override
 	public void destroy() {
 		stop();
 	}
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java b/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
index bf7f6920d7..cf7393bdaa 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
@@ -109,6 +109,7 @@ public class LocalConnectionFactoryBean implements FactoryBean<Object>, Initiali
 		this.connectionManager = connectionManager;
 	}
 
+	@Override
 	public void afterPropertiesSet() throws ResourceException {
 		if (this.managedConnectionFactory == null) {
 			throw new IllegalArgumentException("Property 'managedConnectionFactory' is required");
@@ -122,14 +123,17 @@ public class LocalConnectionFactoryBean implements FactoryBean<Object>, Initiali
 	}
 
 
+	@Override
 	public Object getObject() {
 		return this.connectionFactory;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return (this.connectionFactory != null ? this.connectionFactory.getClass() : null);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java b/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java
index ed1c3372f4..ac24240aaf 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java
@@ -113,6 +113,7 @@ public class ResourceAdapterFactoryBean implements FactoryBean<ResourceAdapter>,
 	 * Builds the BootstrapContext and starts the ResourceAdapter with it.
 	 * @see javax.resource.spi.ResourceAdapter#start(javax.resource.spi.BootstrapContext)
 	 */
+	@Override
 	public void afterPropertiesSet() throws ResourceException {
 		if (this.resourceAdapter == null) {
 			throw new IllegalArgumentException("'resourceAdapter' or 'resourceAdapterClass' is required");
@@ -124,14 +125,17 @@ public class ResourceAdapterFactoryBean implements FactoryBean<ResourceAdapter>,
 	}
 
 
+	@Override
 	public ResourceAdapter getObject() {
 		return this.resourceAdapter;
 	}
 
+	@Override
 	public Class<? extends ResourceAdapter> getObjectType() {
 		return (this.resourceAdapter != null ? this.resourceAdapter.getClass() : ResourceAdapter.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
@@ -141,6 +145,7 @@ public class ResourceAdapterFactoryBean implements FactoryBean<ResourceAdapter>,
 	 * Stops the ResourceAdapter.
 	 * @see javax.resource.spi.ResourceAdapter#stop()
 	 */
+	@Override
 	public void destroy() {
 		this.resourceAdapter.stop();
 	}
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java b/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
index d26fea7332..be54bddd5c 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java
@@ -62,6 +62,7 @@ public class SimpleBootstrapContext implements BootstrapContext {
 	}
 
 
+	@Override
 	public WorkManager getWorkManager() {
 		if (this.workManager == null) {
 			throw new IllegalStateException("No WorkManager available");
@@ -69,10 +70,12 @@ public class SimpleBootstrapContext implements BootstrapContext {
 		return this.workManager;
 	}
 
+	@Override
 	public XATerminator getXATerminator() {
 		return this.xaTerminator;
 	}
 
+	@Override
 	public Timer createTimer() throws UnavailableException {
 		return new Timer();
 	}
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java b/spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java
index 9f3ee639b1..d3601d2791 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java
@@ -53,6 +53,7 @@ public class DelegatingWork implements Work {
 	/**
 	 * Delegates execution to the underlying Runnable.
 	 */
+	@Override
 	public void run() {
 		this.delegate.run();
 	}
@@ -61,6 +62,7 @@ public class DelegatingWork implements Work {
 	 * This implementation is empty, since we expect the Runnable
 	 * to terminate based on some specific shutdown signal.
 	 */
+	@Override
 	public void release() {
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java b/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
index 63c8564f37..702a26dd4e 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
@@ -88,10 +88,12 @@ public class SimpleTaskWorkManager implements WorkManager {
 	}
 
 
+	@Override
 	public void doWork(Work work) throws WorkException {
 		doWork(work, WorkManager.INDEFINITE, null, null);
 	}
 
+	@Override
 	public void doWork(Work work, long startTimeout, ExecutionContext executionContext, WorkListener workListener)
 			throws WorkException {
 
@@ -99,10 +101,12 @@ public class SimpleTaskWorkManager implements WorkManager {
 		executeWork(this.syncTaskExecutor, work, startTimeout, false, executionContext, workListener);
 	}
 
+	@Override
 	public long startWork(Work work) throws WorkException {
 		return startWork(work, WorkManager.INDEFINITE, null, null);
 	}
 
+	@Override
 	public long startWork(Work work, long startTimeout, ExecutionContext executionContext, WorkListener workListener)
 			throws WorkException {
 
@@ -110,10 +114,12 @@ public class SimpleTaskWorkManager implements WorkManager {
 		return executeWork(this.asyncTaskExecutor, work, startTimeout, true, executionContext, workListener);
 	}
 
+	@Override
 	public void scheduleWork(Work work) throws WorkException {
 		scheduleWork(work, WorkManager.INDEFINITE, null, null);
 	}
 
+	@Override
 	public void scheduleWork(Work work, long startTimeout, ExecutionContext executionContext, WorkListener workListener)
 			throws WorkException {
 
@@ -219,6 +225,7 @@ public class SimpleTaskWorkManager implements WorkManager {
 			this.acceptOnExecution = acceptOnExecution;
 		}
 
+		@Override
 		public void run() {
 			if (this.acceptOnExecution) {
 				this.workListener.workAccepted(new WorkEvent(this, WorkEvent.WORK_ACCEPTED, work, null));
@@ -244,6 +251,7 @@ public class SimpleTaskWorkManager implements WorkManager {
 			this.workListener.workCompleted(new WorkEvent(this, WorkEvent.WORK_COMPLETED, this.work, null));
 		}
 
+		@Override
 		public void release() {
 			this.work.release();
 		}
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java b/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
index c6f4cb4c4e..de8f4da2cf 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/WorkManagerTaskExecutor.java
@@ -122,6 +122,7 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 	 * Specify the JCA BootstrapContext that contains the
 	 * WorkManager to delegate to.
 	 */
+	@Override
 	public void setBootstrapContext(BootstrapContext bootstrapContext) {
 		Assert.notNull(bootstrapContext, "BootstrapContext must not be null");
 		this.workManager = bootstrapContext.getWorkManager();
@@ -160,6 +161,7 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 		this.workListener = workListener;
 	}
 
+	@Override
 	public void afterPropertiesSet() throws NamingException {
 		if (this.workManager == null) {
 			if (this.workManagerName != null) {
@@ -186,10 +188,12 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 	// Implementation of the Spring SchedulingTaskExecutor interface
 	//-------------------------------------------------------------------------
 
+	@Override
 	public void execute(Runnable task) {
 		execute(task, TIMEOUT_INDEFINITE);
 	}
 
+	@Override
 	public void execute(Runnable task, long startTimeout) {
 		Assert.state(this.workManager != null, "No WorkManager specified");
 		Work work = new DelegatingWork(task);
@@ -232,12 +236,14 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 		}
 	}
 
+	@Override
 	public Future<?> submit(Runnable task) {
 		FutureTask<Object> future = new FutureTask<Object>(task, null);
 		execute(future, TIMEOUT_INDEFINITE);
 		return future;
 	}
 
+	@Override
 	public <T> Future<T> submit(Callable<T> task) {
 		FutureTask<T> future = new FutureTask<T>(task);
 		execute(future, TIMEOUT_INDEFINITE);
@@ -247,6 +253,7 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 	/**
 	 * This task executor prefers short-lived work units.
 	 */
+	@Override
 	public boolean prefersShortLivedTasks() {
 		return true;
 	}
@@ -256,30 +263,36 @@ public class WorkManagerTaskExecutor extends JndiLocatorSupport
 	// Implementation of the JCA WorkManager interface
 	//-------------------------------------------------------------------------
 
+	@Override
 	public void doWork(Work work) throws WorkException {
 		this.workManager.doWork(work);
 	}
 
+	@Override
 	public void doWork(Work work, long delay, ExecutionContext executionContext, WorkListener workListener)
 			throws WorkException {
 
 		this.workManager.doWork(work, delay, executionContext, workListener);
 	}
 
+	@Override
 	public long startWork(Work work) throws WorkException {
 		return this.workManager.startWork(work);
 	}
 
+	@Override
 	public long startWork(Work work, long delay, ExecutionContext executionContext, WorkListener workListener)
 			throws WorkException {
 
 		return this.workManager.startWork(work, delay, executionContext, workListener);
 	}
 
+	@Override
 	public void scheduleWork(Work work) throws WorkException {
 		this.workManager.scheduleWork(work);
 	}
 
+	@Override
 	public void scheduleWork(Work work, long delay, ExecutionContext executionContext, WorkListener workListener)
 			throws WorkException {
 
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..4aba8ee705 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
@@ -40,6 +40,7 @@ public abstract class AbstractTransactionManagementConfiguration implements Impo
 	protected AnnotationAttributes enableTx;
 	protected PlatformTransactionManager txManager;
 
+	@Override
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		this.enableTx = AnnotationAttributes.fromMap(
 				importMetadata.getAnnotationAttributes(EnableTransactionManagement.class.getName(), false));
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java
index f7122b3742..c7e20cf1dc 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java
@@ -34,6 +34,7 @@ import org.springframework.transaction.interceptor.TransactionAttribute;
 @SuppressWarnings("serial")
 public class Ejb3TransactionAnnotationParser implements TransactionAnnotationParser, Serializable {
 
+	@Override
 	public TransactionAttribute parseTransactionAnnotation(AnnotatedElement ae) {
 		javax.ejb.TransactionAttribute ann = ae.getAnnotation(javax.ejb.TransactionAttribute.class);
 		if (ann != null) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java
index d9024f1a1f..514548d9ce 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java
@@ -35,6 +35,7 @@ import org.springframework.transaction.interceptor.TransactionAttribute;
 @SuppressWarnings("serial")
 public class SpringTransactionAnnotationParser implements TransactionAnnotationParser, Serializable {
 
+	@Override
 	public TransactionAttribute parseTransactionAnnotation(AnnotatedElement ae) {
 		Transactional ann = AnnotationUtils.getAnnotation(ae, Transactional.class);
 		if (ann != null) {
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..6821c78e6b 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
@@ -73,6 +73,7 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
 	 * {@link AopNamespaceUtils#registerAutoProxyCreatorIfNecessary register an AutoProxyCreator}
 	 * with the container as necessary.
 	 */
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		String mode = element.getAttribute("mode");
 		if ("aspectj".equals(mode)) {
diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java b/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java
index 28736d0177..228ffdbc90 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java
@@ -50,6 +50,7 @@ public class TxNamespaceHandler extends NamespaceHandlerSupport {
 	}
 
 
+	@Override
 	public void init() {
 		registerBeanDefinitionParser("advice", new TxAdviceBeanDefinitionParser());
 		registerBeanDefinitionParser("annotation-driven", new AnnotationDrivenBeanDefinitionParser());
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..a1dcc33b39 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
@@ -80,6 +80,7 @@ public abstract class AbstractFallbackTransactionAttributeSource implements Tran
 	 * @return TransactionAttribute for this method, or {@code null} if the method
 	 * is not transactional
 	 */
+	@Override
 	public TransactionAttribute getTransactionAttribute(Method method, Class<?> targetClass) {
 		// First, see if we have a cached value.
 		Object cacheKey = getCacheKey(method, targetClass);
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java
index 551eb287da..49da42fb87 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java
@@ -61,6 +61,7 @@ public class BeanFactoryTransactionAttributeSourceAdvisor extends AbstractBeanFa
 		this.pointcut.setClassFilter(classFilter);
 	}
 
+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java
index 1deed0c720..a0f1a193b5 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java
@@ -52,6 +52,7 @@ public class CompositeTransactionAttributeSource implements TransactionAttribute
 	}
 
 
+	@Override
 	public TransactionAttribute getTransactionAttribute(Method method, Class<?> targetClass) {
 		for (TransactionAttributeSource tas : this.transactionAttributeSources) {
 			TransactionAttribute ta = tas.getTransactionAttribute(method, targetClass);
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..8e016f2533 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
@@ -82,6 +82,7 @@ public class DefaultTransactionAttribute extends DefaultTransactionDefinition im
 	/**
 	 * Return a qualifier value associated with this transaction attribute.
 	 */
+	@Override
 	public String getQualifier() {
 		return this.qualifier;
 	}
@@ -91,6 +92,7 @@ public class DefaultTransactionAttribute extends DefaultTransactionDefinition im
 	 * Additionally attempt to rollback on Error.
 	 * <p>This is consistent with TransactionTemplate's default behavior.
 	 */
+	@Override
 	public boolean rollbackOn(Throwable ex) {
 		return (ex instanceof RuntimeException || ex instanceof Error);
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java
index 32c66e68dd..84db321374 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java
@@ -46,10 +46,12 @@ public abstract class DelegatingTransactionAttribute extends DelegatingTransacti
 	}
 
 
+	@Override
 	public String getQualifier() {
 		return this.targetAttribute.getQualifier();
 	}
 
+	@Override
 	public boolean rollbackOn(Throwable ex) {
 		return this.targetAttribute.rollbackOn(ex);
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
index b67ed6982b..e27ee94bf5 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
@@ -50,6 +50,7 @@ public class MatchAlwaysTransactionAttributeSource implements TransactionAttribu
 	}
 
 
+	@Override
 	public TransactionAttribute getTransactionAttribute(Method method, Class<?> targetClass) {
 		return this.transactionAttribute;
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
index c71f01d681..77b26a5f25 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
@@ -81,6 +81,7 @@ public class MethodMapTransactionAttributeSource
 		this.methodMap = methodMap;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader beanClassLoader) {
 		this.beanClassLoader = beanClassLoader;
 	}
@@ -91,6 +92,7 @@ public class MethodMapTransactionAttributeSource
 	 * {@link #setMethodMap(java.util.Map) "methodMap"}, if any.
 	 * @see #initMethodMap(java.util.Map)
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		initMethodMap(this.methodMap);
 		this.eagerlyInitialized = true;
@@ -204,6 +206,7 @@ public class MethodMapTransactionAttributeSource
 	}
 
 
+	@Override
 	public TransactionAttribute getTransactionAttribute(Method method, Class<?> targetClass) {
 		if (this.eagerlyInitialized) {
 			return this.transactionAttributeMap.get(method);
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
index 8fa8be22a3..9d2b5debc8 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
@@ -98,6 +98,7 @@ public class NameMatchTransactionAttributeSource implements TransactionAttribute
 	}
 
 
+	@Override
 	public TransactionAttribute getTransactionAttribute(Method method, Class<?> targetClass) {
 		// look for direct name match
 		String methodName = method.getName();
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
index 8d15342c02..b9e6784298 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
@@ -206,6 +206,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init
 	/**
 	 * Set the BeanFactory to use for retrieving PlatformTransactionManager beans.
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.beanFactory = beanFactory;
 	}
@@ -220,6 +221,7 @@ public abstract class TransactionAspectSupport implements BeanFactoryAware, Init
 	/**
 	 * Check that required properties were set.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		if (this.transactionManager == null && this.beanFactory == null) {
 			throw new IllegalStateException(
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
index a5a632411d..3795ec8234 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java
@@ -79,10 +79,12 @@ public class TransactionAttributeSourceAdvisor extends AbstractPointcutAdvisor {
 	}
 
 
+	@Override
 	public Advice getAdvice() {
 		return this.transactionInterceptor;
 	}
 
+	@Override
 	public Pointcut getPointcut() {
 		return this.pointcut;
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
index 4b9314edf7..13b23dfcfd 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
@@ -32,6 +32,7 @@ import org.springframework.util.ObjectUtils;
 @SuppressWarnings("serial")
 abstract class TransactionAttributeSourcePointcut extends StaticMethodMatcherPointcut implements Serializable {
 
+	@Override
 	public boolean matches(Method method, Class targetClass) {
 		TransactionAttributeSource tas = getTransactionAttributeSource();
 		return (tas == null || tas.getTransactionAttribute(method, targetClass) != null);
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
index 11f72759a7..8fd9004b6d 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java
@@ -88,6 +88,7 @@ public class TransactionInterceptor extends TransactionAspectSupport implements
 	}
 
 
+	@Override
 	public Object invoke(final MethodInvocation invocation) throws Throwable {
 		// Work out the target class: may be {@code null}.
 		// The TransactionAttributeSource should be passed the target class
@@ -126,6 +127,7 @@ public class TransactionInterceptor extends TransactionAspectSupport implements
 			try {
 				Object result = ((CallbackPreferringPlatformTransactionManager) tm).execute(txAttr,
 						new TransactionCallback<Object>() {
+							@Override
 							public Object doInTransaction(TransactionStatus status) {
 								TransactionInfo txInfo = prepareTransactionInfo(tm, txAttr, joinpointIdentification, status);
 								try {
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 eaf963cc39..611e44400d 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
@@ -180,6 +180,7 @@ public class TransactionProxyFactoryBean extends AbstractSingletonProxyFactoryBe
 	 * @see org.springframework.beans.factory.BeanFactoryUtils#beanOfTypeIncludingAncestors
 	 * @see org.springframework.transaction.PlatformTransactionManager
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		this.transactionInterceptor.setBeanFactory(beanFactory);
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
index fded50e167..4a4e70cb8e 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java
@@ -49,9 +49,11 @@ public class JtaAfterCompletionSynchronization implements Synchronization {
 	}
 
 
+	@Override
 	public void beforeCompletion() {
 	}
 
+	@Override
 	public void afterCompletion(int status) {
 		switch (status) {
 			case Status.STATUS_COMMITTED:
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..f60295ab07 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
@@ -410,6 +410,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 	 * Initialize the UserTransaction as well as the TransactionManager handle.
 	 * @see #initUserTransactionAndTransactionManager()
 	 */
+	@Override
 	public void afterPropertiesSet() throws TransactionSystemException {
 		initUserTransactionAndTransactionManager();
 		checkUserTransactionAndTransactionManager();
@@ -1164,6 +1165,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 	// Implementation of TransactionFactory interface
 	//---------------------------------------------------------------------
 
+	@Override
 	public Transaction createTransaction(String name, int timeout) throws NotSupportedException, SystemException {
 		TransactionManager tm = getTransactionManager();
 		Assert.state(tm != null, "No JTA TransactionManager available");
@@ -1174,6 +1176,7 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager
 		return new ManagedTransactionAdapter(tm);
 	}
 
+	@Override
 	public boolean supportsResourceAdapterManagedTransactions() {
 		return false;
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
index 356dd4819b..3f697ee16a 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
@@ -60,6 +60,7 @@ public class JtaTransactionObject implements SmartTransactionObject {
 	/**
 	 * This implementation checks the UserTransaction's rollback-only flag.
 	 */
+	@Override
 	public boolean isRollbackOnly() {
 		if (this.userTransaction == null) {
 			return false;
@@ -78,6 +79,7 @@ public class JtaTransactionObject implements SmartTransactionObject {
 	 * assuming that they will flush all affected ORM sessions.
 	 * @see org.springframework.transaction.support.TransactionSynchronization#flush()
 	 */
+	@Override
 	public void flush() {
 		TransactionSynchronizationUtils.triggerFlush();
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java
index d3310106ca..d07eb8f688 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java
@@ -57,31 +57,38 @@ public class ManagedTransactionAdapter implements Transaction {
 	}
 
 
+	@Override
 	public void commit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException,
 			SecurityException, SystemException {
 		this.transactionManager.commit();
 	}
 
+	@Override
 	public void rollback() throws SystemException {
 		this.transactionManager.rollback();
 	}
 
+	@Override
 	public void setRollbackOnly() throws SystemException {
 		this.transactionManager.setRollbackOnly();
 	}
 
+	@Override
 	public int getStatus() throws SystemException {
 		return this.transactionManager.getStatus();
 	}
 
+	@Override
 	public boolean enlistResource(XAResource xaRes) throws RollbackException, SystemException {
 		return this.transactionManager.getTransaction().enlistResource(xaRes);
 	}
 
+	@Override
 	public boolean delistResource(XAResource xaRes, int flag) throws SystemException {
 		return this.transactionManager.getTransaction().delistResource(xaRes, flag);
 	}
 
+	@Override
 	public void registerSynchronization(Synchronization sync) throws RollbackException, SystemException {
 		this.transactionManager.getTransaction().registerSynchronization(sync);
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java b/spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java
index 679e15060b..055bafcff4 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java
@@ -50,6 +50,7 @@ public class SimpleTransactionFactory implements TransactionFactory {
 	}
 
 
+	@Override
 	public Transaction createTransaction(String name, int timeout) throws NotSupportedException, SystemException {
 		if (timeout >= 0) {
 			this.transactionManager.setTransactionTimeout(timeout);
@@ -58,6 +59,7 @@ public class SimpleTransactionFactory implements TransactionFactory {
 		return new ManagedTransactionAdapter(this.transactionManager);
 	}
 
+	@Override
 	public boolean supportsResourceAdapterManagedTransactions() {
 		return false;
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
index e4ecffce74..421f8c86ad 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java
@@ -113,6 +113,7 @@ public class SpringJtaSynchronizationAdapter implements Synchronization {
 	 * <p>In case of an exception, the JTA transaction will be marked as rollback-only.
 	 * @see org.springframework.transaction.support.TransactionSynchronization#beforeCommit
 	 */
+	@Override
 	public void beforeCompletion() {
 		try {
 			boolean readOnly = TransactionSynchronizationManager.isCurrentTransactionReadOnly();
@@ -168,6 +169,7 @@ public class SpringJtaSynchronizationAdapter implements Synchronization {
 	 * @see org.springframework.transaction.support.TransactionSynchronization#beforeCompletion
 	 * @see org.springframework.transaction.support.TransactionSynchronization#afterCompletion
 	 */
+	@Override
 	public void afterCompletion(int status) {
 		if (!this.beforeCompletionCalled) {
 			// beforeCompletion not called before (probably because of JTA rollback).
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java
index 9472928761..67e1c7efa9 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java
@@ -65,28 +65,34 @@ public class UserTransactionAdapter implements UserTransaction {
 	}
 
 
+	@Override
 	public void setTransactionTimeout(int timeout) throws SystemException {
 		this.transactionManager.setTransactionTimeout(timeout);
 	}
 
+	@Override
 	public void begin() throws NotSupportedException, SystemException {
 		this.transactionManager.begin();
 	}
 
+	@Override
 	public void commit()
 			throws RollbackException, HeuristicMixedException, HeuristicRollbackException,
 			SecurityException, SystemException {
 		this.transactionManager.commit();
 	}
 
+	@Override
 	public void rollback() throws SecurityException, SystemException {
 		this.transactionManager.rollback();
 	}
 
+	@Override
 	public void setRollbackOnly() throws SystemException {
 		this.transactionManager.setRollbackOnly();
 	}
 
+	@Override
 	public int getStatus() throws SystemException {
 		return this.transactionManager.getStatus();
 	}
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..3480a11741 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
@@ -211,6 +211,7 @@ public class WebSphereUowTransactionManager extends JtaTransactionManager
 	}
 
 
+	@Override
 	public <T> T execute(TransactionDefinition definition, TransactionCallback<T> callback) throws TransactionException {
 		if (definition == null) {
 			// Use defaults if no transaction definition given.
@@ -330,6 +331,7 @@ public class WebSphereUowTransactionManager extends JtaTransactionManager
 			this.debug = debug;
 		}
 
+		@Override
 		public void run() {
 			DefaultTransactionStatus status = prepareTransactionStatus(
 					this.definition, (this.actualTransaction ? this : null),
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..ad6fe26042 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
@@ -332,6 +332,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	 * @see #isExistingTransaction
 	 * @see #doBegin
 	 */
+	@Override
 	public final TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
 		Object transaction = doGetTransaction();
 
@@ -693,6 +694,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	 * @see #doCommit
 	 * @see #rollback
 	 */
+	@Override
 	public final void commit(TransactionStatus status) throws TransactionException {
 		if (status.isCompleted()) {
 			throw new IllegalTransactionStateException(
@@ -813,6 +815,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
 	 * @see #doRollback
 	 * @see #doSetRollbackOnly
 	 */
+	@Override
 	public final void rollback(TransactionStatus status) throws TransactionException {
 		if (status.isCompleted()) {
 			throw new IllegalTransactionStateException(
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java
index 1e2f4455c9..840d7dbc49 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java
@@ -56,6 +56,7 @@ public abstract class AbstractTransactionStatus implements TransactionStatus {
 	// Handling of current transaction state
 	//---------------------------------------------------------------------
 
+	@Override
 	public void setRollbackOnly() {
 		this.rollbackOnly = true;
 	}
@@ -67,6 +68,7 @@ public abstract class AbstractTransactionStatus implements TransactionStatus {
 	 * @see #isLocalRollbackOnly()
 	 * @see #isGlobalRollbackOnly()
 	 */
+	@Override
 	public boolean isRollbackOnly() {
 		return (isLocalRollbackOnly() || isGlobalRollbackOnly());
 	}
@@ -92,6 +94,7 @@ public abstract class AbstractTransactionStatus implements TransactionStatus {
 	/**
 	 * This implementations is empty, considering flush as a no-op.
 	 */
+	@Override
 	public void flush() {
 	}
 
@@ -102,6 +105,7 @@ public abstract class AbstractTransactionStatus implements TransactionStatus {
 		this.completed = true;
 	}
 
+	@Override
 	public boolean isCompleted() {
 		return this.completed;
 	}
@@ -126,6 +130,7 @@ public abstract class AbstractTransactionStatus implements TransactionStatus {
 		return this.savepoint;
 	}
 
+	@Override
 	public boolean hasSavepoint() {
 		return (this.savepoint != null);
 	}
@@ -172,6 +177,7 @@ public abstract class AbstractTransactionStatus implements TransactionStatus {
 	 * @see #getSavepointManager()
 	 * @see org.springframework.transaction.SavepointManager
 	 */
+	@Override
 	public Object createSavepoint() throws TransactionException {
 		return getSavepointManager().createSavepoint();
 	}
@@ -183,6 +189,7 @@ public abstract class AbstractTransactionStatus implements TransactionStatus {
 	 * @see #getSavepointManager()
 	 * @see org.springframework.transaction.SavepointManager
 	 */
+	@Override
 	public void rollbackToSavepoint(Object savepoint) throws TransactionException {
 		getSavepointManager().rollbackToSavepoint(savepoint);
 	}
@@ -193,6 +200,7 @@ public abstract class AbstractTransactionStatus implements TransactionStatus {
 	 * @see #getSavepointManager()
 	 * @see org.springframework.transaction.SavepointManager
 	 */
+	@Override
 	public void releaseSavepoint(Object savepoint) throws TransactionException {
 		getSavepointManager().releaseSavepoint(savepoint);
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
index f1a63abc11..b83b01698b 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
@@ -134,6 +134,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
 		this.propagationBehavior = propagationBehavior;
 	}
 
+	@Override
 	public final int getPropagationBehavior() {
 		return this.propagationBehavior;
 	}
@@ -168,6 +169,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
 		this.isolationLevel = isolationLevel;
 	}
 
+	@Override
 	public final int getIsolationLevel() {
 		return this.isolationLevel;
 	}
@@ -184,6 +186,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
 		this.timeout = timeout;
 	}
 
+	@Override
 	public final int getTimeout() {
 		return this.timeout;
 	}
@@ -196,6 +199,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
 		this.readOnly = readOnly;
 	}
 
+	@Override
 	public final boolean isReadOnly() {
 		return this.readOnly;
 	}
@@ -209,6 +213,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
 		this.name = name;
 	}
 
+	@Override
 	public final String getName() {
 		return this.name;
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java
index 9569dc1098..22f6f46acc 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java
@@ -103,6 +103,7 @@ public class DefaultTransactionStatus extends AbstractTransactionStatus {
 		return (this.transaction != null);
 	}
 
+	@Override
 	public boolean isNewTransaction() {
 		return (hasTransaction() && this.newTransaction);
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
index 4bc84fb392..e05c4e2784 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
@@ -46,22 +46,27 @@ public abstract class DelegatingTransactionDefinition implements TransactionDefi
 	}
 
 
+	@Override
 	public int getPropagationBehavior() {
 		return this.targetDefinition.getPropagationBehavior();
 	}
 
+	@Override
 	public int getIsolationLevel() {
 		return this.targetDefinition.getIsolationLevel();
 	}
 
+	@Override
 	public int getTimeout() {
 		return this.targetDefinition.getTimeout();
 	}
 
+	@Override
 	public boolean isReadOnly() {
 		return this.targetDefinition.isReadOnly();
 	}
 
+	@Override
 	public String getName() {
 		return this.targetDefinition.getName();
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
index 4120e5b0b3..e8ab7707b2 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
@@ -177,15 +177,18 @@ public abstract class ResourceHolderSupport implements ResourceHolder {
 	/**
 	 * Reset this resource holder - transactional state as well as reference count.
 	 */
+	@Override
 	public void reset() {
 		clear();
 		this.referenceCount = 0;
 	}
 
+	@Override
 	public void unbound() {
 		this.isVoid = true;
 	}
 
+	@Override
 	public boolean isVoid() {
 		return this.isVoid;
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java
index b9e668fc57..3c94f20efa 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java
@@ -45,25 +45,30 @@ public abstract class ResourceHolderSynchronization<H extends ResourceHolder, K>
 	}
 
 
+	@Override
 	public void suspend() {
 		if (this.holderActive) {
 			TransactionSynchronizationManager.unbindResource(this.resourceKey);
 		}
 	}
 
+	@Override
 	public void resume() {
 		if (this.holderActive) {
 			TransactionSynchronizationManager.bindResource(this.resourceKey, this.resourceHolder);
 		}
 	}
 
+	@Override
 	public void flush() {
 		flushResource(this.resourceHolder);
 	}
 
+	@Override
 	public void beforeCommit(boolean readOnly) {
 	}
 
+	@Override
 	public void beforeCompletion() {
 		if (shouldUnbindAtCompletion()) {
 			TransactionSynchronizationManager.unbindResource(this.resourceKey);
@@ -74,12 +79,14 @@ public abstract class ResourceHolderSynchronization<H extends ResourceHolder, K>
 		}
 	}
 
+	@Override
 	public void afterCommit() {
 		if (!shouldReleaseBeforeCompletion()) {
 			processResourceAfterCommit(this.resourceHolder);
 		}
 	}
 
+	@Override
 	public void afterCompletion(int status) {
 		if (shouldUnbindAtCompletion()) {
 			boolean releaseNecessary = false;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
index fd6f184304..2788b8f728 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java
@@ -57,6 +57,7 @@ public class SimpleTransactionStatus extends AbstractTransactionStatus {
 	}
 
 
+	@Override
 	public boolean isNewTransaction() {
 		return this.newTransaction;
 	}
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java
index e3168e1b7b..a4b57b3b0b 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java
@@ -29,6 +29,7 @@ import org.springframework.transaction.TransactionStatus;
  */
 public abstract class TransactionCallbackWithoutResult implements TransactionCallback<Object> {
 
+	@Override
 	public final Object doInTransaction(TransactionStatus status) {
 		doInTransactionWithoutResult(status);
 		return null;
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationAdapter.java
index 8ccdb53623..c1b22136c2 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationAdapter.java
@@ -32,28 +32,36 @@ import org.springframework.core.Ordered;
  */
 public abstract class TransactionSynchronizationAdapter implements TransactionSynchronization, Ordered {
 
+	@Override
 	public int getOrder() {
 		return Ordered.LOWEST_PRECEDENCE;
 	}
 
+	@Override
 	public void suspend() {
 	}
 
+	@Override
 	public void resume() {
 	}
 
+	@Override
 	public void flush() {
 	}
 
+	@Override
 	public void beforeCommit(boolean readOnly) {
 	}
 
+	@Override
 	public void beforeCompletion() {
 	}
 
+	@Override
 	public void afterCommit() {
 	}
 
+	@Override
 	public void afterCompletion(int status) {
 	}
 
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
index 47d8319af6..7515148694 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
@@ -113,6 +113,7 @@ public class TransactionTemplate extends DefaultTransactionDefinition
 		return this.transactionManager;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.transactionManager == null) {
 			throw new IllegalArgumentException("Property 'transactionManager' is required");
@@ -120,6 +121,7 @@ public class TransactionTemplate extends DefaultTransactionDefinition
 	}
 
 
+	@Override
 	public <T> T execute(TransactionCallback<T> action) throws TransactionException {
 		if (this.transactionManager instanceof CallbackPreferringPlatformTransactionManager) {
 			return ((CallbackPreferringPlatformTransactionManager) this.transactionManager).execute(this, action);
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..fb0f203bf8 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
@@ -507,6 +507,7 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
 	 * @param headerName the header name
 	 * @return the first header value; or {@code null}
 	 */
+	@Override
 	public String getFirst(String headerName) {
 		List<String> headerValues = headers.get(headerName);
 		return headerValues != null ? headerValues.get(0) : null;
@@ -520,6 +521,7 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
 	 * @see #put(String, List)
 	 * @see #set(String, String)
 	 */
+	@Override
 	public void add(String headerName, String headerValue) {
 		List<String> headerValues = headers.get(headerName);
 		if (headerValues == null) {
@@ -537,18 +539,21 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
 	 * @see #put(String, List)
 	 * @see #add(String, String)
 	 */
+	@Override
 	public void set(String headerName, String headerValue) {
 		List<String> headerValues = new LinkedList<String>();
 		headerValues.add(headerValue);
 		headers.put(headerName, headerValues);
 	}
 
+	@Override
 	public void setAll(Map<String, String> values) {
 		for (Entry<String, String> entry : values.entrySet()) {
 			set(entry.getKey(), entry.getValue());
 		}
 	}
 
+	@Override
 	public Map<String, String> toSingleValueMap() {
 		LinkedHashMap<String, String> singleValueMap = new LinkedHashMap<String,String>(this.headers.size());
 		for (Entry<String, List<String>> entry : headers.entrySet()) {
@@ -559,50 +564,62 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
 
 	// Map implementation
 
+	@Override
 	public int size() {
 		return this.headers.size();
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return this.headers.isEmpty();
 	}
 
+	@Override
 	public boolean containsKey(Object key) {
 		return this.headers.containsKey(key);
 	}
 
+	@Override
 	public boolean containsValue(Object value) {
 		return this.headers.containsValue(value);
 	}
 
+	@Override
 	public List<String> get(Object key) {
 		return this.headers.get(key);
 	}
 
+	@Override
 	public List<String> put(String key, List<String> value) {
 		return this.headers.put(key, value);
 	}
 
+	@Override
 	public List<String> remove(Object key) {
 		return this.headers.remove(key);
 	}
 
+	@Override
 	public void putAll(Map<? extends String, ? extends List<String>> m) {
 		this.headers.putAll(m);
 	}
 
+	@Override
 	public void clear() {
 		this.headers.clear();
 	}
 
+	@Override
 	public Set<String> keySet() {
 		return this.headers.keySet();
 	}
 
+	@Override
 	public Collection<List<String>> values() {
 		return this.headers.values();
 	}
 
+	@Override
 	public Set<Entry<String, List<String>>> entrySet() {
 		return this.headers.entrySet();
 	}
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 99e1b2d124..d7a5903bf2 100644
--- a/spring-web/src/main/java/org/springframework/http/MediaType.java
+++ b/spring-web/src/main/java/org/springframework/http/MediaType.java
@@ -583,6 +583,7 @@ public class MediaType implements Comparable<MediaType> {
 	 * @param other media type to compare to
 	 * @see #sortBySpecificity(List)
 	 */
+	@Override
 	public int compareTo(MediaType other) {
 		int comp = this.type.compareToIgnoreCase(other.type);
 		if (comp != 0) {
@@ -841,6 +842,7 @@ public class MediaType implements Comparable<MediaType> {
 	 */
 	public static final Comparator<MediaType> SPECIFICITY_COMPARATOR = new Comparator<MediaType>() {
 
+		@Override
 		public int compare(MediaType mediaType1, MediaType mediaType2) {
 			if (mediaType1.isWildcardType() && !mediaType2.isWildcardType()) { // */* < audio/*
 				return 1;
@@ -884,6 +886,7 @@ public class MediaType implements Comparable<MediaType> {
 	 */
 	public static final Comparator<MediaType> QUALITY_VALUE_COMPARATOR = new Comparator<MediaType>() {
 
+		@Override
 		public int compare(MediaType mediaType1, MediaType mediaType2) {
 			double quality1 = mediaType1.getQualityValue();
 			double quality2 = mediaType2.getQualityValue();
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..bb713e336b 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
@@ -35,15 +35,18 @@ public abstract class AbstractClientHttpRequest implements ClientHttpRequest {
 	private boolean executed = false;
 
 
+	@Override
 	public final HttpHeaders getHeaders() {
 		return (this.executed ? HttpHeaders.readOnlyHttpHeaders(this.headers) : this.headers);
 	}
 
+	@Override
 	public final OutputStream getBody() throws IOException {
 		checkExecuted();
 		return getBodyInternal(this.headers);
 	}
 
+	@Override
 	public final ClientHttpResponse execute() throws IOException {
 		checkExecuted();
 		ClientHttpResponse result = executeInternal(this.headers);
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..8e34c1ca3d 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
@@ -48,6 +48,7 @@ public abstract class AbstractClientHttpRequestFactoryWrapper implements ClientH
 	 * with the wrapped request factory provided to the
 	 * {@linkplain #AbstractClientHttpRequestFactoryWrapper(ClientHttpRequestFactory) constructor}.
 	 */
+	@Override
 	public final ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
 		return createRequest(uri, httpMethod, requestFactory);
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java
index cd6166575b..84a6d9322b 100644
--- a/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/client/AbstractClientHttpResponse.java
@@ -28,6 +28,7 @@ import org.springframework.http.HttpStatus;
  */
 public abstract class AbstractClientHttpResponse implements ClientHttpResponse {
 
+	@Override
 	public HttpStatus getStatusCode() throws IOException {
 		return HttpStatus.valueOf(getRawStatusCode());
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java b/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
index 813f98cfad..0d66c7c711 100644
--- a/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
+++ b/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
@@ -42,10 +42,12 @@ final class BufferingClientHttpRequestWrapper extends AbstractBufferingClientHtt
 	}
 
 
+	@Override
 	public HttpMethod getMethod() {
 		return this.request.getMethod();
 	}
 
+	@Override
 	public URI getURI() {
 		return this.request.getURI();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpResponseWrapper.java b/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpResponseWrapper.java
index f280790fec..d076ef8f25 100644
--- a/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpResponseWrapper.java
+++ b/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpResponseWrapper.java
@@ -43,22 +43,27 @@ final class BufferingClientHttpResponseWrapper implements ClientHttpResponse {
 	}
 
 
+	@Override
 	public HttpStatus getStatusCode() throws IOException {
 		return this.response.getStatusCode();
 	}
 
+	@Override
 	public int getRawStatusCode() throws IOException {
 		return this.response.getRawStatusCode();
 	}
 
+	@Override
 	public String getStatusText() throws IOException {
 		return this.response.getStatusText();
 	}
 
+	@Override
 	public HttpHeaders getHeaders() {
 		return this.response.getHeaders();
 	}
 
+	@Override
 	public InputStream getBody() throws IOException {
 		if (this.body == null) {
 			this.body = FileCopyUtils.copyToByteArray(this.response.getBody());
@@ -66,6 +71,7 @@ final class BufferingClientHttpResponseWrapper implements ClientHttpResponse {
 		return new ByteArrayInputStream(this.body);
 	}
 
+	@Override
 	public void close() {
 		this.response.close();
 	}
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..26fa24a44c 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
@@ -57,6 +57,7 @@ public interface ClientHttpResponse extends HttpInputMessage, Closeable {
 	/**
 	 * Closes this response, freeing any resources created.
 	 */
+	@Override
 	void close();
 
 }
diff --git a/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequest.java
index 65ecf35a17..59dca8c119 100644
--- a/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequest.java
@@ -56,10 +56,12 @@ final class CommonsClientHttpRequest extends AbstractBufferingClientHttpRequest
 	}
 
 
+	@Override
 	public HttpMethod getMethod() {
 		return HttpMethod.valueOf(this.httpMethod.getName());
 	}
 
+	@Override
 	public URI getURI() {
 		try {
 			return URI.create(this.httpMethod.getURI().getEscapedURI());
diff --git a/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
index 429b383442..d985d95ad4 100644
--- a/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
+++ b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequestFactory.java
@@ -112,6 +112,7 @@ public class CommonsClientHttpRequestFactory implements ClientHttpRequestFactory
 	}
 
 
+	@Override
 	public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
 		HttpMethodBase commonsHttpMethod = createCommonsHttpMethod(httpMethod, uri.toString());
 		postProcessCommonsHttpMethod(commonsHttpMethod);
@@ -162,6 +163,7 @@ public class CommonsClientHttpRequestFactory implements ClientHttpRequestFactory
 	 * Shutdown hook that closes the underlying {@link HttpConnectionManager}'s
 	 * connection pool, if any.
 	 */
+	@Override
 	public void destroy() {
 		HttpConnectionManager connectionManager = getHttpClient().getHttpConnectionManager();
 		if (connectionManager instanceof MultiThreadedHttpConnectionManager) {
diff --git a/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpResponse.java
index 7cc8cec6e9..ed0daaf8c9 100644
--- a/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpResponse.java
@@ -48,14 +48,17 @@ final class CommonsClientHttpResponse extends AbstractClientHttpResponse {
 	}
 
 
+	@Override
 	public int getRawStatusCode() {
 		return this.httpMethod.getStatusCode();
 	}
 
+	@Override
 	public String getStatusText() {
 		return this.httpMethod.getStatusText();
 	}
 
+	@Override
 	public HttpHeaders getHeaders() {
 		if (this.headers == null) {
 			this.headers = new HttpHeaders();
@@ -66,10 +69,12 @@ final class CommonsClientHttpResponse extends AbstractClientHttpResponse {
 		return this.headers;
 	}
 
+	@Override
 	public InputStream getBody() throws IOException {
 		return this.httpMethod.getResponseBodyAsStream();
 	}
 
+	@Override
 	public void close() {
 		this.httpMethod.releaseConnection();
 	}
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..f829f25ff0 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
@@ -60,10 +60,12 @@ final class HttpComponentsClientHttpRequest extends AbstractBufferingClientHttpR
 	}
 
 
+	@Override
 	public HttpMethod getMethod() {
 		return HttpMethod.valueOf(this.httpRequest.getMethod());
 	}
 
+	@Override
 	public URI getURI() {
 		return this.httpRequest.getURI();
 	}
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..f16d1fd54d 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
@@ -128,6 +128,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
 		getHttpClient().getParams().setIntParameter(CoreConnectionPNames.SO_TIMEOUT, timeout);
 	}
 
+	@Override
 	public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
 		HttpUriRequest httpRequest = createHttpUriRequest(httpMethod, uri);
 		postProcessHttpRequest(httpRequest);
@@ -188,6 +189,7 @@ public class HttpComponentsClientHttpRequestFactory implements ClientHttpRequest
 	 * {@link org.apache.http.conn.ClientConnectionManager ClientConnectionManager}'s
 	 * connection pool, if any.
 	 */
+	@Override
 	public void destroy() {
 		getHttpClient().getConnectionManager().shutdown();
 	}
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..121f413df4 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
@@ -49,14 +49,17 @@ final class HttpComponentsClientHttpResponse extends AbstractClientHttpResponse
 	}
 
 
+	@Override
 	public int getRawStatusCode() throws IOException {
 		return this.httpResponse.getStatusLine().getStatusCode();
 	}
 
+	@Override
 	public String getStatusText() throws IOException {
 		return this.httpResponse.getStatusLine().getReasonPhrase();
 	}
 
+	@Override
 	public HttpHeaders getHeaders() {
 		if (this.headers == null) {
 			this.headers = new HttpHeaders();
@@ -67,11 +70,13 @@ final class HttpComponentsClientHttpResponse extends AbstractClientHttpResponse
 		return this.headers;
 	}
 
+	@Override
 	public InputStream getBody() throws IOException {
 		HttpEntity entity = this.httpResponse.getEntity();
 		return entity != null ? entity.getContent() : null;
 	}
 
+	@Override
 	public void close() {
 		HttpEntity entity = this.httpResponse.getEntity();
 		if (entity != null) {
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 9d39760479..2b6b2c521e 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
@@ -52,10 +52,12 @@ class InterceptingClientHttpRequest extends AbstractBufferingClientHttpRequest {
 		this.uri = uri;
 	}
 
+	@Override
 	public HttpMethod getMethod() {
 		return method;
 	}
 
+	@Override
 	public URI getURI() {
 		return uri;
 	}
@@ -75,6 +77,7 @@ class InterceptingClientHttpRequest extends AbstractBufferingClientHttpRequest {
 			this.iterator = interceptors.iterator();
 		}
 
+		@Override
 		public ClientHttpResponse execute(HttpRequest request, byte[] body) throws IOException {
 			if (iterator.hasNext()) {
 				ClientHttpRequestInterceptor nextInterceptor = iterator.next();
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 989d9e4d28..930a2df1e1 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
@@ -45,10 +45,12 @@ final class SimpleBufferingClientHttpRequest extends AbstractBufferingClientHttp
 	}
 
 
+	@Override
 	public HttpMethod getMethod() {
 		return HttpMethod.valueOf(this.connection.getRequestMethod());
 	}
 
+	@Override
 	public URI getURI() {
 		try {
 			return this.connection.getURL().toURI();
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 22d17b50f0..a64f9f8622 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
@@ -105,6 +105,7 @@ public class SimpleClientHttpRequestFactory implements ClientHttpRequestFactory
 	}
 
 
+	@Override
 	public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException {
 		HttpURLConnection connection = openConnection(uri.toURL(), this.proxy);
 		prepareConnection(connection, httpMethod.name());
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..986a9202f6 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
@@ -43,14 +43,17 @@ final class SimpleClientHttpResponse extends AbstractClientHttpResponse {
 	}
 
 
+	@Override
 	public int getRawStatusCode() throws IOException {
 		return this.connection.getResponseCode();
 	}
 
+	@Override
 	public String getStatusText() throws IOException {
 		return this.connection.getResponseMessage();
 	}
 
+	@Override
 	public HttpHeaders getHeaders() {
 		if (this.headers == null) {
 			this.headers = new HttpHeaders();
@@ -72,11 +75,13 @@ final class SimpleClientHttpResponse extends AbstractClientHttpResponse {
 		return this.headers;
 	}
 
+	@Override
 	public InputStream getBody() throws IOException {
 		InputStream errorStream = this.connection.getErrorStream();
 		return (errorStream != null ? errorStream : this.connection.getInputStream());
 	}
 
+	@Override
 	public void close() {
 		this.connection.disconnect();
 	}
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 a5e831102c..02b5f42658 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
@@ -50,10 +50,12 @@ final class SimpleStreamingClientHttpRequest extends AbstractClientHttpRequest {
 		this.chunkSize = chunkSize;
 	}
 
+	@Override
 	public HttpMethod getMethod() {
 		return HttpMethod.valueOf(this.connection.getRequestMethod());
 	}
 
+	@Override
 	public URI getURI() {
 		try {
 			return this.connection.getURL().toURI();
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..67e2ecbb69 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
@@ -55,6 +55,7 @@ public class HttpRequestWrapper implements HttpRequest {
 	/**
 	 * Returns the method of the wrapped request.
 	 */
+	@Override
 	public HttpMethod getMethod() {
 		return this.request.getMethod();
 	}
@@ -62,6 +63,7 @@ public class HttpRequestWrapper implements HttpRequest {
 	/**
 	 * Returns the URI of the wrapped request.
 	 */
+	@Override
 	public URI getURI() {
 		return this.request.getURI();
 	}
@@ -69,6 +71,7 @@ public class HttpRequestWrapper implements HttpRequest {
 	/**
 	 * Returns the headers of the wrapped request.
 	 */
+	@Override
 	public HttpHeaders getHeaders() {
 		return this.request.getHeaders();
 	}
diff --git a/spring-web/src/main/java/org/springframework/http/client/support/ProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/http/client/support/ProxyFactoryBean.java
index b769c38453..6ff8d581f3 100644
--- a/spring-web/src/main/java/org/springframework/http/client/support/ProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/http/client/support/ProxyFactoryBean.java
@@ -63,6 +63,7 @@ public class ProxyFactoryBean implements FactoryBean<Proxy>, InitializingBean {
 		this.port = port;
 	}
 
+	@Override
 	public void afterPropertiesSet() throws IllegalArgumentException {
 		Assert.notNull(type, "'type' must not be null");
 		Assert.hasLength(hostname, "'hostname' must not be empty");
@@ -73,14 +74,17 @@ public class ProxyFactoryBean implements FactoryBean<Proxy>, InitializingBean {
 
 	}
 
+	@Override
 	public Proxy getObject() {
 		return proxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return Proxy.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..b5caa76c3f 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
@@ -82,6 +82,7 @@ public abstract class AbstractHttpMessageConverter<T> implements HttpMessageConv
 		this.supportedMediaTypes = new ArrayList<MediaType>(supportedMediaTypes);
 	}
 
+	@Override
 	public List<MediaType> getSupportedMediaTypes() {
 		return Collections.unmodifiableList(this.supportedMediaTypes);
 	}
@@ -92,6 +93,7 @@ public abstract class AbstractHttpMessageConverter<T> implements HttpMessageConv
 	 * and if the {@linkplain #getSupportedMediaTypes() supported media types}
 	 * {@linkplain MediaType#includes(MediaType) include} the given media type.
 	 */
+	@Override
 	public boolean canRead(Class<?> clazz, MediaType mediaType) {
 		return supports(clazz) && canRead(mediaType);
 	}
@@ -121,6 +123,7 @@ public abstract class AbstractHttpMessageConverter<T> implements HttpMessageConv
 	 * and if the {@linkplain #getSupportedMediaTypes() supported media types}
 	 * {@linkplain MediaType#includes(MediaType) include} the given media type.
 	 */
+	@Override
 	public boolean canWrite(Class<?> clazz, MediaType mediaType) {
 		return supports(clazz) && canWrite(mediaType);
 		}
@@ -149,6 +152,7 @@ public abstract class AbstractHttpMessageConverter<T> implements HttpMessageConv
 	 * This implementation simple delegates to {@link #readInternal(Class, HttpInputMessage)}.
 	 * Future implementations might add some default behavior, however.
 	 */
+	@Override
 	public final T read(Class<? extends T> clazz, HttpInputMessage inputMessage) throws IOException {
 		return readInternal(clazz, inputMessage);
 	}
@@ -158,6 +162,7 @@ public abstract class AbstractHttpMessageConverter<T> implements HttpMessageConv
 	 * type was not provided, calls {@link #getContentLength}, and sets the corresponding headers
 	 * on the output message. It then calls {@link #writeInternal}.
 	 */
+	@Override
 	public final void write(T t, MediaType contentType, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
 
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 b9392d0d95..25e16be1b3 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
@@ -115,6 +115,7 @@ public class BufferedImageHttpMessageConverter implements HttpMessageConverter<B
 	}
 
 
+	@Override
 	public boolean canRead(Class<?> clazz, MediaType mediaType) {
 		return (BufferedImage.class.equals(clazz) && isReadable(mediaType));
 	}
@@ -127,6 +128,7 @@ public class BufferedImageHttpMessageConverter implements HttpMessageConverter<B
 		return imageReaders.hasNext();
 	}
 
+	@Override
 	public boolean canWrite(Class<?> clazz, MediaType mediaType) {
 		return (BufferedImage.class.equals(clazz) && isWritable(mediaType));
 	}
@@ -139,10 +141,12 @@ public class BufferedImageHttpMessageConverter implements HttpMessageConverter<B
 		return imageWriters.hasNext();
 	}
 
+	@Override
 	public List<MediaType> getSupportedMediaTypes() {
 		return Collections.unmodifiableList(this.readableMediaTypes);
 	}
 
+	@Override
 	public BufferedImage read(Class<? extends BufferedImage> clazz, HttpInputMessage inputMessage)
 			throws IOException, HttpMessageNotReadableException {
 
@@ -188,6 +192,7 @@ public class BufferedImageHttpMessageConverter implements HttpMessageConverter<B
 		}
 	}
 
+	@Override
 	public void write(BufferedImage image, MediaType contentType, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
 
diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
index 0bbe671083..ae352112c4 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
@@ -122,6 +122,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
 		this.charset = charset;
 	}
 
+	@Override
 	public boolean canRead(Class<?> clazz, MediaType mediaType) {
 		if (!MultiValueMap.class.isAssignableFrom(clazz)) {
 			return false;
@@ -139,6 +140,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
 		return false;
 	}
 
+	@Override
 	public boolean canWrite(Class<?> clazz, MediaType mediaType) {
 		if (!MultiValueMap.class.isAssignableFrom(clazz)) {
 			return false;
@@ -161,10 +163,12 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
 		this.supportedMediaTypes = supportedMediaTypes;
 	}
 
+	@Override
 	public List<MediaType> getSupportedMediaTypes() {
 		return Collections.unmodifiableList(this.supportedMediaTypes);
 	}
 
+	@Override
 	public MultiValueMap<String, String> read(Class<? extends MultiValueMap<String, ?>> clazz,
 			HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException {
 
@@ -190,6 +194,7 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
 		return result;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void write(MultiValueMap<String, ?> map, MediaType contentType, HttpOutputMessage outputMessage)
 			throws IOException, HttpMessageNotWritableException {
@@ -373,10 +378,12 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
 			this.os = os;
 		}
 
+		@Override
 		public HttpHeaders getHeaders() {
 			return headersWritten ? HttpHeaders.readOnlyHttpHeaders(headers) : this.headers;
 		}
 
+		@Override
 		public OutputStream getBody() throws IOException {
 			writeHeaders();
 			return this.os;
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..cb089c9295 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
@@ -249,6 +249,7 @@ public class Jackson2ObjectMapperFactoryBean implements FactoryBean<ObjectMapper
 		}
 	}
 
+	@Override
 	public void afterPropertiesSet() throws FatalBeanException {
 		if (this.objectMapper == null) {
 			this.objectMapper = new ObjectMapper();
@@ -312,14 +313,17 @@ public class Jackson2ObjectMapperFactoryBean implements FactoryBean<ObjectMapper
 	/**
 	 * Return the singleton ObjectMapper.
 	 */
+	@Override
 	public ObjectMapper getObject() {
 		return this.objectMapper;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return ObjectMapper.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..48ddfec469 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
@@ -191,6 +191,7 @@ public class JacksonObjectMapperFactoryBean implements FactoryBean<ObjectMapper>
 		}
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.objectMapper == null) {
 			this.objectMapper = new ObjectMapper();
@@ -229,14 +230,17 @@ public class JacksonObjectMapperFactoryBean implements FactoryBean<ObjectMapper>
 	/**
 	 * Return the singleton ObjectMapper.
 	 */
+	@Override
 	public ObjectMapper getObject() {
 		return this.objectMapper;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return ObjectMapper.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..3a9e4f8320 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
@@ -132,6 +132,7 @@ public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConv
 		return canRead(clazz, null, mediaType);
 	}
 
+	@Override
 	public boolean canRead(Type type, Class<?> contextClass, MediaType mediaType) {
 		JavaType javaType = getJavaType(type, contextClass);
 		return (this.objectMapper.canDeserialize(javaType) && canRead(mediaType));
@@ -156,6 +157,7 @@ public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConv
 		return readJavaType(javaType, inputMessage);
 	}
 
+	@Override
 	public Object read(Type type, Class<?> contextClass, HttpInputMessage inputMessage)
 			throws IOException, HttpMessageNotReadableException {
 
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..4b546cea0a 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
@@ -130,6 +130,7 @@ public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConve
 		return canRead(clazz, null, mediaType);
 	}
 
+	@Override
 	public boolean canRead(Type type, Class<?> contextClass, MediaType mediaType) {
 		JavaType javaType = getJavaType(type, contextClass);
 		return (this.objectMapper.canDeserialize(javaType) && canRead(mediaType));
@@ -154,6 +155,7 @@ public class MappingJacksonHttpMessageConverter extends AbstractHttpMessageConve
 		return readJavaType(javaType, inputMessage);
 	}
 
+	@Override
 	public Object read(Type type, Class<?> contextClass, HttpInputMessage inputMessage)
 			throws IOException, HttpMessageNotReadableException {
 
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..d2e0e9b53d 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
@@ -74,6 +74,7 @@ public class Jaxb2CollectionHttpMessageConverter<T extends Collection>
 	 * {@link Collection} where the generic type is a JAXB type annotated with
 	 * {@link XmlRootElement} or {@link XmlType}.
 	 */
+	@Override
 	public boolean canRead(Type type, Class<?> contextClass, MediaType mediaType) {
 		if (!(type instanceof ParameterizedType)) {
 			return false;
@@ -119,6 +120,7 @@ public class Jaxb2CollectionHttpMessageConverter<T extends Collection>
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public T read(Type type, Class<?> contextClass, HttpInputMessage inputMessage)
 			throws IOException, HttpMessageNotReadableException {
 
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/ServerHttpResponse.java
index 8ce306271f..90cb72ffd5 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServerHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServerHttpResponse.java
@@ -38,6 +38,7 @@ public interface ServerHttpResponse extends HttpOutputMessage, Closeable {
 	/**
 	 * Close this response, freeing any resources created.
 	 */
+	@Override
 	void close();
 
 }
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..9a150b5e92 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
@@ -76,10 +76,12 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
 		return this.servletRequest;
 	}
 
+	@Override
 	public HttpMethod getMethod() {
 		return HttpMethod.valueOf(this.servletRequest.getMethod());
 	}
 
+	@Override
 	public URI getURI() {
 		try {
 			return new URI(this.servletRequest.getScheme(), null, this.servletRequest.getServerName(),
@@ -91,6 +93,7 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
 		}
 	}
 
+	@Override
 	public HttpHeaders getHeaders() {
 		if (this.headers == null) {
 			this.headers = new HttpHeaders();
@@ -123,6 +126,7 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
 		return this.headers;
 	}
 
+	@Override
 	public InputStream getBody() throws IOException {
 		if (isFormPost(this.servletRequest)) {
 			return getBodyFromServletRequestParameters(this.servletRequest);
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
index 985085e51e..4133a9c229 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpResponse.java
@@ -58,19 +58,23 @@ public class ServletServerHttpResponse implements ServerHttpResponse {
 		return this.servletResponse;
 	}
 
+	@Override
 	public void setStatusCode(HttpStatus status) {
 		this.servletResponse.setStatus(status.value());
 	}
 
+	@Override
 	public HttpHeaders getHeaders() {
 		return (this.headersWritten ? HttpHeaders.readOnlyHttpHeaders(this.headers) : this.headers);
 	}
 
+	@Override
 	public OutputStream getBody() throws IOException {
 		writeHeaders();
 		return this.servletResponse.getOutputStream();
 	}
 
+	@Override
 	public void close() {
 		writeHeaders();
 	}
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
index 28b6bd5087..c7a74297bf 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java
@@ -137,6 +137,7 @@ public class BurlapClientInterceptor extends UrlBasedRemoteAccessor implements M
 	}
 
 
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		if (this.burlapProxy == null) {
 			throw new IllegalStateException("BurlapClientInterceptor is not properly initialized - " +
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
index 27d4ba86d2..9c0cd99a21 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
@@ -47,6 +47,7 @@ public class BurlapExporter extends RemoteExporter implements InitializingBean {
 	private BurlapSkeleton skeleton;
 
 
+	@Override
 	public void afterPropertiesSet() {
 		prepare();
 	}
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
index 7e06907e61..633ccf14e8 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
@@ -52,14 +52,17 @@ public class BurlapProxyFactoryBean extends BurlapClientInterceptor implements F
 	}
 
 
+	@Override
 	public Object getObject() {
 		return this.serviceProxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return getServiceInterface();
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
index 34c28129a4..188905afe5 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
@@ -54,6 +54,7 @@ public class BurlapServiceExporter extends BurlapExporter implements HttpRequest
 	/**
 	 * Processes the incoming Burlap request and creates a Burlap response.
 	 */
+	@Override
 	public void handleRequest(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
index ff89f1bb86..81dcdf7a76 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java
@@ -211,6 +211,7 @@ public class HessianClientInterceptor extends UrlBasedRemoteAccessor implements
 	}
 
 
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		if (this.hessianProxy == null) {
 			throw new IllegalStateException("HessianClientInterceptor is not properly initialized - " +
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
index 5aba1cb154..9548d6b3e8 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java
@@ -93,6 +93,7 @@ public class HessianExporter extends RemoteExporter implements InitializingBean
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		prepare();
 	}
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
index f14ad7b2e6..a9a2397292 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
@@ -52,14 +52,17 @@ public class HessianProxyFactoryBean extends HessianClientInterceptor implements
 	}
 
 
+	@Override
 	public Object getObject() {
 		return this.serviceProxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return getServiceInterface();
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
index 9f83c31bec..8e75fba47a 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
@@ -53,6 +53,7 @@ public class HessianServiceExporter extends HessianExporter implements HttpReque
 	/**
 	 * Processes the incoming Hessian request and creates a Hessian response.
 	 */
+	@Override
 	public void handleRequest(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
index aed4137c5a..399bcc1224 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
@@ -50,6 +50,7 @@ public class SimpleBurlapServiceExporter extends BurlapExporter implements HttpH
 	/**
 	 * Processes the incoming Burlap request and creates a Burlap response.
 	 */
+	@Override
 	public void handle(HttpExchange exchange) throws IOException {
 		if (!"POST".equals(exchange.getRequestMethod())) {
 			exchange.getResponseHeaders().set("Allow", "POST");
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
index d0e49e94a4..3a509a9cea 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
@@ -50,6 +50,7 @@ public class SimpleHessianServiceExporter extends HessianExporter implements Htt
 	/**
 	 * Processes the incoming Hessian request and creates a Hessian response.
 	 */
+	@Override
 	public void handle(HttpExchange exchange) throws IOException {
 		if (!"POST".equals(exchange.getRequestMethod())) {
 			exchange.getResponseHeaders().set("Allow", "POST");
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
index 5a024973ea..8b6c47b339 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java
@@ -113,6 +113,7 @@ public abstract class AbstractHttpInvokerRequestExecutor
 		return this.acceptGzipEncoding;
 	}
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
@@ -125,6 +126,7 @@ public abstract class AbstractHttpInvokerRequestExecutor
 	}
 
 
+	@Override
 	public final RemoteInvocationResult executeRequest(
 			HttpInvokerClientConfiguration config, RemoteInvocation invocation) throws Exception {
 
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..ccc1f704f6 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
@@ -91,6 +91,7 @@ public class HttpInvokerClientInterceptor extends RemoteInvocationBasedAccessor
 	/**
 	 * Return the codebase URL to download classes from if not found locally.
 	 */
+	@Override
 	public String getCodebaseUrl() {
 		return this.codebaseUrl;
 	}
@@ -131,6 +132,7 @@ public class HttpInvokerClientInterceptor extends RemoteInvocationBasedAccessor
 	}
 
 
+	@Override
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		if (AopUtils.isToStringMethod(methodInvocation.getMethod())) {
 			return "HTTP invoker proxy for service URL [" + getServiceUrl() + "]";
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..969825b0c6 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
@@ -63,14 +63,17 @@ public class HttpInvokerProxyFactoryBean extends HttpInvokerClientInterceptor
 	}
 
 
+	@Override
 	public Object getObject() {
 		return this.serviceProxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return getServiceInterface();
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..7c643a2810 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
@@ -65,6 +65,7 @@ public class HttpInvokerServiceExporter extends RemoteInvocationSerializingExpor
 	 * @see #invokeAndCreateResult(org.springframework.remoting.support.RemoteInvocation, Object)
 	 * @see #writeRemoteInvocationResult(HttpServletRequest, HttpServletResponse, RemoteInvocationResult)
 	 */
+	@Override
 	public void handleRequest(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java
index 084a4e6596..1b122a70cc 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java
@@ -61,6 +61,7 @@ public class SimpleHttpInvokerServiceExporter extends RemoteInvocationSerializin
 	 * @see #invokeAndCreateResult(org.springframework.remoting.support.RemoteInvocation, Object)
 	 * @see #writeRemoteInvocationResult(com.sun.net.httpserver.HttpExchange, org.springframework.remoting.support.RemoteInvocationResult)
 	 */
+	@Override
 	public void handle(HttpExchange exchange) throws IOException {
 		try {
 			RemoteInvocation invocation = readRemoteInvocation(exchange);
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java
index 373b301dc7..bb19449254 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java
@@ -344,6 +344,7 @@ public class JaxRpcPortClientInterceptor extends LocalJaxRpcServiceFactory
 	 * Prepares the JAX-RPC service and port if the "lookupServiceOnStartup"
 	 * is turned on (which it is by default).
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		if (this.lookupServiceOnStartup) {
 			prepare();
@@ -542,6 +543,7 @@ public class JaxRpcPortClientInterceptor extends LocalJaxRpcServiceFactory
 	 * @see #prepare()
 	 * @see #doInvoke
 	 */
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		if (AopUtils.isToStringMethod(invocation.getMethod())) {
 			return "JAX-RPC proxy for port [" + getPortName() + "] of service [" + getServiceName() + "]";
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java
index 610168c678..65abc2807c 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java
@@ -54,6 +54,7 @@ public class JaxRpcPortProxyFactoryBean extends JaxRpcPortClientInterceptor
 	private Object serviceProxy;
 
 
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
@@ -75,14 +76,17 @@ public class JaxRpcPortProxyFactoryBean extends JaxRpcPortClientInterceptor
 	}
 
 
+	@Override
 	public Object getObject() {
 		return this.serviceProxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return getServiceInterface();
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java
index 35d8afa8c5..efdd96bcee 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java
@@ -44,19 +44,23 @@ public class LocalJaxRpcServiceFactoryBean extends LocalJaxRpcServiceFactory
 	private Service service;
 
 
+	@Override
 	public void afterPropertiesSet() throws ServiceException {
 		this.service = createJaxRpcService();
 	}
 
 
+	@Override
 	public Service getObject() throws Exception {
 		return this.service;
 	}
 
+	@Override
 	public Class<? extends Service> getObjectType() {
 		return (this.service != null ? this.service.getClass() : Service.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
index 4a3d34185b..04d52e6ae4 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java
@@ -77,6 +77,7 @@ public abstract class ServletEndpointSupport implements ServiceLifecycle {
 	 * @throws ServiceException if the context is not a ServletEndpointContext
 	 * @see #onInit
 	 */
+	@Override
 	public final void init(Object context) throws ServiceException {
 		if (!(context instanceof ServletEndpointContext)) {
 			throw new ServiceException("ServletEndpointSupport needs ServletEndpointContext, not [" + context + "]");
@@ -145,6 +146,7 @@ public abstract class ServletEndpointSupport implements ServiceLifecycle {
 	 * This implementation of destroy is empty.
 	 * Can be overridden in subclasses.
 	 */
+	@Override
 	public void destroy() {
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java
index 5a2f3ba7c4..dfe833dc97 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java
@@ -109,6 +109,7 @@ public abstract class AbstractJaxWsServiceExporter implements BeanFactoryAware,
 	/**
 	 * Obtains all web service beans and publishes them as JAX-WS endpoints.
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (!(beanFactory instanceof ListableBeanFactory)) {
 			throw new IllegalStateException(getClass().getSimpleName() + " requires a ListableBeanFactory");
@@ -121,6 +122,7 @@ public abstract class AbstractJaxWsServiceExporter implements BeanFactoryAware,
 	 * Immediately publish all endpoints when fully configured.
 	 * @see #publishEndpoints()
 	 */
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		publishEndpoints();
 	}
@@ -201,6 +203,7 @@ public abstract class AbstractJaxWsServiceExporter implements BeanFactoryAware,
 	/**
 	 * Stops all published endpoints, taking the web services offline.
 	 */
+	@Override
 	public void destroy() {
 		for (Endpoint endpoint : this.publishedEndpoints) {
 			endpoint.stop();
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java
index 9efd206e5f..4139a926d5 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortClientInterceptor.java
@@ -299,6 +299,7 @@ public class JaxWsPortClientInterceptor extends LocalJaxWsServiceFactory
 	 * {@link #setWebServiceFeatures}, and also for building a client
 	 * proxy in the {@link JaxWsPortProxyFactoryBean} subclass.
 	 */
+	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.beanClassLoader = classLoader;
 	}
@@ -311,6 +312,7 @@ public class JaxWsPortClientInterceptor extends LocalJaxWsServiceFactory
 	}
 
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.lookupServiceOnStartup) {
 			prepare();
@@ -474,6 +476,7 @@ public class JaxWsPortClientInterceptor extends LocalJaxWsServiceFactory
 	}
 
 
+	@Override
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		if (AopUtils.isToStringMethod(invocation.getMethod())) {
 			return "JAX-WS proxy for port [" + getPortName() + "] of service [" + getServiceName() + "]";
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java
index 85ddbef62e..a9511b6864 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java
@@ -50,14 +50,17 @@ public class JaxWsPortProxyFactoryBean extends JaxWsPortClientInterceptor
 	}
 
 
+	@Override
 	public Object getObject() {
 		return this.serviceProxy;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return getServiceInterface();
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java
index 91dc2902b6..c98ee83876 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java
@@ -41,18 +41,22 @@ public class LocalJaxWsServiceFactoryBean extends LocalJaxWsServiceFactory
 	private Service service;
 
 
+	@Override
 	public void afterPropertiesSet() {
 		this.service = createJaxWsService();
 	}
 
+	@Override
 	public Service getObject() {
 		return this.service;
 	}
 
+	@Override
 	public Class<? extends Service> getObjectType() {
 		return (this.service != null ? this.service.getClass() : Service.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
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..717f4ec3f9 100644
--- a/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java
@@ -147,6 +147,7 @@ public class SpringServletContainerInitializer implements ServletContainerInitia
 	 * @see WebApplicationInitializer#onStartup(ServletContext)
 	 * @see AnnotationAwareOrderComparator
 	 */
+	@Override
 	public void onStartup(Set<Class<?>> webAppInitializerClasses, ServletContext servletContext)
 			throws ServletException {
 
diff --git a/spring-web/src/main/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategy.java b/spring-web/src/main/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategy.java
index edd0b8e22b..a85e4b19b6 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategy.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategy.java
@@ -42,6 +42,7 @@ public abstract class AbstractMappingContentNegotiationStrategy extends MappingM
 		super(mediaTypes);
 	}
 
+	@Override
 	public List<MediaType> resolveMediaTypes(NativeWebRequest webRequest) {
 		String key = getMediaTypeKey(webRequest);
 		if (StringUtils.hasText(key)) {
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 961ffdcc72..6a7d17c35a 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
@@ -97,6 +97,7 @@ public class ContentNegotiationManager implements ContentNegotiationStrategy, Me
 	 * @return the requested media types or an empty list, never {@code null}
 	 * @throws HttpMediaTypeNotAcceptableException if the requested media types cannot be parsed
 	 */
+	@Override
 	public List<MediaType> resolveMediaTypes(NativeWebRequest webRequest) throws HttpMediaTypeNotAcceptableException {
 		for (ContentNegotiationStrategy strategy : this.contentNegotiationStrategies) {
 			List<MediaType> mediaTypes = strategy.resolveMediaTypes(webRequest);
@@ -111,6 +112,7 @@ public class ContentNegotiationManager implements ContentNegotiationStrategy, Me
 	 * Delegate to all configured MediaTypeFileExtensionResolver instances and aggregate
 	 * the list of all file extensions found.
 	 */
+	@Override
 	public List<String> resolveFileExtensions(MediaType mediaType) {
 		Set<String> result = new LinkedHashSet<String>();
 		for (MediaTypeFileExtensionResolver resolver : this.fileExtensionResolvers) {
@@ -123,6 +125,7 @@ public class ContentNegotiationManager implements ContentNegotiationStrategy, Me
 	 * Delegate to all configured MediaTypeFileExtensionResolver instances and aggregate
 	 * the list of all known file extensions.
 	 */
+	@Override
 	public List<String> getAllFileExtensions() {
 		Set<String> result = new LinkedHashSet<String>();
 		for (MediaTypeFileExtensionResolver resolver : this.fileExtensionResolvers) {
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 8b805802d2..f230f1c7f0 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
@@ -150,10 +150,12 @@ public class ContentNegotiationManagerFactoryBean
 		this.defaultContentType = defaultContentType;
 	}
 
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		List<ContentNegotiationStrategy> strategies = new ArrayList<ContentNegotiationStrategy>();
 
@@ -192,14 +194,17 @@ public class ContentNegotiationManagerFactoryBean
 		this.contentNegotiationManager = new ContentNegotiationManager(array);
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return ContentNegotiationManager.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
 
+	@Override
 	public ContentNegotiationManager getObject() throws Exception {
 		return this.contentNegotiationManager;
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/accept/FixedContentNegotiationStrategy.java b/spring-web/src/main/java/org/springframework/web/accept/FixedContentNegotiationStrategy.java
index 84ac58cfee..5180154dd2 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/FixedContentNegotiationStrategy.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/FixedContentNegotiationStrategy.java
@@ -43,6 +43,7 @@ public class FixedContentNegotiationStrategy implements ContentNegotiationStrate
 		this.defaultContentType = defaultContentType;
 	}
 
+	@Override
 	public List<MediaType> resolveMediaTypes(NativeWebRequest webRequest) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Requested media types is " + this.defaultContentType + " (based on default MediaType)");
diff --git a/spring-web/src/main/java/org/springframework/web/accept/HeaderContentNegotiationStrategy.java b/spring-web/src/main/java/org/springframework/web/accept/HeaderContentNegotiationStrategy.java
index ef84fb179d..1cfcd67e5d 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/HeaderContentNegotiationStrategy.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/HeaderContentNegotiationStrategy.java
@@ -38,6 +38,7 @@ public class HeaderContentNegotiationStrategy implements ContentNegotiationStrat
 	 * {@inheritDoc}
 	 * @throws HttpMediaTypeNotAcceptableException if the 'Accept' header cannot be parsed.
 	 */
+	@Override
 	public List<MediaType> resolveMediaTypes(NativeWebRequest webRequest) throws HttpMediaTypeNotAcceptableException {
 		String acceptHeader = webRequest.getHeader(ACCEPT_HEADER);
 		try {
diff --git a/spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java b/spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java
index 293f26ce7a..71e670d0fd 100644
--- a/spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java
@@ -63,11 +63,13 @@ public class MappingMediaTypeFileExtensionResolver implements MediaTypeFileExten
 	 * Find the file extensions mapped to the given MediaType.
 	 * @return 0 or more extensions, never {@code null}
 	 */
+	@Override
 	public List<String> resolveFileExtensions(MediaType mediaType) {
 		List<String> fileExtensions = this.fileExtensions.get(mediaType);
 		return (fileExtensions != null) ? fileExtensions : Collections.<String>emptyList();
 	}
 
+	@Override
 	public List<String> getAllFileExtensions() {
 		return Collections.unmodifiableList(this.allFileExtensions);
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java b/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
index 67144395e2..3cb0b96b89 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java
@@ -58,121 +58,150 @@ public class EscapedErrors implements Errors {
 	}
 
 
+	@Override
 	public String getObjectName() {
 		return this.source.getObjectName();
 	}
 
+	@Override
 	public void setNestedPath(String nestedPath) {
 		this.source.setNestedPath(nestedPath);
 	}
 
+	@Override
 	public String getNestedPath() {
 		return this.source.getNestedPath();
 	}
 
+	@Override
 	public void pushNestedPath(String subPath) {
 		this.source.pushNestedPath(subPath);
 	}
 
+	@Override
 	public void popNestedPath() throws IllegalStateException {
 		this.source.popNestedPath();
 	}
 
 
+	@Override
 	public void reject(String errorCode) {
 		this.source.reject(errorCode);
 	}
 
+	@Override
 	public void reject(String errorCode, String defaultMessage) {
 		this.source.reject(errorCode, defaultMessage);
 	}
 
+	@Override
 	public void reject(String errorCode, Object[] errorArgs, String defaultMessage) {
 		this.source.reject(errorCode, errorArgs, defaultMessage);
 	}
 
+	@Override
 	public void rejectValue(String field, String errorCode) {
 		this.source.rejectValue(field, errorCode);
 	}
 
+	@Override
 	public void rejectValue(String field, String errorCode, String defaultMessage) {
 		this.source.rejectValue(field, errorCode, defaultMessage);
 	}
 
+	@Override
 	public void rejectValue(String field, String errorCode, Object[] errorArgs, String defaultMessage) {
 		this.source.rejectValue(field, errorCode, errorArgs, defaultMessage);
 	}
 
+	@Override
 	public void addAllErrors(Errors errors) {
 		this.source.addAllErrors(errors);
 	}
 
 
+	@Override
 	public boolean hasErrors() {
 		return this.source.hasErrors();
 	}
 
+	@Override
 	public int getErrorCount() {
 		return this.source.getErrorCount();
 	}
 
+	@Override
 	public List<ObjectError> getAllErrors() {
 		return escapeObjectErrors(this.source.getAllErrors());
 	}
 
+	@Override
 	public boolean hasGlobalErrors() {
 		return this.source.hasGlobalErrors();
 	}
 
+	@Override
 	public int getGlobalErrorCount() {
 		return this.source.getGlobalErrorCount();
 	}
 
+	@Override
 	public List<ObjectError> getGlobalErrors() {
 		return escapeObjectErrors(this.source.getGlobalErrors());
 	}
 
+	@Override
 	public ObjectError getGlobalError() {
 		return escapeObjectError(this.source.getGlobalError());
 	}
 
+	@Override
 	public boolean hasFieldErrors() {
 		return this.source.hasFieldErrors();
 	}
 
+	@Override
 	public int getFieldErrorCount() {
 		return this.source.getFieldErrorCount();
 	}
 
+	@Override
 	public List<FieldError> getFieldErrors() {
 		return this.source.getFieldErrors();
 	}
 
+	@Override
 	public FieldError getFieldError() {
 		return this.source.getFieldError();
 	}
 
+	@Override
 	public boolean hasFieldErrors(String field) {
 		return this.source.hasFieldErrors(field);
 	}
 
+	@Override
 	public int getFieldErrorCount(String field) {
 		return this.source.getFieldErrorCount(field);
 	}
 
+	@Override
 	public List<FieldError> getFieldErrors(String field) {
 		return escapeObjectErrors(this.source.getFieldErrors(field));
 	}
 
+	@Override
 	public FieldError getFieldError(String field) {
 		return escapeObjectError(this.source.getFieldError(field));
 	}
 
+	@Override
 	public Object getFieldValue(String field) {
 		Object value = this.source.getFieldValue(field);
 		return (value instanceof String ? HtmlUtils.htmlEscape((String) value) : value);
 	}
 
+	@Override
 	public Class getFieldType(String field) {
 		return this.source.getFieldType(field);
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java
index 699f2aa8a2..caada588f0 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodResolver.java
@@ -84,6 +84,7 @@ public class HandlerMethodResolver {
 		for (Class<?> currentHandlerType : handlerTypes) {
 			final Class<?> targetClass = (specificHandlerType != null ? specificHandlerType : currentHandlerType);
 			ReflectionUtils.doWithMethods(currentHandlerType, new ReflectionUtils.MethodCallback() {
+				@Override
 				public void doWith(Method method) {
 					Method specificMethod = ClassUtils.getMostSpecificMethod(method, targetClass);
 					Method bridgedMethod = BridgeMethodResolver.findBridgedMethod(specificMethod);
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java b/spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java
index 8b0d4ffb27..3056ad0311 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/ConfigurableWebBindingInitializer.java
@@ -181,6 +181,7 @@ public class ConfigurableWebBindingInitializer implements WebBindingInitializer
 	}
 
 
+	@Override
 	public void initBinder(WebDataBinder binder, WebRequest request) {
 		binder.setAutoGrowNestedPaths(this.autoGrowNestedPaths);
 		if (this.directFieldAccess) {
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
index bab588d5a4..d673f17b2c 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java
@@ -43,6 +43,7 @@ public class DefaultDataBinderFactory implements WebDataBinderFactory {
 	 * initialize it through a {@link WebBindingInitializer}.
 	 * @throws Exception in case of invalid state or arguments
 	 */
+	@Override
 	public final WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName)
 			throws Exception {
 		WebDataBinder dataBinder = createBinderInstance(target, objectName, webRequest);
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java
index 6f0e512a1a..17507c88ba 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java
@@ -46,6 +46,7 @@ public class DefaultSessionAttributeStore implements SessionAttributeStore {
 	}
 
 
+	@Override
 	public void storeAttribute(WebRequest request, String attributeName, Object attributeValue) {
 		Assert.notNull(request, "WebRequest must not be null");
 		Assert.notNull(attributeName, "Attribute name must not be null");
@@ -54,6 +55,7 @@ public class DefaultSessionAttributeStore implements SessionAttributeStore {
 		request.setAttribute(storeAttributeName, attributeValue, WebRequest.SCOPE_SESSION);
 	}
 
+	@Override
 	public Object retrieveAttribute(WebRequest request, String attributeName) {
 		Assert.notNull(request, "WebRequest must not be null");
 		Assert.notNull(attributeName, "Attribute name must not be null");
@@ -61,6 +63,7 @@ public class DefaultSessionAttributeStore implements SessionAttributeStore {
 		return request.getAttribute(storeAttributeName, WebRequest.SCOPE_SESSION);
 	}
 
+	@Override
 	public void cleanupAttribute(WebRequest request, String attributeName) {
 		Assert.notNull(request, "WebRequest must not be null");
 		Assert.notNull(attributeName, "Attribute name must not be null");
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java b/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java
index f9d1d7c102..7f20bf4e8f 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java
@@ -28,10 +28,12 @@ public class SimpleSessionStatus implements SessionStatus {
 	private boolean complete = false;
 
 
+	@Override
 	public void setComplete() {
 		this.complete = true;
 	}
 
+	@Override
 	public boolean isComplete() {
 		return this.complete;
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
index bdb8e616d6..45eb677ea9 100644
--- a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
+++ b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java
@@ -45,6 +45,7 @@ public class DefaultResponseErrorHandler implements ResponseErrorHandler {
 	/**
 	 * Delegates to {@link #hasError(HttpStatus)} with the response status code.
 	 */
+	@Override
 	public boolean hasError(ClientHttpResponse response) throws IOException {
 		return hasError(getHttpStatusCode(response));
 	}
@@ -81,6 +82,7 @@ public class DefaultResponseErrorHandler implements ResponseErrorHandler {
 	 * if it is {@link org.springframework.http.HttpStatus.Series#SERVER_ERROR},
 	 * and a {@link RestClientException} in other cases.
 	 */
+	@Override
 	public void handleError(ClientHttpResponse response) throws IOException {
 		HttpStatus statusCode = getHttpStatusCode(response);
 		switch (statusCode.series()) {
diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
index b4232ff47c..4fc24562a2 100644
--- a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
+++ b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java
@@ -76,6 +76,7 @@ public class HttpMessageConverterExtractor<T> implements ResponseExtractor<T> {
 		this.logger = logger;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public T extractData(ClientHttpResponse response) throws IOException {
 		if (!hasMessageBody(response)) {
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..91cdfabb44 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
@@ -207,6 +207,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 
 	// GET
 
+	@Override
 	public <T> T getForObject(String url, Class<T> responseType, Object... urlVariables) throws RestClientException {
 		AcceptHeaderRequestCallback requestCallback = new AcceptHeaderRequestCallback(responseType);
 		HttpMessageConverterExtractor<T> responseExtractor =
@@ -214,6 +215,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables);
 	}
 
+	@Override
 	public <T> T getForObject(String url, Class<T> responseType, Map<String, ?> urlVariables) throws RestClientException {
 		AcceptHeaderRequestCallback requestCallback = new AcceptHeaderRequestCallback(responseType);
 		HttpMessageConverterExtractor<T> responseExtractor =
@@ -221,6 +223,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables);
 	}
 
+	@Override
 	public <T> T getForObject(URI url, Class<T> responseType) throws RestClientException {
 		AcceptHeaderRequestCallback requestCallback = new AcceptHeaderRequestCallback(responseType);
 		HttpMessageConverterExtractor<T> responseExtractor =
@@ -228,6 +231,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, HttpMethod.GET, requestCallback, responseExtractor);
 	}
 
+	@Override
 	public <T> ResponseEntity<T> getForEntity(String url, Class<T> responseType, Object... urlVariables)
 			throws RestClientException {
 		AcceptHeaderRequestCallback requestCallback = new AcceptHeaderRequestCallback(responseType);
@@ -236,6 +240,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables);
 	}
 
+	@Override
 	public <T> ResponseEntity<T> getForEntity(String url, Class<T> responseType, Map<String, ?> urlVariables)
 			throws RestClientException {
 		AcceptHeaderRequestCallback requestCallback = new AcceptHeaderRequestCallback(responseType);
@@ -244,6 +249,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, HttpMethod.GET, requestCallback, responseExtractor, urlVariables);
 	}
 
+	@Override
 	public <T> ResponseEntity<T> getForEntity(URI url, Class<T> responseType) throws RestClientException {
 		AcceptHeaderRequestCallback requestCallback = new AcceptHeaderRequestCallback(responseType);
 		ResponseEntityResponseExtractor<T> responseExtractor =
@@ -253,26 +259,31 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 
 	// HEAD
 
+	@Override
 	public HttpHeaders headForHeaders(String url, Object... urlVariables) throws RestClientException {
 		return execute(url, HttpMethod.HEAD, null, this.headersExtractor, urlVariables);
 	}
 
+	@Override
 	public HttpHeaders headForHeaders(String url, Map<String, ?> urlVariables) throws RestClientException {
 		return execute(url, HttpMethod.HEAD, null, this.headersExtractor, urlVariables);
 	}
 
+	@Override
 	public HttpHeaders headForHeaders(URI url) throws RestClientException {
 		return execute(url, HttpMethod.HEAD, null, this.headersExtractor);
 	}
 
 	// POST
 
+	@Override
 	public URI postForLocation(String url, Object request, Object... urlVariables) throws RestClientException {
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request);
 		HttpHeaders headers = execute(url, HttpMethod.POST, requestCallback, this.headersExtractor, urlVariables);
 		return headers.getLocation();
 	}
 
+	@Override
 	public URI postForLocation(String url, Object request, Map<String, ?> urlVariables)
 			throws RestClientException {
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request);
@@ -280,12 +291,14 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return headers.getLocation();
 	}
 
+	@Override
 	public URI postForLocation(URI url, Object request) throws RestClientException {
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request);
 		HttpHeaders headers = execute(url, HttpMethod.POST, requestCallback, this.headersExtractor);
 		return headers.getLocation();
 	}
 
+	@Override
 	public <T> T postForObject(String url, Object request, Class<T> responseType, Object... uriVariables)
 			throws RestClientException {
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request, responseType);
@@ -294,6 +307,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, HttpMethod.POST, requestCallback, responseExtractor, uriVariables);
 	}
 
+	@Override
 	public <T> T postForObject(String url, Object request, Class<T> responseType, Map<String, ?> uriVariables)
 			throws RestClientException {
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request, responseType);
@@ -302,6 +316,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, HttpMethod.POST, requestCallback, responseExtractor, uriVariables);
 	}
 
+	@Override
 	public <T> T postForObject(URI url, Object request, Class<T> responseType) throws RestClientException {
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request, responseType);
 		HttpMessageConverterExtractor<T> responseExtractor =
@@ -309,6 +324,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, HttpMethod.POST, requestCallback, responseExtractor);
 	}
 
+	@Override
 	public <T> ResponseEntity<T> postForEntity(String url, Object request, Class<T> responseType, Object... uriVariables)
 			throws RestClientException {
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request, responseType);
@@ -317,6 +333,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, HttpMethod.POST, requestCallback, responseExtractor, uriVariables);
 	}
 
+	@Override
 	public <T> ResponseEntity<T> postForEntity(String url,
 										   Object request,
 										   Class<T> responseType,
@@ -328,6 +345,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, HttpMethod.POST, requestCallback, responseExtractor, uriVariables);
 	}
 
+	@Override
 	public <T> ResponseEntity<T> postForEntity(URI url, Object request, Class<T> responseType) throws RestClientException {
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request, responseType);
 		ResponseEntityResponseExtractor<T> responseExtractor =
@@ -337,16 +355,19 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 
 	// PUT
 
+	@Override
 	public void put(String url, Object request, Object... urlVariables) throws RestClientException {
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request);
 		execute(url, HttpMethod.PUT, requestCallback, null, urlVariables);
 	}
 
+	@Override
 	public void put(String url, Object request, Map<String, ?> urlVariables) throws RestClientException {
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request);
 		execute(url, HttpMethod.PUT, requestCallback, null, urlVariables);
 	}
 
+	@Override
 	public void put(URI url, Object request) throws RestClientException {
 		HttpEntityRequestCallback requestCallback = new HttpEntityRequestCallback(request);
 		execute(url, HttpMethod.PUT, requestCallback, null);
@@ -354,30 +375,36 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 
 	// DELETE
 
+	@Override
 	public void delete(String url, Object... urlVariables) throws RestClientException {
 		execute(url, HttpMethod.DELETE, null, null, urlVariables);
 	}
 
+	@Override
 	public void delete(String url, Map<String, ?> urlVariables) throws RestClientException {
 		execute(url, HttpMethod.DELETE, null, null, urlVariables);
 	}
 
+	@Override
 	public void delete(URI url) throws RestClientException {
 		execute(url, HttpMethod.DELETE, null, null);
 	}
 
 	// OPTIONS
 
+	@Override
 	public Set<HttpMethod> optionsForAllow(String url, Object... urlVariables) throws RestClientException {
 		HttpHeaders headers = execute(url, HttpMethod.OPTIONS, null, this.headersExtractor, urlVariables);
 		return headers.getAllow();
 	}
 
+	@Override
 	public Set<HttpMethod> optionsForAllow(String url, Map<String, ?> urlVariables) throws RestClientException {
 		HttpHeaders headers = execute(url, HttpMethod.OPTIONS, null, this.headersExtractor, urlVariables);
 		return headers.getAllow();
 	}
 
+	@Override
 	public Set<HttpMethod> optionsForAllow(URI url) throws RestClientException {
 		HttpHeaders headers = execute(url, HttpMethod.OPTIONS, null, this.headersExtractor);
 		return headers.getAllow();
@@ -385,6 +412,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 
 	// exchange
 
+	@Override
 	public <T> ResponseEntity<T> exchange(String url, HttpMethod method,
 			HttpEntity<?> requestEntity, Class<T> responseType, Object... uriVariables) throws RestClientException {
 
@@ -393,6 +421,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, method, requestCallback, responseExtractor, uriVariables);
 	}
 
+	@Override
 	public <T> ResponseEntity<T> exchange(String url, HttpMethod method,
 			HttpEntity<?> requestEntity, Class<T> responseType, Map<String, ?> uriVariables) throws RestClientException {
 
@@ -401,6 +430,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, method, requestCallback, responseExtractor, uriVariables);
 	}
 
+	@Override
 	public <T> ResponseEntity<T> exchange(URI url, HttpMethod method, HttpEntity<?> requestEntity,
 			Class<T> responseType) throws RestClientException {
 
@@ -409,6 +439,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, method, requestCallback, responseExtractor);
 	}
 
+	@Override
 	public <T> ResponseEntity<T> exchange(String url, HttpMethod method, HttpEntity<?> requestEntity,
 			ParameterizedTypeReference<T> responseType, Object... uriVariables) throws RestClientException {
 
@@ -418,6 +449,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, method, requestCallback, responseExtractor, uriVariables);
 	}
 
+	@Override
 	public <T> ResponseEntity<T> exchange(String url, HttpMethod method, HttpEntity<?> requestEntity,
 			ParameterizedTypeReference<T> responseType, Map<String, ?> uriVariables) throws RestClientException {
 
@@ -427,6 +459,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return execute(url, method, requestCallback, responseExtractor, uriVariables);
 	}
 
+	@Override
 	public <T> ResponseEntity<T> exchange(URI url, HttpMethod method, HttpEntity<?> requestEntity,
 			ParameterizedTypeReference<T> responseType) throws RestClientException {
 
@@ -438,6 +471,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 
 	// general execution
 
+	@Override
 	public <T> T execute(String url, HttpMethod method, RequestCallback requestCallback,
 			ResponseExtractor<T> responseExtractor, Object... urlVariables) throws RestClientException {
 
@@ -446,6 +480,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return doExecute(expanded, method, requestCallback, responseExtractor);
 	}
 
+	@Override
 	public <T> T execute(String url, HttpMethod method, RequestCallback requestCallback,
 			ResponseExtractor<T> responseExtractor, Map<String, ?> urlVariables) throws RestClientException {
 
@@ -454,6 +489,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 		return doExecute(expanded, method, requestCallback, responseExtractor);
 	}
 
+	@Override
 	public <T> T execute(URI url, HttpMethod method, RequestCallback requestCallback,
 			ResponseExtractor<T> responseExtractor) throws RestClientException {
 
@@ -544,6 +580,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 			this.responseType = responseType;
 		}
 
+		@Override
 		@SuppressWarnings("unchecked")
 		public void doWithRequest(ClientHttpRequest request) throws IOException {
 			if (responseType != null) {
@@ -682,6 +719,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 			}
 		}
 
+		@Override
 		public ResponseEntity<T> extractData(ClientHttpResponse response) throws IOException {
 			if (delegate != null) {
 				T body = delegate.extractData(response);
@@ -699,6 +737,7 @@ public class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 	 */
 	private static class HeadersExtractor implements ResponseExtractor<HttpHeaders> {
 
+		@Override
 		public HttpHeaders extractData(ClientHttpResponse response) throws IOException {
 			return response.getHeaders();
 		}
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..486da7952a 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
@@ -41,6 +41,7 @@ public abstract class AbstractContextLoaderInitializer implements WebApplication
 	/** Logger available to subclasses. */
 	protected final Log logger = LogFactory.getLog(getClass());
 
+	@Override
 	public void onStartup(ServletContext servletContext) throws ServletException {
 		this.registerContextLoaderListener(servletContext);
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java
index a6185a81e8..1712408562 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ConfigurableWebApplicationContext.java
@@ -74,6 +74,7 @@ public interface ConfigurableWebApplicationContext extends WebApplicationContext
 	/**
 	 * Return the {@link ConfigurableWebEnvironment} used by this web application context.
 	 */
+	@Override
 	ConfigurableWebEnvironment getEnvironment();
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java b/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java
index 4dc269a1b4..db3b5b3f53 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java
@@ -43,9 +43,11 @@ public class ContextCleanupListener implements ServletContextListener {
 	private static final Log logger = LogFactory.getLog(ContextCleanupListener.class);
 
 
+	@Override
 	public void contextInitialized(ServletContextEvent event) {
 	}
 
+	@Override
 	public void contextDestroyed(ServletContextEvent event) {
 		cleanupAttributes(event.getServletContext());
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java b/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
index 279fd71636..1e03001c99 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ContextLoaderListener.java
@@ -104,6 +104,7 @@ public class ContextLoaderListener extends ContextLoader implements ServletConte
 	/**
 	 * Initialize the root web application context.
 	 */
+	@Override
 	public void contextInitialized(ServletContextEvent event) {
 		this.contextLoader = createContextLoader();
 		if (this.contextLoader == null) {
@@ -138,6 +139,7 @@ public class ContextLoaderListener extends ContextLoader implements ServletConte
 	/**
 	 * Close the root web application context.
 	 */
+	@Override
 	public void contextDestroyed(ServletContextEvent event) {
 		if (this.contextLoader != null) {
 			this.contextLoader.closeWebApplicationContext(event.getServletContext());
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java
index 155eadeb7e..0132583726 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java
@@ -36,6 +36,7 @@ import org.springframework.beans.factory.config.Scope;
  */
 public abstract class AbstractRequestAttributesScope implements Scope {
 
+	@Override
 	public Object get(String name, ObjectFactory objectFactory) {
 		RequestAttributes attributes = RequestContextHolder.currentRequestAttributes();
 		Object scopedObject = attributes.getAttribute(name, getScope());
@@ -46,6 +47,7 @@ public abstract class AbstractRequestAttributesScope implements Scope {
 		return scopedObject;
 	}
 
+	@Override
 	public Object remove(String name) {
 		RequestAttributes attributes = RequestContextHolder.currentRequestAttributes();
 		Object scopedObject = attributes.getAttribute(name, getScope());
@@ -58,11 +60,13 @@ public abstract class AbstractRequestAttributesScope implements Scope {
 		}
 	}
 
+	@Override
 	public void registerDestructionCallback(String name, Runnable callback) {
 		RequestAttributes attributes = RequestContextHolder.currentRequestAttributes();
 		attributes.registerDestructionCallback(name, callback, getScope());
 	}
 
+	@Override
 	public Object resolveContextualObject(String key) {
 		RequestAttributes attributes = RequestContextHolder.currentRequestAttributes();
 		return attributes.resolveReference(key);
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java b/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
index 27202c36be..f1467553b8 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
@@ -45,9 +45,11 @@ public class DestructionCallbackBindingListener implements HttpSessionBindingLis
 	}
 
 
+	@Override
 	public void valueBound(HttpSessionBindingEvent event) {
 	}
 
+	@Override
 	public void valueUnbound(HttpSessionBindingEvent event) {
 		this.destructionCallback.run();
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
index 8570211fa3..32f4585234 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java
@@ -106,6 +106,7 @@ public class FacesRequestAttributes implements RequestAttributes {
 	}
 
 
+	@Override
 	public Object getAttribute(String name, int scope) {
 		if (scope == SCOPE_GLOBAL_SESSION && portletApiPresent) {
 			return PortletSessionAccessor.getAttribute(name, getExternalContext());
@@ -115,6 +116,7 @@ public class FacesRequestAttributes implements RequestAttributes {
 		}
 	}
 
+	@Override
 	public void setAttribute(String name, Object value, int scope) {
 		if (scope == SCOPE_GLOBAL_SESSION && portletApiPresent) {
 			PortletSessionAccessor.setAttribute(name, value, getExternalContext());
@@ -124,6 +126,7 @@ public class FacesRequestAttributes implements RequestAttributes {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name, int scope) {
 		if (scope == SCOPE_GLOBAL_SESSION && portletApiPresent) {
 			PortletSessionAccessor.removeAttribute(name, getExternalContext());
@@ -133,6 +136,7 @@ public class FacesRequestAttributes implements RequestAttributes {
 		}
 	}
 
+	@Override
 	public String[] getAttributeNames(int scope) {
 		if (scope == SCOPE_GLOBAL_SESSION && portletApiPresent) {
 			return PortletSessionAccessor.getAttributeNames(getExternalContext());
@@ -142,6 +146,7 @@ public class FacesRequestAttributes implements RequestAttributes {
 		}
 	}
 
+	@Override
 	public void registerDestructionCallback(String name, Runnable callback, int scope) {
 		if (logger.isWarnEnabled()) {
 			logger.warn("Could not register destruction callback [" + callback + "] for attribute '" + name +
@@ -149,6 +154,7 @@ public class FacesRequestAttributes implements RequestAttributes {
 		}
 	}
 
+	@Override
 	public Object resolveReference(String key) {
 		if (REFERENCE_REQUEST.equals(key)) {
 			return getExternalContext().getRequest();
@@ -221,6 +227,7 @@ public class FacesRequestAttributes implements RequestAttributes {
 		}
 	}
 
+	@Override
 	public String getSessionId() {
 		Object session = getExternalContext().getSession(true);
 		try {
@@ -233,6 +240,7 @@ public class FacesRequestAttributes implements RequestAttributes {
 		}
 	}
 
+	@Override
 	public Object getSessionMutex() {
 		// Enforce presence of a session first to allow listeners
 		// to create the mutex attribute, if any.
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
index f921d2a541..940e0c9d0a 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java
@@ -43,14 +43,17 @@ public class FacesWebRequest extends FacesRequestAttributes implements NativeWeb
 	}
 
 
+	@Override
 	public Object getNativeRequest() {
 		return getExternalContext().getRequest();
 	}
 
+	@Override
 	public Object getNativeResponse() {
 		return getExternalContext().getResponse();
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T getNativeRequest(Class<T> requiredType) {
 		if (requiredType != null) {
@@ -62,6 +65,7 @@ public class FacesWebRequest extends FacesRequestAttributes implements NativeWeb
 		return null;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T getNativeResponse(Class<T> requiredType) {
 		if (requiredType != null) {
@@ -74,66 +78,82 @@ public class FacesWebRequest extends FacesRequestAttributes implements NativeWeb
 	}
 
 
+	@Override
 	public String getHeader(String headerName) {
 		return getExternalContext().getRequestHeaderMap().get(headerName);
 	}
 
+	@Override
 	public String[] getHeaderValues(String headerName) {
 		return getExternalContext().getRequestHeaderValuesMap().get(headerName);
 	}
 
+	@Override
 	public Iterator<String> getHeaderNames() {
 		return getExternalContext().getRequestHeaderMap().keySet().iterator();
 	}
 
+	@Override
 	public String getParameter(String paramName) {
 		return getExternalContext().getRequestParameterMap().get(paramName);
 	}
 
+	@Override
 	public Iterator<String> getParameterNames() {
 		return getExternalContext().getRequestParameterNames();
 	}
 
+	@Override
 	public String[] getParameterValues(String paramName) {
 		return getExternalContext().getRequestParameterValuesMap().get(paramName);
 	}
 
+	@Override
 	public Map<String, String[]> getParameterMap() {
 		return getExternalContext().getRequestParameterValuesMap();
 	}
 
+	@Override
 	public Locale getLocale() {
 		return getFacesContext().getExternalContext().getRequestLocale();
 	}
 
+	@Override
 	public String getContextPath() {
 		return getFacesContext().getExternalContext().getRequestContextPath();
 	}
 
+	@Override
 	public String getRemoteUser() {
 		return getFacesContext().getExternalContext().getRemoteUser();
 	}
 
+	@Override
 	public Principal getUserPrincipal() {
 		return getFacesContext().getExternalContext().getUserPrincipal();
 	}
 
+	@Override
 	public boolean isUserInRole(String role) {
 		return getFacesContext().getExternalContext().isUserInRole(role);
 	}
 
+	@Override
 	public boolean isSecure() {
 		return false;
 	}
 
+	@Override
 	public boolean checkNotModified(long lastModifiedTimestamp) {
 		return false;
 	}
 
+	@Override
 	public boolean checkNotModified(String eTag) {
 		return false;
 	}
 
+	@Override
 	public String getDescription(boolean includeClientInfo) {
 		ExternalContext externalContext = getExternalContext();
 		StringBuilder sb = new StringBuilder();
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/Log4jNestedDiagnosticContextInterceptor.java b/spring-web/src/main/java/org/springframework/web/context/request/Log4jNestedDiagnosticContextInterceptor.java
index c369abbcaa..cfc25e82f7 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/Log4jNestedDiagnosticContextInterceptor.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/Log4jNestedDiagnosticContextInterceptor.java
@@ -58,6 +58,7 @@ public class Log4jNestedDiagnosticContextInterceptor implements AsyncWebRequestI
 	/**
 	 * Adds a message the Log4J NDC before the request is processed.
 	 */
+	@Override
 	public void preHandle(WebRequest request) throws Exception {
 		NDC.push(getNestedDiagnosticContextMessage(request));
 	}
@@ -74,12 +75,14 @@ public class Log4jNestedDiagnosticContextInterceptor implements AsyncWebRequestI
 		return request.getDescription(isIncludeClientInfo());
 	}
 
+	@Override
 	public void postHandle(WebRequest request, ModelMap model) throws Exception {
 	}
 
 	/**
 	 * Removes the log message from the Log4J NDC after the request is processed.
 	 */
+	@Override
 	public void afterCompletion(WebRequest request, Exception ex) throws Exception {
 		NDC.pop();
 		if (NDC.getDepth() == 0) {
@@ -91,6 +94,7 @@ public class Log4jNestedDiagnosticContextInterceptor implements AsyncWebRequestI
 	 * Removes the log message from the Log4J NDC when the processing thread is
 	 * exited after the start of asynchronous request handling.
 	 */
+	@Override
 	public void afterConcurrentHandlingStarted(WebRequest request) {
 		NDC.pop();
 		if (NDC.getDepth() == 0) {
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..1316d29694 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
@@ -49,6 +49,7 @@ public class RequestContextListener implements ServletRequestListener {
 			RequestContextListener.class.getName() + ".REQUEST_ATTRIBUTES";
 
 
+	@Override
 	public void requestInitialized(ServletRequestEvent requestEvent) {
 		if (!(requestEvent.getServletRequest() instanceof HttpServletRequest)) {
 			throw new IllegalArgumentException(
@@ -61,6 +62,7 @@ public class RequestContextListener implements ServletRequestListener {
 		RequestContextHolder.setRequestAttributes(attributes);
 	}
 
+	@Override
 	public void requestDestroyed(ServletRequestEvent requestEvent) {
 		ServletRequestAttributes attributes =
 				(ServletRequestAttributes) requestEvent.getServletRequest().getAttribute(REQUEST_ATTRIBUTES_ATTRIBUTE);
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java
index b95814a00e..370a3ee841 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java
@@ -52,6 +52,7 @@ public class RequestScope extends AbstractRequestAttributesScope {
 	 * There is no conversation id concept for a request, so this method
 	 * returns {@code null}.
 	 */
+	@Override
 	public String getConversationId() {
 		return null;
 	}
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..35c06593f1 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
@@ -89,6 +89,7 @@ public class ServletRequestAttributes extends AbstractRequestAttributes {
 	}
 
 
+	@Override
 	public Object getAttribute(String name, int scope) {
 		if (scope == SCOPE_REQUEST) {
 			if (!isRequestActive()) {
@@ -117,6 +118,7 @@ public class ServletRequestAttributes extends AbstractRequestAttributes {
 		}
 	}
 
+	@Override
 	public void setAttribute(String name, Object value, int scope) {
 		if (scope == SCOPE_REQUEST) {
 			if (!isRequestActive()) {
@@ -134,6 +136,7 @@ public class ServletRequestAttributes extends AbstractRequestAttributes {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name, int scope) {
 		if (scope == SCOPE_REQUEST) {
 			if (isRequestActive()) {
@@ -159,6 +162,7 @@ public class ServletRequestAttributes extends AbstractRequestAttributes {
 		}
 	}
 
+	@Override
 	public String[] getAttributeNames(int scope) {
 		if (scope == SCOPE_REQUEST) {
 			if (!isRequestActive()) {
@@ -181,6 +185,7 @@ public class ServletRequestAttributes extends AbstractRequestAttributes {
 		}
 	}
 
+	@Override
 	public void registerDestructionCallback(String name, Runnable callback, int scope) {
 		if (scope == SCOPE_REQUEST) {
 			registerRequestDestructionCallback(name, callback);
@@ -190,6 +195,7 @@ public class ServletRequestAttributes extends AbstractRequestAttributes {
 		}
 	}
 
+	@Override
 	public Object resolveReference(String key) {
 		if (REFERENCE_REQUEST.equals(key)) {
 			return this.request;
@@ -202,10 +208,12 @@ public class ServletRequestAttributes extends AbstractRequestAttributes {
 		}
 	}
 
+	@Override
 	public String getSessionId() {
 		return getSession(true).getId();
 	}
 
+	@Override
 	public Object getSessionMutex() {
 		return WebUtils.getSessionMutex(getSession(true));
 	}
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..12ef426339 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
@@ -79,76 +79,94 @@ public class ServletWebRequest extends ServletRequestAttributes implements Nativ
 		return this.response;
 	}
 
+	@Override
 	public Object getNativeRequest() {
 		return getRequest();
 	}
 
+	@Override
 	public Object getNativeResponse() {
 		return getResponse();
 	}
 
+	@Override
 	public <T> T getNativeRequest(Class<T> requiredType) {
 		return WebUtils.getNativeRequest(getRequest(), requiredType);
 	}
 
+	@Override
 	public <T> T getNativeResponse(Class<T> requiredType) {
 		return WebUtils.getNativeResponse(getResponse(), requiredType);
 	}
 
 
+	@Override
 	public String getHeader(String headerName) {
 		return getRequest().getHeader(headerName);
 	}
 
+	@Override
 	public String[] getHeaderValues(String headerName) {
 		String[] headerValues = StringUtils.toStringArray(getRequest().getHeaders(headerName));
 		return (!ObjectUtils.isEmpty(headerValues) ? headerValues : null);
 	}
 
+	@Override
 	public Iterator<String> getHeaderNames() {
 		return CollectionUtils.toIterator(getRequest().getHeaderNames());
 	}
 
+	@Override
 	public String getParameter(String paramName) {
 		return getRequest().getParameter(paramName);
 	}
 
+	@Override
 	public String[] getParameterValues(String paramName) {
 		return getRequest().getParameterValues(paramName);
 	}
 
+	@Override
 	public Iterator<String> getParameterNames() {
 		return CollectionUtils.toIterator(getRequest().getParameterNames());
 	}
 
+	@Override
 	public Map<String, String[]> getParameterMap() {
 		return getRequest().getParameterMap();
 	}
 
+	@Override
 	public Locale getLocale() {
 		return getRequest().getLocale();
 	}
 
+	@Override
 	public String getContextPath() {
 		return getRequest().getContextPath();
 	}
 
+	@Override
 	public String getRemoteUser() {
 		return getRequest().getRemoteUser();
 	}
 
+	@Override
 	public Principal getUserPrincipal() {
 		return getRequest().getUserPrincipal();
 	}
 
+	@Override
 	public boolean isUserInRole(String role) {
 		return getRequest().isUserInRole(role);
 	}
 
+	@Override
 	public boolean isSecure() {
 		return getRequest().isSecure();
 	}
 
+	@Override
 	public boolean checkNotModified(long lastModifiedTimestamp) {
 		if (lastModifiedTimestamp >= 0 && !this.notModified &&
 				(this.response == null || !this.response.containsHeader(HEADER_LAST_MODIFIED))) {
@@ -166,6 +184,7 @@ public class ServletWebRequest extends ServletRequestAttributes implements Nativ
 		return this.notModified;
 	}
 
+	@Override
 	public boolean checkNotModified(String eTag) {
 		if (StringUtils.hasLength(eTag) && !this.notModified &&
 				(this.response == null || !this.response.containsHeader(HEADER_ETAG))) {
@@ -188,6 +207,7 @@ public class ServletWebRequest extends ServletRequestAttributes implements Nativ
 		return this.notModified;
 	}
 
+	@Override
 	public String getDescription(boolean includeClientInfo) {
 		HttpServletRequest request = getRequest();
 		StringBuilder sb = new StringBuilder();
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java b/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java
index 19bcb0d772..1696c1fcf4 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java
@@ -81,6 +81,7 @@ public class SessionScope extends AbstractRequestAttributesScope {
 		return this.scope;
 	}
 
+	@Override
 	public String getConversationId() {
 		return RequestContextHolder.currentRequestAttributes().getSessionId();
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/CallableProcessingInterceptorAdapter.java b/spring-web/src/main/java/org/springframework/web/context/request/async/CallableProcessingInterceptorAdapter.java
index 264e44237f..36689b1e42 100644
--- a/spring-web/src/main/java/org/springframework/web/context/request/async/CallableProcessingInterceptorAdapter.java
+++ b/spring-web/src/main/java/org/springframework/web/context/request/async/CallableProcessingInterceptorAdapter.java
@@ -32,18 +32,21 @@ public abstract class CallableProcessingInterceptorAdapter implements CallablePr
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public <T> void beforeConcurrentHandling(NativeWebRequest request, Callable<T> task) throws Exception {
 	}
 
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public <T> void preProcess(NativeWebRequest request, Callable<T> task) throws Exception {
 	}
 
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult) throws Exception {
 	}
 
@@ -51,6 +54,7 @@ public abstract class CallableProcessingInterceptorAdapter implements CallablePr
 	 * This implementation always returns
 	 * {@link CallableProcessingInterceptor#RESULT_NONE RESULT_NONE}.
 	 */
+	@Override
 	public <T> Object handleTimeout(NativeWebRequest request, Callable<T> task) throws Exception {
 		return RESULT_NONE;
 	}
@@ -58,6 +62,7 @@ public abstract class CallableProcessingInterceptorAdapter implements CallablePr
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public <T> void afterCompletion(NativeWebRequest request, Callable<T> task) throws Exception {
 	}
 
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..42409c6fe2 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,18 +30,21 @@ public abstract class DeferredResultProcessingInterceptorAdapter implements Defe
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public <T> void beforeConcurrentHandling(NativeWebRequest request, DeferredResult<T> deferredResult) throws Exception {
 	}
 
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public <T> void preProcess(NativeWebRequest request, DeferredResult<T> deferredResult) throws Exception {
 	}
 
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public <T> void postProcess(NativeWebRequest request, DeferredResult<T> deferredResult,
 			Object concurrentResult) throws Exception {
 	}
@@ -49,6 +52,7 @@ public abstract class DeferredResultProcessingInterceptorAdapter implements Defe
 	/**
 	 * This implementation returns {@code true} by default.
 	 */
+	@Override
 	public <T> boolean handleTimeout(NativeWebRequest request, DeferredResult<T> deferredResult) throws Exception {
 		return true;
 	}
@@ -56,6 +60,7 @@ public abstract class DeferredResultProcessingInterceptorAdapter implements Defe
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public <T> void afterCompletion(NativeWebRequest request, DeferredResult<T> deferredResult) throws Exception {
 	}
 
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..5fa0f94a79 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
@@ -33,32 +33,39 @@ public class NoSupportAsyncWebRequest extends ServletWebRequest implements Async
 		super(request, response);
 	}
 
+	@Override
 	public void addCompletionHandler(Runnable runnable) {
 		// ignored
 	}
 
+	@Override
 	public void setTimeout(Long timeout) {
 		// ignored
 	}
 
+	@Override
 	public void addTimeoutHandler(Runnable runnable) {
 		// ignored
 	}
 
+	@Override
 	public boolean isAsyncStarted() {
 		return false;
 	}
 
 	// Not supported
 
+	@Override
 	public void startAsync() {
 		throw new UnsupportedOperationException("No async support in a pre-Servlet 3.0 runtime");
 	}
 
+	@Override
 	public boolean isAsyncComplete() {
 		throw new UnsupportedOperationException("No async support in a pre-Servlet 3.0 runtime");
 	}
 
+	@Override
 	public void dispatch() {
 		throw new UnsupportedOperationException("No async support in a pre-Servlet 3.0 runtime");
 	}
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..abb8329dce 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
@@ -68,19 +68,23 @@ public class StandardServletAsyncWebRequest extends ServletWebRequest implements
 	 * <p>In Servlet 3 async processing, the timeout period begins after the
 	 * container processing thread has exited.
 	 */
+	@Override
 	public void setTimeout(Long timeout) {
 		Assert.state(!isAsyncStarted(), "Cannot change the timeout with concurrent handling in progress");
 		this.timeout = timeout;
 	}
 
+	@Override
 	public void addTimeoutHandler(Runnable timeoutHandler) {
 		this.timeoutHandlers.add(timeoutHandler);
 	}
 
+	@Override
 	public void addCompletionHandler(Runnable runnable) {
 		this.completionHandlers.add(runnable);
 	}
 
+	@Override
 	public boolean isAsyncStarted() {
 		return ((this.asyncContext != null) && getRequest().isAsyncStarted());
 	}
@@ -90,10 +94,12 @@ public class StandardServletAsyncWebRequest extends ServletWebRequest implements
 	 * <p>It is important to avoid use of request and response objects after async
 	 * processing has completed. Servlet containers often re-use them.
 	 */
+	@Override
 	public boolean isAsyncComplete() {
 		return this.asyncCompleted.get();
 	}
 
+	@Override
 	public void startAsync() {
 		Assert.state(getRequest().isAsyncSupported(),
 				"Async support must be enabled on a servlet and for all filters involved " +
@@ -111,6 +117,7 @@ public class StandardServletAsyncWebRequest extends ServletWebRequest implements
 		}
 	}
 
+	@Override
 	public void dispatch() {
 		Assert.notNull(this.asyncContext, "Cannot dispatch without an AsyncContext");
 		this.asyncContext.dispatch();
@@ -120,18 +127,22 @@ public class StandardServletAsyncWebRequest extends ServletWebRequest implements
 	// Implementation of AsyncListener methods
 	// ---------------------------------------------------------------------
 
+	@Override
 	public void onStartAsync(AsyncEvent event) throws IOException {
 	}
 
+	@Override
 	public void onError(AsyncEvent event) throws IOException {
 	}
 
+	@Override
 	public void onTimeout(AsyncEvent event) throws IOException {
 		for (Runnable handler : this.timeoutHandlers) {
 			handler.run();
 		}
 	}
 
+	@Override
 	public void onComplete(AsyncEvent event) throws IOException {
 		for (Runnable handler : this.completionHandlers) {
 			handler.run();
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 2e104d8e75..d0582e931c 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
@@ -107,6 +107,7 @@ public final class WebAsyncManager {
 		Assert.state(!isConcurrentHandlingStarted(), "Can't set AsyncWebRequest with concurrent handling in progress");
 		this.asyncWebRequest = asyncWebRequest;
 		this.asyncWebRequest.addCompletionHandler(new Runnable() {
+			@Override
 			public void run() {
 				asyncWebRequest.removeAttribute(WebAsyncUtils.WEB_ASYNC_MANAGER_ATTRIBUTE, RequestAttributes.SCOPE_REQUEST);
 			}
@@ -291,6 +292,7 @@ public final class WebAsyncManager {
 		final CallableInterceptorChain interceptorChain = new CallableInterceptorChain(interceptors);
 
 		this.asyncWebRequest.addTimeoutHandler(new Runnable() {
+			@Override
 			public void run() {
 				logger.debug("Processing timeout");
 				Object result = interceptorChain.triggerAfterTimeout(asyncWebRequest, callable);
@@ -301,6 +303,7 @@ public final class WebAsyncManager {
 		});
 
 		this.asyncWebRequest.addCompletionHandler(new Runnable() {
+			@Override
 			public void run() {
 				interceptorChain.triggerAfterCompletion(asyncWebRequest, callable);
 			}
@@ -311,6 +314,7 @@ public final class WebAsyncManager {
 		startAsyncProcessing(processingContext);
 
 		this.taskExecutor.submit(new Runnable() {
+			@Override
 			public void run() {
 				Object result = null;
 				try {
@@ -382,6 +386,7 @@ public final class WebAsyncManager {
 		final DeferredResultInterceptorChain interceptorChain = new DeferredResultInterceptorChain(interceptors);
 
 		this.asyncWebRequest.addTimeoutHandler(new Runnable() {
+			@Override
 			public void run() {
 				try {
 					interceptorChain.triggerAfterTimeout(asyncWebRequest, deferredResult);
@@ -393,6 +398,7 @@ public final class WebAsyncManager {
 		});
 
 		this.asyncWebRequest.addCompletionHandler(new Runnable() {
+			@Override
 			public void run() {
 				interceptorChain.triggerAfterCompletion(asyncWebRequest, deferredResult);
 			}
@@ -405,6 +411,7 @@ public final class WebAsyncManager {
 		try {
 			interceptorChain.applyPreProcess(this.asyncWebRequest, deferredResult);
 			deferredResult.setResultHandler(new DeferredResultHandler() {
+				@Override
 				public void handleResult(Object result) {
 					result = interceptorChain.applyPostProcess(asyncWebRequest, deferredResult, result);
 					setConcurrentResultAndDispatch(result);
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 f36bddc316..2583bb7a0f 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
@@ -98,14 +98,17 @@ public abstract class AbstractRefreshableWebApplicationContext extends AbstractR
 	}
 
 
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
 
+	@Override
 	public void setServletConfig(ServletConfig servletConfig) {
 		this.servletConfig = servletConfig;
 		if (servletConfig != null && this.servletContext == null) {
@@ -113,10 +116,12 @@ public abstract class AbstractRefreshableWebApplicationContext extends AbstractR
 		}
 	}
 
+	@Override
 	public ServletConfig getServletConfig() {
 		return this.servletConfig;
 	}
 
+	@Override
 	public void setNamespace(String namespace) {
 		this.namespace = namespace;
 		if (namespace != null) {
@@ -124,6 +129,7 @@ public abstract class AbstractRefreshableWebApplicationContext extends AbstractR
 		}
 	}
 
+	@Override
 	public String getNamespace() {
 		return this.namespace;
 	}
@@ -215,6 +221,7 @@ public abstract class AbstractRefreshableWebApplicationContext extends AbstractR
 		this.getEnvironment().initPropertySources(this.servletContext, this.servletConfig);
 	}
 
+	@Override
 	public Theme getTheme(String themeName) {
 		return this.themeSource.getTheme(themeName);
 	}
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 ac87960cd0..cd376fd6d1 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
@@ -116,10 +116,12 @@ public class GenericWebApplicationContext extends GenericApplicationContext
 	/**
 	 * Set the ServletContext that this WebApplicationContext runs in.
 	 */
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
@@ -205,6 +207,7 @@ public class GenericWebApplicationContext extends GenericApplicationContext
 		this.getEnvironment().initPropertySources(this.servletContext, null);
 	}
 
+	@Override
 	public Theme getTheme(String themeName) {
 		return this.themeSource.getTheme(themeName);
 	}
@@ -214,24 +217,29 @@ public class GenericWebApplicationContext extends GenericApplicationContext
 	// Pseudo-implementation of ConfigurableWebApplicationContext
 	// ---------------------------------------------------------------------
 
+	@Override
 	public void setServletConfig(ServletConfig servletConfig) {
 		// no-op
 	}
 
+	@Override
 	public ServletConfig getServletConfig() {
 		throw new UnsupportedOperationException(
 				"GenericWebApplicationContext does not support getServletConfig()");
 	}
 
+	@Override
 	public void setNamespace(String namespace) {
 		// no-op
 	}
 
+	@Override
 	public String getNamespace() {
 		throw new UnsupportedOperationException(
 				"GenericWebApplicationContext does not support getNamespace()");
 	}
 
+	@Override
 	public void setConfigLocation(String configLocation) {
 		if (StringUtils.hasText(configLocation)) {
 			throw new UnsupportedOperationException(
@@ -240,6 +248,7 @@ public class GenericWebApplicationContext extends GenericApplicationContext
 		}
 	}
 
+	@Override
 	public void setConfigLocations(String[] configLocations) {
 		if (!ObjectUtils.isEmpty(configLocations)) {
 			throw new UnsupportedOperationException(
@@ -248,6 +257,7 @@ public class GenericWebApplicationContext extends GenericApplicationContext
 		}
 	}
 
+	@Override
 	public String[] getConfigLocations() {
 		throw new UnsupportedOperationException(
 				"GenericWebApplicationContext does not support getConfigLocations()");
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java
index 26bcfb4498..722a5aec6f 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java
@@ -63,6 +63,7 @@ public class ServletContextAttributeExporter implements ServletContextAware {
 		this.attributes = attributes;
 	}
 
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		for (Map.Entry<String, Object> entry : attributes.entrySet()) {
 			String attributeName = entry.getKey();
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java
index da3ca2419c..144dc562d3 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java
@@ -55,6 +55,7 @@ public class ServletContextAttributeFactoryBean implements FactoryBean<Object>,
 		this.attributeName = attributeName;
 	}
 
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		if (this.attributeName == null) {
 			throw new IllegalArgumentException("Property 'attributeName' is required");
@@ -66,14 +67,17 @@ public class ServletContextAttributeFactoryBean implements FactoryBean<Object>,
 	}
 
 
+	@Override
 	public Object getObject() throws Exception {
 		return this.attribute;
 	}
 
+	@Override
 	public Class<?> getObjectType() {
 		return (this.attribute != null ? this.attribute.getClass() : null);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java
index 3e19b43f57..7cfa4641d8 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java
@@ -70,6 +70,7 @@ public class ServletContextAwareProcessor implements BeanPostProcessor {
 	}
 
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		if (this.servletContext != null && bean instanceof ServletContextAware) {
 			((ServletContextAware) bean).setServletContext(this.servletContext);
@@ -80,6 +81,7 @@ public class ServletContextAwareProcessor implements BeanPostProcessor {
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) {
 		return bean;
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextFactoryBean.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextFactoryBean.java
index f5af556658..9389942026 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextFactoryBean.java
@@ -49,19 +49,23 @@ public class ServletContextFactoryBean implements FactoryBean<ServletContext>, S
 	private ServletContext servletContext;
 
 
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
 
 
+	@Override
 	public ServletContext getObject() {
 		return this.servletContext;
 	}
 
+	@Override
 	public Class<? extends ServletContext> getObjectType() {
 		return (this.servletContext != null ? this.servletContext.getClass() : ServletContext.class);
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
index 6af3d80863..27f30651ea 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java
@@ -50,6 +50,7 @@ public class ServletContextParameterFactoryBean implements FactoryBean<String>,
 		this.initParamName = initParamName;
 	}
 
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		if (this.initParamName == null) {
 			throw new IllegalArgumentException("initParamName is required");
@@ -61,14 +62,17 @@ public class ServletContextParameterFactoryBean implements FactoryBean<String>,
 	}
 
 
+	@Override
 	public String getObject() {
 		return this.paramValue;
 	}
 
+	@Override
 	public Class<String> getObjectType() {
 		return String.class;
 	}
 
+	@Override
 	public boolean isSingleton() {
 		return true;
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java
index ea6cda9767..e2a8f1f2f2 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java
@@ -109,6 +109,7 @@ public class ServletContextPropertyPlaceholderConfigurer extends PropertyPlaceho
 	 * against the ServletContext: It will effectively behave like a plain
 	 * PropertyPlaceholderConfigurer in such a scenario.
 	 */
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
index 673c39c9a1..a05b782f8c 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResource.java
@@ -134,6 +134,7 @@ public class ServletContextResource extends AbstractFileResolvingResource implem
 	 * but throws a FileNotFoundException if no resource found.
 	 * @see javax.servlet.ServletContext#getResourceAsStream(String)
 	 */
+	@Override
 	public InputStream getInputStream() throws IOException {
 		InputStream is = this.servletContext.getResourceAsStream(this.path);
 		if (is == null) {
@@ -202,10 +203,12 @@ public class ServletContextResource extends AbstractFileResolvingResource implem
 	 * This implementation returns a description that includes the ServletContext
 	 * resource location.
 	 */
+	@Override
 	public String getDescription() {
 		return "ServletContext resource [" + this.path + "]";
 	}
 
+	@Override
 	public String getPathWithinContext() {
 		return this.path;
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
index 180645580f..d16a99d3f3 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
@@ -62,6 +62,7 @@ public class ServletContextScope implements Scope, DisposableBean {
 	}
 
 
+	@Override
 	public Object get(String name, ObjectFactory<?> objectFactory) {
 		Object scopedObject = this.servletContext.getAttribute(name);
 		if (scopedObject == null) {
@@ -71,6 +72,7 @@ public class ServletContextScope implements Scope, DisposableBean {
 		return scopedObject;
 	}
 
+	@Override
 	public Object remove(String name) {
 		Object scopedObject = this.servletContext.getAttribute(name);
 		if (scopedObject != null) {
@@ -83,14 +85,17 @@ public class ServletContextScope implements Scope, DisposableBean {
 		}
 	}
 
+	@Override
 	public void registerDestructionCallback(String name, Runnable callback) {
 		this.destructionCallbacks.put(name, callback);
 	}
 
+	@Override
 	public Object resolveContextualObject(String key) {
 		return null;
 	}
 
+	@Override
 	public String getConversationId() {
 		return null;
 	}
@@ -101,6 +106,7 @@ public class ServletContextScope implements Scope, DisposableBean {
 	 * To be called on ServletContext shutdown.
 	 * @see org.springframework.web.context.ContextCleanupListener
 	 */
+	@Override
 	public void destroy() {
 		for (Runnable runnable : this.destructionCallbacks.values()) {
 			runnable.run();
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..6704b261aa 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
@@ -90,6 +90,7 @@ public class StandardServletEnvironment extends StandardEnvironment
 		super.customizePropertySources(propertySources);
 	}
 
+	@Override
 	public void initPropertySources(ServletContext servletContext, ServletConfig servletConfig) {
 		WebApplicationContextUtils.initServletPropertySources(
 				this.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 5de71bda60..98f21c2e45 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
@@ -75,14 +75,17 @@ public class StaticWebApplicationContext extends StaticApplicationContext
 	/**
 	 * Set the ServletContext that this WebApplicationContext runs in.
 	 */
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
 
+	@Override
 	public void setServletConfig(ServletConfig servletConfig) {
 		this.servletConfig = servletConfig;
 		if (servletConfig != null && this.servletContext == null) {
@@ -90,10 +93,12 @@ public class StaticWebApplicationContext extends StaticApplicationContext
 		}
 	}
 
+	@Override
 	public ServletConfig getServletConfig() {
 		return this.servletConfig;
 	}
 
+	@Override
 	public void setNamespace(String namespace) {
 		this.namespace = namespace;
 		if (namespace != null) {
@@ -101,6 +106,7 @@ public class StaticWebApplicationContext extends StaticApplicationContext
 		}
 	}
 
+	@Override
 	public String getNamespace() {
 		return this.namespace;
 	}
@@ -109,6 +115,7 @@ public class StaticWebApplicationContext extends StaticApplicationContext
 	 * The {@link StaticWebApplicationContext} class does not support this method.
 	 * @throws UnsupportedOperationException <b>always</b>
 	 */
+	@Override
 	public void setConfigLocation(String configLocation) {
 		if (configLocation != null) {
 			throw new UnsupportedOperationException("StaticWebApplicationContext does not support config locations");
@@ -119,12 +126,14 @@ public class StaticWebApplicationContext extends StaticApplicationContext
 	 * The {@link StaticWebApplicationContext} class does not support this method.
 	 * @throws UnsupportedOperationException <b>always</b>
 	 */
+	@Override
 	public void setConfigLocations(String[] configLocations) {
 		if (configLocations != null) {
 			throw new UnsupportedOperationException("StaticWebApplicationContext does not support config locations");
 		}
 	}
 
+	@Override
 	public String[] getConfigLocations() {
 		return null;
 	}
@@ -193,6 +202,7 @@ public class StaticWebApplicationContext extends StaticApplicationContext
 				this.getEnvironment().getPropertySources(), this.servletContext, this.servletConfig);
 	}
 
+	@Override
 	public Theme getTheme(String themeName) {
 		return this.themeSource.getTheme(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..f7a5f81daa 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
@@ -292,6 +292,7 @@ public abstract class WebApplicationContextUtils {
 	@SuppressWarnings("serial")
 	private static class RequestObjectFactory implements ObjectFactory<ServletRequest>, Serializable {
 
+		@Override
 		public ServletRequest getObject() {
 			return currentRequestAttributes().getRequest();
 		}
@@ -309,6 +310,7 @@ public abstract class WebApplicationContextUtils {
 	@SuppressWarnings("serial")
 	private static class SessionObjectFactory implements ObjectFactory<HttpSession>, Serializable {
 
+		@Override
 		public HttpSession getObject() {
 			return currentRequestAttributes().getRequest().getSession();
 		}
@@ -326,6 +328,7 @@ public abstract class WebApplicationContextUtils {
 	@SuppressWarnings("serial")
 	private static class WebRequestObjectFactory implements ObjectFactory<WebRequest>, Serializable {
 
+		@Override
 		public WebRequest getObject() {
 			return new ServletWebRequest(currentRequestAttributes().getRequest());
 		}
@@ -344,6 +347,7 @@ public abstract class WebApplicationContextUtils {
 
 		public static void registerFacesDependencies(ConfigurableListableBeanFactory beanFactory) {
 			beanFactory.registerResolvableDependency(FacesContext.class, new ObjectFactory<FacesContext>() {
+				@Override
 				public FacesContext getObject() {
 					return FacesContext.getCurrentInstance();
 				}
@@ -353,6 +357,7 @@ public abstract class WebApplicationContextUtils {
 				}
 			});
 			beanFactory.registerResolvableDependency(ExternalContext.class, new ObjectFactory<ExternalContext>() {
+				@Override
 				public ExternalContext getObject() {
 					return FacesContext.getCurrentInstance().getExternalContext();
 				}
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..b333d59279 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
@@ -40,6 +40,7 @@ public abstract class WebApplicationObjectSupport extends ApplicationObjectSuppo
 	private ServletContext servletContext;
 
 
+	@Override
 	public final void setServletContext(ServletContext servletContext) {
 		if (servletContext != this.servletContext) {
 			this.servletContext = servletContext;
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..37e9c015ff 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
@@ -52,6 +52,7 @@ public class CompositeFilter implements Filter {
 	 *
 	 * @see Filter#init(FilterConfig)
 	 */
+	@Override
 	public void destroy() {
 		for (int i = filters.size(); i-- > 0;) {
 			Filter filter = filters.get(i);
@@ -64,6 +65,7 @@ public class CompositeFilter implements Filter {
 	 *
 	 * @see Filter#init(FilterConfig)
 	 */
+	@Override
 	public void init(FilterConfig config) throws ServletException {
 		for (Filter filter : filters) {
 			filter.init(config);
@@ -77,6 +79,7 @@ public class CompositeFilter implements Filter {
 	 *
 	 * @see Filter#doFilter(ServletRequest, ServletResponse, FilterChain)
 	 */
+	@Override
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
 			ServletException {
 		new VirtualFilterChain(chain, filters).doFilter(request, response);
@@ -92,6 +95,7 @@ public class CompositeFilter implements Filter {
 			this.additionalFilters = additionalFilters;
 		}
 
+		@Override
 		public void doFilter(final ServletRequest request, final ServletResponse response) throws IOException,
 				ServletException {
 			if (currentPosition == additionalFilters.size()) {
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..6933acd166 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
@@ -239,6 +239,7 @@ public class DelegatingFilterProxy extends GenericFilterBean {
 		}
 	}
 
+	@Override
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain)
 			throws ServletException, IOException {
 
diff --git a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
index 816a52c3c1..1491a2b861 100644
--- a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
+++ b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java
@@ -103,6 +103,7 @@ public abstract class GenericFilterBean implements
 	 * @see org.springframework.beans.factory.BeanNameAware
 	 * @see #getFilterName()
 	 */
+	@Override
 	public final void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -116,6 +117,7 @@ public abstract class GenericFilterBean implements
 	 * used, this {@code Environment} can be essentially ignored.
 	 * @see #init(FilterConfig)
 	 */
+	@Override
 	public void setEnvironment(Environment environment) {
 		this.environment = environment;
 	}
@@ -127,6 +129,7 @@ public abstract class GenericFilterBean implements
 	 * @see org.springframework.web.context.ServletContextAware
 	 * @see #getServletContext()
 	 */
+	@Override
 	public final void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
@@ -139,6 +142,7 @@ public abstract class GenericFilterBean implements
 	 * @see #initFilterBean()
 	 * @see #init(javax.servlet.FilterConfig)
 	 */
+	@Override
 	public void afterPropertiesSet() throws ServletException {
 		initFilterBean();
 	}
@@ -166,6 +170,7 @@ public abstract class GenericFilterBean implements
 	 * properties are missing), or if subclass initialization fails.
 	 * @see #initFilterBean
 	 */
+	@Override
 	public final void init(FilterConfig filterConfig) throws ServletException {
 		Assert.notNull(filterConfig, "FilterConfig must not be null");
 		if (logger.isDebugEnabled()) {
@@ -274,6 +279,7 @@ public abstract class GenericFilterBean implements
 	 * as well as filter bean destruction in a Spring application context.
 	 * <p>This default implementation is empty.
 	 */
+	@Override
 	public void destroy() {
 	}
 
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..cdb1c05182 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
@@ -83,6 +83,7 @@ public abstract class OncePerRequestFilter extends GenericFilterBean {
 	 * @see #shouldNotFilter
 	 * @see #doFilterInternal
 	 */
+	@Override
 	public final void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain)
 			throws ServletException, IOException {
 
diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
index d554e05cf5..eeea3a8cc9 100644
--- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
+++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java
@@ -62,16 +62,19 @@ import org.springframework.web.context.WebApplicationContext;
 @SuppressWarnings("serial")
 public class DelegatingPhaseListenerMulticaster implements PhaseListener {
 
+	@Override
 	public PhaseId getPhaseId() {
 		return PhaseId.ANY_PHASE;
 	}
 
+	@Override
 	public void beforePhase(PhaseEvent event) {
 		for (PhaseListener listener : getDelegates(event.getFacesContext())) {
 			listener.beforePhase(event);
 		}
 	}
 
+	@Override
 	public void afterPhase(PhaseEvent event) {
 		for (PhaseListener listener : getDelegates(event.getFacesContext())) {
 			listener.afterPhase(event);
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..eeefa75044 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
@@ -101,6 +101,7 @@ public class ControllerAdviceBean implements Ordered {
 	 * Returns the order value extracted from the {@link ControllerAdvice}
 	 * annotation or {@link Ordered#LOWEST_PRECEDENCE} otherwise.
 	 */
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
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 4d93eff7f2..d948f0bfa7 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
@@ -56,6 +56,7 @@ public abstract class HandlerMethodSelector {
 		for (Class<?> currentHandlerType : handlerTypes) {
 			final Class<?> targetClass = (specificHandlerType != null ? specificHandlerType : currentHandlerType);
 			ReflectionUtils.doWithMethods(currentHandlerType, new ReflectionUtils.MethodCallback() {
+				@Override
 				public void doWith(Method method) {
 					Method specificMethod = ClassUtils.getMostSpecificMethod(method, targetClass);
 					Method bridgedMethod = BridgeMethodResolver.findBridgedMethod(specificMethod);
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java
index 07c44b32a8..6b1fe43392 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java
@@ -48,6 +48,7 @@ public abstract class AbstractCookieValueMethodArgumentResolver extends Abstract
 		super(beanFactory);
 	}
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return parameter.hasParameterAnnotation(CookieValue.class);
 	}
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 9e35288687..e2e3af023d 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
@@ -74,6 +74,7 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
 		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/AbstractWebArgumentResolverAdapter.java b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractWebArgumentResolverAdapter.java
index 76e1630318..3a8740026d 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractWebArgumentResolverAdapter.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractWebArgumentResolverAdapter.java
@@ -63,6 +63,7 @@ public abstract class AbstractWebArgumentResolverAdapter implements HandlerMetho
 	 * Actually resolve the value and check the resolved value is not
 	 * {@link WebArgumentResolver#UNRESOLVED} absorbing _any_ exceptions.
 	 */
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		try {
 			NativeWebRequest webRequest = getWebRequest();
@@ -91,6 +92,7 @@ public abstract class AbstractWebArgumentResolverAdapter implements HandlerMetho
 	 * @exception IllegalStateException if the resolved value is not assignable
 	 * to the method parameter.
 	 */
+	@Override
 	public Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ErrorsMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ErrorsMethodArgumentResolver.java
index 63e713685b..bb2b31f6b1 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/ErrorsMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ErrorsMethodArgumentResolver.java
@@ -40,11 +40,13 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  */
 public class ErrorsMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		Class<?> paramType = parameter.getParameterType();
 		return Errors.class.isAssignableFrom(paramType);
 	}
 
+	@Override
 	public 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..7db05ab78c 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
@@ -143,6 +143,7 @@ public class ExceptionHandlerMethodResolver {
 	 */
 	public final static MethodFilter EXCEPTION_HANDLER_METHODS = new MethodFilter() {
 
+		@Override
 		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/ExpressionValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
index 92a2aa88d1..91c41c0927 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java
@@ -48,6 +48,7 @@ public class ExpressionValueMethodArgumentResolver extends AbstractNamedValueMet
 		super(beanFactory);
 	}
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return parameter.hasParameterAnnotation(Value.class);
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java b/spring-web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java
index df430b5f0d..ed8a0c025e 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java
@@ -38,10 +38,12 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  */
 public class MapMethodProcessor implements HandlerMethodArgumentResolver, HandlerMethodReturnValueHandler {
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return Map.class.isAssignableFrom(parameter.getParameterType());
 	}
 
+	@Override
 	public Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
@@ -50,10 +52,12 @@ public class MapMethodProcessor implements HandlerMethodArgumentResolver, Handle
 		return mavContainer.getModel();
 	}
 
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		return Map.class.isAssignableFrom(returnType.getParameterType());
 	}
 
+	@Override
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void handleReturnValue(
 			Object returnValue, MethodParameter returnType,
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..aee03bef14 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
@@ -71,6 +71,7 @@ public class ModelAttributeMethodProcessor implements HandlerMethodArgumentResol
 	 * @return true if the parameter is annotated with {@link ModelAttribute}
 	 * or in default resolution mode also if it is not a simple type.
 	 */
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		if (parameter.hasParameterAnnotation(ModelAttribute.class)) {
 			return true;
@@ -92,6 +93,7 @@ public class ModelAttributeMethodProcessor implements HandlerMethodArgumentResol
 	 * and the next method parameter is not of type {@link Errors}.
 	 * @throws Exception if WebDataBinder initialization fails.
 	 */
+	@Override
 	public final Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest request, WebDataBinderFactory binderFactory)
@@ -180,6 +182,7 @@ public class ModelAttributeMethodProcessor implements HandlerMethodArgumentResol
 	 * Return {@code true} if there is a method-level {@code @ModelAttribute}
 	 * or if it is a non-simple type when {@code annotationNotRequired=true}.
 	 */
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		if (returnType.getMethodAnnotation(ModelAttribute.class) != null) {
 			return true;
@@ -195,6 +198,7 @@ public class ModelAttributeMethodProcessor implements HandlerMethodArgumentResol
 	/**
 	 * Add non-null return values to the {@link ModelAndViewContainer}.
 	 */
+	@Override
 	public void handleReturnValue(
 			Object returnValue, MethodParameter returnType,
 			ModelAndViewContainer mavContainer, NativeWebRequest webRequest)
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java
index c529efd8a3..c1bc413851 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java
@@ -37,10 +37,12 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  */
 public class ModelMethodProcessor implements HandlerMethodArgumentResolver, HandlerMethodReturnValueHandler {
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return Model.class.isAssignableFrom(parameter.getParameterType());
 	}
 
+	@Override
 	public Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
@@ -49,10 +51,12 @@ public class ModelMethodProcessor implements HandlerMethodArgumentResolver, Hand
 		return mavContainer.getModel();
 	}
 
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		return Model.class.isAssignableFrom(returnType.getParameterType());
 	}
 
+	@Override
 	public void handleReturnValue(
 			Object returnValue, MethodParameter returnType,
 			ModelAndViewContainer mavContainer, NativeWebRequest webRequest)
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..e335b9dbf5 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
@@ -45,11 +45,13 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  */
 public class RequestHeaderMapMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return parameter.hasParameterAnnotation(RequestHeader.class)
 				&& Map.class.isAssignableFrom(parameter.getParameterType());
 	}
 
+	@Override
 	public Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java
index e7b46bdb6a..e5596839f5 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java
@@ -52,6 +52,7 @@ public class RequestHeaderMethodArgumentResolver extends AbstractNamedValueMetho
 		super(beanFactory);
 	}
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return parameter.hasParameterAnnotation(RequestHeader.class)
 				&& !Map.class.isAssignableFrom(parameter.getParameterType());
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java
index befe7178d9..8708e5a5a0 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java
@@ -45,6 +45,7 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  */
 public class RequestParamMapMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		RequestParam requestParamAnnot = parameter.getParameterAnnotation(RequestParam.class);
 		if (requestParamAnnot != null) {
@@ -55,6 +56,7 @@ public class RequestParamMapMethodArgumentResolver implements HandlerMethodArgum
 		return false;
 	}
 
+	@Override
 	public Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
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 3f351595ec..30cb121e3e 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
@@ -102,6 +102,7 @@ public class RequestParamMethodArgumentResolver extends AbstractNamedValueMethod
 	 * 		even if not with @{@link RequestParam}.
 	 * </ul>
 	 */
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		Class<?> paramType = parameter.getParameterType();
 		if (parameter.hasParameterAnnotation(RequestParam.class)) {
diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/SessionStatusMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/SessionStatusMethodArgumentResolver.java
index f19ae73727..c9ae58b647 100644
--- a/spring-web/src/main/java/org/springframework/web/method/annotation/SessionStatusMethodArgumentResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/method/annotation/SessionStatusMethodArgumentResolver.java
@@ -32,10 +32,12 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  */
 public class SessionStatusMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return SessionStatus.class.equals(parameter.getParameterType());
 	}
 
+	@Override
 	public Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java
index 21c88153fb..6fa290d05d 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolverComposite.java
@@ -59,6 +59,7 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu
 	 * Whether the given {@linkplain MethodParameter method parameter} is supported by any registered
 	 * {@link HandlerMethodArgumentResolver}.
 	 */
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return getArgumentResolver(parameter) != null;
 	}
@@ -67,6 +68,7 @@ public class HandlerMethodArgumentResolverComposite implements HandlerMethodArgu
 	 * Iterate over registered {@link HandlerMethodArgumentResolver}s and invoke the one that supports it.
 	 * @exception IllegalStateException if no suitable {@link HandlerMethodArgumentResolver} is found.
 	 */
+	@Override
 	public Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
diff --git a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerComposite.java b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerComposite.java
index fb364be2b3..991c5ef73e 100644
--- a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerComposite.java
+++ b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerComposite.java
@@ -51,6 +51,7 @@ public class HandlerMethodReturnValueHandlerComposite implements HandlerMethodRe
 	 * Whether the given {@linkplain MethodParameter method return type} is supported by any registered
 	 * {@link HandlerMethodReturnValueHandler}.
 	 */
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		return getReturnValueHandler(returnType) != null;
 	}
@@ -59,6 +60,7 @@ public class HandlerMethodReturnValueHandlerComposite implements HandlerMethodRe
 	 * Iterate over registered {@link HandlerMethodReturnValueHandler}s and invoke the one that supports it.
 	 * @exception IllegalStateException if no suitable {@link HandlerMethodReturnValueHandler} is found.
 	 */
+	@Override
 	public void handleReturnValue(
 			Object returnValue, MethodParameter returnType,
 			ModelAndViewContainer mavContainer, NativeWebRequest webRequest)
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..b649e587e0 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
@@ -65,10 +65,12 @@ public class CommonsMultipartFile implements MultipartFile, Serializable {
 	}
 
 
+	@Override
 	public String getName() {
 		return this.fileItem.getFieldName();
 	}
 
+	@Override
 	public String getOriginalFilename() {
 		String filename = this.fileItem.getName();
 		if (filename == null) {
@@ -91,18 +93,22 @@ public class CommonsMultipartFile implements MultipartFile, Serializable {
 		}
 	}
 
+	@Override
 	public String getContentType() {
 		return this.fileItem.getContentType();
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return (this.size == 0);
 	}
 
+	@Override
 	public long getSize() {
 		return this.size;
 	}
 
+	@Override
 	public byte[] getBytes() {
 		if (!isAvailable()) {
 			throw new IllegalStateException("File has been moved - cannot be read again");
@@ -111,6 +117,7 @@ public class CommonsMultipartFile implements MultipartFile, Serializable {
 		return (bytes != null ? bytes : new byte[0]);
 	}
 
+	@Override
 	public InputStream getInputStream() throws IOException {
 		if (!isAvailable()) {
 			throw new IllegalStateException("File has been moved - cannot be read again");
@@ -119,6 +126,7 @@ public class CommonsMultipartFile implements MultipartFile, Serializable {
 		return (inputStream != null ? inputStream : new ByteArrayInputStream(new byte[0]));
 	}
 
+	@Override
 	public void transferTo(File dest) throws IOException, IllegalStateException {
 		if (!isAvailable()) {
 			throw new IllegalStateException("File has already been moved - cannot be transferred again");
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..977042863d 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
@@ -111,6 +111,7 @@ public class CommonsMultipartResolver extends CommonsFileUploadSupport
 		return new ServletFileUpload(fileItemFactory);
 	}
 
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		if (!isUploadTempDirSpecified()) {
 			getFileItemFactory().setRepository(WebUtils.getTempDir(servletContext));
@@ -118,10 +119,12 @@ public class CommonsMultipartResolver extends CommonsFileUploadSupport
 	}
 
 
+	@Override
 	public boolean isMultipart(HttpServletRequest request) {
 		return (request != null && ServletFileUpload.isMultipartContent(request));
 	}
 
+	@Override
 	public MultipartHttpServletRequest resolveMultipart(final HttpServletRequest request) throws MultipartException {
 		Assert.notNull(request, "Request must not be null");
 		if (this.resolveLazily) {
@@ -182,6 +185,7 @@ public class CommonsMultipartResolver extends CommonsFileUploadSupport
 		return encoding;
 	}
 
+	@Override
 	public void cleanupMultipart(MultipartHttpServletRequest request) {
 		if (request != null) {
 			try {
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
index 4dd8c14b01..9de0d6aeed 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
@@ -59,10 +59,12 @@ public abstract class AbstractMultipartHttpServletRequest extends HttpServletReq
 		return (HttpServletRequest) super.getRequest();
 	}
 
+	@Override
 	public HttpMethod getRequestMethod() {
 		return HttpMethod.valueOf(getRequest().getMethod());
 	}
 
+	@Override
 	public HttpHeaders getRequestHeaders() {
 		HttpHeaders headers = new HttpHeaders();
 		Enumeration<String> headerNames = getHeaderNames();
@@ -73,14 +75,17 @@ public abstract class AbstractMultipartHttpServletRequest extends HttpServletReq
 		return headers;
 	}
 
+	@Override
 	public Iterator<String> getFileNames() {
 		return getMultipartFiles().keySet().iterator();
 	}
 
+	@Override
 	public MultipartFile getFile(String name) {
 		return getMultipartFiles().getFirst(name);
 	}
 
+	@Override
 	public List<MultipartFile> getFiles(String name) {
 		List<MultipartFile> multipartFiles = getMultipartFiles().get(name);
 		if (multipartFiles != null) {
@@ -91,10 +96,12 @@ public abstract class AbstractMultipartHttpServletRequest extends HttpServletReq
 		}
 	}
 
+	@Override
 	public Map<String, MultipartFile> getFileMap() {
 		return getMultipartFiles().toSingleValueMap();
 	}
 
+	@Override
 	public MultiValueMap<String, MultipartFile> getMultiFileMap() {
 		return getMultipartFiles();
 	}
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..33c9925ea7 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
@@ -110,6 +110,7 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer
 		return paramMap;
 	}
 
+	@Override
 	public String getMultipartContentType(String paramOrFileName) {
 		MultipartFile file = getFile(paramOrFileName);
 		if (file != null) {
@@ -120,6 +121,7 @@ public class DefaultMultipartHttpServletRequest extends AbstractMultipartHttpSer
 		}
 	}
 
+	@Override
 	public HttpHeaders getMultipartHeaders(String paramOrFileName) {
 		String contentType = getMultipartContentType(paramOrFileName);
 		if (contentType != null) {
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..46a9886fe2 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
@@ -95,6 +95,7 @@ public class StandardMultipartHttpServletRequest extends AbstractMultipartHttpSe
 	}
 
 
+	@Override
 	public String getMultipartContentType(String paramOrFileName) {
 		try {
 			Part part = getPart(paramOrFileName);
@@ -105,6 +106,7 @@ public class StandardMultipartHttpServletRequest extends AbstractMultipartHttpSe
 		}
 	}
 
+	@Override
 	public HttpHeaders getMultipartHeaders(String paramOrFileName) {
 		try {
 			Part part = getPart(paramOrFileName);
@@ -139,34 +141,42 @@ public class StandardMultipartHttpServletRequest extends AbstractMultipartHttpSe
 			this.filename = filename;
 		}
 
+		@Override
 		public String getName() {
 			return this.part.getName();
 		}
 
+		@Override
 		public String getOriginalFilename() {
 			return this.filename;
 		}
 
+		@Override
 		public String getContentType() {
 			return this.part.getContentType();
 		}
 
+		@Override
 		public boolean isEmpty() {
 			return (this.part.getSize() == 0);
 		}
 
+		@Override
 		public long getSize() {
 			return this.part.getSize();
 		}
 
+		@Override
 		public byte[] getBytes() throws IOException {
 			return FileCopyUtils.copyToByteArray(this.part.getInputStream());
 		}
 
+		@Override
 		public InputStream getInputStream() throws IOException {
 			return this.part.getInputStream();
 		}
 
+		@Override
 		public void transferTo(File dest) throws IOException, IllegalStateException {
 			this.part.write(dest.getPath());
 		}
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..25cc39510a 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
@@ -45,6 +45,7 @@ import org.springframework.web.multipart.MultipartResolver;
  */
 public class StandardServletMultipartResolver implements MultipartResolver {
 
+	@Override
 	public boolean isMultipart(HttpServletRequest request) {
 		// Same check as in Commons FileUpload...
 		if (!"post".equals(request.getMethod().toLowerCase())) {
@@ -54,10 +55,12 @@ public class StandardServletMultipartResolver implements MultipartResolver {
 		return (contentType != null && contentType.toLowerCase().startsWith("multipart/"));
 	}
 
+	@Override
 	public MultipartHttpServletRequest resolveMultipart(HttpServletRequest request) throws MultipartException {
 		return new StandardMultipartHttpServletRequest(request);
 	}
 
+	@Override
 	public void cleanupMultipart(MultipartHttpServletRequest request) {
 		// To be on the safe side: explicitly delete the parts,
 		// but only actual file parts (for Resin compatibility)
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 f3a5ec9013..9591e80cf5 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
@@ -639,25 +639,30 @@ final class HierarchicalUriComponents extends UriComponents {
 			this.path = path;
 		}
 
+		@Override
 		public String getPath() {
 			return path;
 		}
 
+		@Override
 		public List<String> getPathSegments() {
 			String delimiter = new String(new char[]{PATH_DELIMITER});
 			String[] pathSegments = StringUtils.tokenizeToStringArray(path, delimiter);
 			return Collections.unmodifiableList(Arrays.asList(pathSegments));
 		}
 
+		@Override
 		public PathComponent encode(String encoding) throws UnsupportedEncodingException {
 			String encodedPath = encodeUriComponent(getPath(),encoding, Type.PATH);
 			return new FullPathComponent(encodedPath);
 		}
 
+		@Override
 		public void verify() {
 			verifyUriComponent(this.path, Type.PATH);
 		}
 
+		@Override
 		public PathComponent expand(UriTemplateVariables uriVariables) {
 			String expandedPath = expandUriComponent(getPath(), uriVariables);
 			return new FullPathComponent(expandedPath);
@@ -686,6 +691,7 @@ final class HierarchicalUriComponents extends UriComponents {
 			this.pathSegments = Collections.unmodifiableList(pathSegments);
 		}
 
+		@Override
 		public String getPath() {
 			StringBuilder pathBuilder = new StringBuilder();
 			pathBuilder.append(PATH_DELIMITER);
@@ -699,10 +705,12 @@ final class HierarchicalUriComponents extends UriComponents {
 			return pathBuilder.toString();
 		}
 
+		@Override
 		public List<String> getPathSegments() {
 			return this.pathSegments;
 		}
 
+		@Override
 		public PathComponent encode(String encoding) throws UnsupportedEncodingException {
 			List<String> pathSegments = getPathSegments();
 			List<String> encodedPathSegments = new ArrayList<String>(pathSegments.size());
@@ -713,12 +721,14 @@ final class HierarchicalUriComponents extends UriComponents {
 			return new PathSegmentComponent(encodedPathSegments);
 		}
 
+		@Override
 		public void verify() {
 			for (String pathSegment : getPathSegments()) {
 				verifyUriComponent(pathSegment, Type.PATH_SEGMENT);
 			}
 		}
 
+		@Override
 		public PathComponent expand(UriTemplateVariables uriVariables) {
 			List<String> pathSegments = getPathSegments();
 			List<String> expandedPathSegments = new ArrayList<String>(pathSegments.size());
@@ -753,6 +763,7 @@ final class HierarchicalUriComponents extends UriComponents {
 			this.pathComponents = pathComponents;
 		}
 
+		@Override
 		public String getPath() {
 			StringBuilder pathBuilder = new StringBuilder();
 			for (PathComponent pathComponent : this.pathComponents) {
@@ -761,6 +772,7 @@ final class HierarchicalUriComponents extends UriComponents {
 			return pathBuilder.toString();
 		}
 
+		@Override
 		public List<String> getPathSegments() {
 			List<String> result = new ArrayList<String>();
 			for (PathComponent pathComponent : this.pathComponents) {
@@ -769,6 +781,7 @@ final class HierarchicalUriComponents extends UriComponents {
 			return result;
 		}
 
+		@Override
 		public PathComponent encode(String encoding) throws UnsupportedEncodingException {
 			List<PathComponent> encodedComponents = new ArrayList<PathComponent>(pathComponents.size());
 			for (PathComponent pathComponent : pathComponents) {
@@ -777,12 +790,14 @@ final class HierarchicalUriComponents extends UriComponents {
 			return new PathComponentComposite(encodedComponents);
 		}
 
+		@Override
 		public void verify() {
 			for (PathComponent pathComponent : pathComponents) {
 				pathComponent.verify();
 			}
 		}
 
+		@Override
 		public PathComponent expand(UriTemplateVariables uriVariables) {
 			List<PathComponent> expandedComponents = new ArrayList<PathComponent>(this.pathComponents.size());
 			for (PathComponent pathComponent : this.pathComponents) {
@@ -799,21 +814,26 @@ final class HierarchicalUriComponents extends UriComponents {
 	 */
 	final static PathComponent NULL_PATH_COMPONENT = new PathComponent() {
 
+		@Override
 		public String getPath() {
 			return null;
 		}
 
+		@Override
 		public List<String> getPathSegments() {
 			return Collections.emptyList();
 		}
 
+		@Override
 		public PathComponent encode(String encoding) throws UnsupportedEncodingException {
 			return this;
 		}
 
+		@Override
 		public void verify() {
 		}
 
+		@Override
 		public PathComponent expand(UriTemplateVariables uriVariables) {
 			return this;
 		}
diff --git a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
index ab7a710147..c0a7f344e6 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java
@@ -44,10 +44,12 @@ import javax.servlet.http.HttpSessionListener;
  */
 public class HttpSessionMutexListener implements HttpSessionListener {
 
+	@Override
 	public void sessionCreated(HttpSessionEvent event) {
 		event.getSession().setAttribute(WebUtils.SESSION_MUTEX_ATTRIBUTE, new Mutex());
 	}
 
+	@Override
 	public void sessionDestroyed(HttpSessionEvent event) {
 		event.getSession().removeAttribute(WebUtils.SESSION_MUTEX_ATTRIBUTE);
 	}
diff --git a/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java b/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
index bf0ed911b4..8a96df095a 100644
--- a/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java
@@ -71,10 +71,12 @@ import org.springframework.beans.CachedIntrospectionResults;
  */
 public class IntrospectorCleanupListener implements ServletContextListener {
 
+	@Override
 	public void contextInitialized(ServletContextEvent event) {
 		CachedIntrospectionResults.acceptClassLoader(Thread.currentThread().getContextClassLoader());
 	}
 
+	@Override
 	public void contextDestroyed(ServletContextEvent event) {
 		CachedIntrospectionResults.clearClassLoader(Thread.currentThread().getContextClassLoader());
 		Introspector.flushCaches();
diff --git a/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java b/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java
index 0ca9e35d32..ad38baa0df 100644
--- a/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java
@@ -41,10 +41,12 @@ import javax.servlet.ServletContextListener;
  */
 public class Log4jConfigListener implements ServletContextListener {
 
+	@Override
 	public void contextInitialized(ServletContextEvent event) {
 		Log4jWebConfigurer.initLogging(event.getServletContext());
 	}
 
+	@Override
 	public void contextDestroyed(ServletContextEvent event) {
 		Log4jWebConfigurer.shutdownLogging(event.getServletContext());
 	}
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 f04c5f695b..7c5bd604a2 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
@@ -246,6 +246,7 @@ public abstract class UriComponents {
 			this.uriVariables = uriVariables;
 		}
 
+		@Override
 		public Object getValue(String name) {
 			if (!this.uriVariables.containsKey(name)) {
 				throw new IllegalArgumentException("Map has no value for '" + name + "'");
@@ -266,6 +267,7 @@ public abstract class UriComponents {
 			this.valueIterator = Arrays.asList(uriVariableValues).iterator();
 		}
 
+		@Override
 		public Object getValue(String name) {
 			if (!valueIterator.hasNext()) {
 				throw new IllegalArgumentException(
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 141cd7b86e..975d3f5c4b 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
@@ -611,15 +611,18 @@ public class UriComponentsBuilder {
 			this.path = new StringBuilder(path);
 		}
 
+		@Override
 		public HierarchicalUriComponents.PathComponent build() {
 			return new HierarchicalUriComponents.FullPathComponent(path.toString());
 		}
 
+		@Override
 		public PathComponentBuilder appendPath(String path) {
 			this.path.append(path);
 			return this;
 		}
 
+		@Override
 		public PathComponentBuilder appendPathSegments(String... pathSegments) {
 			PathComponentCompositeBuilder builder = new PathComponentCompositeBuilder(this);
 			builder.appendPathSegments(pathSegments);
@@ -648,16 +651,19 @@ public class UriComponentsBuilder {
 			return result;
 		}
 
+		@Override
 		public HierarchicalUriComponents.PathComponent build() {
 			return new HierarchicalUriComponents.PathSegmentComponent(pathSegments);
 		}
 
+		@Override
 		public PathComponentBuilder appendPath(String path) {
 			PathComponentCompositeBuilder builder = new PathComponentCompositeBuilder(this);
 			builder.appendPath(path);
 			return builder;
 		}
 
+		@Override
 		public PathComponentBuilder appendPathSegments(String... pathSegments) {
 			this.pathSegments.addAll(removeEmptyPathSegments(pathSegments));
 			return this;
@@ -675,6 +681,7 @@ public class UriComponentsBuilder {
 			pathComponentBuilders.add(builder);
 		}
 
+		@Override
 		public HierarchicalUriComponents.PathComponent build() {
 			List<HierarchicalUriComponents.PathComponent> pathComponents =
 					new ArrayList<HierarchicalUriComponents.PathComponent>(pathComponentBuilders.size());
@@ -685,11 +692,13 @@ public class UriComponentsBuilder {
 			return new HierarchicalUriComponents.PathComponentComposite(pathComponents);
 		}
 
+		@Override
 		public PathComponentBuilder appendPath(String path) {
 			this.pathComponentBuilders.add(new FullPathComponentBuilder(path));
 			return this;
 		}
 
+		@Override
 		public PathComponentBuilder appendPathSegments(String... pathSegments) {
 			this.pathComponentBuilders.add(new PathSegmentComponentBuilder(pathSegments));
 			return this;
@@ -702,14 +711,17 @@ public class UriComponentsBuilder {
 	 */
 	private static PathComponentBuilder NULL_PATH_COMPONENT_BUILDER = new PathComponentBuilder() {
 
+		@Override
 		public HierarchicalUriComponents.PathComponent build() {
 			return HierarchicalUriComponents.NULL_PATH_COMPONENT;
 		}
 
+		@Override
 		public PathComponentBuilder appendPath(String path) {
 			return new FullPathComponentBuilder(path);
 		}
 
+		@Override
 		public PathComponentBuilder appendPathSegments(String... pathSegments) {
 			return new PathSegmentComponentBuilder(pathSegments);
 		}
diff --git a/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java b/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
index 832ea24d31..36078f7b63 100644
--- a/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
+++ b/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java
@@ -52,10 +52,12 @@ import javax.servlet.ServletContextListener;
  */
 public class WebAppRootListener implements ServletContextListener {
 
+	@Override
 	public void contextInitialized(ServletContextEvent event) {
 		WebUtils.setWebAppRootSystemProperty(event.getServletContext());
 	}
 
+	@Override
 	public void contextDestroyed(ServletContextEvent event) {
 		WebUtils.removeWebAppRootSystemProperty(event.getServletContext());
 	}
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..d67899df6a 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
@@ -421,6 +421,7 @@ public abstract class FrameworkPortlet extends GenericPortletBean
 	 * triggering a refresh of this servlet's context-dependent state.
 	 * @param event the incoming ApplicationContext event
 	 */
+	@Override
 	public void onApplicationEvent(ContextRefreshedEvent event) {
 		this.refreshEventReceived = true;
 		onRefresh(event.getApplicationContext());
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
index 13b981b941..4febdfc9e8 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java
@@ -174,6 +174,7 @@ public abstract class GenericPortletBean extends GenericPortlet
 	 * @throws IllegalArgumentException if environment is not assignable to
 	 * {@code ConfigurableEnvironment}.
 	 */
+	@Override
 	public void setEnvironment(Environment environment) {
 		Assert.isInstanceOf(ConfigurableEnvironment.class, environment);
 		this.environment = (ConfigurableEnvironment)environment;
@@ -184,6 +185,7 @@ public abstract class GenericPortletBean extends GenericPortlet
 	 * <p>If {@code null}, a new environment will be initialized via
 	 * {@link #createEnvironment()}.
 	 */
+	@Override
 	public ConfigurableEnvironment getEnvironment() {
 		if (this.environment == null) {
 			this.environment = this.createEnvironment();
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java
index c61dd503ed..1df9110d19 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/AbstractRefreshablePortletApplicationContext.java
@@ -104,18 +104,22 @@ public abstract class AbstractRefreshablePortletApplicationContext extends Abstr
 		}
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
 
+	@Override
 	public void setPortletContext(PortletContext portletContext) {
 		this.portletContext = portletContext;
 	}
 
+	@Override
 	public PortletContext getPortletContext() {
 		return this.portletContext;
 	}
 
+	@Override
 	public void setPortletConfig(PortletConfig portletConfig) {
 		this.portletConfig = portletConfig;
 		if (portletConfig != null && this.portletContext == null) {
@@ -123,10 +127,12 @@ public abstract class AbstractRefreshablePortletApplicationContext extends Abstr
 		}
 	}
 
+	@Override
 	public PortletConfig getPortletConfig() {
 		return this.portletConfig;
 	}
 
+	@Override
 	public void setNamespace(String namespace) {
 		this.namespace = namespace;
 		if (namespace != null) {
@@ -134,6 +140,7 @@ public abstract class AbstractRefreshablePortletApplicationContext extends Abstr
 		}
 	}
 
+	@Override
 	public String getNamespace() {
 		return this.namespace;
 	}
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..e218e2938e 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
@@ -244,6 +244,7 @@ public abstract class PortletApplicationContextUtils {
 	@SuppressWarnings("serial")
 	private static class RequestObjectFactory implements ObjectFactory<PortletRequest>, Serializable {
 
+		@Override
 		public PortletRequest getObject() {
 			return currentRequestAttributes().getRequest();
 		}
@@ -261,6 +262,7 @@ public abstract class PortletApplicationContextUtils {
 	@SuppressWarnings("serial")
 	private static class SessionObjectFactory implements ObjectFactory<PortletSession>, Serializable {
 
+		@Override
 		public PortletSession getObject() {
 			return currentRequestAttributes().getRequest().getPortletSession();
 		}
@@ -278,6 +280,7 @@ public abstract class PortletApplicationContextUtils {
 	@SuppressWarnings("serial")
 	private static class WebRequestObjectFactory implements ObjectFactory<WebRequest>, Serializable {
 
+		@Override
 		public WebRequest getObject() {
 			return new PortletWebRequest(currentRequestAttributes().getRequest());
 		}
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
index 0007c187e4..d780573c15 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java
@@ -36,6 +36,7 @@ public abstract class PortletApplicationObjectSupport extends ApplicationObjectS
 	private PortletContext portletContext;
 
 
+	@Override
 	public void setPortletContext(PortletContext portletContext) {
 		this.portletContext = portletContext;
 	}
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
index b9df018158..c941c6a187 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java
@@ -69,6 +69,7 @@ public class PortletContextAwareProcessor implements BeanPostProcessor {
 	}
 
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		if (this.portletContext != null && bean instanceof PortletContextAware) {
 			((PortletContextAware) bean).setPortletContext(this.portletContext);
@@ -79,6 +80,7 @@ public class PortletContextAwareProcessor implements BeanPostProcessor {
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) {
 		return bean;
 	}
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java
index 22fe3c7dd8..492d1432e8 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java
@@ -134,6 +134,7 @@ public class PortletContextResource extends AbstractFileResolvingResource implem
 	 * but throws a FileNotFoundException if not found.
 	 * @see javax.portlet.PortletContext#getResourceAsStream(String)
 	 */
+	@Override
 	public InputStream getInputStream() throws IOException {
 		InputStream is = this.portletContext.getResourceAsStream(this.path);
 		if (is == null) {
@@ -188,10 +189,12 @@ public class PortletContextResource extends AbstractFileResolvingResource implem
 		return StringUtils.getFilename(this.path);
 	}
 
+	@Override
 	public String getDescription() {
 		return "PortletContext resource [" + this.path + "]";
 	}
 
+	@Override
 	public String getPathWithinContext() {
 		return this.path;
 	}
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
index 5dd52cfd49..e2c42a09bb 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
@@ -62,6 +62,7 @@ public class PortletContextScope implements Scope, DisposableBean {
 	}
 
 
+	@Override
 	public Object get(String name, ObjectFactory<?> objectFactory) {
 		Object scopedObject = this.portletContext.getAttribute(name);
 		if (scopedObject == null) {
@@ -71,6 +72,7 @@ public class PortletContextScope implements Scope, DisposableBean {
 		return scopedObject;
 	}
 
+	@Override
 	public Object remove(String name) {
 		Object scopedObject = this.portletContext.getAttribute(name);
 		if (scopedObject != null) {
@@ -83,14 +85,17 @@ public class PortletContextScope implements Scope, DisposableBean {
 		}
 	}
 
+	@Override
 	public void registerDestructionCallback(String name, Runnable callback) {
 		this.destructionCallbacks.put(name, callback);
 	}
 
+	@Override
 	public Object resolveContextualObject(String key) {
 		return null;
 	}
 
+	@Override
 	public String getConversationId() {
 		return null;
 	}
@@ -101,6 +106,7 @@ public class PortletContextScope implements Scope, DisposableBean {
 	 * To be called on ServletContext shutdown.
 	 * @see org.springframework.web.context.ContextCleanupListener
 	 */
+	@Override
 	public void destroy() {
 		for (Runnable runnable : this.destructionCallbacks.values()) {
 			runnable.run();
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..9c21f505fd 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
@@ -100,6 +100,7 @@ public class PortletRequestAttributes extends AbstractRequestAttributes {
 	}
 
 
+	@Override
 	public Object getAttribute(String name, int scope) {
 		if (scope == SCOPE_REQUEST) {
 			if (!isRequestActive()) {
@@ -136,6 +137,7 @@ public class PortletRequestAttributes extends AbstractRequestAttributes {
 		}
 	}
 
+	@Override
 	public void setAttribute(String name, Object value, int scope) {
 		if (scope == SCOPE_REQUEST) {
 			if (!isRequestActive()) {
@@ -161,6 +163,7 @@ public class PortletRequestAttributes extends AbstractRequestAttributes {
 		}
 	}
 
+	@Override
 	public void removeAttribute(String name, int scope) {
 		if (scope == SCOPE_REQUEST) {
 			if (isRequestActive()) {
@@ -187,6 +190,7 @@ public class PortletRequestAttributes extends AbstractRequestAttributes {
 		}
 	}
 
+	@Override
 	public String[] getAttributeNames(int scope) {
 		if (scope == SCOPE_REQUEST) {
 			if (!isRequestActive()) {
@@ -211,6 +215,7 @@ public class PortletRequestAttributes extends AbstractRequestAttributes {
 		}
 	}
 
+	@Override
 	public void registerDestructionCallback(String name, Runnable callback, int scope) {
 		if (scope == SCOPE_REQUEST) {
 			registerRequestDestructionCallback(name, callback);
@@ -220,6 +225,7 @@ public class PortletRequestAttributes extends AbstractRequestAttributes {
 		}
 	}
 
+	@Override
 	public Object resolveReference(String key) {
 		if (REFERENCE_REQUEST.equals(key)) {
 			return this.request;
@@ -232,10 +238,12 @@ public class PortletRequestAttributes extends AbstractRequestAttributes {
 		}
 	}
 
+	@Override
 	public String getSessionId() {
 		return getSession(true).getId();
 	}
 
+	@Override
 	public Object getSessionMutex() {
 		return PortletUtils.getSessionMutex(getSession(true));
 	}
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
index fe6348dd6d..76c41e96d1 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java
@@ -68,74 +68,91 @@ public class PortletWebRequest extends PortletRequestAttributes implements Nativ
 		return this.response;
 	}
 
+	@Override
 	public Object getNativeRequest() {
 		return getRequest();
 	}
 
+	@Override
 	public Object getNativeResponse() {
 		return getResponse();
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T getNativeRequest(Class<T> requiredType) {
 		return PortletUtils.getNativeRequest(getRequest(), requiredType);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T getNativeResponse(Class<T> requiredType) {
 		return PortletUtils.getNativeResponse(getResponse(), requiredType);
 	}
 
 
+	@Override
 	public String getHeader(String headerName) {
 		return getRequest().getProperty(headerName);
 	}
 
+	@Override
 	public String[] getHeaderValues(String headerName) {
 		String[] headerValues = StringUtils.toStringArray(getRequest().getProperties(headerName));
 		return (!ObjectUtils.isEmpty(headerValues) ? headerValues : null);
 	}
 
+	@Override
 	public Iterator<String> getHeaderNames() {
 		return CollectionUtils.toIterator(getRequest().getPropertyNames());
 	}
 
+	@Override
 	public String getParameter(String paramName) {
 		return getRequest().getParameter(paramName);
 	}
 
+	@Override
 	public String[] getParameterValues(String paramName) {
 		return getRequest().getParameterValues(paramName);
 	}
 
+	@Override
 	public Iterator<String> getParameterNames() {
 		return CollectionUtils.toIterator(getRequest().getParameterNames());
 	}
 
+	@Override
 	public Map<String, String[]> getParameterMap() {
 		return getRequest().getParameterMap();
 	}
 
+	@Override
 	public Locale getLocale() {
 		return getRequest().getLocale();
 	}
 
+	@Override
 	public String getContextPath() {
 		return getRequest().getContextPath();
 	}
 
+	@Override
 	public String getRemoteUser() {
 		return getRequest().getRemoteUser();
 	}
 
+	@Override
 	public Principal getUserPrincipal() {
 		return getRequest().getUserPrincipal();
 	}
 
+	@Override
 	public boolean isUserInRole(String role) {
 		return getRequest().isUserInRole(role);
 	}
 
+	@Override
 	public boolean isSecure() {
 		return getRequest().isSecure();
 	}
@@ -144,6 +161,7 @@ public class PortletWebRequest extends PortletRequestAttributes implements Nativ
 	 * Last-modified handling not supported for portlet requests:
 	 * As a consequence, this method always returns {@code false}.
 	 */
+	@Override
 	public boolean checkNotModified(long lastModifiedTimestamp) {
 		return false;
 	}
@@ -152,10 +170,12 @@ public class PortletWebRequest extends PortletRequestAttributes implements Nativ
 	 * Last-modified handling not supported for portlet requests:
 	 * As a consequence, this method always returns {@code false}.
 	 */
+	@Override
 	public boolean checkNotModified(String eTag) {
 		return false;
 	}
 
+	@Override
 	public String getDescription(boolean includeClientInfo) {
 		PortletRequest request = getRequest();
 		StringBuilder result = new StringBuilder();
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..fdd23d92c5 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
@@ -101,18 +101,22 @@ public class StaticPortletApplicationContext extends StaticApplicationContext
 		}
 	}
 
+	@Override
 	public ServletContext getServletContext() {
 		return this.servletContext;
 	}
 
+	@Override
 	public void setPortletContext(PortletContext portletContext) {
 		this.portletContext = portletContext;
 	}
 
+	@Override
 	public PortletContext getPortletContext() {
 		return this.portletContext;
 	}
 
+	@Override
 	public void setPortletConfig(PortletConfig portletConfig) {
 		this.portletConfig = portletConfig;
 		if (portletConfig != null && this.portletContext == null) {
@@ -120,10 +124,12 @@ public class StaticPortletApplicationContext extends StaticApplicationContext
 		}
 	}
 
+	@Override
 	public PortletConfig getPortletConfig() {
 		return this.portletConfig;
 	}
 
+	@Override
 	public void setNamespace(String namespace) {
 		this.namespace = namespace;
 		if (namespace != null) {
@@ -131,6 +137,7 @@ public class StaticPortletApplicationContext extends StaticApplicationContext
 		}
 	}
 
+	@Override
 	public String getNamespace() {
 		return this.namespace;
 	}
@@ -139,6 +146,7 @@ public class StaticPortletApplicationContext extends StaticApplicationContext
 	 * The {@link StaticPortletApplicationContext} class does not support this method.
 	 * @throws UnsupportedOperationException <b>always</b>
 	 */
+	@Override
 	public void setConfigLocation(String configLocation) {
 		if (configLocation != null) {
 			throw new UnsupportedOperationException("StaticPortletApplicationContext does not support config locations");
@@ -149,12 +157,14 @@ public class StaticPortletApplicationContext extends StaticApplicationContext
 	 * The {@link StaticPortletApplicationContext} class does not support this method.
 	 * @throws UnsupportedOperationException <b>always</b>
 	 */
+	@Override
 	public void setConfigLocations(String[] configLocations) {
 		if (configLocations != null) {
 			throw new UnsupportedOperationException("StaticPortletApplicationContext does not support config locations");
 		}
 	}
 
+	@Override
 	public String[] getConfigLocations() {
 		return null;
 	}
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..32a7299557 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
@@ -61,6 +61,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
@@ -124,6 +125,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
 	 * matches in case of "mappedHandlers" having been specified), then
 	 * delegates to the {@link #doResolveException} template method.
 	 */
+	@Override
 	public ModelAndView resolveException(RenderRequest request, RenderResponse response, Object handler, Exception ex) {
 		if (shouldApplyTo(request, handler)) {
 			return doResolveException(request, response, handler, ex);
@@ -133,6 +135,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
 		}
 	}
 
+	@Override
 	public ModelAndView resolveException(ResourceRequest request, ResourceResponse response, Object handler, Exception ex) {
 		if (shouldApplyTo(request, handler)) {
 			return doResolveException(request, response, handler, ex);
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..c648433cc1 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
@@ -63,6 +63,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im
 	  this.order = order;
 	}
 
+	@Override
 	public final int getOrder() {
 	  return this.order;
 	}
@@ -201,6 +202,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im
 	 * @return the corresponding handler instance, or the default handler
 	 * @see #getHandlerInternal
 	 */
+	@Override
 	public final HandlerExecutionChain getHandler(PortletRequest request) throws Exception {
 		Object handler = getHandlerInternal(request);
 		if (handler == null) {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
index 9c3bff5f2a..7b052cca12 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java
@@ -43,6 +43,7 @@ public abstract class HandlerInterceptorAdapter implements HandlerInterceptor {
 	/**
 	 * This implementation delegates to {@link #preHandle}.
 	 */
+	@Override
 	public boolean preHandleAction(ActionRequest request, ActionResponse response, Object handler)
 			throws Exception {
 
@@ -52,6 +53,7 @@ public abstract class HandlerInterceptorAdapter implements HandlerInterceptor {
 	/**
 	 * This implementation delegates to {@link #afterCompletion}.
 	 */
+	@Override
 	public void afterActionCompletion(
 			ActionRequest request, ActionResponse response, Object handler, Exception ex)
 			throws Exception {
@@ -63,6 +65,7 @@ public abstract class HandlerInterceptorAdapter implements HandlerInterceptor {
 	/**
 	 * This implementation delegates to {@link #preHandle}.
 	 */
+	@Override
 	public boolean preHandleRender(RenderRequest request, RenderResponse response, Object handler)
 			throws Exception {
 
@@ -72,6 +75,7 @@ public abstract class HandlerInterceptorAdapter implements HandlerInterceptor {
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public void postHandleRender(
 			RenderRequest request, RenderResponse response, Object handler, ModelAndView modelAndView)
 			throws Exception {
@@ -80,6 +84,7 @@ public abstract class HandlerInterceptorAdapter implements HandlerInterceptor {
 	/**
 	 * This implementation delegates to {@link #afterCompletion}.
 	 */
+	@Override
 	public void afterRenderCompletion(
 			RenderRequest request, RenderResponse response, Object handler, Exception ex)
 			throws Exception {
@@ -91,6 +96,7 @@ public abstract class HandlerInterceptorAdapter implements HandlerInterceptor {
 	/**
 	 * This implementation delegates to {@link #preHandle}.
 	 */
+	@Override
 	public boolean preHandleResource(ResourceRequest request, ResourceResponse response, Object handler)
 			throws Exception {
 
@@ -100,6 +106,7 @@ public abstract class HandlerInterceptorAdapter implements HandlerInterceptor {
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public void postHandleResource(
 			ResourceRequest request, ResourceResponse response, Object handler, ModelAndView modelAndView)
 			throws Exception {
@@ -108,6 +115,7 @@ public abstract class HandlerInterceptorAdapter implements HandlerInterceptor {
 	/**
 	 * This implementation delegates to {@link #afterCompletion}.
 	 */
+	@Override
 	public void afterResourceCompletion(
 			ResourceRequest request, ResourceResponse response, Object handler, Exception ex)
 			throws Exception {
@@ -119,6 +127,7 @@ public abstract class HandlerInterceptorAdapter implements HandlerInterceptor {
 	/**
 	 * This implementation delegates to {@link #preHandle}.
 	 */
+	@Override
 	public boolean preHandleEvent(EventRequest request, EventResponse response, Object handler)
 			throws Exception {
 
@@ -128,6 +137,7 @@ public abstract class HandlerInterceptorAdapter implements HandlerInterceptor {
 	/**
 	 * This implementation delegates to {@link #afterCompletion}.
 	 */
+	@Override
 	public void afterEventCompletion(
 			EventRequest request, EventResponse response, Object handler, Exception ex)
 			throws Exception {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
index 5ef81bb0ae..f7a884dad9 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java
@@ -63,21 +63,25 @@ public class SimplePortletHandlerAdapter implements HandlerAdapter, PortletConte
 	private PortletContext portletContext;
 
 
+	@Override
 	public void setPortletContext(PortletContext portletContext) {
 		this.portletContext = portletContext;
 	}
 
 
+	@Override
 	public boolean supports(Object handler) {
 		return (handler instanceof Portlet);
 	}
 
+	@Override
 	public void handleAction(ActionRequest request, ActionResponse response, Object handler)
 			throws Exception {
 
 		((Portlet) handler).processAction(request, response);
 	}
 
+	@Override
 	public ModelAndView handleRender(RenderRequest request, RenderResponse response, Object handler)
 			throws Exception {
 
@@ -85,6 +89,7 @@ public class SimplePortletHandlerAdapter implements HandlerAdapter, PortletConte
 		return null;
 	}
 
+	@Override
 	public ModelAndView handleResource(ResourceRequest request, ResourceResponse response, Object handler)
 			throws Exception {
 
@@ -98,6 +103,7 @@ public class SimplePortletHandlerAdapter implements HandlerAdapter, PortletConte
 		return null;
 	}
 
+	@Override
 	public void handleEvent(EventRequest request, EventResponse response, Object handler) throws Exception {
 		if (handler instanceof EventPortlet) {
 			((EventPortlet) handler).processEvent(request, response);
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
index c9cde4b1b0..62a79e4b71 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java
@@ -92,19 +92,23 @@ public class SimplePortletPostProcessor
 		this.useSharedPortletConfig = useSharedPortletConfig;
 	}
 
+	@Override
 	public void setPortletContext(PortletContext portletContext) {
 		this.portletContext = portletContext;
 	}
 
+	@Override
 	public void setPortletConfig(PortletConfig portletConfig) {
 		this.portletConfig = portletConfig;
 	}
 
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 		if (bean instanceof Portlet) {
 			PortletConfig config = this.portletConfig;
@@ -121,6 +125,7 @@ public class SimplePortletPostProcessor
 		return bean;
 	}
 
+	@Override
 	public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException {
 		if (bean instanceof Portlet) {
 			((Portlet) bean).destroy();
@@ -146,46 +151,57 @@ public class SimplePortletPostProcessor
 			this.portletConfig = portletConfig;
 		}
 
+		@Override
 		public String getPortletName() {
 			return this.portletName;
 		}
 
+		@Override
 		public PortletContext getPortletContext() {
 			return this.portletContext;
 		}
 
+		@Override
 		public String getInitParameter(String paramName) {
 			return null;
 		}
 
+		@Override
 		public Enumeration<String> getInitParameterNames() {
 			return Collections.enumeration(new HashSet<String>());
 		}
 
+		@Override
 		public ResourceBundle getResourceBundle(Locale locale) {
 			return (this.portletConfig != null ? this.portletConfig.getResourceBundle(locale) : null);
 		}
 
+		@Override
 		public Enumeration<String> getPublicRenderParameterNames() {
 			return Collections.enumeration(new HashSet<String>());
 		}
 
+		@Override
 		public String getDefaultNamespace() {
 			return XMLConstants.NULL_NS_URI;
 		}
 
+		@Override
 		public Enumeration<QName> getPublishingEventQNames() {
 			return Collections.enumeration(new HashSet<QName>());
 		}
 
+		@Override
 		public Enumeration<QName> getProcessingEventQNames() {
 			return Collections.enumeration(new HashSet<QName>());
 		}
 
+		@Override
 		public Enumeration<Locale> getSupportedLocales() {
 			return Collections.enumeration(new HashSet<Locale>());
 		}
 
+		@Override
 		public Map<String, String[]> getContainerRuntimeOptions() {
 			return (this.portletConfig != null ? this.portletConfig.getContainerRuntimeOptions() : null);
 		}
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
index 6026dd17b4..b871ed7059 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java
@@ -76,6 +76,7 @@ public class WebRequestHandlerInterceptorAdapter implements HandlerInterceptor {
 	}
 
 
+	@Override
 	public boolean preHandleAction(ActionRequest request, ActionResponse response, Object handler) throws Exception {
 		if (!this.renderPhaseOnly) {
 			this.requestInterceptor.preHandle(new PortletWebRequest(request));
@@ -83,6 +84,7 @@ public class WebRequestHandlerInterceptorAdapter implements HandlerInterceptor {
 		return true;
 	}
 
+	@Override
 	public void afterActionCompletion(
 			ActionRequest request, ActionResponse response, Object handler, Exception ex) throws Exception {
 
@@ -91,11 +93,13 @@ public class WebRequestHandlerInterceptorAdapter implements HandlerInterceptor {
 		}
 	}
 
+	@Override
 	public boolean preHandleRender(RenderRequest request, RenderResponse response, Object handler) throws Exception {
 		this.requestInterceptor.preHandle(new PortletWebRequest(request));
 		return true;
 	}
 
+	@Override
 	public void postHandleRender(
 			RenderRequest request, RenderResponse response, Object handler, ModelAndView modelAndView) throws Exception {
 
@@ -103,12 +107,14 @@ public class WebRequestHandlerInterceptorAdapter implements HandlerInterceptor {
 				(modelAndView != null && !modelAndView.wasCleared() ? modelAndView.getModelMap() : null));
 	}
 
+	@Override
 	public void afterRenderCompletion(
 			RenderRequest request, RenderResponse response, Object handler, Exception ex) throws Exception {
 
 		this.requestInterceptor.afterCompletion(new PortletWebRequest(request), ex);
 	}
 
+	@Override
 	public boolean preHandleResource(ResourceRequest request, ResourceResponse response, Object handler)
 			throws Exception {
 
@@ -116,6 +122,7 @@ public class WebRequestHandlerInterceptorAdapter implements HandlerInterceptor {
 		return true;
 	}
 
+	@Override
 	public void postHandleResource(ResourceRequest request, ResourceResponse response, Object handler, ModelAndView modelAndView)
 			throws Exception {
 
@@ -123,17 +130,20 @@ public class WebRequestHandlerInterceptorAdapter implements HandlerInterceptor {
 				(modelAndView != null ? modelAndView.getModelMap() : null));
 	}
 
+	@Override
 	public void afterResourceCompletion(ResourceRequest request, ResourceResponse response, Object handler,
 			Exception ex) throws Exception {
 
 		this.requestInterceptor.afterCompletion(new PortletWebRequest(request), ex);
 	}
 
+	@Override
 	public boolean preHandleEvent(EventRequest request, EventResponse response, Object handler) throws Exception {
 		this.requestInterceptor.preHandle(new PortletWebRequest(request));
 		return true;
 	}
 
+	@Override
 	public void afterEventCompletion(EventRequest request, EventResponse response, Object handler, Exception ex)
 			throws Exception {
 
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
index 0489721509..4e4cf8499e 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java
@@ -106,6 +106,7 @@ public class CommonsPortletMultipartResolver extends CommonsFileUploadSupport
 		return new PortletFileUpload(fileItemFactory);
 	}
 
+	@Override
 	public void setPortletContext(PortletContext portletContext) {
 		if (!isUploadTempDirSpecified()) {
 			getFileItemFactory().setRepository(PortletUtils.getTempDir(portletContext));
@@ -113,10 +114,12 @@ public class CommonsPortletMultipartResolver extends CommonsFileUploadSupport
 	}
 
 
+	@Override
 	public boolean isMultipart(ActionRequest request) {
 		return (request != null && PortletFileUpload.isMultipartContent(request));
 	}
 
+	@Override
 	public MultipartActionRequest resolveMultipart(final ActionRequest request) throws MultipartException {
 		Assert.notNull(request, "Request must not be null");
 		if (this.resolveLazily) {
@@ -177,6 +180,7 @@ public class CommonsPortletMultipartResolver extends CommonsFileUploadSupport
 		return encoding;
 	}
 
+	@Override
 	public void cleanupMultipart(MultipartActionRequest request) {
 		if (request != null) {
 			try {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
index a46f14b9b1..8ee6e40785 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java
@@ -74,14 +74,17 @@ public class DefaultMultipartActionRequest extends ActionRequestWrapper implemen
 	}
 
 
+	@Override
 	public Iterator<String> getFileNames() {
 		return getMultipartFiles().keySet().iterator();
 	}
 
+	@Override
 	public MultipartFile getFile(String name) {
 		return getMultipartFiles().getFirst(name);
 	}
 
+	@Override
 	public List<MultipartFile> getFiles(String name) {
 		List<MultipartFile> multipartFiles = getMultipartFiles().get(name);
 		if (multipartFiles != null) {
@@ -93,10 +96,12 @@ public class DefaultMultipartActionRequest extends ActionRequestWrapper implemen
 	}
 
 
+	@Override
 	public Map<String, MultipartFile> getFileMap() {
 		return getMultipartFiles().toSingleValueMap();
 	}
 
+	@Override
 	public MultiValueMap<String, MultipartFile> getMultiFileMap() {
 		return getMultipartFiles();
 	}
@@ -138,6 +143,7 @@ public class DefaultMultipartActionRequest extends ActionRequestWrapper implemen
 		return paramMap;
 	}
 
+	@Override
 	public String getMultipartContentType(String paramOrFileName) {
 		MultipartFile file = getFile(paramOrFileName);
 		if (file != null) {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
index 271906d4a2..de00d6f077 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java
@@ -180,6 +180,7 @@ public abstract class AbstractController extends PortletContentGenerator impleme
 	}
 
 
+	@Override
 	public void handleActionRequest(ActionRequest request, ActionResponse response) throws Exception {
 		// Delegate to PortletContentGenerator for checking and preparing.
 		check(request, response);
@@ -199,6 +200,7 @@ public abstract class AbstractController extends PortletContentGenerator impleme
 		handleActionRequestInternal(request, response);
 	}
 
+	@Override
 	public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception {
 		// If the portlet is minimized and we don't want to render then return null.
 		if (WindowState.MINIMIZED.equals(request.getWindowState()) && !this.renderWhenMinimized) {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java
index b6e9217d64..9aea2de865 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java
@@ -40,10 +40,12 @@ import org.springframework.web.portlet.ModelAndView;
  */
 public class PortletModeNameViewController implements Controller {
 
+	@Override
 	public void handleActionRequest(ActionRequest request, ActionResponse response) throws Exception {
 		throw new PortletException("PortletModeNameViewController does not handle action requests");
 	}
 
+	@Override
 	public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) {
 		return new ModelAndView(request.getPortletMode().toString());
 	}
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
index f8a1df3d20..9e41ffc438 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java
@@ -117,6 +117,7 @@ public class PortletWrappingController extends AbstractController
 		this.portletContext = portletContext;
 	}
 
+	@Override
 	public void setPortletConfig(PortletConfig portletConfig) {
 		this.portletConfig = portletConfig;
 	}
@@ -146,11 +147,13 @@ public class PortletWrappingController extends AbstractController
 		this.initParameters = initParameters;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		this.beanName = name;
 	}
 
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		if (this.portletClass == null) {
 			throw new IllegalArgumentException("portletClass is required");
@@ -186,6 +189,7 @@ public class PortletWrappingController extends AbstractController
 		return null;
 	}
 
+	@Override
 	public ModelAndView handleResourceRequest(
 			ResourceRequest request, ResourceResponse response) throws Exception {
 
@@ -214,6 +218,7 @@ public class PortletWrappingController extends AbstractController
 		return null;
 	}
 
+	@Override
 	public void handleEventRequest(
 			EventRequest request, EventResponse response) throws Exception {
 
@@ -242,6 +247,7 @@ public class PortletWrappingController extends AbstractController
 	}
 
 
+	@Override
 	public void destroy() {
 		this.portletInstance.destroy();
 	}
@@ -255,46 +261,57 @@ public class PortletWrappingController extends AbstractController
 	 */
 	private class DelegatingPortletConfig implements PortletConfig {
 
+		@Override
 		public String getPortletName() {
 			return portletName;
 		}
 
+		@Override
 		public PortletContext getPortletContext() {
 			return portletContext;
 		}
 
+		@Override
 		public String getInitParameter(String paramName) {
 			return initParameters.get(paramName);
 		}
 
+		@Override
 		public Enumeration<String> getInitParameterNames() {
 			return Collections.enumeration(initParameters.keySet());
 		}
 
+		@Override
 		public ResourceBundle getResourceBundle(Locale locale) {
 			return (portletConfig != null ? portletConfig.getResourceBundle(locale) : null);
 		}
 
+		@Override
 		public Enumeration<String> getPublicRenderParameterNames() {
 			return Collections.enumeration(new HashSet<String>());
 		}
 
+		@Override
 		public String getDefaultNamespace() {
 			return XMLConstants.NULL_NS_URI;
 		}
 
+		@Override
 		public Enumeration<QName> getPublishingEventQNames() {
 			return Collections.enumeration(new HashSet<QName>());
 		}
 
+		@Override
 		public Enumeration<QName> getProcessingEventQNames() {
 			return Collections.enumeration(new HashSet<QName>());
 		}
 
+		@Override
 		public Enumeration<Locale> getSupportedLocales() {
 			return Collections.enumeration(new HashSet<Locale>());
 		}
 
+		@Override
 		public Map<String, String[]> getContainerRuntimeOptions() {
 			return (portletConfig != null ? portletConfig.getContainerRuntimeOptions() : null);
 		}
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java
index 918d3ee1fc..e00710e978 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java
@@ -49,27 +49,32 @@ public class SimpleControllerHandlerAdapter implements HandlerAdapter, PortletCo
 	private PortletContext portletContext;
 
 
+	@Override
 	public void setPortletContext(PortletContext portletContext) {
 		this.portletContext = portletContext;
 	}
 
 
+	@Override
 	public boolean supports(Object handler) {
 		return (handler instanceof Controller);
 	}
 
+	@Override
 	public void handleAction(ActionRequest request, ActionResponse response, Object handler)
 			throws Exception {
 
 		((Controller) handler).handleActionRequest(request, response);
 	}
 
+	@Override
 	public ModelAndView handleRender(RenderRequest request, RenderResponse response, Object handler)
 			throws Exception {
 
 		return ((Controller) handler).handleRenderRequest(request, response);
 	}
 
+	@Override
 	public ModelAndView handleResource(ResourceRequest request, ResourceResponse response, Object handler)
 			throws Exception {
 
@@ -83,6 +88,7 @@ public class SimpleControllerHandlerAdapter implements HandlerAdapter, PortletCo
 		}
 	}
 
+	@Override
 	public void handleEvent(EventRequest request, EventResponse response, Object handler) throws Exception {
 		if (handler instanceof EventAwareController) {
 			((EventAwareController) handler).handleEventRequest(request, response);
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
index 3fa889d8b4..34cf77e22b 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
@@ -263,10 +263,12 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (beanFactory instanceof ConfigurableBeanFactory) {
 			this.beanFactory = (ConfigurableBeanFactory) beanFactory;
@@ -275,10 +277,12 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 	}
 
 
+	@Override
 	public boolean supports(Object handler) {
 		return getMethodResolver(handler).hasHandlerMethods();
 	}
 
+	@Override
 	public void handleAction(ActionRequest request, ActionResponse response, Object handler) throws Exception {
 		Object returnValue = doHandle(request, response, handler);
 		if (returnValue != null) {
@@ -286,16 +290,19 @@ public class AnnotationMethodHandlerAdapter extends PortletContentGenerator
 		}
 	}
 
+	@Override
 	public ModelAndView handleRender(RenderRequest request, RenderResponse response, Object handler) throws Exception {
 		checkAndPrepare(request, response);
 		return doHandle(request, response, handler);
 	}
 
+	@Override
 	public ModelAndView handleResource(ResourceRequest request, ResourceResponse response, Object handler) throws Exception {
 		checkAndPrepare(request, response);
 		return doHandle(request, response, handler);
 	}
 
+	@Override
 	public void handleEvent(EventRequest request, EventResponse response, Object handler) throws Exception {
 		Object returnValue = doHandle(request, response, handler);
 		if (returnValue != null) {
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
index 37125cde89..579ef82388 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
@@ -153,6 +153,7 @@ public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExc
 		final Map<Class<? extends Throwable>, Method> matchedHandlers = new HashMap<Class<? extends Throwable>, Method>();
 
 		ReflectionUtils.doWithMethods(handlerType, new ReflectionUtils.MethodCallback() {
+			@Override
 			public void doWith(Method method) {
 				method = ClassUtils.getMostSpecificMethod(method, handlerType);
 				List<Class<? extends Throwable>> handledExceptions = getHandledExceptions(method);
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
index 7558a92bec..9b77f6d0bf 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
@@ -148,6 +148,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
 		handlerTypes.addAll(Arrays.asList(handlerType.getInterfaces()));
 		for (Class<?> currentHandlerType : handlerTypes) {
 			ReflectionUtils.doWithMethods(currentHandlerType, new ReflectionUtils.MethodCallback() {
+				@Override
 				public void doWith(Method method) {
 					PortletRequestMappingPredicate predicate = null;
 					String[] modeKeys = new String[0];
@@ -229,6 +230,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
 			this.params = params;
 		}
 
+		@Override
 		public boolean match(PortletRequest request) {
 			return PortletAnnotationMappingUtils.checkParameters(this.params, request);
 		}
@@ -262,6 +264,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
 			}
 		}
 
+		@Override
 		public void validate(PortletRequest request) throws PortletException {
 			if (!PortletAnnotationMappingUtils.checkHeaders(this.headers, request)) {
 				throw new PortletRequestBindingException("Header conditions \"" +
@@ -279,6 +282,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
 			}
 		}
 
+		@Override
 		public int compareTo(Object other) {
 			return (other instanceof SpecialRequestTypePredicate ? -1 : compareParams(other));
 		}
@@ -291,9 +295,11 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
 			super(params);
 		}
 
+		@Override
 		public void validate(PortletRequest request) throws PortletException {
 		}
 
+		@Override
 		public int compareTo(Object other) {
 			return (other instanceof SpecialRequestTypePredicate ? 1 : compareParams(other));
 		}
@@ -316,9 +322,11 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
 					super.match(request));
 		}
 
+		@Override
 		public void validate(PortletRequest request) {
 		}
 
+		@Override
 		public int compareTo(Object other) {
 			if (other instanceof TypeLevelMappingPredicate) {
 				return 1;
@@ -358,9 +366,11 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
 					super.match(request));
 		}
 
+		@Override
 		public void validate(PortletRequest request) {
 		}
 
+		@Override
 		public int compareTo(Object other) {
 			if (other instanceof TypeLevelMappingPredicate) {
 				return 1;
@@ -392,14 +402,17 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
 			this.resourceId = resourceId;
 		}
 
+		@Override
 		public boolean match(PortletRequest request) {
 			return (PortletRequest.RESOURCE_PHASE.equals(request.getAttribute(PortletRequest.LIFECYCLE_PHASE)) &&
 					("".equals(this.resourceId) || this.resourceId.equals(((ResourceRequest) request).getResourceID())));
 		}
 
+		@Override
 		public void validate(PortletRequest request) {
 		}
 
+		@Override
 		public int compareTo(Object other) {
 			if (other instanceof ResourceMappingPredicate) {
 				boolean hasResourceId = !"".equals(this.resourceId);
@@ -424,6 +437,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
 			this.eventName = eventName;
 		}
 
+		@Override
 		public boolean match(PortletRequest request) {
 			if (!PortletRequest.EVENT_PHASE.equals(request.getAttribute(PortletRequest.LIFECYCLE_PHASE))) {
 				return false;
@@ -435,9 +449,11 @@ public class DefaultAnnotationHandlerMapping extends AbstractMapBasedHandlerMapp
 			return (this.eventName.equals(event.getName()) || this.eventName.equals(event.getQName().toString()));
 		}
 
+		@Override
 		public void validate(PortletRequest request) {
 		}
 
+		@Override
 		public int compareTo(Object other) {
 			if (other instanceof EventMappingPredicate) {
 				boolean hasEventName = !"".equals(this.eventName);
diff --git a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/AbstractSpringPreparerFactory.java b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/AbstractSpringPreparerFactory.java
index eaa6d58bc2..e86e9cf5ac 100644
--- a/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/AbstractSpringPreparerFactory.java
+++ b/spring-webmvc-tiles3/src/main/java/org/springframework/web/servlet/view/tiles3/AbstractSpringPreparerFactory.java
@@ -37,6 +37,7 @@ import org.springframework.web.servlet.view.tiles2.SpringBeanPreparerFactory;
  */
 public abstract class AbstractSpringPreparerFactory implements PreparerFactory {
 
+	@Override
 	public ViewPreparer getPreparer(String name, Request context) {
 		WebApplicationContext webApplicationContext = (WebApplicationContext) context.getContext("request").get(
 				DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE);
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 f01f25dd1a..b18c89f932 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
@@ -236,6 +236,7 @@ public class TilesConfigurer implements ServletContextAware, InitializingBean, D
 		this.useMutableTilesContainer = useMutableTilesContainer;
 	}
 
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
@@ -245,6 +246,7 @@ public class TilesConfigurer implements ServletContextAware, InitializingBean, D
 	 * delegating to the TilesInitializer.
 	 * @throws TilesException in case of setup failure
 	 */
+	@Override
 	public void afterPropertiesSet() throws TilesException {
 
 		SpringWildcardServletTilesApplicationContext preliminaryContext =
@@ -272,6 +274,7 @@ public class TilesConfigurer implements ServletContextAware, InitializingBean, D
 	 * Removes the TilesContainer from this web application.
 	 * @throws TilesException in case of cleanup failure
 	 */
+	@Override
 	public void destroy() throws TilesException {
 		this.tilesInitializer.destroy();
 	}
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 6483616edb..43994b9d49 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
@@ -1021,6 +1021,7 @@ public class DispatcherServlet extends FrameworkServlet {
 	@Override
 	protected LocaleContext buildLocaleContext(final HttpServletRequest request) {
 		return new LocaleContext() {
+			@Override
 			public Locale getLocale() {
 				return localeResolver.resolveLocale(request);
 			}
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..1e5d4ec88b 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
@@ -135,6 +135,7 @@ public final class FlashMap extends HashMap<String, Object> implements Comparabl
 	 * path or has more target URL parameters. Before comparing FlashMap
 	 * instances ensure that they match a given request.
 	 */
+	@Override
 	public int compareTo(FlashMap other) {
 		int thisUrlPath = (this.targetRequestPath != null) ? 1 : 0;
 		int otherUrlPath = (other.targetRequestPath != null) ? 1 : 0;
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 ca2a919043..cb08d3e627 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
@@ -1054,6 +1054,7 @@ public abstract class FrameworkServlet extends HttpServletBean {
 	 */
 	private class ContextRefreshListener implements ApplicationListener<ContextRefreshedEvent> {
 
+		@Override
 		public void onApplicationEvent(ContextRefreshedEvent event) {
 			FrameworkServlet.this.onApplicationEvent(event);
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
index 044b56d2ae..998a2ff6bd 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HttpServletBean.java
@@ -189,6 +189,7 @@ public abstract class HttpServletBean extends HttpServlet
 	 * @throws IllegalArgumentException if environment is not assignable to
 	 * {@code ConfigurableWebEnvironment}.
 	 */
+	@Override
 	public void setEnvironment(Environment environment) {
 		Assert.isInstanceOf(ConfigurableWebEnvironment.class, environment);
 		this.environment = (ConfigurableWebEnvironment)environment;
@@ -199,6 +200,7 @@ public abstract class HttpServletBean extends HttpServlet
 	 * <p>If {@code null}, a new environment will be initialized via
 	 * {@link #createEnvironment()}.
 	 */
+	@Override
 	public ConfigurableWebEnvironment getEnvironment() {
 		if (this.environment == null) {
 			this.environment = this.createEnvironment();
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 9d409a3fec..c072fa1673 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
@@ -142,6 +142,7 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
 	private static boolean romePresent =
 			ClassUtils.isPresent("com.sun.syndication.feed.WireFeed", AnnotationDrivenBeanDefinitionParser.class.getClassLoader());
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		Object source = parserContext.extractSource(element);
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java
index d842b4d689..42f1dca52d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java
@@ -43,6 +43,7 @@ import org.springframework.web.servlet.resource.DefaultServletHttpRequestHandler
  */
 class DefaultServletHandlerBeanDefinitionParser implements BeanDefinitionParser {
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		Object source = parserContext.extractSource(element);
 
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..05e4c8bf32 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
@@ -38,6 +38,7 @@ import org.w3c.dom.Element;
  */
 class InterceptorsBeanDefinitionParser implements BeanDefinitionParser {
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		CompositeComponentDefinition compDefinition = new CompositeComponentDefinition(element.getTagName(), parserContext.extractSource(element));
 		parserContext.pushContainingComponent(compDefinition);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
index d1d887700b..9c099ede53 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
@@ -28,6 +28,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  */
 public class MvcNamespaceHandler extends NamespaceHandlerSupport {
 
+	@Override
 	public void init() {
 		registerBeanDefinitionParser("annotation-driven", new AnnotationDrivenBeanDefinitionParser());
 		registerBeanDefinitionParser("default-servlet-handler", new DefaultServletHandlerBeanDefinitionParser());
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 97df07e544..39558faa60 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
@@ -45,6 +45,7 @@ import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
  */
 class ResourcesBeanDefinitionParser implements BeanDefinitionParser {
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		Object source = parserContext.extractSource(element);
 
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..82e455c7a4 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
@@ -43,6 +43,7 @@ class ViewControllerBeanDefinitionParser implements BeanDefinitionParser {
 		"org.springframework.web.servlet.config.viewControllerHandlerMapping";
 
 
+	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		Object source = parserContext.extractSource(element);
 
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 e85f189126..076147c0e5 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
@@ -173,6 +173,7 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
 	 * Set the {@link javax.servlet.ServletContext}, e.g. for resource handling,
 	 * looking up file extensions, etc.
 	 */
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
@@ -180,6 +181,7 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
 	/**
 	 * Set the Spring {@link ApplicationContext}, e.g. for resource loading.
 	 */
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		this.applicationContext = applicationContext;
 	}
@@ -432,9 +434,11 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
 			}
 			else {
 				validator = new 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/WebMvcConfigurerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java
index ac63b1cbca..abf8217f13 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
@@ -39,6 +39,7 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
+	@Override
 	public void addFormatters(FormatterRegistry registry) {
 	}
 
@@ -46,6 +47,7 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
+	@Override
 	public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
 	}
 
@@ -53,6 +55,7 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
 	 * {@inheritDoc}
 	 * <p>This implementation returns {@code null}
 	 */
+	@Override
 	public Validator getValidator() {
 		return null;
 	}
@@ -61,6 +64,7 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
+	@Override
 	public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
 	}
 
@@ -68,6 +72,7 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
+	@Override
 	public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
 	}
 
@@ -75,6 +80,7 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
+	@Override
 	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
 	}
 
@@ -82,6 +88,7 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
+	@Override
 	public void addReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnValueHandlers) {
 	}
 
@@ -89,6 +96,7 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
+	@Override
 	public void configureHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
 	}
 
@@ -96,6 +104,7 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
+	@Override
 	public MessageCodesResolver getMessageCodesResolver() {
 		return null;
 	}
@@ -104,6 +113,7 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
+	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 	}
 
@@ -111,6 +121,7 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
+	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {
 	}
 
@@ -118,6 +129,7 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
+	@Override
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
 	}
 
@@ -125,6 +137,7 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer {
 	 * {@inheritDoc}
 	 * <p>This implementation is empty.
 	 */
+	@Override
 	public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
 	}
 
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..05461d5013 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
@@ -43,72 +43,84 @@ class WebMvcConfigurerComposite implements WebMvcConfigurer {
 		}
 	}
 
+	@Override
 	public void addFormatters(FormatterRegistry registry) {
 		for (WebMvcConfigurer delegate : this.delegates) {
 			delegate.addFormatters(registry);
 		}
 	}
 
+	@Override
 	public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
 		for (WebMvcConfigurer delegate : this.delegates) {
 			delegate.configureContentNegotiation(configurer);
 		}
 	}
 
+	@Override
 	public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
 		for (WebMvcConfigurer delegate : this.delegates) {
 			delegate.configureAsyncSupport(configurer);
 		}
 	}
 
+	@Override
 	public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
 		for (WebMvcConfigurer delegate : this.delegates) {
 			delegate.configureMessageConverters(converters);
 		}
 	}
 
+	@Override
 	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
 		for (WebMvcConfigurer delegate : this.delegates) {
 			delegate.addArgumentResolvers(argumentResolvers);
 		}
 	}
 
+	@Override
 	public void addReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnValueHandlers) {
 		for (WebMvcConfigurer delegate : this.delegates) {
 			delegate.addReturnValueHandlers(returnValueHandlers);
 		}
 	}
 
+	@Override
 	public void configureHandlerExceptionResolvers(List<HandlerExceptionResolver> exceptionResolvers) {
 		for (WebMvcConfigurer delegate : this.delegates) {
 			delegate.configureHandlerExceptionResolvers(exceptionResolvers);
 		}
 	}
 
+	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		for (WebMvcConfigurer delegate : this.delegates) {
 			delegate.addInterceptors(registry);
 		}
 	}
 
+	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {
 		for (WebMvcConfigurer delegate : this.delegates) {
 			delegate.addViewControllers(registry);
 		}
 	}
 
+	@Override
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
 		for (WebMvcConfigurer delegate : this.delegates) {
 			delegate.addResourceHandlers(registry);
 		}
 	}
 
+	@Override
 	public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
 		for (WebMvcConfigurer delegate : this.delegates) {
 			delegate.configureDefaultServletHandling(configurer);
 		}
 	}
 
+	@Override
 	public Validator getValidator() {
 		List<Validator> candidates = new ArrayList<Validator>();
 		for (WebMvcConfigurer configurer : this.delegates) {
@@ -133,6 +145,7 @@ class WebMvcConfigurerComposite implements WebMvcConfigurer {
 		}
 	}
 
+	@Override
 	public MessageCodesResolver getMessageCodesResolver() {
 		List<MessageCodesResolver> candidates = new ArrayList<MessageCodesResolver>();
 		for (WebMvcConfigurer configurer : this.delegates) {
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..7020b27118 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
@@ -64,6 +64,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
@@ -123,6 +124,7 @@ public abstract class AbstractHandlerExceptionResolver implements HandlerExcepti
 	 * in case of "mappedHandlers" having been specified), then delegates to the
 	 * {@link #doResolveException} template method.
 	 */
+	@Override
 	public ModelAndView resolveException(HttpServletRequest request, HttpServletResponse response,
 			Object handler, Exception ex) {
 
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 ea079c4938..2fcd479401 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
@@ -82,6 +82,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 	  this.order = order;
 	}
 
+	@Override
 	public final int getOrder() {
 	  return this.order;
 	}
@@ -293,6 +294,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
 	 * @return the corresponding handler instance, or the default handler
 	 * @see #getHandlerInternal
 	 */
+	@Override
 	public final HandlerExecutionChain getHandler(HttpServletRequest request) throws Exception {
 		Object handler = getHandlerInternal(request);
 		if (handler == null) {
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 28fbe1efbc..97d7370ee2 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
@@ -83,6 +83,7 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
 	/**
 	 * Detects handler methods at initialization.
 	 */
+	@Override
 	public void afterPropertiesSet() {
 		initHandlerMethods();
 	}
@@ -135,6 +136,7 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
 		final Class<?> userType = ClassUtils.getUserClass(handlerType);
 
 		Set<Method> methods = HandlerMethodSelector.selectMethods(userType, new MethodFilter() {
+			@Override
 			public boolean matches(Method method) {
 				return getMappingForMethod(method, userType) != null;
 			}
@@ -352,6 +354,7 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
 			this.comparator = comparator;
 		}
 
+		@Override
 		public int compare(Match match1, Match match2) {
 			return this.comparator.compare(match1.mapping, match2.mapping);
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
index 8716f20cef..bcf6090121 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java
@@ -42,6 +42,7 @@ public class HandlerExceptionResolverComposite implements HandlerExceptionResolv
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
@@ -64,6 +65,7 @@ public class HandlerExceptionResolverComposite implements HandlerExceptionResolv
 	 * Resolve the exception by iterating over the list of configured exception resolvers.
 	 * The first one to return a ModelAndView instance wins. Otherwise {@code null} is returned.
 	 */
+	@Override
 	public ModelAndView resolveException(HttpServletRequest request,
 										 HttpServletResponse response,
 										 Object handler,
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
index c721327101..602886ba29 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerInterceptorAdapter.java
@@ -34,6 +34,7 @@ public abstract class HandlerInterceptorAdapter implements AsyncHandlerIntercept
 	/**
 	 * This implementation always returns {@code true}.
 	 */
+	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
 		throws Exception {
 		return true;
@@ -42,6 +43,7 @@ public abstract class HandlerInterceptorAdapter implements AsyncHandlerIntercept
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public void postHandle(
 			HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView)
 			throws Exception {
@@ -50,6 +52,7 @@ public abstract class HandlerInterceptorAdapter implements AsyncHandlerIntercept
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public void afterCompletion(
 			HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
 			throws Exception {
@@ -58,6 +61,7 @@ public abstract class HandlerInterceptorAdapter implements AsyncHandlerIntercept
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public void afterConcurrentHandlingStarted(
 			HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
index e72e011c7a..e19ebe57f0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java
@@ -53,10 +53,12 @@ import org.springframework.web.servlet.ModelAndView;
  */
 public class SimpleServletHandlerAdapter implements HandlerAdapter {
 
+	@Override
 	public boolean supports(Object handler) {
 		return (handler instanceof Servlet);
 	}
 
+	@Override
 	public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
 
@@ -64,6 +66,7 @@ public class SimpleServletHandlerAdapter implements HandlerAdapter {
 		return null;
 	}
 
+	@Override
 	public long getLastModified(HttpServletRequest request, Object handler) {
 		return -1;
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
index 663786ff29..49e2e3c813 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java
@@ -86,19 +86,23 @@ public class SimpleServletPostProcessor implements
 		this.useSharedServletConfig = useSharedServletConfig;
 	}
 
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
 
+	@Override
 	public void setServletConfig(ServletConfig servletConfig) {
 		this.servletConfig = servletConfig;
 	}
 
 
+	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
 		return bean;
 	}
 
+	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
 		if (bean instanceof Servlet) {
 			ServletConfig config = this.servletConfig;
@@ -115,6 +119,7 @@ public class SimpleServletPostProcessor implements
 		return bean;
 	}
 
+	@Override
 	public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException {
 		if (bean instanceof Servlet) {
 			((Servlet) bean).destroy();
@@ -137,18 +142,22 @@ public class SimpleServletPostProcessor implements
 			this.servletContext = servletContext;
 		}
 
+		@Override
 		public String getServletName() {
 			return this.servletName;
 		}
 
+		@Override
 		public ServletContext getServletContext() {
 			return this.servletContext;
 		}
 
+		@Override
 		public String getInitParameter(String paramName) {
 			return null;
 		}
 
+		@Override
 		public Enumeration<String> getInitParameterNames() {
 			return Collections.enumeration(new HashSet<String>());
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
index 8e70a48fa4..69a199ab24 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
@@ -49,6 +49,7 @@ public class WebRequestHandlerInterceptorAdapter implements AsyncHandlerIntercep
 	}
 
 
+	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
 
@@ -56,6 +57,7 @@ public class WebRequestHandlerInterceptorAdapter implements AsyncHandlerIntercep
 		return true;
 	}
 
+	@Override
 	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView)
 			throws Exception {
 
@@ -63,12 +65,14 @@ public class WebRequestHandlerInterceptorAdapter implements AsyncHandlerIntercep
 				(modelAndView != null && !modelAndView.wasCleared() ? modelAndView.getModelMap() : null));
 	}
 
+	@Override
 	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
 			throws Exception {
 
 		this.requestInterceptor.afterCompletion(new DispatcherServletWebRequest(request, response), ex);
 	}
 
+	@Override
 	public void afterConcurrentHandlingStarted(HttpServletRequest request, HttpServletResponse response, Object handler) {
 		if (this.requestInterceptor instanceof AsyncWebRequestInterceptor) {
 			AsyncWebRequestInterceptor asyncInterceptor = (AsyncWebRequestInterceptor) this.requestInterceptor;
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..b736a94575 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
@@ -37,10 +37,12 @@ import org.springframework.web.servlet.LocaleResolver;
  */
 public class AcceptHeaderLocaleResolver implements LocaleResolver {
 
+	@Override
 	public Locale resolveLocale(HttpServletRequest request) {
 		return request.getLocale();
 	}
 
+	@Override
 	public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) {
 		throw new UnsupportedOperationException(
 				"Cannot change HTTP accept header - use a different locale resolution strategy");
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
index 94c7d03723..007090ad17 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java
@@ -89,6 +89,7 @@ public class CookieLocaleResolver extends CookieGenerator implements LocaleResol
 	}
 
 
+	@Override
 	public Locale resolveLocale(HttpServletRequest request) {
 		// Check request for pre-parsed or preset locale.
 		Locale locale = (Locale) request.getAttribute(LOCALE_REQUEST_ATTRIBUTE_NAME);
@@ -112,6 +113,7 @@ public class CookieLocaleResolver extends CookieGenerator implements LocaleResol
 		return determineDefaultLocale(request);
 	}
 
+	@Override
 	public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) {
 		if (locale != null) {
 			// Set request attribute and add cookie.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
index f56590f469..e7397c0a1d 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java
@@ -52,6 +52,7 @@ public class FixedLocaleResolver extends AbstractLocaleResolver {
 	}
 
 
+	@Override
 	public Locale resolveLocale(HttpServletRequest request) {
 		Locale locale = getDefaultLocale();
 		if (locale == null) {
@@ -60,6 +61,7 @@ public class FixedLocaleResolver extends AbstractLocaleResolver {
 		return locale;
 	}
 
+	@Override
 	public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) {
 		throw new UnsupportedOperationException(
 				"Cannot change fixed locale - use a different locale resolution strategy");
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..07ba5fc970 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
@@ -52,6 +52,7 @@ public class SessionLocaleResolver extends AbstractLocaleResolver {
 	public static final String LOCALE_SESSION_ATTRIBUTE_NAME = SessionLocaleResolver.class.getName() + ".LOCALE";
 
 
+	@Override
 	public Locale resolveLocale(HttpServletRequest request) {
 		Locale locale = (Locale) WebUtils.getSessionAttribute(request, LOCALE_SESSION_ATTRIBUTE_NAME);
 		if (locale == null) {
@@ -78,6 +79,7 @@ public class SessionLocaleResolver extends AbstractLocaleResolver {
 		return defaultLocale;
 	}
 
+	@Override
 	public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) {
 		WebUtils.setSessionAttribute(request, LOCALE_SESSION_ATTRIBUTE_NAME, locale);
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
index a0ef16cc32..ec2c81639b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java
@@ -133,6 +133,7 @@ public abstract class AbstractController extends WebContentGenerator implements
 	}
 
 
+	@Override
 	public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response)
 			throws Exception {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java
index fd8650420c..93222d9697 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java
@@ -39,10 +39,12 @@ import org.springframework.web.servlet.ModelAndView;
  */
 public class HttpRequestHandlerAdapter implements HandlerAdapter {
 
+	@Override
 	public boolean supports(Object handler) {
 		return (handler instanceof HttpRequestHandler);
 	}
 
+	@Override
 	public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
 
@@ -50,6 +52,7 @@ public class HttpRequestHandlerAdapter implements HandlerAdapter {
 		return null;
 	}
 
+	@Override
 	public long getLastModified(HttpServletRequest request, Object handler) {
 		if (handler instanceof LastModified) {
 			return ((LastModified) handler).getLastModified(request);
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..73fc89bd51 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
@@ -101,6 +101,7 @@ public class ServletForwardingController extends AbstractController implements B
 		this.servletName = servletName;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		this.beanName = name;
 		if (this.servletName == null) {
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..27700fee32 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
@@ -123,6 +123,7 @@ public class ServletWrappingController extends AbstractController
 		this.initParameters = initParameters;
 	}
 
+	@Override
 	public void setBeanName(String name) {
 		this.beanName = name;
 	}
@@ -132,6 +133,7 @@ public class ServletWrappingController extends AbstractController
 	 * Initialize the wrapped Servlet instance.
 	 * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
 	 */
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		if (this.servletClass == null) {
 			throw new IllegalArgumentException("servletClass is required");
@@ -165,6 +167,7 @@ public class ServletWrappingController extends AbstractController
 	 * Destroy the wrapped Servlet instance.
 	 * @see javax.servlet.Servlet#destroy()
 	 */
+	@Override
 	public void destroy() {
 		this.servletInstance.destroy();
 	}
@@ -177,18 +180,22 @@ public class ServletWrappingController extends AbstractController
 	 */
 	private class DelegatingServletConfig implements ServletConfig {
 
+		@Override
 		public String getServletName() {
 			return servletName;
 		}
 
+		@Override
 		public ServletContext getServletContext() {
 			return ServletWrappingController.this.getServletContext();
 		}
 
+		@Override
 		public String getInitParameter(String paramName) {
 			return initParameters.getProperty(paramName);
 		}
 
+		@Override
 		public Enumeration getInitParameterNames() {
 			return initParameters.keys();
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java
index 6577e2997c..76b70a1f06 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java
@@ -38,16 +38,19 @@ import org.springframework.web.servlet.ModelAndView;
  */
 public class SimpleControllerHandlerAdapter implements HandlerAdapter {
 
+	@Override
 	public boolean supports(Object handler) {
 		return (handler instanceof Controller);
 	}
 
+	@Override
 	public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
 
 		return ((Controller) handler).handleRequest(request, response);
 	}
 
+	@Override
 	public long getLastModified(HttpServletRequest request, Object handler) {
 		if (handler instanceof LastModified) {
 			return ((LastModified) handler).getLastModified(request);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
index 50a20e51b9..5eae702cd5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java
@@ -137,6 +137,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle
 	}
 
 
+	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
 		throws ServletException {
 
@@ -189,6 +190,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public void postHandle(
 			HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView)
 			throws Exception {
@@ -197,6 +199,7 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle
 	/**
 	 * This implementation is empty.
 	 */
+	@Override
 	public void afterCompletion(
 			HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
 			throws Exception {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
index f62226435d..9e4baa213c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
@@ -378,10 +378,12 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
 
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (beanFactory instanceof ConfigurableBeanFactory) {
 			this.beanFactory = (ConfigurableBeanFactory) beanFactory;
@@ -390,10 +392,12 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 	}
 
 
+	@Override
 	public boolean supports(Object handler) {
 		return getMethodResolver(handler).hasHandlerMethods();
 	}
 
+	@Override
 	public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
 
@@ -452,6 +456,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 	 * to check it, and return {@code null} if that returns {@code true}.
 	 * @see org.springframework.web.context.request.WebRequest#checkNotModified(long)
 	 */
+	@Override
 	public long getLastModified(HttpServletRequest request, Object handler) {
 		return -1;
 	}
@@ -1210,6 +1215,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
 			this.request = new ServletServerHttpRequest(request);
 		}
 
+		@Override
 		public int compare(RequestSpecificMappingInfo info1, RequestSpecificMappingInfo info2) {
 			int pathComparison = pathComparator.compare(info1.bestMatchedPattern(), info2.bestMatchedPattern());
 			if (pathComparison != 0) {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
index d204e33e89..1450d8a968 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java
@@ -177,6 +177,7 @@ public class AnnotationMethodHandlerExceptionResolver extends AbstractHandlerExc
 		final Map<Class<? extends Throwable>, Method> matchedHandlers = new HashMap<Class<? extends Throwable>, Method>();
 
 		ReflectionUtils.doWithMethods(handlerType, new ReflectionUtils.MethodCallback() {
+			@Override
 			public void doWith(Method method) {
 				method = ClassUtils.getMostSpecificMethod(method, handlerType);
 				List<Class<? extends Throwable>> handledExceptions = getHandledExceptions(method);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
index f7f1c163d8..557992e211 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/DefaultAnnotationHandlerMapping.java
@@ -177,6 +177,7 @@ public class DefaultAnnotationHandlerMapping extends AbstractDetectingUrlHandler
 		handlerTypes.addAll(Arrays.asList(handlerType.getInterfaces()));
 		for (Class<?> currentHandlerType : handlerTypes) {
 			ReflectionUtils.doWithMethods(currentHandlerType, new ReflectionUtils.MethodCallback() {
+				@Override
 				public void doWith(Method method) {
 					RequestMapping mapping = AnnotationUtils.findAnnotation(method, RequestMapping.class);
 					if (mapping != null) {
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 15aee22ec2..7e99bbda92 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
@@ -56,10 +56,12 @@ abstract class AbstractMediaTypeExpression implements Comparable<AbstractMediaTy
 		isNegated = negated;
 	}
 
+	@Override
 	public MediaType getMediaType() {
 		return mediaType;
 	}
 
+	@Override
 	public boolean isNegated() {
 		return isNegated;
 	}
@@ -76,6 +78,7 @@ abstract class AbstractMediaTypeExpression implements Comparable<AbstractMediaTy
 
 	protected abstract boolean matchMediaType(HttpServletRequest request) throws HttpMediaTypeException;
 
+	@Override
 	public int compareTo(AbstractMediaTypeExpression other) {
 		return MediaType.SPECIFICITY_COMPARATOR.compare(this.getMediaType(), other.getMediaType());
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
index 3915ffc761..74c18e86cc 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java
@@ -49,14 +49,17 @@ abstract class AbstractNameValueExpression<T> implements NameValueExpression<T>
 		}
 	}
 
+	@Override
 	public String getName() {
 		return this.name;
 	}
 
+	@Override
 	public T getValue() {
 		return this.value;
 	}
 
+	@Override
 	public boolean isNegated() {
 		return this.isNegated;
 	}
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..1f6befcbac 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
@@ -106,6 +106,7 @@ public class CompositeRequestCondition extends AbstractRequestCondition<Composit
 	 * If both instances have conditions, combine the individual conditions
 	 * after ensuring they are of the same type and number.
 	 */
+	@Override
 	public CompositeRequestCondition combine(CompositeRequestCondition other) {
 		if (isEmpty() && other.isEmpty()) {
 			return this;
@@ -137,6 +138,7 @@ public class CompositeRequestCondition extends AbstractRequestCondition<Composit
 	 * resulting "matching" condition instances.
 	 * <p>An empty {@code CompositeRequestCondition} matches to all requests.
 	 */
+	@Override
 	public CompositeRequestCondition getMatchingCondition(HttpServletRequest request) {
 		if (isEmpty()) {
 			return this;
@@ -155,6 +157,7 @@ public class CompositeRequestCondition extends AbstractRequestCondition<Composit
 	 * If one instance is empty, the other "wins". If both instances have
 	 * conditions, compare them in the order in which they were provided.
 	 */
+	@Override
 	public int compareTo(CompositeRequestCondition other, HttpServletRequest request) {
 		if (isEmpty() && other.isEmpty()) {
 			return 0;
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..934c20b74d 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
@@ -140,6 +140,7 @@ public final class ConsumesRequestCondition extends AbstractRequestCondition<Con
 	 * instance otherwise. Practically that means a method-level "consumes"
 	 * overrides a type-level "consumes" condition.
 	 */
+	@Override
 	public ConsumesRequestCondition combine(ConsumesRequestCondition other) {
 		return !other.expressions.isEmpty() ? other : this;
 	}
@@ -156,6 +157,7 @@ public final class ConsumesRequestCondition extends AbstractRequestCondition<Con
 	 * 		or a new condition with matching expressions only;
 	 * 		or {@code null} if no expressions match.
 	 */
+	@Override
 	public ConsumesRequestCondition getMatchingCondition(HttpServletRequest request) {
 		if (isEmpty()) {
 			return this;
@@ -182,6 +184,7 @@ public final class ConsumesRequestCondition extends AbstractRequestCondition<Con
 	 * {@link #getMatchingCondition(HttpServletRequest)} and each instance contains
 	 * the matching consumable media type expression only or is otherwise empty.
 	 */
+	@Override
 	public int compareTo(ConsumesRequestCondition other, HttpServletRequest request) {
 		if (this.expressions.isEmpty() && other.expressions.isEmpty()) {
 			return 0;
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..78e845bb17 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
@@ -91,6 +91,7 @@ public final class HeadersRequestCondition extends AbstractRequestCondition<Head
 	 * Returns a new instance with the union of the header expressions
 	 * from "this" and the "other" instance.
 	 */
+	@Override
 	public HeadersRequestCondition combine(HeadersRequestCondition other) {
 		Set<HeaderExpression> set = new LinkedHashSet<HeaderExpression>(this.expressions);
 		set.addAll(other.expressions);
@@ -101,6 +102,7 @@ public final class HeadersRequestCondition extends AbstractRequestCondition<Head
 	 * Returns "this" instance if the request matches all expressions;
 	 * or {@code null} otherwise.
 	 */
+	@Override
 	public HeadersRequestCondition getMatchingCondition(HttpServletRequest request) {
 		for (HeaderExpression expression : expressions) {
 			if (!expression.match(request)) {
@@ -122,6 +124,7 @@ public final class HeadersRequestCondition extends AbstractRequestCondition<Head
 	 * {@link #getMatchingCondition(HttpServletRequest)} and each instance
 	 * contains the matching header expression only or is otherwise empty.
 	 */
+	@Override
 	public int compareTo(HeadersRequestCondition other, HttpServletRequest request) {
 		return other.expressions.size() - this.expressions.size();
 	}
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..dac9b38a6f 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
@@ -82,6 +82,7 @@ public final class ParamsRequestCondition extends AbstractRequestCondition<Param
 	 * Returns a new instance with the union of the param expressions
 	 * from "this" and the "other" instance.
 	 */
+	@Override
 	public ParamsRequestCondition combine(ParamsRequestCondition other) {
 		Set<ParamExpression> set = new LinkedHashSet<ParamExpression>(this.expressions);
 		set.addAll(other.expressions);
@@ -92,6 +93,7 @@ public final class ParamsRequestCondition extends AbstractRequestCondition<Param
 	 * Returns "this" instance if the request matches all param expressions;
 	 * or {@code null} otherwise.
 	 */
+	@Override
 	public ParamsRequestCondition getMatchingCondition(HttpServletRequest request) {
 		for (ParamExpression expression : expressions) {
 			if (!expression.match(request)) {
@@ -113,6 +115,7 @@ public final class ParamsRequestCondition extends AbstractRequestCondition<Param
 	 * {@link #getMatchingCondition(HttpServletRequest)} and each instance
 	 * contains the matching parameter expressions only or is otherwise empty.
 	 */
+	@Override
 	public int compareTo(ParamsRequestCondition other, HttpServletRequest request) {
 		return other.expressions.size() - this.expressions.size();
 	}
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 357e31fe36..761818437c 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
@@ -161,6 +161,7 @@ public final class PatternsRequestCondition extends AbstractRequestCondition<Pat
 	 *  <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()) {
@@ -202,6 +203,7 @@ public final class PatternsRequestCondition extends AbstractRequestCondition<Pat
 	 * 		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;
@@ -271,6 +273,7 @@ public final class PatternsRequestCondition extends AbstractRequestCondition<Pat
 	 * 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.urlPathHelper.getLookupPathForRequest(request);
 		Comparator<String> patternComparator = this.pathMatcher.getPatternComparator(lookupPath);
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..f34694aae9 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
@@ -159,6 +159,7 @@ public final class ProducesRequestCondition extends AbstractRequestCondition<Pro
 	 * instance otherwise. Practically that means a method-level "produces"
 	 * overrides a type-level "produces" condition.
 	 */
+	@Override
 	public ProducesRequestCondition combine(ProducesRequestCondition other) {
 		return !other.expressions.isEmpty() ? other : this;
 	}
@@ -175,6 +176,7 @@ public final class ProducesRequestCondition extends AbstractRequestCondition<Pro
 	 * 		or a new condition with matching expressions;
 	 * 		or {@code null} if no expressions match.
 	 */
+	@Override
 	public ProducesRequestCondition getMatchingCondition(HttpServletRequest request) {
 		if (isEmpty()) {
 			return this;
@@ -208,6 +210,7 @@ public final class ProducesRequestCondition extends AbstractRequestCondition<Pro
 	 * contains the matching producible media type expression only or
 	 * is otherwise empty.
 	 */
+	@Override
 	public int compareTo(ProducesRequestCondition other, HttpServletRequest request) {
 		try {
 			List<MediaType> acceptedMediaTypes = getAcceptedMediaTypes(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..fffbf7c923 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
@@ -71,6 +71,7 @@ public final class RequestConditionHolder extends AbstractRequestCondition<Reque
 	 * instances after making sure the conditions are of the same type.
 	 * Or if one holder is empty, the other holder is returned.
 	 */
+	@Override
 	public RequestConditionHolder combine(RequestConditionHolder other) {
 		if (this.condition == null && other.condition == null) {
 			return this;
@@ -104,6 +105,7 @@ public final class RequestConditionHolder extends AbstractRequestCondition<Reque
 	 * new RequestConditionHolder instance. Or otherwise if this is an empty
 	 * holder, return the same holder instance.
 	 */
+	@Override
 	public RequestConditionHolder getMatchingCondition(HttpServletRequest request) {
 		if (this.condition == null) {
 			return this;
@@ -117,6 +119,7 @@ public final class RequestConditionHolder extends AbstractRequestCondition<Reque
 	 * instances after making sure the conditions are of the same type.
 	 * Or if one holder is empty, the other holder is preferred.
 	 */
+	@Override
 	public int compareTo(RequestConditionHolder other, HttpServletRequest request) {
 		if (this.condition == null && other.condition == null) {
 			return 0;
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..631852bae5 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
@@ -80,6 +80,7 @@ public final class RequestMethodsRequestCondition extends AbstractRequestConditi
 	 * Returns a new instance with a union of the HTTP request methods
 	 * from "this" and the "other" instance.
 	 */
+	@Override
 	public RequestMethodsRequestCondition combine(RequestMethodsRequestCondition other) {
 		Set<RequestMethod> set = new LinkedHashSet<RequestMethod>(this.methods);
 		set.addAll(other.methods);
@@ -94,6 +95,7 @@ public final class RequestMethodsRequestCondition extends AbstractRequestConditi
 	 * @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
 	 */
+	@Override
 	public RequestMethodsRequestCondition getMatchingCondition(HttpServletRequest request) {
 		if (this.methods.isEmpty()) {
 			return this;
@@ -130,6 +132,7 @@ public final class RequestMethodsRequestCondition extends AbstractRequestConditi
 	 * {@link #getMatchingCondition(HttpServletRequest)} and therefore each instance
 	 * contains the matching HTTP request method only or is otherwise empty.
 	 */
+	@Override
 	public int compareTo(RequestMethodsRequestCondition other, HttpServletRequest request) {
 		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..8eb83966bb 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
@@ -50,6 +50,7 @@ public abstract class AbstractHandlerMethodAdapter extends WebContentGenerator i
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
@@ -60,6 +61,7 @@ public abstract class AbstractHandlerMethodAdapter extends WebContentGenerator i
 	 * @param handler the handler instance to check
 	 * @return whether or not this adapter can adapt the given handler
 	 */
+	@Override
 	public final boolean supports(Object handler) {
 		return handler instanceof HandlerMethod && supportsInternal((HandlerMethod) handler);
 	}
@@ -75,6 +77,7 @@ public abstract class AbstractHandlerMethodAdapter extends WebContentGenerator i
 	/**
 	 * {@inheritDoc} <p>This implementation expects the handler to be an {@link HandlerMethod}.
 	 */
+	@Override
 	public final ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
 		return handleInternal(request, response, (HandlerMethod) handler);
@@ -98,6 +101,7 @@ public abstract class AbstractHandlerMethodAdapter extends WebContentGenerator i
 	/**
 	 * {@inheritDoc} <p>This implementation expects the handler to be an {@link HandlerMethod}.
 	 */
+	@Override
 	public final long getLastModified(HttpServletRequest request, Object handler) {
 		return getLastModifiedInternal(request, (HandlerMethod) handler);
 	}
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..573133ea05 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
@@ -148,6 +148,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 	 * <p>Example: combine type- and method-level request mappings.
 	 * @return a new request mapping info instance; never {@code null}
 	 */
+	@Override
 	public RequestMappingInfo combine(RequestMappingInfo other) {
 		PatternsRequestCondition patterns = this.patternsCondition.combine(other.patternsCondition);
 		RequestMethodsRequestCondition methods = this.methodsCondition.combine(other.methodsCondition);
@@ -167,6 +168,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 	 * the current request, sorted with best matching patterns on top.
 	 * @return a new instance in case all conditions match; or {@code null} otherwise
 	 */
+	@Override
 	public RequestMappingInfo getMatchingCondition(HttpServletRequest request) {
 		RequestMethodsRequestCondition methods = methodsCondition.getMatchingCondition(request);
 		ParamsRequestCondition params = paramsCondition.getMatchingCondition(request);
@@ -197,6 +199,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 	 * {@link #getMatchingCondition(HttpServletRequest)} to ensure they have conditions with
 	 * content relevant to current request.
 	 */
+	@Override
 	public int compareTo(RequestMappingInfo other, HttpServletRequest request) {
 		int result = patternsCondition.compareTo(other.getPatternsCondition(), request);
 		if (result != 0) {
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 dfdfc05ed2..ee75059a59 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
@@ -74,6 +74,7 @@ public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMe
 	@Override
 	protected Comparator<RequestMappingInfo> getMappingComparator(final HttpServletRequest request) {
 		return new Comparator<RequestMappingInfo>() {
+			@Override
 			public int compare(RequestMappingInfo info1, RequestMappingInfo info2) {
 				return info1.compareTo(info2, request);
 			}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AsyncTaskMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AsyncTaskMethodReturnValueHandler.java
index 98130ad84e..1c4f3e3933 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AsyncTaskMethodReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AsyncTaskMethodReturnValueHandler.java
@@ -39,11 +39,13 @@ public class AsyncTaskMethodReturnValueHandler implements HandlerMethodReturnVal
 		this.beanFactory = beanFactory;
 	}
 
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		Class<?> paramType = returnType.getParameterType();
 		return WebAsyncTask.class.isAssignableFrom(paramType);
 	}
 
+	@Override
 	public void handleReturnValue(Object returnValue,
 			MethodParameter returnType, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest) throws Exception {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/CallableMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/CallableMethodReturnValueHandler.java
index 22471f7c3f..7da354795c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/CallableMethodReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/CallableMethodReturnValueHandler.java
@@ -32,11 +32,13 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  */
 public class CallableMethodReturnValueHandler implements HandlerMethodReturnValueHandler {
 
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		Class<?> paramType = returnType.getParameterType();
 		return Callable.class.isAssignableFrom(paramType);
 	}
 
+	@Override
 	public void handleReturnValue(Object returnValue,
 			MethodParameter returnType, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest) throws Exception {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java
index fbb7c8531a..5f10dfa891 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java
@@ -31,11 +31,13 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  */
 public class DeferredResultMethodReturnValueHandler implements HandlerMethodReturnValueHandler {
 
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		Class<?> paramType = returnType.getParameterType();
 		return DeferredResult.class.isAssignableFrom(paramType);
 	}
 
+	@Override
 	public void handleReturnValue(Object returnValue,
 			MethodParameter returnType, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest) throws Exception {
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..8a62923a42 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
@@ -205,6 +205,7 @@ public class ExceptionHandlerExceptionResolver extends AbstractHandlerMethodExce
 		this.contentNegotiationManager = contentNegotiationManager;
 	}
 
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		this.applicationContext = applicationContext;
 	}
@@ -213,6 +214,7 @@ public class ExceptionHandlerExceptionResolver extends AbstractHandlerMethodExce
 		return this.applicationContext;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.argumentResolvers == null) {
 			List<HandlerMethodArgumentResolver> resolvers = getDefaultArgumentResolvers();
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 e93029aa64..4108828fa4 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,16 +61,19 @@ public class HttpEntityMethodProcessor extends AbstractMessageConverterMethodPro
 		super(messageConverters, contentNegotiationManager);
 	}
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		Class<?> parameterType = parameter.getParameterType();
 		return HttpEntity.class.equals(parameterType);
 	}
 
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		Class<?> parameterType = returnType.getParameterType();
 		return HttpEntity.class.equals(parameterType) || ResponseEntity.class.equals(parameterType);
 	}
 
+	@Override
 	public Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
@@ -94,6 +97,7 @@ public class HttpEntityMethodProcessor extends AbstractMessageConverterMethodPro
 				+ " is not parameterized or has more than one parameter");
 	}
 
+	@Override
 	public void handleReturnValue(
 			Object returnValue, MethodParameter returnType,
 			ModelAndViewContainer mavContainer, NativeWebRequest webRequest)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMapMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMapMethodArgumentResolver.java
index 9a5160ade9..ffefd91786 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMapMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMapMethodArgumentResolver.java
@@ -44,6 +44,7 @@ import org.springframework.web.servlet.HandlerMapping;
  */
 public class MatrixVariableMapMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		MatrixVariable paramAnnot = parameter.getParameterAnnotation(MatrixVariable.class);
 		if (paramAnnot != null) {
@@ -54,6 +55,7 @@ public class MatrixVariableMapMethodArgumentResolver implements HandlerMethodArg
 		return false;
 	}
 
+	@Override
 	public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest request, WebDataBinderFactory binderFactory) throws Exception {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMethodArgumentResolver.java
index 5b511116db..e4fd61ceac 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMethodArgumentResolver.java
@@ -47,6 +47,7 @@ public class MatrixVariableMethodArgumentResolver extends AbstractNamedValueMeth
 		super(null);
 	}
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		if (!parameter.hasParameterAnnotation(MatrixVariable.class)) {
 			return false;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java
index cca424048e..e04782a89f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java
@@ -42,10 +42,12 @@ import org.springframework.web.servlet.View;
  */
 public class ModelAndViewMethodReturnValueHandler implements HandlerMethodReturnValueHandler {
 
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		return ModelAndView.class.isAssignableFrom(returnType.getParameterType());
 	}
 
+	@Override
 	public void handleReturnValue(
 			Object returnValue, MethodParameter returnType,
 			ModelAndViewContainer mavContainer, NativeWebRequest webRequest)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java
index a39649551a..a54518b393 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java
@@ -67,10 +67,12 @@ public class ModelAndViewResolverMethodReturnValueHandler implements HandlerMeth
 	/**
 	 * Always returns {@code true}. See class-level note.
 	 */
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		return true;
 	}
 
+	@Override
 	public void handleReturnValue(
 			Object returnValue, MethodParameter returnType,
 			ModelAndViewContainer mavContainer, NativeWebRequest request)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolver.java
index 52af8e427a..55e59b7dbf 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMapMethodArgumentResolver.java
@@ -42,6 +42,7 @@ import org.springframework.web.servlet.HandlerMapping;
  */
 public class PathVariableMapMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		PathVariable annot = parameter.getParameterAnnotation(PathVariable.class);
 		return ((annot != null) && (Map.class.isAssignableFrom(parameter.getParameterType()))
@@ -51,6 +52,7 @@ public class PathVariableMapMethodArgumentResolver implements HandlerMethodArgum
 	/**
 	 * Return a Map with all URI template variables or an empty map.
 	 */
+	@Override
 	public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolver.java
index d93b7746a7..cda9a37ad1 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolver.java
@@ -65,6 +65,7 @@ public class PathVariableMethodArgumentResolver extends AbstractNamedValueMethod
 		super(null);
 	}
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		if (!parameter.hasParameterAnnotation(PathVariable.class)) {
 			return false;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RedirectAttributesMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RedirectAttributesMethodArgumentResolver.java
index 89d4849c3d..9cf3a73189 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RedirectAttributesMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RedirectAttributesMethodArgumentResolver.java
@@ -42,10 +42,12 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributesModelMap;
  */
 public class RedirectAttributesMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return RedirectAttributes.class.isAssignableFrom(parameter.getParameterType());
 	}
 
+	@Override
 	public Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
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 d79a9ef5db..c2b189aeb7 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
@@ -465,6 +465,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter i
 	 * <p>A {@link ConfigurableBeanFactory} is expected for resolving
 	 * expressions in method argument default values.
 	 */
+	@Override
 	public void setBeanFactory(BeanFactory beanFactory) {
 		if (beanFactory instanceof ConfigurableBeanFactory) {
 			this.beanFactory = (ConfigurableBeanFactory) beanFactory;
@@ -478,6 +479,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter i
 		return this.beanFactory;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.argumentResolvers == null) {
 			List<HandlerMethodArgumentResolver> resolvers = getDefaultArgumentResolvers();
@@ -863,6 +865,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter i
 	 */
 	public static final MethodFilter INIT_BINDER_METHODS = new MethodFilter() {
 
+		@Override
 		public boolean matches(Method method) {
 			return AnnotationUtils.findAnnotation(method, InitBinder.class) != null;
 		}
@@ -873,6 +876,7 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter i
 	 */
 	public static final MethodFilter MODEL_ATTRIBUTE_METHODS = new MethodFilter() {
 
+		@Override
 		public boolean matches(Method method) {
 			return ((AnnotationUtils.findAnnotation(method, RequestMapping.class) == null) &&
 					(AnnotationUtils.findAnnotation(method, ModelAttribute.class) != null));
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..f5c8c00978 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
@@ -87,6 +87,7 @@ public class RequestPartMethodArgumentResolver extends AbstractMessageConverterM
 	 * 	<li>Of type {@code javax.servlet.http.Part} unless annotated with {@code @RequestParam}.
 	 * </ul>
 	 */
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		if (parameter.hasParameterAnnotation(RequestPart.class)) {
 			return true;
@@ -107,6 +108,7 @@ public class RequestPartMethodArgumentResolver extends AbstractMessageConverterM
 		}
 	}
 
+	@Override
 	public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest request, WebDataBinderFactory binderFactory) throws Exception {
 
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 9b320cedb9..4c8d098864 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
@@ -74,10 +74,12 @@ public class RequestResponseBodyMethodProcessor extends AbstractMessageConverter
 		super(messageConverters, contentNegotiationManager);
 	}
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return parameter.hasParameterAnnotation(RequestBody.class);
 	}
 
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		return returnType.getMethodAnnotation(ResponseBody.class) != null;
 	}
@@ -89,6 +91,7 @@ public class RequestResponseBodyMethodProcessor extends AbstractMessageConverter
 	 * 	is {@code true} and there is no body content or if there is no suitable
 	 * 	converter to read the content with.
 	 */
+	@Override
 	public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
 
@@ -180,6 +183,7 @@ public class RequestResponseBodyMethodProcessor extends AbstractMessageConverter
 		return super.readWithMessageConverters(inputMessage, methodParam, paramType);
 	}
 
+	@Override
 	public void handleReturnValue(Object returnValue, MethodParameter returnType,
 			ModelAndViewContainer mavContainer, NativeWebRequest webRequest)
 			throws IOException, HttpMediaTypeNotAcceptableException {
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
index b219196c59..bc9246c046 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
@@ -182,6 +182,7 @@ public class ServletInvocableHandlerMethod extends InvocableHandlerMethod {
 
 		return new CallableHandlerMethod(new Callable<Object>() {
 
+			@Override
 			public Object call() throws Exception {
 				if (result instanceof Exception) {
 					throw (Exception) result;
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..3a6770c793 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
@@ -55,6 +55,7 @@ import org.springframework.web.servlet.support.RequestContextUtils;
  */
 public class ServletRequestMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		Class<?> paramType = parameter.getParameterType();
 		return WebRequest.class.isAssignableFrom(paramType) ||
@@ -67,6 +68,7 @@ public class ServletRequestMethodArgumentResolver implements HandlerMethodArgume
 				Reader.class.isAssignableFrom(paramType);
 	}
 
+	@Override
 	public Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java
index 14c216258f..11e97e8660 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java
@@ -44,6 +44,7 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  */
 public class ServletResponseMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		Class<?> paramType = parameter.getParameterType();
 		return ServletResponse.class.isAssignableFrom(paramType)
@@ -57,6 +58,7 @@ public class ServletResponseMethodArgumentResolver implements HandlerMethodArgum
 	 * to the response. If subsequently the underlying method returns
 	 * {@code null}, the request is considered directly handled.
 	 */
+	@Override
 	public Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java
index f87811a950..a1800c2858 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java
@@ -37,10 +37,12 @@ import org.springframework.web.util.UriComponentsBuilder;
  */
 public class UriComponentsBuilderMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
+	@Override
 	public boolean supportsParameter(MethodParameter parameter) {
 		return UriComponentsBuilder.class.isAssignableFrom(parameter.getParameterType());
 	}
 
+	@Override
 	public Object resolveArgument(
 			MethodParameter parameter, ModelAndViewContainer mavContainer,
 			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java
index de6a387330..e68d91273e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java
@@ -40,10 +40,12 @@ import org.springframework.web.servlet.View;
  */
 public class ViewMethodReturnValueHandler implements HandlerMethodReturnValueHandler {
 
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		return View.class.isAssignableFrom(returnType.getParameterType());
 	}
 
+	@Override
 	public void handleReturnValue(
 			Object returnValue, MethodParameter returnType,
 			ModelAndViewContainer mavContainer, NativeWebRequest webRequest)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandler.java
index 153486abb5..d4ffdb8059 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandler.java
@@ -40,11 +40,13 @@ import org.springframework.web.servlet.RequestToViewNameTranslator;
  */
 public class ViewNameMethodReturnValueHandler implements HandlerMethodReturnValueHandler {
 
+	@Override
 	public boolean supportsReturnType(MethodParameter returnType) {
 		Class<?> paramType = returnType.getParameterType();
 		return (void.class.equals(paramType) || String.class.equals(paramType));
 	}
 
+	@Override
 	public void handleReturnValue(
 			Object returnValue, MethodParameter returnType,
 			ModelAndViewContainer mavContainer, NativeWebRequest webRequest)
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java
index ed781d99c7..3ee748d461 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java
@@ -85,6 +85,7 @@ public abstract class AbstractUrlMethodNameResolver implements MethodNameResolve
 	 * Converts {@code null} values to NoSuchRequestHandlingMethodExceptions.
 	 * @see #getHandlerMethodNameForUrlPath
 	 */
+	@Override
 	public final String getHandlerMethodName(HttpServletRequest request)
 			throws NoSuchRequestHandlingMethodException {
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java
index 77fc742104..0c2eff8a4b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MultiActionController.java
@@ -364,6 +364,7 @@ public class MultiActionController extends AbstractController implements LastMod
 	 * Return -1 if there's no such handler, indicating that content must be updated.
 	 * @see org.springframework.web.servlet.mvc.LastModified#getLastModified(HttpServletRequest)
 	 */
+	@Override
 	public long getLastModified(HttpServletRequest request) {
 		try {
 			String handlerMethodName = this.methodNameResolver.getHandlerMethodName(request);
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 bd9405b65b..469d77e2f7 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
@@ -157,6 +157,7 @@ public class ParameterMethodNameResolver implements MethodNameResolver {
 	}
 
 
+	@Override
 	public String getHandlerMethodName(HttpServletRequest request) throws NoSuchRequestHandlingMethodException {
 		String methodName = null;
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
index 3cbcb08a8f..08026a8735 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java
@@ -72,6 +72,7 @@ public class PropertiesMethodNameResolver extends AbstractUrlMethodNameResolver
 		this.pathMatcher = pathMatcher;
 	}
 
+	@Override
 	public void afterPropertiesSet() {
 		if (this.mappings == null || this.mappings.isEmpty()) {
 			throw new IllegalArgumentException("'mappings' property is required");
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
index d23b050cbc..53b1437cda 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
@@ -59,12 +59,16 @@ import org.springframework.web.servlet.FlashMap;
  */
 public interface RedirectAttributes extends Model {
 
+	@Override
 	RedirectAttributes addAttribute(String attributeName, Object attributeValue);
 
+	@Override
 	RedirectAttributes addAttribute(Object attributeValue);
 
+	@Override
 	RedirectAttributes addAllAttributes(Collection<?> attributeValues);
 
+	@Override
 	RedirectAttributes mergeAttributes(Map<String, ?> attributes);
 
 	/**
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java
index 6db27a10d4..66c811837b 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java
@@ -57,6 +57,7 @@ public class RedirectAttributesModelMap extends ModelMap implements RedirectAttr
 	/**
 	 * Return the attributes candidate for flash storage or an empty Map.
 	 */
+	@Override
 	public Map<String, ?> getFlashAttributes() {
 		return this.flashAttributes;
 	}
@@ -65,6 +66,7 @@ public class RedirectAttributesModelMap extends ModelMap implements RedirectAttr
 	 * {@inheritDoc}
 	 * <p>Formats the attribute value as a String before adding it.
 	 */
+	@Override
 	public RedirectAttributesModelMap addAttribute(String attributeName, Object attributeValue) {
 		super.addAttribute(attributeName, formatValue(attributeValue));
 		return this;
@@ -81,6 +83,7 @@ public class RedirectAttributesModelMap extends ModelMap implements RedirectAttr
 	 * {@inheritDoc}
 	 * <p>Formats the attribute value as a String before adding it.
 	 */
+	@Override
 	public RedirectAttributesModelMap addAttribute(Object attributeValue) {
 		super.addAttribute(attributeValue);
 		return this;
@@ -90,6 +93,7 @@ public class RedirectAttributesModelMap extends ModelMap implements RedirectAttr
 	 * {@inheritDoc}
 	 * <p>Each attribute value is formatted as a String before being added.
 	 */
+	@Override
 	public RedirectAttributesModelMap addAllAttributes(Collection<?> attributeValues) {
 		super.addAllAttributes(attributeValues);
 		return this;
@@ -99,6 +103,7 @@ public class RedirectAttributesModelMap extends ModelMap implements RedirectAttr
 	 * {@inheritDoc}
 	 * <p>Each attribute value is formatted as a String before being added.
 	 */
+	@Override
 	public RedirectAttributesModelMap addAllAttributes(Map<String, ?> attributes) {
 		if (attributes != null) {
 			for (String key : attributes.keySet()) {
@@ -112,6 +117,7 @@ public class RedirectAttributesModelMap extends ModelMap implements RedirectAttr
 	 * {@inheritDoc}
 	 * <p>Each attribute value is formatted as a String before being merged.
 	 */
+	@Override
 	public RedirectAttributesModelMap mergeAttributes(Map<String, ?> attributes) {
 		if (attributes != null) {
 			for (String key : attributes.keySet()) {
@@ -123,6 +129,7 @@ public class RedirectAttributesModelMap extends ModelMap implements RedirectAttr
 		return this;
 	}
 
+	@Override
 	public Map<String, Object> asMap() {
 		return this;
 	}
@@ -149,11 +156,13 @@ public class RedirectAttributesModelMap extends ModelMap implements RedirectAttr
 		}
 	}
 
+	@Override
 	public RedirectAttributes addFlashAttribute(String attributeName, Object attributeValue) {
 		this.flashAttributes.addAttribute(attributeName, attributeValue);
 		return this;
 	}
 
+	@Override
 	public RedirectAttributes addFlashAttribute(Object attributeValue) {
 		this.flashAttributes.addAttribute(attributeValue);
 		return this;
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
index e31262c437..5a214c7d0c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
@@ -83,6 +83,7 @@ public class DefaultServletHttpRequestHandler implements HttpRequestHandler, Ser
 	 * attempts to locate the default Servlet using the known common
 	 * container-specific names.
 	 */
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 		if (!StringUtils.hasText(this.defaultServletName)) {
@@ -109,6 +110,7 @@ public class DefaultServletHttpRequestHandler implements HttpRequestHandler, Ser
 	}
 
 
+	@Override
 	public void handleRequest(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 
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..965adae67b 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
@@ -88,6 +88,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator implements H
 		this.locations = locations;
 	}
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		Assert.notEmpty(locations, "Locations list must not be empty");
 	}
@@ -104,6 +105,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator implements H
 	 * of the resource will be written to the response with caching headers
 	 * set to expire one year in the future.
 	 */
+	@Override
 	public void handleRequest(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 
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..d667e88a81 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
@@ -82,6 +82,7 @@ public abstract class AbstractFlashMapManager implements FlashMapManager {
 		return this.urlPathHelper;
 	}
 
+	@Override
 	public final FlashMap retrieveAndUpdate(HttpServletRequest request, HttpServletResponse response) {
 
 		List<FlashMap> maps = retrieveFlashMaps(request);
@@ -178,6 +179,7 @@ public abstract class AbstractFlashMapManager implements FlashMapManager {
 		return true;
 	}
 
+	@Override
 	public final void saveOutputFlashMap(FlashMap flashMap, HttpServletRequest request, HttpServletResponse response) {
 		if (CollectionUtils.isEmpty(flashMap)) {
 			return;
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..d3afa478ac 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
@@ -40,6 +40,7 @@ public class SessionFlashMapManager extends AbstractFlashMapManager{
 	 * FlashMap matching the current request is found or there are expired
 	 * FlashMap to be removed.
 	 */
+	@Override
 	@SuppressWarnings("unchecked")
 	protected List<FlashMap> retrieveFlashMaps(HttpServletRequest request) {
 		HttpSession session = request.getSession(false);
@@ -49,6 +50,7 @@ public class SessionFlashMapManager extends AbstractFlashMapManager{
 	/**
 	 * Save the given FlashMap instance, if not empty, in the HTTP session.
 	 */
+	@Override
 	protected void updateFlashMaps(List<FlashMap> flashMaps, HttpServletRequest request, HttpServletResponse response) {
 		request.getSession().setAttribute(FLASH_MAPS_SESSION_ATTRIBUTE, flashMaps);
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
index f5b45233e1..e1b756b98e 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java
@@ -171,6 +171,7 @@ public class BindTag extends HtmlEscapingAwareTag implements EditorAwareTag {
 		return this.status.getErrors();
 	}
 
+	@Override
 	public final PropertyEditor getEditor() {
 		return this.status.getEditor();
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
index 2c0056def4..c0cbaa9e11 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java
@@ -67,10 +67,12 @@ public class EscapeBodyTag extends HtmlEscapingAwareTag implements BodyTag {
 		return EVAL_BODY_BUFFERED;
 	}
 
+	@Override
 	public void doInitBody() {
 		// do nothing
 	}
 
+	@Override
 	public void setBodyContent(BodyContent bodyContent) {
 		this.bodyContent = bodyContent;
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
index 6ec63b58c8..b180975eb9 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
@@ -165,15 +165,18 @@ public class EvalTag extends HtmlEscapingAwareTag {
 			this.variableResolver = pageContext.getVariableResolver();
 		}
 
+		@Override
 		public Class<?>[] getSpecificTargetClasses() {
 			return null;
 		}
 
+		@Override
 		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
 			return (target == null &&
 					(resolveImplicitVariable(name) != null || this.pageContext.findAttribute(name) != null));
 		}
 
+		@Override
 		public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
 			Object implicitVar = resolveImplicitVariable(name);
 			if (implicitVar != null) {
@@ -182,10 +185,12 @@ public class EvalTag extends HtmlEscapingAwareTag {
 			return new TypedValue(this.pageContext.findAttribute(name));
 		}
 
+		@Override
 		public boolean canWrite(EvaluationContext context, Object target, String name) {
 			return false;
 		}
 
+		@Override
 		public void write(EvaluationContext context, Object target, String name, Object newValue) {
 			throw new UnsupportedOperationException();
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
index 1f8ddd2843..65c9f565e3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java
@@ -111,10 +111,12 @@ public class NestedPathTag extends TagSupport implements TryCatchFinally {
 		return EVAL_PAGE;
 	}
 
+	@Override
 	public void doCatch(Throwable throwable) throws Throwable {
 		throw throwable;
 	}
 
+	@Override
 	public void doFinally() {
 		this.previousNestedPath = null;
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
index b02021fbb6..7105bc71c0 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java
@@ -110,10 +110,12 @@ public abstract class RequestContextAwareTag extends TagSupport implements TryCa
 	protected abstract int doStartTagInternal() throws Exception;
 
 
+	@Override
 	public void doCatch(Throwable throwable) throws Throwable {
 		throw throwable;
 	}
 
+	@Override
 	public void doFinally() {
 		this.requestContext = null;
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
index 370bf19688..d0a65ad962 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
@@ -157,6 +157,7 @@ public class UrlTag extends HtmlEscapingAwareTag implements ParamAware {
 				ExpressionEvaluationUtils.evaluateBoolean("javaScriptEscape", javaScriptEscape, pageContext);
 	}
 
+	@Override
 	public void addParam(Param param) {
 		this.params.add(param);
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
index a0d569a509..abeebb548f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
@@ -219,6 +219,7 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im
 	 * Exposes the {@link PropertyEditor} for {@link EditorAwareTag}.
 	 * <p>Use {@link #getPropertyEditor()} for internal rendering purposes.
 	 */
+	@Override
 	public final PropertyEditor getEditor() throws JspException {
 		return getPropertyEditor();
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
index a31cc1ebe6..0bbc79ba6f 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java
@@ -149,10 +149,12 @@ public abstract class AbstractHtmlElementBodyTag extends AbstractHtmlElementTag
 	// BodyTag implementation
 	//---------------------------------------------------------------------
 
+	@Override
 	public void doInitBody() throws JspException {
 		// no op
 	}
 
+	@Override
 	public void setBodyContent(BodyContent bodyContent) {
 		this.bodyContent = bodyContent;
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
index 6316ac8b3c..f3da981aa8 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java
@@ -394,6 +394,7 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen
 	/**
 	 * {@inheritDoc}
 	 */
+	@Override
 	public void setDynamicAttribute(String uri, String localName, Object value ) throws JspException {
 		if (this.dynamicAttributes == null) {
 			this.dynamicAttributes = new HashMap<String, Object>();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
index d3468aed0b..39a52e0fad 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java
@@ -46,6 +46,7 @@ public class ButtonTag extends AbstractHtmlElementTag {
 	/**
 	 * Set the value of the '{@code name}' attribute.
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
index e0afe0f431..675292dc08 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java
@@ -216,6 +216,7 @@ public class SelectTag extends AbstractHtmlInputElementTag {
 							ObjectUtils.getDisplayString(evaluate("itemLabel", getItemLabel())) : null);
 					OptionWriter optionWriter =
 							new OptionWriter(itemsObject, getBindStatus(), valueProperty, labelProperty, isHtmlEscape()) {
+								@Override
 								protected String processOptionValue(String resolvedValue) {
 									return processFieldValue(selectName, resolvedValue, "option");
 								}
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..5d73b8e452 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
@@ -76,6 +76,7 @@ public class CookieThemeResolver extends CookieGenerator implements ThemeResolve
 	}
 
 
+	@Override
 	public String resolveThemeName(HttpServletRequest request) {
 		// Check request for preparsed or preset theme.
 		String theme = (String) request.getAttribute(THEME_REQUEST_ATTRIBUTE_NAME);
@@ -93,6 +94,7 @@ public class CookieThemeResolver extends CookieGenerator implements ThemeResolve
 		return getDefaultThemeName();
 	}
 
+	@Override
 	public void setThemeName(HttpServletRequest request, HttpServletResponse response, String themeName) {
 		if (themeName != null) {
 			// Set request attribute and add cookie.
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..c02bc45aa5 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
@@ -33,10 +33,12 @@ import javax.servlet.http.HttpServletResponse;
  */
 public class FixedThemeResolver extends AbstractThemeResolver {
 
+	@Override
 	public String resolveThemeName(HttpServletRequest request) {
 		return getDefaultThemeName();
 	}
 
+	@Override
 	public void setThemeName(HttpServletRequest request, HttpServletResponse response, String themeName) {
 		throw new UnsupportedOperationException("Cannot change theme - use a different theme resolution strategy");
 	}
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..7c9f0089f8 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
@@ -46,12 +46,14 @@ public class SessionThemeResolver extends AbstractThemeResolver {
 	 */
 	public static final String THEME_SESSION_ATTRIBUTE_NAME = SessionThemeResolver.class.getName() + ".THEME";
 
+	@Override
 	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());
 	}
 
+	@Override
 	public void setThemeName(HttpServletRequest request, HttpServletResponse response, String themeName) {
 		WebUtils.setSessionAttribute(request, THEME_SESSION_ATTRIBUTE_NAME, themeName);
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
index c0a66c5216..fe73b6df5c 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractCachingViewResolver.java
@@ -116,6 +116,7 @@ public abstract class AbstractCachingViewResolver extends WebApplicationObjectSu
 	}
 
 
+	@Override
 	public View resolveViewName(String viewName, Locale locale) throws Exception {
 		if (!isCache()) {
 			return createView(viewName, locale);
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java
index 9e17d98f8f..39f2c3b095 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java
@@ -62,6 +62,7 @@ public abstract class AbstractUrlBasedView extends AbstractView implements Initi
 		return this.url;
 	}
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		if (isUrlRequired() && getUrl() == null) {
 			throw new IllegalArgumentException("Property 'url' is required");
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..fdc3d22879 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
@@ -79,6 +79,7 @@ public abstract class AbstractView extends WebApplicationObjectSupport implement
 	 * Set the view's name. Helpful for traceability.
 	 * <p>Framework code must call this when constructing views.
 	 */
+	@Override
 	public void setBeanName(String beanName) {
 		this.beanName = beanName;
 	}
@@ -104,6 +105,7 @@ public abstract class AbstractView extends WebApplicationObjectSupport implement
 	/**
 	 * Return the content type for this view.
 	 */
+	@Override
 	public String getContentType() {
 		return this.contentType;
 	}
@@ -252,6 +254,7 @@ public abstract class AbstractView extends WebApplicationObjectSupport implement
 	 * Delegates to renderMergedOutputModel for the actual rendering.
 	 * @see #renderMergedOutputModel
 	 */
+	@Override
 	public void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		if (logger.isTraceEnabled()) {
 			logger.trace("Rendering view with name '" + this.beanName + "' with model " + model +
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..f19239c254 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
@@ -61,11 +61,13 @@ public class BeanNameViewResolver extends WebApplicationObjectSupport implements
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return order;
 	}
 
 
+	@Override
 	public View resolveViewName(String viewName, Locale locale) throws BeansException {
 		ApplicationContext context = getApplicationContext();
 		if (!context.containsBean(viewName)) {
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 cc49726297..8334c0b6d5 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
@@ -111,6 +111,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
@@ -272,6 +273,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 		this.cnManagerFactoryBean.setServletContext(servletContext);
 	}
 
+	@Override
 	public void afterPropertiesSet() throws Exception {
 		if (this.contentNegotiationManager == null) {
 			this.cnManagerFactoryBean.afterPropertiesSet();
@@ -279,6 +281,7 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 		}
 	}
 
+	@Override
 	public View resolveViewName(String viewName, Locale locale) throws Exception {
 		RequestAttributes attrs = RequestContextHolder.getRequestAttributes();
 		Assert.isInstanceOf(ServletRequestAttributes.class, attrs);
@@ -413,10 +416,12 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
 
 	private static final View NOT_ACCEPTABLE_VIEW = new View() {
 
+		@Override
 		public String getContentType() {
 			return null;
 		}
 
+		@Override
 		public void render(Map<String, ?> model, HttpServletRequest request, HttpServletResponse response) {
 			response.setStatus(HttpServletResponse.SC_NOT_ACCEPTABLE);
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
index 9ffb54e7b7..dd8b1d3912 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java
@@ -171,6 +171,7 @@ public class DefaultRequestToViewNameTranslator implements RequestToViewNameTran
 	 * @see org.springframework.web.util.UrlPathHelper#getLookupPathForRequest
 	 * @see #transformPath
 	 */
+	@Override
 	public String getViewName(HttpServletRequest request) {
 		String lookupPath = this.urlPathHelper.getLookupPathForRequest(request);
 		return (this.prefix + transformPath(lookupPath) + this.suffix);
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..8813f4172f 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
@@ -238,6 +238,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView {
 	/**
 	 * Returns "true" indicating this view performs a redirect.
 	 */
+	@Override
 	public boolean isRedirectView() {
 		return true;
 	}
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 2726e0537c..3ccf375e06 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
@@ -91,6 +91,7 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
@@ -180,6 +181,7 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver
 	 * Eagerly initialize Locales if necessary.
 	 * @see #setLocalesToInitialize
 	 */
+	@Override
 	public void afterPropertiesSet() throws BeansException {
 		if (this.localesToInitialize != null) {
 			for (Locale locale : this.localesToInitialize) {
@@ -275,6 +277,7 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver
 	/**
 	 * Close the bundle View factories on context shutdown.
 	 */
+	@Override
 	public void destroy() throws BeansException {
 		for (ConfigurableApplicationContext factory : this.bundleCache.values()) {
 			factory.close();
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..086d6e204e 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
@@ -334,6 +334,7 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements
 	 * Return the order in which this {@link org.springframework.web.servlet.ViewResolver}
 	 * is evaluated.
 	 */
+	@Override
 	public int getOrder() {
 		return this.order;
 	}
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..67f3ac5192 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
@@ -69,6 +69,7 @@ public class XmlViewResolver extends AbstractCachingViewResolver
 		this.order = order;
 	}
 
+	@Override
 	public int getOrder() {
 		return order;
 	}
@@ -86,6 +87,7 @@ public class XmlViewResolver extends AbstractCachingViewResolver
 	 * Pre-initialize the factory from the XML file.
 	 * Only effective if caching is enabled.
 	 */
+	@Override
 	public void afterPropertiesSet() throws BeansException {
 		if (isCache()) {
 			initFactory();
@@ -152,6 +154,7 @@ public class XmlViewResolver extends AbstractCachingViewResolver
 	/**
 	 * Close the view bean factory on context shutdown.
 	 */
+	@Override
 	public void destroy() throws BeansException {
 		if (this.cachedFactory != null) {
 			this.cachedFactory.close();
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
index 1f04244b7c..21bbd923fe 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
@@ -97,6 +97,7 @@ public class FreeMarkerConfigurer extends FreeMarkerConfigurationFactory
 	/**
 	 * Initialize the {@link TaglibFactory} for the given ServletContext.
 	 */
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.taglibFactory = new TaglibFactory(servletContext);
 	}
@@ -109,6 +110,7 @@ public class FreeMarkerConfigurer extends FreeMarkerConfigurationFactory
 	 * @see #createConfiguration
 	 * @see #setConfiguration
 	 */
+	@Override
 	public void afterPropertiesSet() throws IOException, TemplateException {
 		if (this.configuration == null) {
 			this.configuration = createConfiguration();
@@ -129,6 +131,7 @@ public class FreeMarkerConfigurer extends FreeMarkerConfigurationFactory
 	/**
 	 * Return the Configuration object wrapped by this bean.
 	 */
+	@Override
 	public Configuration getConfiguration() {
 		return this.configuration;
 	}
@@ -136,6 +139,7 @@ public class FreeMarkerConfigurer extends FreeMarkerConfigurationFactory
 	/**
 	 * Return the TaglibFactory object wrapped by this bean.
 	 */
+	@Override
 	public TaglibFactory getTaglibFactory() {
 		return this.taglibFactory;
 	}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
index 643231404a..d64e1e0ae3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
@@ -387,18 +387,22 @@ public class FreeMarkerView extends AbstractTemplateView {
 	 */
 	private class DelegatingServletConfig implements ServletConfig {
 
+		@Override
 		public String getServletName() {
 			return FreeMarkerView.this.getBeanName();
 		}
 
+		@Override
 		public ServletContext getServletContext() {
 			return FreeMarkerView.this.getServletContext();
 		}
 
+		@Override
 		public String getInitParameter(String paramName) {
 			return null;
 		}
 
+		@Override
 		public Enumeration<String> getInitParameterNames() {
 			return Collections.enumeration(new HashSet<String>());
 		}
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
index ef4faaf2e0..06b3fdabaf 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java
@@ -36,6 +36,7 @@ import org.springframework.web.servlet.DispatcherServlet;
  */
 public abstract class AbstractSpringPreparerFactory implements PreparerFactory {
 
+	@Override
 	public ViewPreparer getPreparer(String name, TilesRequestContext context) throws TilesException {
 		WebApplicationContext webApplicationContext = (WebApplicationContext) context.getRequestScope().get(
 				DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE);
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..42ae8aaeab 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
@@ -47,10 +47,12 @@ public class SpringTilesApplicationContextFactory extends AbstractTilesApplicati
 
 	private Map<String, String> params;
 
+	@Override
 	public void init(Map<String, String> params) {
 		this.params = params;
 	}
 
+	@Override
 	public TilesApplicationContext createApplicationContext(Object context) {
 		return new SpringWildcardServletTilesApplicationContext((ServletContext) context, this.params);
 	}
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..f3b76f3730 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
@@ -309,6 +309,7 @@ public class TilesConfigurer implements ServletContextAware, InitializingBean, D
 		CollectionUtils.mergePropertiesIntoMap(tilesProperties, this.tilesPropertyMap);
 	}
 
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
@@ -320,6 +321,7 @@ public class TilesConfigurer implements ServletContextAware, InitializingBean, D
 	 * @throws TilesException in case of setup failure
 	 * @see #createTilesInitializer()
 	 */
+	@Override
 	public void afterPropertiesSet() throws TilesException {
 		boolean activateEl = false;
 		if (tilesElPresent) {
@@ -376,6 +378,7 @@ public class TilesConfigurer implements ServletContextAware, InitializingBean, D
 	 * Removes the TilesContainer from this web application.
 	 * @throws TilesException in case of cleanup failure
 	 */
+	@Override
 	public void destroy() throws TilesException {
 		try {
 			// Tiles 2.2?
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java
index 5d547a639e..d5394519af 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java
@@ -104,6 +104,7 @@ public class VelocityConfigurer extends VelocityEngineFactory
 		this.velocityEngine = velocityEngine;
 	}
 
+	@Override
 	public void setServletContext(ServletContext servletContext) {
 		this.servletContext = servletContext;
 	}
@@ -114,6 +115,7 @@ public class VelocityConfigurer extends VelocityEngineFactory
 	 * @see #createVelocityEngine
 	 * @see #setVelocityEngine
 	 */
+	@Override
 	public void afterPropertiesSet() throws IOException, VelocityException {
 		if (this.velocityEngine == null) {
 			this.velocityEngine = createVelocityEngine();
@@ -141,6 +143,7 @@ public class VelocityConfigurer extends VelocityEngineFactory
 		}
 	}
 
+	@Override
 	public VelocityEngine getVelocityEngine() {
 		return this.velocityEngine;
 	}

From b2a048b6f31342a0953e32d8f8c5fa2109ff1442 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 28 Dec 2012 23:57:33 +0100
Subject: [PATCH 36/36] Update Apache license headers for affected sources

---
 .../aop/aspectj/AspectJAfterReturningAdvice.java                | 2 +-
 .../springframework/aop/aspectj/AspectJAfterThrowingAdvice.java | 2 +-
 .../org/springframework/aop/aspectj/AspectJAroundAdvice.java    | 2 +-
 .../springframework/aop/aspectj/AspectJMethodBeforeAdvice.java  | 2 +-
 .../org/springframework/aop/aspectj/AspectJPointcutAdvisor.java | 2 +-
 .../annotation/LazySingletonAspectInstanceFactoryDecorator.java | 2 +-
 .../springframework/aop/config/MethodLocatingFactoryBean.java   | 2 +-
 .../springframework/aop/config/PointcutComponentDefinition.java | 2 +-
 .../aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java | 2 +-
 .../aop/config/SpringConfiguredBeanDefinitionParser.java        | 2 +-
 .../aop/framework/AbstractSingletonProxyFactoryBean.java        | 2 +-
 .../framework/adapter/AdvisorAdapterRegistrationManager.java    | 2 +-
 .../aop/support/StaticMethodMatcherPointcut.java                | 2 +-
 .../aop/support/StaticMethodMatcherPointcutAdvisor.java         | 2 +-
 .../aop/support/annotation/AnnotationClassFilter.java           | 2 +-
 .../springframework/aop/target/HotSwappableTargetSource.java    | 2 +-
 .../factory/annotation/AnnotationBeanWiringInfoResolver.java    | 2 +-
 .../beans/factory/annotation/CustomAutowireConfigurer.java      | 2 +-
 .../beans/factory/config/CustomScopeConfigurer.java             | 2 +-
 .../config/InstantiationAwareBeanPostProcessorAdapter.java      | 2 +-
 .../beans/factory/config/PropertiesFactoryBean.java             | 2 +-
 .../beans/factory/config/PropertyResourceConfigurer.java        | 2 +-
 .../beans/factory/parsing/AbstractComponentDefinition.java      | 2 +-
 .../beans/factory/parsing/CompositeComponentDefinition.java     | 2 +-
 .../beans/factory/parsing/EmptyReaderEventListener.java         | 2 +-
 .../beans/factory/support/DefaultBeanNameGenerator.java         | 2 +-
 .../beans/factory/support/SimpleAutowireCandidateResolver.java  | 2 +-
 .../beans/factory/support/StaticListableBeanFactory.java        | 2 +-
 .../beans/factory/wiring/ClassNameBeanWiringInfoResolver.java   | 2 +-
 .../beans/factory/xml/DefaultDocumentLoader.java                | 2 +-
 .../beans/factory/xml/NamespaceHandlerSupport.java              | 2 +-
 .../cache/ehcache/EhCacheManagerFactoryBean.java                | 2 +-
 .../java/org/springframework/mail/javamail/MimeMailMessage.java | 2 +-
 .../scheduling/commonj/DelegatingTimerListener.java             | 2 +-
 .../org/springframework/scheduling/commonj/DelegatingWork.java  | 2 +-
 .../scheduling/commonj/TimerManagerFactoryBean.java             | 2 +-
 .../springframework/scheduling/quartz/AdaptableJobFactory.java  | 2 +-
 .../org/springframework/scheduling/quartz/DelegatingJob.java    | 2 +-
 .../scheduling/quartz/SimpleThreadPoolTaskExecutor.java         | 2 +-
 .../ui/freemarker/FreeMarkerConfigurationFactoryBean.java       | 2 +-
 .../org/springframework/ui/freemarker/SpringTemplateLoader.java | 2 +-
 .../springframework/ui/velocity/VelocityEngineFactoryBean.java  | 2 +-
 .../cache/concurrent/ConcurrentMapCacheFactoryBean.java         | 2 +-
 .../cache/config/AnnotationDrivenCacheBeanDefinitionParser.java | 2 +-
 .../org/springframework/cache/config/CacheNamespaceHandler.java | 2 +-
 .../org/springframework/cache/interceptor/CacheInterceptor.java | 2 +-
 .../cache/interceptor/CompositeCacheOperationSource.java        | 2 +-
 .../springframework/cache/interceptor/DefaultKeyGenerator.java  | 2 +-
 .../cache/interceptor/NameMatchCacheOperationSource.java        | 2 +-
 .../springframework/cache/support/CompositeCacheManager.java    | 2 +-
 .../annotation/AnnotationConfigBeanDefinitionParser.java        | 2 +-
 .../context/annotation/ComponentScanBeanDefinitionParser.java   | 2 +-
 .../context/annotation/Jsr330ScopeMetadataResolver.java         | 2 +-
 .../context/annotation/LoadTimeWeavingConfiguration.java        | 2 +-
 .../context/config/SpringConfiguredBeanDefinitionParser.java    | 2 +-
 .../context/event/GenericApplicationListenerAdapter.java        | 2 +-
 .../context/expression/BeanExpressionContextAccessor.java       | 2 +-
 .../springframework/context/expression/BeanFactoryAccessor.java | 2 +-
 .../springframework/context/expression/BeanFactoryResolver.java | 2 +-
 .../springframework/context/expression/EnvironmentAccessor.java | 2 +-
 .../context/support/DefaultLifecycleProcessor.java              | 2 +-
 .../context/support/DelegatingMessageSource.java                | 2 +-
 .../springframework/context/weaving/AspectJWeavingEnabler.java  | 2 +-
 .../springframework/format/datetime/joda/DateTimeParser.java    | 2 +-
 .../format/datetime/joda/MillisecondInstantPrinter.java         | 2 +-
 .../format/datetime/joda/ReadableInstantPrinter.java            | 2 +-
 .../format/datetime/joda/ReadablePartialPrinter.java            | 2 +-
 .../org/springframework/format/number/CurrencyFormatter.java    | 2 +-
 .../java/org/springframework/format/number/NumberFormatter.java | 2 +-
 .../org/springframework/format/number/PercentFormatter.java     | 2 +-
 .../classloading/glassfish/ClassTransformerAdapter.java         | 2 +-
 .../instrument/classloading/jboss/JBossModulesAdapter.java      | 2 +-
 .../springframework/jmx/export/NotificationListenerBean.java    | 2 +-
 .../java/org/springframework/jndi/JndiObjectFactoryBean.java    | 2 +-
 .../main/java/org/springframework/jndi/JndiObjectLocator.java   | 2 +-
 .../remoting/support/DefaultRemoteInvocationExecutor.java       | 2 +-
 .../remoting/support/DefaultRemoteInvocationFactory.java        | 2 +-
 .../remoting/support/RemoteInvocationTraceInterceptor.java      | 2 +-
 .../remoting/support/SimpleHttpServerFactoryBean.java           | 2 +-
 .../remoting/support/UrlBasedRemoteAccessor.java                | 2 +-
 .../scheduling/annotation/AsyncConfigurationSelector.java       | 2 +-
 .../scheduling/config/TaskExecutorFactoryBean.java              | 2 +-
 .../scheduling/support/DelegatingErrorHandlingRunnable.java     | 2 +-
 .../scheduling/support/MethodInvokingRunnable.java              | 2 +-
 .../scheduling/support/ScheduledMethodRunnable.java             | 2 +-
 .../scheduling/support/SimpleTriggerContext.java                | 2 +-
 .../org/springframework/scripting/jruby/JRubyScriptFactory.java | 2 +-
 .../ui/context/support/DelegatingThemeSource.java               | 2 +-
 .../org/springframework/ui/context/support/SimpleTheme.java     | 2 +-
 .../validation/beanvalidation/BeanValidationPostProcessor.java  | 2 +-
 .../validation/beanvalidation/CustomValidatorBean.java          | 2 +-
 .../beanvalidation/LocaleContextMessageInterpolator.java        | 2 +-
 .../beanvalidation/MessageSourceResourceBundleLocator.java      | 2 +-
 .../beanvalidation/SpringConstraintValidatorFactory.java        | 2 +-
 .../main/java/org/springframework/core/ControlFlowFactory.java  | 2 +-
 .../java/org/springframework/core/ExceptionDepthComparator.java | 2 +-
 .../core/convert/support/ArrayToCollectionConverter.java        | 2 +-
 .../core/convert/support/ArrayToObjectConverter.java            | 2 +-
 .../core/convert/support/ArrayToStringConverter.java            | 2 +-
 .../core/convert/support/CharacterToNumberFactory.java          | 2 +-
 .../core/convert/support/CollectionToArrayConverter.java        | 2 +-
 .../core/convert/support/CollectionToCollectionConverter.java   | 2 +-
 .../core/convert/support/CollectionToObjectConverter.java       | 2 +-
 .../core/convert/support/CollectionToStringConverter.java       | 2 +-
 .../core/convert/support/NumberToCharacterConverter.java        | 2 +-
 .../core/convert/support/ObjectToArrayConverter.java            | 2 +-
 .../core/convert/support/ObjectToCollectionConverter.java       | 2 +-
 .../core/convert/support/ObjectToStringConverter.java           | 2 +-
 .../core/convert/support/PropertiesToStringConverter.java       | 2 +-
 .../core/convert/support/StringToArrayConverter.java            | 2 +-
 .../core/convert/support/StringToBooleanConverter.java          | 2 +-
 .../core/convert/support/StringToCharacterConverter.java        | 2 +-
 .../core/convert/support/StringToCollectionConverter.java       | 2 +-
 .../core/convert/support/StringToEnumConverterFactory.java      | 2 +-
 .../core/convert/support/StringToLocaleConverter.java           | 2 +-
 .../core/convert/support/StringToNumberConverterFactory.java    | 2 +-
 .../core/convert/support/StringToPropertiesConverter.java       | 2 +-
 .../org/springframework/core/env/EnumerablePropertySource.java  | 2 +-
 .../springframework/core/env/ReadOnlySystemAttributesMap.java   | 2 +-
 .../org/springframework/core/io/FileSystemResourceLoader.java   | 2 +-
 .../core/serializer/support/DeserializingConverter.java         | 2 +-
 .../core/serializer/support/SerializingConverter.java           | 2 +-
 .../core/task/support/ConcurrentExecutorAdapter.java            | 2 +-
 .../core/type/classreading/SimpleMetadataReaderFactory.java     | 2 +-
 .../core/type/filter/AbstractClassTestingTypeFilter.java        | 2 +-
 .../org/springframework/core/type/filter/AspectJTypeFilter.java | 2 +-
 .../main/java/org/springframework/util/CompositeIterator.java   | 2 +-
 .../main/java/org/springframework/util/LinkedMultiValueMap.java | 2 +-
 .../java/org/springframework/util/WeakReferenceMonitor.java     | 2 +-
 .../java/org/springframework/util/xml/XMLEventStreamReader.java | 2 +-
 .../expression/common/TemplateAwareExpressionParser.java        | 2 +-
 .../expression/spel/support/ReflectiveConstructorExecutor.java  | 2 +-
 .../expression/spel/support/ReflectiveMethodExecutor.java       | 2 +-
 .../expression/spel/support/StandardOperatorOverloader.java     | 2 +-
 .../org/springframework/jdbc/config/JdbcNamespaceHandler.java   | 2 +-
 .../springframework/jdbc/core/ArgPreparedStatementSetter.java   | 2 +-
 .../jdbc/core/ArgTypePreparedStatementSetter.java               | 2 +-
 .../java/org/springframework/jdbc/core/BatchUpdateUtils.java    | 2 +-
 .../jdbc/core/metadata/TableMetaDataProviderFactory.java        | 2 +-
 .../jdbc/core/namedparam/BeanPropertySqlParameterSource.java    | 2 +-
 .../jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java    | 2 +-
 .../jdbc/datasource/JdbcTransactionObjectSupport.java           | 2 +-
 .../jdbc/datasource/LazyConnectionDataSourceProxy.java          | 2 +-
 .../springframework/jdbc/datasource/SimpleConnectionHandle.java | 2 +-
 .../datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java | 2 +-
 .../jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java   | 2 +-
 .../jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java  | 2 +-
 .../datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java     | 2 +-
 .../jdbc/datasource/embedded/OutputStreamFactory.java           | 2 +-
 .../jdbc/datasource/init/CompositeDatabasePopulator.java        | 2 +-
 .../jdbc/datasource/init/DataSourceInitializer.java             | 2 +-
 .../jdbc/datasource/lookup/SingleDataSourceLookup.java          | 2 +-
 .../springframework/jdbc/support/DatabaseStartupValidator.java  | 2 +-
 .../org/springframework/jdbc/support/GeneratedKeyHolder.java    | 2 +-
 .../springframework/jdbc/support/lob/AbstractLobHandler.java    | 2 +-
 .../org/springframework/jdbc/support/lob/PassThroughBlob.java   | 2 +-
 .../org/springframework/jdbc/support/lob/PassThroughClob.java   | 2 +-
 .../springframework/jms/connection/CachedMessageConsumer.java   | 2 +-
 .../springframework/jms/connection/CachedMessageProducer.java   | 2 +-
 .../jms/connection/ChainedExceptionListener.java                | 2 +-
 .../jms/listener/adapter/MessageListenerAdapter102.java         | 2 +-
 .../jms/listener/endpoint/JmsMessageEndpointManager.java        | 2 +-
 .../orm/hibernate3/HibernateExceptionTranslator.java            | 2 +-
 .../orm/hibernate3/SpringSessionSynchronization.java            | 2 +-
 .../orm/hibernate3/SpringTransactionFactory.java                | 2 +-
 .../org/springframework/orm/hibernate3/TypeDefinitionBean.java  | 2 +-
 .../orm/ibatis/support/BlobByteArrayTypeHandler.java            | 2 +-
 .../orm/ibatis/support/BlobSerializableTypeHandler.java         | 2 +-
 .../orm/ibatis/support/ClobStringTypeHandler.java               | 2 +-
 .../jdo/support/OpenPersistenceManagerInViewInterceptor.java    | 2 +-
 .../orm/jdo/support/StandardPersistenceManagerProxyBean.java    | 2 +-
 .../orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java     | 2 +-
 .../main/java/org/springframework/mock/web/MockBodyContent.java | 2 +-
 .../java/org/springframework/mock/web/MockFilterConfig.java     | 2 +-
 .../main/java/org/springframework/mock/web/MockJspWriter.java   | 2 +-
 .../java/org/springframework/mock/web/MockMultipartFile.java    | 2 +-
 .../mock/web/MockMultipartHttpServletRequest.java               | 2 +-
 .../java/org/springframework/mock/web/MockServletConfig.java    | 2 +-
 .../org/springframework/mock/web/PassThroughFilterChain.java    | 2 +-
 .../springframework/mock/web/portlet/MockActionResponse.java    | 2 +-
 .../java/org/springframework/mock/web/portlet/MockBaseURL.java  | 2 +-
 .../org/springframework/mock/web/portlet/MockCacheControl.java  | 2 +-
 .../springframework/mock/web/portlet/MockClientDataRequest.java | 2 +-
 .../java/org/springframework/mock/web/portlet/MockEvent.java    | 2 +-
 .../org/springframework/mock/web/portlet/MockEventRequest.java  | 2 +-
 .../org/springframework/mock/web/portlet/MockEventResponse.java | 2 +-
 .../org/springframework/mock/web/portlet/MockMimeResponse.java  | 2 +-
 .../mock/web/portlet/MockMultipartActionRequest.java            | 2 +-
 .../org/springframework/mock/web/portlet/MockPortalContext.java | 2 +-
 .../mock/web/portlet/MockPortletPreferences.java                | 2 +-
 .../mock/web/portlet/MockPortletRequestDispatcher.java          | 2 +-
 .../springframework/mock/web/portlet/MockPortletResponse.java   | 2 +-
 .../org/springframework/mock/web/portlet/MockPortletURL.java    | 2 +-
 .../org/springframework/mock/web/portlet/MockRenderRequest.java | 2 +-
 .../springframework/mock/web/portlet/MockRenderResponse.java    | 2 +-
 .../springframework/mock/web/portlet/MockResourceRequest.java   | 2 +-
 .../springframework/mock/web/portlet/MockResourceResponse.java  | 2 +-
 .../org/springframework/mock/web/portlet/MockResourceURL.java   | 2 +-
 .../mock/web/portlet/MockStateAwareResponse.java                | 2 +-
 .../mock/web/portlet/ServletWrappingPortletContext.java         | 2 +-
 .../main/java/org/springframework/test/ConditionalTestCase.java | 2 +-
 .../test/annotation/SystemProfileValueSource.java               | 2 +-
 .../java/org/springframework/jca/cci/object/EisOperation.java   | 2 +-
 .../jca/context/BootstrapContextAwareProcessor.java             | 2 +-
 .../jca/context/ResourceAdapterApplicationContext.java          | 2 +-
 .../jca/endpoint/GenericMessageEndpointManager.java             | 2 +-
 .../springframework/jca/support/LocalConnectionFactoryBean.java | 2 +-
 .../springframework/jca/support/ResourceAdapterFactoryBean.java | 2 +-
 .../main/java/org/springframework/jca/work/DelegatingWork.java  | 2 +-
 .../org/springframework/jca/work/SimpleTaskWorkManager.java     | 2 +-
 .../springframework/transaction/jta/JtaTransactionObject.java   | 2 +-
 .../transaction/jta/ManagedTransactionAdapter.java              | 2 +-
 .../transaction/jta/SimpleTransactionFactory.java               | 2 +-
 .../springframework/transaction/jta/UserTransactionAdapter.java | 2 +-
 .../transaction/support/ResourceHolderSupport.java              | 2 +-
 .../transaction/support/TransactionSynchronizationAdapter.java  | 2 +-
 .../springframework/http/client/AbstractClientHttpRequest.java  | 2 +-
 .../http/client/AbstractClientHttpRequestFactoryWrapper.java    | 2 +-
 .../http/client/BufferingClientHttpRequestWrapper.java          | 2 +-
 .../springframework/http/client/CommonsClientHttpRequest.java   | 2 +-
 .../http/client/SimpleBufferingClientHttpRequest.java           | 2 +-
 .../springframework/http/client/support/HttpRequestWrapper.java | 2 +-
 .../http/converter/BufferedImageHttpMessageConverter.java       | 2 +-
 .../http/converter/FormHttpMessageConverter.java                | 2 +-
 .../org/springframework/remoting/caucho/BurlapExporter.java     | 2 +-
 .../springframework/remoting/caucho/BurlapProxyFactoryBean.java | 2 +-
 .../springframework/remoting/caucho/BurlapServiceExporter.java  | 2 +-
 .../remoting/caucho/HessianProxyFactoryBean.java                | 2 +-
 .../springframework/remoting/caucho/HessianServiceExporter.java | 2 +-
 .../remoting/caucho/SimpleBurlapServiceExporter.java            | 2 +-
 .../remoting/caucho/SimpleHessianServiceExporter.java           | 2 +-
 .../remoting/httpinvoker/HttpInvokerProxyFactoryBean.java       | 2 +-
 .../remoting/httpinvoker/HttpInvokerServiceExporter.java        | 2 +-
 .../remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java  | 2 +-
 .../remoting/jaxws/AbstractJaxWsServiceExporter.java            | 2 +-
 .../remoting/jaxws/JaxWsPortProxyFactoryBean.java               | 2 +-
 .../remoting/jaxws/LocalJaxWsServiceFactoryBean.java            | 2 +-
 .../web/bind/support/DefaultSessionAttributeStore.java          | 2 +-
 .../org/springframework/web/context/ContextCleanupListener.java | 2 +-
 .../web/context/support/ServletContextAttributeExporter.java    | 2 +-
 .../web/context/support/ServletContextAttributeFactoryBean.java | 2 +-
 .../web/context/support/ServletContextAwareProcessor.java       | 2 +-
 .../web/context/support/ServletContextFactoryBean.java          | 2 +-
 .../org/springframework/web/filter/DelegatingFilterProxy.java   | 2 +-
 .../multipart/support/AbstractMultipartHttpServletRequest.java  | 2 +-
 .../web/portlet/mvc/PortletModeNameViewController.java          | 2 +-
 .../web/portlet/mvc/SimpleControllerHandlerAdapter.java         | 2 +-
 .../servlet/handler/WebRequestHandlerInterceptorAdapter.java    | 2 +-
 .../web/servlet/mvc/HttpRequestHandlerAdapter.java              | 2 +-
 .../web/servlet/mvc/SimpleControllerHandlerAdapter.java         | 2 +-
 .../web/servlet/mvc/condition/ConsumesRequestCondition.java     | 2 +-
 .../web/servlet/mvc/condition/PatternsRequestCondition.java     | 2 +-
 .../servlet/mvc/condition/RequestMethodsRequestCondition.java   | 2 +-
 .../method/annotation/ModelAndViewMethodReturnValueHandler.java | 2 +-
 .../method/annotation/RequestPartMethodArgumentResolver.java    | 2 +-
 .../web/servlet/resource/DefaultServletHttpRequestHandler.java  | 2 +-
 .../web/servlet/view/freemarker/FreeMarkerConfigurer.java       | 2 +-
 .../view/tiles2/SpringTilesApplicationContextFactory.java       | 2 +-
 258 files changed, 258 insertions(+), 258 deletions(-)

diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java
index ae3cec974d..6ae24d5d7b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterReturningAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java
index da9e10ed4d..a7bef4b213 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
index d0a3b1375e..b9c546342b 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAroundAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java
index 31a849ae86..6f7ce26b39 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJMethodBeforeAdvice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
index f92b2300bb..14ad6c67a9 100644
--- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 23df015c5c..36bb4eeb42 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-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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java
index e827eef1f0..abb26930cb 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/MethodLocatingFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java b/spring-aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java
index 23827f914e..3cbf472e58 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/PointcutComponentDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java
index 9c08b0258a..64cc673bab 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/SimpleBeanFactoryAwareAspectInstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java
index 06bbf9b614..59aed08e0e 100644
--- a/spring-aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java
+++ b/spring-aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java
index 4e640d0477..261d1cab60 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/AbstractSingletonProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java
index 5ff96dcd12..4ef00db86c 100644
--- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java
+++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcut.java
index 1f0917877c..1c2f1106cb 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java
index 3b0c382072..9dbe10dbf4 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 d3a84e3a73..aacf645c3f 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-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.
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java
index 8948bb3699..9f7e5fc263 100644
--- a/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java
+++ b/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java
index 8729b095a9..78fe8fe86a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java
index 106997fe76..2d6934de0c 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java
index ebd4f3236c..0d5a281925 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomScopeConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
index b21ac39b30..3e02846fcb 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 31005c1d15..71b3e85fb9 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-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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyResourceConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyResourceConfigurer.java
index c58bc9a90f..a84bdc067a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyResourceConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyResourceConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java
index 0ae0a3f87a..08d4aa43c1 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AbstractComponentDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/CompositeComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/CompositeComponentDefinition.java
index 019fa6e3f5..550ae761c2 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/CompositeComponentDefinition.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/CompositeComponentDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/EmptyReaderEventListener.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/EmptyReaderEventListener.java
index cf3b61e2a8..f27831a63f 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/EmptyReaderEventListener.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/EmptyReaderEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultBeanNameGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultBeanNameGenerator.java
index 79c213cbc3..ebd7a7022d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultBeanNameGenerator.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultBeanNameGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
index 8d23469022..3570305d9d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 f7a91be9e4..dc84919149 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolver.java
index e4d13eb1e6..b458dfe84a 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/ClassNameBeanWiringInfoResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
index e7910e0ea3..f86765cb62 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerSupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerSupport.java
index 217773c986..b9f89b2369 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerSupport.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 a2d378c4b9..b055160dc3 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-2011 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java
index c9f9e32cb9..6a483168eb 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMailMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java
index 5e08cd6abd..5d0e444715 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingTimerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java
index a6657fdc98..d748203698 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/DelegatingWork.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java
index 1f4c3251d6..3b67a93f95 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 931c560749..ba8a6d0c7a 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-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.
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/DelegatingJob.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/DelegatingJob.java
index 942f40b39a..7536e0aa3a 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/DelegatingJob.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/DelegatingJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java
index e87c4c173e..6f5374ab21 100644
--- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java
+++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleThreadPoolTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBean.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBean.java
index 6536778dfa..4e295bbb53 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 f157080704..6f1c22a62d 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-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.
diff --git a/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactoryBean.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactoryBean.java
index 6552690d78..7c45782625 100644
--- a/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactoryBean.java
+++ b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheFactoryBean.java b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheFactoryBean.java
index e36426f54f..0e0b5a8adf 100644
--- a/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 7a6ecc9d1a..1488d62bd8 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-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.
diff --git a/spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java b/spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java
index be44366e17..238a3d2805 100644
--- a/spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java
+++ b/spring-context/src/main/java/org/springframework/cache/config/CacheNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java
index 7cea0341a6..ad4ab9721b 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java
index 6f4438b32c..8c01c66417 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CompositeCacheOperationSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 a12b04a0c4..a37218804a 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-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.
diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java b/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
index 3137501a89..c1cbdc0e9b 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * 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.
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 4434909fc2..3d64b770e0 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-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.
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigBeanDefinitionParser.java
index e386246b53..de52f2e6d3 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 bf2db85ed9..2ef0ad17af 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-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.
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
index 072951d075..47b6395fbd 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 26cd32ab49..efc2a0e30e 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-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.
diff --git a/spring-context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java
index 322d8e6289..3d61447fc3 100644
--- a/spring-context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 26fd7dcc58..8c7f6e6d57 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-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.
diff --git a/spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java
index 167a8f8e10..0f1a161948 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 0aa3414679..15d3d7a622 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-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.
diff --git a/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java b/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java
index 0c09e42113..94ecbe74a0 100644
--- a/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java
+++ b/spring-context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 3995136a7c..86893f3daa 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-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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java b/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
index a443d13b8b..6290f869fd 100644
--- a/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java
index 7ca94b6400..6526cc957a 100644
--- a/spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java
+++ b/spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/context/weaving/AspectJWeavingEnabler.java b/spring-context/src/main/java/org/springframework/context/weaving/AspectJWeavingEnabler.java
index 069509d259..ca86be3110 100644
--- a/spring-context/src/main/java/org/springframework/context/weaving/AspectJWeavingEnabler.java
+++ b/spring-context/src/main/java/org/springframework/context/weaving/AspectJWeavingEnabler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java
index 8dd1903870..8171ee34c2 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/DateTimeParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java
index 319463877c..325d3029e7 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/MillisecondInstantPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java
index 09d62b2532..40a402d383 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadableInstantPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java
index 50a871ed50..a8b8981f47 100644
--- a/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java
+++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/ReadablePartialPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/number/CurrencyFormatter.java b/spring-context/src/main/java/org/springframework/format/number/CurrencyFormatter.java
index 00bf1303a1..739f9c4343 100644
--- a/spring-context/src/main/java/org/springframework/format/number/CurrencyFormatter.java
+++ b/spring-context/src/main/java/org/springframework/format/number/CurrencyFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/number/NumberFormatter.java b/spring-context/src/main/java/org/springframework/format/number/NumberFormatter.java
index cee5a62a37..5111c17bab 100644
--- a/spring-context/src/main/java/org/springframework/format/number/NumberFormatter.java
+++ b/spring-context/src/main/java/org/springframework/format/number/NumberFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/format/number/PercentFormatter.java b/spring-context/src/main/java/org/springframework/format/number/PercentFormatter.java
index 719b77dd39..8058b020eb 100644
--- a/spring-context/src/main/java/org/springframework/format/number/PercentFormatter.java
+++ b/spring-context/src/main/java/org/springframework/format/number/PercentFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/ClassTransformerAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/ClassTransformerAdapter.java
index 2fd924ed53..67e33d6902 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/ClassTransformerAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/ClassTransformerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossModulesAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossModulesAdapter.java
index ac3e17645f..9faced8dee 100644
--- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossModulesAdapter.java
+++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossModulesAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/jmx/export/NotificationListenerBean.java b/spring-context/src/main/java/org/springframework/jmx/export/NotificationListenerBean.java
index b82366aa17..53339d84e4 100644
--- a/spring-context/src/main/java/org/springframework/jmx/export/NotificationListenerBean.java
+++ b/spring-context/src/main/java/org/springframework/jmx/export/NotificationListenerBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 1648ad3edb..7c8d2f5b9c 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-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.
diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
index 50327e4545..123dcee53c 100644
--- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
+++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java b/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java
index 7d8a49f623..d664730125 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java b/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java
index 9d32dbbed5..83d0e71265 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/DefaultRemoteInvocationFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java
index 03fe329f9e..f629dc6b7d 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationTraceInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java
index 8aa6921f42..1cc5669e6c 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/SimpleHttpServerFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java
index fba31eae21..9e00b592f8 100644
--- a/spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java
+++ b/spring-context/src/main/java/org/springframework/remoting/support/UrlBasedRemoteAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 38e975167c..ea6afa94b8 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-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.
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 39b1b55668..d41e8703cd 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-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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/DelegatingErrorHandlingRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/support/DelegatingErrorHandlingRunnable.java
index 667933911c..1bbb2c8493 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/DelegatingErrorHandlingRunnable.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/DelegatingErrorHandlingRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java
index a3d755625a..d118eca1b0 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/MethodInvokingRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java
index 165ab45fc6..63beb9b180 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java b/spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java
index d68534b3ab..75be34ae6c 100644
--- a/spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java
+++ b/spring-context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 81a785e222..d501a5e8a0 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-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.
diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java
index 75caa42182..290754c719 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/support/DelegatingThemeSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java b/spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java
index 37d14c5115..b83b69523d 100644
--- a/spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java
+++ b/spring-context/src/main/java/org/springframework/ui/context/support/SimpleTheme.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java
index d88ab54298..bac3469b82 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java
index 1648ebc340..bf7d220795 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java
index afaf2d047a..492d635acc 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java
index 9f17fab589..b6ba34bdda 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java
index 878e7bb6d0..2f9dd91531 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java b/spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java
index e47f72eaeb..4860b5f4ee 100644
--- a/spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/ControlFlowFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java b/spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java
index ffe9c45cce..8336678e26 100644
--- a/spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java
+++ b/spring-core/src/main/java/org/springframework/core/ExceptionDepthComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 9ee37f783d..6676e73963 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-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.
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 5f69e0e638..78d2f93548 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-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.
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 548872c0a6..85326e4b60 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-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.
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java
index f698500020..179823f32c 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/CharacterToNumberFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToArrayConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToArrayConverter.java
index 53da33c064..ea79a065b6 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToArrayConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToArrayConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 6fcd271feb..c07b057a4b 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-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.
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java
index bf4b591922..bcc51e2f95 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToObjectConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToStringConverter.java
index 428f399051..7537c1c3e0 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToStringConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/CollectionToStringConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/NumberToCharacterConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/NumberToCharacterConverter.java
index 11090a0d11..d79435d06f 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/NumberToCharacterConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/NumberToCharacterConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 99c2a4fd1d..bf64daf892 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-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.
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 63a348ecb2..02a389eb66 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-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.
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 4b3604ed5d..f9c3c8174e 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-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.
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 4ccb387a9b..5417a62659 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-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.
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToArrayConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToArrayConverter.java
index 0fa7696dd6..af209148c8 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToArrayConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToArrayConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java
index d5dc90cf70..1d8bc61ef7 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java
index 83477f5d78..7a076d335c 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToCharacterConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 35d6083c92..7d91ee8ab0 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-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.
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 e47748942b..064801aea4 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-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java
index 7fea4b148b..c6c22ea280 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToLocaleConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java
index 17fc6975ed..506dcec929 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToNumberConverterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/StringToPropertiesConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/StringToPropertiesConverter.java
index 4e97c8f1f2..83c6c13fb1 100644
--- a/spring-core/src/main/java/org/springframework/core/convert/support/StringToPropertiesConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/convert/support/StringToPropertiesConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 117b3f12d9..11039d712c 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-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.
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 f4f99c930c..df59662b18 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/io/FileSystemResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/FileSystemResourceLoader.java
index f1ef298c26..7446b71ff2 100644
--- a/spring-core/src/main/java/org/springframework/core/io/FileSystemResourceLoader.java
+++ b/spring-core/src/main/java/org/springframework/core/io/FileSystemResourceLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java b/spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java
index 49cb0c9627..074acf7bbb 100644
--- a/spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java
+++ b/spring-core/src/main/java/org/springframework/core/serializer/support/DeserializingConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 042bf74390..b092cc7bd1 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-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.
diff --git a/spring-core/src/main/java/org/springframework/core/task/support/ConcurrentExecutorAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/ConcurrentExecutorAdapter.java
index 0ed48c4f67..8f9f09eda5 100644
--- a/spring-core/src/main/java/org/springframework/core/task/support/ConcurrentExecutorAdapter.java
+++ b/spring-core/src/main/java/org/springframework/core/task/support/ConcurrentExecutorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 9719ddd57e..667bac6882 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-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.
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 9ddf225895..a87168b7ad 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-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.
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 dc584ea443..2af6411e22 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-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.
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 7279368496..81f0206a74 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-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.
diff --git a/spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java b/spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
index 5ba90a2d62..f980b91c23 100644
--- a/spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
+++ b/spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java b/spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java
index bf6accc6ae..2ce4b7901e 100644
--- a/spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java
+++ b/spring-core/src/main/java/org/springframework/util/WeakReferenceMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
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 59ce5f0091..731d7bc9a2 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-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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java
index 8f2620aec9..82b6ab07bb 100644
--- a/spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java
+++ b/spring-expression/src/main/java/org/springframework/expression/common/TemplateAwareExpressionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java
index b6bd630f4b..e2601c893b 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
index 96defb2687..1b4da4b284 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardOperatorOverloader.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardOperatorOverloader.java
index 322f7ab422..c120bf66ed 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardOperatorOverloader.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardOperatorOverloader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/config/JdbcNamespaceHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/JdbcNamespaceHandler.java
index 663d8d7ff0..e5567d1cfd 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/config/JdbcNamespaceHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/config/JdbcNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgPreparedStatementSetter.java
index 236cdb9f71..f049232a79 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgPreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgPreparedStatementSetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgTypePreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgTypePreparedStatementSetter.java
index d0e3daab21..ee0e03de9a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgTypePreparedStatementSetter.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ArgTypePreparedStatementSetter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
index 85e044d19a..c888b47ef3 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchUpdateUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
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 b6f67e2394..36bc50ed84 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-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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java
index 8c54ebac4d..364b075b61 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/BeanPropertySqlParameterSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java
index 64dcdc2630..fd711b4327 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterBatchUpdateUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java
index d2f6e55ae9..18c6572883 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/JdbcTransactionObjectSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
index c4a82f071c..c59f31b4cb 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java
index 4172971e4a..6140a51f1a 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleConnectionHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 3516d4b164..2497a6cc01 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-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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java
index f04758765a..f41180ca85 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java
index d5775369c4..197b5fb6be 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java
index e65fe30e78..a39685139e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.java
index 8aaaad91f5..964c3b3323 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java
index 740065ce32..4920ada8f7 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DataSourceInitializer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DataSourceInitializer.java
index aa2a104a47..177e778187 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DataSourceInitializer.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DataSourceInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/SingleDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/SingleDataSourceLookup.java
index 10acc19b77..8bd9a4bbce 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/SingleDataSourceLookup.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/SingleDataSourceLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java
index 836501d418..738709acc6 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java
index dd6a311505..abdab1e872 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java
index efd9824bcb..d55e85176c 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
index 8a6bdbccd5..d55a0fd5c2 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
index be2d61bcd2..82e5d004ac 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/PassThroughClob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java
index 7d138c7cdd..ce1a628351 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageConsumer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java
index d879e587c7..2b8e54726d 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/CachedMessageProducer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java b/spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java
index d94cdadb63..4ca40d842c 100644
--- a/spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java
+++ b/spring-jms/src/main/java/org/springframework/jms/connection/ChainedExceptionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102.java
index 50f25c1eb6..78bd1c1986 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
index 2bf01afad5..3586dffaad 100644
--- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
+++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java
index 0c54690470..ded5f70434 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java
index eeb7c2c7c1..28acc3b604 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionSynchronization.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java
index e5e41eecb2..c0258c7a5f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringTransactionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java
index aac6fadc59..a3fc0ac210 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TypeDefinitionBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
index 7c2b79c966..f41cbaae8f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobByteArrayTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
index 0f38e310a5..aded9e5ce3 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/BlobSerializableTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
index aed761462b..a65f884bbe 100644
--- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
+++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/ClobStringTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewInterceptor.java
index 0275567792..f54c081023 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewInterceptor.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/StandardPersistenceManagerProxyBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/StandardPersistenceManagerProxyBean.java
index bbdbeaefbb..0b3ab56472 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/StandardPersistenceManagerProxyBean.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/StandardPersistenceManagerProxyBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
index 7c774be110..b077f1132f 100644
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java b/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java
index 61aa61c0e8..3b98e2edb5 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockBodyContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java b/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java
index 2de79f09c2..99e7722f33 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockFilterConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java b/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java
index 4dfb1e7971..9fc585e59a 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockJspWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartFile.java b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartFile.java
index 7cff3fd2bd..91eb319f35 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartFile.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
index 0d3f64f0c6..9c9b568770 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java
index d8e8abdf5e..be7ebf808e 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java b/spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java
index 1a98d4c657..080b8534ea 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/PassThroughFilterChain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionResponse.java
index 2f5c773e0c..423cbb0c34 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockActionResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockBaseURL.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockBaseURL.java
index fcdc50acdc..28662358c0 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockBaseURL.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockBaseURL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockCacheControl.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockCacheControl.java
index cac1a83d5f..109133a2b6 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockCacheControl.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockCacheControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockClientDataRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
index 8fa396de4d..beccbcf59a 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockClientDataRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEvent.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEvent.java
index c2c82febae..daa15e5156 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEvent.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventRequest.java
index af4725dea7..d29d7865c4 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventResponse.java
index f7c846e028..1114d0081b 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockEventResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 cbfb70bca1..0a48975f69 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-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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
index 54201b8ec8..e269a621e1 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortalContext.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortalContext.java
index 8731438d70..824df6f70d 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortalContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortalContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletPreferences.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletPreferences.java
index fc281fc16b..3af2d6e97a 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletPreferences.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletPreferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
index 5ba423ed0e..f4e0dc98fd 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletResponse.java
index 9fe6d6315f..513a6c8c9c 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletURL.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletURL.java
index 53deff0916..89fe6a5b17 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletURL.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletURL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderRequest.java
index 672a51dcb7..8b9ed2e41a 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderResponse.java
index 7f70be9a05..e359b0b52c 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockRenderResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceRequest.java
index e889d92314..5878e7b96e 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceRequest.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceResponse.java
index 00a267b1d8..4c7f45279b 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceURL.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceURL.java
index 12b7fd4a39..a0cf72f022 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceURL.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockResourceURL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
index 6d2f6d74fa..93ddad81d0 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
index 924188660a..561dfeb4f0 100644
--- a/spring-test/src/main/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
+++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/ConditionalTestCase.java b/spring-test/src/main/java/org/springframework/test/ConditionalTestCase.java
index 223d3e629c..eb46b634e2 100644
--- a/spring-test/src/main/java/org/springframework/test/ConditionalTestCase.java
+++ b/spring-test/src/main/java/org/springframework/test/ConditionalTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-test/src/main/java/org/springframework/test/annotation/SystemProfileValueSource.java b/spring-test/src/main/java/org/springframework/test/annotation/SystemProfileValueSource.java
index 7bd17b9bd5..5a39918a77 100644
--- a/spring-test/src/main/java/org/springframework/test/annotation/SystemProfileValueSource.java
+++ b/spring-test/src/main/java/org/springframework/test/annotation/SystemProfileValueSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java
index 36c8810c23..19bd6dda70 100644
--- a/spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java
+++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/EisOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java
index 97ff0bdfb6..fbac4159dd 100644
--- a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java
+++ b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAwareProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java b/spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java
index 60c3861729..b822fc5fb6 100644
--- a/spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java
+++ b/spring-tx/src/main/java/org/springframework/jca/context/ResourceAdapterApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
index 3d85df8936..c05c613253 100644
--- a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
+++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java b/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
index cf7393bdaa..605bbebb8d 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/LocalConnectionFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java b/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java
index ac24240aaf..8d3fd3d236 100644
--- a/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java
+++ b/spring-tx/src/main/java/org/springframework/jca/support/ResourceAdapterFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java b/spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java
index d3601d2791..f0320d9ffe 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/DelegatingWork.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java b/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
index 702a26dd4e..96645a6e24 100644
--- a/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
+++ b/spring-tx/src/main/java/org/springframework/jca/work/SimpleTaskWorkManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
index 3f697ee16a..5031822294 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java
index d07eb8f688..f73436a2c5 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java b/spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java
index 055bafcff4..b68abdce0b 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/SimpleTransactionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java
index 67e1c7efa9..efcf0616c9 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/jta/UserTransactionAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
index e8ab7707b2..bea1e3e864 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationAdapter.java
index c1b22136c2..4342e872e0 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationAdapter.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 bb713e336b..878ab04eb3 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-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.
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 8e34c1ca3d..4022c4dc73 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-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.
diff --git a/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java b/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
index 0d66c7c711..0bf52d0493 100644
--- a/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
+++ b/spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequest.java
index 59dca8c119..4ab92f5061 100644
--- a/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/client/CommonsClientHttpRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 930a2df1e1..e15528f922 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-2011 the original author or authors.
+ * 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.
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 67e2ecbb69..d66476d914 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-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.
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 25e16be1b3..24eee6ca4d 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-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
index ae352112c4..f6a646422f 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
index 9c0cd99a21..ae302751fa 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
index 633ccf14e8..0bfe6e43a0 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
index 188905afe5..7f9c7ec7db 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapServiceExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
index a9a2397292..f9e4e1de06 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
index 8e75fba47a..3952671c32 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianServiceExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
index 399bcc1224..304f962201 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleBurlapServiceExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
index 3a509a9cea..f46dc95a49 100644
--- a/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/caucho/SimpleHessianServiceExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 969825b0c6..3514f5e2e5 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-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.
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 7c643a2810..0e85a7bcc4 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-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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java
index 1b122a70cc..88283205a9 100644
--- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/SimpleHttpInvokerServiceExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java
index dfe833dc97..52ad40354c 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/AbstractJaxWsServiceExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java
index a9511b6864..ee7ccdfe31 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsPortProxyFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java
index c98ee83876..da97f8437a 100644
--- a/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/LocalJaxWsServiceFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java
index 17507c88ba..498849d608 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultSessionAttributeStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java b/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java
index db3b5b3f53..677ea452b1 100644
--- a/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java
+++ b/spring-web/src/main/java/org/springframework/web/context/ContextCleanupListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java
index 722a5aec6f..6c5427058f 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java
index 144dc562d3..5e2d1d0029 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java
index 7cfa4641d8..8da02f48f0 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextAwareProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextFactoryBean.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextFactoryBean.java
index 9389942026..beb46be6d2 100644
--- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextFactoryBean.java
+++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 6933acd166..4fb7f4fed4 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-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.
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
index 9de0d6aeed..decbe3859f 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/AbstractMultipartHttpServletRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java
index 9aea2de865..59e90c27af 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletModeNameViewController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * 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.
diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java
index e00710e978..bae04e4d30 100644
--- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java
+++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleControllerHandlerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
index 69a199ab24..2c204ba673 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/WebRequestHandlerInterceptorAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java
index 93222d9697..7c6f8349cb 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/HttpRequestHandlerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java
index 76b70a1f06..bcd28c0e54 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleControllerHandlerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * 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.
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 934c20b74d..39f4620501 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-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.
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 761818437c..f5badd50bf 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-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.
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 631852bae5..c74cc97333 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-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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java
index e04782a89f..ebdcd8fcf3 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * 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.
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 f5c8c00978..f3474d102a 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-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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
index 5a214c7d0c..180bc6e88a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/DefaultServletHttpRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * 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.
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
index 21bbd923fe..c572481b6a 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * 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.
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 42ae8aaeab..3b399b1932 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-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.